Move trunk/phpBB to old_trunk/phpBB

git-svn-id: file:///svn/phpbb/trunk@10210 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Meik Sievertsen <acydburn@phpbb.com> 2009-10-04 18:13:59 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2009-10-04 18:13:59 +0000
commit: bf8ac19eaa8d74f9dfd6d597190f5664e7339382 (patch)
tree: c3ad876736748e36cb9176a0248cc43badfc1d9a
parent: 3215bbf88864139dc8c7e9ac5773b1ea8a7e96c1 (diff)
download: forums-bf8ac19eaa8d74f9dfd6d597190f5664e7339382.tar
forums-bf8ac19eaa8d74f9dfd6d597190f5664e7339382.tar.gz
forums-bf8ac19eaa8d74f9dfd6d597190f5664e7339382.tar.bz2
forums-bf8ac19eaa8d74f9dfd6d597190f5664e7339382.tar.xz
forums-bf8ac19eaa8d74f9dfd6d597190f5664e7339382.zip
747 files changed, 0 insertions, 173670 deletions
diff --git a/phpBB/.htaccess b/phpBB/.htaccess
deleted file mode 100644
index 41fb129175..0000000000
--- a/phpBB/.htaccess
+++ /dev/null
@@ -1,9 +0,0 @@
-<Files "config.php">
-Order Allow,Deny
-Deny from All
-</Files>
-
-<Files "common.php">
-Order Allow,Deny
-Deny from All
-</Files>
diff --git a/phpBB/adm/images/arrow_down.gif b/phpBB/adm/images/arrow_down.gif
deleted file mode 100644
index e45c365ecc..0000000000
--- a/phpBB/adm/images/arrow_down.gif
+++ /dev/null
diff --git a/phpBB/adm/images/arrow_left.gif b/phpBB/adm/images/arrow_left.gif
deleted file mode 100644
index 076a5596f1..0000000000
--- a/phpBB/adm/images/arrow_left.gif
+++ /dev/null
diff --git a/phpBB/adm/images/arrow_right.gif b/phpBB/adm/images/arrow_right.gif
deleted file mode 100644
index c5827a401f..0000000000
--- a/phpBB/adm/images/arrow_right.gif
+++ /dev/null
diff --git a/phpBB/adm/images/arrow_up.gif b/phpBB/adm/images/arrow_up.gif
deleted file mode 100644
index 38b5a62c17..0000000000
--- a/phpBB/adm/images/arrow_up.gif
+++ /dev/null
diff --git a/phpBB/adm/images/bg_button.gif b/phpBB/adm/images/bg_button.gif
deleted file mode 100644
index 03172ff5c6..0000000000
--- a/phpBB/adm/images/bg_button.gif
+++ /dev/null
diff --git a/phpBB/adm/images/bg_hash1.gif b/phpBB/adm/images/bg_hash1.gif
deleted file mode 100644
index 61163679a8..0000000000
--- a/phpBB/adm/images/bg_hash1.gif
+++ /dev/null
diff --git a/phpBB/adm/images/bg_hash2.gif b/phpBB/adm/images/bg_hash2.gif
deleted file mode 100644
index d31840361c..0000000000
--- a/phpBB/adm/images/bg_hash2.gif
+++ /dev/null
diff --git a/phpBB/adm/images/bg_hash3.gif b/phpBB/adm/images/bg_hash3.gif
deleted file mode 100644
index 40bc7e1b5c..0000000000
--- a/phpBB/adm/images/bg_hash3.gif
+++ /dev/null
diff --git a/phpBB/adm/images/bg_hash4.gif b/phpBB/adm/images/bg_hash4.gif
deleted file mode 100644
index 54e7f0019f..0000000000
--- a/phpBB/adm/images/bg_hash4.gif
+++ /dev/null
diff --git a/phpBB/adm/images/bg_header.gif b/phpBB/adm/images/bg_header.gif
deleted file mode 100644
index b95bf3ba95..0000000000
--- a/phpBB/adm/images/bg_header.gif
+++ /dev/null
diff --git a/phpBB/adm/images/bg_header.jpg b/phpBB/adm/images/bg_header.jpg
deleted file mode 100644
index 5ecec5360b..0000000000
--- a/phpBB/adm/images/bg_header.jpg
+++ /dev/null
diff --git a/phpBB/adm/images/bg_tabs1.gif b/phpBB/adm/images/bg_tabs1.gif
deleted file mode 100644
index d129365661..0000000000
--- a/phpBB/adm/images/bg_tabs1.gif
+++ /dev/null
diff --git a/phpBB/adm/images/bg_tabs2.gif b/phpBB/adm/images/bg_tabs2.gif
deleted file mode 100644
index 0aace9b6db..0000000000
--- a/phpBB/adm/images/bg_tabs2.gif
+++ /dev/null
diff --git a/phpBB/adm/images/bg_tabs_alt1.gif b/phpBB/adm/images/bg_tabs_alt1.gif
deleted file mode 100644
index 335a72c711..0000000000
--- a/phpBB/adm/images/bg_tabs_alt1.gif
+++ /dev/null
diff --git a/phpBB/adm/images/bg_tabs_alt2.gif b/phpBB/adm/images/bg_tabs_alt2.gif
deleted file mode 100644
index a2142d5432..0000000000
--- a/phpBB/adm/images/bg_tabs_alt2.gif
+++ /dev/null
diff --git a/phpBB/adm/images/cellpic3.gif b/phpBB/adm/images/cellpic3.gif
deleted file mode 100644
index be46fc6fcc..0000000000
--- a/phpBB/adm/images/cellpic3.gif
+++ /dev/null
diff --git a/phpBB/adm/images/corners_left.gif b/phpBB/adm/images/corners_left.gif
deleted file mode 100644
index bacd276495..0000000000
--- a/phpBB/adm/images/corners_left.gif
+++ /dev/null
diff --git a/phpBB/adm/images/corners_left2.gif b/phpBB/adm/images/corners_left2.gif
deleted file mode 100644
index 206e50368d..0000000000
--- a/phpBB/adm/images/corners_left2.gif
+++ /dev/null
diff --git a/phpBB/adm/images/corners_right.gif b/phpBB/adm/images/corners_right.gif
deleted file mode 100644
index bcb5bd7d14..0000000000
--- a/phpBB/adm/images/corners_right.gif
+++ /dev/null
diff --git a/phpBB/adm/images/corners_right2.gif b/phpBB/adm/images/corners_right2.gif
deleted file mode 100644
index 0ba66d50b2..0000000000
--- a/phpBB/adm/images/corners_right2.gif
+++ /dev/null
diff --git a/phpBB/adm/images/file_conflict.gif b/phpBB/adm/images/file_conflict.gif
deleted file mode 100644
index 4458c4ff23..0000000000
--- a/phpBB/adm/images/file_conflict.gif
+++ /dev/null
diff --git a/phpBB/adm/images/file_modified.gif b/phpBB/adm/images/file_modified.gif
deleted file mode 100644
index 17e8f976c3..0000000000
--- a/phpBB/adm/images/file_modified.gif
+++ /dev/null
diff --git a/phpBB/adm/images/file_new.gif b/phpBB/adm/images/file_new.gif
deleted file mode 100644
index d0ec75876d..0000000000
--- a/phpBB/adm/images/file_new.gif
+++ /dev/null
diff --git a/phpBB/adm/images/file_new_conflict.gif b/phpBB/adm/images/file_new_conflict.gif
deleted file mode 100644
index 84efde4faa..0000000000
--- a/phpBB/adm/images/file_new_conflict.gif
+++ /dev/null
diff --git a/phpBB/adm/images/file_not_modified.gif b/phpBB/adm/images/file_not_modified.gif
deleted file mode 100644
index 8f9b3d3839..0000000000
--- a/phpBB/adm/images/file_not_modified.gif
+++ /dev/null
diff --git a/phpBB/adm/images/file_up_to_date.gif b/phpBB/adm/images/file_up_to_date.gif
deleted file mode 100644
index c372342646..0000000000
--- a/phpBB/adm/images/file_up_to_date.gif
+++ /dev/null
diff --git a/phpBB/adm/images/gradient2b.gif b/phpBB/adm/images/gradient2b.gif
deleted file mode 100644
index a8107659e2..0000000000
--- a/phpBB/adm/images/gradient2b.gif
+++ /dev/null
diff --git a/phpBB/adm/images/icon_delete.gif b/phpBB/adm/images/icon_delete.gif
deleted file mode 100644
index 57962d5172..0000000000
--- a/phpBB/adm/images/icon_delete.gif
+++ /dev/null
diff --git a/phpBB/adm/images/icon_delete_disabled.gif b/phpBB/adm/images/icon_delete_disabled.gif
deleted file mode 100644
index da55bbbe44..0000000000
--- a/phpBB/adm/images/icon_delete_disabled.gif
+++ /dev/null
diff --git a/phpBB/adm/images/icon_down.gif b/phpBB/adm/images/icon_down.gif
deleted file mode 100644
index 793db26cde..0000000000
--- a/phpBB/adm/images/icon_down.gif
+++ /dev/null
diff --git a/phpBB/adm/images/icon_down_disabled.gif b/phpBB/adm/images/icon_down_disabled.gif
deleted file mode 100644
index 3ba36975b4..0000000000
--- a/phpBB/adm/images/icon_down_disabled.gif
+++ /dev/null
diff --git a/phpBB/adm/images/icon_edit.gif b/phpBB/adm/images/icon_edit.gif
deleted file mode 100644
index c95cf98eb9..0000000000
--- a/phpBB/adm/images/icon_edit.gif
+++ /dev/null
diff --git a/phpBB/adm/images/icon_edit_disabled.gif b/phpBB/adm/images/icon_edit_disabled.gif
deleted file mode 100644
index ac96b0e6dc..0000000000
--- a/phpBB/adm/images/icon_edit_disabled.gif
+++ /dev/null
diff --git a/phpBB/adm/images/icon_folder.gif b/phpBB/adm/images/icon_folder.gif
deleted file mode 100644
index 82ceee0784..0000000000
--- a/phpBB/adm/images/icon_folder.gif
+++ /dev/null
diff --git a/phpBB/adm/images/icon_folder_link.gif b/phpBB/adm/images/icon_folder_link.gif
deleted file mode 100644
index 01fb1c4e1e..0000000000
--- a/phpBB/adm/images/icon_folder_link.gif
+++ /dev/null
diff --git a/phpBB/adm/images/icon_folder_lock.gif b/phpBB/adm/images/icon_folder_lock.gif
deleted file mode 100644
index 450bf28c3c..0000000000
--- a/phpBB/adm/images/icon_folder_lock.gif
+++ /dev/null
diff --git a/phpBB/adm/images/icon_subfolder.gif b/phpBB/adm/images/icon_subfolder.gif
deleted file mode 100644
index 5e97bc94ce..0000000000
--- a/phpBB/adm/images/icon_subfolder.gif
+++ /dev/null
diff --git a/phpBB/adm/images/icon_sync.gif b/phpBB/adm/images/icon_sync.gif
deleted file mode 100644
index 16223dfd9a..0000000000
--- a/phpBB/adm/images/icon_sync.gif
+++ /dev/null
diff --git a/phpBB/adm/images/icon_sync_disabled.gif b/phpBB/adm/images/icon_sync_disabled.gif
deleted file mode 100644
index 39985045c8..0000000000
--- a/phpBB/adm/images/icon_sync_disabled.gif
+++ /dev/null
diff --git a/phpBB/adm/images/icon_trace.gif b/phpBB/adm/images/icon_trace.gif
deleted file mode 100644
index 5c622e9a9d..0000000000
--- a/phpBB/adm/images/icon_trace.gif
+++ /dev/null
diff --git a/phpBB/adm/images/icon_up.gif b/phpBB/adm/images/icon_up.gif
deleted file mode 100644
index 7daa95c07e..0000000000
--- a/phpBB/adm/images/icon_up.gif
+++ /dev/null
diff --git a/phpBB/adm/images/icon_up_disabled.gif b/phpBB/adm/images/icon_up_disabled.gif
deleted file mode 100644
index 2797192574..0000000000
--- a/phpBB/adm/images/icon_up_disabled.gif
+++ /dev/null
diff --git a/phpBB/adm/images/innerbox_bg.gif b/phpBB/adm/images/innerbox_bg.gif
deleted file mode 100644
index 460526f0ba..0000000000
--- a/phpBB/adm/images/innerbox_bg.gif
+++ /dev/null
diff --git a/phpBB/adm/images/no_avatar.gif b/phpBB/adm/images/no_avatar.gif
deleted file mode 100644
index 80539c8c71..0000000000
--- a/phpBB/adm/images/no_avatar.gif
+++ /dev/null
diff --git a/phpBB/adm/images/no_image.png b/phpBB/adm/images/no_image.png
deleted file mode 100644
index 1061ee3b8f..0000000000
--- a/phpBB/adm/images/no_image.png
+++ /dev/null
diff --git a/phpBB/adm/images/phpbb_logo.gif b/phpBB/adm/images/phpbb_logo.gif
deleted file mode 100644
index 239993182b..0000000000
--- a/phpBB/adm/images/phpbb_logo.gif
+++ /dev/null
diff --git a/phpBB/adm/images/progress_bar.gif b/phpBB/adm/images/progress_bar.gif
deleted file mode 100644
index 1ae265152c..0000000000
--- a/phpBB/adm/images/progress_bar.gif
+++ /dev/null
diff --git a/phpBB/adm/images/spacer.gif b/phpBB/adm/images/spacer.gif
deleted file mode 100644
index cd29009a65..0000000000
--- a/phpBB/adm/images/spacer.gif
+++ /dev/null
diff --git a/phpBB/adm/images/toggle.gif b/phpBB/adm/images/toggle.gif
deleted file mode 100644
index 8af6861bd1..0000000000
--- a/phpBB/adm/images/toggle.gif
+++ /dev/null
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
deleted file mode 100644
index a6ab6ec182..0000000000
--- a/phpBB/adm/index.php
+++ /dev/null
@@ -1,608 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-*/
-define('IN_PHPBB', true);
-define('ADMIN_START', true);
-define('NEED_SID', true);
-
-// Include files
-if (!defined('PHPBB_ROOT_PATH')) define('PHPBB_ROOT_PATH', './../');
-if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-if (!defined('PHPBB_ADMIN_PATH')) define('PHPBB_ADMIN_PATH', './');
-
-include PHPBB_ROOT_PATH . 'common.' . PHP_EXT;
-require PHPBB_ROOT_PATH . 'includes/functions_admin.' . PHP_EXT;
-require PHPBB_ROOT_PATH . 'includes/functions_module.' . PHP_EXT;
-
-// Start session management
-phpbb::$user->session_begin();
-phpbb::$acl->init(phpbb::$user->data);
-phpbb::$user->setup('acp/common');
-// End session management
-
-// Have they authenticated (again) as an admin for this session?
-if (!phpbb::$user->is_guest && (!isset(phpbb::$user->data['session_admin']) || !phpbb::$user->data['session_admin']))
-{
-	login_box('', phpbb::$user->lang['LOGIN_ADMIN_CONFIRM'], phpbb::$user->lang['LOGIN_ADMIN_SUCCESS'], true, false);
-}
-else if (phpbb::$user->is_guest)
-{
-	login_box('');
-}
-
-// Is user any type of admin? No, then stop here, each script needs to
-// check specific permissions but this is a catchall
-if (!phpbb::$acl->acl_get('a_'))
-{
-	trigger_error('NO_ADMIN');
-}
-
-// We define the admin variables now, because the user is now able to use the admin related features...
-define('IN_ADMIN', true);
-
-// Some oft used variables
-$safe_mode		= (@ini_get('safe_mode') == '1' || strtolower(@ini_get('safe_mode')) === 'on') ? true : false;
-$file_uploads	= (@ini_get('file_uploads') == '1' || strtolower(@ini_get('file_uploads')) === 'on') ? true : false;
-$module_id		= request_var('i', '');
-$mode			= request_var('mode', '');
-
-// Set custom template for admin area
-phpbb::$template->set_custom_template(PHPBB_ADMIN_PATH . 'style', 'admin');
-phpbb::$template->assign_var('T_TEMPLATE_PATH', PHPBB_ADMIN_PATH . 'style');
-
-// Define page header/footer to use
-phpbb::$plugins->register_function('page_header', 'adm_page_header', phpbb::FUNCTION_OVERRIDE);
-phpbb::$plugins->register_function('page_footer', 'adm_page_footer', phpbb::FUNCTION_OVERRIDE);
-
-// And make the calls available
-phpbb::$plugins->setup();
-
-// Instantiate new module
-$module = new p_master();
-
-// Instantiate module system and generate list of available modules
-$module->list_modules('acp');
-
-// Select the active module
-$module->set_active($module_id, $mode);
-
-// Assign data to the template engine for the list of modules
-// We do this before loading the active module for correct menu display in trigger_error
-$module->assign_tpl_vars(phpbb::$url->append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT));
-
-// Load and execute the relevant module
-$module->load_active();
-
-// Generate the page
-page_header($module->get_page_title());
-
-phpbb::$template->set_filenames(array(
-	'body' => $module->get_tpl_name(),
-));
-
-page_footer();
-
-/**
-* Header for acp pages
-*/
-function adm_page_header($page_title)
-{
-	if (defined('HEADER_INC'))
-	{
-		return;
-	}
-
-	define('HEADER_INC', true);
-
-	// gzip_compression
-	if (phpbb::$config['gzip_compress'])
-	{
-		if (@extension_loaded('zlib') && !headers_sent())
-		{
-			ob_start('ob_gzhandler');
-		}
-	}
-
-	phpbb::$template->assign_vars(array(
-		'PAGE_TITLE'			=> $page_title,
-		'USERNAME'				=> (!phpbb::$user->is_guest) ? phpbb::$user->data['username'] : '',
-
-		'SESSION_ID'			=> phpbb::$user->session_id,
-		'ROOT_PATH'				=> PHPBB_ADMIN_PATH,
-
-		'U_LOGOUT'				=> phpbb::$url->append_sid('ucp', 'mode=logout'),
-		'U_ADM_LOGOUT'			=> phpbb::$url->append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, 'action=admlogout'),
-		'U_ADM_INDEX'			=> phpbb::$url->append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT),
-		'U_INDEX'				=> phpbb::$url->append_sid('index'),
-
-		'S_USER_ADMIN'			=> phpbb::$user->data['session_admin'],
-		'S_USER_LOGGED_IN'		=> (phpbb::$user->is_registered),
-
-		'T_IMAGES_PATH'			=> PHPBB_ROOT_PATH . 'images/',
-		'T_SMILIES_PATH'		=> PHPBB_ROOT_PATH . phpbb::$config['smilies_path'] . '/',
-		'T_AVATAR_PATH'			=> PHPBB_ROOT_PATH . phpbb::$config['avatar_path'] . '/',
-		'T_AVATAR_GALLERY_PATH'	=> PHPBB_ROOT_PATH . phpbb::$config['avatar_gallery_path'] . '/',
-		'T_ICONS_PATH'			=> PHPBB_ROOT_PATH . phpbb::$config['icons_path'] . '/',
-		'T_RANKS_PATH'			=> PHPBB_ROOT_PATH . phpbb::$config['ranks_path'] . '/',
-		'T_UPLOAD_PATH'			=> PHPBB_ROOT_PATH . phpbb::$config['upload_path'] . '/',
-
-		'ICON_MOVE_UP'				=> '<img src="' . PHPBB_ADMIN_PATH . 'images/icon_up.gif" alt="' . phpbb::$user->lang['MOVE_UP'] . '" title="' . phpbb::$user->lang['MOVE_UP'] . '" />',
-		'ICON_MOVE_UP_DISABLED'		=> '<img src="' . PHPBB_ADMIN_PATH . 'images/icon_up_disabled.gif" alt="' . phpbb::$user->lang['MOVE_UP'] . '" title="' . phpbb::$user->lang['MOVE_UP'] . '" />',
-		'ICON_MOVE_DOWN'			=> '<img src="' . PHPBB_ADMIN_PATH . 'images/icon_down.gif" alt="' . phpbb::$user->lang['MOVE_DOWN'] . '" title="' . phpbb::$user->lang['MOVE_DOWN'] . '" />',
-		'ICON_MOVE_DOWN_DISABLED'	=> '<img src="' . PHPBB_ADMIN_PATH . 'images/icon_down_disabled.gif" alt="' . phpbb::$user->lang['MOVE_DOWN'] . '" title="' . phpbb::$user->lang['MOVE_DOWN'] . '" />',
-		'ICON_EDIT'					=> '<img src="' . PHPBB_ADMIN_PATH . 'images/icon_edit.gif" alt="' . phpbb::$user->lang['EDIT'] . '" title="' . phpbb::$user->lang['EDIT'] . '" />',
-		'ICON_EDIT_DISABLED'		=> '<img src="' . PHPBB_ADMIN_PATH . 'images/icon_edit_disabled.gif" alt="' . phpbb::$user->lang['EDIT'] . '" title="' . phpbb::$user->lang['EDIT'] . '" />',
-		'ICON_DELETE'				=> '<img src="' . PHPBB_ADMIN_PATH . 'images/icon_delete.gif" alt="' . phpbb::$user->lang['DELETE'] . '" title="' . phpbb::$user->lang['DELETE'] . '" />',
-		'ICON_DELETE_DISABLED'		=> '<img src="' . PHPBB_ADMIN_PATH . 'images/icon_delete_disabled.gif" alt="' . phpbb::$user->lang['DELETE'] . '" title="' . phpbb::$user->lang['DELETE'] . '" />',
-		'ICON_SYNC'					=> '<img src="' . PHPBB_ADMIN_PATH . 'images/icon_sync.gif" alt="' . phpbb::$user->lang['RESYNC'] . '" title="' . phpbb::$user->lang['RESYNC'] . '" />',
-		'ICON_SYNC_DISABLED'		=> '<img src="' . PHPBB_ADMIN_PATH . 'images/icon_sync_disabled.gif" alt="' . phpbb::$user->lang['RESYNC'] . '" title="' . phpbb::$user->lang['RESYNC'] . '" />',
-
-		'S_USER_LANG'			=> phpbb::$user->lang['USER_LANG'],
-		'S_CONTENT_DIRECTION'	=> phpbb::$user->lang['DIRECTION'],
-		'S_CONTENT_ENCODING'	=> 'UTF-8',
-		'S_CONTENT_FLOW_BEGIN'	=> (phpbb::$user->lang['DIRECTION'] == 'ltr') ? 'left' : 'right',
-		'S_CONTENT_FLOW_END'	=> (phpbb::$user->lang['DIRECTION'] == 'ltr') ? 'right' : 'left',
-	));
-
-	// application/xhtml+xml not used because of IE
-	header('Content-type: text/html; charset=UTF-8');
-
-	header('Cache-Control: private, no-cache="set-cookie"');
-	header('Expires: 0');
-	header('Pragma: no-cache');
-
-	return;
-}
-
-/**
-* Page footer for acp pages
-*/
-function adm_page_footer($copyright_html = true)
-{
-	global $starttime;
-
-	// Output page creation time
-	if (phpbb::$base_config['debug'])
-	{
-		$mtime = explode(' ', microtime());
-		$totaltime = $mtime[0] + $mtime[1] - $starttime;
-
-		if (phpbb_request::variable('explain', false) && phpbb::$acl->acl_get('a_') && phpbb::$base_config['debug_extra'] && method_exists(phpbb::$db, 'sql_report'))
-		{
-			phpbb::$db->sql_report('display');
-		}
-
-		$debug_output = sprintf('Time : %.3fs | ' . phpbb::$db->sql_num_queries() . ' Queries | GZIP : ' . ((phpbb::$config['gzip_compress']) ? 'On' : 'Off') . ((phpbb::$user->system['load']) ? ' | Load : ' . phpbb::$user->system['load'] : ''), $totaltime);
-
-		if (phpbb::$acl->acl_get('a_') && phpbb::$base_config['debug_extra'])
-		{
-			if (function_exists('memory_get_usage'))
-			{
-				if ($memory_usage = memory_get_usage())
-				{
-					$memory_usage -= phpbb::$base_config['memory_usage'];
-					$memory_usage = get_formatted_filesize($memory_usage);
-
-					$debug_output .= ' | Memory Usage: ' . $memory_usage;
-				}
-			}
-
-			$debug_output .= ' | <a href="' . phpbb::$url->build_url() . '&amp;explain=1">Explain</a>';
-		}
-	}
-
-	phpbb::$template->assign_vars(array(
-		'DEBUG_OUTPUT'		=> (phpbb::$base_config['debug']) ? $debug_output : '',
-		'TRANSLATION_INFO'	=> (!empty(phpbb::$user->lang['TRANSLATION_INFO'])) ? phpbb::$user->lang['TRANSLATION_INFO'] : '',
-		'S_COPYRIGHT_HTML'	=> $copyright_html,
-		'VERSION'			=> phpbb::$config['version'])
-	);
-
-	phpbb::$template->display('body');
-
-	garbage_collection();
-	exit_handler();
-}
-
-/**
-* Generate back link for acp pages
-*/
-function adm_back_link($u_action)
-{
-	return '<br /><br /><a href="' . $u_action . '">&laquo; ' . phpbb::$user->lang['BACK_TO_PREV'] . '</a>';
-}
-
-/**
-* Build select field options in acp pages
-*/
-function build_select($option_ary, $option_default = false)
-{
-	$html = '';
-	foreach ($option_ary as $value => $title)
-	{
-		$selected = ($option_default !== false && $value == $option_default) ? ' selected="selected"' : '';
-		$html .= '<option value="' . $value . '"' . $selected . '>' . phpbb::$user->lang[$title] . '</option>';
-	}
-
-	return $html;
-}
-
-/**
-* Build radio fields in acp pages
-*/
-function h_radio($name, &$input_ary, $input_default = false, $id = false, $key = false)
-{
-	$html = '';
-	$id_assigned = false;
-	foreach ($input_ary as $value => $title)
-	{
-		$selected = ($input_default !== false && $value == $input_default) ? ' checked="checked"' : '';
-		$html .= '<label><input type="radio" name="' . $name . '"' . (($id && !$id_assigned) ? ' id="' . $id . '"' : '') . ' value="' . $value . '"' . $selected . (($key) ? ' accesskey="' . $key . '"' : '') . ' class="radio" /> ' . phpbb::$user->lang[$title] . '</label>';
-		$id_assigned = true;
-	}
-
-	return $html;
-}
-
-/**
-* Build configuration template for acp configuration pages
-*/
-function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
-{
-	global $module;
-
-	$tpl = '';
-	$name = 'config[' . $config_key . ']';
-
-	switch ($tpl_type[0])
-	{
-		case 'text':
-		case 'password':
-			$size = (int) $tpl_type[1];
-			$maxlength = (int) $tpl_type[2];
-
-			$tpl = '<input id="' . $key . '" type="' . $tpl_type[0] . '"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="' . $name . '" value="' . $new[$config_key] . '" />';
-		break;
-
-		case 'dimension':
-			$size = (int) $tpl_type[1];
-			$maxlength = (int) $tpl_type[2];
-
-			$tpl = '<input id="' . $key . '" type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '" /> x <input type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" />';
-		break;
-
-		case 'textarea':
-			$rows = (int) $tpl_type[1];
-			$cols = (int) $tpl_type[2];
-
-			$tpl = '<textarea id="' . $key . '" name="' . $name . '" rows="' . $rows . '" cols="' . $cols . '">' . $new[$config_key] . '</textarea>';
-		break;
-
-		case 'radio':
-			$key_yes	= ($new[$config_key]) ? ' checked="checked"' : '';
-			$key_no		= (!$new[$config_key]) ? ' checked="checked"' : '';
-
-			$tpl_type_cond = explode('_', $tpl_type[1]);
-			$type_no = ($tpl_type_cond[0] == 'disabled' || $tpl_type_cond[0] == 'enabled') ? false : true;
-
-			$tpl_no = '<label><input type="radio" name="' . $name . '" value="0"' . $key_no . ' class="radio" /> ' . (($type_no) ? phpbb::$user->lang['NO'] : phpbb::$user->lang['DISABLED']) . '</label>';
-			$tpl_yes = '<label><input type="radio" id="' . $key . '" name="' . $name . '" value="1"' . $key_yes . ' class="radio" /> ' . (($type_no) ? phpbb::$user->lang['YES'] : phpbb::$user->lang['ENABLED']) . '</label>';
-
-			$tpl = ($tpl_type_cond[0] == 'yes' || $tpl_type_cond[0] == 'enabled') ? $tpl_yes . $tpl_no : $tpl_no . $tpl_yes;
-		break;
-
-		case 'select':
-		case 'select_multiple':
-		case 'custom':
-
-			$return = '';
-
-			if (isset($vars['method']))
-			{
-				$call = array($module->module, $vars['method']);
-			}
-			else if (isset($vars['function']))
-			{
-				$call = $vars['function'];
-			}
-			else
-			{
-				break;
-			}
-
-			if (isset($vars['params']))
-			{
-				$args = array();
-				foreach ($vars['params'] as $value)
-				{
-					switch ($value)
-					{
-						case '{CONFIG_VALUE}':
-							$value = $new[$config_key];
-						break;
-
-						case '{KEY}':
-							$value = $key;
-						break;
-					}
-
-					$args[] = $value;
-				}
-			}
-			else
-			{
-				if ($tpl_type[0] == 'select_multiple')
-				{
-					$new[$config_key] = @unserialize(trim($new[$config_key]));
-				}
-
-				$args = array($new[$config_key], $key);
-			}
-
-			$return = call_user_func_array($call, $args);
-
-			if ($tpl_type[0] == 'select_multiple')
-			{
-				$tpl = '<select id="' . $key . '" name="' . $name . '[]" multiple="multiple">' . $return . '</select>';
-			}
-			else if ($tpl_type[0] == 'select')
-			{
-				$tpl = '<select id="' . $key . '" name="' . $name . '">' . $return . '</select>';
-			}
-			else
-			{
-				$tpl = $return;
-			}
-
-		break;
-
-		default:
-		break;
-	}
-
-	if (isset($vars['append']))
-	{
-		$tpl .= $vars['append'];
-	}
-
-	return $tpl;
-}
-
-/**
-* Going through a config array and validate values, writing errors to $error. The validation method  accepts parameters separated by ':' for string and int.
-* The first parameter defines the type to be used, the second the lower bound and the third the upper bound. Only the type is required.
-*/
-function validate_config_vars($config_vars, &$cfg_array, &$error)
-{
-	$type	= 0;
-	$min	= 1;
-	$max	= 2;
-
-	foreach ($config_vars as $config_name => $config_definition)
-	{
-		if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false)
-		{
-			continue;
-		}
-
-		if (!isset($config_definition['validate']))
-		{
-			continue;
-		}
-
-		$validator = explode(':', $config_definition['validate']);
-
-		// Validate a bit. ;) (0 = type, 1 = min, 2= max)
-		switch ($validator[$type])
-		{
-			case 'string':
-				$length = strlen($cfg_array[$config_name]);
-
-				// the column is a VARCHAR
-				$validator[$max] = (isset($validator[$max])) ? min(255, $validator[$max]) : 255;
-
-				if (isset($validator[$min]) && $length < $validator[$min])
-				{
-					$error[] = sprintf(phpbb::$user->lang['SETTING_TOO_SHORT'], phpbb::$user->lang[$config_definition['lang']], $validator[$min]);
-				}
-				else if (isset($validator[$max]) && $length > $validator[2])
-				{
-					$error[] = sprintf(phpbb::$user->lang['SETTING_TOO_LONG'], phpbb::$user->lang[$config_definition['lang']], $validator[$max]);
-				}
-			break;
-
-			case 'bool':
-				$cfg_array[$config_name] = ($cfg_array[$config_name]) ? 1 : 0;
-			break;
-
-			case 'int':
-				$cfg_array[$config_name] = (int) $cfg_array[$config_name];
-
-				if (isset($validator[$min]) && $cfg_array[$config_name] < $validator[$min])
-				{
-					$error[] = sprintf(phpbb::$user->lang['SETTING_TOO_LOW'], phpbb::$user->lang[$config_definition['lang']], $validator[$min]);
-				}
-				else if (isset($validator[$max]) && $cfg_array[$config_name] > $validator[$max])
-				{
-					$error[] = sprintf(phpbb::$user->lang['SETTING_TOO_BIG'], phpbb::$user->lang[$config_definition['lang']], $validator[$max]);
-				}
-			break;
-
-			// Absolute path
-			case 'script_path':
-				if (!$cfg_array[$config_name])
-				{
-					break;
-				}
-
-				$destination = str_replace('\\', '/', $cfg_array[$config_name]);
-
-				if ($destination !== '/')
-				{
-					// Adjust destination path (no trailing slash)
-					if (substr($destination, -1, 1) == '/')
-					{
-						$destination = substr($destination, 0, -1);
-					}
-
-					$destination = str_replace(array('../', './'), '', $destination);
-
-					if ($destination[0] != '/')
-					{
-						$destination = '/' . $destination;
-					}
-				}
-
-				$cfg_array[$config_name] = trim($destination);
-
-			break;
-
-			// Absolute path
-			case 'lang':
-				if (!$cfg_array[$config_name])
-				{
-					break;
-				}
-
-				$cfg_array[$config_name] = basename($cfg_array[$config_name]);
-
-				if (!file_exists(PHPBB_ROOT_PATH . 'language/' . $cfg_array[$config_name] . '/'))
-				{
-					$error[] = phpbb::$user->lang['WRONG_DATA_LANG'];
-				}
-			break;
-
-			// Relative path (appended PHPBB_ROOT_PATH)
-			case 'rpath':
-			case 'rwpath':
-				if (!$cfg_array[$config_name])
-				{
-					break;
-				}
-
-				$destination = $cfg_array[$config_name];
-
-				// Adjust destination path (no trailing slash)
-				if (substr($destination, -1, 1) == '/' || substr($destination, -1, 1) == '\\')
-				{
-					$destination = substr($destination, 0, -1);
-				}
-
-				$destination = str_replace(array('../', '..\\', './', '.\\'), '', $destination);
-				if ($destination && ($destination[0] == '/' || $destination[0] == "\\"))
-				{
-					$destination = '';
-				}
-
-				$cfg_array[$config_name] = trim($destination);
-
-			// Path being relative (still prefixed by phpbb_root_path), but with the ability to escape the root dir...
-			case 'path':
-			case 'wpath':
-
-				if (!$cfg_array[$config_name])
-				{
-					break;
-				}
-
-				$cfg_array[$config_name] = trim($cfg_array[$config_name]);
-
-				// Make sure no NUL byte is present...
-				if (strpos($cfg_array[$config_name], "\0") !== false || strpos($cfg_array[$config_name], '%00') !== false)
-				{
-					$cfg_array[$config_name] = '';
-					break;
-				}
-
-				if (!file_exists(PHPBB_ROOT_PATH . $cfg_array[$config_name]))
-				{
-					$error[] = sprintf(phpbb::$user->lang['DIRECTORY_DOES_NOT_EXIST'], $cfg_array[$config_name]);
-				}
-
-				if (file_exists(PHPBB_ROOT_PATH . $cfg_array[$config_name]) && !is_dir(PHPBB_ROOT_PATH . $cfg_array[$config_name]))
-				{
-					$error[] = sprintf(phpbb::$user->lang['DIRECTORY_NOT_DIR'], $cfg_array[$config_name]);
-				}
-
-				// Check if the path is writable
-				if ($config_definition['validate'] == 'wpath' || $config_definition['validate'] == 'rwpath')
-				{
-					if (file_exists(PHPBB_ROOT_PATH . $cfg_array[$config_name]) && !@is_writable(PHPBB_ROOT_PATH . $cfg_array[$config_name]))
-					{
-						$error[] = sprintf(phpbb::$user->lang['DIRECTORY_NOT_WRITABLE'], $cfg_array[$config_name]);
-					}
-				}
-
-			break;
-		}
-	}
-
-	return;
-}
-
-/**
-* Checks whatever or not a variable is OK for use in the Database
-* param mixed $value_ary An array of the form array(array('lang' => ..., 'value' => ..., 'column_type' =>))'
-* param mixed $error The error array
-*/
-function validate_range($value_ary, &$error)
-{
-	$column_types = array(
-		'BOOL'	=> array('php_type' => 'int', 		'min' => 0, 				'max' => 1),
-		'USINT'	=> array('php_type' => 'int',		'min' => 0, 				'max' => 65535),
-		'UINT'	=> array('php_type' => 'int', 		'min' => 0, 				'max' => (int) 0x7fffffff),
-		'INT'	=> array('php_type' => 'int', 		'min' => (int) 0x80000000, 	'max' => (int) 0x7fffffff),
-		'TINT'	=> array('php_type' => 'int',		'min' => -128,				'max' => 127),
-
-		'VCHAR'	=> array('php_type' => 'string', 	'min' => 0, 				'max' => 255),
-	);
-	foreach ($value_ary as $value)
-	{
-		$column = explode(':', $value['column_type']);
-		$max = $min = 0;
-		$type = 0;
-		if (!isset($column_types[$column[0]]))
-		{
-			continue;
-		}
-		else
-		{
-			$type = $column_types[$column[0]];
-		}
-
-		switch ($type['php_type'])
-		{
-			case 'string' :
-				$max = (isset($column[1])) ? min($column[1],$type['max']) : $type['max'];
-				if (strlen($value['value']) > $max)
-				{
-					$error[] = sprintf(phpbb::$user->lang['SETTING_TOO_LONG'], phpbb::$user->lang[$value['lang']], $max);
-				}
-			break;
-
-			case 'int':
-				$min = (isset($column[1])) ? max($column[1],$type['min']) : $type['min'];
-				$max = (isset($column[2])) ? min($column[2],$type['max']) : $type['max'];
-				if ($value['value'] < $min)
-				{
-					$error[] = sprintf(phpbb::$user->lang['SETTING_TOO_LOW'], phpbb::$user->lang[$value['lang']], $min);
-				}
-				else if ($value['value'] > $max)
-				{
-					$error[] = sprintf(phpbb::$user->lang['SETTING_TOO_BIG'], phpbb::$user->lang[$value['lang']], $max);
-				}
-			break;
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
deleted file mode 100644
index 9573c34248..0000000000
--- a/phpBB/adm/style/acp_attachments.html
+++ /dev/null
@@ -1,376 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF U_BACK -->
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-<!-- ENDIF -->
-
-<h1>{L_TITLE}</h1>
-
-<p>{L_TITLE_EXPLAIN}</p>
-
-<!-- IF S_WARNING -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{WARNING_MSG}</p>
-	</div>
-<!-- ENDIF -->
-
-<!-- IF S_NOTIFY -->
-	<div class="successbox">
-		<h3>{L_NOTIFY}</h3>
-		<p>{NOTIFY_MSG}</p>
-	</div>
-<!-- ENDIF -->
-
-<!-- IF S_UPLOADING_FILES -->
-	<h2>{L_UPLOADING_FILES}</h2>
-
-	<!-- BEGIN upload -->
-		:: {upload.FILE_INFO}<br />
-		<!-- IF upload.S_DENIED --><span class="error">{upload.DENIED}</span><!-- ELSEIF upload.ERROR_MSG --><span class="error">{upload.ERROR_MSG}</span><!-- ELSE --><span class="success">{L_SUCCESSFULLY_UPLOADED}</span><!-- ENDIF -->
-		<br /><br />
-	<!-- END upload -->
-
-<!-- ENDIF -->
-
-<!-- IF S_ATTACHMENT_SETTINGS -->
-
-	<!-- IF not S_THUMBNAIL_SUPPORT -->
-		<div class="errorbox">
-			<p>{L_NO_THUMBNAIL_SUPPORT}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="attachsettings" method="post" action="{U_ACTION}">
-	<!-- BEGIN options -->
-		<!-- IF options.S_LEGEND -->
-			<!-- IF not options.S_FIRST_ROW -->
-				</fieldset>
-			<!-- ENDIF -->
-			<fieldset>
-				<legend>{options.LEGEND}</legend>
-		<!-- ELSE -->
-
-			<dl>
-				<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-				<dd>{options.CONTENT}</dd>
-			</dl>
-
-		<!-- ENDIF -->
-	<!-- END options -->
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</fieldset>
-
-	<!-- IF not S_SECURE_DOWNLOADS -->
-		<div class="errorbox">
-			<p>{L_SECURE_DOWNLOAD_NOTICE}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<fieldset>
-		<legend>{L_SECURE_TITLE}</legend>
-		<p>{L_DOWNLOAD_ADD_IPS_EXPLAIN}</p>
-	<dl>
-		<dt><label for="ip_hostname">{L_IP_HOSTNAME}:</label></dt>
-		<dd><textarea id="ip_hostname" cols="40" rows="3" name="ips"></textarea></dd>
-	</dl>
-	<dl>
-		<dt><label for="exclude">{L_IP_EXCLUDE}:</label><br /><span>{L_EXCLUDE_ENTERED_IP}</span></dt>
-		<dd><label><input type="radio" id="exclude" name="ipexclude" value="1" class="radio" /> {L_YES}</label>
-			<label><input type="radio" name="ipexclude" value="0" checked="checked" class="radio" /> {L_NO}</label></dd>
-	</dl>
-
-	<p class="quick">
-		<input class="button1" type="submit" id="securesubmit" name="securesubmit" value="{L_SUBMIT}" />
-	</p>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_REMOVE_IPS}</legend>
-	<!-- IF S_DEFINED_IPS -->
-			<p>{L_DOWNLOAD_REMOVE_IPS_EXPLAIN}</p>
-		<dl>
-			<dt><label for="remove_ip_hostname">{L_IP_HOSTNAME}:</label></dt>
-			<dd><select name="unip[]" id="remove_ip_hostname" multiple="multiple" size="10">{DEFINED_IPS}</select></dd>
-		</dl>
-
-		<p class="quick">
-			<input class="button1" type="submit" id="unsecuresubmit" name="unsecuresubmit" value="{L_SUBMIT}" />
-		</p>
-		</fieldset>
-
-	<!-- ELSE -->
-		<p>{L_NO_IPS_DEFINED}</p>
-	<!-- ENDIF -->
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_EXTENSION_GROUPS -->
-
-	<!-- IF S_EDIT_GROUP -->
-		<script type="text/javascript" defer="defer">
-		// <![CDATA[
-			function update_image(newimage)
-			{
-				if (newimage == 'no_image')
-				{
-					document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}images/spacer.gif";
-				}
-				else
-				{
-					document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}{IMG_PATH}/" + newimage;
-				}
-			}
-
-			function show_extensions(elem)
-			{
-				var str = '';
-
-				for (i = 0; i < elem.length; i++)
-				{
-					var element = elem.options[i];
-					if (element.selected)
-					{
-						if (str)
-						{
-							str = str + ', ';
-						}
-
-						str = str + element.innerHTML;
-					}
-				}
-
-				if (document.all)
-				{
-					document.all.ext.innerText = str;
-				}
-				else if (document.getElementById('ext').textContent)
-				{
-					document.getElementById('ext').textContent = str;
-				}
-				else if (document.getElementById('ext').firstChild.nodeValue)
-				{
-					document.getElementById('ext').firstChild.nodeValue = str;
-				}
-			}
-
-		// ]]>
-		</script>
-
-		<form id="extgroups" method="post" action="{U_ACTION}">
-		<fieldset>
-			<input type="hidden" name="action" value="{ACTION}" />
-			<input type="hidden" name="g" value="{GROUP_ID}" />
-
-			<legend>{L_LEGEND}</legend>
-		<dl>
-			<dt><label for="group_name">{L_GROUP_NAME}:</label></dt>
-			<dd><input type="text" id="group_name" size="20" maxlength="100" name="group_name" value="{GROUP_NAME}" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="category">{L_SPECIAL_CATEGORY}:</label><br /><span>{L_SPECIAL_CATEGORY_EXPLAIN}</span></dt>
-			<dd>{S_CATEGORY_SELECT}</dd>
-		</dl>
-		<dl>
-			<dt><label for="allowed">{L_ALLOWED}:</label></dt>
-			<dd><input type="checkbox" class="radio" id="allowed" name="allow_group" value="1"<!-- IF ALLOW_GROUP --> checked="checked"<!-- ENDIF --> /></dd>
-		</dl>
-		<dl>
-			<dt><label for="allow_in_pm">{L_ALLOW_IN_PM}:</label></dt>
-			<dd><input type="checkbox" class="radio" id="allow_in_pm" name="allow_in_pm" value="1"<!-- IF ALLOW_IN_PM --> checked="checked"<!-- ENDIF --> /></dd>
-		</dl>
-		<dl>
-			<dt><label for="upload_icon">{L_UPLOAD_ICON}:</label></dt>
-			<dd><select name="upload_icon" id="upload_icon" onchange="update_image(this.options[selectedIndex].value);">
-					<option value="no_image"<!-- IF S_NO_IMAGE --> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>{S_FILENAME_LIST}
-			</select></dd>
-			<dd>&nbsp;<img <!-- IF S_NO_IMAGE -->src="{PHPBB_ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> id="image_upload_icon" alt="" title="" />&nbsp;</dd>
-		</dl>
-		<dl>
-			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}:</label></dt>
-			<dd><input type="text" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
-		</dl>
-		<dl>
-			<dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}:</label></dt>
-			<dd><div id="ext">{ASSIGNED_EXTENSIONS}</div> <span>[<a href="{U_EXTENSIONS}">{L_GO_TO_EXTENSIONS}</a> ]</span></dd>
-			<dd><select name="extensions[]" id="assigned_extensions" class="narrow" onchange="show_extensions(this);" multiple="multiple" size="8">{S_EXTENSION_OPTIONS}</select></dd>
-		</dl>
-		<dl>
-			<dt><label for="allowed_forums">{L_ALLOWED_FORUMS}:</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_ALL_FORUMS}</label>
-				<label><input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_SELECTED_FORUMS}</label></dd>
-			<dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd>
-		</dl>
-
-		<p class="submit-buttons">
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		</p>
-		{S_FORM_TOKEN}
-		</fieldset>
-
-		</form>
-	<!-- ELSE -->
-
-		<form id="extgroups" method="post" action="{U_ACTION}">
-		<fieldset class="tabulated">
-		<legend>{L_TITLE}</legend>
-
-		<table cellspacing="1">
-			<col class="row1" /><col class="row1" /><col class="row2" />
-		<thead>
-		<tr>
-			<th>{L_EXTENSION_GROUP}</th>
-			<th>{L_SPECIAL_CATEGORY}</th>
-			<th>{L_OPTIONS}</th>
-		</tr>
-		</thead>
-		<tbody>
-		<!-- BEGIN groups -->
-			<!-- IF groups.S_ADD_SPACER and not groups.S_FIRST_ROW -->
-			<tr>
-				<td class="spacer" colspan="3">&nbsp;</td>
-			</tr>
-			<!-- ENDIF -->
-			<tr>
-				<td><strong>{groups.GROUP_NAME}</strong>
-					<!-- IF groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>&raquo; {L_NOT_ALLOWED_IN_PM}</span>
-					<!-- ELSEIF groups.S_ALLOWED_IN_PM and not groups.S_GROUP_ALLOWED --><br /><span>&raquo; {L_ONLY_ALLOWED_IN_PM}</span>
-					<!-- ELSEIF not groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>&raquo; {L_NOT_ALLOWED_IN_PM_POST}</span>
-					<!-- ELSE --><br /><span>&raquo; {L_ALLOWED_IN_PM_POST}</span><!-- ENDIF -->
-				</td>
-				<td>{groups.CATEGORY}</td>
-				<td align="center" valign="middle" style="white-space: nowrap;">&nbsp;<a href="{groups.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{groups.U_DELETE}">{ICON_DELETE}</a>&nbsp;</td>
-			</tr>
-		<!-- END groups -->
-		</tbody>
-		</table>
-		<p class="quick">
-				{L_CREATE_GROUP}: <input type="text" name="group_name" maxlength="30" />
-				<input class="button2" name="add" type="submit" value="{L_SUBMIT}" />
-		</p>
-		{S_FORM_TOKEN}
-		</fieldset>
-		</form>
-
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_EXTENSIONS -->
-
-	<form id="add_ext" method="post" action="{U_ACTION}">
-	<fieldset>
-		<legend>{L_ADD_EXTENSION}</legend>
-	<dl>
-		<dt><label for="add_extension">{L_EXTENSION}</label></dt>
-		<dd><input type="text" id="add_extension" size="20" maxlength="100" name="add_extension" value="{ADD_EXTENSION}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="extension_group">{L_EXTENSION_GROUP}</label></dt>
-		<dd>{GROUP_SELECT_OPTIONS}</dd>
-	</dl>
-
-	<p class="quick">
-		<input type="submit" id="add_extension_check" name="add_extension_check" class="button2" value="{L_SUBMIT}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-	<br />
-
-	<form id="change_ext" method="post" action="{U_ACTION}">
-
-	<fieldset class="tabulated">
-	<legend>{L_TITLE}</legend>
-
-	<table cellspacing="1">
-		<col class="row1" /><col class="row1" /><col class="row2" />
-	<thead>
-	<tr>
-		<th>{L_EXTENSION}</th>
-		<th>{L_EXTENSION_GROUP}</th>
-		<th>{L_DELETE}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN extensions -->
-		<!-- IF extensions.S_SPACER -->
-		<tr>
-			<td class="spacer" colspan="3">&nbsp;</td>
-		</tr>
-		<!-- ENDIF -->
-		<tr>
-			<td><strong>{extensions.EXTENSION}</strong></td>
-			<td>{extensions.GROUP_OPTIONS}</td>
-			<td><input type="checkbox" class="radio" name="extension_id_list[]" value="{extensions.EXTENSION_ID}" /><input type="hidden" name="extension_change_list[]" value="{extensions.EXTENSION_ID}" /></td>
-		</tr>
-	<!-- END extensions -->
-	</tbody>
-	</table>
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_ORPHAN -->
-
-	<form id="orphan" method="post" action="{U_ACTION}">
-
-	<fieldset class="tabulated">
-	<legend>{L_TITLE}</legend>
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_FILENAME}</th>
-		<th>{L_FILEDATE}</th>
-		<th>{L_FILESIZE}</th>
-		<th>{L_ATTACH_POST_ID}</th>
-		<th>{L_ATTACH_TO_POST}</th>
-		<th>{L_DELETE}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN orphan -->
-		<!-- IF orphan.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>
-			<td>{orphan.FILETIME}</td>
-			<td>{orphan.FILESIZE}</td>
-			<td><strong>{L_ATTACH_ID}: </strong><input type="text" name="post_id[{orphan.ATTACH_ID}]" size="7" maxlength="10" value="{orphan.POST_ID}" /></td>
-			<td><input type="checkbox" class="radio" name="add[{orphan.ATTACH_ID}]" /></td>
-			<td><input type="checkbox" class="radio" name="delete[{orphan.ATTACH_ID}]" /></td>
-		</tr>
-	<!-- END orphan -->
-	<tr class="row4">
-		<td colspan="4">&nbsp;</td>
-		<td class="small"><a href="#" onclick="marklist('orphan', 'add', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('orphan', 'add', false); return false;">{L_UNMARK_ALL}</a></td>
-		<td class="small"><a href="#" onclick="marklist('orphan', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('orphan', 'delete', false); return false;">{L_UNMARK_ALL}</a></td>
-	</tr>
-	</tbody>
-	</table>
-
-	<br />
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html
deleted file mode 100644
index bc326345b0..0000000000
--- a/phpBB/adm/style/acp_ban.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<p>{L_ACP_BAN_EXPLAIN}</p>
-
-<h1>{L_TITLE}</h1>
-
-<p>{L_EXPLAIN}</p>
-
-<script type="text/javascript">
-// <![CDATA[
-
-	var ban_length = new Array();
-		ban_length[-1] = '';
-	<!-- BEGIN ban_length -->
-		ban_length['{ban_length.BAN_ID}'] = '{ban_length.A_LENGTH}';
-	<!-- END ban_length -->
-
-	var ban_reason = new Array();
-		ban_reason[-1] = '';
-	<!-- BEGIN ban_reason -->
-		ban_reason['{ban_reason.BAN_ID}'] = '{ban_reason.A_REASON}';
-	<!-- END ban_reason -->
-
-	var ban_give_reason = new Array();
-		ban_give_reason[-1] = '';
-	<!-- BEGIN ban_give_reason -->
-		ban_give_reason['{ban_give_reason.BAN_ID}'] = '{ban_give_reason.A_REASON}';
-	<!-- END ban_give_reason -->
-
-	function display_details(option)
-	{
-		document.getElementById('acp_unban').unbangivereason.value = ban_give_reason[option];
-		document.getElementById('acp_unban').unbanreason.value = ban_reason[option];
-		document.getElementById('acp_unban').unbanlength.value = ban_length[option];
-	}
-
-// ]]>
-</script>
-
-<form id="acp_ban" method="post" action="{U_ACTION}">
-
-<fieldset>
-	<legend>{L_TITLE}</legend>
-<dl>
-	<dt><label for="ban">{L_BAN_CELL}:</label></dt>
-	<dd><textarea name="ban" cols="40" rows="3" id="ban"></textarea></dd>
-	<!-- IF S_USERNAME_BAN --><dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF -->
-</dl>
-<dl>
-	<dt><label for="banlength">{L_BAN_LENGTH}:</label></dt>
-	<dd><label for="banlength"><select name="banlength" id="banlength" onchange="if(this.value==-1){document.getElementById('banlengthother').style.display = 'block';}else{document.getElementById('banlengthother').style.display='none';}">{S_BAN_END_OPTIONS}</select></label></dd>
-	<dd id="banlengthother" style="display: none;"><label><input type="text" name="banlengthother" class="inputbox" /><br /><span>{L_YEAR_MONTH_DAY}</span></label></dd>
-</dl>
-<dl>
-	<dt><label for="banexclude">{L_BAN_EXCLUDE}:</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" name="banexclude" value="1" class="radio" /> {L_YES}</label>
-		<label><input type="radio" name="banexclude" id="banexclude" value="0" checked="checked" class="radio" /> {L_NO}</label></dd>
-</dl>
-<dl>
-	<dt><label for="banreason">{L_BAN_REASON}:</label></dt>
-	<dd><input name="banreason" type="text" class="text medium" maxlength="255" id="banreason" /></dd>
-</dl>
-<dl>
-	<dt><label for="bangivereason">{L_BAN_GIVE_REASON}:</label></dt>
-	<dd><input name="bangivereason" type="text" class="text medium" maxlength="255" id="bangivereason" /></dd>
-</dl>
-
-<p class="submit-buttons">
-	<input class="button1" type="submit" id="bansubmit" name="bansubmit" value="{L_SUBMIT}" />&nbsp;
-	<input class="button2" type="reset" id="banreset" name="banreset" value="{L_RESET}" />
-</p>
-{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<br /><br />
-
-<h1>{L_UNBAN_TITLE}</h1>
-
-<p>{L_UNBAN_EXPLAIN}</p>
-
-<form id="acp_unban" method="post" action="{U_ACTION}">
-
-<fieldset>
-	<legend>{L_UNBAN_TITLE}</legend>
-
-<!-- IF S_BANNED_OPTIONS -->
-	<dl>
-		<dt><label for="unban">{L_BAN_CELL}:</label></dt>
-		<dd><select id="unban" name="unban[]" multiple="multiple" size="10" style="width: 50%" onchange="if (this.selectedIndex > -1) display_details(this.options[this.selectedIndex].value); else display_details(-1);">{BANNED_OPTIONS}</select></dd>
-	</dl>
-	<dl>
-		<dt><label for="unbanlength">{L_BAN_LENGTH}:</label></dt>
-		<dd><input style="border: 0;" type="text" class="text full" disabled="disabled" name="unbanlength" id="unbanlength" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="unbanreason">{L_BAN_REASON}:</label></dt>
-		<dd><textarea style="border: 0;" class="text full" disabled="disabled" name="unbanreason" id="unbanreason" rows="5" cols="80">&nbsp;</textarea></dd>
-	</dl>
-	<dl>
-		<dt><label for="unbangivereason">{L_BAN_GIVE_REASON}:</label></dt>
-		<dd><textarea style="border: 0;" class="text full" disabled="disabled" name="unbangivereason" id="unbangivereason" rows="5" cols="80">&nbsp;</textarea></dd>
-	</dl>
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="unbansubmit" name="unbansubmit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="unbanreset" name="unbanreset" value="{L_RESET}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-
-<!-- ELSE -->
-
-	<p>{L_NO_BAN_CELL}</p>
-	{S_FORM_TOKEN}
-</fieldset>
-
-<!-- ENDIF -->
-
-</form>
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html
deleted file mode 100644
index c81c198fd5..0000000000
--- a/phpBB/adm/style/acp_bbcodes.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_EDIT_BBCODE -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_ACP_BBCODES}</h1>
-
-	<p>{L_ACP_BBCODES_EXPLAIN}</p>
-
-	<form id="acp_bbcodes" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_BBCODE_USAGE}</legend>
-		<p>{L_BBCODE_USAGE_EXPLAIN}</p>
-	<dl>
-		<dt><label for="bbcode_match">{L_EXAMPLES}</label><br /><br /><span>{L_BBCODE_USAGE_EXAMPLE}</span></dt>
-		<dd><textarea id="bbcode_match" name="bbcode_match" cols="60" rows="5">{BBCODE_MATCH}</textarea></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_HTML_REPLACEMENT}</legend>
-		<p>{L_HTML_REPLACEMENT_EXPLAIN}</p>
-	<dl>
-		<dt><label for="bbcode_tpl">{L_EXAMPLES}</label><br /><br /><span>{L_HTML_REPLACEMENT_EXAMPLE}</span></dt>
-		<dd><textarea id="bbcode_tpl" name="bbcode_tpl" cols="60" rows="8">{BBCODE_TPL}</textarea></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_BBCODE_HELPLINE}</legend>
-		<p>{L_BBCODE_HELPLINE_EXPLAIN}</p>
-	<dl>
-		<dt><label for="bbcode_helpline">{L_BBCODE_HELPLINE_TEXT}</label></dt>
-		<dd><input type="text" id="bbcode_helpline" name="bbcode_helpline" size="60" maxlength="255" value="{BBCODE_HELPLINE}" /></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_SETTINGS}</legend>
-	<dl>
-		<dt><label for="display_on_posting">{L_DISPLAY_ON_POSTING}</label></dt>
-		<dd><input type="checkbox" class="radio" name="display_on_posting" id="display_on_posting" value="1"<!-- IF DISPLAY_ON_POSTING --> checked="checked"<!-- ENDIF --> /></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	
-	<br />
-
-	<table cellspacing="1" id="down">
-	<thead>
-	<tr>
-		<th colspan="2">{L_TOKENS}</th>
-	</tr>
-	<tr>
-		<td class="row3" colspan="2">{L_TOKENS_EXPLAIN}</td>
-	</tr>
-	<tr>
-		<th>{L_TOKEN}</th>
-		<th>{L_TOKEN_DEFINITION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN token -->
-		<tr valign="top">
-			<td class="row1">{token.TOKEN}</td>
-			<td class="row2">{token.EXPLAIN}</td>
-		</tr>
-	<!-- END token -->
-	</tbody>
-	</table>
-	</form>
-
-<!-- ELSE -->
-
-	<h1>{L_ACP_BBCODES}</h1>
-
-	<p>{L_ACP_BBCODES_EXPLAIN}</p>
-	
-	<form id="acp_bbcodes" method="post" action="{U_ACTION}">
-	<fieldset class="tabulated">
-	<legend>{L_ACP_BBCODES}</legend>
-
-	<table cellspacing="1" id="down">
-	<thead>
-	<tr>
-		<th>{L_BBCODE_TAG}</th>
-		<th>{L_ACTION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN bbcodes -->
-		<!-- IF bbcodes.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td style="text-align: center;">{bbcodes.BBCODE_TAG}</td>
-			<td style="text-align: right; width: 40px;"><a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}">{ICON_DELETE}</a></td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr class="row3">
-			<td colspan="2">{L_ACP_NO_ITEMS}</td>
-		</tr>
-	<!-- END bbcodes -->
-	</tbody>
-	</table>
-
-	<p class="quick">
-		<input class="button2" name="submit" type="submit" value="{L_ADD_BBCODE}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html
deleted file mode 100644
index bb16204801..0000000000
--- a/phpBB/adm/style/acp_board.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h1>{L_TITLE}</h1>
-
-<p>{L_TITLE_EXPLAIN}</p>
-
-<!-- IF S_ERROR -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
-<!-- ENDIF -->
-
-<form id="acp_board" method="post" action="{U_ACTION}">
-
-<!-- BEGIN options -->
-	<!-- IF options.S_LEGEND -->
-		<!-- IF not options.S_FIRST_ROW -->
-			</fieldset>
-		<!-- ENDIF -->
-		<fieldset>
-			<legend>{options.LEGEND}</legend>
-	<!-- ELSE -->
-
-		<dl>
-			<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-			<dd>{options.CONTENT}</dd>
-		</dl>
-
-	<!-- ENDIF -->
-<!-- END options -->
-
-<!-- IF S_AUTH -->
-	<!-- BEGIN auth_tpl -->
-		{auth_tpl.TPL}
-	<!-- END auth_tpl -->
-<!-- ENDIF -->
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</p>
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html
deleted file mode 100644
index 7783356574..0000000000
--- a/phpBB/adm/style/acp_bots.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_EDIT_BOT -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_BOT_EDIT_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="acp_bots" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_TITLE}</legend>
-	<dl>
-		<dt><label for="bot_name">{L_BOT_NAME}:</label><br /><span>{L_BOT_NAME_EXPLAIN}</span></dt>
-		<dd><input name="bot_name" type="text" id="bot_name" value="{BOT_NAME}" maxlength="255" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="bot_style">{L_BOT_STYLE}:</label><br /><span>{L_BOT_STYLE_EXPLAIN}</span></dt>
-		<dd><select id="bot_style" name="bot_style">{S_STYLE_OPTIONS}</select></dd>
-	</dl>
-	<dl>
-		<dt><label for="bot_lang">{L_BOT_LANG}:</label><br /><span>{L_BOT_LANG_EXPLAIN}</span></dt>
-		<dd><select id="bot_lang" name="bot_lang">{S_LANG_OPTIONS}</select></dd>
-	</dl>
-	<dl>
-		<dt><label for="bot_active">{L_BOT_ACTIVE}:</label></dt>
-		<dd><select id="bot_active" name="bot_active">{S_ACTIVE_OPTIONS}</select></dd>
-	</dl>
-	<dl>
-		<dt><label for="bot_agent">{L_BOT_AGENT}:</label><br /><span>{L_BOT_AGENT_EXPLAIN}</span></dt>
-		<dd><input name="bot_agent" type="text" id="bot_agent" value="{BOT_AGENT}" maxlength="255" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="bot_ip">{L_BOT_IP}:</label><br /><span>{L_BOT_IP_EXPLAIN}</span></dt>
-		<dd><input name="bot_ip" type="text" id="bot_ip" value="{BOT_IP}" maxlength="255" /></dd>
-	</dl>
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</p>
-	</fieldset>
-	</form>
-
-<!-- ELSE -->
-
-	<h1>{L_BOTS}</h1>
-
-	<p>{L_BOTS_EXPLAIN}</p>
-
-	<form id="acp_bots" method="post" action="{U_ACTION}">
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_BOT_NAME}</th>
-		<th>{L_BOT_LAST_VISIT}</th>
-		<th colspan="3">{L_OPTIONS}</th>
-		<th>{L_MARK}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN bots -->
-		<!-- IF bots.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td style="width: 50%;">{bots.BOT_NAME}</td>
-			<td style="width: 15%; white-space: nowrap;" align="center">&nbsp;{bots.LAST_VISIT}&nbsp;</td>
-			<td style="text-align: center;">&nbsp;<a href="{bots.U_ACTIVATE_DEACTIVATE}">{bots.L_ACTIVATE_DEACTIVATE}</a>&nbsp;</td>
-			<td style="text-align: center;">&nbsp;<a href="{bots.U_EDIT}">{L_EDIT}</a>&nbsp;</td>
-			<td style="text-align: center;">&nbsp;<a href="{bots.U_DELETE}">{L_DELETE}</a>&nbsp;</td>
-			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{bots.BOT_ID}" /></td>
-		</tr>
-	<!-- END bots -->
-	</tbody>
-	</table>
-
-	<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
-		<input class="button2" name="add" type="submit" value="{L_BOT_ADD}" />
-	</fieldset>
-
-	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
-		<select name="action">{S_BOT_OPTIONS}</select>
-		<input class="button2" name="submit" type="submit" value="{L_SUBMIT}" />
-		<p class="small"><a href="#" onclick="marklist('acp_bots', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('acp_bots', 'mark', false);">{L_UNMARK_ALL}</a></p>
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html
deleted file mode 100644
index af67de16ea..0000000000
--- a/phpBB/adm/style/acp_captcha.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h1>{L_ACP_VC_SETTINGS}</h1>
-
-<p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
-
-
-<form id="acp_captcha" method="post" action="{U_ACTION}">
-
-<fieldset>
-<legend>{L_GENERAL_OPTIONS}</legend>
-
-<dl>
-	<dt><label for="enable_confirm">{L_VISUAL_CONFIRM_REG}:</label><br /><span>{L_VISUAL_CONFIRM_REG_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="enable_confirm" name="enable_confirm" value="1"<!-- IF REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
-		<label><input type="radio" class="radio" name="enable_confirm" value="0"<!-- IF not REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
-</dl>
-<dl>
-	<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}:</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="enable_post_confirm" name="enable_post_confirm" value="1"<!-- IF POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
-		<label><input type="radio" class="radio" name="enable_post_confirm" value="0"<!-- IF not POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
-</dl>
-<dl>
-	<dt><label for="confirm_refresh">{L_VISUAL_CONFIRM_REFRESH}:</label><br /><span>{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="confirm_refresh" name="confirm_refresh" value="1"<!-- IF CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
-	<label><input type="radio" class="radio" name="confirm_refresh" value="0"<!-- IF not CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
-</dl>
-<!-- IF GD -->
-<dl>
-	<dt><label for="captcha_select">{L_CAPTCHA_SELECT}:</label><br /><span>{L_CAPTCHA_SELECT_EXPLAIN}</span></dt>
-	<dd><select id="captcha_select" name="select_captcha" onchange="(document.getElementById('acp_captcha')).submit()" >{CAPTCHA_SELECT}</select></dd>
-</dl>
-<dl>
-	<dt><label for="configure">{L_CAPTCHA_CONFIGURE}:</label><br /><span>{L_CAPTCHA_CONFIGURE_EXPLAIN}</span></dt>
-	<dd><input class="button2" type="submit" id="configure" name="configure" value="{L_CONFIGURE}" /></dd>
-</dl>
-<dl>
-	<dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}:</label><br /><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt>
-	<dd><input id="captcha_gd_x_grid" name="captcha_gd_x_grid" value="{CAPTCHA_GD_X_GRID}" type="text" /></dd>
-</dl>
-<dl>
-	<dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}:</label><br /><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt>
-	<dd><input id="captcha_gd_y_grid" name="captcha_gd_y_grid" value="{CAPTCHA_GD_Y_GRID}" type="text" /></dd>
-</dl>
-<dl>
-	<dt><label for="captcha_gd_wave">{L_CAPTCHA_GD_WAVE}:</label><br /><span>{L_CAPTCHA_GD_WAVE_EXPLAIN}</span></dt>
-	<dd><label><input id="captcha_gd_wave" name="captcha_gd_wave" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input name="captcha_gd_wave" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-</dd>
-</dl>
-<dl>
-	<dt><label for="captcha_gd_3d_noise">{L_CAPTCHA_GD_3D_NOISE}:</label><br /><span>{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}</span></dt>
-	<dd><label><input id="captcha_gd_3d_noise" name="captcha_gd_3d_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input name="captcha_gd_3d_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-</dd>
-</dl>
-<dl>
-	<dt><label for="captcha_gd_fonts">{L_CAPTCHA_GD_FONTS}:</label><br /><span>{L_CAPTCHA_GD_FONTS_EXPLAIN}</span></dt>
-	<dd><label><input id="captcha_gd_fonts" name="captcha_gd_fonts" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 1 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_DEFAULT}</label>
-		<label><input name="captcha_gd_fonts" value="2" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 2 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_NEW}</label>
-		<label><input name="captcha_gd_fonts" value="3" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 3 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_LOWER}</label>
-
-</dd>
-</dl>
-<!-- ENDIF -->
-
-</fieldset>
-
-<!-- IF CAPTCHA_PREVIEW -->
-<fieldset>
-	<legend>{L_PREVIEW}</legend>
-{CAPTCHA_PREVIEW}
-</fieldset>
-<!-- ENDIF -->
-
-<fieldset class="submit-buttons">
-	<legend>{L_SUBMIT}</legend>
-	<input class="button1" type="submit" id="main_submit" name="main_submit" value="{L_SUBMIT}" />&nbsp;
-	<input class="button2" type="reset" id="form_reset" name="reset" value="{L_RESET}" />&nbsp;
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html
deleted file mode 100644
index e839fb1bda..0000000000
--- a/phpBB/adm/style/acp_database.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF MODE eq 'restore' -->
-	<h1>{L_ACP_RESTORE}</h1>
-
-	<p>{L_ACP_RESTORE_EXPLAIN}</p>
-
-	<!-- IF .files -->
-	<form id="acp_backup" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_RESTORE_OPTIONS}</legend>
-	<dl>
-		<dt><label for="file">{L_SELECT_FILE}:</label></dt>
-		<dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_LAST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd>
-	</dl>
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_START_RESTORE}" />&nbsp;
-		<input class="button2" type="submit" id="delete" name="delete" value="{L_DELETE_BACKUP}" />&nbsp;
-		<input class="button2" type="submit" id="download" name="download" value="{L_DOWNLOAD_BACKUP}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-	<!-- ELSE -->
-		<div class="errorbox">
-			<p>{L_ACP_NO_ITEMS}</p>
-		</div>
-	<!-- ENDIF -->
-
-<!-- ELSE -->
-	<h1>{L_ACP_BACKUP}</h1>
-
-	<p>{L_ACP_BACKUP_EXPLAIN}</p>
-
-	<script type="text/javascript">
-	// <![CDATA[
-
-		function selector(bool)
-		{
-			var table = document.getElementById('table');
-
-			for (var i = 0; i < table.options.length; i++)
-			{
-				table.options[i].selected = bool;
-			}
-		}
-
-	// ]]>
-	</script>
-
-	<form id="acp_backup" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_BACKUP_OPTIONS}</legend>
-	<dl>
-		<dt><label for="type">{L_BACKUP_TYPE}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="type" value="full" id="type" checked="checked" /> {L_FULL_BACKUP}</label>
-			<label><input type="radio" name="type" class="radio" value="structure" /> {L_STRUCTURE_ONLY}</label>
-			<label><input type="radio" class="radio" name="type" value="data" /> {L_DATA_ONLY}</label></dd>
-	</dl>
-	<dl>
-		<dt><label for="method">{L_FILE_TYPE}:</label></dt>
-		<dd><!-- BEGIN methods -->
-		<label><input name="method"<!-- IF methods.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> type="radio" class="radio" value="{methods.TYPE}" /> {methods.TYPE}</label>
-		<!-- END methods --></dd>
-	</dl>
-	<dl>
-		<dt><label for="where">{L_ACTION}:</label></dt>
-		<dd>
-			<label><input type="radio" class="radio" name="where" value="store" checked="checked" /> {L_STORE_LOCAL}</label>
-			<label><input type="radio" class="radio" name="where" value="download" /> {L_DOWNLOAD}</label></dd>
-	</dl>
-	<dl>
-		<dt><label for="table">{L_TABLE_SELECT}:</label></dt>
-		<dd><select id="table" name="table[]" size="10" multiple="multiple">
-		<!-- BEGIN tables -->
-			<option value="{tables.TABLE}">{tables.TABLE}</option>
-		<!-- END tables -->
-		</select></dd>
-		<dd><a href="#" onclick="selector(true); return false;">{L_SELECT_ALL}</a> :: <a href="#" onclick="selector(false); return false;">{L_DESELECT_ALL}</a></dd>
-	</dl>
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_disallow.html b/phpBB/adm/style/acp_disallow.html
deleted file mode 100644
index b68d3ab3c0..0000000000
--- a/phpBB/adm/style/acp_disallow.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h1>{L_ACP_DISALLOW_USERNAMES}</h1>
-
-<p>{L_ACP_DISALLOW_EXPLAIN}</p>
-
-<form id="acp_disallow" method="post" action="{U_ACTION}">
-
-<fieldset>
-	<legend>{L_ADD_DISALLOW_TITLE}</legend>
-<dl>
-	<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_ADD_DISALLOW_EXPLAIN}</span></dt>
-	<dd><input id="user" type="text" class="text medium" maxlength="255" name="disallowed_user" /></dd>
-</dl>
-
-<p class="quick">
-	<input class="button1" type="submit" name="disallow" value="{L_SUBMIT}" />
-</p>
-</fieldset>
-
-<h1>{L_DELETE_DISALLOW_TITLE}</h1>
-
-<p>{L_DELETE_DISALLOW_EXPLAIN}</p>
-
-<fieldset>
-	<legend>{L_DELETE_DISALLOW_TITLE}</legend>
-<!-- IF S_DISALLOWED_NAMES -->
-	<dl>
-		<dt><label for="disallowed">{L_USERNAME}:</label></dt>
-		<dd><select name="disallowed_id" id="disallowed">{S_DISALLOWED_NAMES}</select></dd>
-	</dl>
-
-	<p class="quick">
-		<input class="button1" type="submit" name="allow" value="{L_SUBMIT}" />
-	</p>
-<!-- ELSE -->
-	<p>{L_NO_DISALLOWED}</p>
-<!-- ENDIF -->
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html
deleted file mode 100644
index 885809ffe2..0000000000
--- a/phpBB/adm/style/acp_email.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h1>{L_ACP_MASS_EMAIL}</h1>
-
-<p>{L_ACP_MASS_EMAIL_EXPLAIN}</p>
-
-<!-- IF S_WARNING -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{WARNING_MSG}</p>
-	</div>
-<!-- ENDIF -->
-
-<form id="acp_email" method="post" action="{U_ACTION}">
-
-<fieldset>
-	<legend>{L_COMPOSE}</legend>
-<dl>
-	<dt><label for="group">{L_SEND_TO_GROUP}:</label></dt>
-	<dd><select id="group" name="g">{S_GROUP_OPTIONS}</select></dd>
-</dl>
-<dl>
-	<dt><label for="usernames">{L_SEND_TO_USERS}:</label><br /><span>{L_SEND_TO_USERS_EXPLAIN}</span></dt>
-	<dd><textarea name="usernames" id="usernames" rows="5" cols="40">{USERNAMES}</textarea></dd>
-	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
-</dl>
-<dl>
-	<dt><label for="subject">{L_SUBJECT}:</label></dt>
-	<dd><input name="subject" type="text" id="subject" value="{SUBJECT}" /></dd>
-</dl>
-<dl>
-	<dt><label for="message">{L_MASS_MESSAGE}:</label><br /><span>{L_MASS_MESSAGE_EXPLAIN}</span></dt>
-	<dd><textarea id="message" name="message" rows="10" cols="60">{MESSAGE}</textarea></dd>
-</dl>
-<dl>
-	<dt><label for="priority">{L_MAIL_PRIORITY}:</label></dt>
-	<dd><select id="priority" name="mail_priority_flag">{S_PRIORITY_OPTIONS}</select></dd>
-</dl>
-<dl>
-	<dt><label for="send">{L_SEND_IMMEDIATELY}:</label></dt>
-	<dd><input id="send" type="checkbox" class="radio" name="send_immediately" checked="checked" /></dd>
-</dl>
-
-<p class="submit-buttons">
-	<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_EMAIL}" />&nbsp;
-	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-</p>
-{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
deleted file mode 100644
index 547ac66e3c..0000000000
--- a/phpBB/adm/style/acp_forums.html
+++ /dev/null
@@ -1,500 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_EDIT_FORUM -->
-
-	<script type="text/javascript">
-	// <![CDATA[
-		/**
-		* Handle displaying/hiding several options based on the forum type
-		*/
-		function display_options(value)
-		{
-			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
-				if (value == {FORUM_POST})
-				{
-					dE('type_actions', -1);
-				}
-				else
-				{
-					dE('type_actions', 1);
-				}
-			<!-- ENDIF -->
-
-			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
-				if (value == {FORUM_LINK})
-				{
-					dE('cat_to_link_actions', 1);
-				}
-				else
-				{
-					dE('cat_to_link_actions', -1);
-				}
-			<!-- ENDIF -->
-
-			if (value == {FORUM_POST})
-			{
-				dE('forum_post_options', 1);
-				dE('forum_link_options', -1);
-				dE('forum_rules_options', 1);
-				dE('forum_cat_options', -1);
-			}
-			else if (value == {FORUM_LINK})
-			{
-				dE('forum_post_options', -1);
-				dE('forum_link_options', 1);
-				dE('forum_rules_options', -1);
-				dE('forum_cat_options', -1);
-			}
-			else if (value == {FORUM_CAT})
-			{
-				dE('forum_post_options', -1);
-				dE('forum_link_options', -1);
-				dE('forum_rules_options', 1);
-				dE('forum_cat_options', 1);
-			}
-		}
-
-		/**
-		* Init the wanted display functionality if javascript is enabled.
-		* If javascript is not available, the user is still able to properly administrate.
-		*/
-		onload = function()
-		{
-			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
-				<!-- IF S_FORUM_POST -->
-					dE('type_actions', -1);
-				<!-- ENDIF -->
-			<!-- ENDIF -->
-
-			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
-				<!-- IF S_FORUM_CAT -->
-					dE('cat_to_link_actions', -1);
-				<!-- ENDIF -->
-			<!-- ENDIF -->
-
-			<!-- IF not S_FORUM_POST -->
-				dE('forum_post_options', -1);
-			<!-- ENDIF -->
-
-			<!-- IF not S_FORUM_CAT -->
-				dE('forum_cat_options', -1);
-			<!-- ENDIF -->
-
-			<!-- IF not S_FORUM_LINK -->
-				dE('forum_link_options', -1);
-			<!-- ENDIF -->
-
-			<!-- IF S_FORUM_LINK -->
-			dE('forum_rules_options', -1);
-			<!-- ENDIF -->
-		}
-
-	// ]]>
-	</script>
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE} <!-- IF FORUM_NAME -->:: {FORUM_NAME}<!-- ENDIF --></h1>
-
-	<p>{L_FORUM_EDIT_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="forumedit" method="post" action="{U_EDIT_ACTION}">
-
-	<fieldset>
-		<legend>{L_FORUM_SETTINGS}</legend>
-	<dl>
-		<dt><label for="forum_type">{L_FORUM_TYPE}:</label></dt>
-		<dd><select id="forum_type" name="forum_type" onchange="display_options(this.options[this.selectedIndex].value);">{S_FORUM_TYPE_OPTIONS}</select></dd>
-	</dl>
-	<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
-	<div id="type_actions">
-		<dl>
-			<dt><label for="type_action">{L_DECIDE_MOVE_DELETE_CONTENT}:</label></dt>
-			<dd><label><input type="radio" class="radio" name="type_action" value="delete"<!-- IF not S_MOVE_FORUM_OPTIONS --> checked="checked" id="type_action"<!-- ENDIF --> /> {L_DELETE_ALL_POSTS}</label></dd>
-			<!-- IF S_MOVE_FORUM_OPTIONS --><dd><label><input type="radio" class="radio" name="type_action" id="type_action" value="move" checked="checked" /> {L_MOVE_POSTS_TO}</label> <select name="to_forum_id">{S_MOVE_FORUM_OPTIONS}</select></dd><!-- ENDIF -->
-		</dl>
-	</div>
-	<!-- ENDIF -->
-	<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
-	<div id="cat_to_link_actions">
-		<dl>
-			<dt><label for="action_subforums">{L_DECIDE_MOVE_DELETE_SUBFORUMS}:</label></dt>
-			<!-- IF S_FORUMS_LIST -->
-				<dd><label><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="move" checked="checked" /> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
-			<!-- ELSE -->
-				<dd><label><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</label></dd>
-			<!-- ENDIF -->
-		</dl>
-	</div>
-	<!-- ENDIF -->
-	<dl>
-		<dt><label for="parent">{L_FORUM_PARENT}:</label></dt>
-		<dd><select id="parent" name="forum_parent_id"><option value="0"<!-- IF not S_FORUM_PARENT_ID --> selected="selected"<!-- ENDIF -->>{L_NO_PARENT}</option>{S_PARENT_OPTIONS}</select></dd>
-	</dl>
-	<dl>
-		<dt><label for="forum_name">{L_FORUM_NAME}:</label></dt>
-		<dd><input class="text medium" type="text" id="forum_name" name="forum_name" value="{FORUM_NAME}" maxlength="255" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="forum_desc">{L_FORUM_DESC}:</label><br /><span>{L_FORUM_DESC_EXPLAIN}</span></dt>
-		<dd><textarea id="forum_desc" name="forum_desc" rows="5" cols="45">{FORUM_DESC}</textarea></dd>
-		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
-			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
-			<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
-	</dl>
-	<dl>
-		<dt><label for="forum_image">{L_FORUM_IMAGE}:</label><br /><span>{L_FORUM_IMAGE_EXPLAIN}</span></dt>
-		<dd><input class="text medium" type="text" id="forum_image" name="forum_image" value="{FORUM_IMAGE}" maxlength="255" /></dd>
-		<!-- IF FORUM_IMAGE_SRC -->
-			<dd><img src="{FORUM_IMAGE_SRC}" alt="{L_FORUM_IMAGE}" /></dd>
-		<!-- ENDIF -->
-	</dl>
-	<dl>
-		<dt><label for="forum_password">{L_FORUM_PASSWORD}:</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt>
-		<dd><input type="password" id="forum_password" name="forum_password" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}:</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt>
-		<dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" /></dd>
-	</dl>
-	<!-- IF S_FORUM_PASSWORD_SET -->
-	<dl>
-		<dt><label for="forum_password_unset">{L_FORUM_PASSWORD_UNSET}:</label><br /><span>{L_FORUM_PASSWORD_UNSET_EXPLAIN}</span></dt>
-		<dd><input id="forum_password_unset" name="forum_password_unset" type="checkbox" /></dd>
-	</dl>
-	<!-- ENDIF -->
-	<dl>
-		<dt><label for="forum_style">{L_FORUM_STYLE}:</label></dt>
-		<dd><select id="forum_style" name="forum_style"><option value="0">{L_DEFAULT_STYLE}</option>{S_STYLES_OPTIONS}</select></dd>
-	</dl>
-	<!-- IF S_CAN_COPY_PERMISSIONS -->
-		<dl>
-			<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
-			<dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>
-		</dl>
-	<!-- ENDIF -->
-	</fieldset>
-
-	<div id="forum_cat_options">
-		<fieldset>
-			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
-		<dl>
-			<dt><label for="display_active">{L_DISPLAY_ACTIVE_TOPICS}:</label><br /><span>{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="display_active" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="display_active" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		</fieldset>
-	</div>
-
-	<div id="forum_post_options">
-		<fieldset>
-			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
-		<dl>
-			<dt><label for="forum_status">{L_FORUM_STATUS}:</label></dt>
-			<dd><select id="forum_status" name="forum_status">{S_STATUS_OPTIONS}</select></dd>
-		</dl>
-		<dl>
-			<dt><label for="display_subforum_list">{L_LIST_SUBFORUMS}:</label><br /><span>{L_LIST_SUBFORUMS_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="display_subforum_list" value="1"<!-- IF S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="display_subforum_list" value="0"<!-- IF not S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="enable_post_review">{L_ENABLE_POST_REVIEW}:</label><br /><span>{L_ENABLE_POST_REVIEW_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="enable_post_review" value="1"<!-- IF S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_post_review" value="0"<!-- IF not S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="enable_indexing">{L_ENABLE_INDEXING}:</label><br /><span>{L_ENABLE_INDEXING_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="enable_indexing" value="1"<!-- IF S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_indexing" value="0"<!-- IF not S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="enable_icons">{L_ENABLE_TOPIC_ICONS}:</label></dt>
-			<dd><label><input type="radio" class="radio" name="enable_icons" value="1"<!-- IF S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_icons" value="0"<!-- IF not S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="display_recent">{L_ENABLE_RECENT}:</label><br /><span>{L_ENABLE_RECENT_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="display_recent" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="display_recent" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}:</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
-			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>
-		</dl>
-		</fieldset>
-
-		<fieldset>
-			<legend>{L_FORUM_PRUNE_SETTINGS}</legend>
-		<dl>
-			<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}:</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="enable_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_prune" value="0"<!-- IF not S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}:</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
-			<dd><input type="text" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" /> {L_DAYS}</dd>
-		</dl>
-		<dl>
-			<dt><label for="prune_days">{L_AUTO_PRUNE_DAYS}:</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
-			<dd><input type="text" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" maxlength="4" size="4" /> {L_DAYS}</dd>
-		</dl>
-		<dl>
-			<dt><label for="prune_viewed">{L_AUTO_PRUNE_VIEWED}:</label><br /><span>{L_AUTO_PRUNE_VIEWED_EXPLAIN}</span></dt>
-			<dd><input type="text" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" maxlength="4" size="4" /> {L_DAYS}</dd>
-		</dl>
-		<dl>
-			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="prune_old_polls" value="1"<!-- IF S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="prune_old_polls" value="0"<!-- IF not S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="prune_announce">{L_PRUNE_ANNOUNCEMENTS}:</label></dt>
-			<dd><label><input type="radio" class="radio" name="prune_announce" value="1"<!-- IF S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="prune_announce" value="0"<!-- IF not S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="prune_sticky">{L_PRUNE_STICKY}:</label></dt>
-			<dd><label><input type="radio" class="radio" name="prune_sticky" value="1"<!-- IF S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="prune_sticky" value="0"<!-- IF not S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		</fieldset>
-	</div>
-
-	<div id="forum_link_options">
-		<fieldset>
-			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
-		<dl>
-			<dt><label for="link_display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="link_display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="link_display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="forum_link">{L_FORUM_LINK}:</label><br /><span>{L_FORUM_LINK_EXPLAIN}</span></dt>
-			<dd><input class="text medium" type="text" id="forum_link" name="forum_link" value="{FORUM_DATA_LINK}" maxlength="255" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="forum_link_track">{L_FORUM_LINK_TRACK}:</label><br /><span>{L_FORUM_LINK_TRACK_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="forum_link_track" value="1"<!-- IF S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="forum_link_track" value="0"<!-- IF not S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		</fieldset>
-	</div>
-
-	<div id="forum_rules_options">
-		<fieldset>
-			<legend>{L_FORUM_RULES}</legend>
-		<dl>
-			<dt><label for="forum_rules_link">{L_FORUM_RULES_LINK}:</label><br /><span>{L_FORUM_RULES_LINK_EXPLAIN}</span></dt>
-			<dd><input class="text medium" type="text" id="forum_rules_link" name="forum_rules_link" value="{FORUM_RULES_LINK}" maxlength="255" /></dd>
-		</dl>
-	<!-- IF FORUM_RULES_PREVIEW -->
-		<dl>
-			<dt><label>{L_FORUM_RULES_PREVIEW}:</label></dt>
-			<dd>{FORUM_RULES_PREVIEW}</dd>
-		</dl>
-	<!-- ENDIF -->
-		<dl>
-			<dt><label for="forum_rules">{L_FORUM_RULES}:</label><br /><span>{L_FORUM_RULES_EXPLAIN}</span></dt>
-			<dd><textarea id="forum_rules" name="forum_rules" rows="4" cols="70">{FORUM_RULES_PLAIN}</textarea></dd>
-			<dd><label><input type="checkbox" class="radio" name="rules_parse_bbcode"<!-- IF S_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
-				<label><input type="checkbox" class="radio" name="rules_parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
-				<label><input type="checkbox" class="radio" name="rules_parse_urls"<!-- IF S_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
-		</dl>
-		</fieldset>
-	</div>
-
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_DELETE_FORUM -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_FORUM_DELETE}</h1>
-
-	<p>{L_FORUM_DELETE_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="acp_forum" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_FORUM_DELETE}</legend>
-	<dl>
-		<dt><label>{L_FORUM_NAME}:</label></dt>
-		<dd><strong>{FORUM_NAME}</strong></dd>
-	</dl>
-	<!-- IF S_FORUM_POST -->
-		<dl>
-			<dt><label for="delete_action">{L_ACTION}:</label></dt>
-			<dd><label><input type="radio" class="radio" id="delete_action" name="action_posts" value="delete" checked="checked" /> {L_DELETE_ALL_POSTS}</label></dd>
-			<!-- IF S_MOVE_FORUM_OPTIONS -->
-				<dd><label><input type="radio" class="radio" name="action_posts" value="move" /> {L_MOVE_POSTS_TO}</label> <select name="posts_to_id">{S_MOVE_FORUM_OPTIONS}</select></dd>
-			<!-- ENDIF -->
-		</dl>
-	<!-- ENDIF -->
-	<!-- IF S_HAS_SUBFORUMS -->
-		<dl>
-			<dt><label for="sub_delete_action">{L_ACTION}:</label></dt>
-			<dd><label><input type="radio" class="radio" id="sub_delete_action" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</label></dd>
-			<!-- IF S_FORUMS_LIST -->
-				<dd><label><input type="radio" class="radio" name="action_subforums" value="move" /> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
-			<!-- ENDIF -->
-		</dl>
-	<!-- ENDIF -->
-
-	<p class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_CONTINUE_SYNC -->
-
-	<script type="text/javascript">
-	// <![CDATA[
-		var close_waitscreen = 0;
-		// no scrollbars...
-		popup('{UA_PROGRESS_BAR}', 400, 240, '_sync');
-	// ]]>
-	</script>
-
-	<h1>{L_FORUM_ADMIN}</h1>
-
-	<p>{L_FORUM_ADMIN_EXPLAIN}</p>
-
-	<p>{L_PROGRESS_EXPLAIN}</p>
-
-<!-- ELSE -->
-
-	<script type="text/javascript">
-	// <![CDATA[
-		/**
-		* Popup search progress bar
-		*/
-		function popup_progress_bar()
-		{
-			var close_waitscreen = 0;
-			// no scrollbars...
-			popup('{UA_PROGRESS_BAR}', 400, 240, '_sync');
-		}
-	// ]]>
-	</script>
-
-	<h1>{L_FORUM_ADMIN}</h1>
-
-	<p>{L_FORUM_ADMIN_EXPLAIN}</p>
-
-	<!-- IF ERROR_MSG -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF S_RESYNCED -->
-		<script type="text/javascript">
-		// <![CDATA[
-			var close_waitscreen = 1;
-		// ]]>
-		</script>
-
-		<div class="successbox">
-			<h3>{L_NOTIFY}</h3>
-			<p>{L_FORUM_RESYNCED}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<p><strong>{NAVIGATION}<!-- IF S_NO_FORUMS --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a><!-- IF not S_LINK --> | <a href="{U_SYNC}">{L_RESYNC}</a><!-- ENDIF --->]<!-- ENDIF --></strong></p>
-
-	<!-- IF .forums -->
-		<table cellspacing="1">
-			<col class="row1" /><col class="row1" /><col class="row2" />
-		<tbody>
-		<!-- BEGIN forums -->
-			<tr>
-				<td style="width: 5%; text-align: center;">{forums.FOLDER_IMAGE}</td>
-				<td>
-					<!-- IF forums.FORUM_IMAGE --><div style="float: {S_CONTENT_FLOW_BEGIN}; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF -->
-					<strong><!-- IF forums.S_FORUM_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF --></strong>
-					<!-- IF forums.FORUM_DESCRIPTION --><br /><span>{forums.FORUM_DESCRIPTION}</span><!-- ENDIF -->
-					<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}: <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}: <strong>{forums.FORUM_POSTS}</strong></span><!-- ENDIF -->
-				</td>
-				<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
-					<!-- IF forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
-						{ICON_MOVE_UP_DISABLED}
-						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-					<!-- ELSEIF not forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
-						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-					<!-- ELSEIF forums.S_LAST_ROW && not forums.S_FIRST_ROW -->
-						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-						{ICON_MOVE_DOWN_DISABLED}
-					<!-- ELSE -->
-						{ICON_MOVE_UP_DISABLED}
-						{ICON_MOVE_DOWN_DISABLED}
-					<!-- ENDIF -->
-					<a href="{forums.U_EDIT}">{ICON_EDIT}</a>
-					<!-- IF not forums.S_FORUM_LINK -->
-						<a href="{forums.U_SYNC}" onclick="popup_progress_bar();">{ICON_SYNC}</a>
-					<!-- ELSE -->
-						{ICON_SYNC_DISABLED}
-					<!-- ENDIF -->
-					<a href="{forums.U_DELETE}">{ICON_DELETE}</a>
-				</td>
-			</tr>
-		<!-- END forums -->
-		</tbody>
-		</table>
-	<!-- ENDIF -->
-
-	<form id="fselect" method="post" action="{U_SEL_ACTION}">
-
-	<fieldset class="quick">
-		{L_SELECT_FORUM}: <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select>
-
-		<input class="button2" type="submit" value="{L_GO}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-	<form id="forums" method="post" action="{U_ACTION}">
-
-	<fieldset class="quick">
-		<input type="hidden" name="action" value="add" />
-
-		<input type="text" name="forum_name" value="" maxlength="255" />
-		<input class="button2" name="addforum" type="submit" value="{L_CREATE_FORUM}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
deleted file mode 100644
index 5df8a16a39..0000000000
--- a/phpBB/adm/style/acp_groups.html
+++ /dev/null
@@ -1,350 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_EDIT -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_ACP_GROUPS_MANAGE}</h1>
-
-	<p>{L_GROUP_EDIT_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>
-
-	<fieldset>
-		<legend>{L_GROUP_DETAILS}</legend>
-	<dl>
-		<dt><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}:</label></dt>
-		<dd><!-- IF S_SPECIAL_GROUP --><strong>{GROUP_NAME}</strong><!-- ENDIF --><input name="group_name" type="<!-- IF S_SPECIAL_GROUP -->hidden<!-- ELSE -->text<!-- ENDIF -->" id="group_name" value="{GROUP_INTERNAL_NAME}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="group_desc">{L_GROUP_DESC}:</label></dt>
-		<dd><textarea id="group_desc" name="group_desc" rows="5" cols="45">{GROUP_DESC}</textarea></dd>
-		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
-			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
-			<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
-	</dl>
-	<!-- IF not S_SPECIAL_GROUP -->
-		<dl>
-			<dt><label for="group_type">{L_GROUP_TYPE}:</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
-			<dd>
-				<label><input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}</label>
-				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}</label>
-				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_CLOSED}"{GROUP_CLOSED} /> {L_GROUP_CLOSED}</label>
-				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN}</label>
-			</dd>
-		</dl>
-	<!-- ELSE -->
-		<input name="group_type" type="hidden" value="{GROUP_TYPE_SPECIAL}" />
-	<!-- ENDIF -->
-
-	<!-- IF S_ADD_GROUP and S_GROUP_PERM -->
-		<dl>
-			<dt><label for="group_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
-			<dd><select id="group_perm_from" name="group_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_GROUP_OPTIONS}</select></dd>
-		</dl>
-	<!-- ENDIF -->
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_GROUP_SETTINGS_SAVE}</legend>
-	<!-- IF S_USER_FOUNDER -->
-	<dl>
-		<dt><label for="group_founder_manage">{L_GROUP_FOUNDER_MANAGE}:</label><br /><span>{L_GROUP_FOUNDER_MANAGE_EXPLAIN}</span></dt>
-		<dd><input name="group_founder_manage" type="checkbox" class="radio" id="group_founder_manage"{GROUP_FOUNDER_MANAGE} /></dd>
-	</dl>
-	<!-- ENDIF -->
-	<dl>
-		<dt><label for="group_legend">{L_GROUP_LEGEND}:</label></dt>
-		<dd><input name="group_legend" type="checkbox" class="radio" id="group_legend"{GROUP_LEGEND} /></dd>
-	</dl>
-	<dl>
-		<dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}:</label><br /><span>{L_GROUP_RECEIVE_PM_EXPLAIN}</span></dt>
-		<dd><input name="group_receive_pm" type="checkbox" class="radio" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd>
-	</dl>
-	<dl>
-		<dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}:</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt>
-		<dd><input name="group_message_limit" type="text" id="group_message_limit" maxlength="4" size="4" value="{GROUP_MESSAGE_LIMIT}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="group_max_recipients">{L_GROUP_MAX_RECIPIENTS}:</label><br /><span>{L_GROUP_MAX_RECIPIENTS_EXPLAIN}</span></dt>
-		<dd><input name="group_max_recipients" type="text" id="group_max_recipients" maxlength="10" size="4" value="{GROUP_MAX_RECIPIENTS}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
-		<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />&nbsp;&nbsp;<span>[ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>
-	</dl>
-	<dl>
-		<dt><label for="group_rank">{L_GROUP_RANK}:</label></dt>
-		<dd><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_GROUP_AVATAR}</legend>
-	<dl>
-		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-		<dd>{AVATAR_IMAGE}</dd>
-		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd>
-	</dl>
-	<!-- IF not S_IN_AVATAR_GALLERY -->
-		<!-- IF S_CAN_UPLOAD -->
-			<dl> 
-				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
-				<dd><input type="file" id="uploadfile" name="uploadfile" /></dd>
-			</dl>
-			<dl>
-				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd>
-			</dl>
-		<!-- ENDIF -->
-		<dl>
-			<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-			<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
-			<dd><input name="width" type="text" id="width" size="3" value="{AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{AVATAR_HEIGHT}" /> <span>px</span></dd>
-		</dl>
-		<!-- IF S_DISPLAY_GALLERY -->
-			<dl> 
-				<dt><label>{L_AVATAR_GALLERY}:</label></dt>
-				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd>
-			</dl>
-		<!-- ENDIF -->
-	<!-- ELSE -->
-		</fieldset>
-
-		<fieldset>
-			<legend>{L_AVATAR_GALLERY}</legend>
-		<dl>
-			<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt>
-			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>
-		</dl>
-		<dl>
-			<table cellspacing="1">
-			<!-- BEGIN avatar_row -->
-			<tr> 
-				<!-- BEGIN avatar_column -->
-					<td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td>
-				<!-- END avatar_column -->
-			</tr>
-			<tr>
-				<!-- BEGIN avatar_option_column -->
-					<td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
-				<!-- END avatar_option_column -->
-			</tr>
-			<!-- END avatar_row -->
-			</table>
-		</dl>
-		</fieldset>
-		
-		<fieldset class="quick" style="margin-top: -15px;">
-			<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
-		</fieldset>
-	
-	<!-- ENDIF -->
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_LIST -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_GROUP_MEMBERS} :: {GROUP_NAME}</h1>
-
-	<p>{L_GROUP_MEMBERS_EXPLAIN}</p>
-
-	<form id="list" method="post" action="{U_ACTION}">
-
-	<fieldset class="quick">
-		<a href="{U_DEFAULT_ALL}">&raquo; {L_MAKE_DEFAULT_FOR_ALL}</a>
-	</fieldset>
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_USERNAME}</th>
-		<th>{L_GROUP_DEFAULT}</th>
-		<th>{L_JOINED}</th>
-		<th>{L_POSTS}</th>
-		<th>{L_MARK}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td class="row3" colspan="5"><strong>{L_GROUP_LEAD}</strong></td>
-	</tr>
-	<!-- BEGIN leader -->
-		<!-- IF leader.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td><a href="{leader.U_USER_EDIT}">{leader.USERNAME}</a></td>
-			<td style="text-align: center;"><!-- IF leader.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
-			<td style="text-align: center;">{leader.JOINED}</td>
-			<td style="text-align: center;">{leader.USER_POSTS}</td>
-			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{leader.USER_ID}" /></td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td class="row1" colspan="5" style="text-align: center;">{L_GROUPS_NO_MODS}</td>
-		</tr>
-	<!-- END leader -->
-	<tr>
-		<td class="row3" colspan="5"><strong>{L_GROUP_APPROVED}</strong></td>
-	</tr>
-	<!-- BEGIN member -->
-		<!-- IF member.S_PENDING -->
-		<tr>
-			<td class="row3" colspan="5"><strong>{L_GROUP_PENDING}</strong></td>
-		</tr>
-		<!-- ELSE -->
-			<!-- IF member.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td><a href="{member.U_USER_EDIT}">{member.USERNAME}</a></td>
-			<td style="text-align: center;"><!-- IF member.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
-			<td style="text-align: center;">{member.JOINED}</td>
-			<td style="text-align: center;">{member.USER_POSTS}</td>
-			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{member.USER_ID}" /></td>
-		</tr>
-		<!-- ENDIF -->
-	<!-- BEGINELSE -->
-		<tr>
-			<td class="row1" colspan="5" style="text-align: center;">{L_GROUPS_NO_MEMBERS}</td>
-		</tr>
-	<!-- END member -->
-	</tbody>
-	</table>
-	<!-- IF PAGINATION -->
-	<div class="pagination">
-			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-	</div>
-	<!-- ENDIF -->	
-
-	<fieldset class="quick">
-		<select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select>
-		<input class="button2" type="submit" name="update" value="{L_SUBMIT}" />
-		<p class="small"><a href="#" onclick="marklist('list', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>		
-	</fieldset>
-
-	<h1>{L_ADD_USERS}</h1>
-
-	<p>{L_ADD_USERS_EXPLAIN}</p>
-
-	<fieldset>
-		<legend>{L_ADD_USERS}</legend>
-	<dl>
-		<dt><label for="leader">{L_USER_GROUP_LEADER}:</label></dt>
-		<dd><label><input name="leader" type="radio" class="radio" value="1" /> {L_YES}</label>
-			<label><input name="leader" type="radio" class="radio" id="leader" value="0" checked="checked" /> {L_NO}</label></dd>
-	</dl>
-	<dl>
-		<dt><label for="default">{L_USER_GROUP_DEFAULT}:</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt>
-		<dd><label><input name="default" type="radio" class="radio" value="1" /> {L_YES}</label>
-			<label><input name="default" type="radio" class="radio" id="default" value="0" checked="checked" /> {L_NO}</label></dd>
-	</dl>
-	<dl>
-		<dt><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
-		<dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd>
-		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
-	</dl>
-
-	<p class="quick">
-		<input class="button2" type="submit" name="addusers" value="{L_SUBMIT}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSE -->
-
-	<h1>{L_ACP_GROUPS_MANAGE}</h1>
-
-	<p>{L_ACP_GROUPS_MANAGE_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<h1>{L_USER_DEF_GROUPS}</h1>
-
-	<p>{L_USER_DEF_GROUPS_EXPLAIN}</p>
-
-	<form id="acp_groups" method="post" action="{U_ACTION}">
-
-	<table cellspacing="1">
-		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
-	<thead>
-	<tr>
-		<th style="width: 50%">{L_GROUP}</th>
-		<th>{L_TOTAL_MEMBERS}</th>
-		<th colspan="2">{L_OPTIONS}</th>
-		<th>{L_ACTION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN groups -->
-		<!-- IF groups.S_SPECIAL -->
-		<!-- IF groups.S_FIRST_ROW -->
-			<tr>
-				<td colspan="5" class="row3">{L_NO_GROUPS_CREATED}</td>
-			</tr>
-		<!-- ENDIF -->
-	</tbody>
-	</table>
-
-	<fieldset class="quick">
-		<!-- IF S_GROUP_ADD -->
-			{L_CREATE_GROUP}: <input type="text" name="group_name" value="" /> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
-			<input type="hidden" name="add" value="1" />
-		<!-- ENDIF -->
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-	<h1>{L_SPECIAL_GROUPS}</h1>
-
-	<p>{L_SPECIAL_GROUPS_EXPLAIN}</p>
-
-	<table cellspacing="1">
-		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
-	<thead>
-	<tr>
-		<th style="width: 50%">{L_GROUP}</th>
-		<th>{L_TOTAL_MEMBERS}</th>
-		<th colspan="2">{L_OPTIONS}</th>
-		<th>{L_ACTION}</th>
-	</tr>
-	</thead>
-	<tbody>
-		<!-- ELSE -->
-		<tr>
-			<td><strong>{groups.GROUP_NAME}</strong></td>
-			<td style="text-align: center;">{groups.TOTAL_MEMBERS}</td>
-			<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_SETTINGS}</a></td>
-			<td style="text-align: center;"><a href="{groups.U_LIST}">{L_MEMBERS}</a></td>
-			<td style="text-align: center;"><!-- IF not groups.S_GROUP_SPECIAL and groups.U_DELETE --><a href="{groups.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
-		</tr>
-		<!-- ENDIF -->
-	<!-- END groups -->
-	</tbody>
-	</table>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
deleted file mode 100644
index 86500ae047..0000000000
--- a/phpBB/adm/style/acp_icons.html
+++ /dev/null
@@ -1,268 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_EDIT -->
-
-	<script type="text/javascript" defer="defer">
-	// <![CDATA[
-	<!-- IF S_ADD_CODE -->
-	
-			var smiley = Array();
-			<!-- BEGIN smile -->
-				smiley['{smile.SMILEY_URL}'] = Array();
-				smiley['{smile.SMILEY_URL}']['code'] = '{smile.CODE}';
-				smiley['{smile.SMILEY_URL}']['emotion'] = '{smile.EMOTION}';
-				smiley['{smile.SMILEY_URL}']['width'] = {smile.WIDTH};
-				smiley['{smile.SMILEY_URL}']['height'] = {smile.HEIGHT};
-				smiley['{smile.SMILEY_URL}']['order'] = {smile.ORDER};
-			<!-- END smile -->
-
-			function update_image(newimage)
-			{
-				var use_element = smiley[newimage];
-
-				document.getElementById('add_image_src').src = '{PHPBB_ROOT_PATH}{IMG_PATH}/' + encodeURI(newimage);
-				document.getElementById('add_code').value = use_element['code'];
-				document.getElementById('add_emotion').value = use_element['emotion'];
-				document.getElementById('add_width').value = use_element['width'];
-				document.getElementById('add_height').value = use_element['height'];
-
-				element = document.getElementById('add_order');
-				for (var i = 0; i < element.length; i++)
-				{
-					if (element.options[i].value == use_element['order'])
-					{
-						document.getElementById('add_order').options.selectedIndex = i;
-					}
-				}
-			}
-		
-	<!-- ENDIF -->
-
-	
-	function toggle_select(icon, display, select)
-	{
-		var disp = document.getElementById('order_disp_' + select);
-		var nodisp = document.getElementById('order_no_disp_' + select);
-		disp.disabled = !display;
-		nodisp.disabled = display;
-		if (display)
-		{
-			document.getElementById('order_' + select).selectedIndex = 0;
-			nodisp.className = 'disabled-options';
-			disp.className = '';
-		}
-		else
-		{
-			document.getElementById('order_' + select).selectedIndex = {S_ORDER_LIST_DISPLAY_COUNT};
-			disp.className = 'disabled-options';
-			nodisp.className = '';
-		}
-	}
-	// ]]>
-	</script>
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<form id="acp_icons" method="post" action="{U_ACTION}">
-
-	<fieldset class="tabulated">
-	<legend>{L_TITLE}</legend>
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th colspan="{COLSPAN}">{L_CONFIG}</th>
-	</tr>
-	<!-- IF .items or S_ADD_CODE -->
-	<tr class="row3">
-		<td>{L_URL}</td>
-		<td>{L_LOCATION}</td>
-	<!-- IF S_SMILIES -->
-		<td>{L_SMILIES_CODE}</td>
-		<td>{L_SMILIES_EMOTION}</td>
-	<!-- ENDIF -->
-		<td>{L_WIDTH}</td>
-		<td>{L_HEIGHT}</td>
-		<td>{L_DISPLAY_ON_POSTING}</td>
-	<!-- IF ID or S_ADD -->
-		<td>{L_ORDER}</td>
-	<!-- ENDIF -->
-	<!-- IF S_ADD -->
-		<td>{L_ADD}</td>
-	<!-- ENDIF -->
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN items -->
-		<!-- IF items.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-	
-		<td style="text-align: center;"><img src="{items.IMG_SRC}" alt="" title="" /><input type="hidden" name="image[{items.IMG}]" value="1" /></td>
-		<td style="vertical-align: top;">[{items.IMG}]</td>
-		<!-- IF S_SMILIES -->
-			<td><input class="text post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" maxlength="50" /></td>
-			<td><input class="text post" type="text" name="emotion[{items.IMG}]" value="{items.EMOTION}" size="10" maxlength="50" /></td>
-		<!-- ENDIF -->
-		<td><input class="text post" type="text" size="3" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
-		<td><input class="text post" type="text" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
-		<td>
-			<input type="checkbox" class="radio" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} onclick="toggle_select('{items.A_IMG}', this.checked, '{items.S_ROW_COUNT}');"/>
-			<!-- IF items.S_ID -->
-				<input type="hidden" name="id[{items.IMG}]" value="{items.ID}" />
-			<!-- ENDIF -->
-		</td>
-		<!-- IF ID or S_ADD -->
-			<td><select id="order_{items.S_ROW_COUNT}" name="order[{items.IMG}]">
-				<optgroup id="order_disp_{items.S_ROW_COUNT}" label="{L_DISPLAY_POSTING}" <!-- IF not items.POSTING_CHECKED -->disabled="disabled" class="disabled-options" <!-- ENDIF -->>{S_ORDER_LIST_DISPLAY}</optgroup>
-				<optgroup id="order_no_disp_{items.S_ROW_COUNT}" label="{L_DISPLAY_POSTING_NO}" <!-- IF  items.POSTING_CHECKED -->disabled="disabled" class="disabled-options" <!-- ENDIF -->>{S_ORDER_LIST_UNDISPLAY}</optgroup>
-			</select></td>
-		<!-- ENDIF -->	
-		<!-- IF S_ADD -->
-			<td><input type="checkbox" class="radio" name="add_img[{items.IMG}]" value="1" /></td>
-		<!-- ENDIF -->
-		</tr>
-	<!-- END items -->
-	<!-- IF S_ADD_CODE -->
-	<tr>
-		<th colspan="{COLSPAN}">{L_ADD_SMILEY_CODE}</th>
-	</tr>
-	<tr class="row1">
-		<td style="text-align: center;"><select name="add_image" id="add_image" onchange="update_image(this.options[selectedIndex].value);">{S_IMG_OPTIONS}</select></td>
-		<td style="vertical-align: top;"><img src="{IMG_SRC}" id="add_image_src" alt="" title="" /></td>
-		<td><input class="text post" type="text" name="add_code" id="add_code" value="{CODE}" size="10" maxlength="50" /></td>
-		<td><input class="text post" type="text" name="add_emotion" id="add_emotion" value="{EMOTION}" size="10" maxlength="50" /></td>
-		<td><input class="text post" type="text" size="3" name="add_width" id="add_width" value="{WIDTH}" /></td>
-		<td><input class="text post" type="text" size="3" name="add_height" id="add_height" value="{HEIGHT}" /></td>
-		<td><input type="checkbox" class="radio" name="add_display_on_posting" checked="checked" onclick="toggle_select('add', this.checked, 'add_order');"/></td>
- 		<td><select id="add_order" name="add_order">
-				<optgroup id="order_disp[add]" label="{L_DISPLAY_POSTING}">{S_ADD_ORDER_LIST_DISPLAY}</optgroup>
-				<optgroup id="order_no_disp[add]" label="{L_DISPLAY_POSTING_NO}" disabled="disabled" class="disabled-options" >{S_ADD_ORDER_LIST_UNDISPLAY}</optgroup>
-		</select></td>
-		<td><input type="checkbox" class="radio" name="add_additional_code" value="1" /></td>
-	</tr>
-	<!-- ENDIF -->
-	<!-- ELSE -->
-	<tr class="row3">
-		<td colspan="{COLSPAN}">{L_NO_ICONS}</td>
-	</tr>
-	<!-- ENDIF -->
-	</tbody>
-	</table>
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_CHOOSE_PAK -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<form id="acp_icons" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_IMPORT}</legend>
-	
-	<!-- IF not S_PAK_OPTIONS -->
-		<p>{L_NO_PAK_OPTIONS}</p>
-
-	<!-- ELSE -->
-		<dl>
-			<dt><label for="pak">{L_SELECT_PACKAGE}</label></dt>
-			<dd><select id="pak" name="pak">{S_PAK_OPTIONS}</select></dd>
-		</dl>
-			<dt><label for="current">{L_CURRENT}</label><br /><span>{L_CURRENT_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" id="current" name="current" value="keep" checked="checked" /> {L_KEEP_ALL}</label>
-				<label><input type="radio" class="radio" name="current" value="replace" /> {L_REPLACE_MATCHES}</label>
-				<label><input type="radio" class="radio" name="current" value="delete" /> {L_DELETE_ALL}</label></dd>
-		</dl>
-
-	<p class="quick">
-		<input class="button1" type="submit" id="import" name="import" value="{L_IMPORT_SUBMIT}" />
-	</p>
-	<!-- ENDIF -->
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSE -->
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<!-- IF NOTICE -->
-		<div class="successbox">
-			<h3>{L_NOTIFY}</h3>
-			<p>{NOTICE}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="acp_icons" method="post" action="{U_ACTION}">
-
-	<div style="text-align: right;"><a href="{U_IMPORT}">{L_IMPORT}</a> | <a href="{U_EXPORT}">{L_EXPORT}</a></div>
-
-	<fieldset class="tabulated">
-
-	<legend>{L_TITLE}</legend>
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_TITLE}</th>
-		<!-- IF S_SMILIES -->
-		<th>{L_CODE}</th>
-		<th>{L_EMOTION}</th>
-		<!-- ENDIF -->
-		<th>{L_OPTIONS}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN items -->
-		<!-- IF items.S_SPACER -->
-			<tr>
-				<td class="row3" colspan="{COLSPAN}" style="text-align: center;">{L_NOT_DISPLAYED}</td>
-			</tr>
-		<!-- ENDIF -->
-		<!-- IF items.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td style="width: 85%; text-align: center;"><img src="{items.IMG_SRC}" width="{items.WIDTH}" height="{items.HEIGHT}" alt="{items.ALT_TEXT}" title="{items.ALT_TEXT}" /></td>
-			<!-- IF S_SMILIES -->
-				<td style="text-align: center;">{items.CODE}</td>
-				<td style="text-align: center;">{items.EMOTION}</td>
-			<!-- ENDIF -->
-			<td style="text-align: right; white-space: nowrap;">
-				<!-- IF items.S_FIRST_ROW -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF -->&nbsp;
-				<!-- IF items.S_LAST_ROW -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF -->
-				&nbsp;<a href="{items.U_EDIT}">{ICON_EDIT}</a> <a href="{items.U_DELETE}">{ICON_DELETE}</a>
-			</td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr class="row3">
-			<td colspan="{COLSPAN}">{L_ACP_NO_ITEMS}</td>
-		</tr>
-	<!-- END items -->
-	</tbody>
-	</table>
-
-	<p class="quick">
-		<input class="button2" name="add" type="submit" value="{L_ICON_ADD}" />&nbsp; &nbsp;<input class="button2" type="submit" name="edit" value="{L_ICON_EDIT}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html
deleted file mode 100644
index 240cec1643..0000000000
--- a/phpBB/adm/style/acp_inactive.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h2>{L_INACTIVE_USERS}</h2>
-
-<p>{L_INACTIVE_USERS_EXPLAIN}</p>
-
-<form id="inactive" method="post" action="{U_ACTION}">
-
-<div class="clearfix"></div>
-
-<!-- IF PAGINATION -->
-<div class="pagination">
-		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-</div>
-<!-- ENDIF -->
-
-<table cellspacing="1">
-<thead>
-<tr>
-	<th>{L_USERNAME}</th>
-	<th>{L_JOINED}</th>
-	<th>{L_INACTIVE_DATE}</th>
-	<th>{L_INACTIVE_REASON}</th>
-	<th>{L_LAST_VISIT}</th>
-	<th>{L_MARK}</th>
-</tr>
-</thead>
-<tbody>
-<!-- BEGIN inactive -->
-	<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-		<td><a href="{inactive.U_USER_ADMIN}">{inactive.USERNAME}</a></td>
-		<td>{inactive.JOINED}</td>
-		<td>{inactive.INACTIVE_DATE}</td>
-		<td>{inactive.REASON}</td>
-		<td>{inactive.LAST_VISIT}</td>
-		<td>&nbsp;<input type="checkbox" class="radio" name="mark[]" value="{inactive.USER_ID}" />&nbsp;</td>
-	</tr>
-<!-- BEGINELSE -->
-	<tr>
-		<td colspan="6" style="text-align: center;">{L_NO_INACTIVE_USERS}</td>
-	</tr>
-<!-- END inactive -->
-</tbody>
-</table>
-
-	<fieldset class="display-options">
-		{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
-		<input class="button2" type="submit" value="{L_GO}" name="sort" />
-	</fieldset>
-	<hr />
-	<!-- IF PAGINATION -->
-	<div class="pagination">
-			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-	</div>
-	<!-- ENDIF -->
-
-	<fieldset class="quick">
-		<select name="action">{S_INACTIVE_OPTIONS}</select>
-		<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
-		<p class="small"><a href="#" onclick="marklist('inactive', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('inactive', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>		
-		{S_FORM_TOKEN}
-	</fieldset>
-
-
-
-</form>
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html
deleted file mode 100644
index 2cc715493a..0000000000
--- a/phpBB/adm/style/acp_jabber.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h1>{L_ACP_JABBER_SETTINGS}</h1>
-
-<p>{L_ACP_JABBER_SETTINGS_EXPLAIN}</p>
-
-<!-- IF S_WARNING -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{WARNING_MSG}</p>
-	</div>
-<!-- ENDIF -->
-
-<form id="acp_jabber" method="post" action="{U_ACTION}">
-
-<fieldset>
-	<legend>{L_ACP_JABBER_SETTINGS}</legend>
-<!-- IF S_GTALK_NOTE -->
-	<p>{L_JAB_GTALK_NOTE}</p>
-<!-- ENDIF -->
-<dl>
-	<dt><label for="jab_enable">{L_JAB_ENABLE}:</label><br /><span>{L_JAB_ENABLE_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="jab_enable" name="jab_enable" value="1"<!-- IF JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
-		<label><input type="radio" class="radio" name="jab_enable" value="0"<!-- IF not JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
-</dl>
-<dl>
-	<dt><label for="jab_host">{L_JAB_SERVER}:</label><br /><span>{L_JAB_SERVER_EXPLAIN}</span></dt>
-	<dd><input type="text" id="jab_host" name="jab_host" value="{JAB_HOST}" /></dd>
-</dl>
-<dl>
-	<dt><label for="jab_port">{L_JAB_PORT}:</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt>
-	<dd><input type="text" id="jab_port" name="jab_port" value="{JAB_PORT}" maxlength="5" size="5" /></dd>
-</dl>
-<dl>
-	<dt><label for="jab_username">{L_JAB_USERNAME}:</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt>
-	<dd><input type="text" id="jab_username" name="jab_username" value="{JAB_USERNAME}" /></dd>
-</dl>
-<dl>
-	<dt><label for="jab_password">{L_JAB_PASSWORD}:</label></dt>
-	<dd><input type="password" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd>
-</dl>
-<!-- IF S_CAN_USE_SSL -->
-<dl>
-	<dt><label for="jab_use_ssl">{L_JAB_USE_SSL}:</label><br /><span>{L_JAB_USE_SSL_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="jab_use_ssl" name="jab_use_ssl" value="1"<!-- IF JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input type="radio" class="radio" name="jab_use_ssl" value="0"<!-- IF not JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
-<!-- ENDIF -->
-<dl>
-	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}:</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt>
-	<dd><input type="text" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" maxlength="5" size="5" /></dd>
-</dl>
-
-</fieldset>
-
-<fieldset class="submit-buttons">
-	<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html
deleted file mode 100644
index 6dbfe9e0f6..0000000000
--- a/phpBB/adm/style/acp_language.html
+++ /dev/null
@@ -1,215 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_SELECT_METHOD -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_SELECT_DOWNLOAD_FORMAT}</h1>
-
-	<form id="selectmethod" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_DOWNLOAD_AS}</legend>
-	<dl>
-		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
-		<dd>{RADIO_BUTTONS}</dd>
-	</dl>
-
-	<p class="quick">
-		<input type="submit" class="button2" value="{L_DOWNLOAD}" name="download" />
-	</p>
-	</fieldset>
-
-	</form>
-
-<!-- ELSEIF S_DETAILS -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_LANGUAGE_PACK_DETAILS}</h1>
-
-	<form id="details" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{LANG_LOCAL_NAME}</legend>
-	<dl>
-		<dt><label for="lang_english_name">{L_LANG_ENGLISH_NAME}:</label></dt>
-		<dd><input type="text" id="lang_english_name" name="lang_english_name" value="{LANG_ENGLISH_NAME}" maxlength="100" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="lang_local_name">{L_LANG_LOCAL_NAME}:</label></dt>
-		<dd><input type="text" id="lang_local_name" name="lang_local_name" value="{LANG_LOCAL_NAME}" maxlength="255" /></dd>
-	</dl>
-	<dl>
-		<dt><label>{L_LANG_ISO_CODE}:</label></dt>
-		<dd><strong>{LANG_ISO}</strong></dd>
-	</dl>
-	<dl>
-		<dt><label for="lang_author">{L_LANG_AUTHOR}:</label></dt>
-		<dd><input type="text" id="lang_author" name="lang_author" value="{LANG_AUTHOR}" maxlength="255" /></dd>
-	</dl>
-
-	<p class="quick" style="margin-top: -15px;">
-		<input type="submit" name="update_details" class="button2" value="{L_SUBMIT}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-	<br /><br />
-
-	<!-- IF S_MISSING_FILES -->
-		<div class="errorbox">
-			<h3>{L_MISSING_FILES}</h3>
-			<p>{MISSING_FILES}</p>
-		</div>
-		<br /><br />
-	<!-- ENDIF -->
-
-	<!-- IF S_MISSING_VARS -->
-		<h1>{L_MISSING_LANG_VARIABLES}</h1>
-
-		<p>{L_MISSING_VARS_EXPLAIN}</p>
-
-		<form id="missing" method="post" action="{U_MISSING_ACTION}">
-
-		<table cellspacing="1">
-		<thead>
-		<tr>
-			<th>{L_LANGUAGE_KEY}</th>
-			<th>{L_LANGUAGE_VARIABLE}</th>
-		</tr>
-		</thead>
-		<tbody>
-		<!-- BEGIN missing -->
-			<tr class="row4">
-				<td><strong>{missing.FILE}</strong></td>
-				<td style="text-align: right;"><input type="submit" name="missing_file[{missing.KEY}]" value="{L_SELECT}" class="button2" /></td>
-			</tr>
-			{missing.TPL}
-		<!-- END missing -->
-		</tbody>
-		</table>
-		<div>{S_FORM_TOKEN}</div>
-		</form>
-
-		<br /><br />
-	<!-- ENDIF -->
-
-	<a name="entries"></a>
-
-	<h1>{L_LANGUAGE_ENTRIES}</h1>
-
-	<p>{L_LANGUAGE_ENTRIES_EXPLAIN}</p>
-
-	<form id="lang_entries" method="post" action="{U_ENTRY_ACTION}">
-
-	<!-- IF S_FROM_STORE -->
-		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
-			<input type="submit" name="remove_store" value="{L_REMOVE_FROM_STORAGE_FOLDER}" class="button2" /> 
-		</fieldset>
-	<!-- ENDIF -->
-
-	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
-		<select name="language_file">{S_LANG_OPTIONS}</select>&nbsp;<input type="submit" class="button2" name="change" value="{L_SELECT}" />
-	</fieldset>
-
-	<p>&nbsp;<br />&nbsp;</p>
-
-
-	<!--[if lt IE 8]>
-	<style type="text/css">
-	/* <![CDATA[ */
-		input.langvalue, textarea.langvalue {
-		width: 450px;
-		}
-	/* ]]> */
-	</style>
-	<![endif]-->
-
-	<table cellspacing="1">
-	<thead>
-	<!-- IF S_EMAIL_FILE -->
-		<tr>
-			<th colspan="2">{L_FILE_CONTENTS}</th>
-		</tr>
-	<!-- ELSE -->
-		<tr>
-			<th>{L_LANGUAGE_KEY}</th>
-			<th>{L_LANGUAGE_VARIABLE}</th>
-		</tr>
-	<!-- ENDIF -->
-	<tr>
-		<td class="row3"><strong>{PRINT_MESSAGE}<!-- IF S_FROM_STORE --><br /><span style="color: red;">{L_FILE_FROM_STORAGE}</span><!-- ENDIF --></strong></td>
-		<td class="row3" style="text-align: right;"><input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /></td>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- IF S_EMAIL_FILE -->
-		<tr>
-			<td class="row2" colspan="2" style="text-align: center;"><textarea name="entry" id="entry" cols="80" rows="20">{LANG}</textarea></td>
-		</tr>
-	<!-- ELSE -->
-		{TPL}
-	<!-- ENDIF -->
-	<tr>
-		<td class="row3" colspan="3" style="text-align: right;">{S_FORM_TOKEN}<input type="submit" name="download_file" class="button2" value="{L_SUBMIT_AND_DOWNLOAD}" />&nbsp;&nbsp;<input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /></td>
-	</tr>
-	</tbody>
-	</table>
-	</form>
-
-<!-- ELSEIF S_UPDATE_OPTIONS -->
-
-<!-- INCLUDE update_options.html -->
-
-<!-- ELSE -->
-
-	<h1>{L_ACP_LANGUAGE_PACKS}</h1>
-
-	<p>{L_ACP_LANGUAGE_PACKS_EXPLAIN}</p>
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_LANGUAGE_PACK_NAME}</th>
-		<th>{L_LANGUAGE_PACK_LOCALNAME}</th>
-		<th>{L_LANGUAGE_PACK_ISO}</th>
-		<th>{L_LANGUAGE_PACK_USED_BY}</th>
-		<th>{L_OPTIONS}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td class="row3" colspan="5"><strong>{L_INSTALLED_LANGUAGE_PACKS}</strong></td>
-	</tr>
-	<!-- BEGIN lang -->
-		<!-- IF lang.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td><a href="{lang.U_DETAILS}">{lang.ENGLISH_NAME}</a> {lang.TAG}</td>
-		<td>{lang.LOCAL_NAME}</td>
-		<td style="text-align: center;"><strong>{lang.ISO}</strong></td>
-		<td style="text-align: center;">{lang.USED_BY}</td>
-		<td style="text-align: center;">&nbsp;<a href="{lang.U_DOWNLOAD}">{L_DOWNLOAD}</a>&nbsp;|&nbsp;<a href="{lang.U_DELETE}">{L_DELETE}</a></td>
-	</tr>
-	<!-- END lang -->
-	<!-- IF .notinst -->
-	<tr>
-		<td class="row3" colspan="5"><strong>{L_UNINSTALLED_LANGUAGE_PACKS}</strong></td>
-	</tr>
-	<!-- ENDIF -->
-	<!-- BEGIN notinst -->
-		<!-- IF notinst.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td>{notinst.NAME}</td>
-		<td>{notinst.LOCAL_NAME}</td>
-		<td style="text-align: center;"><strong>{notinst.ISO}</strong></td>
-		<td colspan="2" style="text-align: center;"><a href="{notinst.U_INSTALL}">{L_INSTALL}</a></td>
-	</tr>
-	<!-- END notinst -->
-	</tbody>
-	</table>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_login.html b/phpBB/adm/style/acp_login.html
deleted file mode 100644
index 015f3ec908..0000000000
--- a/phpBB/adm/style/acp_login.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-<h1>{PAGE_TITLE}</h1>
-<p><!-- IF LOGIN_EXPLAIN -->{LOGIN_EXPLAIN}<!-- ELSE -->{L_LOGIN}<!-- ENDIF --></p>
-
-<!-- IF LOGIN_ERROR -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{LOGIN_ERROR}</p>
-	</div>
-<!-- ENDIF -->
-<form action="{S_LOGIN_ACTION}" method="post" id="login">
- 
-	<fieldset>
-		<dl>
-			<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}:</label></dt>
-			<dd><input type="text" tabindex="1" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}:</label></dt>
-			<dd><input type="password" tabindex="2" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd>
-			<!-- IF S_DISPLAY_FULL_LOGIN and (U_SEND_PASSWORD or U_RESEND_ACTIVATION) -->
-				<!-- IF U_SEND_PASSWORD --><dd><a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a></dd><!-- ENDIF -->
-				<!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF -->
-			<!-- ENDIF -->
-		</dl>
-			
-		<!-- IF S_CONFIRM_CODE -->
-		<dl>
-			<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label><br /><span>{L_CONFIRM_CODE_EXPLAIN}</span></dt>
-				<dd><input type="hidden" name="confirm_id" value="{CONFIRM_ID}" />{CONFIRM_IMAGE}</dd>
-				<dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="3" class="inputbox narrow" title="{L_CONFIRM_CODE}" /></dd>
-		</dl>
-		<!-- ENDIF -->
-	
-		<p class="submit-buttons">
-			<!-- IF S_DISPLAY_FULL_LOGIN -->
-				<!-- IF S_AUTOLOGIN_ENABLED --><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="4" /> {L_LOG_ME_IN}</label><!-- ENDIF -->
-				<label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="5" /> {L_HIDE_ME}</label>
-			<!-- ENDIF -->
-				&nbsp;
-				{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="6" value="{L_LOGIN}" class="button1" />
-		</p>
-	</fieldset> 
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
deleted file mode 100644
index 11ab5faa9c..0000000000
--- a/phpBB/adm/style/acp_logs.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h1>{L_TITLE}</h1>
-
-<p>{L_EXPLAIN}</p>
-
-<form id="list" method="post" action="{U_ACTION}">
-
-<!-- IF PAGINATION -->
-<div class="pagination">
-		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-</div>
-<!-- ENDIF -->
-
-<!-- IF .log -->
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_USERNAME}</th>
-		<th>{L_IP}</th>
-		<th>{L_TIME}</th>
-		<th>{L_ACTION}</th>
-		<th>{L_MARK}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN log -->
-		<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-			<td>
-				{log.USERNAME}
-				<!-- IF log.REPORTEE_USERNAME -->
-				<br />&raquo; {log.REPORTEE_USERNAME}
-				<!-- ENDIF -->
-			</td>
-			<td style="text-align: center;">{log.IP}</td>
-			<td style="text-align: center;">{log.DATE}</td>
-			<td>{log.ACTION}<!-- IF log.DATA --><br /><span>{log.DATA}</span><!-- ENDIF --></td>
-			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td>
-		</tr>
-	<!-- END log -->
-	</tbody>
-	</table>
-
-<!-- ELSE -->
-
-	<div class="errorbox">
-		<p>{L_NO_ENTRIES}</p>
-	</div>
-
-<!-- ENDIF -->
-
-
-<fieldset class="display-options">
-	{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
-	<input class="button2" type="submit" value="{L_GO}" name="sort" />
-	{S_FORM_TOKEN}
-</fieldset>
-<hr />
-<!-- IF PAGINATION -->
-<div class="pagination">
-	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-</div>
-<!-- ENDIF -->
-<!-- IF S_SHOW_FORUMS -->
-	<fieldset class="quick">
-		{L_SELECT_FORUM}: <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select>
-		<input class="button2" type="submit" value="{L_GO}" />
-	</fieldset>
-<!-- ENDIF -->
-
-<!-- IF S_CLEARLOGS -->
-	<fieldset class="quick">
-		<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
-		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" /><br />
-		<p class="small"><a href="#" onclick="marklist('list', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>
-	</fieldset>
-<!-- ENDIF -->
-
-
-</form>
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
deleted file mode 100644
index 4b6bc1910d..0000000000
--- a/phpBB/adm/style/acp_main.html
+++ /dev/null
@@ -1,222 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_RESTORE_PERMISSIONS -->
-
-	<h1>{L_PERMISSIONS_TRANSFERRED}</h1>
-
-	<p>{L_PERMISSIONS_TRANSFERRED_EXPLAIN}</p>
-
-<!-- ELSE -->
-
-	<h1>{L_WELCOME_PHPBB}</h1>
-
-	<p>{L_ADMIN_INTRO}</p>
-
-	<!-- IF S_REMOVE_INSTALL -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{L_REMOVE_INSTALL}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF S_WRITABLE_CONFIG -->
-		<div class="errorbox notice">
-			<p>{L_WRITABLE_CONFIG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<table cellspacing="1">
-		<caption>{L_FORUM_STATS}</caption>
-		<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
-	<thead>
-	<tr>
-		<th>{L_STATISTIC}</th>
-		<th>{L_VALUE}</th>
-		<th>{L_STATISTIC}</th>
-		<th>{L_VALUE}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td>{L_NUMBER_POSTS}: </td>
-		<td><strong>{TOTAL_POSTS}</strong></td>
-		<td>{L_POSTS_PER_DAY}: </td>
-		<td><strong>{POSTS_PER_DAY}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_NUMBER_TOPICS}: </td>
-		<td><strong>{TOTAL_TOPICS}</strong></td>
-		<td>{L_TOPICS_PER_DAY}: </td>
-		<td><strong>{TOPICS_PER_DAY}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_NUMBER_USERS}: </td>
-		<td><strong>{TOTAL_USERS}</strong></td>
-		<td>{L_USERS_PER_DAY}: </td>
-		<td><strong>{USERS_PER_DAY}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_NUMBER_FILES}: </td>
-		<td><strong>{TOTAL_FILES}</strong></td>
-		<td>{L_FILES_PER_DAY}: </td>
-		<td><strong>{FILES_PER_DAY}</strong></td>
-	</tr>
-
-
-	<tr>
-		<td>{L_BOARD_STARTED}: </td>
-		<td><strong>{START_DATE}</strong></td>
-		<td>{L_AVATAR_DIR_SIZE}: </td>
-		<td><strong>{AVATAR_DIR_SIZE}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_DATABASE_SIZE}: </td>
-		<td><strong>{DBSIZE}</strong></td>
-		<td>{L_UPLOAD_DIR_SIZE}: </td>
-		<td><strong>{UPLOAD_DIR_SIZE}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_DATABASE_SERVER_INFO}: </td>
-		<td><strong>{DATABASE_INFO}</strong></td>
-		<td>{L_GZIP_COMPRESSION}: </td>
-		<td><strong>{GZIP_COMPRESSION}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_BOARD_VERSION}: </td>
-		<td><strong>{BOARD_VERSION}</strong></td>
-	<!-- IF S_TOTAL_ORPHAN -->
-		<td>{L_NUMBER_ORPHAN}: </td>
-		<td><strong>{TOTAL_ORPHAN}</strong></td>
-	<!-- ELSE -->
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-	<!-- ENDIF -->
-	</tr>
-	</tbody>
-	</table>
-
-	<!-- IF S_ACTION_OPTIONS -->
-		<fieldset>
-			<legend>{L_STATISTIC_RESYNC_OPTIONS}</legend>
-
-			<form id="action_online_form" method="post" action="{U_ACTION}">
-				<dl>
-					<dt><label for="action_online">{L_RESET_ONLINE}</label><br /><span>&nbsp;</span></dt>
-					<dd><input type="hidden" name="action" value="online" /><input class="button2" type="submit" id="action_online" name="action_online" value="{L_RUN}" /></dd>
-				</dl>
-			</form>
-
-			<form id="action_date_form" method="post" action="{U_ACTION}">
-				<dl>
-					<dt><label for="action_date">{L_RESET_DATE}</label><br /><span>&nbsp;</span></dt>
-					<dd><input type="hidden" name="action" value="date" /><input class="button2" type="submit" id="action_date" name="action_date" value="{L_RUN}" /></dd>
-				</dl>
-			</form>
-
-			<form id="action_stats_form" method="post" action="{U_ACTION}">
-				<dl>
-					<dt><label for="action_stats">{L_RESYNC_STATS}</label><br /><span>{L_RESYNC_STATS_EXPLAIN}</span></dt>
-					<dd><input type="hidden" name="action" value="stats" /><input class="button2" type="submit" id="action_stats" name="action_stats" value="{L_RUN}" /></dd>
-				</dl>
-			</form>
-
-			<form id="action_user_form" method="post" action="{U_ACTION}">
-				<dl>
-					<dt><label for="action_user">{L_RESYNC_POSTCOUNTS}</label><br /><span>{L_RESYNC_POSTCOUNTS_EXPLAIN}</span></dt>
-					<dd><input type="hidden" name="action" value="user" /><input class="button2" type="submit" id="action_user" name="action_user" value="{L_RUN}" /></dd>
-				</dl>
-			</form>
-
-			<form id="action_db_track_form" method="post" action="{U_ACTION}">
-				<dl>
-					<dt><label for="action_db_track">{L_RESYNC_POST_MARKING}</label><br /><span>{L_RESYNC_POST_MARKING_EXPLAIN}</span></dt>
-					<dd><input type="hidden" name="action" value="db_track" /><input class="button2" type="submit" id="action_db_track" name="action_db_track" value="{L_RUN}" /></dd>
-				</dl>
-			</form>
-
-			<!-- IF S_FOUNDER -->
-			<form id="action_purge_cache_form" method="post" action="{U_ACTION}">
-				<dl>
-					<dt><label for="action_purge_cache">{L_PURGE_CACHE}</label><br /><span>{L_PURGE_CACHE_EXPLAIN}</span></dt>
-					<dd><input type="hidden" name="action" value="purge_cache" /><input class="button2" type="submit" id="action_purge_cache" name="action_purge_cache" value="{L_RUN}" /></dd>
-				</dl>
-			</form>
-			<!-- ENDIF -->
-  		</fieldset>
-	<!-- ENDIF -->
-
-	<!-- IF .log -->
-		<h2>{L_ADMIN_LOG}</h2>
-
-		<p>{L_ADMIN_LOG_INDEX_EXPLAIN}</p>
-
-		<div style="text-align: right;"><a href="{U_ADMIN_LOG}">&raquo; {L_VIEW_ADMIN_LOG}</a></div>
-
-		<table cellspacing="1">
-		<thead>
-		<tr>
-			<th>{L_USERNAME}</th>
-			<th>{L_IP}</th>
-			<th>{L_TIME}</th>
-			<th>{L_ACTION}</th>
-		</tr>
-		</thead>
-		<tbody>
-		<!-- BEGIN log -->
-			<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-				<td>{log.USERNAME}</td>
-				<td style="text-align: center;">{log.IP}</td>
-				<td style="text-align: center;">{log.DATE}</td>
-				<td>{log.ACTION}</td>
-			</tr>
-		<!-- END log -->
-		</tbody>
-		</table>
-
-		<br />
-
-	<!-- ENDIF -->
-
-	<!-- IF S_INACTIVE_USERS -->
-		<h2>{L_INACTIVE_USERS}</h2>
-
-		<p>{L_INACTIVE_USERS_EXPLAIN_INDEX}</p>
-
-		<div style="text-align: right;"><a href="{U_INACTIVE_USERS}">&raquo; {L_VIEW_INACTIVE_USERS}</a></div>
-
-		<table cellspacing="1">
-		<thead>
-		<tr>
-			<th>{L_USERNAME}</th>
-			<th>{L_JOINED}</th>
-			<th>{L_INACTIVE_DATE}</th>
-			<th>{L_INACTIVE_REASON}</th>
-			<th>{L_LAST_VISIT}</th>
-		</tr>
-		</thead>
-		<tbody>
-		<!-- BEGIN inactive -->
-			<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-				<td><a href="{inactive.U_USER_ADMIN}">{inactive.USERNAME}</a></td>
-				<td>{inactive.JOINED}</td>
-				<td>{inactive.INACTIVE_DATE}</td>
-				<td>{inactive.REASON}</td>
-				<td>{inactive.LAST_VISIT}</td>
-			</tr>
-		<!-- BEGINELSE -->
-			<tr>
-				<td colspan="5" style="text-align: center;">{L_NO_INACTIVE_USERS}</td>
-			</tr>
-		<!-- END inactive -->
-		</tbody>
-		</table>
-
-	<!-- ENDIF -->
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html
deleted file mode 100644
index 5396e78557..0000000000
--- a/phpBB/adm/style/acp_modules.html
+++ /dev/null
@@ -1,212 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_EDIT_MODULE -->
-
-	<script type="text/javascript">
-	// <![CDATA[
-		function display_options(value)
-		{
-			if (value == 'category')
-			{
-				dE('modoptions', -1);
-			}
-			else
-			{
-				dE('modoptions', 1);
-			}
-		}
-
-		function display_modes(value)
-		{
-			// Find the old select tag
-			var item = document.getElementById('module_mode');
-
-			// Create the new select tag
-			var new_node = document.createElement('select');
-			new_node.setAttribute('id', 'module_mode');
-			new_node.setAttribute('name', 'module_mode');
-
-			// Substitute it for the old one
-			item.parentNode.replaceChild(new_node, item);
-
-			// Reset the variable
-			item = document.getElementById('module_mode');
-
-			var j = 0;
-<!-- BEGIN m_names -->
-		
-			if (value == '{m_names.A_NAME}')
-			{
-	<!-- BEGIN modes -->
-				item.options[j] = new Option('{m_names.modes.A_VALUE}');
-				item.options[j].value = '{m_names.modes.A_OPTION}';
-				j++;
-	<!-- END modes -->
-			}
-<!-- END m_names -->
-
-			// select first item
-			item.options[0].selected = true;
-		}
-
-	// ]]>
-	</script>
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE} :: {MODULENAME}</h1>
-
-	<p>{L_EDIT_MODULE_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="moduleedit" method="post" action="{U_EDIT_ACTION}">
-
-	<fieldset>
-		<legend>{L_GENERAL_OPTIONS}</legend>
-	<dl>
-		<dt><label for="module_langname">{L_MODULE_LANGNAME}:</label><br />
-		<span>{L_MODULE_LANGNAME_EXPLAIN}</span></dt>
-		<dd><input name="module_langname" type="text" class="text medium" id="module_langname" value="{MODULE_LANGNAME}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="module_type">{L_MODULE_TYPE}:</label></dt>
-		<dd><select name="module_type" id="module_type" onchange="display_options(this.value);"><option value="category"<!-- IF S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_CATEGORY}</option><option value="module"<!-- IF not S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_MODULE}</option></select></dd>
-	</dl>
-	<dl>
-		<dt><label for="parent_id">{L_PARENT}:</label></dt>
-		<dd><select name="module_parent_id" id="parent_id">{S_CAT_OPTIONS}</select></dd>
-	</dl>
-	<hr />
-	<dl>
-		<dt><label for="module_enabled">{L_MODULE_ENABLED}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="module_enabled" id="module_enabled" value="1"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="module_enabled" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<div id="modoptions"<!-- IF S_IS_CAT --> style="display: none;"<!-- ENDIF -->>
-		<dl>
-			<dt><label for="module_display">{L_MODULE_DISPLAYED}:</label><br /><span>{L_MODULE_DISPLAYED_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="module_display" id="module_display" value="1"<!-- IF MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="module_display" value="0"<!-- IF not MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="module_basename">{L_CHOOSE_MODULE}:</label><br />
-			<span>{L_CHOOSE_MODULE_EXPLAIN}</span></dt>
-			<dd><select name="module_basename" id="module_basename" onchange="display_modes(this.value);">{S_MODULE_NAMES}</select></dd>
-		</dl>
-		<dl>
-			<dt><label for="module_mode">{L_CHOOSE_MODE}:</label><br />
-			<span>{L_CHOOSE_MODE_EXPLAIN}</span></dt>
-			<dd><select name="module_mode" id="module_mode">{S_MODULE_MODES}</select></dd>
-		</dl>
-	</div>
-
-	<p class="submit-buttons">
-		<input type="hidden" name="action" value="{ACTION}" />
-		<input type="hidden" name="m" value="{MODULE_ID}" />
-		
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSE -->
-
-	<h1>{L_ACP_MODULE_MANAGEMENT}</h1>
-
-	<p>{L_ACP_MODULE_MANAGEMENT_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<table cellspacing="1">
-	<tbody>
-	<tr>
-		<td class="row3">{NAVIGATION}<!-- IF S_NO_MODULES --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a> | <!-- IF MODULE_ENABLED --><a href="{U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->]<!-- ENDIF --></td>
-	</tr>
-	</tbody>
-	</table>
-
-	<!-- IF .modules -->
-		<table cellspacing="1">
-			<col class="row1" /><col class="row1" /><col class="row2" /><col class="row2" />
-		<tbody>
-		<!-- BEGIN modules -->
-			<tr>
-				<td style="width: 5%; text-align: center;">{modules.MODULE_IMAGE}</td>
-				<td><a href="{modules.U_MODULE}">{modules.MODULE_TITLE}</a><!-- IF not modules.MODULE_DISPLAYED --> <span class="small">[{L_HIDDEN_MODULE}]</span><!-- ENDIF --></td>
-				<td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;">&nbsp;<!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->&nbsp;</td>
-				<td style="width:90px; white-space: nowrap; text-align: right; vertical-align: middle;">
-					<!-- IF modules.S_FIRST_ROW && not modules.S_LAST_ROW -->
-						{ICON_MOVE_UP_DISABLED}
-						<a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-					<!-- ELSEIF not modules.S_FIRST_ROW && not modules.S_LAST_ROW-->
-						<a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
-						<a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
-					<!-- ELSEIF modules.S_LAST_ROW && not modules.S_FIRST_ROW -->
-						<a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
-						{ICON_MOVE_DOWN_DISABLED}
-					<!-- ELSE -->
-						{ICON_MOVE_UP_DISABLED}
-						{ICON_MOVE_DOWN_DISABLED}
-					<!-- ENDIF -->
-					<a href="{modules.U_EDIT}">{ICON_EDIT}</a> 
-					<a href="{modules.U_DELETE}">{ICON_DELETE}</a>
-				</td>
-			</tr>
-		<!-- END modules -->
-		</tbody>
-		</table>
-	<!-- ENDIF -->
-
-	<div class="clearfix">&nbsp;</div>
-
-	<form id="quick" method="post" action="{U_ACTION}">
-
-	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
-		<input type="hidden" name="action" value="quickadd" />
-
-		<select name="quick_install">{S_INSTALL_OPTIONS}</select>
-		<input class="button2" name="quickadd" type="submit" value="{L_ADD_MODULE}" />
-	</fieldset>
-	
-	</form>
-
-	<form id="module" method="post" action="{U_ACTION}">
-
-	<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
-		<input type="hidden" name="action" value="add" />
-		<input type="hidden" name="module_parent_id" value="{PARENT_ID}" />
-
-		<input type="text" name="module_langname" maxlength="255" /> 
-		<input class="button2" name="addmodule" type="submit" value="{L_CREATE_MODULE}" />
-	</fieldset>
-
-	</form>
-
-	<div class="clearfix">&nbsp;</div><br style="clear: both;" />
-	
-	<form id="mselect" method="post" action="{U_SEL_ACTION}">
-	<fieldset class="quick">
-		{L_SELECT_MODULE}: <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{MODULE_BOX}</select> 
-
-		<input class="button2" type="submit" value="{L_GO}" />
-	</fieldset>
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html
deleted file mode 100644
index 220e7dafbe..0000000000
--- a/phpBB/adm/style/acp_permission_roles.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_EDIT -->
-
-	<script type="text/javascript">
-	// <![CDATA[
-		var active_pmask = '0';
-		var active_fmask = '0';
-		var active_cat = '0';
-
-		var id = '000';
-
-		var role_options = new Array();
-
-		<!-- IF S_ROLE_JS_ARRAY -->
-			{S_ROLE_JS_ARRAY}
-		<!-- ENDIF -->
-	// ]]>
-	</script>
-
-	<script type="text/javascript" src="style/permissions.js"></script>
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<br />
-	<a href="#acl">&raquo; {L_SET_ROLE_PERMISSIONS}</a>
-
-	<form id="acp_roles" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_ROLE_DETAILS}</legend>
-	<dl>
-		<dt><label for="role_name">{L_ROLE_NAME}:</label></dt>
-		<dd><input name="role_name" type="text" id="role_name" value="{ROLE_NAME}" maxlength="255" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="role_description">{L_ROLE_DESCRIPTION}:</label><br /><span>{L_ROLE_DESCRIPTION_EXPLAIN}</span></dt>
-		<dd><textarea id="role_description" name="role_description" rows="3" cols="45">{ROLE_DESCRIPTION}</textarea></dd>
-	</dl>
-
-	<p class="quick">
-		<input type="submit" class="button1" name="submit" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
-	</p>
-	</fieldset>
-
-	<!-- IF S_DISPLAY_ROLE_MASK -->
-
-		<h1>{L_ROLE_ASSIGNED_TO}</h1>
-
-		<!-- INCLUDE permission_roles_mask.html -->
-
-	<!-- ENDIF -->
-
-	<p>
-
-	<a name="acl"></a>
-
-	<a href="#maincontent">&raquo; {L_BACK_TO_TOP}</a><br />
-	<br /><br />
-
-	</p>
-
-	<h1>{L_ACL_TYPE}</h1>
-
-	<fieldset class="perm nolegend">
-
-		<div id="advanced00">
-			<div class="permissions-category">
-				<ul>
-				<!-- BEGIN auth -->
-					<!-- IF auth.S_YES -->
-						<li class="permissions-preset-yes<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
-					<!-- ELSEIF auth.S_NEVER -->
-						<li class="permissions-preset-never<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
-					<!-- ELSEIF auth.S_NO -->
-						<li class="permissions-preset-no<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
-					<!-- ELSE -->
-						<li class="permissions-preset-custom<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
-					<!-- ENDIF -->
-						<a href="#" onclick="swap_options('0','0','{auth.S_ROW_COUNT}'); return false;"><span class="tabbg"><span class="colour"></span>{auth.CAT_NAME}</span></a></li>	
-				<!-- END auth -->
-				</ul>
-			</div>
-			<!-- BEGIN auth -->
-			<div class="permissions-panel" id="options00{auth.S_ROW_COUNT}"<!-- IF auth.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
-				<span class="corners-top"><span></span></span>
-				<div class="tablewrap">
-					<table id="table00{auth.S_ROW_COUNT}" cellspacing="1">
-					<colgroup>
-						<col class="permissions-name" />
-						<col class="permissions-yes" />
-						<col class="permissions-no" />
-						<col class="permissions-never" />
-					</colgroup>
-					<thead>
-					<tr>
-						<th class="name" scope="col"><strong>{L_ACL_SETTING}</strong></th>
-						<th class="value permissions-yes" scope="col"><a href="#" onclick="mark_options('options00{auth.S_ROW_COUNT}', 'y'); set_colours('00{auth.S_ROW_COUNT}', false, 'yes'); return false;">{L_ACL_YES}</a></th>
-						<th class="value permissions-no" scope="col"><a href="#" onclick="mark_options('options00{auth.S_ROW_COUNT}', 'u'); set_colours('00{auth.S_ROW_COUNT}', false, 'no'); return false;">{L_ACL_NO}</a></th>
-						<th class="value permissions-never" scope="col"><a href="#" onclick="mark_options('options00{auth.S_ROW_COUNT}', 'n'); set_colours('00{auth.S_ROW_COUNT}', false, 'never'); return false;">{L_ACL_NEVER}</a></th>
-					</tr>
-					</thead>
-					<tbody>
-					<!-- BEGIN mask -->
-						<!-- IF auth.mask.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
-						<th class="permissions-name<!-- IF auth.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->">{auth.mask.PERMISSION}</th>
-							
-						<td class="permissions-yes"><label for="setting_{auth.mask.FIELD_NAME}_y"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_y" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></label></td>
-						<td class="permissions-no"><label for="setting_{auth.mask.FIELD_NAME}_u"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_u" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NO --> checked="checked"<!-- ENDIF --> value="-1" /></label></td>
-						<td class="permissions-never"><label for="setting_{auth.mask.FIELD_NAME}_n"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_n" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NEVER --> checked="checked"<!-- ENDIF --> value="0" /></label></td>
-					</tr>
-					<!-- END mask -->
-					</tbody>
-					</table>
-				</div>
-				<span class="corners-bottom"><span></span></span>
-			</div>
-			<!-- END auth -->
-		</div>
-
-	</fieldset>
-
-	<fieldset class="quick">
-		<input type="submit" class="button1" name="submit" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-	<a href="#maincontent">&raquo; {L_BACK_TO_TOP}</a><br />
-	<br />
-
-<!-- ELSE -->
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<form id="acp_roles" method="post" action="{U_ACTION}">
-
-	<table cellspacing="1">
-		<col class="col2" /><col class="col2" /><col class="col1" /><col class="col2" /><col class="col2" />
-	<thead>
-	<tr>
-		<th>{L_ROLE_NAME}</th>
-		<th colspan="2">{L_OPTIONS}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN roles -->
-	<tr>
-		<td style="vertical-align: top;"><strong>{roles.ROLE_NAME}</strong>
-			<!-- IF roles.ROLE_DESCRIPTION --><br /><span>{roles.ROLE_DESCRIPTION}</span><!-- ENDIF -->
-		</td>
-		<td style="width: 30%; text-align: center; vertical-align: top; white-space: nowrap;"><!-- IF roles.U_DISPLAY_ITEMS --><a href="{roles.U_DISPLAY_ITEMS}">{L_VIEW_ASSIGNED_ITEMS}</a><!-- ELSE -->{L_VIEW_ASSIGNED_ITEMS}<!-- ENDIF --></td>
-		<td style="width: 80px; text-align: right; vertical-align: top; white-space: nowrap;">
-			<!-- IF roles.S_FIRST_ROW && not roles.S_LAST_ROW -->
-				{ICON_MOVE_UP_DISABLED}
-				<a href="{roles.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-			<!-- ELSEIF not roles.S_FIRST_ROW && not roles.S_LAST_ROW-->
-				<a href="{roles.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
-				<a href="{roles.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
-			<!-- ELSEIF roles.S_LAST_ROW && not roles.S_FIRST_ROW -->
-				<a href="{roles.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
-				{ICON_MOVE_DOWN_DISABLED}
-			<!-- ELSE -->
-				{ICON_MOVE_UP_DISABLED}
-				{ICON_MOVE_DOWN_DISABLED}
-			<!-- ENDIF -->	
-			<a href="{roles.U_EDIT}" title="{L_EDIT_ROLE}">{ICON_EDIT}</a> 
-			<a href="{roles.U_REMOVE}" title="{L_REMOVE_ROLE}">{ICON_DELETE}</a>
-		</td>
-	</tr>
-	<!-- END roles -->
-	</tbody>
-	</table>
-
-	<fieldset class="quick">
-		{L_CREATE_ROLE}: <input type="text" name="role_name" value="" maxlength="255" /><!-- IF S_ROLE_OPTIONS --> <select name="options_from"><option value="0" selected="selected">{L_CREATE_ROLE_FROM}</option>{S_ROLE_OPTIONS}</select><!-- ENDIF --> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" /><br />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-	<!-- IF S_DISPLAY_ROLE_MASK -->
-
-		<a name="assigned_to"></a>
-
-		<h1>{L_ROLE_ASSIGNED_TO}</h1>
-
-		<!-- INCLUDE permission_roles_mask.html -->
-
-	<!-- ENDIF -->
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html
deleted file mode 100644
index 63583093b0..0000000000
--- a/phpBB/adm/style/acp_permissions.html
+++ /dev/null
@@ -1,357 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_INTRO -->
-
-	<h1>{L_ACP_PERMISSIONS}</h1>
-
-	{L_ACP_PERMISSIONS_EXPLAIN}
-
-<!-- ENDIF -->
-
-<!-- IF S_SELECT_VICTIM -->
-
-	<!-- IF U_BACK --><a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a><!-- ENDIF -->
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<!-- IF S_FORUM_NAMES -->
-		<p><strong>{L_FORUMS}:</strong> {FORUM_NAMES}</p>
-	<!-- ENDIF -->
-
-	<!-- IF S_SELECT_FORUM -->
-
-		<form id="select_victim" method="post" action="{U_ACTION}">
-
-		<fieldset>
-			<legend>{L_LOOK_UP_FORUM}</legend>
-			<!-- IF S_FORUM_MULTIPLE --><p>{L_LOOK_UP_FORUMS_EXPLAIN}</p><!-- ENDIF -->
-		<dl>
-			<dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt>
-			<dd><select id="forum" name="forum_id[]"<!-- IF S_FORUM_MULTIPLE --> multiple="multiple"<!-- ENDIF --> size="10">{S_FORUM_OPTIONS}</select></dd>
-			<!-- IF S_FORUM_ALL --><dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd><!-- ENDIF -->
-		</dl>
-
-		<p class="quick">
-			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
-			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-		</p>
-
-		</fieldset>
-		</form>
-
-		<!-- IF S_FORUM_MULTIPLE -->
-
-			<form id="select_subforum" method="post" action="{U_ACTION}">
-
-			<fieldset>
-				<legend>{L_LOOK_UP_FORUM}</legend>
-				<p>{L_SELECT_FORUM_SUBFORUM_EXPLAIN}</p>
-			<dl>
-				<dt><label for="sforum">{L_LOOK_UP_FORUM}:</label></dt>
-				<dd><select id="sforum" name="subforum_id">{S_SUBFORUM_OPTIONS}</select></dd>
-			</dl>
-
-			<p class="quick">
-				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
-				<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-			</p>
-
-			</fieldset>
-			</form>
-
-		<!-- ENDIF -->
-
-	<!-- ELSEIF S_SELECT_USER and S_CAN_SELECT_USER -->
-
-		<form id="select_victim" method="post" action="{U_ACTION}">
-
-		<fieldset>
-			<legend>{L_LOOK_UP_USER}</legend>
-		<dl>
-			<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
-			<dd><input class="text medium" type="text" id="username" name="username[]" /></dd>
-			<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
-			<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
-		</dl>
-
-		<p class="quick">
-			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
-			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-		</p>
-		</fieldset>
-		</form>
-
-	<!-- ELSEIF S_SELECT_GROUP and S_CAN_SELECT_GROUP -->
-
-		<form id="select_victim" method="post" action="{U_ACTION}">
-
-		<fieldset>
-			<legend>{L_LOOK_UP_GROUP}</legend>
-		<dl>
-			<dt><label for="group">{L_LOOK_UP_GROUP}:</label></dt>
-			<dd><select name="group_id[]" id="group">{S_GROUP_OPTIONS}</select></dd>
-		</dl>
-
-		<p class="quick">
-			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
-			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-		</p>
-
-		</fieldset>
-		</form>
-
-		<!-- ELSEIF S_SELECT_USERGROUP -->
-
-		<div style="float: {S_CONTENT_FLOW_BEGIN}; width: 48%;">
-
-		<!-- IF S_CAN_SELECT_USER -->
-
-			<h1>{L_USERS}</h1>
-
-			<form id="users" method="post" action="{U_ACTION}">
-
-			<fieldset>
-				<legend>{L_MANAGE_USERS}</legend>
-			<dl>
-				<dd class="full"><select style="width: 100%;" name="user_id[]" multiple="multiple" size="5">{S_DEFINED_USER_OPTIONS}</select></dd>
-				<!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_users" value="1" /> {L_ALL_USERS}</label></dd><!-- ENDIF -->
-			</dl>
-			</fieldset>
-
-			<fieldset class="quick">
-				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
-				<input type="submit" class="button2" name="action[delete]" value="{L_REMOVE_PERMISSIONS}" style="width: 46% !important;" /> &nbsp; <input class="button1" type="submit" name="submit_edit_options" value="{L_EDIT_PERMISSIONS}" style="width: 46% !important;" />
-			</fieldset>
-			</form>
-
-			<form id="add_user" method="post" action="{U_ACTION}">
-
-			<fieldset>
-				<legend>{L_ADD_USERS}</legend>
-				<p>{L_USERNAMES_EXPLAIN}</p>
-			<dl>
-				<dd class="full"><textarea id="username" name="usernames" rows="5" cols="5" style="width: 100%; height: 60px;"></textarea></dd>
-				<dd class="full" style="text-align: left;"><div style="float: {S_CONTENT_FLOW_END};">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</div><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
-			</dl>
-			</fieldset>
-
-			<fieldset class="quick">
-				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
-				<input class="button1" type="submit" name="submit_add_options" value="{L_ADD_PERMISSIONS}" />
-			</fieldset>
-			</form>
-
-		<!-- ENDIF -->
-
-		</div>
-
-		<div style="float: {S_CONTENT_FLOW_END}; width: 48%">
-
-		<!-- IF S_CAN_SELECT_GROUP -->
-
-			<h1>{L_USERGROUPS}</h1>
-
-			<form id="groups" method="post" action="{U_ACTION}">
-
-			<fieldset>
-				<legend>{L_MANAGE_GROUPS}</legend>
-			<dl>
-				<dd class="full"><select style="width: 100%;" name="group_id[]" multiple="multiple" size="5">{S_DEFINED_GROUP_OPTIONS}</select></dd>
-				<!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_groups" value="1" /> {L_ALL_GROUPS}</label></dd><!-- ENDIF -->
-			</dl>
-			</fieldset>
-
-			<fieldset class="quick">
-				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
-				<input class="button2" type="submit" name="action[delete]" value="{L_REMOVE_PERMISSIONS}" style="width: 46% !important;" /> &nbsp; <input class="button1" type="submit" name="submit_edit_options" value="{L_EDIT_PERMISSIONS}" style="width: 46% !important;" />
-			</fieldset>
-			</form>
-
-			<form id="add_groups" method="post" action="{U_ACTION}">
-
-			<fieldset>
-				<legend>{L_ADD_GROUPS}</legend>
-			<dl>
-				<dd class="full"><select name="group_id[]" style="width: 100%; height: 107px;" multiple="multiple">{S_ADD_GROUP_OPTIONS}</select></dd>
-			</dl>
-			</fieldset>
-
-			<fieldset class="quick">
-				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
-				<input type="submit" class="button1" name="submit_add_options" value="{L_ADD_PERMISSIONS}" />
-			</fieldset>
-			</form>
-
-		<!-- ENDIF -->
-
-		</div>
-
-	<!-- ELSEIF S_SELECT_USERGROUP_VIEW -->
-
-		<div style="float: {S_CONTENT_FLOW_BEGIN}; width: 48%;">
-
-			<h1>{L_USERS}</h1>
-
-			<form id="users" method="post" action="{U_ACTION}">
-
-			<fieldset>
-				<legend>{L_MANAGE_USERS}</legend>
-			<dl>
-				<dd class="full"><select style="width: 100%;" name="user_id[]" multiple="multiple" size="5">{S_DEFINED_USER_OPTIONS}</select></dd>
-			</dl>
-			</fieldset>
-
-			<fieldset class="quick">
-				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
-				<input class="button1" type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" />
-			</fieldset>
-			</form>
-
-			<form id="add_user" method="post" action="{U_ACTION}">
-
-			<fieldset>
-				<legend>{L_LOOK_UP_USER}</legend>
-			<dl>
-				<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
-				<dd><input type="text" id="username" name="username[]" /></dd>
-				<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
-				<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
-			</dl>
-			</fieldset>
-
-			<fieldset class="quick">
-				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
-				<input type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" class="button1" />
-			</fieldset>
-			</form>
-
-		</div>
-
-		<div style="float: {S_CONTENT_FLOW_END}; width: 48%">
-
-			<h1>{L_USERGROUPS}</h1>
-
-			<form id="groups" method="post" action="{U_ACTION}">
-
-			<fieldset>
-				<legend>{L_MANAGE_GROUPS}</legend>
-			<dl>
-				<dd class="full"><select style="width: 100%;" name="group_id[]" multiple="multiple" size="5">{S_DEFINED_GROUP_OPTIONS}</select></dd>
-			</dl>
-			</fieldset>
-
-			<fieldset class="quick">
-				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
-				<input class="button1" type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" />
-			</fieldset>
-			</form>
-
-			<form id="group" method="post" action="{U_ACTION}">
-
-			<fieldset>
-				<legend>{L_LOOK_UP_GROUP}</legend>
-			<dl>
-				<dt><label for="group_select">{L_LOOK_UP_GROUP}:</label></dt>
-				<dd><select name="group_id[]" id="group_select">{S_ADD_GROUP_OPTIONS}</select></dd>
-				<dd>&nbsp;</dd>
-			</dl>
-			</fieldset>
-
-			<fieldset class="quick">
-				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
-				<input type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" class="button1" />
-			</fieldset>
-			</form>
-
-		</div>
-
-	<!-- ENDIF -->
-
-<!-- ENDIF -->
-
-<!-- IF S_VIEWING_PERMISSIONS -->
-
-	<h1>{L_ACL_VIEW}</h1>
-
-	<p>{L_ACL_VIEW_EXPLAIN}</p>
-
-	<fieldset class="quick">
-		<strong>&raquo; {L_PERMISSION_TYPE}</strong>
-	</fieldset>
-
-	<!-- INCLUDE permission_mask.html -->
-
-<!-- ENDIF -->
-
-<!-- IF S_SETTING_PERMISSIONS -->
-
-	<h1>{L_ACL_SET}</h1>
-
-	<p>{L_ACL_SET_EXPLAIN}</p>
-
-	<br />
-
-	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
-		<strong>&raquo; {L_PERMISSION_TYPE}</strong>
-	</fieldset>
-
-	<!-- IF S_PERMISSION_DROPDOWN -->
-		<form id="pselect" method="post" action="{U_ACTION}">
-
-		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
-			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
-			{L_SELECT_TYPE}: <select name="type">{S_PERMISSION_DROPDOWN}</select>
-
-			<input class="button2" type="submit" name="submit" value="{L_GO}" />
-		</fieldset>
-		</form>
-	<!-- ENDIF -->
-
-	<br /><br />
-
-	<!-- include tooltip file -->
-	<script type="text/javascript" src="style/tooltip.js"></script>
-	<script type="text/javascript">
-	// <![CDATA[
-		window.onload = function(){enable_tooltips_select('set-permissions', '{LA_ROLE_DESCRIPTION}', 'role')};
-	// ]]>
-	</script>
-
-	<form id="set-permissions" method="post" action="{U_ACTION}">
-
-	{S_HIDDEN_FIELDS}
-
-	<!-- INCLUDE permission_mask.html -->
-
-	<br /><br />
-
-	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
-		<input class="button1" type="submit" name="action[apply_all_permissions]" value="{L_APPLY_ALL_PERMISSIONS}" />
-		<input class="button2" type="button" name="cancel" value="{L_RESET}" onclick="document.forms['set-permissions'].reset(); init_colours(active_pmask + active_fmask);" />
-		{S_FORM_TOKEN}
-	</fieldset>
-
-	<br /><br />
-
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/adm/style/acp_php_info.html b/phpBB/adm/style/acp_php_info.html
deleted file mode 100644
index de065c4896..0000000000
--- a/phpBB/adm/style/acp_php_info.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h1>{L_ACP_PHP_INFO}</h1>
-
-<p>{L_ACP_PHP_INFO_EXPLAIN}</p>
-
-<div class="phpinfo">
-	{PHPINFO}
-</div>
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html
deleted file mode 100644
index eec975ad25..0000000000
--- a/phpBB/adm/style/acp_profile.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_EDIT -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<!-- IF ERROR_MSG -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="add_profile_field" method="post" action="{U_ACTION}">
-
-	<!-- IF S_STEP_ONE -->
-
-		<fieldset>
-			<legend>{L_TITLE}</legend>
-		<dl>
-			<dt><label>{L_FIELD_TYPE}:</label><br /><span>{L_FIELD_TYPE_EXPLAIN}</span></dt>
-			<dd><strong>{FIELD_TYPE}</strong></dd>
-		</dl>
-		<!-- IF S_EDIT_MODE -->
-		<dl>
-			<dt><label>{L_FIELD_IDENT}:</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
-			<dd><input type="hidden" name="field_ident" value="{FIELD_IDENT}" /><strong>{FIELD_IDENT}</strong></dd>
-		</dl>
-		<!-- ELSE -->
-		<dl>
-			<dt><label for="field_ident">{L_FIELD_IDENT}:</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
-			<dd><input class="text medium" type="text" id="field_ident" name="field_ident" value="{FIELD_IDENT}" /></dd>
-		</dl>
-		<!-- ENDIF -->
-		<dl>
-			<dt><label for="field_no_view">{L_DISPLAY_PROFILE_FIELD}:</label><br /><span>{L_DISPLAY_PROFILE_FIELD_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" id="field_no_view" name="field_no_view" value="0"<!-- IF not S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="field_no_view" value="1"<!-- IF S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		</fieldset>
-
-		<fieldset>
-			<legend>{L_VISIBILITY_OPTION}</legend>
-		<dl>
-			<dt><label for="field_option_none">{L_DISPLAY_AT_PROFILE}:</label><br /><span>{L_DISPLAY_AT_PROFILE_EXPLAIN}</span></dt>
-			<dd><input type="radio" class="radio" id="field_option_none" name="field_option" value="none"<!-- IF not S_SHOW_ON_REG and not S_FIELD_REQUIRED and not S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd>
-		</dl>
-		<dl>
-			<dt><label for="field_show_on_reg">{L_DISPLAY_AT_REGISTER}:</label><br /><span>{L_DISPLAY_AT_REGISTER_EXPLAIN}</span></dt>
-			<dd><input type="radio" class="radio" id="field_show_on_reg" name="field_option" value="field_show_on_reg"<!-- IF S_SHOW_ON_REG --> checked="checked"<!-- ENDIF --> /></dd>
-		</dl>
-		<dl>
-			<dt><label for="field_required">{L_REQUIRED_FIELD}:</label><br /><span>{L_REQUIRED_FIELD_EXPLAIN}</span></dt>
-			<dd><input type="radio" class="radio" id="field_required" name="field_option" value="field_required"<!-- IF S_FIELD_REQUIRED --> checked="checked"<!-- ENDIF --> /></dd>
-		</dl>
-		<dl>
-			<dt><label for="field_hide">{L_HIDE_PROFILE_FIELD}:</label><br /><span>{L_HIDE_PROFILE_FIELD_EXPLAIN}</span></dt>
-			<dd><input type="radio" class="radio" id="field_hide" name="field_option" value="field_hide"<!-- IF S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd>
-		</dl>
-		</fieldset>
-
-		<!-- IF S_EDIT_MODE -->
-			<fieldset class="quick">
-				<input class="button1" type="submit" name="save" value="{L_SAVE}" />
-			</fieldset>
-		<!-- ENDIF -->
-
-		<fieldset>
-			<legend>{L_LANG_SPECIFIC}</legend>
-		<dl>
-			<dt><label for="lang_name">{L_USER_FIELD_NAME}:</label></dt>
-			<dd><input class="text medium" type="text" id="lang_name" name="lang_name" value="{LANG_NAME}" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="lang_explain">{L_FIELD_DESCRIPTION}:</label><br /><span>{L_FIELD_DESCRIPTION_EXPLAIN}</span></dt>
-			<dd><textarea id="lang_explain" name="lang_explain" rows="3" cols="80">{LANG_EXPLAIN}</textarea></dd>
-		</dl>
-		<!-- IF S_TEXT or S_STRING -->
-			<dl>
-				<dt><label for="lang_default_value">{L_DEFAULT_VALUE}:</label><br /><span>{L_DEFAULT_VALUE_EXPLAIN}</span></dt>
-				<dd><!-- IF S_STRING --><input class="text medium" type="text" id="lang_default_value" name="lang_default_value" value="{LANG_DEFAULT_VALUE}" /><!-- ELSE --><textarea id="lang_default_value" name="lang_default_value" rows="5" cols="80">{LANG_DEFAULT_VALUE}</textarea><!-- ENDIF --></dd>
-			</dl>
-		<!-- ENDIF -->
-		<!-- IF S_BOOL or S_DROPDOWN -->
-			<dl>
-				<dt><label for="lang_options">{L_ENTRIES}:</label>
-					<!-- IF S_EDIT_MODE and S_DROPDOWN -->
-						<br /><span>{L_EDIT_DROPDOWN_LANG_EXPLAIN}</span>
-					<!-- ELSE -->
-						<br /><span>{L_LANG_OPTIONS_EXPLAIN}</span>
-					<!-- ENDIF -->
-				</dt>
-			<!-- IF S_DROPDOWN -->
-				<dd><textarea id="lang_options" name="lang_options" rows="5" cols="80">{LANG_OPTIONS}</textarea></dd>
-			<!-- ELSE -->
-				<dd><input class="medium" id="lang_options" name="lang_options[0]" value="{FIRST_LANG_OPTION}" /> {L_FIRST_OPTION}</dd>
-				<dd><input class="medium" name="lang_options[1]" value="{SECOND_LANG_OPTION}" /> {L_SECOND_OPTION}</dd>
-			<!-- ENDIF -->
-			</dl>
-		<!-- ENDIF -->
-		</fieldset>
-
-		<fieldset class="quick">
-			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
-			<input class="button1" type="submit" name="next" value="{L_PROFILE_TYPE_OPTIONS}" />
-		</fieldset>
-
-	<!-- ELSEIF S_STEP_TWO -->
-
-		<fieldset>
-			<legend>{L_TITLE}</legend>
-		<!-- BEGIN option -->
-			<dl>
-				<dt><label>{option.TITLE}:</label><!-- IF option.EXPLAIN --><br /><span>{option.EXPLAIN}</span><!-- ENDIF --></dt>
-				<dd>{option.FIELD}</dd>
-			</dl>
-		<!-- END option -->
-		</fieldset>
-
-		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
-			<input class="button1" type="submit" name="prev" value="{L_PROFILE_BASIC_OPTIONS}" />
-		</fieldset>
-		
-		<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
-			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
-			<input class="button1" type="submit" name="next" value="{L_NEXT_STEP}" />
-		</fieldset>
-
-	<!-- ELSEIF S_STEP_THREE -->
-
-		<!-- BEGIN options -->
-			<fieldset>
-				<legend>{options.LANGUAGE}</legend>
-			<!-- BEGIN field -->
-				<dl>
-					<dt><label>{options.field.L_TITLE}:</label><!-- IF options.field.L_EXPLAIN --><br /><span>{options.field.L_EXPLAIN}</span><!-- ENDIF --></dt>
-					{options.field.FIELD}
-				</dl>
-			<!-- END field -->
-			</fieldset>
-		<!-- END options -->
-
-		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
-			<input class="button1" type="submit" name="prev" value="{L_PROFILE_TYPE_OPTIONS}" />
-		</fieldset>
-		
-		<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
-			{S_HIDDEN_FIELDS}
-			<input class="button1" type="submit" name="save" value="{L_SAVE}" />
-			{S_FORM_TOKEN}
-		</fieldset>
-	
-	<!-- ENDIF -->
-	
-	</form>
-
-<!-- ELSE -->
-
-	<h1>{L_ACP_CUSTOM_PROFILE_FIELDS}</h1>
-
-	<!-- IF S_NEED_EDIT -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{L_CUSTOM_FIELDS_NOT_TRANSLATED}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_FIELD_IDENT}</th>
-		<th>{L_FIELD_TYPE}</th>
-		<th colspan="2">{L_OPTIONS}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN fields -->
-		<!-- IF fields.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-		<td>{fields.FIELD_IDENT}</td>
-		<td>{fields.FIELD_TYPE}</td>
-		<td style="text-align: center;"><a href="{fields.U_ACTIVATE_DEACTIVATE}">{fields.L_ACTIVATE_DEACTIVATE}</a><!-- IF fields.S_NEED_EDIT --> | <a href="{fields.U_TRANSLATE}" style="color: red;">{L_TRANSLATE}</a><!-- ENDIF --></td>
-
-		<td style="width: 80px; text-align: right; white-space: nowrap;">
-			<!-- IF fields.S_FIRST_ROW && not fields.S_LAST_ROW -->
-				{ICON_MOVE_UP_DISABLED}
-				<a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-			<!-- ELSEIF not fields.S_FIRST_ROW && not fields.S_LAST_ROW-->
-				<a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
-				<a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
-			<!-- ELSEIF fields.S_LAST_ROW && not fields.S_FIRST_ROW -->
-				<a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-				{ICON_MOVE_DOWN_DISABLED}	
-			<!-- ENDIF -->
-			<!-- IF not fields.S_NEED_EDIT -->
-				<a href="{fields.U_EDIT}">{ICON_EDIT}</a> 
-			<!-- ELSE -->
-				{ICON_EDIT_DISABLED}
-			<!-- ENDIF -->
-			<a href="{fields.U_DELETE}">{ICON_DELETE}</a>
-		</td>
-
-	</tr>
-	<!-- END fields -->
-	</tbody>
-	</table>
-
-	<form id="profile_fields" method="post" action="{U_ACTION}">
-	
-	<fieldset class="quick">
-		<input class="text small" type="text" name="field_ident" /> <select name="field_type">{S_TYPE_OPTIONS}</select>
-		<input class="button1" type="submit" name="submit" value="{L_CREATE_NEW_FIELD}" />
-		<input type="hidden" name="create" value="1" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html
deleted file mode 100644
index 069d2c91c3..0000000000
--- a/phpBB/adm/style/acp_prune_forums.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_PRUNED -->
-
-	<h1>{L_FORUM_PRUNE}</h1>
-
-	<p>{L_PRUNE_SUCCESS}</p>
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_FORUM}</th>
-		<th>{L_TOPICS_PRUNED}</th>
-		<th>{L_POSTS_PRUNED}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN pruned -->
-		<!-- IF pruned.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td style="text-align: center;">{pruned.FORUM_NAME}</td>
-		<td style="text-align: center;">{pruned.NUM_TOPICS}</td>
-		<td style="text-align: center;">{pruned.NUM_POSTS}</td>
-	</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td colspan="3" class="row3" style="text-align: center;">{L_NO_PRUNE}</td>
-		</tr>
-	<!-- END pruned -->
-	</tbody>
-	</table>
-
-<!-- ELSEIF S_SELECT_FORUM -->
-
-	<h1>{L_ACP_PRUNE_FORUMS}</h1>
-
-	<p>{L_ACP_PRUNE_FORUMS_EXPLAIN}</p>
-
-	<form id="acp_prune" method="post" action="{U_ACTION}">
-	
-	<fieldset>
-		<legend>{L_SELECT_FORUM}</legend>
-		<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
-	<dl>
-		<dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt>
-		<dd><select id="forum" name="f[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
-		<dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd>
-	</dl>
-	
-	<p class="quick">
-		<input class="button1" type="submit" value="{L_LOOK_UP_FORUM}" />
-	</p>
-	</fieldset>
-
-	</form>
-
-<!-- ELSE -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_ACP_PRUNE_FORUMS}</h1>
-
-	<p>{L_ACP_PRUNE_FORUMS_EXPLAIN}</p>
-
-	<h2>{L_FORUM}</h2>
-
-	<p>{L_SELECTED_FORUMS}: {FORUM_LIST}</p>
-
-	<form id="acp_prune" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_FORUM_PRUNE}</legend>
-	<dl>
-		<dt><label for="prune_days">{L_PRUNE_NOT_POSTED}:</label></dt>
-		<dd><input type="text" id="prune_days" name="prune_days" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="prune_vieweddays">{L_PRUNE_NOT_VIEWED}:</label></dt>
-		<dd><input type="text" id="prune_vieweddays" name="prune_vieweddays" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" name="prune_old_polls" value="1" /> {L_YES}</label>
-			<label><input type="radio" class="radio" id="polls" name="prune_old_polls" value="0" checked="checked" /> {L_NO}</label></dd>
-	</dl>
-	<dl>
-		<dt><label for="announce">{L_PRUNE_ANNOUNCEMENTS}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="prune_announce" value="1" /> {L_YES}</label>
-			<label><input type="radio" class="radio" id="announce" name="prune_announce" value="0" checked="checked" /> {L_NO}</label></dd>
-	</dl>
-	<dl>
-		<dt><label for="sticky">{L_PRUNE_STICKY}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="prune_sticky" value="1" /> {L_YES}</label>
-			<label><input type="radio" class="radio" id="sticky" name="prune_sticky" value="0" checked="checked" /> {L_NO}</label></dd>
-	</dl>
-	
-	<p class="quick">
-		{S_HIDDEN_FIELDS}
-		{S_FORM_TOKEN}
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
-	</p>
-	</fieldset>
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html
deleted file mode 100644
index 0f2b23dcef..0000000000
--- a/phpBB/adm/style/acp_prune_users.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h1>{L_ACP_PRUNE_USERS}</h1>
-
-<p>{L_ACP_PRUNE_USERS_EXPLAIN}</p>
-
-<form id="acp_prune" method="post" action="{U_ACTION}">
-	
-<fieldset>
-	<legend>{L_ACP_PRUNE_USERS}</legend>
-<dl>
-	<dt><label for="username">{L_USERNAME}:</label></dt>
-	<dd><input type="text" id="username" name="username" /></dd>
-</dl>
-<dl>
-	<dt><label for="email">{L_EMAIL}:</label></dt>
-	<dd><input type="text" id="email" name="email" /></dd>
-</dl>
-<dl>
-	<dt><label for="joined">{L_JOINED}:</label><br /><span>{L_JOINED_EXPLAIN}</span></dt>
-	<dd><select name="joined_select">{S_JOINED_OPTIONS}</select> <input type="text" id="joined" name="joined" /></dd>
-</dl>
-<dl>
-	<dt><label for="active">{L_LAST_ACTIVE}:</label><br /><span>{L_LAST_ACTIVE_EXPLAIN}</span></dt>
-	<dd><select name="active_select">{S_ACTIVE_OPTIONS}</select> <input type="text" id="active" name="active" /></dd>
-</dl>
-<dl>
-	<dt><label for="count">{L_POSTS}:</label></dt>
-	<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input type="text" id="count" name="count" /></dd>
-</dl>
-<dl>
-	<dt><label for="users">{L_ACP_PRUNE_USERS}:</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt>
-	<dd><textarea id="users" name="users" cols="40" rows="5"></textarea></dd>
-	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
-</dl>
-<dl>
-	<dt><label for="deleteposts">{L_DELETE_USER_POSTS}:</label><br /><span>{L_DELETE_USER_POSTS_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" name="deleteposts" value="1" /> {L_YES}</label>
-		<label><input type="radio" class="radio" id="deleteposts" name="deleteposts" value="0" checked="checked" /> {L_NO}</label></dd>
-</dl>
-<dl>
-	<dt><label for="deactivate">{L_DEACTIVATE_DELETE}:</label><br /><span>{L_DEACTIVATE_DELETE_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" name="action" value="delete" /> {L_DELETE_USERS}</label>
-		<label><input type="radio" class="radio" id="deactivate" name="action" value="deactivate" checked="checked" /> {L_DEACTIVATE}</label></dd>
-</dl>
-
-<p class="submit-buttons">
-	<input type="hidden" name="prune" value="1" />
-
-	<input class="button1" type="submit" id="update" name="update" value="{L_SUBMIT}" />&nbsp;
-	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	{S_FORM_TOKEN}
-</p>
-</fieldset>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html
deleted file mode 100644
index 9306e30269..0000000000
--- a/phpBB/adm/style/acp_ranks.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_EDIT -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<script type="text/javascript">
-	// <![CDATA[
-		function update_image(newimage)
-		{
-			document.getElementById('image').src = (newimage) ? "{RANKS_PATH}/" + encodeURI(newimage) : "./images/spacer.gif";
-		}
-
-	// ]]>
-	</script>
-
-	<h1>{L_ACP_MANAGE_RANKS}</h1>
-
-	<p>{L_ACP_RANKS_EXPLAIN}</p>
-
-	<form id="acp_ranks" method="post" action="{U_ACTION}">
-	
-	<fieldset>
-		<legend>{L_ACP_RANKS}</legend>
-	<dl>
-		<dt><label for="title">{L_RANK_TITLE}:</label></dt>
-		<dd><input name="title" type="text" id="title" value="{RANK_TITLE}" maxlength="255" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="rank_image">{L_RANK_IMAGE}:</label></dt>
-		<dd><select name="rank_image" id="rank_image" onchange="update_image(this.options[selectedIndex].value);">{S_FILENAME_LIST}</select></dd>
-		<dd><img src="{RANK_IMAGE}" id="image" alt="" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="special_rank">{L_RANK_SPECIAL}:</label></dt>
-		<dd><label><input onchange="dE('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
-			<label><input onchange="dE('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<!-- IF S_SPECIAL_RANK --><div id="posts" style="display: none;"><!-- ELSE --><div id="posts"><!-- ENDIF -->
-	<dl>
-		<dt><label for="min_posts">{L_RANK_MINIMUM}:</label></dt>
-		<dd><input name="min_posts" type="text" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd>
-	</dl>
-	</div>
-
-	<p class="submit-buttons">
-		<input type="hidden" name="action" value="save" />
-
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</p>
-	</fieldset>
-	</form>
-
-<!-- ELSE -->
-
-	<h1>{L_ACP_MANAGE_RANKS}</h1>
-
-	<p>{L_ACP_RANKS_EXPLAIN}</p>
-
-	<form id="acp_ranks" method="post" action="{U_ACTION}">
-	<fieldset class="tabulated">
-	<legend>{L_ACP_MANAGE_RANKS}</legend>
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_RANK_IMAGE}</th>
-		<th>{L_RANK_TITLE}</th>
-		<th>{L_RANK_MINIMUM}</th>
-		<th>{L_ACTION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN ranks -->
-		<!-- IF ranks.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td style="text-align: center;"><!-- IF ranks.S_RANK_IMAGE --><img src="{ranks.RANK_IMAGE}" alt="{ranks.RANK_TITLE}" title="{ranks.RANK_TITLE}" /><!-- ELSE -->&nbsp; - &nbsp;<!-- ENDIF --></td>
-		<td style="text-align: center;">{ranks.RANK_TITLE}</td>
-		<td style="text-align: center;"><!-- IF ranks.S_SPECIAL_RANK -->&nbsp; - &nbsp;<!-- ELSE -->{ranks.MIN_POSTS}<!-- ENDIF --></td>
-		<td style="text-align: center;"><a href="{ranks.U_EDIT}">{ICON_EDIT}</a> <a href="{ranks.U_DELETE}">{ICON_DELETE}</a></td>
-	</tr>
-	<!-- END ranks -->
-	</tbody>
-	</table>
-
-	<p class="quick">
-		<input class="button2" name="add" type="submit" value="{L_ADD_RANK}" />
-		{S_FORM_TOKEN}
-	</p>
-	</fieldset>
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html
deleted file mode 100644
index 23fcfbdeb8..0000000000
--- a/phpBB/adm/style/acp_reasons.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_EDIT_REASON -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_REASON_EDIT_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF not S_TRANSLATED -->
-		<h3>{L_AVAILABLE_TITLES}</h3>
-
-		<p>{S_AVAILABLE_TITLES}</p>
-	<!-- ENDIF -->
-
-	<form id="acp_reasons" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_TITLE}</legend>
-		<p><!-- IF S_TRANSLATED -->{L_IS_TRANSLATED_EXPLAIN}<!-- ELSE -->{L_IS_NOT_TRANSLATED_EXPLAIN}<!-- ENDIF --></p>
-	<dl>
-		<dt><label for="reason_title">{L_REASON_TITLE}:</label></dt>
-		<dd><input name="reason_title" type="text" id="reason_title" value="{REASON_TITLE}" maxlength="255" /></dd>
-	</dl>
-	<!-- IF S_TRANSLATED -->
-	<dl>
-		<dt>{L_REASON_TITLE_TRANSLATED}</dt>
-		<dd>{TRANSLATED_TITLE}</dd>
-	</dl>
-	<!-- ENDIF -->
-	<dl>
-		<dt><label for="reason_description">{L_REASON_DESCRIPTION}:</label></dt>
-		<dd><textarea name="reason_description" id="reason_description" rows="8" cols="80">{REASON_DESCRIPTION}</textarea></dd>
-	</dl>
-	<!-- IF S_TRANSLATED -->
-	<dl>
-		<dt>{L_REASON_DESC_TRANSLATED}</dt>
-		<dd>{TRANSLATED_DESCRIPTION}</dd>
-	</dl>
-	<!-- ENDIF -->
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</p>
-	</fieldset>
-	</form>
-
-<!-- ELSE -->
-
-	<h1>{L_ACP_REASONS}</h1>
-
-	<p>{L_ACP_REASONS_EXPLAIN}</p>
-
-	<form id="reasons" method="post" action="{U_ACTION}">
-	<fieldset class="tabulated">
-	<legend>{L_ACP_REASONS}</legend>
-
-	<!-- IF .reasons -->
-		<table cellspacing="1">
-			<col class="row1" /><col class="row1" /><col class="row2" />
-		<thead>
-		<tr>
-			<th>{L_REASON}</th>
-			<th>{L_USED_IN_REPORTS}</th>
-			<th>{L_OPTIONS}</th>
-		</tr>
-		</thead>
-		<tbody>
-		<!-- BEGIN reasons -->
-			<tr>
-				<td>
-					<i style="float: {S_CONTENT_FLOW_END}; font-size: .9em;"><!-- IF reasons.S_TRANSLATED -->{L_IS_TRANSLATED}<!-- ELSE -->{L_IS_NOT_TRANSLATED}<!-- ENDIF --></i>
-					<strong>{reasons.REASON_TITLE}<!-- IF reasons.S_OTHER_REASON --> *<!-- ENDIF --></strong>
-					<br /><span>{reasons.REASON_DESCRIPTION}</span>
-				</td>
-				<td style="width: 100px;">{reasons.REASON_COUNT}</td>
-				<td style="width: 80px; text-align: right; white-space: nowrap;">
-					<!-- IF reasons.S_FIRST_ROW && not reasons.S_LAST_ROW -->
-						{ICON_MOVE_UP_DISABLED}
-						<a href="{reasons.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-					<!-- ELSEIF not reasons.S_FIRST_ROW && not reasons.S_LAST_ROW-->
-						<a href="{reasons.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
-						<a href="{reasons.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
-					<!-- ELSEIF reasons.S_LAST_ROW && not reasons.S_FIRST_ROW -->
-						<a href="{reasons.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
-						{ICON_MOVE_DOWN_DISABLED}
-					<!-- ENDIF -->
-					<a href="{reasons.U_EDIT}">{ICON_EDIT}</a> 
-					<!-- IF reasons.U_DELETE -->
-						<a href="{reasons.U_DELETE}">{ICON_DELETE}</a>
-					<!-- ELSE -->
-						{ICON_DELETE_DISABLED}
-					<!-- ENDIF -->
-				</td>
-			</tr>
-		<!-- END reasons -->
-		</tbody>
-		</table>
-
-	<!-- ENDIF -->
-
-	<p class="quick">
-		<input type="hidden" name="action" value="add" />
-
-		<input type="text" name="reason_title" /> 
-		<input class="button2" name="addreason" type="submit" value="{L_ADD_NEW_REASON}" />
-		{S_FORM_TOKEN}
-	</p>
-	</fieldset>
-	
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html
deleted file mode 100644
index 5fd7a23d97..0000000000
--- a/phpBB/adm/style/acp_search.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_SETTINGS -->
-	<h1>{L_ACP_SEARCH_SETTINGS}</h1>
-
-	<p>{L_ACP_SEARCH_SETTINGS_EXPLAIN}</p>
-
-	<form id="acp_search" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_GENERAL_SEARCH_SETTINGS}</legend>
-	<dl>
-		<dt><label for="load_search">{L_YES_SEARCH}:</label><br /><span>{L_YES_SEARCH_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" id="load_search" name="config[load_search]" value="1"<!-- IF S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="config[load_search]" value="0"<!-- IF not S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl>
-		<dt><label for="search_interval">{L_SEARCH_INTERVAL}:</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt>
-		<dd><input id="search_interval" type="text" size="4" maxlength="4" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>
-	</dl>
-	<dl>
-		<dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}:</label><br /><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt>
-		<dd><input id="search_anonymous_interval" type="text" size="4" maxlength="4" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>
-	</dl>
-	<dl>
-		<dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}:</label><br /><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt>
-		<dd><input id="limit_search_load" type="text" size="4" maxlength="4" name="config[limit_search_load]" value="{LIMIT_SEARCH_LOAD}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}:</label><br /><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt>
-		<dd><input id="min_search_author_chars" type="text" size="4" maxlength="4" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}:</label><br /><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
-		<dd><input id="max_num_search_keywords" type="text" size="4" maxlength="4" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}:</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt>
-		<dd><input id="search_store_results" type="text" size="4" maxlength="6" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>
-	</dl>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_SEARCH_TYPE}</legend>
-	<dl>
-		<dt><label for="search_type">{L_SEARCH_TYPE}:</label><br /><span>{L_SEARCH_TYPE_EXPLAIN}</span></dt>
-		<dd><select id="search_type" name="config[search_type]">{S_SEARCH_TYPES}</select></dd>
-	</dl>
-	</fieldset>
-
-	<!-- BEGIN backend -->
-
-		<fieldset>
-			<legend>{backend.NAME}</legend>
-		{backend.SETTINGS}
-		</fieldset>
-
-	<!-- END backend -->
-
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_INDEX -->
-
-	<script type="text/javascript">
-	// <![CDATA[
-		/**
-		* Popup search progress bar
-		*/
-		function popup_progress_bar(progress_type)
-		{
-			close_waitscreen = 0;
-			// no scrollbars
-			popup('{UA_PROGRESS_BAR}&amp;type=' + progress_type, 400, 240, '_index');
-		}
-	// ]]>
-	</script>
-
-	<h1>{L_ACP_SEARCH_INDEX}</h1>
-
-	<!-- IF S_CONTINUE_INDEXING -->
-		<p>{L_CONTINUE_EXPLAIN}</p>
-
-		<form id="acp_search_continue" method="post" action="{U_CONTINUE_INDEXING}">
-			<fieldset class="submit-buttons">
-				<legend>{L_SUBMIT}</legend>
-				<input class="button1" type="submit" id="continue" name="continue" value="{L_CONTINUE}" onclick="popup_progress_bar('{S_CONTINUE_INDEXING}');" />&nbsp;
-				<input class="button2" type="submit" id="cancel" name="cancel" value="{L_CANCEL}" />
-				{S_FORM_TOKEN}
-			</fieldset>
-		</form>
-	<!-- ELSE -->
-
-		<p>{L_ACP_SEARCH_INDEX_EXPLAIN}</p>
-
-		<!-- BEGIN backend -->
-
-			<!-- IF backend.S_STATS -->
-
-			<form id="acp_search_index_{backend.NAME}" method="post" action="{U_ACTION}">
-
-				<fieldset class="tabulated">
-
-				{backend.S_HIDDEN_FIELDS}
-
-				<legend>{L_INDEX_STATS}: {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></legend>
-
-				<table cellspacing="1">
-					<caption>{backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></caption>
-					<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
-				<thead>
-				<tr>
-					<th>{L_STATISTIC}</th>
-					<th>{L_VALUE}</th>
-					<th>{L_STATISTIC}</th>
-					<th>{L_VALUE}</th>
-				</tr>
-				</thead>
-				<tbody>
-				<!-- BEGIN data -->
-					<tr>
-						<td>{backend.data.STATISTIC_1}:</td>
-						<td>{backend.data.VALUE_1}</td>
-						<td>{backend.data.STATISTIC_2}<!-- IF backend.data.STATISTIC_2 -->:<!-- ENDIF --></td>
-						<td>{backend.data.VALUE_2}</td>
-					</tr>
-				<!-- END data -->
-				</tbody>
-				</table>
-
-			<!-- ENDIF -->
-
-			<p class="quick">
-			<!-- IF backend.S_INDEXED -->
-				<input class="button2" type="submit" name="action[delete]" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');" />
-			<!-- ELSE -->
-				<input class="button2" type="submit" name="action[create]" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');" />
-			<!-- ENDIF -->
-			</p>
-			{S_FORM_TOKEN}
-			</fieldset>
-
-			</form>
-		<!-- END backend -->
-
-	<!-- ENDIF -->
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
deleted file mode 100644
index 4c738ad618..0000000000
--- a/phpBB/adm/style/acp_styles.html
+++ /dev/null
@@ -1,514 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_DELETE -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<form id="acp_styles" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_TITLE}</legend>
-	<dl>
-		<dt><label>{L_NAME}:</label></dt>
-		<dd><strong>{NAME}</strong></dd>
-	</dl>
-	<dl>
-		<dt><label for="new_id">{L_REPLACE}:</label><br /><span>{L_REPLACE_EXPLAIN}</span></dt>
-		<dd><select name="new_id">{S_REPLACE_OPTIONS}</select></dd>
-	</dl>
-
-	<p class="quick">
-		<input class="button1" type="submit" name="update" value="{L_DELETE}" />
-		{S_FORM_TOKEN}
-	</p>
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_EDIT_IMAGESET -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<!-- IF SUCCESS -->
-		<div class="successbox">
-			<p>{L_IMAGESET_UPDATED}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF ERROR -->
-		<div class="errorbox">
-			<p>{L_NO_IMAGE}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<script type="text/javascript" defer="defer">
-	// <![CDATA[
-		function update_image(newimage)
-		{
-			document.getElementById('newimg').src = (newimage) ? '../styles/{A_PATH}/imageset/' + encodeURI(newimage) : 'images/no_image.png';
-		}
-	// ]]>
-	</script>
-	<script type="text/javascript">
-	// <![CDATA[
-		/**
-		* Handle displaying/hiding the dimension fields
-		*/
-		function display_options(value)
-		{
-			if (value == 0)
-			{
-				dE('img_dimensions', -1);
-			}
-			else
-			{
-				dE('img_dimensions', 1);
-			}
-		}
-
-		/**
-		* Init the wanted display functionality if javascript is enabled.
-		* If javascript is not available, the user is still able to properly administrate.
-		*/
-		onload = function()
-		{
-			<!-- IF not IMAGE_SIZE -->
-				dE('img_dimensions', -1);
-			<!-- ENDIF -->
-		}
-	// ]]>
-	</script>
-
-	<form method="post" action="{U_ACTION}">
-
-	<fieldset class="quick" style="text-align: left;">
-		<legend>{L_SELECT_IMAGE}</legend>
-		{L_SELECT_IMAGE}: <select name="imgname" onchange="this.form.submit();">
-		<!-- BEGIN category -->
-			<option class="sep" value="" disabled="disabled">{category.NAME}</option>
-				<!-- BEGIN images --><option value="{category.images.VALUE}"<!-- IF category.images.SELECTED--> selected="selected"<!-- ENDIF -->>&nbsp;&nbsp;&nbsp;&nbsp;{category.images.TEXT}</option>
-				<!-- END images -->
-			<!-- END category -->
-		</select>&nbsp; <input class="button1" type="submit" value="{L_SELECT}" tabindex="100" />
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_EDIT_IMAGESET}</legend>
-	<dl>
-		<dt><label>{L_CURRENT_IMAGE}:</label></dt>
-		<dd><img src="<!-- IF IMAGE_REQUEST -->{IMAGE_REQUEST}<!-- ELSE -->images/no_image.png<!-- ENDIF -->" alt="" /></dd>
-	</dl>
-	<dl>
-		<dt><label>{L_SELECTED_IMAGE}:</label></dt>
-		<dd><img src="{IMG_SRC}" id="newimg" alt="" /></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset>
-	<legend>{L_IMAGE}</legend>
-	<dl>
-		<dt><label for="imgpath">{L_IMAGE}:</label></dt>
-		<dd><select id="imgpath" name="imgpath" onchange="update_image(this.options[selectedIndex].value);"><option value=""<!-- IF not IMAGE_SELECT--> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>
-			<!-- BEGIN imagesetlist -->
-			<option class="sep" value=""><!-- IF imagesetlist.TYPE -->{L_LOCALISED_IMAGES}<!-- ELSE -->{L_GLOBAL_IMAGES}<!-- ENDIF --></option>
-				<!-- BEGIN images -->
-				<option value="{imagesetlist.images.VALUE}"<!-- IF imagesetlist.images.SELECTED--> selected="selected"<!-- ENDIF -->>{imagesetlist.images.TEXT}</option>
-				<!-- END images -->
-			<!-- END imagesetlist -->
-			</select>
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="imgsize">{L_INCLUDE_DIMENSIONS}:</label><br /><span>{L_DIMENSIONS_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" name="imgsize" id="imgsize" onclick="display_options(1);" value="1"<!-- IF IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="imgsize" onclick="display_options(0);" value="0"<!-- IF not IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<div id="img_dimensions">
-		<dl>
-			<dt><label for="imgwidth">{L_IMAGE_WIDTH}:</label><br /><span>{L_AUTOMATIC_EXPLAIN}</span></dt>
-			<dd><input type="text" name="imgwidth" value="{IMAGE_SIZE}" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="imgheight">{L_IMAGE_HEIGHT}:</label><br /><span>{L_AUTOMATIC_EXPLAIN}</span></dt>
-			<dd><input type="text" name="imgheight" value="{IMAGE_HEIGHT}" /></dd>
-		</dl>
-	</div>
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="button2" type="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_EDIT_TEMPLATE or S_EDIT_THEME -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_EDIT}</h1>
-
-	<p>{L_EDIT_EXPLAIN}</p>
-
-	<p>{L_SELECTED}: <strong>{SELECTED_TEMPLATE}</strong></p>
-
-	<form id="acp_styles" method="post" action="{U_ACTION}">
-
-	<!-- IF S_EDIT_TEMPLATE or (S_EDIT_THEME and not S_THEME_IN_DB) -->
-	<fieldset>
-		<legend>{L_SELECT}</legend>
-	<dl>
-		<dt><label for="template_file">{L_FILE}:</label></dt>
-		<dd><select id="template_file" name="template_file" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_TEMPLATES}</select> <input class="button2" type="submit" value="{L_SELECT}" /></dd>
-	</dl>
-	{S_FORM_TOKEN}
-	</fieldset>
-	<!-- ENDIF -->
-	</form>
-
-	<!-- IF TEMPLATE_FILE or (S_EDIT_THEME and S_THEME_IN_DB) -->
-		<script type="text/javascript" defer="defer">
-		// <![CDATA[
-
-			function change_editor_height(height)
-			{
-				height = Number(height);
-
-				if (isNaN(height))
-				{
-					return;
-				}
-
-				editor = document.getElementById('template_data');
-				editor.rows = Math.max(5, Math.min(height, 999));
-
-				append_text_rows('acp_styles', height);
-				append_text_rows('acp_template', height);
-			}
-
-			function append_text_rows(form_name, value)
-			{
-				value = Number(value);
-
-				if (isNaN(value))
-				{
-					return;
-				}
-
-				url = document.getElementById(form_name).action;
-
-				// Make sure &amp; is actually... &
-				url = url.replace(/&amp;/g, '&');
-
-				var_start = url.indexOf('&text_rows=');
-				if (var_start == -1)
-				{
-					document.getElementById(form_name).action = url + "&text_rows=" + value;
-				}
-				else
-				{
-					url_start = url.substring(0, var_start + 1);
-					var_end = url.substring(var_start + 1).indexOf('&');
-					if (var_end == -1)
-					{
-						document.getElementById(form_name).action = url_start + "text_rows=" + value;
-					}
-					else
-					{
-						document.getElementById(form_name).action = url_start + url.substring(var_end + var_start + 2) + "&text_rows=" + value;
-					}
-				}
-			}
-
-		// ]]>
-		</script>
-
-		<form id="acp_template" method="post" action="{U_ACTION}">
-
-		<fieldset>
-			<legend>{L_EDITOR}</legend>
-		<!-- IF S_EDIT_TEMPLATE or (S_EDIT_THEME and not S_THEME_IN_DB) -->
-		<dl>
-			<dt><label>{L_SELECTED_FILE}:</label></dt>
-			<dd>{TEMPLATE_FILE}</dd>
-		</dl>
-		<!-- ENDIF -->
-		<dl>
-			<dt><label for="text_rows">{L_EDITOR_HEIGHT}:</label></dt>
-			<dd><input id="text_rows" type="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="button2" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd>
-		</dl>
-		<textarea id="template_data" name="template_data" style="font-family:'Courier New', monospace;font-size:9pt;line-height:125%;width:100%;" cols="80" rows="{TEXT_ROWS}">{TEMPLATE_DATA}</textarea>
-		</fieldset>
-
-		<fieldset class="submit-buttons">
-			<legend>{L_SUBMIT}</legend>
-			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
-			<input class="button1" id="save" type="submit" name="save" value="{L_SUBMIT}" />
-		</fieldset>
-		</form>
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_CACHE -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TEMPLATE_CACHE}</h1>
-
-	<p>{L_TEMPLATE_CACHE_EXPLAIN}</p>
-
-	<form name="acp_styles" method="post" action="{U_ACTION}">
-	<fieldset class="tabulated">
-	<legend>{L_TEMPLATE_CACHE}</legend>
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_CACHE_FILENAME}</th>
-		<th>{L_CACHE_FILESIZE}</th>
-		<th>{L_CACHE_CACHED}</th>
-		<th>{L_CACHE_MODIFIED}</th>
-		<th>{L_MARK}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN file -->
-		<!-- IF file.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td><a href="{file.U_VIEWSOURCE}" onclick="popup(this.href, 750, 550, '_source'); return false;">{file.FILENAME}</a></td>
-			<td>{file.FILESIZE}</td>
-			<td>{file.CACHED}</td>
-			<td>{file.MODIFIED}</td>
-			<td><input type="checkbox" class="radio" name="delete[]" value="{file.FILENAME}" /></td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr class="row1">
-			<td colspan="5">{L_TEMPLATE_CACHE_EMPTY}</td>
-		</tr>
-	<!-- END file -->
-	</tbody>
-	</table>
-
-	<p class="quick">
-		<span class="small"><a href="#" onclick="marklist('acp_styles', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('acp_styles', 'delete', false); return false;">{L_UNMARK_ALL}</a></span><br />
-		{S_FORM_TOKEN}
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_DELETE_MARKED}" />
-	</p>
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_EXPORT -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<!-- IF S_ERROR_MSG -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="acp_styles" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_TITLE}</legend>
-	<dl>
-		<dt><label>{L_NAME}:</label></dt>
-		<dd><strong>{NAME}</strong></dd>
-	</dl>
-	<!-- IF S_STYLE -->
-		<dl>
-			<dt><label for="inc_template">{L_INCLUDE_TEMPLATE}:</label></dt>
-			<dd><label><input type="radio" class="radio" id="inc_template" name="inc_template" value="1" checked="checked" /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="inc_template" value="0" /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="inc_theme">{L_INCLUDE_THEME}:</label></dt>
-			<dd><label><input type="radio" class="radio" id="inc_theme" name="inc_theme" value="1" checked="checked" /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="inc_theme" value="0" /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="inc_imageset">{L_INCLUDE_IMAGESET}:</label></dt>
-			<dd><label><input type="radio" class="radio" id="inc_imageset" name="inc_imageset" value="1" checked="checked" /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="inc_imageset" value="0" /> {L_NO}</label></dd>
-		</dl>
-	<!-- ENDIF -->
-	<dl>
-		<dt><label for="store">{L_DOWNLOAD_STORE}:</label><br /><span>{L_DOWNLOAD_STORE_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" id="store" name="store" value="1" checked="checked" /> {L_EXPORT_STORE}</label>
-			<label><input type="radio" class="radio" name="store" value="0" /> {L_EXPORT_DOWNLOAD}</label></dd>
-	</dl>
-	<dl>
-		<dt><label for="format">{L_ARCHIVE_FORMAT}:</label></dt>
-		<dd>{FORMAT_BUTTONS}</dd>
-	</dl>
-
-	<p class="quick">
-		{S_FORM_TOKEN}
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-	</p>
-	</fieldset>
-
-
-	</form>
-
-<!-- ELSEIF S_FRONTEND -->
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<!-- IF S_STYLE --> <!-- DEFINE $COLSPAN = 5 --> <!-- ELSE --> <!-- DEFINE $COLSPAN = 4 --> <!-- ENDIF -->
-
-	<table cellspacing="1">
-		<col class="row1" /><!-- IF S_STYLE --><col class="row1" /><!-- ENDIF --><col class="row2" /><col class="row2" />
-	<thead>
-	<tr>
-		<th>{L_NAME}</th>
-		<!-- IF S_STYLE --><th>{L_STYLE_USED_BY}</th><!-- ENDIF -->
-		<th>{L_OPTIONS}</th>
-		<th>{L_ACTIONS}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td class="row3" colspan="{$COLSPAN}"><strong>{L_INSTALLED}</strong></td>
-	</tr>
-	<!-- BEGIN installed -->
-	<tr>
-		<td><strong>{installed.NAME}</strong><!-- IF installed.S_DEFAULT_STYLE --> *<!-- ENDIF --></td>
-		<!-- IF S_STYLE -->
-			<td style="text-align: center;">{installed.STYLE_COUNT}</td>
-		<!-- ENDIF -->
-		<td style="text-align: center;">
-			{installed.S_OPTIONS}
-		</td>
-		<td style="text-align: center;">
-			<!-- IF S_STYLE -->
-				<a href="{installed.U_STYLE_ACT_DEACT}">{installed.L_STYLE_ACT_DEACT}</a> |
-			<!-- ENDIF -->
-			{installed.S_ACTIONS}
-			<!-- IF S_STYLE -->
-				| <a href="{installed.U_PREVIEW}">{L_PREVIEW}</a>
-			<!-- ENDIF -->
-		</td>
-	</tr>
-	<!-- END installed -->
-	<tr>
-		<td class="row3" colspan="{$COLSPAN}"><strong>{L_UNINSTALLED}</strong></td>
-	</tr>
-	<!-- IF not .uninstalled -->
-		<tr>
-			<td class="row1" colspan="{$COLSPAN}" style="text-align: center;">{L_NO_UNINSTALLED}</td>
-		</tr>
-	<!-- ENDIF -->
-	<!-- BEGIN uninstalled -->
-		<tr>
-			<td<!-- IF S_STYLE --> colspan="2"<!-- ENDIF -->><strong>{uninstalled.NAME}</strong><br /><span>{L_COPYRIGHT}: {uninstalled.COPYRIGHT}</span></td>
-			<td style="text-align: center;" colspan="2"><a href="{uninstalled.U_INSTALL}">{L_INSTALL}</a></td>
-		</tr>
-	<!-- END uninstalled -->
-	</tbody>
-	</table>
-
-	<!-- IF S_STYLE -->
-		<form id="acp_styles" method="post" action="{U_ACTION}">
-
-		<fieldset class="quick">
-			<legend>{L_CREATE}</legend>
-			{L_CREATE}: <input type="text" name="name" value="" /> {L_FROM} <select name="basis">{S_BASIS_OPTIONS}</select> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" />
-		</fieldset>
-
-		</form>
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_DETAILS -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_TITLE}</h1>
-
-	<p>{L_EXPLAIN}</p>
-
-	<!-- IF S_ERROR_MSG -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="acp_styles" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_TITLE}</legend>
-	<dl>
-		<dt><label for="name">{L_NAME}:</label></dt>
-		<dd><!-- IF S_INSTALL --><strong id="name">{NAME}</strong><!-- ELSE --><input type="text" id="name" name="name" value="{NAME}" /><!-- ENDIF --></dd>
-	</dl>
-	<dl>
-		<dt><label for="copyright">{L_COPYRIGHT}:</label></dt>
-		<dd><!-- IF S_INSTALL --><strong id="copyright">{COPYRIGHT}</strong><!-- ELSE --><input type="text" id="copyright" name="copyright" value="{COPYRIGHT}" /><!-- ENDIF --></dd>
-	</dl>
-	<!-- IF S_SUPERTEMPLATE -->
-	<dl>
-		<dt><label for="inheriting">{L_INHERITING_FROM}:</label></dt>
-		<dd><strong id="inheriting">{S_SUPERTEMPLATE}</strong></dd>
-	</dl>
-	<!-- ENDIF -->
-	<!-- IF S_STYLE and not S_BASIS -->
-		<dl>
-			<dt><label for="template_id">{L_STYLE_TEMPLATE}:</label></dt>
-			<dd><!-- IF S_INSTALL --><strong id="template_id">{TEMPLATE_NAME}</strong><!-- ELSE --><select id="template_id" name="template_id">{S_TEMPLATE_OPTIONS}</select><!-- ENDIF --></dd>
-		</dl>
-		<dl>
-			<dt><label for="theme_id">{L_STYLE_THEME}:</label></dt>
-			<dd><!-- IF S_INSTALL --><strong id="theme_id">{THEME_NAME}</strong><!-- ELSE --><select id="theme_id" name="theme_id">{S_THEME_OPTIONS}</select><!-- ENDIF --></dd>
-		</dl>
-		<dl>
-			<dt><label for="imageset_id">{L_STYLE_IMAGESET}:</label></dt>
-			<dd><!-- IF S_INSTALL --><strong id="imageset_id">{IMAGESET_NAME}</strong><!-- ELSE --><select id="imageset_id" name="imageset_id">{S_IMAGESET_OPTIONS}</select><!-- ENDIF --></dd>
-		</dl>
-	<!-- ENDIF -->
-	<!-- IF S_STYLE -->
-		</fieldset>
-
-		<fieldset>
-			<legend>{L_OPTIONS}</legend>
-		<dl>
-			<dt><label for="style_active">{L_STYLE_ACTIVE}:</label></dt>
-			<dd><label><input type="radio" class="radio" name="style_active" value="1"<!-- IF S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="style_active" value="0"<!-- IF not S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<!-- IF not S_STYLE_DEFAULT -->
-			<dl>
-				<dt><label for="style_default">{L_STYLE_DEFAULT}:</label></dt>
-				<dd><label><input type="radio" class="radio" name="style_default" value="1" /> {L_YES}</label>
-					<label><input type="radio" class="radio" id="style_default" name="style_default" value="0" checked="checked" /> {L_NO}</label></dd>
-			</dl>
-		<!-- ENDIF -->
-	<!-- ENDIF -->
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-
-	</form>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_update.html b/phpBB/adm/style/acp_update.html
deleted file mode 100644
index e82aee0e87..0000000000
--- a/phpBB/adm/style/acp_update.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-	
-<!-- IF S_VERSION_CHECK -->
-
-	<h1>{L_VERSION_CHECK}</h1>
-
-	<p>{L_VERSION_CHECK_EXPLAIN}</p>
-
-	<!-- IF S_UP_TO_DATE and S_UP_TO_DATE_AUTO -->
-		<div class="successbox">
-			<p>{L_VERSION_UP_TO_DATE_ACP}</p>
-		</div>
-	<!-- ELSE -->
-		<div class="errorbox">
-			<p>{L_VERSION_NOT_UP_TO_DATE_ACP}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<fieldset>
-		<legend></legend>
-	<dl>
-		<dt><label>{L_CURRENT_VERSION}</label></dt>
-		<dd><strong><!-- IF S_UP_TO_DATE and not S_UP_TO_DATE_AUTO -->{AUTO_VERSION}<!-- ELSE -->{CURRENT_VERSION}<!-- ENDIF --></strong></dd>
-	</dl>
-	<dl>
-		<dt><label>{L_LATEST_VERSION}</label></dt>
-		<dd><strong>{LATEST_VERSION}</strong></dd>
-	</dl>
-	</fieldset>
-
-	<!-- IF S_UP_TO_DATE and not S_UP_TO_DATE_AUTO -->
-		{L_UPDATE_INSTRUCTIONS_INCOMPLETE}
-		<br /><br />
-		{UPDATE_INSTRUCTIONS}
-		<br /><br />
-	<!-- ENDIF -->
-	<!-- IF not S_UP_TO_DATE -->
-		{UPDATE_INSTRUCTIONS}
-		<br /><br />
-	<!-- ENDIF -->
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
deleted file mode 100644
index 34e4147356..0000000000
--- a/phpBB/adm/style/acp_users.html
+++ /dev/null
@@ -1,230 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_SELECT_USER -->
-
-	<h1>{L_USER_ADMIN}</h1>
-
-	<p>{L_USER_ADMIN_EXPLAIN}</p>
-
-	<form id="select_user" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_SELECT_USER}</legend>
-	<dl>
-		<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
-		<dd><input class="text medium" type="text" id="username" name="username" /></dd>
-		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
-		<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
-	</dl>
-
-	<p class="quick">
-		<input type="submit" name="submituser" value="{L_SUBMIT}" class="button1" />
-	</p>
-	</fieldset>
-
-	</form>
-
-<!-- ELSEIF S_SELECT_FORUM -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_USER_ADMIN}</h1>
-
-	<p>{L_USER_ADMIN_EXPLAIN}</p>
-
-	<form id="select_forum" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_USER_ADMIN_MOVE_POSTS}</legend>
-	<dl>
-		<dt><label for="new_forum">{L_USER_ADMIN_MOVE_POSTS}</label><br /><span>{L_MOVE_POSTS_EXPLAIN}</span></dt>
-		<dd><select id="new_forum" name="new_f">{S_FORUM_OPTIONS}</select></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset class="quick">
-		<input type="submit" name="update" value="{L_SUBMIT}" class="button1" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSE -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_USER_ADMIN} :: {MANAGED_USERNAME}</h1>
-
-	<p>{L_USER_ADMIN_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="mode_select" method="post" action="{U_MODE_SELECT}">
-
-	<fieldset class="quick">
-		{L_SELECT_FORM}: <select name="mode" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_FORM_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ENDIF -->
-
-<!-- IF S_OVERVIEW -->
-
-<!-- INCLUDE acp_users_overview.html -->
-
-<!-- ELSEIF S_FEEDBACK -->
-
-<!-- INCLUDE acp_users_feedback.html -->
-
-<!-- ELSEIF S_PROFILE -->
-
-<!-- INCLUDE acp_users_profile.html -->
-
-<!-- ELSEIF S_PREFS -->
-
-<!-- INCLUDE acp_users_prefs.html -->
-
-<!-- ELSEIF S_AVATAR -->
-
-<!-- INCLUDE acp_users_avatar.html -->
-
-<!-- ELSEIF S_RANK -->
-
-	<form id="user_prefs" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_ACP_USER_RANK}</legend>
-	<dl>
-		<dt><label for="user_rank">{L_USER_RANK}:</label></dt>
-		<dd><select name="user_rank" id="user_rank">{S_RANK_OPTIONS}</select></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_SIGNATURE -->
-
-<!-- INCLUDE acp_users_signature.html -->
-
-<!-- ELSEIF S_GROUPS -->
-
-	<form id="user_groups" method="post" action="{U_ACTION}">
-
-	<table cellspacing="1">
-	<tbody>
-	<!-- BEGIN group -->
-		<!-- IF group.S_NEW_GROUP_TYPE -->
-		<tr>
-			<td class="row3" colspan="4"><strong>{group.GROUP_TYPE}</strong></td>
-		</tr>
-		<!-- ELSE -->
-			<!-- IF group.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-				<td><a href="{group.U_EDIT_GROUP}">{group.GROUP_NAME}</a></td>
-				<td><!-- IF group.S_NO_DEFAULT --><a href="{group.U_DEFAULT}">{L_GROUP_DEFAULT}</a><!-- ELSE --><strong>{L_GROUP_DEFAULT}</strong><!-- ENDIF --></td>
-				<td><!-- IF not group.S_SPECIAL_GROUP --><a href="{group.U_DEMOTE_PROMOTE}">{group.L_DEMOTE_PROMOTE}</a><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
-				<td><a href="{group.U_DELETE}">{L_GROUP_DELETE}</a></td>
-			</tr>
-		<!-- ENDIF -->
-	<!-- END group -->
-	</tbody>
-	</table>
-
-	<!-- IF S_GROUP_OPTIONS -->
-		<fieldset class="quick">
-			{L_USER_GROUP_ADD}: <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-			{S_FORM_TOKEN}
-		</fieldset>
-	<!-- ENDIF -->
-	</form>
-
-<!-- ELSEIF S_ATTACHMENTS -->
-
-	<form id="user_attachments" method="post" action="{U_ACTION}">
-
-
-	<!-- IF PAGINATION -->
-	<div class="pagination">
-		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-	</div>
-	<!-- ENDIF -->
-
-	<!-- IF .attach -->
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_FILENAME}</th>
-		<th>{L_POST_TIME}</th>
-		<th>{L_FILESIZE}</th>
-		<th>{L_DOWNLOADS}</th>
-		<th>{L_MARK}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN attach -->
-		<!-- IF attach.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td><a href="{attach.U_DOWNLOAD}">{attach.REAL_FILENAME}</a><br /><span class="small"><!-- IF attach.S_IN_MESSAGE --><strong>{L_PM}: </strong><!-- ELSE --><strong>{L_POST}: </strong><!-- ENDIF --><a href="{attach.U_VIEW_TOPIC}">{attach.TOPIC_TITLE}</a></span></td>
-		<td style="text-align: center">{attach.POST_TIME}</td>
-		<td style="text-align: center">{attach.SIZE}</td>
-		<td style="text-align: center">{attach.DOWNLOAD_COUNT}</td>
-		<td style="text-align: center"><input type="checkbox" class="radio" name="mark[]" value="{attach.ATTACH_ID}" /></td>
-	</tr>
-	<!-- END attach -->
-	</tbody>
-	</table>
-	<!-- ELSE -->
-	<div class="errorbox">
-		<p>{L_USER_NO_ATTACHMENTS}</p>
-	</div>
-	<!-- ENDIF -->
-	<fieldset class="display-options">
-		{L_SORT_BY}: <select name="sk">{S_SORT_KEY}</select> <select name="sd">{S_SORT_DIR}</select>
-		<input class="button2" type="submit" value="{L_GO}" name="sort" />
-	</fieldset>
-	<hr />
-	<!-- IF PAGINATION -->
-	<div class="pagination">
-		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-	</div>
-	<!-- ENDIF -->
-
-	<fieldset class="quick">
-		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
-		<p class="small"><a href="#" onclick="marklist('user_attachments', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('user_attachments', 'mark', false);">{L_UNMARK_ALL}</a></p>
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_PERMISSIONS -->
-
-	<div style="float: {S_CONTENT_FLOW_END};">
-		<a href="{U_USER_PERMISSIONS}">&raquo; {L_SET_USERS_PERMISSIONS}</a><br />
-		<a href="{U_USER_FORUM_PERMISSIONS}">&raquo; {L_SET_USERS_FORUM_PERMISSIONS}</a>
-	</div>
-
-	<form id="select_forum" method="post" action="{U_ACTION}">
-
-		<fieldset class="quick" style="text-align: left;">
-			{L_SELECT_FORUM}: <select name="f">{S_FORUM_OPTIONS}</select>
-			<input class="button2" type="submit" value="{L_GO}" name="select" />
-			{S_FORM_TOKEN}
-		</fieldset>
-	</form>
-
-	<div class="clearfix">&nbsp;</div>
-
-	<!-- INCLUDE permission_mask.html -->
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
deleted file mode 100644
index 20b5b60050..0000000000
--- a/phpBB/adm/style/acp_users_avatar.html
+++ /dev/null
@@ -1,76 +0,0 @@
-	<form id="avatar_settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>
-
-	<fieldset>
-		<legend>{L_ACP_USER_AVATAR}</legend>
-	<dl>
-		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-		<dd>{AVATAR_IMAGE}</dd>
-		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd>
-	</dl>
-	<!-- IF not S_IN_AVATAR_GALLERY -->
-		<!-- IF S_CAN_UPLOAD -->
-			<dl> 
-				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
-				<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_MAX_FILESIZE}" /><input type="file" id="uploadfile" name="uploadfile" /></dd>
-			</dl>
-			<dl>
-				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd>
-			</dl>
-		<!-- ENDIF -->
-		<!-- IF S_ALLOW_REMOTE -->
-			<dl>
-				<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-				<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd>
-			</dl>
-			<dl>
-				<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
-				<dd><input name="width" type="text" id="width" size="3" value="{USER_AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{USER_AVATAR_HEIGHT}" /> <span>px</span></dd>
-			</dl>
-		<!-- ENDIF -->
-		<!-- IF S_DISPLAY_GALLERY -->
-			<dl> 
-				<dt><label>{L_AVATAR_GALLERY}:</label></dt>
-				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd>
-			</dl>
-		<!-- ENDIF -->
-	<!-- ELSE -->
-		</fieldset>
-
-		<fieldset>
-			<legend>{L_AVATAR_GALLERY}</legend>
-		<dl>
-			<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt>
-			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>
-		</dl>
-		<dl>
-			<table cellspacing="1">
-			<!-- BEGIN avatar_row -->
-			<tr> 
-				<!-- BEGIN avatar_column -->
-					<td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td>
-				<!-- END avatar_column -->
-			</tr>
-			<tr>
-				<!-- BEGIN avatar_option_column -->
-					<td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
-				<!-- END avatar_option_column -->
-			</tr>
-			<!-- END avatar_row -->
-			</table>
-		</dl>
-		</fieldset>
-		
-		<fieldset class="quick" style="margin-top: -15px;">
-			<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
-		</fieldset>
-	
-	<!-- ENDIF -->
-	</fieldset>
-
-	<fieldset class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	
-	</form>
-\ No newline at end of file
diff --git a/phpBB/adm/style/acp_users_feedback.html b/phpBB/adm/style/acp_users_feedback.html
deleted file mode 100644
index e11a8e6ec1..0000000000
--- a/phpBB/adm/style/acp_users_feedback.html
+++ /dev/null
@@ -1,76 +0,0 @@
-	<form id="list" method="post" action="{U_ACTION}">
-
-	<!-- IF PAGINATION -->
-	<div class="pagination">
-			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-	</div>
-	<!-- ENDIF -->
-
-	<!-- IF .log -->
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_REPORT_BY}</th>
-		<th>{L_IP}</th>
-		<th>{L_TIME}</th>
-		<th>{L_FEEDBACK}</th>
-		<th>{L_MARK}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN log -->
-		<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-			<td>{log.USERNAME}</td>
-			<td style="text-align: center;">{log.IP}</td>
-			<td style="text-align: center;">{log.DATE}</td>
-			<td>
-				{log.ACTION}
-				<!-- IF log.DATA --><br />&#187; <span class="gensmall">[ {log.DATA} ]</span><!-- ENDIF -->
-			</td>
-			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td>
-		</tr>
-	<!-- END log -->
-	</tbody>
-	</table>
-	<!-- ELSE -->
-		<div class="errorbox">
-			<p>{L_NO_ENTRIES}</p>
-		</div>
-	<!-- ENDIF -->
-	
-	<fieldset class="display-options">
-		{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
-		<input class="button2" type="submit" value="{L_GO}" name="sort" />
-	</fieldset>
-	<hr />
-	<!-- IF PAGINATION -->
-	<div class="pagination">
-			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-	</div>
-	<!-- ENDIF -->
-
-	<!-- IF S_CLEARLOGS -->
-		<fieldset class="quick">
-			<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
-			<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
-			<p class="small"><a href="#" onclick="marklist('list', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false);">{L_UNMARK_ALL}</a></p>
-		</fieldset>
-	<!-- ENDIF -->
-
-	<h1>{L_ADD_FEEDBACK}</h1>
-
-	<p>{L_ADD_FEEDBACK_EXPLAIN}</p>
-
-	<fieldset>
-		<legend>{L_ACP_USER_FEEDBACK}</legend>
-		<dl>
-			<dd class="full"><textarea name="message" id="message" rows="10" cols="76"></textarea></dd>
-		</dl>
-	</fieldset>
-
-	<fieldset class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-	</fieldset>
-	{S_FORM_TOKEN}
-	</form>
-\ No newline at end of file
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
deleted file mode 100644
index e3eff369cc..0000000000
--- a/phpBB/adm/style/acp_users_overview.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<form id="user_overview" method="post" action="{U_ACTION}">
-
-<fieldset>
-	<legend>{L_ACP_USER_OVERVIEW}</legend>
-<dl>
-	<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_NAME_CHARS_EXPLAIN}</span></dt>
-	<dd><input type="text" id="user" name="user" value="{USER}" /></dd>
-	<!-- IF U_SWITCH_PERMISSIONS --><dd>[ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]</dd><!-- ENDIF -->
-</dl>
-<!-- IF S_USER_INACTIVE -->
-<dl>
-	<dt><label>{L_USER_IS_INACTIVE}:</label></dt>
-	<dd><strong>{USER_INACTIVE_REASON}</strong></dd>
-</dl>
-<!-- ENDIF -->
-<dl>
-	<dt><label>{L_REGISTERED}:</label></dt>
-	<dd><strong>{USER_REGISTERED}</strong></dd>
-</dl>
-<!-- IF S_USER_IP -->
-<dl>
-	<dt><label>{L_REGISTERED_IP}:</label></dt>
-	<dd><a href="{U_SHOW_IP}">{REGISTERED_IP}</a></dd>
-	<dd>[ <a href="{U_WHOIS}" onclick="popup(this.href, 700, 500, '_whois'); return false;">{L_WHOIS}</a> ]</dd>
-</dl>
-<!-- ENDIF -->
-<dl>
-	<dt><label>{L_LAST_ACTIVE}:</label></dt>
-	<dd><strong>{USER_LASTACTIVE}</strong></dd>
-</dl>
-<dl>
-	<dt><label>{L_POSTS}:</label></dt>
-	<dd><strong>{USER_POSTS}</strong><!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --> (<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)<!-- ELSEIF POSTS_IN_QUEUE --> ({L_POSTS_IN_QUEUE})<!-- ENDIF --></dd>
-</dl>
-<dl>
-	<dt><label>{L_WARNINGS}:</label></dt>
-	<dd><strong>{USER_WARNINGS}</strong></dd>
-</dl>
-<dl>
-	<dt><label for="user_founder">{L_FOUNDER}:</label><br /><span>{L_FOUNDER_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" name="user_founder" value="1"<!-- IF S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input type="radio" class="radio" name="user_founder" value="0"<!-- IF not S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
-<dl>
-	<dt><label for="user_email">{L_EMAIL}:</label></dt>
-	<dd><input class="text medium" type="text" id="user_email" name="user_email" value="{USER_EMAIL}" /></dd>
-</dl>
-<dl>
-	<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label><br /><span>{L_CONFIRM_EMAIL_EXPLAIN}</span></dt>
-	<dd><input class="text medium" type="text" id="email_confirm" name="email_confirm" value="" /></dd>
-</dl>
-<dl>
-	<dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
-	<dd><input type="password" id="new_password" name="new_password" value="" /></dd>
-</dl>
-<dl>
-	<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
-	<dd><input type="password" id="password_confirm" name="password_confirm" value="" /></dd>
-</dl>
-
-<p class="quick">
-	<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-	<input type="hidden" name="action" value="" />
-	{S_FORM_TOKEN}
-</p>
-
-</fieldset>
-</form>
-
-<!-- IF not S_USER_FOUNDER or S_FOUNDER -->
-
-	<script type="text/javascript">
-	// <![CDATA[
-
-		function display_reason(option)
-		{
-			if (option != 'banuser' && option != 'banemail' && option != 'banip')
-			{
-				dE('reasons', -1);
-				return;
-			}
-
-			dE('reasons', 1);
-
-			element = document.getElementById('user_quick_tools').ban_reason;
-
-			if (element.value && element.value != '{LA_USER_ADMIN_BAN_NAME_REASON}' && element.value != '{LA_USER_ADMIN_BAN_EMAIL_REASON}' && element.value != '{LA_USER_ADMIN_BAN_IP_REASON}')
-			{
-				return;
-			}
-
-			if (option == 'banuser')
-			{
-				element.value = '{LA_USER_ADMIN_BAN_NAME_REASON}';
-			}
-			else if (option == 'banemail')
-			{
-				element.value = '{LA_USER_ADMIN_BAN_EMAIL_REASON}';
-			}
-			else if (option == 'banip')
-			{
-				element.value = '{LA_USER_ADMIN_BAN_IP_REASON}';
-			}
-		}
-
-	// ]]>
-	</script>
-
-	<form id="user_quick_tools" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_USER_TOOLS}</legend>
-	<dl>
-		<dt><label for="quicktools">{L_QUICK_TOOLS}:</label></dt>
-		<dd><select id="quicktools" name="action" onchange="display_reason(this.options[this.selectedIndex].value);">{S_ACTION_OPTIONS}</select></dd>
-	</dl>
-	<div style="display: none;" id="reasons">
-		<dl>
-			<dt><label for="ban_reason">{L_BAN_REASON}:</label></dt>
-			<dd><input name="ban_reason" type="text" class="text medium" maxlength="3000" id="ban_reason" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="ban_give_reason">{L_BAN_GIVE_REASON}:</label></dt>
-			<dd><input name="ban_give_reason" type="text" class="text medium" maxlength="3000" id="ban_give_reason" /></dd>
-		</dl>
-	</div>
-		<!-- IF not S_OWN_ACCOUNT -->
-			<dl>
-				<dt><label for="delete_user">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
-				<dd><input type="checkbox" class="radio" name="delete" value="1" /></dd>
-				<dd><select id="delete_user" name="delete_type"><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd>
-			</dl>
-		<!-- ENDIF -->
-
-	<p class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
-	</p>
-
-	</fieldset>
-
-	</form>
-
-<!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html
deleted file mode 100644
index 07a9bc5c78..0000000000
--- a/phpBB/adm/style/acp_users_prefs.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<script type="text/javascript">
-// <![CDATA[
-	var default_dateformat = '{A_DEFAULT_DATEFORMAT}';
-// ]]>
-</script>
-
-	<form id="user_prefs" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_UCP_PREFS_PERSONAL}</legend>
-	<dl> 
-		<dt><label for="viewemail">{L_SHOW_EMAIL}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="viewemail" value="1"<!-- IF VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="viewemail" value="0"<!-- IF not VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="massemail">{L_ADMIN_EMAIL}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="massemail" value="1"<!-- IF MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="massemail" value="0"<!-- IF not MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="allowpm">{L_ALLOW_PM}:</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" name="allowpm" value="1"<!-- IF ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="allowpm" value="0"<!-- IF not ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="hideonline">{L_HIDE_ONLINE}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="hideonline" value="1"<!-- IF HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="hideonline" value="0"<!-- IF not HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="notifymethod">{L_NOTIFY_METHOD}:</label><br /><span>{L_NOTIFY_METHOD_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" name="notifymethod" value="0"<!-- IF NOTIFY_EMAIL --> id="notifymethod" checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label>
-			<label><input type="radio" class="radio" name="notifymethod" value="1"<!-- IF NOTIFY_IM --> id="notifymethod" checked="checked"<!-- ENDIF --><!-- IF S_JABBER_DISABLED --> disabled="disabled"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label>
-			<label><input type="radio" class="radio" name="notifymethod" value="2"<!-- IF NOTIFY_BOTH --> id="notifymethod" checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="notifypm">{L_NOTIFY_ON_PM}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="notifypm" value="1"<!-- IF NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="notifypm" value="0"<!-- IF not NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="popuppm">{L_POPUP_ON_PM}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="popuppm" value="1"<!-- IF POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="popuppm" value="0"<!-- IF not POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt>
-		<dd><select id="lang" name="lang">{S_LANG_OPTIONS}</select></dd>
-	</dl>
-	<dl> 
-		<dt><label for="style">{L_BOARD_STYLE}:</label></dt>
-		<dd><select id="style" name="style">{S_STYLE_OPTIONS}</select></dd>
-	</dl>
-	<dl> 
-		<dt><label for="tz">{L_BOARD_TIMEZONE}:</label></dt>
-		<dd><select id="tz" name="tz" style="width: 100%;">{S_TZ_OPTIONS}</select></dd>
-	</dl>
-	<dl> 
-		<dt><label for="dst">{L_BOARD_DST}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="dst" value="1"<!-- IF DST --> id="dst" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="dst" value="0"<!-- IF not DST --> id="dst" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
-		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
-		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" /></div></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_UCP_PREFS_POST}</legend>
-	<dl> 
-		<dt><label for="bbcode">{L_DEFAULT_BBCODE}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="bbcode" value="1"<!-- IF BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="bbcode" value="0"<!-- IF not BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="smilies">{L_DEFAULT_SMILIES}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="smilies" value="1"<!-- IF SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="smilies" value="0"<!-- IF not SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="sig">{L_DEFAULT_ADD_SIG}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="sig" value="1"<!-- IF ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="sig" value="0"<!-- IF not ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="notify">{L_DEFAULT_NOTIFY}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="notify" value="1"<!-- IF NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="notify" value="0"<!-- IF not NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_UCP_PREFS_VIEW}</legend>
-	<dl> 
-		<dt><label for="view_images">{L_VIEW_IMAGES}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="view_images" value="1"<!-- IF VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="view_images" value="0"<!-- IF not VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="view_flash">{L_VIEW_FLASH}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="view_flash" value="1"<!-- IF VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="view_flash" value="0"<!-- IF not VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="view_smilies">{L_VIEW_SMILIES}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="view_smilies" value="1"<!-- IF VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="view_smilies" value="0"<!-- IF not VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="view_sigs">{L_VIEW_SIGS}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="view_sigs" value="1"<!-- IF VIEW_SIGS --> id="view_sigs" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="view_sigs" value="0"<!-- IF not VIEW_SIGS --> id="view_sigss" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="view_avatars">{L_VIEW_AVATARS}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="view_avatars" value="1"<!-- IF VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="view_avatars" value="0"<!-- IF not VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label for="view_wordcensor">{L_DISABLE_CENSORS}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="view_wordcensor" value="1"<!-- IF VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="view_wordcensor" value="0"<!-- IF not VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<dl> 
-		<dt><label>{L_VIEW_TOPICS_DAYS}:</label></dt>
-		<dd>{S_TOPIC_SORT_DAYS}</dd>
-	</dl>
-	<dl> 
-		<dt><label>{L_VIEW_TOPICS_KEY}:</label></dt>
-		<dd>{S_TOPIC_SORT_KEY}</dd>
-	</dl>
-	<dl> 
-		<dt><label>{L_VIEW_TOPICS_DIR}:</label></dt>
-		<dd>{S_TOPIC_SORT_DIR}</dd>
-	</dl>
-	<dl> 
-		<dt><label>{L_VIEW_POSTS_DAYS}:</label></dt>
-		<dd>{S_POST_SORT_DAYS}</dd>
-	</dl>
-	<dl> 
-		<dt><label>{L_VIEW_POSTS_KEY}:</label></dt>
-		<dd>{S_POST_SORT_KEY}</dd>
-	</dl>
-	<dl> 
-		<dt><label>{L_VIEW_POSTS_DIR}:</label></dt>
-		<dd>{S_POST_SORT_DIR}</dd>
-	</dl>
-	</fieldset>
-
-	<fieldset class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-
-	</form>
-\ No newline at end of file
diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
deleted file mode 100644
index 0d1c6f8e46..0000000000
--- a/phpBB/adm/style/acp_users_profile.html
+++ /dev/null
@@ -1,66 +0,0 @@
-	<form id="user_profile" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_USER_PROFILE}</legend>
-	<dl>
-		<dt><label for="icq">{L_UCP_ICQ}:</label></dt>
-		<dd><input type="text" id="icq" name="icq" value="{ICQ}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="aim">{L_UCP_AIM}:</label></dt>
-		<dd><input type="text" id="aim" name="aim" value="{AIM}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="msn">{L_UCP_MSNM}:</label></dt>
-		<dd><input type="text" id="msn" name="msn" value="{MSN}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="yim">{L_UCP_YIM}:</label></dt>
-		<dd><input type="text" id="yim" name="yim" value="{YIM}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="jabber">{L_UCP_JABBER}:</label></dt>
-		<dd><input type="text" id="jabber" name="jabber" value="{JABBER}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="website">{L_WEBSITE}:</label></dt>
-		<dd><input type="text" id="website" name="website" value="{WEBSITE}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="location">{L_LOCATION}:</label></dt>
-		<dd><input type="text" id="location" name="location" value="{LOCATION}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="occupation">{L_OCCUPATION}:</label></dt>
-		<dd><textarea id="occupation" name="occupation" rows="3" cols="30">{OCCUPATION}</textarea></dd>
-	</dl>
-	<dl>
-		<dt><label for="interests">{L_INTERESTS}:</label></dt>
-		<dd><textarea id="interests" name="interests" rows="3" cols="30">{INTERESTS}</textarea></dd>
-	</dl>
-	<dl> 
-		<dt><label for="birthday">{L_BIRTHDAY}:</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
-		<dd>{L_DAY}: <select id="birthday" name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> {L_MONTH}: <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> {L_YEAR}: <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></dd>
-	</dl>
-	</fieldset>
-
-	<!-- IF .profile_fields -->
-		<fieldset>
-			<legend>{L_USER_CUSTOM_PROFILE_FIELDS}</legend>
-		<!-- BEGIN profile_fields -->
-		<dl> 
-			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}:</label><!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></dt>
-			<dd>{profile_fields.FIELD}</dd>
-			<!-- IF profile_fields.ERROR -->
-				<dd><span class="small" style="color: red;">{profile_fields.ERROR}</span></dd>
-			<!-- ENDIF -->
-		</dl>
-		<!-- END profile_fields -->
-		</fieldset>
-	<!-- ENDIF -->
-
-	<fieldset class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-\ No newline at end of file
diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
deleted file mode 100644
index 239d35f119..0000000000
--- a/phpBB/adm/style/acp_users_signature.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<script type="text/javascript">
-// <![CDATA[
-
-	var form_name = 'user_signature';
-	var text_name = 'signature';
-
-	// Define the bbCode tags
-	var bbcode = new Array();
-	var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'<!-- BEGIN custom_tags -->, {custom_tags.BBCODE_NAME}<!-- END custom_tags -->);
-	var imageTag = false;
-
-	// Helpline messages
-	var help_line = {
-		b: '{LA_BBCODE_B_HELP}',
-		i: '{LA_BBCODE_I_HELP}',
-		u: '{LA_BBCODE_U_HELP}',
-		q: '{LA_BBCODE_Q_HELP}',
-		c: '{LA_BBCODE_C_HELP}',
-		l: '{LA_BBCODE_L_HELP}',
-		o: '{LA_BBCODE_O_HELP}',
-		p: '{LA_BBCODE_P_HELP}',
-		w: '{LA_BBCODE_W_HELP}',
-		s: '{LA_BBCODE_S_HELP}',
-		f: '{LA_BBCODE_F_HELP}',
-		e: '{LA_BBCODE_E_HELP}',
-		d: '{LA_BBCODE_D_HELP}',
-		t: '{LA_BBCODE_T_HELP}',
-		tip: '{L_STYLES_TIP}'
-		<!-- BEGIN custom_tags -->
-			,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
-		<!-- END custom_tags -->
-	}
-
-// ]]>
-</script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
-
-<form id="user_signature" method="post" action="{U_ACTION}">
-
-	<!-- IF SIGNATURE_PREVIEW -->
-		<fieldset>
-			<legend>{L_ADMIN_SIG_PREVIEW}</legend>
-			<p>{SIGNATURE_PREVIEW}</p>
-		</fieldset>
-	<!-- ENDIF -->
-
-	<fieldset>
-		<legend>{L_SIGNATURE}</legend>
-		<p>{L_SIGNATURE_EXPLAIN}</p>
-
-		<div id="format-buttons">
-			<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px;" onclick="bbstyle(2)" onmouseover="helpline('i')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px;" onclick="bbstyle(4)" onmouseover="helpline('u')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" onmouseover="helpline('q')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="t" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" />
-			<!-- IF S_BBCODE_IMG -->
-				<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" onmouseout="helpline('tip')" />
-			<!-- ENDIF -->
-			<!-- IF S_LINKS_ALLOWED -->
-				<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" onmouseover="helpline('w')" onmouseout="helpline('tip')" />
-			<!-- ENDIF -->
-			<!-- IF S_BBCODE_FLASH -->
-				<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" onmouseover="helpline('d')" onmouseout="helpline('tip')" />
-			<!-- ENDIF -->
-
-			{L_FONT_SIZE}: <select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_FONT_SIZE}" onmouseover="helpline('f')" onmouseout="helpline('tip')">
-				<option value="50">{L_FONT_TINY}</option>
-				<option value="85">{L_FONT_SMALL}</option>
-				<option value="100" selected="selected">{L_FONT_NORMAL}</option>
-				<option value="150">{L_FONT_LARGE}</option>
-				<option value="200">{L_FONT_HUGE}</option>
-			</select>
-		<!-- IF .custom_tags -->
-			<br /><br />
-			<!-- BEGIN custom_tags -->
-				<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})"<!-- IF custom_tags.BBCODE_HELPLINE !== '' --> onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')"<!-- ENDIF --> />
-			<!-- END custom_tags -->
-		<!-- ENDIF -->
-
-		</div>
-
-		<p><input type="text" class="text full" style="border: 0; background: none;" name="helpbox" value="{L_STYLES_TIP}" /></p>
-
-		<dl>
-			<dt style="width: 90px;">
-				<script type="text/javascript">
-				// <![CDATA[
-					colorPalette('v', 12, 10);
-				// ]]>
-				</script>
-			</dt>
-			<dd style="margin-left: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{SIGNATURE}</textarea></dd>
-			<dd style="margin-left: 90px; margin-top: 5px;">
-			<!-- IF S_BBCODE_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label>
-			<!-- ENDIF -->
-			<!-- IF S_SMILIES_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_smilies"{S_SMILIES_CHECKED} /> {L_DISABLE_SMILIES}</label>
-			<!-- ENDIF -->
-			<!-- IF S_LINKS_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label>
-			<!-- ENDIF -->
-			</dd>
-			<dd style="margin-left: 90px; margin-top: 10px;"><strong>{L_OPTIONS}: </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>
-		</dl>
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-</form>
-\ No newline at end of file
diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html
deleted file mode 100644
index 3fa4cfc91c..0000000000
--- a/phpBB/adm/style/acp_words.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<!-- IF S_EDIT_WORD -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_ACP_WORDS}</h1>
-
-	<p>{L_ACP_WORDS_EXPLAIN}</p>
-
-	<form id="acp_words" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_EDIT_WORD}</legend>
-		<dl>
-			<dt><label for="word">{L_WORD}</label></dt>
-			<dd><input id="word" type="text" name="word" value="{WORD}" maxlength="255" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="replacement">{L_REPLACEMENT}</label></dt>
-			<dd><input id="replacement" type="text" name="replacement" value="{REPLACEMENT}" maxlength="255" /></dd>
-		</dl>
-		{S_HIDDEN_FIELDS}
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="save" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</p>
-	</fieldset>
-	</form>
-
-<!-- ELSE -->
-
-	<h1>{L_ACP_WORDS}</h1>
-
-	<p>{L_ACP_WORDS_EXPLAIN}</p>
-
-	<form id="acp_words" method="post" action="{U_ACTION}">
-
-	<fieldset class="tabulated">
-	<legend>{L_ACP_WORDS}</legend>
-	<p class="quick">
-		{S_HIDDEN_FIELDS}
-		<input class="button2" name="add" type="submit" value="{L_ADD_WORD}" />
-	</p>
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_WORD}</th>
-		<th>{L_REPLACEMENT}</th>
-		<th>{L_ACTION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN words -->
-		<!-- IF words.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td style="text-align: center;">{words.WORD}</td>
-		<td style="text-align: center;">{words.REPLACEMENT}</td>
-		<td>&nbsp;<a href="{words.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{words.U_DELETE}">{ICON_DELETE}</a>&nbsp;</td>
-	</tr>
-	<!-- BEGINELSE -->
-	<tr class="row3">
-		<td colspan="3">{L_ACP_NO_ITEMS}</td>
-	</tr>
-	<!-- END words -->
-	</tbody>
-	</table>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
deleted file mode 100644
index 344b5cacf0..0000000000
--- a/phpBB/adm/style/admin.css
+++ /dev/null
@@ -1,1644 +0,0 @@
-/*  phpBB 3.0 Admin Style Sheet
-	------------------------------------------------------------------------
-	Original author:	subBlue ( http://www.subblue.com/ )
-	Copyright 2007 phpBB Group ( http://www.phpbb.com/ )
-	------------------------------------------------------------------------
-*/
-
-/* General markup styles
----------------------------------------- */
-* {
-	/* Reset browsers default margin, padding and font sizes */
-	margin: 0;
-	padding: 0;
-	font-size: 100%;
-}
-
-body, div, p, th, td, li, dd {
-	font-size: x-small;
-	voice-family: "\"}\"";
-	voice-family: inherit;
-	font-size: small
-}
-
-html>body, html>div, html>p, html>th, html>td, html>li, html>dd {
-	font-size: small
-}
-
-html {
-	color: #536482;
-	background: #DBD7D1;
-	/* Always show a scrollbar for short pages - stops the jump when the scrollbar appears. non-ie browsers */
-	height: 100%;
-	margin-bottom: 1px;
-}
-
-body {
-	/* Text-Sizing with ems: http://www.clagnut.com/blog/348/ */
-	font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
-	color: #536482;
-	background: #DBD7D1;
-	font-size: 62.5%;	/* This sets the default font size to be equivalent to 10px */
-	margin: 10px 15px;
-}
-
-img {
-	border: 0;
-}
-
-h1 {
-	font-family: "Trebuchet MS", Helvetica, sans-serif;
-	font-size: 1.70em;
-	font-weight: normal;
-	color: #333333;
-}
-
-h2, caption {
-	font-family: "Trebuchet MS", Helvetica, sans-serif;
-	font-size: 1.40em;
-	font-weight: normal;
-	color: #115098;
-	text-align: left;
-	margin-top: 25px;
-}
-
-.rtl h2, .rtl caption {
-	text-align: right;
-}
-
-h3, h4 {
-	font-family: "Trebuchet MS", Helvetica, sans-serif;
-	font-size: 1.20em;
-	text-decoration: none; 
-	line-height: 1.20em; 
-	margin-top: 25px;
-}
-
-p {
-	margin-bottom: 0.7em;
-	line-height: 1.40em;
-	font-size: 0.90em;
-}
-
-ul {
-	list-style: disc;
-	margin: 0 0 1em 2em;
-}
-
-.rtl ul {
-	margin: 0 2em 1em 0;
-}
-
-hr {
-	border: 0 none;
-	border-top: 1px dashed #999999;
-	margin-bottom: 5px;
-	padding-bottom: 5px;
-	height: 1px;
-}
-
-.small { 
-	font-size: 0.85em; 
-}
-
-/* General links  */
-a:link, a:visited {
-	color: #105289;
-	text-decoration: none;
-}
-
-a:hover {
-	color: #BC2A4D;
-	text-decoration: underline;
-}
-
-a:active {
-	color: #368AD2;
-	text-decoration: none;
-}
-
-.install-body p a {
-	font-weight: bold;
-}
-
-/* Main blocks
----------------------------------------- */
-#wrap {
-	padding: 0 0 15px 0;
-	min-width: 615px;
-}
-
-#page-header {
-	clear: both;
-	text-align: right;
-	background: url("../images/phpbb_logo.gif") top left no-repeat;
-	height: 49px;
-	font-size: 0.85em;
-	margin-bottom: 10px;
-}
-
-.rtl #page-header {
-	text-align: left;
-	background: url("../images/phpbb_logo.gif") top right no-repeat;
-}
-
-#page-header h1 {
-	color: #767676;
-	font-family: "Trebuchet MS",Helvetica,sans-serif;
-	font-size: 1.70em;
-	padding-top: 10px;
-}
-
-#page-header p {
-	font-size: 1.00em;
-}
-
-#page-header p#skip {
-	display: none;
-}
-
-#page-body {
-	clear: both;
-	min-width: 700px;
-}
-
-#page-footer {
-	clear: both;
-	font-size: 0.75em;
-	text-align: center;
-}
-
-#content {
-	padding: 30px 10px 10px;
-	position: relative;
-}
-
-#content h1 {
-	color: #115098;
-	line-height: 1.2em;
-	margin-bottom: 0;
-}
-
-#main {
-	float: left;
-	width: 76%;
-	margin: 0 0 0 3%;
-	min-height: 350px;
-}
-
-.rtl #main {
-	float: right;
-	margin: 0 3% 0 0;
-}
-
-* html #main { 
-	height: 350px; 
-}
-
-#page-body.simple-page-body {
-	padding: 0;
-	padding-right: 10px;
-	min-width: 0;
-}
-
-/* Tabbed menu
-	Based on: http://www.alistapart.com/articles/slidingdoors2/
-----------------------------------------*/
-#tabs {
-	line-height: normal;
-	margin: 0 0 -6px 7px;
-	min-width: 600px;
-}
-
-.rtl #tabs {
-	margin: 0 7px -6px 0;
-}
-
-#tabs ul {
-	margin:0;
-	padding: 0;
-	list-style: none;
-}
-
-#tabs li {
-	display: inline;
-	margin: 0;
-	padding: 0;
-	font-size: 0.85em;
-	font-weight: bold;
-}
-
-#tabs a {
-	float: left;
-	background:url("../images/bg_tabs1.gif") no-repeat 0% -34px;
-	margin: 0 1px 0 0;
-	padding: 0 0 0 7px;
-	text-decoration: none;
-	position: relative;
-}
-
-.rtl #tabs a {
-	float: right;
-}
-
-#tabs a span {
-	float: left;
-	display: block;
-	background: url("../images/bg_tabs2.gif") no-repeat 100% -34px;
-	padding: 7px 10px 4px 4px;
-	color: #767676;
-	white-space: nowrap;
-	font-family: Arial, Helvetica, sans-serif;
-	text-transform: uppercase;
-	font-weight: bold;
-}
-
-.rtl #tabs a span {
-	float: right;
-}
-
-/* Commented Backslash Hack hides rule from IE5-Mac \*/
-#tabs a span, .rtl #tabs a span { float:none;}
-/* End hack */
-
-#tabs a:hover span {
-	color: #BC2A4D;
-}
-
-#tabs #activetab a {
-	background-position: 0 0;
-	border-bottom: 1px solid #DCDEE2;
-}
-
-#tabs #activetab a span {
-	background-position: 100% 0;
-	padding-bottom: 5px;
-	color: #23649F;
-}
-
-#tabs a:hover {
-	background-position: 0 -69px;
-}
-
-#tabs a:hover span {
-	background-position: 100% -69px;
-}
-
-#tabs #activetab a:hover span {
-	color: #115098;
-}
-
-
-/* Main Panel
----------------------------------------- */
-#acp {
-	margin: 4px 0;
-	padding: 3px 1px;
-	min-width: 550px;
-	background-color: #FFFFFF;
-	border: 1px #999999 solid;
-}
-
-.panel {
-	background: #F3F3F3 url("../images/innerbox_bg.gif") repeat-x top;
-	padding: 0;
-}
-
-span.corners-top, span.corners-bottom, 
-span.corners-top span, span.corners-bottom span {
-	font-size: 1px;
-	line-height: 1px;
-	display: block;
-	height: 5px;
-	background-repeat: no-repeat;
-}
-
-span.corners-top {
-	background-image: url("../images/corners_left.gif");
-	background-position: 0 0;
-	margin: -4px -2px 0;
-}
-
-span.corners-top span {
-	background-image: url("../images/corners_right.gif");
-	background-position: 100% 0;
-}
-
-span.corners-bottom {
-	background-image: url("../images/corners_left.gif");
-	background-position: 0 100%;
-	margin: 0 -2px -4px;
-	clear: both;
-}
-
-span.corners-bottom span {
-	background-image: url("../images/corners_right.gif");
-	background-position: 100% 100%;
-}
-
-/* WinIE tweaks \*/
-* html span.corners-top, * html span.corners-bottom { background-image: url("../images/corners_left.gif"); }
-* html span.corners-top span, * html span.corners-bottom span { background-image: url("../images/corners_right.gif"); }
-/* End tweaks */
-
-/* Sub-navigation Menu
----------------------------------------- */
-
-/* Toggle */
-#toggle {
-	padding: 5px;
-	width: 5%;
-	height: 100px;
-	position: absolute;
-	left: 15%;
-	top: 28px;
-	margin-left: 2px;
-}
-
-.rtl #toggle {
-	left: 75%;
-	margin-right: 0;
-	margin-left: 6px;
-}
-
-#toggle-handle {
-	display: block;
-	width: 18px;
-	height: 19px;
-	float: right;
-	background-image: url(../images/toggle.gif);
-}
-
-.rtl #toggle-handle {
-	background-image: url(../images/toggle.gif);
-	background-position: 100% 50%;
-}
-
-/* Menu */
-#menu {
-	float: left;
-	width: 20%;
-	font-size: 1.00em;
-	padding: 0;
-	border-right: 1px solid #CCCFD3;
-}
-
-.rtl #menu {
-	float: right;
-	border: none;
-	border-left: 1px solid #CCCFD3;
-}
-
-#menu p {
-	font-size: 0.85em;
-}
-
-#menu ul {
-	list-style: none;
-	margin: 0;
-	padding: 0;
-}
-
-/* Default list state */
-#menu li {
-	padding: 0;
-	margin: 0;
-	font-size: 0.85em;
-	font-weight: bold;
-	display: inline;
-}
-
-/* Link styles for the sub-section links */
-#menu li span {
-	display: block;
-	padding: 3px 3px 3px 8px;
-	margin: 1px 0;
-	text-decoration: none;
-	font-weight: normal;
-	color: #138ECB;
-}
-
-.rtl #menu li span {
-	padding: 3px 8px 3px 3px;
-}
-
-#menu li a:hover, #menu li a:hover span {
-	text-decoration: none;
-	background-color: #FFFFFF;
-	color: #BC2A4D;
-}
-
-#menu li a:active, #menu li a:active span {
-	color: #F632A0;
-}
-
-#menu li#activemenu a span {
-	text-decoration: none;
-	font-weight: bold;
-	color: #1180B7;
-	background: transparent url("../images/arrow_right.gif") 0% 50% no-repeat;
-}
-
-.rtl #menu li#activemenu a span {
-	background: transparent url("../images/arrow_left.gif") 100% 50% no-repeat;
-}
-
-#menu li#activemenu a:hover span, #menu li#activemenu span {
-	text-decoration: none;
-	font-weight: bold;
-	color: #BC2A4D;
-	background: #FFFFFF url("../images/arrow_right.gif") 1% 50% no-repeat;
-}
-
-.rtl #menu li#activemenu a:hover span, .rtl #menu li#activemenu span {
-	background: #FFFFFF url("../images/arrow_left.gif") 99% 50% no-repeat;
-}
-
-#menu li a:active, #menu li a:active span, #menu li#activemenu a:active span {
-	color: #F632A0;
-}
-
-#menu li span.completed {
-	text-decoration: none;
-	padding: 3px 3px 3px 12px;
-	background: url("../images/arrow_down.gif") 1% 50% no-repeat;
-}
-
-.rtl #menu li span.completed {
-	text-decoration: none;
-	padding: 3px 12px 3px 3px;
-	background: url("../images/arrow_down.gif") 99% 50% no-repeat;
-}
-
-#menu li.header {
-	font-family: Tahoma, Helvetica, sans-serif;
-	display: block;
-	font-weight: bold;
-	color: #115098;
-	border-bottom: 1px solid #327AA5;
-	padding: 4px 0 2px;
-	margin-top: 15px;
-	text-transform: uppercase;
-	font-size: 0.75em;
-}
-
-/* Table styles
----------------------------------------- */
-
-table {
-	width: 100%;
-	border: 1px solid #CCCFD3;
-	background-color: #FFFFFF;
-	padding: 1px;
-}
-
-th {
-	padding: 3px 4px;
-	color: #FFFFFF;
-	background: #70AED3 url("../images/gradient2b.gif") bottom left repeat-x;
-	border-top: 1px solid #6DACD2;
-	border-bottom: 1px solid #327AA5;
-	text-align: left;
-	font-size: 0.75em;
-	text-transform: uppercase;
-}
-
-td {
-	text-align: left;
-	font-size: 0.85em;
-	padding: 4px;
-	line-height: 1.20em;
-}
-
-.rtl th, .rtl td {
-	text-align: right;
-}
-
-table.type2 {
-	border: none;
-	background: none;
-	padding: 0;
-}
-
-table.type2 th {
-	background: none;
-	border-top: none;
-	text-align: center;
-	color: #115098;
-	padding: 2px 0;
-}
-
-table.type2 td {
-	padding: 0;
-	font-size: 1em;
-}
-
-table.type2 td.name {
-	padding: 2px;
-	vertical-align: middle;
-}
-
-table.type3  {
-	float: right;
-	width: 300px;
-	border: none;
-	background-color: transparent;
-	padding: 0;
-}
-
-.rtl table.type3 {
-	float: left;
-}
-
-table.type3 thead th {
-	background-color: transparent;
-	border-top: none;
-	text-align: center;
-	color: #115098;
-	padding: 0 3px;
-	font-size: 0.85em;
-	font-weight: normal;
-	text-transform: none;
-}
-
-table.type3 tbody th {
-	border-top: none;
-	text-align: left;
-	text-transform: none;
-	padding: 0;
-	border: none;
-	font-size: 0.90em;
-	font-weight: normal;
-	width: 100%;
-}
-
-.rtl table.type3 tbody th {
-	text-align: right;
-}
-
-table.type3 td {
-	text-align: center;
-	padding: 1px;
-}
-
-th.name {
-	text-align: left;
-	width: auto;
-}
-
-.rtl th.name {
-	text-align: right;
-}
-
-td.name {
-	text-align: left;
-	font-weight: bold;
-}
-
-.rtl td.name {
-	text-align: right;
-}
-
-.entry {
-	text-align: left;
-	font-weight: normal;
-}
-
-.rtl .entry {
-	text-align: right;
-}
-
-.row1 { background-color: #F9F9F9; }
-.row2 { background-color: #DCEBFE; }
-.row3 { background-color: #DBDFE2; }
-.row4 { background-color: #E4E8EB; }
-.col1 { background-color: #DCEBFE; }
-.col2 { background-color: #F9F9F9; }
-
-.spacer {
-	background-color: #DBDFE2;
-	height: 1px;
-	line-height: 1px;
-}
-
-/* General form styles
-----------------------------------------*/
-fieldset {
-	margin: 15px 0;
-	padding: 10px;
-	border-top: 1px solid #D7D7D7;
-	border-right: 1px solid #CCCCCC;
-	border-bottom: 1px solid #CCCCCC;
-	border-left: 1px solid #D7D7D7;
-	background-color: #FFFFFF;
-	position: relative;
-}
-
-.rtl fieldset {
-	border-top: 1px solid #D7D7D7;
-	border-right: 1px solid #D7D7D7;
-	border-bottom: 1px solid #CCCCCC;
-	border-left: 1px solid #CCCCCC;
-}
-
-* html fieldset {
-	padding: 0 10px 5px 10px;
-}
-
-fieldset p {
-	font-size: 0.85em;
-}
-
-legend {
-	padding: 1px 0;
-	font-family: Tahoma,arial,Verdana,Sans-serif;
-	font-size: .9em;
-	font-weight: bold;
-	color: #115098;
-	margin-top: -.4em;
-	position: relative;
-	text-transform: none;
-	line-height: 1.2em;
-	top: 0;
-	vertical-align: middle;
-}
-
-/* Hide from macIE \*/
-legend { top: -1.2em; }
-/* end */
-
-* html legend {
-	margin: 0 0 -10px -7px;
-	line-height: 1em;
-	font-size: .85em;
-}
-
-/* Holly hack, .rtl comes after html */
-* html .rtl legend {
-	margin: 0;
-	margin-right: -7px;
-}
-
-input, textarea {
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 0.90em;
-	font-weight: normal;
-	cursor: text;
-	vertical-align: middle;
-	padding: 2px;
-	color: #111111;
-	border-left: 1px solid #AFAEAA;
-	border-top: 1px solid #AFAEAA;
-	border-right: 1px solid #D5D5C8;
-	border-bottom: 1px solid #D5D5C8;
-	background-color: #E3DFD8;
-}
-
-.rtl input, .rtl textarea {
-	border-left: 1px solid #D5D5C8;
-	border-top: 1px solid #AFAEAA;
-	border-right: 1px solid #AFAEAA;
-	border-bottom: 1px solid #D5D5C8;
-}
-
-input:hover, textarea:hover {
-	border-left: 1px solid #AFAEAA;
-	border-top: 1px solid #AFAEAA;
-	border-right: 1px solid #AFAEAA;
-	border-bottom: 1px solid #AFAEAA;
-	background-color: #E9E9E2;
-}
-
-input.langvalue, textarea.langvalue {
-	width: 90%;
-}
-
-optgroup, select {
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 0.85em;
-	font-weight: normal;
-	font-style: normal;
-	cursor: pointer;
-	vertical-align: middle;
-	width: auto;
-	color: #000;
-}
-
-optgroup {
-	font-size: 1.00em;
-	font-weight: bold;
-}
-
-optgroup.disabled-options {
-	display: none;
-	background-color: gray;
-}
-
-option {
-	padding: 0 1em 0 0;
-	color: #000;
-}
-
-option.disabled-option {
-	color: graytext;
-}
-
-.rtl option {
-	padding: 0 0 0 1em;
-}
-
-.sep {
-	font-weight: bold;
-}
-
-.username-coloured {
-	font-weight: bold;
-}
-
-textarea {
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 0.85em;
-	width: 60%;
-	padding: 2px;
-}
-
-label {
-	cursor: pointer;
-	font-size: 0.85em;
-	padding: 0 5px 0 0;
-}
-
-.rtl label {
-	padding: 0 0 0 5px;
-}
-
-label input {
-	font-size: 1.00em;
-	vertical-align: middle;
-}
-
-label img {
-	vertical-align: middle;
-}
-
-fieldset.quick, p.quick {
-	margin: 0 0 5px;
-	padding: 5px 0 0; 
-	border: none;
-	background-color: transparent;
-	text-align: right;
-}
-
-.rtl fieldset.quick, .rtl p.quick {
-	text-align: left;
-}
-
-fieldset.quick legend {
-	display: none;
-}
-
-fieldset.tabulated {
-	background: none;
-	margin: 0;
-	padding: 0;
-	padding-top: 5px;
-	border: 0;
-}
-
-fieldset.tabulated legend {
-	display: none;
-}
-
-fieldset.nobg {
-	margin: 15px 0 0 0;
-	padding: 0;
-	border: none;
-	background-color: transparent;
-}
-
-fieldset.display-options {
-	margin: 15px 0 2px 0;
-	padding: 0 0 4px 0;
-	border: none;
-	background-color: transparent;
-	text-align: center;
-	font-size: 0.75em;
-}
-
-fieldset.display-options select, fieldset.display-options input, fieldset.display-options label {
-	font-size: 1.00em;
-	vertical-align: middle;
-}
-
-select option.disabled {
-	background-color: #bbb;
-	color: #fff;
-}
-
-/* Special case inputs */
-select#board_timezone, 
-select#full_folder_action {
-	width: 95%;
-}
-
-/* Definition list layout for forms
-	Other general def. list properties defined in prosilver_main.css
----------------------------------------- */
-dl {
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 1.00em;
-}
-
-dt {
-	float: left;
-	width: auto;
-}
-
-.rtl dt {
-	float: right;
-}
-
-dd { color: #666666;}
-dd + dd { padding-top: 5px;}
-dt span { padding: 0 5px 0 0;}
-.rtl dt span { padding: 0 0 0 5px;}
-
-dt .explain { font-style: italic;}
-
-dt label {
-	font-size: 1.00em;
-	text-align: left;
-	font-weight: bold;
-	color: #4A5A73;
-}
-
-.rtl dt label {
-	text-align: right;
-}
-
-dd label {
-	font-size: 1.00em;
-	white-space: nowrap;
-	margin: 0 10px 0 0;
-	color: #4A5A73;
-}
-
-.rtl dd label {
-	margin: 0 0 0 10px;
-}
-
-html>body dd label input { vertical-align: text-bottom;}	/* Tweak for Moz to align checkboxes/radio buttons nicely */
-
-dd input {
-	font-size: 1.00em;
-	max-width: 100%;
-}
-
-dd select {
-	font-size: 100%;
-	width: auto;
-	max-width: 100%;
-}
-
-dd textarea {
-	font-size: 0.90em;
-	width: 90%;
-}
-
-dd select {
-	width: auto;
-	font-size: 1.00em;
-}
-
-fieldset dl {
-	margin-bottom: 10px;
-	font-size: 0.85em;
-}
-
-fieldset dt {
-	width: 45%;
-	text-align: left;
-	border: none;
-	border-right: 1px solid #CCCCCC;
-	padding-top: 3px;
-}
-
-.rtl fieldset dt {
-	text-align: right;
-	border: none;
-	border-left: 1px solid #CCCCCC;
-}
-
-fieldset dd {
-	margin: 0 0 0 45%;
-	padding: 0 0 0 5px;
-	border: none;
-	border-left: 1px solid #CCCCCC;
-	vertical-align: top;
-	font-size: 1.00em;
-}
-
-.rtl fieldset dd {
-	margin: 0 45% 0 0;
-	padding: 0 5px 0 0;
-	border: none;
-	border-right: 1px solid #CCCCCC;
-}
-
-dd.full, .rtl dd.full {
-	margin: 0;
-	border: 0;
-	padding: 0;
-	padding-top: 3px;
-	text-align: center;
-	width: 95%;
-}
-
-/* Hover highlights for form rows */
-fieldset dl:hover dt, fieldset dl:hover dd {
-	border-color: #666666;
-}
-
-fieldset dl:hover dt label {
-	color: #000000;
-}
-
-fieldset dl dd label:hover {
-	color: #BC2A4D;
-}
-
-input:focus, textarea:focus {
-	border: 1px solid #BC2A4D;
-	background-color: #E9E9E2;
-	color: #BC2A4D;
-}
-
-/* Submit button fieldset or paragraph
----------------------------------------- */
-fieldset.submit-buttons {
-	text-align: center;
-	border: none;
-	background-color: transparent;
-	margin: 0;
-	padding: 4px;
-	margin-top: -1px;
-}
-
-p.submit-buttons {
-	text-align: center;
-	margin: 0;
-	padding: 4px;
-	margin-top: 10px;
-}
-
-fieldset.submit-buttons input, p.submit-buttons input {
-	padding: 3px 2px;
-}
-
-fieldset.submit-buttons legend {
-	display: none;
-}
-
-/* Input field styles
----------------------------------------- */
-
-input.radio, input.permissions-checkbox {
-	width: auto !important;
-	background-color: transparent;
-	border: none;
-	cursor: default;
-}
-
-input.full,
-textarea.full {
-	width: 99%;
-}
-
-* html input.full, * html textarea.full { width: 95%;}
-input.medium { width: 50%;}
-input.narrow { width: 25%;}
-input.tiny { width: 10%;}
-input.autowidth { width: auto !important;}
-.box2 .inputbox { background-color: #E9E9E9;}
-
-/* Form button styles
----------------------------------------- */
-a.button1, input.button1, input.button3,
-a.button2, input.button2 {
-	width: auto !important;
-	padding: 1px 3px 0 3px;
-	font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
-	color: #000;
-	font-size: 0.85em;
-	background: #EFEFEF url("../images/bg_button.gif") repeat-x top;
-	cursor: pointer;
-}
-
-a.button1, input.button1 {
-	font-weight: bold;
-	border: 1px solid #666666;
-}
-
-/* Alternative button */
-a.button2, input.button2 {
-	border: 1px solid #666666;
-}
-
-/* <a> button in the style of the form buttons */
-a.button1, a.button1:link, a.button1:visited, a.button1:active,
-a.button2, a.button2:link, a.button2:visited, a.button2:active {
-	text-decoration: none;
-	color: #000000;
-	padding: 4px 8px;
-}
-
-/* Hover states */
-a.button1:hover, input.button1:hover,
-a.button2:hover, input.button2:hover {
-	border: 1px solid #BC2A4D;
-	background: #EFEFEF url("../images/bg_button.gif") repeat bottom;
-	color: #BC2A4D;
-}
-
-input.disabled {
-	font-weight: normal;
-	color: #666666;
-}
-
-/* Pagination
----------------------------------------- */
-.pagination {
-	height: 1%; /* IE tweak (holly hack) */
-	width: auto;
-	text-align: right;
-	margin-top: 5px;
-	font-size: 0.85em;
-	padding-bottom: 2px;
-}
-
-.rtl .pagination {
-	text-align: left;
-}
-
-.pagination strong,
-.pagination b {
-	font-weight: normal;
-}
-
-.pagination span.page-sep {
-	display:none;
-}
-
-.pagination span strong {
-	padding: 0 2px;
-	margin: 0 2px;
-	font-weight: normal;
-	font-size: 0.85em;
-	color: #FFFFFF;
-	background: #4692BF;
-	border: 1px solid #4692BF;
-}
-
-.pagination span a, .pagination span a:link, .pagination span a:visited, .pagination span a:active {
-	font-weight: normal;
-	font-size: 0.85em;
-	text-decoration: none;
-	color: #5C758C;
-	margin: 0 2px;
-	padding: 0 2px;
-	background: #ECEDEE;
-	border: 1px solid #B4BAC0;
-}
-
-.pagination span a:hover {
-	border-color: #368AD2;
-	background: #368AD2;
-	color: #FFFFFF;
-	text-decoration: none;
-}
-
-.pagination img {
-	vertical-align: middle;
-}
-
-
-/* Action Highlighting
----------------------------------------- */
-.successbox, .errorbox {
-	padding: 8px;
-	margin: 10px 0;
-	color: #FFFFFF;
-	text-align: center;
-}
-
-.success {
-	color: #228822;
-}
-
-.error {
-	color: #BC2A4D;
-}
-
-.successbox {
-	background-color: #228822;
-}
-
-.errorbox {
-	background-color: #BC2A4D;
-}
-
-* html .errorbox, * html .successbox { height: 1%; } /* Pixel shift fix for IE */
-
-.successbox h3, .errorbox h3 {
-	color: #FFFFFF;
-	margin: 0 0 0.5em;
-	font-size: 1.10em;
-	font-family: "Lucida Grande",Verdana,Helvetica,Arial,sans-serif;
-}
-
-.successbox p, .errorbox p {
-	color: #FFFFFF;
-	font-size: 0.85em;
-	margin-bottom: 0;
-}
-
-.errorbox a:link, .errorbox a:active, .errorbox a:visited,
-.successbox a:link, .successbox a:active, .successbox a:visited {
-	color: #DBD7D1;
-	text-decoration: underline;
-	font-weight: bold;
-}
-
-.errorbox a:hover, .successbox a:hover {
-	color: #FFFFFF;
-	text-decoration: none;
-	font-weight: bold;
-}
-
-.notice {
-	background-color: #62A5CC;
-}
-
-/* Special cases for the error page */
-#errorpage #page-header a {
-	font-weight: bold;
-	line-height: 6em;
-}
-
-#errorpage #content {
-	padding-top: 10px;
-}
-
-#errorpage #content h1 {
-	color: #DF075C;
-}
-
-#errorpage #content h2 {
-	margin-top: 20px;
-	margin-bottom: 5px;
-	border-bottom: 1px solid #CCCCCC;
-	padding-bottom: 5px;
-	color: #333333;
-}
-
-/* Tooltip for permission roles */
-.tooltip {
-	width: 200px;
-	color: #000;
-	text-align: center;
-	border: 1px solid #AAA;
-}
-
-.tooltip span.top {
-	background: #EFEFEF;
-	font-weight: bold;
-	padding: 2px;
-}
-
-.tooltip span.bottom {
-	padding: 5px;
-	color: #000000;
-	background: #FFFFFF;
-}
-
-/*
- Format Buttons for signature editor
-*/
-#format-buttons {
-	margin: 15px 0 2px 0;
-}
-
-#format-buttons input, #format-buttons select {
-	vertical-align: middle;
-}
-
-/* Nice method for clearing floated blocks without having to insert any extra markup
-	From http://www.positioniseverything.net/easyclearing.html 
-.clearfix:after, #tabs:after, .row:after, #content:after, fieldset dl:after, #page-body:after {
-	content: "."; 
-	display: block; 
-	height: 0; 
-	clear: both; 
-	visibility: hidden;
-}*/
-
-.clearfix, #tabs, .row, #content, fieldset dl, #page-body {
-	height: 1%;
-	overflow: hidden;
-}
-
-/* Syntax Highlighting
----------------------------------------- */
-.sourcenum {
-	color: gray;
-	font-family: Monaco, 'Courier New', monospace;
-	font-size: 1.25em;
-	font-weight: bold;
-	line-height: 1.20em;
-	text-align: right;
-	padding: 0;
-}
-
-.rtl .sourcenum {
-	text-align: left;
-}
-
-.source {
-	font-family: Monaco, 'Courier New', monospace;
-	font-size: 1.25em;
-	line-height: 1.20em;
-	padding: 0;
-}
-
-.syntaxbg {
-	color: #FFFFFF;
-}
-
-.syntaxcomment {
-	color: #FF8000;
-}
-
-.syntaxdefault {
-	color: #0000BB;
-}
-
-.syntaxhtml {
-	color: #000000;
-}
-
-.syntaxkeyword {
-	color: #007700;
-}
-
-.syntaxstring {
-	color: #DD0000;
-}
-
-/* Permission interface
----------------------------------------- */
-
-fieldset.permissions legend {
-	text-transform: none;
-}
-
-fieldset.permissions legend input{
-	height: 1.1em;
-}
-
-/* Permission sections */ 
-fieldset.permissions .permissions-simple {
-	text-align: left;
-	padding-top: 3px;
-}
-
-.rtl fieldset.permissions .permissions-simple {
-	text-align: right;
-}
-
-fieldset.permissions .permissions-advanced {
-	padding: 10px 0 0 5px;
-	vertical-align: top;
-	clear: right;
-}
-
-.rtl fieldset.permissions .permissions-advanced {
-	padding: 10px 5px 0 0;
-	clear: left;
-}
-
-fieldset.permissions .permissions-switch {
-	float: right;
-}
-
-.rtl fieldset.permissions .permissions-switch {
-	float: left;
-}
-
-fieldset.permissions .padding {
-}
-
-.permissions-switch {
-	margin-top: -6px;
-	font-size: .9em;
-}
-
-.permissions-switch a {
-	text-decoration: underline;
-}
-
-.permissions-reset {
-	padding-bottom: 10px;
-}
-
-.permissions-reset a {
-	font-size: .85em;
-}
-
-/* Tabbed menu */
-.permissions-category {
-	line-height: normal;
-	margin: 0 0 -1px 7px;
-	min-width: 570px;
-	font-size: 0.85em;
-}
-
-.rtl .permissions-category {
-	margin: 0 7px -1px 0;
-}
-
-.permissions-category ul {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-}
-
-.permissions-category li {
-	display: inline;
-	margin: 0;
-	padding: 0;
-	font-size: 1em;
-	font-weight: bold;
-}
-
-.permissions-category a {
-	float: left;
-	background: url("../images/bg_tabs_alt1.gif") no-repeat 0% -35px;
-	margin: 0 1px 0 0;
-	padding: 0 0 0 6px;
-	text-decoration: none;
-	position: relative;
-}
-
-.rtl .permissions-category a {
-	float: right;
-}
-
-.permissions-category a span.tabbg {
-	float: left;
-	display: block;
-	background: url("../images/bg_tabs_alt2.gif") no-repeat 100% -35px;
-	padding: 7px 12px 6px 6px;
-	color: #536482;
-	white-space: nowrap;
-}
-
-.rtl .permissions-category a span.tabbg {
-	float: right;
-}
-
-/* Commented Backslash Hack hides rule from IE5-Mac \*/
-.permissions-category a span.tabbg, .rtl .permissions-category a span.tabbg { float: none;}
-/* End hack */
-
-.permissions-category a:hover span.tabbg {
-	color: #DD6900;
-}
-
-.permissions-category .activetab a {
-	background-position: 0 0;
-}
-
-.permissions-category .activetab a span.tabbg {
-	background-position: 100% 0;
-	padding-bottom: 7px;
-	color: #333333;
-}
-
-.permissions-category a:hover {
-	background-position: 0 -70px;
-}
-
-.permissions-category a:hover span.tabbg {
-	background-position: 100% -70px;
-}
-
-.permissions-category .activetab a:hover span.tabbg {
-	color: #333333;
-	background-position: 100% 0;
-}
-
-.permissions-category .activetab a:hover {
-	background-position: 0 0;
-}
-
-.permissions-category a span.colour {
-	border: 1px solid #536482;
-	display: block;
-	float: left;
-	width: 10px;
-	height: 10px;
-	margin: 0 5px 0 0;
-}
-
-/* Most browsers will have to live with a left aligned icon in RTL mode, as (currently) only Firefox 3.0 Alpha 3 renders it correctly without destroying it
-.rtl .permissions-category a span.colour {
-	float: right;
-	margin: 0 0 0 5px;
-}
-*/
-
-.permissions-category .activetab span.colour {
-	border-color: #333333;
-}
-
-.permissions-category a:hover span.colour {
-	border-color: #DD6900;
-}
-
-.permissions-category .activetab a:hover span.colour {
-	border-color: #333333;
-}
-
-/* Permission preset colours */
-.permissions-preset-yes span.colour,
-.yes {
-	background-color: #86F786;
-}
-
-.permissions-preset-custom span.colour {
-	background-color: #B2BBDD;
-}
-
-.permissions-preset-never span.colour {
-	background-color: #DD0000;
-}
-
-.permissions-preset-no span.colour,
-.never {
-	background-color: #EFB0B2;
-}
-
-/* Permission panel
----------------------------------------- */
-.permissions-panel {
-	float: left;
-	background-color: #CADCEB;
-	width: 100%;
-}
-
-.rtl .permissions-panel {
-	float: right;
-}
-
-.permissions-panel span.corners-top {
-	background-image: url("../images/corners_left2.gif");
-}
-
-.permissions-panel span.corners-top span {
-	background-image: url("../images/corners_right2.gif");
-}
-
-.permissions-panel span.corners-bottom {
-	background-image: url("../images/corners_left2.gif");
-}
-
-.permissions-panel span.corners-bottom span {
-	background-image: url("../images/corners_right2.gif");
-}
-
-.permissions-panel span.corners-top, .permissions-panel span.corners-bottom, 
-.permissions-panel span.corners-top span, .permissions-panel span.corners-bottom span {
-	font-size: 1px;
-	line-height: 1px;
-	display: block;
-	height: 5px;
-	background-repeat: no-repeat;
-}
-
-.permissions-panel span.corners-top {
-	background-image: url("../images/corners_left2.gif");
-	background-position: 0 0;
-	margin: 0 0;
-}
-
-.permissions-panel span.corners-top span {
-	background-image: url("../images/corners_right2.gif");
-	background-position: 100% 0;
-}
-
-.permissions-panel span.corners-bottom {
-	background-image: url("../images/corners_left2.gif");
-	background-position: 0 100%;
-	margin: 0 0;
-	clear: both;
-}
-
-.permissions-panel span.corners-bottom span {
-	background-image: url("../images/corners_right2.gif");
-	background-position: 100% 100%;
-}
-
-/* Permission table
----------------------------------------- */
-.permissions-panel .tablewrap {
-	margin: 0 10px;
-}
-
-.permissions-panel table {
-	width: 100%;
-}
-
-.permissions-panel th {
-	text-transform: none;
-}
-
-.permissions-panel th.value {
-	text-align: center;
-}
-
-.permissions-panel th.name {
-	text-align: left;
-	width: auto;
-	text-transform: none;
-}
-
-.rtl .permissions-panel th.name {
-	text-align: right;
-}
-
-.permissions-panel th.permissions-name {
-	border: none;
-	color: #536482;
-	font-weight: normal;
-}
-
-.permissions-panel th.permissions-name a.trace {
-	display: inline;
-}
-
-.permissions-panel th.row3 {
-	background-image: none;
-	background-color: #D1D7DC;
-	color: #536482;
-	border: none;
-}
-
-.permissions-panel th.row4 {
-	background-image: none;	
-	background-color: #E4E8EB;
-	color: #536482;
-	border: none;
-}
-
-.permissions-panel th a:link, .permissions-panel th a:hover, .permissions-panel th a:visited {
-	display: block;
-	color: #FFFFFF; 
-	text-decoration: underline; 
-}
-
-.permissions-panel td.permissions-yes label:hover {
-	background-color: #86F786;
-}
-
-.permissions-panel td.permissions-no label:hover {
-	background-color: #EFB0B2;
-}
-
-.permissions-panel td.permissions-never label:hover {
-	background-color: #DD0000;
-}
-
-.permissions-panel td {
-	padding: 0;
-	text-align: center;
-	width: 10%;
-}
-
-.permissions-panel td label {
-	display: block;
-	margin: 0;
-	padding: 0;
-}
-
-/* Classes for additional tasks
----------------------------------------- */
-
-.phpinfo {
-	overflow: auto;
-	width: 99%;
-	direction: ltr;
-}
-
-.phpinfo td, .phpinfo th, .phpinfo h2, .phpinfo h1 {
-	text-align: left;
-}
diff --git a/phpBB/adm/style/captcha_default_acp_demo.html b/phpBB/adm/style/captcha_default_acp_demo.html
deleted file mode 100644
index a714386e51..0000000000
--- a/phpBB/adm/style/captcha_default_acp_demo.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<dl>
-	<dt><label for="captcha_preview">{L_PREVIEW}:</label><br /><span>{L_CAPTCHA_PREVIEW_EXPLAIN}</span></dt>
-	<dd><img src="{CONFIRM_IMAGE}" alt="{L_PREVIEW}" width="360" height="96" id="captcha_preview" /></dd>
-</dl>
-\ No newline at end of file
diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html
deleted file mode 100644
index ff1500e7d0..0000000000
--- a/phpBB/adm/style/captcha_gd_acp.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h1>{L_ACP_VC_SETTINGS}</h1>
-
-<p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
-
-
-<form id="acp_captcha" method="post" action="{U_ACTION}">
-
-<fieldset>
-<legend>{L_GENERAL_OPTIONS}</legend>
-
-<dl>
-	<dt><label for="captcha_gd_foreground_noise">{L_CAPTCHA_GD_FOREGROUND_NOISE}:</label><br /><span>{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}</span></dt>
-	<dd><label><input id="captcha_gd_foreground_noise" name="captcha_gd_foreground_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input name="captcha_gd_foreground_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
-<dl>
-	<dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}:</label><br /><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt>
-	<dd><input id="captcha_gd_x_grid" name="captcha_gd_x_grid" value="{CAPTCHA_GD_X_GRID}" type="text" /></dd>
-</dl>
-<dl>
-	<dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}:</label><br /><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt>
-	<dd><input id="captcha_gd_y_grid" name="captcha_gd_y_grid" value="{CAPTCHA_GD_Y_GRID}" type="text" /></dd>
-</dl>
-
-
-</fieldset>
-<fieldset>
-	<legend>{L_PREVIEW}</legend>
-<!-- IF PREVIEW -->
-	<div class="successbox">
-		<h3>{L_WARNING}</h3>
-		<p>{L_CAPTCHA_PREVIEW_MSG}</p>
-	</div>
-<!-- ENDIF -->
-{CAPTCHA_PREVIEW}
-</fieldset>
-
-<fieldset class="submit-buttons">
-	<legend>{L_SUBMIT}</legend>
-	<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />&nbsp;
-	<input type="hidden" name="select_captcha" value="{CAPTCHA_NAME}" />
-	<input type="hidden" name="configure" value="1" />
-
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html
deleted file mode 100644
index f325c3727d..0000000000
--- a/phpBB/adm/style/captcha_recaptcha.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- IF S_RECAPTCHA_AVAILABLE -->
-	<dl>
-		<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
-		// <![CDATA[
-		var RecaptchaOptions = {
-		   lang : {L_RECAPTCHA_LANG}
-		};
-		// ]]>
-		</script>
-
-	<noscript>
-  		<iframe src="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" height="300" width="500" frameborder="0"></iframe><br/>
-  		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
-  		<input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
-	</noscript>
-	</dl>
-<!-- ELSE -->
-{L_RECAPTCHA_NOT_AVAILABLE}
-<!-- ENDIF -->
-\ No newline at end of file
diff --git a/phpBB/adm/style/captcha_recaptcha_acp.html b/phpBB/adm/style/captcha_recaptcha_acp.html
deleted file mode 100644
index 07751d1d03..0000000000
--- a/phpBB/adm/style/captcha_recaptcha_acp.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h1>{L_ACP_VC_SETTINGS}</h1>
-
-<p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
-
-
-<form id="acp_captcha" method="post" action="{U_ACTION}">
-
-<fieldset>
-<legend>{L_GENERAL_OPTIONS}</legend>
-
-<dl>
-	<dt><label for="recaptcha_pubkey">{L_RECAPTCHA_PUBLIC}:</label><br /><span>{L_RECAPTCHA_PUBLIC_EXPLAIN}</span></dt>
-	<dd><input id="recaptcha_pubkey" name="recaptcha_pubkey" value="{RECAPTCHA_PUBKEY}" size="50" type="text" /></dd>
-</dl>
-<dl>
-	<dt><label for="recaptcha_privkey">{L_RECAPTCHA_PRIVATE}:</label><br /><span>{L_RECAPTCHA_PRIVATE_EXPLAIN}</span></dt>
-	<dd><input id="recaptcha_privkey" name="recaptcha_privkey" value="{RECAPTCHA_PRIVKEY}" size="50" type="text" /></dd>
-</dl>
-
-
-</fieldset>
-<fieldset>
-	<legend>{L_PREVIEW}</legend>
-<!-- IF PREVIEW -->
-	<div class="successbox">
-		<h3>{L_WARNING}</h3>
-		<p>{L_CAPTCHA_PREVIEW_MSG}</p>
-	</div>
-<!-- ENDIF -->
-{CAPTCHA_PREVIEW}
-</fieldset>
-
-<fieldset class="submit-buttons">
-	<legend>{L_SUBMIT}</legend>
-	<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />&nbsp;
-	<input type="hidden" name="select_captcha" value="{CAPTCHA_NAME}" />
-	<input type="hidden" name="configure" value="1" />
-
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/colour_swatch.html b/phpBB/adm/style/colour_swatch.html
deleted file mode 100644
index c9e89980d8..0000000000
--- a/phpBB/adm/style/colour_swatch.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
-<meta http-equiv="imagetoolbar" content="no" />
-<title>{L_COLOUR_SWATCH}</title>
-
-<style type="text/css">
-/* <![CDATA[ */
-	body {
-		background-color: #404040;
-		color: #fff;
-	}
-
-	td {
-		border: solid 1px #333; 
-	}
-
-	.over { 
-		border-color: white; 
-	}
-
-	.out {
-		border-color: #333333; 
-	}
-
-	img {
-		border: 0;
-	}
-/* ]]> */
-</style>
-</head>
-
-<body>
-
-<script type="text/javascript">
-// <![CDATA[
-	var r = 0, g = 0, b = 0;
-
-	var numberList = new Array(6);
-	numberList[0] = '00';
-	numberList[1] = '33';
-	numberList[2] = '66';
-	numberList[3] = '99';
-	numberList[4] = 'CC';
-	numberList[5] = 'FF';
-
-	document.writeln('<table cellspacing="0" cellpadding="0" border="0">');
-
-	for (r = 0; r < 6; r++)
-	{
-		document.writeln('<tr>');
-
-		for (g = 0; g < 6; g++)
-		{
-			for (b = 0; b < 6; b++)
-			{
-				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
-				document.write('<td style="background-color: #' + color + ';" onmouseover="this.className=\'over\'" onmouseout="this.className=\'out\'">');
-				document.write('<a href="#" onclick="cell(\'' + color + '\'); return false;"><img src="{T_IMAGES_PATH}spacer.gif" width="15" height="12" alt="#' + color + '" title="#' + color + '" \/><\/a>');
-				document.writeln('<\/td>');
-			}
-		}
-		document.writeln('<\/tr>');
-	}
-	document.writeln('<\/table>');
-
-	function cell(color)
-	{
-		opener.document.forms["{OPENER}"].{NAME}.value = color;
-	}
-// ]]>
-</script>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/phpBB/adm/style/confirm_body.html b/phpBB/adm/style/confirm_body.html
deleted file mode 100644
index 2fbb1a60d7..0000000000
--- a/phpBB/adm/style/confirm_body.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<form id="confirm" method="post" action="{S_CONFIRM_ACTION}">
-
-<fieldset>
-	<h1>{MESSAGE_TITLE}</h1>
-	<p>{MESSAGE_TEXT}</p>
-
-	{S_HIDDEN_FIELDS}
-
-	<div style="text-align: center;">
-		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp; 
-		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
-	</div>
-
-</fieldset>
-		
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/confirm_body_prune.html b/phpBB/adm/style/confirm_body_prune.html
deleted file mode 100644
index 9481386231..0000000000
--- a/phpBB/adm/style/confirm_body_prune.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<form id="confirm" method="post" action="{S_CONFIRM_ACTION}">
-
-<fieldset>
-	<h1>{MESSAGE_TITLE}</h1>
-	<p>{MESSAGE_TEXT}</p>
-
-	{S_HIDDEN_FIELDS}
-
-	<div style="text-align: center;">
-		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp; 
-		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
-	</div>
-
-	<h2>{L_PRUNE_USERS_LIST}</h2>
-	<!-- IF S_DEACTIVATE --><p>{L_PRUNE_USERS_LIST_DEACTIVATE}</p><!-- ELSE --><p>{L_PRUNE_USERS_LIST_DELETE}</p><!-- ENDIF -->
-
-	<br />
-	<!-- BEGIN users -->
-	&raquo; <a href="{users.U_PROFILE}">{users.USERNAME}</a><!-- IF users.U_USER_ADMIN --> [<a href="{users.U_USER_ADMIN}">{L_USER_ADMIN}</a>]<!-- ENDIF --><br />
-	<!-- END users -->
-
-	<br /><br />
-
-</fieldset>
-
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/custom_profile_fields.html b/phpBB/adm/style/custom_profile_fields.html
deleted file mode 100644
index 351397d3c7..0000000000
--- a/phpBB/adm/style/custom_profile_fields.html
+++ /dev/null
@@ -1,32 +0,0 @@
-
-<!-- BEGIN dropdown -->
-	<select name="{dropdown.FIELD_IDENT}" id="{dropdown.FIELD_IDENT}">
-		<!-- BEGIN options --><option value="{dropdown.options.OPTION_ID}"{dropdown.options.SELECTED}>{dropdown.options.VALUE}</option><!-- END options -->
-	</select>
-<!-- END dropdown -->
-
-<!-- BEGIN text -->
-	<textarea name="{text.FIELD_IDENT}" id="{text.FIELD_IDENT}" rows="{text.FIELD_ROWS}" cols="{text.FIELD_COLS}">{text.FIELD_VALUE}</textarea>
-<!-- END text -->
-
-<!-- BEGIN string -->
-	<input type="text" name="{string.FIELD_IDENT}" id="{string.FIELD_IDENT}" size="{string.FIELD_LENGTH}" maxlength="{string.FIELD_MAXLEN}" value="{string.FIELD_VALUE}" />
-<!-- END string -->
-
-<!-- BEGIN bool -->
-	<!-- IF bool.FIELD_LENGTH eq 1 -->
-		<!-- BEGIN options --><label for="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}"><input type="radio" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}" value="{bool.options.OPTION_ID}"{bool.options.CHECKED} /> {bool.options.VALUE}</label> <!-- END options -->
-	<!-- ELSE -->
-		<input type="checkbox" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}" value="1"<!-- IF bool.FIELD_VALUE --> checked="checked"<!-- ENDIF --> />
-	<!-- ENDIF -->
-<!-- END bool -->
-
-<!-- BEGIN int -->
-	<input type="text" name="{int.FIELD_IDENT}" id="{int.FIELD_IDENT}" size="{int.FIELD_LENGTH}" value="{int.FIELD_VALUE}" />
-<!-- END int -->
-
-<!-- BEGIN date -->
-	<span>{L_DAY}:</span> <select name="{date.FIELD_IDENT}_day" id="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select>
-	<span>{L_MONTH}:</span> <select name="{date.FIELD_IDENT}_month" id="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select>
-	<span>{L_YEAR}:</span> <select name="{date.FIELD_IDENT}_year" id="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select>
-<!-- END date -->
diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js
deleted file mode 100644
index 93d0059609..0000000000
--- a/phpBB/adm/style/editor.js
+++ /dev/null
@@ -1,399 +0,0 @@
-/**
-* bbCode control by subBlue design [ www.subBlue.com ]
-* Includes unixsafe colour palette selector by SHS`
-*/
-
-// Startup variables
-var imageTag = false;
-var theSelection = false;
-
-// Check for Browser & Platform for PC & IE specific bits
-// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
-var clientPC = navigator.userAgent.toLowerCase(); // Get client info
-var clientVer = parseInt(navigator.appVersion); // Get browser version
-
-var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1));
-var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
-
-var baseHeight;
-window.onload = initInsertions;
-
-/**
-* Shows the help messages in the helpline window
-*/
-function helpline(help)
-{
-	document.forms[form_name].helpbox.value = help_line[help];
-}
-
-/**
-* Fix a bug involving the TextRange object. From
-* http://www.frostjedi.com/terra/scripts/demo/caretBug.html
-*/ 
-function initInsertions() 
-{
-	var doc;
-	if(document.forms[form_name])
-	{
-		doc = document;
-	}
-	else
-	{
-		doc = opener.document;
-	}
-
-	var textarea = doc.forms[form_name].elements[text_name];
-	if (is_ie && typeof(baseHeight) != 'number')
-	{
-		textarea.focus();
-		baseHeight = doc.selection.createRange().duplicate().boundingHeight;
-		// document.body.focus();
-	}
-}
-
-/**
-* bbstyle
-*/
-function bbstyle(bbnumber)
-{
-	if (bbnumber != -1)
-	{
-		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
-	}
-	else
-	{
-		insert_text('[*]');
-		document.forms[form_name].elements[text_name].focus();		
-	}
-}
-
-/**
-* Apply bbcodes
-*/
-function bbfontstyle(bbopen, bbclose)
-{
-	theSelection = false;
-		
-	var textarea = document.forms[form_name].elements[text_name];
-
-	textarea.focus();
-
-	if ((clientVer >= 4) && is_ie && is_win)
-	{
-		// Get text selection
-		theSelection = document.selection.createRange().text;
-
-		if (theSelection)
-		{
-			// Add tags around selection
-			document.selection.createRange().text = bbopen + theSelection + bbclose;
-			document.forms[form_name].elements[text_name].focus();
-			theSelection = '';
-			return;
-		}
-	}
-	else if (document.forms[form_name].elements[text_name].selectionEnd && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0))
-	{
-		mozWrap(document.forms[form_name].elements[text_name], bbopen, bbclose);
-		document.forms[form_name].elements[text_name].focus();
-		theSelection = '';
-		return;
-	}
-	
-	//The new position for the cursor after adding the bbcode
-	var caret_pos = getCaretPosition(textarea).start;
-	var new_pos = caret_pos + bbopen.length;		
-
-	// Open tag
-	insert_text(bbopen + bbclose);
-
-	// Center the cursor when we don't have a selection
-	// Gecko and proper browsers
-	if (!isNaN(textarea.selectionStart))
-	{
-		textarea.selectionStart = new_pos;
-		textarea.selectionEnd = new_pos;
-	}	
-	// IE
-	else if (document.selection)
-	{
-		var range = textarea.createTextRange(); 
-		range.move("character", new_pos); 
-		range.select();
-		storeCaret(textarea);
-	}
-
-	textarea.focus();
-	return;
-}
-
-/**
-* Insert text at position
-*/
-function insert_text(text, spaces, popup)
-{
-	var textarea;
-	
-	if (!popup)
-	{
-		textarea = document.forms[form_name].elements[text_name];
-	}
-	else
-	{
-		textarea = opener.document.forms[form_name].elements[text_name];
-	}
-
-	if (spaces)
-	{
-		text = ' ' + text + ' ';
-	}
-
-	if (!isNaN(textarea.selectionStart))
-	{
-		var sel_start = textarea.selectionStart;
-		var sel_end = textarea.selectionEnd;
-
-		mozWrap(textarea, text, '')
-		textarea.selectionStart = sel_start + text.length;
-		textarea.selectionEnd = sel_end + text.length;
-	}	
-	
-	else if (textarea.createTextRange && textarea.caretPos)
-	{
-		if (baseHeight != textarea.caretPos.boundingHeight) 
-		{
-			textarea.focus();
-			storeCaret(textarea);
-		}
-		var caret_pos = textarea.caretPos;
-		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
-		
-	}
-	else
-	{
-		textarea.value = textarea.value + text;
-	}
-
-	if (!popup)
-	{
-		textarea.focus();
-	}
-
-}
-
-/**
-* Add inline attachment at position
-*/
-function attach_inline(index, filename)
-{
-	insert_text('[attachment=' + index + ']' + filename + '[/attachment]');
-	document.forms[form_name].elements[text_name].focus();
-}
-
-/**
-* Add quote text to message
-*/
-function addquote(post_id, username)
-{
-	var message_name = 'message_' + post_id;
-	var theSelection = '';
-	var divarea = false;
-
-	if (document.all)
-	{
-		divarea = document.all[message_name];
-	}
-	else
-	{
-		divarea = document.getElementById(message_name);
-	}
-
-	// Get text selection - not only the post content :(
-	if (window.getSelection)
-	{
-		theSelection = window.getSelection().toString();
-	}
-	else if (document.getSelection)
-	{
-		theSelection = document.getSelection();
-	}
-	else if (document.selection)
-	{
-		theSelection = document.selection.createRange().text;
-	}
-
-	if (theSelection == '' || typeof theSelection == 'undefined' || theSelection == null)
-	{
-		if (divarea.innerHTML)
-		{
-			theSelection = divarea.innerHTML.replace(/<br>/ig, '\n');
-			theSelection = theSelection.replace(/<br\/>/ig, '\n');
-			theSelection = theSelection.replace(/&lt\;/ig, '<');
-			theSelection = theSelection.replace(/&gt\;/ig, '>');
-			theSelection = theSelection.replace(/&amp\;/ig, '&');			
-		}
-		else if (document.all)
-		{
-			theSelection = divarea.innerText;
-		}
-		else if (divarea.textContent)
-		{
-			theSelection = divarea.textContent;
-		}
-		else if (divarea.firstChild.nodeValue)
-		{
-			theSelection = divarea.firstChild.nodeValue;
-		}
-	}
-
-	if (theSelection)
-	{
-		insert_text('[quote="' + username + '"]' + theSelection + '[/quote]');
-	}
-
-	return;
-}
-
-/**
-* From http://www.massless.org/mozedit/
-*/
-function mozWrap(txtarea, open, close)
-{
-	var selLength = txtarea.textLength;
-	var selStart = txtarea.selectionStart;
-	var selEnd = txtarea.selectionEnd;
-	var scrollTop = txtarea.scrollTop;
-
-	if (selEnd == 1 || selEnd == 2) 
-	{
-		selEnd = selLength;
-	}
-
-	var s1 = (txtarea.value).substring(0,selStart);
-	var s2 = (txtarea.value).substring(selStart, selEnd)
-	var s3 = (txtarea.value).substring(selEnd, selLength);
-
-	txtarea.value = s1 + open + s2 + close + s3;
-	txtarea.selectionStart = selEnd + open.length + close.length;
-	txtarea.selectionEnd = txtarea.selectionStart;
-	txtarea.focus();
-	txtarea.scrollTop = scrollTop;
-
-	return;
-}
-
-/**
-* Insert at Caret position. Code from
-* http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
-*/
-function storeCaret(textEl)
-{
-	if (textEl.createTextRange)
-	{
-		textEl.caretPos = document.selection.createRange().duplicate();
-	}
-}
-
-/**
-* Color pallette
-*/
-function colorPalette(dir, width, height)
-{
-	var r = 0, g = 0, b = 0;
-	var numberList = new Array(6);
-	var color = '';
-
-	numberList[0] = '00';
-	numberList[1] = '40';
-	numberList[2] = '80';
-	numberList[3] = 'BF';
-	numberList[4] = 'FF';
-
-	document.writeln('<table class="type2">');
-
-	for (r = 0; r < 5; r++)
-	{
-		if (dir == 'h')
-		{
-			document.writeln('<tr>');
-		}
-
-		for (g = 0; g < 5; g++)
-		{
-			if (dir == 'v')
-			{
-				document.writeln('<tr>');
-			}
-			
-			for (b = 0; b < 5; b++)
-			{
-				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
-				document.write('<td bgcolor="#' + color + '">');
-				document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;" onmouseover="helpline(\'s\');"  onmouseout="helpline(\'tip\');"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>');
-				document.writeln('</td>');
-			}
-
-			if (dir == 'v')
-			{
-				document.writeln('</tr>');
-			}
-		}
-
-		if (dir == 'h')
-		{
-			document.writeln('</tr>');
-		}
-	}
-	document.writeln('</table>');
-}
-
-
-/**
-* Caret Position object
-*/
-function caretPosition()
-{
-	var start = null;
-	var end = null;
-}
-
-
-/**
-* Get the caret position in an textarea
-*/
-function getCaretPosition(txtarea)
-{
-	var caretPos = new caretPosition();
-	
-	// simple Gecko/Opera way
-	if (txtarea.selectionStart || txtarea.selectionStart == 0)
-	{
-		caretPos.start = txtarea.selectionStart;
-		caretPos.end = txtarea.selectionEnd;
-	}
-	// dirty and slow IE way
-	else if (document.selection)
-	{
-		// get current selection
-		var range = document.selection.createRange();
-
-		// a new selection of the whole textarea
-		var range_all = document.body.createTextRange();
-		range_all.moveToElementText(txtarea);
-		
-		// calculate selection start point by moving beginning of range_all to beginning of range
-		var sel_start;
-		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++)
-		{
-			range_all.moveStart('character', 1);
-		}
-	
-		txtarea.sel_start = sel_start;
-	
-		// we ignore the end value for IE, this is already dirty enough and we don't need it
-		caretPos.start = txtarea.sel_start;
-		caretPos.end = txtarea.sel_start;			
-	}
-
-	return caretPos;
-}
-\ No newline at end of file
diff --git a/phpBB/adm/style/install/convert.html b/phpBB/adm/style/install/convert.html
deleted file mode 100644
index a9ff57da29..0000000000
--- a/phpBB/adm/style/install/convert.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<!-- INCLUDE install/header.html -->
-
-<!-- IF S_NOT_INSTALLED -->
-
-	<h1>{TITLE}</h1>
-
-	<p>{BODY}</p>
-
-<!-- ELSE -->
-
-	<form id="install_convert" method="post" action="{U_ACTION}">
-
-	<h1>{TITLE}</h1>
-
-	<p>{BODY}</p>
-
-	<!-- IF S_ERROR_BOX -->
-	<div class="errorbox">
-		<h3>{ERROR_TITLE}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
-	<!-- ENDIF -->
-
-	<!-- IF S_LIST -->
-		<table cellspacing="1">
-			<caption>{L_AVAILABLE_CONVERTORS}</caption>
-			<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
-		<thead>
-		<tr>
-			<th>{L_SOFTWARE}</th>
-			<th>{L_VERSION}</th>
-			<th>{L_AUTHOR}</th>
-			<th>{L_OPTIONS}</th>
-		</tr>
-		</thead>
-		<tbody>
-		<!-- IF .convertors -->
-			<!-- BEGIN convertors -->
-			<tr>
-				<td>{convertors.SOFTWARE}</td>
-				<td>{convertors.VERSION}</td>
-				<td>{convertors.AUTHOR}</td>
-				<td><a href="{convertors.U_CONVERT}">{L_CONVERT}</a></td>
-			</tr>
-			<!-- END convertors -->
-		<!-- ELSE -->
-			<tr>
-				<td>{L_NO_CONVERTORS}</td>
-				<td>-</td>
-				<td>-</td>
-				<td>-</td>
-			</tr>
-		<!-- ENDIF -->
-		</tbody>
-		</table>
-	<!-- ENDIF -->
-
-	<!-- IF S_CONTINUE -->
-		</form>
-
-		<fieldset class="submit-buttons">
-			<form method="post" action="{U_NEW_ACTION}">
-				<input class="button1" type="submit" name="submit_new" value="{L_NEW}" />
-			</form>
-			<br />
-			<form method="post" action="{U_CONTINUE_ACTION}">
-				<input class="button1" type="submit" name="submit_cont" value="{L_CONTINUE}" />
-			</form>
-		</fieldset>
-
-		<form method="post" action="{U_ACTION}">
-	<!-- ENDIF -->
-
-	<!-- IF .checks -->
-		<fieldset>
-
-		<!-- BEGIN checks -->
-			<!-- IF checks.S_LEGEND -->
-				<!-- IF not checks.S_FIRST_ROW -->
-				</fieldset>
-
-				<fieldset>
-				<!-- ENDIF -->
-					<legend>{checks.LEGEND}</legend>
-					<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
-			<!-- ELSE -->
-
-				<dl>
-					<dt><label>{checks.TITLE}:</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-					<dd>{checks.RESULT}</dd>
-				</dl>
-			<!-- ENDIF -->
-		<!-- END checks -->
-
-		</fieldset>
-	<!-- ENDIF -->
-
-	<!-- IF .options -->
-		<fieldset>
-
-		<!-- BEGIN options -->
-			<!-- IF options.S_LEGEND -->
-				<!-- IF not options.S_FIRST_ROW -->
-					</fieldset>
-
-					<fieldset>
-				<!-- ENDIF -->
-					<legend>{options.LEGEND}</legend>
-			<!-- ELSE -->
-
-				<dl>
-					<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-					<dd>{options.CONTENT}</dd>
-				</dl>
-
-			<!-- ENDIF -->
-		<!-- END options -->
-
-		</fieldset>
-	<!-- ENDIF -->
-
-	<!-- IF L_SUBMIT -->
-		<!-- IF L_MESSAGE --><p>{L_MESSAGE}</p><!-- ENDIF -->
-
-		<fieldset class="submit-buttons">
-			{S_HIDDEN}
-			<!-- IF L_SUBMIT --><input class="button1<!-- IF S_REFRESH --> disabled<!-- ENDIF -->" type="submit" id="submit" <!-- IF S_REFRESH -->disabled="disabled" <!-- ELSE --> onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" <!-- ENDIF -->name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
-		</fieldset>
-	<!-- ENDIF -->
-
-	</form>
-<!-- ENDIF -->
-
-<!-- INCLUDE install/footer.html -->
-\ No newline at end of file
diff --git a/phpBB/adm/style/install/error.html b/phpBB/adm/style/install/error.html
deleted file mode 100644
index f6982650c8..0000000000
--- a/phpBB/adm/style/install/error.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- INCLUDE install/header.html -->
-
-<div class="errorbox">
-	<h3>{MESSAGE_TITLE}</h3>
-	<p>{MESSAGE_TEXT}</p>
-</div>
-
-<!-- INCLUDE install/footer.html -->
-\ No newline at end of file
diff --git a/phpBB/adm/style/install/footer.html b/phpBB/adm/style/install/footer.html
deleted file mode 100644
index 2ec3581ef4..0000000000
--- a/phpBB/adm/style/install/footer.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-					</div>
-				</div>
-			<span class="corners-bottom"><span></span></span>
-		</div>
-		</div>
-	</div>
-	
-	<!--
-		We request you retain the full copyright notice below including the link to www.phpbb.com.
-		This not only gives respect to the large amount of time given freely by the developers
-		but also helps build interest, traffic and use of phpBB. If you (honestly) cannot retain
-		the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-		"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-		forums may be affected.
-	
-		The phpBB Group : 2006
-	// -->
-	
-	<div id="page-footer">
-		Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
-	</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/phpBB/adm/style/install/header.html b/phpBB/adm/style/install/header.html
deleted file mode 100644
index fbb6a7b409..0000000000
--- a/phpBB/adm/style/install/header.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
-<head>
-
-<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
-<meta http-equiv="imagetoolbar" content="no" />
-<!-- IF META -->{META}<!-- ENDIF -->
-<title>{PAGE_TITLE}</title>
-
-<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
-
-<script type="text/javascript">
-// <![CDATA[
-
-/**
-* Set display of page element
-* s[-1,0,1] = hide,toggle display,show
-*/
-function dE(n, s, type)
-{
-	if (!type)
-	{
-		type = 'block';
-	}
-
-	var e = document.getElementById(n);
-	if (!s)
-	{
-		s = (e.style.display == '' || e.style.display == 'block') ? -1 : 1;
-	}
-	e.style.display = (s == 1) ? type : 'none';
-}
-
-// ]]>
-</script>
-
-</head>
-
-<body class="{S_CONTENT_DIRECTION}">
-<div id="wrap">
-	<div id="page-header">
-		<h1>{L_INSTALL_PANEL}</h1>
-		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
-		<!-- IF S_LANG_SELECT -->
-		<form method="post" action="">
-			<fieldset class="nobg">
-				<label for="language">{L_SELECT_LANG}:</label>
-				{S_LANG_SELECT}
-				<input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" />
-			</fieldset>
-		</form>
-		<!-- ENDIF -->
-	</div>
-	
-	<div id="page-body">
-		<div id="tabs">
-			<ul>
-			<!-- BEGIN t_block1 -->
-				<li<!-- IF t_block1.S_SELECTED --> id="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>
-			<!-- END t_block1 -->
-			</ul>
-		</div>
-
-		<div id="acp">
-		<div class="panel">
-			<span class="corners-top"><span></span></span>
-				<div id="content">
-					<div id="menu">
-						<ul>
-						<!-- BEGIN l_block1 -->
-							<li<!-- IF l_block1.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li>
-						<!-- END l_block1 -->
-						<!-- BEGIN l_block2 -->
-							<li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF -->>{l_block2.L_TITLE}</span></li>
-						<!-- END l_block2 -->
-						</ul>
-					</div>
-	
-					<div id="main" class="install-body">
diff --git a/phpBB/adm/style/install/install.html b/phpBB/adm/style/install/install.html
deleted file mode 100644
index a08b52eb7a..0000000000
--- a/phpBB/adm/style/install/install.html
+++ /dev/null
@@ -1,187 +0,0 @@
-<!-- INCLUDE install/header.html -->
-
-<!-- IF S_SUB eq 'intro' -->
-
-	<h1>{L_INSTALL_INTRO}</h1>
-	<p>{L_INSTALL_INTRO_BODY}</p>
-
-
-	<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
-
-	<fieldset class="submit-buttons">
-		<legend>{L_NEXT_STEP}</legend>
-		<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_NEXT_STEP}" />
-	</fieldset>
-
-	</form>
-
-<!-- ELSEIF S_SUB eq 'requirements' -->
-	<h1>{L_REQUIREMENTS_TITLE}</h1>
-	<p>{L_REQUIREMENTS_EXPLAIN}</p>
-
-	<!-- INCLUDE install/snippet_checks.html -->
-
-	<!-- IF S_FAILED -->
-
-		<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
-
-		<fieldset class="submit-buttons">
-			<legend>{L_INSTALL_TEST}</legend>
-			<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_INSTALL_TEST}" />
-		</fieldset>
-
-		</form>
-
-	<!-- ELSE -->
-
-		<form id="install_install" method="post" action="{U_ACTION_TEST}" onsubmit="submit.disabled = 'disabled';">
-
-		<fieldset class="submit-buttons" style="float: left;">
-			<legend>{L_INSTALL_TEST}</legend>
-			<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_INSTALL_TEST}" />
-		</fieldset>
-
-		</form>
-
-		<form id="install_start" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
-
-		<fieldset class="submit-buttons" style="float: right;">
-			<legend>{L_INSTALL_START}</legend>
-			{S_HIDDEN}
-			<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_INSTALL_START}" />
-		</fieldset>
-
-		</form>
-
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_SUB eq 'database' -->
-
-	<!-- IF S_CONNECT_TEST -->
-		<fieldset>
-			<legend>{L_DB_CONNECTION}</legend>
-
-		<!-- IF S_SUCCESS -->
-			<dl>
-				<dt>{L_DB_TEST}:</dt>
-				<dd><strong style="color:green">{L_SUCCESSFUL_CONNECT}</strong></dd>
-			</dl>
-		<!-- ELSE -->
-			<dl>
-				<dt>{L_DB_TEST}:</dt>
-				<dd><strong style="color:red">{ERROR}</strong></dd>
-			</dl>
-		<!-- ENDIF -->
-		</fieldset>
-	<!-- ENDIF -->
-
-	<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
-
-	<!-- INCLUDE install/snippet_options.html -->
-
-	<fieldset class="submit-buttons">
-		<legend>{L_NEXT_STEP}</legend>
-		{S_HIDDEN}
-		<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_NEXT_STEP}" />
-	</fieldset>
-
-	</form>
-<!-- ELSEIF S_SUB eq 'administrator' -->
-
-	<!-- INCLUDE install/snippet_checks.html -->
-
-	<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
-
-	<!-- INCLUDE install/snippet_options.html -->
-
-	<fieldset class="submit-buttons">
-		<legend>{L_NEXT_STEP}</legend>
-		{S_HIDDEN}
-		<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_NEXT_STEP}" />
-	</fieldset>
-
-	</form>
-
-<!-- ELSEIF S_SUB eq 'config_file' -->
-
-	<!-- IF S_WRITTEN -->
-		<p>{L_CONFIG_FILE_WRITTEN}</p>
-
-		<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
-
-		<fieldset class="submit-buttons">
-			<legend>{L_NEXT_STEP}</legend>
-			{S_HIDDEN}
-			<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_NEXT_STEP}" />
-		</fieldset>
-
-		</form>
-
-	<!-- ELSE -->
-		<p>{L_CONFIG_FILE_UNABLE_WRITE}</p>
-
-		<h1>{L_DL_CONFIG}</h1>
-		<p>{L_DL_CONFIG_EXPLAIN}</p>
-
-		<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
-
-		<fieldset class="submit-buttons">
-			<legend>{L_DL_CONFIG}</legend>
-			{S_HIDDEN}
-			<input class="button1" type="submit" id="dlconfig" name="dlconfig" value="{L_DL_DOWNLOAD}" />&nbsp;<input class="button1" type="submit" id="dldone" name="dldone" value="{L_DONE}" />
-		</fieldset>
-
-		</form>
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_SUB eq 'advanced' -->
-
-	<p>{L_STAGE_ADVANCED_EXPLAIN}</p>
-
-	<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
-
-	<!-- INCLUDE install/snippet_options.html -->
-
-	<fieldset class="submit-buttons">
-		<legend>{L_NEXT_STEP}</legend>
-		{S_HIDDEN}
-		<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_NEXT_STEP}" />
-	</fieldset>
-
-	</form>
-
-<!-- ELSEIF S_SUB eq 'create_table' -->
-
-	<p>{L_STAGE_CREATE_TABLE_EXPLAIN}</p>
-
-	<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
-
-	<fieldset class="submit-buttons">
-		<legend>{L_NEXT_STEP}</legend>
-		{S_HIDDEN}
-		<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_NEXT_STEP}" />
-	</fieldset>
-
-	</form>
-
-<!-- ELSEIF S_SUB eq 'final' -->
-
-	<!-- INCLUDE install/snippet_checks.html -->
-
-	<h1>{L_INSTALL_CONGRATS}</h1>
-
-	<p>{L_BODY}</p>
-
-	<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
-
-	<fieldset class="submit-buttons">
-		<legend>{L_INSTALL_LOGIN}</legend>
-		<input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_INSTALL_LOGIN}" />
-	</fieldset>
-
-	</form>
-
-<!-- ENDIF -->
-
-
-<!-- INCLUDE install/footer.html -->
diff --git a/phpBB/adm/style/install/main.html b/phpBB/adm/style/install/main.html
deleted file mode 100644
index 64c1a58f37..0000000000
--- a/phpBB/adm/style/install/main.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- INCLUDE install/header.html -->
-
-	<h1>{TITLE}</h1>
-	<p>{BODY}</p>
-
-<!-- INCLUDE install/footer.html -->
-\ No newline at end of file
diff --git a/phpBB/adm/style/install/snippet_checks.html b/phpBB/adm/style/install/snippet_checks.html
deleted file mode 100644
index 2b711bb77c..0000000000
--- a/phpBB/adm/style/install/snippet_checks.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- IF .checks -->
-	<fieldset>
-	<!-- BEGIN checks -->
-		<!-- IF checks.S_LEGEND -->
-			<!-- IF not checks.S_FIRST_ROW -->
-			</fieldset>
-
-			<fieldset>
-			<!-- ENDIF -->
-				<legend>{checks.LEGEND}</legend>
-				<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
-		<!-- ELSE -->
-
-			<dl>
-				<dt>{checks.TITLE}:<!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-				<dd>{checks.RESULT}</dd>
-			</dl>
-		<!-- ENDIF -->
-	<!-- END checks -->
-	</fieldset>
-<!-- ENDIF -->
diff --git a/phpBB/adm/style/install/snippet_options.html b/phpBB/adm/style/install/snippet_options.html
deleted file mode 100644
index a887a1da83..0000000000
--- a/phpBB/adm/style/install/snippet_options.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- IF .options -->
-	<fieldset>
-
-	<!-- BEGIN options -->
-		<!-- IF options.S_LEGEND -->
-			<!-- IF not options.S_FIRST_ROW -->
-				</fieldset>
-		
-				<fieldset>
-			<!-- ENDIF -->
-				<legend>{options.LEGEND}</legend>
-		<!-- ELSE -->
-
-			<dl>
-				<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-				<dd>{options.CONTENT}</dd>
-			</dl>
-
-		<!-- ENDIF -->
-	<!-- END options -->
-
-	</fieldset>
-<!-- ENDIF -->
diff --git a/phpBB/adm/style/install/update.html b/phpBB/adm/style/install/update.html
deleted file mode 100644
index bf60207e46..0000000000
--- a/phpBB/adm/style/install/update.html
+++ /dev/null
@@ -1,374 +0,0 @@
-<!-- INCLUDE install/header.html -->
-
-<script type="text/javascript">
-// <![CDATA[
-	function popup(url, width, height, name)
-	{
-		if (!name)
-		{
-			name = '_popup';
-		}
-
-		window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
-		return false;
-	}
-
-	function diff_popup(url)
-	{
-		popup(url, 950, 600, '_diff');
-		return false;
-	}
-// ]]>
-</script>
-
-<!-- IF S_ERROR -->
-	<div class="errorbox" style="margin-top: 0;">
-		<h3>{L_NOTICE}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
-<!-- ENDIF -->
-
-<!-- IF S_IN_PROGRESS -->
-
-	<div class="successbox" style="margin-top: 0;">
-		<h3>{L_IN_PROGRESS}</h3>
-		<p>{L_IN_PROGRESS_EXPLAIN}</p>
-	</div>
-
-<!-- ELSEIF S_INTRO -->
-
-	<!-- IF S_WARNING -->
-	<div class="successbox" style="margin-top: 0;">
-		<h3>{L_NOTICE}</h3>
-		<p>{WARNING_MSG}</p>
-	</div>
-	<!-- ENDIF -->
-
-	<form id="install_update" method="post" action="{U_ACTION}">
-
-	<h1>{L_UPDATE_INSTALLATION}</h1>
-	<p>{L_UPDATE_INSTALLATION_EXPLAIN}</p>
-
-	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="submit" value="{L_NEXT_STEP}" />
-	</fieldset>
-
-	</form>
-
-<!-- ENDIF -->
-
-<!-- IF S_VERSION_CHECK -->
-
-	<h1>{L_VERSION_CHECK}</h1>
-
-	<p>{L_VERSION_CHECK_EXPLAIN}</p>
-
-	<!-- IF S_UP_TO_DATE -->
-		<div class="successbox">
-			<p>{L_VERSION_UP_TO_DATE}</p>
-		</div>
-	<!-- ELSE -->
-		<div class="errorbox">
-			<p>{L_VERSION_NOT_UP_TO_DATE}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<fieldset>
-		<legend></legend>
-	<dl>
-		<dt><label>{L_CURRENT_VERSION}</label></dt>
-		<dd><strong>{CURRENT_VERSION}</strong></dd>
-	</dl>
-	<dl>
-		<dt><label>{L_LATEST_VERSION}</label></dt>
-		<dd><strong>{LATEST_VERSION}</strong></dd>
-	</dl>
-	<!-- IF PACKAGE_VERSION and not S_UP_TO_DATE -->
-	<dl>
-		<dt><label>{L_PACKAGE_UPDATES_TO}</label></dt>
-		<dd><strong>{PACKAGE_VERSION}</strong></dd>
-	</dl>
-	<!-- ENDIF -->
-	</fieldset>
-
-	<!-- IF not S_UP_TO_DATE -->
-
-		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
-
-		<fieldset class="submit-buttons">
-			<p>{L_UPDATE_DATABASE_EXPLAIN}</p>
-			<input class="button1" type="submit" name="db_update" value="{L_UPDATE_DATABASE}" />
-		</fieldset>
-
-		</form>
-
-	<!-- ELSE -->
-		<form id="install_update" method="post" action="{U_ACTION}">
-
-		<fieldset class="submit-buttons">
-			<p>{L_CHECK_FILES_UP_TO_DATE}</p>
-			<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
-		</fieldset>
-
-		</form>
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_DB_UPDATE -->
-
-	<!-- IF not S_DB_UPDATE_FINISHED -->
-
-		<h1>{L_PERFORM_DATABASE_UPDATE}</h1>
-
-		<p>
-			{L_PERFORM_DATABASE_UPDATE_EXPLAIN}<br />
-		</p>
-
-		<br /><br />
-
-		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
-
-		<fieldset class="submit-buttons">
-			<a href="{U_DB_UPDATE}" class="button1">{L_RUN_DATABASE_SCRIPT}</a>
-
-			<!-- input class="button1" type="submit" name="db_update" value="{L_CHECK_UPDATE_DATABASE}" / -->
-		</fieldset>
-
-		</form>
-
-	<!-- ELSE -->
-
-		<h1>{L_UPDATE_DB_SUCCESS}</h1>
-
-		<br /><br />
-
-		<form id="install_update" method="post" action="{U_ACTION}">
-
-		<fieldset class="submit-buttons">
-			<p>{L_CHECK_FILES_EXPLAIN}</p>
-			<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
-		</fieldset>
-
-		</form>
-
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_FILE_CHECK -->
-
-	<!-- IF S_ALL_UP_TO_DATE -->
-
-		<div class="successbox">
-			<h3>{L_UPDATE_SUCCESS}</h3>
-			<p>{L_ALL_FILES_UP_TO_DATE}</p>
-		</div>
-
-	<!-- ELSE -->
-		<h1>{L_COLLECTED_INFORMATION}</h1>
-
-		<p>{L_COLLECTED_INFORMATION_EXPLAIN}</p>
-
-		<!-- IF S_NO_UPDATE_FILES -->
-			<div class="errorbox">
-				<h3>{L_NO_UPDATE_FILES}</h3>
-
-				<p>{L_NO_UPDATE_FILES_EXPLAIN}</p><br />
-
-				<strong>{NO_UPDATE_FILES}</strong>
-
-			</div>
-		<!-- ENDIF -->
-
-		<form id="install_update" method="post" action="{U_UPDATE_ACTION}">
-
-		<!-- IF .up_to_date -->
-			<h2>{L_FILES_UP_TO_DATE}</h2>
-			<p>{L_FILES_UP_TO_DATE_EXPLAIN}</p>
-
-			<fieldset>
-				<legend><img src="{T_IMAGE_PATH}file_up_to_date.gif" alt="{L_STATUS_UP_TO_DATE}" /></legend>
-			<!-- BEGIN up_to_date -->
-				<dl>
-					<dd class="full" style="text-align: left;"><strong>{up_to_date.FILENAME}</strong></dd>
-				</dl>
-			<!-- END up_to_date -->
-			</fieldset>
-
-		<!-- ENDIF -->
-
-		<!-- IF .new -->
-			<h2>{L_FILES_NEW}</h2>
-			<p>{L_FILES_NEW_EXPLAIN}</p>
-
-			<fieldset>
-				<legend><img src="{T_IMAGE_PATH}file_new.gif" alt="{L_STATUS_NEW}" /></legend>
-			<!-- BEGIN new -->
-				<dl>
-					<dt style="width: 60%;"><strong><!-- IF new.DIR_PART -->{new.DIR_PART}<br /><!-- ENDIF -->{new.FILE_PART}</strong>
-					<!-- IF new.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{new.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-				</dt>
-				<dd style="margin-left: 60%;">
-					<!-- IF not new.S_BINARY -->[ <a href="{new.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new.L_SHOW_DIFF}</a>
-					<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
-				</dd>
-				<!-- IF new.S_CUSTOM -->
-					<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{new.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-				<!-- ENDIF -->
-				</dl>
-			<!-- END new -->
-			</fieldset>
-
-		<!-- ENDIF -->
-
-		<!-- IF .not_modified -->
-			<h2>{L_FILES_NOT_MODIFIED}</h2>
-			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="dE('not_modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
-			<p>{L_FILES_NOT_MODIFIED_EXPLAIN}</p>
-
-			<fieldset id="not_modified" style="display: none;">
-				<legend><img src="{T_IMAGE_PATH}file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
-			<!-- BEGIN not_modified -->
-				<dl>
-					<dt style="width: 60%;"><strong><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<br /><!-- ENDIF -->{not_modified.FILE_PART}</strong>
-						<!-- IF not_modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{not_modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-					</dt>
-					<dd style="margin-left: 60%;"><!-- IF not not_modified.S_BINARY -->[ <a href="{not_modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{not_modified.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
-					<!-- IF not_modified.S_CUSTOM -->
-						<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{not_modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-					<!-- ENDIF -->
-				</dl>
-			<!-- END not_modified -->
-			</fieldset>
-
-		<!-- ENDIF -->
-
-		<!-- IF .modified -->
-			<h2>{L_FILES_MODIFIED}</h2>
-			<p>{L_FILES_MODIFIED_EXPLAIN}</p>
-
-			<!-- BEGIN modified -->
-			<fieldset>
-				<legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
-				<dl>
-					<dt style="width: 60%;"><strong><!-- IF modified.DIR_PART -->{modified.DIR_PART}<br /><!-- ENDIF -->{modified.FILE_PART}</strong>
-					<!-- IF modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-				</dt>
-				<dd style="margin-left: 60%;">&nbsp;</dd>
-				<!-- IF modified.S_CUSTOM -->
-					<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-				<!-- ENDIF -->
-				</dl>
-				<dl>
-					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt>
-					<dd style="margin-left: 60%;"><!-- IF not modified.S_BINARY -->[ <a href="{modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{modified.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
-				</dl>
-				<dl>
-					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-					<dd style="margin-left: 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
-				</dl>
-				<dl>
-					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
-					<dd style="margin-left: 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
-				</dl>
-			</fieldset>
-			<!-- END modified -->
-
-		<!-- ENDIF -->
-
-		<!-- IF .new_conflict -->
-			<h2>{L_FILES_NEW_CONFLICT}</h2>
-			<p>{L_FILES_NEW_CONFLICT_EXPLAIN}</p>
-
-			<fieldset>
-				<legend><img src="{T_IMAGE_PATH}file_new_conflict.gif" alt="{L_STATUS_NEW_CONFLICT}" /></legend>
-			<!-- BEGIN new_conflict -->
-				<dl>
-					<dt style="width: 60%;"><strong><!-- IF new_conflict.DIR_PART -->{new_conflict.DIR_PART}<br /><!-- ENDIF -->{new_conflict.FILE_PART}</strong>
-					<!-- IF new_conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{new_conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-				</dt>
-				<dd style="margin-left: 60%;">
-					<!-- IF not new_conflict.S_BINARY -->[ <a href="{new_conflict.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new_conflict.L_SHOW_DIFF}</a>
-					<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
-				</dd>
-				<!-- IF new_conflict.S_CUSTOM -->
-					<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{new_conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-				<!-- ENDIF -->
-				</dl>
-			<!-- END new_conflict -->
-			</fieldset>
-
-		<!-- ENDIF -->
-
-		<!-- IF .conflict -->
-			<h2>{L_FILES_CONFLICT}</h2>
-			<p>{L_FILES_CONFLICT_EXPLAIN}</p>
-
-			<!-- BEGIN conflict -->
-			<fieldset>
-				<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
-				<dl>
-					<dt style="width: 60%;"><strong><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<br /><!-- ENDIF -->{conflict.FILE_PART}</strong>
-						<!-- IF conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-						<!-- IF conflict.NUM_CONFLICTS --><br /><span>{L_NUM_CONFLICTS}: {conflict.NUM_CONFLICTS}</span><!-- ENDIF -->
-					</dt>
-					<dd style="margin-left: 60%;">
-						<!-- IF not conflict.S_BINARY -->[ <a href="{conflict.U_SHOW_DIFF}">{L_DOWNLOAD_CONFLICTS}</a> ]<br />{L_DOWNLOAD_CONFLICTS_EXPLAIN}
-						<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
-					</dd>
-					<!-- IF conflict.S_CUSTOM -->
-						<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-					<!-- ENDIF -->
-				</dl>
-				<!-- IF conflict.S_BINARY -->
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-						<dd style="margin-left: 60%;">&nbsp;</dd>
-					</dl>
-				<!-- ELSE -->
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="3" checked="checked" /> {L_MERGE_NEW_FILE_OPTION}</label></dt>
-						<dd style="margin-left: 60%;">[<a href="{conflict.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
-					</dl>
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt>
-						<dd style="margin-left: 60%;">[<a href="{conflict.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
-					</dl>
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-						<dd style="margin-left: 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
-					</dl>
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
-						<dd style="margin-left: 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
-					</dl>
-				<!-- ENDIF -->
-			</fieldset>
-			<!-- END conflict -->
-
-		<!-- ENDIF -->
-
-		<br />
-
-		<fieldset class="quick">
-			<input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
-		</fieldset>
-
-		<br />
-
-		<h1>{L_UPDATE_METHOD}</h1>
-
-		<p>{L_UPDATE_METHOD_EXPLAIN}</p>
-
-		<fieldset class="submit-buttons">
-			<input class="button1" type="submit" name="ftp_upload" value="{L_FTP_UPDATE_METHOD}" />&nbsp; &nbsp;<input class="button1" type="submit" name="download" value="{L_DOWNLOAD_UPDATE_METHOD_BUTTON}" />
-		</fieldset>
-
-		</form>
-
-	<!-- ENDIF -->
-
-<!-- ELSEIF S_UPDATE_OPTIONS -->
-
-<!-- INCLUDE update_options.html -->
-
-<!-- ENDIF -->
-
-<!-- INCLUDE install/footer.html -->
diff --git a/phpBB/adm/style/install/update_diff.html b/phpBB/adm/style/install/update_diff.html
deleted file mode 100644
index efbe1d045c..0000000000
--- a/phpBB/adm/style/install/update_diff.html
+++ /dev/null
@@ -1,253 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
-<head>
-
-<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
-<meta http-equiv="imagetoolbar" content="no" />
-<!-- IF META -->{META}<!-- ENDIF -->
-<title>{PAGE_TITLE}</title>
-
-<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
-
-<script type="text/javascript">
-// <![CDATA[
-function resize_panel()
-{
-	var block = document.getElementById('codepanel');	
-	var height;
-	
-	if (window.innerHeight)
-	{
-		height = window.innerHeight - 150;
-		block.style.height = height + 'px';
-	}
-	else
-	{
-		//whatever IE needs to do this
-	}	
-}
-// ]]>
-</script>
-
-<style type="text/css">
-/* <![CDATA[ */
-
-#main {
-	font-size: 1em;
-	line-height: 0.7em;
-	margin: 0;
-	padding: 0;
-	width: 99%;
-}
-
-#diff_content {
-	padding: 30px 10px 10px;
-}
-
-<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
-div#codepanel {
-	overflow: auto;
-	width: 100%;
-	height: 350px;
-	display: inline-block;
-}
-<!-- ELSE -->
-div#codepanel {	
-	background-color: #eee;
-}
-<!-- ENDIF -->
-
-<!-- IF not S_DIFF_NEW_FILE -->
-/**
-* Unified Diff
-*/
-.file {
-	line-height: .7em;
-}
-
-.diff {
-	margin: 0;
-}
-
-.added {
-	background-color: #dfd;
-}
-
-.removed {
-	background-color: #fdd;
-}
-
-.info {
-	color: #888;
-}
-
-.context {
-	background-color: #eee;
-}
-
-/**
-* Inline Diff
-*/
-.ins {
-	background-color: #dfd;
-	text-decoration: underline;
-}
-
-.del {
-	background-color: #fdd;
-	text-decoration: line-through;
-}
-
-/**
-* Column Diff
-*/
-table.hrdiff {
-	margin: 0 0 8px 5px;
-	width: 100%;
-	overflow: hidden;
-	border-bottom: 1px solid #999;
-	table-layout: fixed;
-}
-
-table.hrdiff th {
-	text-align: left;
-	width: 50%;
-	color: #333;
-	font-family: Verdana,Helvetica,sans-serif;
-	font-size: 11px;
-	border-bottom: 1px solid #999;
-	background: transparent;
-}
-
-table.hrdiff thead th {
-	font-weight: bold;
-	font-size: 110%;
-	padding: 2px;
-}
-
-table.hrdiff tr:first-child th {
-	border-top: none;
-}
-
-table.hrdiff tbody th {
-	padding: 2em 1px 1px 1px;
-	font-size: 80%;
-	border-top: 1px solid #999;
-}
-
-table.hrdiff tbody td.old {
-	border-left: 1px solid #999;
-	border-right: 1px solid #999;	
-}
-table.hrdiff tbody td.new {
-	border-right: 1px solid #999;	
-}
-
-table.hrdiff td pre {
-	overflow: auto;
-	display: block;
-	width: 100%;
-	overflow: auto;
-	display: block;
-}
-
-table.hrdiff .unmodified {
-	background: #fff;
-}
-
-table.hrdiff .added {
-	background: #9f9;
-}
-
-table.hrdiff .added_empty {
-	background: #cfc;
-}
-
-table.hrdiff .modified {
-	background: #fd9;
-}
-
-table.hrdiff .removed {
-	background: #f99;
-}
-
-table.hrdiff .removed_empty {
-	background: #fcc;
-}
-
-table.hrdiff caption {
-	caption-side: top;
-	text-align: left;
-	margin: 0 0 8px 5px;
-	font-size: 90%;
-	font-weight: bold;
-	padding: 5px;
-}
-
-table.hrdiff caption span {
-	height: 10px;
-	width: 10px;
-	line-height: 10px;
-	letter-spacing: 10px;
-	border: 1px solid #000;
-	margin-left: 0.5em;
-	vertical-align: baseline;
-}
-
-<!-- ENDIF -->
-
-/* ]]> */
-</style>
-
-</head>
-
-
-<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
-<body onresize="resize_panel();" onload="resize_panel();">
-<!-- ELSE -->
-<body>
-<!-- ENDIF -->
-
-<div id="wrap">
-	<div id="page-header">
-<!-- IF S_DIFF_NEW_FILE -->
-
-		<h1>{L_VIEWING_FILE_CONTENTS}</h1>
-<!-- ELSE -->
-		<h1>{L_VIEWING_FILE_DIFF}</h1>
-<!-- ENDIF -->
-<!-- IF not S_DIFF_NEW_FILE -->
-		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
-		<form method="post">
-		<fieldset class="quick">
-			<label for="diff_mode">{L_SELECT_DIFF_MODE}:</label>
-			<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>
-
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" />
-		</fieldset>
-		</form>
-<!-- ENDIF -->
-	</div>
-	
-	<div id="page-body">
-		<div id="acp">
-		<div class="panel" id="codepanel">
-			<span class="corners-top"><span></span></span>
-				<div id="diff_content">
-					<div id="main">
-
-<!-- IF S_DIFF_CONFLICT_FILE -->
-		<div style="float: {S_CONTENT_FLOW_END};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
-<!-- ENDIF -->
-						{DIFF_CONTENT}
-					</div>
-				</div>
-			<span class="corners-bottom"><span></span></span>
-		</div>
-		</div>
-	</div>
-	
-
-<!-- INCLUDE simple_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/adm/style/message_body.html b/phpBB/adm/style/message_body.html
deleted file mode 100644
index 5d907e911c..0000000000
--- a/phpBB/adm/style/message_body.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<div <!-- IF S_USER_NOTICE -->class="successbox"<!-- ELSE -->class="errorbox"<!-- ENDIF -->>
-	<h3>{MESSAGE_TITLE}</h3>
-	<p>{MESSAGE_TEXT}</p>
-</div>
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
deleted file mode 100644
index d5316aae08..0000000000
--- a/phpBB/adm/style/overall_footer.html
+++ /dev/null
@@ -1,34 +0,0 @@
-
-					</div>
-				</div>
-			<span class="corners-bottom"><span></span></span>
-		</div>
-		</div>
-	</div>
-	
-	<!--
-		We request you retain the full copyright notice below including the link to www.phpbb.com.
-		This not only gives respect to the large amount of time given freely by the developers
-		but also helps build interest, traffic and use of phpBB. If you (honestly) cannot retain
-		the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-		"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-		forums may be affected.
-	
-		The phpBB Group : 2006
-	// -->
-	
-	<div id="page-footer">
-		<!-- IF S_COPYRIGHT_HTML -->
-			Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
-			<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
-		<!-- ENDIF -->
-
-		<!-- IF DEBUG_OUTPUT -->
-			<!-- IF S_COPYRIGHT_HTML --><br /><!-- ENDIF -->
-			{DEBUG_OUTPUT}
-		<!-- ENDIF -->
-	</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
deleted file mode 100644
index 93d72d5205..0000000000
--- a/phpBB/adm/style/overall_header.html
+++ /dev/null
@@ -1,217 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
-<head>
-
-<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
-<meta http-equiv="imagetoolbar" content="no" />
-<!-- IF META -->{META}<!-- ENDIF -->
-<title>{PAGE_TITLE}</title>
-
-<link href="style/admin.css" rel="stylesheet" type="text/css" media="screen" />
-
-<script type="text/javascript">
-// <![CDATA[
-var jump_page = '{LA_JUMP_PAGE}:';
-var on_page = '{ON_PAGE}';
-var per_page = '{PER_PAGE}';
-var base_url = '{A_BASE_URL}';
-
-var menu_state = 'shown';
-
-
-/**
-* Jump to page
-*/
-function jumpto()
-{
-	var page = prompt(jump_page, on_page);
-
-	if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0)
-	{
-		if (base_url.indexOf('?') == -1)
-		{
-			document.location.href = base_url + '?start=' + ((page - 1) * per_page);
-		}
-		else
-		{
-			document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
-		}
-	}
-}
-
-/**
-* Set display of page element
-* s[-1,0,1] = hide,toggle display,show
-*/
-function dE(n, s, type)
-{
-	if (!type)
-	{
-		type = 'block';
-	}
-
-	var e = document.getElementById(n);
-	if (!s)
-	{
-		s = (e.style.display == '') ? -1 : 1;
-	}
-	e.style.display = (s == 1) ? type : 'none';
-}
-
-/**
-* Mark/unmark checkboxes
-* id = ID of parent container, name = name prefix, state = state [true/false]
-*/
-function marklist(id, name, state)
-{
-	var parent = document.getElementById(id);
-	if (!parent)
-	{
-		eval('parent = document.' + id);
-	}
-
-	if (!parent)
-	{
-		return;
-	}
-
-	var rb = parent.getElementsByTagName('input');
-
-	for (var r = 0; r < rb.length; r++)
-	{
-		if (rb[r].name.substr(0, name.length) == name)
-		{
-			rb[r].checked = state;
-		}
-	}
-}
-
-/**
-* Find a member
-*/
-function find_username(url)
-{
-	popup(url, 760, 570, '_usersearch');
-	return false;
-}
-
-/**
-* Window popup
-*/
-function popup(url, width, height, name)
-{
-	if (!name)
-	{
-		name = '_popup';
-	}
-
-	window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
-	return false;
-}
-
-/**
-* Hiding/Showing the side menu
-*/
-function switch_menu()
-{
-	var menu = document.getElementById('menu');
-	var main = document.getElementById('main');
-	var toggle = document.getElementById('toggle');
-	var handle = document.getElementById('toggle-handle');
-
-	switch (menu_state)
-	{
-		// hide
-		case 'shown':
-			main.style.width = '93%';
-			menu_state = 'hidden';
-			menu.style.display = 'none';
-			toggle.style.width = '20px';
-			handle.style.backgroundImage = 'url(images/toggle.gif)';
-			handle.style.backgroundRepeat = 'no-repeat';
-
-			<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-				handle.style.backgroundPosition = '0% 50%';
-				toggle.style.left = '96%';
-			<!-- ELSE -->
-				handle.style.backgroundPosition = '100% 50%';
-				toggle.style.left = '0';
-			<!-- ENDIF -->
-		break;
-
-		// show
-		case 'hidden':
-			main.style.width = '76%';
-			menu_state = 'shown';
-			menu.style.display = 'block';
-			toggle.style.width = '5%';
-			handle.style.backgroundImage = 'url(images/toggle.gif)';
-			handle.style.backgroundRepeat = 'no-repeat';
-
-			<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-				handle.style.backgroundPosition = '100% 50%';
-				toggle.style.left = '75%';
-			<!-- ELSE -->
-				handle.style.backgroundPosition = '0% 50%';
-				toggle.style.left = '15%';
-			<!-- ENDIF -->
-		break;
-	}
-}
-
-// ]]>
-</script>
-</head>
-
-<body class="{S_CONTENT_DIRECTION}">
-
-<div id="wrap">
-	<div id="page-header">
-		<h1>{L_ADMIN_PANEL}</h1>
-		<p><a href="{U_ADM_INDEX}">{L_ADMIN_INDEX}</a> &bull; <a href="{U_INDEX}">{L_FORUM_INDEX}</a></p>
-		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
-	</div>
-
-	<div id="page-body">
-		<div id="tabs">
-			<ul>
-			<!-- BEGIN t_block1 -->
-				<li<!-- IF t_block1.S_SELECTED --> id="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>
-			<!-- END t_block1 -->
-			</ul>
-		</div>
-
-		<div id="acp">
-		<div class="panel">
-			<span class="corners-top"><span></span></span>
-				<div id="content">
-					<!-- IF not S_USER_NOTICE -->
-					<div id="toggle">
-						<a id="toggle-handle" accesskey="m" title="{L_MENU_TOGGLE}" onclick="switch_menu(); return false;" href="#"></a></div>
-					<!-- ENDIF -->
-					<div id="menu">
-						<p><!-- IF S_USER_LOGGED_IN --> {L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [&nbsp;<a href="{U_LOGOUT}">{L_LOGOUT}</a>&nbsp;]<!-- ENDIF --><!-- IF S_USER_ADMIN -->[&nbsp;<a href="{U_ADM_LOGOUT}">{L_ADM_LOGOUT}</a>&nbsp;]<!-- ENDIF --></p>
-						<!-- IF S_USER_ADMIN -->
-						<ul>
-						<!-- BEGIN l_block1 -->
-							<!-- IF l_block1.S_SELECTED -->
-
-						<!-- BEGIN l_block2 -->
-							<!-- IF .l_block1.l_block2.l_block3 -->
-							<li class="header">{l_block1.l_block2.L_TITLE}</li>
-							<!-- ENDIF -->
-
-							<!-- BEGIN l_block3 -->
-								<li<!-- IF l_block1.l_block2.l_block3.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.l_block2.l_block3.U_TITLE}"><span>{l_block1.l_block2.l_block3.L_TITLE}</span></a></li>
-							<!-- END l_block3 -->
-						<!-- END l_block2 -->
-
-							<!-- ENDIF -->
-						<!-- END l_block1 -->
-						</ul>
-						<!-- ENDIF -->
-					</div>
-
-					<div id="main">
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
deleted file mode 100644
index fb4d3ef143..0000000000
--- a/phpBB/adm/style/permission_mask.html
+++ /dev/null
@@ -1,139 +0,0 @@
-
-<script type="text/javascript">
-// <![CDATA[
-	var active_pmask = '0';
-	var active_fmask = '0';
-	var active_cat = '0';
-
-	var id = '000';
-
-	var role_options = new Array();
-
-	<!-- IF S_ROLE_JS_ARRAY -->
-		{S_ROLE_JS_ARRAY}
-	<!-- ENDIF -->
-// ]]>
-</script>
-<script type="text/javascript" src="style/permissions.js"></script>
-
-<!-- BEGIN p_mask -->
-<div class="clearfix"></div>
-<h3>{p_mask.NAME}<!-- IF p_mask.S_LOCAL --> <span class="small"> [{p_mask.L_ACL_TYPE}]</span><!-- ENDIF --></h3>
-
-<!-- BEGIN f_mask -->
-<div class="clearfix"></div>
-<fieldset class="permissions" id="perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
-	<legend id="legend{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
-		<!-- IF not p_mask.S_VIEW -->
-			<input type="checkbox" style="display: none;" class="permissions-checkbox" name="inherit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" id="checkbox{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" value="1" onclick="toggle_opacity('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')" /> 
-		<!-- ELSE -->
-		<!-- ENDIF -->
-		<!-- IF p_mask.f_mask.PADDING --><span class="padding">{p_mask.f_mask.PADDING}{p_mask.f_mask.PADDING}</span><!-- ENDIF -->{p_mask.f_mask.NAME}
-	</legend>
-	<!-- IF not p_mask.S_VIEW -->
-		<div class="permissions-switch">
-			<div class="permissions-reset">
-				<a href="#" onclick="mark_options('perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}', 'y'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_ALL_YES}</a> &middot; <a href="#" onclick="mark_options('perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}', 'u'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_ALL_NO}</a> &middot; <a href="#" onclick="mark_options('perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}', 'n'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_ALL_NEVER}</a>
-			</div>
-			<a href="#" onclick="swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '0', true); return false;">{L_ADVANCED_PERMISSIONS}</a><!-- IF not p_mask.S_VIEW and p_mask.f_mask.S_CUSTOM --> *<!-- ENDIF -->
-		</div>
-		<dl class="permissions-simple">
-			<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}:</label></dt>
-			<!-- IF p_mask.f_mask.S_ROLE_OPTIONS -->
-				<dd style="margin-left: 20%"><select id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" onchange="set_role_settings(this.options[selectedIndex].value, 'advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')">{p_mask.f_mask.S_ROLE_OPTIONS}</select></dd>
-			<!-- ELSE -->
-				<dd>{L_NO_ROLE_AVAILABLE}</dd>
-			<!-- ENDIF -->
-		</dl>
-	<!-- ENDIF -->
-
-	<!-- BEGIN category -->
-		<!-- IF p_mask.f_mask.category.S_FIRST_ROW -->
-			<!-- IF not p_mask.S_VIEW -->
-				<div class="permissions-advanced" id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" style="display: none;">
-			<!-- ELSE -->
-				<div class="permissions-advanced" id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
-			<!-- ENDIF -->
-
-			<div class="permissions-category">
-				<ul>
-		<!-- ENDIF -->
- 		
-		<!-- IF p_mask.f_mask.category.S_YES -->
-			<li class="permissions-preset-yes<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
-		<!-- ELSEIF p_mask.f_mask.category.S_NEVER -->
-			<li class="permissions-preset-never<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
-		<!-- ELSEIF p_mask.f_mask.category.S_NO -->
-			<li class="permissions-preset-no<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
-		<!-- ELSE -->
-			<li class="permissions-preset-custom<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
-		<!-- ENDIF -->
-		<a href="#" onclick="swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '{p_mask.f_mask.category.S_ROW_COUNT}', false<!-- IF p_mask.S_VIEW -->, true<!-- ENDIF -->); return false;"><span class="tabbg"><span class="colour"></span>{p_mask.f_mask.category.CAT_NAME}</span></a></li>
-	<!-- END category -->
-				</ul>
-			</div>
-
-	<!-- BEGIN category -->
-		<div class="permissions-panel" id="options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" <!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
-			<span class="corners-top"><span></span></span>
-			<div class="tablewrap">
-				<table id="table{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" cellspacing="1">
-				<colgroup>
-					<col class="permissions-name" />
-					<col class="permissions-yes" />
-					<col class="permissions-no" />
-					<!-- IF not p_mask.S_VIEW -->
-						<col class="permissions-never" />
-					<!-- ENDIF -->
-				</colgroup>
-				<thead>
-				<tr>
-					<th class="name" scope="col"><strong>{L_ACL_SETTING}</strong></th>
-				<!-- IF p_mask.S_VIEW -->
-					<th class="value" scope="col">{L_ACL_YES}</th>
-					<th class="value" scope="col">{L_ACL_NEVER}</th>
-				<!-- ELSE -->
-					<th class="value permissions-yes" scope="col"><a href="#" onclick="mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'y'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false, 'yes'); return false;">{L_ACL_YES}</a></th>
-					<th class="value permissions-no" scope="col"><a href="#" onclick="mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'u'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false, 'no'); return false;">{L_ACL_NO}</a></th>
-					<th class="value permissions-never" scope="col"><a href="#" onclick="mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'n'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false, 'never'); return false;">{L_ACL_NEVER}</a></th>
-				<!-- ENDIF -->
-				</tr>
-				</thead>
-				<tbody>
-				<!-- BEGIN mask -->
-					<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
-					<th class="permissions-name<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->"><!-- IF p_mask.f_mask.category.mask.U_TRACE --><a href="{p_mask.f_mask.category.mask.U_TRACE}" class="trace" onclick="popup(this.href, 750, 515, '_trace'); return false;" title="{L_TRACE_SETTING}"><img src="images/icon_trace.gif" alt="{L_TRACE_SETTING}" /></a> <!-- ENDIF -->{p_mask.f_mask.category.mask.PERMISSION}</th>
-					<!-- IF p_mask.S_VIEW -->
-						<td<!-- IF p_mask.f_mask.category.mask.S_YES --> class="yes"<!-- ENDIF -->>&nbsp;</td>
-						<td<!-- IF p_mask.f_mask.category.mask.S_NEVER --> class="never"<!-- ENDIF -->></td>
-					<!-- ELSE -->
-						<td class="permissions-yes"><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_y"><input onclick="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_y" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></label></td>
-						<td class="permissions-no"><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_u"><input onclick="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_u" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_NO --> checked="checked"<!-- ENDIF --> value="-1" /></label></td>
-						<td class="permissions-never"><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_n"><input onclick="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_n" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_NEVER --> checked="checked"<!-- ENDIF --> value="0" /></label></td>
-					<!-- ENDIF -->
-				</tr>
-				<!-- END mask -->
-				</tbody>
-				</table>
-			</div>
-			
-			<!-- IF not p_mask.S_VIEW -->
-			<fieldset class="quick" style="margin-right: 11px;">
-				<p class="small">{L_APPLY_PERMISSIONS_EXPLAIN}</p>
-				<input class="button1" type="submit" name="psubmit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" value="{L_APPLY_PERMISSIONS}" />
-				<!-- IF .p_mask.f_mask gt 1 or .p_mask gt 1 -->
-					<p class="small"><a href="#" onclick="reset_opacity(0, '{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="reset_opacity(1, '{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_UNMARK_ALL}</a></p>
-				<!-- ENDIF -->
-			</fieldset>
-		
-			<!-- ENDIF -->
-
-			<span class="corners-bottom"><span></span></span>
-		</div>
-	<!-- END category -->
-			<div class="clearfix"></div>
-	</div>
-</fieldset>
-<!-- END f_mask -->
-
-<!-- END p_mask -->
diff --git a/phpBB/adm/style/permission_roles_mask.html b/phpBB/adm/style/permission_roles_mask.html
deleted file mode 100644
index e88c5fd2ba..0000000000
--- a/phpBB/adm/style/permission_roles_mask.html
+++ /dev/null
@@ -1,38 +0,0 @@
-
-<!-- BEGIN role_mask -->
-
-	<table cellspacing="1">
-		<caption><!-- IF role_mask.FORUM_ID -->{L_FORUM}: <!-- ENDIF -->{role_mask.NAME}</caption>
-	<tbody>
-	<tr>
-		<th>{L_USERS}</th>
-	</tr>
-	<tr>
-		<td class="row1">
-			<!-- BEGIN users -->
-				<a href="{role_mask.users.U_PROFILE}">{role_mask.users.USERNAME}</a><!-- IF not role_mask.users.S_LAST_ROW --> :: <!-- ENDIF -->
-			<!-- BEGINELSE -->
-				{L_USERS_NOT_ASSIGNED}
-			<!-- END users -->
-		</td>
-	</tr>
-	<tr>
-		<th>{L_GROUPS}</th>
-	</tr>
-	<tr>
-		<td class="row2">
-			<!-- BEGIN groups -->
-				<a href="{role_mask.groups.U_PROFILE}">{role_mask.groups.GROUP_NAME}</a><!-- IF not role_mask.groups.S_LAST_ROW --> :: <!-- ENDIF -->
-			<!-- BEGINELSE -->
-				{L_GROUPS_NOT_ASSIGNED}
-			<!-- END users -->
-		</td>
-	</tr>
-	</tbody>
-	</table>
-
-<!-- BEGINELSE -->
-	
-	<p>{L_ROLE_NOT_ASSIGNED}</p>
-
-<!-- END role_mask -->
-\ No newline at end of file
diff --git a/phpBB/adm/style/permission_trace.html b/phpBB/adm/style/permission_trace.html
deleted file mode 100644
index 186bb28b67..0000000000
--- a/phpBB/adm/style/permission_trace.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-
-<div style="background-color: #fff; padding: 10px; margin-top: 10px;" class="permissions">
-
-	<!-- IF U_BACK --><a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a><!-- ENDIF -->
-
-	<h3>{L_TRACE_FOR}: {PERMISSION_USERNAME} / <!-- IF FORUM_NAME -->{FORUM_NAME} / <!-- ENDIF -->{PERMISSION} </h3>
-
-	<br />
-
-	<table cellspacing="1" class="type1">
-	<thead>
-	<tr>
-		<th>{L_TRACE_WHO}</th>
-		<th style="width: 50px;">{L_ACL_SETTING}</th>
-		<th style="width: 50px;">{L_TRACE_TOTAL}</th>
-		<th>{L_INFORMATION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN trace -->
-		<!-- IF trace.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
-		<td style="white-space: nowrap;"><strong>{trace.WHO}</strong></td>
-
-		<!-- IF trace.S_SETTING_NEVER -->
-			<td class="never">{L_ACL_NEVER}</td>
-		<!-- ELSEIF trace.S_SETTING_YES -->
-			<td class="yes">{L_ACL_YES}</td>
-		<!-- ELSE -->
-			<td class="no">{L_ACL_NO}</td>
-		<!-- ENDIF -->
-
-		<!-- IF trace.S_TOTAL_NEVER -->
-			<td class="never">{L_ACL_NEVER}</td>
-		<!-- ELSEIF trace.S_TOTAL_YES -->
-			<td class="yes">{L_ACL_YES}</td>
-		<!-- ELSE -->
-			<td class="no">{L_ACL_NO}</td>
-		<!-- ENDIF -->
-
-		<td>{trace.INFORMATION}</td>
-	</tr>
-	<!-- END trace -->
-	<tr class="row2">
-		<td style="white-space: nowrap;"><strong>{L_TRACE_RESULT}</strong></td>
-		<td colspan="2" style="text-align: center;" class="<!-- IF S_RESULT_NEVER -->never<!-- ELSEIF S_RESULT_YES -->yes<!-- ELSE -->no<!-- ENDIF -->">
-		<!-- IF S_RESULT_NEVER -->{L_ACL_NEVER}<!-- ELSEIF S_RESULT_YES -->{L_ACL_YES}<!-- ELSE -->{L_ACL_NO}<!-- ENDIF -->
-		</td>
-		<td>{L_RESULTING_PERMISSION}</td>
-	</tr>
-	</tbody>
-	</table>
-
-	<br />
-
-</div>
-
-<!-- INCLUDE simple_footer.html -->
diff --git a/phpBB/adm/style/permissions.js b/phpBB/adm/style/permissions.js
deleted file mode 100644
index adc8995c23..0000000000
--- a/phpBB/adm/style/permissions.js
+++ /dev/null
@@ -1,359 +0,0 @@
-/**
-* Hide and show all checkboxes
-* status = true (show boxes), false (hide boxes)
-*/
-function display_checkboxes(status) 
-{
-	var form = document.getElementById('set-permissions');
-	var cb = document.getElementsByTagName('input');
-	var display;
-
-	//show
-	if (status)
-	{
-		display = 'inline';
-	}
-	//hide
-	else
-	{
-		display = 'none';
-	}
-	
-	for (var i = 0; i < cb.length; i++ )
-	{
-		if (cb[i].className == 'permissions-checkbox')
-		{
-			cb[i].style.display = display;
-		}
-		
-	}	
-	
-}
-
-
-/**
-* Change opacity of element
-* e = element
-* value = 0 (hidden) till 10 (fully visible)
-*/
-function set_opacity(e, value) {
-	e.style.opacity = value/10;
-	
-	//IE opacity currently turned off, because of its astronomical stupidity
-	//e.style.filter = 'alpha(opacity=' + value*10 + ')';
-}
-
-/**
-* Reset the opacity and checkboxes
-* block_id = id of the element that needs to be toggled
-*/
-function toggle_opacity(block_id) {
-	var cb = document.getElementById('checkbox' + block_id);
-	var fs = document.getElementById('perm' + block_id);
-	
-	if (cb.checked) 
-	{
-		set_opacity(fs, 5);
-	} 
-	else 
-	{
-		set_opacity(fs, 10);
-	}
-}
-
-/**
-* Reset the opacity and checkboxes
-* value = 0 (checked) and 1 (unchecked)
-* except_id = id of the element not to hide
-*/
-function reset_opacity(status, except_id) {
-	var perm = document.getElementById('set-permissions');
-	var fs = perm.getElementsByTagName('fieldset');
-	var opacity = 5;
-
-	if (status)
-	{
-		opacity = 10;	
-	}
-	
-	for (var i = 0; i < fs.length; i++ )
-	{
-		if (fs[i].className != 'quick')
-		{
-			set_opacity(fs[i], opacity);
-		}
-	}
-
-	if (typeof(except_id) != 'undefined')
-	{
-		set_opacity(document.getElementById('perm' + except_id), 10);
-	}
-
-	//reset checkboxes too
-	marklist('set-permissions', 'inherit', !status);
-}
-
-
-/**
-* Check whether we have a full radiobutton row of true
-* index = offset for the row of inputs (0 == first row, 1 == second, 2 == third),
-* rb = array of radiobuttons
-*/
-function get_radio_status(index, rb) 
-{
-	for (var i = index; i < rb.length; i = i + 3 )
-	{
-		if (rb[i].checked != true)
-		{
-			if (i > index)
-			{
-				//at least one is true, but not all (custom)
-				return 2;
-			}
-			//first one is not true
-			return 0;
-		}
-	}
-
-	// all radiobuttons true
-	return 1;
-}
-
-/**
-* Set tab colours
-* id = panel the tab needs to be set for, 
-* init = initialising on open, 
-* quick = If no calculation needed, this contains the colour
-*/
-function set_colours(id, init, quick)
-{
-	var table = document.getElementById('table' + id);
-	var tab = document.getElementById('tab' + id);
-
-	if (typeof(quick) != 'undefined') 
-	{
-		tab.className = 'permissions-preset-' + quick + ' activetab';
-		return;
-	}
-
-	var rb = table.getElementsByTagName('input');
-	var colour = 'custom';
-
-	var status = get_radio_status(0, rb);
-
-	if (status == 1)
-	{
-		colour = 'yes';
-	}
-	else if (status == 0) 
-	{
-		// We move on to No
-		status = get_radio_status(1, rb);
-
-		if (status == 1)
-		{
-			colour = 'no';
-		}
-		else if (status == 0) 
-		{
-			// We move on to Never
-			status = get_radio_status(2, rb);
-
-			if (status == 1)
-			{
-				colour = 'never';
-			}
-		}
-	}
-
-	if (init)
-	{
-		tab.className = 'permissions-preset-' + colour;
-	}
-	else
-	{
-		tab.className = 'permissions-preset-' + colour + ' activetab';
-	}
-}
-
-/**
-* Initialise advanced tab colours on first load
-* block_id = block that is opened
-*/
-function init_colours(block_id)
-{	
-	var block = document.getElementById('advanced' + block_id);
-	var panels = block.getElementsByTagName('div');
-	var tab = document.getElementById('tab' + id);
-
-	for (var i = 0; i < panels.length; i++)
-	{
-		if(panels[i].className == 'permissions-panel')
-		{
-			set_colours(panels[i].id.replace(/options/, ''), true);
-		}
-	}
-
-	tab.className = tab.className + ' activetab';
-}
-
-/**
-* Show/hide option panels
-* value = suffix for ID to show
-* adv = we are opening advanced permissions
-* view = called from view permissions
-*/
-function swap_options(pmask, fmask, cat, adv, view)
-{
-	id = pmask + fmask + cat;
-	active_option = active_pmask + active_fmask + active_cat;
-
-	var	old_tab = document.getElementById('tab' + active_option);	
-	var new_tab = document.getElementById('tab' + id);
-	var adv_block = document.getElementById('advanced' + pmask + fmask);
-
-	if (adv_block.style.display == 'block' && adv == true)
-	{
-		dE('advanced' + pmask + fmask, -1);
-		reset_opacity(1);
-		display_checkboxes(false);
-		return;
-	}
-
-	// no need to set anything if we are clicking on the same tab again
-	if (new_tab == old_tab && !adv)
-	{
-		return;
-	}
-
-	// init colours
-	if (adv && (pmask + fmask) != (active_pmask + active_fmask))
-	{
-		init_colours(pmask + fmask);
-		display_checkboxes(true);
-		reset_opacity(1);
-	} 
-	else if (adv) 
-	{
-		//Checkbox might have been clicked, but we need full visibility
-		display_checkboxes(true);
-		reset_opacity(1);
-	}
-
-	// set active tab
-	old_tab.className = old_tab.className.replace(/\ activetab/g, '');
-	new_tab.className = new_tab.className + ' activetab';
-
-	if (id == active_option && adv != true)
-	{
-		return;
-	}
-
-	dE('options' + active_option, -1);
-	
-	//hiding and showing the checkbox
-	if (document.getElementById('checkbox' + active_pmask + active_fmask))
-	{
-		dE('checkbox' + pmask + fmask, -1);	
-		
-		if ((pmask + fmask) != (active_pmask + active_fmask))
-		{
-			document.getElementById('checkbox' + active_pmask + active_fmask).style.display = 'inline';
-		}
-	}
-
-	if (!view)
-	{
-		dE('advanced' + active_pmask + active_fmask, -1);
-	}
-
-	if (!view)
-	{
-		dE('advanced' + pmask + fmask, 1);
-	}
-	dE('options' + id, 1);
-
-	active_pmask = pmask;
-	active_fmask = fmask;
-	active_cat = cat;
-}
-
-/**
-* Mark all radio buttons in one panel
-* id = table ID container, s = status ['y'/'u'/'n']
-*/
-function mark_options(id, s)
-{
-	var t = document.getElementById(id);
-
-	if (!t)
-	{
-		return;
-	}
-
-	var rb = t.getElementsByTagName('input');
-
-	for (var r = 0; r < rb.length; r++)
-	{
-		if (rb[r].id.substr(rb[r].id.length-1) == s)
-		{
-			rb[r].checked = true;
-		}
-	}
-}
-
-function mark_one_option(id, field_name, s)
-{
-	var t = document.getElementById(id);
-
-	if (!t)
-	{
-		return;
-	}
-
-	var rb = t.getElementsByTagName('input');
-
-	for (var r = 0; r < rb.length; r++)
-	{
-		if (rb[r].id.substr(rb[r].id.length-field_name.length-3, field_name.length) == field_name && rb[r].id.substr(rb[r].id.length-1) == s)
-		{
-			rb[r].checked = true;
-		}
-	}
-}
-
-/**
-* Reset role dropdown field to Select role... if an option gets changed
-*/
-function reset_role(id)
-{
-	var t = document.getElementById(id);
-
-	if (!t)
-	{
-		return;
-	}
-
-	t.options[0].selected = true;
-}
-
-/**
-* Load role and set options accordingly
-*/
-function set_role_settings(role_id, target_id)
-{
-	settings = role_options[role_id];
-
-	if (!settings)
-	{
-		return;
-	}
-
-	// Mark all options to no (unset) first...
-	mark_options(target_id, 'u');
-
-	for (var r in settings)
-	{
-		mark_one_option(target_id, r, (settings[r] == 1) ? 'y' : 'n');
-	}
-}
diff --git a/phpBB/adm/style/progress_bar.html b/phpBB/adm/style/progress_bar.html
deleted file mode 100644
index 00e1e5e885..0000000000
--- a/phpBB/adm/style/progress_bar.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-
-<script type="text/javascript">
-// <![CDATA[
-	/**
-	* Close previously opened popup
-	*/
-	function close_popup()
-	{
-		if (opener != null)
-		{
-			if (opener.close_waitscreen != null)
-			{
-				if (opener.close_waitscreen == 1)
-				{
-					opener.close_waitscreen = 0;
-					self.close();
-					return 0;
-				}
-			}
-		}
-		setTimeout("close_popup()", 1000);
-		return 0;
-	}
-// ]]>
-</script>
-
-<div class="successbox">
-	<h3>{L_PROGRESS}</h3>
-	<img src="images/progress_bar.gif" alt="{L_PROGRESS}" />
-	<p>{L_PROGRESS_EXPLAIN}</p>
-</div>
-
-<script type="text/javascript">
-// <![CDATA[
-	close_popup();
-// ]]>
-</script>
-
-<!-- INCLUDE simple_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/adm/style/simple_body.html b/phpBB/adm/style/simple_body.html
deleted file mode 100644
index 0b1e11b9a2..0000000000
--- a/phpBB/adm/style/simple_body.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-
-<div class="successbox">
-	<h3>{MESSAGE_TITLE}</h3>
-	<p>{MESSAGE_TEXT}</p>
-</div>
-
-<!-- INCLUDE simple_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
deleted file mode 100644
index 65cf724c2f..0000000000
--- a/phpBB/adm/style/simple_footer.html
+++ /dev/null
@@ -1,31 +0,0 @@
-		<div style="text-align: {S_CONTENT_FLOW_END};"><a href="#" onclick="self.close(); return false;">{L_CLOSE_WINDOW}</a></div>
-	<br /><br />
-</div>
-
-<!--
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-	forums may be affected.
-
-	The phpBB Group : 2006
-// -->
-
-<div id="page-footer">
-
-	<!-- IF S_COPYRIGHT_HTML -->
-		<br />Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
-		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
-	<!-- ENDIF -->
-
-	<!-- IF DEBUG_OUTPUT -->
-		<!-- IF S_COPYRIGHT_HTML --><br /><br /><!-- ENDIF -->
-		{DEBUG_OUTPUT}
-	<!-- ENDIF -->
-
-</div>
-
-</body>
-</html>
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
deleted file mode 100644
index e7d34c7ff4..0000000000
--- a/phpBB/adm/style/simple_header.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
-<head>
-
-<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
-<meta http-equiv="imagetoolbar" content="no" />
-<!-- IF META -->{META}<!-- ENDIF -->
-<title>{PAGE_TITLE}</title>
-
-<link href="style/admin.css" rel="stylesheet" type="text/css" media="screen" />
-
-<script type="text/javascript">
-// <![CDATA[
-var jump_page = '{LA_JUMP_PAGE}:';
-var on_page = '{ON_PAGE}';
-var per_page = '{PER_PAGE}';
-var base_url = '{A_BASE_URL}';
-
-/**
-* Window popup
-*/
-function popup(url, width, height, name)
-{
-	if (!name)
-	{
-		name = '_popup';
-	}
-
-	window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
-	return false;
-}
-
-/**
-* Jump to page
-*/
-function jumpto()
-{
-	var page = prompt(jump_page, on_page);
-
-	if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0)
-	{
-		if (base_url.indexOf('?') == -1)
-		{
-			document.location.href = base_url + '?start=' + ((page - 1) * per_page);
-		}
-		else
-		{
-			document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
-		}
-	}
-}
-
-/**
-* Set display of page element
-* s[-1,0,1] = hide,toggle display,show
-*/
-function dE(n, s, type)
-{
-	if (!type)
-	{
-		type = 'block';
-	}
-
-	var e = document.getElementById(n);
-	if (!s)
-	{
-		s = (e.style.display == '') ? -1 : 1;
-	}
-	e.style.display = (s == 1) ? type : 'none';
-}
-
-/**
-* Mark/unmark checkboxes
-* id = ID of parent container, name = name prefix, state = state [true/false]
-*/
-function marklist(id, name, state)
-{
-	var parent = document.getElementById(id);
-	if (!parent)
-	{
-		return;
-	}
-
-	var rb = parent.getElementsByTagName('input');
-
-	for (var r = 0; r < rb.length; r++)
-	{
-		if (rb[r].name.substr(0, name.length) == name)
-		{
-			rb[r].checked = state;
-		}
-	}
-}
-
-/**
-* Find a member
-*/
-function find_username(url)
-{
-	popup(url, 760, 570, '_usersearch');
-	return false;
-}
-
-// ]]>
-</script>
-</head>
-
-<body class="{S_CONTENT_DIRECTION}">
-
-<div id="page-body" class="simple-page-body">
diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js
deleted file mode 100644
index 20610b52fe..0000000000
--- a/phpBB/adm/style/tooltip.js
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
-javascript for Bubble Tooltips by Alessandro Fulciniti
-- http://pro.html.it - http://web-graphics.com 
-obtained from: http://web-graphics.com/mtarchive/001717.php
-
-phpBB Development Team:
-	- modified to adhere to our coding guidelines
-	- integration into our design
-	- added ability to perform tooltips on select elements
-	- further adjustements
-*/
-
-var head_text, tooltip_mode;
-
-/**
-* Enable tooltip replacements for links
-*/
-function enable_tooltips_link(id, headline, sub_id)
-{
-	var links, i, hold;
-	
-	head_text = headline;
-
-	if (!document.getElementById || !document.getElementsByTagName)
-	{
-		return;
-	}
-
-	hold = document.createElement('span');
-	hold.id = '_tooltip_container';
-	hold.setAttribute('id', '_tooltip_container');
-	hold.style.position = 'absolute';
-
-	document.getElementsByTagName('body')[0].appendChild(hold);
-
-	if (id == null)
-	{
-		links = document.getElementsByTagName('a');
-	}
-	else
-	{
-		links = document.getElementById(id).getElementsByTagName('a');
-	}
-
-	for (i = 0; i < links.length; i++)
-	{
-		if (sub_id)
-		{
-			if (links[i].id.substr(0, sub_id.length) == sub_id)
-			{
-				prepare(links[i]);
-			}
-		}
-		else
-		{
-			prepare(links[i]);
-		}
-	}
-
-	tooltip_mode = 'link';
-}
-
-/**
-* Enable tooltip replacements for selects
-*/
-function enable_tooltips_select(id, headline, sub_id)
-{
-	var links, i, hold;
-	
-	head_text = headline;
-
-	if (!document.getElementById || !document.getElementsByTagName)
-	{
-		return;
-	}
-
-	hold = document.createElement('span');
-	hold.id = '_tooltip_container';
-	hold.setAttribute('id', '_tooltip_container');
-	hold.style.position = 'absolute';
-
-	document.getElementsByTagName('body')[0].appendChild(hold);
-
-	if (id == null)
-	{
-		links = document.getElementsByTagName('option');
-	}
-	else
-	{
-		links = document.getElementById(id).getElementsByTagName('option');
-	}
-
-	for (i = 0; i < links.length; i++)
-	{
-		if (sub_id)
-		{
-			if (links[i].parentNode.id.substr(0, sub_id.length) == sub_id)
-			{
-				prepare(links[i]);
-			}
-		}
-		else
-		{
-			prepare(links[i]);
-		}
-	}
-
-	tooltip_mode = 'select';
-}
-
-/**
-* Prepare elements to replace
-*/
-function prepare(element)
-{
-	var tooltip, text, desc, title;
-
-	text = element.getAttribute('title');
-
-	if (text == null || text.length == 0)
-	{
-		return;
-	}
-
-	element.removeAttribute('title');
-	tooltip = create_element('span', 'tooltip');
-
-	title = create_element('span', 'top');
-	title.appendChild(document.createTextNode(head_text));
-	tooltip.appendChild(title);
-
-	desc = create_element('span', 'bottom');
-	desc.innerHTML = text;
-	tooltip.appendChild(desc);
-
-	set_opacity(tooltip);
-
-	element.tooltip = tooltip;
-	element.onmouseover = show_tooltip;
-	element.onmouseout = hide_tooltip;
-
-	if (tooltip_mode == 'link')
-	{
-		element.onmousemove = locate;
-	}
-}
-
-/**
-* Show tooltip
-*/
-function show_tooltip(e)
-{
-	document.getElementById('_tooltip_container').appendChild(this.tooltip);
-	locate(this);
-}
-
-/**
-* Hide tooltip
-*/
-function hide_tooltip(e)
-{
-	var d = document.getElementById('_tooltip_container');
-	if (d.childNodes.length > 0)
-	{
-		d.removeChild(d.firstChild);
-	}
-}
-
-/**
-* Set opacity on tooltip element
-*/
-function set_opacity(element)
-{
-	element.style.filter = 'alpha(opacity:95)';
-	element.style.KHTMLOpacity = '0.95';
-	element.style.MozOpacity = '0.95';
-	element.style.opacity = '0.95';
-}
-
-/**
-* Create new element
-*/
-function create_element(tag, c)
-{
-	var x = document.createElement(tag);
-	x.className = c;
-	x.style.display = 'block';
-	return x;
-}
-
-/**
-* Correct positioning of tooltip container
-*/
-function locate(e)
-{
-	var posx = 0;
-	var posy = 0;
-
-	e = e.parentNode;
-
-	if (e.offsetParent)
-	{
-		for (var posx = 0, posy = 0; e.offsetParent; e = e.offsetParent)
-		{
-			posx += e.offsetLeft;
-			posy += e.offsetTop;
-		}
-	}
-	else
-	{
-		posx = e.offsetLeft;
-		posy = e.offsetTop;
-	}
-
-	if (tooltip_mode == 'link')
-	{
-		document.getElementById('_tooltip_container').style.top=(posy+20) + 'px';
-		document.getElementById('_tooltip_container').style.left=(posx-20) + 'px';
-	}
-	else
-	{
-		document.getElementById('_tooltip_container').style.top=(posy+30) + 'px';
-		document.getElementById('_tooltip_container').style.left=(posx-205) + 'px';
-	}
-
-/*
-	if (e == null)
-	{
-		e = window.event;
-	}
-
-	if (e.pageX || e.pageY)
-	{
-		posx = e.pageX;
-		posy = e.pageY;
-	}
-	else if (e.clientX || e.clientY)
-	{
-		if (document.documentElement.scrollTop)
-		{
-			posx = e.clientX+document.documentElement.scrollLeft;
-			posy = e.clientY+document.documentElement.scrollTop;
-		}
-		else
-		{
-			posx = e.clientX+document.body.scrollLeft;
-			posy = e.clientY+document.body.scrollTop;
-		}
-	}
-*/
-}
diff --git a/phpBB/adm/style/update_options.html b/phpBB/adm/style/update_options.html
deleted file mode 100644
index e3ef01582c..0000000000
--- a/phpBB/adm/style/update_options.html
+++ /dev/null
@@ -1,123 +0,0 @@
-
-<!-- IF S_DOWNLOAD_FILES -->
-
-	<h1>{L_DOWNLOAD_UPDATE_METHOD}</h1>
-
-	<p>{L_DOWNLOAD_UPDATE_METHOD_EXPLAIN}</p>
-
-	<form id="install_update" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_SELECT_DOWNLOAD_FORMAT}</legend>
-	<dl>
-		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
-		<dd>{RADIO_BUTTONS}</dd>
-	</dl>
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}{S_FORM_TOKEN}
-		<!-- IF S_CHECK_AGAIN --><input type="submit" class="button2" value="{L_CHECK_FILES_AGAIN}" name="check_again" />&nbsp; &nbsp;<!-- ENDIF -->
-		<input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" />
-	</fieldset>
-
-	</form>
-
-	<br /><br />
-
-	<p>{L_MAPPING_FILE_STRUCTURE}</p>
-
-	<table cellspacing="1">
-		<col class="row1" /><col class="row2" /><col class="row1" />
-	<thead>
-	<tr>
-		<th style="width: 49%">{L_ARCHIVE_FILE}</th>
-		<th style="width: 2%">&nbsp;</th>
-		<th style="width: 49%">{L_DESTINATION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN location -->
-	<tr>
-		<td>{location.SOURCE}</td>
-		<td><strong>&raquo;</strong></td>
-		<td>{location.DESTINATION}</td>
-	</tr>
-	<!-- END location -->
-	</tbody>
-	</table>
-
-<!-- ELSEIF S_FTP_UPLOAD -->
-
-	<h1>{L_SELECT_FTP_SETTINGS}</h1>
-
-	<form id="update_options" method="post" action="{U_ACTION}">
-
-	<!-- IF S_CONNECTION_SUCCESS -->
-		<div class="successbox">
-			<p>{L_CONNECTION_SUCCESS}</p>
-		</div>
-	<!-- ELSEIF S_CONNECTION_FAILED -->
-		<div class="successbox">
-			<p>{L_TRY_DOWNLOAD_METHOD}</p>
-
-			<fieldset class="quick">
-				<input class="button1" type="submit" name="download" value="{L_TRY_DOWNLOAD_METHOD_BUTTON}" />
-			</fieldset>
-		</div>
-
-		<div class="errorbox">
-			<p>{L_CONNECTION_FAILED}<br />{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<fieldset>
-		<legend>{L_FTP_SETTINGS}</legend>
-	<dl>
-		<dt><label>{L_UPLOAD_METHOD}:</label></dt>
-		<dd><strong>{UPLOAD_METHOD}</strong></dd>
-	</dl>
-	<!-- BEGIN data -->
-	<dl>
-		<dt><label for="{data.DATA}">{data.NAME}:</label><br /><span>{data.EXPLAIN}</span></dt>
-		<dd><input type="<!-- IF data.DATA == 'password' -->password<!-- ELSE -->text<!-- ENDIF -->" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" /></dd>
-	</dl>
-	<!-- END data -->
-	</fieldset>
-	
-	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}{S_FORM_TOKEN}
-		<input class="button2" type="submit" name="check_again" value="{L_BACK}" />
-		<input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}" />
-		<input class="button1" type="submit" name="update" value="{L_UPDATE_FILES}" />
-	</fieldset>
-
-	</form>
-
-<!-- ELSEIF S_UPLOAD_SUCCESS -->
-
-	<form id="update_options" method="post" action="{U_FINAL_ACTION}">
-
-	<h1>{L_UPDATE_SUCCESS}</h1>
-	<p>{L_UPDATE_SUCCESS_EXPLAIN}</p>
-
-	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="clean_up" value="{L_CONTINUE_UPDATE}" />
-	</fieldset>
-
-	</form>
-
-<!-- ELSEIF S_UPDATE_OPTIONS -->
-
-	<form id="update_options" method="post" action="{U_INITIAL_ACTION}">
-
-	<p>{L_UPDATE_METHOD_EXPLAIN}</p>
-
-	<fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}{S_FORM_TOKEN}
-	<input class="button1" type="submit" name="ftp_upload" value="{L_FTP_UPDATE_METHOD}" />&nbsp; &nbsp;<input class="button1" type="submit" name="download" value="{L_DOWNLOAD_UPDATE_METHOD_BUTTON}" />
-	</fieldset>
-
-	</form>
-
-<!-- ENDIF -->
-\ No newline at end of file
diff --git a/phpBB/adm/style/viewsource.html b/phpBB/adm/style/viewsource.html
deleted file mode 100644
index f127c9626f..0000000000
--- a/phpBB/adm/style/viewsource.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-<div id="acp" style="padding: 0;">
-<div class="panel" style="padding: 10px;">
-<div style="overflow: auto;">
-	<h1>{FILENAME}</h1>
-
-	<table class="type2">
-	<tbody>
-	<!-- BEGIN source -->
-		<tr valign="top">
-			<td class="sourcenum">{source.LINENUM}&nbsp;&nbsp;</td>
-			<td class="source">{source.LINE}</td>
-		</tr>
-	<!-- END source -->
-	</tbody>
-	</table>
-
-</div>
-</div>
-</div>
-<!-- INCLUDE simple_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/adm/swatch.php b/phpBB/adm/swatch.php
deleted file mode 100644
index 921943d597..0000000000
--- a/phpBB/adm/swatch.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-define('IN_PHPBB', true);
-define('ADMIN_START', true);
-if (!defined('PHPBB_ROOT_PATH')) define('PHPBB_ROOT_PATH', './../');
-if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-include(PHPBB_ROOT_PATH . 'common.' . PHP_EXT);
-
-// Start session management
-phpbb::$user->session_begin(false);
-phpbb::$acl->init(phpbb::$user->data);
-phpbb::$user->setup();
-
-// Set custom template for admin area
-phpbb::$template->set_custom_template(PHPBB_ROOT_PATH . phpbb::$base_config['admin_folder'] . '/style', 'admin');
-
-phpbb::$template->set_filenames(array(
-	'body' => 'colour_swatch.html',
-));
-
-$form = request_var('form', '');
-$name = request_var('name', '');
-
-// We validate form and name here, only id/class allowed
-$form = (!preg_match('/^[a-z0-9_-]+$/i', $form)) ? '' : $form;
-$name = (!preg_match('/^[a-z0-9_-]+$/i', $name)) ? '' : $name;
-
-phpbb::$template->assign_vars(array(
-	'OPENER'		=> $form,
-	'NAME'			=> $name,
-	'T_IMAGES_PATH'	=> PHPBB_ROOT_PATH . 'images/',
-
-	'S_USER_LANG'			=> phpbb::$user->lang['USER_LANG'],
-	'S_CONTENT_DIRECTION'	=> phpbb::$user->lang['DIRECTION'],
-	'S_CONTENT_ENCODING'	=> 'UTF-8',
-));
-
-phpbb::$template->display('body');
-
-garbage_collection();
-
-?>
-\ No newline at end of file
diff --git a/phpBB/cache/.htaccess b/phpBB/cache/.htaccess
deleted file mode 100644
index aa5afc1640..0000000000
--- a/phpBB/cache/.htaccess
+++ /dev/null
@@ -1,4 +0,0 @@
-<Files *>
-	Order Allow,Deny
-	Deny from All
-</Files>
-\ No newline at end of file
diff --git a/phpBB/common.php b/phpBB/common.php
deleted file mode 100644
index aa72b83612..0000000000
--- a/phpBB/common.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-* Minimum Requirement: PHP 5.2.0+
-*
-* Within this file the framework with all components as well as all phpBB-specific things will be loaded
-*/
-
-/**
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-// Init Framework - do not change to require_once ;)
-require PHPBB_ROOT_PATH . 'includes/core/bootstrap.' . PHP_EXT;
-
-// Run through remaining Framework states
-if (!phpbb::$base_config['config_set'] || !phpbb::$base_config['installed'])
-{
-	// Redirect the user to the installer
-	// We have to generate a full HTTP/1.1 header here since we can't guarantee to have any of the information
-	// available as used by the redirect function
-	$server_name = (!empty($_SERVER['HTTP_HOST'])) ? strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'));
-	$server_port = (!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT');
-	$secure = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 1 : 0;
-
-	$script_name = (!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : getenv('PHP_SELF');
-	if (!$script_name)
-	{
-		$script_name = (!empty($_SERVER['REQUEST_URI'])) ? $_SERVER['REQUEST_URI'] : getenv('REQUEST_URI');
-	}
-
-	// Replace any number of consecutive backslashes and/or slashes with a single slash
-	// (could happen on some proxy setups and/or Windows servers)
-	$script_path = trim(dirname($script_name)) . '/install/index.' . PHP_EXT;
-	$script_path = preg_replace('#[\\\\/]{2,}#', '/', $script_path);
-
-	$url = (($secure) ? 'https://' : 'http://') . $server_name;
-
-	if ($server_port && (($secure && $server_port <> 443) || (!$secure && $server_port <> 80)))
-	{
-		// HTTP HOST can carry a port number...
-		if (strpos($server_name, ':') === false)
-		{
-			$url .= ':' . $server_port;
-		}
-	}
-
-	$url .= $script_path;
-	header('Location: ' . $url);
-	exit;
-}
-
-// Set PHP error handler to ours
-set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
-
-// enforce the use of the request class
-phpbb_request::disable_super_globals();
-
-// @todo Syndicate config variables somehow and check them here. It would be also nice to not have so many global vars from the config file (means: re-think layout of config file, maybe require phpbb:: to be set)
-
-if (!empty(phpbb::$base_config['dbms']))
-{
-	// Register DB object.
-	phpbb::assign('db', phpbb_db_dbal::connect(phpbb::$base_config['dbms'], phpbb::$base_config['dbhost'], phpbb::$base_config['dbuser'], phpbb::$base_config['dbpasswd'], phpbb::$base_config['dbname'], phpbb::$base_config['dbport'], false, defined('PHPBB_DB_NEW_LINK') ? PHPBB_DB_NEW_LINK : false));
-}
-
-// We do not need the db password any longer, unset for safety purposes
-if (!empty(phpbb::$base_config['dbpasswd']))
-{
-	unset(phpbb::$base_config['dbpasswd']);
-}
-
-// Register Cache Manager
-phpbb::register('acm');
-
-// Grab global variables
-phpbb_cache::obtain_config();
-
-// Register Template
-phpbb::register('template');
-
-// Register permission class
-phpbb::register('acl');
-
-// Register user object
-phpbb::register('user', false, false, phpbb::$config['auth_method'], PHPBB_ROOT_PATH . 'language/');
-
-// Register API
-// phpbb::register('api');
-
-// Register Plugins
-phpbb::$plugins->init(PHPBB_ROOT_PATH . 'plugins/');
-
-// Setup Plugins
-phpbb::$plugins->setup();
-
-?>
-\ No newline at end of file
diff --git a/phpBB/cron.php b/phpBB/cron.php
deleted file mode 100644
index bc801478a9..0000000000
--- a/phpBB/cron.php
+++ /dev/null
@@ -1,285 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-*/
-define('IN_PHPBB', true);
-define('IN_CRON', true);
-if (!defined('PHPBB_ROOT_PATH')) define('PHPBB_ROOT_PATH', './');
-if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-include(PHPBB_ROOT_PATH . 'common.' . PHP_EXT);
-
-// Do not update users last page entry
-phpbb::$user->session_begin(false);
-phpbb::$acl->init(phpbb::$user->data);
-
-$cron_type = request_var('cron_type', '');
-$use_shutdown_function = (@function_exists('register_shutdown_function')) ? true : false;
-
-// Output transparent gif
-header('Cache-Control: no-cache');
-header('Content-type: image/gif');
-header('Content-length: 43');
-
-echo base64_decode('R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==');
-
-// test without flush ;)
-// flush();
-
-//
-if (!isset(phpbb::$config['cron_lock']))
-{
-	set_config('cron_lock', '0', true);
-}
-
-// make sure cron doesn't run multiple times in parallel
-if (phpbb::$config['cron_lock'])
-{
-	// if the other process is running more than an hour already we have to assume it
-	// aborted without cleaning the lock
-	$time = explode(' ', phpbb::$config['cron_lock']);
-	$time = $time[0];
-
-	if ($time + 3600 >= time())
-	{
-		exit;
-	}
-}
-
-define('CRON_ID', time() . ' ' . unique_id());
-
-$sql = 'UPDATE ' . CONFIG_TABLE . "
-	SET config_value = '" . phpbb::$db->sql_escape(CRON_ID) . "'
-	WHERE config_name = 'cron_lock' AND config_value = '" . phpbb::$db->sql_escape(phpbb::$config['cron_lock']) . "'";
-phpbb::$db->sql_query($sql);
-
-// another cron process altered the table between script start and UPDATE query so exit
-if (phpbb::$db->sql_affectedrows() != 1)
-{
-	exit;
-}
-
-/**
-* Run cron-like action
-* Real cron-based layer will be introduced in 3.2
-*/
-switch ($cron_type)
-{
-	case 'queue':
-
-		if (time() - phpbb::$config['queue_interval'] <= phpbb::$config['last_queue_run'] || !file_exists(PHPBB_ROOT_PATH . 'cache/queue.' . PHP_EXT))
-		{
-			break;
-		}
-
-		// A user reported using the mail() function while using shutdown does not work. We do not want to risk that.
-		if ($use_shutdown_function && !phpbb::$config['smtp_delivery'])
-		{
-			$use_shutdown_function = false;
-		}
-
-		include_once(PHPBB_ROOT_PATH . 'includes/functions_messenger.' . PHP_EXT);
-		$queue = new queue();
-
-		if ($use_shutdown_function)
-		{
-			register_shutdown_function(array(&$queue, 'process'));
-		}
-		else
-		{
-			$queue->process();
-		}
-
-	break;
-
-	case 'tidy_cache':
-
-		if (time() - phpbb::$config['cache_gc'] <= phpbb::$config['cache_last_gc'] || !method_exists(phpbb::$acm, 'tidy'))
-		{
-			break;
-		}
-
-		if ($use_shutdown_function)
-		{
-			register_shutdown_function(array(&phpbb::$acm, 'tidy'));
-		}
-		else
-		{
-			phpbb::$acm->tidy();
-		}
-
-	break;
-
-	case 'tidy_search':
-
-		// Select the search method
-		$search_type = basename(phpbb::$config['search_type']);
-
-		if (time() - phpbb::$config['search_gc'] <= phpbb::$config['search_last_gc'] || !file_exists(PHPBB_ROOT_PATH . 'includes/search/' . $search_type . '.' . PHP_EXT))
-		{
-			break;
-		}
-
-		include_once(PHPBB_ROOT_PATH . "includes/search/$search_type." . PHP_EXT);
-
-		// We do some additional checks in the module to ensure it can actually be utilised
-		$error = false;
-		$search = new $search_type($error);
-
-		if ($error)
-		{
-			break;
-		}
-
-		if ($use_shutdown_function)
-		{
-			register_shutdown_function(array(&$search, 'tidy'));
-		}
-		else
-		{
-			$search->tidy();
-		}
-
-	break;
-
-	case 'tidy_warnings':
-
-		if (time() - phpbb::$config['warnings_gc'] <= phpbb::$config['warnings_last_gc'])
-		{
-			break;
-		}
-
-		include_once(PHPBB_ROOT_PATH . 'includes/functions_admin.' . PHP_EXT);
-
-		if ($use_shutdown_function)
-		{
-			register_shutdown_function('tidy_warnings');
-		}
-		else
-		{
-			tidy_warnings();
-		}
-
-	break;
-
-	case 'tidy_database':
-
-		if (time() - phpbb::$config['database_gc'] <= phpbb::$config['database_last_gc'])
-		{
-			break;
-		}
-
-		include_once(PHPBB_ROOT_PATH . 'includes/functions_admin.' . PHP_EXT);
-
-		if ($use_shutdown_function)
-		{
-			register_shutdown_function('tidy_database');
-		}
-		else
-		{
-			tidy_database();
-		}
-
-	break;
-
-	case 'tidy_sessions':
-
-		if (time() - phpbb::$config['session_gc'] <= phpbb::$config['session_last_gc'])
-		{
-			break;
-		}
-
-		if ($use_shutdown_function)
-		{
-			register_shutdown_function(array(&$user, 'session_gc'));
-		}
-		else
-		{
-			phpbb::$user->session_gc();
-		}
-
-	break;
-
-	case 'prune_forum':
-
-		$forum_id = request_var('f', 0);
-
-		$sql = 'SELECT forum_id, prune_next, enable_prune, prune_days, prune_viewed, forum_flags, prune_freq
-			FROM ' . FORUMS_TABLE . "
-			WHERE forum_id = $forum_id";
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$row)
-		{
-			break;
-		}
-
-		// Do the forum Prune thang
-		if ($row['prune_next'] < time() && $row['enable_prune'])
-		{
-			include_once(PHPBB_ROOT_PATH . 'includes/functions_admin.' . PHP_EXT);
-
-			if ($row['prune_days'])
-			{
-				if ($use_shutdown_function)
-				{
-					register_shutdown_function('auto_prune', $row['forum_id'], 'posted', $row['forum_flags'], $row['prune_days'], $row['prune_freq']);
-				}
-				else
-				{
-					auto_prune($row['forum_id'], 'posted', $row['forum_flags'], $row['prune_days'], $row['prune_freq']);
-				}
-			}
-
-			if ($row['prune_viewed'])
-			{
-				if ($use_shutdown_function)
-				{
-					register_shutdown_function('auto_prune', $row['forum_id'], 'viewed', $row['forum_flags'], $row['prune_viewed'], $row['prune_freq']);
-				}
-				else
-				{
-					auto_prune($row['forum_id'], 'viewed', $row['forum_flags'], $row['prune_viewed'], $row['prune_freq']);
-				}
-			}
-		}
-
-	break;
-}
-
-// Unloading cache and closing db after having done the dirty work.
-if ($use_shutdown_function)
-{
-	register_shutdown_function('unlock_cron');
-	register_shutdown_function('garbage_collection');
-}
-else
-{
-	unlock_cron();
-	garbage_collection();
-}
-
-exit;
-
-
-/**
-* Unlock cron script
-*/
-function unlock_cron()
-{
-	$sql = 'UPDATE ' . CONFIG_TABLE . "
-		SET config_value = '0'
-		WHERE config_name = 'cron_lock' AND config_value = '" . phpbb::$db->sql_escape(CRON_ID) . "'";
-	phpbb::$db->sql_query($sql);
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/develop/collect_cache_stats.sh b/phpBB/develop/collect_cache_stats.sh
deleted file mode 100755
index 5bb31c5173..0000000000
--- a/phpBB/develop/collect_cache_stats.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-DIR=$(dirname "$0")/../cache;
-cat "$DIR/sql_*.php" | grep '/* SELECT' | sed 's,/\* ,,;s, \*/,,' | sort
diff --git a/phpBB/develop/file_structure.txt b/phpBB/develop/file_structure.txt
deleted file mode 100644
index 5f40305542..0000000000
--- a/phpBB/develop/file_structure.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-File structure grouped by filesystem:
-
-/includes/core/			Core
-/includes/api/			API
-/includes/acm/			Cache
-/includes/auth/			Authentication
-/includes/bbcode/		BBCode
-/includes/captcha/		Captcha
-/includes/db/			DBAL
-/includes/search/		Search
-/includes/utf/			UTF8-specific files/classes
-
-/includes/classes/		Collection of single classes which we do not want to put into a separate directory. Although later it would be nice to have all of them in one "location".
-	acl.php:					ACL/permission class.
-	cache.php:					Static class for obtaining cached items/arrays
-	session.php:					The session class used for managing sessions.
-	template.php, template_compile.php:		The template engine
-	user.php:					The user object, handling user-based session and user-specific setups. It defines the users workspace.
-
-/includes/libraries/		Collection of external and "adjusted" libraries we use and do not constitute one "system" in phpBB.
-/includes/libraries/diff/	Diff System (Text_Diff-1.1.0 - http://pear.php.net/package/Text_Diff/) - Used By: Updater,
-/includes/libraries/sftp/	SFTP (http://phpseclib.sourceforge.net/) - Used By: Transfer Class,
-
-
-/modules/			Directory holding directories/files for the defined module sections (ucp, mcp, acp, etc.)
-/plugins/			Plugins for phpBB (Hooks are now plugins btw... includes/hooks no longer exists)
-
-/develop/			Internal helper files for development. Only present in SVN
-/docs/				Documentation, Documents, License file, Coding Guidelines
-
-/cache/				Cache directory for storing files. Needs to be writeable
-/store/				Store directory for storing backup files and temporary files. Needs to be writeable
-/files/				Files directory for storing attachments and uploaded files. Needs to be writeable
diff --git a/phpBB/develop/fix_files.sh b/phpBB/develop/fix_files.sh
deleted file mode 100755
index 782418f504..0000000000
--- a/phpBB/develop/fix_files.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-# 
-# Remove all those annoying ^M characters that Winblows editor's like to add
-# from all files in the current directory and all subdirectories.
-#
-# Written by: Jonathan Haase.
-#
-# UPDATE: 7/31/2001: fix so that it doesn't touch things in the images directory
-#
-# UPDATE: 12/15/2003: Fix so that it doesn't touch any "non-text" files
-#
-
-find . > FILELIST.$$
-grep -sv FILELIST FILELIST.$$ > FILELIST2.$$
-grep -sv $(basename $0) FILELIST2.$$ > FILELIST.$$
-grep -sv "^\.$" FILELIST.$$ > FILELIST2.$$
-file -f FILELIST2.$$  |grep text | sed -e 's/^\([^\:]*\)\:.*$/\1/' > FILELIST
-file -f FILELIST2.$$  |grep -sv text | sed -e 's/^\([^\:]*\)\:.*$/Not Modifying file: \1/'
-rm FILELIST2.$$
-rm FILELIST.$$
-
-for i in $(cat FILELIST); do
-	if [ -f $i ]; then  	 
-		sed -e s/
-//g $i > $i.tmp
-  		mv $i.tmp $i
-	fi	
-done
-rm FILELIST
diff --git a/phpBB/develop/generate_utf_casefold.php b/phpBB/develop/generate_utf_casefold.php
deleted file mode 100644
index bbf0a0a75d..0000000000
--- a/phpBB/develop/generate_utf_casefold.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-if (php_sapi_name() != 'cli')
-{
-	die("This program must be run from the command line.\n");
-}
-
-//
-// Security message:
-//
-// This script is potentially dangerous.
-// Remove or comment the next line (die(".... ) to enable this script.
-// Do NOT FORGET to either remove this script or disable it after you have used it.
-//
-die("Please read the first lines of this script for instructions on how to enable it");
-
-set_time_limit(0);
-
-define('IN_PHPBB', true);
-define('PHPBB_ROOT_PATH', './../');
-define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-
-echo "Checking for required files\n";
-download('http://unicode.org/Public/UNIDATA/CaseFolding.txt');
-echo "\n";
-
-
-/**
-* Load the CaseFolding table
-*/
-echo "Loading CaseFolding\n";
-$unidata = file_get_contents('CaseFolding.txt');
-
-
-function utf8_chr($cp)
-{
-    if ($cp > 0xFFFF)
-    {
-        return chr(0xF0 | ($cp >> 18)) . chr(0x80 | (($cp >> 12) & 0x3F)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
-    }
-    else if ($cp > 0x7FF)
-    {
-        return chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
-    }
-    else if ($cp > 0x7F)
-    {
-        return chr(0xC0 | ($cp >> 6)) . chr(0x80 | ($cp & 0x3F));
-    }
-    else
-    {
-        return chr($cp);
-    }
-}
-
-preg_match_all('/^([0-9A-F]+); ([CFS]); ([0-9A-F]+(?: [0-9A-F]+)*);/im', $unidata, $array, PREG_SET_ORDER);
-
-$uniarray = array();
-
-foreach ($array as $value)
-{
-    $uniarray[$value[2]][utf8_chr(hexdec((string)$value[1]))] = implode(array_map('utf8_chr', array_map('hexdec', explode(' ', $value[3]))));
-}
-
-foreach ($uniarray as $idx => $contents)
-{
-	echo "Writing to case_fold_$idx." . PHP_EXT . "\n";
-	$fp = fopen(PHPBB_ROOT_PATH . 'includes/utf/data/case_fold_' . strtolower($idx) . '.' . PHP_EXT, 'wb');
-	fwrite($fp, '<?php return ' . my_var_export($contents) . ';');
-	fclose($fp);
-}
-
-/**
-* Return a parsable string representation of a variable
-*
-* This is function is limited to array/strings/integers
-*
-* @param	mixed	$var		Variable
-* @return	string				PHP code representing the variable
-*/
-function my_var_export($var)
-{
-	if (is_array($var))
-	{
-		$lines = array();
-
-		foreach ($var as $k => $v)
-		{
-			$lines[] = my_var_export($k) . '=>' . my_var_export($v);
-		}
-
-		return 'array(' . implode(',', $lines) . ')';
-	}
-	else if (is_string($var))
-	{
-		return "'" . str_replace(array('\\', "'"), array('\\\\', "\\'"), $var) . "'";
-	}
-	else
-	{
-		return $var;
-	}
-}
-
-/**
-* Download a file to the develop/ dir
-*
-* @param	string	$url		URL of the file to download
-* @return	void
-*/
-function download($url)
-{
-	if (file_exists(PHPBB_ROOT_PATH . 'develop/' . basename($url)))
-	{
-		return;
-	}
-
-	echo 'Downloading from ', $url, ' ';
-
-	if (!$fpr = fopen($url, 'rb'))
-	{
-		die("Can't download from $url\nPlease download it yourself and put it in the develop/ dir, kthxbai");
-	}
-
-	if (!$fpw = fopen(PHPBB_ROOT_PATH . 'develop/' . basename($url), 'wb'))
-	{
-		die("Can't open develop/" . basename($url) . " for output... please check your permissions or something");
-	}
-
-	$i = 0;
-	$chunk = 32768;
-	$done = '';
-
-	while (!feof($fpr))
-	{
-		$i += fwrite($fpw, fread($fpr, $chunk));
-		echo str_repeat("\x08", strlen($done));
-
-		$done = ($i >> 10) . ' KiB';
-		echo $done;
-	}
-	fclose($fpr);
-	fclose($fpw);
-
-	echo "\n";
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/develop/generate_utf_confusables.php b/phpBB/develop/generate_utf_confusables.php
deleted file mode 100644
index a70fca9110..0000000000
--- a/phpBB/develop/generate_utf_confusables.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-if (php_sapi_name() != 'cli')
-{
-	die("This program must be run from the command line.\n");
-}
-
-//
-// Security message:
-//
-// This script is potentially dangerous.
-// Remove or comment the next line (die(".... ) to enable this script.
-// Do NOT FORGET to either remove this script or disable it after you have used it.
-//
-die("Please read the first lines of this script for instructions on how to enable it");
-
-set_time_limit(0);
-
-define('IN_PHPBB', true);
-define('PHPBB_ROOT_PATH', './../');
-define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-
-echo "Checking for required files\n";
-download('http://unicode.org/reports/tr39/data/confusables.txt');
-download('http://unicode.org/Public/UNIDATA/CaseFolding.txt');
-echo "\n";
-
-
-/**
-* Load the confusables table
-*/
-echo "Loading confusables\n";
-$unidata = file_get_contents('confusables.txt');
-
-/**
-* Load the CaseFolding table
-*/
-echo "Loading CaseFolding\n";
-$casefolds = file_get_contents('CaseFolding.txt');
-
-
-function utf8_chr($cp)
-{
-    if ($cp > 0xFFFF)
-    {
-        return chr(0xF0 | ($cp >> 18)) . chr(0x80 | (($cp >> 12) & 0x3F)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
-    }
-    else if ($cp > 0x7FF)
-    {
-        return chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
-    }
-    else if ($cp > 0x7F)
-    {
-        return chr(0xC0 | ($cp >> 6)) . chr(0x80 | ($cp & 0x3F));
-    }
-    else
-    {
-        return chr($cp);
-    }
-}
-
-preg_match_all('/^([0-9A-F]+) ;\s((?:[0-9A-F]+ )*);.*?$/im', $unidata, $array, PREG_SET_ORDER);
-preg_match_all('/^([0-9A-F]+); ([CFS]); ([0-9A-F]+(?: [0-9A-F]+)*);/im', $casefolds, $casefold_array);
-
-// some that we defined ourselves
-$uniarray = array(
-		"\xC2\xA1"			=>	"\x69",	// EXCLAMATION MARK, INVERTED => LATIN SMALL LETTER I
-		"\xC7\x83"			=>	"\x21",	// LATIN LETTER RETROFLEX CLICK => EXCLAMATION MARK
-		"\xCE\xB1"			=>	"\x61",	// GREEK SMALL LETTER ALPHA => LATIN SMALL LETTER A
-		"\xE1\x9A\x80"		=>	"\x20",	// OGHAM SPACE MARK
-
-		"\xC2\xAD"			=>	'',		// HYPHEN, SOFT => empty string
-		"\xDB\x9D"			=>	'',		// ARABIC END OF AYAH
-		"\xDC\x8F"			=>	'',		// SYRIAC ABBREVIATION MARK
-		"\xE1\xA0\x86"		=>	'',		// MONGOLIAN TODO SOFT HYPHEN
-		"\xE1\xA0\x8E"		=>	'',		// MONGOLIAN VOWEL SEPARATOR
-		"\xE2\x80\x8B"		=>	'',		// ZERO WIDTH SPACE
-		"\xE2\x80\x8C"		=>	'',		// ZERO WIDTH NON-JOINER
-		"\xE2\x80\x8D"		=>	'',		// ZERO WIDTH JOINER
-		"\xE2\x80\xA8"		=>	'',		// LINE SEPARATOR
-		"\xE2\x80\xA9"		=>	'',		// PARAGRAPH SEPARATOR
-		"\xE2\x81\xA0"		=>	'',		// WORD JOINER
-		"\xE2\x81\xA1"		=>	'',		// FUNCTION APPLICATION
-		"\xE2\x81\xA2"		=>	'',		// INVISIBLE TIMES
-		"\xE2\x81\xA3"		=>	'',		// INVISIBLE SEPARATOR
-		"\xE2\x81\xAA"		=>	'',		// [CONTROL CHARACTERS]
-		"\xE2\x81\xAB"		=>	'',		// [CONTROL CHARACTERS]
-		"\xE2\x81\xAC"		=>	'',		// [CONTROL CHARACTERS]
-		"\xE2\x81\xAD"		=>	'',		// [CONTROL CHARACTERS]
-		"\xE2\x81\xAE"		=>	'',		// [CONTROL CHARACTERS]
-		"\xE2\x81\xAF"		=>	'',		// [CONTROL CHARACTERS]
-		"\xEF\xBB\xBF"		=>	'',		// ZERO WIDTH NO-BREAK SPACE
-		"\xEF\xBF\xB9"		=>	'',		// [CONTROL CHARACTERS]
-		"\xEF\xBF\xBA"		=>	'',		// [CONTROL CHARACTERS]
-		"\xEF\xBF\xBB"		=>	'',		// [CONTROL CHARACTERS]
-		"\xEF\xBF\xBC"		=>	'',		// [CONTROL CHARACTERS]
-		"\xF0\x9D\x85\xB3"	=>	'',		// [MUSICAL CONTROL CHARACTERS]
-		"\xF0\x9D\x85\xB4"	=>	'',		// [MUSICAL CONTROL CHARACTERS]
-		"\xF0\x9D\x85\xB5"	=>	'',		// [MUSICAL CONTROL CHARACTERS]
-		"\xF0\x9D\x85\xB6"	=>	'',		// [MUSICAL CONTROL CHARACTERS]
-		"\xF0\x9D\x85\xB7"	=>	'',		// [MUSICAL CONTROL CHARACTERS]
-		"\xF0\x9D\x85\xB8"	=>	'',		// [MUSICAL CONTROL CHARACTERS]
-		"\xF0\x9D\x85\xB9"	=>	'',		// [MUSICAL CONTROL CHARACTERS]
-		"\xF0\x9D\x85\xBA"	=>	'',		// [MUSICAL CONTROL CHARACTERS]
-);
-
-$copy = $uniarray;
-
-foreach ($array as $value)
-{
-	$temp_hold = implode(array_map('utf8_chr', array_map('hexdec', explode(' ', trim($value[2])))));
-	
-	if (isset($copy[utf8_chr(hexdec((string)$value[1]))]))
-	{
-		$num = '';
-		$string = utf8_chr(hexdec((string)$value[1]));
-		for ($i = 0; $i < strlen($string); $i++)
-		{
-			$num .= '\x' . str_pad(base_convert(ord($string[$i]), 10, 16), 2, '0', STR_PAD_LEFT);
-		}
-		echo $num . "\n";
-		if ($uniarray[$string] != $temp_hold)
-		{
-			echo "  --> $string\n";
-			echo "  --> " . $temp_hold . "\n";
-		}
-	}
-
-	// do some tests for things that transform into something with the number one
-	if (strpos($temp_hold, utf8_chr(0x0031)) !== false)
-	{
-		// any kind of letter L?
-		if (strpos($value[0], 'LETTER L') !== false || strpos($value[0], 'IOTA') !== false || strpos($value[0], 'SMALL L ') !== false || preg_match('/SMALL LIGATURE [^L]*L /', $value[0]))
-		{
-			// replace all of the mappings that transform some sort of letter l to number one instead to some sort of letter l to latin small letter l
-			$temp_hold = str_replace(utf8_chr(0x0031), utf8_chr(0x006C), $temp_hold);
-		}
-	}
-
-	// uppercased chars that were folded do not exist in this universe,
-	// no amount of normalization could ever "trick" this into not working
-	if (in_array($value[1], $casefold_array[1]))
-	{
-		continue;
-	}
-
-	$uniarray[utf8_chr(hexdec((string)$value[1]))] = $temp_hold;
-}
-
-echo "Writing to confusables." . PHP_EXT . "\n";
-
-$fp = fopen(PHPBB_ROOT_PATH . 'includes/utf/data/confusables.' . PHP_EXT, 'wb');
-fwrite($fp, '<?php return ' . my_var_export($uniarray) . ';');
-fclose($fp);
-
-/**
-* Return a parsable string representation of a variable
-*
-* This is function is limited to array/strings/integers
-*
-* @param	mixed	$var		Variable
-* @return	string				PHP code representing the variable
-*/
-function my_var_export($var)
-{
-	if (is_array($var))
-	{
-		$lines = array();
-
-		foreach ($var as $k => $v)
-		{
-			$lines[] = my_var_export($k) . '=>' . my_var_export($v);
-		}
-
-		return 'array(' . implode(',', $lines) . ')';
-	}
-	else if (is_string($var))
-	{
-		return "'" . str_replace(array('\\', "'"), array('\\\\', "\\'"), $var) . "'";
-	}
-	else
-	{
-		return $var;
-	}
-}
-
-/**
-* Download a file to the develop/ dir
-*
-* @param	string	$url		URL of the file to download
-* @return	void
-*/
-function download($url)
-{
-	if (file_exists(PHPBB_ROOT_PATH . 'develop/' . basename($url)))
-	{
-		return;
-	}
-
-	echo 'Downloading from ', $url, ' ';
-
-	if (!$fpr = fopen($url, 'rb'))
-	{
-		die("Can't download from $url\nPlease download it yourself and put it in the develop/ dir, kthxbai");
-	}
-
-	if (!$fpw = fopen(PHPBB_ROOT_PATH . 'develop/' . basename($url), 'wb'))
-	{
-		die("Can't open develop/" . basename($url) . " for output... please check your permissions or something");
-	}
-
-	$i = 0;
-	$chunk = 32768;
-	$done = '';
-
-	while (!feof($fpr))
-	{
-		$i += fwrite($fpw, fread($fpr, $chunk));
-		echo str_repeat("\x08", strlen($done));
-
-		$done = ($i >> 10) . ' KiB';
-		echo $done;
-	}
-	fclose($fpr);
-	fclose($fpw);
-
-	echo "\n";
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/develop/generate_utf_tables.php b/phpBB/develop/generate_utf_tables.php
deleted file mode 100644
index fcf6395b24..0000000000
--- a/phpBB/develop/generate_utf_tables.php
+++ /dev/null
@@ -1,570 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-if (php_sapi_name() != 'cli')
-{
-	die("This program must be run from the command line.\n");
-}
-
-//
-// Security message:
-//
-// This script is potentially dangerous.
-// Remove or comment the next line (die(".... ) to enable this script.
-// Do NOT FORGET to either remove this script or disable it after you have used it.
-//
-die("Please read the first lines of this script for instructions on how to enable it");
-
-set_time_limit(0);
-
-define('IN_PHPBB', true);
-define('PHPBB_ROOT_PATH', './../');
-define('PHP_EXT', 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.' . PHP_EXT);
-$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." . PHP_EXT . "\n";
-
-	if (!$fp = fopen(PHPBB_ROOT_PATH . 'includes/utf/data/' . $file . '.' . PHP_EXT, '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]);
-			}
-			else if (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
-	'00C5'	=>	'ae',		#	Capital A with diaeresis
-	'00E4'	=>	'ae',		#	Small A with diaeresis
-	'00D6'	=>	'oe',		#	Capital O with diaeresis
-	'00F6'	=>	'oe',		#	Small O with diaeresis
-	'00DC'	=>	'ue',		#	Capital U with diaeresis
-	'00FC'	=>	'ue',		#	Small U 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." . PHP_EXT . "\n";
-	$fp = fopen(PHPBB_ROOT_PATH . 'includes/utf/data/search_indexer_' . $idx . '.' . PHP_EXT, '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) . ')';
-	}
-	else if (is_string($var))
-	{
-		return "'" . str_replace(array('\\', "'"), array('\\\\', "\\'"), $var) . "'";
-	}
-	else
-	{
-		return $var;
-	}
-}
-
-/**
-* Download a file to the develop/ dir
-*
-* @param	string	$url		URL of the file to download
-* @return	void
-*/
-function download($url)
-{
-	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));
-	}
-	else if ($cp > 0x7FF)
-	{
-		return chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
-	}
-	else if ($cp > 0x7F)
-	{
-		return chr(0xC0 | ($cp >> 6)) . chr(0x80 | ($cp & 0x3F));
-	}
-	else
-	{
-		return chr($cp);
-	}
-}
-\ No newline at end of file
diff --git a/phpBB/develop/nuke-db.php b/phpBB/develop/nuke-db.php
deleted file mode 100644
index d7329c3f56..0000000000
--- a/phpBB/develop/nuke-db.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-//
-// Security message:
-//
-// This script is potentially dangerous.
-// Remove or comment the next line (die(".... ) to enable this script.
-// Do NOT FORGET to either remove this script or disable it after you have used it.
-//
-die("Please read the first lines of this script for instructions on how to enable it");
-
-//
-// Do not change anything below this line.
-//
-
-
-// Just a handy script to completely wipe out the contents of a 
-// database.. Use with caution :)
-
-
-if(!isset($submit))
-{
-	?>
-	<FORM ACTION="<?php echo $PHP_SELF?>" METHOD="post" >
-	<table>
-	<tr>
-		<td>DB host:</td>
-		<td><INPUT TYPE="text" name="dbhost" value="localhost"></td>
-	</tr><tr>
-		<td>DB name:</td>
-		<td><INPUT TYPE="text" name="dbname" value="phpBB"></td>
-	</tr><tr>
-		<td>DB username:</td>
-		<td><INPUT TYPE="text" name="dbuser" value="root"></td>
-	</tr><tr>
-		<td>DB password:</td>
-		<td><INPUT TYPE="password" name="dbpass"></td>
-	</tr></table>
-	<INPUT TYPE="submit" name="submit" value="Submit">
-	</FORM>
-	<?php
-}
-else
-{
-	mysql_connect($dbhost, $dbuser, $dbpass) || die(mysql_error());
-	mysql_select_db($dbname);
-
-	$result = mysql_query("SHOW TABLES");
-	while($row = mysql_fetch_row($result)){
-		$table = $row[0];
-		print "Going to drop $table...";
-		mysql_query("DROP TABLE $table") || die();
-		print "Done.<br>\n";
-		flush();
-	}
-}
-?>
-
diff --git a/phpBB/develop/posting-api.php b/phpBB/develop/posting-api.php
deleted file mode 100644
index 14d74e0841..0000000000
--- a/phpBB/develop/posting-api.php
+++ /dev/null
@@ -1,854 +0,0 @@
-<?php
-define('IN_PHPBB', true);
-define('PHPBB_ROOT_PATH', './../');
-define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-include(PHPBB_ROOT_PATH . 'common.' . PHP_EXT);
-
-//$db = new dbal_mysqli();
-
-class posting_api
-{
-	/*
-	topic table:
-	topic_id
-	forum_id
-	topic_title
-	topic_status
-	topic_type
-	topic_shadow_id // to implement
-
-	sec:
-	topic_posts
-	topic_shadow_posts
-	topic_deleted_posts
-	topic_unapproved_posts
-
-	all must be approved:
-	topic_poster
-	topic_first_poster_name
-	topic_first_poster_id
-	topic_last_post_id
-	topic_last_poster_name
-	topic_last_poster_id
-	topic_last_post_title
-	topic_last_post_time
-	*/
-
-	/*
-	post table:
-	post_id
-	topic_id
-	post_subject
-	post_body
-	post_status
-	post_type
-	post_username
-	poster_id
-	forum_id
-	post_time
-
-	/*
-	forum table:
-	forum_id
-	forum_posts
-	forum_shadow_posts
-	forum_deleted_posts
-	forum_unapproved_posts
-
-	sec:
-	forum_topics
-	forum_shadow_topics
-	forum_deleted_topics
-	forum_unapproved_topics
-
-	forum_last_poster_name
-	forum_last_user_id
-	forum_last_post_title
-	forum_last_post_time
-	*/
-
-	const NORMAL = 0;
-
-	// status
-	const UNAPPROVED = 1;
-	const DELETED = 2;
-
-	// type
-	const ANNOUNCEMENT = 1;
-	const STICKY = 2;
-
-	// we, for now, only support the insertion of posts that are not already
-	// shadow'd and not deleted (it must first exist for it to be shadow'd or deleted!)
-	static function insert_topic($data)
-	{
-		// one transaction, we can now garuntee that atomicity of insertions
-		phpbb::$db->sql_transaction('begin');
-
-		$user_id = (int) $data['user_id'];
-		$forum_id = (int) $data['forum_id'];
-		$topic_title = $data['title'];
-		$post_contents = $data['post_contents'];
-		$topic_status = (int) $data['status'];
-		$topic_type = (int) $data['type'];
-		$approved = (bool) $data['approved'];
-
-		$shadow_forums = $data['shadow_forums'];
-
-		$time = ($data['time']) ? (int) $data['time'] : time();
-
-		if (isset($data['username']))
-		{
-			$username = $data['username'];
-		}
-		else
-		{
-			$sql = 'SELECT username
-				FROM ' . USERS_TABLE . '
-				WHERE user_id = ' . $user_id;
-			$result = phpbb::$db->sql_query($sql);
-			$username = (string) phpbb::$db->sql_fetchfield('username');
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		$sql = 'SELECT forum_topics, forum_unapproved_topics, forum_posts, forum_unapproved_posts
-			FROM ' . FORUMS_TABLE . '
-			WHERE forum_id = ' . (int) $forum_id;
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		// throw our topic to the dogs
-		$topic_data = array(
-			'topic_title'				=> $topic_title,
-			'topic_status'				=> $topic_status,
-			'topic_type'				=> $topic_type,
-			'topic_posts'				=> 1,
-			'topic_shadow_posts'		=> 0,
-			'topic_deleted_posts'		=> 0,
-			'topic_unapproved_posts'	=> ($approved) ? 0 : 1,
-			'topic_first_poster_name'	=> $username,
-			'topic_poster'				=> $user_id,
-			'topic_last_username'		=> $username,
-			'topic_last_post_title'		=> $topic_title,
-			'topic_last_post_time'		=> $time,
-			'topic_last_poster_id'		=> $user_id,
-			'forum_id'					=> $forum_id
-		);
-
-		phpbb::$db->sql_handle_data('INSERT', TOPICS_TABLE, $topic_data);
-		$topic_id = phpbb::$db->sql_nextid();
-
-		// I suppose it is time to make us a post, no?
-		$post_data = array(
-			'topic_id'		=> $topic_id,
-			'post_subject'	=> $topic_title,
-			'post_body'		=> $post_contents,
-			'post_username'	=> $username,
-			'poster_id'		=> $user_id,
-			'post_status'	=> $topic_status, // first post inherits its type from the topic
-			'post_type'		=> self::NORMAL, // for now, there are no shadow, global or sticky posts
-			'forum_id'		=> $forum_id
-		);
-
-		phpbb::$db->sql_handle_data('INSERT', POSTS_TABLE, $post_data);
-		$post_id = phpbb::$db->sql_nextid();
-
-		// time to fill in the blanks
-		phpbb::$db->sql_handle_data('UPDATE', TOPICS_TABLE, array('topic_first_post_id' => $post_id, 'topic_last_post_id' => $post_id), "topic_id = $topic_id");
-
-		// let's go update the forum table
-		$forum_data = array(
-			'forum_posts'				=> ++$row['forum_posts'],
-			'forum_topics'				=> ++$row['forum_topics'],
-		);
-
-		// the last post inserted is always the latest,
-		// we must update the forum records to make sure everybody knows the good news
-		if ($approved)
-		{
-			$forum_data['forum_last_poster_name']	= $username;
-			$forum_data['forum_last_user_id']		= $user_id;
-			$forum_data['forum_last_post_title']	= $topic_title;
-			$forum_data['forum_last_post_time']		= $time;
-		}
-		else
-		{
-			$forum_data['forum_unapproved_posts']	= ++$row['forum_unapproved_posts'];
-			$forum_data['forum_unapproved_topics']	= ++$row['forum_unapproved_topics'];
-		}
-
-		phpbb::$db->sql_handle_data('UPDATE', FORUMS_TABLE, $forum_data, "forum_id = $forum_id");
-
-		foreach ($shadow_forums as $shadow_forum_id)
-		{
-			$data['shadow_topic_id'] = $topic_id;
-			$data['forum_id'] = $shadow_forum_id;
-			self::insert_shadow_topic($data);
-		}
-
-		// we are consistant, victory is ours
-		phpbb::$db->sql_transaction('commit');
-	}
-
-	// inserts a shadow topic into the database
-	static function insert_shadow_topic($data)
-	{
-		// one transaction, we can now garuntee that atomicity of insertions
-		phpbb::$db->sql_transaction('begin');
-
-		$user_id = (int) $data['user_id'];
-		$forum_id = (int) $data['forum_id'];
-		$topic_title = $data['title'];
-		$topic_status = (int) $data['status'];
-		$topic_type = (int) $data['type'];
-		$time = ($data['time']) ? (int) $data['time'] : time();
-		$shadow_topic_id = (int) $data['shadow_topic_id'];
-		$approved = (bool) $data['approved'];
-
-		if (isset($data['username']))
-		{
-			$username = $data['username'];
-		}
-		else
-		{
-			$sql = 'SELECT username
-				FROM ' . USERS_TABLE . '
-				WHERE user_id = ' . $user_id;
-			$result = phpbb::$db->sql_query($sql);
-			$username = (stromg) phpbb::$db->sql_fetchfield('username');
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		$sql = 'SELECT forum_topics, forum_shadow_topics
-			FROM ' . FORUMS_TABLE . '
-			WHERE forum_id = ' . (int) $forum_id;
-		$result = phpbb::phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		// throw our topic to the dogs
-		$topic_data = array(
-			'topic_title'				=> $topic_title,
-			'topic_status'				=> $topic_status,
-			'topic_type'				=> $topic_type,
-			'topic_posts'				=> 0,
-			'topic_shadow_posts'		=> 0,
-			'topic_deleted_posts'		=> 0,
-			'topic_unapproved_posts'	=> ($approved ? 0 : 1),
-			'topic_first_poster_name'	=> $username,
-			'topic_poster'				=> $user_id,
-			'topic_last_username'		=> $username,
-			'topic_last_post_title'		=> $topic_title,
-			'topic_last_post_time'		=> $time,
-			'topic_last_poster_id'		=> $user_id,
-			'forum_id'					=> $forum_id,
-			'topic_shadow_id'			=> $shadow_topic_id
-		);
-
-		phpbb::$db->sql_handle_data('INSERT', TOPICS_TABLE, $topic_data);
-
-		// let's go update the forum table
-		$forum_data = array(
-			'forum_topics'				=> ++$row['forum_topics'],
-			'forum_shadow_topics'		=> ++$row['forum_shadow_topics']
-		);
-
-		// an unapproved shadow topic? I suppose...
-		if (!$approved)
-		{
-			$forum_data['forum_unapproved_topics']	= ++$row['forum_unapproved_topics'];
-		}
-
-		phpbb::$db->sql_handle_data('UPDATE', FORUMS_TABLE, $forum_data, "forum_id = $forum_id");
-
-		// we are consistant, victory is ours
-		phpbb::$db->transaction('END');
-	}
-
-	static function insert_post($data)
-	{
-		// one transaction, we can now garuntee that atomicity of insertions
-		phpbb::$db->transaction('BEGIN');
-
-		$user_id = (int) $data['user_id'];
-		$topic_id = (int) $data['topic_id'];
-
-		// begin massive amounts of hand holding
-
-		if (isset($data['forum_id']))
-		{
-			$forum_id = (int) $data['forum_id'];
-		}
-		else
-		{
-			$sql = 'SELECT forum_id
-				FROM ' . TOPICS_TABLE . '
-				WHERE topic_id = ' . $topic_id;
-			$result = phpbb::$db->sql_query($sql);
-			$forum_id = (int) phpbb::$db->sql_fetchfield('forum_id');
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		$post_title = $data['title'];
-		$post_contents = $data['post_contents'];
-		$time = ($data['time']) ? (int) $data['time'] : time();
-
-		if (isset($data['username']))
-		{
-			$username = $data['username'];
-		}
-		else
-		{
-			$sql = 'SELECT username
-				FROM ' . USERS_TABLE . '
-				WHERE user_id = ' . $user_id;
-			$result = phpbb::$db->sql_query($sql);
-			$username = (string) phpbb::$db->sql_fetchfield('username');
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		// hand holding complete, lets write some posts
-
-		$sql = 'SELECT forum_topics, forum_unapproved_topics, forum_posts, forum_unapproved_posts
-			FROM ' . FORUMS_TABLE . '
-			WHERE forum_id = ' . (int) $forum_id;
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		$post_status = (int) $data['post_status'];
-		$approved = ($post_status === self::NORMAL);
-
-		// I suppose it is time to make us a post, no?
-		$post_data = array(
-			'topic_id'		=> $topic_id,
-			'post_subject'	=> $post_title,
-			'post_body'		=> $post_contents,
-			'post_username'	=> $username,
-			'poster_id'		=> $user_id,
-			'post_status'	=> $post_status,
-			'forum_id'		=> $forum_id,
-		);
-		phpbb::$db->sql_handle_data('INSERT', POSTS_TABLE, $post_data);
-
-		// what is the new post_id?
-		$post_id = phpbb::$db->sql_nextid();
-
-		// iceberg ahead! we must only update the topic information if the post is approved ;)
-		if ($approved)
-		{
-			// time to fill in the blanks
-			$topics_data = array(
-				'topic_last_poster_id'	=> $user_id,
-				'topic_last_post_id'	=> $post_id,
-				'topic_last_poster_name'=> $username,
-				'topic_last_post_title'	=> $post_title,
-				'topic_last_post_time'	=> $time,
-			);
-			phpbb::$db->sql_handle_data('UPDATE', TOPICS_TABLE, $topics_data, "topic_id = $topic_id");
-		}
-
-		// let's go update the forum table
-		$forum_data = array(
-			'forum_posts'	=> ++$row['forum_posts'],
-		);
-
-		// the last post inserted is always the latest,
-		// we must update the forum records to make sure everybody knows the good news
-		if ($approved)
-		{
-			$forum_data['forum_last_poster_name']	= $username;
-			$forum_data['forum_last_user_id']		= $user_id;
-			$forum_data['forum_last_post_title']	= $post_title;
-			$forum_data['forum_last_post_time']		= $time;
-		}
-		else
-		{
-			$forum_data['forum_unapproved_posts']	= ++$row['forum_unapproved_posts'];
-		}
-
-		phpbb::$db->sql_handle_data('UPDATE', FORUMS_TABLE, $forum_data, "forum_id = $forum_id");
-
-		// we are consistant, victory is ours
-		phpbb::$db->sql_transaction('commit');
-	}
-
-	static function delete_topic($data)
-	{
-		// just call the more powerful variant with just one topic :)
-		self::delete_topics(array('topic_ids' => array($data['topic_id'])));
-	}
-
-	static function delete_topics($data)
-	{
-		// lets get this party started
-		phpbb::$db->sql_transaction('begin');
-
-		$topic_ids = array_map('intval', $data['topic_ids']);
-
-		// what kind of topic is this? lets find out how much we must tamper with the forum table...
-		// TODO: investigate how aggregate functions can speed this up/reduce the number of results returned/misc. other benefits
-		$sql = 'SELECT topic_posts, topic_shadow_posts, topic_deleted_posts, topic_unapproved_posts, topic_shadow_id, forum_id, topic_status
-			FROM ' . TOPICS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_ids);
-		$result = phpbb::$db->sql_query($sql);
-		// the following in an array, key'd by forum id that refers to topic rows
-		$forum_lookup = array();
-		while ($topic_row = phpbb::$db->sql_fetchrow($result))
-		{
-			$forum_id = (int) $topic_row['forum_id'];
-
-			// deal with posts
-			$forum_lookup[$forum_id]['forum_posts'] += $topic_row['topic_posts'];
-			$forum_lookup[$forum_id]['forum_shadow_posts'] += $topic_row['topic_shadow_posts'];
-			$forum_lookup[$forum_id]['forum_deleted_posts'] += $topic_row['topic_deleted_posts'];
-			$forum_lookup[$forum_id]['forum_unapproved_posts'] += $topic_row['topic_unapproved_posts'];
-
-			// deal with topics
-			$topic_status = (int) $topic_row['topic_status'];
-			$forum_lookup[$forum_id]['forum_topics']++; // a topic is a topic
-			$forum_lookup[$forum_id]['forum_shadow_topics'] += ($topic_row['topic_shadow_id'] != 0);
-			$forum_lookup[$forum_id]['forum_deleted_topics'] += ($topic_status & self::DELETED);
-			$forum_lookup[$forum_id]['forum_unapproved_topics'] += ($topic_status & self::UNAPPROVED);
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// goodnight, topics
-		phpbb::$db->sql_query('DELETE FROM ' . TOPICS_TABLE . ' WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_ids));
-
-		// goodnight, posts
-		phpbb::$db->sql_query('DELETE FROM ' . POSTS_TABLE . ' WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_ids));
-
-		$forum_ids = array_keys($forum_lookup);
-
-		// what kind of topic is this? lets find out how much we must tamper with the forum table...
-		$sql = 'SELECT forum_posts, forum_shadow_posts, forum_deleted_posts, forum_unapproved_posts, forum_id
-			FROM ' . FORUMS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('forum_id', $forum_ids);
-		$result = phpbb::$db->sql_query($sql);
-		$forum_rows = array();
-		while ($forum_row = phpbb::$db->sql_fetchrow($result))
-		{
-			$forum_id = (int) $forum_row['forum_id'];
-			$forum_rows[$forum_id] = $forum_row;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$shadow_topic_ids = array();
-		foreach ($forum_rows as $forum_id => $forum_row)
-		{
-			$topic_row = $forum_lookup[$forum_id];
-			$forum_array = array(
-				'forum_posts'				=> max($forum_row['forum_posts'] - $topic_row['forum_posts'], 0),
-				'forum_shadow_posts'		=> max($forum_row['forum_shadow_posts'] - $topic_row['forum_shadow_posts'], 0),
-				'forum_deleted_posts'		=> max($forum_row['forum_deleted_posts'] - $topic_row['forum_deleted_posts'], 0),
-				'forum_unapproved_posts'	=> max($forum_row['forum_unapproved_posts'] - $topic_row['forum_unapproved_posts'], 0),
-
-				'forum_topics'				=> max($forum_row['forum_topics'] - $topic_row['forum_topics'], 0),
-				'forum_shadow_topics'		=> max($forum_row['forum_shadow_topics'] - $topic_row['forum_shadow_topics'], 0),
-				'forum_deleted_topics'		=> max($forum_row['forum_deleted_topics'] - $topic_row['forum_deleted_topics'], 0),
-				'forum_unapproved_topics'	=> max($forum_row['forum_unapproved_topics'] - $topic_row['forum_unapproved_topics'], 0),
-			);
-
-			// get the last "normal" post in the forum, we _must_ update it
-			$sql = 'SELECT MAX(post_id) as max_post_id
-				FROM ' . POSTS_TABLE . '
-				WHERE post_status = ' . self::NORMAL . '
-					AND forum_id = ' . $forum_id;
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			// anything left?
-			if ($row)
-			{
-				// OK, lets go do some magick
-				$sql = 'SELECT post_username, poster_id, post_subject, post_time
-					FROM '. POSTS_TABLE . '
-					WHERE post_id = ' . (int) $row['max_post_id'];
-				$result = phpbb::$db->sql_query($sql);
-				$last_post = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				$forum_array['forum_last_user_id'] = (int) $last_post['poster_id'];
-				$forum_array['forum_last_poster_name'] = $last_post['post_username'];
-				$forum_array['forum_last_post_title'] = $last_post['post_subject'];
-				$forum_array['forum_last_post_time'] = (int) $last_post['post_time'];
-			}
-			else
-			{
-				// reset forum state
-				$forum_array['forum_last_user_id'] = 0;
-				$forum_array['forum_last_poster_name'] = '';
-				$forum_array['forum_last_post_title'] = '';
-				$forum_array['forum_last_post_time'] = 0;
-			}
-
-			phpbb::$db->sql_handle_data('UPDATE', FORUMS_TABLE, $forum_array, "forum_id = $forum_id");
-		}
-
-		// let's not get too hasty, we can kill off the shadows later,
-		// instead we compose a list of all shadows and then efficiently kill them off :)
-		$sql = 'SELECT topic_id
-			FROM ' . TOPICS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('topic_shadow_id', $topic_ids);
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$shadow_topic_ids[] = $row['topic_id'];
-		}
-
-		phpbb::$db->sql_freeresult($result);
-
-		// recursion, the other white meat.
-		if (sizeof($shadow_topic_ids))
-		{
-			self::delete_topics(array('topic_ids' => $shadow_topic_ids));
-		}
-
-		// goodnight, moon
-		phpbb::$db->transaction('commit');
-	}
-
-	static function delete_post($data)
-	{
-		// just call the more powerful variant with just one post :)
-		self::delete_posts(array('post_ids' => array($data['post_id'])));
-	}
-
-	static function delete_posts($data)
-	{
-		// lets get this party started
-		phpbb::$db->sql_transaction('begin');
-
-		$post_ids = array_map('intval', $data['post_ids']);
-
-		$sql = 'SELECT topic_id, post_status, post_id, post_shadow_id, forum_id
-			FROM ' . POSTS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('post_id', $post_ids);
-		$result = phpbb::$db->sql_query($sql);
-
-		// the following arrays are designed to allow for much faster updates
-		$topic_lookup = array();
-		$forum_lookup = array();
-
-		while ($post_row = phpbb::$db->sql_fetchrow($result))
-		{
-			$topic_id = (int) $post_row['topic_id'];
-			$forum_id = (int) $post_row['forum_id'];
-			$post_status = (int) $post_row['post_status'];
-
-			$topic_lookup[$topic_id]['topic_posts']++; // we remove a post, go figure
-			$topic_lookup[$topic_id]['topic_shadow_posts'] += ($post_row['post_shadow_id'] != 0); // did we just try to kill a shadow post?!
-			$topic_lookup[$topic_id]['topic_deleted_posts'] += ($post_status & self::DELETED);
-			$topic_lookup[$topic_id]['topic_unapproved_posts'] += ($post_status & self::UNAPPROVED);
-
-			$forum_lookup[$forum_id]['forum_posts']++;
-			$forum_lookup[$topic_id]['forum_shadow_posts'] += ($post_row['post_shadow_id'] != 0); // did we just try to kill a shadow post?!
-			$forum_lookup[$topic_id]['forum_deleted_posts'] += ($post_status & self::DELETED);
-			$forum_lookup[$topic_id]['forum_unapproved_posts'] += ($post_status & self::UNAPPROVED);
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$topic_ids = array_keys($forum_lookup);
-
-		// goodnight, posts
-		phpbb::$db->sql_query('DELETE FROM ' . POSTS_TABLE . ' WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_ids));
-
-		// mangle the forums table
-		$sql = 'SELECT forum_posts, forum_shadow_posts, forum_deleted_posts, forum_unapproved_posts, forum_id
-			FROM ' . FORUMS_TABLE . '
-			WHERE forum_id = ' . $forum_id;
-		$result = phpbb::$db->sql_query($sql);
-		$forum_rows = array();
-		while ($forum_row = phpbb::$db->sql_fetchrow($result))
-		{
-			$forum_id = (int) $forum_row['forum_id'];
-			$forum_rows[$forum_id] = $forum_row;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$shadow_topic_ids = array();
-		foreach ($forum_rows as $forum_id => $forum_row)
-		{
-			$topic_row = $forum_lookup[$forum_id];
-			$forum_array = array(
-				'forum_posts'				=> max($forum_row['forum_posts'] - $topic_row['forum_posts'], 0),
-				'forum_shadow_posts'		=> max($forum_row['forum_shadow_posts'] - $topic_row['forum_shadow_posts'], 0),
-				'forum_deleted_posts'		=> max($forum_row['forum_deleted_posts'] - $topic_row['forum_deleted_posts'], 0),
-				'forum_unapproved_posts'	=> max($forum_row['forum_unapproved_posts'] - $topic_row['forum_unapproved_posts'], 0),
-			);
-
-			// get the last "normal" post in the forum, we _must_ update it
-			$sql = 'SELECT MAX(post_id) as max_post_id
-				FROM ' . POSTS_TABLE . '
-				WHERE post_status = ' . self::NORMAL . '
-					AND forum_id = ' . $forum_id;
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			// anything left?
-			if ($row)
-			{
-				// OK, lets go do some magick
-				$sql = 'SELECT post_username, poster_id, post_subject, post_time
-					FROM '. POSTS_TABLE . '
-					WHERE post_id = ' . (int) $row['max_post_id'];
-				$result = phpbb::$db->sql_query($sql);
-				$last_post = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				$forum_array['forum_last_user_id'] = (int) $last_post['poster_id'];
-				$forum_array['forum_last_poster_name'] = $last_post['post_username'];
-				$forum_array['forum_last_post_title'] = $last_post['post_subject'];
-				$forum_array['forum_last_post_time'] = (int) $last_post['post_time'];
-			}
-			else
-			{
-				// reset forum state
-				$forum_array['forum_last_user_id'] = 0;
-				$forum_array['forum_last_poster_name'] = '';
-				$forum_array['forum_last_post_title'] = '';
-				$forum_array['forum_last_post_time'] = 0;
-			}
-
-			phpbb::$db->sql_handle_data('UPDATE', FORUMS_TABLE, $forum_array, "forum_id = $forum_id");
-		}
-
-		// mangle the topics table now :)
-		$sql = 'SELECT topic_posts, topic_shadow_posts, topic_deleted_posts, topic_unapproved_posts, topic_id
-			FROM ' . TOPICS_TABLE . '
-			WHERE forum_id = ' . $forum_id;
-		$result = phpbb::$db->sql_query($sql);
-		$topic_rows = array();
-		while ($topic_row = phpbb::$db->sql_fetchrow($result))
-		{
-			$topic_id = (int) $topic_row['topic_id'];
-			$topic_rows[$topic_id] = $topic_row;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$empty_topic_ids = array();
-
-		foreach ($topic_rows as $topic_id => $topic_row)
-		{
-			$post_row = $topic_lookup[$topic_id];
-			$topic_array = array(
-				'topic_posts'				=> max($topic_row['topic_posts'] - $post_row['topic_posts'], 0),
-				'topic_shadow_posts'		=> max($topic_row['topic_shadow_posts'] - $post_row['topic_shadow_posts'], 0),
-				'topic_deleted_posts'		=> max($topic_row['topic_deleted_posts'] - $post_row['topic_deleted_posts'], 0),
-				'topic_unapproved_posts'	=> max($topic_row['topic_unapproved_posts'] - $post_row['topic_unapproved_posts'], 0),
-			);
-
-			// get the last "normal" post in the topic, we _must_ update it
-			$sql = 'SELECT MAX(post_id) as max_post_id
-				FROM ' . POSTS_TABLE . '
-				WHERE post_status = ' . self::NORMAL . '
-					AND topic_id = ' . $topic_id;
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			// anything left?
-			if ($row)
-			{
-				// OK, lets go do some magick
-				$sql = 'SELECT post_username, poster_id, post_subject, post_time
-					FROM '. POSTS_TABLE . '
-					WHERE post_id = ' . (int) $row['max_post_id'];
-				$result = phpbb::$db->sql_query($sql);
-				$last_post = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				$topic_array['topic_last_user_id'] = (int) $last_post['poster_id'];
-				$topic_array['topic_last_poster_name'] = $last_post['post_username'];
-				$topic_array['topic_last_post_title'] = $last_post['post_subject'];
-				$topic_array['topic_last_post_time'] = (int) $last_post['post_time'];
-			}
-			else
-			{
-				// mark this post for execution!
-				$empty_topic_ids[] = $topic_id;
-			}
-
-			phpbb::$db->sql_handle_data('UPDATE', TOPICS_TABLE, $topic_array, "topic_id = $topic_id");
-		}
-
-		$shadow_post_ids = array();
-
-		// let's not get too hasty, we can kill off the shadows later,
-		// instead we compose a list of all shadows and then efficiently kill them off :)
-		$sql = 'SELECT post_id
-			FROM ' . POSTS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('post_shadow_id', $topic_ids);
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$shadow_post_ids[] = $row['post_id'];
-		}
-
-		phpbb::$db->sql_freeresult($result);
-
-		// recursion, the other white meat.
-		if (sizeof($shadow_topic_ids))
-		{
-			self::delete_posts(array('post_ids' => $shadow_post_ids));
-		}
-
-		// we killed all the posts in a topic, time to kill the topics!
-		if (sizeof($empty_topic_ids))
-		{
-			self::delete_topics(array('topic_ids' => $empty_topic_ids));
-		}
-
-		// goodnight, moon
-		phpbb::$db->transaction('commit');
-	}
-
-	static function move_topic($data)
-	{
-		self::move_topics(array('topic_forum_mapping' => array(array('topic_id' => $data['topic_id'], 'forum_id' => $data['forum_id'], 'make_shadow' => $data['make_shadow']))));
-	}
-
-	static function move_topics($data)
-	{
-		// lets get this party started
-		phpbb::$db->transaction('begin');
-
-		// all of each are indexed by topic id
-		$to_forum_ids = $shadow_topic_ids = array();
-
-		foreach ($data['topic_forum_mapping'] as $mapping)
-		{
-			$topic_id = (int) $mapping['topic_id'];
-			$to_forum_ids[$topic_id] = (int) $mapping['forum_id'];
-			if ($mapping['make_shadow'])
-			{
-				$shadow_topic_ids[] = $topic_id;
-			}
-		}
-
-		$forum_columns = array('forum_posts', 'forum_shadow_posts', 'forum_deleted_posts', 'forum_unapproved_posts', 'forum_topics', 'forum_shadow_topics', 'forum_deleted_topics', 'forum_unapproved_topics');
-
-		$topic_ids = array_keys($to_forum_ids);
-
-		// let us first determine how many items we are removing from the pool
-		$sql = 'SELECT topic_posts, topic_shadow_posts, topic_deleted_posts, topic_unapproved_posts, forum_id, topic_status, topic_type, topic_shadow_id, topic_id
-			FROM ' . TOPICS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_ids);
-		$result = phpbb::$db->sql_query($sql);
-		$forum_lookup = array();
-		while ($topic_row = phpbb::$db->sql_fetchrow($result))
-		{
-			$topic_id = $topic_row['topic_id'];
-			$from_forum_id = (int) $topic_row['forum_id'];
-			$to_forum_id = $to_forum_ids[$topic_id];
-
-			// we are iterating one topic at a time...
-			$forum_lookup[$from_forum_id]['forum_topics'] = $forum_lookup[$to_forum_id]['forum_topics'] = 1;
-
-			foreach ($forum_columns as $column)
-			{
-				$forum_lookup[$from_forum_id][$column]	-= $topic_row['topic_posts'];
-				$forum_lookup[$to_forum_id][$column]	+= $topic_row['topic_posts'];
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// determine the totals
-		$sql = 'SELECT forum_posts, forum_shadow_posts, forum_deleted_posts, forum_unapproved_posts, forum_id, forum_topics, forum_deleted_topics, forum_unapproved_topics
-			FROM ' . FORUMS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('forum_id', array_keys($forum_lookup));
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$forum_id = (int) $row['forum_id'];
-
-			foreach ($forum_columns as $column)
-			{
-				$forum_lookup[$forum_id][$column] += (int) $row[$column];
-			}
-		}
-
-		// create a listing of which topics are going in which forums
-		$update_list = array();
-
-		foreach ($to_forum_ids as $topic_id => $forum_id)
-		{
-			$update_list[$forum_id][] = $topic_id;
-		}
-
-		// we save as many queries as we can by updating all similar topics at once
-		foreach ($update_list as $forum_id => $topic_ids)
-		{
-			// update the topic itself
-			phpbb::$db->sql_handle_data('UPDATE', TOPICS_TABLE, array('forum_id' => $to_forum_id), phpbb::$db->sql_in_set('topic_id', $topic_ids));
-
-			// update the posts now
-			phpbb::$db->sql_handle_data('UPDATE', POSTS_TABLE, array('forum_id' => $to_forum_id), phpbb::$db->sql_in_set('topic_id', $topic_ids));
-		}
-
-		// start building the needed arrays for updating the forum data
-		foreach ($forum_lookup as $forum_id => $forum_data)
-		{
-			foreach ($forum_columns as $column)
-			{
-				$forum_data[$column] = max($forum_data[$column], 0); // ensure the result is unsigned
-			}
-
-			// get the last "normal" post in the old forum, we _must_ update it
-			$sql = 'SELECT MAX(post_id) as max_post_id
-				FROM ' . POSTS_TABLE . '
-				WHERE post_status = ' . self::NORMAL . '
-					AND forum_id = ' . $forum_id;
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			// anything left?
-			if ($row)
-			{
-				// OK, lets go do some magick
-				$sql = 'SELECT post_username, poster_id, post_subject, post_time
-					FROM '. POSTS_TABLE . '
-					WHERE post_id = ' . (int) $row['max_post_id'];
-				$result = phpbb::$db->sql_query($sql);
-				$last_post = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				$forum_data['forum_last_user_id'] = (int) $last_post['poster_id'];
-				$forum_data['forum_last_poster_name'] = $last_post['post_username'];
-				$forum_data['forum_last_post_title'] = $last_post['post_subject'];
-				$forum_data['forum_last_post_time'] = (int) $last_post['post_time'];
-			}
-			else
-			{
-				// reset forum state
-				$forum_data['forum_last_user_id'] = 0;
-				$forum_data['forum_last_poster_name'] = '';
-				$forum_data['forum_last_post_title'] = '';
-				$forum_data['forum_last_post_time'] = 0;
-			}
-
-			// update the old forum
-			phpbb::$db->sql_handle_data('UPDATE', FORUMS_TABLE, $forum_data, "forum_id = $forum_id");
-		}
-
-		// hooray for code reuse!
-		foreach ($shadow_topic_ids as $topic_id)
-		{
-			$data['shadow_topic_id'] = $topic_id;
-			$data['forum_id'] = $from_forum_id;
-			self::insert_shadow_topic($data);
-		}
-
-		phpbb::$db->sql_transaction('commit');
-
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/develop/regex.php b/phpBB/develop/regex.php
deleted file mode 100644
index 9d2d48f653..0000000000
--- a/phpBB/develop/regex.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-//
-// Security message:
-//
-// This script is potentially dangerous.
-// Remove or comment the next line (die(".... ) to enable this script.
-// Do NOT FORGET to either remove this script or disable it after you have used it.
-//
-die("Please read the first lines of this script for instructions on how to enable it");
-
-
-// IP regular expressions
-
-$dec_octet = '(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])';
-$h16 = '[\dA-F]{1,4}';
-$ipv4 = "(?:$dec_octet\.){3}$dec_octet";
-$ls32 = "(?:$h16:$h16|$ipv4)";
-
-$ipv6_construct = array(
-	array(false,	'',		'{6}',	$ls32),
-	array(false,	'::',	'{5}',	$ls32),
-	array('',		':',	'{4}',	$ls32),
-	array('{1,2}',	':',	'{3}',	$ls32),
-	array('{1,3}',	':',	'{2}',	$ls32),
-	array('{1,4}',	':',	'',		$ls32),
-	array('{1,5}',	':',	false,	$ls32),
-	array('{1,6}',	':',	false,	$h16),
-	array('{1,7}',	':',	false,	'')
-);
-
-$ipv6 = '(?:';
-foreach ($ipv6_construct as $ip_type)
-{
-	$ipv6 .= '(?:';
-	if ($ip_type[0] !== false)
-	{
-		$ipv6 .= "(?:$h16:)" . $ip_type[0];
-	}
-	$ipv6 .= $ip_type[1];
-	if ($ip_type[2] !== false)
-	{
-		$ipv6 .= "(?:$h16:)" . $ip_type[2];
-	}
-	$ipv6 .= $ip_type[3] . ')|';
-}
-$ipv6 = substr($ipv6, 0, -1) . ')';
-
-echo 'IPv4: ' . $ipv4 . "<br />\nIPv6: " . $ipv6 . "<br />\n";
-
-// URL regular expressions
-
-$pct_encoded = "%[\dA-F]{2}";
-$unreserved = 'a-z0-9\-._~';
-$sub_delims = '!$&\'()*+,;=';
-$pchar = "(?:[$unreserved$sub_delims:@|]+|$pct_encoded)"; // rfc: no "|"
-
-$scheme = '[a-z][a-z\d+\-.]*';
-$reg_name = "(?:[$unreserved$sub_delims:@|]+|$pct_encoded)+"; // rfc: * instead of + and no "|" and no "@" and no ":" (included instead of userinfo)
-//$userinfo = "(?:(?:[$unreserved$sub_delims:]+|$pct_encoded))*";
-$ipv4_simple = '[0-9.]+';
-$ipv6_simple = '\[[a-z0-9.]+:[a-z0-9.]+:[a-z0-9.:]+\]';
-$host = "(?:$reg_name|$ipv4_simple|$ipv6_simple)";
-$port = '\d*';
-//$authority = "(?:$userinfo@)?$host(?::$port)?";
-$authority = "$host(?::$port)?";
-$segment = "$pchar*";
-$path_abempty = "(?:/$segment)*";
-$hier_part = "/{2}$authority$path_abempty";
-$query = "(?:[$unreserved$sub_delims:@/?|]+|$pct_encoded)*"; // pchar | "/" | "?", rfc: no "|"
-$fragment = $query;
-
-$url =  "$scheme:$hier_part(?:\?$query)?(?:\#$fragment)?";
-echo 'URL: ' . $url . "<br />\n";
-
-// no scheme, shortened authority, but host has to start with www.
-$www_url =  "www\.$reg_name(?::$port)?$path_abempty(?:\?$query)?(?:\#$fragment)?";
-echo 'www.URL: ' . $www_url . "<br />\n";
-
-// no schema and no authority
-$relative_url = "$segment$path_abempty(?:\?$query)?(?:\#$fragment)?";
-echo 'relative URL: ' . $relative_url . "<br />\n";
-
-?>
diff --git a/phpBB/develop/repair_bots.php b/phpBB/develop/repair_bots.php
deleted file mode 100644
index c3a0fe66b9..0000000000
--- a/phpBB/develop/repair_bots.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
-* Rebuild BOTS
-*
-* You should make a backup from your whole database. Things can and will go wrong.
-* This will only work if no BOTs were added.
-*
-*/
-die("Please read the first lines of this script for instructions on how to enable it");
-
-set_time_limit(0);
-
-define('IN_PHPBB', true);
-define('PHPBB_ROOT_PATH', './../');
-define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-include(PHPBB_ROOT_PATH . 'common.' . PHP_EXT);
-include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-
-
-// Start session management
-phpbb::$user->session_begin();
-phpbb::$acl->init(phpbb::$user->data);
-phpbb::$user->setup();
-
-$bots = array(
-	'AdsBot [Google]'			=> array('AdsBot-Google', ''),
-	'Alexa [Bot]'				=> array('ia_archiver', ''),
-	'Alta Vista [Bot]'			=> array('Scooter/', ''),
-	'Ask Jeeves [Bot]'			=> array('Ask Jeeves', ''),
-	'Baidu [Spider]'			=> array('Baiduspider+(', ''),
-	'Exabot [Bot]'				=> array('Exabot/', ''),
-	'FAST Enterprise [Crawler]'	=> array('FAST Enterprise Crawler', ''),
-	'FAST WebCrawler [Crawler]'	=> array('FAST-WebCrawler/', ''),
-	'Francis [Bot]'				=> array('http://www.neomo.de/', ''),
-	'Gigabot [Bot]'				=> array('Gigabot/', ''),
-	'Google Adsense [Bot]'		=> array('Mediapartners-Google', ''),
-	'Google Desktop'			=> array('Google Desktop', ''),
-	'Google Feedfetcher'		=> array('Feedfetcher-Google', ''),
-	'Google [Bot]'				=> array('Googlebot', ''),
-	'Heise IT-Markt [Crawler]'	=> array('heise-IT-Markt-Crawler', ''),
-	'Heritrix [Crawler]'		=> array('heritrix/1.', ''),
-	'IBM Research [Bot]'		=> array('ibm.com/cs/crawler', ''),
-	'ICCrawler - ICjobs'		=> array('ICCrawler - ICjobs', ''),
-	'ichiro [Crawler]'			=> array('ichiro/2', ''),
-	'Majestic-12 [Bot]'			=> array('MJ12bot/', ''),
-	'Metager [Bot]'				=> array('MetagerBot/', ''),
-	'MSN NewsBlogs'				=> array('msnbot-NewsBlogs/', ''),
-	'MSN [Bot]'					=> array('msnbot/', ''),
-	'MSNbot Media'				=> array('msnbot-media/', ''),
-	'NG-Search [Bot]'			=> array('NG-Search/', ''),
-	'Nutch [Bot]'				=> array('http://lucene.apache.org/nutch/', ''),
-	'Nutch/CVS [Bot]'			=> array('NutchCVS/', ''),
-	'OmniExplorer [Bot]'		=> array('OmniExplorer_Bot/', ''),
-	'Online link [Validator]'	=> array('online link validator', ''),
-	'psbot [Picsearch]'			=> array('psbot/0', ''),
-	'Seekport [Bot]'			=> array('Seekbot/', ''),
-	'Sensis [Crawler]'			=> array('Sensis Web Crawler', ''),
-	'SEO Crawler'				=> array('SEO search Crawler/', ''),
-	'Seoma [Crawler]'			=> array('Seoma [SEO Crawler]', ''),
-	'SEOSearch [Crawler]'		=> array('SEOsearch/', ''),
-	'Snappy [Bot]'				=> array('Snappy/1.1 ( http://www.urltrends.com/ )', ''),
-	'Steeler [Crawler]'			=> array('http://www.tkl.iis.u-tokyo.ac.jp/~crawler/', ''),
-	'Synoo [Bot]'				=> array('SynooBot/', ''),
-	'Telekom [Bot]'				=> array('crawleradmin.t-info@telekom.de', ''),
-	'TurnitinBot [Bot]'			=> array('TurnitinBot/', ''),
-	'Voyager [Bot]'				=> array('voyager/1.0', ''),
-	'W3 [Sitesearch]'			=> array('W3 SiteSearch Crawler', ''),
-	'W3C [Linkcheck]'			=> array('W3C-checklink/', ''),
-	'W3C [Validator]'			=> array('W3C_*Validator', ''),
-	'WiseNut [Bot]'				=> array('http://www.WISEnutbot.com', ''),
-	'YaCy [Bot]'				=> array('yacybot', ''),
-	'Yahoo MMCrawler [Bot]'		=> array('Yahoo-MMCrawler/', ''),
-	'Yahoo Slurp [Bot]'			=> array('Yahoo! DE Slurp', ''),
-	'Yahoo [Bot]'				=> array('Yahoo! Slurp', ''),
-	'YahooSeeker [Bot]'			=> array('YahooSeeker/', ''),
-);
-
-$bot_ids = array();
-user_get_id_name($bot_ids, array_keys($bots), phpbb::USER_IGNORE);
-foreach($bot_ids as $bot)
-{
-	user_delete('remove', $bot);
-}
-// Done
-add_bots($bots);
-echo 'done';
-
-
-/**
-* Add the search bots into the database
-* This code should be used in execute_last if the source database did not have bots
-* If you are converting bots this function should not be called
-* @todo We might want to look at sharing the bot list between the install code and this code for consistency
-*/
-function add_bots($bots)
-{
-	$sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name = 'BOTS'";
-	$result = phpbb::$db->sql_query($sql);
-	$group_id = (int) phpbb::$db->sql_fetchfield('group_id', $result);
-	phpbb::$db->sql_freeresult($result);
-	phpbb::$db->sql_query('TRUNCATE TABLE ' . BOTS_TABLE);
-
-	if (!$group_id)
-	{
-		add_default_groups();
-
-		$sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name = 'BOTS'";
-		$result = phpbb::$db->sql_query($sql);
-		$group_id = (int) phpbb::$db->sql_fetchfield('group_id', $result);
-		phpbb::$db->sql_freeresult($result);
-
-	}
-
-
-
-
-	foreach ($bots as $bot_name => $bot_ary)
-	{
-		$user_row = array(
-			'user_type'				=> phpbb::USER_IGNORE,
-			'group_id'				=> $group_id,
-			'username'				=> $bot_name,
-			'user_regdate'			=> time(),
-			'user_password'			=> '',
-			'user_colour'			=> '9E8DA7',
-			'user_email'			=> '',
-			'user_lang'				=> phpbb::$config['default_lang'],
-			'user_style'			=> 1,
-			'user_timezone'			=> 0,
-			'user_allow_massemail'	=> 0,
-		);
-
-		$user_id = user_add($user_row);
-
-		if ($user_id)
-		{
-			$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', array(
-				'bot_active'	=> 1,
-				'bot_name'		=> $bot_name,
-				'user_id'		=> $user_id,
-				'bot_agent'		=> $bot_ary[0],
-				'bot_ip'		=> $bot_ary[1])
-			);
-			phpbb::$db->sql_query($sql);
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/develop/search_fill.php b/phpBB/develop/search_fill.php
deleted file mode 100644
index 8819c428fd..0000000000
--- a/phpBB/develop/search_fill.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-//
-// Security message:
-//
-// This script is potentially dangerous.
-// Remove or comment the next line (die(".... ) to enable this script.
-// Do NOT FORGET to either remove this script or disable it after you have used it.
-//
-
-//
-// Security message:
-//
-// This script is potentially dangerous.
-// Remove or comment the next line (die(".... ) to enable this script.
-// Do NOT FORGET to either remove this script or disable it after you have used it.
-//
-die("Please read the first lines of this script for instructions on how to enable it");
-
-//
-// Do not change anything below this line.
-//
-set_time_limit(0);
-
-define('IN_PHPBB', true);
-define('PHPBB_ROOT_PATH', './../');
-define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-include(PHPBB_ROOT_PATH . 'common.' . PHP_EXT);
-
-// Start session management
-phpbb::$user->session_begin();
-phpbb::$acl->init(phpbb::$user->data);
-phpbb::$user->setup();
-
-$search_type = phpbb::$config['search_type'];
-
-if (!file_exists(PHPBB_ROOT_PATH . 'includes/search/' . $search_type . '.' . PHP_EXT))
-{
-	trigger_error('NO_SUCH_SEARCH_MODULE');
-}
-
-require(PHPBB_ROOT_PATH . 'includes/search/' . $search_type . '.' . PHP_EXT);
-
-$error = false;
-$search = new $search_type($error);
-
-if ($error)
-{
-	trigger_error($error);
-}
-
-print "<html>\n<body>\n";
-
-//
-// Fetch a batch of posts_text entries
-//
-$sql = "SELECT COUNT(*) as total, MAX(post_id) as max_post_id
-	FROM ". POSTS_TABLE;
-if ( !($result = phpbb::$db->sql_query($sql)) )
-{
-	$error = phpbb::$db->sql_error();
-	die("Couldn't get maximum post ID :: " . $sql . " :: " . $error['message']);
-}
-
-$max_post_id = phpbb::$db->sql_fetchrow($result);
-
-$totalposts = $max_post_id['total'];
-$max_post_id = $max_post_id['max_post_id'];
-
-$postcounter = (!isset($HTTP_GET_VARS['batchstart'])) ? 0 : $HTTP_GET_VARS['batchstart'];
-
-$batchsize = 200; // Process this many posts per loop
-$batchcount = 0;
-for(;$postcounter <= $max_post_id; $postcounter += $batchsize)
-{
-	$batchstart = $postcounter + 1;
-	$batchend = $postcounter + $batchsize;
-	$batchcount++;
-
-	$sql = "SELECT *
-		FROM " . POSTS_TABLE . "
-		WHERE post_id
-			BETWEEN $batchstart
-				AND $batchend";
-	if( !($result = phpbb::$db->sql_query($sql)) )
-	{
-		$error = phpbb::$db->sql_error();
-		die("Couldn't get post_text :: " . $sql . " :: " . $error['message']);
-	}
-
-	$rowset = phpbb::$db->sql_fetchrowset($result);
-	phpbb::$db->sql_freeresult($result);
-
-	$post_rows = sizeof($rowset);
-
-	if( $post_rows )
-	{
-
-	// $sql = "LOCK TABLES ".POST_TEXT_TABLE." WRITE";
-	// $result = phpbb::$db->sql_query($sql);
-		print "\n<p>\n<a href='{$_SERVER['PHP_SELF']}?batchstart=$batchstart'>Restart from posting $batchstart</a><br>\n";
-
-		// For every post in the batch:
-		for($post_nr = 0; $post_nr < $post_rows; $post_nr++ )
-		{
-			print ".";
-			flush();
-
-			$post_id = $rowset[$post_nr]['post_id'];
-
-			$search->index('post', $rowset[$post_nr]['post_id'], $rowset[$post_nr]['post_text'], $rowset[$post_nr]['post_subject'], $rowset[$post_nr]['poster_id']);
-		}
-	// $sql = "UNLOCK TABLES";
-	// $result = phpbb::$db->sql_query($sql);
-
-	}
-}
-
-print "<br>Removing common words (words that appear in more than 50% of the posts)<br>\n";
-flush();
-$search->tidy();
-print "Removed words that where too common.<br>";
-
-echo "<br>Done";
-
-?>
-
-</body>
-</html>
diff --git a/phpBB/develop/unicode_testing.php b/phpBB/develop/unicode_testing.php
deleted file mode 100644
index c8712ba53f..0000000000
--- a/phpBB/develop/unicode_testing.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-//
-// This file provides some useful functions for debugging the unicode/UTF-8 library
-// It requires utf_tools.php to be loaded
-//
-die("Please read the first lines of this script for instructions on how to enable it");
-
-if (!headers_sent())
-{
-	header('Content-type: text/html; charset=UTF-8');
-}
-
-/**
- * Converts unicode escape sequences (\u0123) into UTF-8 characters
- *
- * @param	string	A unicode sequence
- * @return	string	UTF-8 representation of the given unicode sequence
- */
-function unicode_to_utf8($string)
-{
-	$utf8 = '';
-	$chars = array();
-	for ($i = 0; $i < strlen($string); $i++)
-	{
-		if (isset($string[$i + 5]) && substr($string, $i, 2) == '\\u' && ctype_xdigit(substr($string, $i + 2, 4)))
-		{
-			$utf8 .= utf8_from_unicode(array(base_convert(substr($string, $i + 2, 4), 16, 10)));
-			$i += 5;
-		}
-		else
-		{
-			$utf8 .= $string[$i];
-		}
-	}
-	return $utf8;
-}
-
-/**
- * Takes an array of ints representing the Unicode characters and returns
- * a UTF-8 string.
- *
- * @param array $array array of unicode code points representing a string
- * @return string UTF-8 character string
- */
-function utf8_from_unicode($array)
-{
-	$str = '';
-	foreach ($array as $value)
-	{
-		$str .= utf8_chr($value);
-	}
-	return $str;
-}
-
-/**
-* Converts a UTF-8 string to unicode code points
-*
-* @param	string	$text		UTF-8 string
-* @return	string				Unicode code points
-*/
-function utf8_to_unicode($text)
-{
-	return preg_replace_callback(
-		'#[\\xC2-\\xF4][\\x80-\\xBF]?[\\x80-\\xBF]?[\\x80-\\xBF]#',
-		'utf8_to_unicode_callback',
-		preg_replace_callback(
-			'#[\\x00-\\x7f]#',
-			'utf8_to_unicode_callback',
-			$text
-		)
-	);
-}
-
-/**
-* Takes a UTF-8 char and replaces it with its unicode escape sequence. Attention, $m is an array
-*
-* @param	array	$m			0-based numerically indexed array passed by preg_replace_callback()
-* @return	string				A unicode escape sequence
-*/
-function utf8_to_unicode_callback($m)
-{
-	return '\u' . str_pad(base_convert(utf8_ord($m[0]), 10, 16), 4, '0', STR_PAD_LEFT) . '';
-}
-
-/**
-* A wrapper function for the normalizer which takes care of including the class if required and modifies the passed strings
-* to be in NFKC
-*
-* @param	mixed	$strings	a string or an array of strings to normalize
-* @return	mixed				the normalized content, preserving array keys if array given.
-*/
-function utf8_normalize_nfkc($strings)
-{
-	if (empty($strings))
-	{
-		return $strings;
-	}
-
-	if (!class_exists('utf_normalizer'))
-	{
-		include(PHPBB_ROOT_PATH . 'includes/utf/utf_normalizer.' . PHP_EXT);
-	}
-
-	if (!is_array($strings))
-	{
-		utf_normalizer::nfkc($strings);
-	}
-	else if (is_array($strings))
-	{
-		foreach ($strings as $key => $string)
-		{
-			utf_normalizer::nfkc($strings[$key]);
-		}
-	}
-
-	return $strings;
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/develop/utf_normalizer_test.php b/phpBB/develop/utf_normalizer_test.php
deleted file mode 100644
index 8a7c31a1b0..0000000000
--- a/phpBB/develop/utf_normalizer_test.php
+++ /dev/null
@@ -1,389 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-if (php_sapi_name() != 'cli')
-{
-	die("This program must be run from the command line.\n");
-}
-
-//
-// Security message:
-//
-// This script is potentially dangerous.
-// Remove or comment the next line (die(".... ) to enable this script.
-// Do NOT FORGET to either remove this script or disable it after you have used it.
-//
-die("Please read the first lines of this script for instructions on how to enable it");
-
-set_time_limit(0);
-error_reporting(E_ALL);
-
-define('IN_PHPBB', true);
-define('PHPBB_ROOT_PATH', './../');
-define('PHP_EXT', 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.' . PHP_EXT);
-
-$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 = $utf_expected;
-				call_user_func(array('utf_normalizer', $form), $utf_result);
-
-				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 >= utf_normalizer::UTF8_SURROGATE_FIRST
-	 && $utf_expected <= utf_normalizer::UTF8_SURROGATE_LAST)
-	{
-		/**
-		* Surrogates are illegal on their own, we expect the normalizer
-		* to return a replacement char
-		*/
-		$utf_expected = utf_normalizer::UTF8_REPLACEMENT;
-		$hex_expected = utf_to_hexseq($utf_expected);
-	}
-
-	foreach (array('nfc', 'nfkc', 'nfd', 'nfkd') as $form)
-	{
-		$utf_result = $utf_expected;
-		call_user_func(array('utf_normalizer', $form), $utf_result);
-		$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)
-{
-	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));
-	}
-	else if ($cp > 0x7FF)
-	{
-		return chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
-	}
-	else if ($cp > 0x7F)
-	{
-		return chr(0xC0 | ($cp >> 6)) . chr(0x80 | ($cp & 0x3F));
-	}
-	else
-	{
-		return chr($cp);
-	}
-}
-\ No newline at end of file
diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
deleted file mode 100644
index 49281e2297..0000000000
--- a/phpBB/docs/AUTHORS
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
-*
-* phpBB3 � Copyright 2000, 2002, 2005, 2007 phpBB Group
-* http://www.phpbb.com
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 2 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://opensource.org/licenses/gpl-license.php>.
-*
-*/
-
-Please see: http://www.phpbb.com/about/team/ for a list of all the people currently
-involved in phpBB.
-
-phpBB Lead Developer  : Acyd Burn (Meik Sievertsen)
-
-phpBB Developers      : APTX (Marek A. R.)
-                        DavidMJ (David M.)
-                        dhn (Dominik Dr�scher)
-                        kellanved (Henry Sudhof)
-                        naderman (Nils Adermann)
-                        ToonArmy (Chris Smith)
-                        Vic D'Elfant (Vic D'Elfant)
-
-
--- Previous Contributors --
-
-phpBB Project Manager : theFinn (James Atkinson) [Founder - 04/2007]
-			SHS` (Jonathan Stanley)
-
-phpBB Lead Developer  : psoTFX (Paul S. Owen) [2001 - 09/2005]
-
-phpBB Developers      : Ashe (Ludovic Arnaud)   [10/2002 - 11/2003, 06/2006 - 10/2006]
-                        BartVB (Bart van Bragt) [11/2000 - 03/2006]
-                        GrahamJE (Graham Eames) [09/2005 - 11/2006]
-
-
--- Copyrights --
-
-Visual Confirmation   : Xore (Robert Hetzler)
-
-Original subSilver by subBlue Design, Tom Beddard, (c) 2001 phpBB Group
-prosilver by subBlue Design, Tom Beddard, (c) 2004 phpBB Group
-subsilver2 by subBlue Design, Tom Beddard, (c) 2004 phpBB Group
-
-phpBB3 contains code from the following applications:
-
-LGPL licenced:
-Smarty (c) 2001, 2002 by ispi of Lincoln, Inc, http://smarty.php.net/
-
-GPL licenced:
-phpMyAdmin (c) 2001,2003 phpMyAdmin Devel team, http://www.phpmyadmin.net/
-Jabber Class (c) 2006 Flyspray.org, http://www.flyspray.org/
-Chora (c) 2000-2006, The Horde Project. http://horde.org/chora/
-Horde Project (c) 2000-2006, The Horde Project. http://horde.org/
-
-PHP License, version 3.0:
-Pear (c) 2001-2004 PHP Group, http://pear.php.net
-
-Text_Diff-0.2.1 http://pear.php.net/package/Text_Diff
-
diff --git a/phpBB/docs/COPYING b/phpBB/docs/COPYING
deleted file mode 100644
index ce992b2ce7..0000000000
--- a/phpBB/docs/COPYING
+++ /dev/null
@@ -1,281 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html
deleted file mode 100644
index f91d4bc223..0000000000
--- a/phpBB/docs/FAQ.html
+++ /dev/null
@@ -1,352 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="en" xml:lang="en">
-<head>
-
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<meta http-equiv="content-style-type" content="text/css" />
-<meta http-equiv="content-language" content="en" />
-<meta http-equiv="imagetoolbar" content="no" />
-<meta name="resource-type" content="document" />
-<meta name="distribution" content="global" />
-<meta name="copyright" content="2007 phpBB Group" />
-<meta name="keywords" content="" />
-<meta name="description" content="phpBB 3.0.x frequently asked questions" />
-<title>phpBB3 &bull; FAQ</title>
-
-<link href="stylesheet.css" rel="stylesheet" type="text/css" media="screen, projection" />
-
-</head>
-
-<body id="phpbb" class="section-docs">
-
-<div id="wrap">
-	<a id="top" name="top" accesskey="t"></a>
-	<div id="page-header">
-		<div class="headerbar">
-			<div class="inner"><span class="corners-top"><span></span></span>
-
-			<div id="doc-description">
-				<a href="../index.php" id="logo"><img src="site_logo.gif" alt="" /></a>
-				<h1>phpBB 3.0.x FAQ</h1>
-				<p>phpBB 3.0.x frequently asked questions</p>
-				<p style="display: none;"><a href="#start_here">Skip</a></p>
-			</div>
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-	</div>
-
-	<a name="start_here"></a>
-
-	<div id="page-body">
-
-<!-- BEGIN DOCUMENT -->
-
-	<p>This is a very basic Frequently Asked Questions (FAQ) page which attempts to answer some of the more commonly asked questions. It is by no means exhaustive and should be used in combination with the 'built-in' User FAQ within phpBB3, the community forums and our IRC channel (see <a href="README.html">README</a> for details).</p>
-
-	<h1>FAQ</h1>
-
-	<div class="paragraph menu">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<!-- add entry about common UTF8 problems (for example wrong uploading, editing) -->
-<ul>
-	<li><a href="#install">I am finding phpBB too difficult to install. Will you do it for me?</a></li>
-	<li><a href="#legal">I am having problems with the admin at a certain board, help!</a></li>
-	<li><a href="#legal">A board has ripped off my graphics/software/etc., stop them!</a></li>
-	<li><a href="#legal">A board is dealing in warez/porn/etc., you need to prevent them doing this!</a></li>
-	<li><a href="#legal">I want to sue you because i think you host an illegal board!</a></li>
-	<li><a href="#viewonline">According to viewonline a user is doing/reading something they should not be able to!</a></li>
-	<li><a href="#mail">I keep getting Mail sending errors when I (or my users) post/send PM's/etc.!</a></li>
-	<li><a href="#mail_language">My users are complaining that emails are not in their selected language!</a></li>
-	<li><a href="#aol_browser">My AOL based users keep getting logged out!</a></li>
-	<li><a href="#avatars">I am unable to upload avatars from my computer, regardless of the settings.</a></li>
-	<li><a href="#gallery_avatars">I just cannot get gallery avatars to appear!</a></li>
-	<li><a href="#permissions">How do I use/set permissions?</a></li>
-	<li><a href="#login_issues">I (or my users) cannot stay logged in to the forum!</a></li>
-	<li><a href="#logout_issues">My users are complaining about being logged out too quickly!</a></li>
-	<li><a href="#not_answered">My question isn't answered here!</a></li>
-	<li><a href="#disclaimer">Copyright and disclaimer</a></li>
-</ul>
-
-		</div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-	<a name="install"></a><h2>I am finding phpBB too difficult to install. Will you do it for me?</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<p>Simple answer, no we will not. We are not being difficult when we say this we are actually trying to help you. phpBB has a reputation for being easy to install, that reputation is we believe well deserved. It is a simple process of unarchiving a single file, uploading the resulting directory/files to their intended location and entering some data in a web based form. The sequence of events, what to type where, etc. is covered in detail in the accompanying <a href="INSTALL.html">INSTALL.html</a> documentation. If you cannot install phpBB3 the chances are you will be unable to administer or update it.</p>
-
-<p>There are people, companies (unrelated to your hosting provider), etc. that will install your forum, either for free or for a payment. We do not recommend you make use of these offers. Unless the service is provided by your hosting company you will have to divulge passwords and other sensitive details. If you did not know how to use an ATM would you give a passer-by your bank card and PIN and ask them to show you what to do? No, probably not! The same applies to your hosting account details!</p>
-
-<p>We think a better solution is for you to carefully read the enclosed documentation, read through our knowledge base at <a href="http://www.phpbb.com/">www.phpbb.com</a> and if necessary ask for help on any thing you get stuck on. However, the decision is yours but please note we may not offer support if we believe you have had the board installed by a third party. In such cases you should direct your questions to that company or person/s.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="legal"></a><h2>I am having problems with the admin at a certain board, help!<br />
-A board has ripped off my graphics/software/etc., stop them!<br />
-A board is dealing in warez/porn/etc., you need to prevent them doing this!<br />
-I want to sue you because i think you host an illegal board!</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<p>We provide the software, we have absolutely nothing to do with any board that runs it (beyond phpbb.com of course!) and we also do not host any site. The GPL grants the user an unlimited right of use subject to their adherence of that licence. Therefore we cannot prevent, dictate, control or otherwise limit the use of phpBB software. So please do not contact us for such matters.</p>
-
-<p>If you have a problem with a given board please take it up with them, not us. We are not and cannot be held legally responsible for any third party use of this software (much like Microsoft et al cannot be held responsible for the use of Windows in illegal activities, etc.). Additionally we do <strong>not</strong> track the use of phpBB software in any way. So please do not ask us for details on a &quot;given&quot; board we will not be able to help you. If any law firms or lawyers out there send us writs, cease and desist orders, etc. for third party website use of this software we reserve the right to charge for time wasted dealing with such issues...</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="viewonline"></a><h2>According to viewonline a user is doing/reading something they should not be able to!</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<p>No, they probably are not. phpBB uses sessions to keep track of users as they move between pages. The session information tells us who this user is. Therefore in order to determine what a user can do on a page we first need the session details. Once this data is available we can check whether the user is permitted to do whatever it is they are trying to do. This can result in it appearing as if a user is reading a topic in a forum they should not be able to access. Or perhaps viewing private messages when they are only guests, etc. In practice the user is not doing these things, they are viewing a &quot;You are not permitted to do this&quot; type message. The session data has simply been updated before we were able to determine what the user could or could not do.</p>
-
-<p>Of course this only applies where permissions have been set correctly!</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="mail"></a><h2>I keep getting Mail sending errors when I (or my users) post/send PM's/etc.!</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<p>This error will occur if phpBB cannot send mail. phpBB can send email two ways; using the PHP <code>mail()</code> function or directly via SMTP. Some hosting providers limit the <code>mail()</code> function to prevent its use in spamming, others may rename it or limit its functionality. If the <code>mail()</code> function got renamed, you are able to enter the correct name within the administration control panel. In either case you may need to make use of SMTP. This requires that you have access to such a facility, e.g. your hosting provider may provide one (perhaps requiring specific written authorisation), etc. Please see <a href="http://www.phpbb.com/">www.phpbb.com</a> for additional help on this matter.</p>
-
-<p>If you do require SMTP services please do not ask (on our forums or elsewhere) for someone to provide you with one. Open relays are now things of the past thanks to the unthinking spammers out there. Therefore you are unlikely to find someone willing to offer you (free) services.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="mail_language"></a><h2>My users are complaining that emails are not in their selected language!</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<p>You must have deleted a language pack or the language pack is incomplete. phpBB will try to send emails in the users selected language. If it cannot find a suitable email template it will switch to the boards default language.</p>
-
-<!-- additional entry about encoded emails -->
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="aol_browser"></a><h2>My AOL based users keep getting logged out!</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<p>phpBB uses sessions to keep track of users as they browse the board. These sessions use a combination of a unique session id, the users IP and if specified the users browser and/or the users x-forwarded-for header to identify each user. We make use of all of this as an extra safe-guard to help prevent sessions being hijacked (by discovering the unique session id).</p>
-
-<p>Unfortunately this only works when the users IP is constant as they browse the board. For most users this will be the case. However certain providers route their users via a cluster of proxys. In some cases, particularly the AOL browser, this results in different IPs being forwarded as the user moves between pages. We take account of this by not checking the entire IP by default but only the first "three quads" (<samp>A.B.C</samp>). Again in most cases this will be fine. However again AOL uses IPs which can vary so much that checking only the first two quads results in a fairly static IP being available for session validation.</p>
-
-<p>If you are experiencing problems related to this you can set the Session IP validation parameter found in <code>Admin-&gt;General-&gt;Server Configuration-&gt;Security Settings</code> to <samp>A.B</samp>. Please note that reducing the IP validation length does potentially increase the risk of sessions being hijacked (this is something for you to consider, phpBB Group takes no responsibility should anything happen!). We suggest to at least additionally enable the browser validation.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="avatars"></a><h2>I am unable to upload avatars from my computer, regardless of the settings.</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<p>There are two possibilities here, the first is you have not created the directory you specified as the storage location for avatars, ie. as specified in the <code>Admin -&gt; General -&gt; Board Configuration -&gt; Avatar settings</code> section. If the directory does not exist uploadeable avatars are automatically disabled. You should create the required directory (ensuring it has global write access or other appropriate permissions to allow the webserver to write files to it).</p>
-
-<p>The second possibility is that your provider has disabled file_upload support. You should contact your provider and ask them if this is the case. There is not a lot you can do, there are still three other avatar settings left to choose from including uploading via an URL which will work fine.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="gallery_avatars"></a><h2>I just cannot get gallery avatars to appear!</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<p>phpBB categorises gallery avatars and it does this by reading through folders contained in the location you specified as being the gallery path. For example, if you set the gallery path to <samp>images/avatars/gallery</samp> phpBB will expect to find a series of folders within that path, e.g. <samp>images/avatars/gallery/moviestars</samp>, <samp>images/avatars/gallery/cartoons</samp>, <samp>images/avatars/gallery/misc</samp>, etc. Placing images directly in <samp>images/avatars/gallery/</samp> will result in nothing being listed in your gallery.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="permissions"></a><h2>How do I use/set permissions?</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<p>Please read the paragraph about permissions in our extensive <a href="http://www.phpbb.com/support/documentation/3.0/">online documentation</a>.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="login_issues"></a><h2>I (or my users) cannot stay logged in to the forum!</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<p>If you (or your users) are, after attempting a login, being returned to the index (or other page) without appearing to be logged in the most likely problem is incorrect cookie settings. phpBB uses cookies to store a session id and a small amount of user data. For this data to be stored correctly the cookie domain, name, path and secure settings must be correct. You can check this in <code>Admin-&gt;General-&gt;Server Configuration-&gt;Cookie Settings</code>. Typically the cookie domain can be left blank and the cookie path set to <samp>/</samp> (a single forward slash). Do <strong>not</strong> set the cookie as being secure unless your board is running over a secure sockets layer connection, ie. https://</p>
-
-<p>If you still have problems try setting the cookie domain to your full domain name, e.g. <samp>www.mysystem.tld</samp>, <samp>www.something.mydomain.tld</samp>. You <strong>must</strong> ensure the domain name contains at least two dots or browsers will be unlikely to recognise the cookie, e.g. <samp>.mydomain.com</samp>, <samp>mydomain.com</samp>. Do <strong>not</strong> add http:// or anything else to the domain name!</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="logout_issues"></a><h2>My users are complaining about being logged out too quickly!</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<p>You can increase the default length of sessions (ie. how long before a users session is considered 'dead') in <code>Admin-&gt;General-&gt;Server Configuration-&gt;Load Settings</code>. Set it to whatever value your users feel comfortable with, remember that security issues may affect your decision (ie. having too long a session may allow non-users to abuse your board should a user forget to logout or otherwise leave a current session on a public workstation).</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="not_answered"></a><h2>My question isn't answered here!</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<p>Please read our <a href="http://www.phpbb.com/support/documentation/3.0/">extensive user documentation</a> first, it may just explain what you want to know.</p>
-
-<p>Feel free to search our community forum for the information you require. <strong>PLEASE DO NOT</strong> post your question without having first used search, chances are someone has already asked and answered your question. You can find our board here:</p>
-
-<p><a href="http://www.phpbb.com">www.phpbb.com</a></p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="disclaimer"></a><h2>Copyright and disclaimer</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-license.php">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-<!-- END DOCUMENT -->
-
-	<div id="page-footer">
-		<div class="version">&nbsp;</div>
-	</div>
-</div></div>
-
-<div>
-	<a id="bottom" name="bottom" accesskey="z"></a>
-</div>
-
-</body>
-</html>
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
deleted file mode 100644
index 7a86f67bff..0000000000
--- a/phpBB/docs/INSTALL.html
+++ /dev/null
@@ -1,448 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="en" xml:lang="en">
-<head>
-
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<meta http-equiv="content-style-type" content="text/css" />
-<meta http-equiv="content-language" content="en" />
-<meta http-equiv="imagetoolbar" content="no" />
-<meta name="resource-type" content="document" />
-<meta name="distribution" content="global" />
-<meta name="copyright" content="2007 phpBB Group" />
-<meta name="keywords" content="" />
-<meta name="description" content="phpBB 3.0.x Installation, updating and conversion informations" />
-<title>phpBB3 &bull; Install</title>
-
-<link href="stylesheet.css" rel="stylesheet" type="text/css" media="screen, projection" />
-
-</head>
-
-<body id="phpbb" class="section-docs">
-
-<div id="wrap">
-	<a id="top" name="top" accesskey="t"></a>
-	<div id="page-header">
-		<div class="headerbar">
-			<div class="inner"><span class="corners-top"><span></span></span>
-
-			<div id="doc-description">
-				<a href="../index.php" id="logo"><img src="site_logo.gif" alt="" /></a>
-				<h1>phpBB 3.0.x Install</h1>
-				<p>phpBB 3.0.x Installation, updating and conversion informations</p>
-				<p style="display: none;"><a href="#start_here">Skip</a></p>
-			</div>
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-	</div>
-
-	<a name="start_here"></a>
-
-	<div id="page-body">
-
-<!-- BEGIN DOCUMENT -->
-
-<p><strong>Please read this document completely before proceeding with installation, updating or converting.</strong></p>
-
-<p>This document will walk you through the basics on installing, updating and converting the forum software.</p>
-
-<p>A basic overview of running phpBB3 can be found in the accompanying <a href="README.html">README</a> file. Please ensure you read that document in addition to this! For more detailed information on using, installing, updating and converting phpBB3 you should read <a href="http://www.phpbb.com/support/documentation/3.0/">the documentation</a> available online.</p>
-
-<h1>Install</h1>
-
-	<div class="paragraph menu">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<ol>
-	<li><a href="#quickinstall">Quick install</a></li>
-	<li><a href="#require">Requirements</a></li>
-	<li><a href="#install">New installation</a></li>
-	<li><a href="#update">Updating from stable releases of phpBB 3.0.x</a>
-	<ol style="list-style-type: lower-roman;">
-		<li><a href="#update_full">Full package</a></li>
-		<li><a href="#update_files">Changed files only</a></li>
-		<li><a href="#update_patch">Patch file</a></li>
-		<li><a href="#update_auto">Automatic update package</a></li>
-		<li><a href="#update_all">All package types</a></li>
-	</ol>
-	</li>
-	<li><a href="#convert">Conversion from phpBB 2.0.x to phpBB 3.0.x</a>
-	<ol style="list-style-type: lower-roman;">
-		<li><a href="#prereq">Requirements before converting</a></li>
-		<li><a href="#conversion">Converting</a></li>
-		<li><a href="#postreq">Things to do after conversion</a></li>
-		<li><a href="#convprob">Common conversion problems</a></li>
-	</ol>
-	</li>
-	<li><a href="#postinstall">Important (security related) post-Install tasks for all installation methods</a>
-	<ol style="list-style-type: lower-roman;">
-		<li><a href="#avatars">Uploadable avatars</a></li>
-	</ol>
-	</li>
-	<li><a href="#disclaimer">Disclaimer</a></li>
-</ol>
-
-		</div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-	<a name="quickinstall"></a><h2>1. Quick install</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<p>If you have basic knowledge of using FTP and are sure your hosting service or server will run phpBB3 you can use these steps to quickly get started. For a more detailed explanation you should skip this and go to <a href="#require">section 2</a> below.</p>
-
-	<ol>
-		<li>Decompress the phpBB3 archive to a local directory on your system.</li>
-		<li>Upload all the files contained in this archive (retaining the directory structure) to a web accessible directory on your server or hosting account.</li>
-		<li>Change the permissions on config.php to be writable by all (666 or -rw-rw-rw- within your FTP Client)</li>
-		<li>Change the permissions on the following directories to be writable by all (777 or -rwxrwxrwx within your FTP Client):<br />
-			<code>store/</code>, <code>cache/</code>, <code>files/</code> and <code>images/avatars/upload/</code>.</li>
-		<li>Using your web browser visit the location you placed phpBB3 with the addition of install/index.php or pointing directly to install/, e.g. http://www.mydomain.com/phpBB3/install/, http://www.mydomain.com/forum/install/ etc.</li>
-		<li>Click the <em>INSTALL</em> tab, follow the steps and fill out all the requested information.</li>
-		<li>Change the permissions on config.php to be writable only by yourself (644 or -rw-r--r-- within your FTP Client)</li>
-		<li>phpBB3 should now be available, please <strong>MAKE SURE</strong> you read at least <a href="#postinstall">Section 6</a> below for important, security related post-installation instructions.</li>
-	</ol>
-
-	<p>If you experienced problems or do not know how to proceed with any of the steps above please read the rest of this document.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-	<a name="require"></a><h2>2. Requirements</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<p>phpBB3 has a few requirements which must be met before you are able to install and use it.</p>
-
-	<ul>
-		<li>A webserver or web hosting account running on any major Operating System with support for PHP</li>
-		<li>A SQL database system, <strong>one of</strong>:
-		<ul>
-			<li>MySQL(i): 4.1 or above</li>
-			<li>PostgreSQL: 8.2+</li>
-			<li>SQLite: 2.8.2+</li>
-			<li>Firebird: 2.0+</li>
-			<li>MS SQL Server 2000 or above (directly or via ODBC)</li>
-			<li>Oracle: 9.2+</li>
-		</ul>
-		</li>
-		<li><strong>PHP 5.2.0+ </strong> with support for the database you intend to use.</li>
-		<li>getimagesize() function need to be enabled.</li>
-		<li>These optional presence of the following modules within PHP will provide access to additional features, but they are not required.
-		<ul>
-			<li>zlib Compression support</li>
-			<li>Remote FTP support</li>
-			<li>XML support</li>
-			<li>Imagemagick support</li>
-			<li>GD Support</li>
-		</ul>
-		</li>
-	</ul>
-
-	<p>If your server or hosting account does not meet the requirements above we are afraid phpBB3 is not for you.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-	<a name="install"></a><h2>3. New installation</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<p>Installation of phpBB3 will vary according to your server and database. If you have <em>shell access</em> to your account (via telnet or ssh for example) you may want to upload the entire phpBB3 archive (in binary mode!) to a directory on your host and unarchive it there.</p>
-
-	<p>If you do not have shell access or do not wish to use it you will need to decompress the phpBB3 archive to a local directory on your system using your favourite compression program, e.g. winzip, rar, zip, etc. From there you must FTP <strong>ALL</strong> the files it contains (being sure to retain the directory structure and filenames) to your host. Please ensure that the cases of filenames are retained, do <strong>NOT</strong> force filenames to all lower or upper case doing so will cause errors later.</p>
-
-	<p>All .php, .inc, .sql, .cfg, .html and .txt files should be uploaded in <strong>ASCII</strong> mode, while all graphics should be uploaded in <strong>BINARY</strong> mode. If you are unfamiliar with what this means please refer to your FTP client documentation. In most cases this is all handled transparantly by your ftp client but if you encounter problems later you should be sure the files where uploaded correctly as described here.</p>
-
-	<p>phpBB3 comes supplied with english as its standard language. However a number of separate packs for different languages are available. If you are not a native english speaker you may wish to install one or more of these packages before continuing. The installation process below will allow you to select a default language from those available (you can of course change this default at a later stage). For more details of language packs, where to obtain them and how to install them please see the <a href="README.html#i18n">README</a>.</p>
-
-	<p>Once all the files have been uploaded to your site you should point your browser at this location with the addition of <code>install/</code>. For example if your domain name is <em>www.mydomain.tld</em> and you placed phpBB3 in a directory /phpBB3 off your web root you would enter <em>http://www.mydomain.tld/phpBB3/install/</em> or (alternatively) <em>http://www.mydomain.tld/phpBB3/install/index.php</em> into your browser. When you have done this you should see the phpBB3 Installation screen appear.</p>
-
-	<h4>Introduction:</h4>
-
-	<p>The installation screen gives you a short introduction into phpBB. It allows you to read the license phpBB3 is released under (General Public License) and provides information about how you can receive support. To start the installation, use the <em>Install</em> button.</p>
-
-	<h4>Requirements</h4>
-
-	<p>The first page you will see after starting the installation is the Requirements list. phpBB3 checks automatically whether everything that it needs to run properly is installed on your server. You need to have at least the minimum PHP version installed, and at least one database available to continue the installation. Also important, is that all shown folders are available and do have the correct permissions. Please see the description of each section to find out whether they are optional or required for phpBB3 to run. If everything is in order, you can continue the installation with <em>Start Install</em>.</p>
-
-	<h4>Database settings</h4>
-
-	<p>You now have to decide which database to use. See the <a href="#require">Requirements section</a> for information on which databases are supported. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need:</p>
-
-	<ul>
-		<li>The Database Type - the database you will be using.</li>
-		<li>The Database server hostname or DSN - the address of the database server.</li>
-		<li>The Database server port - the port of the database server (most of the time this is not needed).</li>
-		<li>The Database name - the name of the database on the server.</li>
-		<li>The Database username and Database password - the login data to access the database.</li>
-	</ul>
-
-	<div class="indent">
-		<p><strong>Note:</strong> if you are installing using SQLite, you should enter the full path to your database file in the DSN field and leave the username and password fields blank. For security reasons, you should make sure that the database file is not stored in a location accessible from the web.</p>
-	</div>
-
-	<p>You don't need to change the Prefix for tables in database setting, unless you plan on using multipe phpBB installations on one database. In this case you can use a different prefix for each installation to make it work.</p>
-
-	<p>After you entered your details, you can continue with the Proceed to next step button. Now phpBB3 will check whether the data you entered will lead to a successful database connection and whether tables with the same prefix already exist.</p>
-
-	<p>A <em>Could not connect to the database</em> error means that you didn't enter the database data correctly and it is not possible for phpBB to connect. Make sure that everything you entered is in order and try again. Again, if you are unsure about your database settings, please contact your host.</p>
-
-	<p>If you installed another version of phpBB before on the same database with the same prefix, phpBB will inform you and you just need to enter a different database prefix.</p>
-
-	<p>If you see the Successful Connection message, you can continue to the next step.</p>
-
-	<h4>Administrator details</h4>
-
-	<p>Now you have to create your administration user. This user will have full administration access and he/she will be the first user on your forum. All fields on this page are required. You can also set the default language of your forum on this page. In a vanilla phpBB3 installation we only include English. You can download further languages from <a href="http://www.phpbb.com/">www.phpbb.com</a>, and add them before installing or later.</p>
-
-	<h4>Configuration file</h4>
-
-	<p>In this step, phpBB will try to write the configuration file automatically. The forum needs the configuration to run properly. It contains all database settings, so without it, phpBB will not be able to access the database.</p>
-
-	<p>Usually writing the configuration file automatically works fine. But in some cases it can fail due to wrong file permissions, for instance. In this case, you need to upload the file manually. phpBB asks you to download the config.php file and tells you what to do with it. Please read the instructions carefully. After you have uploaded the file, use <em>Done</em> to get to the last step. If <em>Done</em> returns you to the same page as before, and does not return a success message, you did not upload the file correctly.</p>
-
-	<h4>Advanced settings</h4>
-
-	<p>The Advanced settings allow you to set some parameters of the board configuration. They are optional, and you can always change them later. So if you are not sure what these settings mean, proceed to the final step and finish the installation.</p>
-
-	<p>If the installation was successful, you can now use the Login button to visit the Administration Control Panel. Congratulations, you have installed phpBB3 successfully. But there is still work ahead!</p>
-
-	<p>If you are unable to get phpBB3 installed even after reading this guide, please look at the support section to find out where you can ask for further assistance.</p>
-
-	<p>At this point if you are converting from phpBB 2.0.x, you should refer to the <a href="#convert">conversion steps</a> for further information. If not, you should remove the install directory from your server as you will only be able to access the Administration Control Panel whilst it is present.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-	<a name="update"></a><h2>4. Updating from stable releases of phpBB 3.0.x</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<p>If you are currently using a stable release of phpBB3 updating to this version is straightforward. You would have downloaded one of four packages and your choice determines what you need to do. <strong>Please Note</strong>: That before updating we heavily recommend you do a <em>full backup of your database and existing phpBB3 files</em>! If you are unsure how to achieve this please ask your hosting provider for advice.</p>
-
-<p><strong>Please make sure you update your phpBB3 source files too, even if you run the <code>database_update.php</code> file.</strong></p>
-
-<a name="update_full"></a><h3>4.i. Full package</h3>
-
-	<p>The full package is normally meant for new installations only, but if you want to replace all source files this package comes in handy.</p>
-
-	<p>First you should make a copy of your existing <em>config.php</em> file, keep it in a safe place! Next delete all the existing phpBB3 files, you may want to leave your <code>files/</code> and <code>images/</code> directory in place. You can leave alternative styles in-place too. With this complete you can upload the new phpBB3 files (see <a href="#install">New installation</a> for details if necessary). Once complete copy back your saved <em>config.php</em>, replacing the new one. Another method is to just <strong>replace</strong> the existing files with the files from the full package - though make sure you do <strong>not</strong> overwrite your config.php file.</p>
-
-	<p>You should now run <code>install/database_update.php</code> which, depending on your previous version, will make a number of database changes. You may receive <em>FAILURES</em> during this procedure, they should not be a cause for concern unless you see an actual <em>ERROR</em>, in which case the script will stop (in this case you should seek help via our forums or bug tracker).</p>
-
-	<p>Once the install/database_update.php has completed you may proceed to the Administration Control Panel and check remove the install directory as advised.</p>
-
-<a name="update_files"></a><h3>4.ii. Changed files only</h3>
-
-	<p>This package is meant for those wanting to only replace changed files from a previous version to the latest version. This package normally contains the changed files from up to five previous versions.</p>
-
-	<p>This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have <samp>3.0.2</samp> you should select the phpBB-3.0.2_to_3.0.3.zip/tar.gz file.</p>
-
-	<p>The directory structure has been preserved enabling you (if you wish) to simply upload the contents of the archive to the appropriate location on your server, i.e. simply overwrite the existing files with the new versions. Do not forget that if you have installed any MODs these files will overwrite the originals possibly destroying them in the process. You will need to re-add MODs to any affected file before uploading.</p>
-
-	<p>As for the other update procedures you should run <b>install/database_update.php</b> after you have finished updating the files. This will update your database schema and increment the version number.</p>
-
-<a name="update_patch"></a><h3>4.iii. Patch file</h3>
-
-	<p>The patch file package is for those wanting to update through the patch application, and being comfortable with it.</p>
-
-	<p>The patch file is one solution for those with many Modifications (MODs) or other changes who do not want to re-add them back to all the changed files if they use the method explained above. To use this you will need command line access to a standard UNIX type <strong>patch</strong> application. If you do not have access to such an application but still want to use this update approach, we strongly recommend the <a href="#update_auto">Automatic update package</a> explained below. It is also the preferred update method.</p>
-
-	<p>A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is 3.0.2 you need the phpBB-3.0.2_to_3.0.3.patch file. Place the correct patch in the parent directory containing the phpBB3 core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: <strong>patch -cl -d [PHPBB DIRECTORY] -p1 &lt; [PATCH NAME]</strong> (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB3, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.</p>
-
-	<p>If you do get failures you should look at using the <a href="#update_files">Changed files only</a> package to replace the files which failed to patch, please note that you will need to manually re-add any Modifications (MODs) to these particular files. Alternatively if you know how you can examine the .rej files to determine what failed where and make manual adjustments to the relevant source.</p>
-
-	<p>You should of course delete the patch file (or files) after use. As for the other update procedures you should run <code>install/database_update.php</code> after you have finished updating the files. This will update your database schema and data (if appropriate) and increment the version number.</p>
-
-<a name="update_auto"></a><h3>4.iv. Automatic update package</h3>
-
-	<p>This update method is the preferred method for updating. This package allows detecting changed files automatically and merges changes if needed.</p>
-
-	<p>The automatic update package contains - contrary to the others - only the information required to update the previous release version to the latest available version. These packages are meant for use with the automatic update tool.</p>
-
-	<p>To perform the update, either follow the instructions from the <code>Administration Control Panel-&gt;System</code> Tab - this should point out that you are running an outdated version and will guide you through the update - or follow the instructions listed below.</p>
-
-	<ul>
-		<li>Go to the <a href="http://www.phpbb.com/downloads/">downloads page</a> and download the latest update package listed there, matching your current version.</li>
-		<li>Upload the archives contents to your phpBB installation - only the install folder is required. Upload the whole install folder, retaining the file structure.</li>
-		<li>After the install folder is present, phpBB3 will go offline automatically.</li>
-		<li>Point your browser to the install directory, for example <samp>http://www.example.com/phpBB3/install/</samp></li>
-		<li>Choose the "Update" Tab and follow the instructions</li>
-	</ul>
-
-	<p>&nbsp;</p>
-
-<a name="update_all"></a><h3>4.v. All package types</h3>
-
-	<p>If you have non-English language packs installed you may want to see if a new version has been made available. A number of missing strings may have been added which, though not essential, may be beneficial to users. Please note that at this time not all language packs have been updated so you should be prepared to periodically check for updates.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-	<a name="convert"></a><h2>5. Conversion from phpBB 2.0.x to phpBB 3.0.x</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<p>This paragraph explains the steps necessary to convert your existing phpBB2 installation to phpBB3.</p>
-
-<a name="prereq"></a><h3>5.i. Requirements before converting</h3>
-
-	<p>Before converting we heavily recommend you do a <em>full backup of your database and files</em>! If you are unsure how to achieve this please ask your hosting provider for advice. You basically need to follow the basic instructions given for <a href="#install">New installations</a>. Please <strong>do not</strong> overwrite any old files - install phpBB3 at a different location.</p>
-
-	<p>Once you made a backup of everything and also have a brand new phpBB3 installation, you can now begin the conversion.</p>
-
-	<p>Note that the conversion requires CREATE and DROP privileges for the phpBB3's database user account.</p>
-
-<a name="conversion"></a><h3>5.ii. Converting</h3>
-
-	<p>To begin the conversion visit the install folder of your phpBB3 installation (the same as you have done for installing). Now you will see a new tab <em>Convert</em>. Click this tab.</p>
-
-	<p>As with install the conversion is automated. Your previous 2.0.x database tables will not be changed as well as the original 2.0.x files remaining unaltered. The conversion is actually only filling your phpBB3 database tables and copying additional data over to your phpBB3 installation. This has the benefit that if something goes wrong you are able to either re-run the conversion or continue a conversion, while your old board is still accessible. We really recommend you disable your old installation while converting, else you may have inconsistent data after the conversion.</p>
-
-	<p>Please note that this conversion process may take quite some time and depending on your hosting provider this may result in it failing (due to web server or other timeout issues). If this is the case you should ask your provider if they are willing to allow the convert script to temporarily exceed their limits (be nice and they will probably be quite helpful).</p>
-
-	<p>Once completed your board should be immediately available. If you encountered errors you should report the problems to our bug tracker or seek help via our forums (see <a href="README.html">README</a> for details).</p>
-
-<a name="postreq"></a><h3>5.iii. Things to do after conversion</h3>
-
-	<p>After successful conversion there may be a few items you need to do - apart from checking if the installation is accessible and everything displayed correctly.</p>
-
-	<p>The first thing you may want to do is going to the administration control panel and checking every configuration item within the general tab. Thereafter you may want to adjust the forum descriptions/names if you entered HTML there. You also may want to access the other administrative sections, e.g. adjusting permissions, smilies, icons, ranks, etc.</p>
-
-	<p>Within the conversion the search index has not been created or transferred. This means after conversion you are not able to find any matches if you want to search for something. We recommend you rebuild your search index within <code>Admin -&gt; Maintenance -&gt; Database -&gt; Search Index</code>.</p>
-
-	<p>After verifying the settings in the ACP, you can delete the install directory to enable the board. The board will stay disabled until you do so.</p>
-
-	<p>Once you are pleased with your new installation you may want to give it the name of your old installation, changing the directory name. With phpBB3 this is possible without any problems - but you may still want to check your cookie settings within the administration panel, if the cookie path need to be adjusted prior to renaming.</p>
-
-<a name="convprob"></a><h3>5.iv. Common conversion problems</h3>
-
-	<p><strong>Broken non-latin characters</strong> The conversion script assumes that the database encoding in the source phpBB2 matches the encoding defined in the <code>lang_main.php</code> file of the default language pack of the source installation. Edit that file to match the database's encoding and re-start the conversion procedure.</p>
-
-	<p><strong>http 500 / white pages</strong> The conversion is a load-heavy procedure. Restrictions imposed by some server hosting providers can cause problems. The most common causes are: too low values for the php settings <code>memory_limit</code> and <code>max_execution_time</code>. Limits on the allowed CPU time are also a frequent cause for such errors, as are caps on the number of database queries allowed. If you cannot change such settings, then contact your hosting provider or run the conversion procedure on a different computer. The phpBB.com forums are also an excellent location to ask for support.</p>
-
-	<p><strong>Password conversion</strong> Due to the utf-8 based handling of passwords in phpBB3, it is not always possible to transfer all passwords. For passwords "lost in translation" the easiest workaround is to use the "forgotten password" function.</p>
-
-	<p><strong>Path to your former board</strong> The converter expects the relative path to your old board's files. So, - for instance - if the old board is located at <code>http://www.yourdomain.com/forum</code> and the phpBB3 installation is located at <code>http://www.yourdomain.com/phpBB3</code>, then the correct value would be <code>../forum</code>. Note that the webserver user must be able to access the source installation's files.</p>
-
-	<p><strong>Missing images</strong> If your default board language's language pack does not include all images, then some images might be missing in your installation. Always use a complete language pack as default language.</p>
-
-	<p><strong>Smilies</strong> During the conversion you might see warnings about image files where the copying failed. That can happen if the old board's smilies have the same file names as those on the new board. Copy those files manually after the conversion, if you want to continue using the old smilies.</p>
-
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-	<a name="postinstall"></a><h2>6. Important (security related) post-Install tasks for all installation methods</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<p>Once you have successfully installed phpBB3 you <strong>MUST</strong> ensure you remove the entire install/ directory. Leaving the install directory in place is a <em>very serious potential security issue</em> which may lead to deletion or alteration of files, etc. Please note that until this directory is removed, phpBB3 will not operate and a warning message will be displayed. Beyond this <strong>essential</strong> deletion, you may also wish to delete the docs/ directories if you wish.</p>
-
-	<p>With these directories deleted you should proceed to the administration panel. Depending on how the installation completed you may have been directed there automatically. If not, login as the administrator you specified during install/conversion and click the <strong>Administration Panel</strong> link at the bottom of any page. Ensure that details specified in <code>Admin -&gt; General</code> are correct!</p>
-
-<a name="avatars"></a><h3>6.i. Uploadable avatars</h3>
-
-	<p>phpBB3 supports several methods for allowing users to select their own <em>avatar</em> (an avatar is a small image generally unique to a user and displayed just below their username in posts).</p>
-
-	<p>Two of these options allow users to upload an avatar from their machine or a remote location (via a URL). If you wish to enable this function you should first ensure the correct paths for uploadeable avatars is set in <code>Admin -&gt; General -&gt; Board Configuration -&gt; Avatar settings</code>. By default this is <em>images/avatars/uploads</em> but you can set it to whatever you like, just ensure the configuration setting is updated. You must also ensure this directory can be written to by the webserver. Usually this means you have to alter its permissions to allow anyone to read and write to. Exactly how you should do this depends on your ftp client or server operating system.</p>
-
-	<p>On UNIX systems for example you set the directory to a+rwx (or ugo+rwx or even 777). This can be done from a command line on your server using chmod or via your FTP client (using the Change Permissions, chmod or other Permissions dialoge box, see your FTP clients documentation for help). Most FTP clients list permissions in the form of User (Read, Write, Execute), Group (Read, Write, Execute) and Other (Read, Write, Execute). You need to tick all of these boxes to set correct permissions.</p>
-
-	<p>On Windows system you need to ensure the directory is not write-protected and that it has global write permissions (see your servers documentation or contact your hosting provider if you are unsure on how to achieve this).</p>
-
-	<p>Please be aware that setting a directories permissions to global write access is a potential security issue. While it is unlikely that anything nasty will occur (such as all the avatars being deleted) there are always people out there to cause trouble. Therefore you should monitor this directory and if possible make regular backups.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="disclaimer"></a><h2>7. Copyright and disclaimer</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-license.php">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-<!-- END DOCUMENT -->
-
-	<div id="page-footer">
-		<div class="version">&nbsp;</div>
-	</div>
-</div></div>
-
-<div>
-	<a id="bottom" name="bottom" accesskey="z"></a>
-</div>
-
-</body>
-</html>
diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html
deleted file mode 100644
index 3510bc448e..0000000000
--- a/phpBB/docs/README.html
+++ /dev/null
@@ -1,363 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="en" xml:lang="en">
-<head>
-
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<meta http-equiv="content-style-type" content="text/css" />
-<meta http-equiv="content-language" content="en" />
-<meta http-equiv="imagetoolbar" content="no" />
-<meta name="resource-type" content="document" />
-<meta name="distribution" content="global" />
-<meta name="copyright" content="2007 phpBB Group" />
-<meta name="keywords" content="" />
-<meta name="description" content="phpBB 3.0.x Readme" />
-<title>phpBB3 &bull; Readme</title>
-
-<link href="stylesheet.css" rel="stylesheet" type="text/css" media="screen, projection" />
-
-</head>
-
-<body id="phpbb" class="section-docs">
-
-<div id="wrap">
-	<a id="top" name="top" accesskey="t"></a>
-	<div id="page-header">
-		<div class="headerbar">
-			<div class="inner"><span class="corners-top"><span></span></span>
-
-			<div id="doc-description">
-				<a href="../index.php" id="logo"><img src="site_logo.gif" alt="" /></a>
-				<h1>phpBB 3.0.x Readme</h1>
-				<p style="display: none;"><a href="#start_here">Skip</a></p>
-			</div>
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-	</div>
-
-	<a name="start_here"></a>
-
-	<div id="page-body">
-
-<!-- BEGIN DOCUMENT -->
-
-	<p>Thank you for downloading phpBB3. This README will guide through the basics of installation and operation of phpBB3. Please ensure you read this and the accompanying documentation fully <strong>before</strong> proceeding with the installation.</p>
-
-	<h1>Readme</h1>
-
-	<div class="paragraph menu">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-			<ol>
-				<li><a href="#install">Installing phpBB3</a></li>
-				<li><a href="#run">Running phpBB3</a>
-				<ol style="list-style-type: lower-roman;">
-					<li><a href="#i18n">Internationalisation (i18n)</a></li>
-					<li><a href="#styles">Styles</a></li>
-					<li><a href="#mods">Modifications</a></li>
-				</ol>
-				</li>
-				<li><a href="#help">Getting help with phpBB3</a>
-				<ol style="list-style-type: lower-roman;">
-					<li><a href="#docs">Documentation</a></li>
-					<li><a href="#website">Community Forums</a></li>
-					<li><a href="#irc">Internet Relay Chat</a></li>
-				</ol>
-				</li>
-				<li><a href="#status">Status of this version</a></li>
-				<li><a href="#bugs">Reporting Bugs</a>
-				<ol style="list-style-type: lower-roman;">
-					<li><a href="#securitybugs">Security related bugs</a></li>
-				</ol>
-				</li>
-				<li><a href="#curbugs">Overview of current bug list</a></li>
-				<li><a href="#php">PHP compatibility issues</a></li>
-				<li><a href="#disclaimer">Disclaimer</a></li>
-			</ol>
-
-		</div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-	<a name="install"></a><h2>1. Installing phpBB3</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<p>Installation, update and conversion instructions can be found in the <a href="INSTALL.html">INSTALL</a> document contained in this distribution. If you are intending to convert from a previous phpBB 2.0.x installation we highly recommend you backup any existing data before proceeding!</p>
-
-	<p>Users of phpBB3 Beta versions cannot directly update.</p>
-
-	<p>Please note that we won't support the following installation types:</p>
-	<ul>
-		<li>Updates from phpBB3 Beta versions to phpBB3 RC1 and higher</li>
-		<li>Conversions from phpBB 2.0.x to phpBB3 Beta versions</li>
-		<li>phpBB3 Beta installations</li>
-	</ul>
-
-	<p>We give support for the following installation types:</p>
-
-	<ul>
-		<li>Updates from phpBB3 RC1 to the latest version</li>
-		<li>Conversions from phpBB 2.0.x to the latest version</li>
-		<li>New installations of phpBB3 - always only the latest released version</li>
-	</ul>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-	<a name="run"></a><h2>2. Running phpBB3</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<p>Once installed phpBB is easily managed by both admin and moderator control panels. If you need help or advice with phpBB please see <a href="#help">Section 3</a> below.</p>
-
-	<a name="i18n"></a><h3>2.i. Internationalisation (i18n)</h3>
-
-	<p>A number of language packs and style localisations are available. You can find them on our official download page:</p>
-
-	<p><a href="http://www.phpbb.com/downloads/">http://www.phpbb.com/downloads/</a></p>
-
-	<p>This is the <em>official</em> location for all supported language sets. If you download a package from a 3rd party site you do so with the understanding that we cannot offer support. So please, do not ask for help in these cases!</p>
-
-	<p>Installation of these packages is straightforward, simply download the required language pack and unarchive it into the <samp>languages/</samp> folder. Please ensure you retain the directory structure when doing this! Once uploaded go to the <code>Admin-&gt;System-&gt;Language Packs</code> and install the now appeared new language pack. To install the style imageset you should download the imageset for your language and unarchive the file/s into the relevant imageset directory (styles/prosilver/imageset or styles/subsilver2/imageset), again you must retain the directory structure. Once installed the imageset will become immediately available.</p>
-
-	<p>If your language is not available please visit our forums where you will find a topic listing translations currently available or in preparation. This topic also gives you information should you wish to volunteer to translate a language not currently listed.</p>
-
-	<a name="styles"></a><h3>2.ii. Styles</h3>
-
-	<p>Although phpBB Group are rather proud of the included styles we realise that it may not be to everyones tastes. Therefore phpBB3 allows styles to be switched with relative ease. Firstly you need to locate and download a style you like. We maintain such a site at</p>
-
-	<p><a href="http://www.phpbb.com/styles/">http://www.phpbb.com/styles/</a></p>
-
-	<p><strong>Please note</strong> that 3rd party styles downloaded for versions of phpBB2 will <strong>not</strong> work in phpBB3.</p>
-
-	<p>Once you have downloaded a style the usual next step is to unarchive (or upload the unarchived contents of) the package into your <samp>styles/</samp> directory. You then need to visit <code>Administration -&gt; Styles</code>, you should see the new style available, click install and it will become available for all your users.</p>
-
-	<p><strong>Please note</strong> that if you create your own style or modify existing ones, please remember to enable the &quot;Recompile stale style components&quot; setting within the <code>Admin-&gt;General-&gt;Load Settings</code> screen. This setting allows the cache to detect changes made to the style and automatically refresh it. If this setting is disabled, you will not see your changes taking effect.</p>
-
-	<a name="mods"></a><h3>2.iii. Modifications</h3>
-
-	<p>Although not officially supported by phpBB Group, phpBB has a thriving modification scene. These third party modifications to the standard phpBB extend its capabilities still further and can be found at:</p>
-
-	<p><a href="http://www.phpbb.com/mods/">http://www.phpbb.com/mods/</a></p>
-
-	<p><strong>Please remember</strong> that any bugs or other issues that occur after you have added any modification should <strong>NOT</strong> be reported to the bug tracker (see below). First remove the modification and see if the problem is resolved.</p>
-
-	<p>Also remember that any modifications which modify the database in any way may render upgrading your forum to future versions more difficult unless we state otherwise. With all this said many users have and continue to utilise many of the mods already available with great success.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="help"></a><h2>3. Getting help with phpBB3</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<p>phpBB3 can seem a little daunting to new users in places, particularly with regard the permission system. The first thing you should do is check the <a href="FAQ.html">FAQ</a> which covers a few basic getting started questions. If you need additional help there are several places you should look.</p>
-
-	<a name="docs"></a><h3>3.i. phpBB3 Documentation</h3>
-
-	<p>A comprehensive documentation is now available online and can be accessed from the following location:</p>
-
-	<p><a href="http://www.phpbb.com/support/documentation/3.0/">http://www.phpbb.com/support/documentation/3.0/</a></p>
-
-	<p>This covers everything from installation through setting permissions and managing users.</p>
-
-	<a name="website"></a><h3>3.ii. Community Forums</h3>
-
-	<p>phpBB Group maintains a thriving community where a number of people have generously decided to donate their time to help support users. This site can be found at:</p>
-
-	<p><a href="http://www.phpbb.com/">http://www.phpbb.com/</a></p>
-
-	<p>If you do seek help via our forums please be sure to do a Search before posting. This may well save both you and us time and allow the developer, moderator and support groups to spend more time responding to people with unknown issues and problems. Please also remember that phpBB is an entirely volunteer effort, no one receives any compensation for the time they give, this includes moderators as well as developers. So please be respectful and mindful when awaiting responses.</p>
-
-	<a name="irc"></a><h3>3.iii Internet Relay Chat</h3>
-
-	<p>Another place you may find help is our IRC channel. This operates on the Freenode IRC network, <em>irc.freenode.net</em> and the channel is <em>#phpbb</em> and can be accessed by any good IRC client such as mIRC, XChat, etc. Again, please do not abuse this service and be respectful of other users.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="status"></a><h2>4. Status of this version</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<p>This is the third stable release of phpBB. The 3.0.x line is essentially feature frozen, with only point releases seeing fixes for bugs and security issues, though feature alterations and minor feature additions may be done if deemed absolutely required. Our next major release will be phpBB 3.2 and the planning phase has begun (the unstable development version is 3.1). Please do not post questions asking when 3.2 will be available, no release date has been set.</p>
-
-	<p>For those interested in the development of phpBB should keep an eye on the community forums to see how things are progressing:</p>
-
-	<p><a href="http://area51.phpbb.com/phpBB/">http://area51.phpbb.com/phpBB/</a></p>
-
-	<p>Please note that this forum should <strong>NOT</strong> be used to obtain support for or ask questions about phpBB 2.0.x or phpBB 3.0.x, the main community forums are the place for this. Any such posts will be locked and go unanswered.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="bugs"></a><h2>5. Reporting Bugs</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<p>The phpBB Group uses a bug tracking system to store, list and manage all reported bugs, it can be found at the location listed below. Please <strong>DO NOT</strong> post bug reports to our forums, they will be locked. In addition please <strong>DO NOT</strong> use the bug tracker for support requests. Posting such a request will only see you directed to the support forums (while taking time away from working on real bugs).</p>
-
-	<p><a href="http://www.phpbb.com/bugs/">http://www.phpbb.com/bugs/</a></p>
-
-	<p>While we very much appreciate receiving bug reports (the more reports the more stable phpBB will be) we ask you carry out a few steps before adding new entries:</p>
-
-	<ul>
-		<li>Firstly determine if your bug is reproduceable, how to determine this depends on the bug in question. Only if the bug is reproduceable it is likely to be a problem with phpBB3 (or in some way connected). If something cannot be reproduced it may turn out to have been your hosting provider working on something, a user doing something silly, etc. Bug reports for non-reproduceable events can slow down our attempts to fix real, reproduceable issues<br /><br /></li>
-		<li>Next please read or search through the existing bug reports to see if <em>your</em> bug (or one very similar to it) is already listed. If it is please add to that existing bug rather than creating a new duplicate entry (all this does is slow us down).<br /><br /></li>
-		<li>Check the forums (use search!) to see if people have discussed anything that sounds similar to what you are seeing. However, as noted above please <strong>DO NOT</strong> post your particular bug to the forum unless it's non-reproduceable or you are sure it's related to something you have done rather phpBB3<br /><br /></li>
-		<li>If no existing bug exists then please feel free to add it</li>
-	</ul>
-
-	<p>If you do post a new bug (i.e. one that isn't already listed in the bug tracker) firstly make sure you have logged in (your username and password are the same as for the community forums) then please include the following details:</p>
-
-	<ul>
-		<li>Your server type/version, e.g. Apache 1.3.28, IIS 4, Sambar, etc.</li>
-		<li>PHP version and mode of operation, e.g. PHP 5.1.1 as a module, PHP 4.4.4 running as CGI, etc.</li>
-		<li>DB type/version, e.g. MySQL 4.0.1, PostgreSQL 7.3.2, MSSQL Server 2000 SP1, etc.</li>
-	</ul>
-
-	<p>The relevant database type/version is listed within the administration control panel</p>
-
-	<p>Please also be as detailed as you can in your report, if possible list the steps required to duplicate the problem. If you have a fix which you are <strong>VERY SURE</strong> works (and is consistent with our <a href="coding-guidelines.html">coding guidelines</a>) and does not introduce further problems or incompatibilities please let us know. However only include it in the bug report if you really must, if we need it we'll ask you for it.</p>
-
-	<p>Once a bug has been submitted you will be emailed any follow up comments added to it. <strong>Please</strong> if you are requested to supply additional information, do so! It is frustrating for us to receive bug reports, ask for additional information but get nothing. In these cases we have a policy of closing the bug, which may leave a very real problem in place. Obviously we would rather not have this situation arise.</p>
-
-<a name="securitybugs"></a><h3>5.i. Security related bugs</h3>
-
-	<p>If you find a potential security related vulnerability in phpBB please <strong>DO NOT</strong> post it to the bug tracker, public forums, etc.! Doing so may allow unscrupulous users to take advantage of it before we have time to put a fix in place. All security related bugs should be sent to our security tracker:</p>
-
-	<p><a href="http://www.phpbb.com/security/">http://www.phpbb.com/security/</a></p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="curbugs"></a><h2>6. Overview of current bug list</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<p>This list is not complete but does represent those bugs which may effect users on a wider scale. Other bugs listed in the tracker have typically been shown to be limited to certain setups or methods of installation, updating and/or conversions.</p>
-
-	<ul>
-		<li>Conversions may fail to complete on large boards under some hosts</li>
-		<li>Updates may fail to complete on large update sets under some hosts</li>
-		<li>Smilies placed directly after bbcode tags will not get parsed. Smilies always need to be separated by spaces.</li>
-	</ul>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="php"></a><h2>7. PHP compatibility issues</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<p>phpBB is no longer supported on PHP3 due to several compatibility issues and we recommend that you upgrade to the latest stable release of PHP5 to run phpBB. The minimum version required is PHP 4.3.3.</p>
-
-	<p>Please remember that running any application on a developmental version of PHP can lead to strange/unexpected results which may appear to be bugs in the application (which may not be true). Therefore we recommend you upgrade to the newest stable version of PHP before running phpBB3. If you are running a developmental version of PHP please check any bugs you find on a system running a stable release before submitting.</p>
-
-	<p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MSSQL Server 2000, PostgreSQL 7.x, Oracle 8, SQLite and Firebird. Versions of PHP used range from 4.3.3 to 6.0.0-dev without problem. </p>
-
-<a name="phpsec"></a><h3>7.i. Notice on PHP security issues</h3>
-
-<p>Currently there are no known issues regarding PHP security.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="disclaimer"></a><h2>8. Copyright and disclaimer</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-license.php">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-<!-- END DOCUMENT -->
-
-	<div id="page-footer">
-		<div class="version">&nbsp;</div>
-	</div>
-</div></div>
-
-<div>
-	<a id="bottom" name="bottom" accesskey="z"></a>
-</div>
-
-</body>
-</html>
diff --git a/phpBB/docs/auth_api.html b/phpBB/docs/auth_api.html
deleted file mode 100644
index c83aaadc2d..0000000000
--- a/phpBB/docs/auth_api.html
+++ /dev/null
@@ -1,253 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="en" xml:lang="en">
-<head>
-
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<meta http-equiv="content-style-type" content="text/css" />
-<meta http-equiv="content-language" content="en" />
-<meta http-equiv="imagetoolbar" content="no" />
-<meta name="resource-type" content="document" />
-<meta name="distribution" content="global" />
-<meta name="copyright" content="2007 phpBB Group" />
-<meta name="keywords" content="" />
-<meta name="description" content="This is an explanation of how to use the phpBB auth/acl API" />
-<title>phpBB3 &bull; Auth API</title>
-
-<link href="stylesheet.css" rel="stylesheet" type="text/css" media="screen, projection" />
-
-</head>
-
-<body id="phpbb" class="section-docs">
-
-<div id="wrap">
-	<a id="top" name="top" accesskey="t"></a>
-	<div id="page-header">
-		<div class="headerbar">
-			<div class="inner"><span class="corners-top"><span></span></span>
-
-			<div id="doc-description">
-				<a href="../index.php" id="logo"><img src="site_logo.gif" alt="" /></a>
-				<h1>Auth API</h1>
-				<p>This is an explanation of how to use the phpBB auth/acl API</p>
-				<p style="display: none;"><a href="#start_here">Skip</a></p>
-			</div>
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-	</div>
-
-	<a name="start_here"></a>
-
-	<div id="page-body">
-
-<!-- BEGIN DOCUMENT -->
-
-	<p>This is an explanation of how to use the phpBB auth/acl API.</p>
-
-	<h1>Auth API</h1>
-
-	<div class="paragraph menu">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<ol>
-	<li><a href="#intro">Introduction</a></li>
-	<li><a href="#methods">Methods</a>
-	<ol style="list-style-type: lower-roman;">
-		<li><a href="#acl">acl</a></li>
-		<li><a href="#acl_get">acl_get</a></li>
-		<li><a href="#acl_gets">acl_gets</a></li>
-		<li><a href="#acl_getf">acl_getf</a></li>
-		<li><a href="#acl_getf_global">acl_getf_global</a></li>
-		<li><a href="#acl_cache">acl_cache</a></li>
-	</ol>
-	</li>
-	<li><a href="#admin_related">Admin related functions</a></li>
-	<li><a href="#disclaimer">Copyright and disclaimer</a></li>
-</ol>
-
-		</div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="intro"></a><h2>1. Introduction</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<h4>What is it?</h4>
-
-	<p>The <code>auth</code> class contains methods related to authorisation users to access various board functions, e.g. posting, viewing, replying, logging in (and out), etc. If you need to check whether a user can carry out a task or handle user login/logouts this class is required.</p>
-
-	<h4>Initialisation</h4>
-
-	<p>To use any methods contained with the <code>auth</code> class it first needs to be instantiated. This is best achieved early in the execution of the script in the following manner:</p>
-
-	<div class="codebox"><pre>
-$auth = new auth();
-	</pre></div>
-
-	<p>Once an instance of the class has been created you are free to call the various methods it contains. Please note that should you wish to use the <code>auth_admin</code> methods you will need to instantiate this separately but in the same way.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="methods"></a><h2>2. Methods</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<p>Following are the methods you are able to use.</p>
-
-	<a name="acl"></a><h3>2.i. acl</h3>
-	
-	<p>The <code>acl</code> method is the initialisation routine for all the acl functions. If you intend calling any acl method you must first call this. The method takes as its one and only required parameter an associative array containing user information as stored in the database. This array must contain at least the following information; user_id, user_permissions and user_type. It is called in the following way:</p>
-
-	<div class="codebox"><pre>
-$auth-&gt;acl(<code>userdata</code>);
-	</pre></div>
-
-	<p>Where userdata is the array containing the aforementioned data.</p>
-
-	<a name="acl_get"></a><h3>2.ii. acl_get</h3>
-
-	<p>This method is the primary way of determining what a user can and cannot do for a given option globally or in a given forum. The method should be called in the following way:</p>
-
-	<div class="codebox"><pre>
-$result = $auth-&gt;acl_get(<code>option</code>[, <code>forum</code>]);
-	</pre></div>
-
-	<p>Where option is a string representing the required option, e.g. 'f_list', 'm_edit', 'a_adduser', etc. By adding a ! in front of the option, e.g. '!f_list' the result of this method will be negated. The optional forum term is the integer forum_id.</p>
-
-	<p>The method returns a positive integer when the user is allowed to carry out the option and a zero if denied or the other way around if the option is prefixed with an exclamation mark.</p>
-
-	<p>If you specify a forum and there is also a global setting for the specified option then this method will return a positive integer if one of them evaluates to a positive integer. An example would be the m_approve option which can be set per forum but also globally. If a user has the global option he will automatically have m_approve in every forum.</p>
-
-	<p>There are some special options or <em>flags</em> which are used as prefixes for other options, e.g. 'f_' or 'm_'. These flags will automatically be set to a positive integer if the user has one or more permissions with the given prefix. A local setting will result in the flag being set only locally (so it will require a forum id to retrieve). If a user has one or more global permissions with the prefix acl_get will return a positive integer regardless of the forum id.</p>
-
-	<a name="acl_gets"></a><h3>2.iii. acl_gets</h3>
-
-	<p>This method is funtionally similar to <code>acl_get</code> in that it returns information on whether a user can or cannot carry out a given task. The difference here is the ability to test several different options in one go. This may be useful for testing whether a user is a moderator or an admin in one call. Rather than having to call and check <code>acl_get</code> twice.</p>
-
-	<p>The method should be called thus:</p>
-
-	<div class="codebox"><pre>
-$result = $auth-&gt;acl_gets(<code>option1</code>[, <code>option2</code>, ..., <code>optionN</code>, <code>forum</code>]);
-	</pre></div>
-
-	<p>As with the <code>acl_get</code> method the options are strings representing the required permissions to check. The forum again is an integer representing a given forum_id.</p>
-
-	<p>The method will return a positive integer if <code>acl_get</code> for one of the options evaluates to a positive integer (combines permissions with OR).</p>
-
-	<a name="acl_getf"></a><h3>2.iv. acl_getf</h3>
-
-	<p>This method is used to find out in which forums a user is allowed to carry out an operation or to find out in which forums he is not allowed to carry out an operation. The method should be called in the following way:</p>
-
-	<div class="codebox"><pre>
-$result = $auth-&gt;acl_getf(<code>option</code>[, <code>clean</code>]);
-	</pre></div>
-
-	<p>Just like in the <code>acl_get</code> method the option is a string specifying the permission which has to be checked (negation using ! is allowed). The second parameter is a boolean. If it is set to false this method returns all forums with either zero or a positive integer. If it is set to true only those forums with a positive integer as the result will be returned.</p>
-
-	<p>The method returns an associative array of the form:</p>
-
-	<div class="codebox"><pre>
-array(<em>forum_id1</em> =&gt; array(<em>option</em> =&gt; <em>integer</em>), <em>forum_id2</em> =&gt; ...)
-	</pre></div>
-
-	<p>Where option is the option passed to the method and integer is either zero or a positive integer and the same <code>acl_get(option, forum_id)</code> would return.</p>
-
-	<a name="acl_getf_global"></a><h3>2.v. acl_getf_global</h3>
-
-	<p>This method is used to find out whether a user has a permission in at least one forum or globally. This method is similar to checking whether <code>acl_getf(option, true)</code> returned one or more forums but it's faster. It should be called in the following way:</p>
-
-	<div class="codebox"><pre>
-$result = acl_getf_global(<code>option</code>)
-	</pre></div>
-
-	<p>As with the previous methods option is a string specifying the permission which has to be checked.</p>
-
-	<p>This method returns either zero or a positive integer.</p>
-
-	<a name="acl_cache"></a><h3>2.vi. acl_cache</h3>
-
-	<p>This should be considered a private method and not be called externally. It handles the generation of the user_permissions data from the basic user and group authorisation data. When necessary this method is called automatically by <code>acl</code>.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="admin_related"></a><h2>3. Admin related functions</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<p>A number of additional methods are available related to <code>auth</code>. These handle more basic functions such as adding user and group permissions, new options and clearing the user cache. These methods are contained within a separate class, <code>auth_admin</code>. This can be found in <code>includes/acp/auth.php</code>.</p>
-
-	<p>To use any methods this class contains it first needs to be instantiated separately from <code>auth</code>. This is achieved in the same way as <code>auth</code>:</p>
-
-	<div class="codebox"><pre>
-$auth_admin = new auth_admin();
-	</pre></div>
-
-	<p>This instance gives you access to both the methods of this specific class and that of <code>auth</code>.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="disclaimer"></a><h2>4. Copyright and disclaimer</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-license.php">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-<!-- END DOCUMENT -->
-
-	<div id="page-footer">
-		<div class="version"> $Id$ </div>
-	</div>
-</div></div>
-
-<div>
-	<a id="bottom" name="bottom" accesskey="z"></a>
-</div>
-
-</body>
-</html>
diff --git a/phpBB/docs/bg_header.gif b/phpBB/docs/bg_header.gif
deleted file mode 100644
index 351de9f46a..0000000000
--- a/phpBB/docs/bg_header.gif
+++ /dev/null
diff --git a/phpBB/docs/changes.txt b/phpBB/docs/changes.txt
deleted file mode 100644
index dea5b40f88..0000000000
--- a/phpBB/docs/changes.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-List of major changes since 3.0.x:
-
-- new stack-based bbcode system
-- Migrate phpBB to PHP versions >= 5.2
diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
deleted file mode 100644
index 4c67b1defb..0000000000
--- a/phpBB/docs/coding-guidelines.html
+++ /dev/null
@@ -1,2352 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="en" xml:lang="en">
-<head>
-
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<meta http-equiv="content-style-type" content="text/css" />
-<meta http-equiv="content-language" content="en" />
-<meta http-equiv="imagetoolbar" content="no" />
-<meta name="resource-type" content="document" />
-<meta name="distribution" content="global" />
-<meta name="copyright" content="2007 phpBB Group" />
-<meta name="keywords" content="" />
-<meta name="description" content="Olympus coding guidelines document" />
-<title>phpBB3 &bull; Coding Guidelines</title>
-
-<link href="stylesheet.css" rel="stylesheet" type="text/css" media="screen, projection" />
-
-</head>
-
-<body id="phpbb" class="section-docs">
-
-<div id="wrap">
-	<a id="top" name="top" accesskey="t"></a>
-	<div id="page-header">
-		<div class="headerbar">
-			<div class="inner"><span class="corners-top"><span></span></span>
-
-			<div id="doc-description">
-				<a href="../index.php" id="logo"><img src="site_logo.gif" alt="" /></a>
-				<h1>Coding Guidelines</h1>
-				<p>Olympus coding guidelines document</p>
-				<p style="display: none;"><a href="#start_here">Skip</a></p>
-			</div>
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-	</div>
-
-	<a name="start_here"></a>
-
-	<div id="page-body">
-
-<!-- BEGIN DOCUMENT -->
-
-<p>These are the phpBB Coding Guidelines for Olympus, all attempts should be made to follow them as closely as possible.</p>
-
-<h1>Coding Guidelines</h1>
-
-	<div class="paragraph menu">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<ol>
-	<li><a href="#defaults">Defaults</a>
-	<ol style="list-style-type: lower-roman;">
-		<li><a href="#editorsettings">Editor Settings</a></li>
-		<li><a href="#fileheader">File Header</a></li>
-		<li><a href="#locations">File Locations</a></li>
-	</ol>
-	</li>
-	<li><a href="#code">Code Layout/Guidelines</a>
-	<ol style="list-style-type: lower-roman;">
-		<li><a href="#namingvars">Variable/Function Naming</a></li>
-		<li><a href="#codelayout">Code Layout</a></li>
-		<li><a href="#sql">SQL/SQL Layout</a></li>
-		<li><a href="#optimizing">Optimizations</a></li>
-		<li><a href="#general">General Guidelines</a></li>
-	</ol>
-	</li>
-	<li><a href="#styling">Styling</a></li>
-	<li><a href="#templating">Templating</a></li>
-	<li><a href="#charsets">Character Sets and Encodings</a></li>
-	<li><a href="#translation">Translation (<abbr title="Internationalisation">i18n</abbr>/<abbr title="Localisation">L10n</abbr>) Guidelines</a>
-	<ol style="list-style-type: lower-roman;">
-		<li><a href="#standardisation">Standardisation</a></li>
-		<li><a href="#otherconsiderations">Other considerations</a></li>
-		<li><a href="#writingstyle">Writing Style</a></li>
-	</ol>
-	</li>
-	<li><a href="#changes">Guidelines Changelog</a></li>
-	<li><a href="#disclaimer">Copyright and disclaimer</a></li>
-</ol>
-
-		</div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="defaults"></a><h2>1. Defaults</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<a name="editorsettings"></a><h3>1.i. Editor Settings</h3>
-
-	<h4>Tabs vs Spaces:</h4>
-	<p>In order to make this as simple as possible, we will be using tabs, not spaces. We enforce 4 (four) spaces for one tab - therefore you need to set your tab width within your editor to 4 spaces. Make sure that when you <strong>save</strong> the file, it's saving tabs and not spaces. This way, we can each have the code be displayed the way we like it, without breaking the layout of the actual files.</p>
-	<p>Tabs in front of lines are no problem, but having them within the text can be a problem if you do not set it to the amount of spaces every one of us uses. Here is a short example of how it should look like:</p>
-
-	<div class="codebox"><pre>
-{TAB}$mode{TAB}{TAB}= request_var('mode', '');
-{TAB}$search_id{TAB}= request_var('search_id', '');
-	</pre></div>
-
-	<p>If entered with tabs (replace the {TAB}) both equal signs need to be on the same column.</p>
-
-	<h3>Linefeeds:</h3>
-	<p>Ensure that your editor is saving files in the UNIX (LF) line ending format. This means that lines are terminated with a newline, not with Windows Line endings (CR/LF combo) as they are on Win32 or Classic Mac (CR) Line endings. Any decent editor should be able to do this, but it might not always be the default setting. Know your editor. If you want advice for an editor for your Operating System, just ask one of the developers. Some of them do their editing on Win32.
-
-	<a name="fileheader"></a><h3>1.ii. File Header</h3>
-
-	<h4>Standard header for new files:</h4>
-	<p>This template of the header must be included at the start of all phpBB files: </p>
-
-	<div class="codebox"><pre>
-/**
-*
-* @package {PACKAGENAME}
-* @version &#36;Id: &#36;
-* @copyright (c) 2007 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-	</pre></div>
-
-	<p>Please see the <a href="#locations">File Locations section</a> for the correct package name.</p>
-
-	<h4>Files containing inline code:</h4>
-
-	<p>For those files you have to put an empty comment directly after the header to prevent the documentor assigning the header to the first code element found.</p>
-
-	<div class="codebox"><pre>
-/**
-* {HEADER}
-*/
-
-/**
-*/
-{CODE}
-	</pre></div>
-
-	<h4>Files containing only functions:</h4>
-
-	<p>Do not forget to comment the functions (especially the first function following the header). Each function should have at least a comment of what this function does. For more complex functions it is recommended to document the parameters too.</p>
-
-	<h4>Files containing only classes:</h4>
-
-	<p>Do not forget to comment the class. Classes need a separate @package definition, it is the same as the header package name. Apart from this special case the above statement for files containing only functions needs to be applied to classes and it's methods too.</p>
-
-	<h4>Code following the header but only functions/classes file:</h4>
-
-	<p>If this case is true, the best method to avoid documentation confusions is adding an ignore command, for example:</p>
-
-	<div class="codebox"><pre>
-/**
-* {HEADER}
-*/
-
-/**
-* @ignore
-*/
-Small code snipped, mostly one or two defines or an if statement
-
-/**
-* {DOCUMENTATION}
-*/
-class ...
-	</pre></div>
-
-	<a name="locations"></a><h3>1.iii. File Locations</h3>
-
-	<p>Functions used by more than one page should be placed in functions.php, functions specific to one page should be placed on that page (at the bottom) or within the relevant sections functions file. Some files in <code>/includes</code> are holding functions responsible for special sections, for example uploading files, displaying &quot;things&quot;, user related functions and so forth.</p>
-
-	<p>The following packages are defined, and related new features/functions should be placed within the mentioned files/locations, as well as specifying the correct package name. The package names are bold within this list:</p>
-
-	<ul>
-		<li><strong>phpBB3</strong><br />Core files and all files not assigned to a separate package</li>
-		<li><strong>acm</strong><br /><code>/includes/acm</code>, <code>/includes/cache.php</code><br />Cache System</li>
-		<li><strong>acp</strong><br /><code>/adm</code>, <code>/includes/acp</code>, <code>/includes/functions_admin.php</code><br />Administration Control Panel</li>
-		<li><strong>dbal</strong><br /><code>/includes/db</code><br />Database Abstraction Layer.<br />Base class is <code>dbal</code>
-			<ul>
-				<li><code>/includes/db/dbal.php</code><br />Base DBAL class, defining the overall framework</li>
-				<li><code>/includes/db/firebird.php</code><br />Firebird/Interbase Database Abstraction Layer</li>
-				<li><code>/includes/db/msssql.php</code><br />MSSQL Database Abstraction Layer</li>
-				<li><code>/includes/db/mssql_odbc.php</code><br />MSSQL ODBC Database Abstraction Layer for MSSQL</li>
-				<li><code>/includes/db/mysql.php</code><br />MySQL Database Abstraction Layer for MySQL 3.x/4.0.x/4.1.x/5.x
-				<li><code>/includes/db/mysqli.php</code><br />MySQLi Database Abstraction Layer</li>
-				<li><code>/includes/db/oracle.php</code><br />Oracle Database Abstraction Layer</li>
-				<li><code>/includes/db/postgres.php</code><br />PostgreSQL Database Abstraction Layer</li>
-				<li><code>/includes/db/sqlite.php</code><br />Sqlite Database Abstraction Layer</li>
-			</ul>
-		</li>
-		<li><strong>diff</strong><br /><code>/includes/diff</code><br />Diff Engine</li>
-		<li><strong>docs</strong><br /><code>/docs</code><br />phpBB Documentation</li>
-		<li><strong>images</strong><br /><code>/images</code><br />All global images not connected to styles</li>
-		<li><strong>install</strong><br /><code>/install</code><br />Installation System</li>
-		<li><strong>language</strong><br /><code>/language</code><br />All language files</li>
-		<li><strong>login</strong><br /><code>/includes/auth</code><br />Login Authentication Plugins</li>
-		<li><strong>VC</strong><br /><code>/includes/captcha</code><br />CAPTCHA</li>
-		<li><strong>mcp</strong><br /><code>mcp.php</code>, <code>/includes/mcp</code>, <code>report.php</code><br />Moderator Control Panel</li>
-		<li><strong>ucp</strong><br /><code>ucp.php</code>, <code>/includes/ucp</code><br />User Control Panel</li>
-		<li><strong>utf</strong><br /><code>/includes/utf</code><br />UTF8-related functions/classes</li>
-		<li><strong>search</strong><br /><code>/includes/search</code>, <code>search.php</code><br />Search System</li>
-		<li><strong>styles</strong><br /><code>/styles</code>, <code>style.php</code><br />phpBB Styles/Templates/Themes/Imagesets</li>
-	</ul>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="code"></a><h2>2. Code Layout/Guidelines</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<p>Please note that these Guidelines applies to all php, html, javascript and css files.</p>
-
-	<a name="namingvars"></a><h3>2.i. Variable/Function Naming</h3>
-
-	<p>We will not be using any form of hungarian notation in our naming conventions. Many of us believe that hungarian naming is one of the primary code obfuscation techniques currently in use.</p>
-
-	<h4>Variable Names:</h4>
-	<p>Variable names should be in all lowercase, with words separated by an underscore, example:</p>
-
-	<div class="indent">
-		<p><code>$current_user</code> is right, but <code>$currentuser</code> and <code> $currentUser</code> are not.</p>
-	</div>
-
-	<p>Names should be descriptive, but concise. We don't want huge sentences as our variable names, but typing an extra couple of characters is always better than wondering what exactly a certain variable is for. </p>
-
-	<h4>Loop Indices:</h4>
-	<p>The <em>only</em> situation where a one-character variable name is allowed is when it's the index for some looping construct. In this case, the index of the outer loop should always be $i. If there's a loop inside that loop, its index should be $j, followed by $k, and so on. If the loop is being indexed by some already-existing variable with a meaningful name, this guideline does not apply, example:</p>
-
-	<div class="codebox"><pre>
-for ($i = 0; $i &lt; $outer_size; $i++)
-{
-   for ($j = 0; $j &lt; $inner_size; $j++)
-   {
-      foo($i, $j);
-   }
-}
-	</pre></div>
-
-	<h4>Function Names:</h4>
-	<p>Functions should also be named descriptively. We're not programming in C here, we don't want to write functions called things like "stristr()". Again, all lower-case names with words separated by a single underscore character. Function names should preferably have a verb in them somewhere. Good function names are <code>print_login_status()</code>, <code>get_user_data()</code>, etc. </p>
-
-	<h4>Function Arguments:</h4>
-	<p>Arguments are subject to the same guidelines as variable names. We don't want a bunch of functions like: <code>do_stuff($a, $b, $c)</code>. In most cases, we'd like to be able to tell how to use a function by just looking at its declaration. </p>
-
-	<h4>Summary:</h4>
-	<p>The basic philosophy here is to not hurt code clarity for the sake of laziness. This has to be balanced by a little bit of common sense, though; <code>print_login_status_for_a_given_user()</code> goes too far, for example -- that function would be better named <code>print_user_login_status()</code>, or just <code>print_login_status()</code>.</p>
-
-	<h4>Special Namings: </h4>
-	<p>For all emoticons use the term <code>smiley</code> in singular and <code>smilies</code> in plural.</p>
-
-	<a name="codelayout"></a><h3>2.ii. Code Layout</h3>
-
-	<h4>Always include the braces:</h4>
-	<p>This is another case of being too lazy to type 2 extra characters causing problems with code clarity. Even if the body of some construct is only one line long, do <em>not</em> drop the braces. Just don't, examples:</p>
-
-	<p class="bad">// These are all wrong. </p>
-
-	<div class="codebox"><pre>
-if (condition) do_stuff();
-
-if (condition)
-	do_stuff();
-
-while (condition)
-	do_stuff();
-
-for ($i = 0; $i &lt; size; $i++)
-	do_stuff($i);
-	</pre></div>
-
-	<p class="good">// These are all right. </p>
-	<div class="codebox"><pre>
-if (condition)
-{
-	do_stuff();
-}
-
-while (condition)
-{
-	do_stuff();
-}
-
-for ($i = 0; $i &lt; size; $i++)
-{
-	do_stuff();
-}
-	</pre></div>
-
-	<h4>Where to put the braces:</h4>
-	<p>This one is a bit of a holy war, but we're going to use a style that can be summed up in one sentence: Braces always go on their own line. The closing brace should also always be at the same column as the corresponding opening brace, examples:</p>
-
-	<div class="codebox"><pre>
-if (condition)
-{
-	while (condition2)
-	{
-		...
-	}
-}
-else
-{
-	...
-}
-
-for ($i = 0; $i &lt; $size; $i++)
-{
-	...
-}
-
-while (condition)
-{
-	...
-}
-
-function do_stuff()
-{
-	...
-}
-	</pre></div>
-
-	<h4>Use spaces between tokens:</h4>
-	<p>This is another simple, easy step that helps keep code readable without much effort. Whenever you write an assignment, expression, etc.. Always leave <em>one</em> space between the tokens. Basically, write code as if it was English. Put spaces between variable names and operators. Don't put spaces just after an opening bracket or before a closing bracket. Don't put spaces just before a comma or a semicolon. This is best shown with a few examples, examples:</p>
-
-	<p>// Each pair shows the wrong way followed by the right way. </p>
-
-	<div class="codebox"><pre>
-$i=0;
-$i = 0;
-
-if($i&lt;7) ...
-if ($i &lt; 7) ...
-
-if ( ($i &lt; 7)&amp;&amp;($j &gt; 8) ) ...
-if ($i &lt; 7 &amp;&amp; $j &gt; 8) ...
-
-do_stuff( $i, 'foo', $b );
-do_stuff($i, 'foo', $b);
-
-for($i=0; $i&lt;$size; $i++) ...
-for ($i = 0; $i &lt; $size; $i++) ...
-
-$i=($j &lt; $size)?0:1;
-$i = ($j &lt; $size) ? 0 : 1;
-	</pre></div>
-
-	<h4>Operator precedence:</h4>
-	<p>Do you know the exact precedence of all the operators in PHP? Neither do I. Don't guess. Always make it obvious by using brackets to force the precedence of an equation so you know what it does. Remember to not over-use this, as it may harden the readability. Basically, do not enclose single expressions. Examples:</p>
-
-	<p class="bad">// what's the result? who knows. </p>
-	<div class="codebox"><pre>
-$bool = ($i &lt; 7 &amp;&amp; $j &gt; 8 || $k == 4);
-	</pre></div>
-
-	<p class="bad">// now you can be certain what I'm doing here.</p>
-	<div class="codebox"><pre>
-$bool = (($i &lt; 7) &amp;&amp; (($j &lt; 8) || ($k == 4)));
-	</pre></div>
-
-	<p class="good">// But this one is even better, because it is easier on the eye but the intention is preserved</p>
-	<div class="codebox"><pre>
-$bool = ($i &lt; 7 &amp;&amp; ($j &lt; 8 || $k == 4));
-	</pre></div>
-
-	<h4>Quoting strings:</h4>
-	<p>There are two different ways to quote strings in PHP - either with single quotes or with double quotes. The main difference is that the parser does variable interpolation in double-quoted strings, but not in single quoted strings. Because of this, you should <em>always</em> use single quotes <em>unless</em> you specifically need variable interpolation to be done on that string. This way, we can save the parser the trouble of parsing a bunch of strings where no interpolation needs to be done.</p>
-	<p>Also, if you are using a string variable as part of a function call, you do not need to enclose that variable in quotes. Again, this will just make unnecessary work for the parser. Note, however, that nearly all of the escape sequences that exist for double-quoted strings will not work with single-quoted strings. Be careful, and feel free to break this guideline if it's making your code easier to read, examples:</p>
-
-	<p class="bad">// wrong </p>
-	<div class="codebox"><pre>
-$str = "This is a really long string with no variables for the parser to find.";
-
-do_stuff("$str");
-	</pre></div>
-
-	<p class="good">// right</p>
-	<div class="codebox"><pre>
-$str = 'This is a really long string with no variables for the parser to find.';
-
-do_stuff($str);
-	</pre></div>
-
-	<p class="bad">// Sometimes single quotes are just not right</p>
-	<div class="codebox"><pre>
-$some_string = $board_url . 'someurl.php?mode=' . $mode . '&amp;amp;start=' . $start;
-	</pre></div>
-
-	<p class="good">// Double quotes are sometimes needed to not overcroud the line with concentinations</p>
-	<div class="codebox"><pre>
-$some_string = "{$board_url}someurl.php?mode=$mode&amp;amp;start=$start";
-	</pre></div>
-
-	<p>In SQL Statements mixing single and double quotes is partly allowed (following the guidelines listed here about SQL Formatting), else it should be tryed to only use one method - mostly single quotes.</p>
-
-	<h4>Associative array keys:</h4>
-	<p>In PHP, it's legal to use a literal string as a key to an associative array without quoting that string. We don't want to do this -- the string should always be quoted to avoid confusion. Note that this is only when we're using a literal, not when we're using a variable, examples:</p>
-
-	<p class="bad">// wrong</p>
-	<div class="codebox"><pre>
-$foo = $assoc_array[blah];
-	</pre></div>
-
-	<p class="good">// right </p>
-	<div class="codebox"><pre>
-$foo = $assoc_array['blah'];
-	</pre></div>
-
-	<p class="bad">// wrong</p>
-	<div class="codebox"><pre>
-$foo = $assoc_array["$var"];
-	</pre></div>
-
-	<p class="good">// right </p>
-	<div class="codebox"><pre>
-$foo = $assoc_array[$var];
-	</pre></div>
-
-	<h4>Comments:</h4>
-	<p>Each complex function should be preceded by a comment that tells a programmer everything they need to know to use that function. The meaning of every parameter, the expected input, and the output are required as a minimal comment. The function's behaviour in error conditions (and what those error conditions are) should also be present - but mostly included within the comment about the output.<br /><br />Especially important to document are any assumptions the code makes, or preconditions for its proper operation. Any one of the developers should be able to look at any part of the application and figure out what's going on in a reasonable amount of time.<br /><br />Avoid using <code>/* */</code> comment blocks for one-line comments, <code>//</code> should be used for one/two-liners.</p>
-
-	<h4>Magic numbers:</h4>
-	<p>Don't use them. Use named constants for any literal value other than obvious special cases. Basically, it's ok to check if an array has 0 elements by using the literal 0. It's not ok to assign some special meaning to a number and then use it everywhere as a literal. This hurts readability AND maintainability. The constants <code>true</code> and <code>false</code> should be used in place of the literals 1 and 0 -- even though they have the same values (but not type!), it's more obvious what the actual logic is when you use the named constants. Typecast variables where it is needed, do not rely on the correct variable type (PHP is currently very loose on typecasting which can lead to security problems if a developer does not have a very close eye to it).</p>
-
-	<h4>Shortcut operators:</h4>
-	<p>The only shortcut operators that cause readability problems are the shortcut increment <code>$i++</code> and decrement <code>$j--</code> operators. These operators should not be used as part of an expression. They can, however, be used on their own line. Using them in expressions is just not worth the headaches when debugging, examples:</p>
-
-	<p class="bad">// wrong </p>
-	<div class="codebox"><pre>
-$array[++$i] = $j;
-$array[$i++] = $k;
-	</pre></div>
-
-	<p class="good">// right </p>
-	<div class="codebox"><pre>
-$i++;
-$array[$i] = $j;
-
-$array[$i] = $k;
-$i++;
-	</pre></div>
-
-	<h4>Inline conditionals:</h4>
-	<p>Inline conditionals should only be used to do very simple things. Preferably, they will only be used to do assignments, and not for function calls or anything complex at all. They can be harmful to readability if used incorrectly, so don't fall in love with saving typing by using them, examples:</p>
-
-	<p class="bad">// Bad place to use them</p>
-	<div class="codebox"><pre>
-($i &lt; $size &amp;&amp; $j &gt; $size) ? do_stuff($foo) : do_stuff($bar);
-	</pre></div>
-
-	<p class="good">// OK place to use them </p>
-	<div class="codebox"><pre>
-$min = ($i &lt; $j) ? $i : $j;
-	</pre></div>
-
-	<h4>Don't use uninitialized variables.</h4>
-	<p>For phpBB3, we intend to use a higher level of run-time error reporting. This will mean that the use of an uninitialized variable will be reported as a warning. These warnings can be avoided by using the built-in isset() function to check whether a variable has been set - but preferably the variable is always existing. For checking if an array has a key set this can come in handy though, examples:</p>
-
-	<p class="bad">// Wrong </p>
-	<div class="codebox"><pre>
-if ($forum) ...
-	</pre></div>
-
-	<p class="good">// Right </p>
-	<div class="codebox"><pre>
-if (isset($forum)) ...
-	</pre></div>
-
-	<p class="good">// Also possible</p>
-	<div class="codebox"><pre>
-if (isset($forum) &amp;&amp; $forum == 5)
-	</pre></div>
-
-	<p>The <code>empty()</code> function is useful if you want to check if a variable is not set or being empty (an empty string, 0 as an integer or string, NULL, false, an empty array or a variable declared, but without a value in a class). Therefore empty should be used in favor of <code>isset($array) &amp;&amp; sizeof($array) &gt; 0</code> - this can be written in a shorter way as <code>!empty($array)</code>.</p>
-
-	<h4>Switch statements:</h4>
-	<p>Switch/case code blocks can get a bit long sometimes. To have some level of notice and being in-line with the opening/closing brace requirement (where they are on the same line for better readability), this also applies to switch/case code blocks and the breaks. An example:</p>
-
-	<p class="bad">// Wrong </p>
-	<div class="codebox"><pre>
-switch ($mode)
-{
-	case 'mode1':
-		// I am doing something here
-		break;
-	case 'mode2':
-		// I am doing something completely different here
-		break;
-}
-	</pre></div>
-
-	<p class="good">// Good </p>
-	<div class="codebox"><pre>
-switch ($mode)
-{
-	case 'mode1':
-		// I am doing something here
-	break;
-
-	case 'mode2':
-		// I am doing something completely different here
-	break;
-
-	default:
-		// Always assume that a case was not caught
-	break;
-}
-	</pre></div>
-
-	<p class="good">// Also good, if you have more code between the case and the break </p>
-	<div class="codebox"><pre>
-switch ($mode)
-{
-	case 'mode1':
-
-		// I am doing something here
-
-	break;
-
-	case 'mode2':
-
-		// I am doing something completely different here
-
-	break;
-
-	default:
-
-		// Always assume that a case was not caught
-
-	break;
-}
-	</pre></div>
-
-	<p>Even if the break for the default case is not needed, it is sometimes better to include it just for readability and completeness.</p>
-
-	<p>If no break is intended, please add a comment instead. An example:</p>
-
-	<p class="good">// Example with no break </p>
-	<div class="codebox"><pre>
-switch ($mode)
-{
-	case 'mode1':
-
-		// I am doing something here
-
-	// no break here
-
-	case 'mode2':
-
-		// I am doing something completely different here
-
-	break;
-
-	default:
-
-		// Always assume that a case was not caught
-
-	break;
-}
-	</pre></div>
-
-	<a name="sql"></a><h3>2.iii. SQL/SQL Layout</h3>
-
-	<h4>Common SQL Guidelines: </h4>
-	<p>All SQL should be cross-DB compatible, if DB specific SQL is used alternatives must be provided which work on all supported DB's (MySQL3/4/5, MSSQL (7.0 and 2000), PostgreSQL (7.0+), Firebird, SQLite, Oracle8, ODBC (generalised if possible)).</p>
-	<p>All SQL commands should utilise the DataBase Abstraction Layer (DBAL)</p>
-
-	<h4>SQL code layout:</h4>
-	<p>SQL Statements are often unreadable without some formatting, since they tend to be big at times. Though the formatting of sql statements adds a lot to the readability of code. SQL statements should be formatted in the following way, basically writing keywords: </p>
-
-	<div class="codebox"><pre>
-$sql = 'SELECT *
-&lt;-one tab-&gt;FROM ' . SOME_TABLE . '
-&lt;-one tab-&gt;WHERE a = 1
-&lt;-two tabs-&gt;AND (b = 2
-&lt;-three tabs-&gt;OR b = 3)
-&lt;-one tab-&gt;ORDER BY b';
-	</pre></div>
-
-	<p>Here the example with the tabs applied:</p>
-
-	<div class="codebox"><pre>
-$sql = 'SELECT *
-	FROM ' . SOME_TABLE . '
-	WHERE a = 1
-		AND (b = 2
-			OR b = 3)
-	ORDER BY b';
-	</pre></div>
-
-	<h4>SQL Quotes: </h4>
-	<p>Double quotes where applicable (The variables in these examples are typecasted to integers before) ... examples: </p>
-
-	<p class="bad">// These are wrong.</p>
-	<div class="codebox"><pre>
-"UPDATE " . SOME_TABLE . " SET something = something_else WHERE a = $b";
-
-'UPDATE ' . SOME_TABLE . ' SET something = ' . $user_id . ' WHERE a = ' . $something;
-	</pre></div>
-
-	<p class="good">// These are right. </p>
-
-	<div class="codebox"><pre>
-'UPDATE ' . SOME_TABLE . " SET something = something_else WHERE a = $b";
-
-'UPDATE ' . SOME_TABLE . " SET something = $user_id WHERE a = $something";
-	</pre></div>
-
-	<p>In other words use single quotes where no variable substitution is required or where the variable involved shouldn't appear within double quotes. Otherwise use double quotes.</p>
-
-	<h4>Avoid DB specific SQL: </h4>
-	<p>The &quot;not equals operator&quot;, as defined by the SQL:2003 standard, is &quot;&lt;&gt;&quot;</p>
-
-	<p class="bad">// This is wrong.</p>
-	<div class="codebox"><pre>
-$sql = 'SELECT *
-	FROM ' . SOME_TABLE . '
-	WHERE a != 2';
-	</pre></div>
-
-	<p class="good">// This is right. </p>
-	<div class="codebox"><pre>
-$sql = 'SELECT *
-	FROM ' . SOME_TABLE . '
-	WHERE a &lt;&gt; 2';
-	</pre></div>
-
-	<h4>Common DBAL methods: </h4>
-
-	<h4>sql_escape():</h4>
-
-	<p>Always use <code>$db-&gt;sql_escape()</code> if you need to check for a string within an SQL statement (even if you are sure the variable cannot contain single quotes - never trust your input), for example:</p>
-
-	<div class="codebox"><pre>
-$sql = 'SELECT *
-	FROM ' . SOME_TABLE . "
-	WHERE username = '" . $db-&gt;sql_escape($username) . "'";
-	</pre></div>
-
-	<h4>sql_query_limit():</h4>
-
-	<p>We do not add limit statements to the sql query, but instead use <code>$db-&gt;sql_query_limit()</code>. You basically pass the query, the total number of lines to retrieve and the offset.</p>
-
-	<p><strong>Note: </strong> Since Oracle handles limits differently and because of how we implemented this handling you need to take special care if you use <code>sql_query_limit</code> with an sql query retrieving data from more than one table.</p>
-
-	<p>Make sure when using something like "SELECT x.*, y.jars" that there is not a column named jars in x; make sure that there is no overlap between an implicit column and the explicit columns.</p>
-
-	<h4>sql_build_array():</h4>
-
-	<p>If you need to UPDATE or INSERT data, make use of the <code>$db-&gt;sql_build_array()</code> function. This function already escapes strings and checks other types, so there is no need to do this here. The data to be inserted should go into an array - <code>$sql_ary</code> - or directly within the statement if one or two variables needs to be inserted/updated. An example of an insert statement would be:</p>
-
-	<div class="codebox"><pre>
-$sql_ary = array(
-	'somedata'		=&gt; $my_string,
-	'otherdata'		=&gt; $an_int,
-	'moredata'		=&gt; $another_int
-);
-
-$db-&gt;sql_query('INSERT INTO ' . SOME_TABLE . ' ' . $db-&gt;sql_build_array('INSERT', $sql_ary));
-	</pre></div>
-
-	<p>To complete the example, this is how an update statement would look like:</p>
-
-	<div class="codebox"><pre>
-$sql_ary = array(
-	'somedata'		=&gt; $my_string,
-	'otherdata'		=&gt; $an_int,
-	'moredata'		=&gt; $another_int
-);
-
-$sql = 'UPDATE ' . SOME_TABLE . '
-	SET ' . $db-&gt;sql_build_array('UPDATE', $sql_ary) . '
-	WHERE user_id = ' . (int) $user_id;
-$db-&gt;sql_query($sql);
-	</pre></div>
-
-	<p>The <code>$db-&gt;sql_build_array()</code> function supports the following modes: <code>INSERT</code> (example above), <code>INSERT_SELECT</code> (building query for <code>INSERT INTO table (...) SELECT value, column ...</code> statements), <code>UPDATE</code> (example above) and <code>SELECT</code> (for building WHERE statement [AND logic]).</p>
-
-	<h4>sql_multi_insert():</h4>
-
-	<p>If you want to insert multiple statements at once, please use the separate <code>sql_multi_insert()</code> method. An example:</p>
-
-	<div class="codebox"><pre>
-$sql_ary = array();
-
-$sql_ary[] = array(
-	'somedata'		=&gt; $my_string_1,
-	'otherdata'		=&gt; $an_int_1,
-	'moredata'		=&gt; $another_int_1,
-);
-
-$sql_ary[] = array(
-	'somedata'		=&gt; $my_string_2,
-	'otherdata'		=&gt; $an_int_2,
-	'moredata'		=&gt; $another_int_2,
-);
-
-$db->sql_multi_insert(SOME_TABLE, $sql_ary);
-	</pre></div>
-
-	<h4>sql_in_set():</h4>
-
-	<p>The <code>$db-&gt;sql_in_set()</code> function should be used for building <code>IN ()</code> and <code>NOT IN ()</code> constructs. Since (specifically) MySQL tend to be faster if for one value to be compared the <code>=</code> and <code>&lt;&gt;</code> operator is used, we let the DBAL decide what to do. A typical example of doing a positive match against a number of values would be:</p>
-
-	<div class="codebox"><pre>
-$sql = 'SELECT *
-	FROM ' . FORUMS_TABLE . '
-	WHERE ' . $db-&gt;sql_in_set('forum_id', $forum_ids);
-$db-&gt;sql_query($sql);
-	</pre></div>
-
-	<p>Based on the number of values in $forum_ids, the query can look differently.</p>
-
-	<p class="good">// SQL Statement if $forum_ids = array(1, 2, 3);</p>
-
-	<div class="codebox"><pre>
-SELECT FROM phpbb_forums WHERE forum_id IN (1, 2, 3)
-	</pre></div>
-
-	<p class="good">// SQL Statement if $forum_ids = array(1) or $forum_ids = 1</p>
-
-	<div class="codebox"><pre>
-SELECT FROM phpbb_forums WHERE forum_id = 1
-	</pre></div>
-
-	<p>Of course the same is possible for doing a negative match against a number of values:</p>
-
-	<div class="codebox"><pre>
-$sql = 'SELECT *
-	FROM ' . FORUMS_TABLE . '
-	WHERE ' . $db-&gt;sql_in_set('forum_id', $forum_ids, <strong>true</strong>);
-$db-&gt;sql_query($sql);
-	</pre></div>
-
-	<p>Based on the number of values in $forum_ids, the query can look differently here too.</p>
-
-	<p class="good">// SQL Statement if $forum_ids = array(1, 2, 3);</p>
-
-	<div class="codebox"><pre>
-SELECT FROM phpbb_forums WHERE forum_id <strong>NOT</strong> IN (1, 2, 3)
-	</pre></div>
-
-	<p class="good">// SQL Statement if $forum_ids = array(1) or $forum_ids = 1</p>
-
-	<div class="codebox"><pre>
-SELECT FROM phpbb_forums WHERE forum_id <strong>&lt;&gt;</strong> 1
-	</pre></div>
-
-	<p>If the given array is empty, an error will be produced.</p>
-
-	<h4>sql_build_query():</h4>
-
-	<p>The <code>$db-&gt;sql_build_query()</code> function is responsible for building sql statements for select and select distinct queries if you need to JOIN on more than one table or retrieving data from more than one table while doing a JOIN. This needs to be used to make sure the resulting statement is working on all supported db's. Instead of explaining every possible combination, i will give a short example:</p>
-
-	<div class="codebox"><pre>
-$sql_array = array(
-	'SELECT'	=&gt; 'f.*, ft.mark_time',
-
-	'FROM'		=&gt; array(
-		FORUMS_WATCH_TABLE	=&gt; 'fw',
-		FORUMS_TABLE		=&gt; 'f'
-	),
-
-	'LEFT_JOIN'	=&gt; array(
-		array(
-			'FROM'	=&gt; array(FORUMS_TRACK_TABLE =&gt; 'ft'),
-			'ON'	=&gt; 'ft.user_id = ' . $user-&gt;data['user_id'] . ' AND ft.forum_id = f.forum_id'
-		)
-	),
-
-	'WHERE'		=&gt; 'fw.user_id = ' . $user-&gt;data['user_id'] . '
-		AND f.forum_id = fw.forum_id',
-
-	'ORDER_BY'	=&gt; 'left_id'
-);
-
-$sql = $db-&gt;sql_build_query('SELECT', $sql_array);
-	</pre></div>
-
-	<p>The possible first parameter for sql_build_query() is SELECT or SELECT_DISTINCT. As you can see, the logic is pretty self-explaining. For the LEFT_JOIN key, just add another array if you want to join on to tables for example. The added benefit of using this construct is that you are able to easily build the query statement based on conditions - for example the above LEFT_JOIN is only necessary if server side topic tracking is enabled; a slight adjustement would be:</p>
-
-	<div class="codebox"><pre>
-$sql_array = array(
-	'SELECT'	=&gt; 'f.*',
-
-	'FROM'		=&gt; array(
-		FORUMS_WATCH_TABLE	=&gt; 'fw',
-		FORUMS_TABLE		=&gt; 'f'
-	),
-
-	'WHERE'		=&gt; 'fw.user_id = ' . $user-&gt;data['user_id'] . '
-		AND f.forum_id = fw.forum_id',
-
-	'ORDER_BY'	=&gt; 'left_id'
-);
-
-if (phpbb::$config['load_db_lastread'])
-{
-	$sql_array['LEFT_JOIN'] = array(
-		array(
-			'FROM'	=&gt; array(FORUMS_TRACK_TABLE =&gt; 'ft'),
-			'ON'	=&gt; 'ft.user_id = ' . $user-&gt;data['user_id'] . ' AND ft.forum_id = f.forum_id'
-		)
-	);
-
-	$sql_array['SELECT'] .= ', ft.mark_time ';
-}
-else
-{
-	// Here we read the cookie data
-}
-
-$sql = $db-&gt;sql_build_query('SELECT', $sql_array);
-	</pre></div>
-
-	<a name="optimizing"></a><h3>2.iv. Optimizations</h3>
-
-	<h4>Operations in loop definition: </h4>
-	<p>Always try to optimize your loops if operations are going on at the comparing part, since this part is executed every time the loop is parsed through. For assignments a descriptive name should be chosen. Example:</p>
-
-	<p class="bad">// On every iteration the sizeof function is called</p>
-	<div class="codebox"><pre>
-for ($i = 0; $i &lt; sizeof($post_data); $i++)
-{
-	do_something();
-}
-	</pre></div>
-
-	<p class="good">// You are able to assign the (not changing) result within the loop itself</p>
-	<div class="codebox"><pre>
-for ($i = 0, $size = sizeof($post_data); $i &lt; $size; $i++)
-{
-	do_something();
-}
-	</pre></div>
-
-	<h4>Use of in_array(): </h4>
-	<p>Try to avoid using in_array() on huge arrays, and try to not place them into loops if the array to check consist of more than 20 entries. in_array() can be very time consuming and uses a lot of cpu processing time. For little checks it is not noticable, but if checked against a huge array within a loop those checks alone can be a bunch of seconds. If you need this functionality, try using isset() on the arrays keys instead, actually shifting the values into keys and vice versa. A call to <code>isset($array[$var])</code> is a lot faster than <code>in_array($var, array_keys($array))</code> for example.</p>
-
-
-	<a name="general"></a><h3>2.v. General Guidelines</h3>
-
-	<h4>General things:</h4>
-	<p>Never trust user input (this also applies to server variables as well as cookies).</p>
-	<p>Try to sanitize values returned from a function.</p>
-	<p>Try to sanitize given function variables within your function.</p>
-	<p>The auth class should be used for all authorisation checking.</p>
-	<p>No attempt should be made to remove any copyright information (either contained within the source or displayed interactively when the source is run/compiled), neither should the copyright information be altered in any way (it may be added to).</p>
-
-	<h4>Variables: </h4>
-	<p>Make use of the <code>request_var()</code> function for anything except for submit or single checking params. </p>
-	<p>The request_var function determines the type to set from the second parameter (which determines the default value too). If you need to get a scalar variable type, you need to tell this the request_var function explicitly. Examples:</p>
-
-	<p class="bad">// Old method, do not use it</p>
-	<div class="codebox"><pre>
-$start = (isset($HTTP_GET_VARS['start'])) ? intval($HTTP_GET_VARS['start']) : intval($HTTP_POST_VARS['start']);
-$submit = (isset($HTTP_POST_VARS['submit'])) ? true : false;
-	</pre></div>
-
-	<p class="good">// Use request var and define a default variable (use the correct type)</p>
-	<div class="codebox"><pre>
-$start = request_var('start', 0);
-$submit = phpbb_request::is_set_post('submit');
-	</pre></div>
-
-	<p class="bad">// $start is an int, the following use of request_var therefore is not allowed</p>
-	<div class="codebox"><pre>
-$start = request_var('start', '0');
-	</pre></div>
-
-	<p class="good">// Getting an array, keys are integers, value defaults to 0</p>
-	<div class="codebox"><pre>
-$mark_array = request_var('mark', array(0));
-	</pre></div>
-
-	<p class="good">// Getting an array, keys are strings, value defaults to 0</p>
-	<div class="codebox"><pre>
-$action_ary = request_var('action', array('' =&gt; 0));
-	</pre></div>
-
-	<h4>Login checks/redirection: </h4>
-	<p>To show a forum login box use <code>login_forum_box($forum_data)</code>, else use the <code>login_box()</code> function.</p>
-
-	<p>The <code>login_box()</code> function can have a redirect as the first parameter. As a thumb of rule, specify an empty string if you want to redirect to the users current location, else do not add the <code>$SID</code> to the redirect string (for example within the ucp/login we redirect to the board index because else the user would be redirected to the login screen).</p>
-
-	<h4>Sensitive Operations: </h4>
-	<p>For sensitive operations always let the user confirm the action. For the confirmation screens, make use of the <code>confirm_box()</code> function.</p>
-
-	<h4>Altering Operations: </h4>
-	<p>For operations altering the state of the database, for instance posting, always verify the form token, unless you are already using <code>confirm_box()</code>. To do so, make use of the <code>add_form_key()</code> and <code>check_form_key()</code> functions. </p>
-	<div class="codebox"><pre>
-	add_form_key('my_form');
-
-	if ($submit)
-	{
-		if (!check_form_key('my_form'))
-		{
-			trigger_error('FORM_INVALID');
-		}
-	}
-	</pre></div>
-
-	<p>The string passed to <code>add_form_key()</code> needs to match the string passed to <code>check_form_key()</code>. Another requirement for this to work correctly is that all forms include the <code>{S_FORM_TOKEN}</code> template variable.</p>
-
-
-	<h4>Sessions: </h4>
-	<p>Sessions should be initiated on each page, as near the top as possible using the following code:</p>
-
-	<div class="codebox"><pre>
-$user-&gt;session_begin();
-$auth-&gt;acl($user-&gt;data);
-$user-&gt;setup();
-	</pre></div>
-
-	<p>The <code>$user-&gt;setup()</code> call can be used to pass on additional language definition and a custom style (used in viewforum).</p>
-
-	<h4>Errors and messages: </h4>
-	<p>All messages/errors should be outputed by calling <code>trigger_error()</code> using the appropriate message type and language string. Example:</p>
-
-	<div class="codebox"><pre>
-trigger_error('NO_FORUM');
-	</pre></div>
-
-	<div class="codebox"><pre>
-trigger_error($user-&gt;lang['NO_FORUM']);
-	</pre></div>
-
-	<div class="codebox"><pre>
-trigger_error('NO_MODE', E_USER_ERROR);
-	</pre></div>
-
-	<h4>Url formatting</h4>
-
-	<p>All urls pointing to internal files need to be prepended by the <code>PHPBB_ROOT_PATH</code> constant. Within the administration control panel all urls pointing to internal files need to be prepended by the <code>PHPBB_ADMIN_PATH</code> constant. This makes sure the path is always correct and users being able to just rename the admin folder and the acp still working as intended (though some links will fail and the code need to be slightly adjusted).</p>
-
-	<p>The <code>append_sid()</code> function from 2.0.x is available too, though does not handle url alterations automatically. Please have a look at the code documentation if you want to get more details on how to use append_sid(). A sample call to append_sid() can look like this:</p>
-
-	<div class="codebox"><pre>
-append_sid(PHPBB_ROOT_PATH . 'memberlist.' . PHP_EXT, 'mode=group&amp;amp;g=' . $row['group_id'])
-	</pre></div>
-
-	<p>For shorter writing internal urls are allowed to be written in short notation, not providing the root path and the extension. The append_sid() function will prepend the root path and append the extension automatically (and before calling the hook).</p>
-
-	<div class="codebox"><pre>
-append_sid('memberlist', 'mode=group&amp;amp;g=' . $row['group_id'])
-	</pre></div>
-
-	<h4>General function usage: </h4>
-
-	<p>Some of these functions are only chosen over others because of personal preference and having no other benefit than to be consistant over the code.</p>
-
-	<ul>
-		<li>
-			<p>Use <code>sizeof</code> instead of <code>count</code></p>
-		</li>
-		<li>
-			<p>Use <code>strpos</code> instead of <code>strstr</code></p>
-		</li>
-		<li>
-			<p>Use <code>else if</code> instead of <code>elseif</code></p>
-		</li>
-		<li>
-			<p>Use <code>false</code> (lowercase) instead of <code>FALSE</code></p>
-		</li>
-		<li>
-			<p>Use <code>true</code> (lowercase) instead of <code>TRUE</code></p>
-		</li>
-	</ul>
-
-	<h4>Exiting</h4>
-
-	<p>Your page should either call <code>page_footer()</code> in the end to trigger output through the template engine and terminate the script, or alternatively at least call the <code>exit_handler()</code>. That call is necessary because it provides a method for external applications embedding phpBB to be called at the end of the script.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="styling"></a><h2>3. Styling</h2>
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-	<a name="cfgfiles"></a><h3>3.i. Style Config Files</h3>
-	<p>Style cfg files are simple name-value lists with the information necessary for installing a style. Similar cfg files exist for templates, themes and imagesets. These follow the same principle and will not be introduced individually. Styles can use installed components by using the required_theme/required_template/required_imageset entries. The important part of the style configuration file is assigning an unique name.</p>
-	<div class="codebox"><pre>
-        # General Information about this style
-        name = prosilver_duplicate
-        copyright = &copy; phpBB Group, 2007
-        version = 3.0.3
-        required_template = prosilver
-        required_theme = prosilver
-        required_imageset = prosilver
-	</pre></div>
-	<a name="genstyling"></a><h3>3.2. General Styling Rules</h3>
-<p>Templates should be produced in a consistent manner. Where appropriate they should be based off an existing copy, e.g. index, viewforum or viewtopic (the combination of which implement a range of conditional and variable forms). Please also note that the intendation and coding guidelines also apply to templates where possible.</p>
-
-<p>The outer table class <code>forumline</code> has gone and is replaced with <code>tablebg</code>.</p>
-<p>When writing <code>&lt;table&gt;</code> the order <code>&lt;table class="" cellspacing="" cellpadding="" border="" align=""&gt;</code> creates consistency and allows everyone to easily see which table produces which "look". The same applies to most other tags for which additional parameters can be set, consistency is the major aim here.</p>
-<p>Each block level element should be indented by one tab, same for tabular elements, e.g. <code>&lt;tr&gt;</code> <code>&lt;td&gt;</code> etc., whereby the intendiation of <code>&lt;table&gt;</code> and the following/ending <code>&lt;tr&gt;</code> should be on the same line. This applies not to div elements of course.</p>
-<p>Don't use <code>&lt;span&gt;</code> more than is essential ... the CSS is such that text sizes are dependent on the parent class. So writing <code>&lt;span class="gensmall"&gt;&lt;span class="gensmall"&gt;TEST&lt;/span&gt;&lt;/span&gt;</code> will result in very very small text. Similarly don't use span at all if another element can contain the class definition, e.g.</p>
-
-<div class="codebox"><pre>
-&lt;td&gt;&lt;span class=&quot;gensmall&quot;&gt;TEST&lt;/span&gt;&lt;/td&gt;
-</pre></div>
-
-<p>can just as well become:</p>
-<div class="codebox"><pre>
-&lt;td class=&quot;gensmall&quot;&gt;TEST&lt;/td&gt;
-</pre></div>
-
-<p>Try to match text class types with existing useage, e.g. don't use the nav class where viewtopic uses gensmall for example.</p>
-
-<p>Row colours/classes are now defined by the template, use an <code>IF S_ROW_COUNT</code> switch, see viewtopic or viewforum for an example.</p>
-
-<p>Remember block level ordering is important ... while not all pages validate as XHTML 1.0 Strict compliant it is something we're trying to work too.</p>
-
-<p>Use a standard cellpadding of 2 and cellspacing of 0 on outer tables. Inner tables can vary from 0 to 3 or even 4 depending on the need.</p>
-
-<p><strong>Use div container/css for styling and table for data representation.</strong></p>
-
-<p>The separate catXXXX and thXXX classes are gone. When defining a header cell just use <code>&lt;th&gt;</code> rather than <code>&lt;th class="thHead"&gt;</code> etc. Similarly for cat, don't use <code>&lt;td class="catLeft"&gt;</code> use <code>&lt;td class="cat"&gt;</code> etc.</p>
-
-<p>Try to retain consistency of basic layout and class useage, i.e. _EXPLAIN text should generally be placed below the title it explains, e.g. <code>{L_POST_USERNAME}&lt;br /&gt;&lt;span class="gensmall"&gt;{L_POST_USERNAME_EXPLAIN}&lt;/span&gt;</code> is the typical way of handling this ... there may be exceptions and this isn't a hard and fast rule.</p>
-
-<p>Try to keep template conditional and other statements tabbed in line with the block to which they refer.</p>
-
-<p class="good">this is correct</p>
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- BEGIN test --&gt;</span>
-	&lt;tr&gt;
-		&lt;td&gt;&#123;test.TEXT&#125;&lt;/td&gt;
-	&lt;/tr&gt;
-<span class="comment">&lt;!-- END test --&gt;</span>
-</pre></div>
-
-<p class="good">this is also correct:</p>
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- BEGIN test --&gt;</span>
-&lt;tr&gt;
-	&lt;td&gt;&#123;test.TEXT&#125;&lt;/td&gt;
-&lt;/tr&gt;
-<span class="comment">&lt;!-- END test --&gt;</span>
-</pre></div>
-
-<p>it gives immediate feedback on exactly what is looping - decide which way to use based on the readability.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="templating"></a><h2>4. Templating</h2>
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<a name="templates"></a><h3>4.i. General Templating</h3>
-
-<h4>File naming</h4>
-<p>Firstly templates now take the suffix &quot;.html&quot; rather than &quot;.tpl&quot;. This was done simply to make the lifes of some people easier wrt syntax highlighting, etc.</p>
-
-<h4>Variables</h4>
-<p>All template variables should be named appropriately (using underscores for spaces), language entries should be prefixed with L_, system data with S_, urls with U_, javascript urls with UA_, language to be put in javascript statements with LA_, all other variables should be presented 'as is'.</p>
-
-<p>L_* template variables are automatically tried to be mapped to the corresponding language entry if the code does not set (and therefore overwrite) this variable specifically. For example <code>{L_USERNAME}</code> maps to <code>$user-&gt;lang['USERNAME']</code>. The LA_* template variables are handled within the same way, but properly escaped to be put in javascript code. This should reduce the need to assign loads of new lang vars in Modifications.
-</p>
-
-<h4>Blocks/Loops</h4>
-<p>The basic block level loop remains and takes the form:</p>
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- BEGIN loopname --&gt;</span>
-	markup, {loopname&#46;X_YYYYY}, etc&#46;
-<span class="comment">&lt;!-- END loopname --&gt;</span>
-</pre></div>
-
-<p>A bit later loops will be explained further. To not irritate you we will explain conditionals as well as other statements first.</p>
-
-<h4>Including files</h4>
-<p>Something that existed in 2.0.x which no longer exists in 3.0.x is the ability to assign a template to a variable. This was used (for example) to output the jumpbox. Instead (perhaps better, perhaps not but certainly more flexible) we now have INCLUDE. This takes the simple form:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- INCLUDE filename --&gt;</span>
-</pre></div>
-
-<p>You will note in the 3.0 templates the major sources start with <code>&lt;!-- INCLUDE overall_header.html --&gt;</code> or <code>&lt;!-- INCLUDE simple_header.html --&gt;</code>, etc. In 2.0.x control of &quot;which&quot; header to use was defined entirely within the code. In 3.0.x the template designer can output what they like. Note that you can introduce new templates (i.e. other than those in the default set) using this system and include them as you wish ... perhaps useful for a common &quot;menu&quot; bar or some such. No need to modify loads of files as with 2.0.x.</p>
-
-<h4>PHP</h4>
-<p>A contentious decision has seen the ability to include PHP within the template introduced. This is achieved by enclosing the PHP within relevant tags:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- PHP --&gt;</span>
-	echo &quot;hello!&quot;;
-<span class="comment">&lt;!-- ENDPHP --&gt;</span>
-</pre></div>
-
-<p>You may also include PHP from an external file using:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- INCLUDEPHP somefile&#46;php --&gt;</span>
-</pre></div>
-
-<p>it will be included and executed inline.<br /><br />A note, it is very much encouraged that template designers do not include PHP. The ability to include raw PHP was introduced primarily to allow end users to include banner code, etc. without modifying multiple files (as with 2.0.x). It was not intended for general use ... hence <!-- w --><a href="http://www.phpbb.com">www.phpbb.com</a><!-- w --> will <strong>not</strong> make available template sets which include PHP. And by default templates will have PHP disabled (the admin will need to specifically activate PHP for a template).</p>
-
-<h4>Conditionals/Control structures</h4>
-<p>The most significant addition to 3.0.x are conditions or control structures, &quot;if something then do this else do that&quot;. The system deployed is very similar to Smarty. This may confuse some people at first but it offers great potential and great flexibility with a little imagination. In their most simple form these constructs take the form:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- IF expr --&gt;</span>
-	markup
-<span class="comment">&lt;!-- ENDIF --&gt;</span>
-</pre></div>
-
-<p>expr can take many forms, for example:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- IF loop&#46;S_ROW_COUNT is even --&gt;</span>
-	markup
-<span class="comment">&lt;!-- ENDIF --&gt;</span>
-</pre></div>
-
-<p>This will output the markup if the S_ROW_COUNT variable in the current iteration of loop is an even value (i.e. the expr is TRUE). You can use various comparison methods (standard as well as equivalent textual versions noted in square brackets) including (<code>not, or, and, eq, neq, is</code> should be used if possible for better readability):</p>
-
-<div class="codebox"><pre>
-== [eq]
-!= [neq, ne]
-&lt;&gt; (same as !=)
-!== (not equivalent in value and type)
-=== (equivalent in value and type)
-&gt; [gt]
-&lt; [lt]
-&gt;= [gte]
-&lt;= [lte]
-&amp;&amp; [and]
-|| [or]
-% [mod]
-! [not]
-+
--
-*
-/
-,
-&lt;&lt; (bitwise shift left)
-&gt;&gt; (bitwise shift right)
-| (bitwise or)
-^ (bitwise xor)
-&amp; (bitwise and)
-~ (bitwise not)
-is (can be used to join comparison operations)
-</pre></div>
-
-<p>Basic parenthesis can also be used to enforce good old BODMAS rules. Additionally some basic comparison types are defined:</p>
-
-<div class="codebox"><pre>
-even
-odd
-div
-</pre></div>
-
-<p>Beyond the simple use of IF you can also do a sequence of comparisons using the following:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- IF expr1 --&gt;</span>
-	markup
-<span class="comment">&lt;!-- ELSEIF expr2 --&gt;</span>
-	markup
-	&#46;
-	&#46;
-	&#46;
-<span class="comment">&lt;!-- ELSEIF exprN --&gt;</span>
-	markup
-<span class="comment">&lt;!-- ELSE --&gt;</span>
-	markup
-<span class="comment">&lt;!-- ENDIF --&gt;</span>
-</pre></div>
-
-<p>Each statement will be tested in turn and the relevant output generated when a match (if a match) is found. It is not necessary to always use ELSEIF, ELSE can be used alone to match &quot;everything else&quot;.<br /><br />So what can you do with all this? Well take for example the colouration of rows in viewforum. In 2.0.x row colours were predefined within the source as either row color1, row color2 or row class1, row class2. In 3.0.x this is moved to the template, it may look a little daunting at first but remember control flows from top to bottom and it's not too difficult:</p>
-
-<div class="codebox"><pre>
-&lt;table&gt;
-	<span class="comment">&lt;!-- IF loop&#46;S_ROW_COUNT is even --&gt;</span>
-		&lt;tr class=&quot;row1&quot;&gt;
-	<span class="comment">&lt;!-- ELSE --&gt;</span>
-		&lt;tr class=&quot;row2&quot;&gt;
-	<span class="comment">&lt;!-- ENDIF --&gt;</span>
-	&lt;td&gt;HELLO!&lt;/td&gt;
-&lt;/tr&gt;
-&lt;/table&gt;
-</pre></div>
-
-<p>This will cause the row cell to be output using class row1 when the row count is even, and class row2 otherwise. The S_ROW_COUNT parameter gets assigned to loops by default. Another example would be the following: </p>
-
-<div class="codebox"><pre>
-&lt;table&gt;
-	<span class="comment">&lt;!-- IF loop&#46;S_ROW_COUNT &gt; 10 --&gt;</span>
-		&lt;tr bgcolor=&quot;#FF0000&quot;&gt;
-	<span class="comment">&lt;!-- ELSEIF loop&#46;S_ROW_COUNT &gt; 5 --&gt;</span>
-		&lt;tr bgcolor=&quot;#00FF00&quot;&gt;
-	<span class="comment">&lt;!-- ELSEIF loop&#46;S_ROW_COUNT &gt; 2 --&gt;</span>
-		&lt;tr bgcolor=&quot;#0000FF&quot;&gt;
-	<span class="comment">&lt;!-- ELSE --&gt;</span>
-		&lt;tr bgcolor=&quot;#FF00FF&quot;&gt;
-	<span class="comment">&lt;!-- ENDIF --&gt;</span>
-	&lt;td&gt;hello!&lt;/td&gt;
-&lt;/tr&gt;
-&lt;/table&gt;
-</pre></div>
-
-<p>This will output the row cell in purple for the first two rows, blue for rows 2 to 5, green for rows 5 to 10 and red for remainder. So, you could produce a &quot;nice&quot; gradient effect, for example.<br /><br />What else can you do? Well, you could use IF to do common checks on for example the login state of a user:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- IF S_USER_LOGGED_IN --&gt;</span>
-	markup
-<span class="comment">&lt;!-- ENDIF --&gt;</span>
-</pre></div>
-
-<p>This replaces the existing (fudged) method in 2.0.x using a zero length array and BEGIN/END.</p>
-
-<h4>Extended syntax for Blocks/Loops</h4>
-
-<p>Back to our loops - they had been extended with the following additions. Firstly you can set the start and end points of the loop. For example:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- BEGIN loopname(2) --&gt;</span>
-	markup
-<span class="comment">&lt;!-- END loopname --&gt;</span>
-</pre></div>
-
-<p>Will start the loop on the third entry (note that indexes start at zero). Extensions of this are:
-<br /><br />
-<code>loopname(2)</code>: Will start the loop on the 3rd entry<br />
-<code>loopname(-2)</code>: Will start the loop two entries from the end<br />
-<code>loopname(3,4)</code>: Will start the loop on the fourth entry and end it on the fifth<br />
-<code>loopname(3,-4)</code>: Will start the loop on the fourth entry and end it four from last<br />
-</p>
-
-<p>A further extension to begin is BEGINELSE:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- BEGIN loop --&gt;</span>
-	markup
-<span class="comment">&lt;!-- BEGINELSE --&gt;</span>
-	markup
-<span class="comment">&lt;!-- END loop --&gt;</span>
-</pre></div>
-
-<p>This will cause the markup between <code>BEGINELSE</code> and <code>END</code> to be output if the loop contains no values. This is useful for forums with no topics (for example) ... in some ways it replaces &quot;bits of&quot; the existing &quot;switch_&quot; type control (the rest being replaced by conditionals).</p>
-
-<p>Another way of checking if a loop contains values is by prefixing the loops name with a dot:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- IF .loop --&gt;</span>
-	<span class="comment">&lt;!-- BEGIN loop --&gt;</span>
-		markup
-	<span class="comment">&lt;!-- END loop --&gt;</span>
-<span class="comment">&lt;!-- ELSE --&gt;</span>
-	markup
-<span class="comment">&lt;!-- ENDIF --&gt;</span>
-</pre></div>
-
-<p>You are even able to check the number of items within a loop by comparing it with values within the IF condition:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- IF .loop &gt; 2 --&gt;</span>
-	<span class="comment">&lt;!-- BEGIN loop --&gt;</span>
-		markup
-	<span class="comment">&lt;!-- END loop --&gt;</span>
-<span class="comment">&lt;!-- ELSE --&gt;</span>
-	markup
-<span class="comment">&lt;!-- ENDIF --&gt;</span>
-</pre></div>
-
-<p>Nesting loops cause the conditionals needing prefixed with all loops from the outer one to the inner most. An illustration of this:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- BEGIN firstloop --&gt;</span>
-	{firstloop.MY_VARIABLE_FROM_FIRSTLOOP}
-
-	<span class="comment">&lt;!-- BEGIN secondloop --&gt;</span>
-		{firstloop.secondloop.MY_VARIABLE_FROM_SECONDLOOP}
-	<span class="comment">&lt;!-- END secondloop --&gt;</span>
-<span class="comment">&lt;!-- END firstloop --&gt;</span>
-</pre></div>
-
-<p>Sometimes it is necessary to break out of nested loops to be able to call another loop within the current iteration. This sounds a little bit confusing and it is not used very often. The following (rather complex) example shows this quite good - it also shows how you test for the first and last row in a loop (i will explain the example in detail further down):</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- BEGIN l_block1 --&gt;</span>
-	<span class="comment">&lt;!-- IF l_block1.S_SELECTED --&gt;</span>
-		&lt;strong&gt;{l_block1.L_TITLE}&lt;/strong&gt;
-		<span class="comment">&lt;!-- IF S_PRIVMSGS --&gt;</span>
-
-			<span class="comment">&lt;!-- the ! at the beginning of the loop name forces the loop to be not a nested one of l_block1 --&gt;</span>
-			<span class="comment">&lt;!-- BEGIN !folder --&gt;</span>
-				<span class="comment">&lt;!-- IF folder.S_FIRST_ROW --&gt;</span>
-					&lt;ul class=&quot;nav&quot;&gt;
-				<span class="comment">&lt;!-- ENDIF --&gt;</span>
-
-				&lt;li&gt;&lt;a href=&quot;{folder.U_FOLDER}&quot;&gt;{folder.FOLDER_NAME}&lt;/a&gt;&lt;/li&gt;
-
-				<span class="comment">&lt;!-- IF folder.S_LAST_ROW --&gt;</span>
-					&lt;/ul&gt;
-				<span class="comment">&lt;!-- ENDIF --&gt;</span>
-			<span class="comment">&lt;!-- END !folder --&gt;</span>
-
-		<span class="comment">&lt;!-- ENDIF --&gt;</span>
-
-		&lt;ul class=&quot;nav&quot;&gt;
-		<span class="comment">&lt;!-- BEGIN l_block2 --&gt;</span>
-			&lt;li&gt;
-				<span class="comment">&lt;!-- IF l_block1.l_block2.S_SELECTED --&gt;</span>
-					&lt;strong&gt;{l_block1.l_block2.L_TITLE}&lt;/strong&gt;
-				<span class="comment">&lt;!-- ELSE --&gt;</span>
-					&lt;a href=&quot;{l_block1.l_block2.U_TITLE}&quot;&gt;{l_block1.l_block2.L_TITLE}&lt;/a&gt;
-				<span class="comment">&lt;!-- ENDIF --&gt;</span>
-			&lt;/li&gt;
-		<span class="comment">&lt;!-- END l_block2 --&gt;</span>
-		&lt;/ul&gt;
-	<span class="comment">&lt;!-- ELSE --&gt;</span>
-		&lt;a class=&quot;nav&quot; href=&quot;{l_block1.U_TITLE}&quot;&gt;{l_block1.L_TITLE}&lt;/a&gt;
-	<span class="comment">&lt;!-- ENDIF --&gt;</span>
-<span class="comment">&lt;!-- END l_block1 --&gt;</span>
-</pre></div>
-
-<p>Let us first concentrate on this part of the example:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- BEGIN l_block1 --&gt;</span>
-	<span class="comment">&lt;!-- IF l_block1.S_SELECTED --&gt;</span>
-		markup
-	<span class="comment">&lt;!-- ELSE --&gt;</span>
-		&lt;a class=&quot;nav&quot; href=&quot;{l_block1.U_TITLE}&quot;&gt;{l_block1.L_TITLE}&lt;/a&gt;
-	<span class="comment">&lt;!-- ENDIF --&gt;</span>
-<span class="comment">&lt;!-- END l_block1 --&gt;</span>
-</pre></div>
-
-<p>Here we open the loop l_block1 and doing some things if the value S_SELECTED within the current loop iteration is true, else we write the blocks link and title. Here, you see <code>{l_block1.L_TITLE}</code> referenced - you remember that L_* variables get automatically assigned the corresponding language entry? This is true, but not within loops. The L_TITLE variable within the loop l_block1 is assigned within the code itself.</p>
-
-<p>Let's have a closer look to the markup:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- BEGIN l_block1 --&gt;</span>
-.
-.
-	<span class="comment">&lt;!-- IF S_PRIVMSGS --&gt;</span>
-
-		<span class="comment">&lt;!-- BEGIN !folder --&gt;</span>
-			<span class="comment">&lt;!-- IF folder.S_FIRST_ROW --&gt;</span>
-				&lt;ul class=&quot;nav&quot;&gt;
-			<span class="comment">&lt;!-- ENDIF --&gt;</span>
-
-			&lt;li&gt;&lt;a href=&quot;{folder.U_FOLDER}&quot;&gt;{folder.FOLDER_NAME}&lt;/a&gt;&lt;/li&gt;
-
-			<span class="comment">&lt;!-- IF folder.S_LAST_ROW --&gt;</span>
-				&lt;/ul&gt;
-			<span class="comment">&lt;!-- ENDIF --&gt;</span>
-		<span class="comment">&lt;!-- END !folder --&gt;</span>
-
-	<span class="comment">&lt;!-- ENDIF --&gt;</span>
-.
-.
-<span class="comment">&lt;!-- END l_block1 --&gt;</span>
-</pre></div>
-
-<p>The <code>&lt;!-- IF S_PRIVMSGS --&gt;</code> statement clearly checks a global variable and not one within the loop, since the loop is not given here. So, if S_PRIVMSGS is true we execute the shown markup. Now, you see the <code>&lt;!-- BEGIN !folder --&gt;</code> statement. The exclamation mark is responsible for instructing the template engine to iterate through the main loop folder. So, we are now within the loop folder - with <code>&lt;!-- BEGIN folder --&gt;</code> we would have been within the loop <code>l_block1.folder</code> automatically as is the case with l_block2:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- BEGIN l_block1 --&gt;</span>
-.
-.
-	&lt;ul class=&quot;nav&quot;&gt;
-	<span class="comment">&lt;!-- BEGIN l_block2 --&gt;</span>
-		&lt;li&gt;
-			<span class="comment">&lt;!-- IF l_block1.l_block2.S_SELECTED --&gt;</span>
-				&lt;strong&gt;{l_block1.l_block2.L_TITLE}&lt;/strong&gt;
-			<span class="comment">&lt;!-- ELSE --&gt;</span>
-				&lt;a href=&quot;{l_block1.l_block2.U_TITLE}&quot;&gt;{l_block1.l_block2.L_TITLE}&lt;/a&gt;
-			<span class="comment">&lt;!-- ENDIF --&gt;</span>
-		&lt;/li&gt;
-	<span class="comment">&lt;!-- END l_block2 --&gt;</span>
-	&lt;/ul&gt;
-.
-.
-<span class="comment">&lt;!-- END l_block1 --&gt;</span>
-</pre></div>
-
-<p>You see the difference? The loop l_block2 is a member of the loop l_block1 but the loop folder is a main loop.</p>
-
-<p>Now back to our folder loop:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- IF folder.S_FIRST_ROW --&gt;</span>
-	&lt;ul class=&quot;nav&quot;&gt;
-<span class="comment">&lt;!-- ENDIF --&gt;</span>
-
-&lt;li&gt;&lt;a href=&quot;{folder.U_FOLDER}&quot;&gt;{folder.FOLDER_NAME}&lt;/a&gt;&lt;/li&gt;
-
-<span class="comment">&lt;!-- IF folder.S_LAST_ROW --&gt;</span>
-	&lt;/ul&gt;
-<span class="comment">&lt;!-- ENDIF --&gt;</span>
-</pre></div>
-
-<p>You may have wondered what the comparison to S_FIRST_ROW and S_LAST_ROW is about. If you haven't guessed already - it is checking for the first iteration of the loop with <code>S_FIRST_ROW</code> and the last iteration with <code>S_LAST_ROW</code>. This can come in handy quite often if you want to open or close design elements, like the above list. Let us imagine a folder loop build with three iterations, it would go this way:</p>
-
-<div class="codebox"><pre>
-&lt;ul class=&quot;nav&quot;&gt; <span class="comment">&lt;!-- written on first iteration --&gt;</span>
-	&lt;li&gt;first element&lt;/li&gt; <span class="comment">&lt;!-- written on first iteration --&gt;</span>
-	&lt;li&gt;second element&lt;/li&gt; <span class="comment">&lt;!-- written on second iteration --&gt;</span>
-	&lt;li&gt;third element&lt;/li&gt; <span class="comment">&lt;!-- written on third iteration --&gt;</span>
-&lt;/ul&gt; <span class="comment">&lt;!-- written on third iteration --&gt;</span>
-</pre></div>
-
-<p>As you can see, all three elements are written down as well as the markup for the first iteration and the last one. Sometimes you want to omit writing the general markup - for example:</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- IF folder.S_FIRST_ROW --&gt;</span>
-	&lt;ul class=&quot;nav&quot;&gt;
-<span class="comment">&lt;!-- ELSEIF folder.S_LAST_ROW --&gt;</span>
-	&lt;/ul&gt;
-<span class="comment">&lt;!-- ELSE --&gt;</span>
-	&lt;li&gt;&lt;a href=&quot;{folder.U_FOLDER}&quot;&gt;{folder.FOLDER_NAME}&lt;/a&gt;&lt;/li&gt;
-<span class="comment">&lt;!-- ENDIF --&gt;</span>
-</pre></div>
-
-<p>would result in the following markup:</p>
-
-<div class="codebox"><pre>
-&lt;ul class=&quot;nav&quot;&gt; <span class="comment">&lt;!-- written on first iteration --&gt;</span>
-	&lt;li&gt;second element&lt;/li&gt; <span class="comment">&lt;!-- written on second iteration --&gt;</span>
-&lt;/ul&gt; <span class="comment">&lt;!-- written on third iteration --&gt;</span>
-</pre></div>
-
-<p>Just always remember that processing is taking place from up to down.</p>
-
-	<h4>Forms</h4>
-		<p>If a form is used for a non-trivial operation (i.e. more than a jumpbox), then it should include the <code>{S_FORM_TOKEN}</code> template variable.</p>
-		<div class="codebox"><pre>
-&lt;form method=&quot;post&quot; id=&quot;mcp&quot; action=&quot;{U_POST_ACTION}&quot;&gt;
-
-	&lt;fieldset class="submit-buttons"&gt;
-		&lt;input type=&quot;reset&quot; value=&quot;{L_RESET}&quot; name=&quot;reset&quot; class=&quot;button2&quot; /&gt&nbsp;
-		&lt;input type=&quot;submit&quot; name=&quot;action[add_warning]&quot; value=&quot;{L_SUBMIT}&quot; class=&quot;button1&quot; /&gt
-		{S_FORM_TOKEN}
-	&lt;/fieldset&gt
-&lt;/form&gt
-		</pre></div><br />
-
-	<a name="inheritance"></a><h3>4.ii. Template Inheritance</h3>
-		<p>When basing a new template on an existing one, it is not necessary to provide all template files. By declaring the template  to be &quot;<strong>inheriting</strong>&quot; in the template configuration file.</p>
-
-		<p>The limitation on this is that the base style has to be installed and complete, meaning that it is not itself inheriting.</p>
-
-		<p>The effect of doing so is that the template engine will use the files in the new template where they exist, but fall back to files in the base template otherwise. Declaring a style to be inheriting also causes it to use some of the configuration settings of the base style, notably database storage.</p>
-
-		<p>We strongly encourage the use of inheritance for styles based on the bundled styles, as it will ease the update procedure.</p>
-
-		<div class="codebox"><pre>
-        # General Information about this template
-        name = inherits
-        copyright = &copy; phpBB Group, 2007
-        version = 3.0.3
-
-        # Defining a different template bitfield
-        template_bitfield = lNg=
-
-        # Are we inheriting?
-        inherit_from = prosilver
-		</pre></div>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-
-
-<a name="charsets"></a><h2>5. Character Sets and Encodings</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-
-
-<h4>What are Unicode, UCS and UTF-8?</h4>
-<p>The <a href="http://en.wikipedia.org/wiki/Universal_Character_Set">Universal Character Set (UCS)</a> described in ISO/IEC 10646 consists of a large amount of characters. Each of them has a unique name and a code point which is an integer number. <a href="http://en.wikipedia.org/wiki/Unicode">Unicode</a> - which is an industry standard - complements the Universal Character Set with further information about the characters' properties and alternative character encodings. More information on Unicode can be found on the <a href="http://www.unicode.org/">Unicode Consortium's website</a>. One of the Unicode encodings is the <a href="http://en.wikipedia.org/wiki/UTF-8">8-bit Unicode Transformation Format (UTF-8)</a>. It encodes characters with up to four bytes aiming for maximum compatibility with the <a href="http://en.wikipedia.org/wiki/ASCII">American Standard Code for Information Interchange</a> which is a 7-bit encoding of a relatively small subset of the UCS.</p>
-
-<h4>phpBB's use of Unicode</h4>
-<p>Unfortunately PHP does not faciliate the use of Unicode prior to version 6. Most functions simply treat strings as sequences of bytes assuming that each character takes up exactly one byte. This behaviour still allows for storing UTF-8 encoded text in PHP strings but many operations on strings have unexpected results. To circumvent this problem we have created some alternative functions to PHP's native string operations which use code points instead of bytes. These functions can be found in <code>/includes/utf/utf_tools.php</code>. They are also covered in the <a href="http://area51.phpbb.com/docs/code/">phpBB3 Sourcecode Documentation</a>. A lot of native PHP functions still work with UTF-8 as long as you stick to certain restrictions. For example <code>explode</code> still works as long as the first and the last character of the delimiter string are ASCII characters.</p>
-
-<p>phpBB only uses the ASCII and the UTF-8 character encodings. Still all Strings are UTF-8 encoded because ASCII is a subset of UTF-8. The only exceptions to this rule are code sections which deal with external systems which use other encodings and character sets. Such external data should be converted to UTF-8 using the <code>utf8_recode()</code> function supplied with phpBB. It supports a variety of other character sets and encodings, a full list can be found below.</p>
-
-<p>With <code>request_var()</code> you can either allow all UCS characters in user input or restrict user input to ASCII characters. This feature is controlled by the function's third parameter called <code>$multibyte</code>. You should allow multibyte characters in posts, PMs, topic titles, forum names, etc. but it's not necessary for internal uses like a <code>$mode</code> variable which should only hold a predefined list of ASCII strings anyway.</p>
-
-<div class="codebox"><pre>
-// an input string containing a multibyte character
-$_REQUEST['multibyte_string'] = 'K&#228;se';
-
-// print request variable as a UTF-8 string allowing multibyte characters
-echo request_var('multibyte_string', '', true);
-// print request variable as ASCII string
-echo request_var('multibyte_string', '');
-</pre></div>
-
-<p>This code snippet will generate the following output:</p>
-
-<div class="codebox"><pre>
-K&#228;se
-K??se
-</pre></div>
-
-<h4>Unicode Normalization</h4>
-
-<p>If you retrieve user input with multibyte characters you should additionally normalize the string using <code>utf8_normalize_nfc()</code> before you work with it. This is necessary to make sure that equal characters can only occur in one particular binary representation. For example the character &#197; can be represented either as <code>U+00C5</code> (LATIN CAPITAL LETTER A WITH RING ABOVE) or as <code>U+212B</code> (ANGSTROM SIGN). phpBB uses Normalization Form Canonical Composition (NFC) for all text. So the correct version of the above example would look like this:</p>
-
-<div class="codebox"><pre>
-$_REQUEST['multibyte_string'] = 'K&#228;se';
-
-// normalize multibyte strings
-echo utf8_normalize_nfc(request_var('multibyte_string', '', true));
-// ASCII strings do not need to be normalized
-echo request_var('multibyte_string', '');
-</pre></div>
-
-<h4>Case Folding</h4>
-
-<p>Case insensitive comparison of strings is no longer possible with <code>strtolower</code> or <code>strtoupper</code> as some characters have multiple lower case or multiple upper case forms depending on their position in a word. The <code>utf8_strtolower</code> and the <code>utf8_strtoupper</code> functions suffer from the same problem so they can only be used to display upper/lower case versions of a string but they cannot be used for case insensitive comparisons either. So instead you should use case folding which gives you a case insensitive version of the string which can be used for case insensitive comparisons. An NFC normalized string can be case folded using <code>utf8_case_fold_nfc()</code>.</p>
-
-<p class="bad">// Bad - The strings might be the same even if strtolower differs</p>
-
-<div class="codebox"><pre>
-if (strtolower($string1) == strtolower($string2))
-{
-	echo '$string1 and $string2 are equal or differ in case';
-}
-</pre></div>
-
-<p class="good">// Good - Case folding is really case insensitive</p>
-
-<div class="codebox"><pre>
-if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
-{
-	echo '$string1 and $string2 are equal or differ in case';
-}
-</pre></div>
-
-<h4>Confusables Detection</h4>
-
-<p>phpBB offers a special method <code>utf8_clean_string</code> which can be used to make sure string identifiers are unique. This method uses Normalization Form Compatibility Composition (NFKC) instead of NFC and replaces similarly looking characters with a particular representative of the equivalence class. This method is currently used for usernames and group names to avoid confusion with similarly looking names.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="translation"></a><h2>6. Translation (<abbr title="Internationalisation">i18n</abbr>/<abbr title="Localisation">L10n</abbr>) Guidelines</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<a name="standardisation"></a><h3>6.i. Standardisation</h3>
-
-	<h4>Reason:</h4>
-
-	<p>phpBB is one of the most translated open-source projects, with the current stable version being available in over 60 localisations. Whilst the ad hoc approach to the naming of language packs has worked, for phpBB3 and beyond we hope to make this process saner which will allow for better interoperation with current and future web browsers.</p>
-
-	<h4>Encoding:</h4>
-
-	<p>With phpBB3, the output encoding for the forum in now UTF-8, a Universal Character Encoding by the Unicode Consortium that is by design a superset to US-ASCII and ISO-8859-1. By using one character set which simultaenously supports all scripts which previously would have required different encodings (eg: ISO-8859-1 to ISO-8859-15 (Latin, Greek, Cyrillic, Thai, Hebrew, Arabic); GB2312 (Simplified Chinese); Big5 (Traditional Chinese), EUC-JP (Japanese), EUC-KR (Korean), VISCII (Vietnamese); et cetera), this removes the need to convert between encodings and improves the accessibility of multilingual forums.</p>
-
-	<p>The impact is that the language files for phpBB must now also be encoded as UTF-8, with a caveat that the files must <strong>not contain</strong> a <acronym title="Byte-Order-Mark">BOM</acronym> for compatibility reasons with non-Unicode aware versions of PHP. For those with forums using the Latin character set (ie: most European languages), this change is transparent since UTF-8 is superset to US-ASCII and ISO-8859-1.</p>
-
-	<h4>Language Tag:</h4>
-
-	<p>The <abbr title="Internet Engineering Task Force">IETF</abbr> recently published <a href="http://tools.ietf.org/html/rfc4646">RFC 4646</a> for tags used to identify languages, which in combination with <a href="http://tools.ietf.org/html/rfc4647">RFC 4647</a> obseletes the older <a href="http://tools.ietf.org/html/rfc3066">RFC 3006</a> and older-still <a href="http://tools.ietf.org/html/rfc1766">RFC 1766</a>. <a href="http://tools.ietf.org/html/rfc4646">RFC 4646</a> uses <a href="http://www.loc.gov/standards/iso639-2/php/English_list.php">ISO 639-1/ISO 639-2</a>, <a href="http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">ISO 3166-1 alpha-2</a>, <a href="http://www.unicode.org/iso15924/iso15924-codes.html">ISO 15924</a> and <a href="http://unstats.un.org/unsd/methods/m49/m49.htm">UN M.49</a> to define a language tag. Each complete tag is composed of subtags which are not case sensitive and can also be empty.</p>
-
-	<p>Ordering of the subtags in the case that they are all non-empty is: <code>language</code>-<code>script</code>-<code>region</code>-<code>variant</code>-<code>extension</code>-<code>privateuse</code>. Should any subtag be empty, its corresponding hyphen would also be ommited. Thus, the language tag for English will be <code>en</code> <strong>and not</strong> <code>en-----</code>.</p>
-
-	<p>Most language tags consist of a two- or three-letter language subtag (from <a href="http://www.loc.gov/standards/iso639-2/php/English_list.php">ISO 639-1/ISO 639-2</a>). Sometimes, this is followed by a two-letter or three-digit region subtag (from <a href="http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">ISO 3166-1 alpha-2</a> or <a href="http://unstats.un.org/unsd/methods/m49/m49.htm">UN M.49</a>). Some examples are:</p>
-
-	<table summary="Examples of various possible language tags as described by RFC 4646 and RFC 4647">
-	<caption>Language tag examples</caption>
-	<thead>
-	<tr>
-		<th scope="col">Language tag</th>
-		<th scope="col">Description</th>
-		<th scope="col">Component subtags</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td><code>en</code></td>
-		<td>English</td>
-		<td><code>language</code></td>
-	</tr>
-	<tr>
-		<td><code>mas</code></td>
-		<td>Masai</td>
-		<td><code>language</code></td>
-	</tr>
-	<tr>
-		<td><code>fr-CA</code></td>
-		<td>French as used in Canada</td>
-		<td><code>language</code>+<code>region</code></td>
-	</tr>
-	<tr>
-		<td><code>en-833</code></td>
-		<td>English as used in the Isle of Man</td>
-		<td><code>language</code>+<code>region</code></td>
-	</tr>
-	<tr>
-		<td><code>zh-Hans</code></td>
-		<td>Chinese written with Simplified script</td>
-		<td><code>language</code>+<code>script</code></td>
-	</tr>
-	<tr>
-		<td><code>zh-Hant-HK</code></td>
-		<td>Chinese written with Traditional script as used in Hong Kong</td>
-		<td><code>language</code>+<code>script</code>+<code>region</code></td>
-	</tr>
-	<tr>
-		<td><code>de-AT-1996</code></td>
-		<td>German as used in Austria with 1996 orthography</td>
-		<td><code>language</code>+<code>region</code>+<code>variant</code></td>
-	</tr>
-	</tbody>
-	</table>
-
-	<p>The ultimate aim of a language tag is to convey the needed <strong>useful distingushing information</strong>, whilst keeping it as <strong>short as possible</strong>. So for example, use <code>en</code>, <code>fr</code> and <code>ja</code> as opposed to <code>en-GB</code>, <code>fr-FR</code> and <code>ja-JP</code>, since we know English, French and Japanese are the native language of Great Britain, France and Japan respectively.</p>
-
-	<p>Next is the <a href="http://www.unicode.org/iso15924/iso15924-codes.html">ISO 15924</a> language script code and when one should or shouldn't use it. For example, whilst <code>en-Latn</code> is syntaxically correct for describing English written with Latin script, real world English writing is <strong>more-or-less exclusively in the Latin script</strong>. For such languages like English that are written in a single script, the <a href="http://www.iana.org/assignments/language-subtag-registry"><abbr title="Internet Assigned Numbers Authority">IANA</abbr> Language Subtag Registry</a> has a "Suppress-Script" field meaning the script code <strong>should be ommitted</strong> unless a specific language tag requires a specific script code. Some languages are <strong>written in more than one script</strong> and in such cases, the script code <strong>is encouraged</strong> since an end-user may be able to read their language in one script, but not the other. Some examples are:</p>
-
-	<table summary="Examples of using a language subtag in combination with a script subtag">
-	<caption>Language subtag + script subtag examples</caption>
-	<thead>
-	<tr>
-		<th scope="col">Language tag</th>
-		<th scope="col">Description</th>
-		<th scope="col">Component subtags</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td><code>en-Brai</code></td>
-		<td>English written in Braille script</td>
-		<td><code>language</code>+<code>script</code></td>
-	</tr>
-	<tr>
-		<td><code>en-Dsrt</code></td>
-		<td>English written in Deseret (Mormon) script</td>
-		<td><code>language</code>+<code>script</code></td>
-	</tr>
-	<tr>
-		<td><code>sr-Latn</code></td>
-		<td>Serbian written in Latin script</td>
-		<td><code>language</code>+<code>script</code></td>
-	</tr>
-	<tr>
-		<td><code>sr-Cyrl</code></td>
-		<td>Serbian written in Cyrillic script</td>
-		<td><code>language</code>+<code>script</code></td>
-	</tr>
-	<tr>
-		<td><code>mn-Mong</code></td>
-		<td>Mongolian written in Mongolian script</td>
-		<td><code>language</code>+<code>script</code></td>
-	</tr>
-	<tr>
-		<td><code>mn-Cyrl</code></td>
-		<td>Mongolian written in Cyrillic script</td>
-		<td><code>language</code>+<code>script</code></td>
-	</tr>
-	<tr>
-		<td><code>mn-Phag</code></td>
-		<td>Mongolian written in Phags-pa script</td>
-		<td><code>language</code>+<code>script</code></td>
-	</tr>
-	<tr>
-		<td><code>az-Cyrl-AZ</code></td>
-		<td>Azerbaijani written in Cyrillic script as used in Azerbaijan</td>
-		<td><code>language</code>+<code>script</code>+<code>region</code></td>
-	</tr>
-	<tr>
-		<td><code>az-Latn-AZ</code></td>
-		<td>Azerbaijani written in Latin script as used in Azerbaijan</td>
-		<td><code>language</code>+<code>script</code>+<code>region</code></td>
-	</tr>
-	<tr>
-		<td><code>az-Arab-IR</code></td>
-		<td>Azerbaijani written in Arabic script as used in Iran</td>
-		<td><code>language</code>+<code>script</code>+<code>region</code></td>
-	</tr>
-	</tbody>
-	</table>
-
-	<p>Usage of the three-digit <a href="http://unstats.un.org/unsd/methods/m49/m49.htm">UN M.49</a> code over the two-letter <a href="http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">ISO 3166-1 alpha-2</a> code should hapen if a macro-geographical entity is required and/or the <a href="http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">ISO 3166-1 alpha-2</a> is ambiguous.</p>
-
-	<p>Examples of English using marco-geographical regions:</p>
-
-	<table summary="Examples for English of ISO 3166-1 alpha-2 vs. UN M.49 code">
-	<caption>Coding for English using macro-geographical regions</caption>
-	<thead>
-	<tr>
-		<th scope="col">ISO 639-1/ISO 639-2 + ISO 3166-1 alpha-2</th>
-		<th scope="col" colspan="2">ISO 639-1/ISO 639-2 + UN M.49 (Example macro regions)</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td><dl><dt><code>en-AU</code></dt><dd>English as used in <strong>Australia</strong></dd></dl></td>
-		<td rowspan="2"><dl><dt><code>en-053</code></dt><dd>English as used in <strong>Australia &amp; New Zealand</strong></dd></dl></td>
-		<td rowspan="3"><dl><dt><code>en-009</code></dt><dd>English as used in <strong>Oceania</strong></dd></dl></td>
-	</tr>
-	<tr>
-		<td><dl><dt><code>en-NZ</code></dt><dd>English as used in <strong>New Zealand</strong></dd></dl></td>
-	</tr>
-	<tr>
-		<td><dl><dt><code>en-FJ</code></dt><dd>English as used in <strong>Fiji</strong></dd></dl></td>
-		<td><dl><dt><code>en-054 </code></dt><dd>English as used in <strong>Melanesia</strong></dd></dl></td>
-	</tr>
-	</tbody>
-	</table>
-
-	<p>Examples of Spanish using marco-geographical regions:</p>
-
-	<table summary="Examples for Spanish of ISO 3166-1 alpha-2 vs. UN M.49 code">
-	<caption>Coding for Spanish macro-geographical regions</caption>
-	<thead>
-	<tr>
-		<th scope="col">ISO 639-1/ISO 639-2 + ISO 3166-1 alpha-2</th>
-		<th scope="col" colspan="2">ISO 639-1/ISO 639-2 + UN M.49 (Example macro regions)</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td><dl><dt><code>es-PR</code></dt><dd>Spanish as used in <strong>Puerto Rico</strong></dd></dl></td>
-		<td rowspan="3"><dl><dt><code>es-419</code></dt><dd>Spanish as used in <strong>Latin America &amp; the Caribbean</strong></dd></dl></td>
-		<td rowspan="4"><dl><dt><code>es-019</code></dt><dd>Spanish as used in <strong>the Americas</strong></dd></dl></td>
-	</tr>
-	<tr>
-		<td><dl><dt><code>es-HN</code></dt><dd>Spanish as used in <strong>Honduras</strong></dd></dl></td>
-	</tr>
-	<tr>
-		<td><dl><dt><code>es-AR</code></dt><dd>Spanish as used in <strong>Argentina</strong></dd></dl></td>
-	</tr>
-	<tr>
-		<td><dl><dt><code>es-US</code></dt><dd>Spanish as used in <strong>United States of America</strong></dd></dl></td>
-		<td><dl><dt><code>es-021</code></dt><dd>Spanish as used in <strong>North America</strong></dd></dl></td>
-	</tr>
-	</tbody>
-	</table>
-
-	<p>Example of where the <a href="http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">ISO 3166-1 alpha-2</a> is ambiguous and why <a href="http://unstats.un.org/unsd/methods/m49/m49.htm">UN M.49</a> might be preferred:</p>
-
-	<table summary="Example where the ISO 3166-1 alpha-2 is ambiguous">
-	<caption>Coding for ambiguous ISO 3166-1 alpha-2 regions</caption>
-	<thead>
-	<tr>
-		<th scope="col" colspan="2"><code>CS</code> assignment pre-1994</th>
-		<th scope="col" colspan="2"><code>CS</code> assignment post-1994</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td colspan="2">
-		<dl>
-		<dt><code>CS</code></dt><dd><strong>Czechoslovakia</strong> (ISO 3166-1)</dd>
-		<dt><code>200</code></dt><dd><strong>Czechoslovakia</strong> (UN M.49)</dd>
-		</dl>
-		</td>
-		<td colspan="2">
-		<dl>
-		<dt><code>CS</code></dt><dd><strong>Serbian &amp; Montenegro</strong> (ISO 3166-1)</dd>
-		<dt><code>891</code></dt><dd><strong>Serbian &amp; Montenegro</strong> (UN M.49)</dd>
-		</dl>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<dl>
-		<dt><code>CZ</code></dt><dd><strong>Czech Republic</strong> (ISO 3166-1)</dd>
-		<dt><code>203</code></dt><dd><strong>Czech Republic</strong> (UN M.49)</dd>
-		</dl>
-		</td>
-		<td>
-		<dl>
-		<dt><code>SK</code></dt><dd><strong>Slovakia</strong> (ISO 3166-1)</dd>
-		<dt><code>703</code></dt><dd><strong>Slovakia</strong> (UN M.49)</dd>
-		</dl>
-		</td>
-		<td>
-		<dl>
-		<dt><code>RS</code></dt><dd><strong>Serbia</strong> (ISO 3166-1)</dd>
-		<dt><code>688</code></dt><dd><strong>Serbia</strong> (UN M.49)</dd>
-		</dl>
-		</td>
-		<td>
-		<dl>
-		<dt><code>ME</code></dt><dd><strong>Montenegro</strong> (ISO 3166-1)</dd>
-		<dt><code>499</code></dt><dd><strong>Montenegro</strong> (UN M.49)</dd>
-		</dl>
-		</td>
-	</tr>
-	</tbody>
-	</table>
-
-	<h4>Macro-languages &amp; Topolects:</h4>
-
-	<p><a href="http://tools.ietf.org/html/rfc4646">RFC 4646</a> anticipates features which shall be available in (currently draft) <a href="http://www.sil.org/iso639-3/">ISO 639-3</a> which aims to provide as complete enumeration of languages as possible, including living, extinct, ancient and constructed languages, whether majour, minor or unwritten. A new feature of <a href="http://www.sil.org/iso639-3/">ISO 639-3</a> compared to the previous two revisions is the concept of <a href="http://www.sil.org/iso639-3/macrolanguages.asp">macrolanguages</a> where Arabic and Chinese are two such examples. In such cases, their respective codes of <code>ar</code> and <code>zh</code> is very vague as to which dialect/topolect is used or perhaps some terse classical variant which may be difficult for all but very educated users. For such macrolanguages, it is recommended that the sub-language tag is used as a suffix to the macrolanguage tag, eg:</p>
-
-	<table summary="Examples of macrolanguages used with sub-language subtags">
-	<caption>Macrolanguage subtag + sub-language subtag examples</caption>
-	<thead>
-	<tr>
-		<th scope="col">Language tag</th>
-		<th scope="col">Description</th>
-		<th scope="col">Component subtags</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td><code>zh-cmn</code></td>
-		<td>Mandarin (Putonghau/Guoyu) Chinese</td>
-		<td><code>macrolanguage</code>+<code>sublanguage</code></td>
-	</tr>
-	<tr>
-		<td><code>zh-yue</code></td>
-		<td>Yue (Cantonese) Chinese</td>
-		<td><code>macrolanguage</code>+<code>sublanguage</code></td>
-	</tr>
-	<tr>
-		<td><code>zh-cmn-Hans</code></td>
-		<td>Mandarin (Putonghau/Guoyu) Chinese written in Simplified script</td>
-		<td><code>macrolanguage</code>+<code>sublanguage</code>+<code>script</code></td>
-	</tr>
-	<tr>
-		<td><code>zh-cmn-Hant</code></td>
-		<td>Mandarin (Putonghau/Guoyu) Chinese written in Traditional script</td>
-		<td><code>macrolanguage</code>+<code>sublanguage</code>+<code>script</code></td>
-	</tr>
-	<tr>
-		<td><code>zh-nan-Latn-TW</code></td>
-		<td>Minnan (Hoklo) Chinese written in Latin script (POJ Romanisation) as used in Taiwan</td>
-		<td><code>macrolanguage</code>+<code>sublanguage</code>+<code>script</code>+<code>region</code></td>
-	</tr>
-	</tbody>
-	</table>
-
-	<a name="otherconsiderations"></a><h3>6.ii. Other considerations</h3>
-
-	<h4>Normalisation of language tags for phpBB:</h4>
-
-	<p>For phpBB, the language tags are <strong>not</strong> used in their raw form and instead converted to all lower-case and have the hyphen <code>-</code> replaced with an underscore <code>_</code> where appropriate, with some examples below:</p>
-
-	<table summary="Normalisation of language tags for usage in phpBB">
-	<caption>Language tag normalisation examples</caption>
-	<thead>
-	<tr>
-		<th scope="col">Raw language tag</th>
-		<th scope="col">Description</th>
-		<th scope="col">Value of <code>USER_LANG</code><br />in <code>./common.php</code></th>
-		<th scope="col">Language pack directory<br />name in <code>/language/</code></th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td><code>en</code></td>
-		<td>British English</td>
-		<td><code>en</code></td>
-		<td><code>en</code></td>
-	</tr>
-	<tr>
-		<td><code>de-AT</code></td>
-		<td>German as used in Austria</td>
-		<td><code>de-at</code></td>
-		<td><code>de_at</code></td>
-	</tr>
-	<tr>
-		<td><code>es-419</code></td>
-		<td>Spanish as used in Latin America &amp; Caribbean</td>
-		<td><code>en-419</code></td>
-		<td><code>en_419</code></td>
-	</tr>
-	<tr>
-		<td><code>zh-yue-Hant-HK</code></td>
-		<td>Cantonese written in Traditional script as used in Hong Kong</td>
-		<td><code>zh-yue-hant-hk</code></td>
-		<td><code>zh_yue_hant_hk</code></td>
-	</tr>
-	</tbody>
-	</table>
-
-	<h4>How to use <code>iso.txt</code>:</h4>
-
-	<p>The <code>iso.txt</code> file is a small UTF-8 encoded plain-text file which consists of three lines:</p>
-
-	<ol>
-		<li><code>Language's English name</code></li>
-		<li><code>Language's local name</code></li>
-		<li><code>Authors information</code></li>
-	</ol>
-
-	<p><code>iso.txt</code> is automatically generated by the language pack submission system on phpBB.com. You don't have to create this file yourself if you plan on releasing your language pack on phpBB.com, but do keep in mind that phpBB itself does require this file to be present.</p>
-
-	<p>Because language tags themselves are meant to be machine read, they can be rather obtuse to humans and why descriptive strings as provided by <code>iso.txt</code> are needed. Whilst <code>en-US</code> could be fairly easily deduced to be "English as used in the United States", <code>de-CH</code> is more difficult less one happens to know that <code>de</code> is from "<span lang="de">Deutsch</span>", German for "German" and <code>CH</code> is the abbreviation of the official Latin name for Switzerland, "<span lang="la">Confoederatio Helvetica</span>".</p>
-
-	<p>For the English language description, the language name is always first and any additional attributes required to describe the subtags within the language code are then listed in order separated with commas and enclosed within parentheses, eg:</p>
-
-	<table summary="English language description examples of iso.txt for usage in phpBB">
-	<caption>English language description examples for iso.txt</caption>
-	<thead>
-	<tr>
-		<th scope="col">Raw language tag</th>
-		<th scope="col">English description within <code>iso.txt</code></th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td><code>en</code></td>
-		<td>British English</td>
-	</tr>
-	<tr>
-		<td><code>en-US</code></td>
-		<td>English (United States)</td>
-	</tr>
-	<tr>
-		<td><code>en-053</code></td>
-		<td>English (Australia &amp; New Zealand)</td>
-	</tr>
-	<tr>
-		<td><code>de</code></td>
-		<td>German</td>
-	</tr>
-	<tr>
-		<td><code>de-CH-1996</code></td>
-		<td>German (Switzerland, 1996 orthography)</td>
-	</tr>
-	<tr>
-		<td><code>gws-1996</code></td>
-		<td>Swiss German (1996 orthography)</td>
-	</tr>
-	<tr>
-		<td><code>zh-cmn-Hans-CN</code></td>
-		<td>Mandarin Chinese (Simplified, Mainland China)</td>
-	</tr>
-	<tr>
-		<td><code>zh-yue-Hant-HK</code></td>
-		<td>Cantonese Chinese (Traditional, Hong Kong)</td>
-	</tr>
-	</tbody>
-	</table>
-
-	<p>For the localised language description, just translate the English version though use whatever appropriate punctuation typical for your own locale, assuming the language uses punctuation at all.</p>
-
-	<h4>Unicode bi-directional considerations:</h4>
-
-	<p>Because phpBB is now UTF-8, all translators must take into account that certain strings may be shown when the directionality of the document is either opposite to normal or is ambiguous.</p>
-
-	<p>The various Unicode control characters for bi-directional text and their HTML enquivalents where appropriate are as follows:</p>
-
-	<table summary="Table of the various Unicode bidirectional control characters">
-	<caption>Unicode bidirectional control characters &amp; HTML elements/entities</caption>
-	<thead>
-	<tr>
-		<th scope="col">Unicode character<br />abbreviation</th>
-		<th scope="col">Unicode<br />code-point</th>
-		<th scope="col">Unicode character<br />name</th>
-		<th scope="col">Equivalent HTML<br />markup/entity</th>
-		<th scope="col">Raw character<br />(enclosed between '')</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td><code>LRM</code></td>
-		<td><code>U+200E</code></td>
-		<td>Left-to-Right Mark</td>
-		<td><code>&amp;lrm;</code></td>
-		<td>'&#x200E;'</td>
-	</tr>
-	<tr>
-		<td><code>RLM</code></td>
-		<td><code>U+200F</code></td>
-		<td>Right-to-Left Mark</td>
-		<td><code>&amp;rlm;</code></td>
-		<td>'&#x200F;'</td>
-	</tr>
-	<tr>
-		<td><code>LRE</code></td>
-		<td><code>U+202A</code></td>
-		<td>Left-to-Right Embedding</td>
-		<td><code>dir=&quot;ltr&quot;</code></td>
-		<td>'&#x202A;'</td>
-	</tr>
-	<tr>
-		<td><code>RLE</code></td>
-		<td><code>U+202B</code></td>
-		<td>Right-to-Left Embedding</td>
-		<td><code>dir=&quot;rtl&quot;</code></td>
-		<td>'&#x202B;'</td>
-	</tr>
-	<tr>
-		<td><code>PDF</code></td>
-		<td><code>U+202C</code></td>
-		<td>Pop Directional Formatting</td>
-		<td><code>&lt;/bdo&gt;</code></td>
-		<td>'&#x202C;'</td>
-	</tr>
-	<tr>
-		<td><code>LRO</code></td>
-		<td><code>U+202D</code></td>
-		<td>Left-to-Right Override</td>
-		<td><code>&lt;bdo dir=&quot;ltr&quot;&gt;</code></td>
-		<td>'&#x202D;'</td>
-	</tr>
-	<tr>
-		<td><code>RLO</code></td>
-		<td><code>U+202E</code></td>
-		<td>Right-to-Left Override</td>
-		<td><code>&lt;bdo dir=&quot;rtl&quot;&gt;</code></td>
-		<td>'&#x202E;'</td>
-	</tr>
-	</tbody>
-	</table>
-
-	<p>For <code>iso.txt</code>, the directionality of the text can be explicitly set using special Unicode characters via any of the three methods provided by left-to-right/right-to-left markers/embeds/overrides, as without them, the ordering of characters will be incorrect, eg:</p>
-
-	<table summary="Effect of using Unicode bidirectional control characters within iso.txt">
-	<caption>Unicode bidirectional control characters iso.txt</caption>
-	<thead>
-	<tr>
-		<th scope="col">Directionality</th>
-		<th scope="col">Raw character view</th>
-		<th scope="col">Display of localised<br />description in <code>iso.txt</code></th>
-		<th scope="col">Ordering</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td><code>dir=&quot;ltr&quot;</code></td>
-		<td>English (Australia &amp; New Zealand)</td>
-		<td dir="ltr">English (Australia &amp; New Zealand)</td>
-		<td class="good">Correct</td>
-	</tr>
-	<tr>
-		<td><code>dir=&quot;rtl&quot;</code></td>
-		<td>English (Australia &amp; New Zealand)</td>
-		<td dir="rtl">English (Australia &amp; New Zealand)</td>
-		<td class="bad">Incorrect</td>
-	</tr>
-	<tr>
-		<td><code>dir=&quot;rtl&quot;</code> with <code>LRM</code></td>
-		<td>English (Australia &amp; New Zealand)<code>U+200E</code></td>
-		<td dir="rtl">English (Australia &amp; New Zealand)&#x200E;</td>
-		<td class="good">Correct</td>
-	</tr>
-	<tr>
-		<td><code>dir=&quot;rtl&quot;</code> with <code>LRE</code> &amp; <code>PDF</code></td>
-		<td><code>U+202A</code>English (Australia &amp; New Zealand)<code>U+202C</code></td>
-		<td dir="rtl">&#x202A;English (Australia &amp; New Zealand)&#x202C;</td>
-		<td class="good">Correct</td>
-	</tr>
-	<tr>
-		<td><code>dir=&quot;rtl&quot;</code> with <code>LRO</code> &amp; <code>PDF</code></td>
-		<td><code>U+202D</code>English (Australia &amp; New Zealand)<code>U+202C</code></td>
-		<td dir="rtl">&#x202D;English (Australia &amp; New Zealand)&#x202C;</td>
-		<td class="good">Correct</td>
-	</tr>
-	</tbody>
-	</table>
-
-	<p>In choosing which of the three methods to use, in the majority of cases, the <code>LRM</code> or <code>RLM</code> to put a &quot;strong&quot; character to fully enclose an ambiguous punctuation character and thus make it inherit the correct directionality is sufficient.</p>
-	<p>Within some cases, there may be mixed scripts of a left-to-right and right-to-left direction, so using <code>LRE</code> &amp; <code>RLE</code> with <code>PDF</code> may be more appropriate. Lastly, in very rare instances where directionality must be forced, then use <code>LRO</code> &amp; <code>RLO</code> with <code>PDF</code>.</p>
-	<p>For further information on authoring techniques of bi-directional text, please see the W3C tutorial on <a href="http://www.w3.org/International/tutorials/bidi-xhtml/">authoring techniques for XHTML pages with bi-directional text</a>.</p>
-
-	<h4>Working with placeholders:</h4>
-
-	<p>As phpBB is translated into languages with different ordering rules to that of English, it is possible to show specific values in any order deemed appropriate. Take for example the extremely simple &quot;Page <em>X</em> of <em>Y</em>&quot;, whilst in English this could just be coded as:</p>
-
-	<div class="codebox"><pre>
-	...
-'PAGE_OF'	=&gt;	'Page %s of %s',
-		/* Just grabbing the replacements as they
-		come and hope they are in the right order */
-	...
-	</pre></div>
-
-	<p>&hellip; a clearer way to show explicit replacement ordering is to do:</p>
-
-	<div class="codebox"><pre>
-	...
-'PAGE_OF'	=&gt;	'Page %1$s of %2$s',
-		/* Explicit ordering of the replacements,
-		even if they are the same order as English */
-	...
-	</pre></div>
-
-	<p>Why bother at all? Because some languages, the string transliterated back to English might read something like:</p>
-
-	<div class="codebox"><pre>
-	...
-'PAGE_OF'	=&gt;	'Total of %2$s pages, currently on page %1$s',
-		/* Explicit ordering of the replacements,
-		reversed compared to English as the total comes first */
-	...
-	</pre></div>
-
-	<a name="writingstyle"></a><h3>6.iii. Writing Style</h3>
-
-	<h4>Miscellaneous tips &amp; hints:</h4>
-
-	<p>As the language files are PHP files, where the various strings for phpBB are stored within an array which in turn are used for display within an HTML page, rules of syntax for both must be considered. Potentially problematic characters are: <code>'</code> (straight quote/apostrophe), <code>&quot;</code> (straight double quote), <code>&lt;</code> (less-than sign), <code>&gt;</code> (greater-than sign) and <code>&amp;</code> (ampersand).</p>
-
-	<p class="bad">// Bad - The un-escapsed straight-quote/apostrophe will throw a PHP parse error</p>
-
-	<div class="codebox"><pre>
-	...
-'CONV_ERROR_NO_AVATAR_PATH'
-	=&gt;	'Note to developer: you must specify $convertor['avatar_path'] to use %s.',
-	...
-	</pre></div>
-
-	<p class="good">// Good - Literal straight quotes should be escaped with a backslash, ie: \</p>
-
-	<div class="codebox"><pre>
-	...
-'CONV_ERROR_NO_AVATAR_PATH'
-	=&gt;	'Note to developer: you must specify $convertor[\'avatar_path\'] to use %s.',
-	...
-	</pre></div>
-
-	<p>However, because phpBB3 now uses UTF-8 as its sole encoding, we can actually use this to our advantage and not have to remember to escape a straight quote when we don't have to:</p>
-
-	<p class="bad">// Bad - The un-escapsed straight-quote/apostrophe will throw a PHP parse error</p>
-
-	<div class="codebox"><pre>
-	...
-'USE_PERMISSIONS'	=&gt;	'Test out user's permissions',
-	...
-	</pre></div>
-
-	<p class="good">// Okay - However, non-programmers wouldn't type "user\'s" automatically</p>
-
-	<div class="codebox"><pre>
-	...
-'USE_PERMISSIONS'	=&gt;	'Test out user\'s permissions',
-	...
-	</pre></div>
-
-	<p class="good">// Best - Use the Unicode Right-Single-Quotation-Mark character</p>
-
-	<div class="codebox"><pre>
-	...
-'USE_PERMISSIONS'	=&gt;	'Test out user&rsquo;s permissions',
-	...
-	</pre></div>
-
-	<p>The <code>&quot;</code> (straight double quote), <code>&lt;</code> (less-than sign) and <code>&gt;</code> (greater-than sign) characters can all be used as displayed glyphs or as part of HTML markup, for example:</p>
-
-	<p class="bad">// Bad - Invalid HTML, as segments not part of elements are not entitised</p>
-
-	<div class="codebox"><pre>
-	...
-'FOO_BAR'	=&gt;	'PHP version &lt; 4.3.3.&lt;br /&gt;
-	Visit &quot;Downloads&quot; at &lt;a href=&quot;http://www.php.net/&quot;&gt;www.php.net&lt;/a&gt;.',
-	...
-	</pre></div>
-
-	<p class="good">// Okay - No more invalid HTML, but &quot;&amp;quot;&quot; is rather clumsy</p>
-
-	<div class="codebox"><pre>
-	...
-'FOO_BAR'	=&gt;	'PHP version &amp;lt; 4.3.3.&lt;br /&gt;
-	Visit &amp;quot;Downloads&amp;quot; at &lt;a href=&quot;http://www.php.net/&quot;&gt;www.php.net&lt;/a&gt;.',
-	...
-	</pre></div>
-
-	<p class="good">// Best - No more invalid HTML, and usage of correct typographical quotation marks</p>
-
-	<div class="codebox"><pre>
-	...
-'FOO_BAR'	=&gt;	'PHP version &amp;lt; 4.3.3.&lt;br /&gt;
-	Visit &ldquo;Downloads&rdquo; at &lt;a href=&quot;http://www.php.net/&quot;&gt;www.php.net&lt;/a&gt;.',
-	...
-	</pre></div>
-
-	<p>Lastly, the <code>&amp;</code> (ampersand) must always be entitised regardless of where it is used:</p>
-
-	<p class="bad">// Bad - Invalid HTML, none of the ampersands are entitised</p>
-
-	<div class="codebox"><pre>
-	...
-'FOO_BAR'	=&gt;	'&lt;a href=&quot;http://somedomain.tld/?foo=1&amp;bar=2&quot;&gt;Foo &amp; Bar&lt;/a&gt;.',
-	...
-	</pre></div>
-
-	<p class="good">// Good - Valid HTML, amperands are correctly entitised in all cases</p>
-
-	<div class="codebox"><pre>
-	...
-'FOO_BAR'	=&gt;	'&lt;a href=&quot;http://somedomain.tld/?foo=1&amp;amp;bar=2&quot;&gt;Foo &amp;amp; Bar&lt;/a&gt;.',
-	...
-	</pre></div>
-
-	<p>As for how these charcters are entered depends very much on choice of Operating System, current language locale/keyboard configuration and native abilities of the text editor used to edit phpBB language files. Please see <a href="http://en.wikipedia.org/wiki/Unicode#Input_methods">http://en.wikipedia.org/wiki/Unicode#Input_methods</a> for more information.</p>
-
-	<h4>Spelling, punctuation, grammar, et cetera:</h4>
-
-	<p>The default language pack bundled with phpBB is <strong>British English</strong> using <a href="http://www.cambridge.org/">Cambridge University Press</a> spelling and is assigned the language code <code>en</code>. The style and tone of writing tends towards formal and translations <strong>should</strong> emulate this style, at least for the variant using the most compact language code. Less formal translations or those with colloquialisms <strong>must</strong> be denoted as such via either an <code>extension</code> or <code>privateuse</code> tag within its language code.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="changes"></a><h2>7. Guidelines Changelog</h2>
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<h3>Revision 8596+</h3>
-
-<ul>
-	<li>Removed sql_build_array('MULTI_INSERT'... statements.</li>
-	<li>Added sql_multi_insert() explanation.</li>
-</ul>
-
-<h3>Revision 1.31</h3>
-
-<ul>
-	<li>Added add_form_key and check_form_key. </li>
-</ul>
-
-<h3>Revision 1.24</h3>
-
-<ul>
-	<li>Added <a href="#translation">5. Character Sets and Encodings</a> section to explain the recommended treatment of strings in phpBB.</li>
-</ul>
-
-<h3>Revision 1.16</h3>
-
-<ul>
-	<li>Added <a href="#translation">6. Translation (<abbr title="Internationalisation">i18n</abbr>/<abbr title="Localisation">L10n</abbr>) Guidelines</a> section to explain expected format and authoring considerations for language packs that are to be created for phpBB.</li>
-</ul>
-
-<h3>Revision 1.11-1.15</h3>
-
-<ul>
-	<li>Various document formatting, spelling, punctuation, grammar bugs.</li>
-</ul>
-
-<h3>Revision 1.9-1.10</h3>
-
-<ul>
-	<li>Added sql_query_limit to <a href="#sql">2.iii. SQL/SQL Layout</a>.</li>
-</ul>
-
-<h3>Revision 1.8</h3>
-
-<ul>
-	<li>Some adjustements to wordings</li>
-	<li>Updated paragraph <a href="#locations">1.iii. File Locations</a> to reflect recent changes</li>
-	<li>Extended paragraph <a href="#codelayout">2.ii. Code Layout</a>.</li>
-	<li>Added sql_in_set and sql_build_query explanation to <a href="#sql">2.iii. SQL/SQL Layout</a>.</li>
-	<li>Updated paragraph <a href="#styling">3. Styling</a>.</li>
-	<li>Updated paragraph <a href="#templating">4. Templating</a> to explain loop checking, loop breaking and other changes we recently made.</li>
-</ul>
-
-<h3>Revision 1.5</h3>
-
-<ul>
-	<li>Changed General function usage paragraph in <a href="#general">2.v. General Guidelines</a></li>
-</ul>
-
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="disclaimer"></a><h2>8. Copyright and disclaimer</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-license.php">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-<!-- END DOCUMENT -->
-
-	<div id="page-footer">
-		<div class="version"> $Id$ </div>
-	</div>
-</div></div>
-
-<div>
-	<a id="bottom" name="bottom" accesskey="z"></a>
-</div>
-
-</body>
-</html>
diff --git a/phpBB/docs/corners_left.gif b/phpBB/docs/corners_left.gif
deleted file mode 100644
index 206e50368d..0000000000
--- a/phpBB/docs/corners_left.gif
+++ /dev/null
diff --git a/phpBB/docs/corners_left.png b/phpBB/docs/corners_left.png
deleted file mode 100644
index 256bde3daa..0000000000
--- a/phpBB/docs/corners_left.png
+++ /dev/null
diff --git a/phpBB/docs/corners_right.gif b/phpBB/docs/corners_right.gif
deleted file mode 100644
index 0ba66d50b2..0000000000
--- a/phpBB/docs/corners_right.gif
+++ /dev/null
diff --git a/phpBB/docs/corners_right.png b/phpBB/docs/corners_right.png
deleted file mode 100644
index df41823b4c..0000000000
--- a/phpBB/docs/corners_right.png
+++ /dev/null
diff --git a/phpBB/docs/hook_system.html b/phpBB/docs/hook_system.html
deleted file mode 100644
index 78e3014adb..0000000000
--- a/phpBB/docs/hook_system.html
+++ /dev/null
@@ -1,859 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="en" xml:lang="en">
-<head>
-
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<meta http-equiv="content-style-type" content="text/css" />
-<meta http-equiv="content-language" content="en" />
-<meta http-equiv="imagetoolbar" content="no" />
-<meta name="resource-type" content="document" />
-<meta name="distribution" content="global" />
-<meta name="copyright" content="2007 phpBB Group" />
-<meta name="keywords" content="" />
-<meta name="description" content="Hook System explanation" />
-<title>phpBB3 &bull; Hook System</title>
-
-<style type="text/css">
-/* <![CDATA[ */
-
-/*
-	The original "prosilver" theme for phpBB3
-	Created by subBlue design :: http://www.subBlue.com
-*/
-
-* { margin: 0; padding: 0; }
-
-html { font-size: 100%; height: 100%; margin-bottom: 1px; }
-
-body {
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	color: #828282;
-	background-color: #FFFFFF;
-	font-size: 12px;
-	margin: 0;
-	padding: 12px 0;
-}
-
-img { border-width: 0; }
-
-p {
-	line-height: 1.3em;
-	font-size: 1.1em;
-	margin-bottom: 1.5em;
-}
-
-hr {
-	border: 0 none #FFFFFF;
-	border-top: 1px solid #CCCCCC;
-	height: 1px;
-	margin: 5px 0;
-	display: block;
-	clear: both;
-}
-
-html, body {
-	color: #536482;
-	background-color: #FFFFFF;
-}
-
-#doc-description h1 {
-	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	margin-right: 200px;
-	color: #FFFFFF;
-	margin-top: 15px;
-	font-weight: bold;
-	font-size: 2em;
-	color: #fff;
-}
-
-h1 {
-	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	font-weight: normal;
-	color: #000;
-	font-size: 2em;
-	margin: 0.8em 0 0.2em 0;
-}
-
-h2 {
-	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	font-weight: normal;
-	color: #28313F;
-	font-size: 1.5em;
-	margin: 0.8em 0 0.2em 0;
-}
-
-h3 {
-	font-family: Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	border-bottom: 1px solid #CCCCCC;
-	margin-bottom: 3px;
-	padding-bottom: 2px;
-	font-size: 1.05em;
-	color: #115098;
-	margin-top: 20px;
-}
-
-.good { color: green; }
-.bad { color: red; }
-
-.version {
-	margin-top: 20px;
-	text-align: left;
-	font-size: 70%;
-	color: #006600;
-	border-top: 1px solid #ccc;
-}
-
-code { 
-	color: #006600; 
-	font-weight: normal; 
-	font-family: 'Courier New', monospace; 
-	border-color: #D1D7DC; 
-	border-width: 1px; 
-	border-style: solid; 
-	background-color: #FAFAFA; 
-}
-
-#wrap {
-	padding: 0 20px;
-	min-width: 650px;
-}
-
-#simple-wrap {
-	padding: 6px 10px;
-}
-
-#page-body {
-	margin: 4px 0;
-	clear: both;
-}
-
-#page-footer {
-	clear: both;
-}
-
-#logo {
-	float: left;
-	width: auto;
-	padding: 10px 13px 0 10px;
-}
-
-a#logo:hover {
-	text-decoration: none;
-}
-
-#doc-description {
-	float: left;
-	width: 70%;
-}
-
-#doc-description h1 {
-	margin-right: 0;
-}
-
-.headerbar {
-	background: #ebebeb none repeat-x 0 0;
-	color: #FFFFFF;
-	margin-bottom: 4px;
-	padding: 0 5px;
-}
-
-span.corners-top, span.corners-bottom, span.corners-top span, span.corners-bottom span {
-	font-size: 1px;
-	line-height: 1px;
-	display: block;
-	height: 5px;
-	background-repeat: no-repeat;
-}
-
-span.corners-top {
-	background-image: none;
-	background-position: 0 0;
-	margin: 0 -5px;
-}
-
-span.corners-top span {
-	background-image: none;
-	background-position: 100% 0;
-}
-
-span.corners-bottom {
-	background-image: none;
-	background-position: 0 100%;
-	margin: 0 -5px;
-	clear: both;
-}
-
-span.corners-bottom span {
-	background-image: none;
-	background-position: 100% 100%;
-}
-
-.paragraph {
-	padding: 0 10px;
-	margin-bottom: 4px;
-	background-repeat: no-repeat;
-	background-position: 100% 0;
-	background-color: #ECF3F7;
-}
-
-.paragraph:target .content {
-	color: #000000;
-}
-
-.paragraph:target h3 a {
-	color: #000000;
-}
-
-.content {
-	color: #333333;
-}
-
-.content h2, .panel h2 {
-	color: #115098;
-	border-bottom-color:  #CCCCCC;
-}
-
-a:link	{ color: #898989; text-decoration: none; }
-a:visited	{ color: #898989; text-decoration: none; }
-a:hover	{ color: #d3d3d3; text-decoration: underline; }
-a:active	{ color: #d2d2d2; text-decoration: none; }
-
-hr {
-	border-color: #FFFFFF;
-	border-top-color: #CCCCCC;
-}
-
-.menu {
-	background-color: #cadceb;
-}
-
-.headerbar {
-	background-color: #12A3EB;
-	background-image: url("bg_header.gif");
-	color: #FFFFFF;
-}
-
-.panel {
-	background-color: #ECF1F3;
-	color: #28313F;
-}
-
-
-span.corners-top {
-	background-image: url("corners_left.png");
-}
-
-span.corners-top span {
-	background-image: url("corners_right.png");
-}
-
-span.corners-bottom {
-	background-image: url("corners_left.png");
-}
-
-span.corners-bottom span {
-	background-image: url("corners_right.png");
-}
-
-.error {
-	color: #BC2A4D;
-}
-
-a:link	{ color: #105289; }
-a:visited	{ color: #105289; }
-a:hover	{ color: #D31141; }
-a:active	{ color: #368AD2; }
-
-.paragraph span.corners-top, .paragraph span.corners-bottom {
-	margin: 0 -10px;
-}
-
-.content {
-	padding: 0;
-	line-height: 1.48em;
-	color: #333333;
-}
-
-.content h2, .panel h2 {
-	color: #115098;
-	border-bottom-color:  #CCCCCC;
-}
-
-.notice {
-	border-top-color:  #CCCCCC;
-}
-
-.codebox {
-	padding: 3px;
-	background-color: #FFFFFF;
-	border: 1px solid #C9D2D8;
-	font-size: 1em;
-	margin-bottom: 10px;
-	display: block;
-	font: 0.9em Monaco, "Andale Mono","Courier New", Courier, mono;
-	line-height: 1.3em;
-}
-
-* html hr { margin: 0; }
-* html span.corners-top, * html span.corners-bottom { background-image: url("corners_left.gif"); }
-* html span.corners-top span, * html span.corners-bottom span { background-image: url("corners_right.gif"); }
-
-.back2top {
-	clear: both;
-	height: 11px;
-	text-align: right;
-}
-
-.content ol {
-	margin-left: 25px;
-}
-
-/* ]]> */
-</style>
-
-</head>
-
-<body id="phpbb" class="section-docs">
-
-<div id="wrap">
-	<a id="top" name="top" accesskey="t"></a>
-	<div id="page-header">
-		<div class="headerbar">
-			<div class="inner"><span class="corners-top"><span></span></span>
-
-			<div id="doc-description">
-				<a href="../index.php" id="logo"><img src="site_logo.gif" alt="" /></a>
-				<h1>Hook System</h1>
-				<p>This is an explanation of how to use the phpBB3 hook system.</p>
-				<p style="display: none;"><a href="#start_here">Skip</a></p>
-			</div>
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-	</div>
-
-	<a name="start_here"></a>
-
-	<div id="page-body">
-
-	<h1>Hook System</h1>
-
-	<div class="paragraph menu">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-			<ol>
-				<li><a href="#intro">Introduction</a></li>
-				<li><a href="#use">Allow hooks in functions/methods</a></li>
-				<li><a href="#register">Registering hooks</a></li>
-				<li><a href="#return">Result returning</a></li>
-				<li><a href="#embed">Embedding your hook files/classes/methods</a></li>
-				<li><a href="#disclaimer">Copyright and disclaimer</a></li>
-			</ol>
-
-		</div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-	<a name="intro"></a><h2>1. Introduction</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<h3>What is it?</h3>
-
-<p>The hook system allows applicaton and mod developers to hook into phpBB's or their own functions.</p>
-
-<h3>Pre-defined hookable phpBB3 functions</h3>
-
-<p>In phpBB3 there are four functions you are able to hook into with your custom functions:</p>
-
-<p><code>phpbb_user_session_handler();</code> which is called within user::setup after the session and the user object is correctly initialized.<br />
-<code>append_sid($url, $params = false, $is_amp = true, $session_id = false);</code> which is called for building urls (appending the session id)<br />
-<code>$template-&gt;display($handle, $include_once = true);</code> which is called directly before outputting the (not-yet-compiled) template.<br />
-<code>exit_handler();</code> which is called at the very end of phpBB3's execution.</p>
-
-<p>There are also valid external constants you may want to use if you embed phpBB3 into your application:</p>
-
-<div class="codebox"><pre>
-PHPBB_MSG_HANDLER (define own message handler)
-PHPBB_DB_NEW_LINK (overwrite new_link parameter for sql_connect)
-PHPBB_ROOT_PATH   (define own PHPBB_ROOT_PATH)
-PHPBB_ADMIN_PATH  (define own PHPBB_ADMIN_PATH)
-</pre></div>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<a name="use"></a><h2>2. Allow hooks in functions/methods</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<p>The following examples explain how phpBB3 utilize the in-build hook system. You will be more interested in registering your hooks, but showing you this may help you understand the system better along the way.</p>
-
-<p>First of all, this is how a function need to be layed out if you want to allow it to be hookable...</p>
-
-<div class="codebox"><pre>
-function my_own_function($my_first_parameter, $my_second_parameter)
-{
-	global $phpbb_hook;
-
-	if ($phpbb_hook-&gt;call_hook(__FUNCTION__, $my_first_parameter, $my_second_parameter))
-	{
-		if ($phpbb_hook-&gt;hook_return(__FUNCTION__))
-		{
-			return $phpbb_hook-&gt;hook_return_result(__FUNCTION__);
-		}
-	}
-
-	[YOUR CODE HERE]
-}
-</pre></div>
-
-<p>Above, the call_hook function should always be mapping your function call... in regard to the number of parameters passed.</p>
-
-<p>This is how you could make a method being hookable...</p>
-
-<div class="codebox"><pre>
-class my_hookable_object
-{
-	function hook_me($my_first_parameter, $my_second_parameter)
-	{
-		global $phpbb_hook;
-
-		if ($phpbb_hook-&gt;call_hook(array(__CLASS__, __FUNCTION__), $my_first_parameter, $my_second_parameter))
-		{
-			if ($phpbb_hook-&gt;hook_return(array(__CLASS__, __FUNCTION__)))
-			{
-				return $phpbb_hook-&gt;hook_return_result(array(__CLASS__, __FUNCTION__));
-			}
-		}
-
-		[YOUR CODE HERE]
-	}
-}
-</pre></div>
-
-<p>The only difference about calling it is the way you define the first parameter. For a function it is only <code>__FUNCTION__</code>, for a method it is <code>array(__CLASS__, __FUNCTION__)</code>. In PHP4 __CLASS__ is always returning the class in lowercase.</p>
-
-<p>Now, in phpBB there are some pre-defined hooks available, but how do you make your own hookable function available (and therefore allowing others to hook into it)? For this, there is the add_hook() method:</p>
-
-<div class="codebox"><pre>
-// Adding your own hookable function:
-$phpbb_hook-&gt;add_hook('my_own_function');
-
-// Adding your own hookable method:
-$phpbb_hook-&gt;add_hook(array('my_hookable_object', 'hook_me'));
-</pre></div>
-
-<p>You are also able to remove the possibility of hooking a function/method by calling <code>$phpbb_hook-&gt;remove_hook()</code> with the same parameters as add_hook().<br />
-This comes in handy if you want to force some hooks not to be called - at all.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<a name="register"></a><h2>3. Registering hooks</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-		<h3>Registering hooks</h3>
-
-<p>Now to actually defining your functions which should be called. For this we take the append_sid() function as an example (this function is able to be hooked by default). We create two classes, one being static and a function:</p>
-
-<div class="codebox"><pre>
-class my_append_sid_class
-{
-	// Our functions
-	function my_append_sid(&amp;$hook, $url, $params = false, $is_amp = true, $session_id = false)
-	{
-		// Get possible previous results
-		$result = $hook-&gt;previous_hook_result('append_sid');
-
-		return $result['result'] . '&lt;br /&gt;And i was the second one.';
-	}
-}
-
-// Yet another class :o
-class my_second_append_sid_class
-{
-	function my_append_sid(&amp;$hook, $url, $params = false, $is_amp = true, $session_id = false)
-	{
-		// Get possible previous results
-		$result = $hook-&gt;previous_hook_result('append_sid');
-
-		echo $result['result'] . '&lt;br /&gt;I was called as the third one.';
-	}
-}
-
-// And a normal function
-function my_append_sid(&amp;$hook, $url, $params = false, $is_amp = true, $session_id = false)
-{
-	// Get possible previous results
-	$result = $hook-&gt;previous_hook_result('append_sid');
-
-	return 'I was called as the first one';
-}
-
-// Initializing the second class
-$my_second_append_sid_class = new my_second_append_sid_class();
-</pre></div>
-
-<p>Make sure you add the same parameters to your function as is defined for the hookable function with one exception: The first variable is always <code>&amp;$hook</code>... this is the hook object itself you are able to operate on.</p>
-
-<p>Now we register the hooks one by one with the <code>$phpbb_hook-&gt;register()</code> method:</p>
-
-<div class="codebox"><pre>
-// Now, we register our append_sid &quot;replacements&quot; in a stacked way...
-// Registering the function (this is called first)
-$phpbb_hook-&gt;register('append_sid', 'my_append_sid');
-
-// Registering the first class
-$phpbb_hook-&gt;register('append_sid', array('my_append_sid_class', 'my_append_sid'));
-$phpbb_hook-&gt;register('append_sid', array(&amp;$my_second_append_sid_class, 'my_append_sid'));
-</pre></div>
-
-<p>With this you are even able to make your own functions that are already hooked itself being hooked again...</p>
-
-<div class="codebox"><pre>
-// Registering hook, which will be called
-$phpbb_hook-&gt;register('append_sid', 'my_own_append_sid');
-
-// Add hook to our called hook function
-$phpbb_hook-&gt;add_hook('my_own_append_sid');
-
-// Register added hook
-$phpbb_hook-&gt;register('my_own_append_sid', 'also_my_own_append_sid');
-</pre></div>
-
-		<h3>Special treatment/chains</h3>
-
-		<p>The <code>register</code> method is able to take a third argument to specify a special 'chain' mode. The valid modes are <code>first</code>, <code>last</code> and <code>standalone</code></p>
-
-		<p><code>$phpbb_hook-&gt;register('append_sid', 'my_own_append_sid', 'first')</code> would make sure that the function is called in the beginning of the chain. It is possible that more than one function is called within the first block - here the FIFO principle is used.</p>
-
-		<p><code>$phpbb_hook-&gt;register('append_sid', 'my_own_append_sid', 'last')</code> would make sure that the function is called at the very end of the chain. It is possible that more than one function is called within the last block - here the FIFO principle is used.</p>
-
-		<p><code>$phpbb_hook-&gt;register('append_sid', 'my_own_append_sid', 'standalone')</code> makes sure only the defined function is called. All other functions are removed from the chain and no other functions are added to it later on. If two applications try to trigger the standalone mode a PHP notice will be printed and the second function being discarded.</p>
-
-		<h3>Only allowing hooks for some objects</h3>
-
-		<p>Because the hook system is not able to differate between initialized objects and only operate on the class, you need to solve this on the code level.</p>
-
-		<p>One possibility would be to use a property:</p>
-
-		<div class="codebox"><pre>
-class my_hookable_object
-{
-	function blabla()
-	{
-	}
-}
-
-class my_hookable_object2 extends my_hookable_object
-{
-	var $call_hook = true;
-
-	function hook_me($my_first_parameter, $my_second_parameter)
-	{
-		if ($this-&gt;call_hook)
-		{
-			global $phpbb_hook;
-
-			if ($phpbb_hook-&gt;call_hook(array(__CLASS__, __FUNCTION__), $my_first_parameter, $my_second_parameter))
-			{
-				if ($phpbb_hook-&gt;hook_return(array(__CLASS__, __FUNCTION__)))
-				{
-					return $phpbb_hook-&gt;hook_return_result(array(__CLASS__, __FUNCTION__));
-				}
-			}
-		}
-
-		return 'not hooked';
-	}
-}
-
-function hooking(&amp;$hook, $first, $second)
-{
-	return 'hooked';
-}
-
-$first_object = new my_hookable_object2();
-$second_object = new my_hookable_object2();
-
-$phpbb_hook-&gt;add_hook(array('my_hookable_object2', 'hook_me'));
-
-$phpbb_hook-&gt;register(array('my_hookable_object2', 'hook_me'), 'hooking');
-
-// Do not call the hook for $first_object
-$first_object-&gt;call_hook = false;
-
-echo $first_object-&gt;hook_me('first', 'second') . '&lt;br /&gt;';
-echo $second_object-&gt;hook_me('first', 'second') . '&lt;br /&gt;';
-</pre></div>
-
-<p>OUTPUT:</p>
-
-<div class="codebox"><pre>
-not hooked
-hooked 
-</pre></div>
-
-		<p>A different possibility would be using a function variable (which could be left out on passing the function variables to the hook):</p>
-
-		<div class="codebox"><pre>
-class my_hookable_object
-{
-	function blabla()
-	{
-	}
-}
-
-class my_hookable_object2 extends my_hookable_object
-{
-	function hook_me($my_first_parameter, $my_second_parameter, $hook_me = true)
-	{
-		if ($hook_me)
-		{
-			global $phpbb_hook;
-
-			if ($phpbb_hook-&gt;call_hook(array(__CLASS__, __FUNCTION__), $my_first_parameter, $my_second_parameter))
-			{
-				if ($phpbb_hook-&gt;hook_return(array(__CLASS__, __FUNCTION__)))
-				{
-					return $phpbb_hook-&gt;hook_return_result(array(__CLASS__, __FUNCTION__));
-				}
-			}
-		}
-
-		return 'not hooked';
-	}
-}
-
-function hooking(&amp;$hook, $first, $second)
-{
-	return 'hooked';
-}
-
-$first_object = new my_hookable_object2();
-$second_object = new my_hookable_object2();
-
-$phpbb_hook-&gt;add_hook(array('my_hookable_object2', 'hook_me'));
-
-$phpbb_hook-&gt;register(array('my_hookable_object2', 'hook_me'), 'hooking');
-
-echo $first_object-&gt;hook_me('first', 'second', false) . '&lt;br /&gt;';
-echo $second_object-&gt;hook_me('first', 'second') . '&lt;br /&gt;';
-		</pre></div>
-
-		<p>OUTPUT:</p>
-
-		<div class="codebox"><pre>
-not hooked
-hooked 
-		</pre></div>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<a name="return"></a><h2>4. Result returning</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<p>Generally, the distinction has to be made if a function returns the result obtained from the called function or continue the execution. Based on the needs of the application this may differ. Therefore, the function returns the results only if the called hook function is returning a result.</p>
-
-<h3>Case 1 - Returning the result</h3>
-
-<p>Imagine the following function supporting hooks:</p>
-
-<div class="codebox"><pre>
-function append_sid($url, $params = false, $is_amp = true, $session_id = false)
-{
-	global $_SID, $_EXTRA_URL, $phpbb_hook;
-
-	// Developers using the hook function need to globalise the $_SID and $_EXTRA_URL on their own and also handle it appropiatly.
-	// They could mimick most of what is within this function
-	if ($phpbb_hook-&gt;call_hook(__FUNCTION__, $url, $params, $is_amp, $session_id))
-	{
-		if ($phpbb_hook-&gt;hook_return(__FUNCTION__))
-		{
-			return $phpbb_hook-&gt;hook_return_result(__FUNCTION__);
-		}
-	}
-
-	[...]
-}
-</pre></div>
-
-<p>Now, the following function is yours. Since you return a value, the append_sid() function itself is returning it as is:</p>
-
-<div class="codebox"><pre>
-// The function called
-function my_append_sid(&amp;$hook, $url, $params = false, $is_amp = true, $session_id = false)
-{
-	// Get possible previous results
-	$result = $hook-&gt;previous_hook_result('append_sid');
-
-	return 'Since i return something the append_sid() function will return my result.';
-}
-</pre></div>
-
-<p>To be able to get the results returned from functions higher in the change the <code>previous_hook_result()</code> method should always be used, it returns an <code>array('result' => [your result])</code> construct.</p>
-
-<h3>Case 2 - Not Returning any result</h3>
-
-<p>Sometimes applications want to return nothing and therefore force the underlying function to continue it's execution:</p>
-
-<div class="codebox"><pre>
-function append_sid($url, $params = false, $is_amp = true, $session_id = false)
-{
-	global $_SID, $_EXTRA_URL, $phpbb_hook;
-
-	// Developers using the hook function need to globalise the $_SID and $_EXTRA_URL on their own and also handle it appropiatly.
-	// They could mimick most of what is within this function
-	if ($phpbb_hook-&gt;call_hook(__FUNCTION__, $url, $params, $is_amp, $session_id))
-	{
-		if ($phpbb_hook-&gt;hook_return(__FUNCTION__))
-		{
-			return $phpbb_hook-&gt;hook_return_result(__FUNCTION__);
-		}
-	}
-
-	[...]
-}
-
-// The function called
-function my_append_sid(&amp;$hook, $url, $params = false, $is_amp = true, $session_id = false)
-{
-	// Get possible previous results
-	$result = $hook-&gt;previous_hook_result('append_sid');
-
-	[...]
-
-	// I only rewrite some variables, but return nothing. Therefore, the append_sid() function will not return my (non)result.
-}
-</pre></div>
-
-<p>Please Note: The decision to return or not return is solely made of the very last function call within the hook chain. An example:</p>
-
-<div class="codebox"><pre>
-// The function called
-function my_append_sid(&amp;$hook, $url, $params = false, $is_amp = true, $session_id = false)
-{
-	// Get possible previous results
-	$result = $hook-&gt;previous_hook_result('append_sid');
-
-	// $result is not filled
-
-	return 'FILLED';
-}
-
-// This function is registered too and gets executed after my_append_sid()
-function my_own_append_sid(&amp;$hook, $url, $params = false, $is_amp = true, $session_id = false)
-{
-	$result = $hook->previous_hook_result('append_sid');
-
-	// $result is actually filled with $result['result'] = 'FILLED'
-	// But i return nothing, therefore append_sid() continues it's execution.
-}
-
-// The way both functions are registered.
-$phpbb_hook->register('append_sid', 'my_append_sid');
-$phpbb_hook->register('append_sid', 'my_own_append_sid');
-</pre></div>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<a name="embed"></a><h2>5. Embedding your hook files/classes/methods</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-<p>There are basically two methods you are able to choose from:</p>
-
-<p>1) Add a file to includes/hooks/. The file need to be prefixed by <code>hook_</code>. This file is included within common.php, you are able to register your hooks, include other files or functions, etc. It is advised to only include other files if needed (within a function call for example).</p>
-
-<p>Please be aware that you need to purge your cache within the ACP to make your newly placed file available to phpBB3.</p>
-
-<p>2) The second method is meant for those wanting to wrap phpBB3 without placing a custom file to the hooks directory. This is mostly done by including phpBB's files within the application file. To be able to register your hooks you need to create a function within your application:</p>
-
-<div class="codebox"><pre>
-// My function which gets executed within the hooks constuctor
-function phpbb_hook_register(&amp;$hook)
-{
-	$hook-&gt;register('append_sid', 'my_append_sid');
-}
-
-[...]
-</pre></div>
-
-<p>You should get the idea. ;)</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<a name="disclaimer"></a><h2>6. Copyright and disclaimer</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-license.php">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<div id="page-footer">
-		<div class="version">$Id$</div>
-	</div>
-</div></div>
-
-<div>
-	<a id="bottom" name="bottom" accesskey="z"></a>
-</div>
-
-</body>
-</html>
diff --git a/phpBB/docs/site_logo.gif b/phpBB/docs/site_logo.gif
deleted file mode 100644
index 909114c377..0000000000
--- a/phpBB/docs/site_logo.gif
+++ /dev/null
diff --git a/phpBB/docs/stylesheet.css b/phpBB/docs/stylesheet.css
deleted file mode 100644
index 6b8f5994c0..0000000000
--- a/phpBB/docs/stylesheet.css
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
-	The original "prosilver" theme for phpBB3
-	Created by subBlue design :: http://www.subBlue.com
-*/
-
-* { margin: 0; padding: 0; }
-
-html { font-size: 100%; height: 100%; margin-bottom: 1px; }
-
-body {
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	color: #828282;
-	background-color: #FFFFFF;
-	font-size: 12px;
-	margin: 0;
-	padding: 12px 0;
-}
-
-img { border-width: 0; }
-
-p {
-	line-height: 1.3em;
-	font-size: 1.1em;
-	margin-bottom: 1.5em;
-}
-
-hr {
-	border: 0 none #FFFFFF;
-	border-top: 1px solid #CCCCCC;
-	height: 1px;
-	margin: 5px 0;
-	display: block;
-	clear: both;
-}
-
-html, body {
-	color: #536482;
-	background-color: #FFFFFF;
-}
-
-#doc-description h1 {
-	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	margin-right: 200px;
-	color: #FFFFFF;
-	margin-top: 15px;
-	font-weight: bold;
-	font-size: 2em;
-	color: #fff;
-}
-
-h1 {
-	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	font-weight: normal;
-	color: #000;
-	font-size: 2em;
-	margin: 0.8em 0 0.2em 0;
-}
-
-h2 {
-	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	font-weight: normal;
-	color: #28313F;
-	font-size: 1.5em;
-	margin: 0.8em 0 0.2em 0;
-}
-
-h3 {
-	font-family: Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	border-bottom: 1px solid #CCCCCC;
-	margin-bottom: 3px;
-	padding-bottom: 2px;
-	font-size: 1.05em;
-	color: #115098;
-	margin-top: 20px;
-}
-
-h4 {
-	font-family: Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	margin-bottom: 3px;
-	padding-bottom: 2px;
-	font-size: 1.05em;
-	color: #115098;
-	margin-top: 20px;
-}
-
-.good { color: green; }
-.bad { color: red; }
-
-.version {
-	margin-top: 20px;
-	text-align: left;
-	font-size: 70%;
-	color: #006600;
-	border-top: 1px solid #ccc;
-}
-
-code { 
-	color: #006600; 
-	font-weight: normal; 
-	font-family: 'Courier New', monospace; 
-	border-color: #D1D7DC; 
-	border-width: 1px; 
-	border-style: solid; 
-	background-color: #FAFAFA; 
-}
-
-#wrap {
-	padding: 0 20px;
-	min-width: 650px;
-}
-
-#simple-wrap {
-	padding: 6px 10px;
-}
-
-#page-body {
-	margin: 4px 0;
-	clear: both;
-}
-
-#page-footer {
-	clear: both;
-}
-
-#logo {
-	float: left;
-	width: auto;
-	padding: 10px 13px 0 10px;
-}
-
-a#logo:hover {
-	text-decoration: none;
-}
-
-#doc-description {
-	float: left;
-	width: 70%;
-}
-
-#doc-description h1 {
-	margin-right: 0;
-}
-
-.headerbar {
-	background: #ebebeb none repeat-x 0 0;
-	color: #FFFFFF;
-	margin-bottom: 4px;
-	padding: 0 5px;
-}
-
-span.corners-top, span.corners-bottom, span.corners-top span, span.corners-bottom span {
-	font-size: 1px;
-	line-height: 1px;
-	display: block;
-	height: 5px;
-	background-repeat: no-repeat;
-}
-
-span.corners-top {
-	background-image: none;
-	background-position: 0 0;
-	margin: 0 -5px;
-}
-
-span.corners-top span {
-	background-image: none;
-	background-position: 100% 0;
-}
-
-span.corners-bottom {
-	background-image: none;
-	background-position: 0 100%;
-	margin: 0 -5px;
-	clear: both;
-}
-
-span.corners-bottom span {
-	background-image: none;
-	background-position: 100% 100%;
-}
-
-.paragraph {
-	padding: 0 10px;
-	margin-bottom: 4px;
-	background-repeat: no-repeat;
-	background-position: 100% 0;
-	background-color: #ECF3F7;
-}
-
-.paragraph:target .content {
-	color: #000000;
-}
-
-.paragraph:target h3 a {
-	color: #000000;
-}
-
-.content {
-	color: #333333;
-}
-
-.content h2, .panel h2 {
-	color: #115098;
-	border-bottom-color:  #CCCCCC;
-}
-
-a:link	{ color: #898989; text-decoration: none; }
-a:visited	{ color: #898989; text-decoration: none; }
-a:hover	{ color: #d3d3d3; text-decoration: underline; }
-a:active	{ color: #d2d2d2; text-decoration: none; }
-
-hr {
-	border-color: #FFFFFF;
-	border-top-color: #CCCCCC;
-}
-
-.menu {
-	background-color: #cadceb;
-}
-
-.headerbar {
-	background-color: #12A3EB;
-	background-image: url("bg_header.gif");
-	color: #FFFFFF;
-}
-
-.panel {
-	background-color: #ECF1F3;
-	color: #28313F;
-}
-
-
-span.corners-top {
-	background-image: url("corners_left.png");
-}
-
-span.corners-top span {
-	background-image: url("corners_right.png");
-}
-
-span.corners-bottom {
-	background-image: url("corners_left.png");
-}
-
-span.corners-bottom span {
-	background-image: url("corners_right.png");
-}
-
-.error {
-	color: #BC2A4D;
-}
-
-a:link	{ color: #105289; }
-a:visited	{ color: #105289; }
-a:hover	{ color: #D31141; }
-a:active	{ color: #368AD2; }
-
-.paragraph span.corners-top, .paragraph span.corners-bottom {
-	margin: 0 -10px;
-}
-
-.content {
-	padding: 0;
-	line-height: 1.48em;
-	color: #333333;
-}
-
-.content h2, .panel h2 {
-	color: #115098;
-	border-bottom-color:  #CCCCCC;
-}
-
-.notice {
-	border-top-color:  #CCCCCC;
-}
-
-.codebox {
-	padding: 3px;
-	background-color: #FFFFFF;
-	border: 1px solid #C9D2D8;
-	font-size: 1em;
-	margin-bottom: 10px;
-	display: block;
-	font: 0.9em Monaco, "Andale Mono","Courier New", Courier, mono;
-	line-height: 1.3em;
-}
-
-* html hr { margin: 0; }
-* html span.corners-top, * html span.corners-bottom { background-image: url("corners_left.gif"); }
-* html span.corners-top span, * html span.corners-bottom span { background-image: url("corners_right.gif"); }
-
-.back2top {
-	clear: both;
-	height: 11px;
-	text-align: right;
-}
-
-.content ol, .content ul {
-	margin-left: 25px;
-	margin-top: 0;
-}
-
-.content ul + p, .content ul + div {
-	margin-top: 20px;
-}
-
-.comment {
-	color: green;
-}
-
-.indent {
-	margin-left: 20px;
-}
-
-.paragraph table  {
-	font-size:	8pt;
-	border-collapse: collapse;
-	border: 1px solid #cfcfcf;
-	margin-bottom: 20px;
-}
-
-.paragraph table caption  {
-	display: none;
-}
-
-.paragraph table thead  {
-	background-color: #cadceb;
-	color: #000;
-}
-
-.paragraph table td, .paragraph table th {
-	border: 1px solid #006699;
-	padding: 0.5em;
-	background-color: #e1ebf2;
-}
-
-.paragraph table th {
-	background-color: #cadceb;
-}
-
-.paragraph table td dl {
-	margin: 0;
-	padding: 0;
-}
-
-.paragraph table td dl dt {
-	float: left;
-	clear: both;
-	margin-right: 1em;
-}
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
deleted file mode 100644
index dda6548e88..0000000000
--- a/phpBB/download/file.php
+++ /dev/null
@@ -1,671 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-define('IN_PHPBB', true);
-if (!defined('PHPBB_ROOT_PATH')) define('PHPBB_ROOT_PATH', './../');
-if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-include(PHPBB_ROOT_PATH . 'includes/core/bootstrap.' . PHP_EXT);
-
-// Thank you sun.
-if (isset($_SERVER['CONTENT_TYPE']))
-{
-	if ($_SERVER['CONTENT_TYPE'] === 'application/x-java-archive')
-	{
-		exit;
-	}
-}
-else if (isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'], 'Java') !== false)
-{
-	exit;
-}
-
-if (phpbb_request::is_set('avatar', phpbb_request::GET))
-{
-	// worst-case default
-	$browser = (!empty($_SERVER['HTTP_USER_AGENT'])) ? htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT']) : 'msie 6.0';
-
-	phpbb::$config = phpbb_cache::obtain_config();
-	$filename = phpbb_request::variable('avatar', '', false, phpbb_request::GET);
-	$avatar_group = false;
-	$exit = false;
-
-	if ($filename[0] === 'g')
-	{
-		$avatar_group = true;
-		$filename = substr($filename, 1);
-	}
-
-	// '==' is not a bug - . as the first char is as bad as no dot at all
-	if (strpos($filename, '.') == false)
-	{
-		header('HTTP/1.0 403 forbidden');
-		$exit = true;
-	}
-
-	if (!$exit)
-	{
-		$ext		= substr(strrchr($filename, '.'), 1);
-		$stamp		= (int) substr(stristr($filename, '_'), 1);
-		$filename	= (int) $filename;
-		$exit = set_modified_headers($stamp, $browser);
-	}
-	if (!$exit && !in_array($ext, array('png', 'gif', 'jpg', 'jpeg')))
-	{
-		// no way such an avatar could exist. They are not following the rules, stop the show.
-		header("HTTP/1.0 403 Forbidden");
-		$exit = true;
-	}
-
-
-	if (!$exit)
-	{
-		if (!$filename)
-		{
-			// no way such an avatar could exist. They are not following the rules, stop the show.
-			header("HTTP/1.0 403 Forbidden");
-		}
-		else
-		{
-			send_avatar_to_browser(($avatar_group ? 'g' : '') . $filename . '.' . $ext, $browser);
-		}
-	}
-	file_gc();
-}
-
-// implicit else: we are not in avatar mode
-$download_id = request_var('id', 0);
-$mode = request_var('mode', '');
-$thumbnail = request_var('t', false);
-
-// Start session management, do not update session page.
-phpbb::$user->session_begin(false);
-phpbb::$acl->init(phpbb::$user->data);
-phpbb::$user->setup('viewtopic');
-
-if (!$download_id)
-{
-	trigger_error('NO_ATTACHMENT_SELECTED');
-}
-
-if (!phpbb::$config['allow_attachments'] && !phpbb::$config['allow_pm_attach'])
-{
-	trigger_error('ATTACHMENT_FUNCTIONALITY_DISABLED');
-}
-
-$sql = 'SELECT attach_id, in_message, post_msg_id, extension, is_orphan, poster_id, filetime
-	FROM ' . ATTACHMENTS_TABLE . "
-	WHERE attach_id = $download_id";
-$result = phpbb::$db->sql_query_limit($sql, 1);
-$attachment = phpbb::$db->sql_fetchrow($result);
-phpbb::$db->sql_freeresult($result);
-
-if (!$attachment)
-{
-	trigger_error('ERROR_NO_ATTACHMENT');
-}
-
-if ((!$attachment['in_message'] && !phpbb::$config['allow_attachments']) || ($attachment['in_message'] && !phpbb::$config['allow_pm_attach']))
-{
-	trigger_error('ATTACHMENT_FUNCTIONALITY_DISABLED');
-}
-
-$row = array();
-
-if ($attachment['is_orphan'])
-{
-	// We allow admins having attachment permissions to see orphan attachments...
-	$own_attachment = (phpbb::$acl->acl_get('a_attach') || $attachment['poster_id'] == phpbb::$user->data['user_id']) ? true : false;
-
-	if (!$own_attachment || ($attachment['in_message'] && !phpbb::$acl->acl_get('u_pm_download')) || (!$attachment['in_message'] && !phpbb::$acl->acl_get('u_download')))
-	{
-		trigger_error('ERROR_NO_ATTACHMENT');
-	}
-
-	// Obtain all extensions...
-	$extensions = phpbb_cache::obtain_extensions();
-}
-else
-{
-	if (!$attachment['in_message'])
-	{
-		//
-		$sql = 'SELECT p.forum_id, f.forum_password, f.parent_id
-			FROM ' . POSTS_TABLE . ' p, ' . FORUMS_TABLE . ' f
-			WHERE p.post_id = ' . $attachment['post_msg_id'] . '
-				AND p.forum_id = f.forum_id';
-		$result = phpbb::$db->sql_query_limit($sql, 1);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		// Global announcement?
-		$f_download = (!$row) ? phpbb::$acl->acl_getf_global('f_download') : phpbb::$acl->acl_get('f_download', $row['forum_id']);
-
-		if (phpbb::$acl->acl_get('u_download') && $f_download)
-		{
-			if ($row && $row['forum_password'])
-			{
-				// Do something else ... ?
-				login_forum_box($row);
-			}
-		}
-		else
-		{
-			trigger_error('SORRY_AUTH_VIEW_ATTACH');
-		}
-	}
-	else
-	{
-		$row['forum_id'] = false;
-		if (!phpbb::$acl->acl_get('u_pm_download'))
-		{
-			header('HTTP/1.0 403 forbidden');
-			trigger_error('SORRY_AUTH_VIEW_ATTACH');
-		}
-
-		// Check if the attachment is within the users scope...
-		$sql = 'SELECT user_id, author_id
-			FROM ' . PRIVMSGS_TO_TABLE . '
-			WHERE msg_id = ' . $attachment['post_msg_id'];
-		$result = phpbb::$db->sql_query($sql);
-
-		$allowed = false;
-		while ($user_row = phpbb::$db->sql_fetchrow($result))
-		{
-			if (phpbb::$user->data['user_id'] == $user_row['user_id'] || phpbb::$user->data['user_id'] == $user_row['author_id'])
-			{
-				$allowed = true;
-				break;
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$allowed)
-		{
-			header('HTTP/1.0 403 forbidden');
-			trigger_error('ERROR_NO_ATTACHMENT');
-		}
-	}
-
-	// disallowed?
-	$extensions = array();
-	if (!extension_allowed($row['forum_id'], $attachment['extension'], $extensions))
-	{
-		trigger_error(sprintf(phpbb::$user->lang['EXTENSION_DISABLED_AFTER_POSTING'], $attachment['extension']));
-	}
-}
-
-if (!download_allowed())
-{
-	header('HTTP/1.0 403 forbidden');
-	trigger_error(phpbb::$user->lang['LINKAGE_FORBIDDEN']);
-}
-
-$download_mode = (int) $extensions[$attachment['extension']]['download_mode'];
-
-// Fetching filename here to prevent sniffing of filename
-$sql = 'SELECT attach_id, is_orphan, in_message, post_msg_id, extension, physical_filename, real_filename, mimetype, filetime
-	FROM ' . ATTACHMENTS_TABLE . "
-	WHERE attach_id = $download_id";
-$result = phpbb::$db->sql_query_limit($sql, 1);
-$attachment = phpbb::$db->sql_fetchrow($result);
-phpbb::$db->sql_freeresult($result);
-
-if (!$attachment)
-{
-	trigger_error('ERROR_NO_ATTACHMENT');
-}
-
-$attachment['physical_filename'] = basename($attachment['physical_filename']);
-$display_cat = $extensions[$attachment['extension']]['display_cat'];
-
-if (($display_cat == ATTACHMENT_CATEGORY_IMAGE || $display_cat == ATTACHMENT_CATEGORY_THUMB) && !phpbb::$user->optionget('viewimg'))
-{
-	$display_cat = ATTACHMENT_CATEGORY_NONE;
-}
-
-if ($display_cat == ATTACHMENT_CATEGORY_FLASH && !phpbb::$user->optionget('viewflash'))
-{
-	$display_cat = ATTACHMENT_CATEGORY_NONE;
-}
-
-if ($thumbnail)
-{
-	$attachment['physical_filename'] = 'thumb_' . $attachment['physical_filename'];
-}
-else if (($display_cat == ATTACHMENT_CATEGORY_NONE/* || $display_cat == ATTACHMENT_CATEGORY_IMAGE*/) && !$attachment['is_orphan'])
-{
-	// Update download count
-	$sql = 'UPDATE ' . ATTACHMENTS_TABLE . '
-		SET download_count = download_count + 1
-		WHERE attach_id = ' . $attachment['attach_id'];
-	phpbb::$db->sql_query($sql);
-}
-
-if ($display_cat == ATTACHMENT_CATEGORY_IMAGE && $mode === 'view' && (strpos($attachment['mimetype'], 'image') === 0) && ((strpos(strtolower(phpbb::$user->system['browser']), 'msie') !== false) && (strpos(strtolower(phpbb::$user->system['browser']), 'msie 8.0') === false)))
-{
-	wrap_img_in_html(append_sid('download/file', 'id=' . $attachment['attach_id']), $attachment['real_filename']);
-}
-else
-{
-	// Determine the 'presenting'-method
-	if ($download_mode == PHYSICAL_LINK)
-	{
-		// This presenting method should no longer be used
-		if (!@is_dir(PHPBB_ROOT_PATH . phpbb::$config['upload_path']))
-		{
-			trigger_error(phpbb::$user->lang['PHYSICAL_DOWNLOAD_NOT_POSSIBLE']);
-		}
-
-		redirect(PHPBB_ROOT_PATH . phpbb::$config['upload_path'] . '/' . $attachment['physical_filename']);
-		file_gc();
-	}
-	else
-	{
-		send_file_to_browser($attachment, phpbb::$config['upload_path'], $display_cat);
-		file_gc();
-	}
-}
-
-
-/**
-* A simplified function to deliver avatars
-* The argument needs to be checked before calling this function.
-*/
-function send_avatar_to_browser($file, $browser)
-{
-	$prefix = phpbb::$config['avatar_salt'] . '_';
-	$image_dir = phpbb::$config['avatar_path'];
-
-	// Adjust image_dir path (no trailing slash)
-	if (substr($image_dir, -1, 1) == '/' || substr($image_dir, -1, 1) == '\\')
-	{
-		$image_dir = substr($image_dir, 0, -1) . '/';
-	}
-	$image_dir = str_replace(array('../', '..\\', './', '.\\'), '', $image_dir);
-
-	if ($image_dir && ($image_dir[0] == '/' || $image_dir[0] == '\\'))
-	{
-		$image_dir = '';
-	}
-	$file_path = PHPBB_ROOT_PATH . $image_dir . '/' . $prefix . $file;
-
-	if ((@file_exists($file_path) && @is_readable($file_path)) && !headers_sent())
-	{
-		header('Pragma: public');
-
-		$image_data = @getimagesize($file_path);
-		header('Content-Type: ' . image_type_to_mime_type($image_data[2]));
-
-		if (strpos(strtolower($browser), 'msie') !== false && strpos(strtolower($browser), 'msie 8.0') === false)
-		{
-			header('Content-Disposition: attachment; ' . header_filename($file));
-
-			if (strpos(strtolower($browser), 'msie 6.0') !== false)
-			{
-				header('Expires: -1');
-			}
-			else
-			{
-				header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + 31536000));
-			}
-		}
-		else
-		{
-			header('Content-Disposition: inline; ' . header_filename($file));
-			header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + 31536000));
-		}
-
-		$size = @filesize($file_path);
-		if ($size)
-		{
-			header("Content-Length: $size");
-		}
-
-		if (@readfile($file_path) == false)
-		{
-			$fp = @fopen($file_path, 'rb');
-
-			if ($fp !== false)
-			{
-				while (!feof($fp))
-				{
-					echo fread($fp, 8192);
-				}
-				fclose($fp);
-			}
-		}
-
-		flush();
-	}
-	else
-	{
-		header('HTTP/1.0 404 Not Found');
-	}
-}
-
-/**
-* Wraps an url into a simple html page. Used to display attachments in IE.
-* this is a workaround for now; might be moved to template system later
-* direct any complaints to 1 Microsoft Way, Redmond
-*/
-function wrap_img_in_html($src, $title)
-{
-	echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-Strict.dtd">';
-	echo '<html>';
-	echo '<head>';
-	echo '<meta http-equiv="content-type" content="text/html; charset=UTF-8" />';
-	echo '<title>' . $title . '</title>';
-	echo '</head>';
-	echo '<body>';
-	echo '<div>';
-	echo '<img src="' . $src . '" alt="' . $title . '" />';
-	echo '</div>';
-	echo '</body>';
-	echo '</html>';
-}
-
-/**
-* Send file to browser
-*/
-function send_file_to_browser($attachment, $upload_dir, $category)
-{
-	$filename = PHPBB_ROOT_PATH . $upload_dir . '/' . $attachment['physical_filename'];
-
-	if (!@file_exists($filename))
-	{
-		trigger_error(phpbb::$user->lang['ERROR_NO_ATTACHMENT'] . '<br /><br />' . sprintf(phpbb::$user->lang['FILE_NOT_FOUND_404'], $filename));
-	}
-
-	// Correct the mime type - we force application/octetstream for all files, except images
-	// Please do not change this, it is a security precaution
-	if ($category != ATTACHMENT_CATEGORY_IMAGE || strpos($attachment['mimetype'], 'image') !== 0)
-	{
-		$attachment['mimetype'] = (strpos(strtolower(phpbb::$user->system['browser']), 'msie') !== false || strpos(strtolower(phpbb::$user->system['browser']), 'opera') !== false) ? 'application/octetstream' : 'application/octet-stream';
-	}
-
-	if (@ob_get_length())
-	{
-		@ob_end_clean();
-	}
-
-	// Now send the File Contents to the Browser
-	$size = @filesize($filename);
-
-	// To correctly display further errors we need to make sure we are using the correct headers for both (unsetting content-length may not work)
-
-	// Check if headers already sent or not able to get the file contents.
-	if (headers_sent() || !@file_exists($filename) || !@is_readable($filename))
-	{
-		// PHP track_errors setting On?
-		if (!empty($php_errormsg))
-		{
-			trigger_error(phpbb::$user->lang['UNABLE_TO_DELIVER_FILE'] . '<br />' . sprintf(phpbb::$user->lang['TRACKED_PHP_ERROR'], $php_errormsg));
-		}
-
-		trigger_error('UNABLE_TO_DELIVER_FILE');
-	}
-
-	// Now the tricky part... let's dance
-	header('Pragma: public');
-
-	/**
-	* Commented out X-Sendfile support. To not expose the physical filename within the header if xsendfile is absent we need to look into methods of checking it's status.
-	*
-	* Try X-Sendfile since it is much more server friendly - only works if the path is *not* outside of the root path...
-	* lighttpd has core support for it. An apache2 module is available at http://celebnamer.celebworld.ws/stuff/mod_xsendfile/
-	*
-	* Not really ideal, but should work fine...
-	* <code>
-	*	if (strpos($upload_dir, '/') !== 0 && strpos($upload_dir, '../') === false)
-	*	{
-	*		header('X-Sendfile: ' . $filename);
-	*	}
-	* </code>
-	*/
-
-	// Send out the Headers. Do not set Content-Disposition to inline please, it is a security measure for users using the Internet Explorer.
-	$is_ie8 = (strpos(strtolower(phpbb::$user->system['browser']), 'msie 8.0') !== false);
-	header('Content-Type: ' . $attachment['mimetype'] . (($is_ie8) ? '; authoritative=true;' : ''));
-
-	if ($category == ATTACHMENT_CATEGORY_FLASH && request_var('view', 0) === 1)
-	{
-		// We use content-disposition: inline for flash files and view=1 to let it correctly play with flash player 10 - any other disposition will fail to play inline
-		header('Content-Disposition: inline');
-	}
-	else if (empty(phpbb::$user->system['browser']) || (!$is_ie8 && (strpos(strtolower(phpbb::$user->system['browser']), 'msie') !== false)))
-	{
-		header('Content-Disposition: attachment; ' . header_filename(htmlspecialchars_decode($attachment['real_filename'])));
-		if (empty(phpbb::$user->system['browser']) || (strpos(strtolower(phpbb::$user->system['browser']), 'msie 6.0') !== false))
-		{
-			header('expires: -1');
-		}
-	}
-	else
-	{
-		header('Content-Disposition: ' . ((strpos($attachment['mimetype'], 'image') === 0) ? 'inline' : 'attachment') . '; ' . header_filename(htmlspecialchars_decode($attachment['real_filename'])));
-		if ($is_ie8 && (strpos($attachment['mimetype'], 'image') !== 0))
-		{
-			header('X-Download-Options: noopen');
-		}
-	}
-
-	if ($size)
-	{
-		header("Content-Length: $size");
-	}
-
-	// Close the db connection before sending the file
-	phpbb::$db->sql_close();
-
-	if (!set_modified_headers($attachment['filetime'], phpbb::$user->system['browser']))
-	{
-		// Try to deliver in chunks
-		@set_time_limit(0);
-
-		$fp = @fopen($filename, 'rb');
-
-		if ($fp !== false)
-		{
-			while (!feof($fp))
-			{
-				echo fread($fp, 8192);
-			}
-			fclose($fp);
-		}
-		else
-		{
-			@readfile($filename);
-		}
-
-		flush();
-	}
-	file_gc();
-}
-
-/**
-* Get a browser friendly UTF-8 encoded filename
-*/
-function header_filename($file)
-{
-	$user_agent = (!empty($_SERVER['HTTP_USER_AGENT'])) ? htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT']) : '';
-
-	// There be dragons here.
-	// Not many follows the RFC...
-	if (strpos($user_agent, 'MSIE') !== false || strpos($user_agent, 'Safari') !== false || strpos($user_agent, 'Konqueror') !== false)
-	{
-		return "filename=" . rawurlencode($file);
-	}
-
-	// follow the RFC for extended filename for the rest
-	return "filename*=UTF-8''" . rawurlencode($file);
-}
-
-/**
-* Check if downloading item is allowed
-*/
-function download_allowed()
-{
-	if (!phpbb::$config['secure_downloads'])
-	{
-		return true;
-	}
-
-	$url = (!empty($_SERVER['HTTP_REFERER'])) ? trim($_SERVER['HTTP_REFERER']) : trim(getenv('HTTP_REFERER'));
-
-	if (!$url)
-	{
-		return (phpbb::$config['secure_allow_empty_referer']) ? true : false;
-	}
-
-	// Split URL into domain and script part
-	$url = @parse_url($url);
-
-	if ($url === false)
-	{
-		return (phpbb::$config['secure_allow_empty_referer']) ? true : false;
-	}
-
-	$hostname = $url['host'];
-	unset($url);
-
-	$allowed = (phpbb::$config['secure_allow_deny']) ? false : true;
-	$iplist = array();
-
-	if (($ip_ary = @gethostbynamel($hostname)) !== false)
-	{
-		foreach ($ip_ary as $ip)
-		{
-			if ($ip)
-			{
-				$iplist[] = $ip;
-			}
-		}
-	}
-
-	// Check for own server...
-	$server_name = phpbb::$user->system['host'];
-
-	// Forcing server vars is the only way to specify/override the protocol
-	if (phpbb::$config['force_server_vars'] || !$server_name)
-	{
-		$server_name = phpbb::$config['server_name'];
-	}
-
-	if (preg_match('#^.*?' . preg_quote($server_name, '#') . '.*?$#i', $hostname))
-	{
-		$allowed = true;
-	}
-
-	// Get IP's and Hostnames
-	if (!$allowed)
-	{
-		$sql = 'SELECT site_ip, site_hostname, ip_exclude
-			FROM ' . SITELIST_TABLE;
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$site_ip = trim($row['site_ip']);
-			$site_hostname = trim($row['site_hostname']);
-
-			if ($site_ip)
-			{
-				foreach ($iplist as $ip)
-				{
-					if (preg_match('#^' . str_replace('\*', '.*?', preg_quote($site_ip, '#')) . '$#i', $ip))
-					{
-						if ($row['ip_exclude'])
-						{
-							$allowed = (phpbb::$config['secure_allow_deny']) ? false : true;
-							break 2;
-						}
-						else
-						{
-							$allowed = (phpbb::$config['secure_allow_deny']) ? true : false;
-						}
-					}
-				}
-			}
-
-			if ($site_hostname)
-			{
-				if (preg_match('#^' . str_replace('\*', '.*?', preg_quote($site_hostname, '#')) . '$#i', $hostname))
-				{
-					if ($row['ip_exclude'])
-					{
-						$allowed = (phpbb::$config['secure_allow_deny']) ? false : true;
-						break;
-					}
-					else
-					{
-						$allowed = (phpbb::$config['secure_allow_deny']) ? true : false;
-					}
-				}
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	return $allowed;
-}
-
-/**
-* Check if the browser has the file already and set the appropriate headers-
-* @returns false if a resend is in order.
-*/
-function set_modified_headers($stamp, $browser)
-{
-	// let's see if we have to send the file at all
-	$last_load 	=  isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? strtotime(trim($_SERVER['HTTP_IF_MODIFIED_SINCE'])) : false;
-	if ((strpos(strtolower($browser), 'msie 6.0') === false) && (strpos(strtolower($browser), 'msie 8.0') === false))
-	{
-		if ($last_load !== false && $last_load <= $stamp)
-		{
-			if (substr(strtolower(@php_sapi_name()),0,3) === 'cgi')
-			{
-				// in theory, we shouldn't need that due to php doing it. Reality offers a differing opinion, though
-				header('Status: 304 Not Modified', true, 304);
-			}
-			else
-			{
-				header('HTTP/1.0 304 Not Modified', true, 304);
-			}
-			// seems that we need those too ... browsers
-			header('Pragma: public');
-			header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + 31536000));
-			return true;
-		}
-		else
-		{
-			header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $stamp) . ' GMT');
-		}
-	}
-	return false;
-}
-
-function file_gc()
-{
-	if (phpbb::registered('acm'))
-	{
-		phpbb::$acm->unload();
-	}
-
-	if (phpbb::registered('db'))
-	{
-		phpbb::$db->sql_close();
-	}
-
-	exit;
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/faq.php b/phpBB/faq.php
deleted file mode 100644
index bae7886c41..0000000000
--- a/phpBB/faq.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-define('IN_PHPBB', true);
-if (!defined('PHPBB_ROOT_PATH')) define('PHPBB_ROOT_PATH', './');
-if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-include(PHPBB_ROOT_PATH . 'common.' . PHP_EXT);
-
-// Start session management
-phpbb::$user->session_begin();
-phpbb::$acl->init(phpbb::$user->data);
-phpbb::$user->setup();
-
-$mode = request_var('mode', '');
-
-// Load the appropriate faq file
-switch ($mode)
-{
-	case 'bbcode':
-		$l_title = phpbb::$user->lang['BBCODE_GUIDE'];
-		phpbb::$user->add_lang('bbcode', false, true);
-	break;
-
-	default:
-		$l_title = phpbb::$user->lang['FAQ_EXPLAIN'];
-		phpbb::$user->add_lang('faq', false, true);
-	break;
-}
-
-// Pull the array data from the lang pack
-$help_blocks = array();
-foreach (phpbb::$user->help as $help_ary)
-{
-	if ($help_ary[0] == '--')
-	{
-		phpbb::$template->assign_block_vars('faq_block', array(
-			'BLOCK_TITLE'		=> $help_ary[1],
-		));
-
-		continue;
-	}
-
-	phpbb::$template->assign_block_vars('faq_block.faq_row', array(
-		'FAQ_QUESTION'		=> $help_ary[0],
-		'FAQ_ANSWER'		=> $help_ary[1],
-	));
-}
-
-// Lets build a page ...
-phpbb::$template->assign_vars(array(
-	'L_FAQ_TITLE'	=> $l_title,
-	'L_BACK_TO_TOP'	=> phpbb::$user->lang['BACK_TO_TOP'],
-));
-
-page_header($l_title);
-
-phpbb::$template->set_filenames(array(
-	'body' => 'faq_body.html')
-);
-make_jumpbox(append_sid('viewforum'));
-
-page_footer();
-
-?>
-\ No newline at end of file
diff --git a/phpBB/files/.htaccess b/phpBB/files/.htaccess
deleted file mode 100644
index aa5afc1640..0000000000
--- a/phpBB/files/.htaccess
+++ /dev/null
@@ -1,4 +0,0 @@
-<Files *>
-	Order Allow,Deny
-	Deny from All
-</Files>
-\ No newline at end of file
diff --git a/phpBB/images/avatars/upload/.htaccess b/phpBB/images/avatars/upload/.htaccess
deleted file mode 100644
index aa5afc1640..0000000000
--- a/phpBB/images/avatars/upload/.htaccess
+++ /dev/null
@@ -1,4 +0,0 @@
-<Files *>
-	Order Allow,Deny
-	Deny from All
-</Files>
-\ No newline at end of file
diff --git a/phpBB/images/icons/misc/fire.gif b/phpBB/images/icons/misc/fire.gif
deleted file mode 100644
index e436d6e8c9..0000000000
--- a/phpBB/images/icons/misc/fire.gif
+++ /dev/null
diff --git a/phpBB/images/icons/misc/heart.gif b/phpBB/images/icons/misc/heart.gif
deleted file mode 100644
index c626dcb99f..0000000000
--- a/phpBB/images/icons/misc/heart.gif
+++ /dev/null
diff --git a/phpBB/images/icons/misc/radioactive.gif b/phpBB/images/icons/misc/radioactive.gif
deleted file mode 100644
index 517ae6397b..0000000000
--- a/phpBB/images/icons/misc/radioactive.gif
+++ /dev/null
diff --git a/phpBB/images/icons/misc/star.gif b/phpBB/images/icons/misc/star.gif
deleted file mode 100644
index dcde6eb66e..0000000000
--- a/phpBB/images/icons/misc/star.gif
+++ /dev/null
diff --git a/phpBB/images/icons/misc/thinking.gif b/phpBB/images/icons/misc/thinking.gif
deleted file mode 100644
index fdec41bc19..0000000000
--- a/phpBB/images/icons/misc/thinking.gif
+++ /dev/null
diff --git a/phpBB/images/icons/smile/alert.gif b/phpBB/images/icons/smile/alert.gif
deleted file mode 100644
index 024e2a969a..0000000000
--- a/phpBB/images/icons/smile/alert.gif
+++ /dev/null
diff --git a/phpBB/images/icons/smile/info.gif b/phpBB/images/icons/smile/info.gif
deleted file mode 100644
index d715ac7c75..0000000000
--- a/phpBB/images/icons/smile/info.gif
+++ /dev/null
diff --git a/phpBB/images/icons/smile/mrgreen.gif b/phpBB/images/icons/smile/mrgreen.gif
deleted file mode 100644
index 9cd2715824..0000000000
--- a/phpBB/images/icons/smile/mrgreen.gif
+++ /dev/null
diff --git a/phpBB/images/icons/smile/question.gif b/phpBB/images/icons/smile/question.gif
deleted file mode 100644
index a07c038a9b..0000000000
--- a/phpBB/images/icons/smile/question.gif
+++ /dev/null
diff --git a/phpBB/images/icons/smile/redface.gif b/phpBB/images/icons/smile/redface.gif
deleted file mode 100644
index 50e7ce3bfa..0000000000
--- a/phpBB/images/icons/smile/redface.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_arrow.gif b/phpBB/images/smilies/icon_arrow.gif
deleted file mode 100644
index c0f9117b96..0000000000
--- a/phpBB/images/smilies/icon_arrow.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_cool.gif b/phpBB/images/smilies/icon_cool.gif
deleted file mode 100644
index 6dd150375d..0000000000
--- a/phpBB/images/smilies/icon_cool.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_cry.gif b/phpBB/images/smilies/icon_cry.gif
deleted file mode 100644
index 21a5a3c113..0000000000
--- a/phpBB/images/smilies/icon_cry.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_e_biggrin.gif b/phpBB/images/smilies/icon_e_biggrin.gif
deleted file mode 100644
index 08be8479b2..0000000000
--- a/phpBB/images/smilies/icon_e_biggrin.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_e_confused.gif b/phpBB/images/smilies/icon_e_confused.gif
deleted file mode 100644
index be5b583c0c..0000000000
--- a/phpBB/images/smilies/icon_e_confused.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_e_geek.gif b/phpBB/images/smilies/icon_e_geek.gif
deleted file mode 100644
index 535bc9f723..0000000000
--- a/phpBB/images/smilies/icon_e_geek.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_e_sad.gif b/phpBB/images/smilies/icon_e_sad.gif
deleted file mode 100644
index 7cd3016a96..0000000000
--- a/phpBB/images/smilies/icon_e_sad.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_e_smile.gif b/phpBB/images/smilies/icon_e_smile.gif
deleted file mode 100644
index d1ec74c8e0..0000000000
--- a/phpBB/images/smilies/icon_e_smile.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_e_surprised.gif b/phpBB/images/smilies/icon_e_surprised.gif
deleted file mode 100644
index 1be6041e3a..0000000000
--- a/phpBB/images/smilies/icon_e_surprised.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_e_ugeek.gif b/phpBB/images/smilies/icon_e_ugeek.gif
deleted file mode 100644
index 0d3c17994d..0000000000
--- a/phpBB/images/smilies/icon_e_ugeek.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_e_wink.gif b/phpBB/images/smilies/icon_e_wink.gif
deleted file mode 100644
index fb1c1402d2..0000000000
--- a/phpBB/images/smilies/icon_e_wink.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_eek.gif b/phpBB/images/smilies/icon_eek.gif
deleted file mode 100644
index cbe9b7b6ab..0000000000
--- a/phpBB/images/smilies/icon_eek.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_evil.gif b/phpBB/images/smilies/icon_evil.gif
deleted file mode 100644
index 98e6535fde..0000000000
--- a/phpBB/images/smilies/icon_evil.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_exclaim.gif b/phpBB/images/smilies/icon_exclaim.gif
deleted file mode 100644
index 2b4a3df330..0000000000
--- a/phpBB/images/smilies/icon_exclaim.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_idea.gif b/phpBB/images/smilies/icon_idea.gif
deleted file mode 100644
index e51d542bfe..0000000000
--- a/phpBB/images/smilies/icon_idea.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_lol.gif b/phpBB/images/smilies/icon_lol.gif
deleted file mode 100644
index 3042b00d6b..0000000000
--- a/phpBB/images/smilies/icon_lol.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_mad.gif b/phpBB/images/smilies/icon_mad.gif
deleted file mode 100644
index 994216615b..0000000000
--- a/phpBB/images/smilies/icon_mad.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_mrgreen.gif b/phpBB/images/smilies/icon_mrgreen.gif
deleted file mode 100644
index dcb44bb01a..0000000000
--- a/phpBB/images/smilies/icon_mrgreen.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_neutral.gif b/phpBB/images/smilies/icon_neutral.gif
deleted file mode 100644
index 41c3e14c48..0000000000
--- a/phpBB/images/smilies/icon_neutral.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_question.gif b/phpBB/images/smilies/icon_question.gif
deleted file mode 100644
index 13936f71a6..0000000000
--- a/phpBB/images/smilies/icon_question.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_razz.gif b/phpBB/images/smilies/icon_razz.gif
deleted file mode 100644
index a262743958..0000000000
--- a/phpBB/images/smilies/icon_razz.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_redface.gif b/phpBB/images/smilies/icon_redface.gif
deleted file mode 100644
index d23a1396a0..0000000000
--- a/phpBB/images/smilies/icon_redface.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_rolleyes.gif b/phpBB/images/smilies/icon_rolleyes.gif
deleted file mode 100644
index 0707821667..0000000000
--- a/phpBB/images/smilies/icon_rolleyes.gif
+++ /dev/null
diff --git a/phpBB/images/smilies/icon_twisted.gif b/phpBB/images/smilies/icon_twisted.gif
deleted file mode 100644
index a555dd0ab3..0000000000
--- a/phpBB/images/smilies/icon_twisted.gif
+++ /dev/null
diff --git a/phpBB/images/spacer.gif b/phpBB/images/spacer.gif
deleted file mode 100644
index cd29009a65..0000000000
--- a/phpBB/images/spacer.gif
+++ /dev/null
diff --git a/phpBB/images/upload_icons/avi.gif b/phpBB/images/upload_icons/avi.gif
deleted file mode 100644
index 55f2116261..0000000000
--- a/phpBB/images/upload_icons/avi.gif
+++ /dev/null
diff --git a/phpBB/images/upload_icons/bmp.gif b/phpBB/images/upload_icons/bmp.gif
deleted file mode 100644
index abd05713ef..0000000000
--- a/phpBB/images/upload_icons/bmp.gif
+++ /dev/null
diff --git a/phpBB/images/upload_icons/doc.gif b/phpBB/images/upload_icons/doc.gif
deleted file mode 100644
index 078d9f7a14..0000000000
--- a/phpBB/images/upload_icons/doc.gif
+++ /dev/null
diff --git a/phpBB/images/upload_icons/exe.gif b/phpBB/images/upload_icons/exe.gif
deleted file mode 100644
index b77dd4dcec..0000000000
--- a/phpBB/images/upload_icons/exe.gif
+++ /dev/null
diff --git a/phpBB/images/upload_icons/flash.gif b/phpBB/images/upload_icons/flash.gif
deleted file mode 100644
index 00ee0f4f72..0000000000
--- a/phpBB/images/upload_icons/flash.gif
+++ /dev/null
diff --git a/phpBB/images/upload_icons/gif.gif b/phpBB/images/upload_icons/gif.gif
deleted file mode 100644
index 5aa8d463e7..0000000000
--- a/phpBB/images/upload_icons/gif.gif
+++ /dev/null
diff --git a/phpBB/images/upload_icons/html.gif b/phpBB/images/upload_icons/html.gif
deleted file mode 100644
index eb948eae6a..0000000000
--- a/phpBB/images/upload_icons/html.gif
+++ /dev/null
diff --git a/phpBB/images/upload_icons/jpg.gif b/phpBB/images/upload_icons/jpg.gif
deleted file mode 100644
index 537de1c3a0..0000000000
--- a/phpBB/images/upload_icons/jpg.gif
+++ /dev/null
diff --git a/phpBB/images/upload_icons/mid.gif b/phpBB/images/upload_icons/mid.gif
deleted file mode 100644
index ea7302cb16..0000000000
--- a/phpBB/images/upload_icons/mid.gif
+++ /dev/null
diff --git a/phpBB/images/upload_icons/mov.gif b/phpBB/images/upload_icons/mov.gif
deleted file mode 100644
index 55f2116261..0000000000
--- a/phpBB/images/upload_icons/mov.gif
+++ /dev/null
diff --git a/phpBB/images/upload_icons/mp3.gif b/phpBB/images/upload_icons/mp3.gif
deleted file mode 100644
index acf1a5015f..0000000000
--- a/phpBB/images/upload_icons/mp3.gif
+++ /dev/null
diff --git a/phpBB/images/upload_icons/mpg.gif b/phpBB/images/upload_icons/mpg.gif
deleted file mode 100644
index 55f2116261..0000000000
--- a/phpBB/images/upload_icons/mpg.gif
+++ /dev/null
diff --git a/phpBB/images/upload_icons/netscape.gif b/phpBB/images/upload_icons/netscape.gif
deleted file mode 100644
index 0854440952..0000000000
--- a/phpBB/images/upload_icons/netscape.gif
+++ /dev/null
diff --git a/phpBB/images/upload_icons/pdf.gif b/phpBB/images/upload_icons/pdf.gif
deleted file mode 100644
index 8d0603ae65..0000000000
--- a/phpBB/images/upload_icons/pdf.gif
+++ /dev/null
diff --git a/phpBB/images/upload_icons/ppt.gif b/phpBB/images/upload_icons/ppt.gif
deleted file mode 100644
index a3800d12c6..0000000000
--- a/phpBB/images/upload_icons/ppt.gif
+++ /dev/null
diff --git a/phpBB/images/upload_icons/rar.gif b/phpBB/images/upload_icons/rar.gif
deleted file mode 100644
index 9c0bd5667e..0000000000
--- a/phpBB/images/upload_icons/rar.gif
+++ /dev/null
diff --git a/phpBB/images/upload_icons/txt.gif b/phpBB/images/upload_icons/txt.gif
deleted file mode 100644
index cc3639b89c..0000000000
--- a/phpBB/images/upload_icons/txt.gif
+++ /dev/null
diff --git a/phpBB/images/upload_icons/wav.gif b/phpBB/images/upload_icons/wav.gif
deleted file mode 100644
index 21195252b7..0000000000
--- a/phpBB/images/upload_icons/wav.gif
+++ /dev/null
diff --git a/phpBB/images/upload_icons/xls.gif b/phpBB/images/upload_icons/xls.gif
deleted file mode 100644
index 187a19b53c..0000000000
--- a/phpBB/images/upload_icons/xls.gif
+++ /dev/null
diff --git a/phpBB/images/upload_icons/zip.gif b/phpBB/images/upload_icons/zip.gif
deleted file mode 100644
index 0141376100..0000000000
--- a/phpBB/images/upload_icons/zip.gif
+++ /dev/null
diff --git a/phpBB/includes/acm/acm_apc.php b/phpBB/includes/acm/acm_apc.php
deleted file mode 100644
index fa92de2b50..0000000000
--- a/phpBB/includes/acm/acm_apc.php
+++ /dev/null
@@ -1,388 +0,0 @@
-<?php
-/**
-*
-* @package acm
-* @version $Id$
-* @copyright (c) 2009 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* ACM File Based Caching
-* @package acm
-*/
-class acm
-{
-	var $vars = array();
-	var $is_modified = false;
-
-	var $sql_rowset = array();
-	var $sql_row_pointer = array();
-	var $cache_dir = '';
-
-	/**
-	* Set cache path
-	*/
-	function acm()
-	{
-		$this->cache_dir = $phpbb_root_path . 'cache/';
-	}
-
-	/**
-	* Load global cache
-	*/
-	function load()
-	{
-		// grab the global cache
-		$this->vars = apc_fetch('global');
-
-		if ($this->vars !== false)
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Unload cache object
-	*/
-	function unload()
-	{
-		$this->save();
-		unset($this->vars);
-		unset($this->sql_rowset);
-		unset($this->sql_row_pointer);
-
-		$this->vars = array();
-		$this->sql_rowset = array();
-		$this->sql_row_pointer = array();
-	}
-
-	/**
-	* Save modified objects
-	*/
-	function save()
-	{
-		if (!$this->is_modified)
-		{
-			return;
-		}
-
-		apc_store('global', $this->vars, 31536000);
-
-		$this->is_modified = false;
-	}
-
-	/**
-	* Tidy cache
-	*/
-	function tidy()
-	{
-		// cache has auto GC, no need to have any code here :)
-
-		set_config('cache_last_gc', time(), true);
-	}
-
-	/**
-	* Get saved cache object
-	*/
-	function get($var_name)
-	{
-		if ($var_name[0] == '_')
-		{
-			if (!$this->_exists($var_name))
-			{
-				return false;
-			}
-
-			return apc_fetch($var_name);
-		}
-		else
-		{
-			return ($this->_exists($var_name)) ? $this->vars[$var_name] : false;
-		}
-	}
-
-	/**
-	* Put data into cache
-	*/
-	function put($var_name, $var, $ttl = 31536000)
-	{
-		if ($var_name[0] == '_')
-		{
-			apc_store($var_name, $var, $ttl);
-		}
-		else
-		{
-			$this->vars[$var_name] = $var;
-			$this->is_modified = true;
-		}
-	}
-
-	/**
-	* Purge cache data
-	*/
-	function purge()
-	{
-		// Purge all phpbb cache files
-		$dir = @opendir($this->cache_dir);
-
-		if (!$dir)
-		{
-			return;
-		}
-
-		while (($entry = readdir($dir)) !== false)
-		{
-			if (strpos($entry, 'sql_') !== 0 && strpos($entry, 'data_') !== 0 && strpos($entry, 'ctpl_') !== 0 && strpos($entry, 'tpl_') !== 0)
-			{
-				continue;
-			}
-
-			$this->remove_file($this->cache_dir . $entry);
-		}
-		closedir($dir);
-
-		apc_clear_cache('user');
-
-		unset($this->vars);
-		unset($this->sql_rowset);
-		unset($this->sql_row_pointer);
-
-		$this->vars = array();
-		$this->sql_rowset = array();
-		$this->sql_row_pointer = array();
-
-		$this->is_modified = false;
-	}
-
-	/**
-	* Destroy cache data
-	*/
-	function destroy($var_name, $table = '')
-	{
-		if ($var_name == 'sql' && !empty($table))
-		{
-			if (!is_array($table))
-			{
-				$table = array($table);
-			}
-
-			foreach ($table as $table_name)
-			{
-				// gives us the md5s that we want
-				$temp = apc_fetch('sql_' . $table_name);
-
-				if ($temp === false)
-				{
-					continue;
-				}
-
-				// delete each query ref
-				foreach ($temp as $md5_id => $void)
-				{
-					apc_delete('sql_' . $md5_id);
-				}
-
-				// delete the table ref
-				apc_delete('sql_' . $table_name);
-			}
-
-			return;
-		}
-
-		if (!$this->_exists($var_name))
-		{
-			return;
-		}
-
-		if ($var_name[0] == '_')
-		{
-			apc_delete($var_name);
-		}
-		else if (isset($this->vars[$var_name]))
-		{
-			$this->is_modified = true;
-			unset($this->vars[$var_name]);
-
-			// We save here to let the following cache hits succeed
-			$this->save();
-		}
-	}
-
-	/**
-	* Check if a given cache entry exist
-	*/
-	function _exists($var_name)
-	{
-		if ($var_name[0] == '_')
-		{
-			return true;
-		}
-		else
-		{
-			if (!sizeof($this->vars))
-			{
-				$this->load();
-			}
-
-			return isset($this->vars[$var_name]);
-		}
-	}
-
-	/**
-	* Load cached sql query
-	*/
-	function sql_load($query)
-	{
-		// Remove extra spaces and tabs
-		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
-		$query_id = sizeof($this->sql_rowset);
-
-		$temp = apc_fetch('sql_' . md5($query));
-
-		if ($temp === false)
-		{
-			return false;
-		}
-
-		$this->sql_rowset[$query_id] = $temp;
-		$this->sql_row_pointer[$query_id] = 0;
-
-		return $query_id;
-	}
-
-	/**
-	* Save sql query
-	*/
-	function sql_save($query, &$query_result, $ttl)
-	{
-		// Remove extra spaces and tabs
-		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
-
-		// determine which tables this query belongs to
-		preg_match('/FROM \\(?(\\w+(?: \\w+)?(?:, ?\\w+(?: \\w+)?)*)\\)?/', $query, $regs);
-		$tables = array_map('trim', explode(',', $regs[1]));
-
-		foreach ($tables as $table_name)
-		{
-			if (($pos = strpos($table_name, ' ')) !== false)
-			{
-				$table_name = substr($table_name, 0, $pos);
-			}
-
-			$temp = apc_fetch('sql_' . $table_name);
-			if ($temp === false)
-			{
-				$temp = array();
-			}
-			$temp[md5($query)] = true;
-			apc_store('sql_' . $table_name, $temp, $ttl);
-		}
-
-		// store them in the right place
-		$query_id = sizeof($this->sql_rowset);
-		$this->sql_rowset[$query_id] = array();
-		$this->sql_row_pointer[$query_id] = 0;
-
-		while ($row = phpbb::$db->sql_fetchrow($query_result))
-		{
-			$this->sql_rowset[$query_id][] = $row;
-		}
-		phpbb::$db->sql_freeresult($query_result);
-
-		apc_store('sql_' . md5($query), $this->sql_rowset[$query_id], $ttl);
-
-		$query_result = $query_id;
-	}
-
-	/**
-	* Ceck if a given sql query exist in cache
-	*/
-	function sql_exists($query_id)
-	{
-		return isset($this->sql_rowset[$query_id]);
-	}
-
-	/**
-	* Fetch row from cache (database)
-	*/
-	function sql_fetchrow($query_id)
-	{
-		if ($this->sql_row_pointer[$query_id] < sizeof($this->sql_rowset[$query_id]))
-		{
-			return $this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]++];
-		}
-
-		return false;
-	}
-
-	/**
-	* Fetch a field from the current row of a cached database result (database)
-	*/
-	function sql_fetchfield($query_id, $field)
-	{
-		if ($this->sql_row_pointer[$query_id] < sizeof($this->sql_rowset[$query_id]))
-		{
-			return (isset($this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]][$field])) ? $this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]][$field] : false;
-		}
-
-		return false;
-	}
-
-	/**
-	* Seek a specific row in an a cached database result (database)
-	*/
-	function sql_rowseek($rownum, $query_id)
-	{
-		if ($rownum >= sizeof($this->sql_rowset[$query_id]))
-		{
-			return false;
-		}
-
-		$this->sql_row_pointer[$query_id] = $rownum;
-		return true;
-	}
-
-	/**
-	* Free memory used for a cached database result (database)
-	*/
-	function sql_freeresult($query_id)
-	{
-		if (!isset($this->sql_rowset[$query_id]))
-		{
-			return false;
-		}
-
-		unset($this->sql_rowset[$query_id]);
-		unset($this->sql_row_pointer[$query_id]);
-
-		return true;
-	}
-
-	/**
-	* Removes/unlinks file
-	*/
-	function remove_file($filename, $check = false)
-	{
-		if ($check && !@is_writable($this->cache_dir))
-		{
-			// E_USER_ERROR - not using language entry - intended.
-			trigger_error('Unable to remove files within ' . $this->cache_dir . '. Please check directory permissions.', E_USER_ERROR);
-		}
-
-		return @unlink($filename);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/acm/acm_eaccelerator.php b/phpBB/includes/acm/acm_eaccelerator.php
deleted file mode 100644
index c6d83da049..0000000000
--- a/phpBB/includes/acm/acm_eaccelerator.php
+++ /dev/null
@@ -1,352 +0,0 @@
-<?php
-/**
-*
-* @package acm
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* ACM Memcache Based Caching
-* @package acm
-*/
-class acm
-{
-	var $vars = array();
-	var $is_modified = false;
-
-	var $sql_rowset = array();
-	var $sql_row_pointer = array();
-	var $cache_dir = '';
-
-	/**
-	* Set cache path
-	*/
-	function acm()
-	{
-		$this->cache_dir = $phpbb_root_path . 'cache/';
-	}
-
-	/**
-	* Load global cache
-	*/
-	function load()
-	{
-		// grab the global cache
-		$temp = eaccelerator_get('global');
-
-		if ($temp !== null)
-		{
-			$this->vars = $temp;
-		}
-		else
-		{
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	* Unload cache object
-	*/
-	function unload()
-	{
-		$this->save();
-		unset($this->vars);
-		unset($this->sql_rowset);
-		unset($this->sql_row_pointer);
-	}
-
-	/**
-	* Save modified objects
-	*/
-	function save()
-	{
-		if (!$this->is_modified)
-		{
-			return;
-		}
-
-		eaccelerator_put('global', $this->vars, 31536000);
-
-		$this->is_modified = false;
-	}
-
-	/**
-	* Tidy cache
-	*/
-	function tidy()
-	{
-		eaccelerator_gc();
-
-		set_config('cache_last_gc', time(), true);
-	}
-
-	/**
-	* Get saved cache object
-	*/
-	function get($var_name)
-	{
-		if ($var_name[0] == '_')
-		{
-			$temp = eaccelerator_get($var_name);
-
-			if ($temp !== null)
-			{
-				return $temp;
-			}
-			else
-			{
-				return false;
-			}
-		}
-		else
-		{
-			if (!sizeof($this->vars))
-			{
-				$this->load();
-			}
-			return (isset($this->vars[$var_name])) ? $this->vars[$var_name] : false;
-		}
-	}
-
-	/**
-	* Put data into cache
-	*/
-	function put($var_name, $var, $ttl = 31536000)
-	{
-		if ($var_name[0] == '_')
-		{
-			eaccelerator_put($var_name, $var, $ttl);
-		}
-		else
-		{
-			$this->vars[$var_name] = $var;
-			$this->is_modified = true;
-		}
-	}
-
-	/**
-	* Purge cache data
-	*/
-	function purge()
-	{
-		// Purge all phpbb cache files
-		$dir = @opendir($this->cache_dir);
-
-		if (!$dir)
-		{
-			return;
-		}
-
-		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);
-
-		foreach (eaccelerator_list_keys() as $var)
-		{
-			eaccelerator_rm(substr($var['name'], 1));
-		}
-
-		unset($this->vars);
-		unset($this->sql_rowset);
-		unset($this->sql_row_pointer);
-
-		$this->is_modified = false;
-	}
-
-	/**
-	* Destroy cache data
-	*/
-	function destroy($var_name, $table = '')
-	{
-		if ($var_name == 'sql' && !empty($table))
-		{
-			if (!is_array($table))
-			{
-				$table = array($table);
-			}
-
-			foreach ($table as $table_name)
-			{
-				// gives us the md5s that we want
-				eaccelerator_lock('sql_' . $table_name);
-				$temp = eaccelerator_get('sql_' . $table_name);
-				if ($temp === null)
-				{
-					continue;
-				}
-
-				// delete each query ref
-				foreach ($temp as $md5_id => $void)
-				{
-					eaccelerator_lock('sql_' . $md5_id);
-					eaccelerator_rm('sql_' . $md5_id);
-					eaccelerator_unlock('sql_' . $md5_id);
-				}
-
-				// delete the table ref
-				eaccelerator_rm('sql_' . $table_name);
-				eaccelerator_unlock('sql_' . $table_name);
-			}
-
-			return;
-		}
-
-		if ($var_name[0] == '_')
-		{
-			eaccelerator_rm($var_name);
-		}
-		else if (isset($this->vars[$var_name]))
-		{
-			$this->is_modified = true;
-			unset($this->vars[$var_name]);
-
-			// We save here to let the following cache hits succeed
-			$this->save();
-		}
-	}
-
-	/**
-	* Load cached sql query
-	*/
-	function sql_load($query)
-	{
-		// Remove extra spaces and tabs
-		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
-		$query_id = sizeof($this->sql_rowset);
-
-		$temp = eaccelerator_get('sql_' . md5($query));
-
-		if ($temp === null)
-		{
-			return false;
-		}
-
-		$this->sql_rowset[$query_id] = $temp;
-
-		$this->sql_row_pointer[$query_id] = 0;
-
-		return $query_id;
-	}
-
-	/**
-	* Save sql query
-	*/
-	function sql_save($query, &$query_result, $ttl)
-	{
-		// Remove extra spaces and tabs
-		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
-
-		// determine which tables this query belongs to
-		preg_match('/FROM \\(?(\\w+(?: \\w+)?(?:, ?\\w+(?: \\w+)?)*)\\)?/', $query, $regs);
-		$tables = array_map('trim', explode(',', $regs[1]));
-
-		foreach ($tables as $table_name)
-		{
-			if (($pos = strpos($table_name, ' ')) !== false)
-			{
-				$table_name = substr($table_name, 0, $pos);
-			}
-
-			$temp = eaccelerator_get('sql_' . $table_name);
-			if ($temp === null)
-			{
-				$temp = array();
-			}
-			$temp[md5($query)] = true;
-			eaccelerator_put('sql_' . $table_name, $temp, $ttl);
-		}
-
-		// store them in the right place
-		$query_id = sizeof($this->sql_rowset);
-		$this->sql_rowset[$query_id] = array();
-		$this->sql_row_pointer[$query_id] = 0;
-
-		while ($row = phpbb::$db->sql_fetchrow($query_result))
-		{
-			$this->sql_rowset[$query_id][] = $row;
-		}
-		phpbb::$db->sql_freeresult($query_result);
-
-		eaccelerator_put('sql_' . md5($query), $this->sql_rowset[$query_id], $ttl);
-
-		$query_result = $query_id;
-	}
-
-	/**
-	* Ceck if a given sql query exist in cache
-	*/
-	function sql_exists($query_id)
-	{
-		return isset($this->sql_rowset[$query_id]);
-	}
-
-	/**
-	* Fetch row from cache (database)
-	*/
-	function sql_fetchrow($query_id)
-	{
-		if ($this->sql_row_pointer[$query_id] < sizeof($this->sql_rowset[$query_id]))
-		{
-			return $this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]++];
-		}
-
-		return false;
-	}
-
-	/**
-	* Fetch a field from the current row of a cached database result (database)
-	*/
-	function sql_fetchfield($query_id, $field)
-	{
-		if ($this->sql_row_pointer[$query_id] < sizeof($this->sql_rowset[$query_id]))
-		{
-			return (isset($this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]][$field])) ? $this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]][$field] : false;
-		}
-
-		return false;
-	}
-
-	/**
-	* Seek a specific row in an a cached database result (database)
-	*/
-	function sql_rowseek($rownum, $query_id)
-	{
-		if ($rownum >= sizeof($this->sql_rowset[$query_id]))
-		{
-			return false;
-		}
-
-		$this->sql_row_pointer[$query_id] = $rownum;
-		return true;
-	}
-
-	/**
-	* Free memory used for a cached database result (database)
-	*/
-	function sql_freeresult($query_id)
-	{
-		if (!isset($this->sql_rowset[$query_id]))
-		{
-			return false;
-		}
-
-		unset($this->sql_rowset[$query_id]);
-		unset($this->sql_row_pointer[$query_id]);
-
-		return true;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/acm/acm_file.php b/phpBB/includes/acm/acm_file.php
deleted file mode 100644
index e073230d49..0000000000
--- a/phpBB/includes/acm/acm_file.php
+++ /dev/null
@@ -1,344 +0,0 @@
-<?php
-/**
-*
-* @package acm
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Define file-based cache.
-* @package acm
-*/
-class phpbb_acm_file extends phpbb_acm_abstract
-{
-	/**
-	* @var string The cache directory to use
-	*/
-	public $cache_dir = '';
-
-	/**
-	* @var array|bool The cache types this class supports. True indicates support for all types.
-	*/
-	public $supported = true;
-
-	/**
-	* Set cache directory
-	*
-	* @param string	$cache_prefix	The cache prefix the instance is responsible for
-	* @access public
-	*/
-	public function __construct($cache_prefix)
-	{
-		$this->cache_dir = PHPBB_ROOT_PATH . 'cache/';
-		$this->cache_prefix = $cache_prefix;
-	}
-
-	/**
-	* {@link phpbb_acm_abstract::get() get()}
-	*/
-	public function get($var_name)
-	{
-		if ($var_name[0] === '#')
-		{
-			$var_name = substr($var_name, 1);
-			return $this->get_global($var_name);
-		}
-
-		if (!$this->exists($var_name))
-		{
-			return false;
-		}
-
-		@include($this->cache_dir . $this->cache_prefix . '_' . $var_name . '.' . PHP_EXT);
-
-		// If no data there, then the file expired...
-		if ($expired)
-		{
-			// Destroy
-			$this->destroy($var_name);
-			return false;
-		}
-
-		return $data;
-	}
-
-	/**
-	* {@link phpbb_acm_abstract::put() put()}
-	*/
-	public function put($var_name, $data, $ttl = 31536000)
-	{
-		if ($var_name[0] === '#')
-		{
-			$var_name = substr($var_name, 1);
-			return $this->put_global($var_name, $data, $ttl);
-		}
-
-		$filename = $this->cache_dir . $this->cache_prefix . '_' . $var_name . '.' . PHP_EXT;
-
-		if ($fp = @fopen($filename, 'wb'))
-		{
-			@flock($fp, LOCK_EX);
-			fwrite($fp, "<?php\nif (!defined('IN_PHPBB')) exit;\n\$expired = (time() > " . (time() + $ttl) . ") ? true : false;\nif (\$expired) { return; }\n\$data =  " . (sizeof($data) ? "unserialize(" . var_export(serialize($data), true) . ");" : 'array();'));
-			@flock($fp, LOCK_UN);
-			fclose($fp);
-
-			phpbb::$system->chmod($filename, phpbb::CHMOD_READ | phpbb::CHMOD_WRITE);
-		}
-
-		return $data;
-	}
-
-
-	/**
-	* {@link phpbb_acm_abstract::exists() exists()}
-	*/
-	public function exists($var_name)
-	{
-		if ($var_name[0] === '#')
-		{
-			$var_name = substr($var_name, 1);
-			return $this->exists_global($var_name);
-		}
-
-		return file_exists($this->cache_dir . $this->cache_prefix . '_' . $var_name . '.' . PHP_EXT);
-	}
-
-	/**
-	* {@link phpbb_acm_abstract::destroy() destroy()}
-	*/
-	public function destroy($var_name)
-	{
-		if ($var_name[0] === '#')
-		{
-			$var_name = substr($var_name, 1);
-			$this->destroy_global($var_name);
-		}
-
-		if (!$this->exists($var_name))
-		{
-			return false;
-		}
-
-		$this->remove_file($this->cache_dir . $this->cache_prefix . '_' . $var_name . '.' . PHP_EXT, true);
-	}
-
-	/**
-	* {@link phpbb_acm_abstract::load() load()}
-	*/
-	public function load()
-	{
-		// grab the global cache
-		if (file_exists($this->cache_dir . $this->cache_prefix . '_global.' . PHP_EXT))
-		{
-			@include($this->cache_dir . $this->cache_prefix . '_global.' . PHP_EXT);
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* {@link phpbb_acm_abstract::unload() unload()}
-	*/
-	public function unload()
-	{
-		if (!$this->is_modified)
-		{
-			return;
-		}
-
-		$filename = $this->cache_dir . $this->cache_prefix . '_global.' . PHP_EXT;
-
-		if ($fp = @fopen($filename, 'wb'))
-		{
-			@flock($fp, LOCK_EX);
-			fwrite($fp, "<?php\nif (!defined('IN_PHPBB')) exit;\n\$this->vars = unserialize(" . var_export(serialize($this->vars), true) . ");\n\$this->var_expires = unserialize(" . var_export(serialize($this->var_expires), true) . ");");
-			@flock($fp, LOCK_UN);
-			fclose($fp);
-
-			phpbb::$system->chmod($filename, phpbb::CHMOD_READ | phpbb::CHMOD_WRITE);
-		}
-		else
-		{
-			// Now, this occurred how often? ... phew, just tell the user then...
-			if (!@is_writable($this->cache_dir))
-			{
-				// We need to use die() here, because else we may encounter an infinite loop (the message handler calls $cache->unload())
-				die($this->cache_dir . ' is NOT writable.');
-				exit;
-			}
-
-			die('Not able to open ' . $filename);
-			exit;
-		}
-
-		$this->is_modified = false;
-
-		// To reset the global vars
-		$this->vars = $this->var_expires = array();
-	}
-
-	/**
-	* Tidy local cache data. Also see {@link phpbb_acm_abstract::tidy() tidy()}
-	* @access protected
-	*/
-	protected function tidy_local()
-	{
-		$dir = @opendir($this->cache_dir);
-
-		if (!$dir)
-		{
-			return;
-		}
-
-		while (($entry = readdir($dir)) !== false)
-		{
-			if (strpos($entry, $this->cache_prefix . '_') !== 0 || strpos($entry, $this->cache_prefix . '_global') === 0)
-			{
-				continue;
-			}
-
-			$expired = true;
-			@include($this->cache_dir . $entry);
-
-			if ($expired)
-			{
-				$this->remove_file($this->cache_dir . $entry);
-			}
-		}
-		closedir($dir);
-	}
-
-	/**
-	* Purge local cache data. Also see {@link phpbb_acm_abstract::purge() purge()}
-	* @access protected
-	*/
-	protected function purge_local()
-	{
-		$dir = @opendir($this->cache_dir);
-
-		if (!$dir)
-		{
-			return;
-		}
-
-		while (($entry = readdir($dir)) !== false)
-		{
-			if (strpos($entry, $this->cache_prefix . '_') !== 0 || strpos($entry, $this->cache_prefix . '_global') === 0)
-			{
-				continue;
-			}
-
-			$this->remove_file($this->cache_dir . $entry);
-		}
-		closedir($dir);
-	}
-
-	/**
-	* Get modified date for cache entry
-	*
-	* @param string	$var_name	The cache variable name
-	* @access public
-	*/
-	public function get_modified_date($var_name)
-	{
-		return @filemtime($this->cache_dir . $this->cache_prefix . '_' . $var_name . '.' . PHP_EXT);
-	}
-
-	/**
-	* Removes/unlinks file
-	*
-	* @param string	$filename	The filename to remove
-	* @param bool	$check		If true the cache directory is checked for correct directory permissions.
-	* @access protected
-	*/
-	protected function remove_file($filename, $check = false)
-	{
-		if ($check && !@is_writable($this->cache_dir))
-		{
-			// E_USER_ERROR - not using language entry - intended.
-			trigger_error('Unable to remove files within ' . $this->cache_dir . '. Please check directory permissions.', E_USER_ERROR);
-		}
-
-		return @unlink($filename);
-	}
-}
-
-/**
-* Special implementation for cache type 'sql'
-* @package acm
-*/
-class phpbb_acm_file_sql extends phpbb_acm_file
-{
-	/**
-	* {@link phpbb_acm_abstract::destroy() destroy()}
-	*/
-	public function destroy($var_name)
-	{
-		if ($var_name[0] === '#')
-		{
-			$var_name = substr($var_name, 1);
-			$this->destroy_global($var_name);
-		}
-
-		$table = (!is_array($var_name)) ? array($var_name) : $var_name;
-		$dir = @opendir($this->cache_dir);
-
-		if (!$dir)
-		{
-			return;
-		}
-
-		while (($entry = readdir($dir)) !== false)
-		{
-			if (strpos($entry, $this->cache_prefix . '_') !== 0)
-			{
-				continue;
-			}
-
-			// The following method is more failproof than simply assuming the query is on line 3 (which it should be)
-			@include($this->cache_dir . $entry);
-
-			if (empty($data))
-			{
-				$this->remove_file($this->cache_dir . $entry);
-				continue;
-			}
-
-			// Get the query
-			$data = $data['query'];
-
-			$found = false;
-			foreach ($table as $check_table)
-			{
-				// Better catch partial table names than no table names. ;)
-				if (strpos($data, $check_table) !== false)
-				{
-					$found = true;
-					break;
-				}
-			}
-
-			if ($found)
-			{
-				$this->remove_file($this->cache_dir . $entry);
-			}
-		}
-		closedir($dir);
-
-		return;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/acm/acm_memcache.php b/phpBB/includes/acm/acm_memcache.php
deleted file mode 100644
index 175d0663a0..0000000000
--- a/phpBB/includes/acm/acm_memcache.php
+++ /dev/null
@@ -1,392 +0,0 @@
-<?php
-/**
-*
-* @package acm
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* ACM File Based Caching
-* @package acm
-*/
-class acm
-{
-	var $vars = array();
-	var $is_modified = false;
-
-	var $sql_rowset = array();
-	var $sql_row_pointer = array();
-	var $cache_dir = '';
-
-	var $memcache;
-
-	/**
-	* Set cache path
-	*/
-	function acm()
-	{
-		$this->cache_dir = $phpbb_root_path . 'cache/';
-		$this->memcache = memcache_connect('localhost', 11211);
-	}
-
-	/**
-	* Load global cache
-	*/
-	function load()
-	{
-		// grab the global cache
-		$this->vars = memcache_get($this->memcache, 'global');
-
-		if ($this->vars !== false)
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Unload cache object
-	*/
-	function unload()
-	{
-		$this->save();
-		unset($this->vars);
-		unset($this->sql_rowset);
-		unset($this->sql_row_pointer);
-
-		$this->vars = array();
-		$this->sql_rowset = array();
-		$this->sql_row_pointer = array();
-	}
-
-	/**
-	* Save modified objects
-	*/
-	function save()
-	{
-		if (!$this->is_modified)
-		{
-			return;
-		}
-
-		memcache_set($this->memcache, 'global', $this->vars, 0, 2592000);
-
-		$this->is_modified = false;
-	}
-
-	/**
-	* Tidy cache
-	*/
-	function tidy()
-	{
-		// cache has auto GC, no need to have any code here :)
-
-		set_config('cache_last_gc', time(), true);
-	}
-
-	/**
-	* Get saved cache object
-	*/
-	function get($var_name)
-	{
-		if ($var_name[0] == '_')
-		{
-			if (!$this->_exists($var_name))
-			{
-				return false;
-			}
-
-			return memcache_get($this->memcache, $var_name);
-		}
-		else
-		{
-			return ($this->_exists($var_name)) ? $this->vars[$var_name] : false;
-		}
-	}
-
-	/**
-	* Put data into cache
-	*/
-	function put($var_name, $var, $ttl = 2592000)
-	{
-		if ($var_name[0] == '_')
-		{
-			memcache_set($this->memcache, $var_name, $var, 0, $ttl);
-		}
-		else
-		{
-			$this->vars[$var_name] = $var;
-			$this->is_modified = true;
-		}
-	}
-
-	/**
-	* Purge cache data
-	*/
-	function purge()
-	{
-		// Purge all phpbb cache files
-		$dir = @opendir($this->cache_dir);
-
-		if (!$dir)
-		{
-			return;
-		}
-
-		while (($entry = readdir($dir)) !== false)
-		{
-			if (strpos($entry, 'sql_') !== 0 && strpos($entry, 'data_') !== 0 && strpos($entry, 'ctpl_') !== 0 && strpos($entry, 'tpl_') !== 0)
-			{
-				continue;
-			}
-
-			$this->remove_file($this->cache_dir . $entry);
-		}
-		closedir($dir);
-
-		memcache_flush($this->memcache);
-
-		unset($this->vars);
-		unset($this->sql_rowset);
-		unset($this->sql_row_pointer);
-
-		$this->vars = array();
-		$this->sql_rowset = array();
-		$this->sql_row_pointer = array();
-
-		$this->is_modified = false;
-	}
-
-
-	/**
-	* Destroy cache data
-	*/
-	function destroy($var_name, $table = '')
-	{
-		if ($var_name == 'sql' && !empty($table))
-		{
-			if (!is_array($table))
-			{
-				$table = array($table);
-			}
-
-			foreach ($table as $table_name)
-			{
-				// gives us the md5s that we want
-				$temp = memcache_get($this->memcache, 'sql_' . $table_name);
-
-				if ($temp === false)
-				{
-					continue;
-				}
-
-				// delete each query ref
-				foreach ($temp as $md5_id => $void)
-				{
-					memcache_delete($this->memcache, 'sql_' . $md5_id);
-				}
-
-				// delete the table ref
-				memcache_delete($this->memcache, 'sql_' . $table_name);
-			}
-
-			return;
-		}
-
-		if (!$this->_exists($var_name))
-		{
-			return;
-		}
-
-		if ($var_name[0] == '_')
-		{
-			memcache_delete($this->memcache, $var_name);
-		}
-		else if (isset($this->vars[$var_name]))
-		{
-			$this->is_modified = true;
-			unset($this->vars[$var_name]);
-
-			// We save here to let the following cache hits succeed
-			$this->save();
-		}
-	}
-
-	/**
-	* Check if a given cache entry exist
-	*/
-	function _exists($var_name)
-	{
-		if ($var_name[0] == '_')
-		{
-			return true;
-		}
-		else
-		{
-			if (!sizeof($this->vars))
-			{
-				$this->load();
-			}
-
-			return isset($this->vars[$var_name]);
-		}
-	}
-
-	/**
-	* Load cached sql query
-	*/
-	function sql_load($query)
-	{
-		// Remove extra spaces and tabs
-		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
-		$query_id = sizeof($this->sql_rowset);
-
-		$temp = memcache_get($this->memcache, 'sql_' . md5($query));
-
-		if ($temp === false)
-		{
-			return false;
-		}
-
-		$this->sql_rowset[$query_id] = $temp;
-		$this->sql_row_pointer[$query_id] = 0;
-
-		return $query_id;
-	}
-
-	/**
-	* Save sql query
-	*/
-	function sql_save($query, &$query_result, $ttl)
-	{
-		// Remove extra spaces and tabs
-		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
-
-		// determine which tables this query belongs to
-		preg_match('/FROM \\(?(\\w+(?: \\w+)?(?:, ?\\w+(?: \\w+)?)*)\\)?/', $query, $regs);
-		$tables = array_map('trim', explode(',', $regs[1]));
-
-		foreach ($tables as $table_name)
-		{
-			if (($pos = strpos($table_name, ' ')) !== false)
-			{
-				$table_name = substr($table_name, 0, $pos);
-			}
-
-			$temp = memcache_get($this->memcache, 'sql_' . $table_name);
-			if ($temp === false)
-			{
-				$temp = array();
-			}
-			$temp[md5($query)] = true;
-			memcache_set($this->memcache, 'sql_' . $table_name, $temp, 0, $ttl);
-		}
-
-		// store them in the right place
-		$query_id = sizeof($this->sql_rowset);
-		$this->sql_rowset[$query_id] = array();
-		$this->sql_row_pointer[$query_id] = 0;
-
-		while ($row = phpbb::$db->sql_fetchrow($query_result))
-		{
-			$this->sql_rowset[$query_id][] = $row;
-		}
-		phpbb::$db->sql_freeresult($query_result);
-
-		memcache_set($this->memcache, 'sql_' . md5($query), $this->sql_rowset[$query_id], 0, $ttl);
-
-		$query_result = $query_id;
-	}
-
-	/**
-	* Ceck if a given sql query exist in cache
-	*/
-	function sql_exists($query_id)
-	{
-		return isset($this->sql_rowset[$query_id]);
-	}
-
-	/**
-	* Fetch row from cache (database)
-	*/
-	function sql_fetchrow($query_id)
-	{
-		if ($this->sql_row_pointer[$query_id] < sizeof($this->sql_rowset[$query_id]))
-		{
-			return $this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]++];
-		}
-
-		return false;
-	}
-
-	/**
-	* Fetch a field from the current row of a cached database result (database)
-	*/
-	function sql_fetchfield($query_id, $field)
-	{
-		if ($this->sql_row_pointer[$query_id] < sizeof($this->sql_rowset[$query_id]))
-		{
-			return (isset($this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]][$field])) ? $this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]][$field] : false;
-		}
-
-		return false;
-	}
-
-	/**
-	* Seek a specific row in an a cached database result (database)
-	*/
-	function sql_rowseek($rownum, $query_id)
-	{
-		if ($rownum >= sizeof($this->sql_rowset[$query_id]))
-		{
-			return false;
-		}
-
-		$this->sql_row_pointer[$query_id] = $rownum;
-		return true;
-	}
-
-	/**
-	* Free memory used for a cached database result (database)
-	*/
-	function sql_freeresult($query_id)
-	{
-		if (!isset($this->sql_rowset[$query_id]))
-		{
-			return false;
-		}
-
-		unset($this->sql_rowset[$query_id]);
-		unset($this->sql_row_pointer[$query_id]);
-
-		return true;
-	}
-
-	/**
-	* Removes/unlinks file
-	*/
-	function remove_file($filename, $check = false)
-	{
-		if ($check && !@is_writable($this->cache_dir))
-		{
-			// E_USER_ERROR - not using language entry - intended.
-			trigger_error('Unable to remove files within ' . $this->cache_dir . '. Please check directory permissions.', E_USER_ERROR);
-		}
-
-		return @unlink($filename);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/acm/acm_xcache.php b/phpBB/includes/acm/acm_xcache.php
deleted file mode 100644
index e2bf21748a..0000000000
--- a/phpBB/includes/acm/acm_xcache.php
+++ /dev/null
@@ -1,336 +0,0 @@
-<?php
-/**
-*
-* @package acm
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* ACM XCache Based Caching
-* @package acm
-*/
-class acm
-{
-	var $vars = array();
-	var $is_modified = false;
-
-	var $sql_rowset = array();
-	var $sql_row_pointer = array();
-	var $cache_dir = '';
-
-	/**
-	* Set cache path
-	*/
-	function acm()
-	{
-		$this->cache_dir = $phpbb_root_path . 'cache/';
-	}
-
-	/**
-	* Load global cache
-	*/
-	function load()
-	{
-		// grab the global cache
-		if (xcache_isset('global'))
-		{
-			$this->vars = xcache_get('global');
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Unload cache object
-	*/
-	function unload()
-	{
-		$this->save();
-		unset($this->vars);
-		unset($this->sql_rowset);
-		unset($this->sql_row_pointer);
-	}
-
-	/**
-	* Save modified objects
-	*/
-	function save()
-	{
-		if (!$this->is_modified)
-		{
-			return;
-		}
-
-		xcache_set('global', $this->vars, 31536000);
-
-		$this->is_modified = false;
-	}
-
-	/**
-	* Tidy cache
-	*/
-	function tidy()
-	{
-		// cache has auto GC, no need to have any code here :)
-
-		set_config('cache_last_gc', time(), true);
-	}
-
-	/**
-	* Get saved cache object
-	*/
-	function get($var_name)
-	{
-		if ($var_name[0] == '_')
-		{
-			return (xcache_isset($var_name)) ? xcache_get($var_name) : false;
-		}
-		else
-		{
-			if (!sizeof($this->vars))
-			{
-				$this->load();
-			}
-			return (isset($this->vars[$var_name])) ? $this->vars[$var_name] : false;
-		}
-	}
-
-	/**
-	* Put data into cache
-	*/
-	function put($var_name, $var, $ttl = 31536000)
-	{
-		if ($var_name[0] == '_')
-		{
-			xcache_set($var_name, $var, $ttl);
-		}
-		else
-		{
-			$this->vars[$var_name] = $var;
-			$this->is_modified = true;
-		}
-	}
-
-	/**
-	* Purge cache data
-	*/
-	function purge()
-	{
-		// Purge all phpbb cache files
-		$dir = @opendir($this->cache_dir);
-
-		if (!$dir)
-		{
-			return;
-		}
-
-		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);
-
-		$n = xcache_count(XC_TYPE_VAR);
-		for ($i = 0; $i < $n; $i++)
-		{
-			xcache_clear_cache(XC_TYPE_VAR, $i);
-		}
-
-		unset($this->vars);
-		unset($this->sql_rowset);
-		unset($this->sql_row_pointer);
-
-		$this->is_modified = false;
-	}
-
-	/**
-	* Destroy cache data
-	*/
-	function destroy($var_name, $table = '')
-	{
-		if ($var_name == 'sql' && !empty($table))
-		{
-			if (!is_array($table))
-			{
-				$table = array($table);
-			}
-
-			foreach ($table as $table_name)
-			{
-				// gives us the md5s that we want
-				if (!xcache_isset('sql_' . $table_name))
-				{
-					continue;
-				}
-				$temp = xcache_get('sql_' . $table_name);
-
-				// delete each query ref
-				foreach ($temp as $md5_id => $void)
-				{
-					xcache_unset('sql_' . $md5_id);
-				}
-
-				// delete the table ref
-				xcache_unset('sql_' . $table_name);
-			}
-
-			return;
-		}
-
-		if ($var_name[0] == '_')
-		{
-			xcache_unset($var_name);
-		}
-		else if (isset($this->vars[$var_name]))
-		{
-			$this->is_modified = true;
-			unset($this->vars[$var_name]);
-
-			// We save here to let the following cache hits succeed
-			$this->save();
-		}
-	}
-
-	/**
-	* Load cached sql query
-	*/
-	function sql_load($query)
-	{
-		// Remove extra spaces and tabs
-		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
-		$query_id = sizeof($this->sql_rowset);
-
-		if (!xcache_isset('sql_' . md5($query)))
-		{
-			return false;
-		}
-
-		$this->sql_rowset[$query_id] = xcache_get('sql_' . md5($query));
-
-		$this->sql_row_pointer[$query_id] = 0;
-
-		return $query_id;
-	}
-
-	/**
-	* Save sql query
-	*/
-	function sql_save($query, &$query_result, $ttl)
-	{
-		// Remove extra spaces and tabs
-		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
-
-		// determine which tables this query belongs to
-		preg_match('/FROM \\(?(\\w+(?: \\w+)?(?:, ?\\w+(?: \\w+)?)*)\\)?/', $query, $regs);
-		$tables = array_map('trim', explode(',', $regs[1]));
-
-		foreach ($tables as $table_name)
-		{
-			if (($pos = strpos($table_name, ' ')) !== false)
-			{
-				$table_name = substr($table_name, 0, $pos);
-			}
-
-			if (xcache_isset('sql_' . $table_name))
-			{
-				$temp = xcache_get('sql_' . $table_name);
-			}
-			else
-			{
-				$temp = array();
-			}
-			$temp[md5($query)] = true;
-			xcache_set('sql_' . $table_name, $temp, $ttl);
-		}
-
-		// store them in the right place
-		$query_id = sizeof($this->sql_rowset);
-		$this->sql_rowset[$query_id] = array();
-		$this->sql_row_pointer[$query_id] = 0;
-
-		while ($row = phpbb::$db->sql_fetchrow($query_result))
-		{
-			$this->sql_rowset[$query_id][] = $row;
-		}
-		phpbb::$db->sql_freeresult($query_result);
-
-		xcache_set('sql_' . md5($query), $this->sql_rowset[$query_id], $ttl);
-
-		$query_result = $query_id;
-	}
-
-	/**
-	* Ceck if a given sql query exist in cache
-	*/
-	function sql_exists($query_id)
-	{
-		return isset($this->sql_rowset[$query_id]);
-	}
-
-	/**
-	* Fetch row from cache (database)
-	*/
-	function sql_fetchrow($query_id)
-	{
-		if ($this->sql_row_pointer[$query_id] < sizeof($this->sql_rowset[$query_id]))
-		{
-			return $this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]++];
-		}
-
-		return false;
-	}
-
-	/**
-	* Fetch a field from the current row of a cached database result (database)
-	*/
-	function sql_fetchfield($query_id, $field)
-	{
-		if ($this->sql_row_pointer[$query_id] < sizeof($this->sql_rowset[$query_id]))
-		{
-			return (isset($this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]][$field])) ? $this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]][$field] : false;
-		}
-
-		return false;
-	}
-
-	/**
-	* Seek a specific row in an a cached database result (database)
-	*/
-	function sql_rowseek($rownum, $query_id)
-	{
-		if ($rownum >= sizeof($this->sql_rowset[$query_id]))
-		{
-			return false;
-		}
-
-		$this->sql_row_pointer[$query_id] = $rownum;
-		return true;
-	}
-
-	/**
-	* Free memory used for a cached database result (database)
-	*/
-	function sql_freeresult($query_id)
-	{
-		if (!isset($this->sql_rowset[$query_id]))
-		{
-			return false;
-		}
-
-		unset($this->sql_rowset[$query_id]);
-		unset($this->sql_row_pointer[$query_id]);
-
-		return true;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/acm/bootstrap.php b/phpBB/includes/acm/bootstrap.php
deleted file mode 100644
index ea671706e5..0000000000
--- a/phpBB/includes/acm/bootstrap.php
+++ /dev/null
@@ -1,487 +0,0 @@
-<?php
-/**
-*
-* @package acm
-* @version $Id: acm_file.php 9233 2008-12-27 12:18:04Z acydburn $
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Base cache class.
-*
-* A prefix of # for $var_name indicates global data.
-*
-* @method mixed get($var_name)							Get cached data.
-* @method mixed put($var_name, $data, $ttl = 31536000)	Put data into cache.
-* @method mixed destroy($var_name)						Destroy cached data.
-* @method mixed exists($var_name)						Check if cached data exists.
-*
-* @package acm
-*/
-class phpbb_acm
-{
-	/**
-	* @var array required phpBB objects
-	*/
-	public $phpbb_required = array();
-
-	/**
-	* @var array Optional phpBB objects
-	*/
-	public $phpbb_optional = array();
-
-	/**
-	* @var array Currently registered core acm types.
-	*/
-	public $cache_types = array('data' => NULL, 'sql' => NULL);
-
-	/**
-	* Constructor
-	* @access public
-	*/
-	public function __construct() { }
-
-	/**
-	* Magic method for calling type-specific functions.
-	* Functions directly supported are: get(), put(), exists(), destroy()
-	*
-	* The type is added to the methods name, for getting sql data just use get_sql() for example.
-	*
-	* see {@link phpbb_acm_abstract phpbb_acm_abstract} for more information
-	*
-	* @access public
-	*/
-	public function __call($method, $arguments)
-	{
-		$supported_internal_functions = array('get', 'put', 'exists', 'destroy');
-		$internal_method = explode('_', $method, 2);
-
-		// Get cache type and method
-		if (in_array($internal_method[0], $supported_internal_functions))
-		{
-			$cache_type = (empty($internal_method[1])) ? 'data' : $internal_method[1];
-			$method = $internal_method[0];
-		}
-		else
-		{
-			$cache_type = $arguments[0];
-			array_shift($arguments);
-		}
-
-		// Check if the cache type is initialized and exist
-		if (!$this->type_exists($cache_type))
-		{
-			return false;
-		}
-
-		// $this->cache_types[$cache_type]->$method($arguments);
-		return call_user_func_array(array($this->cache_types[$cache_type], $method), $arguments);
-	}
-
-	/**
-	* Tidy cache. This removes all expired cache data.
-	* @access public
-	*/
-	public function tidy()
-	{
-		foreach ($this->cache_types as $cache_type => $object)
-		{
-			if ($object === NULL)
-			{
-				continue;
-			}
-
-			$this->cache_types[$cache_type]->tidy();
-		}
-	}
-
-	/**
-	* Purge cache. This removes all cache data, not only the expired one.
-	* @access public
-	*/
-	public function purge()
-	{
-		foreach ($this->cache_types as $cache_type => $object)
-		{
-			if ($object === NULL)
-			{
-				continue;
-			}
-
-			$this->cache_types[$cache_type]->purge();
-		}
-	}
-
-	/**
-	* Load cache data. This is usually only used internally.
-	* @access public
-	*/
-	public function load()
-	{
-		foreach ($this->cache_types as $cache_type => $object)
-		{
-			if ($object === NULL)
-			{
-				continue;
-			}
-
-			$this->cache_types[$cache_type]->load();
-		}
-	}
-
-	/**
-	* Unload everything from cache and make sure non-stored cache items are properly saved.
-	* @access public
-	*/
-	public function unload()
-	{
-		foreach ($this->cache_types as $cache_type => $object)
-		{
-			if ($object === NULL)
-			{
-				continue;
-			}
-
-			$this->cache_types[$cache_type]->unload();
-		}
-	}
-
-	/**
-	* Register a custom cache type/class.
-	*
-	* @param string $cache_type		The cache type to register/set
-	* @param string $cache_append	String to append to the cached data as identifier (if the coder has different types to distinct from)
-	* @param string $cache_object	The exact name of the cache class to load.
-	*								The filename must be: <code>includes/acm/acm_{$cache_object}.php</code>
-	*								The class definition must be: <code>class phpbb_acm_{$cache_object} extends phpbb_acm_abstract</code>
-	*								Additionally it is possible to define classes for every cache type...
-	*									for example: <code>phpbb_acm_{$cache_object}_{$cache_type} extends phpbb_acm_{$cache_object}</code>
-	*
-	* @return bool	Returns true on success, else false.
-	* @access public
-	*/
-	public function register($cache_type, $cache_append = false, $cache_object = false)
-	{
-		$cache_object = ($cache_object === false) ? basename(phpbb::$base_config['acm_type']) : basename($cache_object);
-
-		// We need to init every cache type...
-		if (!isset($this->cache_types[$cache_type]))
-		{
-			$this->cache_types[$cache_type] = NULL;
-		}
-
-		// Unregister if already registered
-		if ($this->cache_types[$cache_type] !== NULL)
-		{
-			$this->cache_types[$cache_type] = NULL;
-		}
-
-		if ($this->cache_types[$cache_type] === NULL)
-		{
-			$class_name = 'phpbb_acm_' . $cache_object;
-
-			if (!class_exists($class_name))
-			{
-				if (!file_exists(PHPBB_ROOT_PATH . 'includes/acm/acm_' . $cache_object . '.' . PHP_EXT))
-				{
-					return false;
-				}
-
-				require_once PHPBB_ROOT_PATH . 'includes/acm/acm_' . $cache_object . '.' . PHP_EXT;
-			}
-
-			$class_name = (class_exists('phpbb_acm_' . $cache_object . '_' . $cache_type)) ? 'phpbb_acm_' . $cache_object . '_' . $cache_type : 'phpbb_acm_' . $cache_object;
-
-			// Set cache prefix, for example ctpl_prosilver
-			$cache_prefix = ($cache_append === false) ? $cache_type : $cache_type . '_' . $cache_append;
-
-			$this->cache_types[$cache_type] = new $class_name($cache_prefix);
-
-			if (!$this->supported($cache_type))
-			{
-				$this->cache_types[$cache_type] = NULL;
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* Check if a specified cache type is supported with the ACM class
-	*
-	* @param string	$cache_type	The cache type to check.
-	*
-	* @return bool	True if the type is supported, else false.
-	* @access public
-	*/
-	public function supported($cache_type)
-	{
-		if (!$this->type_exists($cache_type))
-		{
-			return false;
-		}
-
-		return !empty($this->cache_types[$cache_type]->supported[$cache_type]) || $this->cache_types[$cache_type]->supported === true;
-	}
-
-	/**
-	* Check if the cache type exists. Sometimes some types do not exist if the relevant files are not there or do not support the given cache type.
-	*
-	* @param string	$cache_type	The cache type to check.
-	*
-	* @return bool	True if the type exist, else false.
-	* @access private
-	*/
-	private function type_exists($cache_type)
-	{
-		if (!isset($this->cache_types[$cache_type]) || $this->cache_types[$cache_type] === NULL)
-		{
-			$this->register($cache_type);
-		}
-
-		return $this->cache_types[$cache_type] !== NULL;
-	}
-}
-
-
-/**
-* The abstract class all ACM plugins must extend.
-* @package acm
-*/
-abstract class phpbb_acm_abstract
-{
-	/**
-	* @var string The current cache prefix
-	*/
-	public $cache_prefix = '';
-
-	/**
-	* @var array Cached global data
-	*/
-	protected $vars = array();
-
-	/**
-	* @var array Expire information for cached global data
-	*/
-	protected $var_expires = array();
-
-	/**
-	* @var bool Is true if global data is modified
-	*/
-	protected $is_modified = false;
-
-	/**
-	* Get cached data
-	*
-	* @param string	$var_name	Variable name. Global variable name is prefixed with #.
-	*
-	* @return mixed	Returns false if there is no data available, else returns the data
-	* @access public
-	*/
-	abstract public function get($var_name);
-
-	/**
-	* Put data into cache
-	*
-	* @param string	$var_name	Variable name. Global variable name is prefixed with #.
-	* @param mixed	$data		Data to be put into cache.
-	* @param int	$ttl		Cache lifetime in seconds.
-	*
-	* @return mixed	Returns $data
-	* @access public
-	*/
-	abstract public function put($var_name, $data, $ttl = 31536000);
-
-	/**
-	* Destroy cached data.
-	*
-	* @param string	$var_name	Variable name. Global variable name is prefixed with #.
-	*
-	* @return mixed	Returns false if the cached data does not exist
-	* @access public
-	*/
-	abstract public function destroy($var_name);
-
-	/**
-	* Check if cached data exists.
-	*
-	* @param string	$var_name	Variable name. Global variable name is prefixed with #.
-	*
-	* @return bool	True if it exists
-	* @access public
-	*/
-	abstract public function exists($var_name);
-
-	/**
-	* Load cache data. This is usually only used internally.
-	* @access public
-	*/
-	abstract public function load();
-
-	/**
-	* Unload everything from cache and make sure non-stored cache items are properly saved.
-	* @access public
-	*/
-	abstract public function unload();
-
-	/**
-	* Tidy cache. This removes all expired cache data.
-	* @access public
-	*/
-	public function tidy()
-	{
-		$this->tidy_local();
-		$this->tidy_global();
-
-		set_config('cache_last_gc', time(), true);
-	}
-
-	/**
-	* Purge cache. This removes all cache data, not only the expired one.
-	* @access public
-	*/
-	public function purge()
-	{
-		$this->purge_local();
-		$this->purge_global();
-	}
-
-	/**
-	* Tidy only local cache data
-	* @access protected
-	*/
-	abstract protected function tidy_local();
-
-	/**
-	* Purge only local cache data
-	* @access protected
-	*/
-	abstract protected function purge_local();
-
-	/**
-	* Get global cache data. See {@link get() get()}.
-	* @access protected
-	*/
-	protected function get_global($var_name)
-	{
-		// Check if we have all variables
-		if (!sizeof($this->vars))
-		{
-			$this->load();
-		}
-
-		if (!isset($this->var_expires[$var_name]))
-		{
-			return false;
-		}
-
-		// If expired... we remove this entry now...
-		if (time() > $this->var_expires[$var_name])
-		{
-			$this->destroy('#' . $var_name);
-			return false;
-		}
-
-		if (isset($this->vars[$var_name]))
-		{
-			return $this->vars[$var_name];
-		}
-
-		return false;
-	}
-
-	/**
-	* Put data into global cache. See {@link put() put()}.
-	* @access protected
-	*/
-	protected function put_global($var_name, $data, $ttl = 31536000)
-	{
-		$this->vars[$var_name] = $data;
-		$this->var_expires[$var_name] = time() + $ttl;
-		$this->is_modified = true;
-
-		return $data;
-	}
-
-	/**
-	* Check if global data exists. See {@link exists() exists()}.
-	* @access protected
-	*/
-	protected function exists_global($var_name)
-	{
-		return !empty($this->vars[$var_name]) && time() <= $this->var_expires[$var_name];
-	}
-
-	/**
-	* Destroy global cache data. See {@link destroy() destroy()}.
-	* @access protected
-	*/
-	protected function destroy_global($var_name)
-	{
-		$this->is_modified = true;
-
-		unset($this->vars[$var_name]);
-		unset($this->var_expires[$var_name]);
-
-		// We save here to let the following cache hits succeed
-		$this->unload();
-	}
-
-	/**
-	* Tidy global cache data. See {@link tidy() tidy()}.
-	* @access protected
-	*/
-	protected function tidy_global()
-	{
-		// Now tidy global settings
-		if (!sizeof($this->vars))
-		{
-			$this->load();
-		}
-
-		foreach ($this->var_expires as $var_name => $expires)
-		{
-			if (time() > $expires)
-			{
-				// We only unset, then save later
-				unset($this->vars[$var_name]);
-				unset($this->var_expires[$var_name]);
-			}
-		}
-
-		$this->is_modified = true;
-		$this->unload();
-	}
-
-	/**
-	* Purge global cache data. See {@link purge() purge()}.
-	* @access protected
-	*/
-	protected function purge_global()
-	{
-		// Now purge global settings
-		unset($this->vars);
-		unset($this->var_expires);
-
-		$this->vars = array();
-		$this->var_expires = array();
-
-		$this->is_modified = true;
-		$this->unload();
-	}
-}
-
-
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/auth/auth_apache.php b/phpBB/includes/auth/auth_apache.php
deleted file mode 100644
index 2b9c068672..0000000000
--- a/phpBB/includes/auth/auth_apache.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-/**
-* Apache auth plug-in for phpBB3
-*
-* Authentication plug-ins is largely down to Sergey Kanareykin, our thanks to him.
-*
-* @package login
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Checks whether the user is identified to apache
-* Only allow changing authentication to apache if the user is identified
-* Called in acp_board while setting authentication plugins
-*
-* @return boolean|string false if the user is identified and else an error message
-*/
-function init_apache()
-{
-	if (!isset($_SERVER['PHP_AUTH_USER']) || phpbb::$user->data['username'] !== $_SERVER['PHP_AUTH_USER'])
-	{
-		return phpbb::$user->lang['APACHE_SETUP_BEFORE_USE'];
-	}
-	return false;
-}
-
-/**
-* Login function
-*/
-function login_apache(&$username, &$password)
-{
-	// do not allow empty password
-	if (!$password)
-	{
-		return array(
-			'status'	=> LOGIN_ERROR_PASSWORD,
-			'error_msg'	=> 'NO_PASSWORD_SUPPLIED',
-			'user_row'	=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	if (!$username)
-	{
-		return array(
-			'status'	=> LOGIN_ERROR_USERNAME,
-			'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-			'user_row'	=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	if (!isset($_SERVER['PHP_AUTH_USER']))
-	{
-		return array(
-			'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-			'error_msg'		=> 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE',
-			'user_row'		=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	$php_auth_user = $_SERVER['PHP_AUTH_USER'];
-	$php_auth_pw = $_SERVER['PHP_AUTH_PW'];
-
-	if (!empty($php_auth_user) && !empty($php_auth_pw))
-	{
-		if ($php_auth_user !== $username)
-		{
-			return array(
-				'status'	=> LOGIN_ERROR_USERNAME,
-				'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-				'user_row'	=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		$sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type
-			FROM ' . USERS_TABLE . "
-			WHERE username = '" . phpbb::$db->sql_escape($php_auth_user) . "'";
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if ($row)
-		{
-			// User inactive...
-			if ($row['user_type'] == phpbb::USER_INACTIVE || $row['user_type'] == phpbb::USER_IGNORE)
-			{
-				return array(
-					'status'		=> LOGIN_ERROR_ACTIVE,
-					'error_msg'		=> 'ACTIVE_ERROR',
-					'user_row'		=> $row,
-				);
-			}
-
-			// Successful login...
-			return array(
-				'status'		=> LOGIN_SUCCESS,
-				'error_msg'		=> false,
-				'user_row'		=> $row,
-			);
-		}
-
-		// this is the user's first login so create an empty profile
-		return array(
-			'status'		=> LOGIN_SUCCESS_CREATE_PROFILE,
-			'error_msg'		=> false,
-			'user_row'		=> user_row_apache($php_auth_user, $php_auth_pw),
-		);
-	}
-
-	// Not logged into apache
-	return array(
-		'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-		'error_msg'		=> 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE',
-		'user_row'		=> array('user_id' => ANONYMOUS),
-	);
-}
-
-/**
-* Autologin function
-*
-* @return array containing the user row or empty if no auto login should take place
-*/
-function autologin_apache()
-{
-	if (!isset($_SERVER['PHP_AUTH_USER']))
-	{
-		return array();
-	}
-
-	$php_auth_user = $_SERVER['PHP_AUTH_USER'];
-	$php_auth_pw = $_SERVER['PHP_AUTH_PW'];
-
-	if (!empty($php_auth_user) && !empty($php_auth_pw))
-	{
-		set_var($php_auth_user, $php_auth_user, 'string', true);
-		set_var($php_auth_pw, $php_auth_pw, 'string', true);
-
-		$sql = 'SELECT *
-			FROM ' . USERS_TABLE . "
-			WHERE username = '" . phpbb::$db->sql_escape($php_auth_user) . "'";
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if ($row)
-		{
-			return ($row['user_type'] == phpbb::USER_INACTIVE || $row['user_type'] == phpbb::USER_IGNORE) ? array() : $row;
-		}
-
-		if (!function_exists('user_add'))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-		}
-
-		// create the user if he does not exist yet
-		user_add(user_row_apache($php_auth_user, $php_auth_pw));
-
-		$sql = 'SELECT *
-			FROM ' . USERS_TABLE . "
-			WHERE username_clean = '" . phpbb::$db->sql_escape(utf8_clean_string($php_auth_user)) . "'";
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if ($row)
-		{
-			return $row;
-		}
-	}
-
-	return array();
-}
-
-/**
-* This function generates an array which can be passed to the user_add function in order to create a user
-*/
-function user_row_apache($username, $password)
-{
-	// first retrieve default group id
-	$sql = 'SELECT group_id
-		FROM ' . GROUPS_TABLE . "
-		WHERE group_name_clean = '" . phpbb::$db->sql_escape('registered') . "'
-			AND group_type = " . GROUP_SPECIAL;
-	$result = phpbb::$db->sql_query($sql);
-	$row = phpbb::$db->sql_fetchrow($result);
-	phpbb::$db->sql_freeresult($result);
-
-	if (!$row)
-	{
-		trigger_error('NO_GROUP');
-	}
-
-	// generate user account data
-	return array(
-		'username'		=> $username,
-		'user_password'	=> phpbb_hash($password),
-		'user_email'	=> '',
-		'group_id'		=> (int) $row['group_id'],
-		'user_type'		=> phpbb::USER_NORMAL,
-		'user_ip'		=> phpbb::$user->ip,
-	);
-}
-
-/**
-* The session validation function checks whether the user is still logged in
-*
-* @return boolean true if the given user is authenticated or false if the session should be closed
-*/
-function validate_session_apache(&$user)
-{
-	// We only need to check authenticated users. For anonymous user as well as bots the session of course did not expire.
-	if ($user['user_id'] == ANONYMOUS)
-	{
-		return true;
-	}
-
-	// Checking for a bot is a bit mroe complicated... but we are able to check this with the user type (anonymous has the same as bots)
-	if ($user['user_type'] == USER_IGNORE)
-	{
-		return true;
-	}
-
-	if (!isset($_SERVER['PHP_AUTH_USER']))
-	{
-		$php_auth_user = '';
-		set_var($php_auth_user, $_SERVER['PHP_AUTH_USER'], 'string', true);
-
-		return ($php_auth_user === $user['username']) ? true : false;
-	}
-
-	// PHP_AUTH_USER is not set. A valid session is now determined by the user type (anonymous/bot or not)
-	if ($user['user_type'] == USER_IGNORE)
-	{
-		return true;
-	}
-
-	return false;
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/auth/auth_ldap.php b/phpBB/includes/auth/auth_ldap.php
deleted file mode 100644
index 6dd9abda03..0000000000
--- a/phpBB/includes/auth/auth_ldap.php
+++ /dev/null
@@ -1,335 +0,0 @@
-<?php
-/**
-*
-* LDAP auth plug-in for phpBB3
-*
-* Authentication plug-ins is largely down to Sergey Kanareykin, our thanks to him.
-*
-* @package login
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Connect to ldap server
-* Only allow changing authentication to ldap if we can connect to the ldap server
-* Called in acp_board while setting authentication plugins
-*/
-function init_ldap()
-{
-	if (!@extension_loaded('ldap'))
-	{
-		return phpbb::$user->lang['LDAP_NO_LDAP_EXTENSION'];
-	}
-
-	phpbb::$config['ldap_port'] = (int) phpbb::$config['ldap_port'];
-	if (phpbb::$config['ldap_port'])
-	{
-		$ldap = @ldap_connect(phpbb::$config['ldap_server'], phpbb::$config['ldap_port']);
-	}
-	else
-	{
-		$ldap = @ldap_connect(phpbb::$config['ldap_server']);
-	}
-
-	if (!$ldap)
-	{
-		return phpbb::$user->lang['LDAP_NO_SERVER_CONNECTION'];
-	}
-
-	@ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
-	@ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
-
-	if (phpbb::$config['ldap_user'] || phpbb::$config['ldap_password'])
-	{
-		if (!@ldap_bind($ldap, htmlspecialchars_decode(phpbb::$config['ldap_user']), htmlspecialchars_decode(phpbb::$config['ldap_password'])))
-		{
-			return phpbb::$user->lang['LDAP_INCORRECT_USER_PASSWORD'];
-		}
-	}
-
-	// ldap_connect only checks whether the specified server is valid, so the connection might still fail
-	$search = @ldap_search(
-		$ldap,
-		phpbb::$config['ldap_base_dn'],
-		ldap_user_filter(phpbb::$user->data['username']),
-		(empty(phpbb::$config['ldap_email'])) ? array(phpbb::$config['ldap_uid']) : array(phpbb::$config['ldap_uid'], phpbb::$config['ldap_email']),
-		0,
-		1
-	);
-
-	if ($search === false)
-	{
-		return phpbb::$user->lang['LDAP_NO_SERVER_CONNECTION'];
-	}
-
-	$result = @ldap_get_entries($ldap, $search);
-
-	@ldap_close($ldap);
-
-
-	if (!is_array($result) || sizeof($result) < 2)
-	{
-		return sprintf(phpbb::$user->lang['LDAP_NO_IDENTITY'], phpbb::$user->data['username']);
-	}
-
-	if (!empty(phpbb::$config['ldap_email']) && !isset($result[0][phpbb::$config['ldap_email']]))
-	{
-		return phpbb::$user->lang['LDAP_NO_EMAIL'];
-	}
-
-	return false;
-}
-
-/**
-* Login function
-*/
-function login_ldap(&$username, &$password)
-{
-	// do not allow empty password
-	if (!$password)
-	{
-		return array(
-			'status'	=> LOGIN_ERROR_PASSWORD,
-			'error_msg'	=> 'NO_PASSWORD_SUPPLIED',
-			'user_row'	=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	if (!$username)
-	{
-		return array(
-			'status'	=> LOGIN_ERROR_USERNAME,
-			'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-			'user_row'	=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	if (!@extension_loaded('ldap'))
-	{
-		return array(
-			'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-			'error_msg'		=> 'LDAP_NO_LDAP_EXTENSION',
-			'user_row'		=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	phpbb::$config['ldap_port'] = (int) phpbb::$config['ldap_port'];
-	if (phpbb::$config['ldap_port'])
-	{
-		$ldap = @ldap_connect(phpbb::$config['ldap_server'], phpbb::$config['ldap_port']);
-	}
-	else
-	{
-		$ldap = @ldap_connect(phpbb::$config['ldap_server']);
-	}
-
-	if (!$ldap)
-	{
-		return array(
-			'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-			'error_msg'		=> 'LDAP_NO_SERVER_CONNECTION',
-			'user_row'		=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	@ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
-	@ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
-
-	if (phpbb::$config['ldap_user'] || phpbb::$config['ldap_password'])
-	{
-		if (!@ldap_bind($ldap, phpbb::$config['ldap_user'], htmlspecialchars_decode(phpbb::$config['ldap_password'])))
-		{
-			return phpbb::$user->lang['LDAP_NO_SERVER_CONNECTION'];
-		}
-	}
-
-	$search = @ldap_search(
-		$ldap,
-		phpbb::$config['ldap_base_dn'],
-		ldap_user_filter($username),
-		(empty(phpbb::$config['ldap_email'])) ? array(phpbb::$config['ldap_uid']) : array(phpbb::$config['ldap_uid'], phpbb::$config['ldap_email']),
-		0,
-		1
-	);
-
-	$ldap_result = @ldap_get_entries($ldap, $search);
-
-	if (is_array($ldap_result) && sizeof($ldap_result) > 1)
-	{
-		if (@ldap_bind($ldap, $ldap_result[0]['dn'], htmlspecialchars_decode($password)))
-		{
-			@ldap_close($ldap);
-
-			$sql ='SELECT user_id, username, user_password, user_passchg, user_email, user_type
-				FROM ' . USERS_TABLE . "
-				WHERE username_clean = '" . phpbb::$db->sql_escape(utf8_clean_string($username)) . "'";
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if ($row)
-			{
-				unset($ldap_result);
-
-				// User inactive...
-				if ($row['user_type'] == phpbb::USER_INACTIVE || $row['user_type'] == phpbb::USER_IGNORE)
-				{
-					return array(
-						'status'		=> LOGIN_ERROR_ACTIVE,
-						'error_msg'		=> 'ACTIVE_ERROR',
-						'user_row'		=> $row,
-					);
-				}
-
-				// Successful login... set user_login_attempts to zero...
-				return array(
-					'status'		=> LOGIN_SUCCESS,
-					'error_msg'		=> false,
-					'user_row'		=> $row,
-				);
-			}
-			else
-			{
-				// retrieve default group id
-				$sql = 'SELECT group_id
-					FROM ' . GROUPS_TABLE . "
-					WHERE group_name_clean = '" . phpbb::$db->sql_escape('registered') . "'
-						AND group_type = " . GROUP_SPECIAL;
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$row)
-				{
-					trigger_error('NO_GROUP');
-				}
-
-				// generate user account data
-				$ldap_user_row = array(
-					'username'		=> $username,
-					'user_password'	=> phpbb_hash($password),
-					'user_email'	=> (!empty(phpbb::$config['ldap_email'])) ? $ldap_result[0][phpbb::$config['ldap_email']][0] : '',
-					'group_id'		=> (int) $row['group_id'],
-					'user_type'		=> phpbb::USER_NORMAL,
-					'user_ip'		=> phpbb::$user->ip,
-				);
-
-				unset($ldap_result);
-
-				// this is the user's first login so create an empty profile
-				return array(
-					'status'		=> LOGIN_SUCCESS_CREATE_PROFILE,
-					'error_msg'		=> false,
-					'user_row'		=> $ldap_user_row,
-				);
-			}
-		}
-		else
-		{
-			unset($ldap_result);
-			@ldap_close($ldap);
-
-			// Give status about wrong password...
-			return array(
-				'status'		=> LOGIN_ERROR_PASSWORD,
-				'error_msg'		=> 'LOGIN_ERROR_PASSWORD',
-				'user_row'		=> array('user_id' => ANONYMOUS),
-			);
-		}
-	}
-
-	@ldap_close($ldap);
-
-	return array(
-		'status'	=> LOGIN_ERROR_USERNAME,
-		'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-		'user_row'	=> array('user_id' => ANONYMOUS),
-	);
-}
-
-/**
-* Generates a filter string for ldap_search to find a user
-*
-* @param	$username	string	Username identifying the searched user
-*
-* @return				string	A filter string for ldap_search
-*/
-function ldap_user_filter($username)
-{
-	$filter = '(' . phpbb::$config['ldap_uid'] . '=' . ldap_escape(htmlspecialchars_decode($username)) . ')';
-	if (phpbb::$config['ldap_user_filter'])
-	{
-		$filter = "(&$filter({phpbb::$config['ldap_user_filter']}))";
-	}
-	return $filter;
-}
-
-/**
-* Escapes an LDAP AttributeValue
-*/
-function ldap_escape($string)
-{
-	return str_replace(array('*', '\\', '(', ')'), array('\\*', '\\\\', '\\(', '\\)'), $string);
-}
-
-/**
-* This function is used to output any required fields in the authentication
-* admin panel. It also defines any required configuration table fields.
-*/
-function acp_ldap(&$new)
-{
-	$tpl = '
-
-	<dl>
-		<dt><label for="ldap_server">' . phpbb::$user->lang['LDAP_SERVER'] . ':</label><br /><span>' . phpbb::$user->lang['LDAP_SERVER_EXPLAIN'] . '</span></dt>
-		<dd><input type="text" id="ldap_server" size="40" name="config[ldap_server]" value="' . $new['ldap_server'] . '" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_port">' . phpbb::$user->lang['LDAP_PORT'] . ':</label><br /><span>' . phpbb::$user->lang['LDAP_PORT_EXPLAIN'] . '</span></dt>
-		<dd><input type="text" id="ldap_port" size="40" name="config[ldap_port]" value="' . $new['ldap_port'] . '" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_dn">' . phpbb::$user->lang['LDAP_DN'] . ':</label><br /><span>' . phpbb::$user->lang['LDAP_DN_EXPLAIN'] . '</span></dt>
-		<dd><input type="text" id="ldap_dn" size="40" name="config[ldap_base_dn]" value="' . $new['ldap_base_dn'] . '" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_uid">' . phpbb::$user->lang['LDAP_UID'] . ':</label><br /><span>' . phpbb::$user->lang['LDAP_UID_EXPLAIN'] . '</span></dt>
-		<dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="' . $new['ldap_uid'] . '" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_user_filter">' . phpbb::$user->lang['LDAP_USER_FILTER'] . ':</label><br /><span>' . phpbb::$user->lang['LDAP_USER_FILTER_EXPLAIN'] . '</span></dt>
-		<dd><input type="text" id="ldap_user_filter" size="40" name="config[ldap_user_filter]" value="' . $new['ldap_user_filter'] . '" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_email">' . phpbb::$user->lang['LDAP_EMAIL'] . ':</label><br /><span>' . phpbb::$user->lang['LDAP_EMAIL_EXPLAIN'] . '</span></dt>
-		<dd><input type="text" id="ldap_email" size="40" name="config[ldap_email]" value="' . $new['ldap_email'] . '" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_user">' . phpbb::$user->lang['LDAP_USER'] . ':</label><br /><span>' . phpbb::$user->lang['LDAP_USER_EXPLAIN'] . '</span></dt>
-		<dd><input type="text" id="ldap_user" size="40" name="config[ldap_user]" value="' . $new['ldap_user'] . '" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_password">' . phpbb::$user->lang['LDAP_PASSWORD'] . ':</label><br /><span>' . phpbb::$user->lang['LDAP_PASSWORD_EXPLAIN'] . '</span></dt>
-		<dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="' . $new['ldap_password'] . '" /></dd>
-	</dl>
-	';
-
-	// These are fields required in the config table
-	return array(
-		'tpl'		=> $tpl,
-		'config'	=> array('ldap_server', 'ldap_port', 'ldap_base_dn', 'ldap_uid', 'ldap_user_filter', 'ldap_email', 'ldap_user', 'ldap_password')
-	);
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/auth/db.php b/phpBB/includes/auth/db.php
deleted file mode 100644
index 11b90e4df7..0000000000
--- a/phpBB/includes/auth/db.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/**
-* Database auth plug-in for phpBB3
-*
-* Authentication plug-ins is largely down to Sergey Kanareykin, our thanks to him.
-*
-* This is for authentication via the integrated user table
-*
-* @package login
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-class phpbb_auth_db /* extends phpbb_auth */
-{
-	/**
-	* Login function
-	*/
-	function login(&$username, &$password)
-	{
-		// do not allow empty password
-		if (!$password)
-		{
-			return array(
-				'status'	=> LOGIN_ERROR_PASSWORD,
-				'error_msg'	=> 'NO_PASSWORD_SUPPLIED',
-				'user_row'	=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		if (!$username)
-		{
-			return array(
-				'status'	=> LOGIN_ERROR_USERNAME,
-				'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-				'user_row'	=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		$sql = 'SELECT user_id, username, user_password, user_passchg, user_pass_convert, user_email, user_type, user_login_attempts
-			FROM ' . USERS_TABLE . "
-			WHERE username_clean = '" . phpbb::$db->sql_escape(utf8_clean_string($username)) . "'";
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$row)
-		{
-			return array(
-				'status'	=> LOGIN_ERROR_USERNAME,
-				'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-				'user_row'	=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		// If there are too much login attempts, we need to check for an confirm image
-		// Every auth module is able to define what to do by itself...
-		if (phpbb::$config['max_login_attempts'] && $row['user_login_attempts'] >= phpbb::$config['max_login_attempts'])
-		{
-			$confirm_id = request_var('confirm_id', '');
-			$confirm_code = request_var('confirm_code', '');
-
-			// Visual Confirmation handling
-			if (!$confirm_id)
-			{
-				return array(
-					'status'		=> LOGIN_ERROR_ATTEMPTS,
-					'error_msg'		=> 'LOGIN_ERROR_ATTEMPTS',
-					'user_row'		=> $row,
-				);
-			}
-			else
-			{
-				$captcha = phpbb_captcha_factory::get_instance(phpbb::$config['captcha_plugin']);
-				$captcha->init(CONFIRM_LOGIN);
-				$vc_response = $captcha->validate();
-				if ($vc_response)
-				{
-					return array(
-							'status'		=> LOGIN_ERROR_ATTEMPTS,
-							'error_msg'		=> 'LOGIN_ERROR_ATTEMPTS',
-							'user_row'		=> $row,
-					);
-				}
-			}
-		}
-
-		// Check password ...
-		if (!$row['user_pass_convert'] && phpbb::$security->check_password($password, $row['user_password']))
-		{
-			// Check for old password hash...
-			if (strlen($row['user_password']) == 32)
-			{
-				$hash = phpbb::$security->hash_password($password);
-
-				// Update the password in the users table to the new format
-				$sql = 'UPDATE ' . USERS_TABLE . "
-					SET user_password = '" . phpbb::$db->sql_escape($hash) . "',
-						user_pass_convert = 0
-					WHERE user_id = {$row['user_id']}";
-				phpbb::$db->sql_query($sql);
-
-				$row['user_password'] = $hash;
-			}
-
-			if ($row['user_login_attempts'] != 0)
-			{
-				// Successful, reset login attempts (the user passed all stages)
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_login_attempts = 0
-					WHERE user_id = ' . $row['user_id'];
-				phpbb::$db->sql_query($sql);
-			}
-
-			// User inactive...
-			if ($row['user_type'] == phpbb::USER_INACTIVE || $row['user_type'] == phpbb::USER_IGNORE)
-			{
-				return array(
-					'status'		=> LOGIN_ERROR_ACTIVE,
-					'error_msg'		=> 'ACTIVE_ERROR',
-					'user_row'		=> $row,
-				);
-			}
-
-			// Successful login... set user_login_attempts to zero...
-			return array(
-				'status'		=> LOGIN_SUCCESS,
-				'error_msg'		=> false,
-				'user_row'		=> $row,
-			);
-		}
-
-		// Password incorrect - increase login attempts
-		$sql = 'UPDATE ' . USERS_TABLE . '
-			SET user_login_attempts = user_login_attempts + 1
-			WHERE user_id = ' . $row['user_id'];
-		phpbb::$db->sql_query($sql);
-
-		// Give status about wrong password...
-		return array(
-			'status'		=> LOGIN_ERROR_PASSWORD,
-			'error_msg'		=> 'LOGIN_ERROR_PASSWORD',
-			'user_row'		=> $row,
-		);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
deleted file mode 100644
index 22aa43431e..0000000000
--- a/phpBB/includes/bbcode.php
+++ /dev/null
@@ -1,583 +0,0 @@
-18.04.2009<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* BBCode class
-* @package phpBB3
-*/
-class bbcode
-{
-	var $bbcode_uid = '';
-	var $bbcode_bitfield = '';
-	var $bbcode_cache = array();
-	var $bbcode_template = array();
-
-	var $bbcodes = array();
-
-	var $template_bitfield;
-	var $template_filename = '';
-
-	/**
-	* Constructor
-	* Init bbcode cache entries if bitfield is specified
-	*/
-	function __construct($bitfield = '')
-	{
-		if ($bitfield)
-		{
-			$this->bbcode_bitfield = $bitfield;
-			$this->bbcode_cache_init();
-		}
-	}
-
-	/**
-	* Second pass bbcodes
-	*/
-	function bbcode_second_pass(&$message, $bbcode_uid = '', $bbcode_bitfield = false)
-	{
-		if ($bbcode_uid)
-		{
-			$this->bbcode_uid = $bbcode_uid;
-		}
-
-		if ($bbcode_bitfield !== false)
-		{
-			$this->bbcode_bitfield = $bbcode_bitfield;
-
-			// Init those added with a new bbcode_bitfield (already stored codes will not get parsed again)
-			$this->bbcode_cache_init();
-		}
-
-		if (!$this->bbcode_bitfield)
-		{
-			// Remove the uid from tags that have not been transformed into HTML
-			if ($this->bbcode_uid)
-			{
-				$message = str_replace(':' . $this->bbcode_uid, '', $message);
-			}
-
-			return;
-		}
-
-		$str = array('search' => array(), 'replace' => array());
-		$preg = array('search' => array(), 'replace' => array());
-
-		$bitfield = new bitfield($this->bbcode_bitfield);
-		$bbcodes_set = $bitfield->get_all_set();
-
-		$undid_bbcode_specialchars = false;
-		foreach ($bbcodes_set as $bbcode_id)
-		{
-			if (!empty($this->bbcode_cache[$bbcode_id]))
-			{
-				foreach ($this->bbcode_cache[$bbcode_id] as $type => $array)
-				{
-					foreach ($array as $search => $replace)
-					{
-						${$type}['search'][] = str_replace('$uid', $this->bbcode_uid, $search);
-						${$type}['replace'][] = $replace;
-					}
-
-					if (sizeof($str['search']))
-					{
-						$message = str_replace($str['search'], $str['replace'], $message);
-						$str = array('search' => array(), 'replace' => array());
-					}
-
-					if (sizeof($preg['search']))
-					{
-						// we need to turn the entities back into their original form to allow the
-						// search patterns to work properly
-						if (!$undid_bbcode_specialchars)
-						{
-							$message = str_replace(array('&#58;', '&#46;'), array(':', '.'), $message);
-							$undid_bbcode_specialchars = true;
-						}
-
-						$message = preg_replace($preg['search'], $preg['replace'], $message);
-						$preg = array('search' => array(), 'replace' => array());
-					}
-				}
-			}
-		}
-
-		// Remove the uid from tags that have not been transformed into HTML
-		$message = str_replace(':' . $this->bbcode_uid, '', $message);
-	}
-
-	/**
-	* Init bbcode cache
-	*
-	* requires: $this->bbcode_bitfield
-	* sets: $this->bbcode_cache with bbcode templates needed for bbcode_bitfield
-	*/
-	function bbcode_cache_init()
-	{
-		if (empty($this->template_filename))
-		{
-			$this->template_bitfield = new bitfield(phpbb::$user->theme['bbcode_bitfield']);
-			$this->template_filename = PHPBB_ROOT_PATH . 'styles/' . phpbb::$user->theme['template_path'] . '/template/bbcode.html';
-
-			if (!@file_exists($this->template_filename))
-			{
-				trigger_error('The file ' . $this->template_filename . ' is missing.', E_USER_ERROR);
-			}
-		}
-
-		$bbcode_ids = $rowset = $sql = array();
-
-		$bitfield = new bitfield($this->bbcode_bitfield);
-		$bbcodes_set = $bitfield->get_all_set();
-
-		foreach ($bbcodes_set as $bbcode_id)
-		{
-			if (isset($this->bbcode_cache[$bbcode_id]))
-			{
-				// do not try to re-cache it if it's already in
-				continue;
-			}
-			$bbcode_ids[] = $bbcode_id;
-
-			if ($bbcode_id > NUM_CORE_BBCODES)
-			{
-				$sql[] = $bbcode_id;
-			}
-		}
-
-		if (sizeof($sql))
-		{
-			$sql = 'SELECT *
-				FROM ' . BBCODES_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('bbcode_id', $sql);
-			$result = phpbb::$db->sql_query($sql, 3600);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				// To circumvent replacing newlines with <br /> for the generated html,
-				// we use carriage returns here. They are later changed back to newlines
-				$row['bbcode_tpl'] = str_replace("\n", "\r", $row['bbcode_tpl']);
-				$row['second_pass_replace'] = str_replace("\n", "\r", $row['second_pass_replace']);
-
-				$rowset[$row['bbcode_id']] = $row;
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		foreach ($bbcode_ids as $bbcode_id)
-		{
-			switch ($bbcode_id)
-			{
-				case 0:
-					$this->bbcode_cache[$bbcode_id] = array(
-						'str' => array(
-							'[/quote:$uid]'	=> $this->bbcode_tpl('quote_close', $bbcode_id)
-						),
-						'preg' => array(
-							'#\[quote(?:=&quot;(.*?)&quot;)?:$uid\]((?!\[quote(?:=&quot;.*?&quot;)?:$uid\]).)?#ise'	=> "\$this->bbcode_second_pass_quote('\$1', '\$2')"
-						)
-					);
-				break;
-
-				case 1:
-					$this->bbcode_cache[$bbcode_id] = array(
-						'str' => array(
-							'[b:$uid]'	=> $this->bbcode_tpl('b_open', $bbcode_id),
-							'[/b:$uid]'	=> $this->bbcode_tpl('b_close', $bbcode_id),
-						)
-					);
-				break;
-
-				case 2:
-					$this->bbcode_cache[$bbcode_id] = array(
-						'str' => array(
-							'[i:$uid]'	=> $this->bbcode_tpl('i_open', $bbcode_id),
-							'[/i:$uid]'	=> $this->bbcode_tpl('i_close', $bbcode_id),
-						)
-					);
-				break;
-
-				case 3:
-					$this->bbcode_cache[$bbcode_id] = array(
-						'preg' => array(
-							'#\[url:$uid\]((.*?))\[/url:$uid\]#s'			=> $this->bbcode_tpl('url', $bbcode_id),
-							'#\[url=([^\[]+?):$uid\](.*?)\[/url:$uid\]#s'	=> $this->bbcode_tpl('url', $bbcode_id),
-						)
-					);
-				break;
-
-				case 4:
-					if (phpbb::$user->optionget('viewimg'))
-					{
-						$this->bbcode_cache[$bbcode_id] = array(
-							'preg' => array(
-								'#\[img:$uid\](.*?)\[/img:$uid\]#s'		=> $this->bbcode_tpl('img', $bbcode_id),
-							)
-						);
-					}
-					else
-					{
-						$this->bbcode_cache[$bbcode_id] = array(
-							'preg' => array(
-								'#\[img:$uid\](.*?)\[/img:$uid\]#s'		=> str_replace('$2', '[ img ]', $this->bbcode_tpl('url', $bbcode_id, true)),
-							)
-						);
-					}
-				break;
-
-				case 5:
-					$this->bbcode_cache[$bbcode_id] = array(
-						'preg' => array(
-							'#\[size=([\-\+]?\d+):$uid\](.*?)\[/size:$uid\]#s'	=> $this->bbcode_tpl('size', $bbcode_id),
-						)
-					);
-				break;
-
-				case 6:
-					$this->bbcode_cache[$bbcode_id] = array(
-						'preg' => array(
-							'!\[color=(#[0-9a-f]{6}|[a-z\-]+):$uid\](.*?)\[/color:$uid\]!is'	=> $this->bbcode_tpl('color', $bbcode_id),
-						)
-					);
-				break;
-
-				case 7:
-					$this->bbcode_cache[$bbcode_id] = array(
-						'str' => array(
-							'[u:$uid]'	=> $this->bbcode_tpl('u_open', $bbcode_id),
-							'[/u:$uid]'	=> $this->bbcode_tpl('u_close', $bbcode_id),
-						)
-					);
-				break;
-
-				case 8:
-					$this->bbcode_cache[$bbcode_id] = array(
-						'preg' => array(
-							'#\[code(?:=([a-z]+))?:$uid\](.*?)\[/code:$uid\]#ise'	=> "\$this->bbcode_second_pass_code('\$1', '\$2')",
-						)
-					);
-				break;
-
-				case 9:
-					$this->bbcode_cache[$bbcode_id] = array(
-						'preg' => array(
-							'#(\[\/?(list|\*):[mou]?:?$uid\])[\n]{1}#'	=> "\$1",
-							'#(\[list=([^\[]+):$uid\])[\n]{1}#'			=> "\$1",
-							'#\[list=([^\[]+):$uid\]#e'					=> "\$this->bbcode_list('\$1')",
-						),
-						'str' => array(
-							'[list:$uid]'		=> $this->bbcode_tpl('ulist_open_default', $bbcode_id),
-							'[/list:u:$uid]'	=> $this->bbcode_tpl('ulist_close', $bbcode_id),
-							'[/list:o:$uid]'	=> $this->bbcode_tpl('olist_close', $bbcode_id),
-							'[*:$uid]'			=> $this->bbcode_tpl('listitem', $bbcode_id),
-							'[/*:$uid]'			=> $this->bbcode_tpl('listitem_close', $bbcode_id),
-							'[/*:m:$uid]'		=> $this->bbcode_tpl('listitem_close', $bbcode_id)
-						),
-					);
-				break;
-
-				case 10:
-					$this->bbcode_cache[$bbcode_id] = array(
-						'preg' => array(
-							'#\[email:$uid\]((.*?))\[/email:$uid\]#is'			=> $this->bbcode_tpl('email', $bbcode_id),
-							'#\[email=([^\[]+):$uid\](.*?)\[/email:$uid\]#is'	=> $this->bbcode_tpl('email', $bbcode_id)
-						)
-					);
-				break;
-
-				case 11:
-					if (phpbb::$user->optionget('viewflash'))
-					{
-						$this->bbcode_cache[$bbcode_id] = array(
-							'preg' => array(
-								'#\[flash=([0-9]+),([0-9]+):$uid\](.*?)\[/flash:$uid\]#'	=> $this->bbcode_tpl('flash', $bbcode_id),
-							)
-						);
-					}
-					else
-					{
-						$this->bbcode_cache[$bbcode_id] = array(
-							'preg' => array(
-								'#\[flash=([0-9]+),([0-9]+):$uid\](.*?)\[/flash:$uid\]#'	=> str_replace('$1', '$3', str_replace('$2', '[ flash ]', $this->bbcode_tpl('url', $bbcode_id, true)))
-							)
-						);
-					}
-				break;
-
-				case 12:
-					$this->bbcode_cache[$bbcode_id] = array(
-						'str'	=> array(
-							'[/attachment:$uid]'	=> $this->bbcode_tpl('inline_attachment_close', $bbcode_id)
-						),
-						'preg'	=> array(
-							'#\[attachment=([0-9]+):$uid\]#'	=> $this->bbcode_tpl('inline_attachment_open', $bbcode_id)
-						)
-					);
-				break;
-
-				default:
-					if (isset($rowset[$bbcode_id]))
-					{
-						if ($this->template_bitfield->get($bbcode_id))
-						{
-							// The bbcode requires a custom template to be loaded
-							if (!$bbcode_tpl = $this->bbcode_tpl($rowset[$bbcode_id]['bbcode_tag'], $bbcode_id))
-							{
-								// For some reason, the required template seems not to be available, use the default template
-								$bbcode_tpl = (!empty($rowset[$bbcode_id]['second_pass_replace'])) ? $rowset[$bbcode_id]['second_pass_replace'] : $rowset[$bbcode_id]['bbcode_tpl'];
-							}
-							else
-							{
-								// In order to use templates with custom bbcodes we need
-								// to replace all {VARS} to corresponding backreferences
-								// Note that backreferences are numbered from bbcode_match
-								if (preg_match_all('/\{(URL|LOCAL_URL|EMAIL|TEXT|SIMPLETEXT|IDENTIFIER|COLOR|NUMBER)[0-9]*\}/', $rowset[$bbcode_id]['bbcode_match'], $m))
-								{
-									foreach ($m[0] as $i => $tok)
-									{
-										$bbcode_tpl = str_replace($tok, '$' . ($i + 1), $bbcode_tpl);
-									}
-								}
-							}
-						}
-						else
-						{
-							// Default template
-							$bbcode_tpl = (!empty($rowset[$bbcode_id]['second_pass_replace'])) ? $rowset[$bbcode_id]['second_pass_replace'] : $rowset[$bbcode_id]['bbcode_tpl'];
-						}
-
-						// Replace {L_*} lang strings
-						$bbcode_tpl = preg_replace('/{L_([A-Z_]+)}/e', "phpbb::\$user->lang('\$1')", $bbcode_tpl);
-
-						if (!empty($rowset[$bbcode_id]['second_pass_replace']))
-						{
-							// The custom BBCode requires second-pass pattern replacements
-							$this->bbcode_cache[$bbcode_id] = array(
-								'preg' => array($rowset[$bbcode_id]['second_pass_match'] => $bbcode_tpl)
-							);
-						}
-						else
-						{
-							$this->bbcode_cache[$bbcode_id] = array(
-								'str' => array($rowset[$bbcode_id]['second_pass_match'] => $bbcode_tpl)
-							);
-						}
-					}
-					else
-					{
-						$this->bbcode_cache[$bbcode_id] = false;
-					}
-				break;
-			}
-		}
-	}
-
-	/**
-	* Return bbcode template
-	*/
-	function bbcode_tpl($tpl_name, $bbcode_id = -1, $skip_bitfield_check = false)
-	{
-		static $bbcode_hardtpl = array();
-		if (empty($bbcode_hardtpl))
-		{
-			$bbcode_hardtpl = array(
-				'b_open'	=> '<span style="font-weight: bold">',
-				'b_close'	=> '</span>',
-				'i_open'	=> '<span style="font-style: italic">',
-				'i_close'	=> '</span>',
-				'u_open'	=> '<span style="text-decoration: underline">',
-				'u_close'	=> '</span>',
-				'img'		=> '<img src="$1" alt="' . phpbb::$user->lang['IMAGE'] . '" />',
-				'size'		=> '<span style="font-size: $1%; line-height: normal">$2</span>',
-				'color'		=> '<span style="color: $1">$2</span>',
-				'email'		=> '<a href="mailto:$1">$2</a>'
-			);
-		}
-
-		if ($bbcode_id != -1 && !$skip_bitfield_check && !$this->template_bitfield->get($bbcode_id))
-		{
-			return (isset($bbcode_hardtpl[$tpl_name])) ? $bbcode_hardtpl[$tpl_name] : false;
-		}
-
-		if (empty($this->bbcode_template))
-		{
-			if (($tpl = file_get_contents($this->template_filename)) === false)
-			{
-				trigger_error('Could not load bbcode template', E_USER_ERROR);
-			}
-
-			// replace \ with \\ and then ' with \'.
-			$tpl = str_replace('\\', '\\\\', $tpl);
-			$tpl = str_replace("'", "\'", $tpl);
-
-			// strip newlines and indent
-			$tpl = preg_replace("/\n[\n\r\s\t]*/", '', $tpl);
-
-			// Turn template blocks into PHP assignment statements for the values of $bbcode_tpl..
-			$this->bbcode_template = array();
-
-			$matches = preg_match_all('#<!-- BEGIN (.*?) -->(.*?)<!-- END (?:.*?) -->#', $tpl, $match);
-
-			for ($i = 0; $i < $matches; $i++)
-			{
-				if (empty($match[1][$i]))
-				{
-					continue;
-				}
-
-				$this->bbcode_template[$match[1][$i]] = $this->bbcode_tpl_replace($match[1][$i], $match[2][$i]);
-			}
-		}
-
-		return (isset($this->bbcode_template[$tpl_name])) ? $this->bbcode_template[$tpl_name] : ((isset($bbcode_hardtpl[$tpl_name])) ? $bbcode_hardtpl[$tpl_name] : false);
-	}
-
-	/**
-	* Return bbcode template replacement
-	*/
-	function bbcode_tpl_replace($tpl_name, $tpl)
-	{
-		static $replacements = array(
-			'quote_username_open'	=> array('{USERNAME}'	=> '$1'),
-			'color'					=> array('{COLOR}'		=> '$1', '{TEXT}'			=> '$2'),
-			'size'					=> array('{SIZE}'		=> '$1', '{TEXT}'			=> '$2'),
-			'img'					=> array('{URL}'		=> '$1'),
-			'flash'					=> array('{WIDTH}'		=> '$1', '{HEIGHT}'			=> '$2', '{URL}'	=> '$3'),
-			'url'					=> array('{URL}'		=> '$1', '{DESCRIPTION}'	=> '$2'),
-			'email'					=> array('{EMAIL}'		=> '$1', '{DESCRIPTION}'	=> '$2')
-		);
-
-		$tpl = preg_replace('/{L_([A-Z_]+)}/e', "phpbb::\$user->lang('\$1')", $tpl);
-
-		if (!empty($replacements[$tpl_name]))
-		{
-			$tpl = strtr($tpl, $replacements[$tpl_name]);
-		}
-
-		return trim($tpl);
-	}
-
-	/**
-	* Second parse list bbcode
-	*/
-	function bbcode_list($type)
-	{
-		if ($type == '')
-		{
-			$tpl = 'ulist_open_default';
-			$type = 'default';
-		}
-		else if ($type == 'i')
-		{
-			$tpl = 'olist_open';
-			$type = 'lower-roman';
-		}
-		else if ($type == 'I')
-		{
-			$tpl = 'olist_open';
-			$type = 'upper-roman';
-		}
-		else if (preg_match('#^(disc|circle|square)$#i', $type))
-		{
-			$tpl = 'ulist_open';
-			$type = strtolower($type);
-		}
-		else if (preg_match('#^[a-z]$#', $type))
-		{
-			$tpl = 'olist_open';
-			$type = 'lower-alpha';
-		}
-		else if (preg_match('#[A-Z]#', $type))
-		{
-			$tpl = 'olist_open';
-			$type = 'upper-alpha';
-		}
-		else if (is_numeric($type))
-		{
-			$tpl = 'olist_open';
-			$type = 'decimal';
-		}
-		else
-		{
-			$tpl = 'olist_open';
-			$type = 'decimal';
-		}
-
-		return str_replace('{LIST_TYPE}', $type, $this->bbcode_tpl($tpl));
-	}
-
-	/**
-	* Second parse quote tag
-	*/
-	function bbcode_second_pass_quote($username, $quote)
-	{
-		// when using the /e modifier, preg_replace slashes double-quotes but does not
-		// seem to slash anything else
-		$quote = str_replace('\"', '"', $quote);
-		$username = str_replace('\"', '"', $username);
-
-		// remove newline at the beginning
-		if ($quote == "\n")
-		{
-			$quote = '';
-		}
-
-		$quote = (($username) ? str_replace('$1', $username, $this->bbcode_tpl('quote_username_open')) : $this->bbcode_tpl('quote_open')) . $quote;
-
-		return $quote;
-	}
-
-	/**
-	* Second parse code tag
-	*/
-	function bbcode_second_pass_code($type, $code)
-	{
-		// when using the /e modifier, preg_replace slashes double-quotes but does not
-		// seem to slash anything else
-		$code = str_replace('\"', '"', $code);
-
-		switch ($type)
-		{
-			case 'php':
-				// Not the english way, but valid because of hardcoded syntax highlighting
-				if (strpos($code, '<span class="syntaxdefault"><br /></span>') === 0)
-				{
-					$code = substr($code, 41);
-				}
-
-			// no break;
-
-			default:
-				$code = str_replace("\t", '&nbsp; &nbsp;', $code);
-				$code = str_replace('  ', '&nbsp; ', $code);
-				$code = str_replace('  ', ' &nbsp;', $code);
-
-				// remove newline at the beginning
-				if (!empty($code) && $code[0] == "\n")
-				{
-					$code = substr($code, 1);
-				}
-			break;
-		}
-
-		$code = $this->bbcode_tpl('code_open') . $code . $this->bbcode_tpl('code_close');
-
-		return $code;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/bbcode/bbcode_parser.php b/phpBB/includes/bbcode/bbcode_parser.php
deleted file mode 100644
index 81151a2945..0000000000
--- a/phpBB/includes/bbcode/bbcode_parser.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
- * The phpBB version of the BBCode parser
- *
- */
-class phpbb_bbcode_parser extends phpbb_bbcode_parser_base
-{
-	private $list_stack = array();
-	protected $tags = array();
-
-	public function __construct()
-	{
-		$this->tags = array(
-			// The exact B BBcode from phpBB
-			'b' => array(
-				'replace' => '<span style="font-weight: bold">',
-				'close' => '</span>',
-				'attributes' => array(),
-				'children' => array(true, 'quote' => true, 'code' => true, 'list' => true),
-				'parents' => array(true),
-			),
-			// The exact I BBcode from phpBB
-			'i' => array(
-				'replace' => '<span style="font-style: italic">',
-				'close' => '</span>',
-				'attributes' => array(),
-				'children' => array(true, 'quote' => true, 'code' => true, 'list' => true),
-				'parents' => array(true),
-			),
-			// The exact U BBcode from phpBB
-			'u' => array(
-				'replace' => '<span style="text-decoration: underline">',
-				'close' => '</span>',
-				'attributes' => array(),
-				'children' => array(true, 'quote' => true, 'code' => true, 'list' => true),
-				'parents' => array(true),
-			),
-
-			// Quote tag attempt.
-			'quote' => array(
-				'replace' => '<div class="quotetitle">{_}</div><div class="quotecontent">',
-				'close' => '</div>',
-				'attributes' => array(
-					'_' => array(
-						'replace' => '%s wrote:',
-					),
-				),
-				'children' => array(true),
-				'parents' => array(true),
-			),
-
-			// code tag (without the =php functionality)
-			'code' => array(
-				'replace' => '<div class="codetitle"><b>Code:</b></div><div class="codecontent">',
-				'close' => '</div>',
-				'attributes' => array(),
-				'children' => array(false),
-				'parents' => array(true),
-			),
-
-			// list tag
-			'list' => array(
-				'replace' => '',
-				'replace_func' => array($this, 'list_open'),
-				'close' => '',
-				'close_func' => array($this, 'list_close'),
-				'attributes' => array(
-					'_' => array(
-						'replace' => '',
-					),
-				),
-				'children' => array(false, 'li' => true),
-				'parents' => array(true),
-			),
-
-			// The exact * tag from phpBB. "*" is not a valid tag name in this parser... introducing li from HTML!
-			'li' => array(
-				'replace' => '<li>',
-				'close' => '</li>',
-				'close_shadow' => true,
-				'attributes' => array(),
-				'children' => array(true, 'li' => true),
-				'parents' => array(false, 'list' => true),
-			),
-
-			// Almost exact img tag from phpBB...
-			'img' => array(
-				'replace' => '<img alt="Image" src="',
-				'close' => '" />',
-				'attributes' => array(
-					'__' => array(
-						'replace' => '%s',
-					),
-				),
-				'children' => array(false),
-				'parents' => array(true),
-
-			),
-
-			'url' => array(
-				'replace' => '',
-				'replace_func' => array($this, 'url_tag'),
-				'close' => '</a>',
-				'attributes' => array(
-					// The replace value is not important empty because the replace_func handles this.
-					'_' => array(
-						'replace' => '',
-					),
-					'__' => array(
-						'replace' => '',
-					),
-				),
-				'children' => array(false),
-				'parents' => array(true),
-
-			),
-
-			'color' => array(
-				'replace' => '<span style="color: {_}">',
-				'close' => '</span>',
-				'attributes' => array(
-					'_' => array(
-						'replace' => '%s',
-						'required' => true
-					),
-				),
-				'children' => array(true, 'color' => true),
-				'parents' => array(true),
-			),
-
-			'size' => array(
-				'replace' => '<span style="font-size: {_}px; line-height: normal">',
-				'close' => '</span>',
-				'attributes' => array(
-					'_' => array(
-						'replace' => '%s',
-						'required' => true
-					),
-				),
-				'children' => array(true, 'size' => true),
-				'parents' => array(true),
-			),
-
-
-			// FLASH tag implementation attempt.
-			'flash' => array(
-				'replace' => '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,19,0"{w}{h}>
-<param name="movie" value="{m}" />
-<param name="quality" value="high" />
-<embed src="{m}" quality="high" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash"{w}{h}>
-</embed>
-</object>',
-				'close' => false,
-				'attributes' => array(
-					'm' => array(
-						'replace' => '%s',
-						'required' => true,
-					),
-					'w' => array(
-						'replace' => ' width="%s"',
-						'type_check' => 'ctype_digit',
-					),
-					'h' => array(
-						'replace' => ' height="%s"',
-						'type_check' => 'ctype_digit',
-					),
-				),
-				'children' => array(false),
-				'parents' => array(true),
-			),
-			// The spoiler tag from area51.phpbb.com :p
-			'spoiler' => array(
-				'replace' => '<span class="quotetitle"><b>Spoiler:</b></span><span style="background-color:white;color:white;">',
-				'close' => '</span>',
-				'attributes' => array(),
-				'children' => array(false),
-				'parents' => array(true),
-			),
-			// a noparse tag
-			'noparse' => array(
-				'replace' => '',
-				'close' => '',
-				'attributes' => array(),
-				'children' => array(false),
-				'parents' => array(true),
-			),
-		);
-		$this->smilies = array(
-			':)' => '<img src="http://area51.phpbb.com/phpBB/images/smilies/icon_e_smile.gif" />',
-			':(' => '<img src="http://area51.phpbb.com/phpBB/images/smilies/icon_e_sad.gif" />',
-		);
-		
-//		$this->text_callback = 'strtoupper';
-		parent::__construct();
-	}
-
-
- 	protected function url_tag(array $attributes = array(), array $definition = array())
-	{
-		if (isset($attributes['_']))
-		{
-			return '<a href="' . $attributes['_'] . '">';
-		}
-		return '<a href="' . $attributes['__'] . '">';
-	}
-
- 	protected function list_open(array $attributes = array(), array $definition = array())
-	{
-		if (isset($attributes['_']))
-		{
-			return '<ol style="list-style-type: ' . $attributes['_'] . '">';
-		}
-		return '<ul>';
-	}
-
-	protected function list_close(array $attributes = array())
-	{
-		if (isset($attributes['_']))
-		{
-			return '</ol>';
-		}
-		return '</ul>';
-	}
-}
diff --git a/phpBB/includes/bbcode/bbcode_parser_base.php b/phpBB/includes/bbcode/bbcode_parser_base.php
deleted file mode 100644
index af74f6c38e..0000000000
--- a/phpBB/includes/bbcode/bbcode_parser_base.php
+++ /dev/null
@@ -1,868 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-
-/**
- * A stack based BBCode parser.
- *
- */
-abstract class phpbb_bbcode_parser_base
-{
-	/**
-	 * Array holding the BBCode definitions.
-	 *
-	 * This is all the documentation you'll find!
-	 *
-	 * 'tagName' => array( // The tag name must start with a letter and can consist only of letters and numbers.
-	 * 		'replace' => 'The open tag is replaced with this. "{attribute}" - Will be replaced with an existing attribute.',
-	 * 		// Optional
-	 * 		'replace_func' => 'function_name', // Open tag is replaced with the the value that this function returns. replace will not be used. The function will get the arguments given to the tag and the tag definition. It is your responsibility to validate the arguments.
-	 * 		'close' => 'The close tag is replaced by this. If set to bool(false) the tag won't need a closing tag.',
-	 * 		// Optional
-	 * 		'close_shadow' => true, // If set, no closing tag will be needed, but the value close will be added as soon as the parent tag is closed or a tag which is not allowed in the tag is encountered.
-	 * 		// Optional
-	 * 		'close_func' => 'function_name', // Close tag is replaced with the the value that this function returns. close will not be used. If close is set to bool this might not function as expected.
-	 * 		'attributes' => array(
-	 * 			'attributeName' => array(
-	 * 				'replace' => 'Attribute replacement. Use string defined in self::$attr_value_replace as a replacement for the attributes value',
-	 * 				'type_check' => 'function_name', // Optional. Function name to check if the value of the attribute is allowed. It must return bool or a corrected string. It must accept the attribute value string.
-	 * 				'required' => true, // Optional. The attribute must be set and not empty for the tag to be parsed.
-	 * 			),
-	 * 			// ...
-	 * 		),
-	 * 		'children' => array(
-	 * 			true, // true allows all tags to be a child of this tag except for the other tags in the array. false allows only the tags in the array.
-	 * 			'tag2' => true,
-	 * 			// ...
-	 * 		),
-	 * 		'parents' => array(true), // Same as 'children'.
-	 * 		// Optional
-	 * 		'content_func' => 'function_name', // Applies function to the contents of the tag and replaces it with the output. Used only when the tag does not allow children. It must return the replacement string and accept the input string. This is not like HTML...
-	 * 	),
-	 * 	'tag2' => array(
-	 * // ...
-	 *
-	 * NOTE: Use "_" as the name of the attribute assigned to the tag itself. (eg. form the tag [tag="value"] "_" will hold "value")
-	 * NOTE: Use "__" for the content of a tag without children. (eg. for [u]something[/u] "__" will hold "something") This is not like HTML...
-	 * NOTE: The following special tags exist: "__url" (child), "__smiley" (child) and "__global" (parent). They are to be used in the child/parent allowed/disallowed lists.
-	 * @var array
-	 */
-	protected  $tags = array();
-	
-	/**
-	 * The smilies which are to be "parsed".
-	 * 
-	 * Smilies are treated the same way as BBCodes (though BBcodes have precedence).
-	 * Use "__smiley" to allow/disallow them in tags. Smileys can only be children.
-	 * 
-	 * 'smiley' => 'replacement'
-	 *
-	 * @var array
-	 */
-	protected $smilies = array();
-	
-	/**
-	 * Callback to be applied to all text nodes (in second_pass).
-	 *
-	 * @var mixed
-	 */
-	protected $text_callback = null;
-
-	/**
-	 * Used by first_pass and second_pass
-	 *
-	 * @var array
-	 */
-	private $stack = array();
-
-	/**
-	 * Regex to match BBCode tags.
-	 *
-	 * @var string
-	 */
-	private $tag_regex = '\[(/?)([a-z][a-z0-9]*)(?:=(\'[^\']*\'|"[^"]*"))?((?: [a-z]+(?:\s?=\s?(?:\'[^\']*\'|"[^"]*"))?)*)\]';
-	
-	/**
-	 * Regex for URL's
-	 * 
-	 * @var string
-	 */
-	private $url_regex = '(?>([a-z+]{2,}://|www\.))(?:[a-z0-9]+(?:\.[a-z0-9]+)?@)?(?:(?:[a-z](?:[a-z0-9]|(?<!-)-)*[a-z0-9])(?:\.[a-z](?:[a-z0-9]|(?<!-)-)*[a-z0-9])+|(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))(?:/[^\\/:?*"<>|\n]*[a-z0-9])*/?(?:\?[a-z0-9_.%]+(?:=[a-z0-9_.%:/+-]*)?(?:&[a-z0-9_.%]+(?:=[a-z0-9_.%:/+-]*)?)*)?(?:#[a-z0-9_%.]+)?';
-
-	/**
-	 * Regex to match attribute&value pairs.
-	 *
-	 * @var string
-	 */
-	private $attribute_regex = '~([a-z]+)(?:\s?=\s?((?:\'[^\']*?\'|"[^"]*?")))?~i';
-
-	/**
-	 * Delimiter's ASCII code.
-	 *
-	 * @var int
-	 */
-	private $delimiter = 0;
-
-	/**
-	 * This string will be replaced by the attribute value.
-	 *
-	 * @var string
-	 */
-	private $attr_value_replace = '%s';
-
-	/**
-	 * First pass result.
-	 *
-	 * @var array
-	 */
-	private $parsed = array();
-	private $parse_pos = 1;
-	
-	/**
-	 * Parse flags
-	 *
-	 * @var int
-	 */
-	protected $flags;
-	
-	/**
-	 * Types
-	 */
-	const TYPE_TAG				= 1;
-	const TYPE_TAG_SIMPLE		= 2;
-	const TYPE_CTAG				= 3;
-	const TYPE_ABSTRACT_SMILEY	= 4;
-	const TYPE_ABSTRACT_URL		= 5;
-	
-	/**
-	 * Feature flags
-	 */
-	const PARSE_BBCODE	= 1;
-	const PARSE_URLS	= 2;
-	const PARSE_SMILIES	= 4;
-
-	/**
-	 * Tag Backreferences.
-	 *
-	 */
-	const MATCH_CLOSING_TAG	= 1;
-	const MATCH_TAG_NAME	= 2;
-	const MATCH_SHORT_ARG	= 3;
-	const MATCH_ARGS		= 4;
-	
-	/**
-	 * Argument backreferences
-	 * 
-	 */
-	const MATCH_ARG_NAME	= 1;
-	const MATCH_ARG_VALUE	= 2;
-
-	/**
-	 * Constructor.
-	 *
-	 */
-	public function __construct()
-	{
-		$this->delimiter = chr($this->delimiter);
-		$this->flags = self::PARSE_BBCODE | self::PARSE_URLS | self::PARSE_SMILIES;
-	}
-
-	/**
-	 * Returns a string ready for storage and/or second_pass
-	 *
-	 * @param string $string
-	 * @return string
-	 */
-	public function first_pass($string)
-	{
-		$this->stack = array();
-		$this->parsed = array();
-		$this->parse_pos = 1;
-
-		// Remove the delimiter from the string.
-		$string = str_replace($this->delimiter, '', $string);
-		
-		$smilies = implode('|',array_map(array($this, 'regex_quote'), array_keys($this->smilies)));
-		
-		// Make a regex out of the following items:
-		$regex_parts = array(
-			$this->tag_regex,
-			$this->url_regex,
-			$smilies,
-		);
-
-		$regex = '~' . implode('|', $regex_parts) . '~i';
-
-		// Do most of the job here...
-		$string = preg_replace_callback($regex, array($this, 'first_pass_tag_check'), $string);
-
-		// Close all remaining open tags.
-		if (sizeof($this->stack) > 0)
-		{
-			$string .= $this->close_tags($this->stack);
-			$this->stack = array();
-		}
-		
-		// Make a serialized array out of it.
-		$string = explode($this->delimiter, $string);
-		
-		if (sizeof($string) > 1)
-		{
-			$parsed = array();
-	
-			$this->parse_pos = 0;
-	
-			end($this->parsed);
-			reset($string);
-			foreach ($this->parsed as $key => $val)
-			{	
-				$parsed[key($string) * 2] = current($string);
-				$parsed[$key] = $val;
-				next($string);
-			}
-	
-			$this->parsed = array();
-			$this->parse_pos = 1;
-		}
-		else
-		{
-			$parsed = $string;
-		}
-
-		return serialize($parsed);
-	}
-
-	/**
-	 * Opposite function to first_pass.
-	 * Changes the output of first_pass back to BBCode.
-	 *
-	 * @param string $string
-	 * @return string
-	 * @todo make sure this works after the change of first_pass data storage.
-	 */
-	public function first_pass_decompile($string)
-	{
-		$string = unserialize($string);
-		for ($i = 1, $n = sizeof($string); $i < $n; $i += 2)
-		{
-			$string[$i] = $this->decompile_tag($tag);
-		}
-		return implode('', $string);
-	}
-
-	/**
-	 * Removes first_pass data. This removes all BBCode tags. To reverse the effect of first_pass use first_pass_decompile
-	 *
-	 * @param string $string
-	 * @return string
-	 */
-	public function remove_first_pass_data($string)
-	{
-		$decompiled = array();
-		$compiled = unserialize($string);
-		for ($i = 0, $n = sizeof($compiled); $i < $n; $n += 2)
-		{
-			$decompiled[] = $compiled[$i];
-		}
-		return implode('', $decompiled);
-	}
-
-	/**
-	 * The function takes the result of first_pass and returnes the string fully parsed.
-	 *
-	 * @param string $string
-	 * @return string
-	 */
-	public function second_pass($string)
-	{
-		$this->stack = array();
-
-		$string = unserialize($string);
-		
-		if (!is_null($this->text_callback))
-		{
-			for ($i = 0, $n = sizeof($string); $i < $n; $i += 2)
-			{
-				$string[$i] = call_user_func($this->text_callback, $string[$i]);
-			}
-		}
-		
-		for ($i = 1, $n = sizeof($string); $i < $n; $i += 2)
-		{
-
-			$tag_data		= $string[$i];
-			$type			= &$tag_data[0];
-			$tag			= $tag_data[1];
-			$tag_definition	= &$this->tags[$tag];
-
-			if ($this->flags & self::PARSE_BBCODE && $type != self::TYPE_ABSTRACT_URL && $type != self::TYPE_ABSTRACT_SMILEY && $type != self::TYPE_CTAG)
-			{
-				// These apply to opening tags and tags without closing tags.
-
-				// Is the tag still allowed as a child?
-				// This is still needed!
-				if (sizeof($this->stack) && isset($this->tags[$this->stack[0]['name']]['close_shadow']) && !is_bool($this->tags[$this->stack[0]['name']]['close']) && !$this->child_allowed($tag))
-				{
-					// The previous string won't be edited anymore.
-					$string[$i - 1] .= $this->tags[$this->stack[0]['name']]['close'];
-					array_shift($this->stack);
-				}
-				
-				// Add tag to stack only if it needs a closing tag.
-				if ($tag_definition['close'] !== false || !isset($tag_definition['close_shadow']))
-				{
-					array_unshift($this->stack, array('name' => $tag, 'attributes' => array()));
-				}
-			}
-			
-			switch ($type)
-			{
-				case self::TYPE_ABSTRACT_URL:
-
-					if ($this->flags & self::PARSE_URLS && $this->child_allowed('__url'))
-					{
-						$string[$i] = '<a href="' . $tag_data[1] . '">' . $tag_data[1] . '</a>';
-					}
-					else
-					{
-						$string[$i] = $tag_data[1];
-					}
-				
-				break;
-					
-				case self::TYPE_ABSTRACT_SMILEY:
-
-					if ($this->flags & self::PARSE_SMILIES && $this->child_allowed('__smiley'))
-					{
-						$string[$i] = $this->smilies[$tag_data[1]];
-					}
-					else
-					{
-						$string[$i] = $tag_data[1];
-					}
-					
-				break;
-				
-				case self::TYPE_CTAG:
-					
-					if (($this->flags & self::PARSE_BBCODE) == 0)
-					{
-						$string[$i] = $this->decompile_tag($string[$i]);
-						break;
-					}
-	
-					// It must be the last one as tag nesting was checked in the first pass.
-					// An exception to this rule was created with adding the new type of tag without closing tag.
-					if (isset($this->tags[$this->stack[0]['name']]['close_shadow']))
-					{
-						if (!is_bool($this->tags[$this->stack[0]['name']]['close']))
-						{
-							// the previous string won't be edited anymore.
-							$string[$i - 1] .= $this->tags[$this->stack[0]['name']]['close'];
-						}
-						else if (isset($tag_definition['close_func']))
-						{
-							$string[$i - 1] .= call_user_func($tag_definition['close_func'], $this->stack[0]['attributes']);
-						}
-						array_shift($this->stack);
-					}
-
-					if ($tag != $this->stack[0]['name'])
-					{
-						$string[$i] = $this->decompile_tag('/' . $tag);
-					}
-					else if (isset($tag_definition['close_shadow']))
-					{
-						$string[$i] = '';
-					}
-					else if ($tag_definition['close'] !== false || !isset($tag_definition['close_shadow']))
-					{
-						if (isset($tag_definition['close_func']))
-						{
-							$string[$i] = call_user_func($tag_definition['close_func'], $this->stack[0]['attributes']);
-						}
-						else
-						{
-							$string[$i] = $tag_definition['close'];
-						}
-						array_shift($this->stack);
-					}
-					else
-					{
-						$string[$i] = '';
-					}
-					
-				break;
-					
-				case self::TYPE_TAG_SIMPLE:
-					
-					if (($this->flags & self::PARSE_BBCODE) == 0)
-					{
-						$string[$i] = $this->decompile_tag($string[$i]);
-						break;
-					}
-					
-					if ($tag_definition['children'][0] == false && sizeof($tag_definition['children']) == 1)
-					{
-						if (isset($tag_definition['attributes']['__']))
-						{
-							$this->stack[0]['attributes'] = array('__' => $string[$i + 1]);
-							if (isset($tag_definition['replace_func']))
-							{
-								$string[$i] = call_user_func($tag_definition['replace_func'], array('__' => $string[$i + 1]), $tag_definition);
-							}
-							else
-							{
-								$string[$i] = str_replace('{__}', $string[$i + 1], $tag_definition['replace']);
-							}
-						}
-						else if (isset($tag_definition['replace_func']))
-						{
-							$string[$i] = call_user_func($tag_definition['replace_func'], array(), $tag_definition);
-						}
-						else
-						{
-							$string[$i] = $tag_definition['replace'];
-						}
-
-						if (isset($this->tags[$tag]['content_func']))
-						{
-							$string[$i + 1] = call_user_func($tag_definition['content_func'], $string[$i + 1]);
-						}
-					}
-					else
-					{
-						if (isset($tag_definition['replace_func']))
-						{
-							$string[$i] = call_user_func($tag_definition['replace_func'], array(), $tag_definition);
-						}
-						else
-						{
-							$string[$i] = $tag_definition['replace'];
-						}
-					}
-	
-					if (sizeof($tag_definition['attributes']) > 0)
-					{
-						// The tag has defined attributes but doesn't use any. The attribute replacements must be removed. I don't want this regex here.
-						$string[$i] = preg_replace('/{[^}]*}/', '', $string[$i]);
-					}
-						
-				break;
-				
-				case self::TYPE_TAG:
-			
-					if (($this->flags & self::PARSE_BBCODE) == 0)
-					{
-						$string[$i] = $this->decompile_tag($string[$i]);
-						break;
-					}
-
-					// These apply to tags with attributes.
-					if (!isset($tag_data[2]))
-					{
-						$tag_data[2] = array('__' => $string[$i + 1]);
-					}
-					$this->stack[0]['attributes'] = $tag_data[2];
-		
-					// Handle the (opening) tag with a custom function
-					if (isset($tag_definition['replace_func']))
-					{
-						
-						$string[$i] = call_user_func($tag_definition['replace_func'], $tag_data[2], $tag_definition);
-		
-						if (isset($tag_definition['content_func']) && $tag_definition['children'][0] === false && sizeof($tag_definition['children']) == 1)
-						{
-							$string[$i + 1] = call_user_func($tag_definition['content_func'], $string[$i + 1]);
-						}
-						break;
-					}
-		
-					// New code for the feature I've always wanted to implement :)
-					if (isset($tag_definition['attributes']['__']) && $tag_definition['children'][0] == false && sizeof($tag_definition['children']) == 1)
-					{
-						$attributes = array('{__}');
-						$replacements = array($string[$i + 1]);
-						// End new code.
-					}
-					else
-					{
-						$attributes = array();
-						$replacements = array();
-					}
-		
-					foreach ($tag_definition['attributes'] as $attribute => $value)
-					{
-						$attributes[] = '{' . $attribute . '}';
-						if (!isset($tag_data[2][$attribute]))
-						{
-							if (isset($value['required']))
-							{
-								$string[$i] = $this->decompile_tag($tag_data);
-								break 2;
-							}
-							$replacements[] = '';
-							continue;
-						}
-		
-						$replacements[] = str_replace($this->attr_value_replace, $tag_data[2][$attribute], $tag_definition['attributes'][$attribute]['replace']);
-					}
-	
-		
-					$string[$i] = str_replace($attributes, $replacements, $this->tags[$tag]['replace']);
-		
-					// It has to be twice... this should not be used if required attributes are missing.
-					if (isset($tag_definition['content_func']) && $tag_definition['children'][0] === false && sizeof($tag_definition['children']) == 1)
-					{
-						$string[$i + 1] = call_user_func($tag_definition['content_func'], $string[$i + 1]);
-					}
-					
-				break;
-			}
-		}
-
-		return implode($string);
-	}
-
-	/**
-	 * Callback for preg_replace_callback in first_pass.
-	 *
-	 * @param array $matches
-	 * @return string
-	 */
-	private function first_pass_tag_check($matches)
-	{
-		switch (sizeof($matches))
-		{
-			// Smilies
-			case 1:
-				
-				$this->parsed[$this->parse_pos] = array(self::TYPE_ABSTRACT_SMILEY, $matches[0]);
-				$this->parse_pos += 2;
-				return $this->delimiter;
-				
-			break;
-			
-			// URL
-			case 6:
-
-				$this->parsed[$this->parse_pos] = array(self::TYPE_ABSTRACT_URL, $matches[0]);
-				$this->parse_pos += 2;
-				return $this->delimiter;
-				
-			break;
-			
-			default:
-
-				if (!isset($this->tags[$matches[self::MATCH_TAG_NAME]]))
-				{
-					// Tag with the given name not defined.
-					return $matches[0];
-				}
-
-				// If tag is an opening tag.
-				if (strlen($matches[self::MATCH_CLOSING_TAG]) == 0)
-				{
-					if (sizeof($this->stack))
-					{
-						if ($this->tags[$this->stack[0]]['children'][0] == false && sizeof($this->tags[$this->stack[0]]['children']) == 1)
-						{
-							// Tag does not allow children.
-							return $matches[0];
-						}
-						// Tag parent not allowed for this tag. Omit here.
-						else if (!$this->parent_allowed($matches[self::MATCH_TAG_NAME], $this->stack[0]))
-						{
-							if (isset($this->tags[$this->stack[0]]['close_shadow']))
-							{
-								array_shift($this->stack);
-							}
-							else
-							{
-								return $matches[0];
-							}
-						}
-					}
-					// Is tag allowed in global scope?
-					else if (!$this->parent_allowed($matches[self::MATCH_TAG_NAME], '__global'))
-					{
-						return $matches[0];
-					}
-		
-					if ($this->tags[$matches[self::MATCH_TAG_NAME]]['close'] !== false || !isset($this->tags[$matches[self::MATCH_TAG_NAME]]['close_shadow']))
-					{
-						// Do not add tags to stack that do not need closing tags.
-						array_unshift($this->stack, $matches[self::MATCH_TAG_NAME]);
-					}
-		
-					$tag_attributes = &$this->tags[$matches[self::MATCH_TAG_NAME]]['attributes'];
-		
-					if (strlen($matches[self::MATCH_SHORT_ARG]) != 0 && isset($tag_attributes['_']))
-					{
-						// Add short attribute.
-						$attributes = array('_' => substr($matches[self::MATCH_SHORT_ARG], 1, -1));
-					}
-					else if (strlen($matches[4]) == 0 || (sizeof($tag_attributes)) == 0)
-					{
-						// Check all attributes, which were not used, if they are required.
-						if ($this->has_required($matches[self::MATCH_TAG_NAME], array_keys($tag_attributes)))
-						{
-							// Not all required attributes were used.
-							return $matches[0];
-						}
-						else
-						{
-							$this->parsed[$this->parse_pos] = array(self::TYPE_TAG_SIMPLE, $matches[self::MATCH_TAG_NAME]);
-							if (isset($attributes))
-							{
-								$this->parsed[$this->parse_pos][] = $attributes;
-							}
-							$this->parse_pos += 2;
-							return $this->delimiter;
-						}
-					}
-					else
-					{
-						$attributes = array();
-					}
-		
-					// Analyzer...
-					$matched_attrs = array();
-		
-					preg_match_all($this->attribute_regex, $matches[self::MATCH_ARGS], $matched_attrs, PREG_SET_ORDER);
-		
-					foreach($matched_attrs as $i => $value)
-					{
-						$tag_attribs_matched = &$tag_attributes[$value[self::MATCH_ARG_NAME]];
-						if (isset($attributes[$value[self::MATCH_ARG_NAME]]))
-						{
-							// This prevents adding the same attribute more than once. Childish betatesters are needed.
-							continue;
-						}
-						if (isset($tag_attribs_matched))
-						{
-							// The attribute exists within the defined tag. Undefined tags are removed.
-		
-							$attr_value = substr($value[self::MATCH_ARG_VALUE], 1, -1);
-		
-							if (isset($tag_attribs_matched['type_check']))
-							{
-								// A type check is needed for this attribute.
-
-								$type_check = $tag_attribs_matched['type_check']($attr_value);
-		
-								if (!is_bool($type_check))
-								{
-									// The type check function decided to fix the input instead of returning false.
-									$attr_value = $type_check;
-								}
-								else if ($type_check === false)
-								{
-									// Type check has failed.
-									continue;
-								}
-							}
-							if (isset($tag_attribs_matched['required']) && strlen($attr_value) == 0)
-							{
-								// A required attribute is empty. This is done after the type check as the type check may return an empty value.
-								return $matches[0];
-							}
-							$attributes[$value[self::MATCH_ARG_NAME]] = $attr_value;
-						}
-					}
-		
-					// Check all attributes, which were not used, if they are required.
-					if ($this->has_required($matches[self::MATCH_TAG_NAME], array_values(array_diff(array_keys($tag_attributes), array_keys($attributes)))))
-					{
-						// Not all required attributes were used.
-						return $matches[0];
-					}
-		
-					if (sizeof($attributes))
-					{
-						$this->parsed[$this->parse_pos] = array(self::TYPE_TAG, $matches[self::MATCH_TAG_NAME], $attributes);
-						$this->parse_pos += 2;
-						return $this->delimiter;
-					}
-
-					$this->parsed[$this->parse_pos] = array(self::TYPE_TAG_SIMPLE, $matches[self::MATCH_TAG_NAME]);
-					$this->parse_pos += 2;
-					return $this->delimiter;
-				}
-				// If tag is a closing tag.
-				
-
-				$valid = array_search($matches[self::MATCH_TAG_NAME], $this->stack);
-		
-				if ($valid === false)
-				{
-					// Closing tag without open tag.
-					return $matches[0];
-				}
-				else if ($valid != 0)
-				{
-					if ($this->tags[$this->stack[0]]['children'][0] == false && sizeof($this->tags[$this->stack[0]]['children']) == 1)
-					{
-						// Tag does not allow children.
-						// Do not handle other closing tags here as they are invalid in tags which do not allow children.
-						return $matches[0];
-					}
-					// Now we have to close all tags that were opened before this closing tag.
-					// We know that this tag does not close the last opened tag.
-					$to_close = array_splice($this->stack, 0, $valid + 1);
-					return $this->close_tags($to_close);
-				}
-				else
-				{
-					// A unset() was elicting many notices here.
-					array_shift($this->stack);
-					$this->parsed[$this->parse_pos] = array(self::TYPE_CTAG, $matches[self::MATCH_TAG_NAME]);
-					$this->parse_pos += 2;
-					return $this->delimiter;
-				}
-				
-			break;
-		}
-	}
-
-	/**
-	 * Returns closing tags for all tags in the $tags array (in reverse order).
-	 *
-	 * @param array $tags
-	 * @return string
-	 */
-	private function close_tags($tags)
-	{
-		$ret = '';
-		foreach($tags as $tag)
-		{
-			// @todo: Is this needed?
-			if (!isset($this->tags[$tag]['close_shadow']))
-			{
-				$this->parsed[$this->parse_pos] = array(self::TYPE_CTAG, $tag);
-				$this->parse_pos += 2;
-				$ret .= $this->delimiter;
-			}
-		}
-		return $ret;
-	}
-
-	/**
-	 * Returns the tag to the form it had before the first_pass
-	 *
-	 * @param array $tag
-	 * @return string
-	 */
-	private function decompile_tag(array $tag)
-	{
-		$ret = '[' . (($tag[0]) ? '' : '/');
-		$ret .= $tag[1];
-		
-		if(isset($tag[2]))
-		{
-			if (isset($tag[2]['_']))
-			{
-				$ret .= '="' . $tag[2]['_'] . '"';
-				unset($tag[2]['_']);
-			}
-	
-			foreach ($tag[2] as $attribute => $value)
-			{
-				$ret .= ' ' . $attribute . '="' . $value . '"';
-			}
-		}
-		$ret .= ']';
-
-		return $ret;
-	}
-
-	/**
-	 * Checks if $tag can be a child of the tag in stack index $index
-	 *
-	 * @param string $tag
-	 * @param int $index = 0
-	 * @return bool
-	 */
-	private function child_allowed($tag, $index = 0)
-	{
-		if (!isset($this->stack[$index]))
-		{
-			return true;
-		}
-		// I assume this trick is usefull starting form two.
-		$children = &$this->tags[$this->stack[$index]['name']]['children'];
-		if (isset($children[$tag]) xor $children[0])
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	/**
-	 * Checks if the $tag can be a child of $parent
-	 *
-	 * @param string $tag
-	 * @param string $parent
-	 * @return bool
-	 */
-	private function parent_allowed($tag, $parent)
-	{
-		$parents = &$this->tags[$tag]['parents'];
-		if (isset($parents[$parent]) xor $parents[0])
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	/**
-	 * Checks if any of $tag's attributes in $attributes are required.
-	 *
-	 * @param string $tag
-	 * @param string $attributes
-	 * @return bool
-	 */
-	private function has_required($tag, $attributes)
-	{
-		for ($i = 0, $n = sizeof($attributes); $i < $n; ++$i)
-		{
-			if (isset($this->tags[$tag]['attributes'][$attributes[$i]]['required']))
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-	
-	private function regex_quote($var)
-	{
-		return preg_quote($var, '~');
-	}
-	
-	public function set_flags($flags)
-	{
-		$this->flags = (int) $flags;
-	}
-}
diff --git a/phpBB/includes/captcha/captcha_factory.php b/phpBB/includes/captcha/captcha_factory.php
deleted file mode 100644
index 0f16e137ec..0000000000
--- a/phpBB/includes/captcha/captcha_factory.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
-*
-* @package VC
-* @version $Id: $
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (!interface_exists('phpbb_captcha_plugin'))
-{
-	include(PHPBB_ROOT_PATH . 'includes/captcha/captcha_plugin.' . PHP_EXT);
-}
-
-/**
-* A small class until we get the autoloader done
-*/
-class phpbb_captcha_factory
-{
-	/**
-	* return an instance of class $name in file $name_plugin.php
-	*/
-	public static function get_instance($name)
-	{
-		$name = basename($name);
-		if (!class_exists($name))
-		{
-			include(PHPBB_ROOT_PATH . "includes/captcha/plugins/{$name}_plugin." . PHP_EXT);
-		}
-		return call_user_func(array($name, 'get_instance'));
-	}
-
-	/**
-	* Call the garbage collector
-	*/
-	public static function garbage_collect($name)
-	{
-		$name = basename($name);
-		if (!class_exists($name))
-		{
-			include(PHPBB_ROOT_PATH . "includes/captcha/plugins/{$name}_plugin." . PHP_EXT);
-		}
-		call_user_func(array($name, 'garbage_collect'), 0);
-	}
-
-	/**
-	* return a list of all discovered CAPTCHA plugins
-	*/
-	public static function get_captcha_types()
-	{
-		$captchas = array(
-			'available'		=> array(),
-			'unavailable'	=> array(),
-		);
-
-		$dp = @opendir(PHPBB_ROOT_PATH . 'includes/captcha/plugins');
-
-		if ($dp)
-		{
-			while (($file = readdir($dp)) !== false)
-			{
-				if ((preg_match('#_plugin\.' . PHP_EXT . '$#', $file)))
-				{
-					$name = preg_replace('#^(.*?)_plugin\.' . PHP_EXT . '$#', '\1', $file);
-					if (!class_exists($name))
-					{
-						include(PHPBB_ROOT_PATH . "includes/captcha/plugins/$file");
-					}
-					if (call_user_func(array($name, 'is_available')))
-					{
-						$captchas['available'][$name] = call_user_func(array($name, 'get_name'));
-					}
-					else
-					{
-						$captchas['unavailable'][$name] = call_user_func(array($name, 'get_name'));
-					}
-				}
-			}
-			closedir($dp);
-		}
-
-		return $captchas;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/captcha/captcha_gd.php b/phpBB/includes/captcha/captcha_gd.php
deleted file mode 100644
index 9db4bea46f..0000000000
--- a/phpBB/includes/captcha/captcha_gd.php
+++ /dev/null
@@ -1,2636 +0,0 @@
-<?php
-/**
-*
-* @package VC
-* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Original Author - Xore (Robert Hetzler)
-* With contributions from Neothermic
-*
-* @package VC
-*/
-class captcha
-{
-	const width = 360;
-	const height = 96;
-
-	/**
-	* Create the image containing $code with a seed of $seed
-	*/
-	public static function execute($code, $seed)
-	{
-		srand($seed);
-		mt_srand($seed);
-
-		// Create image
-		$img = imagecreatetruecolor(self::width, self::height);
-
-		// Generate colours
-		$colour = new colour_manager($img, array(
-			'random'	=> true,
-			'min_value'	=> 60,
-		), 'hsv');
-
-		$scheme = $colour->colour_scheme('background', false);
-		$scheme = $colour->mono_range($scheme, 10, false);
-		shuffle($scheme);
-
-		$bg_colours = array_splice($scheme, mt_rand(6, 12));
-
-		// Generate code characters
-		$characters = $sizes = $bounding_boxes = $noise = array();
-		$width_avail = self::width - 15;
-		$code_len = strlen($code);
-
-		$captcha_bitmaps = self::captcha_bitmaps();
-		for ($i = 0; $i < $code_len; ++$i)
-		{
-			$characters[$i] = new char_cube3d($captcha_bitmaps, $code[$i]);
-
-			list($min, $max) = char_cube3d::range();
-			$sizes[$i] = mt_rand($min, $max);
-
-			$box = $characters[$i]->dimensions($sizes[$i]);
-			$width_avail -= ($box[2] - $box[0]);
-			$bounding_boxes[$i] = $box;
-		}
-
-
-		// Redistribute leftover x-space
-		$offset = array();
-		for ($i = 0; $i < $code_len; ++$i)
-		{
-			$denom = ($code_len - $i);
-			$denom = max(1.3, $denom);
-			$offset[$i] = mt_rand(0, (1.5 * $width_avail) / $denom);
-			$width_avail -= $offset[$i];
-		}
-
-		if (phpbb::$config['captcha_gd_x_grid'])
-		{
-			$grid = (int) phpbb::$config['captcha_gd_x_grid'];
-			for ($y = 0; $y < self::height; $y += mt_rand($grid - 2, $grid + 2))
-			{
-				$current_colour = $scheme[array_rand($scheme)];
-				imageline($img, mt_rand(0,4), mt_rand($y - 3, $y), mt_rand(self::width - 5, self::width), mt_rand($y - 3, $y), $current_colour);
-			}
-		}
-
-		if (phpbb::$config['captcha_gd_y_grid'])
-		{
-			$grid = (int) phpbb::$config['captcha_gd_y_grid'];
-			for ($x = 0; $x < self::width; $x += mt_rand($grid - 2, $grid + 2))
-			{
-				$current_colour = $scheme[array_rand($scheme)];
-				imagedashedline($img, mt_rand($x -3, $x + 3), mt_rand(0, 4), mt_rand($x -3, $x + 3), mt_rand(self::height - 5, self::height), $current_colour);
-			}
-		}
-
-		if (phpbb::$config['captcha_gd_wave'] && (phpbb::$config['captcha_gd_y_grid'] || phpbb::$config['captcha_gd_y_grid']))
-		{
-			self::wave($img);
-		}
-
-		if (phpbb::$config['captcha_gd_3d_noise'])
-		{
-			$xoffset = rand(0,9);
-			$noise_bitmaps = self::captcha_noise_bg_bitmaps();
-			for ($i = 0; $i < $code_len; ++$i)
-			{
-				$noise[$i] = new char_cube3d($noise_bitmaps, mt_rand(1, count($noise_bitmaps['data'])));
-
-				list($min, $max) = $noise[$i]->range();
-				//$box = $noise[$i]->dimensions($sizes[$i]);
-			}
-			$xoffset = 0;
-			for ($i = 0; $i < $code_len; ++$i)
-			{
-				$dimm = $bounding_boxes[$i];
-				$xoffset += ($offset[$i] - $dimm[0]);
-				$yoffset = mt_rand(-$dimm[1], self::height - $dimm[3]);
-
-				$noise[$i]->drawchar($sizes[$i], $xoffset, $yoffset, $img, $colour->get_resource('background'), $scheme);
-				$xoffset += $dimm[2];
-			}
-		}
-		$xoffset = 5;
-		for ($i = 0; $i < $code_len; ++$i)
-		{
-			$dimm = $bounding_boxes[$i];
-			$xoffset += ($offset[$i] - $dimm[0]);
-			$yoffset = mt_rand(-$dimm[1], self::height - $dimm[3]);
-
-			$characters[$i]->drawchar($sizes[$i], $xoffset, $yoffset, $img, $colour->get_resource('background'), $scheme);
-			$xoffset += $dimm[2];
-		}
-
-		if (phpbb::$config['captcha_gd_wave'])
-		{
-			self::wave($img);
-		}
-
-		if (phpbb::$config['captcha_gd_foreground_noise'])
-		{
-			self::noise_line($img, 0, 0, self::width, self::height, $colour->get_resource('background'), $scheme, $bg_colours);
-		}
-		// Send image
-		header('Content-Type: image/png');
-		header('Cache-control: no-cache, no-store');
-		imagepng($img);
-		imagedestroy($img);
-	}
-
-	/**
-	* Sinus
-	*/
-	private static function wave($img)
-	{
-		$period_x = mt_rand(12,18);
-		$period_y = mt_rand(7,14);
-		$amp_x = mt_rand(5,10);
-		$amp_y = mt_rand(2,4);
-		$socket = mt_rand(0,100);
-
-		$dampen_x = mt_rand(self::width/5, self::width/2);
-		$dampen_y = mt_rand(self::height/5, self::height/2);
-		$direction_x = (mt_rand (0, 1));
-		$direction_y = (mt_rand (0, 1));
-
-		for ($i = 0; $i < self::width; $i++)
-		{
-			$dir = ($direction_x) ? $i : (self::width - $i);
-			imagecopy($img, $img, $i-1, sin($socket+ $i/($period_x + $dir/$dampen_x)) * $amp_x, $i, 0, 1, self::height);
-		}
-		$socket = mt_rand(0,100);
-		for ($i = 0; $i < self::height; $i++)
-		{
-			$dir = ($direction_y) ? $i : (self::height - $i);
-			imagecopy($img, $img ,sin($socket + $i/($period_y + ($dir)/$dampen_y)) * $amp_y, $i-1, 0, $i, self::width, 1);
-		}
-		return $img;
-	}
-
-	/**
-	* Noise line
-	*/
-	private static function noise_line($img, $min_x, $min_y, $max_x, $max_y, $bg, $font, $non_font)
-	{
-		imagesetthickness($img, 2);
-
-		$x1 = $min_x;
-		$x2 = $max_x;
-		$y1 = $min_y;
-		$y2 = $min_y;
-
-		do
-		{
-			$line = array_merge(
-				array_fill(0, mt_rand(30, 60), $non_font[array_rand($non_font)]),
-				array_fill(0, mt_rand(30, 60), $bg)
-			);
-
-			imagesetstyle($img, $line);
-			imageline($img, $x1, $y1, $x2, $y2, IMG_COLOR_STYLED);
-
-			$y1 += mt_rand(12, 35);
-			$y2 += mt_rand(12, 35);
-		}
-		while ($y1 < $max_y && $y2 < $max_y);
-
-		$x1 = $min_x;
-		$x2 = $min_x;
-		$y1 = $min_y;
-		$y2 = $max_y;
-
-		do
-		{
-			$line = array_merge(
-				array_fill(0, mt_rand(30, 60), $non_font[array_rand($non_font)]),
-				array_fill(0, mt_rand(30, 60), $bg)
-			);
-
-			imagesetstyle($img, $line);
-			imageline($img, $x1, $y1, $x2, $y2, IMG_COLOR_STYLED);
-
-			$x1 += mt_rand(20, 35);
-			$x2 += mt_rand(20, 35);
-		}
-		while ($x1 < $max_x && $x2 < $max_x);
-		imagesetthickness($img, 1);
-	}
-
-
-	function captcha_noise_bg_bitmaps()
-	{
-		return array(
-			'width'		=> 15,
-			'height'	=> 5,
-			'data'		=> array(
-
-			1 => array(
-				array(1,0,0,0,1,0,0,0,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,1,0,0,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,1,0,0,0,0,0,0,1,0,0),
-				array(1,0,0,0,0,0,1,0,0,0,0,1,0,0,0),
-			),
-			2 => array(
-				array(1,1,mt_rand(0,1),1,0,1,1,1,1,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,1,0,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,0,0,1,1,0,1,1,1),
-			),
-			3 => array(
-				array(1,0,0,0,0,0,0,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,1,0,0,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,0,0,0,0,0,1,0),
-				array(1,0,0,0,0,0,0,0,0,0,0,0,0,0,1),
-			),
-			4 => array(
-				array(1,0,1,0,1,0,0,1,1,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,1,0,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-				array(1,0,1,0,0,0,0,0,0,0,0,0,0,0,0),
-			),
-			5 => array(
-				array(1,1,1,1,0,0,0,1,1,1,0,0,1,0,1),
-				array(0,0,0,0,0,0,0,1,0,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-				array(1,0,1,0,0,0,0,0,0,0,0,0,0,0,0),
-			),
-			6 => array(
-				array(mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),0,mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),0,mt_rand(0,1),mt_rand(0,1),mt_rand(0,1)),
-				array(0,0,0,0,0,0,0,mt_rand(0,1),0,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-				array(mt_rand(0,1),0,mt_rand(0,1),0,0,0,0,0,0,0,0,0,0,0,0),
-			),
-			7 => array(
-				array(0,0,0,0,0,0,0,0,0,0,1,1,0,1,1),
-				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-				array(0,0,1,1,0,0,0,1,0,0,0,0,0,0,0),
-				array(0,1,0,0,0,1,0,0,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-			),
-		));
-	}
-
-	/**
-	* Return bitmaps
-	*/
-	private static function captcha_bitmaps()
-	{
-		$chars = array(
-			'A'	=>	array(
-						array(
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,1,1,1,1,1,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,1,1,0,1,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,1,1,1,1,1,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,1,1,0,0,0,1,1,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,1,1,0,0,0,1,1,0),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,1,1),
-							array(0,0,0,0,0,1,1,1,1),
-							array(0,0,0,1,1,1,0,0,1),
-							array(0,1,1,1,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,1,0,0,0,0,1,1,1),
-							array(0,1,1,1,1,1,1,0,1),
-						),
-					),
-		'B'	=>		array(
-						array(
-							array(1,1,1,1,1,1,1,0,0),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,1,1,1,1,1,1,0,0),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,1,1,1,1,1,1,0,0),
-						),
-						array(
-							array(1,1,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,1,1,1,1,1,1,0,0),
-						),
-						array(
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,1,1,1,1,1,0,0),
-						),
-					),
-		'C'	=>		array(
-						array(
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,1,1,1,1,0,0),
-						),
-						array(
-							array(0,0,1,1,1,1,1,0,1),
-							array(0,1,0,0,0,0,0,1,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,1),
-							array(0,0,1,1,1,1,1,0,1),
-						),
-					),
-		'D'	=>		array(
-						array(
-							array(1,1,1,1,1,1,1,0,0),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,1,1,1,1,1,1,0,0),
-						),
-						array(
-							array(1,1,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,1,1,1,1,1,1,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,1,1,1,1,1,0,1),
-							array(0,1,1,0,0,0,1,1,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,1,0,0,0,1,1,1),
-							array(0,0,1,1,1,1,1,0,1),
-						),
-					),
-		'E'	=>		array(
-						array(
-							array(1,1,1,1,1,1,1,1,1),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,1,1,1,1,1,1,1,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,1,1,1,1,1,1,1,1),
-						),
-						array(
-							array(1,1,1,1,1,1,1,1,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,1,1,1,1,1,1,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,1,1,1,1,1,1,1,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,1,1,0,0,0,1,1,0),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,1,1,1,1,1,1,1),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(0,1,1,1,1,1,1,1,0),
-						),
-					),
-		'F'	=>		array(
-						array(
-							array(1,1,1,1,1,1,1,1,1),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,1,1,1,1,1,1,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-						),
-						array(
-							array(0,1,1,1,1,1,1,1,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(1,1,1,0,0,0,0,0,0),
-						),
-						array(
-							array(0,0,0,1,1,0,0,0,0),
-							array(0,0,1,1,0,0,0,0,0),
-							array(0,1,1,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(1,1,1,1,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-						),
-					),
-		'G'	=>		array(
-						array(
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,1,1,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,1,1,1,1,0,0),
-						),
-						array(
-							array(0,0,1,1,1,1,1,0,1),
-							array(0,1,0,0,0,0,0,1,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,1,1,1,1,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,1),
-							array(0,0,1,1,1,1,1,0,1),
-						),
-						array(
-							array(0,0,1,1,1,1,1,0,1),
-							array(0,1,1,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,1,1,0,0,0,0,0,1),
-							array(0,0,1,1,1,1,1,1,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,1,1),
-							array(1,1,1,1,1,1,1,1,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-						),
-					),
-		'H'	=>		array(
-						array(
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,1,1,1,1,1,1,1,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-						),
-						array(
-							array(1,1,1,0,0,0,1,1,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,1,1,1,1,1,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,1,1,0,0,0,1,1,1),
-						),
-						array(
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,1,1,1,0,0,0),
-							array(1,1,1,1,0,1,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-						),
-					),
-		'I'	=>		array(
-						array(
-							array(1,1,1,1,1,1,1,1,1),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(1,1,1,1,1,1,1,1,1),
-						),
-						array(
-							array(0,0,0,1,1,1,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,1,1,1,0,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,1,1,1,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,1,1,1,0,0,0),
-						),
-					),
-		'J'	=>		array(
-						array(
-							array(1,1,1,1,1,1,1,1,1),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(1,0,0,0,0,1,0,0,0),
-							array(1,0,0,0,0,1,0,0,0),
-							array(0,1,0,0,1,0,0,0,0),
-							array(0,0,1,1,0,0,0,0,0),
-						),
-						array(
-							array(1,1,1,1,1,1,1,1,1),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(1,0,0,0,0,1,0,0,0),
-							array(1,0,0,0,0,1,0,0,0),
-							array(1,1,0,0,1,0,0,0,0),
-							array(1,0,1,1,0,0,0,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(1,0,0,0,0,1,0,0,0),
-							array(1,0,0,0,0,1,0,0,0),
-							array(0,1,0,0,1,0,0,0,0),
-							array(0,0,1,1,0,0,0,0,0),
-						),
-					),
-		'K'	=>		array(
-						array(    // New 'K', supplied by NeoThermic
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,1,0,0,0),
-							array(1,0,0,0,1,0,0,0,0),
-							array(1,0,0,1,0,0,0,0,0),
-							array(1,0,1,0,0,0,0,0,0),
-							array(1,1,0,0,0,0,0,0,0),
-							array(1,0,1,0,0,0,0,0,0),
-							array(1,0,0,1,0,0,0,0,0),
-							array(1,0,0,0,1,0,0,0,0),
-							array(1,0,0,0,0,1,0,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-						),
-						array(
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,1,0,0),
-							array(0,1,0,0,0,1,0,0,0),
-							array(0,1,0,0,1,0,0,0,0),
-							array(0,1,0,1,0,0,0,0,0),
-							array(0,1,1,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,1,0,0,0,0,0,0),
-							array(0,1,0,1,0,0,0,0,0),
-							array(0,1,0,0,1,0,0,0,0),
-							array(0,1,0,0,0,1,0,0,0),
-							array(0,1,0,0,0,0,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,1,1,0,0,0,1,1,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,1,0,0,0),
-							array(0,1,0,0,1,0,0,0,0),
-							array(0,1,0,1,0,0,0,0,0),
-							array(0,1,1,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,1,0,0,0,0,0,0),
-							array(0,1,0,1,0,0,0,0,0),
-							array(0,1,0,0,1,0,0,0,0),
-							array(0,1,0,0,0,1,0,0,0),
-							array(0,1,0,0,0,0,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-						),
-					),
-		'L'	=>		array(
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,1,1,1,1,1,1,1,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,1),
-							array(1,1,1,1,1,1,1,1,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,1,0,0,0,0,0,0),
-							array(0,0,1,1,1,0,0,0,0),
-						),
-					),
-		'M'	=>		array(
-						array(
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,0,1,0,0,0,1,0,1),
-							array(1,0,1,0,0,0,1,0,1),
-							array(1,0,1,0,0,0,1,0,1),
-							array(1,0,0,1,0,1,0,0,1),
-							array(1,0,0,1,0,1,0,0,1),
-							array(1,0,0,1,0,1,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,1,0,0,0,1,1,0),
-							array(0,1,1,0,0,0,1,1,0),
-							array(0,1,1,0,0,0,1,1,0),
-							array(0,1,0,1,0,1,0,1,0),
-							array(0,1,0,1,0,1,0,1,0),
-							array(0,1,0,1,0,1,0,1,0),
-							array(0,1,0,0,1,0,0,1,0),
-							array(0,1,0,0,1,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,1,1,0,0,0,1,1,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,1,1,1,0,1,1,1,0),
-							array(1,1,0,1,1,1,0,1,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-						),
-					),
-		'N'	=>		array(
-						array(
-							array(1,1,0,0,0,0,0,0,1),
-							array(1,1,0,0,0,0,0,0,1),
-							array(1,0,1,0,0,0,0,0,1),
-							array(1,0,1,0,0,0,0,0,1),
-							array(1,0,0,1,0,0,0,0,1),
-							array(1,0,0,1,0,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,0,1,0,0,1),
-							array(1,0,0,0,0,1,0,0,1),
-							array(1,0,0,0,0,0,1,0,1),
-							array(1,0,0,0,0,0,1,0,1),
-							array(1,0,0,0,0,0,0,1,1),
-							array(1,0,0,0,0,0,0,1,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,1,0,0,0,0,1,0),
-							array(0,1,1,0,0,0,0,1,0),
-							array(0,1,1,0,0,0,0,1,0),
-							array(0,1,0,1,0,0,0,1,0),
-							array(0,1,0,1,0,0,0,1,0),
-							array(0,1,0,1,0,0,0,1,0),
-							array(0,1,0,0,1,0,0,1,0),
-							array(0,1,0,0,1,1,0,1,0),
-							array(0,1,0,0,0,1,0,1,0),
-							array(0,1,0,0,0,1,1,1,0),
-							array(0,1,0,0,0,0,1,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,1,1,0,0,0,1,1,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(1,0,1,1,1,1,0,0,0),
-							array(1,1,1,0,0,1,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-						),
-					),
-		'O'	=>		array(
-						array(
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,1,1,1,1,0,0),
-						),
-						array(
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,1,1,1,1,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,1,1,1,1,1,0,0,0),
-							array(1,1,1,0,0,1,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,1,0,0,0,1,1,0,0),
-							array(0,1,1,1,1,1,0,0,0),
-						),
-					),
-		'P'	=>		array(
-						array(
-							array(1,1,1,1,1,1,1,0,0),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,1,1,1,1,1,1,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-						),
-						array(
-							array(1,1,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,1,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(1,1,1,0,0,0,0,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,1,1,0,0,0,0,0),
-							array(1,1,0,1,1,0,0,0,0),
-							array(1,0,0,0,1,0,0,0,0),
-							array(1,0,0,0,1,0,0,0,0),
-							array(1,0,0,1,1,0,0,0,0),
-							array(1,1,1,1,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-						),
-					),
-		'Q'	=>		array(
-						array(
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,1,0,0,1),
-							array(1,0,0,0,0,0,1,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,1,1,1,1,0,1),
-						),
-						array(
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,1,0,0,1,1,0,1,1),
-							array(0,1,1,1,1,1,1,1,0),
-							array(0,0,0,0,0,0,1,1,0),
-							array(0,0,0,0,0,0,0,1,1),
-							array(0,0,0,0,0,0,0,0,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,1,1,1,1),
-							array(0,0,0,0,1,1,0,0,1),
-							array(0,0,0,0,1,0,0,0,1),
-							array(0,0,0,0,1,0,0,0,1),
-							array(0,0,0,0,1,1,0,1,1),
-							array(0,0,0,0,0,1,1,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-						),
-					),
-		'R'	=>		array(
-						array(
-							array(1,1,1,1,1,1,1,0,0),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,1,1,1,1,1,1,0,0),
-							array(1,1,1,0,0,0,0,0,0),
-							array(1,0,0,1,0,0,0,0,0),
-							array(1,0,0,0,1,0,0,0,0),
-							array(1,0,0,0,0,1,0,0,0),
-							array(1,0,0,0,0,0,1,0,0),
-							array(1,0,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-						),
-						array(
-							array(1,1,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,1,1,1,1,1,1,0,0),
-							array(0,1,1,0,0,0,0,0,0),
-							array(0,1,1,1,0,0,0,0,0),
-							array(0,1,0,1,1,0,0,0,0),
-							array(0,1,0,0,1,1,0,0,0),
-							array(0,1,0,0,0,1,1,0,0),
-							array(0,1,0,0,0,0,1,1,0),
-							array(1,1,1,0,0,0,1,1,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,1,1,1,1,0,0,0,0),
-							array(1,1,0,0,1,1,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-						),
-					),
-		'S'	=>		array(
-						array(
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,0,0,0,0,0,0,1,0),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,1,1,1,1,0,0),
-						),
-						array(
-							array(0,0,1,1,1,1,1,0,1),
-							array(0,1,0,0,0,0,0,1,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,0,0,0,0,0,0,1,0),
-							array(0,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,1,0,0,0,0,0,1,0),
-							array(1,0,1,1,1,1,1,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,1,1,1,1,0,0,0,0),
-							array(1,0,0,0,0,1,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,1,0,0,0,0,0,0,0),
-							array(0,1,1,1,1,0,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(1,0,0,0,1,1,0,0,0),
-							array(0,1,1,1,1,0,0,0,0),
-						),
-					),
-		'T'	=>		array(
-						array(
-							array(1,1,1,1,1,1,1,1,1),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-						),
-						array(
-							array(1,1,1,1,1,1,1,1,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,1,1,1,0,0,0),
-						),
-						array(
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,1,1,1,1,1,1,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,1,0,0,0),
-							array(0,0,0,0,0,1,1,1,0),
-						),
-					),
-		'U'	=>		array(
-						array(
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,1,1,1,1,0,0),
-						),
-						array(
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,1,1,0,0,0,1,1,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,1,0,0,0,1,1,0),
-							array(0,0,1,1,1,1,1,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,1,0,0,0,0,0,1),
-							array(0,0,1,0,0,0,0,0,1),
-							array(0,0,1,0,0,0,0,0,1),
-							array(0,0,1,0,0,0,0,0,1),
-							array(0,0,1,0,0,0,0,0,1),
-							array(0,0,1,0,0,0,0,1,1),
-							array(0,0,1,1,0,0,1,1,1),
-							array(0,0,0,1,1,1,1,0,1),
-						),
-					),
-		'V'	=>		array(
-						array(
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(1,1,1,0,0,0,1,1,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-						),
-					),
-		'W'	=>		array(
-						array(
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,0,1,0,0,0,1),
-							array(1,0,0,1,0,1,0,0,1),
-							array(1,0,0,1,0,1,0,0,1),
-							array(1,0,0,1,0,1,0,0,1),
-							array(1,0,1,0,0,0,1,0,1),
-							array(1,0,1,0,0,0,1,0,1),
-							array(1,0,1,0,0,0,1,0,1),
-							array(1,1,0,0,0,0,0,1,1),
-							array(1,1,0,0,0,0,0,1,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(1,1,1,0,0,0,1,1,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,1,0,0,1,0),
-							array(0,1,0,0,1,0,0,1,0),
-							array(0,1,0,1,1,1,0,1,0),
-							array(0,1,0,1,0,1,0,1,0),
-							array(0,1,1,1,0,1,1,1,0),
-							array(0,1,1,0,0,0,1,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,0,0,0,0,0,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,1,0,0,1,0),
-							array(0,1,0,0,1,0,0,1,0),
-							array(0,1,0,1,1,1,0,1,0),
-							array(0,1,0,1,0,1,0,1,0),
-							array(0,1,1,1,0,1,1,1,0),
-							array(0,1,1,0,0,0,1,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,0,0,0,0,0,0,0),
-						),
-					),
-		'X'	=>		array(
-						array(
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,1,0,0,0,0,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(1,1,1,0,0,0,1,1,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,1,0,0,0,0,1,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(1,1,1,0,0,0,1,1,1),
-							array(0,0,0,0,0,0,0,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,1,0,0,0,1,1,0),
-							array(0,0,1,1,0,1,1,0,0),
-							array(0,0,0,1,1,1,0,0,0),
-							array(0,0,0,1,1,1,0,0,0),
-							array(0,0,1,1,0,1,1,0,0),
-							array(0,1,1,0,0,0,1,1,0),
-							array(0,0,0,0,0,0,0,0,0),
-						),
-					),
-		'Y'	=>		array(
-						array(
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(1,1,1,0,0,0,1,1,1),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,1,0,0,0,0,0,1,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,1,0,0,0,1,0,0),
-							array(0,0,0,1,0,1,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,1,1,1,0,0,0),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,1,0,0,0,0,1),
-							array(0,0,0,1,1,0,0,0,1),
-							array(0,0,0,0,1,0,0,1,1),
-							array(0,0,0,0,1,1,0,1,0),
-							array(0,0,0,0,0,1,1,1,0),
-							array(0,0,0,0,0,0,1,0,0),
-							array(0,0,0,0,0,1,1,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,1,1,0,0,0),
-							array(0,0,1,1,1,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-						),
-					),
-		'Z'	=>		array(
-						array(
-							array(1,1,1,1,1,1,1,1,1),
-							array(1,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,1,0),
-							array(0,0,0,0,0,0,1,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,1,0,0,0,0),
-							array(0,0,0,1,0,0,0,0,0),
-							array(0,0,0,1,0,0,0,0,0),
-							array(0,0,1,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,1),
-							array(1,1,1,1,1,1,1,1,1),
-						),
-						array(
-							array(1,1,1,1,1,1,1,1,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,0,1),
-							array(0,0,0,0,0,0,0,1,0),
-							array(0,0,0,0,0,0,1,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,0,0,0,1,0,0,0),
-							array(0,0,1,1,1,1,1,0,0),
-							array(0,0,0,1,0,0,0,0,0),
-							array(0,0,0,1,0,0,0,0,0),
-							array(0,0,1,0,0,0,0,0,0),
-							array(0,1,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,0,0,0,0,0,0,0,0),
-							array(1,1,1,1,1,1,1,1,1),
-						),
-						array(
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,0,0,0,0,0,0,0,0),
-							array(0,1,1,1,1,1,1,1,0),
-							array(0,0,0,0,0,1,1,0,0),
-							array(0,0,0,0,1,1,0,0,0),
-							array(0,0,0,1,1,0,0,0,0),
-							array(0,0,1,1,0,0,0,0,0),
-							array(0,0,1,0,0,0,0,0,0),
-							array(0,1,1,1,1,1,1,1,0),
-						),
-					),
-				);
-		return array(
-			'width'		=> 9,
-			'height'	=> 15,
-			'data'		=> array(
-
-			'A' =>	$chars['A'][mt_rand(0, min(count($chars['A']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'B' =>	$chars['B'][mt_rand(0, min(count($chars['B']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'C' =>	$chars['C'][mt_rand(0, min(count($chars['C']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'D' =>	$chars['D'][mt_rand(0, min(count($chars['D']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'E' =>	$chars['E'][mt_rand(0, min(count($chars['E']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'F' =>	$chars['F'][mt_rand(0, min(count($chars['F']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'G' =>	$chars['G'][mt_rand(0, min(count($chars['G']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'H' =>	$chars['H'][mt_rand(0, min(count($chars['H']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'I' =>	$chars['I'][mt_rand(0, min(count($chars['I']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'J' =>	$chars['J'][mt_rand(0, min(count($chars['J']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'K' =>	$chars['K'][mt_rand(0, min(count($chars['K']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'L' =>	$chars['L'][mt_rand(0, min(count($chars['L']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'M' =>	$chars['M'][mt_rand(0, min(count($chars['M']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'N' =>	$chars['N'][mt_rand(0, min(count($chars['N']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'O' =>	$chars['O'][mt_rand(0, min(count($chars['O']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'P' =>	$chars['P'][mt_rand(0, min(count($chars['P']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'Q' =>	$chars['Q'][mt_rand(0, min(count($chars['Q']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'R' =>	$chars['R'][mt_rand(0, min(count($chars['R']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'S' =>	$chars['S'][mt_rand(0, min(count($chars['S']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'T' =>	$chars['T'][mt_rand(0, min(count($chars['T']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'U' =>	$chars['U'][mt_rand(0, min(count($chars['U']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'V' =>	$chars['V'][mt_rand(0, min(count($chars['V']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'W' =>	$chars['W'][mt_rand(0, min(count($chars['W']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'X' =>	$chars['X'][mt_rand(0, min(count($chars['X']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'Y' =>	$chars['Y'][mt_rand(0, min(count($chars['Y']), phpbb::$config['captcha_gd_fonts']) -1)],
-			'Z' =>	$chars['Z'][mt_rand(0, min(count($chars['Z']), phpbb::$config['captcha_gd_fonts']) -1)],
-
-			'1' => array(
-				array(0,0,0,1,1,0,0,0,0),
-				array(0,0,1,0,1,0,0,0,0),
-				array(0,1,0,0,1,0,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,1,1,1,1,1,1,1,0),
-			),
-			'2' => array(    // New '2' supplied by Anon
-				array(0,0,0,1,1,1,0,0,0),
-				array(0,0,1,0,0,0,1,0,0),
-				array(0,1,0,0,0,0,1,1,0),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,1,1),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,0,1,0,0),
-				array(0,0,0,0,0,1,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,1,0,0,0,0,0),
-				array(0,0,1,0,0,0,0,0,0),
-				array(0,1,0,0,0,0,0,0,0),
-				array(1,1,1,1,1,1,1,1,1),
-				array(0,0,0,0,0,0,0,0,0),
-			),
-			'3' => array(
-				array(0,0,1,1,1,1,1,0,0),
-				array(0,1,0,0,0,0,0,1,0),
-				array(1,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,1,1,0,0),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(0,1,0,0,0,0,0,1,0),
-				array(0,0,1,1,1,1,1,0,0),
-			),
-			'4' => array(
-				array(0,0,0,0,0,0,1,1,0),
-				array(0,0,0,0,0,1,0,1,0),
-				array(0,0,0,0,1,0,0,1,0),
-				array(0,0,0,1,0,0,0,1,0),
-				array(0,0,1,0,0,0,0,1,0),
-				array(0,1,0,0,0,0,0,1,0),
-				array(1,0,0,0,0,0,0,1,0),
-				array(1,0,0,0,0,0,0,1,0),
-				array(1,1,1,1,1,1,1,1,1),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,0,0,1,0),
-			),
-			'5' => array(
-				array(1,1,1,1,1,1,1,1,1),
-				array(1,0,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,0,0,0,0),
-				array(0,1,0,0,0,0,0,0,0),
-				array(0,0,1,1,1,1,1,0,0),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(0,1,0,0,0,0,0,1,0),
-				array(0,0,1,1,1,1,1,0,0),
-			),
-			'6' => array(
-				array(0,0,1,1,1,1,1,0,0),
-				array(0,1,0,0,0,0,0,1,0),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,0,0,0,0),
-				array(1,0,0,1,1,1,1,0,0),
-				array(1,0,1,0,0,0,0,1,0),
-				array(1,1,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(0,1,0,0,0,0,0,1,0),
-				array(0,0,1,1,1,1,1,0,0),
-			),
-			'7' => array(
-				array(1,1,1,1,1,1,1,1,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,0,1,0,0),
-				array(0,0,0,0,0,1,0,0,0),
-				array(0,0,0,0,0,1,0,0,0),
-				array(0,0,0,0,1,0,0,0,0),
-				array(0,0,0,1,0,0,0,0,0),
-				array(0,0,0,1,0,0,0,0,0),
-				array(0,0,1,0,0,0,0,0,0),
-				array(0,1,0,0,0,0,0,0,0),
-				array(0,1,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,0,0,0,0),
-			),
-			'8' => array(
-				array(0,0,1,1,1,1,1,0,0),
-				array(0,1,0,0,0,0,0,1,0),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(0,1,0,0,0,0,0,1,0),
-				array(0,0,1,1,1,1,1,0,0),
-				array(0,1,0,0,0,0,0,1,0),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(0,1,0,0,0,0,0,1,0),
-				array(0,0,1,1,1,1,1,0,0),
-			),
-			'9' => array(
-				array(0,0,1,1,1,1,1,0,0),
-				array(0,1,0,0,0,0,0,1,0),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,1,1),
-				array(0,1,0,0,0,0,1,0,1),
-				array(0,0,1,1,1,1,0,0,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(0,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(1,0,0,0,0,0,0,0,1),
-				array(0,1,0,0,0,0,0,1,0),
-				array(0,0,1,1,1,1,1,0,0),
-			),
-			)
-		);
-	}
-}
-
-/**
-* @package VC
-*/
-class char_cube3d
-{
-	private $bitmap;
-	private $bitmap_width;
-	private $bitmap_height;
-
-	private $basis_matrix = array(array(1, 0, 0), array(0, 1, 0), array(0, 0, 1));
-	private $abs_x = array(1, 0);
-	private $abs_y = array(0, 1);
-	private $x = 0;
-	private $y = 1;
-	private $z = 2;
-	private $letter = '';
-
-	/**
-	*/
-	function __construct(&$bitmaps, $letter)
-	{
-		$this->bitmap			= $bitmaps['data'][$letter];
-		$this->bitmap_width		= $bitmaps['width'];
-		$this->bitmap_height	= $bitmaps['height'];
-
-		$this->basis_matrix[0][0] = mt_rand(-600, 600);
-		$this->basis_matrix[0][1] = mt_rand(-600, 600);
-		$this->basis_matrix[0][2] = (mt_rand(0, 1) * 2000) - 1000;
-		$this->basis_matrix[1][0] = mt_rand(-1000, 1000);
-		$this->basis_matrix[1][1] = mt_rand(-1000, 1000);
-		$this->basis_matrix[1][2] = mt_rand(-1000, 1000);
-
-		$this->normalize($this->basis_matrix[0]);
-		$this->normalize($this->basis_matrix[1]);
-		$this->basis_matrix[2] = $this->cross_product($this->basis_matrix[0], $this->basis_matrix[1]);
-		$this->normalize($this->basis_matrix[2]);
-
-		// $this->basis_matrix[1] might not be (probably isn't) orthogonal to $basis_matrix[0]
-		$this->basis_matrix[1] = $this->cross_product($this->basis_matrix[0], $this->basis_matrix[2]);
-		$this->normalize($this->basis_matrix[1]);
-
-		// Make sure our cube is facing into the canvas (assuming +z == in)
-		for ($i = 0; $i < 3; ++$i)
-		{
-			if ($this->basis_matrix[$i][2] < 0)
-			{
-				$this->basis_matrix[$i][0] *= -1;
-				$this->basis_matrix[$i][1] *= -1;
-				$this->basis_matrix[$i][2] *= -1;
-			}
-		}
-
-		// Force our "z" basis vector to be the one with greatest absolute z value
-		$this->x = 0;
-		$this->y = 1;
-		$this->z = 2;
-
-		// Swap "y" with "z"
-		if ($this->basis_matrix[1][2] > $this->basis_matrix[2][2])
-		{
-			$this->z = 1;
-			$this->y = 2;
-		}
-
-		// Swap "x" with "z"
-		if ($this->basis_matrix[0][2] > $this->basis_matrix[$this->z][2])
-		{
-			$this->x = $this->z;
-			$this->z = 0;
-		}
-
-		// Still need to determine which of $x,$y are which.
-		// wrong orientation if y's y-component is less than it's x-component
-		// likewise if x's x-component is less than it's y-component
-		// if they disagree, go with the one with the greater weight difference.
-		// rotate if positive
-		$weight = (abs($this->basis_matrix[$this->x][1]) - abs($this->basis_matrix[$this->x][0])) + (abs($this->basis_matrix[$this->y][0]) - abs($this->basis_matrix[$this->y][1]));
-
-		// Swap "x" with "y"
-		if ($weight > 0)
-		{
-			list($this->x, $this->y) = array($this->y, $this->x);
-		}
-
-		$this->abs_x = array($this->basis_matrix[$this->x][0], $this->basis_matrix[$this->x][1]);
-		$this->abs_y = array($this->basis_matrix[$this->y][0], $this->basis_matrix[$this->y][1]);
-
-		if ($this->abs_x[0] < 0)
-		{
-			$this->abs_x[0] *= -1;
-			$this->abs_x[1] *= -1;
-		}
-
-		if ($this->abs_y[1] > 0)
-		{
-			$this->abs_y[0] *= -1;
-			$this->abs_y[1] *= -1;
-		}
-
-		$this->letter = $letter;
-	}
-
-	/**
-	* Draw a character
-	*/
-	public function drawchar($scale, $xoff, $yoff, $img, $background, $colours)
-	{
-		$width	= $this->bitmap_width;
-		$height	= $this->bitmap_height;
-		$bitmap	= $this->bitmap;
-
-		$colour1 = $colours[array_rand($colours)];
-		$colour2 = $colours[array_rand($colours)];
-
-		$swapx = ($this->basis_matrix[$this->x][0] > 0);
-		$swapy = ($this->basis_matrix[$this->y][1] < 0);
-
-		for ($y = 0; $y < $height; ++$y)
-		{
-			for ($x = 0; $x < $width; ++$x)
-			{
-				$xp = ($swapx) ? ($width - $x - 1) : $x;
-				$yp = ($swapy) ? ($height - $y - 1) : $y;
-
-				if ($bitmap[$height - $yp - 1][$xp])
-				{
-					$dx = $this->scale($this->abs_x, ($xp - ($swapx ? ($width / 2) : ($width / 2) - 1)) * $scale);
-					$dy = $this->scale($this->abs_y, ($yp - ($swapy ? ($height / 2) : ($height / 2) - 1)) * $scale);
-					$xo = $xoff + $dx[0] + $dy[0];
-					$yo = $yoff + $dx[1] + $dy[1];
-
-					$origin = array(0, 0, 0);
-					$xvec = $this->scale($this->basis_matrix[$this->x], $scale);
-					$yvec = $this->scale($this->basis_matrix[$this->y], $scale);
-					$face_corner = self::sum2($xvec, $yvec);
-
-					$zvec = $this->scale($this->basis_matrix[$this->z], $scale);
-					$x_corner = self::sum2($xvec, $zvec);
-					$y_corner = self::sum2($yvec, $zvec);
-
-					imagefilledpolygon($img, self::gen_poly($xo, $yo, $origin, $xvec, $x_corner,$zvec), 4, $colour1);
-					imagefilledpolygon($img, self::gen_poly($xo, $yo, $origin, $yvec, $y_corner,$zvec), 4, $colour2);
-
-					$face = self::gen_poly($xo, $yo, $origin, $xvec, $face_corner, $yvec);
-
-					imagefilledpolygon($img, $face, 4, $background);
-					imagepolygon($img, $face, 4, $colour1);
-				}
-			}
-		}
-	}
-
-	/*
-	* return a roughly acceptable range of sizes for rendering with this texttype
-	*/
-	public static function range()
-	{
-		return array(3, 4);
-	}
-
-	/**
-	* Vector length
-	*/
-	private static function vectorlen($vector)
-	{
-		return sqrt(pow($vector[0], 2) + pow($vector[1], 2) + pow($vector[2], 2));
-	}
-
-	/**
-	* Normalize
-	*/
-	private static function normalize(&$vector, $length = 1)
-	{
-		$length = (( $length < 1) ? 1 : $length);
-		$length /= self::vectorlen($vector);
-		$vector[0] *= $length;
-		$vector[1] *= $length;
-		$vector[2] *= $length;
-	}
-
-	/**
-	*/
-	private static function cross_product($vector1, $vector2)
-	{
-		$retval = array(0, 0, 0);
-		$retval[0] =  (($vector1[1] * $vector2[2]) - ($vector1[2] * $vector2[1]));
-		$retval[1] = -(($vector1[0] * $vector2[2]) - ($vector1[2] * $vector2[0]));
-		$retval[2] =  (($vector1[0] * $vector2[1]) - ($vector1[1] * $vector2[0]));
-
-		return $retval;
-	}
-
-	/**
-	*/
-	private static function sum($vector1, $vector2)
-	{
-		return array($vector1[0] + $vector2[0], $vector1[1] + $vector2[1], $vector1[2] + $vector2[2]);
-	}
-
-	/**
-	*/
-	private static function sum2($vector1, $vector2)
-	{
-		return array($vector1[0] + $vector2[0], $vector1[1] + $vector2[1]);
-	}
-
-	/**
-	*/
-	private static function scale($vector, $length)
-	{
-		if (sizeof($vector) == 2)
-		{
-			return array($vector[0] * $length, $vector[1] * $length);
-		}
-
-		return array($vector[0] * $length, $vector[1] * $length, $vector[2] * $length);
-	}
-
-	/**
-	*/
-	private static function gen_poly($xoff, $yoff, &$vec1, &$vec2, &$vec3, &$vec4)
-	{
-		$poly = array();
-		$poly[0] = $xoff + $vec1[0];
-		$poly[1] = $yoff + $vec1[1];
-		$poly[2] = $xoff + $vec2[0];
-		$poly[3] = $yoff + $vec2[1];
-		$poly[4] = $xoff + $vec3[0];
-		$poly[5] = $yoff + $vec3[1];
-		$poly[6] = $xoff + $vec4[0];
-		$poly[7] = $yoff + $vec4[1];
-
-		return $poly;
-	}
-
-	/**
-	* dimensions
-	*/
-	public function dimensions($size)
-	{
-		$xn = $this->scale($this->basis_matrix[$this->x], -($this->bitmap_width / 2) * $size);
-		$xp = $this->scale($this->basis_matrix[$this->x], ($this->bitmap_width / 2) * $size);
-		$yn = $this->scale($this->basis_matrix[$this->y], -($this->bitmap_height / 2) * $size);
-		$yp = $this->scale($this->basis_matrix[$this->y], ($this->bitmap_height / 2) * $size);
-
-		$p = array();
-		$p[0] = self::sum2($xn, $yn);
-		$p[1] = self::sum2($xp, $yn);
-		$p[2] = self::sum2($xp, $yp);
-		$p[3] = self::sum2($xn, $yp);
-
-		$min_x = $max_x = $p[0][0];
-		$min_y = $max_y = $p[0][1];
-
-		for ($i = 1; $i < 4; ++$i)
-		{
-			$min_x = ($min_x > $p[$i][0]) ? $p[$i][0] : $min_x;
-			$min_y = ($min_y > $p[$i][1]) ? $p[$i][1] : $min_y;
-			$max_x = ($max_x < $p[$i][0]) ? $p[$i][0] : $max_x;
-			$max_y = ($max_y < $p[$i][1]) ? $p[$i][1] : $max_y;
-		}
-
-		return array($min_x, $min_y, $max_x, $max_y);
-	}
-}
-
-/**
-* @package VC
-*/
-class colour_manager
-{
-	private $img;
-	private $mode;
-	private $colours;
-	private $named_colours;
-
-	/**
-	* Create the colour manager, link it to the image resource
-	*/
-	function __construct($img, $background = false, $mode = 'ahsv')
-	{
-		$this->img = $img;
-		$this->mode = $mode;
-		$this->colours = array();
-		$this->named_colours = array();
-
-		if ($background !== false)
-		{
-			$bg = $this->allocate_named('background', $background);
-			imagefill($this->img, 0, 0, $bg);
-		}
-	}
-
-	/**
-	* Lookup a named colour resource
-	*/
-	public function get_resource($named_colour)
-	{
-		if (isset($this->named_colours[$named_colour]))
-		{
-			return $this->named_colours[$named_colour];
-		}
-
-		if (isset($this->named_rgb[$named_colour]))
-		{
-			return $this->allocate_named($named_colour, $this->named_rgb[$named_colour], 'rgb');
-		}
-
-		return false;
-	}
-
-	/**
-	* Assign a name to a colour resource
-	*/
-	private function name_colour($name, $resource)
-	{
-		$this->named_colours[$name] = $resource;
-	}
-
-	/**
-	* names and allocates a colour resource
-	*/
-	private function allocate_named($name, $colour, $mode = false)
-	{
-		$resource = $this->allocate($colour, $mode);
-
-		if ($resource !== false)
-		{
-			$this->name_colour($name, $resource);
-		}
-		return $resource;
-	}
-
-	/**
-	* allocates a specified colour into the image
-	*/
-	private function allocate($colour, $mode = false)
-	{
-		if ($mode === false)
-		{
-			$mode = $this->mode;
-		}
-
-		if (!is_array($colour))
-		{
-			if (isset($this->named_rgb[$colour]))
-			{
-				return $this->allocate_named($colour, $this->named_rgb[$colour], 'rgb');
-			}
-
-			if (!is_int($colour))
-			{
-				return false;
-			}
-
-			$mode = 'rgb';
-			$colour = array(255 & ($colour >> 16), 255 & ($colour >>  8), 255 & $colour);
-		}
-
-		if (isset($colour['mode']))
-		{
-			$mode = $colour['mode'];
-			unset($colour['mode']);
-		}
-
-		if (isset($colour['random']))
-		{
-			unset($colour['random']);
-			// everything else is params
-			return $this->random_colour($colour, $mode);
-		}
-
-		$rgb		= colour_manager::model_convert($colour, $mode, 'rgb');
-		$store		= ($this->mode == 'rgb') ? $rgb : colour_manager::model_convert($colour, $mode, $this->mode);
-		$resource	= imagecolorallocate($this->img, $rgb[0], $rgb[1], $rgb[2]);
-		$this->colours[$resource] = $store;
-
-		return $resource;
-	}
-
-	/**
-	* randomly generates a colour, with optional params
-	*/
-	private function random_colour($params = array(), $mode = false)
-	{
-		if ($mode === false)
-		{
-			$mode = $this->mode;
-		}
-
-		switch ($mode)
-		{
-			case 'rgb':
-				// @TODO random rgb generation. do we intend to do this, or is it just too tedious?
-			break;
-
-			case 'ahsv':
-			case 'hsv':
-			default:
-
-				$default_params = array(
-					'hue_bias'			=> false,	// degree / 'r'/'g'/'b'/'c'/'m'/'y'   /'o'
-					'hue_range'			=> false,	// if hue bias, then difference range +/- from bias
-					'min_saturation'	=> 30,		// 0 - 100
-					'max_saturation'	=> 80,		// 0 - 100
-					'min_value'			=> 30,		// 0 - 100
-					'max_value'			=> 80,		// 0 - 100
-				);
-
-				$alt = ($mode == 'ahsv') ? true : false;
-				$params = array_merge($default_params, $params);
-
-				$min_hue		= 0;
-				$max_hue		= 359;
-				$min_saturation	= max(0, $params['min_saturation']);
-				$max_saturation	= min(100, $params['max_saturation']);
-				$min_value		= max(0, $params['min_value']);
-				$max_value		= min(100, $params['max_value']);
-
-				if ($params['hue_bias'] !== false)
-				{
-					if (is_numeric($params['hue_bias']))
-					{
-						$h = intval($params['hue_bias']) % 360;
-					}
-					else
-					{
-						switch ($params['hue_bias'])
-						{
-							case 'o':
-								$h = $alt ?  60 :  30;
-							break;
-
-							case 'y':
-								$h = $alt ? 120 :  60;
-							break;
-
-							case 'g':
-								$h = $alt ? 180 : 120;
-							break;
-
-							case 'c':
-								$h = $alt ? 210 : 180;
-							break;
-
-							case 'b':
-								$h = 240;
-							break;
-
-							case 'm':
-								$h = 300;
-							break;
-
-							case 'r':
-							default:
-								$h = 0;
-							break;
-						}
-					}
-
-					$min_hue = $h + 360;
-					$max_hue = $h + 360;
-
-					if ($params['hue_range'])
-					{
-						$min_hue -= min(180, $params['hue_range']);
-						$max_hue += min(180, $params['hue_range']);
-					}
-				}
-
-				$h = mt_rand($min_hue, $max_hue);
-				$s = mt_rand($min_saturation, $max_saturation);
-				$v = mt_rand($min_value, $max_value);
-
-				return $this->allocate(array($h, $s, $v), $mode);
-
-			break;
-		}
-	}
-
-	/**
-	*/
-	public function colour_scheme($resource, $include_original = true)
-	{
-		$mode = 'hsv';
-
-		if (($pre = $this->get_resource($resource)) !== false)
-		{
-			$resource = $pre;
-		}
-
-		$colour = colour_manager::model_convert($this->colours[$resource], $this->mode, $mode);
-		$results = ($include_original) ? array($resource) : array();
-		$colour2 = $colour3 = $colour4 = $colour;
-		$colour2[0] += 150;
-		$colour3[0] += 180;
-		$colour4[0] += 210;
-
-
-		$results[] = $this->allocate($colour2, $mode);
-		$results[] = $this->allocate($colour3, $mode);
-		$results[] = $this->allocate($colour4, $mode);
-
-		return $results;
-	}
-
-	/**
-	*/
-	public function mono_range($resource, $count = 5, $include_original = true)
-	{
-		if (is_array($resource))
-		{
-			$results = array();
-			for ($i = 0, $size = sizeof($resource); $i < $size; ++$i)
-			{
-				$results = array_merge($results, $this->mono_range($resource[$i], $count, $include_original));
-			}
-			return $results;
-		}
-
-		$mode = (in_array($this->mode, array('hsv', 'ahsv'), true) ? $this->mode : 'ahsv');
-		if (($pre = $this->get_resource($resource)) !== false)
-		{
-			$resource = $pre;
-		}
-
-		$colour = colour_manager::model_convert($this->colours[$resource], $this->mode, $mode);
-
-		$results = array();
-		if ($include_original)
-		{
-			$results[] = $resource;
-			$count--;
-		}
-
-		// This is a hard problem. I chicken out and try to maintain readability at the cost of less randomness.
-
-		while ($count > 0)
-		{
-			$colour[1] = ($colour[1] + mt_rand(40,60)) % 99;
-			$colour[2] = ($colour[2] + mt_rand(40,60));
-			$results[] = $this->allocate($colour, $mode);
-			$count--;
-		}
-		return $results;
-	}
-
-	/**
-	* Convert from one colour model to another
-	*/
-	private static function model_convert($colour, $from_model, $to_model)
-	{
-		if ($from_model == $to_model)
-		{
-			return $colour;
-		}
-
-		switch ($to_model)
-		{
-			case 'hsv':
-
-				switch ($from_model)
-				{
-					case 'ahsv':
-						return colour_manager::ah2h($colour);
-					break;
-
-					case 'rgb':
-						return colour_manager::rgb2hsv($colour);
-					break;
-				}
-			break;
-
-			case 'ahsv':
-
-				switch ($from_model)
-				{
-					case 'hsv':
-						return colour_manager::h2ah($colour);
-					break;
-
-					case 'rgb':
-						return colour_manager::h2ah(colour_manager::rgb2hsv($colour));
-					break;
-				}
-			break;
-
-			case 'rgb':
-				switch ($from_model)
-				{
-					case 'hsv':
-						return colour_manager::hsv2rgb($colour);
-					break;
-
-					case 'ahsv':
-						return colour_manager::hsv2rgb(colour_manager::ah2h($colour));
-					break;
-				}
-			break;
-		}
-		return false;
-	}
-
-	/**
-	* Slightly altered from wikipedia's algorithm
-	*/
-	private static function hsv2rgb($hsv)
-	{
-		colour_manager::normalize_hue($hsv[0]);
-
-		$h = $hsv[0];
-		$s = min(1, max(0, $hsv[1] / 100));
-		$v = min(1, max(0, $hsv[2] / 100));
-
-		// calculate hue sector
-		$hi = floor($hsv[0] / 60);
-
-		// calculate opposite colour
-		$p = $v * (1 - $s);
-
-		// calculate distance between hex vertices
-		$f = ($h / 60) - $hi;
-
-		// coming in or going out?
-		if (!($hi & 1))
-		{
-			$f = 1 - $f;
-		}
-
-		// calculate adjacent colour
-		$q = $v * (1 - ($f * $s));
-
-		switch ($hi)
-		{
-			case 0:
-				$rgb = array($v, $q, $p);
-			break;
-
-			case 1:
-				$rgb = array($q, $v, $p);
-			break;
-
-			case 2:
-				$rgb = array($p, $v, $q);
-			break;
-
-			case 3:
-				$rgb = array($p, $q, $v);
-			break;
-
-			case 4:
-				$rgb = array($q, $p, $v);
-			break;
-
-			case 5:
-				$rgb = array($v, $p, $q);
-			break;
-
-			default:
-				return array(0, 0, 0);
-			break;
-		}
-
-		return array(255 * $rgb[0], 255 * $rgb[1], 255 * $rgb[2]);
-	}
-
-	/**
-	* (more than) Slightly altered from wikipedia's algorithm
-	*/
-	private static function rgb2hsv($rgb)
-	{
-		$r = min(255, max(0, $rgb[0]));
-		$g = min(255, max(0, $rgb[1]));
-		$b = min(255, max(0, $rgb[2]));
-		$max = max($r, $g, $b);
-		$min = min($r, $g, $b);
-
-		$v = $max / 255;
-		$s = (!$max) ? 0 : 1 - ($min / $max);
-
-		// if max - min is 0, we want hue to be 0 anyway.
-		$h = $max - $min;
-
-		if ($h)
-		{
-			switch ($max)
-			{
-				case $g:
-					$h = 120 + (60 * ($b - $r) / $h);
-				break;
-
-				case $b:
-					$h = 240 + (60 * ($r - $g) / $h);
-				break;
-
-				case $r:
-					$h = 360 + (60 * ($g - $b) / $h);
-				break;
-			}
-		}
-		colour_manager::normalize_hue($h);
-
-		return array($h, $s * 100, $v * 100);
-	}
-
-	/**
-	*/
-	private static function normalize_hue(&$hue)
-	{
-		$hue %= 360;
-
-		if ($hue < 0)
-		{
-			$hue += 360;
-		}
-	}
-
-	/**
-	* Alternate hue to hue
-	*/
-	private static function ah2h($ahue)
-	{
-		if (is_array($ahue))
-		{
-			$ahue[0] = colour_manager::ah2h($ahue[0]);
-			return $ahue;
-		}
-		colour_manager::normalize_hue($ahue);
-
-		// blue through red is already ok
-		if ($ahue >= 240)
-		{
-			return $ahue;
-		}
-
-		// ahue green is at 180
-		if ($ahue >= 180)
-		{
-			// return (240 - (2 * (240 - $ahue)));
-			return (2 * $ahue) - 240; // equivalent
-		}
-
-		// ahue yellow is at 120   (RYB rather than RGB)
-		if ($ahue >= 120)
-		{
-			return $ahue - 60;
-		}
-
-		return $ahue / 2;
-	}
-
-	/**
-	* hue to Alternate hue
-	*/
-	private static function h2ah($hue)
-	{
-		if (is_array($hue))
-		{
-			$hue[0] = colour_manager::h2ah($hue[0]);
-			return $hue;
-		}
-		colour_manager::normalize_hue($hue);
-
-		// blue through red is already ok
-		if ($hue >= 240)
-		{
-			return $hue;
-		}
-		else if ($hue <= 60)
-		{
-			return $hue * 2;
-		}
-		else if ($hue <= 120)
-		{
-			return $hue + 60;
-		}
-		else
-		{
-			return ($hue + 240) / 2;
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/captcha/captcha_gd_wave.php b/phpBB/includes/captcha/captcha_gd_wave.php
deleted file mode 100644
index 8c1d9d5507..0000000000
--- a/phpBB/includes/captcha/captcha_gd_wave.php
+++ /dev/null
@@ -1,842 +0,0 @@
-<?php
-/** 
-*
-* @package VC
-* @version $Id: captcha_gd.php,v 1.19 2007/01/26 16:07:43 acydburn Exp $
-* @copyright (c) 2006 phpBB Group 
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-*
-*/
-
-
-/** 
-Wave3D CAPTCHA by Robert Hetzler
-*/
-class captcha
-{
-	const WIDTH		= 360;
-	const HEIGHT	= 96;
-
-	static function execute($code, $seed)
-	{
-		global $starttime;
-		
-		// seed the random generator
-		mt_srand($seed);
-	
-		// set height and width
-		$img_x = self::WIDTH;
-		$img_y = self::HEIGHT;
-
-		// Generate image
-		$img	= imagecreatetruecolor($img_x, $img_y);
-		$x_grid = mt_rand(6, 10);
-		$y_grid = mt_rand(6, 10);
- 
-		// Ok, so lets cut to the chase. We could accurately represent this in 3d and
-		// do all the appropriate linear transforms. my questions is... why bother?
-		// The computational overhead is unnecessary when you consider the simple fact:
-		// we're not here to accurately represent a model, but to just show off some random-ish
-		// polygons
-
-		// Conceive of 3 spaces.
-		// 1) planar-space (discrete "pixel" grid)
-		// 2) 3-space. (planar-space with z/height aspect)
-		// 3) image space (pixels on the screen)
-		// resolution of the planar-space we're embedding the text code in
-		$plane_x	= 100;
-		$plane_y	= 30;
-
-		$subdivision_factor	= 3;
-		// $box is the 4 points in img_space that correspond to the corners of the plane in 3-space
-		$box = array(
-			'upper_left'	=> array(
-				'x' => mt_rand(5, 15),
-				'y' => mt_rand(10, 15)
-			), 
-			'upper_right'	=> array(
-				'x' => mt_rand($img_x - 35, $img_x - 19),
-				'y' => mt_rand(10, 17)
-			), 
-			'lower_left'	=> array(
-				'x' => mt_rand($img_x - 5, $img_x - 45),
-				'y' => mt_rand($img_y - 0, $img_y - 15)
-			), 
-		);
-		$box['lower_right'] = array(
-				'x' => $box['lower_left']['x'] + $box['upper_left']['x'] - $box['upper_right']['x'],
-				'y' => $box['lower_left']['y'] + $box['upper_left']['y'] - $box['upper_right']['y'],
-		);
-
-
-		// TODO
-		$background = imagecolorallocate($img, mt_rand(155, 255), mt_rand(155, 255), mt_rand(155, 255));
-		imagefill($img, 0, 0, $background);
-		$black = imagecolorallocate($img, 0, 0, 0);
-
-		$random = array();
-		$fontcolors = array();
-
-		for ($i = 0; $i < 15; ++$i)
-		{
-			$random[$i] = imagecolorallocate($img, mt_rand(120, 255), mt_rand(120, 255), mt_rand(120, 255));
-		}
-
-		$fontcolors[0] = imagecolorallocate($img, mt_rand(0, 120), mt_rand(0, 120), mt_rand(0, 120));
-		
- 		$colors = array();
-
-		$minr = mt_rand(20, 30);
-		$ming = mt_rand(20, 30);
-		$minb = mt_rand(20, 30);
-
-		$maxr = mt_rand(150, 230);
-		$maxg = mt_rand(150, 230);
-		$maxb = mt_rand(150, 230);
-
-		for ($i = -30; $i <= 30; ++$i)
-		{
-			$coeff1 = ($i + 12) / 45;
-			$coeff2 = 1 - $coeff1;
-			$colors[$i] = imagecolorallocate($img, ($coeff2 * $maxr) + ($coeff1 * $minr), ($coeff2 * $maxg) + ($coeff1 * $ming), ($coeff2 * $maxb) + ($coeff1 * $minb));
-		}
-
-		// $img_buffer is the last row of 3-space positions (converted to img-space), cached
-		// (using this means we don't need to recalculate all 4 positions for each new polygon,
-		// merely the newest point that we're adding, which is then cached.
-		$img_buffer = array(array(), array());
-
-		// In image-space, the x- and y-offset necessary to move one unit in the x-direction in planar-space
-		$dxx = ($box['upper_right']['x'] - $box['upper_left']['x']) / ($subdivision_factor * $plane_x);
-		$dxy = ($box['upper_right']['y'] - $box['upper_left']['y']) / ($subdivision_factor * $plane_x);
-
-		// In image-space, the x- and y-offset necessary to move one unit in the y-direction in planar-space
-		$dyx = ($box['lower_right']['x'] - $box['upper_left']['x']) / ($subdivision_factor * $plane_y);
-		$dyy = ($box['lower_right']['y'] - $box['upper_left']['y']) / ($subdivision_factor * $plane_y);
-
-		// Initial captcha-letter offset in planar-space
-		$plane_offset_x = mt_rand(3, 8);
-		$plane_offset_y = mt_rand( 12, 15);
-
-		// character map
-		$map = self::captcha_bitmaps();
-
-		// matrix
-		$plane = array();
-
-		// for each character, we'll silkscreen it into our boolean pixel plane
-		for ($c = 0, $code_num = strlen($code); $c < $code_num; ++$c)
-		{
-			$letter = $code[$c];
-
-			for ($x = $map['width'] - 1; $x >= 0; --$x)
-			{
-				for ($y = $map['height'] - 1; $y >= 0; --$y)
-				{
-					if ($map['data'][$letter][$y][$x])
-					{
-						$plane[$y + $plane_offset_y + (($c & 1) ? 1 : -1)][$x + $plane_offset_x] = true;
-					}
-				}
-			}
-			$plane_offset_x += 11;
-		}
-
-		// calculate our first buffer, we can't actually draw polys with these yet
-		// img_pos_prev == screen x,y location to our immediate left.
-		// img_pos_cur == current screen x,y location
-		// we calculate screen position of our
-		// current cell based on the difference from the previous cell
-		// rather than recalculating from absolute coordinates
-		// What we cache into the $img_buffer contains the raised text coordinates.
-		$img_pos_prev	= $img_buffer[0][0] = array($box['upper_left']['x'], $box['upper_left']['y']);
-		$cur_height		= $prev_height = self::wave_height(0, 0, $subdivision_factor);
-		$full_x			= $plane_x * $subdivision_factor;
-		$full_y			= $plane_y * $subdivision_factor;
-
-		for ($x = 1; $x <= $full_x; ++$x)
-		{
-			$cur_height		= self::wave_height($x, 0, $subdivision_factor);
-			$offset			= $cur_height - $prev_height;
-			$img_pos_cur	= array($img_pos_prev[0] + $dxx, $img_pos_prev[1] + $dxy + $offset);
-									
-			$img_buffer[0][$x]	= $img_pos_cur;
-			$img_pos_prev		= $img_pos_cur;
-			$prev_height		= $cur_height;
-		}
-
-		for ($y = 1; $y <= $full_y; ++$y)
-		{
-			// swap buffers
-			$buffer_cur		= $y & 1;
-			$buffer_prev	= 1 - $buffer_cur;
-			
-			$prev_height	= self::wave_height(0, $y, $subdivision_factor);
-			$offset			= $prev_height - self::wave_height(0, $y - 1, $subdivision_factor);
-			$img_pos_cur	= array($img_buffer[$buffer_prev][0][0] + $dyx, min($img_buffer[$buffer_prev][0][1] + $dyy + $offset, $img_y - 1));
-
-			// make sure we don't try to write off the page
-			$img_pos_prev	= $img_pos_cur;
-
-			$img_buffer[$buffer_cur][0]	= $img_pos_cur;
-			
-			for ($x = 1; $x <= $full_x; ++$x)
-			{
-				$cur_height		= self::wave_height($x, $y, $subdivision_factor) + self::grid_height($x, $y, 1, $x_grid, $y_grid);
-
-				// height is a z-factor, not a y-factor
-				$offset			= $cur_height - $prev_height;
-				$img_pos_cur	= array($img_pos_prev[0] + $dxx, $img_pos_prev[1] + $dxy + $offset);
-
-				// height is float, index it to an int, get closest color
-				$color			= $colors[intval($cur_height)];
-				$img_pos_prev	= $img_pos_cur;
-				$prev_height	= $cur_height;
-
-				$y_index_old = intval(($y - 1) / $subdivision_factor);
-				$y_index_new = intval($y / $subdivision_factor);
-				$x_index_old = intval(($x - 1) / $subdivision_factor);
-				$x_index_new = intval($x / $subdivision_factor);
-
-				if (!empty($plane[$y_index_new][$x_index_new]))
-				{
-					$img_pos_cur[1]	+= self::wave_height($x, $y, $subdivision_factor, 1) - 30 - $cur_height;
-					$color			= $colors[20];
-				}
-				$img_pos_cur[1] = min($img_pos_cur[1], $img_y - 1);
-				$img_buffer[$buffer_cur][$x] = $img_pos_cur;
-
-				// Smooth the edges as much as possible by having not more than one low<->high traingle per square
-				// Otherwise, just
-				$diag_down	= (empty($plane[$y_index_old][$x_index_old]) == empty($plane[$y_index_new][$x_index_new]));
-				$diag_up	= (empty($plane[$y_index_old][$x_index_new]) == empty($plane[$y_index_new][$x_index_old]));
-
-				// natural switching
-				$mode = ($x + $y) & 1;
-
-				// override if it requires it
-				if ($diag_down != $diag_up)
-				{
-					$mode = $diag_up;
-				}
-
-				if ($mode)
-				{
-					//		+-/			  /
-					// 1	|/		2	 /|
-					//		/			/-+
-					$poly1 = array_merge($img_buffer[$buffer_cur][$x - 1], $img_buffer[$buffer_prev][$x - 1], $img_buffer[$buffer_prev][$x]);
-					$poly2 = array_merge($img_buffer[$buffer_cur][$x - 1], $img_buffer[$buffer_cur][$x], $img_buffer[$buffer_prev][$x]);
-				}
-				else
-				{
-					//		\			\-+
-					// 1	|\		2	 \|
-					//		+-\			  \
-					$poly1 = array_merge($img_buffer[$buffer_cur][$x - 1], $img_buffer[$buffer_prev][$x - 1], $img_buffer[$buffer_cur][$x]);
-					$poly2 = array_merge($img_buffer[$buffer_prev][$x - 1], $img_buffer[$buffer_prev][$x], $img_buffer[$buffer_cur][$x]);
-				}
-
-				imagefilledpolygon($img, $poly1, 3, $color);
-				imagefilledpolygon($img, $poly2, 3, $color);
-			}
-		}
-
-		// Output image
-		header('Content-Type: image/png');
-		header('Cache-control: no-cache, no-store');
-		//$mtime = explode(' ', microtime());
-		//$totaltime = $mtime[0] + $mtime[1] - $starttime;
-
-		//echo $totaltime . "<br />\n";
-		//echo memory_get_usage() - $tmp;
-		imagepng($img);
-		imagedestroy($img);
-	}
-
-	static function wave_height($x, $y, $factor = 1, $tweak = 0.7)
-	{
-		// stretch the wave. TODO: pretty it up
-		$x = $x/5 + 180;
-		$y = $y/4;
-		return ((sin($x / (3 * $factor)) + sin($y / (3 * $factor))) * 10 * $tweak);
-	}
-
-	static function grid_height($x, $y, $factor = 1, $x_grid, $y_grid)
-	{
-		return ((!($x % ($x_grid * $factor)) || !($y % ($y_grid * $factor))) ? 3 : 0);
-	}
-
-	static function captcha_bitmaps()
-	{
-		return array(
-			'width'		=> 9,
-			'height'	=> 13,
-			'data'		=> array(
-				'A' => array(
-					array(0,0,1,1,1,1,0,0,0),
-					array(0,1,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,1,1,1,1,1,1,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'B' => array(
-					array(1,1,1,1,1,1,0,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,1,1,1,1,1,0,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,1,1,1,1,1,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'C' => array(
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'D' => array(
-					array(1,1,1,1,1,1,1,0,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,1,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'E' => array(
-					array(0,0,1,1,1,1,1,1,1),
-					array(0,1,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,1,1,1,1,1,1,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(0,1,0,0,0,0,0,0,0),
-					array(0,0,1,1,1,1,1,1,1),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'F' => array(
-					array(0,0,1,1,1,1,1,1,0),
-					array(0,1,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,1,1,1,1,1,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'G' => array(
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,1,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'H' => array(
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,1,1,1,1,1,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'I' => array(
-					array(0,1,1,1,1,1,1,1,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,1,1,1,1,1,1,1,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'J' => array(
-					array(0,0,0,0,0,0,1,1,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,0,1,0,0,0,0,1,0),
-					array(0,0,0,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'K' => array(
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,1,0,0,0),
-					array(1,0,0,0,1,0,0,0,0),
-					array(1,0,0,1,0,0,0,0,0),
-					array(1,0,1,0,0,0,0,0,0),
-					array(1,1,0,0,0,0,0,0,0),
-					array(1,0,1,0,0,0,0,0,0),
-					array(1,0,0,1,0,0,0,0,0),
-					array(1,0,0,0,1,0,0,0,0),
-					array(1,0,0,0,0,1,0,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'L' => array(
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(0,1,0,0,0,0,0,0,0),
-					array(0,0,1,1,1,1,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'M' => array(
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,1,1,0,0,0,1,1,0),
-					array(0,1,0,1,0,1,0,1,0),
-					array(0,1,0,0,1,0,0,1,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'N' => array(
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,1,0,0,0,0,0,0,1),
-					array(1,0,1,0,0,0,0,0,1),
-					array(1,0,0,1,0,0,0,0,1),
-					array(1,0,0,0,1,0,0,0,1),
-					array(1,0,0,0,0,1,0,0,1),
-					array(1,0,0,0,0,0,1,0,1),
-					array(1,0,0,0,0,0,0,1,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),		
-				'O' => array(
-					array(0,0,0,1,1,1,0,0,0),
-					array(0,0,1,0,0,0,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,0,0,0,1,0,0),
-					array(0,0,0,1,1,1,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'P' => array(
-					array(1,1,1,1,1,1,0,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,1,1,1,1,1,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'Q' => array(
-					array(0,0,1,1,1,1,0,0,0),
-					array(0,1,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,1,0,0,1,0),
-					array(1,0,0,0,0,1,0,1,0),
-					array(0,1,0,0,0,0,1,0,0),
-					array(0,0,1,1,1,1,0,1,0),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'R' => array(
-					array(1,1,1,1,1,1,0,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,1,1,1,1,1,0,0,0),
-					array(1,0,1,0,0,0,0,0,0),
-					array(1,0,0,1,0,0,0,0,0),
-					array(1,0,0,0,1,0,0,0,0),
-					array(1,0,0,0,0,1,0,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'S' => array(
-					array(0,0,1,1,1,1,1,1,1),
-					array(0,1,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(0,1,0,0,0,0,0,0,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,1,0),
-					array(1,1,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'T' => array(
-					array(1,1,1,1,1,1,1,1,1),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'U' => array(
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'V' => array(
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,0,0,0,1,0,0),
-					array(0,0,0,1,0,1,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'W' => array(
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,1,0,0,0,1),
-					array(1,0,0,1,0,1,0,0,1),
-					array(1,0,1,0,0,0,1,0,1),
-					array(1,1,0,0,0,0,0,1,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'X' => array(
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,0,0,0,1,0,0),
-					array(0,0,0,1,0,1,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,1,0,1,0,0,0),
-					array(0,0,1,0,0,0,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'Y' => array(
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,0,0,0,1,0,0),
-					array(0,0,0,1,0,1,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'Z' => array(
-					array(1,1,1,1,1,1,1,1,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,1,0,0),
-					array(0,0,0,0,0,1,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,1,0,0,0,0,0),
-					array(0,0,1,0,0,0,0,0,0),
-					array(0,1,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,1,1,1,1,1,1,1,1),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'1' => array(
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,1,1,0,0,0,0),
-					array(0,0,1,0,1,0,0,0,0),
-					array(0,1,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,1,1,1,1,1,1,1,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'2' => array(
-					array(0,0,0,1,1,1,0,0,0),
-					array(0,0,1,0,0,0,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,1,0,0),
-					array(0,0,0,0,0,1,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,1,0,0,0,0,0),
-					array(0,0,1,0,0,0,0,0,0),
-					array(0,1,1,1,1,1,1,1,1),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'3' => array(
-					array(0,0,0,1,1,1,1,0,0),
-					array(0,0,1,0,0,0,0,1,0),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,1,1,0,0),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,0,1,0,0,0,0,1,0),
-					array(0,0,0,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'4' => array(
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,1,1,0),
-					array(0,0,0,0,0,1,0,1,0),
-					array(0,0,0,0,1,0,0,1,0),
-					array(0,0,0,1,0,0,0,1,0),
-					array(0,0,1,0,0,0,0,1,0),
-					array(0,1,1,1,1,1,1,1,1),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'5' => array(
-					array(1,1,1,1,1,1,1,1,1),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(0,1,0,0,0,0,0,0,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'6' => array(
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,1,1,1,1,0,0),
-					array(1,0,1,0,0,0,0,1,0),
-					array(1,1,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'7' => array(
-					array(1,1,1,1,1,1,1,1,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,1,0,0),
-					array(0,0,0,0,0,1,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'8' => array(
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'9' => array(
-					array(0,0,0,1,1,1,1,0,0),
-					array(0,0,1,0,0,0,0,1,0),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,1),
-					array(0,0,1,1,1,1,1,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,0,1,0,0,0,0,1,0),
-					array(0,0,0,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-			)
-		);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/captcha/captcha_non_gd.php b/phpBB/includes/captcha/captcha_non_gd.php
deleted file mode 100644
index 3f9db24f3a..0000000000
--- a/phpBB/includes/captcha/captcha_non_gd.php
+++ /dev/null
@@ -1,384 +0,0 @@
-<?php
-/**
-*
-* @package VC
-* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Main non-gd captcha class
-* @ignore
-* @package VC
-*/
-class captcha
-{
-	const width = 320;
-	const height = 50;
-
-	/**
-	* Create the image containing $code with a seed of $seed
-	*/
-	public static function execute($code, $seed)
-	{
-		$img_height = self::height - 10;
-		$img_width = 0;
-
-		mt_srand($seed);
-
-		$char_widths = $hold_chars = array();
-		$code_len = strlen($code);
-
-		// If we can we will generate a single filtered png, we avoid nastiness via emulation of some Zlib stuff
-		$filtered_pngs = self::define_filtered_pngs();
-
-		for ($i = 0; $i < $code_len; $i++)
-		{
-			$char = $code[$i];
-
-			$width = mt_rand(0, 4);
-			$raw_width = $filtered_pngs[$char]['width'];
-			$char_widths[$i] = $width;
-			$img_width += $raw_width - $width;
-
-			// Split the char into chunks of $raw_width + 1 length
-			if (empty($hold_chars[$char]))
-			{
-				$hold_chars[$char] = str_split(base64_decode($filtered_pngs[$char]['data']), $raw_width + 1);
-			}
-		}
-
-		$offset_x = mt_rand(0, self::width - $img_width);
-		$offset_y = mt_rand(0, self::height - $img_height);
-
-		$image = '';
-		for ($i = 0; $i < self::height; $i++)
-		{
-			$image .= chr(0);
-
-			if ($i > $offset_y && $i < $offset_y + $img_height)
-			{
-				for ($j = 0; $j < $offset_x; $j++)
-				{
-					$image .= chr(mt_rand(140, 255));
-				}
-
-				for ($j = 0; $j < $code_len; $j++)
-				{
-					$image .= self::randomise(substr($hold_chars[$code{$j}][$i - $offset_y - 1], 1), $char_widths[$j]);
-				}
-
-				for ($j = $offset_x + $img_width; $j < self::width; $j++)
-				{
-					$image .= chr(mt_rand(140, 255));
-				}
-			}
-			else
-			{
-				for ($j = 0; $j < self::width; $j++)
-				{
-					$image .= chr(mt_rand(140, 255));
-				}
-			}
-		}
-		unset($hold_chars);
-
-		$image = self::create_png($image, self::width, self::height);
-
-		// Output image
-		header('Content-Type: image/png');
-		header('Cache-control: no-cache, no-store');
-		echo $image;
-	}
-
-	/**
-	* This is designed to randomise the pixels of the image data within
-	* certain limits so as to keep it readable. It also varies the image
-	* width a little
-	*/
-	private static function randomise($scanline, $width)
-	{
-		$new_line = '';
-
-		$end = strlen($scanline) - ceil($width / 2);
-		for ($i = $width >> 1; $i < $end; $i++)
-		{
-			$pixel = ord($scanline[$i]);
-
-			if ($pixel < 190)
-			{
-				$new_line .= chr(mt_rand(0, 205));
-			}
-			else if ($pixel > 190)
-			{
-				$new_line .= chr(mt_rand(145, 255));
-			}
-			else
-			{
-				$new_line .= $scanline{$i};
-			}
-		}
-
-		return $new_line;
-	}
-
-	/**
-	* This creates a chunk of the given type, with the given data
-	* of the given length adding the relevant crc
-	*/
-	private static function png_chunk($length, $type, $data)
-	{
-		$raw = $type . $data;
-
-		return pack('N', $length) . $raw . pack('N', crc32($raw));
-	}
-
-	/**
-	* Creates greyscale 8bit png - The PNG spec can be found at
-	* http://www.libpng.org/pub/png/spec/PNG-Contents.html we use
-	* png because it's a fully recognised open standard and supported
-	* by practically all modern browsers and OSs
-	*/
-	static function create_png($raw_image, $width, $height)
-	{
-		// SIG
-		$image = pack('C8', 137, 80, 78, 71, 13, 10, 26, 10);
-
-		// IHDR
-		$raw = pack('N2', $width, $height);
-		$raw .= pack('C5', 8, 0, 0, 0, 0);
-		$image .= self::png_chunk(13, 'IHDR', $raw);
-
-		// IDAT
-		if (@extension_loaded('zlib'))
-		{
-			$raw_image = gzcompress($raw_image);
-			$length = strlen($raw_image);
-		}
-		else
-		{
-			// The total length of this image, uncompressed, is just a calculation of pixels
-			$length = ($width + 1) * $height;
-
-			// Adler-32 hash generation
-			// Note: The hash is _backwards_ so we must reverse it
-
-			if (@extension_loaded('hash'))
-			{
-				$adler_hash = strrev(hash('adler32', $raw_image, true));
-			}
-			else if (@extension_loaded('mhash'))
-			{
-				$adler_hash = strrev(mhash(MHASH_ADLER32, $raw_image));
-			}
-			else
-			{
-				// Optimized Adler-32 loop ported from the GNU Classpath project
-				$temp_length = $length;
-				$s1 = 1;
-				$s2 = $index = 0;
-
-				while ($temp_length > 0)
-				{
-					// We can defer the modulo operation:
-					// s1 maximally grows from 65521 to 65521 + 255 * 3800
-					// s2 maximally grows by 3800 * median(s1) = 2090079800 < 2^31
-					$substract_value = ($temp_length < 3800) ? $temp_length : 3800;
-					$temp_length -= $substract_value;
-
-					while (--$substract_value >= 0)
-					{
-						$s1 += ord($raw_image[$index]);
-						$s2 += $s1;
-
-						$index++;
-					}
-
-					$s1 %= 65521;
-					$s2 %= 65521;
-				}
-				$adler_hash = pack('N', ($s2 << 16) | $s1);
-			}
-
-			// This is the same thing as gzcompress($raw_image, 0) but does not need zlib
-			$raw_image = pack('C3v2', 0x78, 0x01, 0x01, $length, ~$length) . $raw_image . $adler_hash;
-
-			// The Zlib header + Adler hash make us add on 11
-			$length += 11;
-		}
-
-		// IDAT
-		$image .= self::png_chunk($length, 'IDAT', $raw_image);
-
-		// IEND
-		$image .= self::png_chunk(0, 'IEND', '');
-
-		return $image;
-	}
-
-	/**
-	* png image data
-	* Each 'data' element is base64_encoded uncompressed IDAT
-	*/
-	private static function define_filtered_pngs()
-	{
-		return array(
-			'0' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A///////////////////olFAkBAAAGDyA4P///M31/////////////wD////////////////0dAgAAAAAAAAAAAAEcPipFGHn////////////AP//////////////6DAAAAAAAAAAAAAAAAAALSEAN+T///////////8A//////////////xAAAAAAAAAAAAAAAAAAAAAACPA/////////////wD/////////////oAAAAAAAAAAAAAAAAAAAAAAAev//////////////AP////////////8oAAAAAAAAPNj/zDAAAAAAAABD//////////////8A////////////1AAAAAAAABjw////5BAAAAAAAADo/////////////wD///////////+QAAAAAAAAbP//////QgAAAAAAAKj/////////////AP///////////1wAAAAAAACs/////8AXAAAAAAAAcP////////////8A////////////OAAAAAAAAND////dNwAAAAAAAABI/////////////wD///////////8gAAAAAAAA4P//7koACwAAAAAAACT/////////////AP///////////wgAAAAAAAD///VqAwaPAAAAAAAAEP////////////8A////////////AAAAAAAAAP/8kQYDavUAAAAAAAAA/////////////wD///////////8AAAAAAAAA/6kNAEru/wAAAAAAAAD/////////////AP///////////wAAAAAAAADAIwA33f//AAAAAAAAAP////////////8A////////////FAAAAAAAADYAI8D///8AAAAAAAAQ/////////////wD///////////8kAAAAAAAAAA2p////5AAAAAAAACD/////////////AP///////////0gAAAAAAAAFkfz////UAAAAAAAAQP////////////8A////////////cAAAAAAAAET1/////7AAAAAAAABo/////////////wD///////////+oAAAAAAAAXfX/////sAAAAAAAAGj/////////////AAAAALgAAAAAAAAwAAAAAAAAAAAAAAD////////////oAAAAAAAACOT////oEAAAAAAAAOD/////////////AP////////////8+AAAAAAAAKMz/zDQAAAAAAAA0//////////////8A////////////7jgAAAAAAAAAAAAAAAAAAAAAAKT//////////////wD///////////VqAwIAAAAAAAAAAAAAAAAAAAA8////////////////AP//////////rQcDaVEAAAAAAAAAAAAAAAAAKOj///////////////8A///////////nblnu/IAIAAAAAAAAAAAAAFzw/////////////////wD////////////79////+iITCAAAAAgSITg////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////w==',
-				'width' => 40
-			),
-			'1' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////8BAAAAAAAP//////////////////AP////////////////////////9sAAAAAAAA//////////////////8A////////////////////////pAAAAAAAAAD//////////////////wD//////////////////////6wEAAAAAAAAAP//////////////////AP////////////////////h4AAAAAAAAAAAA//////////////////8A//////////////////ygJAAAAAAAAAAAAAD//////////////////wD//////////////9x8HAAAAAAAAAAAAAAAAP//////////////////AP//////////////AAAAAAAAAAAAAAAAAAAA//////////////////8A//////////////8AAAAAAAAAAAAAAAAAAAD//////////////////wD//////////////wAAAAAAAAR4AAAAAAAAAP//////////////////AP//////////////AAAAAAA4zP8AAAAAAAAA//////////////////8A//////////////8AAAA4sP///wAAAAAAAAD//////////////////wD//////////////yR80P//////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'2' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP/////////////////okFAkCAAABCBIfNT///////////////////8A///////////////8hAgAAAAAAAAAAAAAAFTo/////////////////wD//////////////1QAAAAAAAAAAAAAAAAAACjo////////////////AP////////////+MAAAAAAAAAAAAAAAAAAAAADj///////////////8A////////////9BAAAAAAAAAAAAAAAAAAAAAAALD//////////////wD///////////+gAAAAAAAAAHjs+KwMAAAAAAAAVP//////////////AP///////////1gAAAAAAABM/////6QAAAAAAAAU//////////////8A////////////KAAAAAAAALj/////+AAAAAAAAAD//////////////wD///////////+MfGBMOCAI8P/////wAAAAAAAACP//////////////AP///////////////////////////5wAAAAAAAAw//////////////8A///////////////////////////oFAAAAAAAAHz//////////////wD/////////////////////////6CgAAAAAAAAE3P//////////////AP///////////////////////9ggAAAAAAAAAHT///////////////8A//////////////////////+0DAAAAAAAAAA8+P///////////////wD/////////////////////gAAAAAAAAAAAKOj/////////////////AP//////////////////9FAAAAAAAAAAADzw//////////////////8A/////////////////+g4AAAAAAAAAABk/P///////////////////wD////////////////oKAAAAAAAAAAMqP//////////////////////AP//////////////6CgAAAAAAAAAMNz///////////////////////8A//////////////g4AAAAAAAAAFT0/////////////////////////wD/////////////bAAAAAAAAABU/P//////////////////////////AP///////////8wAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A////////////SAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////9wAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////hAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////9AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////xAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'3' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD////////////////8sGg0FAAAACA4cLz8////////////////////AP//////////////rBgAAAAAAAAAAAAAACTA//////////////////8A/////////////3QAAAAAAAAAAAAAAAAAAASs/////////////////wD///////////+YAAAAAAAAAAAAAAAAAAAAAAjc////////////////AP//////////6AwAAAAAAAAAAAAAAAAAAAAAAGT///////////////8A//////////94AAAAAAAABJDw/8g4AAAAAAAAHP///////////////wD//////////yAAAAAAAACE/////9gAAAAAAAAA////////////////AP///////////NSwiGQ4FOT//////AAAAAAAABD///////////////8A//////////////////////////+YAAAAAAAAVP///////////////wD//////////////////////P/ggAQAAAAAAATM////////////////AP////////////////////9gAAAAAAAAAAAElP////////////////8A/////////////////////0AAAAAAAAAAHLj//////////////////wD/////////////////////OAAAAAAAAAAwkPj/////////////////AP////////////////////8gAAAAAAAAAAAAINj///////////////8A/////////////////////xAAAAAAAAAAAAAAIPD//////////////wD/////////////////////uOz/4HgEAAAAAAAAhP//////////////AP///////////////////////////3wAAAAAAAAw//////////////8A////////////////////////////6AAAAAAAAAj//////////////wD/////////////////////////////AAAAAAAAAP//////////////AP//////////tJh8YEQoDNz//////+AAAAAAAAAY//////////////8A//////////88AAAAAAAAaP//////dAAAAAAAAEz//////////////wD//////////6QAAAAAAAAAdOD/5HQAAAAAAAAApP//////////////AP///////////CgAAAAAAAAAAAAAAAAAAAAAACD4//////////////8A////////////yAQAAAAAAAAAAAAAAAAAAAAEuP///////////////wD/////////////rAQAAAAAAAAAAAAAAAAABJD/////////////////AP//////////////zDQAAAAAAAAAAAAAACTA//////////////////8A/////////////////8BwOCAAAAAUNGi0/P///////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'4' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP//////////////////////////nAAAAAAAAAD///////////////8A/////////////////////////8AEAAAAAAAAAP///////////////wD////////////////////////gGAAAAAAAAAAA////////////////AP//////////////////////9DAAAAAAAAAAAAD///////////////8A//////////////////////9UAAAAAAAAAAAAAP///////////////wD/////////////////////hAAAAAAAAAAAAAAA////////////////AP///////////////////7QAAAAAAAAAAAAAAAD///////////////8A///////////////////UDAAAAAAUAAAAAAAAAP///////////////wD/////////////////7CQAAAAABMAAAAAAAAAA////////////////AP////////////////xEAAAAAACU/wAAAAAAAAD///////////////8A////////////////cAAAAAAAZP//AAAAAAAAAP///////////////wD//////////////6AAAAAAADz8//8AAAAAAAAA////////////////AP/////////////IBAAAAAAc6P///wAAAAAAAAD///////////////8A////////////5BgAAAAADMz/////AAAAAAAAAP///////////////wD///////////g0AAAAAACk//////8AAAAAAAAA////////////////AP//////////XAAAAAAAfP///////wAAAAAAAAD///////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A////////////////////////////AAAAAAAAAP///////////////wD///////////////////////////8AAAAAAAAA////////////////AP///////////////////////////wAAAAAAAAD///////////////8A////////////////////////////AAAAAAAAAP///////////////wD///////////////////////////8AAAAAAAAA////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'5' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP//////////////8AAAAAAAAAAAAAAAAAAAAAAA//////////////8A///////////////MAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////////6wAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////////iAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////////9kAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////////0QAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////////IAAAAAAAYP////////////////////////////8A//////////////wAAAAAAAB8/////////////////////////////wD/////////////3AAAAAAAAIj/////////////////////////////AP////////////+4AAAAAAAAoLRYHAAEKGTE//////////////////8A/////////////5QAAAAAAAAQAAAAAAAAAABY9P///////////////wD/////////////dAAAAAAAAAAAAAAAAAAAAAA89P//////////////AP////////////9QAAAAAAAAAAAAAAAAAAAAAABg//////////////8A/////////////zAAAAAAAAAAAAAAAAAAAAAAAADQ/////////////wD/////////////IAAAAAAAAGjY/+h4BAAAAAAAAGz/////////////AP//////////////9NS0lHSc//////90AAAAAAAALP////////////8A/////////////////////////////9QAAAAAAAAE/////////////wD//////////////////////////////wAAAAAAAAD/////////////AP/////////////////////////////8AAAAAAAAEP////////////8A////////////pIRwWEAgDOD//////8wAAAAAAAA8/////////////wD///////////9EAAAAAAAAaP//////ZAAAAAAAAHz/////////////AP///////////6QAAAAAAAAAaOD/4GQAAAAAAAAE4P////////////8A/////////////CQAAAAAAAAAAAAAAAAAAAAAAGD//////////////wD/////////////yAQAAAAAAAAAAAAAAAAAAAAc7P//////////////AP//////////////rAwAAAAAAAAAAAAAAAAAGNj///////////////8A////////////////0EAAAAAAAAAAAAAAAFTo/////////////////wD//////////////////8h4QCAAAAAcQHzU////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'6' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////////////////+0ZCwMAAAUNGjI////////////////////AP/////////////////EMAAAAAAAAAAAAABM6P////////////////8A////////////////lAQAAAAAAAAAAAAAAAAo6P///////////////wD//////////////6wAAAAAAAAAAAAAAAAAAABI////////////////AP/////////////oEAAAAAAAAAAAAAAAAAAAAACw//////////////8A/////////////3AAAAAAAAAoxP/YPAAAAAAAAEj//////////////wD////////////4EAAAAAAACOD////YDCBAVGiAoP//////////////AP///////////7gAAAAAAABY//////////////////////////////8A////////////eAAAAAAAAJT//////////////////////////////wD///////////9MAAAAAAAAvP/IXBgABCx03P//////////////////AP///////////ygAAAAAAADcdAAAAAAAAAAEiP////////////////8A////////////FAAAAAAAAFAAAAAAAAAAAAAAcP///////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAlP//////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAQ8P////////////8A////////////AAAAAAAAAABAyP/kZAAAAAAAAACQ/////////////wD///////////8MAAAAAAAALPj/////WAAAAAAAAET/////////////AP///////////yQAAAAAAACY///////MAAAAAAAAFP////////////8A////////////SAAAAAAAAMD///////wAAAAAAAAA/////////////wD///////////9wAAAAAAAAvP///////wAAAAAAAAD/////////////AP///////////7QAAAAAAACI///////UAAAAAAAAJP////////////8A////////////+AwAAAAAACDw/////2wAAAAAAABY/////////////wD/////////////cAAAAAAAADC8/Ox4AAAAAAAAAKj/////////////AP/////////////oEAAAAAAAAAAAAAAAAAAAAAAk/P////////////8A//////////////+oAAAAAAAAAAAAAAAAAAAABLj//////////////wD///////////////+QAAAAAAAAAAAAAAAAAACQ////////////////AP////////////////+0JAAAAAAAAAAAAAAkuP////////////////8A///////////////////8sGg0FAAADCxgqPz//////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'7' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAABP////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAy4/////////////wD//////////////////////////+QUAAAAAAAEuP//////////////AP/////////////////////////8QAAAAAAAAKT///////////////8A/////////////////////////4wAAAAAAAB0/////////////////wD////////////////////////cCAAAAAAANPz/////////////////AP///////////////////////0QAAAAAAATY//////////////////8A//////////////////////+0AAAAAAAAeP///////////////////wD//////////////////////CQAAAAAABTw////////////////////AP////////////////////+gAAAAAAAAkP////////////////////8A/////////////////////ywAAAAAABDw/////////////////////wD///////////////////+4AAAAAAAAbP//////////////////////AP///////////////////1wAAAAAAADQ//////////////////////8A///////////////////4DAAAAAAAMP///////////////////////wD//////////////////7QAAAAAAAB8////////////////////////AP//////////////////aAAAAAAAAMj///////////////////////8A//////////////////8oAAAAAAAM/P///////////////////////wD/////////////////8AAAAAAAAET/////////////////////////AP////////////////+0AAAAAAAAcP////////////////////////8A/////////////////4wAAAAAAACY/////////////////////////wD/////////////////WAAAAAAAAMD/////////////////////////AP////////////////80AAAAAAAA4P////////////////////////8A/////////////////xAAAAAAAAD4/////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'8' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD////////////////////IdDQUAAAEIEiA1P//////////////////AP/////////////////gRAAAAAAAAAAAAAAAROD///////////////8A////////////////0BgAAAAAAAAAAAAAAAAAEMj//////////////wD///////////////AcAAAAAAAAAAAAAAAAAAAAHPD/////////////AP//////////////hAAAAAAAAAAAAAAAAAAAAAAAhP////////////8A//////////////8sAAAAAAAAKMz/zCgAAAAAAAAs/////////////wD//////////////wAAAAAAAADM////zAAAAAAAAAD/////////////AP//////////////BAAAAAAAAP//////AAAAAAAABP////////////8A//////////////8sAAAAAAAAzP///9QAAAAAAAAw/////////////wD//////////////3wAAAAAAAAoyP/YNAAAAAAAAIT/////////////AP//////////////7BgAAAAAAAAAAAAAAAAAAAAc8P////////////8A////////////////xBgAAAAAAAAAAAAAAAAAGNj//////////////wD/////////////////tAQAAAAAAAAAAAAAAACo////////////////AP///////////////HAAAAAAAAAAAAAAAAAAAAB8//////////////8A//////////////9gAAAAAAAAAAAAAAAAAAAAAAB8/////////////wD/////////////wAAAAAAAAABk4P/UWAAAAAAAAATQ////////////AP////////////9UAAAAAAAAaP//////XAAAAAAAAGT///////////8A/////////////xgAAAAAAADg///////cAAAAAAAAJP///////////wD/////////////AAAAAAAAAP////////8AAAAAAAAA////////////AP////////////8AAAAAAAAA4P//////3AAAAAAAAAT///////////8A/////////////ygAAAAAAABg//////9cAAAAAAAALP///////////wD/////////////ZAAAAAAAAABY1P/cXAAAAAAAAABw////////////AP/////////////QAAAAAAAAAAAAAAAAAAAAAAAABNz///////////8A//////////////9gAAAAAAAAAAAAAAAAAAAAAAB0/////////////wD///////////////Q8AAAAAAAAAAAAAAAAAAAAUPz/////////////AP////////////////x4CAAAAAAAAAAAAAAAEIT8//////////////8A///////////////////smFQwGAAAABg0ZKT0/////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'9' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////////////////ysYCwMAAAUNGiw/P//////////////////AP////////////////+4JAAAAAAAAAAAAAAkuP////////////////8A////////////////lAQAAAAAAAAAAAAAAAAAkP///////////////wD//////////////8AEAAAAAAAAAAAAAAAAAAAAqP//////////////AP/////////////8JAAAAAAAAAAAAAAAAAAAAAAQ7P////////////8A/////////////6wAAAAAAAAAfOz8vCwAAAAAAABw/////////////wD/////////////WAAAAAAAAHD/////7BgAAAAAAAz4////////////AP////////////8kAAAAAAAA1P//////hAAAAAAAALT///////////8A/////////////wAAAAAAAAD///////+4AAAAAAAAcP///////////wD/////////////AAAAAAAAAPz//////8AAAAAAAABI////////////AP////////////8UAAAAAAAAzP//////lAAAAAAAACT///////////8A/////////////0QAAAAAAABY//////gsAAAAAAAADP///////////wD/////////////kAAAAAAAAABw5P/IPAAAAAAAAAAA////////////AP/////////////wEAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A//////////////+UAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD///////////////9wAAAAAAAAAAAAAFAAAAAAAAAU////////////AP////////////////+IBAAAAAAAAABw3AAAAAAAACj///////////8A///////////////////cdCwEABhcxP+8AAAAAAAATP///////////wD//////////////////////////////5AAAAAAAAB4////////////AP//////////////////////////////UAAAAAAAALj///////////8A//////////////+kgGxUQCAM2P///+AIAAAAAAAQ+P///////////wD//////////////0gAAAAAAAA42P/EKAAAAAAAAHD/////////////AP//////////////sAAAAAAAAAAAAAAAAAAAAAAQ6P////////////8A////////////////TAAAAAAAAAAAAAAAAAAAAKz//////////////wD////////////////oKAAAAAAAAAAAAAAAAASU////////////////AP/////////////////sUAAAAAAAAAAAAAAwxP////////////////8A////////////////////yHA0FAAADCxktP///////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'A' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD//////////////////+QAAAAAAAAAAAAAAOT/////////////////AP//////////////////kAAAAAAAAAAAAAAAkP////////////////8A//////////////////88AAAAAAAAAAAAAAA8/////////////////wD/////////////////5AAAAAAAAAAAAAAAAADk////////////////AP////////////////+QAAAAAAAAAAAAAAAAAJD///////////////8A/////////////////zwAAAAAAAAAAAAAAAAAPP///////////////wD////////////////kAAAAAAAAAAgAAAAAAAAA5P//////////////AP///////////////5AAAAAAAAAAgAAAAAAAAACQ//////////////8A////////////////PAAAAAAAAAz8HAAAAAAAADz//////////////wD//////////////+QAAAAAAAAAWP9kAAAAAAAAANz/////////////AP//////////////kAAAAAAAAACk/7wAAAAAAAAAhP////////////8A//////////////88AAAAAAAABOz//BQAAAAAAAAw/////////////wD/////////////4AAAAAAAAAA8////ZAAAAAAAAADc////////////AP////////////+EAAAAAAAAAIj///+8AAAAAAAAAIT///////////8A/////////////zAAAAAAAAAA2P////wQAAAAAAAAMP///////////wD////////////cAAAAAAAAACT//////1wAAAAAAAAA3P//////////AP///////////4QAAAAAAAAAAAAAAAAAAAAAAAAAAACE//////////8A////////////MAAAAAAAAAAAAAAAAAAAAAAAAAAAADD//////////wD//////////9wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANz/////////AP//////////hAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhP////////8A//////////8wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAw/////////wD/////////3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADc////////AP////////+EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIT///////8A/////////zAAAAAAAAAAhP///////////2QAAAAAAAAAMP///////wD////////cAAAAAAAAAADM////////////vAAAAAAAAAAA3P//////AP///////4QAAAAAAAAAHP/////////////4DAAAAAAAAACE//////8A////////MAAAAAAAAABk//////////////9cAAAAAAAAADD//////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'B' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAEDh83P///////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAEhP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAeP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAxP///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAABY////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAABT///////////8A//////////8AAAAAAAAAAP/////4zEwAAAAAAAAAAP///////////wD//////////wAAAAAAAAAA////////7AAAAAAAAAAQ////////////AP//////////AAAAAAAAAAD////////sAAAAAAAAAEj///////////8A//////////8AAAAAAAAAAP/////4zEQAAAAAAAAAtP///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAFz/////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAiA/P////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAIjPj//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAGKz/////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAJT///////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAABNz//////////wD//////////wAAAAAAAAAA///////sqCAAAAAAAAAAbP//////////AP//////////AAAAAAAAAAD/////////yAAAAAAAAAAs//////////8A//////////8AAAAAAAAAAP//////////AAAAAAAAAAT//////////wD//////////wAAAAAAAAAA/////////7wAAAAAAAAAAP//////////AP//////////AAAAAAAAAAD//////+ikGAAAAAAAAAAY//////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFT//////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsP//////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAADj///////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAc6P///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAATOj/////////////AP//////////AAAAAAAAAAAAAAAAAAAEIEBkkNj///////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'C' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP//////////////////5JRULBAAAAgkTIDQ//////////////////8A////////////////1FAAAAAAAAAAAAAAAABAyP///////////////wD//////////////4gEAAAAAAAAAAAAAAAAAAAElP//////////////AP////////////9wAAAAAAAAAAAAAAAAAAAAAAAAlP////////////8A////////////kAAAAAAAAAAAAAAAAAAAAAAAAAAEyP///////////wD//////////9wIAAAAAAAAAAAAAAAAAAAAAAAAAAAw////////////AP//////////WAAAAAAAAAAAWMz/8JwQAAAAAAAAAACw//////////8A/////////+wEAAAAAAAAAID//////9QMAAAAAAAAAET//////////wD/////////nAAAAAAAAAAo/P///////3wAAAAABDBspP//////////AP////////9gAAAAAAAAAIz/////////3BxQjMT0//////////////8A/////////zQAAAAAAAAAzP///////////////////////////////wD/////////GAAAAAAAAADo////////////////////////////////AP////////8AAAAAAAAAAP////////////////////////////////8A/////////wAAAAAAAAAA/////////////////////////////////wD/////////AAAAAAAAAAD/////////////////////////////////AP////////8cAAAAAAAAAOj///////////////////////////////8A/////////zgAAAAAAAAA0P/////////kIGio7P///////////////wD/////////bAAAAAAAAACg/////////5wAAAAAMHS49P//////////AP////////+oAAAAAAAAAEz/////////PAAAAAAAAAAc//////////8A//////////QIAAAAAAAAALz//////6QAAAAAAAAAAGT//////////wD//////////3AAAAAAAAAADIzo/+SEBAAAAAAAAAAAyP//////////AP//////////7BAAAAAAAAAAAAAAAAAAAAAAAAAAAED///////////8A////////////rAAAAAAAAAAAAAAAAAAAAAAAAAAE0P///////////wD/////////////fAAAAAAAAAAAAAAAAAAAAAAAAJz/////////////AP//////////////iAQAAAAAAAAAAAAAAAAAAASY//////////////8A////////////////yEAAAAAAAAAAAAAAAAA8yP///////////////wD//////////////////9yIUCwQAAAAIEB4yP//////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'D' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////////8AAAAAAAAAAAAAAAAADChQkOT/////////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAABGjw//////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAACDY/////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAABjk////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAED///////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAKj//////////wD///////////8AAAAAAAAAAP///+isSAAAAAAAAAAANP//////////AP///////////wAAAAAAAAAA////////hAAAAAAAAAAA2P////////8A////////////AAAAAAAAAAD/////////MAAAAAAAAACQ/////////wD///////////8AAAAAAAAAAP////////+MAAAAAAAAAFj/////////AP///////////wAAAAAAAAAA/////////8gAAAAAAAAAMP////////8A////////////AAAAAAAAAAD/////////5AAAAAAAAAAY/////////wD///////////8AAAAAAAAAAP//////////AAAAAAAAAAD/////////AP///////////wAAAAAAAAAA//////////8AAAAAAAAAAP////////8A////////////AAAAAAAAAAD//////////wAAAAAAAAAA/////////wD///////////8AAAAAAAAAAP/////////wAAAAAAAAABD/////////AP///////////wAAAAAAAAAA/////////9QAAAAAAAAAJP////////8A////////////AAAAAAAAAAD/////////qAAAAAAAAABI/////////wD///////////8AAAAAAAAAAP////////9QAAAAAAAAAHj/////////AP///////////wAAAAAAAAAA////////uAAAAAAAAAAAvP////////8A////////////AAAAAAAAAAD////w0HwEAAAAAAAAACT8/////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAoP//////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAADz8//////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAY6P///////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAKNz/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAACHT0//////////////8A////////////AAAAAAAAAAAAAAAAABg4bKj0/////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'E' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP//////////AAAAAAAAAAD///////////////////////////////8A//////////8AAAAAAAAAAP///////////////////////////////wD//////////wAAAAAAAAAA////////////////////////////////AP//////////AAAAAAAAAAD///////////////////////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////8AAAAAAAAAAP///////////////////////////////wD//////////wAAAAAAAAAA////////////////////////////////AP//////////AAAAAAAAAAD///////////////////////////////8A//////////8AAAAAAAAAAP///////////////////////////////wD//////////wAAAAAAAAAA////////////////////////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'F' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'G' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD//////////////////MB8TCgQAAAACCA4YJzs////////////////AP///////////////JQcAAAAAAAAAAAAAAAAAAhw8P////////////8A/////////////9gwAAAAAAAAAAAAAAAAAAAAAAAk2P///////////wD////////////EDAAAAAAAAAAAAAAAAAAAAAAAAAAc7P//////////AP//////////2AwAAAAAAAAAAAAAAAAAAAAAAAAAAABY//////////8A//////////wwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQ/////////wD/////////kAAAAAAAAAAAEHzQ/P/gmCAAAAAAAAAAAFz/////////AP////////wcAAAAAAAAACjg////////8CwAAAAAAAAgWP////////8A////////vAAAAAAAAAAI2P//////////yBRAcJjI8P///////////wD///////94AAAAAAAAAGD/////////////////////////////////AP///////0AAAAAAAAAAsP////////////////////////////////8A////////IAAAAAAAAADc/////////////////////////////////wD///////8AAAAAAAAAAP///////wAAAAAAAAAAAAAAAAD/////////AP///////wAAAAAAAAAA////////AAAAAAAAAAAAAAAAAP////////8A////////AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAA/////////wD///////8gAAAAAAAAAOD//////wAAAAAAAAAAAAAAAAD/////////AP///////0AAAAAAAAAAtP//////AAAAAAAAAAAAAAAAAP////////8A////////cAAAAAAAAABw//////8AAAAAAAAAAAAAAAAA/////////wD///////+8AAAAAAAAABDs////////////AAAAAAAAAAD/////////AP////////wYAAAAAAAAADz0//////////AAAAAAAAAAAP////////8A/////////5AAAAAAAAAAACCY4P//3KhcCAAAAAAAAAAA/////////wD/////////+CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AP//////////xAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIP////////8A////////////rAQAAAAAAAAAAAAAAAAAAAAAAAAAAGTw/////////wD/////////////vBQAAAAAAAAAAAAAAAAAAAAAADjI////////////AP//////////////8HAQAAAAAAAAAAAAAAAAAEiw//////////////8A//////////////////iwcEAgBAAABCA4aKDk/////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'H' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'I' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'J' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAj//////////////wD//////////+zMrIxwUDAQ//////wAAAAAAAAAIP//////////////AP//////////DAAAAAAAAADo////2AAAAAAAAAA0//////////////8A//////////8wAAAAAAAAAKj///+YAAAAAAAAAFj//////////////wD//////////2gAAAAAAAAAIND/yBgAAAAAAAAAkP//////////////AP//////////vAAAAAAAAAAAAAAAAAAAAAAAAADc//////////////8A////////////MAAAAAAAAAAAAAAAAAAAAAAAUP///////////////wD////////////EBAAAAAAAAAAAAAAAAAAAABjk////////////////AP////////////+sBAAAAAAAAAAAAAAAAAAY2P////////////////8A///////////////EMAAAAAAAAAAAAAAAVOj//////////////////wD/////////////////vHBAIAAAABg8fNT/////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'K' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////8AAAAAAAAAAP//////////wAQAAAAAAAAAAABw////////AP///////wAAAAAAAAAA/////////9AMAAAAAAAAAAAAcP////////8A////////AAAAAAAAAAD////////cGAAAAAAAAAAAAHD//////////wD///////8AAAAAAAAAAP//////6CgAAAAAAAAAAABs////////////AP///////wAAAAAAAAAA//////Q0AAAAAAAAAAAAVPz///////////8A////////AAAAAAAAAAD////8RAAAAAAAAAAAAFT8/////////////wD///////8AAAAAAAAAAP///1gAAAAAAAAAAABU/P//////////////AP///////wAAAAAAAAAA//9wAAAAAAAAAAAASPz///////////////8A////////AAAAAAAAAAD/jAAAAAAAAAAAADz0/////////////////wD///////8AAAAAAAAAAKQAAAAAAAAAAAA89P//////////////////AP///////wAAAAAAAAAABAAAAAAAAAAAFPT///////////////////8A////////AAAAAAAAAAAAAAAAAAAAAAAApP///////////////////wD///////8AAAAAAAAAAAAAAAAAAAAAAAAU8P//////////////////AP///////wAAAAAAAAAAAAAAAAAAAAAAAABk//////////////////8A////////AAAAAAAAAAAAAAAAAAAAAAAAAADE/////////////////wD///////8AAAAAAAAAAAAAAAAoEAAAAAAAACz8////////////////AP///////wAAAAAAAAAAAAAAGNiAAAAAAAAAAIj///////////////8A////////AAAAAAAAAAAAABjY//gYAAAAAAAACOD//////////////wD///////8AAAAAAAAAAAAY2P///5wAAAAAAAAASP//////////////AP///////wAAAAAAAAAAGNj//////CgAAAAAAAAAqP////////////8A////////AAAAAAAAAADI////////sAAAAAAAAAAc8P///////////wD///////8AAAAAAAAAAP//////////QAAAAAAAAABs////////////AP///////wAAAAAAAAAA///////////IAAAAAAAAAATI//////////8A////////AAAAAAAAAAD///////////9YAAAAAAAAADD8/////////wD///////8AAAAAAAAAAP///////////9wEAAAAAAAAAJD/////////AP///////wAAAAAAAAAA/////////////3AAAAAAAAAADOT///////8A////////AAAAAAAAAAD/////////////7BAAAAAAAAAAUP///////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'L' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'M' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A//////8AAAAAAAAAAAAAAHz//////3wAAAAAAAAAAAAAAP///////wD//////wAAAAAAAAAAAAAATP//////UAAAAAAAAAAAAAAA////////AP//////AAAAAAAAAAAAAAAc//////8cAAAAAAAAAAAAAAD///////8A//////8AAAAAAAAAAAAAAADw////8AAAAAAAAAAAAAAAAP///////wD//////wAAAAAAAAAAAAAAALz////AAAAAAAAAAAAAAAAA////////AP//////AAAAAAAAAAAAAAAAkP///5AAAAAAAAAAAAAAAAD///////8A//////8AAAAAAAAAAAAAAABc////ZAAAAAAAAAAAAAAAAP///////wD//////wAAAAAAAAAoAAAAADD///8wAAAAACQAAAAAAAAA////////AP//////AAAAAAAAAFwAAAAABPz//AgAAAAAXAAAAAAAAAD///////8A//////8AAAAAAAAAkAAAAAAA0P/UAAAAAACQAAAAAAAAAP///////wD//////wAAAAAAAADMAAAAAACg/6gAAAAAAMQAAAAAAAAA////////AP//////AAAAAAAAAPgEAAAAAHD/dAAAAAAE+AAAAAAAAAD///////8A//////8AAAAAAAAA/zQAAAAAQP9IAAAAADD/AAAAAAAAAP///////wD//////wAAAAAAAAD/bAAAAAAQ/xQAAAAAaP8AAAAAAAAA////////AP//////AAAAAAAAAP+gAAAAAADQAAAAAACc/wAAAAAAAAD///////8A//////8AAAAAAAAA/9QAAAAAAGgAAAAAAND/AAAAAAAAAP///////wD//////wAAAAAAAAD//wwAAAAAFAAAAAAM/P8AAAAAAAAA////////AP//////AAAAAAAAAP//RAAAAAAAAAAAADz//wAAAAAAAAD///////8A//////8AAAAAAAAA//94AAAAAAAAAAAAcP//AAAAAAAAAP///////wD//////wAAAAAAAAD//7AAAAAAAAAAAACo//8AAAAAAAAA////////AP//////AAAAAAAAAP//5AAAAAAAAAAAANz//wAAAAAAAAD///////8A//////8AAAAAAAAA////HAAAAAAAAAAQ////AAAAAAAAAP///////wD//////wAAAAAAAAD///9QAAAAAAAAAEz///8AAAAAAAAA////////AP//////AAAAAAAAAP///4gAAAAAAAAAfP///wAAAAAAAAD///////8A//////8AAAAAAAAA////vAAAAAAAAACw////AAAAAAAAAP///////wD//////wAAAAAAAAD////wAAAAAAAAAOz///8AAAAAAAAA////////AP//////AAAAAAAAAP////8sAAAAAAAc/////wAAAAAAAAD///////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'N' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////AAAAAAAAALD/////////////AAAAAAAAAP//////////AP////////8AAAAAAAAAFOj///////////8AAAAAAAAA//////////8A/////////wAAAAAAAAAASP///////////wAAAAAAAAD//////////wD/////////AAAAAAAAAAAAkP//////////AAAAAAAAAP//////////AP////////8AAAAAAAAAAAAI1P////////8AAAAAAAAA//////////8A/////////wAAAAAAAAAAAAAw+P///////wAAAAAAAAD//////////wD/////////AAAAAAAAAAAAAABw////////AAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAC8//////8AAAAAAAAA//////////8A/////////wAAAAAAAAAAAAAAABzs/////wAAAAAAAAD//////////wD/////////AAAAAAAAAAAAAAAAAFD/////AAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAAAAJz///8AAAAAAAAA//////////8A/////////wAAAAAAAAAUAAAAAAAADNz//wAAAAAAAAD//////////wD/////////AAAAAAAAALQAAAAAAAAANPz/AAAAAAAAAP//////////AP////////8AAAAAAAAA/2wAAAAAAAAAfP8AAAAAAAAA//////////8A/////////wAAAAAAAAD/+CwAAAAAAAAExAAAAAAAAAD//////////wD/////////AAAAAAAAAP//0AQAAAAAAAAgAAAAAAAAAP//////////AP////////8AAAAAAAAA////jAAAAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAD/////RAAAAAAAAAAAAAAAAAD//////////wD/////////AAAAAAAAAP/////kFAAAAAAAAAAAAAAAAP//////////AP////////8AAAAAAAAA//////+sAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAD///////9kAAAAAAAAAAAAAAD//////////wD/////////AAAAAAAAAP////////QkAAAAAAAAAAAAAP//////////AP////////8AAAAAAAAA/////////8wEAAAAAAAAAAAA//////////8A/////////wAAAAAAAAD//////////4QAAAAAAAAAAAD//////////wD/////////AAAAAAAAAP///////////DwAAAAAAAAAAP//////////AP////////8AAAAAAAAA////////////4BAAAAAAAAAA//////////8A/////////wAAAAAAAAD/////////////qAAAAAAAAAD//////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'O' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A///////////////////0qGw4HAAAABw4aKT0/////////////////wD////////////////wcAwAAAAAAAAAAAAAAAho6P//////////////AP//////////////uBQAAAAAAAAAAAAAAAAAAAAMoP////////////8A/////////////6AEAAAAAAAAAAAAAAAAAAAAAAAAkP///////////wD///////////+4BAAAAAAAAAAAAAAAAAAAAAAAAAAAoP//////////AP//////////8BQAAAAAAAAAAAAAAAAAAAAAAAAAAAAM5P////////8A//////////9wAAAAAAAAAAAsrPD/7KQsAAAAAAAAAABg/////////wD/////////+BAAAAAAAAAAUPj///////hQAAAAAAAAAAjs////////AP////////+sAAAAAAAAABDw//////////AYAAAAAAAAAKD///////8A/////////2wAAAAAAAAAdP///////////3wAAAAAAAAAYP///////wD/////////OAAAAAAAAAC4////////////xAAAAAAAAAAw////////AP////////8cAAAAAAAAAOD////////////oAAAAAAAAABT///////8A/////////wAAAAAAAAAA//////////////8AAAAAAAAAAP///////wD/////////AAAAAAAAAAD//////////////wAAAAAAAAAA////////AP////////8AAAAAAAAAAP/////////////8AAAAAAAAAAD///////8A/////////xwAAAAAAAAA5P///////////+AAAAAAAAAAHP///////wD/////////NAAAAAAAAAC8////////////uAAAAAAAAAA4////////AP////////9oAAAAAAAAAHj///////////98AAAAAAAAAGT///////8A/////////6gAAAAAAAAAGPD/////////+BgAAAAAAAAApP///////wD/////////9AwAAAAAAAAAUPz///////xcAAAAAAAAAAjs////////AP//////////cAAAAAAAAAAALKjs//CwOAAAAAAAAAAAYP////////8A///////////wFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzk/////////wD///////////+4BAAAAAAAAAAAAAAAAAAAAAAAAAAAoP//////////AP////////////+QAAAAAAAAAAAAAAAAAAAAAAAAAJD///////////8A//////////////+sEAAAAAAAAAAAAAAAAAAAAAyg/////////////wD////////////////oZAgAAAAAAAAAAAAAAARg4P//////////////AP//////////////////9KhsOCAAAAAUMFyc7P////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'P' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP///////////wAAAAAAAAAAAAAAAAAACCxguP////////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAOOD//////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAGOD/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAARP////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAxP///////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAABo////////////AP///////////wAAAAAAAAAA////6JwMAAAAAAAAADD///////////8A////////////AAAAAAAAAAD//////6AAAAAAAAAADP///////////wD///////////8AAAAAAAAAAP//////9AAAAAAAAAAA////////////AP///////////wAAAAAAAAAA///////0AAAAAAAAAAD///////////8A////////////AAAAAAAAAAD//////5gAAAAAAAAAHP///////////wD///////////8AAAAAAAAAAP///9iICAAAAAAAAABI////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAJD///////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAI6P///////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAIT/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAABU/P////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAIhPz//////////////wD///////////8AAAAAAAAAAAAAAAAABCRMkOz/////////////////AP///////////wAAAAAAAAAA//////////////////////////////8A////////////AAAAAAAAAAD//////////////////////////////wD///////////8AAAAAAAAAAP//////////////////////////////AP///////////wAAAAAAAAAA//////////////////////////////8A////////////AAAAAAAAAAD//////////////////////////////wD///////////8AAAAAAAAAAP//////////////////////////////AP///////////wAAAAAAAAAA//////////////////////////////8A////////////AAAAAAAAAAD//////////////////////////////wD///////////8AAAAAAAAAAP//////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'Q' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////SoaDQcAAAAHDhoqPT///////////////////8A//////////////BwDAAAAAAAAAAAAAAACHDo/////////////////wD///////////+4FAAAAAAAAAAAAAAAAAAAABCo////////////////AP//////////nAQAAAAAAAAAAAAAAAAAAAAAAACQ//////////////8A/////////7gEAAAAAAAAAAAAAAAAAAAAAAAAAACg/////////////wD////////wFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzo////////////AP///////3AAAAAAAAAAACyo8P/sqCwAAAAAAAAAAGT///////////8A///////4EAAAAAAAAABM+P///////FQAAAAAAAAACPT//////////wD//////7AAAAAAAAAAFPD/////////9BgAAAAAAAAApP//////////AP//////bAAAAAAAAAB4////////////fAAAAAAAAABk//////////8A//////84AAAAAAAAALz///////////+8AAAAAAAAADT//////////wD//////xwAAAAAAAAA6P///////////+QAAAAAAAAAHP//////////AP//////AAAAAAAAAAD//////////////wAAAAAAAAAA//////////8A//////8AAAAAAAAAAP//////////////AAAAAAAAAAD//////////wD//////wAAAAAAAAAA/P////////////8AAAAAAAAAAP//////////AP//////GAAAAAAAAADg////////////4AAAAAAAAAAc//////////8A//////84AAAAAAAAALT////MJHTo//+8AAAAAAAAADT//////////wD//////2wAAAAAAAAAdP///2AAABCg/3wAAAAAAAAAZP//////////AP//////rAAAAAAAAAAY9P/sCAAAAABMGAAAAAAAAACk//////////8A///////4EAAAAAAAAABU/P+0OAAAAAAAAAAAAAAACPT//////////wD///////94AAAAAAAAAAA4sPD/gAAAAAAAAAAAAABk////////////AP////////AcAAAAAAAAAAAAAAAAAAAAAAAAAAAADOT///////////8A/////////7wEAAAAAAAAAAAAAAAAAAAAAAAAAACQ/////////////wD//////////6wEAAAAAAAAAAAAAAAAAAAAAAAAABSs////////////AP///////////7gUAAAAAAAAAAAAAAAAAAAAAAAAAABAwP////////8A//////////////BwDAAAAAAAAAAAAAAABAgAAAAAAAA8/////////wD////////////////0qGg0GAAAABgwXJjkxBgAAAAAALD/////////AP//////////////////////////////////5DQAAAAk/P////////8A////////////////////////////////////+GwAAJD//////////wD//////////////////////////////////////8A49P//////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'R' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////wAAAAAAAAAAAAAAAAAAAAQgOGSk+P///////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAcuP//////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAEsP////////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ6P///////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAADD///////////8A/////////wAAAAAAAAAA///////svDgAAAAAAAAACP///////////wD/////////AAAAAAAAAAD/////////7AAAAAAAAAAA////////////AP////////8AAAAAAAAAAP/////////cAAAAAAAAABD///////////8A/////////wAAAAAAAAAA//////DQoCQAAAAAAAAAQP///////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAACU////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAIPj///////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAzU/////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAA02P//////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAxctPz///////////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAEDY/////////////////wD/////////AAAAAAAAAAD/9LAsAAAAAAAAAAzc////////////////AP////////8AAAAAAAAAAP///+wkAAAAAAAAADD8//////////////8A/////////wAAAAAAAAAA/////8QAAAAAAAAAAJD//////////////wD/////////AAAAAAAAAAD//////1QAAAAAAAAAFPD/////////////AP////////8AAAAAAAAAAP//////3AQAAAAAAAAAgP////////////8A/////////wAAAAAAAAAA////////aAAAAAAAAAAM6P///////////wD/////////AAAAAAAAAAD////////oCAAAAAAAAABs////////////AP////////8AAAAAAAAAAP////////+AAAAAAAAAAATc//////////8A/////////wAAAAAAAAAA//////////AUAAAAAAAAAFj//////////wD/////////AAAAAAAAAAD//////////5AAAAAAAAAAAND/////////AP////////8AAAAAAAAAAP//////////+CQAAAAAAAAAQP////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'S' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP/////////////////8vHBEIAgAAAQgQHC8/P////////////////8A////////////////pCQAAAAAAAAAAAAAAAAcoP///////////////wD//////////////FwAAAAAAAAAAAAAAAAAAAAAXP//////////////AP////////////9oAAAAAAAAAAAAAAAAAAAAAAAAhP////////////8A////////////zAAAAAAAAAAAAAAAAAAAAAAAAAAI6P///////////wD///////////9cAAAAAAAAAAAAAAAAAAAAAAAAAACA////////////AP///////////xgAAAAAAAAAUOD/8KwkAAAAAAAAADj///////////8A////////////AAAAAAAAAAD0/////8wABCAgICxASP///////////wD///////////8MAAAAAAAAAMz/////////////////////////////AP///////////0AAAAAAAAAACFiQxPT///////////////////////8A////////////oAAAAAAAAAAAAAAAADBwtPT//////////////////wD////////////8QAAAAAAAAAAAAAAAAAAACFTA////////////////AP/////////////oOAAAAAAAAAAAAAAAAAAAAABM6P////////////8A///////////////4fAgAAAAAAAAAAAAAAAAAAAAY2P///////////wD/////////////////7IwwAAAAAAAAAAAAAAAAAAAo+P//////////AP/////////////////////koGw0BAAAAAAAAAAAAACU//////////8A///////////////////////////4uFgAAAAAAAAAADz//////////wD//////////2BgSEA0IBwA6P///////5QAAAAAAAAADP//////////AP//////////JAAAAAAAAACc/////////AAAAAAAAAAA//////////8A//////////9YAAAAAAAAACDo///////AAAAAAAAAABT//////////wD//////////6QAAAAAAAAAACCk7P/snBQAAAAAAAAAUP//////////AP//////////+BAAAAAAAAAAAAAAAAAAAAAAAAAAAACs//////////8A////////////kAAAAAAAAAAAAAAAAAAAAAAAAAAAOP///////////wD////////////8RAAAAAAAAAAAAAAAAAAAAAAAABjc////////////AP/////////////0PAAAAAAAAAAAAAAAAAAAAAAg2P////////////8A///////////////8hBQAAAAAAAAAAAAAAAAMdPT//////////////wD/////////////////+LRwSCAMAAAAHDhoqPT/////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'T' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'U' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////JAAAAAAAAADk/////////+gAAAAAAAAAHP//////////AP////////9MAAAAAAAAAJz/////////nAAAAAAAAABE//////////8A/////////4gAAAAAAAAAHOj//////+ggAAAAAAAAAHz//////////wD/////////0AAAAAAAAAAAIJzs/+ykIAAAAAAAAAAA0P//////////AP//////////QAAAAAAAAAAAAAAAAAAAAAAAAAAAAED///////////8A///////////IBAAAAAAAAAAAAAAAAAAAAAAAAAAE0P///////////wD///////////+YAAAAAAAAAAAAAAAAAAAAAAAAAJj/////////////AP////////////+UBAAAAAAAAAAAAAAAAAAAAASU//////////////8A///////////////IPAAAAAAAAAAAAAAAAAAwyP///////////////wD/////////////////0IxYOCAIAAAEIEiAyP//////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'V' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD//////zAAAAAAAAAAYP//////////////ZAAAAAAAAAAw////////AP//////kAAAAAAAAAAU/P////////////8UAAAAAAAAAJD///////8A///////oBAAAAAAAAADE////////////xAAAAAAAAAAE7P///////wD///////9MAAAAAAAAAHD///////////94AAAAAAAAAEz/////////AP///////6gAAAAAAAAAJP///////////yQAAAAAAAAArP////////8A////////+BAAAAAAAAAA1P/////////YAAAAAAAAABT4/////////wD/////////aAAAAAAAAACE/////////4QAAAAAAAAAbP//////////AP/////////EAAAAAAAAADT/////////OAAAAAAAAADM//////////8A//////////8kAAAAAAAAAOT//////+QAAAAAAAAAKP///////////wD//////////4QAAAAAAAAAmP//////nAAAAAAAAACI////////////AP//////////5AAAAAAAAABE//////9EAAAAAAAABOT///////////8A////////////QAAAAAAAAAT0////9AgAAAAAAABI/////////////wD///////////+gAAAAAAAAAKT///+kAAAAAAAAAKj/////////////AP////////////QIAAAAAAAAXP///1wAAAAAAAAM+P////////////8A/////////////1wAAAAAAAAM+P/8DAAAAAAAAGT//////////////wD/////////////vAAAAAAAAAC8/7wAAAAAAAAAxP//////////////AP//////////////HAAAAAAAAGj/aAAAAAAAACT///////////////8A//////////////94AAAAAAAAHP8cAAAAAAAAhP///////////////wD//////////////9gAAAAAAAAAkAAAAAAAAADk////////////////AP///////////////zgAAAAAAAAQAAAAAAAAQP////////////////8A////////////////lAAAAAAAAAAAAAAAAACg/////////////////wD////////////////sCAAAAAAAAAAAAAAADPT/////////////////AP////////////////9QAAAAAAAAAAAAAABg//////////////////8A/////////////////7AAAAAAAAAAAAAAAMD//////////////////wD//////////////////BQAAAAAAAAAAAAc////////////////////AP//////////////////cAAAAAAAAAAAAHz///////////////////8A///////////////////MAAAAAAAAAAAA3P///////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'W' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A//8cAAAAAAAAALz/////4AAAAAAAAAAA6P////+8AAAAAAAAABz//wD//1QAAAAAAAAAjP////+gAAAAAAAAAACo/////4wAAAAAAAAAUP//AP//jAAAAAAAAABU/////2AAAAAAAAAAAGj/////VAAAAAAAAACM//8A///EAAAAAAAAACT/////IAAAAAAAAAAAKP////8kAAAAAAAAAMT//wD///gEAAAAAAAAAPD//+AAAAAAAAAAAAAA6P//8AAAAAAAAAAE9P//AP///zAAAAAAAAAAvP//oAAAAAAAAAAAAACo//+8AAAAAAAAADD///8A////bAAAAAAAAACM//9gAAAAAAAAAAAAAGT//4wAAAAAAAAAaP///wD///+kAAAAAAAAAFT//yAAAAAAAAAAAAAAIP//VAAAAAAAAACc////AP///9gAAAAAAAAAJP/gAAAAAAAAAAAAAAAA4P8kAAAAAAAAANT///8A/////xAAAAAAAAAA8KAAAAAAAAAAAAAAAACg8AAAAAAAAAAQ/////wD/////TAAAAAAAAAC8YAAAAAAAAAAAAAAAAGC8AAAAAAAAAET/////AP////+AAAAAAAAAAIwgAAAAAAAAAAAAAAAAIIwAAAAAAAAAfP////8A/////7gAAAAAAAAANAAAAAAAACwwAAAAAAAANAAAAAAAAACw/////wD/////8AAAAAAAAAAAAAAAAAAAdHgAAAAAAAAAAAAAAAAAAOz/////AP//////KAAAAAAAAAAAAAAAAAC4vAAAAAAAAAAAAAAAAAAg//////8A//////9gAAAAAAAAAAAAAAAACPj4CAAAAAAAAAAAAAAAAFj//////wD//////5QAAAAAAAAAAAAAAABE//9IAAAAAAAAAAAAAAAAkP//////AP//////0AAAAAAAAAAAAAAAAIj//4wAAAAAAAAAAAAAAADI//////8A///////8DAAAAAAAAAAAAAAAzP//1AAAAAAAAAAAAAAABPj//////wD///////88AAAAAAAAAAAAABT/////GAAAAAAAAAAAAAA0////////AP///////3QAAAAAAAAAAAAAWP////9gAAAAAAAAAAAAAHD///////8A////////sAAAAAAAAAAAAACg/////6QAAAAAAAAAAAAApP///////wD////////kAAAAAAAAAAAAAOT/////6AAAAAAAAAAAAADc////////AP////////8cAAAAAAAAAAAo////////MAAAAAAAAAAAEP////////8A/////////1QAAAAAAAAAAHD///////94AAAAAAAAAABM/////////wD/////////jAAAAAAAAAAAtP///////7wAAAAAAAAAAID/////////AP/////////EAAAAAAAAAAT0////////+AgAAAAAAAAAuP////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'X' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////9UAAAAAAAAAKz///////////+sAAAAAAAAAFD/////////AP///////+QQAAAAAAAAFOT/////////8BwAAAAAAAAM5P////////8A/////////5gAAAAAAAAATP////////9kAAAAAAAAAJD//////////wD//////////0AAAAAAAAAAoP//////wAAAAAAAAAA0/P//////////AP//////////2AgAAAAAAAAQ4P////gkAAAAAAAABMz///////////8A////////////iAAAAAAAAABA////dAAAAAAAAABw/////////////wD////////////8MAAAAAAAAACU/9AEAAAAAAAAHPD/////////////AP/////////////IBAAAAAAAAAzYMAAAAAAAAACs//////////////8A//////////////90AAAAAAAAABAAAAAAAAAATP///////////////wD///////////////QgAAAAAAAAAAAAAAAAAAzg////////////////AP///////////////7wAAAAAAAAAAAAAAAAAjP////////////////8A/////////////////2AAAAAAAAAAAAAAADD8/////////////////wD/////////////////7BQAAAAAAAAAAAAEyP//////////////////AP/////////////////gDAAAAAAAAAAAAAjY//////////////////8A/////////////////0AAAAAAAAAAAAAAADj8/////////////////wD///////////////+UAAAAAAAAAAAAAAAAAJD/////////////////AP//////////////4AwAAAAAAAAAAAAAAAAADOD///////////////8A//////////////9AAAAAAAAAAAAAAAAAAAAAQP///////////////wD/////////////nAAAAAAAAAAAWAAAAAAAAAAAlP//////////////AP///////////+QQAAAAAAAAAGD/YAAAAAAAAAAM4P////////////8A////////////TAAAAAAAAAAs9P/0LAAAAAAAAABM/////////////wD//////////6AAAAAAAAAADNT////UDAAAAAAAAACg////////////AP/////////kEAAAAAAAAACg//////+gAAAAAAAAABDk//////////8A/////////0wAAAAAAAAAYP////////9gAAAAAAAAAEz//////////wD///////+oAAAAAAAAACz0//////////QsAAAAAAAAAKT/////////AP//////7BQAAAAAAAAM1P///////////9QMAAAAAAAAFOz///////8A//////9UAAAAAAAAAKD//////////////6AAAAAAAAAAVP///////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'Y' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP///////1QAAAAAAAAAAGj//////////2gAAAAAAAAAAFT///////8A////////5BAAAAAAAAAAAMT////////EAAAAAAAAAAAQ5P///////wD/////////mAAAAAAAAAAAKPj/////+CgAAAAAAAAAAJj/////////AP//////////PAAAAAAAAAAAgP////+AAAAAAAAAAAA8//////////8A///////////YCAAAAAAAAAAE2P//2AQAAAAAAAAACNj//////////wD///////////+AAAAAAAAAAAA4//84AAAAAAAAAACA////////////AP////////////woAAAAAAAAAACUlAAAAAAAAAAAKPz///////////8A/////////////8gAAAAAAAAAABAQAAAAAAAAAADI/////////////wD//////////////2wAAAAAAAAAAAAAAAAAAAAAbP//////////////AP//////////////8BwAAAAAAAAAAAAAAAAAABzw//////////////8A////////////////tAAAAAAAAAAAAAAAAAAAtP///////////////wD/////////////////VAAAAAAAAAAAAAAAAFT/////////////////AP/////////////////oEAAAAAAAAAAAAAAQ6P////////////////8A//////////////////+cAAAAAAAAAAAAAJz//////////////////wD///////////////////9AAAAAAAAAAABA////////////////////AP///////////////////9gAAAAAAAAAANj///////////////////8A/////////////////////wAAAAAAAAAA/////////////////////wD/////////////////////AAAAAAAAAAD/////////////////////AP////////////////////8AAAAAAAAAAP////////////////////8A/////////////////////wAAAAAAAAAA/////////////////////wD/////////////////////AAAAAAAAAAD/////////////////////AP////////////////////8AAAAAAAAAAP////////////////////8A/////////////////////wAAAAAAAAAA/////////////////////wD/////////////////////AAAAAAAAAAD/////////////////////AP////////////////////8AAAAAAAAAAP////////////////////8A/////////////////////wAAAAAAAAAA/////////////////////wD/////////////////////AAAAAAAAAAD/////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-			'Z' => array(
-				'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAQ//////////////8A/////////////////////////1AAAAAAAAAABLz//////////////wD///////////////////////98AAAAAAAAAACY////////////////AP//////////////////////pAAAAAAAAAAAaP////////////////8A/////////////////////8QIAAAAAAAAAET8/////////////////wD////////////////////gGAAAAAAAAAAo9P//////////////////AP//////////////////9CwAAAAAAAAAFNz///////////////////8A//////////////////xMAAAAAAAAAATA/////////////////////wD/////////////////eAAAAAAAAAAAnP//////////////////////AP///////////////5wAAAAAAAAAAHT///////////////////////8A///////////////ABAAAAAAAAABM/P///////////////////////wD/////////////3BQAAAAAAAAALPT/////////////////////////AP////////////QoAAAAAAAAABjg//////////////////////////8A///////////8SAAAAAAAAAAExP///////////////////////////wD//////////2wAAAAAAAAAAKD/////////////////////////////AP////////+YAAAAAAAAAAB8//////////////////////////////8A/////////wQAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=',
-				'width' => 40
-			),
-		);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/captcha/captcha_plugin.php b/phpBB/includes/captcha/captcha_plugin.php
deleted file mode 100644
index 3e8e508206..0000000000
--- a/phpBB/includes/captcha/captcha_plugin.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-interface phpbb_captcha_plugin
-{
-	/**
-	* Initiates the CAPTCHA to validate codes.
-	* @param int $type the type as defined in constants.php
-	*/
-	function init($type);
-
-
-	/**
-	* Returns true if the captcha will work on the current install
-	*/
-	static function is_available();
-
-	/**
-	* Returns the translated pretty name of the captcha.
-	*/
-	static function get_name();
-
-	/**
-	* Returns the class name of the captcha.
-	*/
-	static function get_class_name();
-
-	/**
-	* Returns an instance; does not have to be the same instance twice.
-	*/
-	static function get_instance();
-
-	/**
-	* Returns the HTML needed to embed the captcha in another template
-	*/
-	function get_template();
-
-
-	/**
-	* Delivers the image of image based captchas; not required for text/remote etc CAPTCHAs
-	*/
-	function execute();
-
-	/**
-	* Returns the HTML needed to display a demo of the captcha
-	*/
-	function get_demo_template($id);
-
-
-	/**
-	* Delivers the demo image of image based captchas; not required for text/remote etc CAPTCHAs
-	*/
-	function execute_demo();
-
-	/**
-	* Clears leftover entries in the database.
-	*/
-	static function garbage_collect($type);
-
-
-	/**
-	* Clears all entries from the database if the CAPTCHA is replaced
-	*/
-	function uninstall();
-
-	/**
-	* Sets up the CAPTCHA when it is selected in the ACP.
-	*/
-	function install();
-
-
-	/**
-	* Checks the captcha; returns false if the code was correct; a translated error string otherwise
-	*/
-	function validate();
-
-	/**
-	* Prepares the captcha to ask a new question; required call on failed answers
-	*/
-	function reset();
-
-	/**
-	* Displays the configuration options in the ACP
-	*/
-	function acp_page($id, &$module);
-
-	/**
-	* Returns the entries for the hidden field array needed to preserve the current state.
-	*/
-	function get_hidden_fields();
-
-
-	/**
-	* Returns the number of solving attempts of the current user
-	*/
-	function get_attempt_count();
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
deleted file mode 100644
index 4f494b9c69..0000000000
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-/**
-*
-* @package VC
-* @version $Id$
-* @copyright (c) 2006 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-
-/**
-* This class holds the code shared by the two default 3.0 CAPTCHAs.
-*/
-abstract class phpbb_default_captcha implements phpbb_captcha_plugin
-{
-	protected $confirm_id;
-	protected $confirm_code;
-	protected $code;
-	protected $seed;
-	protected $type;
-	protected $solved = false;
-
-	protected $min_chars = 4;
-	protected $max_chars = 7;
-
-	function init($type)
-	{
-		// read input
-		$this->confirm_id = request_var('confirm_id', '');
-		$this->confirm_code = request_var('confirm_code', '');
-		$this->type = (int) $type;
-
-		if (!strlen($this->confirm_id))
-		{
-			// we have no confirm ID, better get ready to display something
-			$this->generate_code();
-		}
-	}
-
-	function execute_demo()
-	{
-		$this->code = gen_rand_string(mt_rand($this->min_chars, $this->max_chars));
-		$this->seed = hexdec(substr(unique_id(), 4, 10));
-
-		// compute $seed % 0x7fffffff
-		$this->seed -= 0x7fffffff * floor($this->seed / 0x7fffffff);
-
-		captcha::execute($this->code, $this->seed);
-	}
-
-
-	function execute()
-	{
-		if (empty($this->code))
-		{
-			if (!$this->load_code())
-			{
-				// invalid request, bail out
-				return false;
-			}
-		}
-		captcha::execute($this->code, $this->seed);
-	}
-
-
-	function get_template()
-	{
-		phpbb::$template->set_filenames(array(
-			'captcha' => 'captcha_default.html',
-		));
-
-		phpbb::$template->assign_vars(array(
-			'CONFIRM_IMAGE'				=> append_sid('ucp', 'mode=confirm&amp;confirm_id=' . $this->confirm_id . '&amp;type=' . $this->type),
-			'CONFIRM_ID'				=> $this->confirm_id,
-		));
-
-		return phpbb::$template->assign_display('captcha');
-	}
-
-	function get_demo_template($id)
-	{
-		phpbb::$template->set_filenames(array(
-			'captcha_demo' => 'captcha_default_acp_demo.html',
-		));
-		// acp_captcha has a delivery function; let's use it
-		phpbb::$template->assign_vars(array(
-			'CONFIRM_IMAGE'		=> append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, 'captcha_demo=1&amp;mode=visual&amp;i=' . $id . '&amp;select_captcha=' . $this->get_class_name()),
-			'CONFIRM_ID'		=> $this->confirm_id,
-		));
-
-		return phpbb::$template->assign_display('captcha_demo');
-	}
-
-	function get_hidden_fields()
-	{
-		$hidden_fields = array();
-
-		// this is required for postig.php - otherwise we would forget about the captcha being already solved
-		if ($this->solved)
-		{
-			$hidden_fields['confirm_code'] = $this->confirm_code;
-		}
-		$hidden_fields['confirm_id'] = $this->confirm_id;
-		return $hidden_fields;
-	}
-
-	static function garbage_collect($type)
-	{
-		$sql = 'SELECT DISTINCT c.session_id
-				FROM ' . CONFIRM_TABLE . ' c
-				LEFT JOIN ' . SESSIONS_TABLE . ' s ON (c.session_id = s.session_id)
-				WHERE s.session_id IS NULL' .
-					((empty($type)) ? '' : ' AND c.confirm_type = ' . (int) $type);
-		$result = phpbb::$db->sql_query($sql);
-
-		if ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$sql_in = array();
-			do
-			{
-				$sql_in[] = (string) $row['session_id'];
-			}
-			while ($row = phpbb::$db->sql_fetchrow($result));
-
-			if (sizeof($sql_in))
-			{
-				$sql = 'DELETE FROM ' . CONFIRM_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('session_id', $sql_in);
-				phpbb::$db->sql_query($sql);
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	function uninstall()
-	{
-		self::garbage_collect(0);
-	}
-
-	function install()
-	{
-		return;
-	}
-
-	function validate()
-	{
-		$this->confirm_code = request_var('confirm_code', '');
-
-		if (!$this->confirm_id)
-		{
-			$error = phpbb::$user->lang['CONFIRM_CODE_WRONG'];
-		}
-		else
-		{
-			if ($this->check_code())
-			{
-				// $this->delete_code(); commented out to allow posting.php to repeat the question
-				$this->solved = true;
-			}
-			else
-			{
-				$error = phpbb::$user->lang['CONFIRM_CODE_WRONG'];
-			}
-		}
-
-		if (strlen($error))
-		{
-			// okay, inorect answer. Let's ask a new question
-			$this->generate_code();
-			return $error;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-
-	/**
-	* The old way to generate code, suitable for GD and non-GD. Resets the internal state.
-	*/
-	protected function generate_code()
-	{
-		$this->code = gen_rand_string(mt_rand($this->min_chars, $this->max_chars));
-		$this->confirm_id = md5(unique_id(phpbb::$user->ip));
-		$this->seed = hexdec(substr(unique_id(), 4, 10));
-		$this->solved = false;
-
-		// compute $seed % 0x7fffffff
-		$this->seed -= 0x7fffffff * floor($this->seed / 0x7fffffff);
-
-		$sql = 'INSERT INTO ' . CONFIRM_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', array(
-				'confirm_id'	=> (string) $this->confirm_id,
-				'session_id'	=> (string) phpbb::$user->session_id,
-				'confirm_type'	=> (int) $this->type,
-				'code'			=> (string) $this->code,
-				'seed'			=> (int) $this->seed)
-		);
-		phpbb::$db->sql_query($sql);
-	}
-
-	/**
-	* Look up everything we need for painting&checking.
-	*/
-	protected function load_code()
-	{
-		$sql = 'SELECT code, seed
-				FROM ' . CONFIRM_TABLE . "
-				WHERE confirm_id = '" . phpbb::$db->sql_escape($this->confirm_id) . "'
-				AND session_id = '" . phpbb::$db->sql_escape(phpbb::$user->session_id) . "'
-					AND confirm_type = " . $this->type;
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-		if ($row)
-		{
-			$this->code = $row['code'];
-			$this->seed = $row['seed'];
-			return true;
-		}
-		return false;
-
-	}
-
-	protected function check_code()
-	{
-		if (empty($this->code))
-		{
-			if (!$this->load_code())
-			{
-				return false;
-			}
-		}
-		return (strcasecmp($this->code, $this->confirm_code) === 0);
-	}
-
-	protected function delete_code()
-	{
-		$sql = 'DELETE FROM ' . CONFIRM_TABLE . "
-				WHERE confirm_id = '" . phpbb::$db->sql_escape($this->confirm_id) . "'
-					AND session_id = '" . phpbb::$db->sql_escape(phpbb::$user->session_id) . "'
-					AND confirm_type = " . $this->type;
-		phpbb::$db->sql_query($sql);
-	}
-
-	function get_attempt_count()
-	{
-		$sql = 'SELECT COUNT(session_id) AS attempts
-				FROM ' . CONFIRM_TABLE . "
-				WHERE session_id = '" . phpbb::$db->sql_escape(phpbb::$user->session_id) . "'
-					AND confirm_type = " . $this->type;
-		$result = phpbb::$db->sql_query($sql);
-		$attempts = (int) phpbb::$db->sql_fetchfield('attempts');
-		phpbb::$db->sql_freeresult($result);
-
-		return $attempts;
-	}
-
-
-	function reset()
-	{
-		$sql = 'DELETE FROM ' . CONFIRM_TABLE . "
-					WHERE session_id = '" . phpbb::$db->sql_escape(phpbb::$user->session_id) . "'
-						AND confirm_type = " . (int) $this->type;
-		phpbb::$db->sql_query($sql);
-
-		// we leave the class usable by generating a new question
-		$this->generate_code();
-	}
-
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
deleted file mode 100644
index f795349f3d..0000000000
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
-*
-* @package VC
-* @version $Id$
-* @copyright (c) 2006 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Placeholder for autoload
-*/
-include_once(PHPBB_ROOT_PATH . 'includes/captcha/plugins/captcha_abstract.' . PHP_EXT);
-
-class phpbb_captcha_gd extends phpbb_default_captcha implements phpbb_captcha_plugin
-{
-
-	function __construct()
-	{
-		include_once(PHPBB_ROOT_PATH . 'includes/captcha/captcha_gd.' . PHP_EXT);
-	}
-
-	public static function get_instance()
-	{
-		return new phpbb_captcha_gd();
-	}
-
-	static function is_available()
-	{
-		return (@extension_loaded('gd') || can_load_dll('gd'));
-	}
-
-	static function get_name()
-	{
-		return 'CAPTCHA_GD';
-	}
-
-	static function get_class_name()
-	{
-		return 'phpbb_captcha_gd';
-	}
-
-	function acp_page($id, &$module)
-	{
-		$captcha_vars = array(
-			'captcha_gd_x_grid'				=> 'CAPTCHA_GD_X_GRID',
-			'captcha_gd_y_grid'				=> 'CAPTCHA_GD_Y_GRID',
-			'captcha_gd_foreground_noise'	=> 'CAPTCHA_GD_FOREGROUND_NOISE',
-			'captcha_gd'					=> 'CAPTCHA_GD_PREVIEWED'
-		);
-
-		$module->tpl_name = 'captcha_gd_acp';
-		$module->page_title = 'ACP_VC_SETTINGS';
-		$form_key = 'acp_captcha';
-		add_form_key($form_key);
-
-		$submit = request_var('submit', '');
-
-		if ($submit && check_form_key($form_key))
-		{
-			$captcha_vars = array_keys($captcha_vars);
-			foreach ($captcha_vars as $captcha_var)
-			{
-				$value = request_var($captcha_var, 0);
-				if ($value >= 0)
-				{
-					set_config($captcha_var, $value);
-				}
-			}
-			trigger_error(phpbb::$user->lang['CONFIG_UPDATED'] . adm_back_link($module->u_action));
-		}
-		else if ($submit)
-		{
-			trigger_error(phpbb::$user->lang['FORM_INVALID'] . adm_back_link($module->u_action));
-		}
-		else
-		{
-			foreach ($captcha_vars as $captcha_var => $template_var)
-			{
-				$var = request_var($captcha_var, (int) phpbb::$config[$captcha_var]);
-				phpbb::$template->assign_var($template_var, $var);
-			}
-
-			phpbb::$template->assign_vars(array(
-				'CAPTCHA_PREVIEW'	=> $this->get_demo_template($id),
-				'CAPTCHA_NAME'		=> $this->get_class_name(),
-			));
-
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
deleted file mode 100644
index 1dbebcdbd6..0000000000
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
-*
-* @package VC
-* @version $Id$
-* @copyright (c) 2006 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Placeholder for autoload
-*/
-include_once(PHPBB_ROOT_PATH . 'includes/captcha/plugins/captcha_abstract.' . PHP_EXT);
-
-class phpbb_captcha_gd_wave extends phpbb_default_captcha implements phpbb_captcha_plugin
-{
-
-	function __construct()
-	{
-		include_once(PHPBB_ROOT_PATH . 'includes/captcha/captcha_gd_wave.' . PHP_EXT);
-	}
-
-	public static function get_instance()
-	{
-		return new phpbb_captcha_gd_wave();
-	}
-
-	static function is_available()
-	{
-		return (@extension_loaded('gd') || can_load_dll('gd'));
-	}
-
-	static function get_name()
-	{
-		return 'CAPTCHA_GD_WAVE';
-	}
-
-	static function get_class_name()
-	{
-		return 'phpbb_captcha_gd_wave';
-	}
-
-	function acp_page($id, &$module)
-	{
-		trigger_error(phpbb::$user->lang['CAPTCHA_NO_OPTIONS'] . adm_back_link($module->u_action));
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
deleted file mode 100644
index f76c42338e..0000000000
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
-*
-* @package VC
-* @version $Id$
-* @copyright (c) 2006 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-include_once(PHPBB_ROOT_PATH . 'includes/captcha/plugins/captcha_abstract.' . PHP_EXT);
-
-class phpbb_captcha_nogd extends phpbb_default_captcha implements phpbb_captcha_plugin
-{
-
-	function __construct()
-	{
-		include_once(PHPBB_ROOT_PATH . 'includes/captcha/captcha_non_gd.' . PHP_EXT);
-	}
-
-	public static function get_instance()
-	{
-		return new phpbb_captcha_nogd();
-	}
-
-	static function is_available()
-	{
-		return true;
-	}
-
-	static function get_name()
-	{
-		return 'CAPTCHA_NO_GD';
-	}
-
-	static function get_class_name()
-	{
-		return 'phpbb_captcha_nogd';
-	}
-
-
-	function acp_page($id, &$module)
-	{
-		trigger_error(phpbb::$user->lang['CAPTCHA_NO_OPTIONS'] . adm_back_link($module->u_action));
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
deleted file mode 100644
index a27909baee..0000000000
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ /dev/null
@@ -1,306 +0,0 @@
-<?php
-/**
-*
-* @package VC
-* @version $Id$
-* @copyright (c) 2006 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-// we need the classic captcha code for tracking solutions and attempts
-include_once(PHPBB_ROOT_PATH . 'includes/captcha/plugins/captcha_abstract.' . PHP_EXT);
-
-class phpbb_recaptcha extends phpbb_default_captcha implements phpbb_captcha_plugin
-{
-	const recaptcha_server = 'http://api.recaptcha.net';
-	const recaptcha_verify_server = 'api-verify.recaptcha.net';
-	protected $challenge;
-	protected $response;
-
-	function init($type)
-	{
-		phpbb::$user->add_lang('recaptcha');
-		parent::init($type);
-
-		$this->challenge = request_var('recaptcha_challenge_field', '');
-		$this->response = request_var('recaptcha_response_field', '');
-	}
-
-	public static function get_instance()
-	{
-		return new phpbb_recaptcha();
-	}
-
-	static function is_available()
-	{
-		phpbb::$user->add_lang('recaptcha');
-		return (isset(phpbb::$config['recaptcha_pubkey']) && !empty(phpbb::$config['recaptcha_pubkey']));
-	}
-
-	static function get_name()
-	{
-		return 'CAPTCHA_RECAPTCHA';
-	}
-
-	static function get_class_name()
-	{
-		return 'phpbb_recaptcha';
-	}
-
-	function acp_page($id, &$module)
-	{
-		$captcha_vars = array(
-			'recaptcha_pubkey'				=> 'RECAPTCHA_PUBKEY',
-			'recaptcha_privkey'				=> 'RECAPTCHA_PRIVKEY',
-		);
-
-		$module->tpl_name = 'captcha_recaptcha_acp';
-		$module->page_title = 'ACP_VC_SETTINGS';
-		$form_key = 'acp_captcha';
-		add_form_key($form_key);
-
-		$submit = request_var('submit', '');
-
-		if ($submit && check_form_key($form_key))
-		{
-			$captcha_vars = array_keys($captcha_vars);
-			foreach ($captcha_vars as $captcha_var)
-			{
-				$value = request_var($captcha_var, '');
-				if ($value)
-				{
-					set_config($captcha_var, $value);
-				}
-			}
-			trigger_error(phpbb::$user->lang['CONFIG_UPDATED'] . adm_back_link($module->u_action));
-		}
-		else if ($submit)
-		{
-			trigger_error(phpbb::$user->lang['FORM_INVALID'] . adm_back_link($module->u_action));
-		}
-		else
-		{
-			foreach ($captcha_vars as $captcha_var => $template_var)
-			{
-				$var = request_var($captcha_var, (isset(phpbb::$config[$captcha_var])) ? (string) phpbb::$config[$captcha_var] : '');
-				phpbb::$template->assign_var($template_var, $var);
-			}
-
-			phpbb::$template->assign_vars(array(
-				'CAPTCHA_PREVIEW'	=> $this->get_demo_template($id),
-				'CAPTCHA_NAME'		=> $this->get_class_name(),
-			));
-
-		}
-	}
-
-
-	// not needed
-	function execute_demo()
-	{
-	}
-
-
-	// not needed
-	function execute()
-	{
-	}
-
-
-	function get_template()
-	{
-		phpbb::$template->set_filenames(array(
-			'captcha' => 'captcha_recaptcha.html',
-		));
-
-		phpbb::$template->assign_vars(array(
-			'RECAPTCHA_SERVER'			=> self::recaptcha_server,
-			'RECAPTCHA_PUBKEY'			=> isset(phpbb::$config['recaptcha_pubkey']) ? phpbb::$config['recaptcha_pubkey'] : '',
-			'RECAPTCHA_ERRORGET'		=> '',
-			'S_RECAPTCHA_AVAILABLE'		=> self::is_available(),
-		));
-
-		return phpbb::$template->assign_display('captcha');
-	}
-
-	function get_demo_template($id)
-	{
-		return $this->get_template();
-	}
-
-	function get_hidden_fields()
-	{
-		$hidden_fields = array();
-
-		// this is required for postig.php - otherwise we would forget about the captcha being already solved
-		if ($this->solved)
-		{
-			$hidden_fields['confirm_code'] = $this->confirm_code;
-		}
-		$hidden_fields['confirm_id'] = $this->confirm_id;
-		return $hidden_fields;
-	}
-
-	function uninstall()
-	{
-		self::garbage_collect(0);
-	}
-
-	function install()
-	{
-		return;
-	}
-
-	function validate()
-	{
-		if (!parent::validate())
-		{
-			return false;
-		}
-		else
-		{
-			return $this->recaptcha_check_answer();
-		}
-	}
-
-
-// Code from here on is based on recaptchalib.php
-/*
- * This is a PHP library that handles calling reCAPTCHA.
- *	- Documentation and latest version
- *		  http://recaptcha.net/plugins/php/
- *	- Get a reCAPTCHA API Key
- *		  http://recaptcha.net/api/getkey
- *	- Discussion group
- *		  http://groups.google.com/group/recaptcha
- *
- * Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net
- * AUTHORS:
- *   Mike Crawford
- *   Ben Maurer
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-	/**
-	* Submits an HTTP POST to a reCAPTCHA server
-	* @param string $host
-	* @param string $path
-	* @param array $data
-	* @param int port
-	* @return array response
-	*/
-	protected function _recaptcha_http_post($host, $path, $data, $port = 80)
-	{
-		$req = $this->_recaptcha_qsencode ($data);
-
-		$http_request  = "POST $path HTTP/1.0\r\n";
-		$http_request .= "Host: $host\r\n";
-		$http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
-		$http_request .= "Content-Length: " . strlen($req) . "\r\n";
-		$http_request .= "User-Agent: reCAPTCHA/PHP/phpBB\r\n";
-		$http_request .= "\r\n";
-		$http_request .= $req;
-
-		$response = '';
-		if (false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10)))
-		{
-			trigger_error('Could not open socket', E_USER_ERROR);
-		}
-
-		fwrite($fs, $http_request);
-
-		while (!feof($fs))
-		{
-			// One TCP-IP packet
-			$response .= fgets($fs, 1160);
-		}
-		fclose($fs);
-
-		$response = explode("\r\n\r\n", $response, 2);
-
-		return $response;
-	}
-
-	/**
-	* Calls an HTTP POST function to verify if the user's guess was correct
-	* @param array $extra_params an array of extra variables to post to the server
-	* @return ReCaptchaResponse
-	*/
-	protected function recaptcha_check_answer($extra_params = array())
-	{
-		// discard spam submissions
-		if ($this->challenge == null || strlen($this->challenge) == 0 || $this->response == null || strlen($this->response) == 0)
-		{
-			return phpbb::$user->lang['RECAPTCHA_INCORRECT'];
-		}
-
-		$response = $this->_recaptcha_http_post(self::recaptcha_verify_server, '/verify', array(
-			'privatekey'	=> phpbb::$config['recaptcha_privkey'],
-			'remoteip'		=> phpbb::$user->ip,
-			'challenge'		=> $this->challenge,
-			'response'		=> $this->response,
-			) + $extra_params
-		);
-
-		$answers = explode("\n", $response[1]);
-
-		if (trim($answers[0]) === 'true')
-		{
-			$this->solved = true;
-			return false;
-		}
-		else
-		{
-			if ($answers[1] === 'incorrect-captcha-sol')
-			{
-				return phpbb::$user->lang['RECAPTCHA_INCORRECT'];
-			}
-		}
-	}
-
-	/**
-	* Encodes the given data into a query string format
-	* @param $data - array of string elements to be encoded
-	* @return string - encoded request
-	*/
-	protected function _recaptcha_qsencode($data)
-	{
-		$req = '';
-
-		foreach ($data as $key => $value)
-		{
-			$req .= $key . '=' . urlencode(stripslashes($value)) . '&';
-		}
-		// Cut the last '&'
-		$req = substr($req, 0, strlen($req) - 1);
-		return $req;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/classes/acl.php b/phpBB/includes/classes/acl.php
deleted file mode 100644
index 049b0842e2..0000000000
--- a/phpBB/includes/classes/acl.php
+++ /dev/null
@@ -1,946 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Permission/ACL class
-* @package phpBB3
-*/
-class phpbb_acl
-{
-	public $phpbb_required = array('acm', 'db');
-	public $phpbb_optional = array();
-
-	public $acl_raw;
-
-	private $acl = array();
-	private $cache = array();
-	public $acl_options = array();
-	private $acl_element_ids = false;
-	private $recache = false;
-
-	public function __construct()
-	{
-		$this->acl = $this->cache = $this->acl_options = array();
-		$this->acl_element_ids = false;
-
-		if (($this->acl_options = phpbb::$acm->get('acl_options')) === false)
-		{
-			$sql = 'SELECT auth_option_id, auth_option, is_global, is_local
-				FROM ' . ACL_OPTIONS_TABLE . '
-				ORDER BY auth_option_id';
-			$result = phpbb::$db->sql_query($sql);
-
-			$global = $local = 0;
-			$this->acl_options = array();
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				if ($row['is_global'])
-				{
-					$this->acl_options['global'][$row['auth_option']] = $global++;
-				}
-
-				if ($row['is_local'])
-				{
-					$this->acl_options['local'][$row['auth_option']] = $local++;
-				}
-
-				$this->acl_options['id'][$row['auth_option']] = (int) $row['auth_option_id'];
-				$this->acl_options['option'][(int) $row['auth_option_id']] = $row['auth_option'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			phpbb::$acm->put('acl_options', $this->acl_options);
-			$this->recache = true;
-		}
-
-		// Add raw data acl class
-		$this->acl_raw = new phpbb_acl_raw_data();
-	}
-
-	/**
-	* Init permissions
-	*/
-	public function init(array &$userdata)
-	{
-		if (!trim($userdata['user_permissions']) || $this->recache)
-		{
-			$this->acl_cache($userdata);
-		}
-
-		// Fill ACL array
-		$this->_fill_acl($userdata['user_permissions']);
-
-		// Verify bitstring length with options provided...
-		$renew = false;
-		$global_length = sizeof($this->acl_options['global']);
-		$local_length = sizeof($this->acl_options['local']);
-
-		// Specify comparing length (bitstring is padded to 31 bits)
-		$global_length = ($global_length % 31) ? ($global_length - ($global_length % 31) + 31) : $global_length;
-		$local_length = ($local_length % 31) ? ($local_length - ($local_length % 31) + 31) : $local_length;
-
-		// You thought we are finished now? Noooo... now compare them.
-		foreach ($this->acl as $forum_id => $bitstring)
-		{
-			if (($forum_id && strlen($bitstring) != $local_length) || (!$forum_id && strlen($bitstring) != $global_length))
-			{
-				$renew = true;
-				break;
-			}
-		}
-
-		// If a bitstring within the list does not match the options, we have a user with incorrect permissions set and need to renew them
-		if ($renew)
-		{
-			$this->acl_cache($userdata);
-			$this->_fill_acl($userdata['user_permissions']);
-		}
-
-		return;
-	}
-
-	/**
-	* Fill ACL array with relevant bitstrings from user_permissions column
-	* @access private
-	*/
-	private function _fill_acl($user_permissions)
-	{
-		$this->acl = array();
-		$user_permissions = explode("\n", $user_permissions);
-
-		foreach ($user_permissions as $f => $seq)
-		{
-			if ($seq)
-			{
-				$i = 0;
-
-				if (!isset($this->acl[$f]))
-				{
-					$this->acl[$f] = '';
-				}
-
-				while ($subseq = substr($seq, $i, 6))
-				{
-					// We put the original bitstring into the acl array
-					$this->acl[$f] .= str_pad(base_convert($subseq, 36, 2), 31, 0, STR_PAD_LEFT);
-					$i += 6;
-				}
-			}
-		}
-	}
-
-	/**
-	* Look up an option
-	* if the option is prefixed with !, then the result becomes negated
-	*
-	* If a forum id is specified the local option will be combined with a global option if one exist.
-	* If a forum id is not specified, only the global option will be checked.
-	*/
-	public function acl_get($opt, $f = 0)
-	{
-		$negate = false;
-
-		if (strpos($opt, '!') === 0)
-		{
-			$negate = true;
-			$opt = substr($opt, 1);
-		}
-
-		if (!isset($this->cache[$f][$opt]))
-		{
-			// We combine the global/local option with an OR because some options are global and local.
-			// If the user has the global permission the local one is true too and vice versa
-			$this->cache[$f][$opt] = false;
-
-			// Is this option a global permission setting?
-			if (isset($this->acl_options['global'][$opt]))
-			{
-				if (isset($this->acl[0]))
-				{
-					$this->cache[$f][$opt] = $this->acl[0][$this->acl_options['global'][$opt]];
-				}
-			}
-
-			// Is this option a local permission setting?
-			// But if we check for a global option only, we won't combine the options...
-			if ($f != 0 && isset($this->acl_options['local'][$opt]))
-			{
-				if (isset($this->acl[$f]) && isset($this->acl[$f][$this->acl_options['local'][$opt]]))
-				{
-					$this->cache[$f][$opt] |= $this->acl[$f][$this->acl_options['local'][$opt]];
-				}
-			}
-		}
-
-		// Founder always has all global options set to true...
-		return $negate xor $this->cache[$f][$opt];
-	}
-
-	/**
-	* Get forums with the specified permission setting
-	* if the option is prefixed with !, then the result becomes negated
-	*
-	* @param bool $clean set to true if only values needs to be returned which are set/unset
-	*/
-	public function acl_getf($opt, $clean = false)
-	{
-		$acl_f = array();
-		$negate = false;
-
-		if (strpos($opt, '!') === 0)
-		{
-			$negate = true;
-			$opt = substr($opt, 1);
-		}
-
-		// If we retrieve a list of forums not having permissions in, we need to get every forum_id
-		if ($negate)
-		{
-			if ($this->acl_forum_ids === false)
-			{
-				$sql = 'SELECT forum_id
-					FROM ' . FORUMS_TABLE;
-
-				if (sizeof($this->acl))
-				{
-					$sql .= ' WHERE ' . phpbb::$db->sql_in_set('forum_id', array_keys($this->acl), true);
-				}
-				$result = phpbb::$db->sql_query($sql);
-
-				$this->acl_forum_ids = array();
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$this->acl_forum_ids[] = $row['forum_id'];
-				}
-				phpbb::$db->sql_freeresult($result);
-			}
-		}
-
-		if (isset($this->acl_options['local'][$opt]))
-		{
-			foreach ($this->acl as $f => $bitstring)
-			{
-				// Skip global settings
-				if (!$f)
-				{
-					continue;
-				}
-
-				$allowed = (!isset($this->cache[$f][$opt])) ? $this->acl_get($opt, $f) : $this->cache[$f][$opt];
-
-				if (!$clean)
-				{
-					$acl_f[$f][$opt] = $negate xor $allowed;
-				}
-				else if ($negate xor $allowed)
-				{
-					$acl_f[$f][$opt] = 1;
-				}
-			}
-		}
-
-		// If we get forum_ids not having this permission, we need to fill the remaining parts
-		if ($negate && sizeof($this->acl_forum_ids))
-		{
-			foreach ($this->acl_forum_ids as $f)
-			{
-				$acl_f[$f][$opt] = 1;
-			}
-		}
-
-		return $acl_f;
-	}
-
-	/**
-	* Get local permission state for any forum.
-	*
-	* Returns true if user has the permission in one or more forums, false if in no forum.
-	* If global option is checked it returns the global state (same as acl_get($opt))
-	* Local option has precedence...
-	*/
-	public function acl_getf_global($opt)
-	{
-		if (is_array($opt))
-		{
-			// evaluates to true as soon as acl_getf_global is true for one option
-			foreach ($opt as $check_option)
-			{
-				if ($this->acl_getf_global($check_option))
-				{
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		if (isset($this->acl_options['local'][$opt]))
-		{
-			foreach ($this->acl as $f => $bitstring)
-			{
-				// Skip global settings
-				if (!$f)
-				{
-					continue;
-				}
-
-				// as soon as the user has any permission we're done so return true
-				if ((!isset($this->cache[$f][$opt])) ? $this->acl_get($opt, $f) : $this->cache[$f][$opt])
-				{
-					return true;
-				}
-			}
-		}
-		else if (isset($this->acl_options['global'][$opt]))
-		{
-			return $this->acl_get($opt);
-		}
-
-		return false;
-	}
-
-	/**
-	* Get permission settings (more than one)
-	*/
-	public function acl_gets()
-	{
-		$args = func_get_args();
-		$f = array_pop($args);
-
-		if (!is_numeric($f))
-		{
-			$args[] = $f;
-			$f = 0;
-		}
-
-		// alternate syntax: acl_gets(array('m_', 'a_'), $forum_id)
-		if (is_array($args[0]))
-		{
-			$args = $args[0];
-		}
-
-		$acl = 0;
-		foreach ($args as $opt)
-		{
-			$acl |= $this->acl_get($opt, $f);
-		}
-
-		return $acl;
-	}
-
-	/**
-	* Get permission listing based on user_id/options/forum_ids
-	*/
-	public function acl_get_list($user_id = false, $opts = false, $forum_id = false)
-	{
-		if ($user_id !== false && !is_array($user_id) && $opts === false && $forum_id === false)
-		{
-			$hold_ary = array($user_id => $this->acl_raw->single_user($user_id));
-		}
-		else
-		{
-			$hold_ary = $this->acl_raw->data($user_id, $opts, $forum_id);
-		}
-
-		$auth_ary = array();
-		foreach ($hold_ary as $user_id => $forum_ary)
-		{
-			foreach ($forum_ary as $forum_id => $auth_option_ary)
-			{
-				foreach ($auth_option_ary as $auth_option => $auth_setting)
-				{
-					if ($auth_setting)
-					{
-						$auth_ary[$forum_id][$auth_option][] = $user_id;
-					}
-				}
-			}
-		}
-
-		return $auth_ary;
-	}
-
-	/**
-	* Cache data to user_permissions row
-	*/
-	public function acl_cache(array &$userdata)
-	{
-		// Empty user_permissions
-		$userdata['user_permissions'] = '';
-
-		$hold_ary = $this->acl_raw->single_user($userdata['user_id']);
-
-		// Key 0 in $hold_ary are global options, all others are forum_ids
-
-		// If this user is founder we're going to force fill the admin options ...
-		if ($userdata['user_type'] == phpbb::USER_FOUNDER)
-		{
-			foreach ($this->acl_options['global'] as $opt => $id)
-			{
-				if (strpos($opt, 'a_') === 0)
-				{
-					$hold_ary[0][$this->acl_options['id'][$opt]] = phpbb::ACL_YES;
-				}
-			}
-		}
-
-		$hold_str = $this->build_bitstring($hold_ary);
-
-		if ($hold_str)
-		{
-			$userdata['user_permissions'] = $hold_str;
-
-			$sql = 'UPDATE ' . USERS_TABLE . "
-				SET user_permissions = '" . phpbb::$db->sql_escape($userdata['user_permissions']) . "',
-					user_perm_from = 0
-				WHERE user_id = " . $userdata['user_id'];
-			phpbb::$db->sql_query($sql);
-		}
-
-		return;
-	}
-
-	/**
-	* Build bitstring from permission set
-	*/
-	protected function build_bitstring(&$hold_ary)
-	{
-		$hold_str = '';
-
-		if (sizeof($hold_ary))
-		{
-			ksort($hold_ary);
-
-			$last_f = 0;
-
-			foreach ($hold_ary as $f => $auth_ary)
-			{
-				$ary_key = (!$f) ? 'global' : 'local';
-
-				$bitstring = array();
-				foreach ($this->acl_options[$ary_key] as $opt => $id)
-				{
-					if (isset($auth_ary[$this->acl_options['id'][$opt]]))
-					{
-						$bitstring[$id] = $auth_ary[$this->acl_options['id'][$opt]];
-
-						$option_key = substr($opt, 0, strpos($opt, '_') + 1);
-
-						// If one option is allowed, the global permission for this option has to be allowed too
-						// example: if the user has the a_ permission this means he has one or more a_* permissions
-						if ($auth_ary[$this->acl_options['id'][$opt]] == phpbb::ACL_YES && (!isset($bitstring[$this->acl_options[$ary_key][$option_key]]) || $bitstring[$this->acl_options[$ary_key][$option_key]] == phpbb::ACL_NEVER))
-						{
-							$bitstring[$this->acl_options[$ary_key][$option_key]] = phpbb::ACL_YES;
-						}
-					}
-					else
-					{
-						$bitstring[$id] = phpbb::ACL_NEVER;
-					}
-				}
-
-				// Now this bitstring defines the permission setting for the current forum $f (or global setting)
-				$bitstring = implode('', $bitstring);
-
-				// The line number indicates the id, therefore we have to add empty lines for those ids not present
-				$hold_str .= str_repeat("\n", $f - $last_f);
-
-				// Convert bitstring for storage - we do not use binary/bytes because PHP's string functions are not fully binary safe
-				for ($i = 0, $bit_length = strlen($bitstring); $i < $bit_length; $i += 31)
-				{
-					$hold_str .= str_pad(base_convert(str_pad(substr($bitstring, $i, 31), 31, 0, STR_PAD_RIGHT), 2, 36), 6, 0, STR_PAD_LEFT);
-				}
-
-				$last_f = $f;
-			}
-			unset($bitstring);
-
-			$hold_str = rtrim($hold_str);
-		}
-
-		return $hold_str;
-	}
-
-	/**
-	* Clear one or all users cached permission settings
-	*/
-	public function acl_clear_prefetch($user_id = false)
-	{
-		// Rebuild options cache
-		phpbb::$acm->destroy('role_cache');
-
-		$sql = 'SELECT *
-			FROM ' . ACL_ROLES_DATA_TABLE . '
-			ORDER BY role_id ASC';
-		$result = phpbb::$db->sql_query($sql);
-
-		$this->role_cache = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$this->role_cache[$row['role_id']][$row['auth_option_id']] = (int) $row['auth_setting'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		foreach ($this->role_cache as $role_id => $role_options)
-		{
-			$this->role_cache[$role_id] = serialize($role_options);
-		}
-
-		phpbb::$acm->put('role_cache', $this->role_cache);
-
-		// Now empty user permissions
-		$where_sql = '';
-
-		if ($user_id !== false)
-		{
-			$user_id = (!is_array($user_id)) ? $user_id = array((int) $user_id) : array_map('intval', $user_id);
-			$where_sql = ' WHERE ' . phpbb::$db->sql_in_set('user_id', $user_id);
-		}
-
-		$sql = 'UPDATE ' . USERS_TABLE . "
-			SET user_permissions = '',
-				user_perm_from = 0
-			$where_sql";
-		phpbb::$db->sql_query($sql);
-
-		return;
-	}
-
-/**
-}
-
- * Role-specific methods/definitionis used by phpbb_acl
-class phpbb_acl_role
-{
- */
-
-	/**
-	* Get assigned roles
-	* @todo: protected or public?
-	*/
-	public function acl_role_data($user_type, $role_type, $ug_id = false, $forum_id = false)
-	{
-		$roles = array();
-
-		$sql_id = ($user_type == 'user') ? 'user_id' : 'group_id';
-
-		$sql_ug = ($ug_id !== false) ? ((!is_array($ug_id)) ? "AND a.$sql_id = $ug_id" : 'AND ' . phpbb::$db->sql_in_set("a.$sql_id", $ug_id)) : '';
-		$sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? "AND a.forum_id = $forum_id" : 'AND ' . phpbb::$db->sql_in_set('a.forum_id', $forum_id)) : '';
-
-		// Grab assigned roles...
-		$sql = 'SELECT a.auth_role_id, a.' . $sql_id . ', a.forum_id
-			FROM ' . (($user_type == 'user') ? ACL_USERS_TABLE : ACL_GROUPS_TABLE) . ' a, ' . ACL_ROLES_TABLE . " r
-			WHERE a.auth_role_id = r.role_id
-				AND r.role_type = '" . phpbb::$db->sql_escape($role_type) . "'
-				$sql_ug
-				$sql_forum
-			ORDER BY r.role_order ASC";
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$roles[$row[$sql_id]][$row['forum_id']] = $row['auth_role_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		return $roles;
-	}
-}
-
-/**
-* data-specific methods/definitionis used by phpbb_acl
-*/
-class phpbb_acl_raw_data
-{
-	/**
-	* Get raw acl data based on user/option/forum
-	* @todo: protected or public?
-	*/
-	public function data($user_id = false, $opts = false, $forum_id = false)
-	{
-		$sql_user = ($user_id !== false) ? ((!is_array($user_id)) ? 'user_id = ' . (int) $user_id : phpbb::$db->sql_in_set('user_id', array_map('intval', $user_id))) : '';
-		$sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? 'AND a.forum_id = ' . (int) $forum_id : 'AND ' . phpbb::$db->sql_in_set('a.forum_id', array_map('intval', $forum_id))) : '';
-
-		$sql_opts = $sql_opts_select = $sql_opts_from = '';
-		$hold_ary = array();
-
-		if ($opts !== false)
-		{
-			$sql_opts_select = ', ao.auth_option';
-			$sql_opts_from = ', ' . ACL_OPTIONS_TABLE . ' ao';
-			$this->build_auth_option_statement('ao.auth_option', $opts, $sql_opts);
-		}
-
-		$sql_ary = array();
-
-		// Grab non-role settings - user-specific
-		$sql_ary[] = 'SELECT a.user_id, a.forum_id, a.auth_setting, a.auth_option_id' . $sql_opts_select . '
-			FROM ' . ACL_USERS_TABLE . ' a' . $sql_opts_from . '
-			WHERE a.auth_role_id = 0 ' .
-				(($sql_opts_from) ? 'AND a.auth_option_id = ao.auth_option_id ' : '') .
-				(($sql_user) ? 'AND a.' . $sql_user : '') . "
-				$sql_forum
-				$sql_opts";
-
-		// Now the role settings - user-specific
-		$sql_ary[] = 'SELECT a.user_id, a.forum_id, r.auth_option_id, r.auth_setting, r.auth_option_id' . $sql_opts_select . '
-			FROM ' . ACL_USERS_TABLE . ' a, ' . ACL_ROLES_DATA_TABLE . ' r' . $sql_opts_from . '
-			WHERE a.auth_role_id = r.role_id ' .
-				(($sql_opts_from) ? 'AND r.auth_option_id = ao.auth_option_id ' : '') .
-				(($sql_user) ? 'AND a.' . $sql_user : '') . "
-				$sql_forum
-				$sql_opts";
-
-		foreach ($sql_ary as $sql)
-		{
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$option = ($sql_opts_select) ? $row['auth_option'] : $this->acl_options['option'][$row['auth_option_id']];
-				$hold_ary[$row['user_id']][$row['forum_id']][$option] = $row['auth_setting'];
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		$sql_ary = array();
-
-		// Now grab group settings - non-role specific...
-		$sql_ary[] = 'SELECT ug.user_id, a.forum_id, a.auth_setting, a.auth_option_id' . $sql_opts_select . '
-			FROM ' . ACL_GROUPS_TABLE . ' a, ' . USER_GROUP_TABLE . ' ug' . $sql_opts_from . '
-			WHERE a.auth_role_id = 0 ' .
-				(($sql_opts_from) ? 'AND a.auth_option_id = ao.auth_option_id ' : '') . '
-				AND a.group_id = ug.group_id
-				AND ug.user_pending = 0
-				' . (($sql_user) ? 'AND ug.' . $sql_user : '') . "
-				$sql_forum
-				$sql_opts";
-
-		// Now grab group settings - role specific...
-		$sql_ary[] = 'SELECT ug.user_id, a.forum_id, r.auth_setting, r.auth_option_id' . $sql_opts_select . '
-			FROM ' . ACL_GROUPS_TABLE . ' a, ' . USER_GROUP_TABLE . ' ug, ' . ACL_ROLES_DATA_TABLE . ' r' . $sql_opts_from . '
-			WHERE a.auth_role_id = r.role_id ' .
-				(($sql_opts_from) ? 'AND r.auth_option_id = ao.auth_option_id ' : '') . '
-				AND a.group_id = ug.group_id
-				AND ug.user_pending = 0
-				' . (($sql_user) ? 'AND ug.' . $sql_user : '') . "
-				$sql_forum
-				$sql_opts";
-
-		foreach ($sql_ary as $sql)
-		{
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$option = ($sql_opts_select) ? $row['auth_option'] : $this->acl_options['option'][$row['auth_option_id']];
-
-				// @todo: use the ref technique to reduce opcode generation
-				if (!isset($hold_ary[$row['user_id']][$row['forum_id']][$option]) || (isset($hold_ary[$row['user_id']][$row['forum_id']][$option]) && $hold_ary[$row['user_id']][$row['forum_id']][$option] != phpbb::ACL_NEVER))
-				{
-					$hold_ary[$row['user_id']][$row['forum_id']][$option] = $row['auth_setting'];
-
-					// If we detect phpbb::ACL_NEVER, we will unset the flag option (within building the bitstring it is correctly set again)
-					if ($row['auth_setting'] == phpbb::ACL_NEVER)
-					{
-						$flag = substr($option, 0, strpos($option, '_') + 1);
-
-						if (isset($hold_ary[$row['user_id']][$row['forum_id']][$flag]) && $hold_ary[$row['user_id']][$row['forum_id']][$flag] == phpbb::ACL_YES)
-						{
-							unset($hold_ary[$row['user_id']][$row['forum_id']][$flag]);
-
-/*							if (in_array(phpbb::ACL_YES, $hold_ary[$row['user_id']][$row['forum_id']]))
-							{
-								$hold_ary[$row['user_id']][$row['forum_id']][$flag] = phpbb::ACL_YES;
-							}
-*/
-						}
-					}
-				}
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		return $hold_ary;
-	}
-
-	/**
-	* Get raw user based permission settings
-	*/
-	public function user($user_id = false, $opts = false, $forum_id = false)
-	{
-		$sql_user = ($user_id !== false) ? ((!is_array($user_id)) ? 'user_id = ' . (int) $user_id : phpbb::$db->sql_in_set('user_id', array_map('intval', $user_id))) : '';
-		$sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? 'AND a.forum_id = ' . (int) $forum_id : 'AND ' . phpbb::$db->sql_in_set('a.forum_id', array_map('intval', $forum_id))) : '';
-
-		$sql_opts = '';
-		$hold_ary = $sql_ary = array();
-
-		if ($opts !== false)
-		{
-			$this->build_auth_option_statement('ao.auth_option', $opts, $sql_opts);
-		}
-
-		// Grab user settings - non-role specific...
-		$sql_ary[] = 'SELECT a.user_id, a.forum_id, a.auth_setting, a.auth_option_id, ao.auth_option
-			FROM ' . ACL_USERS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . ' ao
-			WHERE a.auth_role_id = 0
-				AND a.auth_option_id = ao.auth_option_id ' .
-				(($sql_user) ? 'AND a.' . $sql_user : '') . "
-				$sql_forum
-				$sql_opts
-			ORDER BY a.forum_id, ao.auth_option";
-
-		// Now the role settings - user-specific
-		$sql_ary[] = 'SELECT a.user_id, a.forum_id, r.auth_option_id, r.auth_setting, r.auth_option_id, ao.auth_option
-			FROM ' . ACL_USERS_TABLE . ' a, ' . ACL_ROLES_DATA_TABLE . ' r, ' . ACL_OPTIONS_TABLE . ' ao
-			WHERE a.auth_role_id = r.role_id
-				AND r.auth_option_id = ao.auth_option_id ' .
-				(($sql_user) ? 'AND a.' . $sql_user : '') . "
-				$sql_forum
-				$sql_opts
-			ORDER BY a.forum_id, ao.auth_option";
-
-		foreach ($sql_ary as $sql)
-		{
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$hold_ary[$row['user_id']][$row['forum_id']][$row['auth_option']] = $row['auth_setting'];
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		return $hold_ary;
-	}
-
-	/**
-	* Get raw group based permission settings
-	*/
-	public function group($group_id = false, $opts = false, $forum_id = false)
-	{
-		$sql_group = ($group_id !== false) ? ((!is_array($group_id)) ? 'group_id = ' . (int) $group_id : phpbb::$db->sql_in_set('group_id', array_map('intval', $group_id))) : '';
-		$sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? 'AND a.forum_id = ' . (int) $forum_id : 'AND ' . phpbb::$db->sql_in_set('a.forum_id', array_map('intval', $forum_id))) : '';
-
-		$sql_opts = '';
-		$hold_ary = $sql_ary = array();
-
-		if ($opts !== false)
-		{
-			$this->build_auth_option_statement('ao.auth_option', $opts, $sql_opts);
-		}
-
-		// Grab group settings - non-role specific...
-		$sql_ary[] = 'SELECT a.group_id, a.forum_id, a.auth_setting, a.auth_option_id, ao.auth_option
-			FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . ' ao
-			WHERE a.auth_role_id = 0
-				AND a.auth_option_id = ao.auth_option_id ' .
-				(($sql_group) ? 'AND a.' . $sql_group : '') . "
-				$sql_forum
-				$sql_opts
-			ORDER BY a.forum_id, ao.auth_option";
-
-		// Now grab group settings - role specific...
-		$sql_ary[] = 'SELECT a.group_id, a.forum_id, r.auth_setting, r.auth_option_id, ao.auth_option
-			FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_ROLES_DATA_TABLE . ' r, ' . ACL_OPTIONS_TABLE . ' ao
-			WHERE a.auth_role_id = r.role_id
-				AND r.auth_option_id = ao.auth_option_id ' .
-				(($sql_group) ? 'AND a.' . $sql_group : '') . "
-				$sql_forum
-				$sql_opts
-			ORDER BY a.forum_id, ao.auth_option";
-
-		foreach ($sql_ary as $sql)
-		{
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$hold_ary[$row['group_id']][$row['forum_id']][$row['auth_option']] = $row['auth_setting'];
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		return $hold_ary;
-	}
-
-	/**
-	* Get raw acl data based on user for caching user_permissions
-	* This function returns the same data as data(), but without the user id as the first key within the array.
-	*/
-	public function single_user($user_id)
-	{
-		// Check if the role-cache is there
-		if (($this->role_cache = phpbb::$acm->get('role_cache')) === false)
-		{
-			$this->role_cache = array();
-
-			// We pre-fetch roles
-			$sql = 'SELECT *
-				FROM ' . ACL_ROLES_DATA_TABLE . '
-				ORDER BY role_id ASC';
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$this->role_cache[$row['role_id']][$row['auth_option_id']] = (int) $row['auth_setting'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			foreach ($this->role_cache as $role_id => $role_options)
-			{
-				$this->role_cache[$role_id] = serialize($role_options);
-			}
-
-			phpbb::$acm->put('role_cache', $this->role_cache);
-		}
-
-		$hold_ary = array();
-
-		// Grab user-specific permission settings
-		$sql = 'SELECT forum_id, auth_option_id, auth_role_id, auth_setting
-			FROM ' . ACL_USERS_TABLE . '
-			WHERE user_id = ' . $user_id;
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			// If a role is assigned, assign all options included within this role. Else, only set this one option.
-			if ($row['auth_role_id'])
-			{
-				$hold_ary[$row['forum_id']] = (empty($hold_ary[$row['forum_id']])) ? unserialize($this->role_cache[$row['auth_role_id']]) : $hold_ary[$row['forum_id']] + unserialize($this->role_cache[$row['auth_role_id']]);
-			}
-			else
-			{
-				$hold_ary[$row['forum_id']][$row['auth_option_id']] = $row['auth_setting'];
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// Now grab group-specific permission settings
-		$sql = 'SELECT a.forum_id, a.auth_option_id, a.auth_role_id, a.auth_setting
-			FROM ' . ACL_GROUPS_TABLE . ' a, ' . USER_GROUP_TABLE . ' ug
-			WHERE a.group_id = ug.group_id
-				AND ug.user_pending = 0
-				AND ug.user_id = ' . $user_id;
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			if (!$row['auth_role_id'])
-			{
-				$this->_set_group_hold_ary($hold_ary[$row['forum_id']], $row['auth_option_id'], $row['auth_setting']);
-			}
-			else if (!empty($this->role_cache[$row['auth_role_id']]))
-			{
-				foreach (unserialize($this->role_cache[$row['auth_role_id']]) as $option_id => $setting)
-				{
-					$this->_set_group_hold_ary($hold_ary[$row['forum_id']], $option_id, $setting);
-				}
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		return $hold_ary;
-	}
-
-	/**
-	* Private function snippet for setting a specific piece of the hold_ary
-	*/
-	private function _set_group_hold_ary(&$hold_ary, $option_id, $setting)
-	{
-		if (!isset($hold_ary[$option_id]) || (isset($hold_ary[$option_id]) && $hold_ary[$option_id] != phpbb::ACL_NEVER))
-		{
-			$hold_ary[$option_id] = $setting;
-
-			// If we detect phpbb::ACL_NEVER, we will unset the flag option (within building the bitstring it is correctly set again)
-			if ($setting == phpbb::ACL_NEVER)
-			{
-				$flag = substr($this->acl_options['option'][$option_id], 0, strpos($this->acl_options['option'][$option_id], '_') + 1);
-				$flag = (int) $this->acl_options['id'][$flag];
-
-				if (isset($hold_ary[$flag]) && $hold_ary[$flag] == phpbb::ACL_YES)
-				{
-					unset($hold_ary[$flag]);
-
-/*					This is uncommented, because i suspect this being slightly wrong due to mixed permission classes being possible
-					if (in_array(phpbb::ACL_YES, $hold_ary))
-					{
-						$hold_ary[$flag] = phpbb::ACL_YES;
-					}*/
-				}
-			}
-		}
-	}
-
-	/**
-	* Fill auth_option statement for later querying based on the supplied options
-	*/
-	private function build_auth_option_statement($key, $auth_options, &$sql_opts)
-	{
-		if (!is_array($auth_options))
-		{
-			if (strpos($auth_options, '%') !== false)
-			{
-				$sql_opts = "AND $key " . phpbb::$db->sql_like_expression(str_replace('%', phpbb::$db->any_char, $auth_options));
-			}
-			else
-			{
-				$sql_opts = "AND $key = '" . phpbb::$db->sql_escape($auth_options) . "'";
-			}
-		}
-		else
-		{
-			$is_like_expression = false;
-
-			foreach ($auth_options as $option)
-			{
-				if (strpos($option, '%') !== false)
-				{
-					$is_like_expression = true;
-				}
-			}
-
-			if (!$is_like_expression)
-			{
-				$sql_opts = 'AND ' . phpbb::$db->sql_in_set($key, $auth_options);
-			}
-			else
-			{
-				$sql = array();
-
-				foreach ($auth_options as $option)
-				{
-					if (strpos($option, '%') !== false)
-					{
-						$sql[] = $key . ' ' . phpbb::$db->sql_like_expression(str_replace('%', phpbb::$db->any_char, $option));
-					}
-					else
-					{
-						$sql[] = $key . " = '" . phpbb::$db->sql_escape($option) . "'";
-					}
-				}
-
-				$sql_opts = 'AND (' . implode(' OR ', $sql) . ')';
-			}
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/classes/cache.php b/phpBB/includes/classes/cache.php
deleted file mode 100644
index eeeae58989..0000000000
--- a/phpBB/includes/classes/cache.php
+++ /dev/null
@@ -1,425 +0,0 @@
-<?php
-/**
-*
-* @package acm
-* @version $Id$
-* @copyright (c) 2005, 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Class for obtaining cached entries, for example censor word list, configuration...
-* @package acm
-*/
-class phpbb_cache
-{
-	/**
-	* We do not want this object instantiable
-	*/
-	private function ___construct() { }
-
-	/**
-	* Required phpBB objects
-	*/
-	public $phpbb_required = array('config', 'acm', 'db');
-
-	/**
-	* Optional phpBB objects
-	*/
-	public $phpbb_optional = array();
-
-	/**
-	* Get config values
-	*
-	* @return array configuration
-	* @access public
-	*/
-	public static function obtain_config()
-	{
-		if ((phpbb::$config = phpbb::$acm->get('#config')) !== false)
-		{
-			$sql = 'SELECT config_name, config_value
-				FROM ' . CONFIG_TABLE . '
-				WHERE is_dynamic = 1';
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				phpbb::$config[$row['config_name']] = $row['config_value'];
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-		else
-		{
-			phpbb::$config = $cached_config = array();
-
-			$sql = 'SELECT config_name, config_value, is_dynamic
-				FROM ' . CONFIG_TABLE;
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				if (!$row['is_dynamic'])
-				{
-					$cached_config[$row['config_name']] = $row['config_value'];
-				}
-
-				phpbb::$config[$row['config_name']] = $row['config_value'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			phpbb::$acm->put('#config', $cached_config);
-		}
-
-		return phpbb::$config;
-	}
-
-	/**
-	* Obtain list of naughty words and build preg style replacement arrays for use by the calling script
-	*
-	* @return array Censored words
-	* @access public
-	*/
-	public static function obtain_word_list()
-	{
-		if (($censors = phpbb::$acm->get('word_censors')) === false)
-		{
-			$sql = 'SELECT word, replacement
-				FROM ' . WORDS_TABLE;
-			$result = phpbb::$db->sql_query($sql);
-
-			$censors = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$censors['match'][] = '#(?<!\w)(' . str_replace('\*', '\w*?', preg_quote($row['word'], '#')) . ')(?!\w)#i';
-				$censors['replace'][] = $row['replacement'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			phpbb::$acm->put('word_censors', $censors);
-		}
-
-		return $censors;
-	}
-
-	/**
-	* Obtain currently listed icons
-	*
-	* @return array Icons
-	* @access public
-	*/
-	public static function obtain_icons()
-	{
-		if (($icons = phpbb::$acm->get('icons')) === false)
-		{
-			// Topic icons
-			$sql = 'SELECT *
-				FROM ' . ICONS_TABLE . '
-				ORDER BY icons_order';
-			$result = phpbb::$db->sql_query($sql);
-
-			$icons = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$icons[$row['icons_id']]['img'] = $row['icons_url'];
-				$icons[$row['icons_id']]['width'] = (int) $row['icons_width'];
-				$icons[$row['icons_id']]['height'] = (int) $row['icons_height'];
-				$icons[$row['icons_id']]['display'] = (bool) $row['display_on_posting'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			phpbb::$acm->put('icons', $icons);
-		}
-
-		return $icons;
-	}
-
-	/**
-	* Obtain ranks
-	*
-	* @return Ranks
-	* @access public
-	*/
-	public static function obtain_ranks()
-	{
-		if (($ranks = phpbb::$acm->get('ranks')) === false)
-		{
-			$sql = 'SELECT *
-				FROM ' . RANKS_TABLE . '
-				ORDER BY rank_min DESC';
-			$result = phpbb::$db->sql_query($sql);
-
-			$ranks = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				if ($row['rank_special'])
-				{
-					$ranks['special'][$row['rank_id']] = array(
-						'rank_title'	=>	$row['rank_title'],
-						'rank_image'	=>	$row['rank_image']
-					);
-				}
-				else
-				{
-					$ranks['normal'][] = array(
-						'rank_title'	=>	$row['rank_title'],
-						'rank_min'		=>	$row['rank_min'],
-						'rank_image'	=>	$row['rank_image']
-					);
-				}
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			phpbb::$acm->put('ranks', $ranks);
-		}
-
-		return $ranks;
-	}
-
-	/**
-	* Put attachment extensions data into cache
-	*
-	* @return array Cached extensions
-	* @access private
-	*/
-	private static function cache_extensions()
-	{
-		$extensions = array(
-			'_allowed_post'	=> array(),
-			'_allowed_pm'	=> array(),
-		);
-
-		// The rule is to only allow those extensions defined. ;)
-		$sql = 'SELECT e.extension, g.*
-			FROM ' . EXTENSIONS_TABLE . ' e, ' . EXTENSION_GROUPS_TABLE . ' g
-			WHERE e.group_id = g.group_id
-				AND (g.allow_group = 1 OR g.allow_in_pm = 1)';
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$extension = strtolower(trim($row['extension']));
-
-			$extensions[$extension] = array(
-				'display_cat'	=> (int) $row['cat_id'],
-				'download_mode'	=> (int) $row['download_mode'],
-				'upload_icon'	=> trim($row['upload_icon']),
-				'max_filesize'	=> (int) $row['max_filesize'],
-				'allow_group'	=> $row['allow_group'],
-				'allow_in_pm'	=> $row['allow_in_pm'],
-			);
-
-			$allowed_forums = ($row['allowed_forums']) ? unserialize(trim($row['allowed_forums'])) : array();
-
-			// Store allowed extensions forum wise
-			if ($row['allow_group'])
-			{
-				$extensions['_allowed_post'][$extension] = (!sizeof($allowed_forums)) ? 0 : $allowed_forums;
-			}
-
-			if ($row['allow_in_pm'])
-			{
-				$extensions['_allowed_pm'][$extension] = 0;
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		phpbb::$acm->put('extensions', $extensions);
-		return $extensions;
-	}
-
-	/**
-	* Obtain allowed attachment extensions in private messages
-	*
-	* @return array Allowed extensions
-	* @access public
-	*/
-	public static function obtain_extensions_pm()
-	{
-		if (($extensions = phpbb::$acm->get('extensions')) === false)
-		{
-			$extensions = self::cache_extensions();
-		}
-
-		// We are checking for private messages, therefore we only need to get the pm extensions...
-		$result = array('_allowed_' => array());
-
-		foreach ($extensions['_allowed_pm'] as $extension => $check)
-		{
-			$result['_allowed_'][$extension] = 0;
-			$result[$extension] = $extensions[$extension];
-		}
-
-		return $result;
-	}
-
-	/**
-	* Obtain allowed attachment extensions in specific forum
-	*
-	* @param int $forum_id The forum id
-	* @return array Allowed extensions within the specified forum
-	* @access public
-	*/
-	public static function obtain_extensions_forum($forum_id)
-	{
-		if (($extensions = phpbb::$acm->get('extensions')) === false)
-		{
-			$extensions = self::cache_extensions();
-		}
-
-		$forum_id = (int) $forum_id;
-		$result = array('_allowed_' => array());
-
-		foreach ($extensions['_allowed_post'] as $extension => $check)
-		{
-			// Check for allowed forums
-			if (is_array($check))
-			{
-				$allowed = (!in_array($forum_id, $check)) ? false : true;
-			}
-			else
-			{
-				$allowed = true;
-			}
-
-			if ($allowed)
-			{
-				$result['_allowed_'][$extension] = 0;
-				$result[$extension] = $extensions[$extension];
-			}
-		}
-
-		if (!isset($result['_allowed_']))
-		{
-			$result['_allowed_'] = array();
-		}
-
-		return $result;
-	}
-
-	/**
-	* Obtain general attachment extension information
-	*
-	* @return array Cached extension information
-	* @access public
-	*/
-	public static function obtain_extensions()
-	{
-		if (($extensions = phpbb::$acm->get('extensions')) === false)
-		{
-			$extensions = self::cache_extensions();
-		}
-
-		return $extensions;
-	}
-
-	/**
-	* Obtain active bots
-	*
-	* @return array Active bots
-	* @access public
-	*/
-	public static function obtain_bots()
-	{
-		if (($bots = phpbb::$acm->get('bots')) === false)
-		{
-			// @todo We order by last visit date. This way we are able to safe some cycles by checking the most active ones first.
-			$sql = 'SELECT user_id, bot_agent, bot_ip
-				FROM ' . BOTS_TABLE . '
-				WHERE bot_active = 1
-				ORDER BY ' . phpbb::$db->sql_function('length_varchar', 'bot_agent') . 'DESC';
-			$result = phpbb::$db->sql_query($sql);
-
-			$bots = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$bots[] = $row;
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			phpbb::$acm->put('bots', $bots);
-		}
-
-		return $bots;
-	}
-
-	/**
-	* Obtain Styles .cfg file data
-	*
-	* @param array $theme An array containing the path to the items
-	* @param string $item The specific item to get: 'theme', 'template', or 'imageset'
-	* @return array The configuration
-	* @access public
-	*/
-	public static function obtain_cfg_item($theme, $item = 'theme')
-	{
-		$parsed_array = phpbb::$acm->get('cfg_' . $item . '_' . $theme[$item . '_path']);
-
-		if ($parsed_array === false)
-		{
-			$parsed_array = array();
-		}
-
-		$reparse = false;
-		$filename = PHPBB_ROOT_PATH . 'styles/' . $theme[$item . '_path'] . '/' . $item . '/' . $item . '.cfg';
-
-		if (!file_exists($filename))
-		{
-			return $parsed_array;
-		}
-
-		if (!isset($parsed_array['filetime']) || ((phpbb::$config['load_tplcompile'] && @filemtime($filename) > $parsed_array['filetime'])))
-		{
-			$reparse = true;
-		}
-
-		// Re-parse cfg file
-		if ($reparse)
-		{
-			$parsed_array = parse_cfg_file($filename);
-			$parsed_array['filetime'] = @filemtime($filename);
-
-			phpbb::$acm->put('cfg_' . $item . '_' . $theme[$item . '_path'], $parsed_array);
-		}
-
-		return $parsed_array;
-	}
-
-	/**
-	* Obtain disallowed usernames
-	*
-	* @return array Disallowed usernames
-	* @access public
-	*/
-	public static function obtain_disallowed_usernames()
-	{
-		if (($usernames = phpbb::$acm->get('disallowed_usernames')) === false)
-		{
-			$sql = 'SELECT disallow_username
-				FROM ' . DISALLOW_TABLE;
-			$result = phpbb::$db->sql_query($sql);
-
-			$usernames = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$usernames[] = str_replace('%', '.*?', preg_quote(utf8_clean_string($row['disallow_username']), '#'));
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			phpbb::$acm->put('disallowed_usernames', $usernames);
-		}
-
-		return $usernames;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/classes/session.php b/phpBB/includes/classes/session.php
deleted file mode 100644
index ca54bae552..0000000000
--- a/phpBB/includes/classes/session.php
+++ /dev/null
@@ -1,1289 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005, 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Session class
-* @package phpBB3
-*/
-abstract class phpbb_session
-{
-	/**
-	* @var array Cookie informations
-	*/
-	private $cookie_data = array();
-
-	/**
-	* @var array User data
-	*/
-	public $data = array();
-
-	/**
-	* @var string Session id
-	*/
-	public $session_id = '';
-
-	/**
-	* @var int Current time
-	*/
-	public $time_now = 0;
-
-	/**
-	* @var bool True if the current page is updated within the sessions table
-	*/
-	public $update_session_page = true;
-
-	/**
-	* @var mixed Reference to authentication system.
-	*/
-	public $auth = NULL;
-
-	/**
-	* @var mixed Reference to system array for obtaining server/system information
-	*/
-	public $system = NULL;
-
-	/**
-	* @var array Extra url parameter to append to every URL in phpBB
-	*/
-	public $extra_url = array();
-
-	/**
-	* @var bool If this is true then the session id (?sid=[session_id]) is required
-	*/
-	public $need_sid = false;
-
-	/**
-	* @var array Information about current page
-	*/
-	public $page = array();
-
-	/**
-	* @var string The users IP
-	*/
-	public $ip = '127.0.0.1';
-
-	/**
-	* Init session. Empties the user data and assigns the system object (phpbb::$instances['system'])
-	* @access public
-	*/
-	public function __construct()
-	{
-		// Reset data array ;)
-		$this->data = array();
-
-		// Set auth to false (only valid for an user object)
-		$this->auth = false;
-
-		// Some system/server variables, directly generated by phpbb_system_info methods. Used like an array.
-		// We use the phpbb:: one, because it could've been modified and being a completely different class
-		$this->system =& phpbb::$instances['server-vars'];
-	}
-
-	/**
-	* Specifiy the need for a session id within the URL
-	*
-	* @param bool	$need_sid	Specify if the session id is needed or not. Default is false.
-	* @access public
-	*/
-	public function need_sid($need_sid = false)
-	{
-		$this->need_sid = $need_sid;
-	}
-
-	/**
-	* Start session management
-	*
-	* This is where all session activity begins. We gather various pieces of
-	* information from the client and server. We test to see if a session already
-	* exists. If it does, fine and dandy. If it doesn't we'll go on to create a
-	* new one ... pretty logical heh? We also examine the system load (if we're
-	* running on a system which makes such information readily available) and
-	* halt if it's above an admin definable limit.
-	*
-	* @param bool	$update_session_page	If true the session page gets updated.
-	* 										This can be set to false to circumvent certain scripts to update the users last visited page.
-	*
-	* @return bool	True if the session exist or has been created, else False.
-	* @access public
-	*/
-	public function session_begin($update_session_page = true)
-	{
-		// Give us some basic information
-		$this->time_now				= time();
-		$this->cookie_data			= array('u' => 0, 'k' => '');
-		$this->update_session_page	= $update_session_page;
-		$this->page					= $this->system['page'];
-		$this->ip					= $this->system['ip'];
-
-		if (phpbb_request::is_set(phpbb::$config['cookie_name'] . '_sid', phpbb_request::COOKIE) || phpbb_request::is_set(phpbb::$config['cookie_name'] . '_u', phpbb_request::COOKIE))
-		{
-			$this->cookie_data['u'] = request_var(phpbb::$config['cookie_name'] . '_u', 0, false, true);
-			$this->cookie_data['k'] = request_var(phpbb::$config['cookie_name'] . '_k', '', false, true);
-			$this->session_id 		= request_var(phpbb::$config['cookie_name'] . '_sid', '', false, true);
-
-			if (empty($this->session_id))
-			{
-				$this->session_id = request_var('sid', '');
-				$this->cookie_data = array('u' => 0, 'k' => '');
-				$this->need_sid = true;
-			}
-		}
-		else
-		{
-			$this->session_id = request_var('sid', '');
-			$this->need_sid = true;
-		}
-
-		$this->extra_url = array();
-
-		// Now check for an existing session
-		if ($this->session_exist())
-		{
-			return true;
-		}
-
-		// If we reach here then no (valid) session exists. So we'll create a new one
-		return $this->session_create();
-	}
-
-	/**
-	* Create a new session
-	*
-	* If upon trying to start a session we discover there is nothing existing we
-	* jump here. Additionally this method is called directly during login to regenerate
-	* the session for the specific user. In this method we carry out a number of tasks;
-	* garbage collection, (search)bot checking, banned user comparison. Basically
-	* though this method will result in a new session for a specific user.
-	*
-	* @param int	$user_id		The user id to create the session for.
-	* @param bool	$set_admin		Set the users admin field to identify him/her as an admin?
-	* @param bool	$persist_login	Allow persistent login
-	* @param bool	$viewonline		If false then the user will be logged in as hidden
-	*
-	* @return bool	True if session got created successfully.
-	* @access public
-	*/
-	public function session_create($user_id = false, $set_admin = false, $persist_login = false, $viewonline = true)
-	{
-		// There is one case where we need to add a "failsafe" user... when we are not able to query the database
-		if (!phpbb::registered('db'))
-		{
-			$this->data = $this->default_data();
-			return true;
-		}
-
-		// If the data array is filled, chances are high that there was a different session active
-		if (sizeof($this->data))
-		{
-			// Kill the session and do not create a new one
-			$this->session_kill(false);
-		}
-
-		$this->data = array();
-
-		// Do we allow autologin on this board? No? Then override anything
-		// that may be requested here
-		if (!phpbb::$config['allow_autologin'])
-		{
-			$this->cookie_data['k'] = $persist_login = false;
-		}
-
-		// Check for autologin key. ;)
-		if ($this->auth !== false && method_exists($this->auth, 'autologin'))
-		{
-			$this->data = $this->auth->autologin();
-
-			if (sizeof($this->data))
-			{
-				$this->cookie_data['k'] = '';
-				$this->cookie_data['u'] = $this->data['user_id'];
-			}
-		}
-
-		// NULL indicates we need to check for a bot later. Sometimes it is apparant that it is not a bot. ;) No need to always check this.
-		$bot = NULL;
-
-		// If we're presented with an autologin key we'll join against it.
-		// Else if we've been passed a user_id we'll grab data based on that
-		if (isset($this->cookie_data['k']) && $this->cookie_data['k'] && $this->cookie_data['u'] && !sizeof($this->data))
-		{
-			$sql = 'SELECT u.*
-				FROM ' . USERS_TABLE . ' u, ' . SESSIONS_KEYS_TABLE . ' k
-				WHERE u.user_id = ' . (int) $this->cookie_data['u'] . '
-					AND u.user_type IN (' . phpbb::USER_NORMAL . ', ' . phpbb::USER_FOUNDER . ")
-					AND k.user_id = u.user_id
-					AND k.key_id = '" . phpbb::$db->sql_escape(md5($this->cookie_data['k'])) . "'";
-			$result = phpbb::$db->sql_query($sql);
-			$this->data = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			$bot = false;
-		}
-		else if ($user_id !== false && !sizeof($this->data))
-		{
-			$this->cookie_data['k'] = '';
-			$this->cookie_data['u'] = $user_id;
-
-			$sql = 'SELECT *
-				FROM ' . USERS_TABLE . '
-				WHERE user_id = ' . (int) $this->cookie_data['u'] . '
-					AND user_type IN (' . phpbb::USER_NORMAL . ', ' . phpbb::USER_FOUNDER . ')';
-			$result = phpbb::$db->sql_query($sql);
-			$this->data = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			$bot = false;
-		}
-
-		if ($bot === NULL)
-		{
-			$bot = $this->check_bot();
-		}
-
-		// If no data was returned one or more of the following occurred:
-		// Key didn't match one in the DB
-		// User does not exist
-		// User is inactive
-		// User is bot
-		if (!sizeof($this->data) || !is_array($this->data))
-		{
-			$this->cookie_data['k'] = '';
-			$this->cookie_data['u'] = ($bot) ? $bot : ANONYMOUS;
-
-			if (!$bot)
-			{
-				$sql = 'SELECT *
-					FROM ' . USERS_TABLE . '
-					WHERE user_id = ' . (int) $this->cookie_data['u'];
-			}
-			else
-			{
-				// We give bots always the same session if it is not yet expired.
-				$sql = 'SELECT u.*, s.*
-					FROM ' . USERS_TABLE . ' u
-					LEFT JOIN ' . SESSIONS_TABLE . ' s ON (s.session_user_id = u.user_id)
-					WHERE u.user_id = ' . (int) $bot;
-			}
-
-			$result = phpbb::$db->sql_query($sql);
-			$this->data = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			$this->is_registered = false;
-		}
-		else
-		{
-			$this->is_registered = true;
-			$this->is_guest = false;
-			$this->is_founder = $this->data['user_type'] == phpbb::USER_FOUNDER;
-		}
-
-		// Force user id to be integer...
-		$this->data['user_id'] = (int) $this->data['user_id'];
-
-		// Code for ANONYMOUS user, INACTIVE user and BOTS
-		if (!$this->is_registered)
-		{
-			// Set last visit date to 'now'
-			$this->data['session_last_visit'] = $this->time_now;
-			$this->is_bot = ($bot) ? true : false;
-
-			// If our friend is a bot, we re-assign a previously assigned session
-			if ($this->is_bot && $bot == $this->data['user_id'] && $this->data['session_id'])
-			{
-				if ($this->session_valid(false))
-				{
-					$this->session_id = $this->data['session_id'];
-
-					// Only update session DB a minute or so after last update or if page changes
-					if ($this->time_now - $this->data['session_time'] > 60 || ($this->update_session_page && $this->data['session_page'] != $this->system['page']['page']))
-					{
-						$this->data['session_time'] = $this->data['session_last_visit'] = $this->time_now;
-						$sql_ary = array('session_time' => $this->time_now, 'session_last_visit' => $this->time_now, 'session_admin' => 0);
-
-						if ($this->update_session_page)
-						{
-							$sql_ary['session_page'] = substr($this->system['page']['page'], 0, 199);
-						}
-
-						$sql = 'UPDATE ' . SESSIONS_TABLE . ' SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . "
-							WHERE session_id = '" . phpbb::$db->sql_escape($this->session_id) . "'";
-						phpbb::$db->sql_query($sql);
-
-						// Update the last visit time
-						$sql = 'UPDATE ' . USERS_TABLE . '
-							SET user_lastvisit = ' . (int) $this->data['session_time'] . '
-							WHERE user_id = ' . (int) $this->data['user_id'];
-						phpbb::$db->sql_query($sql);
-					}
-
-					$this->session_id = '';
-
-					return true;
-				}
-				else
-				{
-					// If the ip and browser does not match make sure we only have one bot assigned to one session
-					phpbb::$db->sql_query('DELETE FROM ' . SESSIONS_TABLE . ' WHERE session_user_id = ' . $this->data['user_id']);
-				}
-			}
-		}
-		else
-		{
-			// Code for registered users
-			$this->data['session_last_visit'] = (!empty($this->data['session_time'])) ? $this->data['session_time'] : (($this->data['user_lastvisit']) ? $this->data['user_lastvisit'] : $this->time_now);
-			$this->is_bot = false;
-		}
-
-		// At this stage we should have a filled data array, defined cookie u and k data.
-		// data array should contain recent session info if we're a real user and a recent
-		// session exists in which case session_id will also be set
-
-		// Is user banned? Are they excluded? Won't return on ban, exists within method
-		if ($this->data['user_type'] != phpbb::USER_FOUNDER)
-		{
-			if (!phpbb::$config['forwarded_for_check'])
-			{
-				$this->check_ban($this->data['user_id'], $this->system['ip']);
-			}
-			else
-			{
-				$ips = explode(', ', $this->forwarded_for);
-				$ips[] = $this->system['ip'];
-				$this->check_ban($this->data['user_id'], $ips);
-			}
-		}
-
-		$session_autologin = (($this->cookie_data['k'] || $persist_login) && $this->is_registered) ? true : false;
-		$set_admin = ($set_admin && $this->is_registered) ? true : false;
-
-		// Create or update the session
-		$sql_ary = array(
-			'session_user_id'		=> (int) $this->data['user_id'],
-			'session_start'			=> (int) $this->time_now,
-			'session_last_visit'	=> (int) $this->data['session_last_visit'],
-			'session_time'			=> (int) $this->time_now,
-			'session_browser'		=> (string) trim(substr($this->system['browser'], 0, 149)),
-			'session_forwarded_for'	=> (string) $this->system['forwarded_for'],
-			'session_ip'			=> (string) $this->system['ip'],
-			'session_autologin'		=> ($session_autologin) ? 1 : 0,
-			'session_admin'			=> ($set_admin) ? 1 : 0,
-			'session_viewonline'	=> ($viewonline) ? 1 : 0,
-		);
-
-		if ($this->update_session_page)
-		{
-			$sql_ary['session_page'] = (string) substr($this->system['page']['page'], 0, 199);
-		}
-
-		phpbb::$db->sql_return_on_error(true);
-
-		// Delete old session, if user id now different from anonymous
-		if (!defined('IN_ERROR_HANDLER'))
-		{
-			// We do not care about the user id, because we assign a new session later
-			$sql = 'DELETE
-				FROM ' . SESSIONS_TABLE . "
-				WHERE session_id = '" . phpbb::$db->sql_escape($this->session_id) . "'";
-			$result = phpbb::$db->sql_query($sql);
-
-			// If there were no sessions or the session id empty (then the affected rows will be empty too), then we have a brand new session and can check the active sessions limit
-			if ((!$result || !phpbb::$db->sql_affectedrows()) && (empty($this->data['session_time']) && phpbb::$config['active_sessions']))
-			{
-				$sql = 'SELECT COUNT(session_id) AS sessions
-					FROM ' . SESSIONS_TABLE . '
-					WHERE session_time >= ' . ($this->time_now - 60);
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if ((int) $row['sessions'] > (int) phpbb::$config['active_sessions'])
-				{
-					header('HTTP/1.1 503 Service Unavailable');
-					trigger_error('BOARD_UNAVAILABLE');
-				}
-			}
-		}
-
-		// Something quite important: session_page always holds the *last* page visited, except for the *first* visit.
-		// We are not able to simply have an empty session_page btw, therefore we need to tell phpBB how to detect this special case.
-		// If the session id is empty, we have a completely new one and will set an "identifier" here. This identifier is able to be checked later.
-		if (empty($this->data['session_id']))
-		{
-			// This is a temporary variable, only set for the very first visit
-			$this->data['session_created'] = true;
-		}
-
-		$this->session_id = $this->data['session_id'] = md5(phpbb::$security->unique_id());
-
-		$sql_ary['session_id'] = (string) $this->session_id;
-
-		$sql = 'INSERT INTO ' . SESSIONS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary);
-		phpbb::$db->sql_query($sql);
-
-		phpbb::$db->sql_return_on_error(false);
-
-		// Regenerate autologin/persistent login key
-		if ($session_autologin)
-		{
-			$this->set_login_key();
-		}
-
-		// refresh data
-		$this->data = array_merge($this->data, $sql_ary);
-
-		if (!$bot)
-		{
-			$cookie_expire = $this->time_now + ((phpbb::$config['max_autologin_time']) ? 86400 * (int) phpbb::$config['max_autologin_time'] : 31536000);
-
-			$this->set_cookie('u', $this->cookie_data['u'], $cookie_expire);
-			$this->set_cookie('k', $this->cookie_data['k'], $cookie_expire);
-			$this->set_cookie('sid', $this->session_id, $cookie_expire);
-
-			unset($cookie_expire);
-
-			// Only one session entry present...
-			$sql = 'SELECT COUNT(session_id) AS sessions
-				FROM ' . SESSIONS_TABLE . '
-				WHERE session_user_id = ' . (int) $this->data['user_id'] . '
-					AND session_time >= ' . (int) ($this->time_now - (max(phpbb::$config['session_length'], phpbb::$config['form_token_lifetime'])));
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if ((int) $row['sessions'] <= 1 || empty($this->data['user_form_salt']))
-			{
-				$this->data['user_form_salt'] = phpbb::$security->unique_id();
-
-				// Update the form key
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_form_salt = \'' . phpbb::$db->sql_escape($this->data['user_form_salt']) . '\'
-					WHERE user_id = ' . (int) $this->data['user_id'];
-				phpbb::$db->sql_query($sql);
-			}
-		}
-		else
-		{
-			$this->data['session_time'] = $this->data['session_last_visit'] = $this->time_now;
-
-			// Update the last visit time
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_lastvisit = ' . (int) $this->data['session_time'] . '
-				WHERE user_id = ' . (int) $this->data['user_id'];
-			phpbb::$db->sql_query($sql);
-
-			$this->session_id = '';
-		}
-
-		return true;
-	}
-
-	/**
-	* Kills a session
-	*
-	* This method does what it says on the tin. It will delete a pre-existing session.
-	* It resets cookie information (destroying any autologin key within that cookie data)
-	* and update the users information from the relevant session data. It will then
-	* grab guest user information.
-	*
-	* @param bool	$new_session	If true a new session will be generated after the original one got killed.
-	* @access public
-	*/
-	public function session_kill($new_session = true)
-	{
-		$sql = 'DELETE FROM ' . SESSIONS_TABLE . "
-			WHERE session_id = '" . phpbb::$db->sql_escape($this->session_id) . "'
-				AND session_user_id = " . (int) $this->data['user_id'];
-		phpbb::$db->sql_query($sql);
-
-		// Allow connecting logout with external auth method logout
-		if ($this->auth !== false && method_exists($this->auth, 'logout'))
-		{
-			$this->auth->logout($this, $new_session);
-		}
-
-		if ($this->data['user_id'] != ANONYMOUS)
-		{
-			// Delete existing session, update last visit info first!
-			if (!isset($this->data['session_time']))
-			{
-				$this->data['session_time'] = time();
-			}
-
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_lastvisit = ' . (int) $this->data['session_time'] . '
-				WHERE user_id = ' . (int) $this->data['user_id'];
-			phpbb::$db->sql_query($sql);
-
-			if ($this->cookie_data['k'])
-			{
-				$sql = 'DELETE FROM ' . SESSIONS_KEYS_TABLE . '
-					WHERE user_id = ' . (int) $this->data['user_id'] . "
-						AND key_id = '" . phpbb::$db->sql_escape(md5($this->cookie_data['k'])) . "'";
-				phpbb::$db->sql_query($sql);
-			}
-
-			// Reset the data array
-			$this->data = array();
-
-			$sql = 'SELECT *
-				FROM ' . USERS_TABLE . '
-				WHERE user_id = ' . ANONYMOUS;
-			$result = phpbb::$db->sql_query($sql);
-			$this->data = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		$cookie_expire = $this->time_now - 31536000;
-		$this->set_cookie('u', '', $cookie_expire);
-		$this->set_cookie('k', '', $cookie_expire);
-		$this->set_cookie('sid', '', $cookie_expire);
-		unset($cookie_expire);
-
-		$this->session_id = '';
-
-		// To make sure a valid session is created we create one for the anonymous user
-		if ($new_session)
-		{
-			$this->session_create(ANONYMOUS);
-		}
-	}
-
-	/**
-	* Session garbage collection
-	*
-	* This looks a lot more complex than it really is. Effectively we are
-	* deleting any sessions older than an admin definable limit. Due to the
-	* way in which we maintain session data we have to ensure we update user
-	* data before those sessions are destroyed. In addition this method
-	* removes autologin key information that is older than an admin defined
-	* limit.
-	*
-	* @access public
-	*/
-	public function session_gc()
-	{
-		$batch_size = 10;
-
-		if (!$this->time_now)
-		{
-			$this->time_now = time();
-		}
-
-		// Firstly, delete guest sessions
-		$sql = 'DELETE FROM ' . SESSIONS_TABLE . '
-			WHERE session_user_id = ' . ANONYMOUS . '
-				AND session_time < ' . (int) ($this->time_now - phpbb::$config['session_length']);
-		phpbb::$db->sql_query($sql);
-
-		// Get expired sessions, only most recent for each user
-		$sql = 'SELECT session_user_id, session_page, MAX(session_time) AS recent_time
-			FROM ' . SESSIONS_TABLE . '
-			WHERE session_time < ' . ($this->time_now - phpbb::$config['session_length']) . '
-			GROUP BY session_user_id, session_page';
-		$result = phpbb::$db->sql_query_limit($sql, $batch_size);
-
-		$del_user_id = array();
-		$del_sessions = 0;
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_lastvisit = ' . (int) $row['recent_time'] . ", user_lastpage = '" . phpbb::$db->sql_escape($row['session_page']) . "'
-				WHERE user_id = " . (int) $row['session_user_id'];
-			phpbb::$db->sql_query($sql);
-
-			$del_user_id[] = (int) $row['session_user_id'];
-			$del_sessions++;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if (sizeof($del_user_id))
-		{
-			// Delete expired sessions
-			$sql = 'DELETE FROM ' . SESSIONS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('session_user_id', $del_user_id) . '
-					AND session_time < ' . ($this->time_now - phpbb::$config['session_length']);
-			phpbb::$db->sql_query($sql);
-		}
-
-		if ($del_sessions < $batch_size)
-		{
-			// Less than 10 users, update gc timer ... else we want gc
-			// called again to delete other sessions
-			set_config('session_last_gc', $this->time_now, true);
-
-			if (phpbb::$config['max_autologin_time'])
-			{
-				$sql = 'DELETE FROM ' . SESSIONS_KEYS_TABLE . '
-					WHERE last_login < ' . (time() - (86400 * (int) phpbb::$config['max_autologin_time']));
-				phpbb::$db->sql_query($sql);
-			}
-
-			// only called from CRON; should be a safe workaround until the infrastructure gets going
-			if (!class_exists('captcha_factory'))
-			{
-				include(PHPBB_ROOT_PATH . "includes/captcha/captcha_factory." . PHP_EXT);
-			}
-			captcha_factory::garbage_collect(phpbb::$config['captcha_plugin']);
-		}
-
-		return;
-	}
-
-
-	/**
-	* Sets a cookie of the given name with the specified data for the given length of time. If no time is specified, a session cookie will be set.
-	*
-	* @param string	$name		Name of the cookie, will be automatically prefixed with the phpBB cookie name. Track becomes [cookie_name]_track then.
-	* @param string	$cookiedata	The data to hold within the cookie
-	* @param int	$cookietime	The expiration time as UNIX timestamp. If 0 is provided, a session cookie is set.
-	*
-	* @access public
-	*/
-	public function set_cookie($name, $cookiedata, $cookietime)
-	{
-		$name_data = rawurlencode(phpbb::$config['cookie_name'] . '_' . $name) . '=' . rawurlencode($cookiedata);
-		$expire = gmdate('D, d-M-Y H:i:s \\G\\M\\T', $cookietime);
-		$domain = (!phpbb::$config['cookie_domain'] || phpbb::$config['cookie_domain'] == 'localhost' || phpbb::$config['cookie_domain'] == '127.0.0.1') ? '' : '; domain=' . phpbb::$config['cookie_domain'];
-
-		header('Set-Cookie: ' . $name_data . (($cookietime) ? '; expires=' . $expire : '') . '; path=' . phpbb::$config['cookie_path'] . $domain . ((!phpbb::$config['cookie_secure']) ? '' : '; secure') . '; HttpOnly', false);
-	}
-
-	/**
-	* Check for banned user
-	*
-	* Checks whether the supplied user is banned by id, ip or email. If no parameters
-	* are passed to the method pre-existing session data is used. If $return is false
-	* this routine does not return on finding a banned user, it outputs a relevant
-	* message and stops execution.
-	*
-	* @param int			$user_id	The user id to check. If false then do not check user ids
-	* @param string|array	$user_ips	Can contain a string with one IP or an array of multiple IPs. If false then no ips are checked.
-	* @param int			$user_email	The email address to check
-	* @param bool			$return		If false then the banned message is displayed and script halted
-	*
-	* @return bool|string	True if banned and no reason given.
-	* 						False if not banned. A ban reason if banned and ban reason given. Check for !== false.
-	* @access public
-	*/
-	public function check_ban($user_id = false, $user_ips = false, $user_email = false, $return = false)
-	{
-		if (defined('IN_CHECK_BAN'))
-		{
-			return;
-		}
-
-		$banned = false;
-		$cache_ttl = 3600;
-		$where_sql = array();
-
-		$sql = 'SELECT ban_ip, ban_userid, ban_email, ban_exclude, ban_give_reason, ban_end
-			FROM ' . BANLIST_TABLE . '
-			WHERE ';
-
-		// Determine which entries to check, only return those
-		if ($user_email === false)
-		{
-			$where_sql[] = "ban_email = ''";
-		}
-
-		if ($user_ips === false)
-		{
-			$where_sql[] = "(ban_ip = '' OR ban_exclude = 1)";
-		}
-
-		if ($user_id === false)
-		{
-			$where_sql[] = '(ban_userid = 0 OR ban_exclude = 1)';
-		}
-		else
-		{
-			$cache_ttl = ($user_id == ANONYMOUS) ? 3600 : 0;
-			$_sql = '(ban_userid = ' . $user_id;
-
-			if ($user_email !== false)
-			{
-				$_sql .= " OR ban_email <> ''";
-			}
-
-			if ($user_ips !== false)
-			{
-				$_sql .= " OR ban_ip <> ''";
-			}
-
-			$_sql .= ')';
-
-			$where_sql[] = $_sql;
-		}
-
-		$sql .= (sizeof($where_sql)) ? implode(' AND ', $where_sql) : '';
-		$result = phpbb::$db->sql_query($sql, $cache_ttl);
-
-		$ban_triggered_by = 'user';
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			if ($row['ban_end'] && $row['ban_end'] < time())
-			{
-				continue;
-			}
-
-			$ip_banned = false;
-			if (!empty($row['ban_ip']))
-			{
-				if (!is_array($user_ips))
-				{
-					$ip_banned = preg_match('#^' . str_replace('\*', '.*?', preg_quote($row['ban_ip'], '#')) . '$#i', $user_ips);
-				}
-				else
-				{
-					foreach ($user_ips as $user_ip)
-					{
-						if (preg_match('#^' . str_replace('\*', '.*?', preg_quote($row['ban_ip'], '#')) . '$#i', $user_ip))
-						{
-							$ip_banned = true;
-							break;
-						}
-					}
-				}
-			}
-
-			if ((!empty($row['ban_userid']) && intval($row['ban_userid']) == $user_id) ||
-				$ip_banned ||
-				(!empty($row['ban_email']) && preg_match('#^' . str_replace('\*', '.*?', preg_quote($row['ban_email'], '#')) . '$#i', $user_email)))
-			{
-				if (!empty($row['ban_exclude']))
-				{
-					$banned = false;
-					break;
-				}
-				else
-				{
-					$banned = true;
-					$ban_row = $row;
-
-					if (!empty($row['ban_userid']) && intval($row['ban_userid']) == $user_id)
-					{
-						$ban_triggered_by = 'user';
-					}
-					else if ($ip_banned)
-					{
-						$ban_triggered_by = 'ip';
-					}
-					else
-					{
-						$ban_triggered_by = 'email';
-					}
-
-					// Don't break. Check if there is an exclude rule for this user
-				}
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if ($banned && !$return)
-		{
-			// If the session is empty we need to create a valid one...
-			if (empty($this->session_id))
-			{
-				// This seems to be no longer needed? - #14971
-//				$this->session_create(ANONYMOUS);
-			}
-
-			// Initiate environment ... since it won't be set at this stage
-			$this->setup();
-
-			// Logout the user, banned users are unable to use the normal 'logout' link
-			if ($this->data['user_id'] != ANONYMOUS)
-			{
-				$this->session_kill();
-			}
-
-			// We show a login box here to allow founders accessing the board if banned by IP
-			if (defined('IN_LOGIN') && $this->data['user_id'] == ANONYMOUS)
-			{
-				$this->setup('ucp');
-				$this->is_registered = $this->is_bot = $this->is_founder = false;
-				$this->is_guest = true;
-
-				// Set as a precaution to allow login_box() handling this case correctly as well as this function not being executed again.
-				define('IN_CHECK_BAN', 1);
-
-				login_box('index.' . PHP_EXT);
-
-				// The false here is needed, else the user is able to circumvent the ban.
-				$this->session_kill(false);
-			}
-
-			// Ok, we catch the case of an empty session id for the anonymous user...
-			// This can happen if the user is logging in, banned by username and the login_box() being called "again".
-			if (empty($this->session_id) && defined('IN_CHECK_BAN'))
-			{
-				$this->session_create(ANONYMOUS);
-			}
-
-
-			// Determine which message to output
-			$till_date = ($ban_row['ban_end']) ? $this->format_date($ban_row['ban_end']) : '';
-			$message = ($ban_row['ban_end']) ? 'BOARD_BAN_TIME' : 'BOARD_BAN_PERM';
-
-			$message = sprintf($this->lang[$message], $till_date, '<a href="mailto:' . phpbb::$config['board_contact'] . '">', '</a>');
-			$message .= ($ban_row['ban_give_reason']) ? '<br /><br />' . sprintf($this->lang['BOARD_BAN_REASON'], $ban_row['ban_give_reason']) : '';
-			$message .= '<br /><br /><em>' . $this->lang['BAN_TRIGGERED_BY_' . strtoupper($ban_triggered_by)] . '</em>';
-
-			// To circumvent session_begin returning a valid value and the check_ban() not called on second page view, we kill the session again
-			$this->session_kill(false);
-
-			// A very special case... we are within the cron script which is not supposed to print out the ban message... show blank page
-			if (defined('IN_CRON'))
-			{
-				garbage_collection();
-				exit_handler();
-				exit;
-			}
-
-			trigger_error($message);
-		}
-
-		return ($banned && $ban_row['ban_give_reason']) ? $ban_row['ban_give_reason'] : $banned;
-	}
-
-	/**
-	* Check if ip is blacklisted
-	* This should be called only where absolutly necessary
-	*
-	* Only IPv4 (rbldns does not support AAAA records/IPv6 lookups)
-	*
-	* @param string	$mode	Possible modes are: register and post
-	* 						spamhaus.org is used for both modes. Spamcop.net is additionally used for register.
-	* @param string	$ip		The ip to check. If false then the current IP is used
-	*
-	* @return bool|array	False if ip is not blacklisted, else an array([checked server], [lookup])
-	* @author satmd (from the php manual)
-	* @access public
-	*/
-	public function check_dnsbl($mode, $ip = false)
-	{
-		if ($ip === false)
-		{
-			$ip = $this->system['ip'];
-		}
-
-		$dnsbl_check = array(
-			'sbl-xbl.spamhaus.org'	=> 'http://www.spamhaus.org/query/bl?ip=',
-		);
-
-		if ($mode == 'register')
-		{
-			$dnsbl_check['bl.spamcop.net'] = 'http://spamcop.net/bl.shtml?';
-		}
-
-		if ($ip)
-		{
-			$quads = explode('.', $ip);
-			$reverse_ip = $quads[3] . '.' . $quads[2] . '.' . $quads[1] . '.' . $quads[0];
-
-			// Need to be listed on all servers...
-			$listed = true;
-			$info = array();
-
-			foreach ($dnsbl_check as $dnsbl => $lookup)
-			{
-				if (phpbb_checkdnsrr($reverse_ip . '.' . $dnsbl . '.', 'A') === true)
-				{
-					$info = array($dnsbl, $lookup . $ip);
-				}
-				else
-				{
-					$listed = false;
-				}
-			}
-
-			if ($listed)
-			{
-				return $info;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	* Set/Update a persistent login key
-	*
-	* This method creates or updates a persistent session key. When a user makes
-	* use of persistent (formerly auto-) logins a key is generated and stored in the
-	* DB. When they revisit with the same key it's automatically updated in both the
-	* DB and cookie. Multiple keys may exist for each user representing different
-	* browsers or locations. As with _any_ non-secure-socket no passphrase login this
-	* remains vulnerable to exploit.
-	*
-	* @param int	$user_id	The user id. If false the current users user id will be used
-	* @param string	$key		A login key. If false then the current users login key stored within the cookie will be used
-	* @param string	$user_ip	The users ip. If false, then the current users IP will be used
-	* @access public
-	*/
-	public function set_login_key($user_id = false, $key = false, $user_ip = false)
-	{
-		$user_id = ($user_id === false) ? $this->data['user_id'] : $user_id;
-		$user_ip = ($user_ip === false) ? $this->system['ip'] : $user_ip;
-		$key = ($key === false) ? (($this->cookie_data['k']) ? $this->cookie_data['k'] : false) : $key;
-
-		$key_id = phpbb::$security->unique_id(hexdec(substr($this->session_id, 0, 8)));
-
-		$sql_ary = array(
-			'key_id'		=> (string) md5($key_id),
-			'last_ip'		=> (string) $this->system['ip'],
-			'last_login'	=> (int) $this->time_now,
-		);
-
-		if (!$key)
-		{
-			$sql_ary += array(
-				'user_id'	=> (int) $user_id
-			);
-		}
-
-		if ($key)
-		{
-			$sql = 'UPDATE ' . SESSIONS_KEYS_TABLE . '
-				SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-				WHERE user_id = ' . (int) $user_id . "
-					AND key_id = '" . phpbb::$db->sql_escape(md5($key)) . "'";
-		}
-		else
-		{
-			$sql = 'INSERT INTO ' . SESSIONS_KEYS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary);
-		}
-		phpbb::$db->sql_query($sql);
-
-		$this->cookie_data['k'] = $key_id;
-	}
-
-	/**
-	* Reset all login keys for the specified user
-	*
-	* This method removes all current login keys for a specified (or the current)
-	* user. It will be called on password change to render old keys unusable
-	*
-	* @param int	$user_id	The user id. If false then the current users user id is used.
-	* @access public
-	*/
-	public function reset_login_keys($user_id = false)
-	{
-		$user_id = ($user_id === false) ? $this->data['user_id'] : $user_id;
-
-		$sql = 'DELETE FROM ' . SESSIONS_KEYS_TABLE . '
-			WHERE user_id = ' . (int) $user_id;
-		phpbb::$db->sql_query($sql);
-
-		// Let's also clear any current sessions for the specified user_id
-		// If it's the current user then we'll leave this session intact
-		$sql_where = 'session_user_id = ' . (int) $user_id;
-		$sql_where .= ($user_id === $this->data['user_id']) ? " AND session_id <> '" . phpbb::$db->sql_escape($this->session_id) . "'" : '';
-
-		$sql = 'DELETE FROM ' . SESSIONS_TABLE . "
-			WHERE $sql_where";
-		phpbb::$db->sql_query($sql);
-
-		// We're changing the password of the current user and they have a key
-		// Lets regenerate it to be safe
-		if ($user_id === $this->data['user_id'] && $this->cookie_data['k'])
-		{
-			$this->set_login_key($user_id);
-		}
-	}
-
-	/**
-	* Reset all admin sessions
-	*
-	* @access public
-	*/
-	public function unset_admin()
-	{
-		$sql = 'UPDATE ' . SESSIONS_TABLE . "
-			SET session_admin = 0
-			WHERE session_id = '" . phpbb::$db->sql_escape($this->session_id) . "'";
-		phpbb::$db->sql_query($sql);
-	}
-
-	/**
-	* Check if a valid, non-expired session exist. Also make sure it errors out correctly if we do not have a db-setup yet. ;)
-	*
-	* @return bool	True if a valid, non-expired session exist
-	* @access private
-	*/
-	private function session_exist()
-	{
-		// If session is empty or does not match the session within the URL (if required - set by NEED_SID), then we need a new session
-		if (empty($this->session_id) || ($this->need_sid && $this->session_id !== phpbb_request::variable('sid', '', false, phpbb_request::GET)))
-		{
-			return false;
-		}
-
-		// If the db is not initialized/registered, then we also need a new session (we are not able to go forward then...
-		if (!phpbb::registered('db'))
-		{
-			return false;
-		}
-
-		// Now finally check the db for our provided session
-		$sql = 'SELECT u.*, s.*
-			FROM ' . SESSIONS_TABLE . ' s, ' . USERS_TABLE . " u
-			WHERE s.session_id = '" . phpbb::$db->sql_escape($this->session_id) . "'
-				AND u.user_id = s.session_user_id";
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		// Also new session if it has not been found. ;)
-		if (!$row)
-		{
-			return false;
-		}
-
-		$this->data = $row;
-
-		// Now check the ip, the browser, forwarded for and referer
-		if (!$this->session_valid())
-		{
-			return false;
-		}
-
-		// Ok, we are not finished yet. We need to know if the session is expired
-
-		// Check whether the session is still valid if we have one
-		if ($this->auth !== false && method_exists($this->auth, 'validate_session'))
-		{
-			if (!$this->auth->validate_session($this))
-			{
-				return false;
-			}
-		}
-
-		// Check the session length timeframe if autologin is not enabled.
-		// Else check the autologin length... and also removing those having autologin enabled but no longer allowed board-wide.
-		if (!$this->data['session_autologin'])
-		{
-			if ($this->data['session_time'] < $this->time_now - (phpbb::$config['session_length'] + 60))
-			{
-				return false;
-			}
-		}
-		else if (!phpbb::$config['allow_autologin'] || (phpbb::$config['max_autologin_time'] && $this->data['session_time'] < $this->time_now - (86400 * (int) phpbb::$config['max_autologin_time']) + 60))
-		{
-			return false;
-		}
-
-		// Only update session DB a minute or so after last update or if page changes
-		if ($this->time_now - $this->data['session_time'] > 60 || ($this->update_session_page && $this->data['session_page'] != $this->system['page']['page']))
-		{
-			$sql_ary = array('session_time' => $this->time_now);
-
-			if ($this->update_session_page)
-			{
-				$sql_ary['session_page'] = substr($this->system['page']['page'], 0, 199);
-				$sql_ary['session_forum_id'] = $this->system['page']['forum'];
-			}
-
-			$sql = 'UPDATE ' . SESSIONS_TABLE . ' SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . "
-				WHERE session_id = '" . phpbb::$db->sql_escape($this->session_id) . "'";
-			phpbb::$db->sql_query($sql);
-		}
-
-		$this->is_registered = ($this->data['user_id'] != ANONYMOUS && ($this->data['user_type'] == phpbb::USER_NORMAL || $this->data['user_type'] == phpbb::USER_FOUNDER)) ? true : false;
-		$this->is_bot = (!$this->is_registered && $this->data['user_id'] != ANONYMOUS) ? true : false;
-		$this->is_founder = $this->data['user_type'] == phpbb::USER_FOUNDER;
-		$this->is_guest = (!$this->is_registered && $this->data['user_id'] == ANONYMOUS) ? true : false;
-		$this->data['user_lang'] = basename($this->data['user_lang']);
-
-		return true;
-	}
-
-	/**
-	* Check if the request originated from the same page.
-	*
-	* @param bool	$check_script_path	If true, the path will be checked as well
-	*
-	* @return bool	True if the referer is valid
-	* @access private
-	*/
-	private function validate_referer($check_script_path = false)
-	{
-		// no referer - nothing to validate, user's fault for turning it off (we only check on POST; so meta can't be the reason)
-		if (empty($this->system['referer']) || empty($this->system['host']))
-		{
-			return true;
-		}
-
-		// Specialchar host, because it's the only one not specialchared
-		$host = htmlspecialchars($this->system['host']);
-		$ref = substr($this->system['referer'], strpos($this->system['referer'], '://') + 3);
-
-		if (!(stripos($ref, $host) === 0))
-		{
-			return false;
-		}
-		else if ($check_script_path && rtrim($this->system['page']['root_script_path'], '/') !== '')
-		{
-			$ref = substr($ref, strlen($host));
-			$server_port = $this->system['port'];
-
-			if ($server_port !== 80 && $server_port !== 443 && stripos($ref, ":$server_port") === 0)
-			{
-				$ref = substr($ref, strlen(":$server_port"));
-			}
-
-			if (!(stripos(rtrim($ref, '/'), rtrim($this->system['page']['root_script_path'], '/')) === 0))
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* Fill data array with a "faked" user account
-	*
-	* @return array	Default user data array
-	* @access private
-	*/
-	private function default_data()
-	{
-		return array(
-			'user_id'		=> ANONYMOUS,
-		);
-	}
-
-	/**
-	* Check for a bot by comparing user agent and ip
-	*
-	* Here we do a bot check, oh er saucy! No, not that kind of bot
-	* check. We loop through the list of bots defined by the admin and
-	* see if we have any useragent and/or IP matches. If we do, this is a
-	* bot, act accordingly
-	*
-	* @return bool	True if it is a bot.
-	* @access private
-	*/
-	private function check_bot()
-	{
-		$bot = false;
-
-		foreach (phpbb_cache::obtain_bots() as $row)
-		{
-			if ($row['bot_agent'] && preg_match('#' . str_replace('\*', '.*?', preg_quote($row['bot_agent'], '#')) . '#i', $this->system['browser']))
-			{
-				$bot = $row['user_id'];
-			}
-
-			// If ip is supplied, we will make sure the ip is matching too...
-			if ($row['bot_ip'] && ($bot || !$row['bot_agent']))
-			{
-				// Set bot to false, then we only have to set it to true if it is matching
-				$bot = false;
-
-				foreach (explode(',', $row['bot_ip']) as $bot_ip)
-				{
-					if (!trim($bot_ip))
-					{
-						continue;
-					}
-
-					if (strpos($this->system['ip'], $bot_ip) === 0)
-					{
-						$bot = (int) $row['user_id'];
-						break;
-					}
-				}
-			}
-
-			if ($bot)
-			{
-				break;
-			}
-		}
-
-		return $bot;
-	}
-
-	/**
-	* Check if session is valid by comparing ip, forwarded for, browser and referer
-	*
-	* @param bool	$log_failure If true then a non-match will be logged. Can cause huge logs.
-	*
-	* @return bool	True if the session is valid
-	* @access private
-	*/
-	private function session_valid($log_failure = true)
-	{
-		// Validate IP length according to admin ... enforces an IP
-		// check on bots if admin requires this
-//		$quadcheck = (phpbb::$config['ip_check_bot'] && $this->data['user_type'] & USER_BOT) ? 4 : phpbb::$config['ip_check'];
-
-		if (strpos($this->system['ip'], ':') !== false && strpos($this->data['session_ip'], ':') !== false)
-		{
-			$session_ip = short_ipv6($this->data['session_ip'], phpbb::$config['ip_check']);
-			$user_ip = short_ipv6($this->system['ip'], phpbb::$config['ip_check']);
-		}
-		else
-		{
-			$session_ip = implode('.', array_slice(explode('.', $this->data['session_ip']), 0, phpbb::$config['ip_check']));
-			$user_ip = implode('.', array_slice(explode('.', $this->system['ip']), 0, phpbb::$config['ip_check']));
-		}
-
-		$session_browser = (phpbb::$config['browser_check']) ? trim(strtolower(substr($this->data['session_browser'], 0, 149))) : '';
-		$user_browser = (phpbb::$config['browser_check']) ? trim(strtolower(substr($this->system['browser'], 0, 149))) : '';
-
-		$session_forwarded_for = (phpbb::$config['forwarded_for_check']) ? substr($this->data['session_forwarded_for'], 0, 254) : '';
-		$user_forwarded_for = (phpbb::$config['forwarded_for_check']) ? substr($this->system['forwarded_for'], 0, 254) : '';
-
-		// referer checks
-		$check_referer_path = phpbb::$config['referer_validation'] == REFERER_VALIDATE_PATH;
-		$referer_valid = true;
-
-		// we assume HEAD and TRACE to be foul play and thus only whitelist GET
-		if (phpbb::$config['referer_validation'] && $this->system['request_method'])
-		{
-			$referer_valid = $this->validate_referer($check_referer_path);
-		}
-
-		if ($user_ip !== $session_ip || $user_browser !== $session_browser || $user_forwarded_for !== $session_forwarded_for || !$referer_valid)
-		{
-			// Added logging temporarly to help debug bugs...
-			if (phpbb::$base_config['debug_extra'] && $this->data['user_id'] != ANONYMOUS && $log_failure)
-			{
-				if ($referer_valid)
-				{
-					add_log('critical', 'LOG_IP_BROWSER_FORWARDED_CHECK', $user_ip, $session_ip, $user_browser, $session_browser, htmlspecialchars($user_forwarded_for), htmlspecialchars($session_forwarded_for));
-				}
-				else
-				{
-					add_log('critical', 'LOG_REFERER_INVALID', $this->system['referer']);
-				}
-			}
-
-			return false;
-		}
-
-		return true;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/classes/template.php b/phpBB/includes/classes/template.php
deleted file mode 100644
index 1ef29545d2..0000000000
--- a/phpBB/includes/classes/template.php
+++ /dev/null
@@ -1,531 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group, sections (c) 2001 ispi of Lincoln Inc
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @todo
-* IMG_ for image substitution?
-* {IMG_[key]:[alt]:[type]}
-* {IMG_ICON_CONTACT:CONTACT:full} -> phpbb::$user->img('icon_contact', 'CONTACT', 'full');
-*
-* More in-depth...
-* yadayada
-*/
-
-/**
-* Base Template class.
-* @package phpBB3
-*/
-class phpbb_template
-{
-	public $phpbb_required = array('user', 'config');
-	public $phpbb_optional = array();
-
-	/**
-	* variable that holds all the data we'll be substituting into
-	* the compiled templates. Takes form:
-	* --> $this->_tpldata[block][iteration#][child][iteration#][child2][iteration#][variablename] == value
-	* if it's a root-level variable, it'll be like this:
-	* --> $this->_tpldata[.][0][varname] == value
-	* @var array
-	*/
-	private $_tpldata = array('.' => array(0 => array()));
-
-	/**
-	* @var array Reference to template->_tpldata['.'][0]
-	*/
-	private $_rootref;
-
-	/**
-	* @var string Root dir for template.
-	*/
-	private $root = '';
-
-	/**
-	* @var string Path of the cache directory for the template
-	*/
-	public $cachepath = '';
-
-	/**
-	* @var array Hash of handle => file path pairs
-	*/
-	public $files = array();
-
-	/**
-	* @var array Hash of handle => filename pairs
-	*/
-	public $filename = array();
-
-	/**
-	* Set template location
-	* @access public
-	*/
-	public function set_template()
-	{
-		if (file_exists(PHPBB_ROOT_PATH . 'styles/' . phpbb::$user->theme['template_path'] . '/template'))
-		{
-			$this->root = PHPBB_ROOT_PATH . 'styles/' . phpbb::$user->theme['template_path'] . '/template';
-			$this->cachepath = PHPBB_ROOT_PATH . 'cache/tpl_' . phpbb::$user->theme['template_path'] . '_';
-		}
-		else
-		{
-			trigger_error('Template path could not be found: styles/' . phpbb::$user->theme['template_path'] . '/template', E_USER_ERROR);
-		}
-
-		$this->_rootref = &$this->_tpldata['.'][0];
-	}
-
-	/**
-	* Set custom template location (able to use directory outside of phpBB)
-	* @access public
-	* @param string $template_path Path to template directory
-	* @param string	$template_name Name of template
-	*/
-	public function set_custom_template($template_path, $template_name)
-	{
-		$this->root = $template_path;
-		$this->cachepath = PHPBB_ROOT_PATH . 'cache/ctpl_' . str_replace('_', '-', $template_name) . '_';
-	}
-
-	/**
-	* Sets the template filenames for handles. $filename_array
-	* @access public
-	* @param array $filname_array Should be a hash of handle => filename pairs.
-	*/
-	public function set_filenames(array $filename_array)
-	{
-		foreach ($filename_array as $handle => $filename)
-		{
-			if (empty($filename))
-			{
-				trigger_error("template->set_filenames: Empty filename specified for $handle", E_USER_ERROR);
-			}
-
-			$this->filename[$handle] = $filename;
-			$this->files[$handle] = $this->root . '/' . $filename;
-		}
-
-		return true;
-	}
-
-	/**
-	* Destroy template data set
-	* @access public
-	*/
-	public function __destruct()
-	{
-		$this->_tpldata = array('.' => array(0 => array()));
-	}
-
-	/**
-	* Reset/empty complete block
-	* @access public
-	* @param string $blockname Name of block to destroy
-	*/
-	public function destroy_block_vars($blockname)
-	{
-		if (strpos($blockname, '.') !== false)
-		{
-			// Nested block.
-			$blocks = explode('.', $blockname);
-			$blockcount = sizeof($blocks) - 1;
-
-			$str = &$this->_tpldata;
-			for ($i = 0; $i < $blockcount; $i++)
-			{
-				$str = &$str[$blocks[$i]];
-				$str = &$str[sizeof($str) - 1];
-			}
-
-			unset($str[$blocks[$blockcount]]);
-		}
-		else
-		{
-			// Top-level block.
-			unset($this->_tpldata[$blockname]);
-		}
-	}
-
-	/**
-	* Display handle
-	* @access public
-	* @param string $handle Handle to display
-	* @param bool $include_once Allow multiple inclusions
-	* @return bool True on success, false on failure
-	*/
-	public function display($handle, $include_once = true)
-	{
-/*
-		if (!empty($phpbb_hook) && $phpbb_hook->call_hook(array(__CLASS__, __FUNCTION__), $handle, $include_once))
-		{
-			if ($phpbb_hook->hook_return(array(__CLASS__, __FUNCTION__)))
-			{
-				return $phpbb_hook->hook_return_result(array(__CLASS__, __FUNCTION__));
-			}
-		}
-*/
-/*		if (defined('IN_ERROR_HANDLER'))
-		{
-			if ((E_NOTICE & error_reporting()) == E_NOTICE)
-			{
-				//error_reporting(error_reporting() ^ E_NOTICE);
-			}
-		}*/
-
-		$_tpldata	= &$this->_tpldata;
-		$_rootref	= &$this->_rootref;
-		$_lang		= &phpbb::$user->lang;
-
-		if (($filename = $this->_tpl_load($handle)) !== false)
-		{
-			($include_once) ? include_once($filename) : include($filename);
-		}
-		else if (($code = $this->_tpl_eval($handle)) !== false)
-		{
-			$code = ' ?> ' . $code . ' <?php ';
-			eval($code);
-		}
-		else
-		{
-			// if we could not eval AND the file exists, something horrific has occured
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	* Display the handle and assign the output to a template variable or return the compiled result.
-	* @access public
-	* @param string $handle Handle to operate on
-	* @param string $template_var Template variable to assign compiled handle to
-	* @param bool $return_content If true return compiled handle, otherwise assign to $template_var
-	* @param bool $include_once Allow multiple inclusions of the file
-	* @return bool|string If $return_content is true return string of the compiled handle, otherwise return true
-	*/
-	public function assign_display($handle, $template_var = '', $return_content = true, $include_once = false)
-	{
-		ob_start();
-		$this->display($handle, $include_once);
-		$contents = ob_get_clean();
-
-		if ($return_content)
-		{
-			return $contents;
-		}
-
-		$this->assign_var($template_var, $contents);
-
-		return true;
-	}
-
-	/**
-	* Load a compiled template if possible, if not, recompile it
-	* @access private
-	* @param string $handle Handle of the template to load
-	* @return string|bool Return filename on success otherwise false
-	* @uses template_compile is used to compile uncached templates
-	*/
-	private function _tpl_load($handle)
-	{
-		if (!isset($this->filename[$handle]))
-		{
-			trigger_error("template->_tpl_load(): No file specified for handle $handle", E_USER_ERROR);
-		}
-
-		$filename = $this->cachepath . str_replace('/', '.', $this->filename[$handle]) . '.' . PHP_EXT;
-
-		$recompile = (!file_exists($filename) || @filesize($filename) === 0 || (phpbb::$config['load_tplcompile'] && @filemtime($filename) < filemtime($this->files[$handle]))) ? true : false;
-
-		if (phpbb::$base_config['debug_extra'])
-		{
-			$recompile = true;
-		}
-
-		// Recompile page if the original template is newer, otherwise load the compiled version
-		if ($recompile)
-		{
-			$compile = new phpbb_template_compile($this);
-
-			// If we don't have a file assigned to this handle, die.
-			if (!isset($this->files[$handle]))
-			{
-				trigger_error("template->_tpl_load(): No file specified for handle $handle", E_USER_ERROR);
-			}
-
-			if ($compile->_tpl_load_file($handle) === false)
-			{
-				return false;
-			}
-		}
-
-		return $filename;
-	}
-
-	/**
-	* This code should only run when some high level error prevents us from writing to the cache.
-	* @access private
-	* @param string $handle Template handle to compile
-	* @return string|bool Return compiled code on success otherwise false
-	* @uses template_compile is used to compile template
-	*/
-	private function _tpl_eval($handle)
-	{
-		$compile = new phpbb_template_compile($this);
-
-		// If we don't have a file assigned to this handle, die.
-		if (!isset($this->files[$handle]))
-		{
-			trigger_error("template->_tpl_eval(): No file specified for handle $handle", E_USER_ERROR);
-		}
-
-		if (($code = $compile->_tpl_gen_src($handle)) === false)
-		{
-			return false;
-		}
-
-		return $code;
-	}
-
-	/**
-	* Assign key variable pairs from an array
-	* @access public
-	* @param array $vararray A hash of variable name => value pairs
-	*/
-	public function assign_vars(array $vararray)
-	{
-		foreach ($vararray as $key => $val)
-		{
-			$this->_rootref[$key] = $val;
-		}
-	}
-
-	/**
-	* Assign a single variable to a single key
-	* @access public
-	* @param string $varname Variable name
-	* @param string $varval Value to assign to variable
-	*/
-	public function assign_var($varname, $varval)
-	{
-		$this->_rootref[$varname] = $varval;
-	}
-
-	/**
-	* Assign key variable pairs from an array to a specified block
-	* @access public
-	* @param string $blockname Name of block to assign $vararray to
-	* @param array $vararray A hash of variable name => value pairs
-	*/
-	public function assign_block_vars($blockname, array $vararray)
-	{
-		if (strpos($blockname, '.') !== false)
-		{
-			// Nested block.
-			$blocks = explode('.', $blockname);
-			$blockcount = sizeof($blocks) - 1;
-
-			$str = &$this->_tpldata;
-			for ($i = 0; $i < $blockcount; $i++)
-			{
-				$str = &$str[$blocks[$i]];
-				$str = &$str[sizeof($str) - 1];
-			}
-
-			// Now we add the block that we're actually assigning to.
-			// We're adding a new iteration to this block with the given
-			// variable assignments.
-			$str[$blocks[$blockcount]][] = $vararray;
-		}
-		else
-		{
-			// Top-level block.
-
-			// Add a new iteration to this block with the variable assignments we were given.
-			$this->_tpldata[$blockname][] = $vararray;
-		}
-	}
-
-	/**
-	* Change already assigned key variable pair (one-dimensional - single loop entry)
-	*
-	* An example of how to use this function:
-	*
-	* @param	string	$blockname	the blockname, for example 'loop'
-	* @param	array	$vararray	the var array to insert/add or merge
-	* @param	mixed	$key		Key to search for
-	*
-	* array: KEY => VALUE [the key/value pair to search for within the loop to determine the correct position]
-	*
-	* int: Position [the position to change or insert at directly given]
-	*
-	* If key is false the position is set to 0
-	* If key is true the position is set to the last entry
-	*
-	* @param	string	$mode		Mode to execute (valid modes are 'insert' and 'change')
-	*
-	*	If insert, the vararray is inserted at the given position (position counting from zero).
-	*	If change, the current block gets merged with the vararray (resulting in new key/value pairs be added and existing keys be replaced by the new value).
-	*
-	* Since counting begins by zero, inserting at the last position will result in this array: array(vararray, last positioned array)
-	* and inserting at position 1 will result in this array: array(first positioned array, vararray, following vars)
-	*
-	* @return bool false on error, true on success
-	* @access public
-	*/
-	public function alter_block_array($blockname, array $vararray, $key = false, $mode = 'insert')
-	{
-		if (strpos($blockname, '.') !== false)
-		{
-			// Nested block.
-			$blocks = explode('.', $blockname);
-			$blockcount = sizeof($blocks) - 1;
-
-			$block = &$this->_tpldata;
-			for ($i = 0; $i < $blockcount; $i++)
-			{
-				if (($pos = strpos($blocks[$i], '[')) !== false)
-				{
-					$name = substr($blocks[$i], 0, $pos);
-
-					if (strpos($blocks[$i], '[]') === $pos)
-					{
-						$index = sizeof($block[$name]) - 1;
-					}
-					else
-					{
-						$index = min((int) substr($blocks[$i], $pos + 1, -1), sizeof($block[$name]) - 1);
-					}
-				}
-				else
-				{
-					$name = $blocks[$i];
-					$index = sizeof($block[$name]) - 1;
-				}
-				$block = &$block[$name];
-				$block = &$block[$index];
-			}
-
-			$block = &$block[$blocks[$i]]; // Traverse the last block
-		}
-		else
-		{
-			// Top-level block.
-			$block = &$this->_tpldata[$blockname];
-		}
-
-		// Change key to zero (change first position) if false and to last position if true
-		if ($key === false || $key === true)
-		{
-			$key = ($key === false) ? 0 : sizeof($block);
-		}
-
-		// Get correct position if array given
-		if (is_array($key))
-		{
-			// Search array to get correct position
-			list($search_key, $search_value) = @each($key);
-
-			$key = NULL;
-			foreach ($block as $i => $val_ary)
-			{
-				if ($val_ary[$search_key] === $search_value)
-				{
-					$key = $i;
-					break;
-				}
-			}
-
-			// key/value pair not found
-			if ($key === NULL)
-			{
-				return false;
-			}
-		}
-
-		// Insert Block
-		if ($mode == 'insert')
-		{
-			// Re-position template blocks
-			for ($i = sizeof($block); $i > $key; $i--)
-			{
-				$block[$i] = $block[$i-1];
-			}
-
-			// Insert vararray at given position
-			$block[$key] = $vararray;
-
-			return true;
-		}
-
-		// Which block to change?
-		if ($mode == 'change')
-		{
-			if ($key == sizeof($block))
-			{
-				$key--;
-			}
-
-			$block[$key] = array_merge($block[$key], $vararray);
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Include a separate template
-	* @access private
-	* @param string $filename Template filename to include
-	* @param bool $include True to include the file, false to just load it
-	* @uses template_compile is used to compile uncached templates
-	*/
-	private function _tpl_include($filename, $include = true)
-	{
-		$handle = $filename;
-		$this->filename[$handle] = $filename;
-		$this->files[$handle] = $this->root . '/' . $filename;
-
- 		$filename = $this->_tpl_load($handle);
-
-		if ($include)
-		{
-			$_tpldata	= &$this->_tpldata;
-			$_rootref	= &$this->_rootref;
-			$_lang		= &phpbb::$user->lang;
-
-			if ($filename)
-			{
-				include($filename);
-				return;
-			}
-			else
-			{
-				$compile = new phpbb_template_compile($this);
-
-				if (($code = $compile->_tpl_gen_src($handle)) !== false)
-				{
-					$code = ' ?> ' . $code . ' <?php ';
-					eval($code);
-				}
-			}
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/classes/template_compile.php b/phpBB/includes/classes/template_compile.php
deleted file mode 100644
index 7880babc51..0000000000
--- a/phpBB/includes/classes/template_compile.php
+++ /dev/null
@@ -1,904 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group, sections (c) 2001 ispi of Lincoln Inc
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* The template filter that does the actual compilation
-* @see template_compile
-* @package phpBB3
-*/
-class phpbb_template_filter extends php_user_filter
-{
-	const REGEX_NS = '[a-z][a-z_0-9]+';
-
-	const REGEX_VAR = '[A-Z][A-Z_0-9]+';
-
-	const REGEX_TAG = '<!-- ([A-Z][A-Z_0-9]+)(?: (.*?) ?)?-->';
-
-	const REGEX_TOKENS = '~<!-- ([A-Z][A-Z_0-9]+)(?: (.*?) ?)?-->|{((?:[a-z][a-z_0-9]+\.)*\\$?[A-Z][A-Z_0-9]+)}~';
-
-	/**
-	* @var array
-	*/
-	private $block_names = array();
-
-	/**
-	* @var array
-	*/
-	private $block_else_level = array();
-
-	/**
-	* @var string
-	*/
-	private $chunk;
-
-	public function filter($in, $out, &$consumed, $closing)
-	{
-		$written = false;
-
-		while ($bucket = stream_bucket_make_writeable($in))
-		{
-			$consumed += $bucket->datalen;
-
-			$data = $this->chunk . $bucket->data;
-			$last_nl = strrpos($data, "\n");
-			$this->chunk = substr($data, $last_nl);
-			$data = substr($data, 0, $last_nl);
-
-			if (!strlen($data))
-			{
-				continue;
-			}
-
-			$written = true;
-
-			$bucket->data = $this->compile($data);
-			$bucket->datalen = strlen($bucket->data);
-			stream_bucket_append($out, $bucket);
-		}
-
-		if ($closing && strlen($this->chunk))
-		{
-			$written = true;
-			$bucket = stream_bucket_new($this->stream, $this->compile($this->chunk));
-			stream_bucket_append($out, $bucket);
-		}
-
-		return $written ? PSFS_PASS_ON : PSFS_FEED_ME;
-	}
-
-	public function onCreate()
-	{
-		$this->chunk = '';
-		return true;
-	}
-
-	private function compile($data)
-	{
-		$data = preg_replace('#<(?:[\\?%]|script)#s', '<?php echo\'\\0\';?>', $data);
-		return str_replace('?><?php', '', preg_replace_callback(self::REGEX_TOKENS, array($this, 'replace'), $data));
-	}
-
-	private function replace($matches)
-	{
-		if (isset($matches[3]))
-		{
-			return $this->compile_var_tags($matches[0]);
-		}
-
-		switch ($matches[1])
-		{
-			case 'BEGIN':
-				$this->block_else_level[] = false;
-				return '<?php ' . $this->compile_tag_block($matches[2]) . ' ?>';
-			break;
-
-			case 'BEGINELSE':
-				$this->block_else_level[sizeof($this->block_else_level) - 1] = true;
-				return '<?php }} else { ?>';
-			break;
-
-			case 'END':
-				array_pop($this->block_names);
-				return '<?php ' . ((array_pop($this->block_else_level)) ? '}' : '}}') . ' ?>';
-			break;
-
-			case 'IF':
-				return '<?php ' . $this->compile_tag_if($matches[2], false) . ' ?>';
-			break;
-
-			case 'ELSE':
-				return '<?php } else { ?>';
-			break;
-
-			case 'ELSEIF':
-				return '<?php ' . $this->compile_tag_if($matches[2], true) . ' ?>';
-			break;
-
-			case 'ENDIF':
-				return '<?php } ?>';
-			break;
-
-			case 'DEFINE':
-				return '<?php ' . $this->compile_tag_define($matches[2], true) . ' ?>';
-			break;
-
-			case 'UNDEFINE':
-				return '<?php ' . $this->compile_tag_define($matches[2], false) . ' ?>';
-			break;
-
-			case 'INCLUDE':
-				return '<?php ' . $this->compile_tag_include($matches[2]) . ' ?>';
-			break;
-
-			case 'INCLUDEPHP':
-				return (phpbb::$config['tpl_allow_php']) ? '<?php ' . $this->compile_tag_include_php($matches[2]) . ' ?>' : '';
-			break;
-
-			case 'PHP':
-				return (phpbb::$config['tpl_allow_php']) ? '<?php ' : '<!-- ';
-			break;
-
-			case 'ENDPHP':
-				return (phpbb::$config['tpl_allow_php']) ? ' ?>' : ' -->';
-			break;
-
-			default:
-				return $matches[0];
-			break;
-
-		}
-		return '';
-	}
-
-	/**
-	* Compile variables
-	* @access private
-	*/
-	private function compile_var_tags(&$text_blocks)
-	{
-		// change template varrefs into PHP varrefs
-		$varrefs = array();
-
-		// This one will handle varrefs WITH namespaces
-		preg_match_all('#\{((?:' . self::REGEX_NS . '\.)+)(\$)?(' . self::REGEX_VAR . ')\}#', $text_blocks, $varrefs, PREG_SET_ORDER);
-
-		foreach ($varrefs as $var_val)
-		{
-			$namespace = $var_val[1];
-			$varname = $var_val[3];
-			$new = $this->generate_block_varref($namespace, $varname, true, $var_val[2]);
-
-			$text_blocks = str_replace($var_val[0], $new, $text_blocks);
-		}
-
-		// Handle special language tags L_ and LA_
-		$this->compile_language_tags($text_blocks);
-
-		// This will handle the remaining root-level varrefs
-		$text_blocks = preg_replace('#\{(' . self::REGEX_VAR . ')\}#', "<?php echo (isset(\$_rootref['\\1'])) ? \$_rootref['\\1'] : ''; ?>", $text_blocks);
-		$text_blocks = preg_replace('#\{\$(' . self::REGEX_VAR . ')\}#', "<?php echo (isset(\$_tpldata['DEFINE']['.']['\\1'])) ? \$_tpldata['DEFINE']['.']['\\1'] : ''; ?>", $text_blocks);
-
-		return $text_blocks;
-	}
-
-	/**
-	* Handles special language tags L_ and LA_
-	*/
-	private function compile_language_tags(&$text_blocks)
-	{
-		// transform vars prefixed by L_ into their language variable pendant if nothing is set within the tpldata array
-		if (strpos($text_blocks, '{L_') !== false)
-		{
-			$text_blocks = preg_replace('#\{L_(' . self::REGEX_VAR . ')\}#', "<?php echo ((isset(\$_rootref['L_\\1'])) ? \$_rootref['L_\\1'] : ((isset(\$_lang['\\1'])) ? \$_lang['\\1'] : '{ \\1 }')); ?>", $text_blocks);
-		}
-
-		// Handle addslashed language variables prefixed with LA_
-		// If a template variable already exist, it will be used in favor of it...
-		if (strpos($text_blocks, '{LA_') !== false)
-		{
-			$text_blocks = preg_replace('#\{LA_(' . self::REGEX_VAR . '+)\}#', "<?php echo ((isset(\$_rootref['LA_\\1'])) ? \$_rootref['LA_\\1'] : ((isset(\$_rootref['L_\\1'])) ? addslashes(\$_rootref['L_\\1']) : ((isset(\$_lang['\\1'])) ? addslashes(\$_lang['\\1']) : '{ \\1 }'))); ?>", $text_blocks);
-		}
-	}
-
-	/**
-	* Compile blocks
-	* @access private
-	*/
-	private function compile_tag_block($tag_args)
-	{
-		$no_nesting = false;
-
-		// Is the designer wanting to call another loop in a loop?
-		// <!-- BEGIN loop -->
-		// <!-- BEGIN !loop2 -->
-		// <!-- END !loop2 -->
-		// <!-- END loop -->
-		// 'loop2' is actually on the same nesting level as 'loop' you assign
-		// variables to it with template->assign_block_vars('loop2', array(...))
-		if (strpos($tag_args, '!') === 0)
-		{
-			// Count the number if ! occurrences (not allowed in vars)
-			$no_nesting = substr_count($tag_args, '!');
-			$tag_args = substr($tag_args, $no_nesting);
-		}
-
-		// Allow for control of looping (indexes start from zero):
-		// foo(2)    : Will start the loop on the 3rd entry
-		// foo(-2)   : Will start the loop two entries from the end
-		// foo(3,4)  : Will start the loop on the fourth entry and end it on the fifth
-		// foo(3,-4) : Will start the loop on the fourth entry and end it four from last
-		$match = array();
-
-		if (preg_match('#^([^()]*)\(([\-\d]+)(?:,([\-\d]+))?\)$#', $tag_args, $match))
-		{
-			$tag_args = $match[1];
-
-			if ($match[2] < 0)
-			{
-				$loop_start = '($_' . $tag_args . '_count ' . $match[2] . ' < 0 ? 0 : $_' . $tag_args . '_count ' . $match[2] . ')';
-			}
-			else
-			{
-				$loop_start = '($_' . $tag_args . '_count < ' . $match[2] . ' ? $_' . $tag_args . '_count : ' . $match[2] . ')';
-			}
-
-			if (!isset($match[3]) || strlen($match[3]) < 1 || $match[3] == -1)
-			{
-				$loop_end = '$_' . $tag_args . '_count';
-			}
-			else if ($match[3] >= 0)
-			{
-				$loop_end = '(' . ($match[3] + 1) . ' > $_' . $tag_args . '_count ? $_' . $tag_args . '_count : ' . ($match[3] + 1) . ')';
-			}
-			else //if ($match[3] < -1)
-			{
-				$loop_end = '$_' . $tag_args . '_count' . ($match[3] + 1);
-			}
-		}
-		else
-		{
-			$loop_start = 0;
-			$loop_end = '$_' . $tag_args . '_count';
-		}
-
-		$tag_template_php = '';
-		array_push($this->block_names, $tag_args);
-
-		if ($no_nesting !== false)
-		{
-			// We need to implode $no_nesting times from the end...
-			$block = array_slice($this->block_names, -$no_nesting);
-		}
-		else
-		{
-			$block = $this->block_names;
-		}
-
-		if (sizeof($block) < 2)
-		{
-			// Block is not nested.
-			$tag_template_php = '$_' . $tag_args . "_count = (isset(\$_tpldata['$tag_args'])) ? sizeof(\$_tpldata['$tag_args']) : 0;";
-			$varref = "\$_tpldata['$tag_args']";
-		}
-		else
-		{
-			// This block is nested.
-			// Generate a namespace string for this block.
-			$namespace = implode('.', $block);
-
-			// Get a reference to the data array for this block that depends on the
-			// current indices of all parent blocks.
-			$varref = $this->generate_block_data_ref($namespace, false);
-
-			// Create the for loop code to iterate over this block.
-			$tag_template_php = '$_' . $tag_args . '_count = (isset(' . $varref . ')) ? sizeof(' . $varref . ') : 0;';
-		}
-
-		$tag_template_php .= 'if ($_' . $tag_args . '_count) {';
-
-		/**
-		* The following uses foreach for iteration instead of a for loop, foreach is faster but requires PHP to make a copy of the contents of the array which uses more memory
-		* <code>
-		*	if (!$offset)
-		*	{
-		*		$tag_template_php .= 'foreach (' . $varref . ' as $_' . $tag_args . '_i => $_' . $tag_args . '_val){';
-		*	}
-		* </code>
-		*/
-
-		$tag_template_php .= 'for ($_' . $tag_args . '_i = ' . $loop_start . '; $_' . $tag_args . '_i < ' . $loop_end . '; ++$_' . $tag_args . '_i){';
-		$tag_template_php .= '$_' . $tag_args . '_val = &' . $varref . '[$_' . $tag_args . '_i];';
-
-		return $tag_template_php;
-	}
-
-	/**
-	* Compile a general expression - much of this is from Smarty with
-	* some adaptions for our block level methods
-	* @access private
-	*/
-	private function compile_expression($tag_args, &$vars = array())
-	{
-		$match = array();
-		preg_match_all('/(?:
-			"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"         |
-			\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'     |
-			[(),]                                  |
-			[^\s(),]+)/x', $tag_args, $match);
-
-		$tokens = $match[0];
-		$is_arg_stack = array();
-
-		for ($i = 0, $size = sizeof($tokens); $i < $size; $i++)
-		{
-			$token = &$tokens[$i];
-
-			switch ($token)
-			{
-				case '!==':
-				case '===':
-				case '<<':
-				case '>>':
-				case '|':
-				case '^':
-				case '&':
-				case '~':
-				case ')':
-				case ',':
-				case '+':
-				case '-':
-				case '*':
-				case '/':
-				case '@':
-				break;
-
-				case '==':
-				case 'eq':
-					$token = '==';
-				break;
-
-				case '!=':
-				case '<>':
-				case 'ne':
-				case 'neq':
-					$token = '!=';
-				break;
-
-				case '<':
-				case 'lt':
-					$token = '<';
-				break;
-
-				case '<=':
-				case 'le':
-				case 'lte':
-					$token = '<=';
-				break;
-
-				case '>':
-				case 'gt':
-					$token = '>';
-				break;
-
-				case '>=':
-				case 'ge':
-				case 'gte':
-					$token = '>=';
-				break;
-
-				case '&&':
-				case 'and':
-					$token = '&&';
-				break;
-
-				case '||':
-				case 'or':
-					$token = '||';
-				break;
-
-				case '!':
-				case 'not':
-					$token = '!';
-				break;
-
-				case '%':
-				case 'mod':
-					$token = '%';
-				break;
-
-				case '(':
-					array_push($is_arg_stack, $i);
-				break;
-
-				case 'is':
-					$is_arg_start = ($tokens[$i-1] == ')') ? array_pop($is_arg_stack) : $i-1;
-					$is_arg = implode(' ', array_slice($tokens, $is_arg_start, $i - $is_arg_start));
-
-					$new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i+1));
-
-					array_splice($tokens, $is_arg_start, sizeof($tokens), $new_tokens);
-
-					$i = $is_arg_start;
-
-				// no break
-
-				default:
-					$varrefs = array();
-					if (preg_match('#^((?:' . self::REGEX_NS . '\.)+)?(\$)?(?=[A-Z])([A-Z0-9\-_]+)#s', $token, $varrefs))
-					{
-						if (!empty($varrefs[1]))
-						{
-							$namespace = substr($varrefs[1], 0, -1);
-							$namespace = (strpos($namespace, '.') === false) ? $namespace : strrchr($namespace, '.');
-
-							// S_ROW_COUNT is deceptive, it returns the current row number now the number of rows
-							// hence S_ROW_COUNT is deprecated in favour of S_ROW_NUM
-							switch ($varrefs[3])
-							{
-								case 'S_ROW_NUM':
-								case 'S_ROW_COUNT':
-									$token = "\$_${namespace}_i";
-								break;
-
-								case 'S_NUM_ROWS':
-									$token = "\$_${namespace}_count";
-								break;
-
-								case 'S_FIRST_ROW':
-									$token = "(\$_${namespace}_i == 0)";
-								break;
-
-								case 'S_LAST_ROW':
-									$token = "(\$_${namespace}_i == \$_${namespace}_count - 1)";
-								break;
-
-								case 'S_BLOCK_NAME':
-									$token = "'$namespace'";
-								break;
-
-								default:
-									$token = $this->generate_block_data_ref(substr($varrefs[1], 0, -1), true, $varrefs[2]) . '[\'' . $varrefs[3] . '\']';
-									$vars[$token] = true;
-								break;
-							}
-						}
-						else
-						{
-							$token = ($varrefs[2]) ? '$_tpldata[\'DEFINE\'][\'.\'][\'' . $varrefs[3] . '\']' : '$_rootref[\'' . $varrefs[3] . '\']';
-							$vars[$token] = true;
-						}
-						
-					}
-					else if (preg_match('#^\.((?:' . self::REGEX_NS . '\.?)+)$#s', $token, $varrefs))
-					{
-						// Allow checking if loops are set with .loopname
-						// It is also possible to check the loop count by doing <!-- IF .loopname > 1 --> for example
-						$blocks = explode('.', $varrefs[1]);
-
-						// If the block is nested, we have a reference that we can grab.
-						// If the block is not nested, we just go and grab the block from _tpldata
-						if (sizeof($blocks) > 1)
-						{
-							$block = array_pop($blocks);
-							$namespace = implode('.', $blocks);
-							$varref = $this->generate_block_data_ref($namespace, true);
-
-							// Add the block reference for the last child.
-							$varref .= "['" . $block . "']";
-						}
-						else
-						{
-							$varref = '$_tpldata';
-
-							// Add the block reference for the last child.
-							$varref .= "['" . $blocks[0] . "']";
-						}
-						$token = "isset($varref) && sizeof($varref)";
-					}
-
-				break;
-			}
-		}
-
-		return $tokens;
-	}
-
-
-	private function compile_tag_if($tag_args, $elseif)
-	{
-		$vars = array();
-
-		$tokens = $this->compile_expression($tag_args, $vars);
-
-		$tpl = ($elseif) ? '} else if (' : 'if (';
-
-		if (!empty($vars))
-		{
-			$tpl .= '(isset(' . implode(') && isset(', array_keys($vars)) . ')) && ';
-		}
-
-		$tpl .= implode(' ', $tokens);
-		$tpl .= ') { ';
-
-		return $tpl;
-	}
-
-	/**
-	* Compile DEFINE tags
-	* @access private
-	*/
-	private function compile_tag_define($tag_args, $op)
-	{
-		$match = array();
-		preg_match('#^((?:' . self::REGEX_NS . '\.)+)?\$(?=[A-Z])([A-Z0-9_\-]*)(?: = (.*?))?$#', $tag_args, $match);
-
-		if (empty($match[2]) || (!isset($match[3]) && $op))
-		{
-			return '';
-		}
-
-		if (!$op)
-		{
-			return 'unset(' . (($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true) . '[\'' . $match[2] . '\']' : '$_tpldata[\'DEFINE\'][\'.\'][\'' . $match[2] . '\']') . ');';
-		}
-
-		$parsed_statement = implode(' ', $this->compile_expression($match[3]));
-
-		return (($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true) . '[\'' . $match[2] . '\']' : '$_tpldata[\'DEFINE\'][\'.\'][\'' . $match[2] . '\']') . ' = ' . $parsed_statement . ';';
-	}
-
-	/**
-	* Compile INCLUDE tag
-	* @access private
-	*/
-	private function compile_tag_include($tag_args)
-	{
-		return "\$this->_tpl_include('$tag_args');";
-	}
-
-	/**
-	* Compile INCLUDE_PHP tag
-	* @access private
-	*/
-	private function compile_tag_include_php($tag_args)
-	{
-		return "include('$tag_args');";
-	}
-
-	/**
-	* parse expression
-	* This is from Smarty
-	* @access private
-	*/
-	private function _parse_is_expr($is_arg, $tokens)
-	{
-		$expr_end = 0;
-		$negate_expr = false;
-
-		if (($first_token = array_shift($tokens)) == 'not')
-		{
-			$negate_expr = true;
-			$expr_type = array_shift($tokens);
-		}
-		else
-		{
-			$expr_type = $first_token;
-		}
-
-		switch ($expr_type)
-		{
-			case 'even':
-				if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by')
-				{
-					$expr_end++;
-					$expr_arg = $tokens[$expr_end++];
-					$expr = "!(($is_arg / $expr_arg) & 1)";
-				}
-				else
-				{
-					$expr = "!($is_arg & 1)";
-				}
-			break;
-
-			case 'odd':
-				if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by')
-				{
-					$expr_end++;
-					$expr_arg = $tokens[$expr_end++];
-					$expr = "(($is_arg / $expr_arg) & 1)";
-				}
-				else
-				{
-					$expr = "($is_arg & 1)";
-				}
-			break;
-
-			case 'div':
-				if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by')
-				{
-					$expr_end++;
-					$expr_arg = $tokens[$expr_end++];
-					$expr = "!($is_arg % $expr_arg)";
-				}
-			break;
-		}
-
-		if ($negate_expr)
-		{
-			if ($expr[0] == '!')
-			{
-				// Negated expression, de-negate it.
-				$expr = substr($expr, 1);
-			}
-			else
-			{
-				$expr = "!($expr)";
-			}
-		}
-
-		array_splice($tokens, 0, $expr_end, $expr);
-
-		return $tokens;
-	}
-
-	/**
-	* Generates a reference to the given variable inside the given (possibly nested)
-	* block namespace. This is a string of the form:
-	* ' . $_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.
-	*
-	* @access private
-	* @param string $namespace Namespace to access (expects a trailing "." on the namespace)
-	* @param string $varname Variable name to use
-	* @param bool $echo If true return an echo statement, otherwise a reference to the internal variable
-	* @param bool $defop If true this is a variable created with the DEFINE construct, otherwise template variable
-	* @return string Code to access variable or echo it if $echo is true
-	*/
-	private function generate_block_varref($namespace, $varname, $echo = true, $defop = false)
-	{
-		// Strip the trailing period.
-		$namespace = substr($namespace, 0, -1);
-
-		$expr = true;
-		$isset = false;
-
-		// S_ROW_COUNT is deceptive, it returns the current row number now the number of rows
-		// hence S_ROW_COUNT is deprecated in favour of S_ROW_NUM
-		switch ($varname)
-		{
-			case 'S_ROW_NUM':
-			case 'S_ROW_COUNT':
-				$varref = "\$_${namespace}_i";
-			break;
-
-			case 'S_NUM_ROWS':
-				$varref = "\$_${namespace}_count";
-			break;
-
-			case 'S_FIRST_ROW':
-				$varref = "(\$_${namespace}_i == 0)";
-			break;
-
-			case 'S_LAST_ROW':
-				$varref = "(\$_${namespace}_i == \$_${namespace}_count - 1)";
-			break;
-
-			case 'S_BLOCK_NAME':
-				$varref = "'$namespace'";
-			break;
-
-			default:
-				// Get a reference to the data block for this namespace.
-				$varref = $this->generate_block_data_ref($namespace, true, $defop);
-				// Prepend the necessary code to stick this in an echo line.
-
-				// Append the variable reference.
-				$varref .= "['$varname']";
-
-				$expr = false;
-				$isset = true;
-			break;
-		}
-		// @todo Test the !$expr more
-		$varref = ($echo) ? '<?php echo ' . ($isset ? "isset($varref) ? $varref : ''" : $varref) . '; ?>' : (($expr || isset($varref)) ? $varref : '');
-
-		return $varref;
-	}
-
-	/**
-	* Generates a reference to the array of data values for the given
-	* (possibly nested) block namespace. This is a string of the form:
-	* $_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['$childN']
-	*
-	* @access private
-	* @param string $blockname Block to access (does not expect a trailing "." on the blockname)
-	* @param bool $include_last_iterator If $include_last_iterator is true, then [$_childN_i] will be appended to the form shown above.
-	* @param bool $defop If true this is a variable created with the DEFINE construct, otherwise template variable
-	* @return string Code to access variable
-	*/
-	private function generate_block_data_ref($blockname, $include_last_iterator, $defop = false)
-	{
-		// Get an array of the blocks involved.
-		$blocks = explode('.', $blockname);
-		$blockcount = sizeof($blocks) - 1;
-
-		// DEFINE is not an element of any referenced variable, we must use _tpldata to access it
-		if ($defop)
-		{
-			$varref = '$_tpldata[\'DEFINE\']';
-			// Build up the string with everything but the last child.
-			for ($i = 0; $i < $blockcount; $i++)
-			{
-				$varref .= "['" . $blocks[$i] . "'][\$_" . $blocks[$i] . '_i]';
-			}
-			// Add the block reference for the last child.
-			$varref .= "['" . $blocks[$blockcount] . "']";
-			// Add the iterator for the last child if requried.
-			if ($include_last_iterator)
-			{
-				$varref .= '[$_' . $blocks[$blockcount] . '_i]';
-			}
-			return $varref;
-		}
-		else if ($include_last_iterator)
-		{
-			return '$_'. $blocks[$blockcount] . '_val';
-		}
-		else
-		{
-			return '$_'. $blocks[$blockcount - 1] . '_val[\''. $blocks[$blockcount]. '\']';
-		}
-	}
-}
-
-stream_filter_register('phpbb_template', 'phpbb_template_filter');
-
-/**
-* Extension of template class - Functions needed for compiling templates only.
-*
-* psoTFX, phpBB Development Team - Completion of file caching, decompilation
-* routines and implementation of conditionals/keywords and associated changes
-*
-* The interface was inspired by PHPLib templates, and the template file (formats are
-* quite similar)
-*
-* The keyword/conditional implementation is currently based on sections of code from
-* the Smarty templating engine (c) 2001 ispi of Lincoln, Inc. which is released
-* (on its own and in whole) under the LGPL. Section 3 of the LGPL states that any code
-* derived from an LGPL application may be relicenced under the GPL, this applies
-* to this source
-*
-* DEFINE directive inspired by a request by Cyberalien
-*
-* @package phpBB3
-* @uses template_filter As a PHP stream filter to perform compilation of templates
-*/
-class phpbb_template_compile
-{
-	/**
-	* @var phpbb_template Reference to the {@link phpbb_template template} object performing compilation
-	*/
-	private $template;
-
-	/**
-	* Constructor
-	* @param phpbb_template $template {@link phpbb_template Template} object performing compilation
-	*/
-	public function __construct(phpbb_template $template)
-	{
-		$this->template = $template;
-	}
-
-	/**
-	* Load template source from file
-	* @access public
-	* @param string $handle Template handle we wish to load
-	* @return bool Return true on success otherwise false
-	*/
-	public function _tpl_load_file($handle)
-	{
-		// Try and open template for read
-		if (!file_exists($this->template->files[$handle]))
-		{
-			trigger_error("template->_tpl_load_file(): File {$this->template->files[$handle]} does not exist or is empty", E_USER_ERROR);
-		}
-
-		// Actually compile the code now.
-		return $this->compile_write($handle, $this->template->files[$handle]);
-	}
-
-	/**
-	* Load template source from file
-	* @access public
-	* @param string $handle Template handle we wish to compile
-	* @return string|bool Return compiled code on successful compilation otherwise false
-	*/
-	public function _tpl_gen_src($handle)
-	{
-		// Try and open template for read
-		if (!file_exists($this->template->files[$handle]))
-		{
-			trigger_error("template->_tpl_load_file(): File {$this->template->files[$handle]} does not exist or is empty", E_USER_ERROR);
-		}
-
-		// Actually compile the code now.
-		return $this->compile_gen($this->template->files[$handle]);
-	}
-
-	/**
-	* Write compiled file to cache directory
-	* @access private
-	* @param string $handle Template handle to compile
-	* @param string $source_file Source template file
-	* @return bool Return true on success otherwise false
-	*/
-	private function compile_write($handle, $source_file)
-	{
-		$filename = $this->template->cachepath . str_replace('/', '.', $this->template->filename[$handle]) . '.' . PHP_EXT;
-
-		$source_handle = @fopen($source_file, 'rb');
-		$destination_handle = @fopen($filename, 'wb');
-
-		if (!$source_handle || !$destination_handle)
-		{
-			return false;
-		}
-
-		@flock($destination_handle, LOCK_EX);
-
-		stream_filter_append($source_handle, 'phpbb_template');
-		stream_copy_to_stream($source_handle, $destination_handle);
-
-		@fclose($source_handle);
-		@flock($destination_handle, LOCK_UN);
-		@fclose($destination_handle);
-
-		phpbb::$system->chmod($filename, phpbb::CHMOD_READ | phpbb::CHMOD_WRITE);
-
-		clearstatcache();
-
-		return true;
-	}
-
-	/**
-	* Generate source for eval()
-	* @access private
-	* @param string $source_file Source template file
-	* @return string|bool Return compiled code on successful compilation otherwise false
-	*/
-	private function compile_gen($source_file)
-	{
-		$source_handle = @fopen($source_file, 'rb');
-		$destination_handle = @fopen('php://temp' ,'r+b');
-
-		if (!$source_handle || !$destination_handle)
-		{
-			return false;
-		}
-
-		stream_filter_append($source_handle, 'phpbb_template');
-		stream_copy_to_stream($source_handle, $destination_handle);
-
-		@fclose($source_handle);
-
-		rewind($destination_handle);
-		return stream_get_contents($destination_handle);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/classes/user.php b/phpBB/includes/classes/user.php
deleted file mode 100644
index 83e8fce4eb..0000000000
--- a/phpBB/includes/classes/user.php
+++ /dev/null
@@ -1,1124 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005, 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Base user class
-*
-* This is the overarching class which contains (through session extend)
-* all methods utilised for user functionality during a session.
-*
-* @package phpBB3
-*/
-class phpbb_user extends phpbb_session
-{
-	/**
-	* @var array required phpBB objects
-	*/
-	public $phpbb_required = array('config', 'acl', 'db', 'template', 'security', 'server-vars', 'acm', 'api:user');
-
-	/**
-	* @var array Optional phpBB objects
-	*/
-	public $phpbb_optional = array();
-
-	/**
-	* @var array language entries
-	*/
-	public $lang = array();
-
-	/**
-	* @var array help entries
-	*/
-	public $help = array();
-
-	/**
-	* @var array theme entries
-	*/
-	public $theme = array();
-
-	/**
-	* @var string users date format
-	*/
-	public $date_format;
-
-	/**
-	* @var double users time zone
-	*/
-	public $timezone;
-
-	/**
-	* @var int users summer time setting. 0 if not in DST, else DST offset.
-	*/
-	public $dst;
-
-	/**
-	* @var string language name, for example 'en'
-	*/
-	public $lang_name = false;
-
-	/**
-	* @var int the language id for the specified language name
-	*/
-	public $lang_id = false;
-
-	/**
-	* @var string the language path phpBB can find installed languages
-	*/
-	public $lang_path;
-
-	/**
-	* @var string Imageset language name. If no fallback happens it is the same as {@link lang_name lang_name}.
-	*/
-	public $img_lang;
-
-	/**
-	* @var array Holds information about the imageset to build {@link img() images}.
-	*/
-	public $img_array = array();
-
-	/**
-	* @var bool Is true if the user is a logged in registered user
-	*/
-	public $is_registered = false;
-
-	/**
-	* @var bool Is true if the user is logged in and a search engine/bot
-	*/
-	public $is_bot = false;
-
-	/**
-	* @var bool Is true if user is founder
-	*/
-	public $is_founder = false;
-
-	/**
-	* @var bool Is true if user is anonymous/guest
-	*/
-	public $is_guest = true;
-
-	/**
-	* Ablility to add new option (id 7). Enabled user options is stored in $data['user_options'].
-	* @var array user options defining their possibilities to view flash, images, etc. User options only supports set/unset (true/false)
-	*/
-	public $keyoptions = array('viewimg' => 0, 'viewflash' => 1, 'viewsmilies' => 2, 'viewsigs' => 3, 'viewavatars' => 4, 'viewcensors' => 5, 'attachsig' => 6, 'bbcode' => 8, 'smilies' => 9, 'popuppm' => 10);
-
-	/**
-	* @var array The respective true/false values for the {@link keyoptions keyoptions}.
-	*/
-	public $keyvalues = array();
-
-	/**
-	* Constructor to set the lang path. Calls parrent::__construct()
-	*
-	* @param string	$auth_method		The authentication method to use, for example 'db'
-	* @param string	$lang_path			Language pack path
-	* @access public
-	*/
-	public function __construct($auth_method, $lang_path)
-	{
-		parent::__construct();
-
-		// Init auth object
-		$method = basename(trim($auth_method));
-		$class = 'phpbb_auth_' . $method;
-
-		if (class_exists($class))
-		{
-			$this->auth = new $class();
-		}
-
-		// Set language path
-		$this->lang_path = $lang_path;
-
-		// Make sure last character is a directory separator
-		if (substr($this->lang_path, -1) != '/')
-		{
-			$this->lang_path .= '/';
-		}
-	}
-
-	/**
-	* Determine and set language
-	*/
-	public function set_language($lang_name = '')
-	{
-		// Try to determine language from browser
-		if (!$lang_name && !empty($_SERVER['HTTP_ACCEPT_LANGUAGE']))
-		{
-			$accept_lang_ary = explode(',', strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE']));
-
-			foreach ($accept_lang_ary as $accept_lang)
-			{
-				// Set correct format ... guess full xx_yy form
-				$accept_lang = substr($accept_lang, 0, 2) . '_' . substr($accept_lang, 3, 2);
-
-				if (file_exists($this->lang_path . basename($accept_lang)))
-				{
-					$lang_name = $accept_lang;
-					break;
-				}
-				else
-				{
-					// No match on xx_yy so try xx
-					$accept_lang = substr($accept_lang, 0, 2);
-					if (file_exists($this->lang_path . basename($accept_lang)))
-					{
-						$lang_name = $accept_lang;
-						break;
-					}
-				}
-			}
-		}
-
-		// Still no luck?
-		$lang_name = (!$lang_name && isset(phpbb::$config['default_lang'])) ? phpbb::$config['default_lang'] : basename($lang_name);
-
-		// No appropriate language found ... so let's use the first one in the language
-		// dir, this may or may not be English
-		if (!$lang_name)
-		{
-			$dir = @opendir($this->lang_path);
-
-			if (!$dir)
-			{
-				trigger_error('Unable to access the language directory', E_USER_ERROR);
-			}
-
-			while (($file = readdir($dir)) !== false)
-			{
-				$path = $this->lang_path . $file;
-
-				if (!is_file($path) && !is_link($path) && file_exists($path . '/iso.txt'))
-				{
-					$lang_name = $file;
-					break;
-				}
-			}
-			closedir($dir);
-		}
-
-		// Update language name if changed
-		if ($this->lang_name !== $lang_name)
-		{
-			$this->lang_name = $lang_name;
-		}
-
-		// Set data language in case we have a user where this is not set
-		if (empty($this->data['user_lang']))
-		{
-			$this->data['user_lang'] = $this->lang_name;
-		}
-
-		// We include common language file here to not load it every time a custom language file is included
-		$lang = &$this->lang;
-
-		if ((include $this->lang_path . $this->lang_name . "/common." . PHP_EXT) === false)
-		{
-			die('Language file ' . $this->lang_path . $this->lang_name . "/common." . PHP_EXT . " couldn't be opened.");
-		}
-	}
-
-	/**
-	* Setup basic user-specific items (style, language, ...)
-	*
-	* @param string|array	$lang_set	Language set to setup.
-	* 									Can be a string or an array of language files without a path and extension.
-	* 									Format must match {@link add_lang() add_lang}.
-	* @param int			$style		If not set to false this specifies the style id to use.
-	* 									The page will then use the specified style id instead of the default one.
-	* @access public
-	*/
-	public function setup($lang_set = false, $style = false)
-	{
-		// Check if there is a valid session
-		if (empty($this->data))
-		{
-			$this->session_begin();
-
-			if (phpbb::registered('acl'))
-			{
-				phpbb::$acl->init($this->data);
-			}
-		}
-
-		if ($this->data['user_id'] != ANONYMOUS)
-		{
-			$this->lang_name = (file_exists($this->lang_path . $this->data['user_lang'] . "/common." . PHP_EXT)) ? $this->data['user_lang'] : basename(phpbb::$config['default_lang']);
-			$this->date_format = $this->data['user_dateformat'];
-			$this->timezone = $this->data['user_timezone'] * 3600;
-			$this->dst = $this->data['user_dst'] * 3600;
-		}
-		else
-		{
-			$this->lang_name = basename(phpbb::$config['default_lang']);
-			$this->date_format = phpbb::$config['default_dateformat'];
-			$this->timezone = phpbb::$config['board_timezone'] * 3600;
-			$this->dst = phpbb::$config['board_dst'] * 3600;
-		}
-
-		$this->set_language($this->lang_name);
-
-		$this->add_lang($lang_set);
-		unset($lang_set);
-
-		if (phpbb_request::variable('style', false, false, phpbb_request::GET) && phpbb::$acl->acl_get('a_styles'))
-		{
-			$style = request_var('style', 0);
-			$this->extra_url = array('style=' . $style);
-		}
-		else
-		{
-			// Set up style
-			$style = ($style) ? $style : ((!phpbb::$config['override_user_style']) ? $this->data['user_style'] : phpbb::$config['default_style']);
-		}
-
-		$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, c.theme_path, c.theme_name, c.theme_storedb, c.theme_id, i.imageset_path, i.imageset_id, i.imageset_name
-			FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . " i
-			WHERE s.style_id = $style
-				AND t.template_id = s.template_id
-				AND c.theme_id = s.theme_id
-				AND i.imageset_id = s.imageset_id";
-		$result = phpbb::$db->sql_query($sql, 3600);
-		$this->theme = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		// User has wrong style
-		if (!$this->theme && $style == $this->data['user_style'])
-		{
-			$style = $this->data['user_style'] = phpbb::$config['default_style'];
-
-			$sql = 'UPDATE ' . USERS_TABLE . "
-				SET user_style = $style
-				WHERE user_id = {$this->data['user_id']}";
-			phpbb::$db->sql_query($sql);
-
-			$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, c.theme_path, c.theme_name, c.theme_storedb, c.theme_id, i.imageset_path, i.imageset_id, i.imageset_name
-				FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . " i
-				WHERE s.style_id = $style
-					AND t.template_id = s.template_id
-					AND c.theme_id = s.theme_id
-					AND i.imageset_id = s.imageset_id";
-			$result = phpbb::$db->sql_query($sql, 3600);
-			$this->theme = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		if (!$this->theme)
-		{
-			trigger_error('Could not get style data', E_USER_ERROR);
-		}
-
-		// Now parse the cfg file and cache it,
-		// we are only interested in the theme configuration for now
-		$parsed_items = phpbb_cache::obtain_cfg_item($this->theme, 'theme');
-
-		$check_for = array(
-			'parse_css_file'	=> (int) 0,
-			'pagination_sep'	=> (string) ', ',
-		);
-
-		foreach ($check_for as $key => $default_value)
-		{
-			$this->theme[$key] = (isset($parsed_items[$key])) ? $parsed_items[$key] : $default_value;
-			settype($this->theme[$key], gettype($default_value));
-
-			if (is_string($default_value))
-			{
-				$this->theme[$key] = htmlspecialchars($this->theme[$key]);
-			}
-		}
-
-		// If the style author specified the theme needs to be cached
-		// (because of the used paths and variables) than make sure it is the case.
-		// For example, if the theme uses language-specific images it needs to be stored in db.
-		if (!$this->theme['theme_storedb'] && $this->theme['parse_css_file'])
-		{
-			$this->theme['theme_storedb'] = 1;
-
-			$stylesheet = file_get_contents(PHPBB_ROOT_PATH . "styles/{$this->theme['theme_path']}/theme/stylesheet.css");
-			// Match CSS imports
-			$matches = array();
-			preg_match_all('/@import url\(["\'](.*)["\']\);/i', $stylesheet, $matches);
-
-			if (sizeof($matches))
-			{
-				$content = '';
-				foreach ($matches[0] as $idx => $match)
-				{
-					if ($content = @file_get_contents(PHPBB_ROOT_PATH . "styles/{$this->theme['theme_path']}/theme/" . $matches[1][$idx]))
-					{
-						$content = trim($content);
-					}
-					else
-					{
-						$content = '';
-					}
-					$stylesheet = str_replace($match, $content, $stylesheet);
-				}
-				unset($content);
-			}
-
-			$stylesheet = str_replace('./', 'styles/' . $this->theme['theme_path'] . '/theme/', $stylesheet);
-
-			$sql_ary = array(
-				'theme_data'	=> $stylesheet,
-				'theme_mtime'	=> time(),
-				'theme_storedb'	=> 1
-			);
-
-			phpbb::$db->sql_query('UPDATE ' . STYLES_THEME_TABLE . ' SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . ' WHERE theme_id = ' . $this->theme['theme_id']);
-			unset($sql_ary);
-		}
-
-		phpbb::$template->set_template();
-
-		$this->img_lang = (file_exists(PHPBB_ROOT_PATH . 'styles/' . $this->theme['imageset_path'] . '/imageset/' . $this->lang_name)) ? $this->lang_name : phpbb::$config['default_lang'];
-
-		$sql = 'SELECT image_name, image_filename, image_lang, image_height, image_width
-			FROM ' . STYLES_IMAGESET_DATA_TABLE . '
-			WHERE imageset_id = ' . $this->theme['imageset_id'] . "
-			AND image_filename <> ''
-			AND image_lang IN ('" . phpbb::$db->sql_escape($this->img_lang) . "', '')";
-		$result = phpbb::$db->sql_query($sql, 3600);
-
-		$localised_images = false;
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			if ($row['image_lang'])
-			{
-				$localised_images = true;
-			}
-
-			$row['image_filename'] = rawurlencode($row['image_filename']);
-			$this->img_array[$row['image_name']] = $row;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// there were no localised images, try to refresh the localised imageset for the user's language
-		if (!$localised_images)
-		{
-			// Attention: this code ignores the image definition list from acp_styles and just takes everything
-			// that the config file contains
-			$sql_ary = array();
-
-			phpbb::$db->sql_transaction('begin');
-
-			$sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . '
-				WHERE imageset_id = ' . $this->theme['imageset_id'] . '
-					AND image_lang = \'' . phpbb::$db->sql_escape($this->img_lang) . '\'';
-			$result = phpbb::$db->sql_query($sql);
-
-			if (@file_exists(PHPBB_ROOT_PATH . "styles/{$this->theme['imageset_path']}/imageset/{$this->img_lang}/imageset.cfg"))
-			{
-				$cfg_data_imageset_data = parse_cfg_file(PHPBB_ROOT_PATH . "styles/{$this->theme['imageset_path']}/imageset/{$this->img_lang}/imageset.cfg");
-				foreach ($cfg_data_imageset_data as $image_name => $value)
-				{
-					if (strpos($value, '*') !== false)
-					{
-						if (substr($value, -1, 1) === '*')
-						{
-							list($image_filename, $image_height) = explode('*', $value);
-							$image_width = 0;
-						}
-						else
-						{
-							list($image_filename, $image_height, $image_width) = explode('*', $value);
-						}
-					}
-					else
-					{
-						$image_filename = $value;
-						$image_height = $image_width = 0;
-					}
-
-					if (strpos($image_name, 'img_') === 0 && $image_filename)
-					{
-						$image_name = substr($image_name, 4);
-						$sql_ary[] = array(
-							'image_name'		=> (string) $image_name,
-							'image_filename'	=> (string) $image_filename,
-							'image_height'		=> (int) $image_height,
-							'image_width'		=> (int) $image_width,
-							'imageset_id'		=> (int) $this->theme['imageset_id'],
-							'image_lang'		=> (string) $this->img_lang,
-						);
-					}
-				}
-			}
-
-			if (sizeof($sql_ary))
-			{
-				phpbb::$db->sql_multi_insert(STYLES_IMAGESET_DATA_TABLE, $sql_ary);
-				phpbb::$db->sql_transaction('commit');
-				phpbb::$acm->destroy_sql(STYLES_IMAGESET_DATA_TABLE);
-
-				add_log('admin', 'LOG_IMAGESET_LANG_REFRESHED', $this->theme['imageset_name'], $this->img_lang);
-			}
-			else
-			{
-				phpbb::$db->sql_transaction('commit');
-				add_log('admin', 'LOG_IMAGESET_LANG_MISSING', $this->theme['imageset_name'], $this->img_lang);
-			}
-		}
-
-		// Call phpbb_user_session_handler() in case external application want to "bend" some variables or replace classes...
-		// After calling it we continue script execution...
-		// phpbb_user_session_handler();
-
-		// If this function got called from the error handler we are finished here.
-		if (defined('IN_ERROR_HANDLER'))
-		{
-			return;
-		}
-
-		// Disable board if the install/ directory is still present
-		// For the brave development army we do not care about this, else we need to comment out this everytime we develop locally
-		if (!phpbb::$base_config['debug_extra'] && !defined('ADMIN_START') && !defined('IN_INSTALL') && !defined('IN_LOGIN') && file_exists(PHPBB_ROOT_PATH . 'install'))
-		{
-			// Adjust the message slightly according to the permissions
-			if (phpbb::$acl->acl_gets('a_', 'm_') || phpbb::$acl->acl_getf_global('m_'))
-			{
-				$message = 'REMOVE_INSTALL';
-			}
-			else
-			{
-				$message = (!empty(phpbb::$config['board_disable_msg'])) ? phpbb::$config['board_disable_msg'] : 'BOARD_DISABLE';
-			}
-			trigger_error($message);
-		}
-
-		// Is board disabled and user not an admin or moderator?
-		if (phpbb::$config['board_disable'] && !defined('IN_LOGIN') && !phpbb::$acl->acl_gets('a_', 'm_') && !phpbb::$acl->acl_getf_global('m_'))
-		{
-			header('HTTP/1.1 503 Service Unavailable');
-
-			$message = (!empty(phpbb::$config['board_disable_msg'])) ? phpbb::$config['board_disable_msg'] : 'BOARD_DISABLE';
-			trigger_error($message);
-		}
-
-		// Is load exceeded?
-		if (phpbb::$config['limit_load'] && $this->load !== false)
-		{
-			if ($this->load > floatval(phpbb::$config['limit_load']) && !defined('IN_LOGIN'))
-			{
-				// Set board disabled to true to let the admins/mods get the proper notification
-				phpbb::$config['board_disable'] = '1';
-
-				if (!phpbb::$acl->acl_gets('a_', 'm_') && !phpbb::$acl->acl_getf_global('m_'))
-				{
-					header('HTTP/1.1 503 Service Unavailable');
-					trigger_error('BOARD_UNAVAILABLE');
-				}
-			}
-		}
-
-		if (isset($this->data['session_viewonline']))
-		{
-			// Make sure the user is able to hide his session
-			if (!$this->data['session_viewonline'])
-			{
-				// Reset online status if not allowed to hide the session...
-				if (!phpbb::$acl->acl_get('u_hideonline'))
-				{
-					$sql = 'UPDATE ' . SESSIONS_TABLE . '
-						SET session_viewonline = 1
-						WHERE session_user_id = ' . $this->data['user_id'];
-					phpbb::$db->sql_query($sql);
-					$this->data['session_viewonline'] = 1;
-				}
-			}
-			else if (!$this->data['user_allow_viewonline'])
-			{
-				// the user wants to hide and is allowed to  -> cloaking device on.
-				if (phpbb::$acl->acl_get('u_hideonline'))
-				{
-					$sql = 'UPDATE ' . SESSIONS_TABLE . '
-						SET session_viewonline = 0
-						WHERE session_user_id = ' . $this->data['user_id'];
-					phpbb::$db->sql_query($sql);
-					$this->data['session_viewonline'] = 0;
-				}
-			}
-		}
-
-
-		// Does the user need to change their password? If so, redirect to the
-		// ucp profile reg_details page ... of course do not redirect if we're already in the ucp
-		if (!defined('IN_ADMIN') && !defined('ADMIN_START') && phpbb::$config['chg_passforce'] && $this->is_registered && phpbb::$acl->acl_get('u_chgpasswd') && $this->data['user_passchg'] < time() - (phpbb::$config['chg_passforce'] * 86400))
-		{
-			if (strpos($this->page['query_string'], 'mode=reg_details') === false && $this->page['page_name'] != 'ucp.' . PHP_EXT)
-			{
-				redirect(append_sid('ucp', 'i=profile&amp;mode=reg_details'));
-			}
-		}
-
-		return;
-	}
-
-	/**
-	* More advanced language substitution
-	*
-	* Function to mimic sprintf() with the possibility of using phpBB's language system to substitute nullar/singular/plural forms.
-	* Params are the language key and the parameters to be substituted.
-	* This function/functionality was inspired by SHS` and Ashe.
-	*
-	* For example:
-	* <code>
-	* 	phpbb::$user->lang('NUM_POSTS_IN_QUEUE', 1);
-	* </code>
-	*
-	* @param string	$key			The language key to use
-	* @param mixed	$parameter,...	An unlimited number of parameter to apply.
-	*
-	* @return string	Substituted language string
-	* @see sprintf()
-	* @access public
-	*/
-	public function lang()
-	{
-		$args = func_get_args();
-		$key = $args[0];
-
-		if (is_array($key))
-		{
-			$lang = &$this->lang[array_shift($key)];
-
-			foreach ($key as $_key)
-			{
-				$lang = &$lang[$_key];
-			}
-		}
-		else
-		{
-			$lang = &$this->lang[$key];
-		}
-
-		// Return if language string does not exist
-		if (!isset($lang) || (!is_string($lang) && !is_array($lang)))
-		{
-			return $key;
-		}
-
-		// If the language entry is a string, we simply mimic sprintf() behaviour
-		if (is_string($lang))
-		{
-			if (sizeof($args) == 1)
-			{
-				return $lang;
-			}
-
-			// Replace key with language entry and simply pass along...
-			$args[0] = $lang;
-			return call_user_func_array('sprintf', $args);
-		}
-
-		// It is an array... now handle different nullar/singular/plural forms
-		$key_found = false;
-
-		// We now get the first number passed and will select the key based upon this number
-		for ($i = 1, $num_args = sizeof($args); $i < $num_args; $i++)
-		{
-			if (is_int($args[$i]))
-			{
-				$numbers = array_keys($lang);
-
-				foreach ($numbers as $num)
-				{
-					if ($num > $args[$i])
-					{
-						break;
-					}
-
-					$key_found = $num;
-				}
-			}
-		}
-
-		// Ok, let's check if the key was found, else use the last entry (because it is mostly the plural form)
-		if ($key_found === false)
-		{
-			$numbers = array_keys($lang);
-			$key_found = end($numbers);
-		}
-
-		// Use the language string we determined and pass it to sprintf()
-		$args[0] = $lang[$key_found];
-		return call_user_func_array('sprintf', $args);
-	}
-
-	/**
-	* Add Language Items - use_db and use_help are assigned where needed (only use them to force inclusion)
-	*
-	* Examples:
-	* <code>
-	*	$lang_set = array('posting', 'help' => 'faq');
-	*	$lang_set = array('posting', 'viewtopic', 'help' => array('bbcode', 'faq'))
-	*	$lang_set = array(array('posting', 'viewtopic'), 'help' => array('bbcode', 'faq'))
-	*	$lang_set = 'posting'
-	*	$lang_set = array('help' => 'faq', 'db' => array('help:faq', 'posting'))
-	* </code>
-	*
-	* @param mixed	$lang_set	specifies the language entries to include
-	* @param bool	$use_db		internal variable for recursion, do not use
-	* @param bool	$use_help	internal variable for recursion, do not use
-	* @access public
-	*/
-	public function add_lang($lang_set, $use_db = false, $use_help = false)
-	{
-		if (is_array($lang_set))
-		{
-			foreach ($lang_set as $key => $lang_file)
-			{
-				// Please do not delete this line.
-				// We have to force the type here, else [array] language inclusion will not work
-				$key = (string) $key;
-
-				if ($key == 'db')
-				{
-					$this->add_lang($lang_file, true, $use_help);
-				}
-				else if ($key == 'help')
-				{
-					$this->add_lang($lang_file, $use_db, true);
-				}
-				else if (!is_array($lang_file))
-				{
-					$this->set_lang($this->lang, $this->help, $lang_file, $use_db, $use_help);
-				}
-				else
-				{
-					$this->add_lang($lang_file, $use_db, $use_help);
-				}
-			}
-			unset($lang_set);
-		}
-		else if ($lang_set)
-		{
-			$this->set_lang($this->lang, $this->help, $lang_set, $use_db, $use_help);
-		}
-	}
-
-	/**
-	* Set language entry (called by {@link add_lang() add_lang})
-	*
-	* @param array	&$lang		A reference to the language array phpbb::$user->lang
-	* @param array	&$help		A reference to the language help array phpbb::$user->help
-	* @param string	$lang_file	Language filename
-	* @param bool	$use_db		True if the database is used for obtaining the information
-	* @param bool	$use_help	True if we fetch help entries instead of language entries
-	* @access private
-	*/
-	private function set_lang(&$lang, &$help, $lang_file, $use_db = false, $use_help = false)
-	{
-		// Make sure the language name is set (if the user setup did not happen it is not set)
-		if (!$this->lang_name)
-		{
-			$this->lang_name = basename(phpbb::$config['default_lang']);
-		}
-
-		// $lang == $this->lang
-		// $help == $this->help
-		// - add appropriate variables here, name them as they are used within the language file...
-		if (!$use_db)
-		{
-			if ($use_help && strpos($lang_file, '/') !== false)
-			{
-				$language_filename = $this->lang_path . $this->lang_name . '/' . substr($lang_file, 0, stripos($lang_file, '/') + 1) . 'help_' . substr($lang_file, stripos($lang_file, '/') + 1) . '.' . PHP_EXT;
-			}
-			else
-			{
-				$language_filename = $this->lang_path . $this->lang_name . '/' . (($use_help) ? 'help_' : '') . $lang_file . '.' . PHP_EXT;
-			}
-
-			if (!file_exists($language_filename))
-			{
-				if ($this->lang_name == 'en')
-				{
-					// The user's selected language is missing the file, the board default's language is missing the file, and the file doesn't exist in /en.
-					$language_filename = str_replace($this->lang_path . 'en', $this->lang_path . $this->data['user_lang'], $language_filename);
-					trigger_error('Language file ' . $language_filename . ' couldn\'t be opened.', E_USER_ERROR);
-				}
-				else if ($this->lang_name == basename(phpbb::$config['default_lang']))
-				{
-					// Fall back to the English Language
-					$this->lang_name = 'en';
-					$this->set_lang($lang, $help, $lang_file, $use_db, $use_help);
-				}
-				else if (file_exists($this->lang_path . $this->data['user_lang'] . '/common.' . PHP_EXT))
-				{
-					// Fall back to the board default language
-					$this->lang_name = basename(phpbb::$config['default_lang']);
-					$this->set_lang($lang, $help, $lang_file, $use_db, $use_help);
-				}
-
-				// Reset the lang name
-				$this->lang_name = (file_exists($this->lang_path . $this->data['user_lang'] . '/common.' . PHP_EXT)) ? $this->data['user_lang'] : basename(phpbb::$config['default_lang']);
-				return;
-			}
-
-			if ((include $language_filename) === false)
-			{
-				trigger_error('Language file ' . $language_filename . ' couldn\'t be opened.', E_USER_ERROR);
-			}
-		}
-		else if ($use_db)
-		{
-			// Get Database Language Strings
-			// Put them into $lang if nothing is prefixed, put them into $help if help: is prefixed
-			// For example: help:faq, posting
-		}
-	}
-
-	/**
-	* Format user date
-	*
-	* @param int		$gmepoch	Unix timestamp to format
-	* @param string		$format		Date format in date() notation.
-	* 								The character | used to indicate relative dates, for example |d m Y|, h:i is translated to Today, h:i.
-	* @param bool		$forcedate	Force non-relative date format.
-	*
-	* @staticvar int	$midnight	Midnight time offset
-	* @staticvar array	$date_cache	Array to cache commonly needed structures within this function
-	*
-	* @return mixed translated date
-	* @access public
-	*/
-	public function format_date($gmepoch, $format = false, $forcedate = false)
-	{
-		static $midnight;
-		static $date_cache;
-
-		$format = (!$format) ? $this->date_format : $format;
-		$now = time();
-		$delta = $now - $gmepoch;
-
-		if (!isset($date_cache[$format]))
-		{
-			// Is the user requesting a friendly date format (i.e. 'Today 12:42')?
-			$date_cache[$format] = array(
-				'is_short'		=> strpos($format, '|'),
-				'format_short'	=> substr($format, 0, strpos($format, '|')) . '||' . substr(strrchr($format, '|'), 1),
-				'format_long'	=> str_replace('|', '', $format),
-				'lang'			=> $this->lang['datetime'],
-			);
-
-			// Short representation of month in format? Some languages use different terms for the long and short format of May
-			if ((strpos($format, '\M') === false && strpos($format, 'M') !== false) || (strpos($format, '\r') === false && strpos($format, 'r') !== false))
-			{
-				$date_cache[$format]['lang']['May'] = $this->lang['datetime']['May_short'];
-			}
-		}
-
-		// Zone offset
-		$zone_offset = $this->timezone + $this->dst;
-
-		// Show date <= 1 hour ago as 'xx min ago'
-		// A small tolerence is given for times in the future and times in the future but in the same minute are displayed as '< than a minute ago'
-		if ($delta <= 3600 && ($delta >= -5 || (($now / 60) % 60) == (($gmepoch / 60) % 60)) && $date_cache[$format]['is_short'] !== false && !$forcedate && isset($this->lang['datetime']['AGO']))
-		{
-			return $this->lang(array('datetime', 'AGO'), max(0, (int) floor($delta / 60)));
-		}
-
-		if (!$midnight)
-		{
-			list($d, $m, $y) = explode(' ', gmdate('j n Y', time() + $zone_offset));
-			$midnight = gmmktime(0, 0, 0, $m, $d, $y) - $zone_offset;
-		}
-
-		if ($date_cache[$format]['is_short'] !== false && !$forcedate && !($gmepoch < $midnight - 86400 || $gmepoch > $midnight + 172800))
-		{
-			$day = false;
-
-			if ($gmepoch > $midnight + 86400)
-			{
-				$day = 'TOMORROW';
-			}
-			else if ($gmepoch > $midnight)
-			{
-				$day = 'TODAY';
-			}
-			else if ($gmepoch > $midnight - 86400)
-			{
-				$day = 'YESTERDAY';
-			}
-
-			if ($day !== false)
-			{
-				return str_replace('||', $this->lang['datetime'][$day], strtr(@gmdate($date_cache[$format]['format_short'], $gmepoch + $zone_offset), $date_cache[$format]['lang']));
-			}
-		}
-
-		return strtr(@gmdate($date_cache[$format]['format_long'], $gmepoch + $zone_offset), $date_cache[$format]['lang']);
-	}
-
-	/**
-	* Get language id currently used by the user
-	*
-	* @return int language id
-	* @access public
-	*/
-	public function get_iso_lang_id()
-	{
-		if (!empty($this->lang_id))
-		{
-			return $this->lang_id;
-		}
-
-		if (!$this->lang_name)
-		{
-			$this->lang_name = phpbb::$config['default_lang'];
-		}
-
-		$sql = 'SELECT lang_id
-			FROM ' . LANG_TABLE . "
-			WHERE lang_iso = '" . phpbb::$db->sql_escape($this->lang_name) . "'";
-		$result = phpbb::$db->sql_query($sql);
-		$this->lang_id = (int) phpbb::$db->sql_fetchfield('lang_id');
-		phpbb::$db->sql_freeresult($result);
-
-		return $this->lang_id;
-	}
-
-	/**
-	* Get users profile fields
-	*
-	* @param int	$user_id	User id. If not specified the current users profile fields are grabbed.
-	*
-	* @return array	Profile fields. If the current user then they are also stored as property $profile_fields.
-	* @access public
-	*/
-	public function get_profile_fields($user_id = false)
-	{
-		$user_id = ($user_id === false) ? $this->data['user_id'] : $user_id;
-
-		if (isset($this->profile_fields) && $user_id === $this->data['user_id'])
-		{
-			return $this->profile_fields;
-		}
-
-		$sql = 'SELECT *
-			FROM ' . PROFILE_FIELDS_DATA_TABLE . "
-			WHERE user_id = $user_id";
-		$result = phpbb::$db->sql_query_limit($sql, 1);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if ($user_id === $this->data['user_id'])
-		{
-			$this->profile_fields = (!$row) ? array() : $row;
-		}
-
-		return $row;
-	}
-
-	/**
-	* Specify/Get image from style imageset
-	*
-	* @param string	$img	The imageset image key name
-	* @param string	$alt	An optional alternative image attribute.
-	* 						If a corresponding language key exist it will be used: phpbb::$user->lang[$alt]
-	* @param string	$type	The preferred type to return. Allowed types are: full_tag, src, width, height
-	* @param int	$width	Set image width
-	*
-	* @return mixed	returns the preferred type from $type
-	* @access public
-	*/
-	public function img($img, $alt = '', $type = 'full_tag', $width = false)
-	{
-		static $imgs;
-
-		$img_data = &$imgs[$img];
-
-		if (empty($img_data))
-		{
-			if (!isset($this->img_array[$img]))
-			{
-				// Do not fill the image to let designers decide what to do if the image is empty
-				$img_data = '';
-				return $img_data;
-			}
-
-			$img_data['src'] = PHPBB_ROOT_PATH . 'styles/' . rawurlencode($this->theme['imageset_path']) . '/imageset/' . ($this->img_array[$img]['image_lang'] ? $this->img_array[$img]['image_lang'] .'/' : '') . $this->img_array[$img]['image_filename'];
-			$img_data['width'] = $this->img_array[$img]['image_width'];
-			$img_data['height'] = $this->img_array[$img]['image_height'];
-		}
-
-		$alt = (!empty($this->lang[$alt])) ? $this->lang[$alt] : $alt;
-
-		switch ($type)
-		{
-			case 'src':
-				return $img_data['src'];
-			break;
-
-			case 'width':
-				return ($width === false) ? $img_data['width'] : $width;
-			break;
-
-			case 'height':
-				return $img_data['height'];
-			break;
-
-			default:
-				$use_width = ($width === false) ? $img_data['width'] : $width;
-
-				return '<img src="' . $img_data['src'] . '"' . (($use_width) ? ' width="' . $use_width . '"' : '') . (($img_data['height']) ? ' height="' . $img_data['height'] . '"' : '') . ' alt="' . $alt . '" title="' . $alt . '" />';
-			break;
-		}
-	}
-
-	/**
-	* Get option bit field from user options.
-	*
-	* @param string	$key	The option key from {@link $keyoptions keyoptions}
-	* @param int	$data	Optional user options bitfield.
-	* 						If not specified then {@link $data $data['user_options']} is used.
-	*
-	* @return bool	Corresponding option value returned. Is the option enabled or disabled.
-	* @access public
-	*/
-	public function optionget($key, $data = false)
-	{
-		if ($data !== false)
-		{
-			return $data & 1 << $this->keyoptions[$key];
-		}
-
-		if (!isset($this->keyvalues[$key]))
-		{
-			$this->keyvalues[$key] = $this->data['user_options'] & 1 << $this->keyoptions[$key];
-		}
-
-		return $this->keyvalues[$key];
-	}
-
-	/**
-	* Set option bit field for user options.
-	*
-	* @param string	$key	The option key from {@link $keyoptions keyoptions}
-	* @param bool	$value	True to enable the option, false to disable it
-	* @param int	$data	Optional user options bitfield.
-	* 						If not specified then {@link $data $data['user_options']} is used.
-	*
-	* @return bool	The new user options bitfield is returned if $data is specified.
-	* 				Else: false is returned if user options not changed, true if changed.
-	* @access public
-	*/
-	public function optionset($key, $value, $data = false)
-	{
-		$var = ($data) ? $data : $this->data['user_options'];
-
-		if ($value && !($var & 1 << $this->keyoptions[$key]))
-		{
-			$var += 1 << $this->keyoptions[$key];
-		}
-		else if (!$value && ($var & 1 << $this->keyoptions[$key]))
-		{
-			$var -= 1 << $this->keyoptions[$key];
-		}
-		else
-		{
-			return ($data) ? $var : false;
-		}
-
-		if (!$data)
-		{
-			$this->data['user_options'] = $this->keyvalues[$key] = $var;
-			return true;
-		}
-
-		return $var;
-	}
-
-	/**
-	* User login. Log the user in.
-	*
-	* @param string	$username	The specified user name
-	* @param string	$password	The specified password
-	* @param bool	$autologin	Enable/disable persistent login
-	* @param bool	$viewonline	If false then the user will be logged in as hidden
-	* @param bool	$admin		If true the user requests an admin login
-	*
-	* @return array	Login result array. This array returns results to the login script to show errors, notices, confirmations.
-	* @access public
-	*/
-	public function login($username, $password, $autologin = false, $viewonline = 1, $admin = 0)
-	{
-		if ($this->auth === false || !method_exists($this->auth, 'login'))
-		{
-			trigger_error('Authentication method not found', E_USER_ERROR);
-		}
-
-		$login = $this->auth->login($username, $password);
-
-		// If the auth module wants us to create an empty profile do so and then treat the status as LOGIN_SUCCESS
-		if ($login['status'] == LOGIN_SUCCESS_CREATE_PROFILE)
-		{
-			phpbb::$api->user->add($login['user_row'], (isset($login['cp_data'])) ? $login['cp_data'] : false);
-
-			$sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type
-				FROM ' . USERS_TABLE . "
-				WHERE username_clean = '" . phpbb::$db->sql_escape(utf8_clean_string($username)) . "'";
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$row)
-			{
-				return array(
-					'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-					'error_msg'		=> 'AUTH_NO_PROFILE_CREATED',
-					'user_row'		=> array('user_id' => ANONYMOUS),
-				);
-			}
-
-			$login = array(
-				'status'	=> LOGIN_SUCCESS,
-				'error_msg'	=> false,
-				'user_row'	=> $row,
-			);
-		}
-
-		// If login succeeded, we will log the user in... else we pass the login array through...
-		if ($login['status'] == LOGIN_SUCCESS)
-		{
-			// We create a new session. The session creation makes sure the old session is killed if there was one.
-			$result = $this->session_create($login['user_row']['user_id'], $admin, $autologin, $viewonline);
-
-			// Successful session creation
-			if ($result === true)
-			{
-				return array(
-					'status'		=> LOGIN_SUCCESS,
-					'error_msg'		=> false,
-					'user_row'		=> $login['user_row'],
-				);
-			}
-
-			return array(
-				'status'		=> LOGIN_BREAK,
-				'error_msg'		=> $result,
-				'user_row'		=> $login['user_row'],
-			);
-		}
-
-		return $login;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
deleted file mode 100644
index 8fc06cb352..0000000000
--- a/phpBB/includes/constants.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* valid external constants:
-* PHPBB_MSG_HANDLER
-* PHPBB_DB_NEW_LINK
-* PHPBB_ROOT_PATH
-* PHPBB_ADMIN_PATH
-*/
-
-// phpBB Version
-define('PHPBB_VERSION', '3.1.0-dev1');
-
-// QA-related
-// define('PHPBB_QA', 1);
-
-// User related
-define('ANONYMOUS', 1);
-
-define('USER_ACTIVATION_NONE', 0);
-define('USER_ACTIVATION_SELF', 1);
-define('USER_ACTIVATION_ADMIN', 2);
-define('USER_ACTIVATION_DISABLE', 3);
-
-define('AVATAR_UPLOAD', 1);
-define('AVATAR_REMOTE', 2);
-define('AVATAR_GALLERY', 3);
-
-define('INACTIVE_REGISTER', 1);
-define('INACTIVE_PROFILE', 2);
-define('INACTIVE_MANUAL', 3);
-define('INACTIVE_REMIND', 4);
-
-// Login error codes
-define('LOGIN_CONTINUE', 1);
-define('LOGIN_BREAK', 2);
-define('LOGIN_SUCCESS', 3);
-define('LOGIN_SUCCESS_CREATE_PROFILE', 20);
-define('LOGIN_ERROR_USERNAME', 10);
-define('LOGIN_ERROR_PASSWORD', 11);
-define('LOGIN_ERROR_ACTIVE', 12);
-define('LOGIN_ERROR_ATTEMPTS', 13);
-define('LOGIN_ERROR_EXTERNAL_AUTH', 14);
-define('LOGIN_ERROR_PASSWORD_CONVERT', 15);
-
-// Group settings
-define('GROUP_OPEN', 0);
-define('GROUP_CLOSED', 1);
-define('GROUP_HIDDEN', 2);
-define('GROUP_SPECIAL', 3);
-define('GROUP_FREE', 4);
-
-// Forum/Topic states
-define('FORUM_CAT', 0);
-define('FORUM_POST', 1);
-define('FORUM_LINK', 2);
-define('ITEM_UNLOCKED', 0);
-define('ITEM_LOCKED', 1);
-define('ITEM_MOVED', 2);
-
-// Forum Flags
-define('FORUM_FLAG_LINK_TRACK', 1);
-define('FORUM_FLAG_PRUNE_POLL', 2);
-define('FORUM_FLAG_PRUNE_ANNOUNCE', 4);
-define('FORUM_FLAG_PRUNE_STICKY', 8);
-define('FORUM_FLAG_ACTIVE_TOPICS', 16);
-define('FORUM_FLAG_POST_REVIEW', 32);
-
-// Optional text flags
-define('OPTION_FLAG_BBCODE', 1);
-define('OPTION_FLAG_SMILIES', 2);
-define('OPTION_FLAG_LINKS', 4);
-
-// Topic types
-define('POST_NORMAL', 0);
-define('POST_STICKY', 1);
-define('POST_ANNOUNCE', 2);
-define('POST_GLOBAL', 3);
-
-// Lastread types
-define('TRACK_NORMAL', 0);
-define('TRACK_POSTED', 1);
-
-// Notify methods
-define('NOTIFY_EMAIL', 0);
-define('NOTIFY_IM', 1);
-define('NOTIFY_BOTH', 2);
-
-// Email Priority Settings
-define('MAIL_LOW_PRIORITY', 4);
-define('MAIL_NORMAL_PRIORITY', 3);
-define('MAIL_HIGH_PRIORITY', 2);
-
-// Log types
-define('LOG_ADMIN', 0);
-define('LOG_MOD', 1);
-define('LOG_CRITICAL', 2);
-define('LOG_USERS', 3);
-
-// Private messaging - Do NOT change these values
-define('PRIVMSGS_HOLD_BOX', -4);
-define('PRIVMSGS_NO_BOX', -3);
-define('PRIVMSGS_OUTBOX', -2);
-define('PRIVMSGS_SENTBOX', -1);
-define('PRIVMSGS_INBOX', 0);
-
-// Full Folder Actions
-define('FULL_FOLDER_NONE', -3);
-define('FULL_FOLDER_DELETE', -2);
-define('FULL_FOLDER_HOLD', -1);
-
-// Download Modes - Attachments
-define('INLINE_LINK', 1);
-// This mode is only used internally to allow modders extending the attachment functionality
-define('PHYSICAL_LINK', 2);
-
-// Confirm types
-define('CONFIRM_REG', 1);
-define('CONFIRM_LOGIN', 2);
-define('CONFIRM_POST', 3);
-
-// Categories - Attachments
-define('ATTACHMENT_CATEGORY_NONE', 0);
-define('ATTACHMENT_CATEGORY_IMAGE', 1); // Inline Images
-define('ATTACHMENT_CATEGORY_WM', 2); // Windows Media Files - Streaming
-define('ATTACHMENT_CATEGORY_RM', 3); // Real Media Files - Streaming
-define('ATTACHMENT_CATEGORY_THUMB', 4); // Not used within the database, only while displaying posts
-define('ATTACHMENT_CATEGORY_FLASH', 5); // Flash/SWF files
-define('ATTACHMENT_CATEGORY_QUICKTIME', 6); // Quicktime/Mov files
-
-// BBCode UID length
-define('BBCODE_UID_LEN', 8);
-
-// Number of core BBCodes
-define('NUM_CORE_BBCODES', 12);
-
-// Magic url types
-define('MAGIC_URL_EMAIL', 1);
-define('MAGIC_URL_FULL', 2);
-define('MAGIC_URL_LOCAL', 3);
-define('MAGIC_URL_WWW', 4);
-
-// Profile Field Types
-define('FIELD_INT', 1);
-define('FIELD_STRING', 2);
-define('FIELD_TEXT', 3);
-define('FIELD_BOOL', 4);
-define('FIELD_DROPDOWN', 5);
-define('FIELD_DATE', 6);
-
-// referer validation
-define('REFERER_VALIDATE_NONE', 0);
-define('REFERER_VALIDATE_HOST', 1);
-define('REFERER_VALIDATE_PATH', 2);
-
-// Additional constants
-define('VOTE_CONVERTED', 127);
-
-// Table names
-define('ACL_GROUPS_TABLE',			phpbb::$base_config['table_prefix'] . 'acl_groups');
-define('ACL_OPTIONS_TABLE',			phpbb::$base_config['table_prefix'] . 'acl_options');
-define('ACL_ROLES_DATA_TABLE',		phpbb::$base_config['table_prefix'] . 'acl_roles_data');
-define('ACL_ROLES_TABLE',			phpbb::$base_config['table_prefix'] . 'acl_roles');
-define('ACL_USERS_TABLE',			phpbb::$base_config['table_prefix'] . 'acl_users');
-define('ATTACHMENTS_TABLE',			phpbb::$base_config['table_prefix'] . 'attachments');
-define('BANLIST_TABLE',				phpbb::$base_config['table_prefix'] . 'banlist');
-define('BBCODES_TABLE',				phpbb::$base_config['table_prefix'] . 'bbcodes');
-define('BOOKMARKS_TABLE',			phpbb::$base_config['table_prefix'] . 'bookmarks');
-define('BOTS_TABLE',				phpbb::$base_config['table_prefix'] . 'bots');
-define('CONFIG_TABLE',				phpbb::$base_config['table_prefix'] . 'config');
-define('CONFIRM_TABLE',				phpbb::$base_config['table_prefix'] . 'confirm');
-define('DISALLOW_TABLE',			phpbb::$base_config['table_prefix'] . 'disallow');
-define('DRAFTS_TABLE',				phpbb::$base_config['table_prefix'] . 'drafts');
-define('EXTENSIONS_TABLE',			phpbb::$base_config['table_prefix'] . 'extensions');
-define('EXTENSION_GROUPS_TABLE',	phpbb::$base_config['table_prefix'] . 'extension_groups');
-define('FORUMS_TABLE',				phpbb::$base_config['table_prefix'] . 'forums');
-define('FORUMS_ACCESS_TABLE',		phpbb::$base_config['table_prefix'] . 'forums_access');
-define('FORUMS_TRACK_TABLE',		phpbb::$base_config['table_prefix'] . 'forums_track');
-define('FORUMS_WATCH_TABLE',		phpbb::$base_config['table_prefix'] . 'forums_watch');
-define('GROUPS_TABLE',				phpbb::$base_config['table_prefix'] . 'groups');
-define('ICONS_TABLE',				phpbb::$base_config['table_prefix'] . 'icons');
-define('LANG_TABLE',				phpbb::$base_config['table_prefix'] . 'lang');
-define('LOG_TABLE',					phpbb::$base_config['table_prefix'] . 'log');
-define('MODERATOR_CACHE_TABLE',		phpbb::$base_config['table_prefix'] . 'moderator_cache');
-define('MODULES_TABLE',				phpbb::$base_config['table_prefix'] . 'modules');
-define('POLL_OPTIONS_TABLE',		phpbb::$base_config['table_prefix'] . 'poll_options');
-define('POLL_VOTES_TABLE',			phpbb::$base_config['table_prefix'] . 'poll_votes');
-define('POSTS_TABLE',				phpbb::$base_config['table_prefix'] . 'posts');
-define('PRIVMSGS_TABLE',			phpbb::$base_config['table_prefix'] . 'privmsgs');
-define('PRIVMSGS_FOLDER_TABLE',		phpbb::$base_config['table_prefix'] . 'privmsgs_folder');
-define('PRIVMSGS_RULES_TABLE',		phpbb::$base_config['table_prefix'] . 'privmsgs_rules');
-define('PRIVMSGS_TO_TABLE',			phpbb::$base_config['table_prefix'] . 'privmsgs_to');
-define('PROFILE_FIELDS_TABLE',		phpbb::$base_config['table_prefix'] . 'profile_fields');
-define('PROFILE_FIELDS_DATA_TABLE',	phpbb::$base_config['table_prefix'] . 'profile_fields_data');
-define('PROFILE_FIELDS_LANG_TABLE',	phpbb::$base_config['table_prefix'] . 'profile_fields_lang');
-define('PROFILE_LANG_TABLE',		phpbb::$base_config['table_prefix'] . 'profile_lang');
-define('RANKS_TABLE',				phpbb::$base_config['table_prefix'] . 'ranks');
-define('REPORTS_TABLE',				phpbb::$base_config['table_prefix'] . 'reports');
-define('REPORTS_REASONS_TABLE',		phpbb::$base_config['table_prefix'] . 'reports_reasons');
-define('SEARCH_RESULTS_TABLE',		phpbb::$base_config['table_prefix'] . 'search_results');
-define('SEARCH_WORDLIST_TABLE',		phpbb::$base_config['table_prefix'] . 'search_wordlist');
-define('SEARCH_WORDMATCH_TABLE',	phpbb::$base_config['table_prefix'] . 'search_wordmatch');
-define('SESSIONS_TABLE',			phpbb::$base_config['table_prefix'] . 'sessions');
-define('SESSIONS_KEYS_TABLE',		phpbb::$base_config['table_prefix'] . 'sessions_keys');
-define('SITELIST_TABLE',			phpbb::$base_config['table_prefix'] . 'sitelist');
-define('SMILIES_TABLE',				phpbb::$base_config['table_prefix'] . 'smilies');
-define('STYLES_TABLE',				phpbb::$base_config['table_prefix'] . 'styles');
-define('STYLES_TEMPLATE_TABLE',		phpbb::$base_config['table_prefix'] . 'styles_template');
-define('STYLES_THEME_TABLE',		phpbb::$base_config['table_prefix'] . 'styles_theme');
-define('STYLES_IMAGESET_TABLE',		phpbb::$base_config['table_prefix'] . 'styles_imageset');
-define('STYLES_IMAGESET_DATA_TABLE',phpbb::$base_config['table_prefix'] . 'styles_imageset_data');
-define('TOPICS_TABLE',				phpbb::$base_config['table_prefix'] . 'topics');
-define('TOPICS_POSTED_TABLE',		phpbb::$base_config['table_prefix'] . 'topics_posted');
-define('TOPICS_TRACK_TABLE',		phpbb::$base_config['table_prefix'] . 'topics_track');
-define('TOPICS_WATCH_TABLE',		phpbb::$base_config['table_prefix'] . 'topics_watch');
-define('USER_GROUP_TABLE',			phpbb::$base_config['table_prefix'] . 'user_group');
-define('USERS_TABLE',				phpbb::$base_config['table_prefix'] . 'users');
-define('WARNINGS_TABLE',			phpbb::$base_config['table_prefix'] . 'warnings');
-define('WORDS_TABLE',				phpbb::$base_config['table_prefix'] . 'words');
-define('ZEBRA_TABLE',				phpbb::$base_config['table_prefix'] . 'zebra');
-
-// Additional tables
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/core/bootstrap.php b/phpBB/includes/core/bootstrap.php
deleted file mode 100644
index f44b48c7db..0000000000
--- a/phpBB/includes/core/bootstrap.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
-*
-* @package core
-* @version $Id$
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-* Within this file only the framework with all components but no phpBB-specific things will be loaded
-*/
-
-/**
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-$starttime = explode(' ', microtime());
-$starttime = $starttime[1] + $starttime[0];
-
-// Report all errors, except notices
-error_reporting(E_ALL | E_STRICT); // ^ E_NOTICE
-date_default_timezone_set('UTC');
-
-// Initialize some standard variables, constants and classes we need
-require_once PHPBB_ROOT_PATH . 'includes/core/core.' . PHP_EXT;
-require_once PHPBB_ROOT_PATH . 'plugins/bootstrap.' . PHP_EXT;
-
-// Define STRIP if it is not already defined
-if (!defined('STRIP'))
-{
-	// If we are on PHP >= 6.0.0 we do not need some code
-	if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
-	{
-		/**
-		* @ignore
-		*/
-		define('STRIP', false);
-	}
-	else
-	{
-		@set_magic_quotes_runtime(0);
-
-		// We do not allow register globals set
-		if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' || !function_exists('ini_get'))
-		{
-			die('phpBB will not work with register globals turned on. Please turn register globals off.');
-		}
-
-		define('STRIP', (@get_magic_quotes_gpc()) ? true : false);
-	}
-}
-
-// we check for the cron script and change the root path
-if (defined('IN_CRON'))
-{
-	@define('PHPBB_ROOT_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
-}
-
-// Set some default configuration parameter if the config file does not exist
-if (!file_exists(PHPBB_ROOT_PATH . 'config.' . PHP_EXT))
-{
-	// phpbb::$base_config['config_set'] = false
-	// This allows common.php or an installation script to do specific actions if the configuration is missing
-}
-else
-{
-	require PHPBB_ROOT_PATH . 'config.' . PHP_EXT;
-}
-
-// Register autoload function
-spl_autoload_register('__phpbb_autoload');
-
-// Set error handler before a real one is there
-set_error_handler(array('phpbb', 'error_handler'));
-
-// Add constants
-include_once PHPBB_ROOT_PATH . 'includes/constants.' . PHP_EXT;
-
-// Add global functions
-// @todo remove functions_content, trim down functions.php
-require_once PHPBB_ROOT_PATH . 'includes/functions.' . PHP_EXT;
-require_once PHPBB_ROOT_PATH . 'includes/functions_content.' . PHP_EXT;
-
-// Add UTF8 tools
-require_once PHPBB_ROOT_PATH . 'includes/utf/utf_tools.' . PHP_EXT;
-
-// Add pre-defined system core files
-require_once PHPBB_ROOT_PATH . 'includes/core/request.' . PHP_EXT;
-
-phpbb::register('security', false, 'core/security');
-phpbb::register('url', false, 'core/url');
-phpbb::register('system', false, 'core/system');
-phpbb::register('server-vars', 'phpbb_system_info', 'core/system_info');
-
-// Make plugins structure available
-phpbb::register('plugins');
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/core/core.php b/phpBB/includes/core/core.php
deleted file mode 100644
index 2b2c4bea13..0000000000
--- a/phpBB/includes/core/core.php
+++ /dev/null
@@ -1,440 +0,0 @@
-<?php
-/**
-*
-* @package core
-* @version $Id$
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit();
-}
-
-/**
-* phpBB abstract class
-*
-* @package core
-* @author acydburn
-*/
-abstract class phpbb
-{
-	/**
-	* The phpBB template object
-	*/
-	public static $template = NULL;
-
-	/**
-	* The phpBB user object
-	*/
-	public static $user = NULL;
-
-	/**
-	* The phpBB database object
-	*/
-	public static $db = NULL;
-
-	/**
-	* The phpBB cache system object
-	*/
-	public static $acm = NULL;
-
-	/**
-	* The phpBB permission object
-	*/
-	public static $acl = NULL;
-
-	/**
-	* The phpBB plugins object
-	*/
-	public static $plugins = NULL;
-
-	/**
-	* The phpBB core url object
-	* Responsible for handling URL-related tasks as well as redirects, etc.
-	*/
-	public static $url = NULL;
-
-	/**
-	* The phpBB core security object.
-	* Responsible for handling security-related tasks, for example password handling, random number generation...
-	*/
-	public static $security = NULL;
-
-	/**
-	* The phpBB core system object
-	* Responsible for handling file/server tasks.
-	*/
-	public static $system = NULL;
-
-	/**
-	* The phpBB API object
-	*/
-	public static $api = NULL;
-
-	/**
-	* @var array The phpBB configuration array
-	*/
-	public static $config = array();
-
-	/**
-	* @var array The base configuration array
-	*/
-	public static $base_config = array(
-		'table_prefix'		=> 'phpbb_',
-		'admin_folder'		=> 'adm',
-		'acm_type'			=> 'file',
-
-		'config_set'		=> false,
-		'extensions_set'	=> false,
-
-		'memory_usage'		=> 0,
-
-		'debug'				=> false,
-		'debug_extra'		=> false,
-		'installed'			=> false,
-	);
-
-	/**
-	* @var array Last notice occurred in message handler
-	*/
-	public static $last_notice = array(
-		'file'		=> '',
-		'line'		=> 0,
-		'message'	=> '',
-		'errno'		=> E_NOTICE,
-	);
-
-	/**#@+
-	* Permission constant
-	*/
-	const ACL_NEVER = 0;
-	const ACL_YES = 1;
-	const ACL_NO = -1;
-	/**#@-*/
-
-	/**#@+
-	* Global constant for {@link phpbb::$system->chmod()}
-	*/
-	const CHMOD_ALL = 7;
-	const CHMOD_READ = 4;
-	const CHMOD_WRITE = 2;
-	const CHMOD_EXECUTE = 1;
-	/**#@-*/
-
-	/**#@+
-	* Constant defining plugin mode for objects
-	*/
-	const METHOD_ADD = 1;
-	const METHOD_OVERRIDE = 2;
-	const METHOD_INJECT = 4;
-	/**#@-*/
-
-	/**#@+
-	* Constant defining plugin mode for functions
-	*/
-	const FUNCTION_OVERRIDE = 1;
-	const FUNCTION_INJECT = 2;
-	/**#@-*/
-
-	/**#@+
-	* Constant to define user level. See {@link phpbb::$user phpbb::$user}
-	*/
-	const USER_NORMAL = 0;
-	const USER_INACTIVE = 1;
-	const USER_IGNORE = 2;
-	const USER_FOUNDER = 3;
-	/**#@-*/
-
-	/**
-	* @var array a static array holding custom objects
-	*/
-	public static $instances = NULL;
-
-	/**
-	* We do not want this class instantiable
-	*/
-	private function ___construct() { }
-
-	/**
-	* A failover error handler to handle errors before we assign our own error handler
-	*
-	* @access public
-	*/
-	public static function error_handler($errno, $errstr, $errfile, $errline)
-	{
-		throw new ErrorException($errstr, 0, $errno, $errfile, $errline);
-	}
-
-	/**
-	* Set base configuration - called from config.php file
-	*/
-	public static function set_config($config)
-	{
-		phpbb::$base_config = array_merge(phpbb::$base_config, $config);
-		phpbb::$base_config['config_set'] = true;
-
-		if (phpbb::$base_config['debug_extra'] && function_exists('memory_get_usage'))
-		{
-			phpbb::$base_config['memory_usage'] = memory_get_usage();
-		}
-
-		// Load Extensions
-		if (!empty(phpbb::$base_config['extensions']) && !phpbb::$base_config['extensions_set'])
-		{
-			$load_extensions = explode(',', phpbb::$base_config['extensions']);
-
-			foreach ($load_extensions as $extension)
-			{
-				@dl(trim($extension));
-			}
-
-			phpbb::$base_config['extensions_set'] = true;
-		}
-	}
-
-	/**
-	* Get instance of static property
-	*
-	* @param string	$variable	The name of the instance to retrieve.
-	*
-	* @return mixed	The property (object/array/...) registered with this name
-	* @access public
-	*/
-	public static function get_instance($variable)
-	{
-		if (!self::registered($variable))
-		{
-			return self::register($variable);
-		}
-
-		// Please do not try to change it to (expr) ? (true) : (false) - it will not work. ;)
-		if (property_exists('phpbb', $variable))
-		{
-			return self::$$variable;
-		}
-		else
-		{
-			return self::$instances[$variable];
-		}
-	}
-
-	/**
-	* Check if the variable is already assigned
-	*
-	* @param string	$variable	The name of the instance to check
-	*
-	* @return bool	True if the instance is registered, false if not.
-	* @access public
-	*/
-	public static function registered($variable)
-	{
-		if (property_exists('phpbb', $variable))
-		{
-			return (self::$$variable !== NULL) ? true : false;
-		}
-
-		return (isset(self::$instances[$variable]) && self::$instances[$variable] !== NULL) ? true : false;
-	}
-
-	/**
-	* Simpler method to access assigned instances.
-	* (Overloading is not possible here due to the object being static and our use of PHP 5.2.x+.)
-	*
-	* @param string	$variable	The instance name to retrieve
-	*
-	* @return mixed	The instance
-	* @access public
-	*/
-	public static function get($variable)
-	{
-		// No error checking done here... returned right away
-		return self::$instances[$variable];
-	}
-
-	/**
-	* Register new class/object.
-	* Any additional parameter will be forwarded to the class instantiation.
-	*
-	* @param string			$variable		The resulting instance name.
-	* 										If a property with the given name exists, it will be assigned.
-	* 										Else it will be put in the {@link $instances intances} array
-	* @param string			$class			Define a custom class name.
-	* 										This is useful if the class used does not abide to the rules (phpbb_{$class}).
-	* @param string|array	$includes		Define additional files/includes required for this class to be correctly set up. Files are expected to be in /includes/.
-	* @param mixed			$arguments,...	Any number of additional arguments passed to the constructor of the object to create
-	*
-	* @return mixed	The instance of the created object
-	* @access public
-	*/
-	public static function register($variable, $class = false, $includes = false)
-	{
-		if (self::registered($variable))
-		{
-			return self::get_instance($variable);
-		}
-
-		$arguments = (func_num_args() > 3) ? array_slice(func_get_args(), 3) : array();
-		$class = ($class === false) ? 'phpbb_' . $variable : $class;
-
-		if ($includes !== false)
-		{
-			if (!is_array($includes))
-			{
-				$includes = array($includes);
-			}
-
-			foreach ($includes as $file)
-			{
-				require_once PHPBB_ROOT_PATH . 'includes/' . $file . '.' . PHP_EXT;
-			}
-		}
-
-		$reflection = new ReflectionClass($class);
-
-		if (!$reflection->isInstantiable())
-		{
-			throw new Exception('Assigned classes need to be instantiated.');
-		}
-
-		if (!property_exists('phpbb', $variable))
-		{
-			self::$instances[$variable] = (sizeof($arguments)) ? call_user_func_array(array($reflection, 'newInstance'), $arguments) : $reflection->newInstance();
-		}
-		else
-		{
-			self::$$variable = (sizeof($arguments)) ? call_user_func_array(array($reflection, 'newInstance'), $arguments) : $reflection->newInstance();
-		}
-
-		return self::get_instance($variable);
-	}
-
-	/**
-	* Instead of registering we also can assign a variable. This is helpful if we have an application builder or use a factory.
-	*
-	* @param string	$variable	The resulting instance name.
-	* 							If a property with the given name exists, it will be assigned.
-	* 							Else it will be put in the {@link $instances intances} array
-	* @param mixed	$object		The variable to assign to the instance
-	*
-	* @return mixed	The instance
-	* @access public
-	*/
-	public static function assign($variable, $object)
-	{
-		if (self::registered($variable))
-		{
-			return self::get_instance($variable);
-		}
-
-		if (!property_exists('phpbb', $variable))
-		{
-			self::$instances[$variable] = $object;
-		}
-		else
-		{
-			self::$$variable = $object;
-		}
-
-		return self::get_instance($variable);
-	}
-
-	/**
-	* Unset/unregister a specific object.
-	*
-	* @param string	$variable	The name of the instance to unset
-	* @access public
-	*/
-	public static function unregister($variable)
-	{
-		if (!self::registered($variable))
-		{
-			return;
-		}
-
-		if (!property_exists('phpbb', $variable))
-		{
-			unset(self::$instances[$variable]);
-		}
-		else
-		{
-			self::$$variable = NULL;
-		}
-	}
-
-	/**
-	* Function to return to a clean state, unregistering everything. This is helpful for unit tests if you want to return to a "clean state"
-	*
-	* @access public
-	*/
-	public static function reset()
-	{
-		$class_vars = array_keys(get_class_vars('phpbb'));
-		$class_vars = array_merge(array_keys(self::$instances), $class_vars);
-
-		foreach ($class_vars as $variable)
-		{
-			self::unregister($variable);
-		}
-	}
-}
-
-/**
-* phpBB SPL Autoload Function. A phpbb_ prefix will be stripped from the class name.
-*
-* The files this function tries to include are:
-*	includes/{$class_name}/bootstrap.php
-*	includes/{$class_name}/index.php
-* Additionally, every _ within $class_name is replaced by / for the following directories:
-*	includes/{$class_name}.php
-*	includes/classes/{$class_name}.php
-*
-* @param string	$class_name	The class name. An existing phpbb_ prefix will be removed.
-*/
-function __phpbb_autoload($class_name)
-{
-	if (strpos($class_name, 'phpbb_') === 0)
-	{
-		$class_name = substr($class_name, 6);
-	}
-
-	$class_name = basename($class_name);
-
-	$filenames = array(
-		'includes/' . $class_name . '/bootstrap',
-		'includes/' . $class_name . '/index',
-		'includes/' . $class_name,
-		'includes/classes/' . $class_name,
-	);
-
-	if (strpos($class_name, '_') !== false)
-	{
-		$class_name = str_replace('_', '/', $class_name);
-
-		$filenames = array_merge($filenames, array(
-			'includes/' . $class_name,
-			'includes/classes/' . $class_name,
-		));
-	}
-
-	foreach ($filenames as $filename)
-	{
-		if (file_exists(PHPBB_ROOT_PATH . $filename . '.' . PHP_EXT))
-		{
-			include PHPBB_ROOT_PATH . $filename . '.' . PHP_EXT;
-			return;
-		}
-	}
-}
-
-/*
-class phpbb_exception extends Exception
-{
-}
-*/
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/core/request.php b/phpBB/includes/core/request.php
deleted file mode 100644
index 7f3f158dc0..0000000000
--- a/phpBB/includes/core/request.php
+++ /dev/null
@@ -1,562 +0,0 @@
-<?php
-/**
-*
-* @package core
-* @version $Id$
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Replacement for a superglobal (like $_GET or $_POST) which calls
-* trigger_error on any operation, overloads the [] operator using SPL.
-*
-* @package core
-* @author naderman
-*/
-class deactivated_super_global implements ArrayAccess, Countable, IteratorAggregate
-{
-	/**
-	* @var string Holds the error message
-	*/
-	private $message;
-
-	/**
-	* Constructor generates an error message fitting the super global to be used within the other functions.
-	*
-	* @param string	$name	Name of the super global this is a replacement for - e.g. '_GET'
-	*/
-	public function __construct($name)
-	{
-		$this->message = 'Illegal use of $' . $name . '. You must use the request class or request_var() to access input data. Found in %s on line %d. This error message was generated';
-	}
-
-	/**
-	* Calls trigger_error with the file and line number the super global was used in
-	*
-	* @access private
-	*/
-	private function error()
-	{
-		$file = '';
-		$line = 0;
-
-		$backtrace = debug_backtrace();
-		if (isset($backtrace[1]))
-		{
-			$file = $backtrace[1]['file'];
-			$line = $backtrace[1]['line'];
-		}
-		trigger_error(sprintf($this->message, $file, $line), E_USER_ERROR);
-	}
-
-	/**#@+
-	* Part of the ArrayAccess implementation, will always result in a FATAL error
-	*
-	* @access public
-	*/
-	public function offsetExists($offset)
-	{
-		$this->error();
-	}
-
-	public function offsetGet($offset)
-	{
-		$this->error();
-	}
-
-	public function offsetSet($offset, $value)
-	{
-		$this->error();
-	}
-
-	public function offsetUnset($offset)
-	{
-		$this->error();
-	}
-	/**#@-*/
-
-	/**
-	* Part of the Countable implementation, will always result in a FATAL error
-	*
-	* @access public
-	*/
-	public function count()
-	{
-		$this->error();
-	}
-
-	/**
-	* Part of the Traversable/IteratorAggregate implementation, will always result in a FATAL error
-	*
-	* @access public
-	*/
-	public function getIterator()
-	{
-		$this->error();
-	}
-}
-
-/**
-* All application input is accessed through this class.
-*
-* It provides a method to disable access to input data through super globals.
-* This should force MOD authors to read about data validation.
-*
-* @package core
-* @author naderman
-*/
-class phpbb_request
-{
-	/**#@+
-	* Constant defining the super global
-	*/
-	const POST = 0;
-	const GET = 1;
-	const REQUEST = 2;
-	const COOKIE = 3;
-	/**#@-*/
-
-	/**
-	* @var
-	*/
-	protected static $initialised = false;
-
-	/**
-	* @var
-	*/
-	protected static $super_globals_disabled = false;
-
-	/**
-	* @var array The names of super global variables that this class should protect if super globals are disabled
-	*/
-	protected static $super_globals = array(phpbb_request::POST => '_POST', phpbb_request::GET => '_GET', phpbb_request::REQUEST => '_REQUEST', phpbb_request::COOKIE => '_COOKIE');
-
-	/**
-	* @var array An associative array that has the value of super global constants as keys and holds their data as values.
-	*/
-	protected static $input;
-
-	/**
-	* Initialises the request class, that means it stores all input data in {@link $input self::$input}
-	*
-	* @access public
-	*/
-	public static function init()
-	{
-		if (!self::$initialised)
-		{
-			foreach (self::$super_globals as $const => $super_global)
-			{
-				if ($const == phpbb_request::REQUEST)
-				{
-					continue;
-				}
-
-				self::$input[$const] = isset($GLOBALS[$super_global]) ? $GLOBALS[$super_global] : array();
-			}
-
-			// @todo far away from ideal... just a quick hack to let request_var() work again. The problem is that $GLOBALS['_REQUEST'] no longer exist.
-			self::$input[phpbb_request::REQUEST] = array_merge(self::$input[phpbb_request::POST], self::$input[phpbb_request::GET]);
-
-			self::$initialised = true;
-		}
-	}
-
-	/**
-	* Resets the request class.
-	* This will simply forget about all input data and read it again from the
-	* super globals, if super globals were disabled, all data will be gone.
-	*
-	* @access public
-	*/
-	public static function reset()
-	{
-		self::$input = array();
-		self::$initialised = false;
-		self::$super_globals_disabled = false;
-	}
-
-	/**
-	* Getter for $super_globals_disabled
-	*
-	* @return bool	Whether super globals are disabled or not.
-	* @access public
-	*/
-	public static function super_globals_disabled()
-	{
-		return self::$super_globals_disabled;
-	}
-
-	/**
-	* Disables access of super globals specified in $super_globals.
-	* This is achieved by overwriting the super globals with instances of {@link deactivated_super_global deactivated_super_global}
-	*
-	* @access public
-	*/
-	public static function disable_super_globals()
-	{
-		if (!self::$initialised)
-		{
-			self::init();
-		}
-
-		foreach (self::$super_globals as $const => $super_global)
-		{
-			unset($GLOBALS[$super_global]);
-			$GLOBALS[$super_global] = new deactivated_super_global($super_global);
-		}
-
-		self::$super_globals_disabled = true;
-	}
-
-	/**
-	* Enables access of super globals specified in $super_globals if they were disabled by {@link disable_super_globals disable_super_globals}.
-	* This is achieved by making the super globals point to the data stored within this class in {@link $input input}.
-	*
-	* @access public
-	*/
-	public static function enable_super_globals()
-	{
-		if (!self::$initialised)
-		{
-			self::init();
-		}
-
-		if (self::$super_globals_disabled)
-		{
-			foreach (self::$super_globals as $const => $super_global)
-			{
-				$GLOBALS[$super_global] = self::$input[$const];
-			}
-
-			self::$super_globals_disabled = false;
-		}
-	}
-
-	/**
-	* Recursively applies addslashes to a variable.
-	*
-	* @param mixed	&$var	Variable passed by reference to which slashes will be added.
-	* @access protected
-	*/
-	protected static function addslashes_recursively(&$var)
-	{
-		if (is_string($var))
-		{
-			$var = addslashes($var);
-		}
-		else if (is_array($var))
-		{
-			$var_copy = $var;
-			foreach ($var_copy as $key => $value)
-			{
-				if (is_string($key))
-				{
-					$key = addslashes($key);
-				}
-				self::addslashes_recursively($var[$key]);
-			}
-		}
-	}
-
-	/**
-	* This function allows overwriting or setting a value in one of the super global arrays.
-	*
-	* Changes which are performed on the super globals directly will not have any effect on the results of
-	* other methods this class provides. Using this function should be avoided if possible! It will
-	* consume twice the the amount of memory of the value
-	*
-	* @param string	$var_name	The name of the variable that shall be overwritten
-	* @param mixed	$value		The value which the variable shall contain.
-	* 							If this is null the variable will be unset.
-	* @param phpbb_request::POST|phpbb_request::GET|phpbb_request::REQUEST|phpbb_request::COOKIE	$super_global	Specifies which super global shall be changed
-	*
-	* @access public
-	*/
-	public static function overwrite($var_name, $value, $super_global = phpbb_request::REQUEST)
-	{
-		if (!self::$initialised)
-		{
-			self::init();
-		}
-
-		if (!isset(self::$super_globals[$super_global]))
-		{
-			return;
-		}
-
-		if (STRIP)
-		{
-			self::addslashes_recursively($value);
-		}
-
-		// setting to null means unsetting
-		if ($value === null)
-		{
-			unset(self::$input[$super_global][$var_name]);
-			if (!self::super_globals_disabled())
-			{
-				unset($GLOBALS[self::$super_globals[$super_global]][$var_name]);
-			}
-		}
-		else
-		{
-			self::$input[$super_global][$var_name] = $value;
-			if (!self::super_globals_disabled())
-			{
-				$GLOBALS[self::$super_globals[$super_global]][$var_name] = $value;
-			}
-		}
-
-		if (!self::super_globals_disabled())
-		{
-			unset($GLOBALS[self::$super_globals[$super_global]][$var_name]);
-			$GLOBALS[self::$super_globals[$super_global]][$var_name] = $value;
-		}
-	}
-
-	/**
-	* Set variable $result. Used by {@link request_var() the request_var function}
-	*
-	* @param mixed	&$result	The variable to fill
-	* @param mixed	$var		The contents to fill with
-	* @param mixed	$type		The variable type. Will be used with {@link settype()}
-	* @param bool	$multibyte	Indicates whether string values may contain UTF-8 characters.
-	* 							Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks.
-	*
-	* @access public
-	*/
-	public static function set_var(&$result, $var, $type, $multibyte = false)
-	{
-		settype($var, $type);
-		$result = $var;
-
-		if ($type == 'string')
-		{
-			$result = trim(utf8_htmlspecialchars(str_replace(array("\r\n", "\r", "\0"), array("\n", "\n", ''), $result)));
-
-			if (!empty($result))
-			{
-				// Make sure multibyte characters are wellformed
-				if ($multibyte)
-				{
-					if (!preg_match('/^./u', $result))
-					{
-						$result = '';
-					}
-				}
-				else
-				{
-					// no multibyte, allow only ASCII (0-127)
-					$result = preg_replace('/[\x80-\xFF]/', '?', $result);
-				}
-			}
-
-			$result = (STRIP) ? stripslashes($result) : $result;
-		}
-	}
-
-	/**
-	* Recursively sets a variable to a given type using {@link set_var() set_var}
-	* This function is only used from within {@link phpbb_request::variable phpbb_request::variable}.
-	*
-	* @param string	$var		The value which shall be sanitised (passed by reference).
-	* @param mixed	$default	Specifies the type $var shall have.
-	* 							If it is an array and $var is not one, then an empty array is returned.
-	* 							Otherwise var is cast to the same type, and if $default is an array all keys and values are cast recursively using this function too.
-	* @param bool	$multibyte	Indicates whether string values may contain UTF-8 characters.
-	* 							Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks.
-	*
-	* @access protected
-	*/
-	protected static function recursive_set_var(&$var, $default, $multibyte)
-	{
-		if (is_array($var) !== is_array($default))
-		{
-			$var = (is_array($default)) ? array() : $default;
-			return;
-		}
-
-		if (!is_array($default))
-		{
-			$type = gettype($default);
-			self::set_var($var, $var, $type, $multibyte);
-		}
-		else
-		{
-			// make sure there is at least one key/value pair to use get the
-			// types from
-			if (!sizeof($default))
-			{
-				$var = array();
-				return;
-			}
-
-			list($default_key, $default_value) = each($default);
-			$value_type = gettype($default_value);
-			$key_type = gettype($default_key);
-
-			$_var = $var;
-			$var = array();
-
-			foreach ($_var as $k => $v)
-			{
-				self::set_var($k, $k, $key_type, $multibyte);
-
-				self::recursive_set_var($v, $default_value, $multibyte);
-				self::set_var($var[$k], $v, $value_type, $multibyte);
-			}
-		}
-	}
-
-	/**
-	* Central type safe input handling function.
-	* All variables in GET or POST requests should be retrieved through this function to maximise security.
-	*
-	* @param string|array	$var_name	The form variable's name from which data shall be retrieved.
-	* 									If the value is an array this may be an array of indizes which will give
-	* 									direct access to a value at any depth. E.g. if the value of "var" is array(1 => "a")
-	* 									then specifying array("var", 1) as the name will return "a".
-	* @param mixed			$default	A default value that is returned if the variable was not set.
-	* 									This function will always return a value of the same type as the default.
-	* @param bool			$multibyte	If $default is a string this paramater has to be true if the variable may contain any UTF-8 characters
-	*									Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks
-	* @param phpbb_request::POST|phpbb_request::GET|phpbb_request::REQUEST|phpbb_request::COOKIE	$super_global	Specifies which super global should be used
-	*
-	* @return mixed	The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the
-	*				the same as that of $default. If the variable is not set $default is returned.
-	* @access public
-	*/
-	public static function variable($var_name, $default, $multibyte = false, $super_global = phpbb_request::REQUEST)
-	{
-		$path = false;
-
-		if (!self::$initialised)
-		{
-			self::init();
-		}
-
-		// deep direct access to multi dimensional arrays
-		if (is_array($var_name))
-		{
-			$path = $var_name;
-			// make sure at least the variable name is specified
-			if (!sizeof($path))
-			{
-				return (is_array($default)) ? array() : $default;
-			}
-			// the variable name is the first element on the path
-			$var_name = array_shift($path);
-		}
-
-		if (!isset(self::$input[$super_global][$var_name]))
-		{
-			return (is_array($default)) ? array() : $default;
-		}
-		$var = self::$input[$super_global][$var_name];
-
-		// make sure cookie does not overwrite get/post
-		if ($super_global != phpbb_request::COOKIE && isset(self::$input[phpbb_request::COOKIE][$var_name]))
-		{
-			if (!isset(self::$input[phpbb_request::GET][$var_name]) && !isset(self::$input[phpbb_request::POST][$var_name]))
-			{
-				return (is_array($default)) ? array() : $default;
-			}
-			$var = isset(self::$input[phpbb_request::POST][$var_name]) ? self::$input[phpbb_request::POST][$var_name] : self::$input[phpbb_request::GET][$var_name];
-		}
-
-		if ($path)
-		{
-			// walk through the array structure and find the element we are looking for
-			foreach ($path as $key)
-			{
-				if (is_array($var) && isset($var[$key]))
-				{
-					$var = $var[$key];
-				}
-				else
-				{
-					return (is_array($default)) ? array() : $default;
-				}
-			}
-		}
-
-		self::recursive_set_var($var, $default, $multibyte);
-
-		return $var;
-	}
-
-	/**
-	* Checks whether a certain variable was sent via POST.
-	* To make sure that a request was sent using POST you should call this function
-	* on at least one variable.
-	*
-	* @param string	$name	The name of the form variable which should have a
-	*						_p suffix to indicate the check in the code that creates the form too.
-	*
-	* @return bool	True if the variable was set in a POST request, false otherwise.
-	* @access public
-	*/
-	public static function is_set_post($name)
-	{
-		return self::is_set($name, phpbb_request::POST);
-	}
-
-	/**
-	* Checks whether a certain variable is set in one of the super global
-	* arrays.
-	*
-	* @param string	$var	Name of the variable
-	* @param phpbb_request::POST|phpbb_request::GET|phpbb_request::REQUEST|phpbb_request::COOKIE	$super_global
-	*						Specifies the super global which shall be checked
-	*
-	* @return bool	True if the variable was sent as input
-	* @access public
-	*/
-	public static function is_set($var, $super_global = phpbb_request::REQUEST)
-	{
-		if (!self::$initialised)
-		{
-			self::init();
-		}
-
-		return isset(self::$input[$super_global][$var]);
-	}
-
-	/**
-	* Returns all variable names for a given super global
-	*
-	* @param phpbb_request::POST|phpbb_request::GET|phpbb_request::REQUEST|phpbb_request::COOKIE	$super_global
-	*					The super global from which names shall be taken
-	*
-	* @return array	All variable names that are set for the super global.
-	*				Pay attention when using these, they are unsanitised!
-	* @access public
-	*/
-	public static function variable_names($super_global = phpbb_request::REQUEST)
-	{
-		if (!self::$initialised)
-		{
-			self::init();
-		}
-
-		if (!isset(self::$input[$super_global]))
-		{
-			return array();
-		}
-
-		return array_keys(self::$input[$super_global]);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/core/security.php b/phpBB/includes/core/security.php
deleted file mode 100644
index f5aca65e8d..0000000000
--- a/phpBB/includes/core/security.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-/**
-*
-* @package core
-* @version $Id$
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit();
-}
-/**
-* Class for generating random numbers, unique ids, unique keys, seeds, hashes...
-* @package core
-*/
-class phpbb_security extends phpbb_plugin_support
-{
-	/**
-	* @var array required phpBB objects
-	*/
-	public $phpbb_required = array();
-
-	/**
-	* @var array Optional phpBB objects
-	*/
-	public $phpbb_optional = array('config');
-
-	/**
-	* @var string Used hash type. The default type is $P$, phpBB uses a different one.
-	*/
-	public $hash_type = '$H$';
-
-	/**
-	* @var bool Is true if random seed got updated.
-	*/
-	private $dss_seeded = false;
-
-	/**
-	* Constructor
-	* @access public
-	*/
-	public function __construct() {}
-
-	/**
-	* Generates an alphanumeric random string of given length
-	*
-	* @param int	$num_chars	Number of characters to return
-	* @return string	Random string of $num_chars characters.
-	* @access public
-	*/
-	public function gen_rand_string($num_chars = 8)
-	{
-		$rand_str = $this->unique_id();
-		$rand_str = str_replace('0', 'Z', strtoupper(base_convert($rand_str, 16, 35)));
-
-		return substr($rand_str, 0, $num_chars);
-	}
-
-	/**
-	* Return unique id
-	*
-	* @param string	$extra	Additional entropy
-	* @return string	Unique id
-	* @access public
-	*/
-	public function unique_id($extra = 'c')
-	{
-		if (!isset(phpbb::$config['rand_seed']))
-		{
-			$val = md5(md5($extra) . microtime());
-			$val = md5(md5($extra) . $val . $extra);
-			return substr($val, 4, 16);
-		}
-
-
-		$val = phpbb::$config['rand_seed'] . microtime();
-		$val = md5($val);
-		phpbb::$config['rand_seed'] = md5(phpbb::$config['rand_seed'] . $val . $extra);
-
-		if (!$this->dss_seeded && phpbb::$config['rand_seed_last_update'] < time() - rand(1, 10))
-		{
-			set_config('rand_seed', phpbb::$config['rand_seed'], true);
-			set_config('rand_seed_last_update', time(), true);
-
-			$this->dss_seeded = true;
-		}
-
-		return substr($val, 4, 16);
-	}
-
-	/**
-	* Hash passwords
-	*
-	* @version Version 0.1
-	*
-	* Portable PHP password hashing framework.
-	*
-	* Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed in
-	* the public domain.
-	*
-	* There's absolutely no warranty.
-	*
-	* The homepage URL for this framework is:
-	*
-	*	http://www.openwall.com/phpass/
-	*
-	* Please be sure to update the Version line if you edit this file in any way.
-	* It is suggested that you leave the main version number intact, but indicate
-	* your project name (after the slash) and add your own revision information.
-	*
-	* Please do not change the "private" password hashing method implemented in
-	* here, thereby making your hashes incompatible.  However, if you must, please
-	* change the hash type identifier (the "$P$") to something different.
-	*
-	* Obviously, since this code is in the public domain, the above are not
-	* requirements (there can be none), but merely suggestions.
-	*
-	* @param string	$password	Password to hash
-	* @return string	Hashed password
-	* @access public
-	*/
-	public function hash_password($password)
-	{
-		$itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-
-		$random_state = $this->unique_id();
-		$random = '';
-		$count = 6;
-
-		if (($fh = @fopen('/dev/urandom', 'rb')))
-		{
-			$random = fread($fh, $count);
-			fclose($fh);
-		}
-
-		if (strlen($random) < $count)
-		{
-			$random = '';
-
-			for ($i = 0; $i < $count; $i += 16)
-			{
-				$random_state = md5($this->unique_id() . $random_state);
-				$random .= pack('H*', md5($random_state));
-			}
-			$random = substr($random, 0, $count);
-		}
-
-		$hash = $this->_hash_crypt_private($password, $this->_hash_gensalt_private($random, $itoa64), $itoa64);
-		$result = (strlen($hash) == 34) ? $hash : md5($password);
-
-		return $result;
-	}
-
-	/**
-	* Check for correct password
-	*
-	* If the hash length is != 34, then a md5($password) === $hash comparison is done. The correct hash length is 34.
-	*
-	* @param string	$password	The password in plain text
-	* @param string	$hash		The stored password hash
-	*
-	* @return bool	Returns true if the password is correct, false if not.
-	* @access public
-	*/
-	public function check_password($password, $hash)
-	{
-		$itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-		if (strlen($hash) == 34)
-		{
-			$result = ($this->_hash_crypt_private($password, $hash, $itoa64) === $hash) ? true : false;
-		}
-		else
-		{
-			$result = (md5($password) === $hash) ? true : false;
-		}
-
-		return $result;
-	}
-
-	/**
-	* Generate salt for hash generation
-	* @access private
-	*/
-	private function _hash_gensalt_private($input, &$itoa64, $iteration_count_log2 = 6)
-	{
-		if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31)
-		{
-			$iteration_count_log2 = 8;
-		}
-
-		$output = $this->hash_type;
-		$output .= $itoa64[min($iteration_count_log2 + 5, 30)];
-		$output .= $this->_hash_encode64($input, 6, $itoa64);
-
-		return $output;
-	}
-
-	/**
-	* Encode hash
-	* @access private
-	*/
-	private function _hash_encode64($input, $count, &$itoa64)
-	{
-		$output = '';
-		$i = 0;
-
-		do
-		{
-			$value = ord($input[$i++]);
-			$output .= $itoa64[$value & 0x3f];
-
-			if ($i < $count)
-			{
-				$value |= ord($input[$i]) << 8;
-			}
-
-			$output .= $itoa64[($value >> 6) & 0x3f];
-
-			if ($i++ >= $count)
-			{
-				break;
-			}
-
-			if ($i < $count)
-			{
-				$value |= ord($input[$i]) << 16;
-			}
-
-			$output .= $itoa64[($value >> 12) & 0x3f];
-
-			if ($i++ >= $count)
-			{
-				break;
-			}
-
-			$output .= $itoa64[($value >> 18) & 0x3f];
-		}
-		while ($i < $count);
-
-		return $output;
-	}
-
-	/**
-	* The crypt function/replacement
-	* @access private
-	*/
-	private function _hash_crypt_private($password, $setting, &$itoa64)
-	{
-		$output = '*';
-
-		// Check for correct hash
-		if (substr($setting, 0, 3) != $this->hash_type)
-		{
-			return $output;
-		}
-
-		$count_log2 = strpos($itoa64, $setting[3]);
-
-		if ($count_log2 < 7 || $count_log2 > 30)
-		{
-			return $output;
-		}
-
-		$count = 1 << $count_log2;
-		$salt = substr($setting, 4, 8);
-
-		if (strlen($salt) != 8)
-		{
-			return $output;
-		}
-
-		/**
-		* We're kind of forced to use MD5 here since it's the only
-		* cryptographic primitive available in all versions of PHP
-		* currently in use.  To implement our own low-level crypto
-		* in PHP would result in much worse performance and
-		* consequently in lower iteration counts and hashes that are
-		* quicker to crack (by non-PHP code).
-		*/
-		$hash = md5($salt . $password, true);
-		do
-		{
-			$hash = md5($hash . $password, true);
-		}
-		while (--$count);
-
-		$output = substr($setting, 0, 12);
-		$output .= $this->_hash_encode64($hash, 16, $itoa64);
-
-		return $output;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/core/system.php b/phpBB/includes/core/system.php
deleted file mode 100644
index 5bb42e9ed4..0000000000
--- a/phpBB/includes/core/system.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-/**
-*
-* @package core
-* @version $Id$
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit();
-}
-
-/**
-* System-specific methods. For example chmod(), unlink()...
-*
-* @package core
-*/
-class phpbb_system extends phpbb_plugin_support
-{
-	/**
-	* @var array required phpBB objects
-	*/
-	public $phpbb_required = array();
-
-	/**
-	* @var array Optional phpBB objects
-	*/
-	public $phpbb_optional = array();
-
-	/**
-	* @var array Holding some information for chmod()
-	*/
-	private $chmod_info = array();
-
-	/**
-	* Method for chmodding directories and files for internal use.
-	*
-	* This function determines owner and group whom the file belongs to and user and group of PHP and then set safest possible file permissions.
-	* The function determines owner and group from common.php file and sets the same to the provided file.
-	* The function uses bit fields to build the permissions.
-	* The function sets the appropiate execute bit on directories.
-	*
-	* Supported constants representing bit fields are:
-	*
-	* phpbb::CHMOD_ALL - all permissions (7)
-	* phpbb::CHMOD_READ - read permission (4)
-	* phpbb::CHMOD_WRITE - write permission (2)
-	* phpbb::CHMOD_EXECUTE - execute permission (1)
-	*
-	* NOTE: The function uses POSIX extension and fileowner()/filegroup() functions. If any of them is disabled, this function tries to build proper permissions, by calling is_readable() and is_writable() functions.
-	*
-	* @param string	$filename	The file/directory to be chmodded
-	* @param int	$perms		Permissions to set
-	*
-	* @return bool	true on success, otherwise false
-	* @author faw, phpBB Group
-	* @access public
-	*/
-	public function chmod($filename, $perms = phpbb::CHMOD_READ)
-	{
-		// Return if the file no longer exists.
-		if (!file_exists($filename))
-		{
-			return false;
-		}
-
-		// Determine some common vars
-		if (empty($this->chmod_info))
-		{
-			if (!function_exists('fileowner') || !function_exists('filegroup'))
-			{
-				// No need to further determine owner/group - it is unknown
-				$this->chmod_info['process'] = false;
-			}
-			else
-			{
-				// Determine owner/group of common.php file and the filename we want to change here
-				$common_php_owner = fileowner(PHPBB_ROOT_PATH . 'common.' . PHP_EXT);
-				$common_php_group = filegroup(PHPBB_ROOT_PATH . 'common.' . PHP_EXT);
-
-				// And the owner and the groups PHP is running under.
-				$php_uid = (function_exists('posix_getuid')) ? @posix_getuid() : false;
-				$php_gids = (function_exists('posix_getgroups')) ? @posix_getgroups() : false;
-
-				if (!$php_uid || empty($php_gids) || !$common_php_owner || !$common_php_group)
-				{
-					$this->chmod_info['process'] = false;
-				}
-				else
-				{
-					$this->chmod_info = array(
-						'process'		=> true,
-						'common_owner'	=> $common_php_owner,
-						'common_group'	=> $common_php_group,
-						'php_uid'		=> $php_uid,
-						'php_gids'		=> $php_gids,
-					);
-				}
-			}
-		}
-
-		if ($this->chmod_info['process'])
-		{
-			$file_uid = fileowner($filename);
-			$file_gid = filegroup($filename);
-
-			// Change owner
-			if (@chown($filename, $this->chmod_info['common_owner']))
-			{
-				clearstatcache();
-				$file_uid = fileowner($filename);
-			}
-
-			// Change group
-			if (@chgrp($filename, $this->chmod_info['common_group']))
-			{
-				clearstatcache();
-				$file_gid = filegroup($filename);
-			}
-
-			// If the file_uid/gid now match the one from common.php we can process further, else we are not able to change something
-			if ($file_uid != $this->chmod_info['common_owner'] || $file_gid != $this->chmod_info['common_group'])
-			{
-				$this->chmod_info['process'] = false;
-			}
-		}
-
-		// Still able to process?
-		if ($this->chmod_info['process'])
-		{
-			if ($file_uid == $this->chmod_info['php_uid'])
-			{
-				$php = 'owner';
-			}
-			else if (in_array($file_gid, $this->chmod_info['php_gids']))
-			{
-				$php = 'group';
-			}
-			else
-			{
-				// Since we are setting the everyone bit anyway, no need to do expensive operations
-				$this->chmod_info['process'] = false;
-			}
-		}
-
-		// We are not able to determine or change something
-		if (!$this->chmod_info['process'])
-		{
-			$php = 'other';
-		}
-
-		// Owner always has read/write permission
-		$owner = phpbb::CHMOD_READ | phpbb::CHMOD_WRITE;
-		if (is_dir($filename))
-		{
-			$owner |= phpbb::CHMOD_EXECUTE;
-
-			// Only add execute bit to the permission if the dir needs to be readable
-			if ($perms & phpbb::CHMOD_READ)
-			{
-				$perms |= phpbb::CHMOD_EXECUTE;
-			}
-		}
-
-		switch ($php)
-		{
-			case 'owner':
-				$result = @chmod($filename, ($owner << 6) + (0 << 3) + (0 << 0));
-
-				clearstatcache();
-
-				if (!is_null($php) || (is_readable($filename) && is_writable($filename)))
-				{
-					break;
-				}
-
-			case 'group':
-				$result = @chmod($filename, ($owner << 6) + ($perms << 3) + (0 << 0));
-
-				clearstatcache();
-
-				if (!is_null($php) || ((!($perms & phpbb::CHMOD_READ) || is_readable($filename)) && (!($perms & phpbb::CHMOD_WRITE) || is_writable($filename))))
-				{
-					break;
-				}
-
-			case 'other':
-				$result = @chmod($filename, ($owner << 6) + ($perms << 3) + ($perms << 0));
-
-				clearstatcache();
-
-				if (!is_null($php) || ((!($perms & phpbb::CHMOD_READ) || is_readable($filename)) && (!($perms & phpbb::CHMOD_WRITE) || is_writable($filename))))
-				{
-					break;
-				}
-
-			default:
-				return false;
-			break;
-		}
-
-		return $result;
-	}
-
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/core/system_info.php b/phpBB/includes/core/system_info.php
deleted file mode 100644
index 56a5d3bcd0..0000000000
--- a/phpBB/includes/core/system_info.php
+++ /dev/null
@@ -1,376 +0,0 @@
-<?php
-/**
-*
-* @package core
-* @version $Id$
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit();
-}
-
-/**
-* Get system/server information variables.
-*
-* @package core
-*/
-class phpbb_system_info extends phpbb_plugin_support implements ArrayAccess
-{
-	/**
-	* @var array required phpBB objects
-	*/
-	public $phpbb_required = array('config', 'url');
-
-	/**
-	* @var array Optional phpBB objects
-	*/
-	public $phpbb_optional = array();
-
-	/**
-	* @var array Array for storing/accessing information
-	*/
-	private $data = array();
-
-	/**#@+
-	* Part of the ArrayAccess implementation.
-	* @access public
-	*/
-	public function offsetSet($offset, $value)
-	{
-		$this->data[$offset] = $value;
-	}
-
-	public function offsetExists($offset)
-	{
-		return isset($this->data[$offset]);
-	}
-
-	public function offsetUnset($offset)
-	{
-		unset($this->data[$offset]);
-	}
-	/**#@-*/
-
-	/**
-	* Get system information - Part of the ArrayAccess implementation.
-	*
-	* System information ought to be received from {@link $data phpbb::$user->system[key]}.
-	* The key used is mapped to a method with get_ as prefix.
-	* For example getting phpbb::$user->system['host'] results in calling the method get_host().
-	*
-	* @param string $offset	The key to get.
-	* @return mixed	The result
-	* @access public
-	*/
-	public function offsetGet($offset)
-	{
-		if (isset($this->data[$offset]))
-		{
-			return $this->data[$offset];
-		}
-
-		$identifier = 'get_' . strtolower($offset);
-
-		// Not static, because we are not able to use late static bindings
-		$this->data[$offset] = $this->$identifier();
-		return $this->data[$offset];
-	}
-
-	/**
-	* Get valid hostname/port. HTTP_HOST is used, SERVER_NAME if HTTP_HOST not present.
-	*
-	* @return string	Host (lowercase, not specialchared)
-	* @access protected
-	*/
-	protected function get_host()
-	{
-		// Get hostname
-		$host = (!empty($_SERVER['HTTP_HOST'])) ? $_SERVER['HTTP_HOST'] : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'));
-
-		// Should be a string and lowered
-		$host = (string) strtolower($host);
-
-		// If host is equal the cookie domain or the server name (if config is set), then we assume it is valid
-		if ((isset(phpbb::$config['cookie_domain']) && $host === phpbb::$config['cookie_domain']) || (isset(phpbb::$config['server_name']) && $host === phpbb::$config['server_name']))
-		{
-			return $host;
-		}
-
-		// Is the host actually a IP? If so, we use the IP... (IPv4)
-		if (long2ip(ip2long($host)) === $host)
-		{
-			return $host;
-		}
-
-		// Now return the hostname (this also removes any port definition). The http:// is prepended to construct a valid URL, hosts never have a scheme assigned
-		$host = @parse_url('http://' . $host, PHP_URL_HOST);
-
-		// Remove any portions not removed by parse_url (#)
-		$host = str_replace('#', '', $host);
-
-		// If, by any means, the host is now empty, we will use a "best approach" way to guess one
-		if (empty($host))
-		{
-			if (!empty(phpbb::$config['server_name']))
-			{
-				$host = phpbb::$config['server_name'];
-			}
-			else if (!empty(phpbb::$config['cookie_domain']))
-			{
-				$host = (strpos(phpbb::$config['cookie_domain'], '.') === 0) ? substr(phpbb::$config['cookie_domain'], 1) : phpbb::$config['cookie_domain'];
-			}
-			else
-			{
-				// Set to OS hostname or localhost
-				$host = (function_exists('php_uname')) ? strtolower(php_uname('n')) : 'localhost';
-			}
-		}
-
-		// It may be still no valid host, but for sure only a hostname (we may further expand on the cookie domain... if set)
-		return $host;
-	}
-
-	/**
-	* Extract current session page, relative from current root path (PHPBB_ROOT_PATH)
-	*
-	* The array returned consist of the following key/value pairs:
-	* page_name:		The current basename'd page name, for example: index.php (urlencoded, htmlspecialchared)
-	* page_dir:			The current directory within the phpBB root, for example: adm
-	* query_string:		The current query string, for example: i=10&b=2 (the parameter 'sid' is never included)
-	* script_path:		The script path from the webroot to the current directory, for example: /phpBB3/adm/
-	* 					The script path is always prefixed with / and ends in /. Specialchared, whitespace replaced with %20.
-	* root_script_path:	The script path from the webroot to the phpBB root, for example: /phpBB3/
-	* 					The root script path is always prefixed with / and ends in /. Specialchared, whitespace replaced with %20.
-	* page:				Current page from phpBB root, for example: adm/index.php?i=10&b=2
-	* forum:			Current forum id (determined by {@link request_var() request_var('f', 0)})
-	*
-	* @return array		Array containing page information.
-	* @plugin-support	return
-	* @access protected
-	*/
-	protected function get_page()
-	{
-		$page_array = array();
-
-		// First of all, get the request uri...
-		$script_name = (!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : getenv('PHP_SELF');
-		$args = (!empty($_SERVER['QUERY_STRING'])) ? explode('&', $_SERVER['QUERY_STRING']) : explode('&', getenv('QUERY_STRING'));
-
-		// If we are unable to get the script name we use REQUEST_URI as a failover and note it within the page array for easier support...
-		if (!$script_name)
-		{
-			$script_name = (!empty($_SERVER['REQUEST_URI'])) ? $_SERVER['REQUEST_URI'] : getenv('REQUEST_URI');
-			$script_name = (($pos = strpos($script_name, '?')) !== false) ? substr($script_name, 0, $pos) : $script_name;
-			$page_array['failover'] = 1;
-		}
-
-		// Replace backslashes and doubled slashes (could happen on some proxy setups)
-		$script_name = str_replace(array('\\', '//'), '/', $script_name);
-
-		// Now, remove the sid and let us get a clean query string...
-		$use_args = array();
-
-		// Since some browser do not encode correctly we need to do this with some "special" characters...
-		// " -> %22, ' => %27, < -> %3C, > -> %3E
-		$find = array('"', "'", '<', '>');
-		$replace = array('%22', '%27', '%3C', '%3E');
-
-		foreach ($args as $argument)
-		{
-			if (strpos($argument, 'sid=') === 0)
-			{
-				continue;
-			}
-
-			$use_args[] = str_replace($find, $replace, $argument);
-		}
-		unset($args);
-
-		// The following examples given are for an request uri of {path to the phpbb directory}/adm/index.php?i=10&b=2
-
-		// The current query string
-		$query_string = trim(implode('&', $use_args));
-
-		// basenamed page name (for example: index.php)
-		$page_name = basename($script_name);
-		$page_name = urlencode(htmlspecialchars($page_name));
-
-		// current directory within the phpBB root (for example: adm)
-		$root_dirs = explode('/', str_replace('\\', '/', phpbb::$url->realpath(PHPBB_ROOT_PATH)));
-		$page_dirs = explode('/', str_replace('\\', '/', phpbb::$url->realpath('./')));
-		$intersection = array_intersect_assoc($root_dirs, $page_dirs);
-
-		$root_dirs = array_diff_assoc($root_dirs, $intersection);
-		$page_dirs = array_diff_assoc($page_dirs, $intersection);
-
-		$page_dir = str_repeat('../', sizeof($root_dirs)) . implode('/', $page_dirs);
-
-		if ($page_dir && substr($page_dir, -1, 1) == '/')
-		{
-			$page_dir = substr($page_dir, 0, -1);
-		}
-
-		// Current page from phpBB root (for example: adm/index.php?i=10&b=2)
-		$page = (($page_dir) ? $page_dir . '/' : '') . $page_name . (($query_string) ? "?$query_string" : '');
-
-		// The script path from the webroot to the current directory (for example: /phpBB3/adm/) : always prefixed with / and ends in /
-		$script_path = trim(str_replace('\\', '/', dirname($script_name)));
-
-		// The script path from the webroot to the phpBB root (for example: /phpBB3/)
-		$script_dirs = explode('/', $script_path);
-		array_splice($script_dirs, -sizeof($page_dirs));
-		$root_script_path = implode('/', $script_dirs) . (sizeof($root_dirs) ? '/' . implode('/', $root_dirs) : '');
-
-		// We are on the base level (phpBB root == webroot), lets adjust the variables a bit...
-		if (!$root_script_path)
-		{
-			$root_script_path = ($page_dir) ? str_replace($page_dir, '', $script_path) : $script_path;
-		}
-
-		$script_path .= (substr($script_path, -1, 1) == '/') ? '' : '/';
-		$root_script_path .= (substr($root_script_path, -1, 1) == '/') ? '' : '/';
-
-		$page_array += array(
-			'page_name'			=> $page_name,
-			'page_dir'			=> $page_dir,
-
-			'query_string'		=> $query_string,
-			'script_path'		=> str_replace(' ', '%20', htmlspecialchars($script_path)),
-			'root_script_path'	=> str_replace(' ', '%20', htmlspecialchars($root_script_path)),
-
-			'page'				=> $page,
-			'forum'				=> request_var('f', 0),
-		);
-
-		return ($this->method_inject(__FUNCTION__, 'return')) ? $this->call_inject(__FUNCTION__, array('return', $page_array)) : $page_array;
-	}
-
-	/**
-	* Get user agent string.
-	*
-	* @return string User agent, determined from $_SERVER['HTTP_USER_AGENT']. Specialchared.
-	* @access protected
-	*/
-	protected function get_browser()
-	{
-		return (!empty($_SERVER['HTTP_USER_AGENT'])) ? htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT']) : '';
-	}
-
-	/**
-	* Get current referer
-	*
-	* @return string Referer, determined from $_SERVER['HTTP_REFERER']. Specialchared.
-	* @access protected
-	*/
-	protected function get_referer()
-	{
-		return (!empty($_SERVER['HTTP_REFERER'])) ? htmlspecialchars((string) $_SERVER['HTTP_REFERER']) : '';
-	}
-
-	/**
-	* Get server port
-	*
-	* @return int Sertver port, determined from $_SERVER/$_ENV['SERVER_PORT'].
-	* @access protected
-	*/
-	protected function get_port()
-	{
-		return (!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT');
-	}
-
-	/**
-	* Get forwarded-for string.
-	* If the forwarded for check is enabled in phpBB the ip's are checked for valid data and invalid data being removed.
-	*
-	* @return string Forwarded-for string, determined from $_SERVER['HTTP_X_FORWARDED_FOR'].
-	* @access protected
-	*/
-	protected function get_forwarded_for()
-	{
-		$forwarded_for = (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) ? (string) $_SERVER['HTTP_X_FORWARDED_FOR'] : '';
-
-		// if the forwarded for header shall be checked we have to validate its contents
-		if (phpbb::$config['forwarded_for_check'])
-		{
-			$forwarded_for = preg_replace('#, +#', ', ', $forwarded_for);
-
-			// split the list of IPs
-			$ips = explode(', ', $forwarded_for);
-			foreach ($ips as $ip)
-			{
-				// check IPv4 first, the IPv6 is hopefully only going to be used very seldomly
-				if (!empty($ip) && !preg_match(get_preg_expression('ipv4'), $ip) && !preg_match(get_preg_expression('ipv6'), $ip))
-				{
-					// contains invalid data, don't use the forwarded for header
-					return '';
-				}
-			}
-		}
-		else
-		{
-			return '';
-		}
-	}
-
-	/**
-	* Get remote ip
-	*
-	* @return string Remote IP, determined from $_SERVER['REMOTE_ADDR']. Specialchared.
-	* @access protected
-	*/
-	protected function get_ip()
-	{
-		return (!empty($_SERVER['REMOTE_ADDR'])) ? htmlspecialchars($_SERVER['REMOTE_ADDR']) : '';
-	}
-
-	/**
-	* Get server load.
-	*
-	* Server load is retrieved if load limitation is enabled in phpBB and server supports {@link sys_getloadavg() sys_getloadavg}
-	* or file /proc/loadavg exists on the server.
-	*
-	* @return double Server load.
-	* @access protected
-	*/
-	protected function get_load()
-	{
-		$load = false;
-
-		// Load limit check (if applicable)
-		if (phpbb::$config['limit_load'] || phpbb::$config['limit_search_load'])
-		{
-			if ((function_exists('sys_getloadavg') && $load = sys_getloadavg()) || ($load = explode(' ', @file_get_contents('/proc/loadavg'))))
-			{
-				$load = array_slice($load, 0, 1);
-				$load = floatval($load[0]);
-			}
-			else
-			{
-				set_config('limit_load', '0');
-				set_config('limit_search_load', '0');
-			}
-		}
-
-		return $load;
-	}
-
-	/**
-	* Get current request method.
-	*
-	* @return string Request method, determined from $_SERVER['REQUEST_METHOD']. Specialchared, lowercase.
-	* @access protected
-	*/
-	protected function get_request_method()
-	{
-		return (isset($_SERVER['REQUEST_METHOD'])) ? strtolower(htmlspecialchars((string) $_SERVER['REQUEST_METHOD'])) : '';
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/core/url.php b/phpBB/includes/core/url.php
deleted file mode 100644
index c182998b87..0000000000
--- a/phpBB/includes/core/url.php
+++ /dev/null
@@ -1,740 +0,0 @@
-<?php
-/**
-*
-* @package core
-* @version $Id$
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit();
-}
-
-/**
-* Class responsible for URL handling, URL building, redirects, meta refreshs and session id handling.
-* Basically everything url/sid-related.
-*
-* @package core
-*/
-class phpbb_url extends phpbb_plugin_support
-{
-	/**
-	* @var array required phpBB objects
-	*/
-	public $phpbb_required = array('user', 'config');
-
-	/**
-	* @var array Optional phpBB objects
-	*/
-	public $phpbb_optional = array('template');
-
-	public function __construct() {}
-
-	/**
-	* Checks if a path ($path) is absolute or relative
-	*
-	* @param string	$path	Path to check absoluteness of
-	* @return bool	True if path is absolute
-	* @access public
-	*/
-	public function is_absolute($path)
-	{
-		return ($path[0] == '/' || (DIRECTORY_SEPARATOR == '\\' && preg_match('#^[a-z]:/#i', $path))) ? true : false;
-	}
-
-	/**
-	* Mimic PHP realpath implementation
-	*
-	* @author Chris Smith <chris@project-minerva.org>
-	* @copyright 2006 Project Minerva Team
-	* @param string	$path	The path which we should attempt to resolve.
-	* @return mixed realpath
-	* @access private
-	*/
-	private function own_realpath($path)
-	{
-		// Switch to use UNIX slashes
-		$path = str_replace(DIRECTORY_SEPARATOR, '/', $path);
-		$path_prefix = '';
-
-		// Determine what sort of path we have
-		if ($this->is_absolute($path))
-		{
-			$absolute = true;
-
-			if ($path[0] == '/')
-			{
-				// Absolute path, *NIX style
-				$path_prefix = '';
-			}
-			else
-			{
-				// Absolute path, Windows style
-				// Remove the drive letter and colon
-				$path_prefix = $path[0] . ':';
-				$path = substr($path, 2);
-			}
-		}
-		else
-		{
-			// Relative Path
-			// Prepend the current working directory
-			if (function_exists('getcwd'))
-			{
-				// This is the best method, hopefully it is enabled!
-				$path = str_replace(DIRECTORY_SEPARATOR, '/', getcwd()) . '/' . $path;
-				$absolute = true;
-				if (preg_match('#^[a-z]:#i', $path))
-				{
-					$path_prefix = $path[0] . ':';
-					$path = substr($path, 2);
-				}
-				else
-				{
-					$path_prefix = '';
-				}
-			}
-			else if (!empty($_SERVER['SCRIPT_FILENAME']))
-			{
-				// Warning: If chdir() has been used this will lie!
-				// Warning: This has some problems sometime (CLI can create them easily)
-				$path = str_replace(DIRECTORY_SEPARATOR, '/', dirname($_SERVER['SCRIPT_FILENAME'])) . '/' . $path;
-				$absolute = true;
-				$path_prefix = '';
-			}
-			else
-			{
-				// We have no way of getting the absolute path, just run on using relative ones.
-				$absolute = false;
-				$path_prefix = '.';
-			}
-		}
-
-		// Remove any repeated slashes
-		$path = preg_replace('#/{2,}#', '/', $path);
-
-		// Remove the slashes from the start and end of the path
-		$path = trim($path, '/');
-
-		// Break the string into little bits for us to nibble on
-		$bits = explode('/', $path);
-
-		// Remove any . in the path, renumber array for the loop below
-		$bits = array_values(array_diff($bits, array('.')));
-
-		// Lets get looping, run over and resolve any .. (up directory)
-		for ($i = 0, $max = sizeof($bits); $i < $max; $i++)
-		{
-			// @todo Optimise
-			if ($bits[$i] == '..' )
-			{
-				if (isset($bits[$i - 1]))
-				{
-					if ($bits[$i - 1] != '..')
-					{
-						// We found a .. and we are able to traverse upwards, lets do it!
-						unset($bits[$i]);
-						unset($bits[$i - 1]);
-						$i -= 2;
-						$max -= 2;
-						$bits = array_values($bits);
-					}
-				}
-				else if ($absolute) // ie. !isset($bits[$i - 1]) && $absolute
-				{
-					// We have an absolute path trying to descend above the root of the filesystem
-					// ... Error!
-					return false;
-				}
-			}
-		}
-
-		// Prepend the path prefix
-		array_unshift($bits, $path_prefix);
-
-		$resolved = '';
-
-		$max = sizeof($bits) - 1;
-
-		// Check if we are able to resolve symlinks, Windows cannot.
-		$symlink_resolve = (function_exists('readlink')) ? true : false;
-
-		foreach ($bits as $i => $bit)
-		{
-			if (@is_dir("$resolved/$bit") || ($i == $max && @is_file("$resolved/$bit")))
-			{
-				// Path Exists
-				if ($symlink_resolve && is_link("$resolved/$bit") && ($link = readlink("$resolved/$bit")))
-				{
-					// Resolved a symlink.
-					$resolved = $link . (($i == $max) ? '' : '/');
-					continue;
-				}
-			}
-			else
-			{
-				// Something doesn't exist here!
-				// This is correct realpath() behaviour but sadly open_basedir and safe_mode make this problematic
-				// return false;
-			}
-			$resolved .= $bit . (($i == $max) ? '' : '/');
-		}
-
-		// @todo If the file exists fine and open_basedir only has one path we should be able to prepend it
-		// because we must be inside that basedir, the question is where...
-		// @internal The slash in is_dir() gets around an open_basedir restriction
-		if (!@file_exists($resolved) || (!is_dir($resolved . '/') && !is_file($resolved)))
-		{
-			return false;
-		}
-
-		// Put the slashes back to the native operating systems slashes
-		$resolved = str_replace('/', DIRECTORY_SEPARATOR, $resolved);
-
-		// Check for DIRECTORY_SEPARATOR at the end (and remove it!)
-		if (substr($resolved, -1) == DIRECTORY_SEPARATOR)
-		{
-			return substr($resolved, 0, -1);
-		}
-
-		// We got here, in the end!
-		return $resolved;
-	}
-
-	/**
-	* A wrapper for realpath
-	*
-	* @param string		$path					The path which we should attempt to resolve.
-	* @staticvar string	$_phpbb_realpath_exist	This is set to false if the PHP function realpath() is not accessible or returns incorrect results
-	*
-	* @return string	Real path
-	* @access public
-	*/
-	public function realpath($path)
-	{
-		static $_phpbb_realpath_exist;
-
-		if (!isset($_phpbb_realpath_exist))
-		{
-			$_phpbb_realpath_exist = (!function_exists('realpath')) ? false : true;
-		}
-
-		if (!$_phpbb_realpath_exist)
-		{
-			return $this->own_realpath($path);
-		}
-
-		$realpath = realpath($path);
-
-		// Strangely there are provider not disabling realpath but returning strange values. :o
-		// We at least try to cope with them.
-		if ($realpath === $path || $realpath === false)
-		{
-			$_phpbb_realpath_exist = false;
-			return $this->own_realpath($path);
-		}
-
-		// Check for DIRECTORY_SEPARATOR at the end (and remove it!)
-		if (substr($realpath, -1) == DIRECTORY_SEPARATOR)
-		{
-			$realpath = substr($realpath, 0, -1);
-		}
-
-		return $realpath;
-	}
-
-	/**
-	* URL wrapper
-	* All urls are run through this... either after {@link append_sid() append_sid} or directly
-	*
-	* @param string	$url	URL to process
-	* @return string	URL
-	* @access public
-	*/
-	public function get($url)
-	{
-		return $url;
-	}
-
-	/**
-	* Append session id to url.
-	*
-	* Examples:
-	* <code>
-	* append_sid(PHPBB_ROOT_PATH . 'viewtopic.' . PHP_EXT . '?t=1&amp;f=2'); // VALID
-	* append_sid(PHPBB_ROOT_PATH . 'viewtopic.' . PHP_EXT, 't=1&amp;f=2'); // VALID
-	* append_sid('viewtopic', 't=1&amp;f=2'); // short notation of the above example - VALID
-	* append_sid('viewtopic', 't=1&f=2', false);  // Instead of &amp; use &
-	* append_sid('viewtopic', array('t' => 1, 'f' => 2));  // Instead of parameter in string notation, use an array
-	* </code>
-	*
-	* @param string			$url		The url the session id needs to be appended to (without parameter)
-	* @param string|array	$params		String or array of additional url parameter.
-	* @param bool			$is_amp		Is url using &amp; (true) or & (false)
-	* @param string			$session_id	Possibility to use a custom session id instead of the global one. This also forces the use of a session id.
-	*
-	* @plugin-support default, return
-	* @return string URL
-	* @access public
-	*/
-	public function append_sid($url, $params = false, $is_amp = true, $session_id = false)
-	{
-		static $parsed_urls = array();
-
-		// The following code is used to make sure such calls like append_sid('viewtopic') (ommitting phpbb_root_path and php_ext) work as intended
-		if (isset($parsed_urls[$url]))
-		{
-			// Set an url like 'viewtopic' to PHPBB_ROOT_PATH . 'viewtopic.' . PHP_EXT
-			$url = $parsed_urls[$url];
-		}
-		else
-		{
-			// If we detect an url without root path and extension, and also not a relative or absolute path, we add it and put it to the parsed urls
-			if (strpos($url, '.' . PHP_EXT) === false && $url[0] != '.' && $url[0] != '/')
-			{
-				$parsed_urls[$url] = $url = PHPBB_ROOT_PATH . $url . '.' . PHP_EXT;
-			}
-		}
-
-		if (empty($params))
-		{
-			$params = false;
-		}
-
-		$params_is_array = is_array($params);
-
-		// Get anchor
-		$anchor = '';
-		if (strpos($url, '#') !== false)
-		{
-			list($url, $anchor) = explode('#', $url, 2);
-			$anchor = '#' . $anchor;
-		}
-		else if (!$params_is_array && strpos($params, '#') !== false)
-		{
-			list($params, $anchor) = explode('#', $params, 2);
-			$anchor = '#' . $anchor;
-		}
-
-		// Handle really simple cases quickly
-		if ($session_id === false && !phpbb::$user->need_sid && empty(phpbb::$user->extra_url) && !$params_is_array && !$anchor)
-		{
-			if ($params === false)
-			{
-				return $this->get($url);
-			}
-
-			$url_delim = (strpos($url, '?') === false) ? '?' : (($is_amp) ? '&amp;' : '&');
-			return $this->get($url . ($params !== false ? $url_delim . $params : ''));
-		}
-
-		// Assign sid if session id is not specified
-		if (phpbb::$user->need_sid && $session_id === false)
-		{
-			$session_id = phpbb::$user->session_id;
-		}
-
-		$amp_delim = ($is_amp) ? '&amp;' : '&';
-		$url_delim = (strpos($url, '?') === false) ? '?' : $amp_delim;
-
-		// Appending custom url parameter?
-		$append_url = (!empty(phpbb::$user->extra_url)) ? implode($amp_delim, phpbb::$user->extra_url) : '';
-
-		if ($this->method_inject(__FUNCTION__)) $this->call_inject(__FUNCTION__, array('default', &$url, &$params, &$session_id, &$append_url, &$anchor, &$amp_delim, &$url_delim));
-
-		if ($this->method_inject(__FUNCTION__, 'return'))
-		{
-			$url = $this->call_inject(__FUNCTION__, array('return', $url, $params, $session_id, $append_url, $anchor, $amp_delim, $url_delim));
-			return $this->get($url);
-		}
-
-		// Use the short variant if possible ;)
-		if ($params === false)
-		{
-			// Append session id
-			if (!$session_id)
-			{
-				return $this->get($url . (($append_url) ? $url_delim . $append_url : '') . $anchor);
-			}
-			else
-			{
-				return $this->get($url . (($append_url) ? $url_delim . $append_url . $amp_delim : $url_delim) . 'sid=' . $session_id . $anchor);
-			}
-		}
-
-		// Build string if parameters are specified as array
-		if ($params_is_array)
-		{
-			$output = array();
-
-			foreach ($params as $key => $item)
-			{
-				if ($item === NULL)
-				{
-					continue;
-				}
-
-				if ($key == '#')
-				{
-					$anchor = '#' . $item;
-					continue;
-				}
-
-				$output[] = $key . '=' . $item;
-			}
-
-			$params = implode($amp_delim, $output);
-		}
-
-		// Append session id and parameter
-		return $this->get($url . (($append_url) ? $url_delim . $append_url : '') . (($params) ? (($append_url) ? $amp_delim : $url_delim) . $params : '') . ((!$session_id) ? '' : $amp_delim . 'sid=' . $session_id) . $anchor);
-	}
-
-	/**
-	* Generate board url (example: http://www.example.com/phpBB)
-	*
-	* @param bool	$without_script_path	If set to true the script path gets not appended (example: http://www.example.com instead of http://www.example.com/phpBB)
-	* @return string	Board URL
-	* @access public
-	*/
-	public function generate_board_url($without_script_path = false)
-	{
-		$server_name = phpbb::$user->system['host'];
-		$server_port = phpbb::$user->system['port'];
-
-		// Forcing server vars is the only way to specify/override the protocol
-		if (phpbb::$config['force_server_vars'] || !$server_name)
-		{
-			$server_protocol = (phpbb::$config['server_protocol']) ? phpbb::$config['server_protocol'] : ((phpbb::$config['cookie_secure']) ? 'https://' : 'http://');
-			$server_name = phpbb::$config['server_name'];
-			$server_port = (int) phpbb::$config['server_port'];
-			$script_path = phpbb::$config['script_path'];
-
-			$url = $server_protocol . $server_name;
-			$cookie_secure = phpbb::$config['cookie_secure'];
-		}
-		else
-		{
-			// Do not rely on cookie_secure, users seem to think that it means a secured cookie instead of an encrypted connection
-			$cookie_secure = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 1 : 0;
-			$url = (($cookie_secure) ? 'https://' : 'http://') . $server_name;
-
-			$script_path = phpbb::$user->page['root_script_path'];
-		}
-
-		if ($server_port && (($cookie_secure && $server_port <> 443) || (!$cookie_secure && $server_port <> 80)))
-		{
-			// HTTP HOST can carry a port number (we fetch $user->system['host'], but for old versions this may be true)
-			if (strpos($server_name, ':') === false)
-			{
-				$url .= ':' . $server_port;
-			}
-		}
-
-		if (!$without_script_path)
-		{
-			$url .= $script_path;
-		}
-
-		// Strip / from the end
-		if (substr($url, -1, 1) == '/')
-		{
-			$url = substr($url, 0, -1);
-		}
-
-		return $url;
-	}
-
-	/**
-	* Redirects the user to another page then exits the script nicely
-	* This function is intended for urls within the board. It's not meant to redirect to cross-domains.
-	*
-	* @param string	$url				The url to redirect to
-	* @param bool	$return				If true, do not redirect but return the sanitized URL.
-	* @param bool	$disable_cd_check	If true, redirect() will support redirects to an external domain.
-	* 									If false, the redirect points to the boards url if it does not match the current domain.
-	*
-	* @return mixed	Sanitized URL if $return is true
-	* @access public
-	*/
-	public function redirect($url, $return = false, $disable_cd_check = false)
-	{
-		if (empty(phpbb::$user->lang))
-		{
-			phpbb::$user->add_lang('common');
-		}
-
-		if (!$return)
-		{
-			garbage_collection();
-		}
-
-		// Make sure no &amp;'s are in, this will break the redirect
-		$url = str_replace('&amp;', '&', $url);
-
-		// Determine which type of redirect we need to handle...
-		$url_parts = parse_url($url);
-
-		if ($url_parts === false)
-		{
-			// Malformed url, redirect to current page...
-			$url = $this->generate_board_url() . '/' . phpbb::$user->page['page'];
-		}
-		else if (!empty($url_parts['scheme']) && !empty($url_parts['host']))
-		{
-			// Attention: only able to redirect within the same domain if $disable_cd_check is false (yourdomain.com -> www.yourdomain.com will not work)
-			if (!$disable_cd_check && $url_parts['host'] !== phpbb::$user->system['host'])
-			{
-				$url = $this->generate_board_url();
-			}
-		}
-		else if ($url[0] == '/')
-		{
-			// Absolute uri, prepend direct url...
-			$url = $this->generate_board_url(true) . $url;
-		}
-		else
-		{
-			// Relative uri
-			$pathinfo = pathinfo($url);
-
-			// Is the uri pointing to the current directory?
-			if ($pathinfo['dirname'] == '.')
-			{
-				$url = str_replace('./', '', $url);
-
-				// Strip / from the beginning
-				if ($url && substr($url, 0, 1) == '/')
-				{
-					$url = substr($url, 1);
-				}
-
-				if (phpbb::$user->page['page_dir'])
-				{
-					$url = $this->generate_board_url() . '/' . phpbb::$user->page['page_dir'] . '/' . $url;
-				}
-				else
-				{
-					$url = $this->generate_board_url() . '/' . $url;
-				}
-			}
-			else
-			{
-				// Used ./ before, but PHPBB_ROOT_PATH is working better with urls within another root path
-				$root_dirs = explode('/', str_replace('\\', '/', $this->realpath(PHPBB_ROOT_PATH)));
-				$page_dirs = explode('/', str_replace('\\', '/', $this->realpath($pathinfo['dirname'])));
-				$intersection = array_intersect_assoc($root_dirs, $page_dirs);
-
-				$root_dirs = array_diff_assoc($root_dirs, $intersection);
-				$page_dirs = array_diff_assoc($page_dirs, $intersection);
-
-				$dir = str_repeat('../', sizeof($root_dirs)) . implode('/', $page_dirs);
-
-				// Strip / from the end
-				if ($dir && substr($dir, -1, 1) == '/')
-				{
-					$dir = substr($dir, 0, -1);
-				}
-
-				// Strip / from the beginning
-				if ($dir && substr($dir, 0, 1) == '/')
-				{
-					$dir = substr($dir, 1);
-				}
-
-				$url = str_replace($pathinfo['dirname'] . '/', '', $url);
-
-				// Strip / from the beginning
-				if (substr($url, 0, 1) == '/')
-				{
-					$url = substr($url, 1);
-				}
-
-				$url = (!empty($dir) ? $dir . '/' : '') . $url;
-				$url = $this->generate_board_url() . '/' . $url;
-			}
-		}
-
-		// Make sure no linebreaks are there... to prevent http response splitting for PHP < 4.4.2
-		if (strpos(urldecode($url), "\n") !== false || strpos(urldecode($url), "\r") !== false || strpos($url, ';') !== false)
-		{
-			trigger_error('Tried to redirect to potentially insecure url.', E_USER_ERROR);
-		}
-
-		// Now, also check the protocol and for a valid url the last time...
-		$allowed_protocols = array('http', 'https', 'ftp', 'ftps');
-		$url_parts = parse_url($url);
-
-		if ($url_parts === false || empty($url_parts['scheme']) || !in_array($url_parts['scheme'], $allowed_protocols))
-		{
-			trigger_error('Tried to redirect to potentially insecure url.', E_USER_ERROR);
-		}
-
-		if ($return)
-		{
-			return $url;
-		}
-
-		// Redirect via an HTML form for PITA webservers
-		if (@preg_match('#Microsoft|WebSTAR|Xitami#', getenv('SERVER_SOFTWARE')))
-		{
-			header('Refresh: 0; URL=' . $url);
-
-			echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
-			echo '<html xmlns="http://www.w3.org/1999/xhtml" dir="' . phpbb::$user->lang['DIRECTION'] . '" lang="' . phpbb::$user->lang['USER_LANG'] . '" xml:lang="' . phpbb::$user->lang['USER_LANG'] . '">';
-			echo '<head>';
-			echo '<meta http-equiv="content-type" content="text/html; charset=utf-8" />';
-			echo '<meta http-equiv="refresh" content="0; url=' . str_replace('&', '&amp;', $url) . '" />';
-			echo '<title>' . phpbb::$user->lang['REDIRECT'] . '</title>';
-			echo '</head>';
-			echo '<body>';
-			echo '<div style="text-align: center;">' . phpbb::$user->lang('URL_REDIRECT', '<a href="' . str_replace('&', '&amp;', $url) . '">', '</a>') . '</div>';
-			echo '</body>';
-			echo '</html>';
-
-			exit;
-		}
-
-		// Behave as per HTTP/1.1 spec for others
-		header('Location: ' . $url);
-		exit;
-	}
-
-	/**
-	* Meta refresh assignment
-	*
-	* If the template object is present, the META template variable holds the meta refresh, else a normal redirect is done.
-	*
-	* @param int	$time				The time in seconds when to redirect
-	* @param string	$url				The URL to redirect to
-	* @param bool	$disable_cd_check	If true, redirect() will support redirects to an external domain.
-	* 									If false, the redirect points to the boards url if it does not match the current domain.
-	*
-	* @return string	Sanitized URL
-	* @plugin-support return
-	* @access public
-	*/
-	public function meta_refresh($time, $url, $disable_cd_check = false)
-	{
-		if (phpbb::registered('template'))
-		{
-			$result_url = $this->redirect($url, true, $disable_cd_check);
-			$result_url = str_replace('&', '&amp;', $result_url);
-
-			// For XHTML compatibility we change back & to &amp;
-			phpbb::$template->assign_var('META', '<meta http-equiv="refresh" content="' . $time . ';url=' . $result_url . '" />');
-		}
-		else
-		{
-			$this->redirect($url, false, $disable_cd_check);
-		}
-
-		return ($this->method_inject(__FUNCTION__, 'return')) ? $this->call_inject(__FUNCTION__, array('return', $result_url, $time, $url, $disable_cd_check)) : $result_url;
-	}
-
-	/**
-	* Re-Apply session id after page reloads
-	*
-	* @param string	$url	URL to re-apply session id to
-	* @return string	URL with re-applied session id
-	* @access public
-	*/
-	public function reapply_sid($url)
-	{
-		if ($url === 'index.' . PHP_EXT)
-		{
-			return $this->append_sid('index.' . PHP_EXT);
-		}
-		else if ($url === PHPBB_ROOT_PATH . 'index.' . PHP_EXT)
-		{
-			return $this->append_sid('index');
-		}
-
-		// Remove previously added sid
-		if (strpos($url, '?sid=') !== false)
-		{
-			$url = preg_replace('/(\?)sid=[a-z0-9]+(&amp;|&)?/', '\1', $url);
-		}
-		else if (strpos($url, '&sid=') !== false)
-		{
-			$url = preg_replace('/&sid=[a-z0-9]+(&)?/', '\1', $url);
-		}
-		else if (strpos($url, '&amp;sid=') !== false)
-		{
-			$url = preg_replace('/&amp;sid=[a-z0-9]+(&amp;)?/', '\1', $url);
-		}
-
-		return $this->append_sid($url);
-	}
-
-	/**
-	* Returns url from the session/current page with an re-appended SID with optionally stripping vars from the url
-	*
-	* @param array|string	$strip_vars	An array containing variables to be stripped from the URL.
-	* @return string	Current page URL with re-applied SID and optionally stripped parameter
-	* @access public
-	*/
-	public function build_url($strip_vars = false)
-	{
-		// Append SID
-		$redirect = $this->append_sid(phpbb::$user->page['page'], false, false);
-
-		// Add delimiter if not there...
-		if (strpos($redirect, '?') === false)
-		{
-			$redirect .= '?';
-		}
-
-		// Strip vars...
-		if ($strip_vars !== false && strpos($redirect, '?') !== false)
-		{
-			if (!is_array($strip_vars))
-			{
-				$strip_vars = array($strip_vars);
-			}
-
-			$query = $_query = array();
-
-			$args = substr($redirect, strpos($redirect, '?') + 1);
-			$args = ($args) ? explode('&', $args) : array();
-			$redirect = substr($redirect, 0, strpos($redirect, '?'));
-
-			foreach ($args as $argument)
-			{
-				$arguments = explode('=', $argument);
-				$key = $arguments[0];
-				unset($arguments[0]);
-
-				$query[$key] = implode('=', $arguments);
-			}
-
-			// Strip the vars off
-			foreach ($strip_vars as $strip)
-			{
-				if (isset($query[$strip]))
-				{
-					unset($query[$strip]);
-				}
-			}
-
-			// Glue the remaining parts together... already urlencoded
-			foreach ($query as $key => $value)
-			{
-				$_query[] = $key . '=' . $value;
-			}
-			$query = implode('&', $_query);
-
-			$redirect .= ($query) ? '?' . $query : '';
-		}
-
-		return PHPBB_ROOT_PATH . str_replace('&', '&amp;', $redirect);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/db/db2.php b/phpBB/includes/db/db2.php
deleted file mode 100644
index 87210d6534..0000000000
--- a/phpBB/includes/db/db2.php
+++ /dev/null
@@ -1,455 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @version $Id$
-* @copyright (c) 2009 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* MSSQL Database Abstraction Layer
-* Minimum Requirement: DB2 8.2.2+
-* Minimum extension version: PECL ibm_db2 1.6.0+
-* @package dbal
-*/
-class phpbb_dbal_db2 extends phpbb_dbal
-{
-	/**
-	* @var string Database type. No distinction between versions or used extensions.
-	*/
-	public $dbms_type = 'db2';
-
-	/**
-	* @var array Database type map, column layout information
-	*/
-	public $dbms_type_map = array(
-		'INT:'		=> 'integer',
-		'BINT'		=> 'float',
-		'UINT'		=> 'integer',
-		'UINT:'		=> 'integer',
-		'TINT:'		=> 'smallint',
-		'USINT'		=> 'smallint',
-		'BOOL'		=> 'smallint',
-		'VCHAR'		=> 'varchar(255)',
-		'VCHAR:'	=> 'varchar(%d)',
-		'CHAR:'		=> 'char(%d)',
-		'XSTEXT'	=> 'clob(65K)',
-		'STEXT'		=> 'varchar(3000)',
-		'TEXT'		=> 'clob(65K)',
-		'MTEXT'		=> 'clob(16M)',
-		'XSTEXT_UNI'=> 'varchar(100)',
-		'STEXT_UNI'	=> 'varchar(255)',
-		'TEXT_UNI'	=> 'clob(65K)',
-		'MTEXT_UNI'	=> 'clob(16M)',
-		'TIMESTAMP'	=> 'integer',
-		'DECIMAL'	=> 'float',
-		'VCHAR_UNI'	=> 'varchar(255)',
-		'VCHAR_UNI:'=> 'varchar(%d)',
-		'VARBINARY'	=> 'varchar(255)',
-	);
-
-	/**
-	* @var array Database features
-	*/
-	public $features = array(
-		'multi_insert'			=> true,
-		'count_distinct'		=> true,
-		'multi_table_deletion'	=> true,
-		'truncate'				=> false,
-	);
-
-	/**
-	* Connect to server. See {@link phpbb_dbal::sql_connect() sql_connect()} for details.
-	*/
-	public function sql_connect($server, $user, $password, $database, $port = false, $persistency = false , $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $user;
-		$this->server = $server . (($port) ? ':' . $port : '');
-		$this->dbname = $database;
-		$this->port = $port;
-
-		$this->db_connect_id = ($this->persistency) ? @db2_pconnect($this->dbname, $this->user, $password, array('autocommit' => DB2_AUTOCOMMIT_ON, 'DB2_ATTR_CASE' => DB2_CASE_LOWER)) : @db2_connect($this->dbname, $this->user, $password, array('autocommit' => DB2_AUTOCOMMIT_ON, 'DB2_ATTR_CASE' => DB2_CASE_LOWER));
-
-		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
-	}
-
-	/**
-	* Version information about used database. See {@link phpbb_dbal::sql_server_info() sql_server_info()} for details.
-	*/
-	public function sql_server_info($raw = false)
-	{
-		if (!phpbb::registered('acm') || ($this->sql_server_version = phpbb::$acm->get('#db2_version')) === false)
-		{
-			$info = @db2_server_info($this->db_connect_id);
-
-			$this->sql_server_info = is_object($info) ? $info->DBMS_VER : 0;
-
-			if (phpbb::registered('acm'))
-			{
-				phpbb::$acm->put('#db2_version', $this->sql_server_version);
-			}
-		}
-
-		return ($raw) ? $this->sql_server_version : 'IBM DB2 ' . $this->sql_server_version;
-	}
-
-	/**
-	* DB-specific base query method. See {@link phpbb_dbal::_sql_query() _sql_query()} for details.
-	*/
-	protected function _sql_query($query)
-	{
-		$array = array();
-
-		// Cope with queries larger than 32K
-		if (strlen($query) > 32740)
-		{
-			if (preg_match('/^(INSERT INTO[^(]++)\\(([^()]+)\\) VALUES[^(]++\\((.*?)\\)$/s', $query, $regs))
-			{
-				if (strlen($regs[3]) > 32740)
-				{
-					preg_match_all('/\'(?:[^\']++|\'\')*+\'|[\d-.]+/', $regs[3], $vals, PREG_PATTERN_ORDER);
-
-					$inserts = $vals[0];
-					unset($vals);
-
-					foreach ($inserts as $key => $value)
-					{
-						// check to see if this thing is greater than the max + 'x2
-						if (!empty($value) && $value[0] === "'" && strlen($value) > 32742)
-						{
-							$inserts[$key] = '?';
-							$array[] = str_replace("''", "'", substr($value, 1, -1));
-						}
-					}
-
-					$query = $regs[1] . '(' . $regs[2] . ') VALUES (' . implode(', ', $inserts) . ')';
-				}
-			}
-			else if (preg_match_all('/^(UPDATE ([\\w_]++)\\s+SET )([\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+)(?:,\\s*[\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+))*+)\\s+(WHERE.*)$/s', $query, $data, PREG_SET_ORDER))
-			{
-				if (strlen($data[0][3]) > 32740)
-				{
-					$update = $data[0][1];
-					$where = $data[0][4];
-					preg_match_all('/(\\w++) = (\'(?:[^\']++|\'\')*+\'|\\d++)/', $data[0][3], $temp, PREG_SET_ORDER);
-					unset($data);
-
-					$cols = array();
-					foreach ($temp as $value)
-					{
-						// check to see if this thing is greater than the max + 'x2
-						if (!empty($value[2]) && $value[2][0] === "'" && strlen($value[2]) > 32742)
-						{
-							$array[] = str_replace("''", "'", substr($value[2], 1, -1));
-							$cols[] = $value[1] . '=?';
-						}
-						else
-						{
-							$cols[] = $value[1] . '=' . $value[2];
-						}
-					}
-
-					$query = $update . implode(', ', $cols) . ' ' . $where;
-					unset($cols);
-				}
-			}
-		}
-
-		if (sizeof($array))
-		{
-			$result = @db2_prepare($this->db_connect_id, $query);
-
-			if (!$result)
-			{
-				return false;
-			}
-
-			if (!@db2_execute($result, $array))
-			{
-				return false;
-			}
-		}
-		else
-		{
-			$result = @db2_exec($this->db_connect_id, $query);
-		}
-
-		return $result;
-	}
-
-	/**
-	* Build LIMIT query and run it. See {@link phpbb_dbal::_sql_query_limit() _sql_query_limit()} for details.
-	*/
-	protected function _sql_query_limit($query, $total, $offset, $cache_ttl)
-	{
-		if ($total && $offset == 0)
-		{
-			return $this->sql_query($query . ' fetch first ' . $total . ' rows only', $cache_ttl);
-		}
-
-		// Seek by $offset rows
-		if ($offset)
-		{
-			$limit_sql = 'SELECT a2.*
-				FROM (
-					SELECT ROW_NUMBER() OVER() AS rownum, a1.*
-						FROM (
-							' . $query . '
-						) a1
-				) a2
-			WHERE a2.rownum BETWEEN ' . ($offset + 1) . ' AND ' . ($offset + $total);
-
-			return $this->sql_query($limit_sql, $cache_ttl);
-		}
-
-		return $this->sql_query($query, $cache_ttl);
-	}
-
-	/**
-	* Close sql connection. See {@link phpbb_dbal::_sql_close() _sql_close()} for details.
-	*/
-	protected function _sql_close()
-	{
-		return @db2_close($this->db_connect_id);
-	}
-
-	/**
-	* SQL Transaction. See {@link phpbb_dbal::_sql_transaction() _sql_transaction()} for details.
-	*/
-	protected function _sql_transaction($status)
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return @db2_autocommit($this->db_connect_id, DB2_AUTOCOMMIT_OFF);
-			break;
-
-			case 'commit':
-				$result = @db2_commit($this->db_connect_id);
-				@db2_autocommit($this->db_connect_id, DB2_AUTOCOMMIT_ON);
-				return $result;
-			break;
-
-			case 'rollback':
-				$result = @db2_rollback($this->db_connect_id);
-				@db2_autocommit($this->db_connect_id, DB2_AUTOCOMMIT_ON);
-				return $result;
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Return number of affected rows. See {@link phpbb_dbal::sql_affectedrows() sql_affectedrows()} for details.
-	*/
-	public function sql_affectedrows()
-	{
-		return ($this->db_connect_id) ? @db2_num_rows($this->db_connect_id) : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement. See {@link phpbb_dbal::sql_nextid() sql_nextid()} for details.
-	*/
-	public function sql_nextid()
-	{
-		if (function_exists('db2_last_insert_id'))
-		{
-			return @db2_last_insert_id($this->db_connect_id);
-		}
-
-		$result_id = @db2_exec($this->db_connect_id, 'VALUES IDENTITY_VAL_LOCAL()');
-
-		if ($result_id)
-		{
-			if ($row = @db2_fetch_assoc($result_id))
-			{
-				@db2_free_result($result_id);
-				return (int) $row[1];
-			}
-			@db2_free_result($result_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* Fetch current row. See {@link phpbb_dbal::_sql_fetchrow() _sql_fetchrow()} for details.
-	*/
-	protected function _sql_fetchrow($query_id)
-	{
-		return @db2_fetch_assoc($query_id);
-	}
-
-	/**
-	* Free query result. See {@link phpbb_dbal::_sql_freeresult() _sql_freeresult()} for details.
-	*/
-	protected function _sql_freeresult($query_id)
-	{
-		return @db2_free_result($query_id);
-	}
-
-	/**
-	* Correctly adjust LIKE expression for special characters. See {@link phpbb_dbal::_sql_like_expression() _sql_like_expression()} for details.
-	*/
-	protected function _sql_like_expression($expression)
-	{
-		return $expression . " ESCAPE '\\'";
-	}
-
-	/**
-	* Escape string used in sql query. See {@link phpbb_dbal::sql_escape() sql_escape()} for details.
-	*/
-	public function sql_escape($msg)
-	{
-		return @db2_escape_string($msg);
-	}
-
-	/**
-	* Expose a DBMS specific function. See {@link phpbb_dbal::sql_function() sql_function()} for details.
-	*/
-	public function sql_function($type, $col)
-	{
-		switch ($type)
-		{
-			case 'length_varchar':
-			case 'length_text':
-				return 'LENGTH(' . $col . ')';
-			break;
-		}
-	}
-
-	/**
-	* Handle data by using prepared statements. See {@link phpbb_dbal::sql_handle_data() sql_handle_data()} for details.
-	public function sql_handle_data($type, $table, $data, $where = '')
-	{
-		if ($type == 'INSERT')
-		{
-			$stmt = db2_prepare($this->db_connect_id, "INSERT INTO $table (". implode(', ', array_keys($data)) . ") VALUES (" . substr(str_repeat('?, ', sizeof($data)) ,0, -1) . ')');
-		}
-		else
-		{
-			$query = "UPDATE $table SET ";
-
-			$set = array();
-			foreach (array_keys($data) as $key)
-			{
-				$set[] = "$key = ?";
-			}
-			$query .= implode(', ', $set);
-
-			if ($where !== '')
-			{
-				$query .= $where;
-			}
-
-			$stmt = db2_prepare($this->db_connect_id, $query);
-		}
-
-		// get the stmt onto the top of the function arguments
-		array_unshift($data, $stmt);
-
-		call_user_func_array('db2_execute', $data);
-	}
-	*/
-
-	/**
-	* Build DB-specific query bits. See {@link phpbb_dbal::_sql_custom_build() _sql_custom_build()} for details.
-	*/
-	protected function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
-	/**
-	* return sql error array. See {@link phpbb_dbal::_sql_error() _sql_error()} for details.
-	*/
-	protected function _sql_error()
-	{
-		$message = @db2_stmt_errormsg();
-		$code = @db2_stmt_error();
-
-		if (!$message && !$code)
-		{
-			$message = @db2_conn_errormsg();
-			$code = @db2_conn_error();
-		}
-
-		$error = array(
-			'message'	=> $message,
-			'code'		=> $code,
-		);
-
-		return $error;
-	}
-
-	/**
-	* Run DB-specific code to build SQL Report to explain queries, show statistics and runtime information. See {@link phpbb_dbal::_sql_report() _sql_report()} for details.
-	*/
-	protected function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'start':
-
-				$html_table = false;
-				@db2_exec($this->db_connect_id, 'DELETE FROM EXPLAIN_INSTANCE');
-				@db2_exec($this->db_connect_id, 'EXPLAIN PLAN FOR ' . $query);
-
-				// Get the data from the plan
-				$sql = "SELECT O.Operator_ID, S2.Target_ID, O.Operator_Type, S.Object_Name, CAST(O.Total_Cost AS INTEGER) Cost
-					FROM EXPLAIN_OPERATOR O
-					LEFT OUTER JOIN EXPLAIN_STREAM S2 ON O.Operator_ID = S2.Source_ID
-					LEFT OUTER JOIN EXPLAIN_STREAM S ON O.Operator_ID = S.Target_ID AND O.Explain_Time = S.Explain_Time AND S.Object_Name IS NOT NULL
-					ORDER BY O.Explain_Time ASC, Operator_ID ASC";
-				$query_id = @db2_exec($this->db_connect_id, $sql);
-
-				if ($query_id)
-				{
-					while ($row = @db2_fetch_assoc($query_id))
-					{
-						$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-					}
-
-					@db2_free_result($query_id);
-				}
-
-				if ($html_table)
-				{
-					$this->html_hold .= '</table>';
-				}
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @db2_exec($this->db_connect_id, $query);
-				while ($void = @db2_fetch_assoc($result, IBASE_TEXT))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@db2_free_result($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
deleted file mode 100644
index 32ee807952..0000000000
--- a/phpBB/includes/db/db_tools.php
+++ /dev/null
@@ -1,1707 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @version $Id$
-* @copyright (c) 2007 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Database Tools for handling cross-db actions such as altering columns, etc.
-*
-* @package dbal
-*/
-class phpbb_db_tools
-{
-	/**
-	* @var object DB object
-	*/
-	public $db = NULL;
-
-	/**
-	* A list of types being unsigned for better reference in some db's
-	* @var array
-	*/
-	public $unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP');
-
-	/**
-	* A list of supported DBMS. We change this class to support more DBMS, the DBMS itself only need to follow some rules.
-	* @var array
-	*/
-	public $supported_dbms = array('mysql', 'mssql', 'sqlite', 'oracle', 'firebird', 'db2', 'postgres');
-
-	/**
-	* This is set to true if user only wants to return the 'to-be-executed' SQL statement(s) (as an array).
-	* This mode has no effect on some methods (inserting of data for example). This is expressed within the methods command.
-	*/
-	public $return_statements = false;
-
-	/**
-	* Constructor. Set DB Object and set {@link $return_statements return_statements}.
-	*
-	* @param phpbb_dbal	$db					DBAL object
-	* @param bool		$return_statements	True if only statements should be returned and no SQL being executed
-	*/
-	public function __construct(phpbb_dbal $db, $return_statements = false)
-	{
-		$this->db = $db;
-		$this->return_statements = $return_statements;
-
-		if (!in_array($this->db->dbms_type, $this->supported_dbms))
-		{
-			trigger_error('DBMS Type ' . $this->db->dbms_type . ' not supported by DB Tools.', E_USER_ERROR);
-		}
-	}
-
-	/**
-	* Create SQL Table
-	*
-	* @param string	$table_name	The table name to create
-	* @param array	$table_data	Array containing table data. For a sample layout see {@example }
-	* @return array	Statements if $return_statements is true.
-	*/
-	public function sql_create_table($table_name, $table_data)
-	{
-		// holds the DDL for a column
-		$columns = $statements = array();
-
-		// Begin transaction
-		$statements[] = 'begin';
-
-		// Determine if we have created a PRIMARY KEY in the earliest
-		$primary_key_gen = false;
-
-		// Determine if the table must be created with TEXTIMAGE
-		$create_textimage = false;
-
-		// Determine if the table requires a sequence
-		$create_sequence = false;
-
-		// Begin table sql statement
-		switch ($this->sql_layer)
-		{
-			case 'mssql':
-				$table_sql = 'CREATE TABLE [' . $table_name . '] (' . "\n";
-			break;
-
-			default:
-				$table_sql = 'CREATE TABLE ' . $table_name . ' (' . "\n";
-			break;
-		}
-
-		// Iterate through the columns to create a table
-		foreach ($table_data['COLUMNS'] as $column_name => $column_data)
-		{
-			// here lies an array, filled with information compiled on the column's data
-			$prepared_column = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
-
-			// here we add the definition of the new column to the list of columns
-			switch ($this->sql_layer)
-			{
-				case 'mssql':
-					$columns[] = "\t [{$column_name}] " . $prepared_column['column_type_sql_default'];
-				break;
-
-				default:
-					$columns[] = "\t {$column_name} " . $prepared_column['column_type_sql'];
-				break;
-			}
-
-			// see if we have found a primary key set due to a column definition if we have found it, we can stop looking
-			if (!$primary_key_gen)
-			{
-				$primary_key_gen = isset($prepared_column['primary_key_set']) && $prepared_column['primary_key_set'];
-			}
-
-			// create textimage DDL based off of the existance of certain column types
-			if (!$create_textimage)
-			{
-				$create_textimage = isset($prepared_column['textimage']) && $prepared_column['textimage'];
-			}
-
-			// create sequence DDL based off of the existance of auto incrementing columns
-			if (!$create_sequence && isset($prepared_column['auto_increment']) && $prepared_column['auto_increment'])
-			{
-				$create_sequence = $column_name;
-			}
-		}
-
-		// this makes up all the columns in the create table statement
-		$table_sql .= implode(",\n", $columns);
-
-		// Close the table for two DBMS and add to the statements
-		switch ($this->db->dbms_type)
-		{
-			case 'firebird':
-				$table_sql .= "\n);";
-				$statements[] = $table_sql;
-			break;
-
-			case 'mssql':
-				$table_sql .= "\n) ON [PRIMARY]" . (($create_textimage) ? ' TEXTIMAGE_ON [PRIMARY]' : '');
-				$statements[] = $table_sql;
-			break;
-		}
-
-		// we have yet to create a primary key for this table,
-		// this means that we can add the one we really wanted instead
-		if (!$primary_key_gen)
-		{
-			// 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 ($this->db->dbms_type)
-				{
-					case 'mysql':
-					case 'postgres':
-					case 'db2':
-					case 'sqlite':
-						$table_sql .= ",\n\t PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ')';
-					break;
-
-					case 'firebird':
-					case 'mssql':
-						$primary_key_stmts = $this->sql_create_primary_key($table_name, $table_data['PRIMARY_KEY']);
-						foreach ($primary_key_stmts as $pk_stmt)
-						{
-							$statements[] = $pk_stmt;
-						}
-					break;
-
-					case 'oracle':
-						$table_sql .= ",\n\t CONSTRAINT pk_{$table_name} PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ')';
-					break;
-				}
-			}
-		}
-
-		// close the table
-		switch ($this->db->dbms_type)
-		{
-			case 'mysql':
-				// make sure the table is in UTF-8 mode
-				$table_sql .= "\n) CHARACTER SET `utf8` COLLATE `utf8_bin`;";
-				$statements[] = $table_sql;
-			break;
-
-			case 'postgres':
-				// do we need to add a sequence for auto incrementing columns?
-				if ($create_sequence)
-				{
-					$statements[] = "CREATE SEQUENCE {$table_name}_seq;";
-				}
-
-				$table_sql .= "\n);";
-				$statements[] = $table_sql;
-			break;
-
-			case 'db2':
-			case 'sqlite':
-				$table_sql .= "\n);";
-				$statements[] = $table_sql;
-			break;
-
-			case 'oracle':
-				$table_sql .= "\n);";
-				$statements[] = $table_sql;
-
-				// do we need to add a sequence and a tigger for auto incrementing columns?
-				if ($create_sequence)
-				{
-					// create the actual sequence
-					$statements[] = "CREATE SEQUENCE {$table_name}_seq";
-
-					// the trigger is the mechanism by which we increment the counter
-					$trigger = "CREATE OR REPLACE TRIGGER t_{$table_name}\n";
-					$trigger .= "BEFORE INSERT ON {$table_name}\n";
-					$trigger .= "FOR EACH ROW WHEN (\n";
-					$trigger .= "\tnew.{$create_sequence} IS NULL OR new.{$create_sequence} = 0\n";
-					$trigger .= ")\n";
-					$trigger .= "BEGIN\n";
-					$trigger .= "\tSELECT {$table_name}_seq.nextval\n";
-					$trigger .= "\tINTO :new.{$create_sequence}\n";
-					$trigger .= "\tFROM dual\n";
-					$trigger .= "END;";
-
-					$statements[] = $trigger;
-				}
-			break;
-
-			case 'firebird':
-				if ($create_sequence)
-				{
-					$statements[] = "CREATE SEQUENCE {$table_name}_seq;";
-				}
-			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]);
-				}
-
-				$old_return_statements = $this->return_statements;
-				$this->return_statements = true;
-
-				$key_stmts = ($key_data[0] == 'UNIQUE') ? $this->sql_create_unique_index($table_name, $key_name, $key_data[1]) : $this->sql_create_index($table_name, $key_name, $key_data[1]);
-
-				foreach ($key_stmts as $key_stmt)
-				{
-					$statements[] = $key_stmt;
-				}
-
-				$this->return_statements = $old_return_statements;
-			}
-		}
-
-		// Commit Transaction
-		$statements[] = 'commit';
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Handle passed database update array. Update table schema.
-	*
-	* Key being one of the following
-	* <pre>
-	* change_columns - Column changes (only type, not name)
-	* add_columns - Add columns to a table
-	* drop_keys - Dropping keys
-	* drop_columns - Removing/Dropping columns
-	* add_primary_keys - adding primary keys
-	* add_unique_index - adding an unique index
-	* add_index - adding an index
-	* </pre>
-	*
-	* For a complete definition of the layout please see {@example }
-	*
-	* @param array	$schema_changes	The schema array
-	*/
-	public function sql_schema_changes($schema_changes)
-	{
-		if (empty($schema_changes))
-		{
-			return;
-		}
-
-		$statements = array();
-
-		// Change columns?
-		if (!empty($schema_changes['change_columns']))
-		{
-			foreach ($schema_changes['change_columns'] as $table => $columns)
-			{
-				foreach ($columns as $column_name => $column_data)
-				{
-					// If the column exists we change it, else we add it ;)
-					if ($this->sql_column_exists($table, $column_name))
-					{
-						$result = $this->sql_column_change($table, $column_name, $column_data);
-					}
-					else
-					{
-						$result = $this->sql_column_add($table, $column_name, $column_data);
-					}
-
-					if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		// Add columns?
-		if (!empty($schema_changes['add_columns']))
-		{
-			foreach ($schema_changes['add_columns'] as $table => $columns)
-			{
-				foreach ($columns as $column_name => $column_data)
-				{
-					// Only add the column if it does not exist yet, else change it (to be consistent)
-					if ($this->sql_column_exists($table, $column_name))
-					{
-						$result = $this->sql_column_change($table, $column_name, $column_data);
-					}
-					else
-					{
-						$result = $this->sql_column_add($table, $column_name, $column_data);
-					}
-
-					if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		// Remove keys?
-		if (!empty($schema_changes['drop_keys']))
-		{
-			foreach ($schema_changes['drop_keys'] as $table => $indexes)
-			{
-				foreach ($indexes as $index_name)
-				{
-					$result = $this->sql_index_drop($table, $index_name);
-
-					if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		// Drop columns?
-		if (!empty($schema_changes['drop_columns']))
-		{
-			foreach ($schema_changes['drop_columns'] as $table => $columns)
-			{
-				foreach ($columns as $column)
-				{
-					// Only remove the column if it exists...
-					if ($this->sql_column_exists($table, $column))
-					{
-						$result = $this->sql_column_remove($table, $column);
-
-						if ($this->return_statements)
-						{
-							$statements = array_merge($statements, $result);
-						}
-					}
-				}
-			}
-		}
-
-		// Add primary keys?
-		if (!empty($schema_changes['add_primary_keys']))
-		{
-			foreach ($schema_changes['add_primary_keys'] as $table => $columns)
-			{
-				$result = $this->sql_create_primary_key($table, $columns);
-
-				if ($this->return_statements)
-				{
-					$statements = array_merge($statements, $result);
-				}
-			}
-		}
-
-		// Add unqiue indexes?
-		if (!empty($schema_changes['add_unique_index']))
-		{
-			foreach ($schema_changes['add_unique_index'] as $table => $index_array)
-			{
-				foreach ($index_array as $index_name => $column)
-				{
-					$result = $this->sql_create_unique_index($table, $index_name, $column);
-
-					if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		// Add indexes?
-		if (!empty($schema_changes['add_index']))
-		{
-			foreach ($schema_changes['add_index'] as $table => $index_array)
-			{
-				foreach ($index_array as $index_name => $column)
-				{
-					$result = $this->sql_create_index($table, $index_name, $column);
-
-					if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		if ($this->return_statements)
-		{
-			return $statements;
-		}
-	}
-
-	/**
-	* Insert SQL data into tables (INSERT). This function DOES NOT SUPPORT $return_statements. SQL queries are executed as is.
-	* For a complete definition of the layout see {@example }
-	*
-	* @param array	$schema_data	The schema data array
-	* @param array	&$data			A replacement array for replacing template variables within the schema
-	*/
-	public function sql_insert_data($schema_data, &$data)
-	{
-		// Go through the columns and define our type and column name for each column
-		$keys = $types = array();
-
-		foreach ($schema_data['columns'] as $column)
-		{
-			if (strpos($column, ':') === false)
-			{
-				$types[] = false;
-				$keys[] = $column;
-				continue;
-			}
-
-			list($type, $column) = explode(':', $column, 2);
-			$types[] = $type;
-			$keys[] = $column;
-		}
-
-		$size = sizeof($keys);
-
-		// Go through the data array...
-		foreach ($schema_data['data'] as $key => $row)
-		{
-			// Get special values
-			foreach ($row as $_key => $value)
-			{
-				// Special case...
-				$row[$_key] = $this->_sql_get_special_row($value, $data);
-
-				if ($types[$_key] === false)
-				{
-					settype($row[$_key], gettype($row[$_key]));
-				}
-				else
-				{
-					settype($row[$_key], $types[$_key]);
-				}
-			}
-
-			// Build SQL array for INSERT
-			$sql = 'INSERT INTO ' . $schema_data['table'] . ' ' . $this->db->sql_build_array('INSERT', array_combine($keys, $row));
-			$this->db->sql_query($sql);
-
-			if (!empty($schema_data['store_auto_increment']))
-			{
-				$this->stored_increments[$schema_data['store_auto_increment']][$key] = $this->db->sql_nextid();
-			}
-		}
-	}
-
-	/**
-	* Update SQL data in tables (UPDATE). This function DOES NOT SUPPORT $return_statements. SQL queries are executed as is.
-	* For a complete definition of the layout see {@example }
-	*
-	* @param array	$schema_data	The schema data array
-	* @param array	&$data			A replacement array for replacing template variables within the schema
-	*/
-	public function sql_update_data($schema_data, &$data)
-	{
-		// Go through the data array...
-		$row = $schema_data['data'];
-
-		// Get special values
-		foreach ($row as $key => $value)
-		{
-			$row[$key] = $this->_sql_get_special_row($value, $data);
-		}
-
-		// Build SQL array for UPDATE
-		$sql_ary = array_combine(array_values($schema_data['columns']), $row);
-
-		$sql = 'UPDATE ' . $schema_data['table'] . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary);
-
-		// Is WHERE statement there?
-		if (!empty($schema_data['where']))
-		{
-			$where_statements = array();
-			foreach ($schema_data['where'] as $_key => $array)
-			{
-				foreach ($array as $key => $value)
-				{
-					$value = $this->_sql_get_special_row($value, $data);
-
-					if (is_string($value))
-					{
-						$where_statements[] = $key . " = '" . $this->db->sql_escape($value) . "'";
-					}
-					else
-					{
-						$where_statements[] = $key . ' = ' . $value;
-					}
-				}
-			}
-
-			if (sizeof($where_statements))
-			{
-				$sql .= ' WHERE ' . implode(' AND ', $where_statements);
-			}
-		}
-
-		$this->db->sql_query($sql);
-	}
-
-	/**
-	* Check if a specified column exist
-	*
-	* @param string	$table			Table to check the column at
-	* @param string	$column_name	The column to check
-	*
-	* @return bool True if column exists, else false
-	*/
-	public function sql_column_exists($table, $column_name)
-	{
-		switch ($this->db->dbms_type)
-		{
-			case 'mysql':
-
-				$sql = "SHOW COLUMNS FROM $table";
-				$result = $this->db->sql_query($sql);
-
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// lower case just in case
-					if (strtolower($row['Field']) == $column_name)
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-				$this->db->sql_freeresult($result);
-				return false;
-			break;
-
-			// PostgreSQL has a way of doing this in a much simpler way but would
-			// not allow us to support all versions of PostgreSQL
-			case 'postgres':
-				$sql = "SELECT a.attname
-					FROM pg_class c, pg_attribute a
-					WHERE c.relname = '{$table}'
-						AND a.attnum > 0
-						AND a.attrelid = c.oid";
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// lower case just in case
-					if (strtolower($row['attname']) == $column_name)
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-				$this->db->sql_freeresult($result);
-
-				return false;
-			break;
-
-			// same deal with PostgreSQL, we must perform more complex operations than
-			// we technically could
-			case 'mssql':
-				$sql = "SELECT c.name
-					FROM syscolumns c
-					LEFT JOIN sysobjects o ON c.id = o.id
-					WHERE o.name = '{$table}'";
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// lower case just in case
-					if (strtolower($row['name']) == $column_name)
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-				$this->db->sql_freeresult($result);
-				return false;
-			break;
-
-			case 'oracle':
-				$sql = "SELECT column_name
-					FROM user_tab_columns
-					WHERE table_name = '{$table}'";
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// lower case just in case
-					if (strtolower($row['column_name']) == $column_name)
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-				$this->db->sql_freeresult($result);
-				return false;
-			break;
-
-			case 'firebird':
-				$sql = "SELECT RDB\$FIELD_NAME as FNAME
-					FROM RDB\$RELATION_FIELDS
-					WHERE RDB\$RELATION_NAME = '{$table}'";
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// lower case just in case
-					if (strtolower($row['fname']) == $column_name)
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-				$this->db->sql_freeresult($result);
-				return false;
-			break;
-
-			case 'db2':
-				$sql = "SELECT colname
-					FROM syscat.columns
-					WHERE tabname = '$table'";
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// lower case just in case
-					if (strtolower($row['colname']) == $column_name)
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-				$this->db->sql_freeresult($result);
-				return false;
-			break;
-
-			// ugh, SQLite
-			case 'sqlite':
-				$sql = "SELECT sql
-					FROM sqlite_master
-					WHERE type = 'table'
-						AND name = '{$table}'";
-				$result = $this->db->sql_query($sql);
-
-				if (!$result)
-				{
-					return false;
-				}
-
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-				$cols = trim($matches[1]);
-				$col_array = preg_split('/,(?![\s\w]+\))/m', $cols);
-
-				foreach ($col_array as $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					if ($entities[0] == 'PRIMARY')
-					{
-						continue;
-					}
-
-					if (strtolower($entities[0]) == $column_name)
-					{
-						return true;
-					}
-				}
-				return false;
-			break;
-		}
-	}
-
-	/**
-	* Add new column
-	*/
-	public function sql_column_add($table_name, $column_name, $column_data)
-	{
-		$column_data = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
-		$statements = array();
-
-		switch ($this->db->dbms_type)
-		{
-			case 'firebird':
-				$statements[] = 'ALTER TABLE "' . $table_name . '" ADD "' . $column_name . '" ' . $column_data['column_type_sql'];
-			break;
-
-			case 'mssql':
-				$statements[] = 'ALTER TABLE [' . $table_name . '] ADD [' . $column_name . '] ' . $column_data['column_type_sql_default'];
-			break;
-
-			case 'mysql':
-				$statements[] = 'ALTER TABLE `' . $table_name . '` ADD COLUMN `' . $column_name . '` ' . $column_data['column_type_sql'];
-			break;
-
-			case 'oracle':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' ' . $column_data['column_type_sql'];
-			break;
-
-			case 'postgres':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD COLUMN "' . $column_name . '" ' . $column_data['column_type_sql'];
-			break;
-
-			case 'db2':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' ' . $column_data['column_type_sql'];
-			break;
-
-			case 'sqlite':
-				if (version_compare(sqlite_libversion(), '3.0') == -1)
-				{
-					$sql = "SELECT sql
-						FROM sqlite_master
-						WHERE type = 'table'
-							AND name = '{$table_name}'
-						ORDER BY type DESC, name;";
-					$result = $this->db->sql_query($sql);
-
-					if (!$result)
-					{
-						break;
-					}
-
-					$row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
-
-					$statements[] = 'begin';
-
-					// Create a backup table and populate it, destroy the existing one
-					$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-					$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-					$statements[] = 'DROP TABLE ' . $table_name;
-
-					preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-					$new_table_cols = trim($matches[1]);
-					$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
-					$column_list = array();
-
-					foreach ($old_table_cols as $declaration)
-					{
-						$entities = preg_split('#\s+#', trim($declaration));
-						if ($entities[0] == 'PRIMARY')
-						{
-							continue;
-						}
-						$column_list[] = $entities[0];
-					}
-
-					$columns = implode(',', $column_list);
-
-					$new_table_cols = $column_name . ' ' . $column_data['column_type_sql'] . ',' . $new_table_cols;
-
-					// create a new table and fill it up. destroy the temp one
-					$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');';
-					$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-					$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-					$statements[] = 'commit';
-				}
-				else
-				{
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' [' . $column_data['column_type_sql'] . ']';
-				}
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Drop column
-	*/
-	public function sql_column_remove($table_name, $column_name)
-	{
-		$statements = array();
-
-		switch ($this->db->dbms_type)
-		{
-			case 'firebird':
-				$statements[] = 'ALTER TABLE "' . $table_name . '" DROP "' . $column_name . '"';
-			break;
-
-			case 'mssql':
-				$statements[] = 'ALTER TABLE [' . $table_name . '] DROP COLUMN [' . $column_name . ']';
-			break;
-
-			case 'mysql':
-				$statements[] = 'ALTER TABLE `' . $table_name . '` DROP COLUMN `' . $column_name . '`';
-			break;
-
-			case 'oracle':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP ' . $column_name;
-			break;
-
-			case 'postgres':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN "' . $column_name . '"';
-			break;
-
-			case 'db2':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP ' . $column_name;
-			break;
-
-			case 'sqlite':
-				if (version_compare(sqlite_libversion(), '3.0') == -1)
-				{
-					$sql = "SELECT sql
-						FROM sqlite_master
-						WHERE type = 'table'
-							AND name = '{$table_name}'
-						ORDER BY type DESC, name;";
-					$result = $this->db->sql_query($sql);
-
-					if (!$result)
-					{
-						break;
-					}
-
-					$row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
-
-					$statements[] = 'begin';
-
-					// Create a backup table and populate it, destroy the existing one
-					$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-					$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-					$statements[] = 'DROP TABLE ' . $table_name;
-
-					preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-					$new_table_cols = trim($matches[1]);
-					$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
-					$column_list = array();
-
-					foreach ($old_table_cols as $declaration)
-					{
-						$entities = preg_split('#\s+#', trim($declaration));
-						if ($entities[0] == 'PRIMARY' || $entities[0] === $column_name)
-						{
-							continue;
-						}
-						$column_list[] = $entities[0];
-					}
-
-					$columns = implode(',', $column_list);
-
-					$new_table_cols = $new_table_cols = preg_replace('/' . $column_name . '[^,]+(?:,|$)/m', '', $new_table_cols);
-
-					// create a new table and fill it up. destroy the temp one
-					$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');';
-					$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-					$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-					$statements[] = 'commit';
-				}
-				else
-				{
-					$statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN ' . $column_name;
-				}
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Drop Index
-	*/
-	public function sql_index_drop($table_name, $index_name)
-	{
-		$statements = array();
-
-		switch ($this->db->dbms_type)
-		{
-			case 'mssql':
-				$statements[] = 'DROP INDEX ' . $table_name . '.' . $index_name;
-			break;
-
-			case 'mysql':
-				$statements[] = 'DROP INDEX ' . $index_name . ' ON ' . $table_name;
-			break;
-
-			case 'firebird':
-			case 'oracle':
-			case 'postgres':
-			case 'sqlite':
-			case 'db2':
-				$statements[] = 'DROP INDEX ' . $table_name . '_' . $index_name;
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Drop Table
-	*/
-	public function sql_table_drop($table_name)
-	{
-		$statements = array();
-
-		// the most basic operation, get rid of the table
-		$statements[] = 'DROP TABLE ' . $table_name;
-
-		switch ($this->db->dbms_type)
-		{
-			case 'firebird':
-				$sql = 'SELECT RDB$GENERATOR_NAME as gen
-					FROM RDB$GENERATORS
-					WHERE RDB$SYSTEM_FLAG = 0
-						AND RDB$GENERATOR_NAME = \'' . strtoupper($table_name) . "_GEN'";
-				$result = $this->db->sql_query($sql);
-
-				// does a generator exist?
-				if ($row = $this->db->sql_fetchrow($result))
-				{
-					$statements[] = "DROP GENERATOR {$row['gen']};";
-				}
-				$this->db->sql_freeresult($result);
-			break;
-
-			case 'oracle':
-				$sql = 'SELECT A.REFERENCED_NAME
-					FROM USER_DEPENDENCIES A, USER_TRIGGERS B
-					WHERE A.REFERENCED_TYPE = \'SEQUENCE\'
-						AND A.NAME = B.TRIGGER_NAME
-						AND B.TABLE_NAME = \'' . strtoupper($table_name) . "'";
-				$result = $this->db->sql_query($sql);
-
-				// any sequences ref'd to this table's triggers?
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					$statements[] = "DROP SEQUENCE {$row['referenced_name']}";
-				}
-				$this->db->sql_freeresult($result);
-
-			case 'postgres':
-				// PGSQL does not "tightly" bind sequences and tables, we must guess...
-				$sql = "SELECT relname
-					FROM pg_class
-					WHERE relkind = 'S'
-						AND relname = '{$table_name}_seq'";
-				$result = $this->db->sql_query($sql);
-
-				// We don't even care about storing the results. We already know the answer if we get rows back.
-				if ($this->db->sql_fetchrow($result))
-				{
-					$statements[] =  "DROP SEQUENCE {$table_name}_seq;\n";
-				}
-				$this->db->sql_freeresult($result);
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Add primary key
-	*/
-	public function sql_create_primary_key($table_name, $column)
-	{
-		$statements = array();
-
-		switch ($this->db->dbms_type)
-		{
-			case 'firebird':
-			case 'postgres':
-			case 'mysql':
-			case 'db2':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD PRIMARY KEY (' . implode(', ', $column) . ')';
-			break;
-
-			case 'mssql':
-				$sql = "ALTER TABLE [{$table_name}] WITH NOCHECK ADD ";
-				$sql .= "CONSTRAINT [PK_{$table_name}] PRIMARY KEY  CLUSTERED (";
-				$sql .= '[' . implode("],\n\t\t[", $column) . ']';
-				$sql .= ') ON [PRIMARY]';
-
-				$statements[] = $sql;
-			break;
-
-			case 'oracle':
-				$statements[] = 'ALTER TABLE ' . $table_name . 'add CONSTRAINT pk_' . $table_name . ' PRIMARY KEY (' . implode(', ', $column) . ')';
-			break;
-
-			case 'sqlite':
-				$sql = "SELECT sql
-					FROM sqlite_master
-					WHERE type = 'table'
-						AND name = '{$table_name}'
-					ORDER BY type DESC, name;";
-				$result = $this->db->sql_query($sql);
-
-				if (!$result)
-				{
-					break;
-				}
-
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				$statements[] = 'begin';
-
-				// Create a backup table and populate it, destroy the existing one
-				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-				$statements[] = 'DROP TABLE ' . $table_name;
-
-				preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-				$new_table_cols = trim($matches[1]);
-				$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
-				$column_list = array();
-
-				foreach ($old_table_cols as $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					if ($entities[0] == 'PRIMARY')
-					{
-						continue;
-					}
-					$column_list[] = $entities[0];
-				}
-
-				$columns = implode(',', $column_list);
-
-				// create a new table and fill it up. destroy the temp one
-				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ', PRIMARY KEY (' . implode(', ', $column) . '));';
-				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-				$statements[] = 'commit';
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Add unique index
-	*/
-	public function sql_create_unique_index($table_name, $index_name, $column)
-	{
-		$statements = array();
-
-		switch ($this->db->dbms_type)
-		{
-			case 'firebird':
-			case 'postgres':
-			case 'oracle':
-			case 'sqlite':
-			case 'db2':
-				$statements[] = 'CREATE UNIQUE INDEX ' . $table_name . '_' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
-			break;
-
-			case 'mysql':
-				$statements[] = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
-			break;
-
-			case 'mssql':
-				$statements[] = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]';
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Add index
-	*/
-	public function sql_create_index($table_name, $index_name, $column)
-	{
-		$statements = array();
-
-		switch ($this->db->dbms_type)
-		{
-			case 'firebird':
-			case 'postgres':
-			case 'oracle':
-			case 'sqlite':
-			case 'db2':
-				$statements[] = 'CREATE INDEX ' . $table_name . '_' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
-			break;
-
-			case 'mysql':
-				$statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
-			break;
-
-			case 'mssql':
-				$statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]';
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* List all of the indices that belong to a table,
-	* does not count:
-	* * UNIQUE indices
-	* * PRIMARY keys
-	*/
-	public function sql_list_index($table_name)
-	{
-		$index_array = array();
-
-		if ($this->db->dbms_type == 'mssql')
-		{
-			$sql = "EXEC sp_statistics '$table_name'";
-			$result = $this->db->sql_query($sql);
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				if ($row['TYPE'] == 3)
-				{
-					$index_array[] = $row['INDEX_NAME'];
-				}
-			}
-			$this->db->sql_freeresult($result);
-		}
-		else
-		{
-			switch ($this->db->dbms_type)
-			{
-				case 'firebird':
-					$sql = "SELECT LOWER(RDB\$INDEX_NAME) as index_name
-						FROM RDB\$INDICES
-						WHERE RDB\$RELATION_NAME = " . strtoupper($table_name) . "
-							AND RDB\$UNIQUE_FLAG IS NULL
-							AND RDB\$FOREIGN_KEY IS NULL";
-					$col = 'index_name';
-				break;
-
-				case 'postgres':
-					$sql = "SELECT ic.relname as index_name
-						FROM pg_class bc, pg_class ic, pg_index i
-						WHERE (bc.oid = i.indrelid)
-							AND (ic.oid = i.indexrelid)
-							AND (bc.relname = '" . $table_name . "')
-							AND (i.indisunique != 't')
-							AND (i.indisprimary != 't')";
-					$col = 'index_name';
-				break;
-
-				case 'mysql':
-					$sql = 'SHOW KEYS
-						FROM ' . $table_name;
-					$col = 'Key_name';
-				break;
-
-				case 'oracle':
-					$sql = "SELECT index_name
-						FROM user_indexes
-						WHERE table_name = '" . $table_name . "'
-							AND generated = 'N'";
-					$col = 'index_name';
-				break;
-
-				case 'sqlite':
-					$sql = "PRAGMA index_info('" . $table_name . "');";
-					$col = 'name';
-				break;
-
-				case 'db2':
-					$sql = "SELECT indname
-						FROM SYSCAT.INDEXES
-						WHERE TABNAME = '$table_name'
-							AND UNIQUERULE <> 'P'";
-					$col = 'name';
-			}
-
-			$result = $this->db->sql_query($sql);
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				if ($this->db->dbms_type == 'mysql' && !$row['Non_unique'])
-				{
-					continue;
-				}
-
-				switch ($this->db->dbms_type)
-				{
-					case 'firebird':
-					case 'oracle':
-					case 'postgres':
-					case 'sqlite':
-					case 'db2':
-						$row[$col] = substr($row[$col], strlen($table_name) + 1);
-					break;
-				}
-
-				$index_array[] = $row[$col];
-			}
-			$this->db->sql_freeresult($result);
-		}
-
-		return array_map('strtolower', $index_array);
-	}
-
-	/**
-	* Change column type (not name!)
-	*/
-	public function sql_column_change($table_name, $column_name, $column_data)
-	{
-		$column_data = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
-		$statements = array();
-
-		switch ($this->db->dbms_type)
-		{
-			case 'firebird':
-				// Change type...
-				$statements[] = 'ALTER TABLE "' . $table_name . '" ALTER COLUMN "' . $column_name . '" TYPE ' . ' ' . $column_data['column_type_sql'];
-			break;
-
-			case 'mssql':
-				$statements[] = 'ALTER TABLE [' . $table_name . '] ALTER COLUMN [' . $column_name . '] ' . $column_data['column_type_sql'];
-			break;
-
-			case 'mysql':
-				$statements[] = 'ALTER TABLE `' . $table_name . '` CHANGE `' . $column_name . '` `' . $column_name . '` ' . $column_data['column_type_sql'];
-			break;
-
-			case 'oracle':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' MODIFY ' . $column_name . ' ' . $column_data['column_type_sql'];
-			break;
-
-			case 'db2':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER ' . $column_name . ' SET DATA TYPE ' . $column_data['column_type_sql'];
-			break;
-
-			case 'postgres':
-				$sql = 'ALTER TABLE ' . $table_name . ' ';
-
-				$sql_array = array();
-				$sql_array[] = 'ALTER COLUMN ' . $column_name . ' TYPE ' . $column_data['column_type'];
-
-				if (isset($column_data['null']))
-				{
-					if ($column_data['null'] == 'NOT NULL')
-					{
-						$sql_array[] = 'ALTER COLUMN ' . $column_name . ' SET NOT NULL';
-					}
-					else if ($column_data['null'] == 'NULL')
-					{
-						$sql_array[] = 'ALTER COLUMN ' . $column_name . ' DROP NOT NULL';
-					}
-				}
-
-				if (isset($column_data['default']))
-				{
-					$sql_array[] = 'ALTER COLUMN ' . $column_name . ' SET DEFAULT ' . $column_data['default'];
-				}
-
-				// we don't want to double up on constraints if we change different number data types
-				if (isset($column_data['constraint']))
-				{
-					$constraint_sql = "SELECT consrc as constraint_data
-								FROM pg_constraint, pg_class bc
-								WHERE conrelid = bc.oid
-									AND bc.relname = '{$table_name}'
-									AND NOT EXISTS (
-										SELECT *
-											FROM pg_constraint as c, pg_inherits as i
-											WHERE i.inhrelid = pg_constraint.conrelid
-												AND c.conname = pg_constraint.conname
-												AND c.consrc = pg_constraint.consrc
-												AND c.conrelid = i.inhparent
-									)";
-
-					$constraint_exists = false;
-
-					$result = $this->db->sql_query($constraint_sql);
-					while ($row = $this->db->sql_fetchrow($result))
-					{
-						if (trim($row['constraint_data']) == trim($column_data['constraint']))
-						{
-							$constraint_exists = true;
-							break;
-						}
-					}
-					$this->db->sql_freeresult($result);
-
-					if (!$constraint_exists)
-					{
-						$sql_array[] = 'ADD ' . $column_data['constraint'];
-					}
-				}
-
-				$sql .= implode(', ', $sql_array);
-
-				$statements[] = $sql;
-			break;
-
-			case 'sqlite':
-				$sql = "SELECT sql
-					FROM sqlite_master
-					WHERE type = 'table'
-						AND name = '{$table_name}'
-					ORDER BY type DESC, name;";
-				$result = $this->db->sql_query($sql);
-
-				if (!$result)
-				{
-					break;
-				}
-
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				$statements[] = 'begin';
-
-				// Create a temp table and populate it, destroy the existing one
-				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-				$statements[] = 'DROP TABLE ' . $table_name;
-
-				preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-				$new_table_cols = trim($matches[1]);
-				$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
-				$column_list = array();
-
-				foreach ($old_table_cols as $key => $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					$column_list[] = $entities[0];
-					if ($entities[0] == $column_name)
-					{
-						$old_table_cols[$key] = $column_name . ' ' . $column_data['column_type_sql'];
-					}
-				}
-
-				$columns = implode(',', $column_list);
-
-				// create a new table and fill it up. destroy the temp one
-				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . implode(',', $old_table_cols) . ');';
-				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-				$statements[] = 'commit';
-
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	private function _sql_get_special_row($value, &$data)
-	{
-		if (is_array($value))
-		{
-			if (isset($value['auto_increment']))
-			{
-				$auto_key = explode(':', $value['auto_increment'], 2);
-				$value_key = $auto_key[0];
-				$auto_key = (int) $auto_key[1];
-
-				if (isset($this->stored_increments[$value_key][$auto_key]))
-				{
-					$value = $this->stored_increments[$value_key][$auto_key];
-				}
-			}
-			else
-			{
-				$value = NULL;
-			}
-		}
-		else if (strpos($value, '{') === 0 && strpos($value, '}') === strlen($value) - 1)
-		{
-			if (strpos($value, '{L_') === 0 && isset(phpbb::$user->lang[substr($value, 3, -1)]))
-			{
-				$value = phpbb::$user->lang[substr($value, 3, -1)];
-			}
-			else if (isset($data[substr($value, 1, -1)]))
-			{
-				$value = $data[substr($value, 1, -1)];
-			}
-		}
-
-		return $value;
-	}
-
-	/**
-	* Private method for performing sql statements (either execute them or return them)
-	* @access private
-	*/
-	private function _sql_run_sql($statements)
-	{
-		if ($this->return_statements)
-		{
-			return $statements;
-		}
-
-		// We could add error handling here...
-		foreach ($statements as $sql)
-		{
-			if ($sql === 'begin')
-			{
-				$this->db->sql_transaction('begin');
-			}
-			else if ($sql === 'commit')
-			{
-				$this->db->sql_transaction('commit');
-			}
-			else
-			{
-				$this->db->sql_query($sql);
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* Function to prepare some column information for better usage
-	* @access private
-	*/
-	private function sql_prepare_column_data($table_name, $column_name, $column_data)
-	{
-		// Get type
-		if (strpos($column_data[0], ':') !== false)
-		{
-			list($orig_column_type, $column_length) = explode(':', $column_data[0]);
-
-			if (!is_array($this->db->dbms_type_map[$orig_column_type . ':']))
-			{
-				$column_type = sprintf($this->db->dbms_type_map[$orig_column_type . ':'], $column_length);
-			}
-			else
-			{
-				if (isset($this->db->dbms_type_map[$orig_column_type . ':']['rule']))
-				{
-					switch ($this->db->dbms_type_map[$orig_column_type . ':']['rule'][0])
-					{
-						case 'div':
-							$column_length /= $this->db->dbms_type_map[$orig_column_type . ':']['rule'][1];
-							$column_length = ceil($column_length);
-							$column_type = sprintf($this->db->dbms_type_map[$orig_column_type . ':'][0], $column_length);
-						break;
-					}
-				}
-
-				if (isset($this->db->dbms_type_map[$orig_column_type . ':']['limit']))
-				{
-					switch ($this->db->dbms_type_map[$orig_column_type . ':']['limit'][0])
-					{
-						case 'mult':
-							$column_length *= $this->db->dbms_type_map[$orig_column_type . ':']['limit'][1];
-							if ($column_length > $this->db->dbms_type_map[$orig_column_type . ':']['limit'][2])
-							{
-								$column_type = $this->db->dbms_type_map[$orig_column_type . ':']['limit'][3];
-							}
-							else
-							{
-								$column_type = sprintf($this->db->dbms_type_map[$orig_column_type . ':'][0], $column_length);
-							}
-						break;
-					}
-				}
-			}
-
-			$orig_column_type .= ':';
-		}
-		else
-		{
-			$orig_column_type = $column_data[0];
-			$column_type = $this->db->dbms_type_map[$column_data[0]];
-		}
-
-		// Adjust default value if db-dependant specified
-		if (is_array($column_data[1]))
-		{
-			$column_data[1] = (isset($column_data[1][$this->db->dbms_type])) ? $column_data[1][$this->db->dbms_type] : $column_data[1]['default'];
-		}
-
-		$sql = '';
-
-		$return_array = array();
-
-		switch ($this->db->dbms_type)
-		{
-			case 'firebird':
-				$sql .= " {$column_type} ";
-
-				if (!is_null($column_data[1]))
-				{
-					$sql .= 'DEFAULT ' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ' ';
-				}
-
-				$sql .= 'NOT NULL';
-
-				// This is a UNICODE column and thus should be given it's fair share
-				if (preg_match('/^X?STEXT_UNI|VCHAR_(CI|UNI:?)/', $column_data[0]))
-				{
-					$sql .= ' COLLATE UNICODE';
-				}
-
-				$return_array['auto_increment'] = false;
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-					$return_array['auto_increment'] = true;
-				}
-
-			break;
-
-			case 'mssql':
-				$sql .= " {$column_type} ";
-				$sql_default = " {$column_type} ";
-
-				// For adding columns we need the default definition
-				if (!is_null($column_data[1]))
-				{
-					// For hexadecimal values do not use single quotes
-					if (strpos($column_data[1], '0x') === 0)
-					{
-						$sql_default .= 'DEFAULT (' . $column_data[1] . ') ';
-					}
-					else
-					{
-						$sql_default .= 'DEFAULT (' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ') ';
-					}
-				}
-
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-//					$sql .= 'IDENTITY (1, 1) ';
-					$sql_default .= 'IDENTITY (1, 1) ';
-				}
-
-				$return_array['textimage'] = $column_type === '[text]';
-
-				$sql .= 'NOT NULL';
-				$sql_default .= 'NOT NULL';
-
-				$return_array['column_type_sql_default'] = $sql_default;
-			break;
-
-			case 'mysql':
-				$sql .= " {$column_type} ";
-
-				// For hexadecimal values do not use single quotes
-				if (!is_null($column_data[1]) && substr($column_type, -4) !== 'text' && substr($column_type, -4) !== 'blob')
-				{
-					$sql .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' ";
-				}
-				$sql .= 'NOT NULL';
-
-				if (isset($column_data[2]))
-				{
-					if ($column_data[2] == 'auto_increment')
-					{
-						$sql .= ' auto_increment';
-					}
-					else if ($column_data[2] == 'true_sort')
-					{
-						$sql .= ' COLLATE utf8_unicode_ci';
-					}
-				}
-
-			break;
-
-			case 'oracle':
-				$sql .= " {$column_type} ";
-				$sql .= (!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
-				// Oracle does not like setting NOT NULL on a column that is already NOT NULL (this happens only on number fields)
-				if (!preg_match('/number/i', $column_type))
-				{
-					$sql .= ($column_data[1] === '') ? '' : 'NOT NULL';
-				}
-
-				$return_array['auto_increment'] = false;
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-					$return_array['auto_increment'] = true;
-				}
-			break;
-
-			case 'postgres':
-				$return_array['column_type'] = $column_type;
-
-				$sql .= " {$column_type} ";
-
-				$return_array['auto_increment'] = false;
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-					$default_val = "nextval('{$table_name}_seq')";
-					$return_array['auto_increment'] = true;
-				}
-				else if (!is_null($column_data[1]))
-				{
-					$default_val = "'" . $column_data[1] . "'";
-					$return_array['null'] = 'NOT NULL';
-					$sql .= 'NOT NULL ';
-				}
-
-				$return_array['default'] = $default_val;
-
-				$sql .= "DEFAULT {$default_val}";
-
-				// Unsigned? Then add a CHECK contraint
-				if (in_array($orig_column_type, $this->unsigned_types))
-				{
-					$return_array['constraint'] = "CHECK ({$column_name} >= 0)";
-					$sql .= " CHECK ({$column_name} >= 0)";
-				}
-			break;
-
-			case 'sqlite':
-				$return_array['primary_key_set'] = false;
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-					$sql .= ' INTEGER PRIMARY KEY';
-					$return_array['primary_key_set'] = true;
-				}
-				else
-				{
-					$sql .= ' ' . $column_type;
-				}
-
-				$sql .= ' NOT NULL ';
-				$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}'" : '';
-			break;
-
-			case 'db2':
-				$sql .= " {$column_type} NOT NULL";
-
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-					$sql .= ' GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1)';
-				}
-				else
-				{
-					if (preg_match('/^(integer|smallint|float)$/', $column_type))
-					{
-						$sql .= " DEFAULT {$column_data[1]}";
-					}
-					else
-					{
-						$sql .= " DEFAULT '{$column_data[1]}'";
-					}
-				}
-			break;
-		}
-
-		$return_array['column_type_sql'] = $sql;
-
-		return $return_array;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
deleted file mode 100644
index 15127509cc..0000000000
--- a/phpBB/includes/db/dbal.php
+++ /dev/null
@@ -1,1553 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* DBAL Factory
-* Only used to instantiate a new DB object
-*
-* @package dbal
-* @static
-*/
-abstract class phpbb_db_dbal
-{
-	/**
-	* Get new database object
-	*
-	* @param string	$dbms	Database module to call
-	* @return object	Database object
-	* @access public
-	*/
-	public static function new_instance($dbms)
-	{
-		$class = 'phpbb_dbal_' . $dbms;
-
-		if (!class_exists($class))
-		{
-			include PHPBB_ROOT_PATH . 'includes/db/' . $dbms . '.' . PHP_EXT;
-		}
-
-		// Instantiate class
-		$db = new $class();
-
-		// Fill default sql layer
-		$db->sql_layer = $dbms;
-
-		return $db;
-	}
-
-	/**
-	* Get new database object and connect to database
-	*
-	* @param string	$dbms			Database module to call
-	* @param string	$server			DB server address to connect to
-	* @param string	$user			DB user name
-	* @param string	$password		DB password to use
-	* @param string	$database		Database name to connect to
-	* @param int	$port			DB Port
-	* @param bool	$persistency	Open persistent DB connection if true
-	* @param bool	$new_link		If set to true a new connection is opened instead of re-using old connections
-	*
-	* @return object	Database object
-	* @access public
-	*/
-	public static function connect($dbms, $server, $user, $password, $database, $port = false, $persistency = false, $new_link = false)
-	{
-		$class = 'phpbb_dbal_' . $dbms;
-
-		if (!class_exists($class))
-		{
-			include PHPBB_ROOT_PATH . 'includes/db/' . $dbms . '.' . PHP_EXT;
-		}
-
-		// Instantiate class
-		$db = new $class();
-
-		// Fill default sql layer
-		$db->sql_layer = $dbms;
-
-		// Connect to DB
-		$db->sql_connect($server, $user, $password, $database, $port, $persistency, $new_link);
-
-		// Return db object
-		return $db;
-	}
-}
-
-/**
-* Database Abstraction Layer
-* @package dbal
-*/
-abstract class phpbb_dbal
-{
-	/**
-	* @var array required phpBB objects
-	*/
-	public $phpbb_required = array('config');
-
-	/**
-	* @var array Optional phpBB objects
-	*/
-	public $phpbb_optional = array('acm', 'user', 'acl');
-
-	/**
-	* @var string Current sql layer name
-	*/
-	public $sql_layer = '';
-
-	/**
-	* @var string Exact version of the DBAL, directly queried
-	*/
-	public $sql_server_version = false;
-
-	/**
-	* @var mixed Database connection id/resource
-	*/
-	public $db_connect_id;
-
-	/**
-	* @var mixed Database query result id/resource
-	*/
-	public $query_result;
-
-	/**
-	* @var bool Persistent connection
-	*/
-	public $persistency = false;
-
-	/**
-	* @var string DB user name
-	*/
-	public $user = '';
-
-	/**
-	* @var string DB server address connected to
-	*/
-	public $server = '';
-
-	/**
-	* @var string Database name connected to
-	*/
-	public $dbname = '';
-
-	/**
-	* @var int Database port used
-	*/
-	public $port = 0;
-
-	/**
-	* @var bool Is true if in transaction
-	*/
-	public $transaction = false;
-
-	/**
-	* @var int Holding transaction count
-	*/
-	public $transactions = 0;
-
-	/**
-	* Stores number of queries
-	*
-	* Keys are:
-	* <ul>
-	* <li>cached: Number of cached queries executed</li>
-	* <li>normal: Number of non-cached queries executed</li>
-	* <li>total: Total number of queries executed</li>
-	* </ul>
-	*
-	* @var array
-	*/
-	public $num_queries = array();
-
-	/**
-	* Stores opened queries.
-	*
-	* The key is returned by {@link phpbb_dbal::sql_get_result_key() sql_get_result_key()}.
-	* The value is the {@link phpbb_dbal::$query_result Database query result id/resource}.
-	*
-	* @var array
-	*/
-	public $open_queries = array();
-
-	/**
-	* @var string Wildcard for matching any (%) character within LIKE expressions
-	*/
-	public $any_char;
-
-	/**
-	* @var string Wildcard for matching exactly one (_) character within LIKE expressions
-	*/
-	public $one_char;
-
-	/**
-	* @var array Storing cached result rowset
-	*/
-	protected $cache_rowset = array();
-
-	/**
-	* @var int Storing cached result rowset index
-	*/
-	protected $cache_index = 0;
-
-	/**
-	* @var bool If true then methods do not call {@link phpbb_dbal::sql_error() sql_error()} on SQL error, but return silently.
-	*/
-	public $return_on_error = false;
-
-	/**
-	* @var bool This is set to true if an error had been triggered.
-	*/
-	public $sql_error_triggered = false;
-
-	/**
-	* @var string Holds the last sql query on triggered sql error.
-	*/
-	public $sql_error_sql = '';
-
-	/**
-	* @var array Holds the SQL error information - only populated if {@link phpbb_dbal::$sql_error_triggered sql_error_triggered} is set to true.
-	*/
-	public $sql_error_returned = array();
-
-	/**
-	* Database features
-	*
-	* <ul>
-	* <li>multi_insert: Supports multi inserts</li>
-	* <li>count_distinct: Supports COUNT(DISTINGT ...)</li>
-	* <li>multi_table_deletion: Supports multiple table deletion</li>
-	* <li>truncate: Supports table truncation</li>
-	* </ul>
-	*
-	* @var array
-	*/
-	public $features = array(
-		'multi_insert'			=> true,
-		'count_distinct'		=> true,
-		'multi_table_deletion'	=> true,
-		'truncate'				=> true,
-	);
-
-	/**
-	* @var int Passed time for executing SQL queries
-	*/
-	public $sql_time = 0;
-
-	/**
-	* @var int Current timestamp
-	*/
-	public $curtime = 0;
-
-	/**#@+
-	* @var string String to hold information for {@link phpbb_dbal::sql_report() SQL report}.
-	*/
-	protected $query_hold = '';
-	protected $html_hold = '';
-	protected $sql_report = '';
-	/**#@-*/
-
-	/**
-	* Constructor. Set default values.
-	* @access public
-	*/
-	public function __construct()
-	{
-		$this->num_queries = array(
-			'cached'		=> 0,
-			'normal'		=> 0,
-			'total'			=> 0,
-		);
-
-		// Do not change this please! This variable is used to easy the use of it - and is hardcoded.
-		$this->any_char = chr(0) . '%';
-		$this->one_char = chr(0) . '_';
-
-		$this->cache_rowset = array();
-		$this->cache_index = 0;
-	}
-
-	/**
-	* Connect to SQL Server.
-	*
-	* @param string	$server			DB server address to connect to
-	* @param string	$user			DB user name
-	* @param string	$password		DB password to use
-	* @param string	$database		Database name to connect to
-	* @param int	$port			DB Port
-	* @param bool	$persistency	Open persistent DB connection if true
-	* @param bool	$new_link		If set to true a new connection is opened instead of re-using old connections
-	*
-	* @return mixed	Database connection id/resource
-	* @access public
-	*/
-	abstract public function sql_connect($server, $user, $password, $database, $port = false, $persistency = false , $new_link = false);
-
-	/**
-	* Version information about used database
-	*
-	* @param bool	$raw	If true, only return the fetched sql_server_version without any additional strings
-	*
-	* @return string	Sql server version
-	* @access public
-	*/
-	abstract public function sql_server_info($raw = false);
-
-	/**
-	* Return number of affected rows.
-	*
-	* @return int	Number of affected rows. False if there is no valid database connection id.
-	* @access public
-	*/
-	abstract public function sql_affectedrows();
-
-	/**
-	* Get last inserted id after insert statement
-	*
-	* @return int	Last inserted id. False if there is no valid database connection id.
-	* @access public
-	*/
-	abstract public function sql_nextid();
-
-	/**
-	* Escape string used in sql query.
-	*
-	* @param string	$msg	Text to escape
-	*
-	* @return string	Escaped text
-	* @access public
-	*/
-	abstract public function sql_escape($msg);
-
-	/**
-	* Expose a DBMS specific function.
-	*
-	* Supported types are:
-	* <ul>
-	* <li>length_varchar: Get expression to return length of VARCHAR</li>
-	* <li>length_text: Get expression to return length of TEXT</li>
-	* </ul>
-	*
-	* @param string	$type	Type to return DB-specific code for
-	* @param string	$col	Column name to operate on
-	*
-	* @return string	DB-specific code able to be used in SQL query
-	* @access public
-	*/
-	abstract public function sql_function($type, $col);
-
-	/**
-	* Handle data by using prepared statements.
-	*
-	* @param string	$type	The type to handle. Possible values are: INSERT, UPDATE
-	* @param string	$table	The table to use insert or update
-	* @param mixed	$data	The data to insert/update in an array (key == column, value == value)
-	* @param string $where	An optional where-statement
-	* @access public
-	* @todo implement correctly by using types and only overwrite if DB supports prepared statements
-	*/
-	public function sql_handle_data($type, $table, $data, $where = '')
-	{
-		if ($type === 'UPDATE')
-		{
-			$where = ($where) ? ' WHERE ' . $where : '';
-			$this->sql_query('UPDATE ' . $table . ' SET ' . $this->sql_build_array('UPDATE', $data) . $where);
-		}
-		else
-		{
-			$this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('INSERT', $data));
-		}
-	}
-
-	/**
-	* DB-specific base query method. Called by {@link phpbb_dbal::sql_query() sql_query()}.
-	*
-	* @param string	$query		Contains the SQL query which shall be executed
-	*
-	* @return mixed	Returns the query result resource. When casted to bool the returned value returns true on success and false on failure
-	* @access protected
-	*/
-	abstract protected function _sql_query($query);
-
-	/**
-	* DB-specific method to Build LIMIT query and run it. Called by {@link phpbb_dbal::sql_query_limit() sql_query_limit}.
-	*
-	* @param string	$query	SQL query LIMIT should be applied to
-	* @param int	$total	Total number of rows returned
-	* @param int	$offset	Offset to read from
-	* @param int	$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	*
-	* @return mixed	Returns the query result resource. When casted to bool the returned value returns true on success and false on failure
-	* @access protected
-	*/
-	abstract protected function _sql_query_limit($query, $total, $offset, $cache_ttl);
-
-	/**
-	* DB-specific method to close sql connection. Called by {@link phpbb_dbal::sql_close() sql_close()}.
-	* @access protected
-	*/
-	abstract protected function _sql_close();
-
-	/**
-	* DB-specific SQL Transaction. Called by {@link phpbb_dbal::sql_transaction() sql_transaction()}.
-	*
-	* @param string	$status	The status code. See {@link phpbb_dbal::sql_transaction() sql_transaction()} for status codes.
-	*
-	* @return mixed	The result returned by the DB
-	* @access protected
-	*/
-	abstract protected function _sql_transaction($status);
-
-	/**
-	* Fetch current row. Called by {@link phpbb_dbal::sql_fetchrow() sql_fetchrow()}.
-	*
-	* @param mixed	$query_id	Query result resource
-	*
-	* @return array|bool	The current row or false if an error occurred
-	* @access protected
-	*/
-	abstract protected function _sql_fetchrow($query_id);
-
-	/**
-	* Free query result. Called by {@link phpbb_dbal::sql_freeresult() sql_freeresult()}.
-	*
-	* @param mixed	$query_id	Query result resource
-	*
-	* @return mixed	The DB result
-	* @access protected
-	*/
-	abstract protected function _sql_freeresult($query_id);
-
-	/**
-	* Correctly adjust LIKE expression for special characters. Called by {@link phpbb_dbal::sql_like_expression() sql_like_expression()}.
-	*
-	* @param string	$expression	The expression to use. Every wildcard is escaped, except {@link phpbb_dbal::$any_char $any_char} and {@link phpbb_dbal::$one_char $one_char}
-	*
-	* @return string	LIKE expression including the keyword!
-	* @access protected
-	*/
-	abstract protected function _sql_like_expression($expression);
-
-	/**
-	* Build DB-specific query bits for {@link phpbb_dbal::sql_build_query() sql_build_query()}.
-	*
-	* Currently used stages are ($stage: $data)
-	* <ul>
-	* <li>FROM: implode(', ', $table_array)</li>
-	* <li>WHERE: Full WHERE-Statement without WHERE keyword</li>
-	* </ul>
-	*
-	* @param string	$stage	The current stage build_query needs db-specific data for. Currently used are: FROM and WHERE.
-	* @param string	$data	Data to operate with
-	*
-	* @return string	$data in it's original form or adjusted to meet DB-specific standard
-	* @access protected
-	*/
-	abstract protected function _sql_custom_build($stage, $data);
-
-	/**
-	* Return sql error array. Called by {@link phpbb_dbal::sql_error() sql_error()}.
-	*
-	* @return array	Array with two keys. 'code' for the error code and 'message' for the error message.
-	* @access protected
-	*/
-	abstract protected function _sql_error();
-
-	/**
-	* Run DB-specific code to build SQL Report to explain queries, show statistics and runtime information. Called by {@link phpbb_dbal::sql_report() sql_report()}.
-	*
-	* This function only executes if the GET parameter 'explain' is true and phpbb::$base_config['debug_extra'] enabled.
-	*
-	* @param string	$mode	The mode to handle. 'display' is used for displaying the report, all other modes are internal.
-	* @param string $query	Query to document/explain. Only used internally to build the plan.
-	*
-	* @access protected
-	*/
-	abstract protected function _sql_report($mode, $query = '');
-
-	/**
-	* Base query method
-	*
-	* @param string	$query		Contains the SQL query which shall be executed
-	* @param int	$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	*
-	* @return mixed	Returns the query result resource. When casted to bool the returned value returns true on success and false on failure
-	* @access public
-	*/
-	public function sql_query($query = '', $cache_ttl = 0)
-	{
-		if (empty($query))
-		{
-			return false;
-		}
-
-		// EXPLAIN only in extra debug mode
-		if (phpbb::$base_config['debug_extra'])
-		{
-			$this->sql_report('start', $query);
-		}
-
-		$this->query_result = false;
-
-		if ($cache_ttl)
-		{
-			$this->sql_get_cache($query);
-		}
-
-		$this->sql_add_num_queries($this->query_result);
-
-		if ($this->query_result !== false)
-		{
-			if (phpbb::$base_config['debug_extra'])
-			{
-				$this->sql_report('fromcache', $query);
-			}
-
-			return $this->query_result;
-		}
-
-		if (($this->query_result = $this->_sql_query($query)) === false)
-		{
-			$this->sql_error($query);
-		}
-
-		if (phpbb::$base_config['debug_extra'])
-		{
-			$this->sql_report('stop', $query);
-		}
-
-		if ($cache_ttl)
-		{
-			$this->sql_put_cache($query, $cache_ttl);
-		}
-
-		if ($cache_ttl || strpos($query, 'SELECT') === 0)
-		{
-			if (($key = $this->sql_get_result_key($this->query_result)) !== false)
-			{
-				$this->open_queries[$key] = $this->query_result;
-			}
-		}
-
-		return $this->query_result;
-	}
-
-	/**
-	* Build LIMIT query and run it.
-	*
-	* @param string	$query	SQL query LIMIT should be applied to
-	* @param int	$total	Total number of rows returned
-	* @param int	$offset	Offset to read from
-	* @param int	$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	*
-	* @return mixed	Returns the query result resource. When casted to bool the returned value returns true on success and false on failure
-	* @access public
-	*/
-	public function sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		if (empty($query))
-		{
-			return false;
-		}
-
-		// Never use a negative total or offset
-		$total = ($total < 0) ? 0 : $total;
-		$offset = ($offset < 0) ? 0 : $offset;
-
-		return $this->_sql_query_limit($query, $total, $offset, $cache_ttl);
-	}
-
-	/**
-	* Switch for "return on error" or "display error message". Affects {@link phpbb_dbal::$return_on_error $return_on_error}.
-	*
-	* @param bool	$fail	True to return on SQL error. False to display error message on SQL error.
-	* @access public
-	*/
-	public function sql_return_on_error($fail = false)
-	{
-		$this->sql_error_triggered = false;
-		$this->sql_error_sql = '';
-
-		$this->return_on_error = $fail;
-	}
-
-	/**
-	* Return number of sql queries and cached sql queries used.
-	*
-	* @param bool	$cached	True to return cached queries executed. False to return non-cached queries executed.
-	*
-	* @return int	Number of queries executed
-	* @access public
-	*/
-	public function sql_num_queries($cached = false)
-	{
-		return ($cached) ? $this->num_queries['cached'] : $this->num_queries['normal'];
-	}
-
-	/**
-	* DBAL garbage collection, close sql connection.
-	*
-	* Iterates through {@link phpbb_dbal::$open_queries open queries} and closes them.
-	* For connection close {@link phpbb_dbal::_sql_close() the DB-specific method} is called.
-	*
-	* @return bool	False if there was no db connection to close or an error occurred, else true
-	* @access public
-	*/
-	public function sql_close()
-	{
-		if (!$this->db_connect_id)
-		{
-			return false;
-		}
-
-		if ($this->transaction)
-		{
-			do
-			{
-				$this->sql_transaction('commit');
-			}
-			while ($this->transaction);
-		}
-
-		foreach ($this->open_queries as $key => $query_result)
-		{
-			$this->sql_freeresult($query_result);
-		}
-
-		// Connection closed correctly. Set db_connect_id to false to prevent errors
-		if ($result = $this->_sql_close())
-		{
-			$this->db_connect_id = false;
-		}
-
-		return $result;
-	}
-
-	/**
-	* SQL Transaction.
-	*
-	* Standard status codes are:
-	* <ul>
-	* <li>begin: Begin transaction</li>
-	* <li>commit: Commit/end transaction</li>
-	* <li>rollback: Rollback transaction</li>
-	* </ul>
-	*
-	* @param string	$status	The status code.
-	*
-	* @return mixed	The result returned by the DB
-	* @access public
-	*/
-	public function sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				// If we are within a transaction we will not open another one, but enclose the current one to not loose data (prevening auto commit)
-				if ($this->transaction)
-				{
-					$this->transactions++;
-					return true;
-				}
-
-				$result = $this->_sql_transaction('begin');
-
-				if (!$result)
-				{
-					$this->sql_error();
-				}
-
-				$this->transaction = true;
-			break;
-
-			case 'commit':
-				// If there was a previously opened transaction we do not commit yet... but count back the number of inner transactions
-				if ($this->transaction && $this->transactions)
-				{
-					$this->transactions--;
-					return true;
-				}
-
-				// Check if there is a transaction (no transaction can happen if there was an error, with a combined rollback and error returning enabled)
-				// This implies we have transaction always set for autocommit db's
-				if (!$this->transaction)
-				{
-					return false;
-				}
-
-				$result = $this->_sql_transaction('commit');
-
-				if (!$result)
-				{
-					$this->sql_error();
-				}
-
-				$this->transaction = false;
-				$this->transactions = 0;
-			break;
-
-			case 'rollback':
-				$result = $this->_sql_transaction('rollback');
-				$this->transaction = false;
-				$this->transactions = 0;
-			break;
-
-			default:
-				$result = $this->_sql_transaction($status);
-			break;
-		}
-
-		return $result;
-	}
-
-	/**
-	* Fetch current row.
-	*
-	* @param mixed	$query_id	Query result resource
-	*
-	* @return array|bool	The current row or false if an error occurred
-	* @access public
-	*/
-	public function sql_fetchrow($query_id = false)
-	{
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($this->sql_cache_exists($query_id))
-		{
-			return $this->sql_cache_fetchrow($query_id);
-		}
-
-		return ($query_id !== false) ? $this->_sql_fetchrow($query_id) : false;
-	}
-
-	/**
-	* Fetch rowset (all rows).
-	*
-	* @param mixed	$query_id	Query result resource
-	*
-	* @return array|bool	The complete rowset or false if an error occurred
-	* @access public
-	*/
-	public function sql_fetchrowset($query_id = false)
-	{
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($query_id !== false)
-		{
-			$result = array();
-			while ($row = $this->sql_fetchrow($query_id))
-			{
-				$result[] = $row;
-			}
-
-			return $result;
-		}
-
-		return false;
-	}
-
-	/**
-	* Fetch field from current row.
-	*
-	* @param string	$field	Field/Column name to fetch data from.
-	* @param mixed	$query_id	Query result resource
-	*
-	* @return mixed	The fields value
-	* @access public
-	*/
-	public function sql_fetchfield($field, $query_id = false)
-	{
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($query_id !== false)
-		{
-			if ($this->sql_cache_exists($query_id))
-			{
-				return $this->sql_cache_fetchfield($query_id, $field);
-			}
-
-			$row = $this->sql_fetchrow($query_id);
-			return (isset($row[$field])) ? $row[$field] : false;
-		}
-
-		return false;
-	}
-
-	/**
-	* Free query result.
-	*
-	* @param mixed	$query_id	Query result resource
-	*
-	* @return mixed	The DB result
-	* @access public
-	*/
-	public function sql_freeresult($query_id)
-	{
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($this->sql_cache_exists($query_id))
-		{
-			return $this->sql_cache_freeresult($query_id);
-		}
-
-		if (($key = $this->sql_get_result_key($query_id)) !== false)
-		{
-			unset($this->open_queries[$key]);
-		}
-
-		return $this->_sql_freeresult($query_id);
-	}
-
-	/**
-	* Correctly adjust LIKE expression for special characters, some DBMS are handling them in a different way.
-	*
-	* @param string	$expression	The expression to use. Every wildcard is escaped, except {@link phpbb_dbal::$any_char $any_char} and {@link phpbb_dbal::$one_char $one_char}
-	*
-	* @return string	LIKE expression including the keyword!
-	* @access public
-	*/
-	public function sql_like_expression($expression)
-	{
-		$expression = str_replace(array('_', '%'), array("\_", "\%"), $expression);
-		$expression = str_replace(array(chr(0) . "\_", chr(0) . "\%"), array('_', '%'), $expression);
-
-		return $this->_sql_like_expression('LIKE \'' . $this->sql_escape($expression) . '\'');
-	}
-
-	/**
-	* Build sql statement from array for insert/update/select statements.
-	*
-	* Idea for this from Ikonboard
-	* Possible query values: INSERT, INSERT_SELECT, UPDATE, SELECT
-	*
-	* @param string	$mode		The mode to handle
-	* @param array	$assoc_ary	The SQL array to insert/update/select (key == column, value == data)
-	*
-	* @return string	Query able to be used in SQL queries
-	* @access public
-	*/
-	public function sql_build_array($mode, $assoc_ary = false)
-	{
-		if (!is_array($assoc_ary))
-		{
-			return false;
-		}
-
-		$fields = $values = array();
-		$query = '';
-
-		if ($mode == 'INSERT' || $mode == 'INSERT_SELECT')
-		{
-			foreach ($assoc_ary as $key => $var)
-			{
-				$fields[] = $key;
-
-				if (is_array($var) && is_string($var[0]))
-				{
-					// This is used for INSERT_SELECT(s)
-					$values[] = $var[0];
-				}
-				else
-				{
-					$values[] = $this->_sql_validate_value($var);
-				}
-			}
-
-			$query = ($mode == 'INSERT') ? ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')' : ' (' . implode(', ', $fields) . ') SELECT ' . implode(', ', $values) . ' ';
-		}
-		else if ($mode == 'MULTI_INSERT')
-		{
-			trigger_error('The MULTI_INSERT query value is no longer supported. Please use sql_multi_insert() instead.', E_USER_ERROR);
-		}
-		else if ($mode == 'UPDATE' || $mode == 'SELECT')
-		{
-			foreach ($assoc_ary as $key => $var)
-			{
-				$values[] = "$key = " . $this->_sql_validate_value($var);
-			}
-			$query = implode(($mode == 'UPDATE') ? ', ' : ' AND ', $values);
-		}
-
-		return $query;
-	}
-
-	/**
-	* Build IN or NOT IN sql comparison string, uses <> or = on single element to improve comparison speed
-	*
-	* @param string	$field				Name of the sql column that shall be compared
-	* @param array	$array				Array of values that are allowed (IN) or not allowed (NOT IN)
-	* @param bool	$negate				True for NOT IN (), false for IN () (default)
-	* @param bool	$allow_empty_set	If true, allow $array to be empty - this function will return 1=1 or 1=0 then.
-	*
-	* @return string	SQL statement able to be used in SQL queries
-	* @access public
-	*/
-	public function sql_in_set($field, $array, $negate = false, $allow_empty_set = false)
-	{
-		if (!sizeof($array))
-		{
-			if (!$allow_empty_set)
-			{
-				// Print the backtrace to help identifying the location of the problematic code
-				$this->sql_error('No values specified for SQL IN comparison');
-			}
-			else
-			{
-				// NOT IN () actually means everything so use a tautology
-				if ($negate)
-				{
-					return '1=1';
-				}
-				// IN () actually means nothing so use a contradiction
-				else
-				{
-					return '1=0';
-				}
-			}
-		}
-
-		if (!is_array($array))
-		{
-			$array = array($array);
-		}
-
-		if (sizeof($array) == 1)
-		{
-			@reset($array);
-			$var = current($array);
-
-			return $field . ($negate ? ' <> ' : ' = ') . $this->_sql_validate_value($var);
-		}
-		else
-		{
-			return $field . ($negate ? ' NOT IN ' : ' IN ') . '(' . implode(', ', array_map(array($this, '_sql_validate_value'), $array)) . ')';
-		}
-	}
-
-	/**
-	* Run more than one insert statement.
-	*
-	* @param string	$table		Table name to run the statements on
-	* @param array	&$sql_ary	Multi-dimensional array holding the statement data.
-	*
-	* @return bool	False if no statements were executed.
-	* @access public
-	* @todo use sql_prepare_data()
-	*/
-	public function sql_multi_insert($table, &$sql_ary)
-	{
-		if (!sizeof($sql_ary))
-		{
-			return false;
-		}
-
-		if ($this->features['multi_insert'])
-		{
-			$ary = array();
-			foreach ($sql_ary as $id => $_sql_ary)
-			{
-				// If by accident the sql array is only one-dimensional we build a normal insert statement
-				if (!is_array($_sql_ary))
-				{
-					$this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('INSERT', $sql_ary));
-					return true;
-				}
-
-				$values = array();
-				foreach ($_sql_ary as $key => $var)
-				{
-					$values[] = $this->_sql_validate_value($var);
-				}
-				$ary[] = '(' . implode(', ', $values) . ')';
-			}
-
-			$this->sql_query('INSERT INTO ' . $table . ' ' . ' (' . implode(', ', array_keys($sql_ary[0])) . ') VALUES ' . implode(', ', $ary));
-		}
-		else
-		{
-			foreach ($sql_ary as $ary)
-			{
-				if (!is_array($ary))
-				{
-					return false;
-				}
-
-				$this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('INSERT', $ary));
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* Build sql statement from array for select and select distinct statements
-	*
-	* @todo add more in-depth explanation about all possible array keys and their effects.
-	*
-	* @param string	$query	Query value. Possible query values: SELECT, SELECT_DISTINCT
-	* @param string	$array	Array to build statement from
-	*
-	* @return string	SQL Statement
-	* @access public
-	*/
-	public function sql_build_query($query, $array)
-	{
-		$sql = '';
-		switch ($query)
-		{
-			case 'SELECT':
-			case 'SELECT_DISTINCT';
-
-				$sql = str_replace('_', ' ', $query) . ' ' . $array['SELECT'] . ' FROM ';
-
-				$table_array = array();
-				foreach ($array['FROM'] as $table_name => $alias)
-				{
-					if (is_array($alias))
-					{
-						foreach ($alias as $multi_alias)
-						{
-							$table_array[] = $table_name . ' ' . $multi_alias;
-						}
-					}
-					else
-					{
-						$table_array[] = $table_name . ' ' . $alias;
-					}
-				}
-
-				$sql .= $this->_sql_custom_build('FROM', implode(', ', $table_array));
-
-				if (!empty($array['LEFT_JOIN']))
-				{
-					foreach ($array['LEFT_JOIN'] as $join)
-					{
-						$sql .= ' LEFT JOIN ' . key($join['FROM']) . ' ' . current($join['FROM']) . ' ON (' . $join['ON'] . ')';
-					}
-				}
-
-				if (!empty($array['WHERE']))
-				{
-					$sql .= ' WHERE ' . $this->_sql_custom_build('WHERE', $array['WHERE']);
-				}
-
-				if (!empty($array['GROUP_BY']))
-				{
-					$sql .= ' GROUP BY ' . $array['GROUP_BY'];
-				}
-
-				if (!empty($array['ORDER_BY']))
-				{
-					$sql .= ' ORDER BY ' . $array['ORDER_BY'];
-				}
-
-			break;
-		}
-
-		return $sql;
-	}
-
-	/**
-	* Display SQL Error message.
-	*
-	* The DB-specific information is retrieved by {@link phpbb_dbal::_sql_error() _sql_error()}.
-	*
-	* @param string	$sql	SQL statement which triggered the error
-	*
-	* @return mixed	Returns sql error array if {@link phpbb_dbal::$return_on_error $return_on_error} is true. Else script is halted.
-	* @access public
-	*/
-	public function sql_error($sql = '')
-	{
-		// Set var to retrieve errored status
-		$this->sql_error_triggered = true;
-		$this->sql_error_sql = $sql;
-
-		$this->sql_error_returned = $this->_sql_error();
-
-		if (!$this->return_on_error)
-		{
-			$sql_message = $this->sql_error_returned['message'];
-			$sql_code = $this->sql_error_returned['code'];
-
-			$message = 'SQL ERROR [ ' . $this->sql_layer . ' ]' . (($sql_message) ? '<br /><br />' . $sql_message : '') . (($sql_code) ? ' [' . $sql_code . ']' : '');
-
-			// Show complete SQL error and path to administrators only
-			// Additionally show complete error on installation or if extended debug mode is enabled
-			// The phpbb::$base_config['debug_extra'] variable is for development only!
-			if ((phpbb::registered('acl') && phpbb::$acl->acl_get('a_')) || defined('IN_INSTALL') || phpbb::$base_config['debug_extra'])
-			{
-				$message .= ($sql) ? '<br /><br />SQL<br /><br />' . htmlspecialchars($sql) : '';
-				$message .= '<br />';
-			}
-			else
-			{
-				// If error occurs in initiating the session we need to use a pre-defined language string
-				// This could happen if the connection could not be established for example (then we are not able to grab the default language)
-				if (!phpbb::registered('user'))
-				{
-					$message .= '<br /><br />An sql error occurred while fetching this page. Please contact an administrator if this problem persists.';
-				}
-				else
-				{
-					if (!empty(phpbb::$config['board_contact']))
-					{
-						$message .= '<br /><br />' . phpbb::$user->lang('SQL_ERROR_OCCURRED', '<a href="mailto:' . htmlspecialchars(phpbb::$config['board_contact']) . '">', '</a>');
-					}
-					else
-					{
-						$message .= '<br /><br />' . phpbb::$user->lang('SQL_ERROR_OCCURRED', '', '');
-					}
-				}
-			}
-
-			if ($this->transaction)
-			{
-				$this->sql_transaction('rollback');
-			}
-
-			if (strlen($message) > 1024)
-			{
-				// We need to define $msg_long_text here to circumvent text stripping.
-				global $msg_long_text;
-				$msg_long_text = $message;
-
-				trigger_error(false, E_USER_ERROR);
-			}
-
-			trigger_error($message, E_USER_ERROR);
-		}
-
-		if ($this->transaction)
-		{
-			$this->sql_transaction('rollback');
-		}
-
-		return $this->sql_error_returned;
-	}
-
-	/**
-	* Build SQL Report to explain queries, show statistics and runtime information.
-	*
-	* This function only executes if the GET parameter 'explain' is true and phpbb::$base_config['debug_extra'] enabled.
-	*
-	* @param string	$mode	The mode to handle. 'display' is used for displaying the report, all other modes are internal.
-	* @param string $query	Query to document/explain. Only used internally to build the plan.
-	*
-	* @access public
-	*/
-	public function sql_report($mode, $query = '')
-	{
-		global $starttime;
-
-		if (!phpbb_request::variable('explain', false))
-		{
-			return false;
-		}
-
-		if (!$query && $this->query_hold != '')
-		{
-			$query = $this->query_hold;
-		}
-
-		switch ($mode)
-		{
-			case 'display':
-				$this->sql_close();
-
-				if (phpbb::registered('acm'))
-				{
-					phpbb::$acm->unload();
-				}
-
-				$mtime = explode(' ', microtime());
-				$totaltime = $mtime[0] + $mtime[1] - $starttime;
-
-				echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-					<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
-					<head>
-						<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-						<meta http-equiv="Content-Style-Type" content="text/css" />
-						<meta http-equiv="imagetoolbar" content="no" />
-						<title>SQL Report</title>
-						<link href="' . PHPBB_ROOT_PATH . 'adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
-					</head>
-					<body id="errorpage">
-					<div id="wrap">
-						<div id="page-header">
-							<a href="' . phpbb::$url->build_url('explain') . '">Return to previous page</a>
-						</div>
-						<div id="page-body">
-							<div id="acp">
-							<div class="panel">
-								<span class="corners-top"><span></span></span>
-								<div id="content">
-									<h1>SQL Report</h1>
-									<br />
-									<p><b>Page generated in ' . round($totaltime, 4) . " seconds with {$this->num_queries['normal']} queries" . (($this->num_queries['cached']) ? " + {$this->num_queries['cached']} " . (($this->num_queries['cached'] == 1) ? 'query' : 'queries') . ' returning data from cache' : '') . '</b></p>
-
-									<p>Time spent on ' . $this->sql_layer . ' queries: <b>' . round($this->sql_time, 5) . 's</b> | Time spent on PHP: <b>' . round($totaltime - $this->sql_time, 5) . 's</b></p>
-
-									<br /><br />
-									' . $this->sql_report . '
-								</div>
-								<span class="corners-bottom"><span></span></span>
-							</div>
-							</div>
-						</div>
-						<div id="page-footer">
-							Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
-						</div>
-					</div>
-					</body>
-					</html>';
-
-				exit_handler();
-
-			break;
-
-			case 'stop':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$this->sql_report .= '
-
-					<table cellspacing="1">
-					<thead>
-					<tr>
-						<th>Query #' . $this->num_queries['total'] . '</th>
-					</tr>
-					</thead>
-					<tbody>
-					<tr>
-						<td class="row3"><textarea style="font-family:\'Courier New\',monospace;width:99%" rows="5" cols="10">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td>
-					</tr>
-					</tbody>
-					</table>
-
-					' . $this->html_hold . '
-
-					<p style="text-align: center;">
-				';
-
-				if ($this->query_result)
-				{
-					if (preg_match('/^(UPDATE|DELETE|REPLACE)/', $query))
-					{
-						$this->sql_report .= 'Affected rows: <b>' . $this->sql_affectedrows($this->query_result) . '</b> | ';
-					}
-					$this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed: <b>' . sprintf('%.5f', $endtime - $this->curtime) . 's</b>';
-				}
-				else
-				{
-					$error = $this->sql_error();
-					$this->sql_report .= '<b style="color: red">FAILED</b> - ' . $this->sql_layer . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']);
-				}
-
-				$this->sql_report .= '</p><br /><br />';
-
-				$this->sql_time += $endtime - $this->curtime;
-			break;
-
-			case 'start':
-				$this->query_hold = $query;
-				$this->html_hold = '';
-
-				$this->_sql_report($mode, $query);
-
-				$this->curtime = explode(' ', microtime());
-				$this->curtime = $this->curtime[0] + $this->curtime[1];
-
-			break;
-
-			case 'add_select_row':
-
-				$html_table = func_get_arg(2);
-				$row = func_get_arg(3);
-
-				if (!$html_table && sizeof($row))
-				{
-					$html_table = true;
-					$this->html_hold .= '<table cellspacing="1"><tr>';
-
-					foreach (array_keys($row) as $val)
-					{
-						$this->html_hold .= '<th>' . (($val) ? ucwords(str_replace('_', ' ', $val)) : '&nbsp;') . '</th>';
-					}
-					$this->html_hold .= '</tr>';
-				}
-				$this->html_hold .= '<tr>';
-
-				$class = 'row1';
-				foreach (array_values($row) as $val)
-				{
-					$class = ($class == 'row1') ? 'row2' : 'row1';
-					$this->html_hold .= '<td class="' . $class . '">' . (($val) ? $val : '&nbsp;') . '</td>';
-				}
-				$this->html_hold .= '</tr>';
-
-				return $html_table;
-
-			break;
-
-			case 'fromcache':
-
-				$this->_sql_report($mode, $query);
-
-			break;
-
-			case 'record_fromcache':
-
-				$endtime = func_get_arg(2);
-				$splittime = func_get_arg(3);
-
-				$time_cache = $endtime - $this->curtime;
-				$time_db = $splittime - $endtime;
-				$color = ($time_db > $time_cache) ? 'green' : 'red';
-
-				$this->sql_report .= '<table cellspacing="1"><thead><tr><th>Query results obtained from the cache</th></tr></thead><tbody><tr>';
-				$this->sql_report .= '<td class="row3"><textarea style="font-family:\'Courier New\',monospace;width:99%" rows="5" cols="10">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td></tr></tbody></table>';
-				$this->sql_report .= '<p style="text-align: center;">';
-				$this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed [cache]: <b style="color: ' . $color . '">' . sprintf('%.5f', ($time_cache)) . 's</b> | Elapsed [db]: <b>' . sprintf('%.5f', $time_db) . 's</b></p><br /><br />';
-
-				// Pad the start time to not interfere with page timing
-				$starttime += $time_db;
-
-			break;
-
-			default:
-
-				$this->_sql_report($mode, $query);
-
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Get stored data from SQL cache and fill the relevant cach rowset.
-	*
-	* @param string	$query	The query cached.
-	*
-	* @return bool	True if the caching was successful, else false
-	* @access private
-	*/
-	private function sql_get_cache($query)
-	{
-		if (!phpbb::registered('acm') || !phpbb::$acm->supported('sql'))
-		{
-			return false;
-		}
-
-		// Remove extra spaces and tabs
-		$var_name = preg_replace('/[\n\r\s\t]+/', ' ', $query);
-		$var_name = md5($this->sql_layer . '_' . $var_name);
-
-		$data = phpbb::$acm->get_sql($var_name);
-
-		if ($data !== false)
-		{
-			$this->query_result = ++$this->cache_index;
-			$this->cache_rowset[$this->query_result] = $data['rowset'];
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Put query to cache.
-	*
-	* @param string	$query		The query cached.
-	* @param int	$cache_ttl	Cache lifetime in seconds.
-	*
-	* @return bool	True if the caching was successful, else false
-	* @access private
-	*/
-	private function sql_put_cache($query, $cache_ttl)
-	{
-		if (!phpbb::registered('acm') || !phpbb::$acm->supported('sql'))
-		{
-			return false;
-		}
-
-		// Prepare the data
-		$var_name = preg_replace('/[\n\r\s\t]+/', ' ', $query);
-		$var_name = md5($this->sql_layer . '_' . $var_name);
-
-		$data = array(
-			'query'		=> $query,
-			'rowset'	=> array(),
-		);
-
-		while ($row = $this->sql_fetchrow($this->query_result))
-		{
-			$data['rowset'][] = $row;
-		}
-		$this->sql_freeresult($this->query_result);
-
-		phpbb::$acm->put_sql($var_name, $data, $cache_ttl);
-
-		$this->query_result = ++$this->cache_index;
-		$this->cache_rowset[$this->query_result] = $data['rowset'];
-		@reset($this->cache_rowset[$this->query_result]);
-
-		return true;
-	}
-
-	/**
-	* Check if an sql cache exist for a specific query id.
-	*
-	* @param int	$query_id	The query_id to check (int)
-	*
-	* @return bool	True if an cache entry exists.
-	* @access private
-	*/
-	private function sql_cache_exists($query_id)
-	{
-		return is_int($query_id) && isset($this->cache_rowset[$query_id]);
-	}
-
-	/**
-	* Fetch row from cache (database). Used in {@link phpbb_dbal::sql_fetchrow() sql_fetchrow()}.
-	*
-	* @param int	$query_id	The query_id to fetch from.
-	*
-	* @return array	The result row
-	* @access private
-	*/
-	private function sql_cache_fetchrow($query_id)
-	{
-		list(, $row) = each($this->cache_rowset[$query_id]);
-		return ($row !== NULL) ? $row : false;
-	}
-
-	/**
-	* Fetch a field from the current row of a cached database result (database). Used in {@link phpbb_dbal::sql_fetchfield() sql_fetchfield()}.
-	*
-	* @param int	$query_id	The query_id to fetch from.
-	* @param string	$field		The column name.
-	*
-	* @return array	The field data
-	* @access private
-	*/
-	private function sql_cache_fetchfield($query_id, $field)
-	{
-		$row = current($this->cache_rowset[$query_id]);
-		return ($row !== false && isset($row[$field])) ? $row[$field] : false;
-	}
-
-	/**
-	* Free memory used for a cached database result (database). Used in {@link phpbb_dbal::sql_freeresult() sql_freeresult()}.
-	*
-	* @param int	$query_id	The query_id.
-	*
-	* @return bool	True on success
-	* @access private
-	*/
-	private function sql_cache_freeresult($query_id)
-	{
-		if (!isset($this->cache_rowset[$query_id]))
-		{
-			return false;
-		}
-
-		if (($key = $this->sql_get_result_key($query_id)) !== false)
-		{
-			unset($this->open_queries[$key]);
-		}
-
-		unset($this->cache_rowset[$query_id]);
-		return true;
-	}
-
-	/**
-	* Function for validating SQL values
-	*
-	* @param mixed	Value. Typecasted to it's type.
-	*
-	* @return mixed	Typecasted value.
-	* @access private
-	*/
-	private function _sql_validate_value($var)
-	{
-		if (is_null($var))
-		{
-			return 'NULL';
-		}
-		else if (is_string($var))
-		{
-			return "'" . $this->sql_escape($var) . "'";
-		}
-		else
-		{
-			return (is_bool($var)) ? intval($var) : $var;
-		}
-	}
-
-	/**
-	* Add "one" to query count.
-	*
-	* @param bool	$cached	If true, add one to cached query count. Otherwise to non-cached query count
-	* @access private
-	*/
-	private function sql_add_num_queries($cached = false)
-	{
-		$this->num_queries['cached'] += ($cached !== false) ? 1 : 0;
-		$this->num_queries['normal'] += ($cached !== false) ? 0 : 1;
-		$this->num_queries['total'] += 1;
-	}
-
-	/**
-	* Get SQL result key for storing open connection
-	*
-	* @param string	$query_result	Query result id/resource/object
-	*
-	* @return mixed	Key usable as array key. False if storing is not possible.
-	* @access private
-	*/
-	private function sql_get_result_key($query_result)
-	{
-		$key = $query_result;
-
-		if (is_object($query_result))
-		{
-			$key = false;
-		}
-		else if (is_resource($query_result))
-		{
-			$key = (int) $query_result;
-		}
-
-		return $key;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
deleted file mode 100644
index be704ad835..0000000000
--- a/phpBB/includes/db/firebird.php
+++ /dev/null
@@ -1,453 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Firebird/Interbase Database Abstraction Layer
-* Minimum Requirement: 2.0+
-* @package dbal
-*/
-class phpbb_dbal_firebird extends phpbb_dbal
-{
-	/**
-	* @var string Database type. No distinction between versions or used extensions.
-	*/
-	public $dbms_type = 'firebird';
-
-	/**
-	* @var array Database type map, column layout information
-	*/
-	public $dbms_type_map = array(
-		'INT:'		=> 'INTEGER',
-		'BINT'		=> 'DOUBLE PRECISION',
-		'UINT'		=> 'INTEGER',
-		'UINT:'		=> 'INTEGER',
-		'TINT:'		=> 'INTEGER',
-		'USINT'		=> 'INTEGER',
-		'BOOL'		=> 'INTEGER',
-		'VCHAR'		=> 'VARCHAR(255) CHARACTER SET NONE',
-		'VCHAR:'	=> 'VARCHAR(%d) CHARACTER SET NONE',
-		'CHAR:'		=> 'CHAR(%d) CHARACTER SET NONE',
-		'XSTEXT'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-		'STEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-		'TEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-		'MTEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-		'XSTEXT_UNI'=> 'VARCHAR(100) CHARACTER SET UTF8',
-		'STEXT_UNI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
-		'TEXT_UNI'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8',
-		'MTEXT_UNI'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8',
-		'TIMESTAMP'	=> 'INTEGER',
-		'DECIMAL'	=> 'DOUBLE PRECISION',
-		'DECIMAL:'	=> 'DOUBLE PRECISION',
-		'PDECIMAL'	=> 'DOUBLE PRECISION',
-		'PDECIMAL:'	=> 'DOUBLE PRECISION',
-		'VCHAR_UNI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
-		'VCHAR_UNI:'=> 'VARCHAR(%d) CHARACTER SET UTF8',
-		'VARBINARY'	=> 'CHAR(255) CHARACTER SET NONE',
-	);
-
-	/**
-	* @var string Last query executed. We need this for sql_nextid()
-	*/
-	var $last_query_text = '';
-
-	/**
-	* @var resource Attached service handle.
-	*/
-	var $service_handle = false;
-
-	/**
-	* @var array Database features
-	*/
-	public $features = array(
-		'multi_insert'			=> false,
-		'count_distinct'		=> true,
-		'multi_table_deletion'	=> true,
-		'truncate'				=> false,
-	);
-
-	/**
-	* Connect to server. See {@link phpbb_dbal::sql_connect() sql_connect()} for details.
-	*/
-	public function sql_connect($server, $user, $password, $database, $port = false, $persistency = false , $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $user;
-		$this->server = $server . (($port) ? ':' . $port : '');
-		$this->dbname = str_replace('\\', '/', $database);
-
-		// There are three possibilities to connect to an interbase db
-		if (!$this->server)
-		{
-			$use_database = $this->dbname;
-		}
-		else if (strpos($this->server, '//') === 0)
-		{
-			$use_database = $this->server . $this->dbname;
-		}
-		else
-		{
-			$use_database = $this->server . ':' . $this->dbname;
-		}
-
-		$this->db_connect_id = ($this->persistency) ? @ibase_pconnect($use_database, $this->user, $password, false, false, 3) : @ibase_connect($use_database, $this->user, $password, false, false, 3);
-
-		if (!$this->db_connect_id)
-		{
-			return $this->sql_error('');
-		}
-
-		$this->service_handle = ($this->server) ? @ibase_service_attach($this->server, $this->user, $password) : false;
-
-		return $this->db_connect_id;
-	}
-
-	/**
-	* Version information about used database. See {@link phpbb_dbal::sql_server_info() sql_server_info()} for details.
-	*/
-	public function sql_server_info($raw = false)
-	{
-		if (!phpbb::registered('acm') || ($this->sql_server_version = phpbb::$acm->get('#firebird_version')) === false)
-		{
-			$version = false;
-
-			if ($this->service_handle !== false)
-			{
-				$val = @ibase_server_info($this->service_handle, IBASE_SVC_SERVER_VERSION);
-				preg_match('#V([\d.]+)#', $val, $version);
-				$version = (!empty($version[1])) ? $version[1] : false;
-			}
-
-			$this->sql_server_version = (!$version) ? '2.0' : $version;
-
-			if (phpbb::registered('acm'))
-			{
-				phpbb::$acm->put('#firebird_version', $this->sql_server_version);
-			}
-		}
-
-		return ($raw) ? $this->sql_server_version : 'Firebird/Interbase ' . $this->sql_server_version;
-	}
-
-	/**
-	* DB-specific base query method. See {@link phpbb_dbal::_sql_query() _sql_query()} for details.
-	*/
-	protected function _sql_query($query)
-	{
-		$this->last_query_text = $query;
-
-		$array = array();
-
-		// We overcome Firebird's 32767 char limit by binding vars
-		if (strlen($query) > 32767)
-		{
-			if (preg_match('/^(INSERT INTO[^(]++)\\(([^()]+)\\) VALUES[^(]++\\((.*?)\\)$/s', $query, $regs))
-			{
-				if (strlen($regs[3]) > 32767)
-				{
-					preg_match_all('/\'(?:[^\']++|\'\')*+\'|[\d-.]+/', $regs[3], $vals, PREG_PATTERN_ORDER);
-
-					$inserts = $vals[0];
-					unset($vals);
-
-					foreach ($inserts as $key => $value)
-					{
-						// check to see if this thing is greater than the max + 'x2
-						if (!empty($value) && $value[0] === "'" && strlen($value) > 32769)
-						{
-							$inserts[$key] = '?';
-							$array[] = str_replace("''", "'", substr($value, 1, -1));
-						}
-					}
-
-					$query = $regs[1] . '(' . $regs[2] . ') VALUES (' . implode(', ', $inserts) . ')';
-				}
-			}
-			else if (preg_match('/^(UPDATE ([\\w_]++)\\s+SET )([\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|\\d+)(?:,\\s*[\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+))*+)\\s+(WHERE.*)$/s', $query, $data))
-			{
-				if (strlen($data[3]) > 32767)
-				{
-					$update = $data[1];
-					$where = $data[4];
-					preg_match_all('/(\\w++)\\s*=\\s*(\'(?:[^\']++|\'\')*+\'|[\d-.]++)/', $data[3], $temp, PREG_SET_ORDER);
-					unset($data);
-
-					$cols = array();
-					foreach ($temp as $value)
-					{
-						// check to see if this thing is greater than the max + 'x2
-						if (!empty($value[2]) && $value[2][0] === "'" && strlen($value[2]) > 32769)
-						{
-							$array[] = str_replace("''", "'", substr($value[2], 1, -1));
-							$cols[] = $value[1] . '=?';
-						}
-						else
-						{
-							$cols[] = $value[1] . '=' . $value[2];
-						}
-					}
-
-					$query = $update . implode(', ', $cols) . ' ' . $where;
-					unset($cols);
-				}
-			}
-		}
-
-		if (sizeof($array))
-		{
-			$p_query = @ibase_prepare($this->db_connect_id, $query);
-			array_unshift($array, $p_query);
-			$result = call_user_func_array('ibase_execute', $array);
-			unset($array);
-		}
-		else
-		{
-			$result = @ibase_query($this->db_connect_id, $query);
-
-			if ($result && !$this->transaction)
-			{
-				@ibase_commit_ret();
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	* Build LIMIT query and run it. See {@link phpbb_dbal::_sql_query_limit() _sql_query_limit()} for details.
-	*/
-	protected function _sql_query_limit($query, $total, $offset, $cache_ttl)
-	{
-		$query = 'SELECT FIRST ' . $total . ((!empty($offset)) ? ' SKIP ' . $offset : '') . substr($query, 6);
-		return $this->sql_query($query, $cache_ttl);
-	}
-
-	/**
-	* Close sql connection. See {@link phpbb_dbal::_sql_close() _sql_close()} for details.
-	*/
-	protected function _sql_close()
-	{
-		if ($this->service_handle !== false)
-		{
-			@ibase_service_detach($this->service_handle);
-		}
-
-		return @ibase_close($this->db_connect_id);
-	}
-
-	/**
-	* SQL Transaction. See {@link phpbb_dbal::_sql_transaction() _sql_transaction()} for details.
-	*/
-	protected function _sql_transaction($status)
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return true;
-			break;
-
-			case 'commit':
-				return @ibase_commit();
-			break;
-
-			case 'rollback':
-				return @ibase_rollback();
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Return number of affected rows. See {@link phpbb_dbal::sql_affectedrows() sql_affectedrows()} for details.
-	*/
-	public function sql_affectedrows()
-	{
-		return ($this->db_connect_id) ? @ibase_affected_rows($this->db_connect_id) : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement. See {@link phpbb_dbal::sql_nextid() sql_nextid()} for details.
-	*/
-	public function sql_nextid()
-	{
-		if (!$this->query_result || !$this->last_query_text)
-		{
-			return false;
-		}
-
-		if (preg_match('#^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)#i', $this->last_query_text, $tablename))
-		{
-			$sql = 'SELECT GEN_ID(' . $tablename[1] . '_gen, 0) AS new_id FROM RDB$DATABASE';
-
-			if (!($temp_q_id = @ibase_query($this->db_connect_id, $sql)))
-			{
-				return false;
-			}
-
-			$temp_result = @ibase_fetch_assoc($temp_q_id);
-			@ibase_free_result($temp_q_id);
-
-			return ($temp_result) ? $temp_result['NEW_ID'] : false;
-		}
-
-		return false;
-	}
-
-	/**
-	* Fetch current row. See {@link phpbb_dbal::_sql_fetchrow() _sql_fetchrow()} for details.
-	*/
-	protected function _sql_fetchrow($query_id)
-	{
-		$cur_row = @ibase_fetch_object($query_id, IBASE_TEXT);
-
-		if (!$cur_row)
-		{
-			return false;
-		}
-
-		foreach (get_object_vars($cur_row) as $key => $value)
-		{
-			$row[strtolower($key)] = (is_string($value)) ? trim(str_replace(array("\\0", "\\n"), array("\0", "\n"), $value)) : $value;
-		}
-
-		return (sizeof($row)) ? $row : false;
-	}
-
-	/**
-	* Free query result. See {@link phpbb_dbal::_sql_freeresult() _sql_freeresult()} for details.
-	*/
-	protected function _sql_freeresult($query_id)
-	{
-		return @ibase_free_result($query_id);
-	}
-
-	/**
-	* Correctly adjust LIKE expression for special characters. See {@link phpbb_dbal::_sql_like_expression() _sql_like_expression()} for details.
-	*/
-	protected function _sql_like_expression($expression)
-	{
-		return $expression . " ESCAPE '\\'";
-	}
-
-	/**
-	* Escape string used in sql query. See {@link phpbb_dbal::sql_escape() sql_escape()} for details.
-	*/
-	public function sql_escape($msg)
-	{
-		return str_replace(array("'", "\0"), array("''", ''), $msg);
-	}
-
-	/**
-	* Expose a DBMS specific function. See {@link phpbb_dbal::sql_function() sql_function()} for details.
-	*/
-	public function sql_function($type, $col)
-	{
-		switch ($type)
-		{
-			case 'length_varchar':
-			case 'length_text':
-				return 'OCTET_LENGTH(' . $col . ')';
-			break;
-		}
-	}
-
-	/**
-	* Handle data by using prepared statements. See {@link phpbb_dbal::sql_handle_data() sql_handle_data()} for details.
-	public function sql_handle_data($type, $table, $data, $where = '')
-	{
-		if ($type == 'INSERT')
-		{
-			$stmt = ibase_prepare($this->db_connect_id, "INSERT INTO $table (". implode(', ', array_keys($data)) . ") VALUES (" . substr(str_repeat('?, ', sizeof($data)) ,0, -1) . ')');
-		}
-		else
-		{
-			$query = "UPDATE $table SET ";
-
-			$set = array();
-			foreach (array_keys($data) as $key)
-			{
-				$set[] = "$key = ?";
-			}
-			$query .= implode(', ', $set);
-
-			if ($where !== '')
-			{
-				$query .= $where;
-			}
-
-			$stmt = ibase_prepare($this->db_connect_id, $query);
-		}
-
-		// get the stmt onto the top of the function arguments
-		array_unshift($data, $stmt);
-
-		call_user_func_array('ibase_execute', $data);
-	}
-	*/
-
-	/**
-	* Build DB-specific query bits. See {@link phpbb_dbal::_sql_custom_build() _sql_custom_build()} for details.
-	*/
-	protected function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
-	/**
-	* return sql error array. See {@link phpbb_dbal::_sql_error() _sql_error()} for details.
-	*/
-	protected function _sql_error()
-	{
-		return array(
-			'message'	=> @ibase_errmsg(),
-			'code'		=> @ibase_errcode()
-		);
-	}
-
-	/**
-	* Run DB-specific code to build SQL Report to explain queries, show statistics and runtime information. See {@link phpbb_dbal::_sql_report() _sql_report()} for details.
-	*/
-	protected function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'start':
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @ibase_query($this->db_connect_id, $query);
-				while ($void = @ibase_fetch_object($result, IBASE_TEXT))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@ibase_free_result($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php
deleted file mode 100644
index d0dcb590fd..0000000000
--- a/phpBB/includes/db/mssql.php
+++ /dev/null
@@ -1,382 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* MSSQL Database Abstraction Layer
-* Minimum Requirement is MSSQL 2000+
-* @package dbal
-*/
-class phpbb_dbal_mssql extends phpbb_dbal
-{
-	/**
-	* @var string Database type. No distinction between versions or used extensions.
-	*/
-	public $dbms_type = 'mssql';
-
-	/**
-	* @var array Database type map, column layout information
-	*/
-	public $dbms_type_map = 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]',
-		'XSTEXT_UNI'=> '[varchar] (100)',
-		'STEXT_UNI'	=> '[varchar] (255)',
-		'TEXT_UNI'	=> '[varchar] (4000)',
-		'MTEXT_UNI'	=> '[text]',
-		'TIMESTAMP'	=> '[int]',
-		'DECIMAL'	=> '[float]',
-		'DECIMAL:'	=> '[float]',
-		'PDECIMAL'	=> '[float]',
-		'PDECIMAL:'	=> '[float]',
-		'VCHAR_UNI'	=> '[varchar] (255)',
-		'VCHAR_UNI:'=> '[varchar] (%d)',
-		'VARBINARY'	=> '[varchar] (255)',
-	);
-
-	/**
-	* Connect to server. See {@link phpbb_dbal::sql_connect() sql_connect()} for details.
-	*/
-	public function sql_connect($server, $user, $password, $database, $port = false, $persistency = false , $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $user;
-		$this->dbname = $database;
-		$this->port = $port;
-
-		$port_delimiter = (defined('PHP_OS') && substr(PHP_OS, 0, 3) === 'WIN') ? ',' : ':';
-		$this->server = $server . (($this->port) ? $port_delimiter . $this->port : '');
-
-		@ini_set('mssql.charset', 'UTF-8');
-		@ini_set('mssql.textlimit', 2147483647);
-		@ini_set('mssql.textsize', 2147483647);
-
-		$this->db_connect_id = ($this->persistency) ? @mssql_pconnect($this->server, $this->user, $password, $new_link) : @mssql_connect($this->server, $this->user, $password, $new_link);
-
-		if (!$this->db_connect_id || !$this->dbname)
-		{
-			return $this->sql_error(phpbb::$last_notice['message']);
-		}
-
-		if (!@mssql_select_db($this->dbname, $this->db_connect_id))
-		{
-			return $this->sql_error('');
-		}
-
-		return $this->db_connect_id;
-	}
-
-	/**
-	* Version information about used database. See {@link phpbb_dbal::sql_server_info() sql_server_info()} for details.
-	*/
-	public function sql_server_info($raw = false)
-	{
-		if (!phpbb::registered('acm') || ($this->sql_server_version = phpbb::$acm->get('#mssql_version')) === false)
-		{
-			$result_id = @mssql_query("SELECT SERVERPROPERTY('productversion'), SERVERPROPERTY('productlevel'), SERVERPROPERTY('edition')", $this->db_connect_id);
-
-			$row = false;
-			if ($result_id)
-			{
-				$row = @mssql_fetch_assoc($result_id);
-				@mssql_free_result($result_id);
-			}
-
-			$this->sql_server_version = ($row) ? trim(implode(' ', $row)) : 0;
-
-			if (phpbb::registered('acm'))
-			{
-				phpbb::$acm->put('#mssql_version', $this->sql_server_version);
-			}
-		}
-
-		if ($raw)
-		{
-			return $this->sql_server_version;
-		}
-
-		return ($this->sql_server_version) ? 'MSSQL<br />' . $this->sql_server_version : 'MSSQL';
-	}
-
-	/**
-	* DB-specific base query method. See {@link phpbb_dbal::_sql_query() _sql_query()} for details.
-	*/
-	protected function _sql_query($query)
-	{
-		return @mssql_query($query, $this->db_connect_id);
-	}
-
-	/**
-	* Build LIMIT query and run it. See {@link phpbb_dbal::_sql_query_limit() _sql_query_limit()} for details.
-	*/
-	protected function _sql_query_limit($query, $total, $offset, $cache_ttl)
-	{
-		// Since TOP is only returning a set number of rows we won't need it if total is set to 0 (return all rows)
-		if ($total)
-		{
-			// We need to grab the total number of rows + the offset number of rows to get the correct result
-			if (strpos($query, 'SELECT DISTINCT') === 0)
-			{
-				$query = 'SELECT DISTINCT TOP ' . ($total + $offset) . ' ' . substr($query, 15);
-			}
-			else
-			{
-				$query = 'SELECT TOP ' . ($total + $offset) . ' ' . substr($query, 6);
-			}
-		}
-
-		$result = $this->sql_query($query, $cache_ttl);
-
-		// Seek by $offset rows
-		if ($offset)
-		{
-			@mssql_data_seek($result, $offset);
-		}
-
-		return $result;
-	}
-
-	/**
-	* Close sql connection. See {@link phpbb_dbal::_sql_close() _sql_close()} for details.
-	*/
-	protected function _sql_close()
-	{
-		return @mssql_close($this->db_connect_id);
-	}
-
-	/**
-	* SQL Transaction. See {@link phpbb_dbal::_sql_transaction() _sql_transaction()} for details.
-	*/
-	protected function _sql_transaction($status)
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return @mssql_query('BEGIN TRANSACTION', $this->db_connect_id);
-			break;
-
-			case 'commit':
-				return @mssql_query('COMMIT TRANSACTION', $this->db_connect_id);
-			break;
-
-			case 'rollback':
-				return @mssql_query('ROLLBACK TRANSACTION', $this->db_connect_id);
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Return number of affected rows. See {@link phpbb_dbal::sql_affectedrows() sql_affectedrows()} for details.
-	*/
-	public function sql_affectedrows()
-	{
-		return ($this->db_connect_id) ? @mssql_rows_affected($this->db_connect_id) : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement. See {@link phpbb_dbal::sql_nextid() sql_nextid()} for details.
-	*/
-	public function sql_nextid()
-	{
-		$result_id = @mssql_query('SELECT SCOPE_IDENTITY()', $this->db_connect_id);
-
-		if ($result_id)
-		{
-			if ($row = @mssql_fetch_assoc($result_id))
-			{
-				@mssql_free_result($result_id);
-				return $row['computed'];
-			}
-			@mssql_free_result($result_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* Fetch current row. See {@link phpbb_dbal::_sql_fetchrow() _sql_fetchrow()} for details.
-	*/
-	protected function _sql_fetchrow($query_id)
-	{
-		$row = @mssql_fetch_assoc($query_id);
-
-		// I hope i am able to remove this later... hopefully only a PHP or MSSQL bug
-		if ($row)
-		{
-			foreach ($row as $key => $value)
-			{
-				$row[$key] = ($value === ' ' || $value === NULL) ? '' : $value;
-			}
-		}
-
-		return $row;
-	}
-
-	/**
-	* Free query result. See {@link phpbb_dbal::_sql_freeresult() _sql_freeresult()} for details.
-	*/
-	protected function _sql_freeresult($query_id)
-	{
-		return @mssql_free_result($query_id);
-	}
-
-	/**
-	* Correctly adjust LIKE expression for special characters. See {@link phpbb_dbal::_sql_like_expression() _sql_like_expression()} for details.
-	*/
-	protected function _sql_like_expression($expression)
-	{
-		return $expression . " ESCAPE '\\'";
-	}
-
-	/**
-	* Escape string used in sql query. See {@link phpbb_dbal::sql_escape() sql_escape()} for details.
-	*/
-	public function sql_escape($msg)
-	{
-		return str_replace(array("'", "\0"), array("''", ''), $msg);
-	}
-
-	/**
-	* Expose a DBMS specific function. See {@link phpbb_dbal::sql_function() sql_function()} for details.
-	*/
-	public function sql_function($type, $col)
-	{
-		switch ($type)
-		{
-			case 'length_varchar':
-			case 'length_text':
-				return 'DATALENGTH(' . $col . ')';
-			break;
-		}
-	}
-
-	/**
-	* Handle data by using prepared statements. See {@link phpbb_dbal::sql_handle_data() sql_handle_data()} for details.
-	public function sql_handle_data($type, $table, $data, $where = '')
-	{
-	}
-	*/
-
-	/**
-	* Build DB-specific query bits. See {@link phpbb_dbal::_sql_custom_build() _sql_custom_build()} for details.
-	*/
-	protected function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
-	/**
-	* return sql error array. See {@link phpbb_dbal::_sql_error() _sql_error()} for details.
-	*/
-	protected function _sql_error()
-	{
-		$error = array(
-			'message'	=> @mssql_get_last_message(),
-			'code'		=> ''
-		);
-
-		// Get error code number
-		$result_id = @mssql_query('SELECT @@ERROR as code', $this->db_connect_id);
-		if ($result_id)
-		{
-			$row = @mssql_fetch_assoc($result_id);
-			$error['code'] = $row['code'];
-			@mssql_free_result($result_id);
-		}
-
-		// Get full error message if possible
-		$sql = 'SELECT CAST(description as varchar(255)) as message
-			FROM master.dbo.sysmessages
-			WHERE error = ' . $error['code'];
-		$result_id = @mssql_query($sql);
-
-		if ($result_id)
-		{
-			$row = @mssql_fetch_assoc($result_id);
-			if (!empty($row['message']))
-			{
-				$error['message'] .= '<br />' . $row['message'];
-			}
-			@mssql_free_result($result_id);
-		}
-
-		return $error;
-	}
-
-	/**
-	* Run DB-specific code to build SQL Report to explain queries, show statistics and runtime information. See {@link phpbb_dbal::_sql_report() _sql_report()} for details.
-	*/
-	protected function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'start':
-				$html_table = false;
-				@mssql_query('SET SHOWPLAN_TEXT ON;', $this->db_connect_id);
-				if ($result = @mssql_query($query, $this->db_connect_id))
-				{
-					@mssql_next_result($result);
-					while ($row = @mssql_fetch_row($result))
-					{
-						$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-					}
-				}
-				@mssql_query('SET SHOWPLAN_TEXT OFF;', $this->db_connect_id);
-				@mssql_free_result($result);
-
-				if ($html_table)
-				{
-					$this->html_hold .= '</table>';
-				}
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @mssql_query($query, $this->db_connect_id);
-				while ($void = @mssql_fetch_assoc($result))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@mssql_free_result($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/db/mssql_2005.php b/phpBB/includes/db/mssql_2005.php
deleted file mode 100644
index 4206e1f7e3..0000000000
--- a/phpBB/includes/db/mssql_2005.php
+++ /dev/null
@@ -1,350 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-include_once(PHPBB_ROOT_PATH . 'includes/db/dbal.' . PHP_EXT);
-
-/**
-* MSSQL Database Abstraction Layer
-* Minimum Requirement is MSSQL 2005+
-* @package dbal
-*/
-class phpbb_dbal_mssql_2005 extends phpbb_dbal
-{
-	/**
-	* @var string Database type. No distinction between versions or used extensions.
-	*/
-	public $dbms_type = 'mssql';
-
-	/**
-	* @var array Database type map, column layout information
-	*/
-	public $dbms_type_map = 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]',
-		'XSTEXT_UNI'=> '[varchar] (100)',
-		'STEXT_UNI'	=> '[varchar] (255)',
-		'TEXT_UNI'	=> '[varchar] (4000)',
-		'MTEXT_UNI'	=> '[text]',
-		'TIMESTAMP'	=> '[int]',
-		'DECIMAL'	=> '[float]',
-		'DECIMAL:'	=> '[float]',
-		'PDECIMAL'	=> '[float]',
-		'PDECIMAL:'	=> '[float]',
-		'VCHAR_UNI'	=> '[varchar] (255)',
-		'VCHAR_UNI:'=> '[varchar] (%d)',
-		'VARBINARY'	=> '[varchar] (255)',
-	);
-
-	/**
-	* Connect to server. See {@link phpbb_dbal::sql_connect() sql_connect()} for details.
-	*/
-	public function sql_connect($server, $user, $password, $database, $port = false, $persistency = false , $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $user;
-		$this->server = $server . (($port) ? ':' . $port : '');
-		$this->dbname = $database;
-		$this->port = $port;
-
-		$conn_info = array();
-		if ($this->user)
-		{
-			$conn_info['UID'] = $this->user;
-		}
-
-		if ($password)
-		{
-			$conn_info['PWD'] = $password;
-		}
-
-		$this->db_connect_id = @sqlsrv_connect($this->server, $conn_info);
-
-		if (!$this->db_connect_id || !$this->dbname)
-		{
-			return $this->sql_error('');
-		}
-
-		if (!@sqlsrv_query($this->db_connect_id, 'USE ' . $this->dbname))
-		{
-			return $this->sql_error('');
-		}
-
-		return $this->db_connect_id;
-	}
-
-	/**
-	* Version information about used database. See {@link phpbb_dbal::sql_server_info() sql_server_info()} for details.
-	*/
-	public function sql_server_info($raw = false)
-	{
-		if (!phpbb::registered('acm') || ($this->sql_server_version = phpbb::$acm->get('#mssql2005_version')) === false)
-		{
-			$server_info = @sqlsrv_server_info($this->db_connect_id);
-
-			$this->sql_server_version = (!empty($server_info['SQLServerVersion'])) ? $server_info['SQLServerVersion'] : 0;
-
-			if (phpbb::registered('acm'))
-			{
-				phpbb::$acm->put('#mssql2005_version', $this->sql_server_version);
-			}
-		}
-
-		return ($raw) ? $this->sql_server_version : 'MSSQL ' . $this->sql_server_version;
-	}
-
-	/**
-	* DB-specific base query method. See {@link phpbb_dbal::_sql_query() _sql_query()} for details.
-	*/
-	protected function _sql_query($query)
-	{
-		if (strpos($query, 'BEGIN') === 0 || strpos($query, 'COMMIT') === 0)
-		{
-			return true;
-		}
-
-		return @sqlsrv_query($this->db_connect_id, $query);
-	}
-
-	/**
-	* Build LIMIT query and run it. See {@link phpbb_dbal::_sql_query_limit() _sql_query_limit()} for details.
-	*/
-	protected function _sql_query_limit($query, $total, $offset, $cache_ttl)
-	{
-		// Since TOP is only returning a set number of rows we won't need it if total is set to 0 (return all rows)
-		if ($total)
-		{
-			// We need to grab the total number of rows + the offset number of rows to get the correct result
-			if (strpos($query, 'SELECT DISTINCT') === 0)
-			{
-				$query = 'SELECT DISTINCT TOP ' . ($total + $offset) . ' ' . substr($query, 15);
-			}
-			else
-			{
-				$query = 'SELECT TOP ' . ($total + $offset) . ' ' . substr($query, 6);
-			}
-		}
-
-		$result = $this->sql_query($query, $cache_ttl);
-
-		// Seek by $offset rows
-		if ($offset)
-		{
-			// We do not fetch the row for rownum == 0 because then the next resultset would be the second row
-			for ($i = 0; $i < $offset; $i++)
-			{
-				if (!$this->sql_fetchrow($result))
-				{
-					return false;
-				}
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	* Close sql connection. See {@link phpbb_dbal::_sql_close() _sql_close()} for details.
-	*/
-	protected function _sql_close()
-	{
-		return @sqlsrv_close($this->db_connect_id);
-	}
-
-	/**
-	* SQL Transaction. See {@link phpbb_dbal::_sql_transaction() _sql_transaction()} for details.
-	*/
-	protected function _sql_transaction($status)
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return @sqlsrv_query($this->db_connect_id, 'BEGIN TRANSACTION');
-			break;
-
-			case 'commit':
-				return @sqlsrv_query($this->db_connect_id, 'COMMIT TRANSACTION');
-			break;
-
-			case 'rollback':
-				return @sqlsrv_query($this->db_connect_id, 'ROLLBACK TRANSACTION');
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Return number of affected rows. See {@link phpbb_dbal::sql_affectedrows() sql_affectedrows()} for details.
-	*/
-	public function sql_affectedrows()
-	{
-		return ($this->db_connect_id) ? @sqlsrv_rows_affected($this->db_connect_id) : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement. See {@link phpbb_dbal::sql_nextid() sql_nextid()} for details.
-	*/
-	public function sql_nextid()
-	{
-		$result_id = @sqlsrv_query($this->db_connect_id, 'SELECT SCOPE_IDENTITY()');
-		if ($result_id)
-		{
-			if ($row = @sqlsrv_fetch_array($result_id, SQLSRV_FETCH_ASSOC))
-			{
-				@sqlsrv_free_stmt($result_id);
-				return $row['computed'];
-			}
-			@sqlsrv_free_stmt($result_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* Fetch current row. See {@link phpbb_dbal::_sql_fetchrow() _sql_fetchrow()} for details.
-	*/
-	protected function _sql_fetchrow($query_id)
-	{
-		$row = @sqlsrv_fetch_array($query_id, SQLSRV_FETCH_ASSOC);
-
-		// I hope i am able to remove this later... hopefully only a PHP or MSSQL bug
-		if ($row)
-		{
-			foreach ($row as $key => $value)
-			{
-				$row[$key] = ($value === ' ' || $value === NULL) ? '' : $value;
-			}
-		}
-
-		return $row;
-	}
-
-	/**
-	* Free query result. See {@link phpbb_dbal::_sql_freeresult() _sql_freeresult()} for details.
-	*/
-	protected function _sql_freeresult($query_id)
-	{
-		return @sqlsrv_free_stmt($query_id);
-	}
-
-	/**
-	* Correctly adjust LIKE expression for special characters. See {@link phpbb_dbal::_sql_like_expression() _sql_like_expression()} for details.
-	*/
-	protected function _sql_like_expression($expression)
-	{
-		return $expression . " ESCAPE '\\'";
-	}
-
-	/**
-	* Escape string used in sql query. See {@link phpbb_dbal::sql_escape() sql_escape()} for details.
-	*/
-	public function sql_escape($msg)
-	{
-		return str_replace("'", "''", $msg);
-	}
-
-	/**
-	* Expose a DBMS specific function. See {@link phpbb_dbal::sql_function() sql_function()} for details.
-	*/
-	public function sql_function($type, $col)
-	{
-		switch ($type)
-		{
-			case 'length_varchar':
-			case 'length_text':
-				return 'DATALENGTH(' . $col . ')';
-			break;
-		}
-	}
-
-	/**
-	* Handle data by using prepared statements. See {@link phpbb_dbal::sql_handle_data() sql_handle_data()} for details.
-	public function sql_handle_data($type, $table, $data, $where = '')
-	{
-	}
-	*/
-
-	/**
-	* Build DB-specific query bits. See {@link phpbb_dbal::_sql_custom_build() _sql_custom_build()} for details.
-	*/
-	protected function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
-	/**
-	* return sql error array. See {@link phpbb_dbal::_sql_error() _sql_error()} for details.
-	*/
-	protected function _sql_error()
-	{
-		$message = $code = array();
-		foreach (@sqlsrv_errors() as $error_array)
-		{
-			$message[] = $error_array['message'];
-			$code[] = $error_array['code'];
-		}
-
-		$error = array(
-			'message'	=> implode('<br />', $message),
-			'code'		=> implode('<br />', $code),
-		);
-
-		return $error;
-	}
-
-	/**
-	* Run DB-specific code to build SQL Report to explain queries, show statistics and runtime information. See {@link phpbb_dbal::_sql_report() _sql_report()} for details.
-	*/
-	protected function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @sqlsrv_query($this->db_connect_id, $query);
-				while ($void = @sqlsrv_fetch_array($result, SQLSRV_FETCH_ASSOC))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@sqlsrv_free_stmt($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php
deleted file mode 100644
index 3fd5635150..0000000000
--- a/phpBB/includes/db/mssql_odbc.php
+++ /dev/null
@@ -1,380 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-include_once(PHPBB_ROOT_PATH . 'includes/db/dbal.' . PHP_EXT);
-
-/**
-* Unified ODBC functions
-* Unified ODBC functions support any database having ODBC driver, for example Adabas D, IBM DB2, iODBC, Solid, Sybase SQL Anywhere...
-* Here we only support MSSQL Server 2000+ because of the provided schema
-*
-* @note number of bytes returned for returning data depends on odbc.defaultlrl php.ini setting.
-* If it is limited to 4K for example only 4K of data is returned max, resulting in incomplete theme data for example.
-* @note odbc.defaultbinmode may affect UTF8 characters
-*
-* @package dbal
-*/
-class phpbb_dbal_mssql_odbc extends phpbb_dbal
-{
-	/**
-	* @var string Database type. No distinction between versions or used extensions.
-	*/
-	public $dbms_type = 'mssql';
-
-	/**
-	* @var array Database type map, column layout information
-	*/
-	public $dbms_type_map = 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]',
-		'XSTEXT_UNI'=> '[varchar] (100)',
-		'STEXT_UNI'	=> '[varchar] (255)',
-		'TEXT_UNI'	=> '[varchar] (4000)',
-		'MTEXT_UNI'	=> '[text]',
-		'TIMESTAMP'	=> '[int]',
-		'DECIMAL'	=> '[float]',
-		'DECIMAL:'	=> '[float]',
-		'PDECIMAL'	=> '[float]',
-		'PDECIMAL:'	=> '[float]',
-		'VCHAR_UNI'	=> '[varchar] (255)',
-		'VCHAR_UNI:'=> '[varchar] (%d)',
-		'VARBINARY'	=> '[varchar] (255)',
-	);
-
-	/**
-	* Connect to server. See {@link phpbb_dbal::sql_connect() sql_connect()} for details.
-	*/
-	public function sql_connect($server, $user, $password, $database, $port = false, $persistency = false , $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $user;
-		$this->dbname = $database;
-		$this->port = $port;
-
-		$port_delimiter = (defined('PHP_OS') && substr(PHP_OS, 0, 3) === 'WIN') ? ',' : ':';
-		$this->server = $server . (($port) ? $port_delimiter . $port : '');
-
-		$max_size = @ini_get('odbc.defaultlrl');
-		if (!empty($max_size))
-		{
-			$unit = strtolower(substr($max_size, -1, 1));
-			$max_size = (int) $max_size;
-
-			if ($unit == 'k')
-			{
-				$max_size = floor($max_size / 1024);
-			}
-			else if ($unit == 'g')
-			{
-				$max_size *= 1024;
-			}
-			else if (is_numeric($unit))
-			{
-				$max_size = floor((int) ($max_size . $unit) / 1048576);
-			}
-			$max_size = max(8, $max_size) . 'M';
-
-			@ini_set('odbc.defaultlrl', $max_size);
-		}
-
-		$this->db_connect_id = ($this->persistency) ? @odbc_pconnect($this->server, $this->user, $password) : @odbc_connect($this->server, $this->user, $password);
-
-		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
-	}
-
-	/**
-	* Version information about used database. See {@link phpbb_dbal::sql_server_info() sql_server_info()} for details.
-	*/
-	public function sql_server_info($raw = false)
-	{
-		if (!phpbb::registered('acm') || ($this->sql_server_version = phpbb::$acm->get('#mssqlodbc_version')) === false)
-		{
-			$result_id = @odbc_exec($this->db_connect_id, "SELECT SERVERPROPERTY('productversion'), SERVERPROPERTY('productlevel'), SERVERPROPERTY('edition')");
-
-			$row = false;
-			if ($result_id)
-			{
-				$row = @odbc_fetch_array($result_id);
-				@odbc_free_result($result_id);
-			}
-
-			$this->sql_server_version = ($row) ? trim(implode(' ', $row)) : 0;
-
-			if (phpbb::registered('acm'))
-			{
-				phpbb::$acm->put('#mssqlodbc_version', $this->sql_server_version);
-			}
-		}
-
-		if ($raw)
-		{
-			return $this->sql_server_version;
-		}
-
-		return ($this->sql_server_version) ? 'MSSQL (ODBC)<br />' . $this->sql_server_version : 'MSSQL (ODBC)';
-	}
-
-	/**
-	* DB-specific base query method. See {@link phpbb_dbal::_sql_query() _sql_query()} for details.
-	*/
-	protected function _sql_query($query)
-	{
-		return @odbc_exec($this->db_connect_id, $query);
-	}
-
-	/**
-	* Build LIMIT query and run it. See {@link phpbb_dbal::_sql_query_limit() _sql_query_limit()} for details.
-	*/
-	protected function _sql_query_limit($query, $total, $offset, $cache_ttl)
-	{
-		// Since TOP is only returning a set number of rows we won't need it if total is set to 0 (return all rows)
-		if ($total)
-		{
-			// We need to grab the total number of rows + the offset number of rows to get the correct result
-			if (strpos($query, 'SELECT DISTINCT') === 0)
-			{
-				$query = 'SELECT DISTINCT TOP ' . ($total + $offset) . ' ' . substr($query, 15);
-			}
-			else
-			{
-				$query = 'SELECT TOP ' . ($total + $offset) . ' ' . substr($query, 6);
-			}
-		}
-
-		$result = $this->sql_query($query, $cache_ttl);
-
-		// Seek by $offset rows
-		if ($offset)
-		{
-			// We do not fetch the row for rownum == 0 because then the next resultset would be the second row
-			for ($i = 0; $i < $offset; $i++)
-			{
-				if (!$this->sql_fetchrow($result))
-				{
-					return false;
-				}
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	* Close sql connection. See {@link phpbb_dbal::_sql_close() _sql_close()} for details.
-	*/
-	protected function _sql_close()
-	{
-		return @odbc_close($this->db_connect_id);
-	}
-
-	/**
-	* SQL Transaction. See {@link phpbb_dbal::_sql_transaction() _sql_transaction()} for details.
-	*/
-	protected function _sql_transaction($status)
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return @odbc_exec($this->db_connect_id, 'BEGIN TRANSACTION');
-			break;
-
-			case 'commit':
-				return @odbc_exec($this->db_connect_id, 'COMMIT TRANSACTION');
-			break;
-
-			case 'rollback':
-				return @odbc_exec($this->db_connect_id, 'ROLLBACK TRANSACTION');
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Return number of affected rows. See {@link phpbb_dbal::sql_affectedrows() sql_affectedrows()} for details.
-	*/
-	public function sql_affectedrows()
-	{
-		return ($this->db_connect_id) ? @odbc_num_rows($this->query_result) : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement. See {@link phpbb_dbal::sql_nextid() sql_nextid()} for details.
-	*/
-	public function sql_nextid()
-	{
-		$result_id = @odbc_exec($this->db_connect_id, 'SELECT @@IDENTITY');
-
-		if ($result_id)
-		{
-			if (@odbc_fetch_array($result_id))
-			{
-				$id = @odbc_result($result_id, 1);
-				@odbc_free_result($result_id);
-				return $id;
-			}
-			@odbc_free_result($result_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* Fetch current row. See {@link phpbb_dbal::_sql_fetchrow() _sql_fetchrow()} for details.
-	* @note number of bytes returned depends on odbc.defaultlrl php.ini setting. If it is limited to 4K for example only 4K of data is returned max.
-	*/
-	protected function _sql_fetchrow($query_id)
-	{
-		return @odbc_fetch_array($query_id);
-	}
-
-	/**
-	* Free query result. See {@link phpbb_dbal::_sql_freeresult() _sql_freeresult()} for details.
-	*/
-	protected function _sql_freeresult($query_id)
-	{
-		return @odbc_free_result($query_id);
-	}
-
-	/**
-	* Correctly adjust LIKE expression for special characters. See {@link phpbb_dbal::_sql_like_expression() _sql_like_expression()} for details.
-	*/
-	protected function _sql_like_expression($expression)
-	{
-		return $expression . " ESCAPE '\\'";
-	}
-
-	/**
-	* Escape string used in sql query. See {@link phpbb_dbal::sql_escape() sql_escape()} for details.
-	*/
-	public function sql_escape($msg)
-	{
-		return str_replace(array("'", "\0"), array("''", ''), $msg);
-	}
-
-	/**
-	* Expose a DBMS specific function. See {@link phpbb_dbal::sql_function() sql_function()} for details.
-	*/
-	public function sql_function($type, $col)
-	{
-		switch ($type)
-		{
-			case 'length_varchar':
-			case 'length_text':
-				return 'DATALENGTH(' . $col . ')';
-			break;
-		}
-	}
-
-	/**
-	* Handle data by using prepared statements. See {@link phpbb_dbal::sql_handle_data() sql_handle_data()} for details.
-	public function sql_handle_data($type, $table, $data, $where = '')
-	{
-		if ($type === 'INSERT')
-		{
-			$stmt = odbc_prepare($this->db_connect_id, "INSERT INTO $table (". implode(', ', array_keys($data)) . ") VALUES (" . substr(str_repeat('?, ', sizeof($data)) ,0, -1) . ')');
-		}
-		else
-		{
-			$query = "UPDATE $table SET ";
-
-			$set = array();
-			foreach (array_keys($data) as $key)
-			{
-				$set[] = "$key = ?";
-			}
-			$query .= implode(', ', $set);
-
-			if ($where !== '')
-			{
-				$query .= $where;
-			}
-
-			$stmt = odbc_prepare($this->db_connect_id, $query);
-		}
-
-		// get the stmt onto the top of the function arguments
-		array_unshift($data, $stmt);
-
-		call_user_func_array('odbc_execute', $data);
-	}
-	*/
-
-	/**
-	* Build DB-specific query bits. See {@link phpbb_dbal::_sql_custom_build() _sql_custom_build()} for details.
-	*/
-	protected function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
-	/**
-	* return sql error array. See {@link phpbb_dbal::_sql_error() _sql_error()} for details.
-	*/
-	protected function _sql_error()
-	{
-		return array(
-			'message'	=> @odbc_errormsg(),
-			'code'		=> @odbc_error()
-		);
-	}
-
-	/**
-	* Run DB-specific code to build SQL Report to explain queries, show statistics and runtime information. See {@link phpbb_dbal::_sql_report() _sql_report()} for details.
-	*/
-	protected function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'start':
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @odbc_exec($this->db_connect_id, $query);
-				while ($void = @odbc_fetch_array($result))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@odbc_free_result($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
deleted file mode 100644
index ac0384d523..0000000000
--- a/phpBB/includes/db/mysql.php
+++ /dev/null
@@ -1,447 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* MySQL Database Abstraction Layer
-* Compatible with:
-* MySQL 4.1+
-* MySQL 5.0+
-* @package dbal
-*/
-class phpbb_dbal_mysql extends phpbb_dbal
-{
-	/**
-	* @var string Database type. No distinction between versions or used extensions.
-	*/
-	public $dbms_type = 'mysql';
-
-	/**
-	* @var array Database type map, column layout information
-	*/
-	public $dbms_type_map = 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',
-		'XSTEXT_UNI'=> 'varchar(100)',
-		'STEXT'		=> 'text',
-		'STEXT_UNI'	=> 'varchar(255)',
-		'TEXT'		=> 'text',
-		'TEXT_UNI'	=> 'text',
-		'MTEXT'		=> 'mediumtext',
-		'MTEXT_UNI'	=> 'mediumtext',
-		'TIMESTAMP'	=> 'int(11) UNSIGNED',
-		'DECIMAL'	=> 'decimal(5,2)',
-		'DECIMAL:'	=> 'decimal(%d,2)',
-		'PDECIMAL'	=> 'decimal(6,3)',
-		'PDECIMAL:'	=> 'decimal(%d,3)',
-		'VCHAR_UNI'	=> 'varchar(255)',
-		'VCHAR_UNI:'=> 'varchar(%d)',
-		'VARBINARY'	=> 'varbinary(255)',
-	);
-
-	/**
-	* Connect to server. See {@link phpbb_dbal::sql_connect() sql_connect()} for details.
-	*/
-	public function sql_connect($server, $user, $password, $database, $port = false, $persistency = false , $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $user;
-		$this->server = $server . (($port) ? ':' . $port : '');
-		$this->dbname = $database;
-		$this->port = $port;
-
-		$this->db_connect_id = ($this->persistency) ? @mysql_pconnect($this->server, $this->user, $password, $new_link) : @mysql_connect($this->server, $this->user, $password, $new_link);
-
-		if (!$this->db_connect_id || !$this->dbname)
-		{
-			return $this->sql_error('');
-		}
-
-		if (!@mysql_select_db($this->dbname, $this->db_connect_id))
-		{
-			return $this->sql_error('');
-		}
-
-		@mysql_query("SET NAMES 'utf8'", $this->db_connect_id);
-
-		// enforce strict mode on databases that support it
-		if (version_compare($this->sql_server_info(true), '5.0.2', '>='))
-		{
-			$result = @mysql_query('SELECT @@session.sql_mode AS sql_mode', $this->db_connect_id);
-			$row = @mysql_fetch_assoc($result);
-			@mysql_free_result($result);
-
-			$modes = array_map('trim', explode(',', $row['sql_mode']));
-
-			// TRADITIONAL includes STRICT_ALL_TABLES and STRICT_TRANS_TABLES
-			if (!in_array('TRADITIONAL', $modes))
-			{
-				if (!in_array('STRICT_ALL_TABLES', $modes))
-				{
-					$modes[] = 'STRICT_ALL_TABLES';
-				}
-
-				if (!in_array('STRICT_TRANS_TABLES', $modes))
-				{
-					$modes[] = 'STRICT_TRANS_TABLES';
-				}
-			}
-
-			$mode = implode(',', $modes);
-			@mysql_query("SET SESSION sql_mode='{$mode}'", $this->db_connect_id);
-		}
-
-		return $this->db_connect_id;
-	}
-
-	/**
-	* Version information about used database. See {@link phpbb_dbal::sql_server_info() sql_server_info()} for details.
-	*/
-	public function sql_server_info($raw = false)
-	{
-		if (!phpbb::registered('acm') || ($this->sql_server_version = phpbb::$acm->get('#mysql_version')) === false)
-		{
-			$result = @mysql_query('SELECT VERSION() AS version', $this->db_connect_id);
-			$row = @mysql_fetch_assoc($result);
-			@mysql_free_result($result);
-
-			$this->sql_server_version = trim($row['version']);
-
-			if (phpbb::registered('acm'))
-			{
-				phpbb::$acm->put('#mysql_version', $this->sql_server_version);
-			}
-		}
-
-		return ($raw) ? $this->sql_server_version : 'MySQL ' . $this->sql_server_version;
-	}
-
-	/**
-	* DB-specific base query method. See {@link phpbb_dbal::_sql_query() _sql_query()} for details.
-	*/
-	protected function _sql_query($query)
-	{
-		return @mysql_query($query, $this->db_connect_id);
-	}
-
-	/**
-	* Build LIMIT query and run it. See {@link phpbb_dbal::_sql_query_limit() _sql_query_limit()} for details.
-	*/
-	protected function _sql_query_limit($query, $total, $offset, $cache_ttl)
-	{
-		// if $total is set to 0 we do not want to limit the number of rows
-		if ($total == 0)
-		{
-			// MySQL 4.1+ no longer supports -1 in limit queries
-			$total = '18446744073709551615';
-		}
-
-		$query .= "\n LIMIT " . ((!empty($offset)) ? $offset . ', ' . $total : $total);
-		return $this->sql_query($query, $cache_ttl);
-	}
-
-	/**
-	* Close sql connection. See {@link phpbb_dbal::_sql_close() _sql_close()} for details.
-	*/
-	protected function _sql_close()
-	{
-		return @mysql_close($this->db_connect_id);
-	}
-
-	/**
-	* SQL Transaction. See {@link phpbb_dbal::_sql_transaction() _sql_transaction()} for details.
-	*/
-	protected function _sql_transaction($status)
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return @mysql_query('BEGIN', $this->db_connect_id);
-			break;
-
-			case 'commit':
-				return @mysql_query('COMMIT', $this->db_connect_id);
-			break;
-
-			case 'rollback':
-				return @mysql_query('ROLLBACK', $this->db_connect_id);
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Return number of affected rows. See {@link phpbb_dbal::sql_affectedrows() sql_affectedrows()} for details.
-	*/
-	public function sql_affectedrows()
-	{
-		return ($this->db_connect_id) ? @mysql_affected_rows($this->db_connect_id) : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement. See {@link phpbb_dbal::sql_nextid() sql_nextid()} for details.
-	*/
-	public function sql_nextid()
-	{
-		return ($this->db_connect_id) ? @mysql_insert_id($this->db_connect_id) : false;
-	}
-
-	/**
-	* Fetch current row. See {@link phpbb_dbal::_sql_fetchrow() _sql_fetchrow()} for details.
-	*/
-	protected function _sql_fetchrow($query_id)
-	{
-		return @mysql_fetch_assoc($query_id);
-	}
-
-	/**
-	* Free query result. See {@link phpbb_dbal::_sql_freeresult() _sql_freeresult()} for details.
-	*/
-	protected function _sql_freeresult($query_id)
-	{
-		return @mysql_free_result($query_id);
-	}
-
-	/**
-	* Correctly adjust LIKE expression for special characters. See {@link phpbb_dbal::_sql_like_expression() _sql_like_expression()} for details.
-	*/
-	protected function _sql_like_expression($expression)
-	{
-		return $expression;
-	}
-
-	/**
-	* Escape string used in sql query. See {@link phpbb_dbal::sql_escape() sql_escape()} for details.
-	*/
-	public function sql_escape($msg)
-	{
-		if (!$this->db_connect_id)
-		{
-			return @mysql_real_escape_string($msg);
-		}
-
-		return @mysql_real_escape_string($msg, $this->db_connect_id);
-	}
-
-	/**
-	* Expose a DBMS specific function. See {@link phpbb_dbal::sql_function() sql_function()} for details.
-	*/
-	public function sql_function($type, $col)
-	{
-		switch ($type)
-		{
-			case 'length_varchar':
-			case 'length_text':
-				return 'LENGTH(' . $col . ')';
-			break;
-		}
-	}
-
-	/**
-	* Handle data by using prepared statements. See {@link phpbb_dbal::sql_handle_data() sql_handle_data()} for details.
-	public function sql_handle_data($type, $table, $data, $where = '')
-	{
-	}
-	*/
-
-	/**
-	* Build DB-specific query bits. See {@link phpbb_dbal::_sql_custom_build() _sql_custom_build()} for details.
-	*/
-	protected function _sql_custom_build($stage, $data)
-	{
-		switch ($stage)
-		{
-			case 'FROM':
-				$data = '(' . $data . ')';
-			break;
-		}
-
-		return $data;
-	}
-
-	/**
-	* return sql error array. See {@link phpbb_dbal::_sql_error() _sql_error()} for details.
-	*/
-	protected function _sql_error()
-	{
-		if (!$this->db_connect_id)
-		{
-			return array(
-				'message'	=> @mysql_error(),
-				'code'		=> @mysql_errno()
-			);
-		}
-
-		return array(
-			'message'	=> @mysql_error($this->db_connect_id),
-			'code'		=> @mysql_errno($this->db_connect_id)
-		);
-	}
-
-	/**
-	* Run DB-specific code to build SQL Report to explain queries, show statistics and runtime information. See {@link phpbb_dbal::_sql_report() _sql_report()} for details.
-	*/
-	protected function _sql_report($mode, $query = '')
-	{
-		static $test_prof;
-		static $test_extend;
-
-		// current detection method, might just switch to see the existance of INFORMATION_SCHEMA.PROFILING
-		if ($test_prof === null)
-		{
-			$test_prof = $test_extend = false;
-			if (version_compare($this->sql_server_info(true), '5.0.37', '>=') && version_compare($this->sql_server_info(true), '5.1', '<'))
-			{
-				$test_prof = true;
-			}
-
-			if (version_compare($this->sql_server_info(true), '4.1.1', '>='))
-			{
-				$test_extend = true;
-			}
-		}
-
-		switch ($mode)
-		{
-			case 'start':
-
-				$explain_query = $query;
-				if (preg_match('/UPDATE ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
-				{
-					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
-				}
-				else if (preg_match('/DELETE FROM ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
-				{
-					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
-				}
-
-				if (preg_match('/^SELECT/', $explain_query))
-				{
-					$html_table = false;
-
-					// begin profiling
-					if ($test_prof)
-					{
-						@mysql_query('SET profiling = 1;', $this->db_connect_id);
-					}
-
-					if ($result = @mysql_query('EXPLAIN ' . (($test_extend) ? 'EXTENDED ' : '') . "$explain_query", $this->db_connect_id))
-					{
-						while ($row = @mysql_fetch_assoc($result))
-						{
-							$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-						}
-					}
-					@mysql_free_result($result);
-
-					if ($html_table)
-					{
-						$this->html_hold .= '</table>';
-					}
-
-					if ($test_extend)
-					{
-						$html_table = false;
-
-						if ($result = @mysql_query('SHOW WARNINGS', $this->db_connect_id))
-						{
-							$this->html_hold .= '<br />';
-							while ($row = @mysql_fetch_assoc($result))
-							{
-								$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-							}
-						}
-						@mysql_free_result($result);
-
-						if ($html_table)
-						{
-							$this->html_hold .= '</table>';
-						}
-					}
-
-					if ($test_prof)
-					{
-						$html_table = false;
-
-						// get the last profile
-						if ($result = @mysql_query('SHOW PROFILE ALL;', $this->db_connect_id))
-						{
-							$this->html_hold .= '<br />';
-							while ($row = @mysql_fetch_assoc($result))
-							{
-								// make <unknown> HTML safe
-								if (!empty($row['Source_function']))
-								{
-									$row['Source_function'] = str_replace(array('<', '>'), array('&lt;', '&gt;'), $row['Source_function']);
-								}
-
-								// remove unsupported features
-								foreach ($row as $key => $val)
-								{
-									if ($val === null)
-									{
-										unset($row[$key]);
-									}
-								}
-								$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-							}
-						}
-						@mysql_free_result($result);
-
-						if ($html_table)
-						{
-							$this->html_hold .= '</table>';
-						}
-
-						@mysql_query('SET profiling = 0;', $this->db_connect_id);
-					}
-				}
-
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @mysql_query($query, $this->db_connect_id);
-				while ($void = @mysql_fetch_assoc($result))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@mysql_free_result($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
deleted file mode 100644
index 386efdbff0..0000000000
--- a/phpBB/includes/db/mysqli.php
+++ /dev/null
@@ -1,472 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* MySQLi Database Abstraction Layer
-* Compatible with:
-* MySQL 4.1+
-* MySQL 5.0+
-* @package dbal
-*/
-class phpbb_dbal_mysqli extends phpbb_dbal
-{
-	/**
-	* @var string Database type. No distinction between versions or used extensions.
-	*/
-	public $dbms_type = 'mysql';
-
-	/**
-	* @var array Database type map, column layout information
-	*/
-	public $dbms_type_map = 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',
-		'XSTEXT_UNI'=> 'varchar(100)',
-		'STEXT'		=> 'text',
-		'STEXT_UNI'	=> 'varchar(255)',
-		'TEXT'		=> 'text',
-		'TEXT_UNI'	=> 'text',
-		'MTEXT'		=> 'mediumtext',
-		'MTEXT_UNI'	=> 'mediumtext',
-		'TIMESTAMP'	=> 'int(11) UNSIGNED',
-		'DECIMAL'	=> 'decimal(5,2)',
-		'DECIMAL:'	=> 'decimal(%d,2)',
-		'PDECIMAL'	=> 'decimal(6,3)',
-		'PDECIMAL:'	=> 'decimal(%d,3)',
-		'VCHAR_UNI'	=> 'varchar(255)',
-		'VCHAR_UNI:'=> 'varchar(%d)',
-		'VARBINARY'	=> 'varbinary(255)',
-	);
-
-	/**
-	* Connect to server. See {@link phpbb_dbal::sql_connect() sql_connect()} for details.
-	*/
-	public function sql_connect($server, $user, $password, $database, $port = false, $persistency = false , $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $user;
-		$this->server = $server;
-		$this->dbname = $database;
-		$this->port = (!$port) ? NULL : $port;
-
-		// Persistant connections not supported by the mysqli extension?
-		$this->db_connect_id = @mysqli_connect($this->server, $this->user, $password, $this->dbname, $this->port);
-
-		if (!$this->db_connect_id || !$this->dbname)
-		{
-			return $this->sql_error('');
-		}
-
-		@mysqli_query($this->db_connect_id, "SET NAMES 'utf8'");
-
-		// enforce strict mode on databases that support it
-		if (version_compare($this->sql_server_info(true), '5.0.2', '>='))
-		{
-			$result = @mysqli_query($this->db_connect_id, 'SELECT @@session.sql_mode AS sql_mode');
-			$row = @mysqli_fetch_assoc($result);
-			@mysqli_free_result($result);
-
-			$modes = array_map('trim', explode(',', $row['sql_mode']));
-
-			// TRADITIONAL includes STRICT_ALL_TABLES and STRICT_TRANS_TABLES
-			if (!in_array('TRADITIONAL', $modes))
-			{
-				if (!in_array('STRICT_ALL_TABLES', $modes))
-				{
-					$modes[] = 'STRICT_ALL_TABLES';
-				}
-
-				if (!in_array('STRICT_TRANS_TABLES', $modes))
-				{
-					$modes[] = 'STRICT_TRANS_TABLES';
-				}
-			}
-
-			$mode = implode(',', $modes);
-			@mysqli_query($this->db_connect_id, "SET SESSION sql_mode='{$mode}'");
-		}
-
-		return $this->db_connect_id;
-	}
-
-	/**
-	* Version information about used database. See {@link phpbb_dbal::sql_server_info() sql_server_info()} for details.
-	*/
-	public function sql_server_info($raw = false)
-	{
-		if (!phpbb::registered('acm') || ($this->sql_server_version = phpbb::$acm->get('#mysqli_version')) === false)
-		{
-			$result = @mysqli_query($this->db_connect_id, 'SELECT VERSION() AS version');
-			$row = @mysqli_fetch_assoc($result);
-			@mysqli_free_result($result);
-
-			$this->sql_server_version = trim($row['version']);
-
-			if (phpbb::registered('acm'))
-			{
-				phpbb::$acm->put('#mysqli_version', $this->sql_server_version);
-			}
-		}
-
-		return ($raw) ? $this->sql_server_version : 'MySQL(i) ' . $this->sql_server_version;
-	}
-
-	/**
-	* DB-specific base query method. See {@link phpbb_dbal::_sql_query() _sql_query()} for details.
-	*/
-	protected function _sql_query($query)
-	{
-		return @mysqli_query($this->db_connect_id, $query);
-	}
-
-	/**
-	* Build LIMIT query and run it. See {@link phpbb_dbal::_sql_query_limit() _sql_query_limit()} for details.
-	*/
-	protected function _sql_query_limit($query, $total, $offset, $cache_ttl)
-	{
-		// if $total is set to 0 we do not want to limit the number of rows
-		if ($total == 0)
-		{
-			// MySQL 4.1+ no longer supports -1 in limit queries
-			$total = '18446744073709551615';
-		}
-
-		$query .= "\n LIMIT " . ((!empty($offset)) ? $offset . ', ' . $total : $total);
-		return $this->sql_query($query, $cache_ttl);
-	}
-
-	/**
-	* Close sql connection. See {@link phpbb_dbal::_sql_close() _sql_close()} for details.
-	*/
-	protected function _sql_close()
-	{
-		return @mysqli_close($this->db_connect_id);
-	}
-
-	/**
-	* SQL Transaction. See {@link phpbb_dbal::_sql_transaction() _sql_transaction()} for details.
-	*/
-	protected function _sql_transaction($status)
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return @mysqli_autocommit($this->db_connect_id, false);
-			break;
-
-			case 'commit':
-				$result = @mysqli_commit($this->db_connect_id);
-				@mysqli_autocommit($this->db_connect_id, true);
-				return $result;
-			break;
-
-			case 'rollback':
-				$result = @mysqli_rollback($this->db_connect_id);
-				@mysqli_autocommit($this->db_connect_id, true);
-				return $result;
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Return number of affected rows. See {@link phpbb_dbal::sql_affectedrows() sql_affectedrows()} for details.
-	*/
-	public function sql_affectedrows()
-	{
-		return ($this->db_connect_id) ? @mysqli_affected_rows($this->db_connect_id) : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement. See {@link phpbb_dbal::sql_nextid() sql_nextid()} for details.
-	*/
-	public function sql_nextid()
-	{
-		return ($this->db_connect_id) ? @mysqli_insert_id($this->db_connect_id) : false;
-	}
-
-	/**
-	* Fetch current row. See {@link phpbb_dbal::_sql_fetchrow() _sql_fetchrow()} for details.
-	*/
-	protected function _sql_fetchrow($query_id)
-	{
-		return @mysqli_fetch_assoc($query_id);
-	}
-
-	/**
-	* Free query result. See {@link phpbb_dbal::_sql_freeresult() _sql_freeresult()} for details.
-	*/
-	protected function _sql_freeresult($query_id)
-	{
-		return @mysqli_free_result($query_id);
-	}
-
-	/**
-	* Correctly adjust LIKE expression for special characters. See {@link phpbb_dbal::_sql_like_expression() _sql_like_expression()} for details.
-	*/
-	protected function _sql_like_expression($expression)
-	{
-		return $expression;
-	}
-
-	/**
-	* Escape string used in sql query. See {@link phpbb_dbal::sql_escape() sql_escape()} for details.
-	*/
-	public function sql_escape($msg)
-	{
-		return @mysqli_real_escape_string($this->db_connect_id, $msg);
-	}
-
-	/**
-	* Expose a DBMS specific function. See {@link phpbb_dbal::sql_function() sql_function()} for details.
-	*/
-	public function sql_function($type, $col)
-	{
-		switch ($type)
-		{
-			case 'length_varchar':
-			case 'length_text':
-				return 'LENGTH(' . $col . ')';
-			break;
-		}
-	}
-
-	/**
-	* Handle data by using prepared statements. See {@link phpbb_dbal::sql_handle_data() sql_handle_data()} for details.
-	public function sql_handle_data($type, $table, $data, $where = '')
-	{
-		if ($type === 'INSERT')
-		{
-			$stmt = mysqli_prepare($this->db_connect_id, "INSERT INTO $table (". implode(', ', array_keys($data)) . ") VALUES (" . substr(str_repeat('?, ', sizeof($data)) ,0, -1) . ')');
-		}
-		else
-		{
-			$query = "UPDATE $table SET ";
-
-			$set = array();
-			foreach (array_keys($data) as $key)
-			{
-				$set[] = "$key = ?";
-			}
-			$query .= implode(', ', $set);
-
-			if ($where !== '')
-			{
-				$query .= ' WHERE ' . $where;
-			}
-
-			$stmt = mysqli_prepare($this->db_connect_id, $query);
-		}
-
-		// get the stmt onto the top of the function arguments
-		array_unshift($data, $stmt);
-
-		call_user_func_array('mysqli_stmt_bind_param', $data);
-		mysqli_stmt_execute($stmt);
-
-		mysqli_stmt_close($stmt);
-	}
-*/
-
-	/**
-	* Build DB-specific query bits. See {@link phpbb_dbal::_sql_custom_build() _sql_custom_build()} for details.
-	*/
-	protected function _sql_custom_build($stage, $data)
-	{
-		switch ($stage)
-		{
-			case 'FROM':
-				$data = '(' . $data . ')';
-			break;
-		}
-
-		return $data;
-	}
-
-	/**
-	* return sql error array. See {@link phpbb_dbal::_sql_error() _sql_error()} for details.
-	*/
-	protected function _sql_error()
-	{
-		if (!$this->db_connect_id)
-		{
-			return array(
-				'message'	=> @mysqli_connect_error(),
-				'code'		=> @mysqli_connect_errno()
-			);
-		}
-
-		return array(
-			'message'	=> @mysqli_error($this->db_connect_id),
-			'code'		=> @mysqli_errno($this->db_connect_id)
-		);
-	}
-
-	/**
-	* Run DB-specific code to build SQL Report to explain queries, show statistics and runtime information. See {@link phpbb_dbal::_sql_report() _sql_report()} for details.
-	*/
-	protected function _sql_report($mode, $query = '')
-	{
-		static $test_prof;
-		static $test_extend;
-
-		// current detection method, might just switch to see the existance of INFORMATION_SCHEMA.PROFILING
-		if ($test_prof === null)
-		{
-			$test_prof = $test_extend = false;
-			if (version_compare($this->sql_server_info(true), '5.0.37', '>=') && version_compare($this->sql_server_info(true), '5.1', '<'))
-			{
-				$test_prof = true;
-			}
-
-			if (version_compare($this->sql_server_info(true), '4.1.1', '>='))
-			{
-				$test_extend = true;
-			}
-		}
-
-		switch ($mode)
-		{
-			case 'start':
-
-				$explain_query = $query;
-				if (preg_match('/UPDATE ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
-				{
-					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
-				}
-				else if (preg_match('/DELETE FROM ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
-				{
-					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
-				}
-
-				if (preg_match('/^SELECT/', $explain_query))
-				{
-					$html_table = false;
-
-					// begin profiling
-					if ($test_prof)
-					{
-						@mysqli_query($this->db_connect_id, 'SET profiling = 1;');
-					}
-
-					if ($result = @mysqli_query($this->db_connect_id, 'EXPLAIN ' . (($test_extend) ? 'EXTENDED ' : '') . "$explain_query"))
-					{
-						while ($row = @mysqli_fetch_assoc($result))
-						{
-							$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-						}
-					}
-					@mysqli_free_result($result);
-
-					if ($html_table)
-					{
-						$this->html_hold .= '</table>';
-					}
-
-					if ($test_extend)
-					{
-						$html_table = false;
-
-						if ($result = @mysqli_query($this->db_connect_id, 'SHOW WARNINGS'))
-						{
-							$this->html_hold .= '<br />';
-							while ($row = @mysqli_fetch_assoc($result))
-							{
-								$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-							}
-						}
-						@mysqli_free_result($result);
-
-						if ($html_table)
-						{
-							$this->html_hold .= '</table>';
-						}
-					}
-
-					if ($test_prof)
-					{
-						$html_table = false;
-
-						// get the last profile
-						if ($result = @mysqli_query($this->db_connect_id, 'SHOW PROFILE ALL;'))
-						{
-							$this->html_hold .= '<br />';
-							while ($row = @mysqli_fetch_assoc($result))
-							{
-								// make <unknown> HTML safe
-								if (!empty($row['Source_function']))
-								{
-									$row['Source_function'] = str_replace(array('<', '>'), array('&lt;', '&gt;'), $row['Source_function']);
-								}
-
-								// remove unsupported features
-								foreach ($row as $key => $val)
-								{
-									if ($val === null)
-									{
-										unset($row[$key]);
-									}
-								}
-								$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-							}
-						}
-						@mysqli_free_result($result);
-
-						if ($html_table)
-						{
-							$this->html_hold .= '</table>';
-						}
-
-						@mysqli_query($this->db_connect_id, 'SET profiling = 0;');
-					}
-				}
-
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @mysqli_query($this->db_connect_id, $query);
-				while ($void = @mysqli_fetch_assoc($result))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@mysqli_free_result($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
deleted file mode 100644
index 3a69565e05..0000000000
--- a/phpBB/includes/db/oracle.php
+++ /dev/null
@@ -1,664 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Oracle Database Abstraction Layer
-* Minimum Requirement: 9.2+
-* @package dbal
-*/
-class phpbb_dbal_oracle extends phpbb_dbal
-{
-	/**
-	* @var string Database type. No distinction between versions or used extensions.
-	*/
-	public $dbms_type = 'oracle';
-
-	/**
-	* @var array Database type map, column layout information
-	*/
-	public $dbms_type_map = 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',
-		'XSTEXT_UNI'=> 'varchar2(300)',
-		'STEXT_UNI'	=> 'varchar2(765)',
-		'TEXT_UNI'	=> 'clob',
-		'MTEXT_UNI'	=> 'clob',
-		'TIMESTAMP'	=> 'number(11)',
-		'DECIMAL'	=> 'number(5, 2)',
-		'DECIMAL:'	=> 'number(%d, 2)',
-		'PDECIMAL'	=> 'number(6, 3)',
-		'PDECIMAL:'	=> 'number(%d, 3)',
-		'VCHAR_UNI'	=> 'varchar2(255)',
-		'VCHAR_UNI:'=> array('varchar2(%d)', 'limit' => array('mult', 3, 765, 'clob')),
-		'VARBINARY'	=> 'raw(255)',
-	);
-
-	/**
-	* @var string Last query executed. We need this for sql_nextid()
-	*/
-	var $last_query_text = '';
-
-	/**
-	* Connect to server. See {@link phpbb_dbal::sql_connect() sql_connect()} for details.
-	*/
-	public function sql_connect($server, $user, $password, $database, $port = false, $persistency = false , $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $user;
-		$this->server = $server . (($port) ? ':' . $port : '');
-		$this->dbname = $database;
-		$this->port = $port;
-
-		$connect = $database;
-
-		// support for "easy connect naming"
-		if ($server !== '' && $server !== '/')
-		{
-			if (substr($server, -1, 1) == '/')
-			{
-				$server == substr($sqlserver, 0, -1);
-			}
-			$connect = $server . (($port) ? ':' . $port : '') . '/' . $database;
-		}
-
-		$this->db_connect_id = ($new_link) ? @oci_new_connect($this->user, $password, $connect, 'AL32UTF8') : (($this->persistency) ? @oci_pconnect($this->user, $password, $connect, 'AL32UTF8') : @oci_connect($this->user, $password, $connect, 'AL32UTF8'));
-
-		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
-	}
-
-	/**
-	* Version information about used database. See {@link phpbb_dbal::sql_server_info() sql_server_info()} for details.
-	*/
-	public function sql_server_info($raw = false)
-	{
-		if (!phpbb::registered('acm') || ($this->sql_server_version = phpbb::$acm->get('#oracle_version')) === false)
-		{
-			$sql = "SELECT value
-				FROM NLS_DATABASE_PARAMETERS
-				WHERE PARAMETER = 'NLS_RDBMS_VERSION'";
-			$result = @ociparse($this->db_connect_id, $sql);
-			@ociexecute($result, OCI_DEFAULT);
-			@ocicommit($this->db_connect_id);
-
-			$row = array();
-			@ocifetchinto($result, $row, OCI_ASSOC + OCI_RETURN_NULLS);
-			@ocifreestatement($result);
-
-			$this->sql_server_version = (isset($row['VALUE'])) ? trim($row['VALUE']) : 0;
-
-			if (phpbb::registered('acm'))
-			{
-				phpbb::$acm->put('#oracle_version', $this->sql_server_version);
-			}
-		}
-
-		return ($raw) ? $this->sql_server_version : @oci_server_version($this->db_connect_id);
-	}
-
-	/**
-	* DB-specific base query method. See {@link phpbb_dbal::_sql_query() _sql_query()} for details.
-	*/
-	protected function _sql_query($query)
-	{
-		$this->last_query_text = $query;
-
-		$in_transaction = false;
-		if (!$this->transaction)
-		{
-			$this->sql_transaction('begin');
-		}
-		else
-		{
-			$in_transaction = true;
-		}
-
-		$array = array();
-
-		// We overcome Oracle's 4000 char limit by binding vars
-		if (strlen($query) > 4000)
-		{
-			if (preg_match('/^(INSERT INTO[^(]++)\\(([^()]+)\\) VALUES[^(]++\\((.*?)\\)$/s', $query, $regs))
-			{
-				if (strlen($regs[3]) > 4000)
-				{
-					$cols = explode(', ', $regs[2]);
-					preg_match_all('/\'(?:[^\']++|\'\')*+\'|[\d-.]+/', $regs[3], $vals, PREG_PATTERN_ORDER);
-
-					$inserts = $vals[0];
-					unset($vals);
-
-					foreach ($inserts as $key => $value)
-					{
-						// check to see if this thing is greater than the max + 'x2
-						if (!empty($value) && $value[0] === "'" && strlen($value) > 4002)
-						{
-							$inserts[$key] = ':' . strtoupper($cols[$key]);
-							$array[$inserts[$key]] = str_replace("''", "'", substr($value, 1, -1));
-						}
-					}
-
-					$query = $regs[1] . '(' . $regs[2] . ') VALUES (' . implode(', ', $inserts) . ')';
-				}
-			}
-			else if (preg_match_all('/^(UPDATE [\\w_]++\\s+SET )([\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+)(?:,\\s*[\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+))*+)\\s+(WHERE.*)$/s', $query, $data, PREG_SET_ORDER))
-			{
-				if (strlen($data[0][2]) > 4000)
-				{
-					$update = $data[0][1];
-					$where = $data[0][3];
-					preg_match_all('/([\\w_]++)\\s*=\\s*(\'(?:[^\']++|\'\')*+\'|[\d-.]++)/', $data[0][2], $temp, PREG_SET_ORDER);
-					unset($data);
-
-					$cols = array();
-					foreach ($temp as $value)
-					{
-						// check to see if this thing is greater than the max + 'x2
-						if (!empty($value[2]) && $value[2][0] === "'" && strlen($value[2]) > 4002)
-						{
-							$cols[] = $value[1] . '=:' . strtoupper($value[1]);
-							$array[$value[1]] = str_replace("''", "'", substr($value[2], 1, -1));
-						}
-						else
-						{
-							$cols[] = $value[1] . '=' . $value[2];
-						}
-					}
-
-					$query = $update . implode(', ', $cols) . ' ' . $where;
-					unset($cols);
-				}
-			}
-		}
-
-		switch (substr($query, 0, 6))
-		{
-			case 'DELETE':
-				if (preg_match('/^(DELETE FROM [\w_]++ WHERE)((?:\s*(?:AND|OR)?\s*[\w_]+\s*(?:(?:=|<>)\s*(?>\'(?>[^\']++|\'\')*+\'|[\d-.]+)|(?:NOT )?IN\s*\((?>\'(?>[^\']++|\'\')*+\',? ?|[\d-.]+,? ?)*+\)))*+)$/', $query, $regs))
-				{
-					$query = $regs[1] . $this->_rewrite_where($regs[2]);
-					unset($regs);
-				}
-			break;
-
-			case 'UPDATE':
-				if (preg_match('/^(UPDATE [\\w_]++\\s+SET [\\w_]+\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]++|:\w++)(?:, [\\w_]+\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]++|:\w++))*+\\s+WHERE)(.*)$/s',  $query, $regs))
-				{
-					$query = $regs[1] . $this->_rewrite_where($regs[2]);
-					unset($regs);
-				}
-			break;
-
-			case 'SELECT':
-				$query = preg_replace_callback('/([\w_.]++)\s*(?:(=|<>)\s*(?>\'(?>[^\']++|\'\')*+\'|[\d-.]++|([\w_.]++))|(?:NOT )?IN\s*\((?>\'(?>[^\']++|\'\')*+\',? ?|[\d-.]++,? ?)*+\))/', array($this, '_rewrite_col_compare'), $query);
-			break;
-		}
-
-		$result = @oci_parse($this->db_connect_id, $query);
-
-		if (!$result)
-		{
-			return false;
-		}
-
-		foreach ($array as $key => $value)
-		{
-			@oci_bind_by_name($result, $key, $array[$key], -1);
-		}
-
-		$success = @oci_execute($result, OCI_DEFAULT);
-
-		if (!$success)
-		{
-			return false;
-		}
-
-		if (!$in_transaction)
-		{
-			$this->sql_transaction('commit');
-		}
-
-		return $result;
-	}
-
-	/**
-	* Build LIMIT query and run it. See {@link phpbb_dbal::_sql_query_limit() _sql_query_limit()} for details.
-	*/
-	protected function _sql_query_limit($query, $total, $offset, $cache_ttl)
-	{
-		$query = 'SELECT * FROM (SELECT /*+ FIRST_ROWS */ rownum AS xrownum, a.* FROM (' . $query . ') a WHERE rownum <= ' . ($offset + $total) . ') WHERE xrownum >= ' . $offset;
-		return $this->sql_query($query, $cache_ttl);
-	}
-
-	/**
-	* Close sql connection. See {@link phpbb_dbal::_sql_close() _sql_close()} for details.
-	*/
-	protected function _sql_close()
-	{
-		return @oci_close($this->db_connect_id);
-	}
-
-	/**
-	* SQL Transaction. See {@link phpbb_dbal::_sql_transaction() _sql_transaction()} for details.
-	*/
-	protected function _sql_transaction($status)
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return true;
-			break;
-
-			case 'commit':
-				return @oci_commit($this->db_connect_id);
-			break;
-
-			case 'rollback':
-				return @oci_rollback($this->db_connect_id);
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Return number of affected rows. See {@link phpbb_dbal::sql_affectedrows() sql_affectedrows()} for details.
-	*/
-	public function sql_affectedrows()
-	{
-		return ($this->query_result) ? @oci_num_rows($this->query_result) : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement. See {@link phpbb_dbal::sql_nextid() sql_nextid()} for details.
-	*/
-	public function sql_nextid()
-	{
-		if (!$this->query_result || !$this->last_query_text)
-		{
-			return false;
-		}
-
-		if (preg_match('#^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)#is', $this->last_query_text, $tablename))
-		{
-			$query = 'SELECT ' . $tablename[1] . '_seq.currval FROM DUAL';
-			$stmt = @oci_parse($this->db_connect_id, $query);
-			@oci_execute($stmt, OCI_DEFAULT);
-
-			$temp_array = @oci_fetch_array($stmt, OCI_ASSOC + OCI_RETURN_NULLS);
-			@oci_free_statement($stmt);
-
-			return (isset($temp_array['CURRVAL'])) ? $temp_array['CURRVAL'] : false;
-		}
-
-		return false;
-	}
-
-	/**
-	* Fetch current row. See {@link phpbb_dbal::_sql_fetchrow() _sql_fetchrow()} for details.
-	*/
-	protected function _sql_fetchrow($query_id)
-	{
-		$row = @oci_fetch_array($query_id, OCI_ASSOC + OCI_RETURN_NULLS);
-
-		if (!$row)
-		{
-			return false;
-		}
-
-		$result_row = array();
-		foreach ($row as $key => $value)
-		{
-			// Oracle treats empty strings as null
-			if (is_null($value))
-			{
-				$value = '';
-			}
-
-			// OCI->CLOB?
-			if (is_object($value))
-			{
-				$value = $value->load();
-			}
-
-			$result_row[strtolower($key)] = $value;
-		}
-
-		return $result_row;
-	}
-
-	/**
-	* Free query result. See {@link phpbb_dbal::_sql_freeresult() _sql_freeresult()} for details.
-	*/
-	protected function _sql_freeresult($query_id)
-	{
-		return @oci_free_statement($query_id);
-	}
-
-	/**
-	* Correctly adjust LIKE expression for special characters. See {@link phpbb_dbal::_sql_like_expression() _sql_like_expression()} for details.
-	*/
-	protected function _sql_like_expression($expression)
-	{
-		return $expression . " ESCAPE '\\'";
-	}
-
-	/**
-	* Escape string used in sql query. See {@link phpbb_dbal::sql_escape() sql_escape()} for details.
-	*/
-	public function sql_escape($msg)
-	{
-		return str_replace(array("'", "\0"), array("''", ''), $msg);
-	}
-
-	/**
-	* Expose a DBMS specific function. See {@link phpbb_dbal::sql_function() sql_function()} for details.
-	*/
-	public function sql_function($type, $col)
-	{
-		switch ($type)
-		{
-			case 'length_varchar':
-				return 'LENGTH(' . $col . ')';
-			break;
-
-			case 'length_text':
-				return 'dbms_lob.getlength(' . $col . ')';
-			break;
-		}
-	}
-
-	/**
-	* Handle data by using prepared statements. See {@link phpbb_dbal::sql_handle_data() sql_handle_data()} for details.
-	public function sql_handle_data($type, $table, $data, $where = '')
-	{
-		if ($type === 'INSERT')
-		{
-			$stmt = oci_parse($this->db_connect_id, "INSERT INTO $table (". implode(', ', array_keys($data)) . ") VALUES (:" . implode(', :', array_keys($data)) . ')');
-		}
-		else
-		{
-			$query = "UPDATE $table SET ";
-
-			$set = array();
-			foreach (array_keys($data) as $key)
-			{
-				$set[] = "$key = :$key";
-			}
-			$query .= implode(', ', $set);
-
-			if ($where !== '')
-			{
-				$query .= $where;
-			}
-
-			$stmt = oci_parse($this->db_connect_id, $query);
-		}
-
-		foreach ($data as $column => $value)
-		{
-			oci_bind_by_name($stmt, ":$column", $data[$column], -1);
-		}
-
-		oci_execute($stmt);
-	}
-	*/
-
-	/**
-	* Build DB-specific query bits. See {@link phpbb_dbal::_sql_custom_build() _sql_custom_build()} for details.
-	*/
-	protected function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
-	/**
-	* return sql error array. See {@link phpbb_dbal::_sql_error() _sql_error()} for details.
-	*/
-	protected function _sql_error()
-	{
-		$error = @oci_error();
-		$error = (empty($error)) ? @oci_error($this->query_result) : $error;
-		$error = (empty($error)) ? @oci_error($this->db_connect_id) : $error;
-
-		if (empty($error))
-		{
-			$error = array(
-				'message'	=> '',
-				'code'		=> '',
-			);
-		}
-
-		return $error;
-	}
-
-	/**
-	* Run DB-specific code to build SQL Report to explain queries, show statistics and runtime information. See {@link phpbb_dbal::_sql_report() _sql_report()} for details.
-	*/
-	protected function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'start':
-				$html_table = false;
-
-				// Grab a plan table, any will do
-				$sql = "SELECT table_name
-					FROM USER_TABLES
-					WHERE table_name LIKE '%PLAN_TABLE%'";
-				$stmt = @oci_parse($this->db_connect_id, $sql);
-				@oci_execute($stmt);
-				$result = array();
-
-				if ($result = @oci_fetch_array($stmt, OCI_ASSOC + OCI_RETURN_NULLS))
-				{
-					$table = $result['TABLE_NAME'];
-
-					// This is the statement_id that will allow us to track the plan
-					$statement_id = substr(md5($query), 0, 30);
-
-					// Remove any stale plans
-					$stmt2 = @oci_parse($this->db_connect_id, "DELETE FROM $table WHERE statement_id='$statement_id'");
-					@oci_execute($stmt2);
-					@oci_free_statement($stmt2);
-
-					// Explain the plan
-					$sql = "EXPLAIN PLAN
-						SET STATEMENT_ID = '$statement_id'
-						FOR $query";
-					$stmt2 = @ociparse($this->db_connect_id, $sql);
-					@oci_execute($stmt2);
-					@oci_free_statement($stmt2);
-
-					// Get the data from the plan
-					$sql = "SELECT operation, options, object_name, object_type, cardinality, cost
-						FROM plan_table
-						START WITH id = 0 AND statement_id = '$statement_id'
-						CONNECT BY PRIOR id = parent_id
-							AND statement_id = '$statement_id'";
-					$stmt2 = @oci_parse($this->db_connect_id, $sql);
-					@oci_execute($stmt2);
-
-					$row = array();
-					while ($row = @oci_fetch_array($stmt2, OCI_ASSOC + OCI_RETURN_NULLS))
-					{
-						$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-					}
-					@oci_free_statement($stmt2);
-
-					// Remove the plan we just made, we delete them on request anyway
-					$stmt2 = @oci_parse($this->db_connect_id, "DELETE FROM $table WHERE statement_id='$statement_id'");
-					@oci_execute($stmt2);
-					@oci_free_statement($stmt2);
-				}
-
-				@oci_free_statement($stmt);
-
-				if ($html_table)
-				{
-					$this->html_hold .= '</table>';
-				}
-
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @oci_parse($this->db_connect_id, $query);
-				$success = @oci_execute($result, OCI_DEFAULT);
-				$row = array();
-
-				while ($void = @oci_fetch_array($result, OCI_ASSOC + OCI_RETURN_NULLS))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@oci_free_statement($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-
-	/**
-	* Oracle specific code to handle the fact that it does not compare columns properly
-	* @access private
-	*/
-	private function _rewrite_col_compare($args)
-	{
-		if (sizeof($args) == 4)
-		{
-			if ($args[2] == '=')
-			{
-				return '(' . $args[0] . ' OR (' . $args[1] . ' is NULL AND ' . $args[3] . ' is NULL))';
-			}
-			else if ($args[2] == '<>')
-			{
-				// really just a fancy way of saying foo <> bar or (foo is NULL XOR bar is NULL) but SQL has no XOR :P
-				return '(' . $args[0] . ' OR ((' . $args[1] . ' is NULL AND ' . $args[3] . ' is NOT NULL) OR (' . $args[1] . ' is NOT NULL AND ' . $args[3] . ' is NULL)))';
-			}
-		}
-		else
-		{
-			return $this->_rewrite_where($args[0]);
-		}
-	}
-
-	/**
-	* Oracle specific code to handle it's lack of sanity
-	* @access private
-	*/
-	private function _rewrite_where($where_clause)
-	{
-		preg_match_all('/\s*(AND|OR)?\s*([\w_.]++)\s*(?:(=|<[=>]?|>=?)\s*((?>\'(?>[^\']++|\'\')*+\'|[\d-.]+))|((NOT )?IN\s*\((?>\'(?>[^\']++|\'\')*+\',? ?|[\d-.]+,? ?)*+\)))/', $where_clause, $result, PREG_SET_ORDER);
-		$out = '';
-
-		foreach ($result as $val)
-		{
-			if (!isset($val[5]))
-			{
-				if ($val[4] !== "''")
-				{
-					$out .= $val[0];
-				}
-				else
-				{
-					$out .= ' ' . $val[1] . ' ' . $val[2];
-					if ($val[3] == '=')
-					{
-						$out .= ' is NULL';
-					}
-					else if ($val[3] == '<>')
-					{
-						$out .= ' is NOT NULL';
-					}
-				}
-			}
-			else
-			{
-				$in_clause = array();
-				$sub_exp = substr($val[5], strpos($val[5], '(') + 1, -1);
-				$extra = false;
-				preg_match_all('/\'(?>[^\']++|\'\')*+\'|[\d-.]++/', $sub_exp, $sub_vals, PREG_PATTERN_ORDER);
-				$i = 0;
-
-				foreach ($sub_vals[0] as $sub_val)
-				{
-					// two things:
-					// 1) This determines if an empty string was in the IN clausing, making us turn it into a NULL comparison
-					// 2) This fixes the 1000 list limit that Oracle has (ORA-01795)
-					if ($sub_val !== "''")
-					{
-						$in_clause[(int) $i++/1000][] = $sub_val;
-					}
-					else
-					{
-						$extra = true;
-					}
-				}
-
-				if (!$extra && $i < 1000)
-				{
-					$out .= $val[0];
-				}
-				else
-				{
-					$out .= ' ' . $val[1] . '(';
-					$in_array = array();
-
-					// constuct each IN() clause
-					foreach ($in_clause as $in_values)
-					{
-						$in_array[] = $val[2] . ' ' . (isset($val[6]) ? $val[6] : '') . 'IN(' . implode(', ', $in_values) . ')';
-					}
-
-					// Join the IN() clauses against a few ORs (IN is just a nicer OR anyway)
-					$out .= implode(' OR ', $in_array);
-
-					// handle the empty string case
-					if ($extra)
-					{
-						$out .= ' OR ' . $val[2] . ' is ' . (isset($val[6]) ? $val[6] : '') . 'NULL';
-					}
-					$out .= ')';
-
-					unset($in_array, $in_clause);
-				}
-			}
-		}
-
-		return $out;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php
deleted file mode 100644
index d74a8167e9..0000000000
--- a/phpBB/includes/db/postgres.php
+++ /dev/null
@@ -1,409 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* PostgreSQL Database Abstraction Layer
-* Minimum Requirement: 8.2+
-* @package dbal
-*/
-class phpbb_dbal_postgres extends phpbb_dbal
-{
-	/**
-	* @var string Database type. No distinction between versions or used extensions.
-	*/
-	public $dbms_type = 'postgres';
-
-	/**
-	* @var array Database type map, column layout information
-	*/
-	public $dbms_type_map = 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',
-		'XSTEXT_UNI'=> 'varchar(100)',
-		'STEXT_UNI'	=> 'varchar(255)',
-		'TEXT_UNI'	=> 'varchar(4000)',
-		'MTEXT_UNI'	=> 'TEXT',
-		'TIMESTAMP'	=> 'INT4', // unsigned
-		'DECIMAL'	=> 'decimal(5,2)',
-		'DECIMAL:'	=> 'decimal(%d,2)',
-		'PDECIMAL'	=> 'decimal(6,3)',
-		'PDECIMAL:'	=> 'decimal(%d,3)',
-		'VCHAR_UNI'	=> 'varchar(255)',
-		'VCHAR_UNI:'=> 'varchar(%d)',
-		'VARBINARY'	=> 'bytea',
-	);
-
-	/**
-	* @var string PostgreSQL schema (if supplied with $database -> database.schema)
-	*/
-	public $schema = '';
-
-	/**
-	* Connect to server. See {@link phpbb_dbal::sql_connect() sql_connect()} for details.
-	*/
-	public function sql_connect($server, $user, $password, $database, $port = false, $persistency = false , $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $user;
-		$this->server = $server;
-		$this->dbname = $database;
-		$this->port = $port;
-
-		$connect_string = '';
-
-		if ($this->user)
-		{
-			$connect_string .= 'user=' . $this->user . ' ';
-		}
-
-		if ($password)
-		{
-			$connect_string .= 'password=' . $password . ' ';
-		}
-
-		if ($this->server)
-		{
-			if (strpos($this->server, ':') !== false)
-			{
-				list($this->server, $this->port) = explode(':', $this->server, 2);
-			}
-
-			if ($this->server !== 'localhost')
-			{
-				$connect_string .= 'host=' . $this->server . ' ';
-			}
-
-			if ($this->port)
-			{
-				$connect_string .= 'port=' . $this->port . ' ';
-			}
-		}
-
-		$this->schema = '';
-
-		if ($this->dbname)
-		{
-			if (strpos($this->dbname, '.') !== false)
-			{
-				list($this->dbname, $this->schema) = explode('.', $this->dbname, 2);
-			}
-			$connect_string .= 'dbname=' . $this->dbname;
-		}
-
-		$this->db_connect_id = ($this->persistency) ? @pg_pconnect($connect_string, ($new_link) ? PGSQL_CONNECT_FORCE_NEW : false) : @pg_connect($connect_string, ($new_link) ? PGSQL_CONNECT_FORCE_NEW : false);
-
-		if (!$this->db_connect_id)
-		{
-			return $this->sql_error(htmlspecialchars_decode(phpbb::$last_notice['message']));
-		}
-
-		if ($this->schema)
-		{
-			@pg_query($this->db_connect_id, 'SET search_path TO ' . $this->schema);
-		}
-
-		return $this->db_connect_id;
-	}
-
-	/**
-	* Version information about used database. See {@link phpbb_dbal::sql_server_info() sql_server_info()} for details.
-	*/
-	public function sql_server_info($raw = false)
-	{
-		if (!phpbb::registered('acm') || ($this->sql_server_version = phpbb::$acm->get('#pgsql_version')) === false)
-		{
-			$query_id = @pg_query($this->db_connect_id, 'SELECT VERSION() AS version');
-			$row = @pg_fetch_assoc($query_id, null);
-			@pg_free_result($query_id);
-
-			$this->sql_server_version = (!empty($row['version'])) ? trim(substr($row['version'], 10)) : 0;
-
-			if (phpbb::registered('acm'))
-			{
-				phpbb::$acm->put('#pgsql_version', $this->sql_server_version);
-			}
-		}
-
-		return ($raw) ? $this->sql_server_version : 'PostgreSQL ' . $this->sql_server_version;
-	}
-
-	/**
-	* DB-specific base query method. See {@link phpbb_dbal::_sql_query() _sql_query()} for details.
-	*/
-	protected function _sql_query($query)
-	{
-		return @pg_query($this->db_connect_id, $query);
-	}
-
-	/**
-	* Build LIMIT query and run it. See {@link phpbb_dbal::_sql_query_limit() _sql_query_limit()} for details.
-	*/
-	protected function _sql_query_limit($query, $total, $offset, $cache_ttl)
-	{
-		// if $total is set to 0 we do not want to limit the number of rows
-		if ($total == 0)
-		{
-			$total = 'ALL';
-		}
-
-		$query .= "\n LIMIT $total OFFSET $offset";
-		return $this->sql_query($query, $cache_ttl);
-	}
-
-	/**
-	* Close sql connection. See {@link phpbb_dbal::_sql_close() _sql_close()} for details.
-	*/
-	protected function _sql_close()
-	{
-		return @pg_close($this->db_connect_id);
-	}
-
-	/**
-	* SQL Transaction. See {@link phpbb_dbal::_sql_transaction() _sql_transaction()} for details.
-	*/
-	protected function _sql_transaction($status)
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return @pg_query($this->db_connect_id, 'BEGIN');
-			break;
-
-			case 'commit':
-				return @pg_query($this->db_connect_id, 'COMMIT');
-			break;
-
-			case 'rollback':
-				return @pg_query($this->db_connect_id, 'ROLLBACK');
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Return number of affected rows. See {@link phpbb_dbal::sql_affectedrows() sql_affectedrows()} for details.
-	*/
-	public function sql_affectedrows()
-	{
-		return ($this->query_result) ? @pg_affected_rows($this->query_result) : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement. See {@link phpbb_dbal::sql_nextid() sql_nextid()} for details.
-	*/
-	public function sql_nextid()
-	{
-		if (!$this->db_connect_id)
-		{
-			return false;
-		}
-
-		$query = "SELECT lastval() AS last_value";
-		$temp_q_id = @pg_query($this->db_connect_id, $query);
-
-		if (!$temp_q_id)
-		{
-			return false;
-		}
-
-		$temp_result = @pg_fetch_assoc($temp_q_id, NULL);
-		@pg_free_result($query_id);
-
-		return ($temp_result) ? $temp_result['last_value'] : false;
-	}
-
-	/**
-	* Fetch current row. See {@link phpbb_dbal::_sql_fetchrow() _sql_fetchrow()} for details.
-	*/
-	protected function _sql_fetchrow($query_id)
-	{
-		return @pg_fetch_assoc($query_id, null);
-	}
-
-	/**
-	* Free query result. See {@link phpbb_dbal::_sql_freeresult() _sql_freeresult()} for details.
-	*/
-	protected function _sql_freeresult($query_id)
-	{
-		return @pg_free_result($query_id);
-	}
-
-	/**
-	* Correctly adjust LIKE expression for special characters. See {@link phpbb_dbal::_sql_like_expression() _sql_like_expression()} for details.
-	*/
-	protected function _sql_like_expression($expression)
-	{
-		return $expression;
-	}
-
-	/**
-	* Escape string used in sql query. See {@link phpbb_dbal::sql_escape() sql_escape()} for details.
-	* Note: Do not use for bytea values if we may use them at a later stage
-	*/
-	public function sql_escape($msg)
-	{
-		return @pg_escape_string($msg);
-	}
-
-	/**
-	* Expose a DBMS specific function. See {@link phpbb_dbal::sql_function() sql_function()} for details.
-	*/
-	public function sql_function($type, $col)
-	{
-		switch ($type)
-		{
-			case 'length_varchar':
-			case 'length_text':
-				return 'LENGTH(' . $col . ')';
-			break;
-		}
-	}
-
-/*
-	/**
-	* Handle data by using prepared statements. See {@link phpbb_dbal::sql_handle_data() sql_handle_data()} for details.
-	public function sql_handle_data($type, $table, $data, $where = '')
-	{
-		// for now, stmtname is an empty string, it might change to something more unique in the future
-		if ($type === 'INSERT')
-		{
-			$stmt = pg_prepare($this->dbms_type, '', "INSERT INTO $table (". implode(', ', array_keys($data)) . ") VALUES ($" . implode(', $', range(1, sizeof($data))) . ')');
-		}
-		else
-		{
-			$query = "UPDATE $table SET ";
-
-			$set = array();
-			foreach (array_keys($data) as $key_id => $key)
-			{
-				$set[] = $key . ' = $' . $key_id;
-			}
-			$query .= implode(', ', $set);
-
-			if ($where !== '')
-			{
-				$query .= $where;
-			}
-
-			$stmt = pg_prepare($this->db_connect_id, '', $query);
-		}
-
-		// add the stmtname to the top
-		array_unshift($data, '');
-
-		// add the connection resource
-		array_unshift($data, $this->db_connect_id);
-
-		call_user_func_array('pg_execute', $data);
-	}
-*/
-
-	/**
-	* Build DB-specific query bits. See {@link phpbb_dbal::_sql_custom_build() _sql_custom_build()} for details.
-	*/
-	protected function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
-	/**
-	* return sql error array. See {@link phpbb_dbal::_sql_error() _sql_error()} for details.
-	*/
-	protected function _sql_error()
-	{
-		return array(
-			'message'	=> (!$this->db_connect_id) ? @pg_last_error() : @pg_last_error($this->db_connect_id),
-			'code'		=> ''
-		);
-	}
-
-	/**
-	* Run DB-specific code to build SQL Report to explain queries, show statistics and runtime information. See {@link phpbb_dbal::_sql_report() _sql_report()} for details.
-	*/
-	protected function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'start':
-
-				$explain_query = $query;
-				if (preg_match('/UPDATE ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
-				{
-					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
-				}
-				else if (preg_match('/DELETE FROM ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
-				{
-					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
-				}
-
-				if (preg_match('/^SELECT/', $explain_query))
-				{
-					$html_table = false;
-
-					if ($result = @pg_query($this->db_connect_id, "EXPLAIN $explain_query"))
-					{
-						while ($row = @pg_fetch_assoc($result, NULL))
-						{
-							$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-						}
-					}
-					@pg_free_result($result);
-
-					if ($html_table)
-					{
-						$this->html_hold .= '</table>';
-					}
-				}
-
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @pg_query($this->db_connect_id, $query);
-				while ($void = @pg_fetch_assoc($result, NULL))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@pg_free_result($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php
deleted file mode 100644
index 0c5cd74f12..0000000000
--- a/phpBB/includes/db/sqlite.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Sqlite Database Abstraction Layer
-* Minimum Requirement: 2.8.2+
-* @package dbal
-*/
-class phpbb_dbal_sqlite extends phpbb_dbal
-{
-	/**
-	* @var string Database type. No distinction between versions or used extensions.
-	*/
-	public $dbms_type = 'sqlite';
-
-	/**
-	* Database features
-	*
-	* <ul>
-	* <li>multi_insert: Supports multi inserts</li>
-	* <li>count_distinct: Supports COUNT(DISTINGT ...)</li>
-	* <li>multi_table_deletion: Supports multiple table deletion</li>
-	* <li>truncate: Supports table truncation</li>
-	* </ul>
-	*
-	* @var array
-	*/
-	public $features = array(
-		'multi_insert'			=> true,
-		// like MS ACCESS, SQLite does not support COUNT(DISTINCT ...)
-		'count_distinct'		=> false,
-		'multi_table_deletion'	=> true,
-		// can't truncate a table
-		'truncate'				=> false,
-	);
-
-	/**
-	* @var array Database type map, column layout information
-	*/
-	public $dbms_type_map = 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)',
-		'XSTEXT_UNI'=> 'text(65535)',
-		'STEXT_UNI'	=> 'text(65535)',
-		'TEXT_UNI'	=> 'text(65535)',
-		'MTEXT_UNI'	=> 'mediumtext(16777215)',
-		'TIMESTAMP'	=> 'INTEGER UNSIGNED', //'int(11) UNSIGNED',
-		'DECIMAL'	=> 'decimal(5,2)',
-		'DECIMAL:'	=> 'decimal(%d,2)',
-		'PDECIMAL'	=> 'decimal(6,3)',
-		'PDECIMAL:'	=> 'decimal(%d,3)',
-		'VCHAR_UNI'	=> 'varchar(255)',
-		'VCHAR_UNI:'=> 'varchar(%d)',
-		'VARBINARY'	=> 'blob',
-	);
-
-	/**
-	* Connect to server. See {@link phpbb_dbal::sql_connect() sql_connect()} for details.
-	*/
-	public function sql_connect($server, $user, $password, $database, $port = false, $persistency = false , $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $user;
-		$this->server = $server . (($port) ? ':' . $port : '');
-		$this->dbname = $database;
-
-		$error = '';
-		$this->db_connect_id = ($this->persistency) ? @sqlite_popen($this->server, 0666, $error) : @sqlite_open($this->server, 0666, $error);
-
-		if ($this->db_connect_id)
-		{
-			@sqlite_query('PRAGMA short_column_names = 1', $this->db_connect_id);
-			@sqlite_query('PRAGMA encoding = "UTF-8"', $this->db_connect_id);
-		}
-
-		return ($this->db_connect_id) ? true : array('message' => $error);
-	}
-
-	/**
-	* Version information about used database. See {@link phpbb_dbal::sql_server_info() sql_server_info()} for details.
-	*/
-	public function sql_server_info($raw = false)
-	{
-		if (!phpbb::registered('acm') || ($this->sql_server_version = phpbb::$acm->get('#sqlite_version')) === false)
-		{
-			$result = @sqlite_query('SELECT sqlite_version() AS version', $this->db_connect_id);
-			$row = @sqlite_fetch_array($result, SQLITE_ASSOC);
-
-			$this->sql_server_version = (!empty($row['version'])) ? $row['version'] : 0;
-
-			if (phpbb::registered('acm'))
-			{
-				phpbb::$acm->put('#sqlite_version', $this->sql_server_version);
-			}
-		}
-
-		return ($raw) ? $this->sql_server_version : 'SQLite ' . $this->sql_server_version;
-	}
-
-	/**
-	* DB-specific base query method. See {@link phpbb_dbal::_sql_query() _sql_query()} for details.
-	*/
-	protected function _sql_query($query)
-	{
-		return @sqlite_query($query, $this->db_connect_id);
-	}
-
-	/**
-	* Build LIMIT query and run it. See {@link phpbb_dbal::_sql_query_limit() _sql_query_limit()} for details.
-	*/
-	protected function _sql_query_limit($query, $total, $offset, $cache_ttl)
-	{
-		// if $total is set to 0 we do not want to limit the number of rows
-		if ($total == 0)
-		{
-			$total = -1;
-		}
-
-		$query .= "\n LIMIT " . ((!empty($offset)) ? $offset . ', ' . $total : $total);
-
-		return $this->sql_query($query, $cache_ttl);
-	}
-
-	/**
-	* Close sql connection. See {@link phpbb_dbal::_sql_close() _sql_close()} for details.
-	*/
-	protected function _sql_close()
-	{
-		return @sqlite_close($this->db_connect_id);
-	}
-
-	/**
-	* SQL Transaction. See {@link phpbb_dbal::_sql_transaction() _sql_transaction()} for details.
-	*/
-	protected function _sql_transaction($status)
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return @sqlite_query('BEGIN', $this->db_connect_id);
-			break;
-
-			case 'commit':
-				return @sqlite_query('COMMIT', $this->db_connect_id);
-			break;
-
-			case 'rollback':
-				return @sqlite_query('ROLLBACK', $this->db_connect_id);
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Return number of affected rows. See {@link phpbb_dbal::sql_affectedrows() sql_affectedrows()} for details.
-	*/
-	public function sql_affectedrows()
-	{
-		return ($this->db_connect_id) ? @sqlite_changes($this->db_connect_id) : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement. See {@link phpbb_dbal::sql_nextid() sql_nextid()} for details.
-	*/
-	public function sql_nextid()
-	{
-		return ($this->db_connect_id) ? @sqlite_last_insert_rowid($this->db_connect_id) : false;
-	}
-
-	/**
-	* Fetch current row. See {@link phpbb_dbal::_sql_fetchrow() _sql_fetchrow()} for details.
-	*/
-	protected function _sql_fetchrow($query_id)
-	{
-		return @sqlite_fetch_array($query_id, SQLITE_ASSOC);
-	}
-
-	/**
-	* Free query result. See {@link phpbb_dbal::_sql_freeresult() _sql_freeresult()} for details.
-	*/
-	protected function _sql_freeresult($query_id)
-	{
-		return true;
-	}
-
-	/**
-	* Correctly adjust LIKE expression for special characters. See {@link phpbb_dbal::_sql_like_expression() _sql_like_expression()} for details.
-	*/
-	protected function _sql_like_expression($expression)
-	{
-		// Unlike LIKE, GLOB is case sensitive (unfortunatly). SQLite users need to live with it!
-		// We only catch * and ? here, not the character map possible for file globbing.
-		$expression = str_replace(array(chr(0) . '_', chr(0) . '%'), array(chr(0) . '?', chr(0) . '*'), $expression);
-
-		$expression = str_replace(array('?', '*'), array("\?", "\*"), $expression);
-		$expression = str_replace(array(chr(0) . "\?", chr(0) . "\*"), array('?', '*'), $expression);
-
-		return 'GLOB \'' . $this->sql_escape($expression) . '\'';
-	}
-
-	/**
-	* Escape string used in sql query. See {@link phpbb_dbal::sql_escape() sql_escape()} for details.
-	*/
-	public function sql_escape($msg)
-	{
-		return @sqlite_escape_string($msg);
-	}
-
-	/**
-	* Expose a DBMS specific function. See {@link phpbb_dbal::sql_function() sql_function()} for details.
-	*/
-	public function sql_function($type, $col)
-	{
-		switch ($type)
-		{
-			case 'length_varchar':
-			case 'length_text':
-				return 'LENGTH(' . $col . ')';
-			break;
-		}
-	}
-
-	/**
-	* Handle data by using prepared statements. See {@link phpbb_dbal::sql_handle_data() sql_handle_data()} for details.
-	public function sql_handle_data($type, $table, $data, $where = '')
-	{
-	}
-	*/
-
-	/**
-	* Build DB-specific query bits. See {@link phpbb_dbal::_sql_custom_build() _sql_custom_build()} for details.
-	*/
-	protected function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
-	/**
-	* return sql error array. See {@link phpbb_dbal::_sql_error() _sql_error()} for details.
-	*/
-	protected function _sql_error()
-	{
-		return array(
-			'message'	=> @sqlite_error_string(@sqlite_last_error($this->db_connect_id)),
-			'code'		=> @sqlite_last_error($this->db_connect_id)
-		);
-	}
-
-	/**
-	* Run DB-specific code to build SQL Report to explain queries, show statistics and runtime information. See {@link phpbb_dbal::_sql_report() _sql_report()} for details.
-	*/
-	protected function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'start':
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @sqlite_query($query, $this->db_connect_id);
-				while ($void = @sqlite_fetch_array($result, SQLITE_ASSOC))
-				{
-					// Take the time spent on parsing rows into account
-				}
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/formatted_text.php b/phpBB/includes/formatted_text.php
deleted file mode 100644
index ca801bfea7..0000000000
--- a/phpBB/includes/formatted_text.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
- * Formatted text class to handle any text that can contain BBCodes, smilies, magic URLs or under word censor.
- */
-class formatted_text
-{
-	/**
-	 * Unformated text.
-	 *
-	 * @var string
-	 */
-	private $text;
-
-	/**
-	 * Internal representation (first_pass data).
-	 *
-	 * @var string
-	 */
-	private $meta;
-
-	/**
-	 * Formatting options as bit flag.
-	 *
-	 * @see bbcode_parser
-	 *
-	 * @var int
-	 */
-	private $flags;
-
-	/**
-	 * Compiled $text. For dispaly.
-	 *
-	 * @var string
-	 */
-	private $compiled;
-
-	/**
-	 * Set to true if text, meta or flags have been changed, false otherwise.
-	 *
-	 * @var bool
-	 */
-	private $changed;
-
-	/**
-	 * DB table to update
-	 *
-	 * @var string
-	 */
-	private $update_table = '';
-
-	/**
-	 * Column in $update_table to update.
-	 *
-	 * @var string
-	 */
-	private $update_column = '';
-
-	/**
-	 * Where clause for auto update.
-	 *
-	 * @var string
-	 */
-	private $update_where = '';
-
-	/**
-	 * Creates a new instance.
-	 *
-	 * @param string $text
-	 * @param string $meta
-	 * @param int $flags
-	 */
-	public function __construct($text, $meta = '', $flags = 0)
-	{
-		$this->text		= $text;
-		$this->meta		= $meta;
-		$this->flags	= $flags;
-		$this->compiled	= '';
-
-		if ($meta == '')
-		{
-			$this->changed = true;
-		}
-		else
-		{
-			$this->changed = false;
-		}
-	}
-
-	public function __destruct()
-	{
-		if ($this->changed && $this->update_table)
-		{
-			$this->to_db($this->update_table, $this->update_column, $this->update_where);
-		}
-	}
-
-	/**
-	 * Convieniently initialize a formatted_text object from
-	 * a database result set. The array must contain the following indexes:
-	 * $column, {$column}_meta and {$column}_flags
-	 *
-	 *
-	 * @param array $data
-	 * @param string $column
-	 * @return formatted_text
-	 */
-	public static function from_db_data(array $data, $column)
-	{
-		return new formatted_text($data[$column], $data[$column . '_meta'], (int) $data[$column . '_flags']);
-	}
-
-	/**
-	 * Returns the $text formatted, ready to be displayed on a webpage.
-	 *
-	 * @return string
-	 */
-	public function to_display()
-	{
-		$this->set_compiled();
-		return $this->compiled;
-	}
-
-	/**
-	 * Updates $table, sets $column, {$column}_meta and {$column}_flags.
-	 * All 3 columns must exist.
-	 *
-	 * @param string $table
-	 * @param string $column
-	 * @param string $where
-	 * @return bool
-	 */
-	public function to_db($table, $column, $where = '1')
-	{
-		$this->changed = false;
-
-		$sql = 'UPDATE ' . $table . ' SET ' . phpbb::$db->sql_build_query('UPDATE', $this->to_db_data($column))
-			. ' WHERE ' . $where;
-		return (bool) phpbb::$db->sql_query($sql);
-	}
-
-	/**
-	 * Returns an array containing $column, {$column}_meta and {$column}_flags
-	 * indexes to be used with query generating functions.
-	 *
-	 * @param string $column
-	 * @return array
-	 */
-	public function to_db_data($column)
-	{
-		$this->set_meta();
-		return array($column => $this->text, $column . '_meta' => $this->meta, $column . '_flags' => $this->flags);
-	}
-
-	/**
-	 * Enable automatic database update on
-	 *
-	 * @param string $table
-	 * @param string $column
-	 * @param string $where
-	 */
-	public function set_auto_update($table, $column, $where = '1')
-	{
-		$this->update_table = $table;
-		$this->update_column = $column;
-		$this->update_where = $where;
-	}
-
-	/**
-	 * Sets $meta if not set.
-	 */
-	private function set_meta()
-	{
-		if (strlen($this->meta))
-		{
-			return;
-		}
-
-		$parser = new phpbb_bbcode_parser;
-		$this->meta = $parser->first_pass($this->text);
-	}
-
-	/**
-	 * Sets $compiled if not set.
-	 */
-	private function set_compiled()
-	{
-		$this->set_meta();
-
-		if (strlen($this->compiled))
-		{
-			return;
-		}
-
-		$parser = new phpbb_bbcode_parser;
-		$parser->set_flags($this->flags);
-		$this->compiled = $parser->second_pass($this->meta);
-	}
-
-	/**
-	 * Sets $text.
-	 *
-	 * @param string $text
-	 */
-	public function set_text($text)
-	{
-		if ($this->text != $text)
-		{
-			$this->text = (string) $text;
-			$this->meta = '';
-			$this->compiled = '';
-		}
-	}
-
-	/**
-	 * Sets $flags.
-	 *
-	 * @param int $flags
-	 */
-	public function set_flags($flags)
-	{
-		$flags = (int) $flags;
-		if ($this->flags != $flags)
-		{
-			$this->flags = $flags;
-			$this->compiled = '';
-		}
-	}
-
-	/**
-	 * Returns the current text.
-	 *
-	 * @return string
-	 */
-	public function get_text()
-	{
-		return $this->text;
-	}
-
-	/**
-	 * Returns the current(!!) metadata.
-	 *
-	 * @return string
-	 */
-	public function get_meta()
-	{
-		return $this->meta;
-	}
-
-	/**
-	 * Returns the current flags.
-	 *
-	 * @return int
-	 */
-	public function get_flags()
-	{
-		return $this->flags;
-	}
-
-	/**
-	 * Returns true if $this is equal to $other.
-	 * Objects are only equal if $text and $flags are equal.
-	 *
-	 * @param formatted_text $other
-	 * @return bool
-	 */
-	public function eq(formatted_text $other)
-	{
-		return $this->flags == $other->get_flags() && $this->text == $other->get_text();
-	}
-
-	/**
-	 * Cast to string. Object is represented by the formatted version of $text with respect to $flags.
-	 *
-	 * @return string
-	 */
-	public function __toString()
-	{
-		return $this->to_display();
-	}
-}
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
deleted file mode 100644
index 71b96757b5..0000000000
--- a/phpBB/includes/functions.php
+++ /dev/null
@@ -1,2562 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Wrapper function of phpbb_request::variable which exists for backwards compatability.
-* See {@link phpbb_request::variable phpbb_request::variable} for documentation of this function's use.
-*
-* @param string|array	$var_name	The form variable's name from which data shall be retrieved.
-* 									If the value is an array this may be an array of indizes which will give
-* 									direct access to a value at any depth. E.g. if the value of "var" is array(1 => "a")
-* 									then specifying array("var", 1) as the name will return "a".
-* @param mixed			$default	A default value that is returned if the variable was not set.
-* 									This function will always return a value of the same type as the default.
-* @param bool			$multibyte	If $default is a string this paramater has to be true if the variable may contain any UTF-8 characters
-*									Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks
-* @param bool			$cookie		This param is mapped to phpbb_request::COOKIE as the last param for phpbb_request::variable for backwards compatability reasons.
-*
-* @return mixed	The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the
-*				the same as that of $default. If the variable is not set $default is returned.
-*/
-function request_var($var_name, $default, $multibyte = false, $cookie = false)
-{
-	return phpbb_request::variable($var_name, $default, $multibyte, ($cookie) ? phpbb_request::COOKIE : phpbb_request::REQUEST);
-}
-
-/**
-* Wrapper for phpbb::$url->append_sid()
-*/
-function append_sid($url, $params = false, $is_amp = true, $session_id = false)
-{
-	return phpbb::$url->append_sid($url, $params, $is_amp, $session_id);
-}
-
-/**
-* Set config value.
-* Creates missing config entry if update did not succeed and phpbb::$config for this entry empty.
-*
-* @param string	$config_name	The configuration keys name
-* @param string	$config_value	The configuration value
-* @param bool	$is_dynamic		True if the configuration entry is not cached
-*/
-function set_config($config_name, $config_value, $is_dynamic = false)
-{
-	$sql = 'UPDATE ' . CONFIG_TABLE . "
-		SET config_value = '" . phpbb::$db->sql_escape($config_value) . "'
-		WHERE config_name = '" . phpbb::$db->sql_escape($config_name) . "'";
-	phpbb::$db->sql_query($sql);
-
-	if (!phpbb::$db->sql_affectedrows() && !isset(phpbb::$config[$config_name]))
-	{
-		$sql = 'INSERT INTO ' . CONFIG_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', array(
-			'config_name'	=> (string) $config_name,
-			'config_value'	=> (string) $config_value,
-			'is_dynamic'	=> (int) $is_dynamic,
-		));
-		phpbb::$db->sql_query($sql);
-	}
-
-	phpbb::$config[$config_name] = $config_value;
-
-	if (!$is_dynamic)
-	{
-		phpbb::$acm->destroy('#config');
-	}
-}
-
-/**
-* Set dynamic config value with arithmetic operation.
-*/
-function set_config_count($config_name, $increment, $is_dynamic = false)
-{
-	switch (phpbb::$db->sql_layer)
-	{
-		case 'firebird':
-			$sql_update = 'CAST(CAST(config_value as integer) + ' . (int) $increment . ' as CHAR)';
-		break;
-
-		case 'postgres':
-			$sql_update = 'int4(config_value) + ' . (int) $increment;
-		break;
-
-		// MySQL, SQlite, mssql, mssql_odbc, oracle
-		default:
-			$sql_update = 'config_value + ' . (int) $increment;
-		break;
-	}
-
-	phpbb::$db->sql_query('UPDATE ' . CONFIG_TABLE . ' SET config_value = ' . $sql_update . " WHERE config_name = '" . phpbb::$db->sql_escape($config_name) . "'");
-
-	if (!$is_dynamic)
-	{
-		phpbb::$acm->destroy('#config');
-	}
-}
-
-/**
-* Return formatted string for filesizes
-* @todo move those functions to a helper class?
-*/
-function get_formatted_filesize($bytes, $add_size_lang = true)
-{
-	if ($bytes >= pow(2, 20))
-	{
-		return ($add_size_lang) ? round($bytes / 1024 / 1024, 2) . ' ' . phpbb::$user->lang['MIB'] : round($bytes / 1024 / 1024, 2);
-	}
-
-	if ($bytes >= pow(2, 10))
-	{
-		return ($add_size_lang) ? round($bytes / 1024, 2) . ' ' . phpbb::$user->lang['KIB'] : round($bytes / 1024, 2);
-	}
-
-	return ($add_size_lang) ? ($bytes) . ' ' . phpbb::$user->lang['BYTES'] : ($bytes);
-}
-
-/**
-* Determine whether we are approaching the maximum execution time. Should be called once
-* at the beginning of the script in which it's used.
-* @return	bool	Either true if the maximum execution time is nearly reached, or false
-*					if some time is still left.
-* @todo helper?
-*/
-function still_on_time($extra_time = 15)
-{
-	static $max_execution_time, $start_time;
-
-	$time = explode(' ', microtime());
-	$current_time = $time[0] + $time[1];
-
-	if (empty($max_execution_time))
-	{
-		$max_execution_time = (function_exists('ini_get')) ? (int) @ini_get('max_execution_time') : (int) @get_cfg_var('max_execution_time');
-
-		// If zero, then set to something higher to not let the user catch the ten seconds barrier.
-		if ($max_execution_time === 0)
-		{
-			$max_execution_time = 50 + $extra_time;
-		}
-
-		$max_execution_time = min(max(10, ($max_execution_time - $extra_time)), 50);
-
-		// For debugging purposes
-		// $max_execution_time = 10;
-
-		global $starttime;
-		$start_time = (empty($starttime)) ? $current_time : $starttime;
-	}
-
-	return (ceil($current_time - $start_time) < $max_execution_time) ? true : false;
-}
-
-	/**
-	* Add a secret hash   for use in links/GET requests
-	* @param string  $link_name The name of the link; has to match the name used in check_link_hash, otherwise no restrictions apply
-	* @return string the hash
-* @todo add to security, but do not use the current hash mechanism
-	*/
-/*
-@todo should use our hashing instead of a "custom" one
-*/
-	function generate_link_hash($link_name)
-	{
-		if (!isset(phpbb::$user->data["hash_$link_name"]))
-		{
-			phpbb::$user->data["hash_$link_name"] = substr(sha1(phpbb::$user->data['user_form_salt'] . $link_name), 0, 8);
-		}
-
-		return phpbb::$user->data["hash_$link_name"];
-	}
-
-
-	/**
-	* checks a link hash - for GET requests
-	* @param string $token the submitted token
-	* @param string $link_name The name of the link
-	* @return boolean true if all is fine
-* @todo add to security
-	*/
-
-	function check_link_hash($token, $link_name)
-	{
-		return $token === generate_link_hash($link_name);
-	}
-
-// functions used for building option fields
-
-/**
-* Pick a language, any language ...
-* @todo integrated into form builder?
-*/
-function language_select($default = '')
-{
-	$sql = 'SELECT lang_iso, lang_local_name
-		FROM ' . LANG_TABLE . '
-		ORDER BY lang_english_name';
-	$result = phpbb::$db->sql_query($sql);
-
-	$lang_options = '';
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$selected = ($row['lang_iso'] == $default) ? ' selected="selected"' : '';
-		$lang_options .= '<option value="' . $row['lang_iso'] . '"' . $selected . '>' . $row['lang_local_name'] . '</option>';
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	return $lang_options;
-}
-
-/**
-* Pick a template/theme combo,
-* @todo integrated into form builder?
-*/
-function style_select($default = '', $all = false)
-{
-	$sql_where = (!$all) ? 'WHERE style_active = 1 ' : '';
-	$sql = 'SELECT style_id, style_name
-		FROM ' . STYLES_TABLE . "
-		$sql_where
-		ORDER BY style_name";
-	$result = phpbb::$db->sql_query($sql);
-
-	$style_options = '';
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$selected = ($row['style_id'] == $default) ? ' selected="selected"' : '';
-		$style_options .= '<option value="' . $row['style_id'] . '"' . $selected . '>' . $row['style_name'] . '</option>';
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	return $style_options;
-}
-
-/**
-* Pick a timezone
-* @todo integrated into form builder?
-*/
-function tz_select($default = '', $truncate = false)
-{
-	$tz_select = '';
-	foreach (phpbb::$user->lang['tz_zones'] as $offset => $zone)
-	{
-		if ($truncate)
-		{
-			$zone_trunc = truncate_string($zone, 50, 255, false, '...');
-		}
-		else
-		{
-			$zone_trunc = $zone;
-		}
-
-		if (is_numeric($offset))
-		{
-			$selected = ($offset == $default) ? ' selected="selected"' : '';
-			$tz_select .= '<option title="'.$zone.'" value="' . $offset . '"' . $selected . '>' . $zone_trunc . '</option>';
-		}
-	}
-
-	return $tz_select;
-}
-
-/**
-* Marks a topic/forum as read
-* Marks a topic as posted to
-*
-* @param int $user_id can only be used with $mode == 'post'
-* @todo add to a tracking class used by forum/topic/post API, except for the marking features
-*/
-function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $user_id = 0)
-{
-	if ($mode == 'all')
-	{
-		if ($forum_id === false || !sizeof($forum_id))
-		{
-			if (phpbb::$config['load_db_lastread'] && phpbb::$user->is_registered)
-			{
-				// Mark all forums read (index page)
-				phpbb::$db->sql_query('DELETE FROM ' . TOPICS_TRACK_TABLE . ' WHERE user_id = ' . phpbb::$user->data['user_id']);
-				phpbb::$db->sql_query('DELETE FROM ' . FORUMS_TRACK_TABLE . ' WHERE user_id = ' . phpbb::$user->data['user_id']);
-				phpbb::$db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_lastmark = ' . time() . ' WHERE user_id = ' . phpbb::$user->data['user_id']);
-			}
-			else if (phpbb::$config['load_anon_lastread'] || phpbb::$user->is_registered)
-			{
-				$tracking_topics = phpbb_request::variable(phpbb::$config['cookie_name'] . '_track', '', false, phpbb_request::COOKIE);
-				$tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array();
-
-				unset($tracking_topics['tf']);
-				unset($tracking_topics['t']);
-				unset($tracking_topics['f']);
-				$tracking_topics['l'] = base_convert(time() - phpbb::$config['board_startdate'], 10, 36);
-
-				phpbb::$user->set_cookie('track', tracking_serialize($tracking_topics), time() + 31536000);
-				phpbb_request::overwrite(phpbb::$config['cookie_name'] . '_track', tracking_serialize($tracking_topics), phpbb_request::COOKIE);
-
-				unset($tracking_topics);
-
-				if (phpbb::$user->is_registered)
-				{
-					phpbb::$db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_lastmark = ' . time() . ' WHERE user_id = ' . phpbb::$user->data['user_id']);
-				}
-			}
-		}
-
-		return;
-	}
-	else if ($mode == 'topics')
-	{
-		// Mark all topics in forums read
-		if (!is_array($forum_id))
-		{
-			$forum_id = array($forum_id);
-		}
-
-		// Add 0 to forums array to mark global announcements correctly
-		$forum_id[] = 0;
-
-		if (phpbb::$config['load_db_lastread'] && phpbb::$user->is_registered)
-		{
-			$sql = 'DELETE FROM ' . TOPICS_TRACK_TABLE . '
-				WHERE user_id = ' . phpbb::$user->data['user_id'] . '
-					AND ' . phpbb::$db->sql_in_set('forum_id', $forum_id);
-			phpbb::$db->sql_query($sql);
-
-			$sql = 'SELECT forum_id
-				FROM ' . FORUMS_TRACK_TABLE . '
-				WHERE user_id = ' . phpbb::$user->data['user_id'] . '
-					AND ' . phpbb::$db->sql_in_set('forum_id', $forum_id);
-			$result = phpbb::$db->sql_query($sql);
-
-			$sql_update = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$sql_update[] = (int) $row['forum_id'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			if (sizeof($sql_update))
-			{
-				$sql = 'UPDATE ' . FORUMS_TRACK_TABLE . '
-					SET mark_time = ' . time() . '
-					WHERE user_id = ' . phpbb::$user->data['user_id'] . '
-						AND ' . phpbb::$db->sql_in_set('forum_id', $sql_update);
-				phpbb::$db->sql_query($sql);
-			}
-
-			if ($sql_insert = array_diff($forum_id, $sql_update))
-			{
-				$sql_ary = array();
-				foreach ($sql_insert as $f_id)
-				{
-					$sql_ary[] = array(
-						'user_id'	=> (int) phpbb::$user->data['user_id'],
-						'forum_id'	=> (int) $f_id,
-						'mark_time'	=> time()
-					);
-				}
-
-				phpbb::$db->sql_multi_insert(FORUMS_TRACK_TABLE, $sql_ary);
-			}
-		}
-		else if (phpbb::$config['load_anon_lastread'] || phpbb::$user->is_registered)
-		{
-			$tracking = phpbb_request::variable(phpbb::$config['cookie_name'] . '_track', '', false, phpbb_request::COOKIE);
-			$tracking = ($tracking) ? tracking_unserialize($tracking) : array();
-
-			foreach ($forum_id as $f_id)
-			{
-				$topic_ids36 = (isset($tracking['tf'][$f_id])) ? $tracking['tf'][$f_id] : array();
-
-				if (isset($tracking['tf'][$f_id]))
-				{
-					unset($tracking['tf'][$f_id]);
-				}
-
-				foreach ($topic_ids36 as $topic_id36)
-				{
-					unset($tracking['t'][$topic_id36]);
-				}
-
-				if (isset($tracking['f'][$f_id]))
-				{
-					unset($tracking['f'][$f_id]);
-				}
-
-				$tracking['f'][$f_id] = base_convert(time() - phpbb::$config['board_startdate'], 10, 36);
-			}
-
-			if (isset($tracking['tf']) && empty($tracking['tf']))
-			{
-				unset($tracking['tf']);
-			}
-
-			phpbb::$user->set_cookie('track', tracking_serialize($tracking), time() + 31536000);
-			phpbb_request::overwrite(phpbb::$config['cookie_name'] . '_track', tracking_serialize($tracking), phpbb_request::COOKIE);
-
-			unset($tracking);
-		}
-
-		return;
-	}
-	else if ($mode == 'topic')
-	{
-		if ($topic_id === false || $forum_id === false)
-		{
-			return;
-		}
-
-		if (phpbb::$config['load_db_lastread'] && phpbb::$user->is_registered)
-		{
-			$sql = 'UPDATE ' . TOPICS_TRACK_TABLE . '
-				SET mark_time = ' . (($post_time) ? $post_time : time()) . '
-				WHERE user_id = ' . phpbb::$user->data['user_id'] . '
-					AND topic_id = ' . $topic_id;
-			phpbb::$db->sql_query($sql);
-
-			// insert row
-			if (!phpbb::$db->sql_affectedrows())
-			{
-				phpbb::$db->sql_return_on_error(true);
-
-				$sql_ary = array(
-					'user_id'		=> (int) phpbb::$user->data['user_id'],
-					'topic_id'		=> (int) $topic_id,
-					'forum_id'		=> (int) $forum_id,
-					'mark_time'		=> ($post_time) ? (int) $post_time : time(),
-				);
-
-				phpbb::$db->sql_query('INSERT INTO ' . TOPICS_TRACK_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary));
-
-				phpbb::$db->sql_return_on_error(false);
-			}
-		}
-		else if (phpbb::$config['load_anon_lastread'] || phpbb::$user->is_registered)
-		{
-			$tracking = phpbb_request::variable(phpbb::$config['cookie_name'] . '_track', '', false, phpbb_request::COOKIE);
-			$tracking = ($tracking) ? tracking_unserialize($tracking) : array();
-
-			$topic_id36 = base_convert($topic_id, 10, 36);
-
-			if (!isset($tracking['t'][$topic_id36]))
-			{
-				$tracking['tf'][$forum_id][$topic_id36] = true;
-			}
-
-			$post_time = ($post_time) ? $post_time : time();
-			$tracking['t'][$topic_id36] = base_convert($post_time - phpbb::$config['board_startdate'], 10, 36);
-
-			// If the cookie grows larger than 10000 characters we will remove the smallest value
-			// This can result in old topics being unread - but most of the time it should be accurate...
-			if (strlen(phpbb_request::variable(phpbb::$config['cookie_name'] . '_track', '', false, phpbb_request::COOKIE)) > 10000)
-			{
-				//echo 'Cookie grown too large' . print_r($tracking, true);
-
-				// We get the ten most minimum stored time offsets and its associated topic ids
-				$time_keys = array();
-				for ($i = 0; $i < 10 && sizeof($tracking['t']); $i++)
-				{
-					$min_value = min($tracking['t']);
-					$m_tkey = array_search($min_value, $tracking['t']);
-					unset($tracking['t'][$m_tkey]);
-
-					$time_keys[$m_tkey] = $min_value;
-				}
-
-				// Now remove the topic ids from the array...
-				foreach ($tracking['tf'] as $f_id => $topic_id_ary)
-				{
-					foreach ($time_keys as $m_tkey => $min_value)
-					{
-						if (isset($topic_id_ary[$m_tkey]))
-						{
-							$tracking['f'][$f_id] = $min_value;
-							unset($tracking['tf'][$f_id][$m_tkey]);
-						}
-					}
-				}
-
-				if (phpbb::$user->is_registered)
-				{
-					phpbb::$user->data['user_lastmark'] = intval(base_convert(max($time_keys) + phpbb::$config['board_startdate'], 36, 10));
-					phpbb::$db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_lastmark = ' . phpbb::$user->data['user_lastmark'] . ' WHERE user_id = ' . phpbb::$user->data['user_id']);
-				}
-				else
-				{
-					$tracking['l'] = max($time_keys);
-				}
-			}
-
-			phpbb::$user->set_cookie('track', tracking_serialize($tracking), time() + 31536000);
-			phpbb_request::overwrite(phpbb::$config['cookie_name'] . '_track', tracking_serialize($tracking));
-		}
-
-		return;
-	}
-	else if ($mode == 'post')
-	{
-		if ($topic_id === false)
-		{
-			return;
-		}
-
-		$use_user_id = (!$user_id) ? phpbb::$user->data['user_id'] : $user_id;
-
-		if (phpbb::$config['load_db_track'] && $use_user_id != ANONYMOUS)
-		{
-			phpbb::$db->sql_return_on_error(true);
-
-			$sql_ary = array(
-				'user_id'		=> (int) $use_user_id,
-				'topic_id'		=> (int) $topic_id,
-				'topic_posted'	=> 1
-			);
-
-			phpbb::$db->sql_query('INSERT INTO ' . TOPICS_POSTED_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary));
-
-			phpbb::$db->sql_return_on_error(false);
-		}
-
-		return;
-	}
-}
-
-/**
-* Get topic tracking info by using already fetched info
-* @todo add to a tracking class used by forum/topic/post API
-*/
-function get_topic_tracking($forum_id, $topic_ids, &$rowset, $forum_mark_time, $global_announce_list = false)
-{
-	$last_read = array();
-
-	if (!is_array($topic_ids))
-	{
-		$topic_ids = array($topic_ids);
-	}
-
-	foreach ($topic_ids as $topic_id)
-	{
-		if (!empty($rowset[$topic_id]['mark_time']))
-		{
-			$last_read[$topic_id] = $rowset[$topic_id]['mark_time'];
-		}
-	}
-
-	$topic_ids = array_diff($topic_ids, array_keys($last_read));
-
-	if (sizeof($topic_ids))
-	{
-		$mark_time = array();
-
-		// Get global announcement info
-		if ($global_announce_list && sizeof($global_announce_list))
-		{
-			if (!isset($forum_mark_time[0]))
-			{
-				$sql = 'SELECT mark_time
-					FROM ' . FORUMS_TRACK_TABLE . '
-					WHERE user_id = ' . phpbb::$user->data['user_id'] . '
-						AND forum_id = 0';
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if ($row)
-				{
-					$mark_time[0] = $row['mark_time'];
-				}
-			}
-			else
-			{
-				if ($forum_mark_time[0] !== false)
-				{
-					$mark_time[0] = $forum_mark_time[0];
-				}
-			}
-		}
-
-		if (!empty($forum_mark_time[$forum_id]) && $forum_mark_time[$forum_id] !== false)
-		{
-			$mark_time[$forum_id] = $forum_mark_time[$forum_id];
-		}
-
-		$user_lastmark = (isset($mark_time[$forum_id])) ? $mark_time[$forum_id] : phpbb::$user->data['user_lastmark'];
-
-		foreach ($topic_ids as $topic_id)
-		{
-			if ($global_announce_list && isset($global_announce_list[$topic_id]))
-			{
-				$last_read[$topic_id] = (isset($mark_time[0])) ? $mark_time[0] : $user_lastmark;
-			}
-			else
-			{
-				$last_read[$topic_id] = $user_lastmark;
-			}
-		}
-	}
-
-	return $last_read;
-}
-
-/**
-* Get topic tracking info from db (for cookie based tracking only this function is used)
-* @todo add to a tracking class used by forum/topic/post API
-*/
-function get_complete_topic_tracking($forum_id, $topic_ids, $global_announce_list = false)
-{
-	$last_read = array();
-
-	if (!is_array($topic_ids))
-	{
-		$topic_ids = array($topic_ids);
-	}
-
-	if (phpbb::$config['load_db_lastread'] && phpbb::$user->is_registered)
-	{
-		$sql = 'SELECT topic_id, mark_time
-			FROM ' . TOPICS_TRACK_TABLE . '
-			WHERE user_id = ' . phpbb::$user->data['user_id'] . '
-				AND ' . phpbb::$db->sql_in_set('topic_id', $topic_ids);
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$last_read[$row['topic_id']] = $row['mark_time'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$topic_ids = array_diff($topic_ids, array_keys($last_read));
-
-		if (sizeof($topic_ids))
-		{
-			$sql = 'SELECT forum_id, mark_time
-				FROM ' . FORUMS_TRACK_TABLE . '
-				WHERE user_id = ' . phpbb::$user->data['user_id'] . '
-					AND forum_id ' .
-					(($global_announce_list && sizeof($global_announce_list)) ? "IN (0, $forum_id)" : "= $forum_id");
-			$result = phpbb::$db->sql_query($sql);
-
-			$mark_time = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$mark_time[$row['forum_id']] = $row['mark_time'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			$user_lastmark = (isset($mark_time[$forum_id])) ? $mark_time[$forum_id] : phpbb::$user->data['user_lastmark'];
-
-			foreach ($topic_ids as $topic_id)
-			{
-				if ($global_announce_list && isset($global_announce_list[$topic_id]))
-				{
-					$last_read[$topic_id] = (isset($mark_time[0])) ? $mark_time[0] : $user_lastmark;
-				}
-				else
-				{
-					$last_read[$topic_id] = $user_lastmark;
-				}
-			}
-		}
-	}
-	else if (phpbb::$config['load_anon_lastread'] || phpbb::$user->is_registered)
-	{
-		global $tracking_topics;
-
-		if (!isset($tracking_topics) || !sizeof($tracking_topics))
-		{
-			$tracking_topics = phpbb_request::variable(phpbb::$config['cookie_name'] . '_track', '', false, phpbb_request::COOKIE);
-			$tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array();
-		}
-
-		if (!phpbb::$user->is_registered)
-		{
-			$user_lastmark = (isset($tracking_topics['l'])) ? base_convert($tracking_topics['l'], 36, 10) + phpbb::$config['board_startdate'] : 0;
-		}
-		else
-		{
-			$user_lastmark = phpbb::$user->data['user_lastmark'];
-		}
-
-		foreach ($topic_ids as $topic_id)
-		{
-			$topic_id36 = base_convert($topic_id, 10, 36);
-
-			if (isset($tracking_topics['t'][$topic_id36]))
-			{
-				$last_read[$topic_id] = base_convert($tracking_topics['t'][$topic_id36], 36, 10) + phpbb::$config['board_startdate'];
-			}
-		}
-
-		$topic_ids = array_diff($topic_ids, array_keys($last_read));
-
-		if (sizeof($topic_ids))
-		{
-			$mark_time = array();
-			if ($global_announce_list && sizeof($global_announce_list))
-			{
-				if (isset($tracking_topics['f'][0]))
-				{
-					$mark_time[0] = base_convert($tracking_topics['f'][0], 36, 10) + phpbb::$config['board_startdate'];
-				}
-			}
-
-			if (isset($tracking_topics['f'][$forum_id]))
-			{
-				$mark_time[$forum_id] = base_convert($tracking_topics['f'][$forum_id], 36, 10) + phpbb::$config['board_startdate'];
-			}
-
-			$user_lastmark = (isset($mark_time[$forum_id])) ? $mark_time[$forum_id] : $user_lastmark;
-
-			foreach ($topic_ids as $topic_id)
-			{
-				if ($global_announce_list && isset($global_announce_list[$topic_id]))
-				{
-					$last_read[$topic_id] = (isset($mark_time[0])) ? $mark_time[0] : $user_lastmark;
-				}
-				else
-				{
-					$last_read[$topic_id] = $user_lastmark;
-				}
-			}
-		}
-	}
-
-	return $last_read;
-}
-
-/**
-* Check for read forums and update topic tracking info accordingly
-*
-* @param int $forum_id the forum id to check
-* @param int $forum_last_post_time the forums last post time
-* @param int $f_mark_time the forums last mark time if user is registered and load_db_lastread enabled
-* @param int $mark_time_forum false if the mark time needs to be obtained, else the last users forum mark time
-*
-* @return true if complete forum got marked read, else false.
-* @todo add to a tracking class used by forum/topic/post API
-*/
-function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_time = false, $mark_time_forum = false)
-{
-	global $tracking_topics;
-
-	// Determine the users last forum mark time if not given.
-	if ($mark_time_forum === false)
-	{
-		if (phpbb::$config['load_db_lastread'] && phpbb::$user->is_registered)
-		{
-			$mark_time_forum = (!empty($f_mark_time)) ? $f_mark_time : phpbb::$user->data['user_lastmark'];
-		}
-		else if (phpbb::$config['load_anon_lastread'] || phpbb::$user->is_registered)
-		{
-			$tracking_topics = phpbb_request::variable(phpbb::$config['cookie_name'] . '_track', '', false, phpbb_request::COOKIE);
-			$tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array();
-
-			if (!phpbb::$user->is_registered)
-			{
-				phpbb::$user->data['user_lastmark'] = (isset($tracking_topics['l'])) ? (int) (base_convert($tracking_topics['l'], 36, 10) + phpbb::$config['board_startdate']) : 0;
-			}
-
-			$mark_time_forum = (isset($tracking_topics['f'][$forum_id])) ? (int) (base_convert($tracking_topics['f'][$forum_id], 36, 10) + phpbb::$config['board_startdate']) : phpbb::$user->data['user_lastmark'];
-		}
-	}
-
-	// Check the forum for any left unread topics.
-	// If there are none, we mark the forum as read.
-	if (phpbb::$config['load_db_lastread'] && phpbb::$user->is_registered)
-	{
-		if ($mark_time_forum >= $forum_last_post_time)
-		{
-			// We do not need to mark read, this happened before. Therefore setting this to true
-			$row = true;
-		}
-		else
-		{
-			$sql = 'SELECT t.forum_id FROM ' . TOPICS_TABLE . ' t
-				LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.topic_id = t.topic_id AND tt.user_id = ' . phpbb::$user->data['user_id'] . ')
-				WHERE t.forum_id = ' . $forum_id . '
-					AND t.topic_last_post_time > ' . $mark_time_forum . '
-					AND t.topic_moved_id = 0
-					AND (tt.topic_id IS NULL OR tt.mark_time < t.topic_last_post_time)
-				GROUP BY t.forum_id';
-			$result = phpbb::$db->sql_query_limit($sql, 1);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-		}
-	}
-	else if (phpbb::$config['load_anon_lastread'] || phpbb::$user->is_registered)
-	{
-		// Get information from cookie
-		$row = false;
-
-		if (!isset($tracking_topics['tf'][$forum_id]))
-		{
-			// We do not need to mark read, this happened before. Therefore setting this to true
-			$row = true;
-		}
-		else
-		{
-			$sql = 'SELECT topic_id
-				FROM ' . TOPICS_TABLE . '
-				WHERE forum_id = ' . $forum_id . '
-					AND topic_last_post_time > ' . $mark_time_forum . '
-					AND topic_moved_id = 0';
-			$result = phpbb::$db->sql_query($sql);
-
-			$check_forum = $tracking_topics['tf'][$forum_id];
-			$unread = false;
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				if (!isset($check_forum[base_convert($row['topic_id'], 10, 36)]))
-				{
-					$unread = true;
-					break;
-				}
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			$row = $unread;
-		}
-	}
-	else
-	{
-		$row = true;
-	}
-
-	if (!$row)
-	{
-		markread('topics', $forum_id);
-		return true;
-	}
-
-	return false;
-}
-
-/**
-* Transform an array into a serialized format
-* @todo add to a tracking class used by forum/topic/post API
-*/
-function tracking_serialize($input)
-{
-	$out = '';
-	foreach ($input as $key => $value)
-	{
-		if (is_array($value))
-		{
-			$out .= $key . ':(' . tracking_serialize($value) . ');';
-		}
-		else
-		{
-			$out .= $key . ':' . $value . ';';
-		}
-	}
-	return $out;
-}
-
-/**
-* Transform a serialized array into an actual array
-* @todo add to a tracking class used by forum/topic/post API
-*/
-function tracking_unserialize($string, $max_depth = 3)
-{
-	$n = strlen($string);
-	if ($n > 10010)
-	{
-		die('Invalid data supplied');
-	}
-	$data = $stack = array();
-	$key = '';
-	$mode = 0;
-	$level = &$data;
-	for ($i = 0; $i < $n; ++$i)
-	{
-		switch ($mode)
-		{
-			case 0:
-				switch ($string[$i])
-				{
-					case ':':
-						$level[$key] = 0;
-						$mode = 1;
-					break;
-					case ')':
-						unset($level);
-						$level = array_pop($stack);
-						$mode = 3;
-					break;
-					default:
-						$key .= $string[$i];
-				}
-			break;
-
-			case 1:
-				switch ($string[$i])
-				{
-					case '(':
-						if (sizeof($stack) >= $max_depth)
-						{
-							die('Invalid data supplied');
-						}
-						$stack[] = &$level;
-						$level[$key] = array();
-						$level = &$level[$key];
-						$key = '';
-						$mode = 0;
-					break;
-					default:
-						$level[$key] = $string[$i];
-						$mode = 2;
-					break;
-				}
-			break;
-
-			case 2:
-				switch ($string[$i])
-				{
-					case ')':
-						unset($level);
-						$level = array_pop($stack);
-						$mode = 3;
-					break;
-					case ';':
-						$key = '';
-						$mode = 0;
-					break;
-					default:
-						$level[$key] .= $string[$i];
-					break;
-				}
-			break;
-
-			case 3:
-				switch ($string[$i])
-				{
-					case ')':
-						unset($level);
-						$level = array_pop($stack);
-					break;
-					case ';':
-						$key = '';
-						$mode = 0;
-					break;
-					default:
-						die('Invalid data supplied');
-					break;
-				}
-			break;
-		}
-	}
-
-	if (sizeof($stack) != 0 || ($mode != 0 && $mode != 3))
-	{
-		die('Invalid data supplied');
-	}
-
-	return $level;
-}
-
-// Pagination functions
-
-/**
-* Pagination routine, generates page number sequence
-* tpl_prefix is for using different pagination blocks at one page
-* @todo $pagination = phpbb_api::new('pagination')
-*/
-function generate_pagination($base_url, $num_items, $per_page, $start_item, $add_prevnext_text = false, $tpl_prefix = '')
-{
-	// Make sure $per_page is a valid value
-	$per_page = ($per_page <= 0) ? 1 : $per_page;
-
-	$seperator = '<span class="page-sep">' . phpbb::$user->lang['COMMA_SEPARATOR'] . '</span>';
-	$total_pages = ceil($num_items / $per_page);
-
-	if ($total_pages == 1 || !$num_items)
-	{
-		return false;
-	}
-
-	$on_page = floor($start_item / $per_page) + 1;
-	$url_delim = (strpos($base_url, '?') === false) ? '?' : '&amp;';
-
-	$page_string = ($on_page == 1) ? '<strong>1</strong>' : '<a href="' . $base_url . '">1</a>';
-
-	if ($total_pages > 5)
-	{
-		$start_cnt = min(max(1, $on_page - 4), $total_pages - 5);
-		$end_cnt = max(min($total_pages, $on_page + 4), 6);
-
-		$page_string .= ($start_cnt > 1) ? ' ... ' : $seperator;
-
-		for ($i = $start_cnt + 1; $i < $end_cnt; $i++)
-		{
-			$page_string .= ($i == $on_page) ? '<strong>' . $i . '</strong>' : '<a href="' . $base_url . "{$url_delim}start=" . (($i - 1) * $per_page) . '">' . $i . '</a>';
-			if ($i < $end_cnt - 1)
-			{
-				$page_string .= $seperator;
-			}
-		}
-
-		$page_string .= ($end_cnt < $total_pages) ? ' ... ' : $seperator;
-	}
-	else
-	{
-		$page_string .= $seperator;
-
-		for ($i = 2; $i < $total_pages; $i++)
-		{
-			$page_string .= ($i == $on_page) ? '<strong>' . $i . '</strong>' : '<a href="' . $base_url . "{$url_delim}start=" . (($i - 1) * $per_page) . '">' . $i . '</a>';
-			if ($i < $total_pages)
-			{
-				$page_string .= $seperator;
-			}
-		}
-	}
-
-	$page_string .= ($on_page == $total_pages) ? '<strong>' . $total_pages . '</strong>' : '<a href="' . $base_url . "{$url_delim}start=" . (($total_pages - 1) * $per_page) . '">' . $total_pages . '</a>';
-
-	if ($add_prevnext_text)
-	{
-		if ($on_page != 1)
-		{
-			$page_string = '<a href="' . $base_url . "{$url_delim}start=" . (($on_page - 2) * $per_page) . '">' . phpbb::$user->lang['PREVIOUS'] . '</a>&nbsp;&nbsp;' . $page_string;
-		}
-
-		if ($on_page != $total_pages)
-		{
-			$page_string .= '&nbsp;&nbsp;<a href="' . $base_url . "{$url_delim}start=" . ($on_page * $per_page) . '">' . phpbb::$user->lang['NEXT'] . '</a>';
-		}
-	}
-
-	phpbb::$template->assign_vars(array(
-		$tpl_prefix . 'BASE_URL'		=> $base_url,
-		'A_' . $tpl_prefix . 'BASE_URL'	=> addslashes($base_url),
-		$tpl_prefix . 'PER_PAGE'		=> $per_page,
-
-		$tpl_prefix . 'PREVIOUS_PAGE'	=> ($on_page == 1) ? '' : $base_url . "{$url_delim}start=" . (($on_page - 2) * $per_page),
-		$tpl_prefix . 'NEXT_PAGE'		=> ($on_page == $total_pages) ? '' : $base_url . "{$url_delim}start=" . ($on_page * $per_page),
-		$tpl_prefix . 'TOTAL_PAGES'		=> $total_pages,
-	));
-
-	return $page_string;
-}
-
-/**
-* Return current page (pagination)
-* @todo $pagination = phpbb_api::new('pagination')
-*/
-function on_page($num_items, $per_page, $start)
-{
-	// Make sure $per_page is a valid value
-	$per_page = ($per_page <= 0) ? 1 : $per_page;
-
-	$on_page = floor($start / $per_page) + 1;
-
-	phpbb::$template->assign_vars(array(
-		'ON_PAGE'		=> $on_page,
-	));
-
-	return phpbb::$user->lang('PAGE_OF', $on_page, max(ceil($num_items / $per_page), 1));
-}
-
-
-//Form validation
-
-
-
-/**
-* Add a secret token to the form (requires the S_FORM_TOKEN template variable)
-* @param string  $form_name The name of the form; has to match the name used in check_form_key, otherwise no restrictions apply
-* @todo add to form builder
-*/
-function add_form_key($form_name)
-{
-	$now = time();
-	$token_sid = (phpbb::$user->is_guest && !empty(phpbb::$config['form_token_sid_guests'])) ? phpbb::$user->session_id : '';
-	$token = sha1($now . phpbb::$user->data['user_form_salt'] . $form_name . $token_sid);
-
-	$s_fields = build_hidden_fields(array(
-		'creation_time' => $now,
-		'form_token'	=> $token,
-	));
-
-	phpbb::$template->assign_vars(array(
-		'S_FORM_TOKEN'	=> $s_fields,
-	));
-}
-
-/**
-* Check the form key. Required for all altering actions not secured by confirm_box
-* @param string  $form_name The name of the form; has to match the name used in add_form_key, otherwise no restrictions apply
-* @param int $timespan The maximum acceptable age for a submitted form in seconds. Defaults to the config setting.
-* @param string $return_page The address for the return link
-* @param bool $trigger If true, the function will triger an error when encountering an invalid form
-* @todo add to form builder
-*/
-function check_form_key($form_name, $timespan = false, $return_page = '', $trigger = false)
-{
-	if ($timespan === false)
-	{
-		// we enforce a minimum value of half a minute here.
-		$timespan = (phpbb::$config['form_token_lifetime'] == -1) ? -1 : max(30, phpbb::$config['form_token_lifetime']);
-	}
-
-	if (phpbb_request::is_set_post('creation_time') && phpbb_request::is_set_post('form_token'))
-	{
-		$creation_time	= abs(request_var('creation_time', 0));
-		$token = request_var('form_token', '');
-
-		$diff = time() - $creation_time;
-
-		// If creation_time and the time() now is zero we can assume it was not a human doing this (the check for if ($diff)...
-		if ($diff && ($diff <= $timespan || $timespan === -1))
-		{
-			$token_sid = (phpbb::$user->is_guest && !empty(phpbb::$config['form_token_sid_guests'])) ? phpbb::$user->session_id : '';
-			$key = sha1($creation_time . phpbb::$user->data['user_form_salt'] . $form_name . $token_sid);
-
-			if ($key === $token)
-			{
-				return true;
-			}
-		}
-	}
-
-	if ($trigger)
-	{
-		trigger_error(phpbb::$user->lang['FORM_INVALID'] . $return_page);
-	}
-
-	return false;
-}
-
-// Message/Login boxes
-
-/**
-* Build Confirm box
-* @param boolean $check True for checking if confirmed (without any additional parameters) and false for displaying the confirm box
-* @param string $title Title/Message used for confirm box.
-*		message text is _CONFIRM appended to title.
-*		If title cannot be found in user->lang a default one is displayed
-*		If title_CONFIRM cannot be found in user->lang the text given is used.
-* @param string $hidden Hidden variables
-* @param string $html_body Template used for confirm box
-* @param string $u_action Custom form action
-*/
-function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_body.html', $u_action = '')
-{
-	if (phpbb_request::is_set_post('cancel'))
-	{
-		return false;
-	}
-
-	$confirm = false;
-	if (phpbb_request::is_set_post('confirm'))
-	{
-		// language frontier
-		if (request_var('confirm', '') === phpbb::$user->lang['YES'])
-		{
-			$confirm = true;
-		}
-	}
-
-	if ($check && $confirm)
-	{
-		$user_id = request_var('user_id', 0);
-		$session_id = request_var('sess', '');
-		$confirm_key = request_var('confirm_key', '');
-
-		if ($user_id != phpbb::$user->data['user_id'] || $session_id != phpbb::$user->session_id || !$confirm_key || !phpbb::$user->data['user_last_confirm_key'] || $confirm_key != phpbb::$user->data['user_last_confirm_key'])
-		{
-			return false;
-		}
-
-		// Reset user_last_confirm_key
-		$sql = 'UPDATE ' . USERS_TABLE . " SET user_last_confirm_key = ''
-			WHERE user_id = " . phpbb::$user->data['user_id'];
-		phpbb::$db->sql_query($sql);
-
-		return true;
-	}
-	else if ($check)
-	{
-		return false;
-	}
-
-	$s_hidden_fields = build_hidden_fields(array(
-		'user_id'	=> phpbb::$user->data['user_id'],
-		'sess'		=> phpbb::$user->session_id,
-		'sid'		=> phpbb::$user->session_id,
-	));
-
-	// generate activation key
-	$confirm_key = gen_rand_string(10);
-
-	page_header((!isset(phpbb::$user->lang[$title])) ? phpbb::$user->lang['CONFIRM'] : phpbb::$user->lang[$title]);
-
-	phpbb::$template->set_filenames(array(
-		'body' => $html_body,
-	));
-
-	// If activation key already exist, we better do not re-use the key (something very strange is going on...)
-	if (request_var('confirm_key', ''))
-	{
-		// This should not occur, therefore we cancel the operation to safe the user
-		return false;
-	}
-
-	// re-add sid / transform & to &amp; for user->page (user->page is always using &)
-	$use_page = ($u_action) ? PHPBB_ROOT_PATH . $u_action : PHPBB_ROOT_PATH . str_replace('&', '&amp;', phpbb::$user->page['page']);
-	$u_action = reapply_sid($use_page);
-	$u_action .= ((strpos($u_action, '?') === false) ? '?' : '&amp;') . 'confirm_key=' . $confirm_key;
-
-	phpbb::$template->assign_vars(array(
-		'MESSAGE_TITLE'		=> (!isset(phpbb::$user->lang[$title])) ? phpbb::$user->lang['CONFIRM'] : phpbb::$user->lang[$title],
-		'MESSAGE_TEXT'		=> (!isset(phpbb::$user->lang[$title . '_CONFIRM'])) ? $title : phpbb::$user->lang[$title . '_CONFIRM'],
-
-		'YES_VALUE'			=> phpbb::$user->lang['YES'],
-		'S_CONFIRM_ACTION'	=> $u_action,
-		'S_HIDDEN_FIELDS'	=> $hidden . $s_hidden_fields,
-	));
-
-	$sql = 'UPDATE ' . USERS_TABLE . " SET user_last_confirm_key = '" . phpbb::$db->sql_escape($confirm_key) . "'
-		WHERE user_id = " . phpbb::$user->data['user_id'];
-	phpbb::$db->sql_query($sql);
-
-	page_footer();
-}
-
-/**
-* Generate login box or verify password
-*/
-function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = false, $s_display = true)
-{
-	$err = '';
-
-	// Make sure user->setup() has been called
-	if (empty(phpbb::$user->lang))
-	{
-		phpbb::$user->setup();
-	}
-
-	// Print out error if user tries to authenticate as an administrator without having the privileges...
-	if ($admin && !phpbb::$acl->acl_get('a_'))
-	{
-		// Not authd
-		// anonymous/inactive users are never able to go to the ACP even if they have the relevant permissions
-		if (phpbb::$user->is_registered)
-		{
-			add_log('admin', 'LOG_ADMIN_AUTH_FAIL');
-		}
-
-		$admin = false;
-	}
-
-	if (phpbb_request::is_set_post('login'))
-	{
-		// Get credential
-		if ($admin)
-		{
-			$credential = request_var('credential', '');
-
-			if (strspn($credential, 'abcdef0123456789') !== strlen($credential) || strlen($credential) != 32)
-			{
-				if (phpbb::$user->is_registered)
-				{
-					add_log('admin', 'LOG_ADMIN_AUTH_FAIL');
-				}
-
-				trigger_error('NO_AUTH_ADMIN');
-			}
-
-			$password = request_var('password_' . $credential, '', true);
-		}
-		else
-		{
-			$password = request_var('password', '', true);
-		}
-
-		$username	= request_var('username', '', true);
-		$autologin	= phpbb_request::variable('autologin', false, false, phpbb_request::POST);
-		$viewonline = (phpbb_request::variable('viewonline', false, false, phpbb_request::POST)) ? 0 : 1;
-		$admin 		= ($admin) ? 1 : 0;
-		$viewonline = ($admin) ? phpbb::$user->data['session_viewonline'] : $viewonline;
-
-		// Check if the supplied username is equal to the one stored within the database if re-authenticating
-		if ($admin && utf8_clean_string($username) != utf8_clean_string(phpbb::$user->data['username']))
-		{
-			// We log the attempt to use a different username...
-			add_log('admin', 'LOG_ADMIN_AUTH_FAIL');
-			trigger_error('NO_AUTH_ADMIN_USER_DIFFER');
-		}
-
-		// If authentication is successful we redirect user to previous page
-		$result = phpbb::$user->login($username, $password, $autologin, $viewonline, $admin);
-
-		// If admin authentication and login, we will log if it was a success or not...
-		// We also break the operation on the first non-success login - it could be argued that the user already knows
-		if ($admin)
-		{
-			if ($result['status'] == LOGIN_SUCCESS)
-			{
-				add_log('admin', 'LOG_ADMIN_AUTH_SUCCESS');
-			}
-			else
-			{
-				// Only log the failed attempt if a real user tried to.
-				// anonymous/inactive users are never able to go to the ACP even if they have the relevant permissions
-				if (phpbb::$user->is_registered)
-				{
-					add_log('admin', 'LOG_ADMIN_AUTH_FAIL');
-				}
-			}
-		}
-
-		// The result parameter is always an array, holding the relevant information...
-		if ($result['status'] == LOGIN_SUCCESS)
-		{
-			$redirect = request_var('redirect', phpbb::$user->page['page']);
-
-			$message = ($l_success) ? $l_success : phpbb::$user->lang['LOGIN_REDIRECT'];
-			$l_redirect = ($admin) ? phpbb::$user->lang['PROCEED_TO_ACP'] : (($redirect === PHPBB_ROOT_PATH . 'index.' . PHP_EXT || $redirect === 'index.' . PHP_EXT) ? phpbb::$user->lang['RETURN_INDEX'] : phpbb::$user->lang['RETURN_PAGE']);
-
-			// append/replace SID (may change during the session for AOL users)
-			$redirect = phpbb::$url->reapply_sid($redirect);
-
-			// Special case... the user is effectively banned, but we allow founders to login
-			if (defined('IN_CHECK_BAN') && $result['user_row']['user_type'] != phpbb::USER_FOUNDER)
-			{
-				return;
-			}
-
-			// $redirect = phpbb::$url->meta_refresh(3, $redirect);
-			trigger_error($message . '<br /><br />' . sprintf($l_redirect, '<a href="' . $redirect . '">', '</a>'));
-		}
-
-		// Something failed, determine what...
-		if ($result['status'] == LOGIN_BREAK)
-		{
-			trigger_error($result['error_msg']);
-		}
-
-		// Special cases... determine
-		switch ($result['status'])
-		{
-			case LOGIN_ERROR_ATTEMPTS:
-
-				$captcha = phpbb_captcha_factory::get_instance(phpbb::$config['captcha_plugin']);
-				$captcha->init(CONFIRM_LOGIN);
-				$captcha->reset();
-
-				phpbb::$template->assign_vars(array(
-					'S_CONFIRM_CODE'			=> true,
-					'CONFIRM'					=> $captcha->get_template(''),
-				));
-
-				$err = phpbb::$user->lang[$result['error_msg']];
-
-			break;
-
-			case LOGIN_ERROR_PASSWORD_CONVERT:
-				$err = sprintf(
-					phpbb::$user->lang[$result['error_msg']],
-					(phpbb::$config['email_enable']) ? '<a href="' . append_sid('ucp', 'mode=sendpassword') . '">' : '',
-					(phpbb::$config['email_enable']) ? '</a>' : '',
-					(phpbb::$config['board_contact']) ? '<a href="mailto:' . utf8_htmlspecialchars(phpbb::$config['board_contact']) . '">' : '',
-					(phpbb::$config['board_contact']) ? '</a>' : ''
-				);
-			break;
-
-			// Username, password, etc...
-			default:
-				$err = phpbb::$user->lang[$result['error_msg']];
-
-				// Assign admin contact to some error messages
-				if ($result['error_msg'] == 'LOGIN_ERROR_USERNAME' || $result['error_msg'] == 'LOGIN_ERROR_PASSWORD')
-				{
-					$err = (!phpbb::$config['board_contact']) ? sprintf(phpbb::$user->lang[$result['error_msg']], '', '') : sprintf(phpbb::$user->lang[$result['error_msg']], '<a href="mailto:' . utf8_htmlspecialchars(phpbb::$config['board_contact']) . '">', '</a>');
-				}
-
-			break;
-		}
-	}
-
-	if (!$redirect)
-	{
-		// We just use what the session code determined...
-		// If we are not within the admin directory we use the page dir...
-		$redirect = '';
-
-		if (!$admin && !defined('ADMIN_START'))
-		{
-			$redirect .= (phpbb::$user->page['page_dir']) ? phpbb::$user->page['page_dir'] . '/' : '';
-		}
-
-		$redirect .= phpbb::$user->page['page_name'] . ((phpbb::$user->page['query_string']) ? '?' . utf8_htmlspecialchars(phpbb::$user->page['query_string']) : '');
-	}
-
-	// Assign credential for username/password pair
-	$credential = ($admin) ? md5(phpbb::$security->unique_id()) : false;
-
-	$s_hidden_fields = array(
-		'redirect'	=> $redirect,
-		'sid'		=> phpbb::$user->session_id,
-	);
-
-	if ($admin)
-	{
-		$s_hidden_fields['credential'] = $credential;
-	}
-
-	$s_hidden_fields = build_hidden_fields($s_hidden_fields);
-
-	phpbb::$template->assign_vars(array(
-		'LOGIN_ERROR'		=> $err,
-		'LOGIN_EXPLAIN'		=> $l_explain,
-
-		'U_SEND_PASSWORD' 		=> (phpbb::$config['email_enable']) ? phpbb::$url->append_sid('ucp', 'mode=sendpassword') : '',
-		'U_RESEND_ACTIVATION'	=> (phpbb::$config['require_activation'] != USER_ACTIVATION_NONE && phpbb::$config['email_enable']) ? phpbb::$url->append_sid('ucp', 'mode=resend_act') : '',
-		'U_TERMS_USE'			=> phpbb::$url->append_sid('ucp', 'mode=terms'),
-		'U_PRIVACY'				=> phpbb::$url->append_sid('ucp', 'mode=privacy'),
-
-		'S_DISPLAY_FULL_LOGIN'	=> ($s_display) ? true : false,
-		'S_LOGIN_ACTION'		=> (!$admin && !defined('ADMIN_START'))  ? phpbb::$url->append_sid('ucp', 'mode=login') : phpbb::$url->append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, false, true, phpbb::$user->session_id),
-		'S_HIDDEN_FIELDS' 		=> $s_hidden_fields,
-
-		'S_ADMIN_AUTH'			=> $admin,
-		'S_ACP_LOGIN'			=> defined('ADMIN_START'),
-		'USERNAME'				=> ($admin) ? phpbb::$user->data['username'] : '',
-
-		'USERNAME_CREDENTIAL'	=> 'username',
-		'PASSWORD_CREDENTIAL'	=> ($admin) ? 'password_' . $credential : 'password',
-	));
-
-	phpbb::$template->set_filenames(array(
-		'body' => 'login_body.html',
-	));
-
-	page_header(phpbb::$user->lang['LOGIN'], false);
-	make_jumpbox('viewforum');
-
-	page_footer();
-}
-
-/**
-* Generate forum login box
-*/
-function login_forum_box($forum_data)
-{
-	$password = request_var('password', '', true);
-
-	$sql = 'SELECT forum_id
-		FROM ' . FORUMS_ACCESS_TABLE . '
-		WHERE forum_id = ' . $forum_data['forum_id'] . '
-			AND user_id = ' . phpbb::$user->data['user_id'] . "
-			AND session_id = '" . phpbb::$db->sql_escape(phpbb::$user->session_id) . "'";
-	$result = phpbb::$db->sql_query($sql);
-	$row = phpbb::$db->sql_fetchrow($result);
-	phpbb::$db->sql_freeresult($result);
-
-	if ($row)
-	{
-		return true;
-	}
-
-	if ($password)
-	{
-		// Remove expired authorised sessions
-		$sql = 'SELECT f.session_id
-			FROM ' . FORUMS_ACCESS_TABLE . ' f
-			LEFT JOIN ' . SESSIONS_TABLE . ' s ON (f.session_id = s.session_id)
-			WHERE s.session_id IS NULL';
-		$result = phpbb::$db->sql_query($sql);
-
-		if ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$sql_in = array();
-			do
-			{
-				$sql_in[] = (string) $row['session_id'];
-			}
-			while ($row = phpbb::$db->sql_fetchrow($result));
-
-			// Remove expired sessions
-			$sql = 'DELETE FROM ' . FORUMS_ACCESS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('session_id', $sql_in);
-			phpbb::$db->sql_query($sql);
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if (phpbb_check_hash($password, $forum_data['forum_password']))
-		{
-			$sql_ary = array(
-				'forum_id'		=> (int) $forum_data['forum_id'],
-				'user_id'		=> (int) phpbb::$user->data['user_id'],
-				'session_id'	=> (string) phpbb::$user->session_id,
-			);
-
-			phpbb::$db->sql_query('INSERT INTO ' . FORUMS_ACCESS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary));
-
-			return true;
-		}
-
-		phpbb::$template->assign_var('LOGIN_ERROR', phpbb::$user->lang['WRONG_PASSWORD']);
-	}
-
-	page_header(phpbb::$user->lang['LOGIN']);
-
-	phpbb::$template->assign_vars(array(
-		'S_HIDDEN_FIELDS'		=> build_hidden_fields(array('f' => $forum_data['forum_id'])),
-	));
-
-	phpbb::$template->set_filenames(array(
-		'body' => 'login_forum.html',
-	));
-
-	page_footer();
-}
-
-// Little helpers
-
-/**
-* Little helper for the build_hidden_fields function
-* @todo helper class or form builder ;)
-*/
-function _build_hidden_fields($key, $value, $specialchar, $stripslashes)
-{
-	$hidden_fields = '';
-
-	if (!is_array($value))
-	{
-		$value = ($stripslashes) ? stripslashes($value) : $value;
-		$value = ($specialchar) ? utf8_htmlspecialchars($value) : $value;
-
-		$hidden_fields .= '<input type="hidden" name="' . $key . '" value="' . $value . '" />' . "\n";
-	}
-	else
-	{
-		foreach ($value as $_key => $_value)
-		{
-			$_key = ($stripslashes) ? stripslashes($_key) : $_key;
-			$_key = ($specialchar) ? utf8_htmlspecialchars($_key) : $_key;
-
-			$hidden_fields .= _build_hidden_fields($key . '[' . $_key . ']', $_value, $specialchar, $stripslashes);
-		}
-	}
-
-	return $hidden_fields;
-}
-
-/**
-* Build simple hidden fields from array
-*
-* @param array $field_ary an array of values to build the hidden field from
-* @param bool $specialchar if true, keys and values get specialchared
-* @param bool $stripslashes if true, keys and values get stripslashed
-*
-* @return string the hidden fields
-* @todo helper class or form builder?
-*/
-function build_hidden_fields($field_ary, $specialchar = false, $stripslashes = false)
-{
-	$s_hidden_fields = '';
-
-	foreach ($field_ary as $name => $vars)
-	{
-		$name = ($stripslashes) ? stripslashes($name) : $name;
-		$name = ($specialchar) ? utf8_htmlspecialchars($name) : $name;
-
-		$s_hidden_fields .= _build_hidden_fields($name, $vars, $specialchar, $stripslashes);
-	}
-
-	return $s_hidden_fields;
-}
-
-/**
-* Parse cfg file
-*/
-function parse_cfg_file($filename, $lines = false)
-{
-	$parsed_items = array();
-
-	if ($lines === false)
-	{
-		$lines = file($filename);
-	}
-
-	foreach ($lines as $line)
-	{
-		$line = trim($line);
-
-		if (!$line || $line[0] == '#' || ($delim_pos = strpos($line, '=')) === false)
-		{
-			continue;
-		}
-
-		// Determine first occurrence, since in values the equal sign is allowed
-		$key = strtolower(trim(substr($line, 0, $delim_pos)));
-		$value = trim(substr($line, $delim_pos + 1));
-
-		if (in_array($value, array('off', 'false', '0')))
-		{
-			$value = false;
-		}
-		else if (in_array($value, array('on', 'true', '1')))
-		{
-			$value = true;
-		}
-		else if (!trim($value))
-		{
-			$value = '';
-		}
-		else if (($value[0] == "'" && $value[sizeof($value) - 1] == "'") || ($value[0] == '"' && $value[sizeof($value) - 1] == '"'))
-		{
-			$value = substr($value, 1, sizeof($value)-2);
-		}
-
-		$parsed_items[$key] = $value;
-	}
-
-	return $parsed_items;
-}
-
-/**
-* Add log event
-* @todo phpbb::$log
-*/
-function add_log()
-{
-	$args = func_get_args();
-
-	$mode			= array_shift($args);
-	$reportee_id	= ($mode == 'user') ? intval(array_shift($args)) : '';
-	$forum_id		= ($mode == 'mod') ? intval(array_shift($args)) : '';
-	$topic_id		= ($mode == 'mod') ? intval(array_shift($args)) : '';
-	$action			= array_shift($args);
-	$data			= (!sizeof($args)) ? '' : serialize($args);
-
-	$sql_ary = array(
-		'user_id'		=> (empty(phpbb::$user->data)) ? ANONYMOUS : phpbb::$user->data['user_id'],
-		'log_ip'		=> phpbb::$user->ip,
-		'log_time'		=> time(),
-		'log_operation'	=> $action,
-		'log_data'		=> $data,
-	);
-
-	switch ($mode)
-	{
-		case 'admin':
-			$sql_ary['log_type'] = LOG_ADMIN;
-		break;
-
-		case 'mod':
-			$sql_ary += array(
-				'log_type'	=> LOG_MOD,
-				'forum_id'	=> $forum_id,
-				'topic_id'	=> $topic_id
-			);
-		break;
-
-		case 'user':
-			$sql_ary += array(
-				'log_type'		=> LOG_USERS,
-				'reportee_id'	=> $reportee_id
-			);
-		break;
-
-		case 'critical':
-			$sql_ary['log_type'] = LOG_CRITICAL;
-		break;
-
-		default:
-			return false;
-	}
-
-	phpbb::$db->sql_query('INSERT INTO ' . LOG_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary));
-
-	return phpbb::$db->sql_nextid();
-}
-
-/**
-* Return a nicely formatted backtrace (parts from the php manual by diz at ysagoon dot com)
-* @todo helper?
-*/
-function get_backtrace()
-{
-	$output = '<div style="font-family: monospace;">';
-	$backtrace = debug_backtrace();
-	$path = phpbb::$url->realpath(PHPBB_ROOT_PATH);
-
-	foreach ($backtrace as $number => $trace)
-	{
-		// We skip the first one, because it only shows this file/function
-		if ($number == 0)
-		{
-			continue;
-		}
-
-		if (empty($trace['file']) && empty($trace['line']))
-		{
-			continue;
-		}
-
-		// Strip the current directory from path
-		if (empty($trace['file']))
-		{
-			$trace['file'] = '';
-		}
-		else
-		{
-			$trace['file'] = str_replace(array($path, '\\'), array('', '/'), $trace['file']);
-			$trace['file'] = substr($trace['file'], 1);
-		}
-		$args = array();
-
-		// If include/require/include_once is not called, do not show arguments - they may contain sensible information
-		if (!in_array($trace['function'], array('include', 'require', 'include_once')))
-		{
-			unset($trace['args']);
-		}
-		else
-		{
-			// Path...
-			if (!empty($trace['args'][0]))
-			{
-				$argument = htmlspecialchars($trace['args'][0]);
-				$argument = str_replace(array($path, '\\'), array('', '/'), $argument);
-				$argument = substr($argument, 1);
-				$args[] = "'{$argument}'";
-			}
-		}
-
-		$trace['class'] = (!isset($trace['class'])) ? '' : $trace['class'];
-		$trace['type'] = (!isset($trace['type'])) ? '' : $trace['type'];
-
-		$output .= '<br />';
-		$output .= '<b>FILE:</b> ' . htmlspecialchars($trace['file']) . '<br />';
-		$output .= '<b>LINE:</b> ' . ((!empty($trace['line'])) ? $trace['line'] : '') . '<br />';
-
-		$output .= '<b>CALL:</b> ' . htmlspecialchars($trace['class'] . $trace['type'] . $trace['function']) . '(' . ((sizeof($args)) ? implode(', ', $args) : '') . ')<br />';
-	}
-	$output .= '</div>';
-	return $output;
-}
-
-/**
-* This function returns a regular expression pattern for commonly used expressions
-* Use with / as delimiter for email mode and # for url modes
-* mode can be: email|bbcode_htm|url|url_inline|www_url|www_url_inline|relative_url|relative_url_inline|ipv4|ipv6
-* @todo helper?
-*/
-function get_preg_expression($mode)
-{
-	switch ($mode)
-	{
-		case 'email':
-			return '(?:[a-z0-9\'\.\-_\+\|]++|&amp;)+@[a-z0-9\-]+\.(?:[a-z0-9\-]+\.)*[a-z]+';
-		break;
-
-		case 'bbcode_htm':
-			return array(
-				'#<!\-\- e \-\-><a href="mailto:(.*?)">.*?</a><!\-\- e \-\->#',
-				'#<!\-\- l \-\-><a (?:class="[\w-]+" )?href="(.*?)(?:(&amp;|\?)sid=[0-9a-f]{32})?">.*?</a><!\-\- l \-\->#',
-				'#<!\-\- ([mw]) \-\-><a (?:class="[\w-]+" )?href="(.*?)">.*?</a><!\-\- \1 \-\->#',
-				'#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#',
-				'#<!\-\- .*? \-\->#s',
-				'#<.*?>#s',
-			);
-		break;
-
-		// Whoa these look impressive!
-		// The code to generate the following two regular expressions which match valid IPv4/IPv6 addresses
-		// can be found in the develop directory
-		case 'ipv4':
-			return '#^(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$#';
-		break;
-
-		case 'ipv6':
-			return '#^(?:(?:(?:[\dA-F]{1,4}:){6}(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:::(?:[\dA-F]{1,4}:){5}(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:):(?:[\dA-F]{1,4}:){4}(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:){1,2}:(?:[\dA-F]{1,4}:){3}(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:){1,3}:(?:[\dA-F]{1,4}:){2}(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:){1,4}:(?:[\dA-F]{1,4}:)(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:){1,5}:(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:){1,6}:[\dA-F]{1,4})|(?:(?:[\dA-F]{1,4}:){1,7}:))$#i';
-		break;
-
-		case 'url':
-		case 'url_inline':
-			$inline = ($mode == 'url') ? ')' : '';
-			$scheme = ($mode == 'url') ? '[a-z\d+\-.]' : '[a-z\d+]'; // avoid automatic parsing of "word" in "last word.http://..."
-			// generated with regex generation file in the develop folder
-			return "[a-z]$scheme*:/{2}(?:(?:[a-z0-9\-._~!$&'($inline*+,;=:@|]+|%[\dA-F]{2})+|[0-9.]+|\[[a-z0-9.]+:[a-z0-9.]+:[a-z0-9.:]+\])(?::\d*)?(?:/(?:[a-z0-9\-._~!$&'($inline*+,;=:@|]+|%[\dA-F]{2})*)*(?:\?(?:[a-z0-9\-._~!$&'($inline*+,;=:@/?|]+|%[\dA-F]{2})*)?(?:\#(?:[a-z0-9\-._~!$&'($inline*+,;=:@/?|]+|%[\dA-F]{2})*)?";
-		break;
-
-		case 'www_url':
-		case 'www_url_inline':
-			$inline = ($mode == 'www_url') ? ')' : '';
-			return "www\.(?:[a-z0-9\-._~!$&'($inline*+,;=:@|]+|%[\dA-F]{2})+(?::\d*)?(?:/(?:[a-z0-9\-._~!$&'($inline*+,;=:@|]+|%[\dA-F]{2})*)*(?:\?(?:[a-z0-9\-._~!$&'($inline*+,;=:@/?|]+|%[\dA-F]{2})*)?(?:\#(?:[a-z0-9\-._~!$&'($inline*+,;=:@/?|]+|%[\dA-F]{2})*)?";
-		break;
-
-		case 'relative_url':
-		case 'relative_url_inline':
-			$inline = ($mode == 'relative_url') ? ')' : '';
-			return "(?:[a-z0-9\-._~!$&'($inline*+,;=:@|]+|%[\dA-F]{2})*(?:/(?:[a-z0-9\-._~!$&'($inline*+,;=:@|]+|%[\dA-F]{2})*)*(?:\?(?:[a-z0-9\-._~!$&'($inline*+,;=:@/?|]+|%[\dA-F]{2})*)?(?:\#(?:[a-z0-9\-._~!$&'($inline*+,;=:@/?|]+|%[\dA-F]{2})*)?";
-		break;
-	}
-
-	return '';
-}
-
-/**
-* Returns the first block of the specified IPv6 address and as many additional
-* ones as specified in the length paramater.
-* If length is zero, then an empty string is returned.
-* If length is greater than 3 the complete IP will be returned
-* @todo helper?
-*/
-function short_ipv6($ip, $length)
-{
-	if ($length < 1)
-	{
-		return '';
-	}
-
-	// extend IPv6 addresses
-	$blocks = substr_count($ip, ':') + 1;
-	if ($blocks < 9)
-	{
-		$ip = str_replace('::', ':' . str_repeat('0000:', 9 - $blocks), $ip);
-	}
-	if ($ip[0] == ':')
-	{
-		$ip = '0000' . $ip;
-	}
-	if ($length < 4)
-	{
-		$ip = implode(':', array_slice(explode(':', $ip), 0, 1 + $length));
-	}
-
-	return $ip;
-}
-
-/**
-* Wrapper for php's checkdnsrr function.
-*
-* The windows failover is from the php manual
-* Please make sure to check the return value for === true and === false, since NULL could
-* be returned too.
-*
-* @return true if entry found, false if not, NULL if this function is not supported by this environment
-*/
-function phpbb_checkdnsrr($host, $type = '')
-{
-	$type = (!$type) ? 'MX' : $type;
-
-	if (DIRECTORY_SEPARATOR == '\\')
-	{
-		if (!function_exists('exec'))
-		{
-			return NULL;
-		}
-
-		// @exec('nslookup -retry=1 -timout=1 -type=' . escapeshellarg($type) . ' ' . escapeshellarg($host), $output);
-		@exec('nslookup -type=' . escapeshellarg($type) . ' ' . escapeshellarg($host) . '.', $output);
-
-		// If output is empty, the nslookup failed
-		if (empty($output))
-		{
-			return NULL;
-		}
-
-		foreach ($output as $line)
-		{
-			if (!trim($line))
-			{
-				continue;
-			}
-
-			// Valid records begin with host name:
-			if (strpos($line, $host) === 0)
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-	else if (function_exists('checkdnsrr'))
-	{
-		// The dot indicates to search the DNS root (helps those having DNS prefixes on the same domain)
-		return (checkdnsrr($host . '.', $type)) ? true : false;
-	}
-
-	return NULL;
-}
-
-// Handler, header and footer
-
-/**
-* Error and message handler, call with trigger_error if reqd
-*/
-function msg_handler($errno, $msg_text, $errfile, $errline)
-{
-	global $msg_title, $msg_long_text;
-
-	// Message handler is stripping text. In case we need it, we are able to define long text...
-	if (isset($msg_long_text) && $msg_long_text && !$msg_text)
-	{
-		$msg_text = $msg_long_text;
-	}
-
-	// Store information for later use
-	phpbb::$last_notice = array(
-		'file'		=> $errfile,
-		'line'		=> $errline,
-		'message'	=> $msg_text,
-		'php_error'	=> (!empty($php_errormsg)) ? $php_errormsg : '',
-		'errno'		=> $errno,
-	);
-
-	// Do not display notices if we suppress them via @
-	if (error_reporting() == 0)
-	{
-		return;
-	}
-
-	switch ($errno)
-	{
-		case E_NOTICE:
-		case E_WARNING:
-		case E_STRICT:
-
-			// Check the error reporting level and return if the error level does not match
-			// If DEBUG is defined the default level is E_ALL
-			if (($errno & ((phpbb::$base_config['debug']) ? E_ALL | E_STRICT : error_reporting())) == 0)
-			{
-				return;
-			}
-
-//			if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false)
-//			{
-				// flush the content, else we get a white page if output buffering is on
-				if ((int) @ini_get('output_buffering') === 1 || strtolower(@ini_get('output_buffering')) === 'on')
-				{
-					@ob_flush();
-				}
-
-				// Another quick fix for those having gzip compression enabled, but do not flush if the coder wants to catch "something". ;)
-				if (!empty(phpbb::$config['gzip_compress']))
-				{
-					if (@extension_loaded('zlib') && !headers_sent() && !ob_get_level())
-					{
-						@ob_flush();
-					}
-				}
-
-				// remove complete path to installation, with the risk of changing backslashes meant to be there
-				if (phpbb::registered('url'))
-				{
-					$errfile = str_replace(array(phpbb::$url->realpath(PHPBB_ROOT_PATH), '\\'), array('', '/'), $errfile);
-					$msg_text = str_replace(array(phpbb::$url->realpath(PHPBB_ROOT_PATH), '\\'), array('', '/'), $msg_text);
-				}
-
-				echo '<b>[phpBB Debug] PHP Notice</b>: in file <b>' . $errfile . '</b> on line <b>' . $errline . '</b>: <b>' . $msg_text . '</b><br />' . "\n";
-//			}
-
-			return;
-
-		break;
-
-		case E_RECOVERABLE_ERROR:
-		case E_USER_ERROR:
-
-			if (phpbb::registered('user'))
-			{
-				// Setup language
-				if (empty(phpbb::$user->lang))
-				{
-					phpbb::$user->setup();
-				}
-
-				$msg_text = (!empty(phpbb::$user->lang[$msg_text])) ? phpbb::$user->lang[$msg_text] : $msg_text;
-				$msg_title = (!isset($msg_title)) ? phpbb::$user->lang['GENERAL_ERROR'] : ((!empty(phpbb::$user->lang[$msg_title])) ? phpbb::$user->lang[$msg_title] : $msg_title);
-
-				$l_return_index = phpbb::$user->lang('RETURN_INDEX', '<a href="' . PHPBB_ROOT_PATH . '">', '</a>');
-				$l_notify = '';
-
-				if (!empty(phpbb::$config['board_contact']))
-				{
-					$l_notify = '<p>' . phpbb::$user->lang('NOTIFY_ADMIN_EMAIL', phpbb::$config['board_contact']) . '</p>';
-				}
-			}
-			else
-			{
-				$msg_title = 'General Error';
-				$l_return_index = '<a href="' . PHPBB_ROOT_PATH . '">Return to index page</a>';
-				$l_notify = '';
-
-				if (!empty(phpbb::$config['board_contact']))
-				{
-					$l_notify = '<p>Please notify the board administrator or webmaster: <a href="mailto:' . phpbb::$config['board_contact'] . '">' . phpbb::$config['board_contact'] . '</a></p>';
-				}
-			}
-
-			garbage_collection();
-
-			// Try to not call the adm page data...
-			// @todo put into failover template file
-
-			echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
-			echo '<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">';
-			echo '<head>';
-			echo '<meta http-equiv="content-type" content="text/html; charset=utf-8" />';
-			echo '<title>' . $msg_title . '</title>';
-			echo '<style type="text/css">' . "\n" . '/* <![CDATA[ */' . "\n";
-			echo '* { margin: 0; padding: 0; } html { font-size: 100%; height: 100%; margin-bottom: 1px; background-color: #E4EDF0; } body { font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; color: #536482; background: #E4EDF0; font-size: 62.5%; margin: 0; } ';
-			echo 'a:link, a:active, a:visited { color: #006699; text-decoration: none; } a:hover { color: #DD6900; text-decoration: underline; } ';
-			echo '#wrap { padding: 0 20px 15px 20px; min-width: 615px; } #page-header { text-align: right; height: 40px; } #page-footer { clear: both; font-size: 1em; text-align: center; } ';
-			echo '.panel { margin: 4px 0; background-color: #FFFFFF; border: solid 1px  #A9B8C2; } ';
-			echo '#errorpage #page-header a { font-weight: bold; line-height: 6em; } #errorpage #content { padding: 10px; } #errorpage #content h1 { line-height: 1.2em; margin-bottom: 0; color: #DF075C; } ';
-			echo '#errorpage #content div { margin-top: 20px; margin-bottom: 5px; border-bottom: 1px solid #CCCCCC; padding-bottom: 5px; color: #333333; font: bold 1.2em "Lucida Grande", Arial, Helvetica, sans-serif; text-decoration: none; line-height: 120%; text-align: left; } ';
-			echo "\n" . '/* ]]> */' . "\n";
-			echo '</style>';
-			echo '</head>';
-			echo '<body id="errorpage">';
-			echo '<div id="wrap">';
-			echo '	<div id="page-header">';
-			echo '		' . $l_return_index;
-			echo '	</div>';
-			echo '	<div id="acp">';
-			echo '	<div class="panel">';
-			echo '		<div id="content">';
-			echo '			<h1>' . $msg_title . '</h1>';
-
-			echo '			<div>' . $msg_text;
-
-			if ((phpbb::registered('acl') && phpbb::$acl->acl_get('a_')) || defined('IN_INSTALL') || phpbb::$base_config['debug_extra'])
-			{
-				echo ($backtrace = get_backtrace()) ? '<br /><br />BACKTRACE' . $backtrace : '';
-			}
-			echo '</div>';
-
-			echo $l_notify;
-
-			echo '		</div>';
-			echo '	</div>';
-			echo '	</div>';
-			echo '	<div id="page-footer">';
-			echo '		Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>';
-			echo '	</div>';
-			echo '</div>';
-			echo '</body>';
-			echo '</html>';
-
-			exit_handler();
-
-			// On a fatal error (and E_USER_ERROR *is* fatal) we never want other scripts to continue and force an exit here.
-			exit;
-		break;
-
-		case E_USER_WARNING:
-		case E_USER_NOTICE:
-
-			define('IN_ERROR_HANDLER', true);
-
-			if (empty(phpbb::$user->data))
-			{
-				phpbb::$user->session_begin();
-			}
-
-			// We re-init the auth array to get correct results on login/logout
-			phpbb::$acl->init(phpbb::$user->data);
-
-			if (empty(phpbb::$user->lang))
-			{
-				phpbb::$user->setup();
-			}
-
-			$msg_text = (!empty(phpbb::$user->lang[$msg_text])) ? phpbb::$user->lang[$msg_text] : $msg_text;
-			$msg_title = (!isset($msg_title)) ? phpbb::$user->lang['INFORMATION'] : ((!empty(phpbb::$user->lang[$msg_title])) ? phpbb::$user->lang[$msg_title] : $msg_title);
-
-			if (!defined('HEADER_INC'))
-			{
-				page_header($msg_title);
-			}
-
-			phpbb::$template->set_filenames(array(
-				'body' => 'message_body.html')
-			);
-
-			phpbb::$template->assign_vars(array(
-				'MESSAGE_TITLE'		=> $msg_title,
-				'MESSAGE_TEXT'		=> $msg_text,
-				'S_USER_WARNING'	=> ($errno == E_USER_WARNING) ? true : false,
-				'S_USER_NOTICE'		=> ($errno == E_USER_NOTICE) ? true : false)
-			);
-
-			// We do not want the cron script to be called on error messages
-			define('IN_CRON', true);
-
-			page_footer();
-
-			exit_handler();
-		break;
-	}
-
-	// If we notice an error not handled here we pass this back to PHP by returning false
-	// This may not work for all php versions
-	return false;
-}
-
-/**
-* Generate page header
-* @plugin-support override, default, return
-*/
-function page_header($page_title = '', $display_online_list = true)
-{
-	if (phpbb::$plugins->function_override(__FUNCTION__)) return phpbb::$plugins->call_override(__FUNCTION__, $page_title, $display_online_list);
-
-	if (defined('HEADER_INC'))
-	{
-		return;
-	}
-
-	define('HEADER_INC', true);
-
-	// gzip_compression
-	if (phpbb::$config['gzip_compress'])
-	{
-		if (@extension_loaded('zlib') && !headers_sent())
-		{
-			ob_start('ob_gzhandler');
-		}
-	}
-
-	if (phpbb::$plugins->function_inject(__FUNCTION__)) phpbb::$plugins->call_inject(__FUNCTION__, array('default', &$page_title, &$display_online_list));
-
-	// Generate logged in/logged out status
-	if (!phpbb::$user->is_guest)
-	{
-		$u_login_logout = phpbb::$url->append_sid('ucp', 'mode=logout', true, phpbb::$user->session_id);
-		$l_login_logout = sprintf(phpbb::$user->lang['LOGOUT_USER'], phpbb::$user->data['username']);
-	}
-	else
-	{
-		$u_login_logout = phpbb::$url->append_sid('ucp', 'mode=login');
-		$l_login_logout = phpbb::$user->lang['LOGIN'];
-	}
-
-	// Last visit date/time
-	$s_last_visit = (!phpbb::$user->is_guest) ? phpbb::$user->format_date(phpbb::$user->data['session_last_visit']) : '';
-
-	// Get users online list ... if required
-	$online_userlist = array();
-	$l_online_users = $l_online_record = '';
-	$forum = request_var('f', 0);
-
-	if (phpbb::$config['load_online'] && phpbb::$config['load_online_time'] && $display_online_list)
-	{
-		$logged_visible_online = $logged_hidden_online = $guests_online = $prev_user_id = 0;
-		$prev_session_ip = $reading_sql = '';
-
-		if ($forum)
-		{
-			$reading_sql = ' AND s.session_forum_id = ' . $forum;
-		}
-
-		// Get number of online guests
-		if (!phpbb::$config['load_online_guests'])
-		{
-			if (phpbb::$db->features['count_distinct'])
-			{
-				$sql = 'SELECT COUNT(DISTINCT s.session_ip) as num_guests
-					FROM ' . SESSIONS_TABLE . ' s
-					WHERE s.session_user_id = ' . ANONYMOUS . '
-						AND s.session_time >= ' . (time() - (phpbb::$config['load_online_time'] * 60)) .
-					$reading_sql;
-			}
-			else
-			{
-				$sql = 'SELECT COUNT(session_ip) as num_guests
-					FROM (
-						SELECT DISTINCT s.session_ip
-							FROM ' . SESSIONS_TABLE . ' s
-							WHERE s.session_user_id = ' . ANONYMOUS . '
-								AND s.session_time >= ' . (time() - (phpbb::$config['load_online_time'] * 60)) .
-								$reading_sql .
-					')';
-			}
-			$result = phpbb::$db->sql_query($sql);
-			$guests_online = (int) phpbb::$db->sql_fetchfield('num_guests');
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		$sql = 'SELECT u.username, u.username_clean, u.user_id, u.user_type, u.user_allow_viewonline, u.user_colour, s.session_ip, s.session_viewonline
-			FROM ' . USERS_TABLE . ' u, ' . SESSIONS_TABLE . ' s
-			WHERE s.session_time >= ' . (time() - (intval(phpbb::$config['load_online_time']) * 60)) .
-				$reading_sql .
-				((!phpbb::$config['load_online_guests']) ? ' AND s.session_user_id <> ' . ANONYMOUS : '') . '
-				AND u.user_id = s.session_user_id
-			ORDER BY u.username_clean ASC, s.session_ip ASC';
-		$result = phpbb::$db->sql_query($sql);
-
-		$prev_user_id = false;
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			// User is logged in and therefore not a guest
-			if ($row['user_id'] != ANONYMOUS)
-			{
-				// Skip multiple sessions for one user
-				if ($row['user_id'] != $prev_user_id)
-				{
-					if ($row['session_viewonline'])
-					{
-						$logged_visible_online++;
-					}
-					else
-					{
-						$row['username'] = '<em>' . $row['username'] . '</em>';
-						$logged_hidden_online++;
-					}
-
-					if (($row['session_viewonline']) || phpbb::$acl->acl_get('u_viewonline'))
-					{
-						$user_online_link = get_username_string(($row['user_type'] <> phpbb::USER_IGNORE) ? 'full' : 'no_profile', $row['user_id'], $row['username'], $row['user_colour']);
-						$online_userlist[] = $user_online_link;
-					}
-				}
-
-				$prev_user_id = $row['user_id'];
-			}
-			else
-			{
-				// Skip multiple sessions for one user
-				if ($row['session_ip'] != $prev_session_ip)
-				{
-					$guests_online++;
-				}
-			}
-
-			$prev_session_ip = $row['session_ip'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if (!sizeof($online_userlist))
-		{
-			$online_userlist = phpbb::$user->lang['NO_ONLINE_USERS'];
-		}
-		else
-		{
-			$online_userlist = implode(', ', $online_userlist);
-		}
-
-		if (!$forum)
-		{
-			$online_userlist = phpbb::$user->lang['REGISTERED_USERS'] . ' ' . $online_userlist;
-		}
-		else
-		{
-			$online_userlist = phpbb::$user->lang('BROWSING_FORUM_GUESTS', $online_userlist, $guests_online);
-		}
-
-		$total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online;
-
-		if ($total_online_users > phpbb::$config['record_online_users'])
-		{
-			set_config('record_online_users', $total_online_users, true);
-			set_config('record_online_date', time(), true);
-		}
-
-		$l_online_users = phpbb::$user->lang('ONLINE_USER_COUNT', $total_online_users);
-		$l_online_users .= phpbb::$user->lang('REG_USER_COUNT', $logged_visible_online);
-		$l_online_users .= phpbb::$user->lang('HIDDEN_USER_COUNT', $logged_hidden_online);
-		$l_online_users .= phpbb::$user->lang('GUEST_USER_COUNT', $guests_online);
-
-		$l_online_record = phpbb::$user->lang('RECORD_ONLINE_USERS', phpbb::$config['record_online_users'], phpbb::$user->format_date(phpbb::$config['record_online_date']));
-		$l_online_time = phpbb::$user->lang('VIEW_ONLINE_TIME', phpbb::$config['load_online_time']);
-	}
-	else
-	{
-		$l_online_time = '';
-	}
-
-	$l_privmsgs_text = $l_privmsgs_text_unread = '';
-	$s_privmsg_new = false;
-
-	// Obtain number of new private messages if user is logged in
-	if (!empty(phpbb::$user->is_registered))
-	{
-		if (phpbb::$user->data['user_new_privmsg'])
-		{
-			$l_privmsgs_text = phpbb::$user->lang('NEW_PM', phpbb::$user->data['user_new_privmsg']);
-
-			if (!phpbb::$user->data['user_last_privmsg'] || phpbb::$user->data['user_last_privmsg'] > phpbb::$user->data['session_last_visit'])
-			{
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_last_privmsg = ' . phpbb::$user->data['session_last_visit'] . '
-					WHERE user_id = ' . phpbb::$user->data['user_id'];
-				phpbb::$db->sql_query($sql);
-
-				$s_privmsg_new = true;
-			}
-			else
-			{
-				$s_privmsg_new = false;
-			}
-		}
-		else
-		{
-			$l_privmsgs_text = phpbb::$user->lang['NO_NEW_PM'];
-			$s_privmsg_new = false;
-		}
-
-		$l_privmsgs_text_unread = '';
-
-		if (phpbb::$user->data['user_unread_privmsg'] && phpbb::$user->data['user_unread_privmsg'] != phpbb::$user->data['user_new_privmsg'])
-		{
-			$l_privmsgs_text_unread = phpbb::$user->lang('UNREAD_PM', phpbb::$user->data['user_unread_privmsg']);
-		}
-	}
-
-	// Which timezone?
-	$tz = (!phpbb::$user->is_guest) ? strval(doubleval(phpbb::$user->data['user_timezone'])) : strval(doubleval(phpbb::$config['board_timezone']));
-
-	// Send a proper content-language to the output
-	$user_lang = phpbb::$user->lang['USER_LANG'];
-	if (strpos($user_lang, '-x-') !== false)
-	{
-		$user_lang = substr($user_lang, 0, strpos($user_lang, '-x-'));
-	}
-
-	// The following assigns all _common_ variables that may be used at any point in a template.
-	phpbb::$template->assign_vars(array(
-		'SITENAME'						=> phpbb::$config['sitename'],
-		'SITE_DESCRIPTION'				=> phpbb::$config['site_desc'],
-		'PAGE_TITLE'					=> $page_title,
-		'SCRIPT_NAME'					=> str_replace('.' . PHP_EXT, '', phpbb::$user->page['page_name']),
-		'LAST_VISIT_DATE'				=> phpbb::$user->lang('YOU_LAST_VISIT', $s_last_visit),
-		'LAST_VISIT_YOU'				=> $s_last_visit,
-		'CURRENT_TIME'					=> phpbb::$user->lang('CURRENT_TIME', phpbb::$user->format_date(time(), false, true)),
-		'TOTAL_USERS_ONLINE'			=> $l_online_users,
-		'LOGGED_IN_USER_LIST'			=> $online_userlist,
-		'RECORD_USERS'					=> $l_online_record,
-		'PRIVATE_MESSAGE_INFO'			=> $l_privmsgs_text,
-		'PRIVATE_MESSAGE_INFO_UNREAD'	=> $l_privmsgs_text_unread,
-
-		'S_USER_NEW_PRIVMSG'			=> phpbb::$user->data['user_new_privmsg'],
-		'S_USER_UNREAD_PRIVMSG'			=> phpbb::$user->data['user_unread_privmsg'],
-
-		'SESSION_ID'		=> phpbb::$user->session_id,
-		'ROOT_PATH'			=> PHPBB_ROOT_PATH,
-
-		'L_LOGIN_LOGOUT'	=> $l_login_logout,
-		'L_INDEX'			=> phpbb::$user->lang['FORUM_INDEX'],
-		'L_ONLINE_EXPLAIN'	=> $l_online_time,
-
-		'U_PRIVATEMSGS'			=> phpbb::$url->append_sid('ucp', 'i=pm&amp;folder=inbox'),
-		'U_RETURN_INBOX'		=> phpbb::$url->append_sid('ucp', 'i=pm&amp;folder=inbox'),
-		'U_POPUP_PM'			=> phpbb::$url->append_sid('ucp', 'i=pm&amp;mode=popup'),
-		'UA_POPUP_PM'			=> addslashes(phpbb::$url->append_sid('ucp', 'i=pm&amp;mode=popup')),
-		'U_MEMBERLIST'			=> phpbb::$url->append_sid('memberlist'),
-		'U_VIEWONLINE'			=> (phpbb::$acl->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) ? phpbb::$url->append_sid('viewonline') : '',
-		'U_LOGIN_LOGOUT'		=> $u_login_logout,
-		'U_INDEX'				=> phpbb::$url->append_sid('index'),
-		'U_SEARCH'				=> phpbb::$url->append_sid('search'),
-		'U_REGISTER'			=> phpbb::$url->append_sid('ucp', 'mode=register'),
-		'U_PROFILE'				=> phpbb::$url->append_sid('ucp'),
-		'U_MODCP'				=> phpbb::$url->append_sid('mcp', false, true, phpbb::$user->session_id),
-		'U_FAQ'					=> phpbb::$url->append_sid('faq'),
-		'U_SEARCH_SELF'			=> phpbb::$url->append_sid('search', 'search_id=egosearch'),
-		'U_SEARCH_NEW'			=> phpbb::$url->append_sid('search', 'search_id=newposts'),
-		'U_SEARCH_UNANSWERED'	=> phpbb::$url->append_sid('search', 'search_id=unanswered'),
-		'U_SEARCH_ACTIVE_TOPICS'=> phpbb::$url->append_sid('search', 'search_id=active_topics'),
-		'U_DELETE_COOKIES'		=> phpbb::$url->append_sid('ucp', 'mode=delete_cookies'),
-		'U_TEAM'				=> (!phpbb::$user->is_guest && !phpbb::$acl->acl_get('u_viewprofile')) ? '' : phpbb::$url->append_sid('memberlist', 'mode=leaders'),
-		'U_RESTORE_PERMISSIONS'	=> (phpbb::$user->data['user_perm_from'] && phpbb::$acl->acl_get('a_switchperm')) ? phpbb::$url->append_sid('ucp', 'mode=restore_perm') : '',
-
-		'S_USER_LOGGED_IN'		=> (!phpbb::$user->is_guest) ? true : false,
-		'S_AUTOLOGIN_ENABLED'	=> (phpbb::$config['allow_autologin']) ? true : false,
-		'S_BOARD_DISABLED'		=> (phpbb::$config['board_disable']) ? true : false,
-		'S_REGISTERED_USER'		=> (!empty(phpbb::$user->is_registered)) ? true : false,
-		'S_IS_BOT'				=> (!empty(phpbb::$user->is_bot)) ? true : false,
-		'S_USER_PM_POPUP'		=> phpbb::$user->optionget('popuppm'),
-		'S_USER_LANG'			=> $user_lang,
-		'S_USER_BROWSER'		=> (isset(phpbb::$user->data['session_browser'])) ? phpbb::$user->data['session_browser'] : phpbb::$user->lang['UNKNOWN_BROWSER'],
-		'S_USERNAME'			=> phpbb::$user->data['username'],
-		'S_CONTENT_DIRECTION'	=> phpbb::$user->lang['DIRECTION'],
-		'S_CONTENT_FLOW_BEGIN'	=> (phpbb::$user->lang['DIRECTION'] == 'ltr') ? 'left' : 'right',
-		'S_CONTENT_FLOW_END'	=> (phpbb::$user->lang['DIRECTION'] == 'ltr') ? 'right' : 'left',
-		'S_CONTENT_ENCODING'	=> 'UTF-8',
-		'S_TIMEZONE'			=> (phpbb::$user->data['user_dst'] || (phpbb::$user->is_guest && phpbb::$config['board_dst'])) ? sprintf(phpbb::$user->lang['ALL_TIMES'], phpbb::$user->lang['tz'][$tz], phpbb::$user->lang['tz']['dst']) : sprintf(phpbb::$user->lang['ALL_TIMES'], phpbb::$user->lang['tz'][$tz], ''),
-		'S_DISPLAY_ONLINE_LIST'	=> ($l_online_time) ? 1 : 0,
-		'S_DISPLAY_SEARCH'		=> (!phpbb::$config['load_search']) ? 0 : (phpbb::$acl->acl_get('u_search') && phpbb::$acl->acl_getf_global('f_search')),
-		'S_DISPLAY_PM'			=> (phpbb::$config['allow_privmsg'] && !empty(phpbb::$user->is_registered) && (phpbb::$acl->acl_get('u_readpm') || phpbb::$acl->acl_get('u_sendpm'))) ? true : false,
-		'S_DISPLAY_MEMBERLIST'	=> (isset($auth)) ? phpbb::$acl->acl_get('u_viewprofile') : 0,
-		'S_NEW_PM'				=> ($s_privmsg_new) ? 1 : 0,
-		'S_REGISTER_ENABLED'	=> (phpbb::$config['require_activation'] != USER_ACTIVATION_DISABLE) ? true : false,
-
-		'T_THEME_PATH'			=> PHPBB_ROOT_PATH . 'styles/' . phpbb::$user->theme['theme_path'] . '/theme',
-		'T_TEMPLATE_PATH'		=> PHPBB_ROOT_PATH . 'styles/' . phpbb::$user->theme['template_path'] . '/template',
-		'T_IMAGESET_PATH'		=> PHPBB_ROOT_PATH . 'styles/' . phpbb::$user->theme['imageset_path'] . '/imageset',
-		'T_IMAGESET_LANG_PATH'	=> PHPBB_ROOT_PATH . 'styles/' . phpbb::$user->theme['imageset_path'] . '/imageset/' . phpbb::$user->data['user_lang'],
-		'T_IMAGES_PATH'			=> PHPBB_ROOT_PATH . 'images/',
-		'T_SMILIES_PATH'		=> PHPBB_ROOT_PATH . phpbb::$config['smilies_path'] . '/',
-		'T_AVATAR_PATH'			=> PHPBB_ROOT_PATH . phpbb::$config['avatar_path'] . '/',
-		'T_AVATAR_GALLERY_PATH'	=> PHPBB_ROOT_PATH . phpbb::$config['avatar_gallery_path'] . '/',
-		'T_ICONS_PATH'			=> PHPBB_ROOT_PATH . phpbb::$config['icons_path'] . '/',
-		'T_RANKS_PATH'			=> PHPBB_ROOT_PATH . phpbb::$config['ranks_path'] . '/',
-		'T_UPLOAD_PATH'			=> PHPBB_ROOT_PATH . phpbb::$config['upload_path'] . '/',
-		'T_STYLESHEET_LINK'		=> (!phpbb::$user->theme['theme_storedb']) ? PHPBB_ROOT_PATH . 'styles/' . phpbb::$user->theme['theme_path'] . '/theme/stylesheet.css' : phpbb::$url->get(PHPBB_ROOT_PATH . 'style.' . PHP_EXT . '?id=' . phpbb::$user->theme['style_id'] . '&amp;lang=' . phpbb::$user->data['user_lang']), //PHPBB_ROOT_PATH . "store/{phpbb::$user->theme['theme_id']}_{phpbb::$user->theme['imageset_id']}_{phpbb::$user->lang_name}.css"
-		'T_STYLESHEET_NAME'		=> phpbb::$user->theme['theme_name'],
-
-		'SITE_LOGO_IMG'			=> phpbb::$user->img('site_logo'),
-
-		'A_COOKIE_SETTINGS'		=> addslashes('; path=' . phpbb::$config['cookie_path'] . ((!phpbb::$config['cookie_domain'] || phpbb::$config['cookie_domain'] == 'localhost' || phpbb::$config['cookie_domain'] == '127.0.0.1') ? '' : '; domain=' . phpbb::$config['cookie_domain']) . ((!phpbb::$config['cookie_secure']) ? '' : '; secure')),
-	));
-
-	// application/xhtml+xml not used because of IE
-	header('Content-type: text/html; charset=UTF-8');
-
-	header('Cache-Control: private, no-cache="set-cookie"');
-	header('Expires: 0');
-	header('Pragma: no-cache');
-
-	if (phpbb::$plugins->function_inject(__FUNCTION__, 'return')) return phpbb::$plugins->call_inject(__FUNCTION__, 'return');
-}
-
-/**
-* Generate page footer
-*/
-function page_footer($run_cron = true)
-{
-	global $starttime;
-
-	// Output page creation time
-	if (phpbb::$base_config['debug'])
-	{
-		$mtime = explode(' ', microtime());
-		$totaltime = $mtime[0] + $mtime[1] - $starttime;
-
-		if (phpbb_request::variable('explain', false) && /*phpbb::$acl->acl_get('a_') &&*/ phpbb::$base_config['debug_extra'] && method_exists(phpbb::$db, 'sql_report'))
-		{
-			phpbb::$db->sql_report('display');
-		}
-
-		$debug_output = sprintf('Time : %.3fs | ' . phpbb::$db->sql_num_queries() . ' Queries | GZIP : ' . ((phpbb::$config['gzip_compress']) ? 'On' : 'Off') . ((phpbb::$user->system['load']) ? ' | Load : ' . phpbb::$user->system['load'] : ''), $totaltime);
-
-		if (/*phpbb::$acl->acl_get('a_') &&*/ phpbb::$base_config['debug_extra'])
-		{
-			if (function_exists('memory_get_usage'))
-			{
-				if ($memory_usage = memory_get_usage())
-				{
-					$memory_usage -= phpbb::$base_config['memory_usage'];
-					$memory_usage = get_formatted_filesize($memory_usage);
-
-					$debug_output .= ' | Memory Usage: ' . $memory_usage;
-				}
-			}
-
-			$debug_output .= ' | <a href="' . phpbb::$url->build_url() . '&amp;explain=1">Explain</a>';
-		}
-	}
-
-	phpbb::$template->assign_vars(array(
-		'DEBUG_OUTPUT'			=> (phpbb::$base_config['debug']) ? $debug_output : '',
-		'TRANSLATION_INFO'		=> (!empty(phpbb::$user->lang['TRANSLATION_INFO'])) ? phpbb::$user->lang['TRANSLATION_INFO'] : '',
-
-		'U_ACP' => (phpbb::$acl->acl_get('a_') && !empty(phpbb::$user->is_registered)) ? phpbb::$url->append_sid(phpbb::$base_config['admin_folder'] . '/index', false, true, phpbb::$user->session_id) : '',
-	));
-
-	// Call cron-type script
-	if (!defined('IN_CRON') && $run_cron && !phpbb::$config['board_disable'])
-	{
-		$cron_type = '';
-
-		if (time() - phpbb::$config['queue_interval'] > phpbb::$config['last_queue_run'] && !defined('IN_ADMIN') && file_exists(PHPBB_ROOT_PATH . 'cache/queue.' . PHP_EXT))
-		{
-			// Process email queue
-			$cron_type = 'queue';
-		}
-		else if (method_exists(phpbb::$acm, 'tidy') && time() - phpbb::$config['cache_gc'] > phpbb::$config['cache_last_gc'])
-		{
-			// Tidy the cache
-			$cron_type = 'tidy_cache';
-		}
-		else if (time() - phpbb::$config['warnings_gc'] > phpbb::$config['warnings_last_gc'])
-		{
-			$cron_type = 'tidy_warnings';
-		}
-		else if (time() - phpbb::$config['database_gc'] > phpbb::$config['database_last_gc'])
-		{
-			// Tidy the database
-			$cron_type = 'tidy_database';
-		}
-		else if (time() - phpbb::$config['search_gc'] > phpbb::$config['search_last_gc'])
-		{
-			// Tidy the search
-			$cron_type = 'tidy_search';
-		}
-		else if (time() - phpbb::$config['session_gc'] > phpbb::$config['session_last_gc'])
-		{
-			$cron_type = 'tidy_sessions';
-		}
-
-		if ($cron_type)
-		{
-			phpbb::$template->assign_var('RUN_CRON_TASK', '<img src="' . phpbb::$url->append_sid('cron', 'cron_type=' . $cron_type) . '" width="1" height="1" alt="cron" />');
-		}
-	}
-
-	phpbb::$template->display('body');
-
-	garbage_collection();
-	exit_handler();
-}
-
-/**
-* Closing the cache object and the database
-* Cool function name, eh? We might want to add operations to it later
-*/
-function garbage_collection()
-{
-	// Unload cache, must be done before the DB connection if closed
-	if (phpbb::registered('acm'))
-	{
-		phpbb::$acm->unload();
-	}
-
-	// Close our DB connection.
-	if (phpbb::registered('db'))
-	{
-		phpbb::$db->sql_close();
-	}
-}
-
-/**
-* Handler for exit calls in phpBB.
-* This function supports hooks.
-*
-* Note: This function is called after the template has been outputted.
-*/
-function exit_handler()
-{
-	// needs to be run prior to the hook
-	if (phpbb_request::super_globals_disabled())
-	{
-		phpbb_request::enable_super_globals();
-	}
-
-	// As a pre-caution... some setups display a blank page if the flush() is not there.
-	(empty(phpbb::$config['gzip_compress'])) ? @flush() : @ob_flush();
-
-	exit;
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
deleted file mode 100644
index dee0f82566..0000000000
--- a/phpBB/includes/functions_admin.php
+++ /dev/null
@@ -1,3251 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Recalculate Binary Tree
-function recalc_btree($sql_id, $sql_table, $module_class = '')
-{
-	if (!$sql_id || !$sql_table)
-	{
-		return;
-	}
-
-	$sql_where = ($module_class) ? " WHERE module_class = '" . phpbb::$db->sql_escape($module_class) . "'" : '';
-
-	// Reset to minimum possible left and right id
-	$sql = "SELECT MIN(left_id) as min_left_id, MIN(right_id) as min_right_id
-		FROM $sql_table
-		$sql_where";
-	$result = phpbb::$db->sql_query($sql);
-	$row = phpbb::$db->sql_fetchrow($result);
-	phpbb::$db->sql_freeresult($result);
-
-	$substract = (int) (min($row['min_left_id'], $row['min_right_id']) - 1);
-
-	if ($substract > 0)
-	{
-		$sql = "UPDATE $sql_table
-			SET left_id = left_id - $substract, right_id = right_id - $substract
-			$sql_where";
-		phpbb::$db->sql_query($sql);
-	}
-
-	$sql = "SELECT $sql_id, parent_id, left_id, right_id
-		FROM $sql_table
-		$sql_where
-		ORDER BY left_id ASC, parent_id ASC, $sql_id ASC";
-	$f_result = phpbb::$db->sql_query($sql);
-
-	while ($item_data = phpbb::$db->sql_fetchrow($f_result))
-	{
-		if ($item_data['parent_id'])
-		{
-			$sql = "SELECT left_id, right_id
-				FROM $sql_table
-				$sql_where " . (($sql_where) ? 'AND' : 'WHERE') . "
-					$sql_id = {$item_data['parent_id']}";
-			$result = phpbb::$db->sql_query($sql);
-
-			if (!$row = phpbb::$db->sql_fetchrow($result))
-			{
-				$sql = "UPDATE $sql_table SET parent_id = 0 WHERE $sql_id = " . $item_data[$sql_id];
-				phpbb::$db->sql_query($sql);
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			$sql = "UPDATE $sql_table
-				SET left_id = left_id + 2, right_id = right_id + 2
-				$sql_where " . (($sql_where) ? 'AND' : 'WHERE') . "
-					left_id > {$row['right_id']}";
-			phpbb::$db->sql_query($sql);
-
-			$sql = "UPDATE $sql_table
-				SET right_id = right_id + 2
-				$sql_where " . (($sql_where) ? 'AND' : 'WHERE') . "
-					{$row['left_id']} BETWEEN left_id AND right_id";
-			phpbb::$db->sql_query($sql);
-
-			$item_data['left_id'] = $row['right_id'];
-			$item_data['right_id'] = $row['right_id'] + 1;
-		}
-		else
-		{
-			$sql = "SELECT MAX(right_id) AS right_id
-				FROM $sql_table
-				$sql_where";
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			$item_data['left_id'] = $row['right_id'] + 1;
-			$item_data['right_id'] = $row['right_id'] + 2;
-		}
-
-		$sql = "UPDATE $sql_table
-			SET left_id = {$item_data['left_id']}, right_id = {$item_data['right_id']}
-			WHERE $sql_id = " . $item_data[$sql_id];
-		phpbb::$db->sql_query($sql);
-	}
-	phpbb::$db->sql_freeresult($f_result);
-}
-*/
-
-/**
-* Simple version of jumpbox, just lists authed forums
-*/
-function make_forum_select($select_id = false, $ignore_id = false, $ignore_acl = false, $ignore_nonpost = false, $ignore_emptycat = true, $only_acl_post = false, $return_array = false)
-{
-	$acl = ($ignore_acl) ? '' : (($only_acl_post) ? 'f_post' : array('f_list', 'a_forum', 'a_forumadd', 'a_forumdel'));
-
-	// This query is identical to the jumpbox one
-	$sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id
-		FROM ' . FORUMS_TABLE . '
-		ORDER BY left_id ASC';
-	$result = phpbb::$db->sql_query($sql, 600);
-
-	$right = 0;
-	$padding_store = array('0' => '');
-	$padding = '';
-	$forum_list = ($return_array) ? array() : '';
-
-	// Sometimes it could happen that forums will be displayed here not be displayed within the index page
-	// This is the result of forums not displayed at index, having list permissions and a parent of a forum with no permissions.
-	// If this happens, the padding could be "broken"
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		if ($row['left_id'] < $right)
-		{
-			$padding .= '&nbsp; &nbsp;';
-			$padding_store[$row['parent_id']] = $padding;
-		}
-		else if ($row['left_id'] > $right + 1)
-		{
-			$padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : '';
-		}
-
-		$right = $row['right_id'];
-		$disabled = false;
-
-		if ($acl && !phpbb::$acl->acl_gets($acl, $row['forum_id']))
-		{
-			// List permission?
-			if (phpbb::$acl->acl_get('f_list', $row['forum_id']))
-			{
-				$disabled = true;
-			}
-			else
-			{
-				continue;
-			}
-		}
-
-		if (
-			((is_array($ignore_id) && in_array($row['forum_id'], $ignore_id)) || $row['forum_id'] == $ignore_id)
-			||
-			// Non-postable forum with no subforums, don't display
-			($row['forum_type'] == FORUM_CAT && ($row['left_id'] + 1 == $row['right_id']) && $ignore_emptycat)
-			||
-			($row['forum_type'] != FORUM_POST && $ignore_nonpost)
-			)
-		{
-			$disabled = true;
-		}
-
-		if ($return_array)
-		{
-			// Include some more information...
-			$selected = (is_array($select_id)) ? ((in_array($row['forum_id'], $select_id)) ? true : false) : (($row['forum_id'] == $select_id) ? true : false);
-			$forum_list[$row['forum_id']] = array_merge(array('padding' => $padding, 'selected' => ($selected && !$disabled), 'disabled' => $disabled), $row);
-		}
-		else
-		{
-			$selected = (is_array($select_id)) ? ((in_array($row['forum_id'], $select_id)) ? ' selected="selected"' : '') : (($row['forum_id'] == $select_id) ? ' selected="selected"' : '');
-			$forum_list .= '<option value="' . $row['forum_id'] . '"' . (($disabled) ? ' disabled="disabled" class="disabled-option"' : $selected) . '>' . $padding . $row['forum_name'] . '</option>';
-		}
-	}
-	phpbb::$db->sql_freeresult($result);
-	unset($padding_store);
-
-	return $forum_list;
-}
-
-/**
-* Generate size select options
-*/
-function size_select_options($size_compare)
-{
-	$size_types_text = array(phpbb::$user->lang['BYTES'], phpbb::$user->lang['KIB'], phpbb::$user->lang['MIB']);
-	$size_types = array('b', 'kb', 'mb');
-
-	$s_size_options = '';
-
-	for ($i = 0, $size = sizeof($size_types_text); $i < $size; $i++)
-	{
-		$selected = ($size_compare == $size_types[$i]) ? ' selected="selected"' : '';
-		$s_size_options .= '<option value="' . $size_types[$i] . '"' . $selected . '>' . $size_types_text[$i] . '</option>';
-	}
-
-	return $s_size_options;
-}
-
-/**
-* Generate list of groups (option fields without select)
-*
-* @param int $group_id The default group id to mark as selected
-* @param array $exclude_ids The group ids to exclude from the list, false (default) if you whish to exclude no id
-* @param int $manage_founder If set to false (default) all groups are returned, if 0 only those groups returned not being managed by founders only, if 1 only those groups returned managed by founders only.
-*
-* @return string The list of options.
-*/
-function group_select_options($group_id, $exclude_ids = false, $manage_founder = false)
-{
-	$exclude_sql = ($exclude_ids !== false && sizeof($exclude_ids)) ? 'WHERE ' . phpbb::$db->sql_in_set('group_id', array_map('intval', $exclude_ids), true) : '';
-	$sql_and = (!phpbb::$config['coppa_enable']) ? (($exclude_sql) ? ' AND ' : ' WHERE ') . "group_name <> 'REGISTERED_COPPA'" : '';
-	$sql_founder = ($manage_founder !== false) ? (($exclude_sql || $sql_and) ? ' AND ' : ' WHERE ') . 'group_founder_manage = ' . (int) $manage_founder : '';
-
-	$sql = 'SELECT group_id, group_name, group_type
-		FROM ' . GROUPS_TABLE . "
-		$exclude_sql
-		$sql_and
-		$sql_founder
-		ORDER BY group_type DESC, group_name ASC";
-	$result = phpbb::$db->sql_query($sql);
-
-	$s_group_options = '';
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$selected = ($row['group_id'] == $group_id) ? ' selected="selected"' : '';
-		$s_group_options .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '') . ' value="' . $row['group_id'] . '"' . $selected . '>' . (($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	return $s_group_options;
-}
-
-/**
-* Obtain authed forums list
-*/
-function get_forum_list($acl_list = 'f_list', $id_only = true, $postable_only = false, $no_cache = false)
-{
-	static $forum_rows;
-
-	if (!isset($forum_rows))
-	{
-		// This query is identical to the jumpbox one
-		$expire_time = ($no_cache) ? 0 : 600;
-
-		$sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id
-			FROM ' . FORUMS_TABLE . '
-			ORDER BY left_id ASC';
-		$result = phpbb::$db->sql_query($sql, $expire_time);
-
-		$forum_rows = array();
-
-		$right = $padding = 0;
-		$padding_store = array('0' => 0);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			if ($row['left_id'] < $right)
-			{
-				$padding++;
-				$padding_store[$row['parent_id']] = $padding;
-			}
-			else if ($row['left_id'] > $right + 1)
-			{
-				// Ok, if the $padding_store for this parent is empty there is something wrong. For now we will skip over it.
-				// @todo digging deep to find out "how" this can happen.
-				$padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : $padding;
-			}
-
-			$right = $row['right_id'];
-			$row['padding'] = $padding;
-
-			$forum_rows[] = $row;
-		}
-		phpbb::$db->sql_freeresult($result);
-		unset($padding_store);
-	}
-
-	$rowset = array();
-	foreach ($forum_rows as $row)
-	{
-		if ($postable_only && $row['forum_type'] != FORUM_POST)
-		{
-			continue;
-		}
-
-		if ($acl_list == '' || ($acl_list != '' && phpbb::$acl->acl_gets($acl_list, $row['forum_id'])))
-		{
-			$rowset[] = ($id_only) ? $row['forum_id'] : $row;
-		}
-	}
-
-	return $rowset;
-}
-
-/**
-* Get forum branch
-*/
-function get_forum_branch($forum_id, $type = 'all', $order = 'descending', $include_forum = true)
-{
-	switch ($type)
-	{
-		case 'parents':
-			$condition = 'f1.left_id BETWEEN f2.left_id AND f2.right_id';
-		break;
-
-		case 'children':
-			$condition = 'f2.left_id BETWEEN f1.left_id AND f1.right_id';
-		break;
-
-		default:
-			$condition = 'f2.left_id BETWEEN f1.left_id AND f1.right_id OR f1.left_id BETWEEN f2.left_id AND f2.right_id';
-		break;
-	}
-
-	$rows = array();
-
-	$sql = 'SELECT f2.*
-		FROM ' . FORUMS_TABLE . ' f1
-		LEFT JOIN ' . FORUMS_TABLE . " f2 ON ($condition)
-		WHERE f1.forum_id = $forum_id
-		ORDER BY f2.left_id " . (($order == 'descending') ? 'ASC' : 'DESC');
-	$result = phpbb::$db->sql_query($sql);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		if (!$include_forum && $row['forum_id'] == $forum_id)
-		{
-			continue;
-		}
-
-		$rows[] = $row;
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	return $rows;
-}
-
-/**
-* Get physical file listing
-*/
-function filelist($rootdir, $dir = '', $type = 'gif|jpg|jpeg|png')
-{
-	$matches = array();
-
-	// Remove initial / if present
-	$rootdir = (substr($rootdir, 0, 1) == '/') ? substr($rootdir, 1) : $rootdir;
-	// Add closing / if not present
-	$rootdir = ($rootdir && substr($rootdir, -1) != '/') ? $rootdir . '/' : $rootdir;
-
-	// Remove initial / if present
-	$dir = (substr($dir, 0, 1) == '/') ? substr($dir, 1) : $dir;
-	// Add closing / if not present
-	$dir = ($dir && substr($dir, -1) != '/') ? $dir . '/' : $dir;
-
-	if (!is_dir($rootdir . $dir))
-	{
-		return $matches;
-	}
-
-	$dh = @opendir($rootdir . $dir);
-
-	if (!$dh)
-	{
-		return $matches;
-	}
-
-	while (($fname = readdir($dh)) !== false)
-	{
-		if (is_file("$rootdir$dir$fname"))
-		{
-			if (filesize("$rootdir$dir$fname") && preg_match('#\.' . $type . '$#i', $fname))
-			{
-				$matches[$dir][] = $fname;
-			}
-		}
-		else if ($fname[0] != '.' && is_dir("$rootdir$dir$fname"))
-		{
-			$matches += filelist($rootdir, "$dir$fname", $type);
-		}
-	}
-	closedir($dh);
-
-	return $matches;
-}
-
-/**
-* Move topic(s)
-*/
-function move_topics($topic_ids, $forum_id, $auto_sync = true)
-{
-	if (empty($topic_ids))
-	{
-		return;
-	}
-
-	$forum_ids = array($forum_id);
-
-	if (!is_array($topic_ids))
-	{
-		$topic_ids = array($topic_ids);
-	}
-
-	$sql = 'DELETE FROM ' . TOPICS_TABLE . '
-		WHERE ' . phpbb::$db->sql_in_set('topic_moved_id', $topic_ids) . '
-			AND forum_id = ' . $forum_id;
-	phpbb::$db->sql_query($sql);
-
-	if ($auto_sync)
-	{
-		$sql = 'SELECT DISTINCT forum_id
-			FROM ' . TOPICS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_ids);
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$forum_ids[] = $row['forum_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	$table_ary = array(TOPICS_TABLE, POSTS_TABLE, LOG_TABLE, DRAFTS_TABLE, TOPICS_TRACK_TABLE);
-	foreach ($table_ary as $table)
-	{
-		$sql = "UPDATE $table
-			SET forum_id = $forum_id
-			WHERE " . phpbb::$db->sql_in_set('topic_id', $topic_ids);
-		phpbb::$db->sql_query($sql);
-	}
-	unset($table_ary);
-
-	if ($auto_sync)
-	{
-		sync('forum', 'forum_id', $forum_ids, true, true);
-		unset($forum_ids);
-	}
-}
-
-/**
-* Move post(s)
-*/
-function move_posts($post_ids, $topic_id, $auto_sync = true)
-{
-	if (!is_array($post_ids))
-	{
-		$post_ids = array($post_ids);
-	}
-
-	$forum_ids = array();
-	$topic_ids = array($topic_id);
-
-	$sql = 'SELECT DISTINCT topic_id, forum_id
-		FROM ' . POSTS_TABLE . '
-		WHERE ' . phpbb::$db->sql_in_set('post_id', $post_ids);
-	$result = phpbb::$db->sql_query($sql);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$forum_ids[] = $row['forum_id'];
-		$topic_ids[] = $row['topic_id'];
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	$sql = 'SELECT forum_id
-		FROM ' . TOPICS_TABLE . '
-		WHERE topic_id = ' . $topic_id;
-	$result = phpbb::$db->sql_query($sql);
-	$forum_row = phpbb::$db->sql_fetchrow($result);
-	phpbb::$db->sql_freeresult($result);
-
-	if (!$forum_row)
-	{
-		trigger_error('NO_TOPIC');
-	}
-
-	$sql = 'UPDATE ' . POSTS_TABLE . '
-		SET forum_id = ' . $forum_row['forum_id'] . ", topic_id = $topic_id
-		WHERE " . phpbb::$db->sql_in_set('post_id', $post_ids);
-	phpbb::$db->sql_query($sql);
-
-	$sql = 'UPDATE ' . ATTACHMENTS_TABLE . "
-		SET topic_id = $topic_id, in_message = 0
-		WHERE " . phpbb::$db->sql_in_set('post_msg_id', $post_ids);
-	phpbb::$db->sql_query($sql);
-
-	if ($auto_sync)
-	{
-		$forum_ids[] = $forum_row['forum_id'];
-
-		sync('topic_reported', 'topic_id', $topic_ids);
-		sync('topic_attachment', 'topic_id', $topic_ids);
-		sync('topic', 'topic_id', $topic_ids, true);
-		sync('forum', 'forum_id', $forum_ids, true, true);
-	}
-
-	// Update posted information
-	update_posted_info($topic_ids);
-}
-
-/**
-* Remove topic(s)
-*/
-function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_sync = true, $call_delete_posts = true)
-{
-	$approved_topics = 0;
-	$forum_ids = $topic_ids = array();
-
-	if ($where_type === 'range')
-	{
-		$where_clause = $where_ids;
-	}
-	else
-	{
-		$where_ids = (is_array($where_ids)) ? array_unique($where_ids) : array($where_ids);
-
-		if (!sizeof($where_ids))
-		{
-			return array('topics' => 0, 'posts' => 0);
-		}
-
-		$where_clause = phpbb::$db->sql_in_set($where_type, $where_ids);
-	}
-
-	// Making sure that delete_posts does not call delete_topics again...
-	$return = array(
-		'posts' => ($call_delete_posts) ? delete_posts($where_type, $where_ids, false, true, $post_count_sync, false) : 0,
-	);
-
-	$sql = 'SELECT topic_id, forum_id, topic_approved, topic_moved_id
-		FROM ' . TOPICS_TABLE . '
-		WHERE ' . $where_clause;
-	$result = phpbb::$db->sql_query($sql);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$forum_ids[] = $row['forum_id'];
-		$topic_ids[] = $row['topic_id'];
-
-		if ($row['topic_approved'] && !$row['topic_moved_id'])
-		{
-			$approved_topics++;
-		}
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	$return['topics'] = sizeof($topic_ids);
-
-	if (!sizeof($topic_ids))
-	{
-		return $return;
-	}
-
-	phpbb::$db->sql_transaction('begin');
-
-	$table_ary = array(TOPICS_TRACK_TABLE, TOPICS_POSTED_TABLE, POLL_VOTES_TABLE, POLL_OPTIONS_TABLE, TOPICS_WATCH_TABLE, TOPICS_TABLE);
-
-	foreach ($table_ary as $table)
-	{
-		$sql = "DELETE FROM $table
-			WHERE " . phpbb::$db->sql_in_set('topic_id', $topic_ids);
-		phpbb::$db->sql_query($sql);
-	}
-	unset($table_ary);
-
-	$moved_topic_ids = array();
-
-	// update the other forums
-	$sql = 'SELECT topic_id, forum_id
-		FROM ' . TOPICS_TABLE . '
-		WHERE ' . phpbb::$db->sql_in_set('topic_moved_id', $topic_ids);
-	$result = phpbb::$db->sql_query($sql);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$forum_ids[] = $row['forum_id'];
-		$moved_topic_ids[] = $row['topic_id'];
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	if (sizeof($moved_topic_ids))
-	{
-		$sql = 'DELETE FROM ' . TOPICS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('topic_id', $moved_topic_ids);
-		phpbb::$db->sql_query($sql);
-	}
-
-	phpbb::$db->sql_transaction('commit');
-
-	if ($auto_sync)
-	{
-		sync('forum', 'forum_id', array_unique($forum_ids), true, true);
-		sync('topic_reported', $where_type, $where_ids);
-	}
-
-	if ($approved_topics)
-	{
-		set_config_count('num_topics', $approved_topics * (-1), true);
-	}
-
-	return $return;
-}
-
-/**
-* Remove post(s)
-*/
-function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync = true, $post_count_sync = true, $call_delete_topics = true)
-{
-	if ($where_type === 'range')
-	{
-		$where_clause = $where_ids;
-	}
-	else
-	{
-		if (is_array($where_ids))
-		{
-			$where_ids = array_unique($where_ids);
-		}
-		else
-		{
-			$where_ids = array($where_ids);
-		}
-
-		if (!sizeof($where_ids))
-		{
-			return false;
-		}
-
-		$where_ids = array_map('intval', $where_ids);
-
-		// Split post deletion into chunks to overcome database limitations
-		if (sizeof($where_ids) >= 1001)
-		{
-			// Split into chunks of 1000
-			$chunks = array_chunk($where_ids, 1000);
-			$removed_posts = 0;
-
-			foreach ($chunks as $_where_ids)
-			{
-				$removed_posts += delete_posts($where_type, $_where_ids, $auto_sync, $posted_sync, $post_count_sync, $call_delete_topics);
-			}
-
-			return $removed_posts;
-		}
-
-		$where_clause = phpbb::$db->sql_in_set($where_type, $where_ids);
-	}
-
-	$approved_posts = 0;
-	$post_ids = $topic_ids = $forum_ids = $post_counts = $remove_topics = array();
-
-	$sql = 'SELECT post_id, poster_id, post_approved, post_postcount, topic_id, forum_id
-		FROM ' . POSTS_TABLE . '
-		WHERE ' . $where_clause;
-	$result = phpbb::$db->sql_query($sql);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$post_ids[] = (int) $row['post_id'];
-		$poster_ids[] = (int) $row['poster_id'];
-		$topic_ids[] = (int) $row['topic_id'];
-		$forum_ids[] = (int) $row['forum_id'];
-
-		if ($row['post_postcount'] && $post_count_sync && $row['post_approved'])
-		{
-			$post_counts[$row['poster_id']] = (!empty($post_counts[$row['poster_id']])) ? $post_counts[$row['poster_id']] + 1 : 1;
-		}
-
-		if ($row['post_approved'])
-		{
-			$approved_posts++;
-		}
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	if (!sizeof($post_ids))
-	{
-		return false;
-	}
-
-	phpbb::$db->sql_transaction('begin');
-
-	$table_ary = array(POSTS_TABLE, REPORTS_TABLE);
-
-	foreach ($table_ary as $table)
-	{
-		$sql = "DELETE FROM $table
-			WHERE " . phpbb::$db->sql_in_set('post_id', $post_ids);
-		phpbb::$db->sql_query($sql);
-	}
-	unset($table_ary);
-
-	// Adjust users post counts
-	if (sizeof($post_counts) && $post_count_sync)
-	{
-		foreach ($post_counts as $poster_id => $substract)
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_posts = 0
-				WHERE user_id = ' . $poster_id . '
-				AND user_posts < ' . $substract;
-			phpbb::$db->sql_query($sql);
-
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_posts = user_posts - ' . $substract . '
-				WHERE user_id = ' . $poster_id . '
-				AND user_posts >= ' . $substract;
-			phpbb::$db->sql_query($sql);
-		}
-	}
-
-	// Remove topics now having no posts?
-	if (sizeof($topic_ids))
-	{
-		$sql = 'SELECT topic_id
-			FROM ' . POSTS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_ids) . '
-			GROUP BY topic_id';
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$remove_topics[] = $row['topic_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// Actually, those not within remove_topics should be removed. ;)
-		$remove_topics = array_diff($topic_ids, $remove_topics);
-	}
-
-	// Remove the message from the search index
-	$search_type = basename(phpbb::$config['search_type']);
-
-	if (!file_exists(PHPBB_ROOT_PATH . 'includes/search/' . $search_type . '.' . PHP_EXT))
-	{
-		trigger_error('NO_SUCH_SEARCH_MODULE');
-	}
-
-	include_once(PHPBB_ROOT_PATH . "includes/search/$search_type." . PHP_EXT);
-
-	$error = false;
-	$search = new $search_type($error);
-
-	if ($error)
-	{
-		trigger_error($error);
-	}
-
-	$search->index_remove($post_ids, $poster_ids, $forum_ids);
-
-	delete_attachments('post', $post_ids, false);
-
-	phpbb::$db->sql_transaction('commit');
-
-	// Resync topics_posted table
-	if ($posted_sync)
-	{
-		update_posted_info($topic_ids);
-	}
-
-	if ($auto_sync)
-	{
-		sync('topic_reported', 'topic_id', $topic_ids);
-		sync('topic', 'topic_id', $topic_ids, true);
-		sync('forum', 'forum_id', $forum_ids, true, true);
-	}
-
-	if ($approved_posts)
-	{
-		set_config_count('num_posts', $approved_posts * (-1), true);
-	}
-
-	// We actually remove topics now to not be inconsistent (the delete_topics function calls this function too)
-	if (sizeof($remove_topics) && $call_delete_topics)
-	{
-		delete_topics('topic_id', $remove_topics, $auto_sync, $post_count_sync, false);
-	}
-
-	return sizeof($post_ids);
-}
-
-/**
-* Delete Attachments
-*
-* @param string $mode can be: post|message|topic|attach|user
-* @param mixed $ids can be: post_ids, message_ids, topic_ids, attach_ids, user_ids
-* @param bool $resync set this to false if you are deleting posts or topics
-*/
-function delete_attachments($mode, $ids, $resync = true)
-{
-	if (is_array($ids) && sizeof($ids))
-	{
-		$ids = array_unique($ids);
-		$ids = array_map('intval', $ids);
-	}
-	else
-	{
-		$ids = array((int) $ids);
-	}
-
-	if (!sizeof($ids))
-	{
-		return false;
-	}
-
-	$sql_where = '';
-
-	switch ($mode)
-	{
-		case 'post':
-		case 'message':
-			$sql_id = 'post_msg_id';
-			$sql_where = ' AND in_message = ' . ($mode == 'message' ? 1 : 0);
-		break;
-
-		case 'topic':
-			$sql_id = 'topic_id';
-		break;
-
-		case 'user':
-			$sql_id = 'poster_id';
-		break;
-
-		case 'attach':
-		default:
-			$sql_id = 'attach_id';
-			$mode = 'attach';
-		break;
-	}
-
-	$post_ids = $message_ids = $topic_ids = $physical = array();
-
-	// Collect post and topic ids for later use if we need to touch remaining entries (if resync is enabled)
-	$sql = 'SELECT post_msg_id, topic_id, in_message, physical_filename, thumbnail, filesize, is_orphan
-			FROM ' . ATTACHMENTS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set($sql_id, $ids);
-
-	$sql .= $sql_where;
-
-	$result = phpbb::$db->sql_query($sql);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		// We only need to store post/message/topic ids if resync is enabled and the file is not orphaned
-		if ($resync && !$row['is_orphan'])
-		{
-			if (!$row['in_message'])
-			{
-				$post_ids[] = $row['post_msg_id'];
-				$topic_ids[] = $row['topic_id'];
-			}
-			else
-			{
-				$message_ids[] = $row['post_msg_id'];
-			}
-		}
-
-		$physical[] = array('filename' => $row['physical_filename'], 'thumbnail' => $row['thumbnail'], 'filesize' => $row['filesize'], 'is_orphan' => $row['is_orphan']);
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	// Delete attachments
-	$sql = 'DELETE FROM ' . ATTACHMENTS_TABLE . '
-		WHERE ' . phpbb::$db->sql_in_set($sql_id, $ids);
-
-	$sql .= $sql_where;
-
-	phpbb::$db->sql_query($sql);
-	$num_deleted = phpbb::$db->sql_affectedrows();
-
-	if (!$num_deleted)
-	{
-		return 0;
-	}
-
-	// Delete attachments from filesystem
-	$space_removed = $files_removed = 0;
-	foreach ($physical as $file_ary)
-	{
-		if (phpbb_unlink($file_ary['filename'], 'file', true) && !$file_ary['is_orphan'])
-		{
-			// Only non-orphaned files count to the file size
-			$space_removed += $file_ary['filesize'];
-			$files_removed++;
-		}
-
-		if ($file_ary['thumbnail'])
-		{
-			phpbb_unlink($file_ary['filename'], 'thumbnail', true);
-		}
-	}
-
-	if ($space_removed || $files_removed)
-	{
-		set_config_count('upload_dir_size', $space_removed * (-1), true);
-		set_config_count('num_files', $files_removed * (-1), true);
-	}
-
-	// If we do not resync, we do not need to adjust any message, post, topic or user entries
-	if (!$resync)
-	{
-		return $num_deleted;
-	}
-
-	// No more use for the original ids
-	unset($ids);
-
-	// Now, we need to resync posts, messages, topics. We go through every one of them
-	$post_ids = array_unique($post_ids);
-	$message_ids = array_unique($message_ids);
-	$topic_ids = array_unique($topic_ids);
-
-	// Update post indicators for posts now no longer having attachments
-	if (sizeof($post_ids))
-	{
-		$sql = 'UPDATE ' . POSTS_TABLE . '
-			SET post_attachment = 0
-			WHERE ' . phpbb::$db->sql_in_set('post_id', $post_ids);
-		phpbb::$db->sql_query($sql);
-	}
-
-	// Update message table if messages are affected
-	if (sizeof($message_ids))
-	{
-		$sql = 'UPDATE ' . PRIVMSGS_TABLE . '
-			SET message_attachment = 0
-			WHERE ' . phpbb::$db->sql_in_set('msg_id', $message_ids);
-		phpbb::$db->sql_query($sql);
-	}
-
-	// Now update the topics. This is a bit trickier, because there could be posts still having attachments within the topic
-	if (sizeof($topic_ids))
-	{
-		// Just check which topics are still having an assigned attachment not orphaned by querying the attachments table (much less entries expected)
-		$sql = 'SELECT topic_id
-			FROM ' . ATTACHMENTS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_ids) . '
-				AND is_orphan = 0';
-		$result = phpbb::$db->sql_query($sql);
-
-		$remaining_ids = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$remaining_ids[] = $row['topic_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// Now only unset those ids remaining
-		$topic_ids = array_diff($topic_ids, $remaining_ids);
-
-		if (sizeof($topic_ids))
-		{
-			$sql = 'UPDATE ' . TOPICS_TABLE . '
-				SET topic_attachment = 0
-				WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_ids);
-			phpbb::$db->sql_query($sql);
-		}
-	}
-
-	return $num_deleted;
-}
-
-/**
-* Remove topic shadows
-*/
-function delete_topic_shadows($max_age, $forum_id = '', $auto_sync = true)
-{
-	$where = (is_array($forum_id)) ? 'AND ' . phpbb::$db->sql_in_set('t.forum_id', array_map('intval', $forum_id)) : (($forum_id) ? 'AND t.forum_id = ' . (int) $forum_id : '');
-
-	if (phpbb::$db->features['multi_table_deletion'])
-	{
-			$sql = 'DELETE FROM ' . TOPICS_TABLE . ' t
-				USING ' . TOPICS_TABLE . ' t2
-				WHERE t.topic_moved_id = t2.topic_id
-					AND t.topic_time < ' . (time() - $max_age)
-					. $where;
-			phpbb::$db->sql_query($sql);
-	}
-	else
-	{
-		$sql = 'SELECT t.topic_id
-			FROM ' . TOPICS_TABLE . ' t, ' . TOPICS_TABLE . ' t2
-			WHERE t.topic_moved_id = t2.topic_id
-				AND t.topic_time < ' . (time() - $max_age)
-			. $where;
-		$result = phpbb::$db->sql_query($sql);
-
-		$topic_ids = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$topic_ids[] = $row['topic_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if (sizeof($topic_ids))
-		{
-			$sql = 'DELETE FROM ' . TOPICS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_ids);
-			phpbb::$db->sql_query($sql);
-		}
-	}
-
-	if ($auto_sync)
-	{
-		$where_type = ($forum_id) ? 'forum_id' : '';
-		sync('forum', $where_type, $forum_id, true, true);
-	}
-}
-
-/**
-* Update/Sync posted information for topics
-*/
-function update_posted_info(&$topic_ids)
-{
-	if (empty($topic_ids) || !phpbb::$config['load_db_track'])
-	{
-		return;
-	}
-
-	// First of all, let us remove any posted information for these topics
-	$sql = 'DELETE FROM ' . TOPICS_POSTED_TABLE . '
-		WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_ids);
-	phpbb::$db->sql_query($sql);
-
-	// Now, let us collect the user/topic combos for rebuilding the information
-	$sql = 'SELECT poster_id, topic_id
-		FROM ' . POSTS_TABLE . '
-		WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_ids) . '
-			AND poster_id <> ' . ANONYMOUS . '
-		GROUP BY poster_id, topic_id';
-	$result = phpbb::$db->sql_query($sql);
-
-	$posted = array();
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		// Add as key to make them unique (grouping by) and circumvent empty keys on array_unique
-		$posted[$row['poster_id']][] = $row['topic_id'];
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	// Now add the information...
-	$sql_ary = array();
-	foreach ($posted as $user_id => $topic_row)
-	{
-		foreach ($topic_row as $topic_id)
-		{
-			$sql_ary[] = array(
-				'user_id'		=> (int) $user_id,
-				'topic_id'		=> (int) $topic_id,
-				'topic_posted'	=> 1,
-			);
-		}
-	}
-	unset($posted);
-
-	phpbb::$db->sql_multi_insert(TOPICS_POSTED_TABLE, $sql_ary);
-}
-
-/**
-* Delete attached file
-*/
-function phpbb_unlink($filename, $mode = 'file', $entry_removed = false)
-{
-	// Because of copying topics or modifications a physical filename could be assigned more than once. If so, do not remove the file itself.
-	$sql = 'SELECT COUNT(attach_id) AS num_entries
-		FROM ' . ATTACHMENTS_TABLE . "
-		WHERE physical_filename = '" . phpbb::$db->sql_escape(basename($filename)) . "'";
-	$result = phpbb::$db->sql_query($sql);
-	$num_entries = (int) phpbb::$db->sql_fetchfield('num_entries');
-	phpbb::$db->sql_freeresult($result);
-
-	// Do not remove file if at least one additional entry with the same name exist.
-	if (($entry_removed && $num_entries > 0) || (!$entry_removed && $num_entries > 1))
-	{
-		return false;
-	}
-
-	$filename = ($mode == 'thumbnail') ? 'thumb_' . basename($filename) : basename($filename);
-	return @unlink(PHPBB_ROOT_PATH . phpbb::$config['upload_path'] . '/' . $filename);
-}
-
-/**
-* All-encompasing sync function
-*
-* Exaples:
-* <code>
-* sync('topic', 'topic_id', 123);			// resync topic #123
-* sync('topic', 'forum_id', array(2, 3));	// resync topics from forum #2 and #3
-* sync('topic');							// resync all topics
-* sync('topic', 'range', 'topic_id BETWEEN 1 AND 60');	// resync a range of topics/forums (only available for 'topic' and 'forum' modes)
-* </code>
-*
-* Modes:
-* - forum				Resync complete forum
-* - topic				Resync topics
-* - topic_moved			Removes topic shadows that would be in the same forum as the topic they link to
-* - topic_approved		Resyncs the topic_approved flag according to the status of the first post
-* - post_reported		Resyncs the post_reported flag, relying on actual reports
-* - topic_reported		Resyncs the topic_reported flag, relying on post_reported flags
-* - post_attachement	Same as post_reported, but with attachment flags
-* - topic_attachement	Same as topic_reported, but with attachment flags
-*/
-function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false, $sync_extra = false)
-{
-	if (is_array($where_ids))
-	{
-		$where_ids = array_unique($where_ids);
-		$where_ids = array_map('intval', $where_ids);
-	}
-	else if ($where_type != 'range')
-	{
-		$where_ids = ($where_ids) ? array((int) $where_ids) : array();
-	}
-
-	if ($mode == 'forum' || $mode == 'topic' || $mode == 'topic_approved' || $mode == 'topic_reported' || $mode == 'post_reported')
-	{
-		if (!$where_type)
-		{
-			$where_sql = '';
-			$where_sql_and = 'WHERE';
-		}
-		else if ($where_type == 'range')
-		{
-			// Only check a range of topics/forums. For instance: 'topic_id BETWEEN 1 AND 60'
-			$where_sql = 'WHERE (' . $mode[0] . ".$where_ids)";
-			$where_sql_and = $where_sql . "\n\tAND";
-		}
-		else
-		{
-			// Do not sync the "global forum"
-			$where_ids = array_diff($where_ids, array(0));
-
-			if (!sizeof($where_ids))
-			{
-				// Empty array with IDs. This means that we don't have any work to do. Just return.
-				return;
-			}
-
-			// Limit the topics/forums we are syncing, use specific topic/forum IDs.
-			// $where_type contains the field for the where clause (forum_id, topic_id)
-			$where_sql = 'WHERE ' . phpbb::$db->sql_in_set($mode[0] . '.' . $where_type, $where_ids);
-			$where_sql_and = $where_sql . "\n\tAND";
-		}
-	}
-	else
-	{
-		if (!sizeof($where_ids))
-		{
-			return;
-		}
-
-		// $where_type contains the field for the where clause (forum_id, topic_id)
-		$where_sql = 'WHERE ' . phpbb::$db->sql_in_set($mode[0] . '.' . $where_type, $where_ids);
-		$where_sql_and = $where_sql . "\n\tAND";
-	}
-
-	switch ($mode)
-	{
-		case 'topic_moved':
-			if (phpbb::$db->features['multi_table_deletion'])
-			{
-				$sql = 'DELETE FROM ' . TOPICS_TABLE . '
-					USING ' . TOPICS_TABLE . ' t1, ' . TOPICS_TABLE . " t2
-					WHERE t1.topic_moved_id = t2.topic_id
-						AND t1.forum_id = t2.forum_id";
-				phpbb::$db->sql_query($sql);
-			}
-			else
-			{
-				$sql = 'SELECT t1.topic_id
-					FROM ' .TOPICS_TABLE . ' t1, ' . TOPICS_TABLE . " t2
-					WHERE t1.topic_moved_id = t2.topic_id
-						AND t1.forum_id = t2.forum_id";
-				$result = phpbb::$db->sql_query($sql);
-
-				$topic_id_ary = array();
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$topic_id_ary[] = $row['topic_id'];
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				if (!sizeof($topic_id_ary))
-				{
-					return;
-				}
-
-				$sql = 'DELETE FROM ' . TOPICS_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_id_ary);
-				phpbb::$db->sql_query($sql);
-			}
-		break;
-
-		case 'topic_approved':
-			if (phpbb::$db->dbms_type == 'mysql')
-			{
-				$sql = 'UPDATE ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
-					SET t.topic_approved = p.post_approved
-					$where_sql_and t.topic_first_post_id = p.post_id";
-				phpbb::$db->sql_query($sql);
-			}
-			else
-			{
-				$sql = 'SELECT t.topic_id, p.post_approved
-					FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
-					$where_sql_and p.post_id = t.topic_first_post_id
-						AND p.post_approved <> t.topic_approved";
-				$result = phpbb::$db->sql_query($sql);
-
-				$topic_ids = array();
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$topic_ids[] = $row['topic_id'];
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				if (!sizeof($topic_ids))
-				{
-					return;
-				}
-
-				$sql = 'UPDATE ' . TOPICS_TABLE . '
-					SET topic_approved = 1 - topic_approved
-					WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_ids);
-				phpbb::$db->sql_query($sql);
-			}
-		break;
-
-		case 'post_reported':
-			$post_ids = $post_reported = array();
-
-			$sql = 'SELECT p.post_id, p.post_reported
-				FROM ' . POSTS_TABLE . " p
-				$where_sql
-				GROUP BY p.post_id, p.post_reported";
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$post_ids[$row['post_id']] = $row['post_id'];
-				if ($row['post_reported'])
-				{
-					$post_reported[$row['post_id']] = 1;
-				}
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			$sql = 'SELECT DISTINCT(post_id)
-				FROM ' . REPORTS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('post_id', $post_ids) . '
-					AND report_closed = 0';
-			$result = phpbb::$db->sql_query($sql);
-
-			$post_ids = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				if (!isset($post_reported[$row['post_id']]))
-				{
-					$post_ids[] = $row['post_id'];
-				}
-				else
-				{
-					unset($post_reported[$row['post_id']]);
-				}
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			// $post_reported should be empty by now, if it's not it contains
-			// posts that are falsely flagged as reported
-			foreach ($post_reported as $post_id => $void)
-			{
-				$post_ids[] = $post_id;
-			}
-
-			if (sizeof($post_ids))
-			{
-				$sql = 'UPDATE ' . POSTS_TABLE . '
-					SET post_reported = 1 - post_reported
-					WHERE ' . phpbb::$db->sql_in_set('post_id', $post_ids);
-				phpbb::$db->sql_query($sql);
-			}
-		break;
-
-		case 'topic_reported':
-			if ($sync_extra)
-			{
-				sync('post_reported', $where_type, $where_ids);
-			}
-
-			$topic_ids = $topic_reported = array();
-
-			$sql = 'SELECT DISTINCT(t.topic_id)
-				FROM ' . POSTS_TABLE . " t
-				$where_sql_and t.post_reported = 1";
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$topic_reported[$row['topic_id']] = 1;
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			$sql = 'SELECT t.topic_id, t.topic_reported
-				FROM ' . TOPICS_TABLE . " t
-				$where_sql";
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				if ($row['topic_reported'] ^ isset($topic_reported[$row['topic_id']]))
-				{
-					$topic_ids[] = $row['topic_id'];
-				}
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			if (sizeof($topic_ids))
-			{
-				$sql = 'UPDATE ' . TOPICS_TABLE . '
-					SET topic_reported = 1 - topic_reported
-					WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_ids);
-				phpbb::$db->sql_query($sql);
-			}
-		break;
-
-		case 'post_attachment':
-			$post_ids = $post_attachment = array();
-
-			$sql = 'SELECT p.post_id, p.post_attachment
-				FROM ' . POSTS_TABLE . " p
-				$where_sql
-				GROUP BY p.post_id, p.post_attachment";
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$post_ids[$row['post_id']] = $row['post_id'];
-				if ($row['post_attachment'])
-				{
-					$post_attachment[$row['post_id']] = 1;
-				}
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			$sql = 'SELECT DISTINCT(post_msg_id)
-				FROM ' . ATTACHMENTS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('post_msg_id', $post_ids) . '
-					AND in_message = 0';
-			$result = phpbb::$db->sql_query($sql);
-
-			$post_ids = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				if (!isset($post_attachment[$row['post_msg_id']]))
-				{
-					$post_ids[] = $row['post_msg_id'];
-				}
-				else
-				{
-					unset($post_attachment[$row['post_msg_id']]);
-				}
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			// $post_attachment should be empty by now, if it's not it contains
-			// posts that are falsely flagged as having attachments
-			foreach ($post_attachment as $post_id => $void)
-			{
-				$post_ids[] = $post_id;
-			}
-
-			if (sizeof($post_ids))
-			{
-				$sql = 'UPDATE ' . POSTS_TABLE . '
-					SET post_attachment = 1 - post_attachment
-					WHERE ' . phpbb::$db->sql_in_set('post_id', $post_ids);
-				phpbb::$db->sql_query($sql);
-			}
-		break;
-
-		case 'topic_attachment':
-			if ($sync_extra)
-			{
-				sync('post_attachment', $where_type, $where_ids);
-			}
-
-			$topic_ids = $topic_attachment = array();
-
-			$sql = 'SELECT DISTINCT(t.topic_id)
-				FROM ' . POSTS_TABLE . " t
-				$where_sql_and t.post_attachment = 1";
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$topic_attachment[$row['topic_id']] = 1;
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			$sql = 'SELECT t.topic_id, t.topic_attachment
-				FROM ' . TOPICS_TABLE . " t
-				$where_sql";
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				if ($row['topic_attachment'] ^ isset($topic_attachment[$row['topic_id']]))
-				{
-					$topic_ids[] = $row['topic_id'];
-				}
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			if (sizeof($topic_ids))
-			{
-				$sql = 'UPDATE ' . TOPICS_TABLE . '
-					SET topic_attachment = 1 - topic_attachment
-					WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_ids);
-				phpbb::$db->sql_query($sql);
-			}
-		break;
-
-		case 'forum':
-
-			// 1: Get the list of all forums
-			$sql = 'SELECT f.*
-				FROM ' . FORUMS_TABLE . " f
-				$where_sql";
-			$result = phpbb::$db->sql_query($sql);
-
-			$forum_data = $forum_ids = $post_ids = $last_post_id = $post_info = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				if ($row['forum_type'] == FORUM_LINK)
-				{
-					continue;
-				}
-
-				$forum_id = (int) $row['forum_id'];
-				$forum_ids[$forum_id] = $forum_id;
-
-				$forum_data[$forum_id] = $row;
-				if ($sync_extra)
-				{
-					$forum_data[$forum_id]['posts'] = 0;
-					$forum_data[$forum_id]['topics'] = 0;
-					$forum_data[$forum_id]['topics_real'] = 0;
-				}
-				$forum_data[$forum_id]['last_post_id'] = 0;
-				$forum_data[$forum_id]['last_post_subject'] = '';
-				$forum_data[$forum_id]['last_post_time'] = 0;
-				$forum_data[$forum_id]['last_poster_id'] = 0;
-				$forum_data[$forum_id]['last_poster_name'] = '';
-				$forum_data[$forum_id]['last_poster_colour'] = '';
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			if (!sizeof($forum_ids))
-			{
-				break;
-			}
-
-			$forum_ids = array_values($forum_ids);
-
-			// 2: Get topic counts for each forum (optional)
-			if ($sync_extra)
-			{
-				$sql = 'SELECT forum_id, topic_approved, COUNT(topic_id) AS forum_topics
-					FROM ' . TOPICS_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('forum_id', $forum_ids) . '
-					GROUP BY forum_id, topic_approved';
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$forum_id = (int) $row['forum_id'];
-					$forum_data[$forum_id]['topics_real'] += $row['forum_topics'];
-
-					if ($row['topic_approved'])
-					{
-						$forum_data[$forum_id]['topics'] = $row['forum_topics'];
-					}
-				}
-				phpbb::$db->sql_freeresult($result);
-			}
-
-			// 3: Get post count for each forum (optional)
-			if ($sync_extra)
-			{
-				if (sizeof($forum_ids) == 1)
-				{
-					$sql = 'SELECT SUM(t.topic_replies + 1) AS forum_posts
-						FROM ' . TOPICS_TABLE . ' t
-						WHERE ' . phpbb::$db->sql_in_set('t.forum_id', $forum_ids) . '
-							AND t.topic_approved = 1
-							AND t.topic_status <> ' . ITEM_MOVED;
-				}
-				else
-				{
-					$sql = 'SELECT t.forum_id, SUM(t.topic_replies + 1) AS forum_posts
-						FROM ' . TOPICS_TABLE . ' t
-						WHERE ' . phpbb::$db->sql_in_set('t.forum_id', $forum_ids) . '
-							AND t.topic_approved = 1
-							AND t.topic_status <> ' . ITEM_MOVED . '
-						GROUP BY t.forum_id';
-				}
-
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$forum_id = (sizeof($forum_ids) == 1) ? (int) $forum_ids[0] : (int) $row['forum_id'];
-
-					$forum_data[$forum_id]['posts'] = (int) $row['forum_posts'];
-				}
-				phpbb::$db->sql_freeresult($result);
-			}
-
-			// 4: Get last_post_id for each forum
-			if (sizeof($forum_ids) == 1)
-			{
-				$sql = 'SELECT MAX(t.topic_last_post_id) as last_post_id
-					FROM ' . TOPICS_TABLE . ' t
-					WHERE ' . phpbb::$db->sql_in_set('t.forum_id', $forum_ids) . '
-						AND t.topic_approved = 1';
-			}
-			else
-			{
-				$sql = 'SELECT t.forum_id, MAX(t.topic_last_post_id) as last_post_id
-					FROM ' . TOPICS_TABLE . ' t
-					WHERE ' . phpbb::$db->sql_in_set('t.forum_id', $forum_ids) . '
-						AND t.topic_approved = 1
-					GROUP BY t.forum_id';
-			}
-
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$forum_id = (sizeof($forum_ids) == 1) ? (int) $forum_ids[0] : (int) $row['forum_id'];
-
-				$forum_data[$forum_id]['last_post_id'] = (int) $row['last_post_id'];
-
-				$post_ids[] = $row['last_post_id'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			// 5: Retrieve last_post infos
-			if (sizeof($post_ids))
-			{
-				$sql = 'SELECT p.post_id, p.poster_id, p.post_subject, p.post_time, p.post_username, u.username, u.user_colour
-					FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
-					WHERE ' . phpbb::$db->sql_in_set('p.post_id', $post_ids) . '
-						AND p.poster_id = u.user_id';
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$post_info[$row['post_id']] = $row;
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				foreach ($forum_data as $forum_id => $data)
-				{
-					if ($data['last_post_id'])
-					{
-						if (isset($post_info[$data['last_post_id']]))
-						{
-							$forum_data[$forum_id]['last_post_subject'] = $post_info[$data['last_post_id']]['post_subject'];
-							$forum_data[$forum_id]['last_post_time'] = $post_info[$data['last_post_id']]['post_time'];
-							$forum_data[$forum_id]['last_poster_id'] = $post_info[$data['last_post_id']]['poster_id'];
-							$forum_data[$forum_id]['last_poster_name'] = ($post_info[$data['last_post_id']]['poster_id'] != ANONYMOUS) ? $post_info[$data['last_post_id']]['username'] : $post_info[$data['last_post_id']]['post_username'];
-							$forum_data[$forum_id]['last_poster_colour'] = $post_info[$data['last_post_id']]['user_colour'];
-						}
-						else
-						{
-							// For some reason we did not find the post in the db
-							$forum_data[$forum_id]['last_post_id'] = 0;
-							$forum_data[$forum_id]['last_post_subject'] = '';
-							$forum_data[$forum_id]['last_post_time'] = 0;
-							$forum_data[$forum_id]['last_poster_id'] = 0;
-							$forum_data[$forum_id]['last_poster_name'] = '';
-							$forum_data[$forum_id]['last_poster_colour'] = '';
-						}
-					}
-				}
-				unset($post_info);
-			}
-
-			// 6: Now do that thing
-			$fieldnames = array('last_post_id', 'last_post_subject', 'last_post_time', 'last_poster_id', 'last_poster_name', 'last_poster_colour');
-
-			if ($sync_extra)
-			{
-				array_push($fieldnames, 'posts', 'topics', 'topics_real');
-			}
-
-			foreach ($forum_data as $forum_id => $row)
-			{
-				$sql_ary = array();
-
-				foreach ($fieldnames as $fieldname)
-				{
-					if ($row['forum_' . $fieldname] != $row[$fieldname])
-					{
-						if (preg_match('#(name|colour|subject)$#', $fieldname))
-						{
-							$sql_ary['forum_' . $fieldname] = (string) $row[$fieldname];
-						}
-						else
-						{
-							$sql_ary['forum_' . $fieldname] = (int) $row[$fieldname];
-						}
-					}
-				}
-
-				if (sizeof($sql_ary))
-				{
-					$sql = 'UPDATE ' . FORUMS_TABLE . '
-						SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-						WHERE forum_id = ' . $forum_id;
-					phpbb::$db->sql_query($sql);
-				}
-			}
-		break;
-
-		case 'topic':
-			$topic_data = $post_ids = $approved_unapproved_ids = $resync_forums = $delete_topics = $delete_posts = $moved_topics = array();
-
-			$sql = 'SELECT t.topic_id, t.forum_id, t.topic_moved_id, t.topic_approved, ' . (($sync_extra) ? 't.topic_attachment, t.topic_reported, ' : '') . 't.topic_poster, t.topic_time, t.topic_replies, t.topic_replies_real, t.topic_first_post_id, t.topic_first_poster_name, t.topic_first_poster_colour, t.topic_last_post_id, t.topic_last_post_subject, t.topic_last_poster_id, t.topic_last_poster_name, t.topic_last_poster_colour, t.topic_last_post_time
-				FROM ' . TOPICS_TABLE . " t
-				$where_sql";
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				if ($row['topic_moved_id'])
-				{
-					$moved_topics[] = $row['topic_id'];
-					continue;
-				}
-
-				$topic_id = (int) $row['topic_id'];
-				$topic_data[$topic_id] = $row;
-				$topic_data[$topic_id]['replies_real'] = -1;
-				$topic_data[$topic_id]['replies'] = 0;
-				$topic_data[$topic_id]['first_post_id'] = 0;
-				$topic_data[$topic_id]['last_post_id'] = 0;
-				unset($topic_data[$topic_id]['topic_id']);
-
-				// This array holds all topic_ids
-				$delete_topics[$topic_id] = '';
-
-				if ($sync_extra)
-				{
-					$topic_data[$topic_id]['reported'] = 0;
-					$topic_data[$topic_id]['attachment'] = 0;
-				}
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			// Use "t" as table alias because of the $where_sql clause
-			// NOTE: 't.post_approved' in the GROUP BY is causing a major slowdown.
-			$sql = 'SELECT t.topic_id, t.post_approved, COUNT(t.post_id) AS total_posts, MIN(t.post_id) AS first_post_id, MAX(t.post_id) AS last_post_id
-				FROM ' . POSTS_TABLE . " t
-				$where_sql
-				GROUP BY t.topic_id, t.post_approved";
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$topic_id = (int) $row['topic_id'];
-
-				$row['first_post_id'] = (int) $row['first_post_id'];
-				$row['last_post_id'] = (int) $row['last_post_id'];
-
-				if (!isset($topic_data[$topic_id]))
-				{
-					// Hey, these posts come from a topic that does not exist
-					$delete_posts[$topic_id] = '';
-				}
-				else
-				{
-					// Unset the corresponding entry in $delete_topics
-					// When we'll be done, only topics with no posts will remain
-					unset($delete_topics[$topic_id]);
-
-					$topic_data[$topic_id]['replies_real'] += $row['total_posts'];
-					$topic_data[$topic_id]['first_post_id'] = (!$topic_data[$topic_id]['first_post_id']) ? $row['first_post_id'] : min($topic_data[$topic_id]['first_post_id'], $row['first_post_id']);
-
-					if ($row['post_approved'] || !$topic_data[$topic_id]['last_post_id'])
-					{
-						$topic_data[$topic_id]['replies'] = $row['total_posts'] - 1;
-						$topic_data[$topic_id]['last_post_id'] = $row['last_post_id'];
-					}
-				}
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			foreach ($topic_data as $topic_id => $row)
-			{
-				$post_ids[] = $row['first_post_id'];
-				if ($row['first_post_id'] != $row['last_post_id'])
-				{
-					$post_ids[] = $row['last_post_id'];
-				}
-			}
-
-			// Now we delete empty topics and orphan posts
-			if (sizeof($delete_posts))
-			{
-				delete_posts('topic_id', array_keys($delete_posts), false);
-				unset($delete_posts);
-			}
-
-			if (!sizeof($topic_data))
-			{
-				// If we get there, topic ids were invalid or topics did not contain any posts
-				delete_topics($where_type, $where_ids, true);
-				return;
-			}
-
-			if (sizeof($delete_topics))
-			{
-				$delete_topic_ids = array();
-				foreach ($delete_topics as $topic_id => $void)
-				{
-					unset($topic_data[$topic_id]);
-					$delete_topic_ids[] = $topic_id;
-				}
-
-				delete_topics('topic_id', $delete_topic_ids, false);
-				unset($delete_topics, $delete_topic_ids);
-			}
-
-			$sql = 'SELECT p.post_id, p.topic_id, p.post_approved, p.poster_id, p.post_subject, p.post_username, p.post_time, u.username, u.user_colour
-				FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
-				WHERE ' . phpbb::$db->sql_in_set('p.post_id', $post_ids) . '
-					AND u.user_id = p.poster_id';
-			$result = phpbb::$db->sql_query($sql);
-
-			$post_ids = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$topic_id = intval($row['topic_id']);
-
-				if ($row['post_id'] == $topic_data[$topic_id]['first_post_id'])
-				{
-					if ($topic_data[$topic_id]['topic_approved'] != $row['post_approved'])
-					{
-						$approved_unapproved_ids[] = $topic_id;
-					}
-					$topic_data[$topic_id]['time'] = $row['post_time'];
-					$topic_data[$topic_id]['poster'] = $row['poster_id'];
-					$topic_data[$topic_id]['first_poster_name'] = ($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username'];
-					$topic_data[$topic_id]['first_poster_colour'] = $row['user_colour'];
-				}
-
-				if ($row['post_id'] == $topic_data[$topic_id]['last_post_id'])
-				{
-					$topic_data[$topic_id]['last_poster_id'] = $row['poster_id'];
-					$topic_data[$topic_id]['last_post_subject'] = $row['post_subject'];
-					$topic_data[$topic_id]['last_post_time'] = $row['post_time'];
-					$topic_data[$topic_id]['last_poster_name'] = ($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username'];
-					$topic_data[$topic_id]['last_poster_colour'] = $row['user_colour'];
-				}
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			// Make sure shadow topics do link to existing topics
-			if (sizeof($moved_topics))
-			{
-				$delete_topics = array();
-
-				$sql = 'SELECT t1.topic_id, t1.topic_moved_id
-					FROM ' . TOPICS_TABLE . ' t1
-					LEFT JOIN ' . TOPICS_TABLE . ' t2 ON (t2.topic_id = t1.topic_moved_id)
-					WHERE ' . phpbb::$db->sql_in_set('t1.topic_id', $moved_topics) . '
-						AND t2.topic_id IS NULL';
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$delete_topics[] = $row['topic_id'];
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				if (sizeof($delete_topics))
-				{
-					delete_topics('topic_id', $delete_topics, false);
-				}
-				unset($delete_topics);
-
-				// Make sure shadow topics having no last post data being updated (this only rarely happens...)
-				$sql = 'SELECT topic_id, topic_moved_id, topic_last_post_id, topic_first_post_id
-					FROM ' . TOPICS_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('topic_id', $moved_topics) . '
-						AND topic_last_post_time = 0';
-				$result = phpbb::$db->sql_query($sql);
-
-				$shadow_topic_data = $post_ids = array();
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$shadow_topic_data[$row['topic_moved_id']] = $row;
-					$post_ids[] = $row['topic_last_post_id'];
-					$post_ids[] = $row['topic_first_post_id'];
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				$sync_shadow_topics = array();
-				if (sizeof($post_ids))
-				{
-					$sql = 'SELECT p.post_id, p.topic_id, p.post_approved, p.poster_id, p.post_subject, p.post_username, p.post_time, u.username, u.user_colour
-						FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
-						WHERE ' . phpbb::$db->sql_in_set('p.post_id', $post_ids) . '
-							AND u.user_id = p.poster_id';
-					$result = phpbb::$db->sql_query($sql);
-
-					$post_ids = array();
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$topic_id = (int) $row['topic_id'];
-
-						// Ok, there should be a shadow topic. If there isn't, then there's something wrong with the db.
-						// However, there's not much we can do about it.
-						if (!empty($shadow_topic_data[$topic_id]))
-						{
-							if ($row['post_id'] == $shadow_topic_data[$topic_id]['topic_first_post_id'])
-							{
-								$orig_topic_id = $shadow_topic_data[$topic_id]['topic_id'];
-
-								if (!isset($sync_shadow_topics[$orig_topic_id]))
-								{
-									$sync_shadow_topics[$orig_topic_id] = array();
-								}
-
-								$sync_shadow_topics[$orig_topic_id]['topic_time'] = $row['post_time'];
-								$sync_shadow_topics[$orig_topic_id]['topic_poster'] = $row['poster_id'];
-								$sync_shadow_topics[$orig_topic_id]['topic_first_poster_name'] = ($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username'];
-								$sync_shadow_topics[$orig_topic_id]['topic_first_poster_colour'] = $row['user_colour'];
-							}
-
-							if ($row['post_id'] == $shadow_topic_data[$topic_id]['topic_last_post_id'])
-							{
-								$orig_topic_id = $shadow_topic_data[$topic_id]['topic_id'];
-
-								if (!isset($sync_shadow_topics[$orig_topic_id]))
-								{
-									$sync_shadow_topics[$orig_topic_id] = array();
-								}
-
-								$sync_shadow_topics[$orig_topic_id]['topic_last_poster_id'] = $row['poster_id'];
-								$sync_shadow_topics[$orig_topic_id]['topic_last_post_subject'] = $row['post_subject'];
-								$sync_shadow_topics[$orig_topic_id]['topic_last_post_time'] = $row['post_time'];
-								$sync_shadow_topics[$orig_topic_id]['topic_last_poster_name'] = ($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username'];
-								$sync_shadow_topics[$orig_topic_id]['topic_last_poster_colour'] = $row['user_colour'];
-							}
-						}
-					}
-					phpbb::$db->sql_freeresult($result);
-
-					$shadow_topic_data = array();
-
-					// Update the information we collected
-					if (sizeof($sync_shadow_topics))
-					{
-						foreach ($sync_shadow_topics as $sync_topic_id => $sql_ary)
-						{
-							$sql = 'UPDATE ' . TOPICS_TABLE . '
-								SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-								WHERE topic_id = ' . $sync_topic_id;
-							phpbb::$db->sql_query($sql);
-						}
-					}
-				}
-
-				unset($sync_shadow_topics, $shadow_topic_data);
-			}
-
-			// approved becomes unapproved, and vice-versa
-			if (sizeof($approved_unapproved_ids))
-			{
-				$sql = 'UPDATE ' . TOPICS_TABLE . '
-					SET topic_approved = 1 - topic_approved
-					WHERE ' . phpbb::$db->sql_in_set('topic_id', $approved_unapproved_ids);
-				phpbb::$db->sql_query($sql);
-			}
-			unset($approved_unapproved_ids);
-
-			// These are fields that will be synchronised
-			$fieldnames = array('time', 'replies', 'replies_real', 'poster', 'first_post_id', 'first_poster_name', 'first_poster_colour', 'last_post_id', 'last_post_subject', 'last_post_time', 'last_poster_id', 'last_poster_name', 'last_poster_colour');
-
-			if ($sync_extra)
-			{
-				// This routine assumes that post_reported values are correct
-				// if they are not, use sync('post_reported') first
-				$sql = 'SELECT t.topic_id, p.post_id
-					FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
-					$where_sql_and p.topic_id = t.topic_id
-						AND p.post_reported = 1
-					GROUP BY t.topic_id, p.post_id";
-				$result = phpbb::$db->sql_query($sql);
-
-				$fieldnames[] = 'reported';
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$topic_data[intval($row['topic_id'])]['reported'] = 1;
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				// This routine assumes that post_attachment values are correct
-				// if they are not, use sync('post_attachment') first
-				$sql = 'SELECT t.topic_id, p.post_id
-					FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
-					$where_sql_and p.topic_id = t.topic_id
-						AND p.post_attachment = 1
-					GROUP BY t.topic_id, p.post_id";
-				$result = phpbb::$db->sql_query($sql);
-
-				$fieldnames[] = 'attachment';
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$topic_data[intval($row['topic_id'])]['attachment'] = 1;
-				}
-				phpbb::$db->sql_freeresult($result);
-			}
-
-			foreach ($topic_data as $topic_id => $row)
-			{
-				$sql_ary = array();
-
-				foreach ($fieldnames as $fieldname)
-				{
-					if (isset($row[$fieldname]) && isset($row['topic_' . $fieldname]) && $row['topic_' . $fieldname] != $row[$fieldname])
-					{
-						$sql_ary['topic_' . $fieldname] = $row[$fieldname];
-					}
-				}
-
-				if (sizeof($sql_ary))
-				{
-					$sql = 'UPDATE ' . TOPICS_TABLE . '
-						SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-						WHERE topic_id = ' . $topic_id;
-					phpbb::$db->sql_query($sql);
-
-					$resync_forums[$row['forum_id']] = $row['forum_id'];
-				}
-			}
-			unset($topic_data);
-
-			// if some topics have been resync'ed then resync parent forums
-			// except when we're only syncing a range, we don't want to sync forums during
-			// batch processing.
-			if ($resync_parents && sizeof($resync_forums) && $where_type != 'range')
-			{
-				sync('forum', 'forum_id', array_values($resync_forums), true, true);
-			}
-		break;
-	}
-
-	return;
-}
-
-/**
-* Prune function
-*/
-function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync = true)
-{
-	if (!is_array($forum_id))
-	{
-		$forum_id = array($forum_id);
-	}
-
-	if (!sizeof($forum_id))
-	{
-		return;
-	}
-
-	$sql_and = '';
-
-	if (!($prune_flags & FORUM_FLAG_PRUNE_ANNOUNCE))
-	{
-		$sql_and .= ' AND topic_type <> ' . POST_ANNOUNCE;
-	}
-
-	if (!($prune_flags & FORUM_FLAG_PRUNE_STICKY))
-	{
-		$sql_and .= ' AND topic_type <> ' . POST_STICKY;
-	}
-
-	if ($prune_mode == 'posted')
-	{
-		$sql_and .= " AND topic_last_post_time < $prune_date";
-	}
-
-	if ($prune_mode == 'viewed')
-	{
-		$sql_and .= " AND topic_last_view_time < $prune_date";
-	}
-
-	$sql = 'SELECT topic_id
-		FROM ' . TOPICS_TABLE . '
-		WHERE ' . phpbb::$db->sql_in_set('forum_id', $forum_id) . "
-			AND poll_start = 0
-			$sql_and";
-	$result = phpbb::$db->sql_query($sql);
-
-	$topic_list = array();
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$topic_list[] = $row['topic_id'];
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	if ($prune_flags & FORUM_FLAG_PRUNE_POLL)
-	{
-		$sql = 'SELECT topic_id
-			FROM ' . TOPICS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('forum_id', $forum_id) . "
-				AND poll_start > 0
-				AND poll_last_vote < $prune_date
-				$sql_and";
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$topic_list[] = $row['topic_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$topic_list = array_unique($topic_list);
-	}
-
-	return delete_topics('topic_id', $topic_list, $auto_sync, false);
-}
-
-/**
-* Function auto_prune(), this function now relies on passed vars
-*/
-function auto_prune($forum_id, $prune_mode, $prune_flags, $prune_days, $prune_freq)
-{
-	$sql = 'SELECT forum_name
-		FROM ' . FORUMS_TABLE . "
-		WHERE forum_id = $forum_id";
-	$result = phpbb::$db->sql_query($sql, 3600);
-	$row = phpbb::$db->sql_fetchrow($result);
-	phpbb::$db->sql_freeresult($result);
-
-	if ($row)
-	{
-		$prune_date = time() - ($prune_days * 86400);
-		$next_prune = time() + ($prune_freq * 86400);
-
-		prune($forum_id, $prune_mode, $prune_date, $prune_flags, true);
-
-		$sql = 'UPDATE ' . FORUMS_TABLE . "
-			SET prune_next = $next_prune
-			WHERE forum_id = $forum_id";
-		phpbb::$db->sql_query($sql);
-
-		add_log('admin', 'LOG_AUTO_PRUNE', $row['forum_name']);
-	}
-
-	return;
-}
-
-/**
-* remove_comments will strip the sql comment lines out of an uploaded sql file
-* specifically for mssql and postgres type files in the install....
-*/
-function remove_comments(&$output)
-{
-	$lines = explode("\n", $output);
-	$output = '';
-
-	// try to keep mem. use down
-	$linecount = sizeof($lines);
-
-	$in_comment = false;
-	for ($i = 0; $i < $linecount; $i++)
-	{
-		if (trim($lines[$i]) == '/*')
-		{
-			$in_comment = true;
-		}
-
-		if (!$in_comment)
-		{
-			$output .= $lines[$i] . "\n";
-		}
-
-		if (trim($lines[$i]) == '*/')
-		{
-			$in_comment = false;
-		}
-	}
-
-	unset($lines);
-	return $output;
-}
-
-/**
-* Cache moderators, called whenever permissions are changed via admin_permissions. Changes of username
-* and group names must be carried through for the moderators table
-*/
-function cache_moderators()
-{
-	// Remove cached sql results
-	phpbb::$acm->destroy_sql(MODERATOR_CACHE_TABLE);
-
-	// Clear table
-	if (phpbb::$db->features['truncate'])
-	{
-		phpbb::$db->sql_query('TRUNCATE TABLE ' . MODERATOR_CACHE_TABLE);
-	}
-	else
-	{
-		phpbb::$db->sql_query('DELETE FROM ' . MODERATOR_CACHE_TABLE);
-	}
-
-	// We add moderators who have forum moderator permissions without an explicit ACL_NEVER setting
-	$hold_ary = $ug_id_ary = $sql_ary = array();
-
-	// Grab all users having moderative options...
-	$hold_ary = phpbb::$acl->acl_user_raw_data(false, 'm_%', false);
-
-	// Add users?
-	if (sizeof($hold_ary))
-	{
-		// At least one moderative option warrants a display
-		$ug_id_ary = array_keys($hold_ary);
-
-		// Remove users who have group memberships with DENY moderator permissions
-		$sql = phpbb::$db->sql_build_query('SELECT', array(
-			'SELECT'	=> 'a.forum_id, ug.user_id',
-
-			'FROM'		=> array(
-				ACL_OPTIONS_TABLE	=> 'o',
-				USER_GROUP_TABLE	=> 'ug',
-				ACL_GROUPS_TABLE	=> 'a'
-			),
-
-			'LEFT_JOIN'	=> array(
-				array(
-					'FROM'	=> array(ACL_ROLES_DATA_TABLE => 'r'),
-					'ON'	=> 'a.auth_role_id = r.role_id'
-				)
-			),
-
-			'WHERE'		=> '(o.auth_option_id = a.auth_option_id OR o.auth_option_id = r.auth_option_id)
-				AND ((a.auth_setting = ' . phpbb::ACL_NEVER . ' AND r.auth_setting IS NULL)
-					OR r.auth_setting = ' . phpbb::ACL_NEVER . ')
-				AND a.group_id = ug.group_id
-				AND ' . phpbb::$db->sql_in_set('ug.user_id', $ug_id_ary) . "
-				AND ug.user_pending = 0
-				AND o.auth_option " . phpbb::$db->sql_like_expression('m_' . phpbb::$db->any_char),
-		));
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			if (isset($hold_ary[$row['user_id']][$row['forum_id']]))
-			{
-				unset($hold_ary[$row['user_id']][$row['forum_id']]);
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if (sizeof($hold_ary))
-		{
-			// Get usernames...
-			$sql = 'SELECT user_id, username
-				FROM ' . USERS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('user_id', array_keys($hold_ary));
-			$result = phpbb::$db->sql_query($sql);
-
-			$usernames_ary = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$usernames_ary[$row['user_id']] = $row['username'];
-			}
-
-			foreach ($hold_ary as $user_id => $forum_id_ary)
-			{
-				// Do not continue if user does not exist
-				if (!isset($usernames_ary[$user_id]))
-				{
-					continue;
-				}
-
-				foreach ($forum_id_ary as $forum_id => $auth_ary)
-				{
-					$sql_ary[] = array(
-						'forum_id'		=> (int) $forum_id,
-						'user_id'		=> (int) $user_id,
-						'username'		=> (string) $usernames_ary[$user_id],
-						'group_id'		=> 0,
-						'group_name'	=> ''
-					);
-				}
-			}
-		}
-	}
-
-	// Now to the groups...
-	$hold_ary = phpbb::$acl->acl_group_raw_data(false, 'm_%', false);
-
-	if (sizeof($hold_ary))
-	{
-		$ug_id_ary = array_keys($hold_ary);
-
-		// Make sure not hidden or special groups are involved...
-		$sql = 'SELECT group_name, group_id, group_type
-			FROM ' . GROUPS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('group_id', $ug_id_ary);
-		$result = phpbb::$db->sql_query($sql);
-
-		$groupnames_ary = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			if ($row['group_type'] == GROUP_HIDDEN || $row['group_type'] == GROUP_SPECIAL)
-			{
-				unset($hold_ary[$row['group_id']]);
-			}
-
-			$groupnames_ary[$row['group_id']] = $row['group_name'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		foreach ($hold_ary as $group_id => $forum_id_ary)
-		{
-			// If there is no group, we do not assign it...
-			if (!isset($groupnames_ary[$group_id]))
-			{
-				continue;
-			}
-
-			foreach ($forum_id_ary as $forum_id => $auth_ary)
-			{
-				$flag = false;
-				foreach ($auth_ary as $auth_option => $setting)
-				{
-					// Make sure at least one ACL_YES option is set...
-					if ($setting == phpbb::ACL_YES)
-					{
-						$flag = true;
-						break;
-					}
-				}
-
-				if (!$flag)
-				{
-					continue;
-				}
-
-				$sql_ary[] = array(
-					'forum_id'		=> (int) $forum_id,
-					'user_id'		=> 0,
-					'username'		=> '',
-					'group_id'		=> (int) $group_id,
-					'group_name'	=> (string) $groupnames_ary[$group_id]
-				);
-			}
-		}
-	}
-
-	phpbb::$db->sql_multi_insert(MODERATOR_CACHE_TABLE, $sql_ary);
-}
-
-/**
-* View log
-*/
-function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $limit_days = 0, $sort_by = 'l.log_time DESC')
-{
-	$topic_id_list = $reportee_id_list = $is_auth = $is_mod = array();
-
-	$profile_url = (defined('IN_ADMIN')) ? phpbb::$url->append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, 'i=users&amp;mode=overview') : phpbb::$url->append_sid('memberlist', 'mode=viewprofile');
-
-	switch ($mode)
-	{
-		case 'admin':
-			$log_type = LOG_ADMIN;
-			$sql_forum = '';
-		break;
-
-		case 'mod':
-			$log_type = LOG_MOD;
-
-			if ($topic_id)
-			{
-				$sql_forum = 'AND l.topic_id = ' . intval($topic_id);
-			}
-			else if (is_array($forum_id))
-			{
-				$sql_forum = 'AND ' . phpbb::$db->sql_in_set('l.forum_id', array_map('intval', $forum_id));
-			}
-			else
-			{
-				$sql_forum = ($forum_id) ? 'AND l.forum_id = ' . intval($forum_id) : '';
-			}
-		break;
-
-		case 'user':
-			$log_type = LOG_USERS;
-			$sql_forum = 'AND l.reportee_id = ' . (int) $user_id;
-		break;
-
-		case 'users':
-			$log_type = LOG_USERS;
-			$sql_forum = '';
-		break;
-
-		case 'critical':
-			$log_type = LOG_CRITICAL;
-			$sql_forum = '';
-		break;
-
-		default:
-			return;
-	}
-
-	$sql = "SELECT l.*, u.username, u.username_clean, u.user_colour
-		FROM " . LOG_TABLE . " l, " . USERS_TABLE . " u
-		WHERE l.log_type = $log_type
-			AND u.user_id = l.user_id
-			" . (($limit_days) ? "AND l.log_time >= $limit_days" : '') . "
-			$sql_forum
-		ORDER BY $sort_by";
-	$result = phpbb::$db->sql_query_limit($sql, $limit, $offset);
-
-	$i = 0;
-	$log = array();
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		if ($row['topic_id'])
-		{
-			$topic_id_list[] = $row['topic_id'];
-		}
-
-		if ($row['reportee_id'])
-		{
-			$reportee_id_list[] = $row['reportee_id'];
-		}
-
-		$log[$i] = array(
-			'id'				=> $row['log_id'],
-
-			'reportee_id'			=> $row['reportee_id'],
-			'reportee_username'		=> '',
-			'reportee_username_full'=> '',
-
-			'user_id'			=> $row['user_id'],
-			'username'			=> $row['username'],
-			'username_full'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'], false, $profile_url),
-
-			'ip'				=> $row['log_ip'],
-			'time'				=> $row['log_time'],
-			'forum_id'			=> $row['forum_id'],
-			'topic_id'			=> $row['topic_id'],
-
-			'viewforum'			=> ($row['forum_id'] && phpbb::$acl->acl_get('f_read', $row['forum_id'])) ? phpbb::$url->append_sid('viewforum', 'f=' . $row['forum_id']) : false,
-			'action'			=> (isset(phpbb::$user->lang[$row['log_operation']])) ? phpbb::$user->lang[$row['log_operation']] : '{' . ucfirst(str_replace('_', ' ', $row['log_operation'])) . '}',
-		);
-
-		if (!empty($row['log_data']))
-		{
-			$log_data_ary = unserialize($row['log_data']);
-
-			if (isset(phpbb::$user->lang[$row['log_operation']]))
-			{
-				// Check if there are more occurrences of % than arguments, if there are we fill out the arguments array
-				// It doesn't matter if we add more arguments than placeholders
-				if ((substr_count($log[$i]['action'], '%') - sizeof($log_data_ary)) > 0)
-				{
-					$log_data_ary = array_merge($log_data_ary, array_fill(0, substr_count($log[$i]['action'], '%') - sizeof($log_data_ary), ''));
-				}
-
-				$log[$i]['action'] = vsprintf($log[$i]['action'], $log_data_ary);
-
-				// If within the admin panel we do not censor text out
-				if (defined('IN_ADMIN'))
-				{
-					$log[$i]['action'] = bbcode_nl2br($log[$i]['action']);
-				}
-				else
-				{
-					$log[$i]['action'] = bbcode_nl2br(censor_text($log[$i]['action']));
-				}
-			}
-			else
-			{
-				$log[$i]['action'] .= '<br />' . implode('', $log_data_ary);
-			}
-
-			/* Apply make_clickable... has to be seen if it is for good. :/
-			// Seems to be not for the moment, reconsider later...
-			$log[$i]['action'] = make_clickable($log[$i]['action']);
-			*/
-		}
-
-		$i++;
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	if (sizeof($topic_id_list))
-	{
-		$topic_id_list = array_unique($topic_id_list);
-
-		// This query is not really needed if move_topics() updates the forum_id field,
-		// although it's also used to determine if the topic still exists in the database
-		$sql = 'SELECT topic_id, forum_id
-			FROM ' . TOPICS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('topic_id', array_map('intval', $topic_id_list));
-		$result = phpbb::$db->sql_query($sql);
-
-		$default_forum_id = 0;
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			if (!$row['forum_id'])
-			{
-				if (phpbb::$acl->acl_getf_global('f_read'))
-				{
-					if (!$default_forum_id)
-					{
-						$sql = 'SELECT forum_id
-							FROM ' . FORUMS_TABLE . '
-							WHERE forum_type = ' . FORUM_POST;
-						$f_result = phpbb::$db->sql_query_limit($sql, 1);
-						$default_forum_id = (int) phpbb::$db->sql_fetchfield('forum_id', $f_result);
-						phpbb::$db->sql_freeresult($f_result);
-					}
-
-					$is_auth[$row['topic_id']] = $default_forum_id;
-				}
-			}
-			else
-			{
-				if (phpbb::$acl->acl_get('f_read', $row['forum_id']))
-				{
-					$is_auth[$row['topic_id']] = $row['forum_id'];
-				}
-			}
-
-			if (phpbb::$acl->acl_gets('a_', 'm_', $row['forum_id']))
-			{
-				$is_mod[$row['topic_id']] = $row['forum_id'];
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		foreach ($log as $key => $row)
-		{
-			$log[$key]['viewtopic'] = (isset($is_auth[$row['topic_id']])) ? phpbb::$url->append_sid('viewtopic', 'f=' . $is_auth[$row['topic_id']] . '&amp;t=' . $row['topic_id']) : false;
-			$log[$key]['viewlogs'] = (isset($is_mod[$row['topic_id']])) ? phpbb::$url->append_sid('mcp', 'i=logs&amp;mode=topic_logs&amp;t=' . $row['topic_id'], true, phpbb::$user->session_id) : false;
-		}
-	}
-
-	if (sizeof($reportee_id_list))
-	{
-		$reportee_id_list = array_unique($reportee_id_list);
-		$reportee_names_list = array();
-
-		$sql = 'SELECT user_id, username, user_colour
-			FROM ' . USERS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('user_id', $reportee_id_list);
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$reportee_names_list[$row['user_id']] = $row;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		foreach ($log as $key => $row)
-		{
-			if (!isset($reportee_names_list[$row['reportee_id']]))
-			{
-				continue;
-			}
-
-			$log[$key]['reportee_username'] = $reportee_names_list[$row['reportee_id']]['username'];
-			$log[$key]['reportee_username_full'] = get_username_string('full', $row['reportee_id'], $reportee_names_list[$row['reportee_id']]['username'], $reportee_names_list[$row['reportee_id']]['user_colour'], false, $profile_url);
-		}
-	}
-
-	$sql = 'SELECT COUNT(l.log_id) AS total_entries
-		FROM ' . LOG_TABLE . " l
-		WHERE l.log_type = $log_type
-			AND l.log_time >= $limit_days
-			$sql_forum";
-	$result = phpbb::$db->sql_query($sql);
-	$log_count = (int) phpbb::$db->sql_fetchfield('total_entries');
-	phpbb::$db->sql_freeresult($result);
-
-	return;
-}
-
-/**
-* Update foes - remove moderators and administrators from foe lists...
-*/
-function update_foes($group_id = false, $user_id = false)
-{
-	// update foes for some user
-	if (is_array($user_id) && sizeof($user_id))
-	{
-		$sql = 'DELETE FROM ' . ZEBRA_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('zebra_id', $user_id) . '
-				AND foe = 1';
-		phpbb::$db->sql_query($sql);
-		return;
-	}
-
-	// update foes for some group
-	if (is_array($group_id) && sizeof($group_id))
-	{
-		// Grab group settings...
-		$sql = phpbb::$db->sql_build_query('SELECT', array(
-			'SELECT'	=> 'a.group_id',
-
-			'FROM'		=> array(
-				ACL_OPTIONS_TABLE	=> 'ao',
-				ACL_GROUPS_TABLE	=> 'a'
-			),
-
-			'LEFT_JOIN'	=> array(
-				array(
-					'FROM'	=> array(ACL_ROLES_DATA_TABLE => 'r'),
-					'ON'	=> 'a.auth_role_id = r.role_id'
-				),
-			),
-
-			'WHERE'		=> '(ao.auth_option_id = a.auth_option_id OR ao.auth_option_id = r.auth_option_id)
-				AND ' . phpbb::$db->sql_in_set('a.group_id', $group_id) . "
-				AND ao.auth_option IN ('a_', 'm_')",
-
-			'GROUP_BY'	=> 'a.group_id'
-		));
-		$result = phpbb::$db->sql_query($sql);
-
-		$groups = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$groups[] = (int) $row['group_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if (!sizeof($groups))
-		{
-			return;
-		}
-
-		if (phpbb::$db->features['multi_table_deletion'])
-		{
-			$sql = 'DELETE FROM' . ZEBRA_TABLE . ' z
-				USING ' . USER_GROUP_TABLE . ' ug
-				WHERE z.zebra_id = ug.user_id
-					AND z.foe = 1
-					AND ' . phpbb::$db->sql_in_set('ug.group_id', $groups);
-			phpbb::$db->sql_query($sql);
-		}
-		else
-		{
-			$sql = 'SELECT user_id
-				FROM ' . USER_GROUP_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('group_id', $groups);
-			$result = phpbb::$db->sql_query($sql);
-
-			$users = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$users[] = (int) $row['user_id'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			if (sizeof($users))
-			{
-				$sql = 'DELETE FROM ' . ZEBRA_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('zebra_id', $users) . '
-						AND foe = 1';
-				phpbb::$db->sql_query($sql);
-			}
-		}
-
-		return;
-	}
-
-	// update foes for everyone
-	$perms = array();
-	foreach (phpbb::$acl->acl_get_list(false, array('a_', 'm_'), false) as $forum_id => $forum_ary)
-	{
-		foreach ($forum_ary as $auth_option => $user_ary)
-		{
-			$perms = array_merge($perms, $user_ary);
-		}
-	}
-
-	if (sizeof($perms))
-	{
-		$sql = 'DELETE FROM ' . ZEBRA_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('zebra_id', array_unique($perms)) . '
-				AND foe = 1';
-		phpbb::$db->sql_query($sql);
-	}
-	unset($perms);
-}
-
-/**
-* Lists inactive users
-*/
-function view_inactive_users(&$users, &$user_count, $limit = 0, $offset = 0, $limit_days = 0, $sort_by = 'user_inactive_time DESC')
-{
-	$sql = 'SELECT COUNT(user_id) AS user_count
-		FROM ' . USERS_TABLE . '
-		WHERE user_type = ' . phpbb::USER_INACTIVE .
-		(($limit_days) ? " AND user_inactive_time >= $limit_days" : '');
-	$result = phpbb::$db->sql_query($sql);
-	$user_count = (int) phpbb::$db->sql_fetchfield('user_count');
-	phpbb::$db->sql_freeresult($result);
-
-	if ($offset >= $user_count)
-	{
-		$offset = ($offset - $limit < 0) ? 0 : $offset - $limit;
-	}
-
-	$sql = 'SELECT user_id, username, user_regdate, user_lastvisit, user_inactive_time, user_inactive_reason
-		FROM ' . USERS_TABLE . '
-		WHERE user_type = ' . phpbb::USER_INACTIVE .
-		(($limit_days) ? " AND user_inactive_time >= $limit_days" : '') . "
-		ORDER BY $sort_by";
-	$result = phpbb::$db->sql_query_limit($sql, $limit, $offset);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$row['inactive_reason'] = phpbb::$user->lang['INACTIVE_REASON_UNKNOWN'];
-		switch ($row['user_inactive_reason'])
-		{
-			case INACTIVE_REGISTER:
-				$row['inactive_reason'] = phpbb::$user->lang['INACTIVE_REASON_REGISTER'];
-			break;
-
-			case INACTIVE_PROFILE:
-				$row['inactive_reason'] = phpbb::$user->lang['INACTIVE_REASON_PROFILE'];
-			break;
-
-			case INACTIVE_MANUAL:
-				$row['inactive_reason'] = phpbb::$user->lang['INACTIVE_REASON_MANUAL'];
-			break;
-
-			case INACTIVE_REMIND:
-				$row['inactive_reason'] = phpbb::$user->lang['INACTIVE_REASON_REMIND'];
-			break;
-		}
-
-		$users[] = $row;
-	}
-
-	return $offset;
-}
-
-/**
-* Lists warned users
-*/
-function view_warned_users(&$users, &$user_count, $limit = 0, $offset = 0, $limit_days = 0, $sort_by = 'user_warnings DESC')
-{
-	$sql = 'SELECT user_id, username, user_colour, user_warnings, user_last_warning
-		FROM ' . USERS_TABLE . '
-		WHERE user_warnings > 0
-		' . (($limit_days) ? "AND user_last_warning >= $limit_days" : '') . "
-		ORDER BY $sort_by";
-	$result = phpbb::$db->sql_query_limit($sql, $limit, $offset);
-	$users = phpbb::$db->sql_fetchrowset($result);
-	phpbb::$db->sql_freeresult($result);
-
-	$sql = 'SELECT count(user_id) AS user_count
-		FROM ' . USERS_TABLE . '
-		WHERE user_warnings > 0
-		' . (($limit_days) ? "AND user_last_warning >= $limit_days" : '');
-	$result = phpbb::$db->sql_query($sql);
-	$user_count = (int) phpbb::$db->sql_fetchfield('user_count');
-	phpbb::$db->sql_freeresult($result);
-
-	return;
-}
-
-/**
-* Get database size
-*/
-function get_database_size()
-{
-	$database_size = false;
-
-	// This code is heavily influenced by a similar routine in phpMyAdmin 2.2.0
-	switch (phpbb::$db->dbms_type)
-	{
-		case 'mysql':
-			$sql = 'SELECT VERSION() AS mysql_version';
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if ($row)
-			{
-				$version = $row['mysql_version'];
-
-				if (preg_match('#(3\.23|[45]\.)#', $version))
-				{
-					$db_name = (preg_match('#^(?:3\.23\.(?:[6-9]|[1-9]{2}))|[45]\.#', $version)) ? "`" . phpbb::$db->dbname . "`" : phpbb::$db->dbname;
-
-					$sql = 'SHOW TABLE STATUS
-						FROM ' . $db_name;
-					$result = phpbb::$db->sql_query($sql, 7200);
-
-					$database_size = 0;
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						if ((isset($row['Type']) && $row['Type'] != 'MRG_MyISAM') || (isset($row['Engine']) && ($row['Engine'] == 'MyISAM' || $row['Engine'] == 'InnoDB')))
-						{
-							if (phpbb::$base_config['table_prefix'] != '')
-							{
-								if (strpos($row['Name'], phpbb::$base_config['table_prefix']) !== false)
-								{
-									$database_size += $row['Data_length'] + $row['Index_length'];
-								}
-							}
-							else
-							{
-								$database_size += $row['Data_length'] + $row['Index_length'];
-							}
-						}
-					}
-					phpbb::$db->sql_freeresult($result);
-				}
-			}
-		break;
-
-		case 'firebird':
-			global $dbname;
-
-			// if it on the local machine, we can get lucky
-			if (file_exists($dbname))
-			{
-				$database_size = filesize($dbname);
-			}
-
-		break;
-
-		case 'sqlite':
-			global $dbhost;
-
-			if (file_exists($dbhost))
-			{
-				$database_size = filesize($dbhost);
-			}
-
-		break;
-
-		case 'mssql':
-			$sql = 'SELECT ((SUM(size) * 8.0) * 1024.0) as dbsize
-				FROM sysfiles';
-			$result = phpbb::$db->sql_query($sql, 7200);
-			$database_size = ($row = phpbb::$db->sql_fetchrow($result)) ? $row['dbsize'] : false;
-			phpbb::$db->sql_freeresult($result);
-		break;
-
-		case 'postgres':
-			$sql = "SELECT proname
-				FROM pg_proc
-				WHERE proname = 'pg_database_size'";
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if ($row['proname'] == 'pg_database_size')
-			{
-				$database = phpbb::$db->dbname;
-				if (strpos($database, '.') !== false)
-				{
-					list($database, ) = explode('.', $database);
-				}
-
-				$sql = "SELECT oid
-					FROM pg_database
-					WHERE datname = '$database'";
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				$oid = $row['oid'];
-
-				$sql = 'SELECT pg_database_size(' . $oid . ') as size';
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				$database_size = $row['size'];
-			}
-		break;
-
-		case 'oracle':
-			$sql = 'SELECT SUM(bytes) as dbsize
-				FROM user_segments';
-			$result = phpbb::$db->sql_query($sql, 7200);
-			$database_size = ($row = phpbb::$db->sql_fetchrow($result)) ? $row['dbsize'] : false;
-			phpbb::$db->sql_freeresult($result);
-		break;
-	}
-
-	$database_size = ($database_size !== false) ? get_formatted_filesize($database_size) : phpbb::$user->lang['NOT_AVAILABLE'];
-
-	return $database_size;
-}
-
-/**
-* Retrieve contents from remotely stored file
-*/
-function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port = 80, $timeout = 10)
-{
-	if ($fsock = @fsockopen($host, $port, $errno, $errstr, $timeout))
-	{
-		@fputs($fsock, "GET $directory/$filename HTTP/1.1\r\n");
-		@fputs($fsock, "HOST: $host\r\n");
-		@fputs($fsock, "Connection: close\r\n\r\n");
-
-		$file_info = '';
-		$get_info = false;
-
-		while (!@feof($fsock))
-		{
-			if ($get_info)
-			{
-				$file_info .= @fread($fsock, 1024);
-			}
-			else
-			{
-				$line = @fgets($fsock, 1024);
-				if ($line == "\r\n")
-				{
-					$get_info = true;
-				}
-				else if (stripos($line, '404 not found') !== false)
-				{
-					$errstr = phpbb::$user->lang['FILE_NOT_FOUND'] . ': ' . $filename;
-					return false;
-				}
-			}
-		}
-		@fclose($fsock);
-	}
-	else
-	{
-		if ($errstr)
-		{
-			$errstr = utf8_convert_message($errstr);
-			return false;
-		}
-		else
-		{
-			$errstr = phpbb::$user->lang['FSOCK_DISABLED'];
-			return false;
-		}
-	}
-
-	return $file_info;
-}
-
-/**
-* Tidy Warnings
-* Remove all warnings which have now expired from the database
-* The duration of a warning can be defined by the administrator
-* This only removes the warning and reduces the associated count,
-* it does not remove the user note recording the contents of the warning
-*/
-function tidy_warnings()
-{
-	$expire_date = time() - (phpbb::$config['warnings_expire_days'] * 86400);
-	$warning_list = $user_list = array();
-
-	$sql = 'SELECT * FROM ' . WARNINGS_TABLE . "
-		WHERE warning_time < $expire_date";
-	$result = phpbb::$db->sql_query($sql);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$warning_list[] = $row['warning_id'];
-		$user_list[$row['user_id']] = isset($user_list[$row['user_id']]) ? ++$user_list[$row['user_id']] : 1;
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	if (sizeof($warning_list))
-	{
-		phpbb::$db->sql_transaction('begin');
-
-		$sql = 'DELETE FROM ' . WARNINGS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('warning_id', $warning_list);
-		phpbb::$db->sql_query($sql);
-
-		foreach ($user_list as $user_id => $value)
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . " SET user_warnings = user_warnings - $value
-				WHERE user_id = $user_id";
-			phpbb::$db->sql_query($sql);
-		}
-
-		phpbb::$db->sql_transaction('commit');
-	}
-
-	set_config('warnings_last_gc', time(), true);
-}
-
-/**
-* Tidy database, doing some maintanance tasks
-*/
-function tidy_database()
-{
-	// Here we check permission consistency
-
-	// Sometimes, it can happen permission tables having forums listed which do not exist
-	$sql = 'SELECT forum_id
-		FROM ' . FORUMS_TABLE;
-	$result = phpbb::$db->sql_query($sql);
-
-	$forum_ids = array(0);
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$forum_ids[] = $row['forum_id'];
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	// Delete those rows from the acl tables not having listed the forums above
-	$sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . '
-		WHERE ' . phpbb::$db->sql_in_set('forum_id', $forum_ids, true);
-	phpbb::$db->sql_query($sql);
-
-	$sql = 'DELETE FROM ' . ACL_USERS_TABLE . '
-		WHERE ' . phpbb::$db->sql_in_set('forum_id', $forum_ids, true);
-	phpbb::$db->sql_query($sql);
-
-	set_config('database_last_gc', time(), true);
-}
-
-/**
-* Add permission language - this will make sure custom files will be included
-*/
-function add_permission_language()
-{
-	// First of all, our own file. We need to include it as the first file because it presets all relevant variables.
-	phpbb::$user->add_lang('acp/permissions_phpbb');
-
-	$files_to_add = array();
-
-	// Now search in acp and mods folder for permissions_ files.
-	foreach (array('acp/', 'mods/') as $path)
-	{
-		$dh = @opendir(phpbb::$user->lang_path . phpbb::$user->lang_name . '/' . $path);
-
-		if ($dh)
-		{
-			while (($file = readdir($dh)) !== false)
-			{
-				if ($file !== 'permissions_phpbb.' . PHP_EXT && strpos($file, 'permissions_') === 0 && substr($file, -(strlen(PHP_EXT) + 1)) === '.' . PHP_EXT)
-				{
-					$files_to_add[] = $path . substr($file, 0, -(strlen(PHP_EXT) + 1));
-				}
-			}
-			closedir($dh);
-		}
-	}
-
-	if (!sizeof($files_to_add))
-	{
-		return false;
-	}
-
-	phpbb::$user->add_lang($files_to_add);
-	return true;
-}
-
-/**
-* Upload files or let the user download them as appropriate
-*/
-function process_transfer($module_url, $update_list, $new_location, $download_filename)
-{
-	// todo: add $s_hidden_fields as a parameter to this function
-	$s_hidden_fields = '';
-
-	if (request_var('download', false))
-	{
-		$use_method = request_var('use_method', '');
-		$methods = array('.tar');
-
-		$available_methods = array('.tar.gz' => 'zlib', '.tar.bz2' => 'bz2', '.zip' => 'zlib');
-		foreach ($available_methods as $type => $module)
-		{
-			if (!@extension_loaded($module))
-			{
-				continue;
-			}
-
-			$methods[] = $type;
-		}
-
-		// Let the user decide in which format he wants to have the pack
-		if (!$use_method)
-		{
-			$radio_buttons = '';
-			foreach ($methods as $method)
-			{
-				$radio_buttons .= '<label><input type="radio"' . ((!$radio_buttons) ? ' id="use_method"' : '') . ' class="radio" value="' . $method . '" name="use_method" /> ' . $method . '</label>';
-			}
-
-			phpbb::$template->assign_vars(array(
-				'S_DOWNLOAD_FILES'		=> true,
-				'U_ACTION'				=> append_sid($module_url),
-				'RADIO_BUTTONS'			=> $radio_buttons,
-				'S_HIDDEN_FIELDS'		=> $s_hidden_fields)
-			);
-
-			// To ease the update process create a file location map
-			$script_path = (phpbb::$config['force_server_vars']) ? ((phpbb::$config['script_path'] == '/') ? '/' : phpbb::$config['script_path'] . '/') : phpbb::$user->page['root_script_path'];
-
-			foreach ($update_list as $status => $files)
-			{
-				if ($status == 'up_to_date' || $status == 'no_update' || $status == 'status')
-				{
-					continue;
-				}
-
-				foreach ($files as $file_struct)
-				{
-					phpbb::$template->assign_block_vars('location', array(
-						'SOURCE'		=> htmlspecialchars($file_struct['filename']),
-						'DESTINATION'	=> $script_path . htmlspecialchars($file_struct['filename']),
-					));
-				}
-			}
-			return 'SELECT_DOWNLOAD_FORMAT';
-		}
-
-		if (!in_array($use_method, $methods))
-		{
-			$use_method = '.tar';
-		}
-
-		$update_mode = 'download';
-	}
-	else
-	{
-		// Choose FTP, if not available use fsock...
-		$method = basename(request_var('method', ''));
-		$submit = phpbb_request::is_set_post('update');
-		$test_ftp_connection = request_var('test_connection', '');
-
-		if (!$method || !class_exists($method))
-		{
-			$method = 'ftp';
-			$methods = transfer::methods();
-
-			if (!in_array('ftp', $methods))
-			{
-				$method = $methods[0];
-			}
-		}
-
-		$test_connection = false;
-		if ($test_ftp_connection || $submit)
-		{
-			$transfer = new $method(request_var('host', ''), request_var('username', ''), request_var('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
-			$test_connection = $transfer->open_session();
-
-			// Make sure that the directory is correct by checking for the existence of common.php
-			if ($test_connection === true)
-			{
-				// Check for common.php file
-				if (!$transfer->file_exists(PHPBB_ROOT_PATH, 'common.' . PHP_EXT))
-				{
-					$test_connection = 'ERR_WRONG_PATH_TO_PHPBB';
-				}
-			}
-
-			$transfer->close_session();
-
-			// Make sure the login details are correct before continuing
-			if ($submit && $test_connection !== true)
-			{
-				$submit = false;
-				$test_ftp_connection = true;
-			}
-		}
-
-		$s_hidden_fields .= build_hidden_fields(array('method' => $method));
-
-		if (!$submit)
-		{
-			if (!class_exists($method))
-			{
-				trigger_error('Method does not exist.', E_USER_ERROR);
-			}
-
-			$requested_data = call_user_func(array($method, 'data'));
-			foreach ($requested_data as $data => $default)
-			{
-				phpbb::$template->assign_block_vars('data', array(
-					'DATA'		=> $data,
-					'NAME'		=> phpbb::$user->lang[strtoupper($method . '_' . $data)],
-					'EXPLAIN'	=> phpbb::$user->lang[strtoupper($method . '_' . $data) . '_EXPLAIN'],
-					'DEFAULT'	=> (request_var($data, false)) ? request_var($data, '') : $default
-				));
-			}
-
-			phpbb::$template->assign_vars(array(
-				'S_CONNECTION_SUCCESS'		=> ($test_ftp_connection && $test_connection === true) ? true : false,
-				'S_CONNECTION_FAILED'		=> ($test_ftp_connection && $test_connection !== true) ? true : false,
-				'ERROR_MSG'					=> ($test_ftp_connection && $test_connection !== true) ? phpbb::$user->lang[$test_connection] : '',
-
-				'S_FTP_UPLOAD'		=> true,
-				'UPLOAD_METHOD'		=> $method,
-				'U_ACTION'			=> $module_url,
-				'U_DOWNLOAD_METHOD'	=> $module_url . '&amp;download=1',
-				'S_HIDDEN_FIELDS'	=> $s_hidden_fields,
-			));
-
-			return 'SELECT_FTP_SETTINGS';
-		}
-
-		$update_mode = 'upload';
-	}
-
-	// Now init the connection
-	if ($update_mode == 'download')
-	{
-		// Now update the installation or download the archive...
-		$archive_filename = $download_filename . '_' . time() . '_' . unique_id();
-
-		if ($use_method == '.zip')
-		{
-			$compress = new compress_zip('w', PHPBB_ROOT_PATH . 'store/' . $archive_filename . $use_method);
-		}
-		else
-		{
-			$compress = new compress_tar('w', PHPBB_ROOT_PATH . 'store/' . $archive_filename . $use_method, $use_method);
-		}
-	}
-	else
-	{
-		$transfer = new $method(request_var('host', ''), request_var('username', ''), request_var('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
-		$transfer->open_session();
-	}
-
-	// Ok, go through the update list and do the operations based on their status
-	foreach ($update_list as $status => $files)
-	{
-		if (!is_array($files))
-		{
-			continue;
-		}
-
-		foreach ($files as $file_struct)
-		{
-			$original_filename = ($file_struct['custom']) ? $file_struct['original'] : $file_struct['filename'];
-
-			switch ($status)
-			{
-				case 'new':
-				case 'new_conflict':
-				case 'not_modified':
-
-					if ($update_mode == 'download')
-					{
-						$compress->add_custom_file($new_location . $original_filename, $file_struct['filename']);
-					}
-					else
-					{
-						if ($status != 'new')
-						{
-							$transfer->rename($file_struct['filename'], $file_struct['filename'] . '.bak');
-						}
-
-						// New directory too?
-						$dirname = dirname($file_struct['filename']);
-
-						if ($dirname && !file_exists(PHPBB_ROOT_PATH . $dirname))
-						{
-							$transfer->make_dir($dirname);
-						}
-
-						$transfer->copy_file($new_location . $original_filename, $file_struct['filename']);
-					}
-				break;
-
-				case 'modified':
-
-					$contents = base64_decode($cache->get($file_list[$file_struct['filename']]));
-
-					if ($update_mode == 'download')
-					{
-						$compress->add_data($contents, $file_struct['filename']);
-					}
-					else
-					{
-						// @todo add option to specify if a backup file should be created?
-						$transfer->rename($file_struct['filename'], $file_struct['filename'] . '.bak');
-						$transfer->write_file($file_struct['filename'], $contents);
-					}
-				break;
-
-				case 'conflict':
-
-					$contents = base64_decode($cache->get($file_list[$file_struct['filename']]));
-
-					if ($update_mode == 'download')
-					{
-						$compress->add_data($contents, $file_struct['filename']);
-					}
-					else
-					{
-						$transfer->rename($file_struct['filename'], $file_struct['filename'] . '.bak');
-						$transfer->write_file($file_struct['filename'], $contents);
-					}
-				break;
-			}
-		}
-	}
-
-	if ($update_mode == 'download')
-	{
-		$compress->close();
-
-		$compress->download($archive_filename, $download_filename);
-		@unlink(PHPBB_ROOT_PATH . 'store/' . $archive_filename . $use_method);
-
-		exit;
-	}
-	else
-	{
-		$transfer->close_session();
-
-		phpbb::$template->assign_var('S_UPLOAD_SUCCESS', true);
-		return;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/functions_compress.php b/phpBB/includes/functions_compress.php
deleted file mode 100644
index eebc82b9d0..0000000000
--- a/phpBB/includes/functions_compress.php
+++ /dev/null
@@ -1,712 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Class for handling archives (compression/decompression)
-* @package phpBB3
-*/
-class compress
-{
-	protected $fp = 0;
-
-	/**
-	* Add file to archive
-	*/
-	public function add_file($src, $src_rm_prefix = '', $src_add_prefix = '', $skip_files = '')
-	{
-		$skip_files = explode(',', $skip_files);
-
-		// Remove rm prefix from src path
-		$src_path = ($src_rm_prefix) ? preg_replace('#^(' . preg_quote($src_rm_prefix, '#') . ')#', '', $src) : $src;
-		// Add src prefix
-		$src_path = ($src_add_prefix) ? ($src_add_prefix . ((substr($src_add_prefix, -1) != '/') ? '/' : '') . $src_path) : $src_path;
-		// Remove initial "/" if present
-		$src_path = (substr($src_path, 0, 1) == '/') ? substr($src_path, 1) : $src_path;
-
-		if (is_file(PHPBB_ROOT_PATH . $src))
-		{
-			$this->data($src_path, file_get_contents(PHPBB_ROOT_PATH . $src), false, stat(PHPBB_ROOT_PATH . $src));
-		}
-		else if (is_dir(PHPBB_ROOT_PATH . $src))
-		{
-			// Clean up path, add closing / if not present
-			$src_path = ($src_path && substr($src_path, -1) != '/') ? $src_path . '/' : $src_path;
-
-			$filelist = array();
-			$filelist = filelist(PHPBB_ROOT_PATH . $src, '', '*');
-			krsort($filelist);
-
-			if ($src_path)
-			{
-				$this->data($src_path, '', true, stat(PHPBB_ROOT_PATH . $src));
-			}
-
-			foreach ($filelist as $path => $file_ary)
-			{
-				if ($path)
-				{
-					// Same as for src_path
-					$path = (substr($path, 0, 1) == '/') ? substr($path, 1) : $path;
-					$path = ($path && substr($path, -1) != '/') ? $path . '/' : $path;
-
-					$this->data("$src_path$path", '', true, stat(PHPBB_ROOT_PATH . $src . $path));
-				}
-
-				foreach ($file_ary as $file)
-				{
-					if (in_array($path . $file, $skip_files))
-					{
-						continue;
-					}
-
-					$this->data("$src_path$path$file", file_get_contents(PHPBB_ROOT_PATH . $src . $path . $file), false, stat(PHPBB_ROOT_PATH . $src . $path . $file));
-				}
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* Add custom file (the filepath will not be adjusted)
-	*/
-	public function add_custom_file($src, $filename)
-	{
-		$this->data($filename, file_get_contents($src), false, stat($src));
-		return true;
-	}
-
-	/**
-	* Add file data
-	*/
-	public function add_data($src, $name)
-	{
-		$stat = array();
-		$stat[2] = 436; //384
-		$stat[4] = $stat[5] = 0;
-		$stat[7] = strlen($src);
-		$stat[9] = time();
-		$this->data($name, $src, false, $stat);
-		return true;
-	}
-
-	/**
-	* Return available methods
-	*/
-	public static function methods()
-	{
-		$methods = array('.tar');
-		$available_methods = array('.tar.gz' => 'zlib', '.tar.bz2' => 'bz2', '.zip' => 'zlib');
-
-		foreach ($available_methods as $type => $module)
-		{
-			if (!@extension_loaded($module))
-			{
-				continue;
-			}
-			$methods[] = $type;
-		}
-
-		return $methods;
-	}
-}
-
-/**
-* Zip creation class from phpMyAdmin 2.3.0 (c) Tobias Ratschiller, Olivier M�ller, Lo�c Chapeaux,
-* Marc Delisle, http://www.phpmyadmin.net/
-*
-* Zip extraction function by Alexandre Tedeschi, alexandrebr at gmail dot com
-*
-* Modified extensively by psoTFX and DavidMJ, (c) phpBB Group, 2003
-*
-* Based on work by Eric Mueller and Denis125
-* Official ZIP file format: http://www.pkware.com/appnote.txt
-*
-* @package phpBB3
-*/
-class compress_zip extends compress
-{
-	private $datasec = array();
-	private $ctrl_dir = array();
-	const eof_cdh = "\x50\x4b\x05\x06\x00\x00\x00\x00";
-
-	private $old_offset = 0;
-	private $datasec_len = 0;
-
-	/**
-	* Constructor
-	*/
-	function __construct($mode, $file)
-	{
-		return $this->fp = @fopen($file, $mode . 'b');
-	}
-
-	/**
-	* Convert unix to dos time
-	*/
-	private static function unix_to_dos_time($time)
-	{
-		$timearray = (!$time) ? getdate() : getdate($time);
-
-		if ($timearray['year'] < 1980)
-		{
-			$timearray['year'] = 1980;
-			$timearray['mon'] = $timearray['mday'] = 1;
-			$timearray['hours'] = $timearray['minutes'] = $timearray['seconds'] = 0;
-		}
-
-		return (($timearray['year'] - 1980) << 25) | ($timearray['mon'] << 21) | ($timearray['mday'] << 16) | ($timearray['hours'] << 11) | ($timearray['minutes'] << 5) | ($timearray['seconds'] >> 1);
-	}
-
-	/**
-	* Extract archive
-	*/
-	public function extract($dst)
-	{
-		// Loop the file, looking for files and folders
-		$dd_try = false;
-		rewind($this->fp);
-
-		while (!feof($this->fp))
-		{
-			// Check if the signature is valid...
-			$signature = fread($this->fp, 4);
-
-			switch ($signature)
-			{
-				// 'Local File Header'
-				case "\x50\x4b\x03\x04":
-					// Lets get everything we need.
-					// We don't store the version needed to extract, the general purpose bit flag or the date and time fields
-					$data = unpack("@4/vc_method/@10/Vcrc/Vc_size/Vuc_size/vname_len/vextra_field", fread($this->fp, 26));
-					$file_name = fread($this->fp, $data['name_len']); // filename
-
-					if ($data['extra_field'])
-					{
-						fread($this->fp, $data['extra_field']); // extra field
-					}
-
-					$target_filename = "$dst$file_name";
-
-					if (!$data['uc_size'] && !$data['crc'] && substr($file_name, -1, 1) == '/')
-					{
-						if (!is_dir($target_filename))
-						{
-							$str = '';
-							$folders = explode('/', $target_filename);
-
-							// Create and folders and subfolders if they do not exist
-							foreach ($folders as $folder)
-							{
-								$folder = trim($folder);
-								if (!$folder)
-								{
-									continue;
-								}
-
-								$str = (!empty($str)) ? $str . '/' . $folder : $folder;
-								if (!is_dir($str))
-								{
-									if (!@mkdir($str, 0777))
-									{
-										trigger_error("Could not create directory $folder");
-									}
-									phpbb::$system->chmod($str, phpbb::CHMOD_READ | phpbb::CHMOD_WRITE);
-								}
-							}
-						}
-						// This is a directory, we are not writting files
-						continue;
-					}
-					else
-					{
-						// Some archivers are punks, they don't include folders in their archives!
-						$str = '';
-						$folders = explode('/', pathinfo($target_filename, PATHINFO_DIRNAME));
-
-						// Create and folders and subfolders if they do not exist
-						foreach ($folders as $folder)
-						{
-							$folder = trim($folder);
-							if (!$folder)
-							{
-								continue;
-							}
-
-							$str = (!empty($str)) ? $str . '/' . $folder : $folder;
-							if (!is_dir($str))
-							{
-								if (!@mkdir($str, 0777))
-								{
-									trigger_error("Could not create directory $folder");
-								}
-								phpbb::$system->chmod($str, phpbb::CHMOD_READ | phpbb::CHMOD_WRITE);
-							}
-						}
-					}
-
-					if (!$data['uc_size'])
-					{
-						$content = '';
-					}
-					else
-					{
-						$content = fread($this->fp, $data['c_size']);
-					}
-
-					$fp = fopen($target_filename, "w");
-
-					switch ($data['c_method'])
-					{
-						case 0:
-							// Not compressed
-							fwrite($fp, $content);
-						break;
-
-						case 8:
-							// Deflate
-							fwrite($fp, gzinflate($content, $data['uc_size']));
-						break;
-
-						case 12:
-							// Bzip2
-							fwrite($fp, bzdecompress($content));
-						break;
-					}
-
-					fclose($fp);
-				break;
-
-				// We hit the 'Central Directory Header', we can stop because nothing else in here requires our attention
-				// or we hit the end of the central directory record, we can safely end the loop as we are totally finished with looking for files and folders
-				case "\x50\x4b\x01\x02":
-				// This case should simply never happen.. but it does exist..
-				case "\x50\x4b\x05\x06":
-				break 2;
-
-				// 'Packed to Removable Disk', ignore it and look for the next signature...
-				case 'PK00':
-				continue 2;
-
-				// We have encountered a header that is weird. Lets look for better data...
-				default:
-					if (!$dd_try)
-					{
-						// Unexpected header. Trying to detect wrong placed 'Data Descriptor';
-						$dd_try = true;
-						fseek($this->fp, 8, SEEK_CUR); // Jump over 'crc-32'(4) 'compressed-size'(4), 'uncompressed-size'(4)
-						continue 2;
-					}
-					trigger_error("Unexpected header, ending loop");
-				break 2;
-			}
-
-			$dd_try = false;
-		}
-	}
-
-	/**
-	* Close archive
-	*/
-	public function close()
-	{
-		// Write out central file directory and footer ... if it exists
-		if (sizeof($this->ctrl_dir))
-		{
-			fwrite($this->fp, $this->file());
-		}
-		fclose($this->fp);
-	}
-
-	/**
-	* Create the structures ... note we assume version made by is MSDOS
-	*/
-	protected function data($name, $data, $is_dir = false, $stat)
-	{
-		$name = str_replace('\\', '/', $name);
-
-		$hexdtime = pack('V', self::unix_to_dos_time($stat[9]));
-
-		if ($is_dir)
-		{
-			$unc_len = $c_len = $crc = 0;
-			$zdata = '';
-			$var_ext = 10;
-		}
-		else
-		{
-			$unc_len = strlen($data);
-			$crc = crc32($data);
-			$zdata = gzdeflate($data);
-			$c_len = strlen($zdata);
-			$var_ext = 20;
-
-			// Did we compress? No, then use data as is
-			if ($c_len >= $unc_len)
-			{
-				$zdata = $data;
-				$c_len = $unc_len;
-				$var_ext = 10;
-			}
-		}
-		unset($data);
-
-		// If we didn't compress set method to store, else deflate
-		$c_method = ($c_len == $unc_len) ? "\x00\x00" : "\x08\x00";
-
-		// Are we a file or a directory? Set archive for file
-		$attrib = ($is_dir) ? 16 : 32;
-
-		// File Record Header
-		$fr = "\x50\x4b\x03\x04";		// Local file header 4bytes
-		$fr .= pack('v', $var_ext);		// ver needed to extract 2bytes
-		$fr .= "\x00\x00";				// gen purpose bit flag 2bytes
-		$fr .= $c_method;				// compression method 2bytes
-		$fr .= $hexdtime;				// last mod time and date 2+2bytes
-		$fr .= pack('V', $crc);			// crc32 4bytes
-		$fr .= pack('V', $c_len);		// compressed filesize 4bytes
-		$fr .= pack('V', $unc_len);		// uncompressed filesize 4bytes
-		$fr .= pack('v', strlen($name));// length of filename 2bytes
-
-		$fr .= pack('v', 0);			// extra field length 2bytes
-		$fr .= $name;
-		$fr .= $zdata;
-		unset($zdata);
-
-		$this->datasec_len += strlen($fr);
-
-		// Add data to file ... by writing data out incrementally we save some memory
-		fwrite($this->fp, $fr);
-		unset($fr);
-
-		// Central Directory Header
-		$cdrec = "\x50\x4b\x01\x02";		// header 4bytes
-		$cdrec .= "\x00\x00";				// version made by
-		$cdrec .= pack('v', $var_ext);		// version needed to extract
-		$cdrec .= "\x00\x00";				// gen purpose bit flag
-		$cdrec .= $c_method;				// compression method
-		$cdrec .= $hexdtime;				// last mod time & date
-		$cdrec .= pack('V', $crc);			// crc32
-		$cdrec .= pack('V', $c_len);		// compressed filesize
-		$cdrec .= pack('V', $unc_len);		// uncompressed filesize
-		$cdrec .= pack('v', strlen($name));	// length of filename
-		$cdrec .= pack('v', 0);				// extra field length
-		$cdrec .= pack('v', 0);				// file comment length
-		$cdrec .= pack('v', 0);				// disk number start
-		$cdrec .= pack('v', 0);				// internal file attributes
-		$cdrec .= pack('V', $attrib);		// external file attributes
-		$cdrec .= pack('V', $this->old_offset);	// relative offset of local header
-		$cdrec .= $name;
-
-		// Save to central directory
-		$this->ctrl_dir[] = $cdrec;
-
-		$this->old_offset = $this->datasec_len;
-	}
-
-	/**
-	* file
-	*/
-	private function file()
-	{
-		$ctrldir = implode('', $this->ctrl_dir);
-
-		return $ctrldir . self::eof_cdh .
-			pack('v', sizeof($this->ctrl_dir)) .	// total # of entries "on this disk"
-			pack('v', sizeof($this->ctrl_dir)) .	// total # of entries overall
-			pack('V', strlen($ctrldir)) .			// size of central dir
-			pack('V', $this->datasec_len) .			// offset to start of central dir
-			"\x00\x00";								// .zip file comment length
-	}
-
-	/**
-	* Download archive
-	*/
-	public function download($filename, $download_name = false)
-	{
-		if ($download_name === false)
-		{
-			$download_name = $filename;
-		}
-
-		$mimetype = 'application/zip';
-
-		header('Pragma: no-cache');
-		header("Content-Type: $mimetype; name=\"$download_name.zip\"");
-		header("Content-disposition: attachment; filename=$download_name.zip");
-
-		$fp = @fopen(PHPBB_ROOT_PATH . "store/$filename.zip", 'rb');
-		if ($fp)
-		{
-			while ($buffer = fread($fp, 1024))
-			{
-				echo $buffer;
-			}
-			fclose($fp);
-		}
-	}
-}
-
-/**
-* Tar/tar.gz compression routine
-* Header/checksum creation derived from tarfile.pl, (c) Tom Horsley, 1994
-*
-* @package phpBB3
-*/
-class compress_tar extends compress
-{
-	private $isgz = false;
-	private $isbz = false;
-	private $filename = '';
-	private $mode = '';
-	private $type = '';
-	private $wrote = false;
-
-	/**
-	* Constructor
-	*/
-	function __construct($mode, $file, $type = '')
-	{
-		$type = (!$type) ? $file : $type;
-		$this->isgz = (strpos($type, '.tar.gz') !== false || strpos($type, '.tgz') !== false) ? true : false;
-		$this->isbz = (strpos($type, '.tar.bz2') !== false) ? true : false;
-
-		$this->mode = &$mode;
-		$this->file = &$file;
-		$this->type = &$type;
-		$this->open();
-	}
-
-	/**
-	* Extract archive
-	*/
-	public function extract($dst)
-	{
-		$fzread = ($this->isbz && function_exists('bzread')) ? 'bzread' : (($this->isgz && @extension_loaded('zlib')) ? 'gzread' : 'fread');
-
-		// Run through the file and grab directory entries
-		while ($buffer = $fzread($this->fp, 512))
-		{
-			$tmp = unpack('A6magic', substr($buffer, 257, 6));
-
-			if (trim($tmp['magic']) == 'ustar')
-			{
-				$tmp = unpack('A100name', $buffer);
-				$filename = trim($tmp['name']);
-
-				$tmp = unpack('Atype', substr($buffer, 156, 1));
-				$filetype = (int) trim($tmp['type']);
-
-				$tmp = unpack('A12size', substr($buffer, 124, 12));
-				$filesize = octdec((int) trim($tmp['size']));
-
-				$target_filename = "$dst$filename";
-
-				if ($filetype == 5)
-				{
-					if (!is_dir($target_filename))
-					{
-						$str = '';
-						$folders = explode('/', $target_filename);
-
-						// Create and folders and subfolders if they do not exist
-						foreach ($folders as $folder)
-						{
-							$folder = trim($folder);
-							if (!$folder)
-							{
-								continue;
-							}
-
-							$str = (!empty($str)) ? $str . '/' . $folder : $folder;
-							if (!is_dir($str))
-							{
-								if (!@mkdir($str, 0777))
-								{
-									trigger_error("Could not create directory $folder");
-								}
-								phpbb::$system->chmod($str, phpbb::CHMOD_READ | phpbb::CHMOD_WRITE);
-							}
-						}
-					}
-				}
-				else if ($filesize >= 0 && ($filetype == 0 || $filetype == "\0"))
-				{
-					// Some archivers are punks, they don't properly order the folders in their archives!
-					$str = '';
-					$folders = explode('/', pathinfo($target_filename, PATHINFO_DIRNAME));
-
-					// Create and folders and subfolders if they do not exist
-					foreach ($folders as $folder)
-					{
-						$folder = trim($folder);
-						if (!$folder)
-						{
-							continue;
-						}
-
-						$str = (!empty($str)) ? $str . '/' . $folder : $folder;
-						if (!is_dir($str))
-						{
-							if (!@mkdir($str, 0777))
-							{
-								trigger_error("Could not create directory $folder");
-							}
-							phpbb::$system->chmod($str, phpbb::CHMOD_READ | phpbb::CHMOD_WRITE);
-						}
-					}
-
-					// Write out the files
-					if (!($fp = fopen($target_filename, 'wb')))
-					{
-						trigger_error("Couldn't create file $filename");
-					}
-					phpbb::$system->chmod($target_filename, phpbb::CHMOD_READ | phpbb::CHMOD_WRITE);
-
-					// Grab the file contents
-					fwrite($fp, ($filesize) ? $fzread($this->fp, ($filesize + 511) &~ 511) : '', $filesize);
-					fclose($fp);
-				}
-			}
-		}
-	}
-
-	/**
-	* Close archive
-	*/
-	public function close()
-	{
-		$fzclose = ($this->isbz && function_exists('bzclose')) ? 'bzclose' : (($this->isgz && @extension_loaded('zlib')) ? 'gzclose' : 'fclose');
-
-		if ($this->wrote)
-		{
-			$fzwrite = ($this->isbz && function_exists('bzwrite')) ? 'bzwrite' : (($this->isgz && @extension_loaded('zlib')) ? 'gzwrite' : 'fwrite');
-
-			// The end of a tar archive ends in two records of all NULLs (1024 bytes of \0)
-			$fzwrite($this->fp, str_repeat("\0", 1024));
-		}
-
-		$fzclose($this->fp);
-	}
-
-	/**
-	* Create the structures
-	*/
-	protected function data($name, $data, $is_dir = false, $stat)
-	{
-		$this->wrote = true;
-		$fzwrite = 	($this->isbz && function_exists('bzwrite')) ? 'bzwrite' : (($this->isgz && @extension_loaded('zlib')) ? 'gzwrite' : 'fwrite');
-
-		$typeflag = ($is_dir) ? '5' : '';
-
-		// This is the header data, it contains all the info we know about the file or folder that we are about to archive
-		$header = '';
-		$header .= pack('a100', $name);						// file name
-		$header .= pack('a8', sprintf("%07o", $stat[2]));	// file mode
-		$header .= pack('a8', sprintf("%07o", $stat[4]));	// owner id
-		$header .= pack('a8', sprintf("%07o", $stat[5]));	// group id
-		$header .= pack('a12', sprintf("%011o", $stat[7]));	// file size
-		$header .= pack('a12', sprintf("%011o", $stat[9]));	// last mod time
-
-		// Checksum
-		$checksum = 0;
-		for ($i = 0; $i < 148; $i++)
-		{
-			$checksum += ord($header[$i]);
-		}
-
-		// We precompute the rest of the hash, this saves us time in the loop and allows us to insert our hash without resorting to string functions
-		$checksum += 2415 + (($is_dir) ? 53 : 0);
-
-		$header .= pack('a8', sprintf("%07o", $checksum));	// checksum
-		$header .= pack('a1', $typeflag);					// link indicator
-		$header .= pack('a100', '');						// name of linked file
-		$header .= pack('a6', 'ustar');						// ustar indicator
-		$header .= pack('a2', '00');						// ustar version
-		$header .= pack('a32', 'Unknown');					// owner name
-		$header .= pack('a32', 'Unknown');					// group name
-		$header .= pack('a8', '');							// device major number
-		$header .= pack('a8', '');							// device minor number
-		$header .= pack('a155', '');						// filename prefix
-		$header .= pack('a12', '');							// end
-
-		// This writes the entire file in one shot. Header, followed by data and then null padded to a multiple of 512
-		$fzwrite($this->fp, $header . (($stat[7] !== 0 && !$is_dir) ? $data . str_repeat("\0", (($stat[7] + 511) &~ 511) - $stat[7]) : ''));
-		unset($data);
-	}
-
-	/**
-	* Open archive
-	*/
-	private function open()
-	{
-		$fzopen = ($this->isbz && function_exists('bzopen')) ? 'bzopen' : (($this->isgz && @extension_loaded('zlib')) ? 'gzopen' : 'fopen');
-		$this->fp = @$fzopen($this->file, $this->mode . (($fzopen == 'bzopen') ? '' : 'b') . (($fzopen == 'gzopen') ? '9' : ''));
-
-		if (!$this->fp)
-		{
-			trigger_error('Unable to open file ' . $this->file . ' [' . $fzopen . ' - ' . $this->mode . 'b]');
-		}
-	}
-
-	/**
-	* Download archive
-	*/
-	public function download($filename, $download_name = false)
-	{
-		if ($download_name === false)
-		{
-			$download_name = $filename;
-		}
-
-		switch ($this->type)
-		{
-			case '.tar':
-				$mimetype = 'application/x-tar';
-			break;
-
-			case '.tar.gz':
-				$mimetype = 'application/x-gzip';
-			break;
-
-			case '.tar.bz2':
-				$mimetype = 'application/x-bzip2';
-			break;
-
-			default:
-				$mimetype = 'application/octet-stream';
-			break;
-		}
-
-		header('Pragma: no-cache');
-		header("Content-Type: $mimetype; name=\"$download_name$this->type\"");
-		header("Content-disposition: attachment; filename=$download_name$this->type");
-
-		$fp = @fopen(PHPBB_ROOT_PATH . "store/$filename$this->type", 'rb');
-		if ($fp)
-		{
-			while ($buffer = fread($fp, 1024))
-			{
-				echo $buffer;
-			}
-			fclose($fp);
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
deleted file mode 100644
index 64c915b7dd..0000000000
--- a/phpBB/includes/functions_content.php
+++ /dev/null
@@ -1,1317 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* gen_sort_selects()
-* make_jumpbox()
-* bump_topic_allowed()
-* get_context()
-* decode_message()
-* strip_bbcode()
-* generate_text_for_display()
-* generate_text_for_storage()
-* generate_text_for_edit()
-* make_clickable_callback()
-* make_clickable()
-* censor_text()
-* bbcode_nl2br()
-* smiley_text()
-* parse_attachments()
-* extension_allowed()
-* truncate_string()
-* get_username_string()
-* class bitfield
-*/
-
-/**
-* Generate sort selection fields
-* @todo phpbb_api::new('sort')
-*/
-function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key, &$sort_dir, &$s_limit_days, &$s_sort_key, &$s_sort_dir, &$u_sort_param, $def_st = false, $def_sk = false, $def_sd = false)
-{
-	$sort_dir_text = array('a' => phpbb::$user->lang['ASCENDING'], 'd' => phpbb::$user->lang['DESCENDING']);
-
-	$sorts = array(
-		'st'	=> array(
-			'key'		=> 'sort_days',
-			'default'	=> $def_st,
-			'options'	=> $limit_days,
-			'output'	=> &$s_limit_days,
-		),
-
-		'sk'	=> array(
-			'key'		=> 'sort_key',
-			'default'	=> $def_sk,
-			'options'	=> $sort_by_text,
-			'output'	=> &$s_sort_key,
-		),
-
-		'sd'	=> array(
-			'key'		=> 'sort_dir',
-			'default'	=> $def_sd,
-			'options'	=> $sort_dir_text,
-			'output'	=> &$s_sort_dir,
-		),
-	);
-	$u_sort_param  = '';
-
-	foreach ($sorts as $name => $sort_ary)
-	{
-		$key = $sort_ary['key'];
-		$selected = $$sort_ary['key'];
-
-		// Check if the key is selectable. If not, we reset to the default or first key found.
-		// This ensures the values are always valid. We also set $sort_dir/sort_key/etc. to the
-		// correct value, else the protection is void. ;)
-		if (!isset($sort_ary['options'][$selected]))
-		{
-			if ($sort_ary['default'] !== false)
-			{
-				$selected = $$key = $sort_ary['default'];
-			}
-			else
-			{
-				@reset($sort_ary['options']);
-				$selected = $$key = key($sort_ary['options']);
-			}
-		}
-
-		$sort_ary['output'] = '<select name="' . $name . '" id="' . $name . '">';
-		foreach ($sort_ary['options'] as $option => $text)
-		{
-			$sort_ary['output'] .= '<option value="' . $option . '"' . (($selected == $option) ? ' selected="selected"' : '') . '>' . $text . '</option>';
-		}
-		$sort_ary['output'] .= '</select>';
-
-		$u_sort_param .= ($selected !== $sort_ary['default']) ? ((strlen($u_sort_param)) ? '&amp;' : '') . "{$name}={$selected}" : '';
-	}
-
-	return;
-}
-
-/**
-* Generate Jumpbox
-*/
-function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list = false, $force_display = false)
-{
-	// We only return if the jumpbox is not forced to be displayed (in case it is needed for functionality)
-	if (!phpbb::$config['load_jumpbox'] && $force_display === false)
-	{
-		return;
-	}
-
-	$sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id
-		FROM ' . FORUMS_TABLE . '
-		ORDER BY left_id ASC';
-	$result = phpbb::$db->sql_query($sql, 600);
-
-	$right = $padding = 0;
-	$padding_store = array('0' => 0);
-	$display_jumpbox = false;
-	$iteration = 0;
-
-	// Sometimes it could happen that forums will be displayed here not be displayed within the index page
-	// This is the result of forums not displayed at index, having list permissions and a parent of a forum with no permissions.
-	// If this happens, the padding could be "broken"
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		if ($row['left_id'] < $right)
-		{
-			$padding++;
-			$padding_store[$row['parent_id']] = $padding;
-		}
-		else if ($row['left_id'] > $right + 1)
-		{
-			// Ok, if the $padding_store for this parent is empty there is something wrong. For now we will skip over it.
-			// @todo digging deep to find out "how" this can happen.
-			$padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : $padding;
-		}
-
-		$right = $row['right_id'];
-
-		if ($row['forum_type'] == FORUM_CAT && ($row['left_id'] + 1 == $row['right_id']))
-		{
-			// Non-postable forum with no subforums, don't display
-			continue;
-		}
-
-		if (!phpbb::$acl->acl_get('f_list', $row['forum_id']))
-		{
-			// if the user does not have permissions to list this forum skip
-			continue;
-		}
-
-		if ($acl_list && !phpbb::$acl->acl_gets($acl_list, $row['forum_id']))
-		{
-			continue;
-		}
-
-		if (!$display_jumpbox)
-		{
-			phpbb::$template->assign_block_vars('jumpbox_forums', array(
-				'FORUM_ID'		=> ($select_all) ? 0 : -1,
-				'FORUM_NAME'	=> ($select_all) ? phpbb::$user->lang['ALL_FORUMS'] : phpbb::$user->lang['SELECT_FORUM'],
-				'S_FORUM_COUNT'	=> $iteration)
-			);
-
-			$iteration++;
-			$display_jumpbox = true;
-		}
-
-		phpbb::$template->assign_block_vars('jumpbox_forums', array(
-			'FORUM_ID'		=> $row['forum_id'],
-			'FORUM_NAME'	=> $row['forum_name'],
-			'SELECTED'		=> ($row['forum_id'] == $forum_id) ? ' selected="selected"' : '',
-			'S_FORUM_COUNT'	=> $iteration,
-			'S_IS_CAT'		=> ($row['forum_type'] == FORUM_CAT) ? true : false,
-			'S_IS_LINK'		=> ($row['forum_type'] == FORUM_LINK) ? true : false,
-			'S_IS_POST'		=> ($row['forum_type'] == FORUM_POST) ? true : false)
-		);
-
-		for ($i = 0; $i < $padding; $i++)
-		{
-			phpbb::$template->assign_block_vars('jumpbox_forums.level', array());
-		}
-		$iteration++;
-	}
-	phpbb::$db->sql_freeresult($result);
-	unset($padding_store);
-
-	phpbb::$template->assign_vars(array(
-		'S_DISPLAY_JUMPBOX'	=> $display_jumpbox,
-		'S_JUMPBOX_ACTION'	=> phpbb::$url->append_sid($action),
-	));
-
-	return;
-}
-
-/**
-* Bump Topic Check - used by posting and viewtopic
-*/
-function bump_topic_allowed($forum_id, $topic_bumped, $last_post_time, $topic_poster, $last_topic_poster)
-{
-	// Check permission and make sure the last post was not already bumped
-	if (!phpbb::$acl->acl_get('f_bump', $forum_id) || $topic_bumped)
-	{
-		return false;
-	}
-
-	// Check bump time range, is the user really allowed to bump the topic at this time?
-	$bump_time = (phpbb::$config['bump_type'] == 'm') ? phpbb::$config['bump_interval'] * 60 : ((phpbb::$config['bump_type'] == 'h') ? phpbb::$config['bump_interval'] * 3600 : phpbb::$config['bump_interval'] * 86400);
-
-	// Check bump time
-	if ($last_post_time + $bump_time > time())
-	{
-		return false;
-	}
-
-	// Check bumper, only topic poster and last poster are allowed to bump
-	if ($topic_poster != phpbb::$user->data['user_id'] && $last_topic_poster != phpbb::$user->data['user_id'])
-	{
-		return false;
-	}
-
-	// A bump time of 0 will completely disable the bump feature... not intended but might be useful.
-	return $bump_time;
-}
-
-/**
-* Generates a text with approx. the specified length which contains the specified words and their context
-*
-* @param	string	$text	The full text from which context shall be extracted
-* @param	string	$words	An array of words which should be contained in the result, has to be a valid part of a PCRE pattern (escape with preg_quote!)
-* @param	int		$length	The desired length of the resulting text, however the result might be shorter or longer than this value
-*
-* @return	string			Context of the specified words separated by "..."
-*/
-function get_context($text, $words, $length = 400)
-{
-	// first replace all whitespaces with single spaces
-	$text = preg_replace('/ +/', ' ', strtr($text, "\t\n\r\x0C ", '     '));
-
-	$word_indizes = array();
-	if (sizeof($words))
-	{
-		$match = '';
-		// find the starting indizes of all words
-		foreach ($words as $word)
-		{
-			if ($word)
-			{
-				if (preg_match('#(?:[^\w]|^)(' . $word . ')(?:[^\w]|$)#i', $text, $match))
-				{
-					$pos = utf8_strpos($text, $match[1]);
-					if ($pos !== false)
-					{
-						$word_indizes[] = $pos;
-					}
-				}
-			}
-		}
-		unset($match);
-
-		if (sizeof($word_indizes))
-		{
-			$word_indizes = array_unique($word_indizes);
-			sort($word_indizes);
-
-			$wordnum = sizeof($word_indizes);
-			// number of characters on the right and left side of each word
-			$sequence_length = (int) ($length / (2 * $wordnum)) - 2;
-			$final_text = '';
-			$word = $j = 0;
-			$final_text_index = -1;
-
-			// cycle through every character in the original text
-			for ($i = $word_indizes[$word], $n = utf8_strlen($text); $i < $n; $i++)
-			{
-				// if the current position is the start of one of the words then append $sequence_length characters to the final text
-				if (isset($word_indizes[$word]) && ($i == $word_indizes[$word]))
-				{
-					if ($final_text_index < $i - $sequence_length - 1)
-					{
-						$final_text .= '... ' . preg_replace('#^([^ ]*)#', '', utf8_substr($text, $i - $sequence_length, $sequence_length));
-					}
-					else
-					{
-						// if the final text is already nearer to the current word than $sequence_length we only append the text
-						// from its current index on and distribute the unused length to all other sequenes
-						$sequence_length += (int) (($final_text_index - $i + $sequence_length + 1) / (2 * $wordnum));
-						$final_text .= utf8_substr($text, $final_text_index + 1, $i - $final_text_index - 1);
-					}
-					$final_text_index = $i - 1;
-
-					// add the following characters to the final text (see below)
-					$word++;
-					$j = 1;
-				}
-
-				if ($j > 0)
-				{
-					// add the character to the final text and increment the sequence counter
-					$final_text .= utf8_substr($text, $i, 1);
-					$final_text_index++;
-					$j++;
-
-					// if this is a whitespace then check whether we are done with this sequence
-					if (utf8_substr($text, $i, 1) == ' ')
-					{
-						// only check whether we have to exit the context generation completely if we haven't already reached the end anyway
-						if ($i + 4 < $n)
-						{
-							if (($j > $sequence_length && $word >= $wordnum) || utf8_strlen($final_text) > $length)
-							{
-								$final_text .= ' ...';
-								break;
-							}
-						}
-						else
-						{
-							// make sure the text really reaches the end
-							$j -= 4;
-						}
-
-						// stop context generation and wait for the next word
-						if ($j > $sequence_length)
-						{
-							$j = 0;
-						}
-					}
-				}
-			}
-			return $final_text;
-		}
-	}
-
-	if (!sizeof($words) || !sizeof($word_indizes))
-	{
-		return (utf8_strlen($text) >= $length + 3) ? utf8_substr($text, 0, $length) . '...' : $text;
-	}
-}
-
-/**
-* Decode text whereby text is coming from the db and expected to be pre-parsed content
-* We are placing this outside of the message parser because we are often in need of it...
-*/
-function decode_message(&$message, $bbcode_uid = '')
-{
-	if ($bbcode_uid)
-	{
-		$match = array('<br />', "[/*:m:$bbcode_uid]", ":u:$bbcode_uid", ":o:$bbcode_uid", ":$bbcode_uid");
-		$replace = array("\n", '', '', '', '');
-	}
-	else
-	{
-		$match = array('<br />');
-		$replace = array("\n");
-	}
-
-	$message = str_replace($match, $replace, $message);
-
-	$match = get_preg_expression('bbcode_htm');
-	$replace = array('\1', '\1', '\2', '\1', '', '');
-
-	$message = preg_replace($match, $replace, $message);
-}
-
-/**
-* Strips all bbcode from a text and returns the plain content
-*/
-function strip_bbcode(&$text, $uid = '')
-{
-	if (!$uid)
-	{
-		$uid = '[0-9a-z]{5,}';
-	}
-
-	$text = preg_replace("#\[\/?[a-z0-9\*\+\-]+(?:=(?:&quot;.*&quot;|[^\]]*))?(?::[a-z])?(\:$uid)\]#", ' ', $text);
-
-	$match = get_preg_expression('bbcode_htm');
-	$replace = array('\1', '\1', '\2', '\1', '', '');
-
-	$text = preg_replace($match, $replace, $text);
-}
-
-/**
-* For display of custom parsed text on user-facing pages
-* Expects $text to be the value directly from the database (stored value)
-*/
-function generate_text_for_display($text, $uid, $bitfield, $flags)
-{
-	static $bbcode;
-
-	if (!$text)
-	{
-		return '';
-	}
-
-	$text = censor_text($text);
-
-	// Parse bbcode if bbcode uid stored and bbcode enabled
-	if ($uid && ($flags & OPTION_FLAG_BBCODE))
-	{
-		if (!class_exists('bbcode'))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/bbcode.' . PHP_EXT);
-		}
-
-		if (empty($bbcode))
-		{
-			$bbcode = new bbcode($bitfield);
-		}
-		else
-		{
-			$bbcode->bbcode($bitfield);
-		}
-
-		$bbcode->bbcode_second_pass($text, $uid);
-	}
-
-	$text = bbcode_nl2br($text);
-	$text = smiley_text($text, !($flags & OPTION_FLAG_SMILIES));
-
-	return $text;
-}
-
-/**
-* For parsing custom parsed text to be stored within the database.
-* This function additionally returns the uid and bitfield that needs to be stored.
-* Expects $text to be the value directly from request_var() and in it's non-parsed form
-*/
-function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bbcode = false, $allow_urls = false, $allow_smilies = false)
-{
-	$uid = $bitfield = '';
-	$flags = (($allow_bbcode) ? OPTION_FLAG_BBCODE : 0) + (($allow_smilies) ? OPTION_FLAG_SMILIES : 0) + (($allow_urls) ? OPTION_FLAG_LINKS : 0);
-
-	if (!$text)
-	{
-		return;
-	}
-
-	if (!class_exists('parse_message'))
-	{
-		include(PHPBB_ROOT_PATH . 'includes/message_parser.' . PHP_EXT);
-	}
-
-	$message_parser = new parse_message($text);
-	$message_parser->parse($allow_bbcode, $allow_urls, $allow_smilies);
-
-	$text = $message_parser->message;
-	$uid = $message_parser->bbcode_uid;
-
-	// If the bbcode_bitfield is empty, there is no need for the uid to be stored.
-	if (!$message_parser->bbcode_bitfield)
-	{
-		$uid = '';
-	}
-
-	$bitfield = $message_parser->bbcode_bitfield;
-
-	return;
-}
-
-/**
-* For decoding custom parsed text for edits as well as extracting the flags
-* Expects $text to be the value directly from the database (pre-parsed content)
-*/
-function generate_text_for_edit($text, $uid, $flags)
-{
-	decode_message($text, $uid);
-
-	return array(
-		'allow_bbcode'	=> ($flags & OPTION_FLAG_BBCODE) ? 1 : 0,
-		'allow_smilies'	=> ($flags & OPTION_FLAG_SMILIES) ? 1 : 0,
-		'allow_urls'	=> ($flags & OPTION_FLAG_LINKS) ? 1 : 0,
-		'text'			=> $text
-	);
-}
-
-/**
-* A subroutine of make_clickable used with preg_replace
-* It places correct HTML around an url, shortens the displayed text
-* and makes sure no entities are inside URLs
-*/
-function make_clickable_callback($type, $whitespace, $url, $relative_url, $class)
-{
-	$orig_url		= $url;
-	$orig_relative	= $relative_url;
-	$append			= '';
-	$url			= htmlspecialchars_decode($url);
-	$relative_url	= htmlspecialchars_decode($relative_url);
-
-	// make sure no HTML entities were matched
-	$chars = array('<', '>', '"');
-	$split = false;
-
-	foreach ($chars as $char)
-	{
-		$next_split = strpos($url, $char);
-		if ($next_split !== false)
-		{
-			$split = ($split !== false) ? min($split, $next_split) : $next_split;
-		}
-	}
-
-	if ($split !== false)
-	{
-		// an HTML entity was found, so the URL has to end before it
-		$append			= substr($url, $split) . $relative_url;
-		$url			= substr($url, 0, $split);
-		$relative_url	= '';
-	}
-	else if ($relative_url)
-	{
-		// same for $relative_url
-		$split = false;
-		foreach ($chars as $char)
-		{
-			$next_split = strpos($relative_url, $char);
-			if ($next_split !== false)
-			{
-				$split = ($split !== false) ? min($split, $next_split) : $next_split;
-			}
-		}
-
-		if ($split !== false)
-		{
-			$append			= substr($relative_url, $split);
-			$relative_url	= substr($relative_url, 0, $split);
-		}
-	}
-
-	// if the last character of the url is a punctuation mark, exclude it from the url
-	$last_char = ($relative_url) ? $relative_url[strlen($relative_url) - 1] : $url[strlen($url) - 1];
-
-	switch ($last_char)
-	{
-		case '.':
-		case '?':
-		case '!':
-		case ':':
-		case ',':
-			$append = $last_char;
-			if ($relative_url)
-			{
-				$relative_url = substr($relative_url, 0, -1);
-			}
-			else
-			{
-				$url = substr($url, 0, -1);
-			}
-		break;
-
-		// set last_char to empty here, so the variable can be used later to
-		// check whether a character was removed
-		default:
-			$last_char = '';
-		break;
-	}
-
-	$short_url = (strlen($url) > 55) ? substr($url, 0, 39) . ' ... ' . substr($url, -10) : $url;
-
-	switch ($type)
-	{
-		case MAGIC_URL_LOCAL:
-			$tag			= 'l';
-			$relative_url	= preg_replace('/[&?]sid=[0-9a-f]{32}$/', '', preg_replace('/([&?])sid=[0-9a-f]{32}&/', '$1', $relative_url));
-			$url			= $url . '/' . $relative_url;
-			$text			= $relative_url;
-
-			// this url goes to http://domain.tld/path/to/board/ which
-			// would result in an empty link if treated as local so
-			// don't touch it and let MAGIC_URL_FULL take care of it.
-			if (!$relative_url)
-			{
-				return $whitespace . $orig_url . '/' . $orig_relative; // slash is taken away by relative url pattern
-			}
-		break;
-
-		case MAGIC_URL_FULL:
-			$tag	= 'm';
-			$text	= $short_url;
-		break;
-
-		case MAGIC_URL_WWW:
-			$tag	= 'w';
-			$url	= 'http://' . $url;
-			$text	= $short_url;
-		break;
-
-		case MAGIC_URL_EMAIL:
-			$tag	= 'e';
-			$text	= $short_url;
-			$url	= 'mailto:' . $url;
-		break;
-	}
-
-	$url	= htmlspecialchars($url);
-	$text	= htmlspecialchars($text);
-	$append	= htmlspecialchars($append);
-
-	$html	= "$whitespace<!-- $tag --><a$class href=\"$url\">$text</a><!-- $tag -->$append";
-
-	return $html;
-}
-
-/**
-* make_clickable function
-*
-* Replace magic urls of form http://xxx.xxx., www.xxx. and xxx@xxx.xxx.
-* Cuts down displayed size of link if over 50 chars, turns absolute links
-* into relative versions when the server/script path matches the link
-*/
-function make_clickable($text, $server_url = false, $class = 'postlink')
-{
-	if ($server_url === false)
-	{
-		$server_url = generate_board_url();
-	}
-
-	static $magic_url_match;
-	static $magic_url_replace;
-	static $static_class;
-
-	if (!is_array($magic_url_match) || $static_class != $class)
-	{
-		$static_class = $class;
-		$class = ($static_class) ? ' class="' . $static_class . '"' : '';
-		$local_class = ($static_class) ? ' class="' . $static_class . '-local"' : '';
-
-		$magic_url_match = $magic_url_replace = array();
-		// Be sure to not let the matches cross over. ;)
-
-		// relative urls for this board
-		$magic_url_match[] = '#(^|[\n\t (>.])(' . preg_quote($server_url, '#') . ')/(' . get_preg_expression('relative_url_inline') . ')#ie';
-		$magic_url_replace[] = "make_clickable_callback(MAGIC_URL_LOCAL, '\$1', '\$2', '\$3', '$local_class')";
-
-		// matches a xxxx://aaaaa.bbb.cccc. ...
-		$magic_url_match[] = '#(^|[\n\t (>.])(' . get_preg_expression('url_inline') . ')#ie';
-		$magic_url_replace[] = "make_clickable_callback(MAGIC_URL_FULL, '\$1', '\$2', '', '$class')";
-
-		// matches a "www.xxxx.yyyy[/zzzz]" kinda lazy URL thing
-		$magic_url_match[] = '#(^|[\n\t (>])(' . get_preg_expression('www_url_inline') . ')#ie';
-		$magic_url_replace[] = "make_clickable_callback(MAGIC_URL_WWW, '\$1', '\$2', '', '$class')";
-
-		// matches an email@domain type address at the start of a line, or after a space or after what might be a BBCode.
-		$magic_url_match[] = '/(^|[\n\t (>])(' . get_preg_expression('email') . ')/ie';
-		$magic_url_replace[] = "make_clickable_callback(MAGIC_URL_EMAIL, '\$1', '\$2', '', '')";
-	}
-
-	return preg_replace($magic_url_match, $magic_url_replace, $text);
-}
-
-/**
-* Censoring
-*/
-function censor_text($text)
-{
-	static $censors;
-
-	// We moved the word censor checks in here because we call this function quite often - and then only need to do the check once
-	if (!isset($censors) || !is_array($censors))
-	{
-		// We check here if the user is having viewing censors disabled (and also allowed to do so).
-		if (!phpbb::$user->optionget('viewcensors') && phpbb::$config['allow_nocensors'] && phpbb::$acl->acl_get('u_chgcensors'))
-		{
-			$censors = array();
-		}
-		else
-		{
-			$censors = phpbb_cache::obtain_word_list();
-		}
-	}
-
-	if (sizeof($censors))
-	{
-		return preg_replace($censors['match'], $censors['replace'], $text);
-	}
-
-	return $text;
-}
-
-/**
-* custom version of nl2br which takes custom BBCodes into account
-*/
-function bbcode_nl2br($text)
-{
-	// custom BBCodes might contain carriage returns so they
-	// are not converted into <br /> so now revert that
-	$text = str_replace(array("\n", "\r"), array('<br />', "\n"), $text);
-	return $text;
-}
-
-/**
-* Smiley processing
-*/
-function smiley_text($text, $force_option = false)
-{
-	if ($force_option || !phpbb::$config['allow_smilies'] || !phpbb::$user->optionget('viewsmilies'))
-	{
-		return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $text);
-	}
-	else
-	{
-		return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img src="' . PHPBB_ROOT_PATH . phpbb::$config['smilies_path'] . '/\2 />', $text);
-	}
-}
-
-/**
-* General attachment parsing
-*
-* @param mixed $forum_id The forum id the attachments are displayed in (false if in private message)
-* @param string &$message The post/private message
-* @param array &$attachments The attachments to parse for (inline) display. The attachments array will hold templated data after parsing.
-* @param array &$update_count The attachment counts to be updated - will be filled
-* @param bool $preview If set to true the attachments are parsed for preview. Within preview mode the comments are fetched from the given $attachments array and not fetched from the database.
-*/
-function parse_attachments($forum_id, &$message, &$attachments, &$update_count, $preview = false)
-{
-	if (!sizeof($attachments))
-	{
-		return;
-	}
-
-	global $extensions;
-
-	//
-	$compiled_attachments = array();
-
-	// @todo: do we really need this check?
-	if (!isset(phpbb::$template->filename['attachment_tpl']))
-	{
-		phpbb::$template->set_filenames(array(
-			'attachment_tpl'	=> 'attachment.html')
-		);
-	}
-
-	if (empty($extensions) || !is_array($extensions))
-	{
-		$extensions = phpbb_cache::obtain_extensions_forum($forum_id);
-	}
-
-	// Look for missing attachment information...
-	$attach_ids = array();
-	foreach ($attachments as $pos => $attachment)
-	{
-		// If is_orphan is set, we need to retrieve the attachments again...
-		if (!isset($attachment['extension']) && !isset($attachment['physical_filename']))
-		{
-			$attach_ids[(int) $attachment['attach_id']] = $pos;
-		}
-	}
-
-	// Grab attachments (security precaution)
-	if (sizeof($attach_ids))
-	{
-		$new_attachment_data = array();
-
-		$sql = 'SELECT *
-			FROM ' . ATTACHMENTS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('attach_id', array_keys($attach_ids));
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			if (!isset($attach_ids[$row['attach_id']]))
-			{
-				continue;
-			}
-
-			// If we preview attachments we will set some retrieved values here
-			if ($preview)
-			{
-				$row['attach_comment'] = $attachments[$attach_ids[$row['attach_id']]]['attach_comment'];
-			}
-
-			$new_attachment_data[$attach_ids[$row['attach_id']]] = $row;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$attachments = $new_attachment_data;
-		unset($new_attachment_data);
-	}
-
-	// Sort correctly
-	if (phpbb::$config['display_order'])
-	{
-		// Ascending sort
-		krsort($attachments);
-	}
-	else
-	{
-		// Descending sort
-		ksort($attachments);
-	}
-
-	foreach ($attachments as $attachment)
-	{
-		if (!sizeof($attachment))
-		{
-			continue;
-		}
-
-		// We need to reset/empty the _file block var, because this function might be called more than once
-		phpbb::$template->destroy_block_vars('_file');
-
-		$block_array = array();
-
-		// Some basics...
-		$attachment['extension'] = strtolower(trim($attachment['extension']));
-		$filename = PHPBB_ROOT_PATH . phpbb::$config['upload_path'] . '/' . basename($attachment['physical_filename']);
-		$thumbnail_filename = PHPBB_ROOT_PATH . phpbb::$config['upload_path'] . '/thumb_' . basename($attachment['physical_filename']);
-
-		$upload_icon = '';
-
-		if (isset($extensions[$attachment['extension']]))
-		{
-			if (phpbb::$user->img('icon_topic_attach', '') && !$extensions[$attachment['extension']]['upload_icon'])
-			{
-				$upload_icon = phpbb::$user->img('icon_topic_attach', '');
-			}
-			else if ($extensions[$attachment['extension']]['upload_icon'])
-			{
-				$upload_icon = '<img src="' . PHPBB_ROOT_PATH . phpbb::$config['upload_icons_path'] . '/' . trim($extensions[$attachment['extension']]['upload_icon']) . '" alt="" />';
-			}
-		}
-
-		$filesize = $attachment['filesize'];
-		$size_lang = ($filesize >= 1048576) ? phpbb::$user->lang['MIB'] : (($filesize >= 1024) ? phpbb::$user->lang['KIB'] : phpbb::$user->lang['BYTES']);
-		$filesize = get_formatted_filesize($filesize, false);
-
-		$comment = bbcode_nl2br(censor_text($attachment['attach_comment']));
-
-		$block_array += array(
-			'UPLOAD_ICON'		=> $upload_icon,
-			'FILESIZE'			=> $filesize,
-			'SIZE_LANG'			=> $size_lang,
-			'DOWNLOAD_NAME'		=> basename($attachment['real_filename']),
-			'COMMENT'			=> $comment,
-		);
-
-		$denied = false;
-
-		if (!extension_allowed($forum_id, $attachment['extension'], $extensions))
-		{
-			$denied = true;
-
-			$block_array += array(
-				'S_DENIED'			=> true,
-				'DENIED_MESSAGE'	=> phpbb::$user->lang('EXTENSION_DISABLED_AFTER_POSTING', $attachment['extension']),
-			);
-		}
-
-		if (!$denied)
-		{
-			$l_downloaded_viewed = $download_link = '';
-			$display_cat = $extensions[$attachment['extension']]['display_cat'];
-
-			if ($display_cat == ATTACHMENT_CATEGORY_IMAGE)
-			{
-				if ($attachment['thumbnail'])
-				{
-					$display_cat = ATTACHMENT_CATEGORY_THUMB;
-				}
-				else
-				{
-					if (phpbb::$config['img_display_inlined'])
-					{
-						if (phpbb::$config['img_link_width'] || phpbb::$config['img_link_height'])
-						{
-							$dimension = @getimagesize($filename);
-
-							// If the dimensions could not be determined or the image being 0x0 we display it as a link for safety purposes
-							if ($dimension === false || empty($dimension[0]) || empty($dimension[1]))
-							{
-								$display_cat = ATTACHMENT_CATEGORY_NONE;
-							}
-							else
-							{
-								$display_cat = ($dimension[0] <= phpbb::$config['img_link_width'] && $dimension[1] <= phpbb::$config['img_link_height']) ? ATTACHMENT_CATEGORY_IMAGE : ATTACHMENT_CATEGORY_NONE;
-							}
-						}
-					}
-					else
-					{
-						$display_cat = ATTACHMENT_CATEGORY_NONE;
-					}
-				}
-			}
-
-			// Make some descisions based on user options being set.
-			if (($display_cat == ATTACHMENT_CATEGORY_IMAGE || $display_cat == ATTACHMENT_CATEGORY_THUMB) && !phpbb::$user->optionget('viewimg'))
-			{
-				$display_cat = ATTACHMENT_CATEGORY_NONE;
-			}
-
-			if ($display_cat == ATTACHMENT_CATEGORY_FLASH && !phpbb::$user->optionget('viewflash'))
-			{
-				$display_cat = ATTACHMENT_CATEGORY_NONE;
-			}
-
-			$download_link = append_sid('download/file', 'id=' . $attachment['attach_id']);
-
-			switch ($display_cat)
-			{
-				// Images
-				case ATTACHMENT_CATEGORY_IMAGE:
-					$l_downloaded_viewed = 'VIEWED_COUNT';
-					$inline_link = append_sid('download/file', 'id=' . $attachment['attach_id']);
-					$download_link .= '&amp;mode=view';
-
-					$block_array += array(
-						'S_IMAGE'		=> true,
-						'U_INLINE_LINK'		=> $inline_link,
-					);
-
-					$update_count[] = $attachment['attach_id'];
-				break;
-
-				// Images, but display Thumbnail
-				case ATTACHMENT_CATEGORY_THUMB:
-					$l_downloaded_viewed = 'VIEWED_COUNT';
-					$thumbnail_link = append_sid('download/file', 'id=' . $attachment['attach_id'] . '&amp;t=1');
-					$download_link .= '&amp;mode=view';
-
-					$block_array += array(
-						'S_THUMBNAIL'		=> true,
-						'THUMB_IMAGE'		=> $thumbnail_link,
-					);
-
-					$update_count[] = $attachment['attach_id'];
-				break;
-
-				// Windows Media Streams
-				case ATTACHMENT_CATEGORY_WM:
-					$l_downloaded_viewed = 'VIEWED_COUNT';
-
-					// Giving the filename directly because within the wm object all variables are in local context making it impossible
-					// to validate against a valid session (all params can differ)
-					// $download_link = $filename;
-
-					$block_array += array(
-						'U_FORUM'		=> generate_board_url(),
-						'ATTACH_ID'		=> $attachment['attach_id'],
-						'S_WM_FILE'		=> true,
-					);
-
-					// Viewed/Heared File ... update the download count
-					$update_count[] = $attachment['attach_id'];
-				break;
-
-				// Real Media Streams
-				case ATTACHMENT_CATEGORY_RM:
-				case ATTACHMENT_CATEGORY_QUICKTIME:
-					$l_downloaded_viewed = 'VIEWED_COUNT';
-
-					$block_array += array(
-						'S_RM_FILE'			=> ($display_cat == ATTACHMENT_CATEGORY_RM) ? true : false,
-						'S_QUICKTIME_FILE'	=> ($display_cat == ATTACHMENT_CATEGORY_QUICKTIME) ? true : false,
-						'U_FORUM'			=> generate_board_url(),
-						'ATTACH_ID'			=> $attachment['attach_id'],
-					);
-
-					// Viewed/Heared File ... update the download count
-					$update_count[] = $attachment['attach_id'];
-				break;
-
-				// Macromedia Flash Files
-				case ATTACHMENT_CATEGORY_FLASH:
-					list($width, $height) = @getimagesize($filename);
-
-					$l_downloaded_viewed = 'VIEWED_COUNT';
-
-					$block_array += array(
-						'S_FLASH_FILE'	=> true,
-						'WIDTH'			=> $width,
-						'HEIGHT'		=> $height,
-						'U_VIEW_LINK'	=> $download_link . '&amp;view=1',
-					);
-
-					// Viewed/Heared File ... update the download count
-					$update_count[] = $attachment['attach_id'];
-				break;
-
-				default:
-					$l_downloaded_viewed = 'DOWNLOAD_COUNT';
-
-					$block_array += array(
-						'S_FILE'		=> true,
-					);
-				break;
-			}
-
-			$block_array += array(
-				'U_DOWNLOAD_LINK'		=> $download_link,
-				'L_DOWNLOAD_COUNT'		=> phpbb::$user->lang($l_downloaded_viewed, $attachment['download_count']),
-			);
-		}
-
-		phpbb::$template->assign_block_vars('_file', $block_array);
-
-		$compiled_attachments[] = phpbb::$template->assign_display('attachment_tpl');
-	}
-
-	$attachments = $compiled_attachments;
-	unset($compiled_attachments);
-
-	$tpl_size = sizeof($attachments);
-
-	$unset_tpl = array();
-
-	preg_match_all('#<!\-\- ia([0-9]+) \-\->(.*?)<!\-\- ia\1 \-\->#', $message, $matches, PREG_PATTERN_ORDER);
-
-	$replace = array();
-	foreach ($matches[0] as $num => $capture)
-	{
-		// Flip index if we are displaying the reverse way
-		$index = (phpbb::$config['display_order']) ? ($tpl_size-($matches[1][$num] + 1)) : $matches[1][$num];
-
-		$replace['from'][] = $matches[0][$num];
-		$replace['to'][] = (isset($attachments[$index])) ? $attachments[$index] : sprintf(phpbb::$user->lang['MISSING_INLINE_ATTACHMENT'], $matches[2][array_search($index, $matches[1])]);
-
-		$unset_tpl[] = $index;
-	}
-
-	if (isset($replace['from']))
-	{
-		$message = str_replace($replace['from'], $replace['to'], $message);
-	}
-
-	$unset_tpl = array_unique($unset_tpl);
-
-	// Needed to let not display the inlined attachments at the end of the post again
-	foreach ($unset_tpl as $index)
-	{
-		unset($attachments[$index]);
-	}
-}
-
-/**
-* Check if extension is allowed to be posted.
-*
-* @param mixed $forum_id The forum id to check or false if private message
-* @param string $extension The extension to check, for example zip.
-* @param array &$extensions The extension array holding the information from the cache (will be obtained if empty)
-*
-* @return bool False if the extension is not allowed to be posted, else true.
-*/
-function extension_allowed($forum_id, $extension, &$extensions)
-{
-	if (empty($extensions))
-	{
-		$extensions = phpbb_cache::obtain_extensions_forum($forum_id);
-	}
-
-	return (!isset($extensions['_allowed_'][$extension])) ? false : true;
-}
-
-/**
-* Truncates string while retaining special characters if going over the max length
-* The default max length is 60 at the moment
-* The maximum storage length is there to fit the string within the given length. The string may be further truncated due to html entities.
-* For example: string given is 'a "quote"' (length: 9), would be a stored as 'a &quot;quote&quot;' (length: 19)
-*
-* @param string $string The text to truncate to the given length. String is specialchared.
-* @param int $max_length Maximum length of string (multibyte character count as 1 char / Html entity count as 1 char)
-* @param int $max_store_length Maximum character length of string (multibyte character count as 1 char / Html entity count as entity chars).
-* @param bool $allow_reply Allow Re: in front of string
-* @param string $append String to be appended
-*/
-function truncate_string($string, $max_length = 60, $max_store_length = 255, $allow_reply = true, $append = '')
-{
-	$chars = array();
-
-	$strip_reply = false;
-	$stripped = false;
-	if ($allow_reply && strpos($string, 'Re: ') === 0)
-	{
-		$strip_reply = true;
-		$string = substr($string, 4);
-	}
-
-	$_chars = utf8_str_split(htmlspecialchars_decode($string));
-	$chars = array_map('utf8_htmlspecialchars', $_chars);
-
-	// Now check the length ;)
-	if (sizeof($chars) > $max_length)
-	{
-		// Cut off the last elements from the array
-		$string = implode('', array_slice($chars, 0, $max_length - utf8_strlen($append)));
-		$stripped = true;
-	}
-
-	// Due to specialchars, we may not be able to store the string...
-	if (utf8_strlen($string) > $max_store_length)
-	{
-		// let's split again, we do not want half-baked strings where entities are split
-		$_chars = utf8_str_split(htmlspecialchars_decode($string));
-		$chars = array_map('utf8_htmlspecialchars', $_chars);
-
-		do
-		{
-			array_pop($chars);
-			$string = implode('', $chars);
-		}
-		while (!empty($chars) && utf8_strlen($string) > $max_store_length);
-	}
-
-	if ($strip_reply)
-	{
-		$string = 'Re: ' . $string;
-	}
-
-	if ($append != '' && $stripped)
-	{
-		$string = $string . $append;
-	}
-
-	return $string;
-}
-
-/**
-* Get username details for placing into templates.
-* This function caches all modes on first call, except for no_profile - determined by $user_id/$guest_username combination.
-*
-* @param string $mode Can be profile (for getting an url to the profile), username (for obtaining the username), colour (for obtaining the user colour), full (for obtaining a html string representing a coloured link to the users profile) or no_profile (the same as full but forcing no profile link)
-* @param int $user_id The users id
-* @param string $username The users name
-* @param string $username_colour The users colour
-* @param string $guest_username optional parameter to specify the guest username. It will be used in favor of the GUEST language variable then.
-* @param string $custom_profile_url optional parameter to specify a profile url. The user id get appended to this url as &amp;u={user_id}
-*
-* @return string A string consisting of what is wanted based on $mode.
-* @author BartVB, Acyd Burn
-*/
-function get_username_string($mode, $user_id, $username, $username_colour = '', $guest_username = false, $custom_profile_url = false)
-{
-	static $_profile_cache;
-
-	// We cache some common variables we need within this function
-	if (empty($_profile_cache))
-	{
-		$_profile_cache['base_url'] = phpbb::$url->append_sid('memberlist', 'mode=viewprofile&amp;u={USER_ID}');
-		$_profile_cache['tpl_noprofile'] = '{USERNAME}';
-		$_profile_cache['tpl_noprofile_colour'] = '<span style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</span>';
-		$_profile_cache['tpl_profile'] = '<a href="{PROFILE_URL}">{USERNAME}</a>';
-		$_profile_cache['tpl_profile_colour'] = '<a href="{PROFILE_URL}" style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</a>';
-	}
-
-	// This switch makes sure we only run code required for the mode
-	switch ($mode)
-	{
-		case 'full':
-		case 'no_profile':
-		case 'colour':
-
-			// Build correct username colour
-			$username_colour = ($username_colour) ? '#' . $username_colour : '';
-
-			// Return colour
-			if ($mode == 'colour')
-			{
-				return $username_colour;
-			}
-
-		// no break;
-
-		case 'username':
-
-			// Build correct username
-			if ($guest_username === false)
-			{
-				$username = ($username) ? $username : phpbb::$user->lang['GUEST'];
-			}
-			else
-			{
-				$username = ($user_id && $user_id != ANONYMOUS) ? $username : ((!empty($guest_username)) ? $guest_username : phpbb::$user->lang['GUEST']);
-			}
-
-			// Return username
-			if ($mode == 'username')
-			{
-				return $username;
-			}
-
-		// no break;
-
-		case 'profile':
-
-			// Build correct profile url - only show if not anonymous and permission to view profile if registered user
-			// For anonymous the link leads to a login page.
-			if ($user_id && $user_id != ANONYMOUS && (phpbb::$user->is_guest || phpbb::$acl->acl_get('u_viewprofile')))
-			{
-				$profile_url = ($custom_profile_url !== false) ? $custom_profile_url . '&amp;u=' . (int) $user_id : str_replace(array('={USER_ID}', '=%7BUSER_ID%7D'), '=' . (int) $user_id, $_profile_cache['base_url']);
-			}
-			else
-			{
-				$profile_url = '';
-			}
-
-			// Return profile
-			if ($mode == 'profile')
-			{
-				return $profile_url;
-			}
-
-		// no break;
-	}
-
-	if (($mode == 'full' && !$profile_url) || $mode == 'no_profile')
-	{
-		return str_replace(array('{USERNAME_COLOUR}', '{USERNAME}'), array($username_colour, $username), (!$username_colour) ? $_profile_cache['tpl_noprofile'] : $_profile_cache['tpl_noprofile_colour']);
-	}
-
-	return str_replace(array('{PROFILE_URL}', '{USERNAME_COLOUR}', '{USERNAME}'), array($profile_url, $username_colour, $username), (!$username_colour) ? $_profile_cache['tpl_profile'] : $_profile_cache['tpl_profile_colour']);
-}
-
-/**
-* @package phpBB3
-*/
-class bitfield
-{
-	var $data;
-
-	function __construct($bitfield = '')
-	{
-		$this->data = base64_decode($bitfield);
-	}
-
-	/**
-	*/
-	function get($n)
-	{
-		// Get the ($n / 8)th char
-		$byte = $n >> 3;
-
-		if (strlen($this->data) >= $byte + 1)
-		{
-			$c = $this->data[$byte];
-
-			// Lookup the ($n % 8)th bit of the byte
-			$bit = 7 - ($n & 7);
-			return (bool) (ord($c) & (1 << $bit));
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	function set($n)
-	{
-		$byte = $n >> 3;
-		$bit = 7 - ($n & 7);
-
-		if (strlen($this->data) >= $byte + 1)
-		{
-			$this->data[$byte] = $this->data[$byte] | chr(1 << $bit);
-		}
-		else
-		{
-			$this->data .= str_repeat("\0", $byte - strlen($this->data));
-			$this->data .= chr(1 << $bit);
-		}
-	}
-
-	function clear($n)
-	{
-		$byte = $n >> 3;
-
-		if (strlen($this->data) >= $byte + 1)
-		{
-			$bit = 7 - ($n & 7);
-			$this->data[$byte] = $this->data[$byte] &~ chr(1 << $bit);
-		}
-	}
-
-	function get_blob()
-	{
-		return $this->data;
-	}
-
-	function get_base64()
-	{
-		return base64_encode($this->data);
-	}
-
-	function get_bin()
-	{
-		$bin = '';
-		$len = strlen($this->data);
-
-		for ($i = 0; $i < $len; ++$i)
-		{
-			$bin .= str_pad(decbin(ord($this->data[$i])), 8, '0', STR_PAD_LEFT);
-		}
-
-		return $bin;
-	}
-
-	function get_all_set()
-	{
-		return array_keys(array_filter(str_split($this->get_bin())));
-	}
-
-	function merge($bitfield)
-	{
-		$this->data = $this->data | $bitfield->get_blob();
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
deleted file mode 100644
index 6e06545b25..0000000000
--- a/phpBB/includes/functions_convert.php
+++ /dev/null
@@ -1,2446 +0,0 @@
-<?php
-/**
-*
-* @package install
-* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Default avatar width/height
-* @ignore
-*/
-define('DEFAULT_AVATAR_X', 80);
-define('DEFAULT_AVATAR_Y', 80);
-
-// Global functions - all functions can be used by convertors
-
-// SIMPLE FUNCTIONS
-
-/**
-* Return the preceding value
-*/
-function dec($var)
-{
-	return --$var;
-}
-
-/**
-* Return the next value
-*/
-function inc($var)
-{
-	return ++$var;
-}
-
-/**
-* Return whether the value is positive
-*/
-function is_positive($n)
-{
-	return ($n > 0) ? 1 : 0;
-}
-
-/**
-* Boolean inverse of the value
-*/
-function not($var)
-{
-	return ($var) ? 0 : 1;
-}
-
-/**
-* Convert a textual value to it's equivalent boolean value
-*
-* @param string $str String to convert (converts yes, on, y, 1 and true to boolean true)
-* @return boolean The equivalent value
-*/
-function str_to_bool($str)
-{
-	$str = strtolower($str);
-	return ($str == 'yes' || $str == 'on' || $str == 'y' || $str == 'true' || $str == '1') ? true : false;
-}
-
-/**
-* Function to mimic php's empty() function (it is the same)
-*/
-function is_empty($mixed)
-{
-	return empty($mixed);
-}
-
-/**
-* Convert the name of a user's primary group to the appropriate equivalent phpBB group id
-*
-* @param string $status The name of the group
-* @return int The group_id corresponding to the equivalent group
-*/
-function str_to_primary_group($status)
-{
-	switch (ucfirst(strtolower($status)))
-	{
-		case 'Administrator':
-			return get_group_id('administrators');
-		break;
-
-		case 'Super moderator':
-		case 'Global moderator':
-		case 'Moderator':
-			return get_group_id('global_moderators');
-		break;
-
-		case 'Guest':
-		case 'Anonymous':
-			return get_group_id('guests');
-		break;
-
-		default:
-			return get_group_id('registered');
-		break;
-	}
-}
-
-/**
-* Convert a boolean into the appropriate phpBB constant indicating whether the item is locked
-*/
-function is_item_locked($bool)
-{
-	return ($bool) ? ITEM_LOCKED : ITEM_UNLOCKED;
-}
-
-/**
-* Convert a value from days to seconds
-*/
-function days_to_seconds($days)
-{
-	return ($days * 86400);
-}
-
-/**
-* Determine whether a user is anonymous and return the appropriate new user_id
-*/
-function is_user_anonymous($user_id)
-{
-	return ($user_id > ANONYMOUS) ? $user_id : ANONYMOUS;
-}
-
-/**
-* Generate a key value based on existing values
-*
-* @param int $pad Amount to add to the maximum value
-* @return int Key value
-*/
-function auto_id($pad = 0)
-{
-	global $auto_id, $convert_row;
-
-	if (!empty($convert_row['max_id']))
-	{
-		return $convert_row['max_id'] + $pad;
-	}
-
-	return $auto_id + $pad;
-}
-
-/**
-* Convert a boolean into the appropriate phpBB constant indicating whether the user is active
-*/
-function set_user_type($user_active)
-{
-	return ($user_active) ? phpbb::USER_NORMAL : phpbb::USER_INACTIVE;
-}
-
-/**
-* Convert a value from minutes to hours
-*/
-function minutes_to_hours($minutes)
-{
-	return ($minutes / 3600);
-}
-
-/**
-* Return the group_id for a given group name
-*/
-function get_group_id($group_name)
-{
-	global $db, $group_mapping;
-
-	if (empty($group_mapping))
-	{
-		$sql = 'SELECT group_name, group_id
-			FROM ' . GROUPS_TABLE;
-		$result = $db->sql_query($sql);
-
-		$group_mapping = array();
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$group_mapping[strtoupper($row['group_name'])] = (int) $row['group_id'];
-		}
-		$db->sql_freeresult($result);
-	}
-
-	if (!sizeof($group_mapping))
-	{
-		add_default_groups();
-		return get_group_id($group_name);
-	}
-
-	if (isset($group_mapping[strtoupper($group_name)]))
-	{
-		return $group_mapping[strtoupper($group_name)];
-	}
-
-	return $group_mapping['REGISTERED'];
-}
-
-/**
-* Generate the email hash stored in the users table
-*/
-function gen_email_hash($email)
-{
-	return (crc32(strtolower($email)) . strlen($email));
-}
-
-/**
-* Convert a boolean into the appropriate phpBB constant indicating whether the topic is locked
-*/
-function is_topic_locked($bool)
-{
-	return (!empty($bool)) ? ITEM_LOCKED : ITEM_UNLOCKED;
-}
-
-/**
-* Generate a bbcode_uid value
-*/
-function make_uid($timestamp)
-{
-	static $last_timestamp, $last_uid;
-
-	if (empty($last_timestamp) || $timestamp != $last_timestamp)
-	{
-		$last_uid = substr(base_convert(unique_id(), 16, 36), 0, BBCODE_UID_LEN);
-	}
-	$last_timestamp = $timestamp;
-	return $last_uid;
-}
-
-
-/**
-* Validate a website address
-*/
-function validate_website($url)
-{
-	if ($url === 'http://')
-	{
-		return '';
-	}
-	else if (!preg_match('#^[a-z0-9]+://#i', $url) && strlen($url) > 0)
-	{
-		return 'http://' . $url;
-	}
-	return $url;
-}
-
-/**
-* Convert nulls to zeros for fields which allowed a NULL value in the source but not the destination
-*/
-function null_to_zero($value)
-{
-	return ($value === NULL) ? 0 : $value;
-}
-
-/**
-* Convert nulls to empty strings for fields which allowed a NULL value in the source but not the destination
-*/
-function null_to_str($value)
-{
-	return ($value === NULL) ? '' : $value;
-}
-
-// EXTENDED FUNCTIONS
-
-/**
-* Get old config value
-*/
-function get_config_value($config_name)
-{
-	static $convert_config;
-
-	if (!isset($convert_config))
-	{
-		$convert_config = get_config();
-	}
-
-	if (!isset($convert_config[$config_name]))
-	{
-		return false;
-	}
-
-	return (empty($convert_config[$config_name])) ? '' : $convert_config[$config_name];
-}
-
-/**
-* Convert an IP address from the hexadecimal notation to normal dotted-quad notation
-*/
-function decode_ip($int_ip)
-{
-	if (!$int_ip)
-	{
-		return $int_ip;
-	}
-
-	$hexipbang = explode('.', chunk_split($int_ip, 2, '.'));
-
-	// Any mod changing the way ips are stored? Then we are not able to convert and enter the ip "as is" to not "destroy" anything...
-	if (sizeof($hexipbang) < 4)
-	{
-		return $int_ip;
-	}
-
-	return hexdec($hexipbang[0]) . '.' . hexdec($hexipbang[1]) . '.' . hexdec($hexipbang[2]) . '.' . hexdec($hexipbang[3]);
-}
-
-/**
-* Reverse the encoding of wild-carded bans
-*/
-function decode_ban_ip($int_ip)
-{
-	return str_replace('255', '*', decode_ip($int_ip));
-}
-
-/**
-* Determine the MIME-type of a specified filename
-* This does not actually inspect the file, but simply uses the file extension
-*/
-function mimetype($filename)
-{
-	if (!preg_match('/\.([a-z0-9]+)$/i', $filename, $m))
-	{
-		return 'application/octet-stream';
-	}
-
-	switch (strtolower($m[1]))
-	{
-		case 'zip':		return 'application/zip';
-		case 'jpeg':	return 'image/jpeg';
-		case 'jpg':		return 'image/jpeg';
-		case 'jpe':		return 'image/jpeg';
-		case 'png':		return 'image/png';
-		case 'gif':		return 'image/gif';
-		case 'htm':
-		case 'html':	return 'text/html';
-		case 'tif':		return 'image/tiff';
-		case 'tiff':	return 'image/tiff';
-		case 'ras':		return 'image/x-cmu-raster';
-		case 'pnm':		return 'image/x-portable-anymap';
-		case 'pbm':		return 'image/x-portable-bitmap';
-		case 'pgm':		return 'image/x-portable-graymap';
-		case 'ppm':		return 'image/x-portable-pixmap';
-		case 'rgb':		return 'image/x-rgb';
-		case 'xbm':		return 'image/x-xbitmap';
-		case 'xpm':		return 'image/x-xpixmap';
-		case 'xwd':		return 'image/x-xwindowdump';
-		case 'z':		return 'application/x-compress';
-		case 'gtar':	return 'application/x-gtar';
-		case 'tgz':		return 'application/x-gtar';
-		case 'gz':		return 'application/x-gzip';
-		case 'tar':		return 'application/x-tar';
-		case 'xls':		return 'application/excel';
-		case 'pdf':		return 'application/pdf';
-		case 'ppt':		return 'application/powerpoint';
-		case 'rm':		return 'application/vnd.rn-realmedia';
-		case 'wma':		return 'audio/x-ms-wma';
-		case 'swf':		return 'application/x-shockwave-flash';
-		case 'ief':		return 'image/ief';
-		case 'doc':
-		case 'dot':
-		case 'wrd':		return 'application/msword';
-		case 'ai':
-		case 'eps':
-		case 'ps':		return 'application/postscript';
-		case 'asc':
-		case 'txt':
-		case 'c':
-		case 'cc':
-		case 'h':
-		case 'hh':
-		case 'cpp':
-		case 'hpp':
-		case 'php':
-		case 'php3':	return 'text/plain';
-		default: 		return 'application/octet-stream';
-	}
-}
-
-/**
-* Obtain the dimensions of all remotely hosted avatars
-* This should only be called from execute_last
-* There can be significant network overhead if there are a large number of remote avatars
-* @todo Look at the option of allowing the user to decide whether this is called or to force the dimensions
-*/
-function remote_avatar_dims()
-{
-	global $db;
-
-	$sql = 'SELECT user_id, user_avatar
-		FROM ' . USERS_TABLE . '
-		WHERE user_avatar_type = ' . AVATAR_REMOTE;
-	$result = $db->sql_query($sql);
-
-	$remote_avatars = array();
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$remote_avatars[(int) $row['user_id']] = $row['user_avatar'];
-	}
-	$db->sql_freeresult($result);
-
-	foreach ($remote_avatars as $user_id => $avatar)
-	{
-		$width = (int) get_remote_avatar_dim($avatar, 0);
-		$height = (int) get_remote_avatar_dim($avatar, 1);
-
-		$sql = 'UPDATE ' . USERS_TABLE . '
-			SET user_avatar_width = ' . (int) $width . ', user_avatar_height = ' . (int) $height . '
-			WHERE user_id = ' . $user_id;
-		$db->sql_query($sql);
-	}
-}
-
-function import_avatar_gallery($gallery_name = '', $subdirs_as_galleries = false)
-{
-	global $convert, $user;
-
-	$relative_path = empty($convert->convertor['source_path_absolute']);
-
-	if (empty($convert->convertor['avatar_gallery_path']))
-	{
-		$convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_GALLERY_PATH'], 'import_avatar_gallery()'), __LINE__, __FILE__);
-	}
-
-	$src_path = relative_base(path($convert->convertor['avatar_gallery_path'], $relative_path), $relative_path);
-
-	if (is_dir($src_path))
-	{
-		// Do not die on failure... safe mode restrictions may be in effect.
-		copy_dir($convert->convertor['avatar_gallery_path'], path(phpbb::$config['avatar_gallery_path']) . $gallery_name, !$subdirs_as_galleries, false, false, $relative_path);
-
-		// only doing 1 level deep. (ibf 1.x)
-		// notes: ibf has 2 tiers: directly in the avatar directory for base gallery (handled in the above statement), plus subdirs(handled below).
-		// recursive subdirs ignored. -- i don't know if other forums support recursive galleries. if they do, this following code could be upgraded to be recursive.
-		if ($subdirs_as_galleries)
-		{
-			$dirlist = array();
-			if ($handle = @opendir($src_path))
-			{
-				while ($entry = readdir($handle))
-				{
-					if ($entry[0] == '.' || $entry == 'CVS' || $entry == 'index.htm')
-					{
-						continue;
-					}
-
-					if (is_dir($src_path . $entry))
-					{
-						$dirlist[] = $entry;
-					}
-				}
-				closedir($handle);
-			}
-			else if ($dir = @dir($src_path))
-			{
-				while ($entry = $dir->read())
-				{
-					if ($entry[0] == '.' || $entry == 'CVS' || $entry == 'index.htm')
-					{
-						continue;
-					}
-
-					if (is_dir($src_path . $entry))
-					{
-						$dirlist[] = $entry;
-					}
-				}
-				$dir->close();
-			}
-
-			for ($i = 0; $i < sizeof($dirlist); ++$i)
-			{
-				$dir = $dirlist[$i];
-
-				// Do not die on failure... safe mode restrictions may be in effect.
-				copy_dir(path($convert->convertor['avatar_gallery_path'], $relative_path) . $dir, path(phpbb::$config['avatar_gallery_path']) . $dir, true, false, false, $relative_path);
-			}
-		}
-	}
-}
-
-function import_attachment_files($category_name = '')
-{
-	global $convert, $db, $user;
-
-	$sql = 'SELECT config_value AS upload_path
-		FROM ' . CONFIG_TABLE . "
-		WHERE config_name = 'upload_path'";
-	$result = $db->sql_query($sql);
-	phpbb::$config['upload_path'] = $db->sql_fetchfield('upload_path');
-	$db->sql_freeresult($result);
-
-	$relative_path = empty($convert->convertor['source_path_absolute']);
-
-	if (empty($convert->convertor['upload_path']))
-	{
-		$convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_UPLOAD_DIR'], 'import_attachment_files()'), __LINE__, __FILE__);
-	}
-
-	if (is_dir(relative_base(path($convert->convertor['upload_path'], $relative_path), $relative_path)))
-	{
-		copy_dir($convert->convertor['upload_path'], path(phpbb::$config['upload_path']) . $category_name, true, false, true, $relative_path);
-	}
-}
-
-function attachment_forum_perms($forum_id)
-{
-	if (!is_array($forum_id))
-	{
-		$forum_id = array($forum_id);
-	}
-
-	return serialize($forum_id);
-}
-
-// base64todec function
-// -> from php manual?
-function base64_unpack($string)
-{
-	$chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ+-';
-	$base = strlen($chars);
-
-	$length = strlen($string);
-	$number = 0;
-
-	for ($i = 1; $i <= $length; $i++)
-	{
-		$pos = $length - $i;
-		$operand = strpos($chars, substr($string, $pos, 1));
-		$exponent = pow($base, $i-1);
-		$dec_value = $operand * $exponent;
-		$number += $dec_value;
-	}
-
-	return $number;
-}
-
-function _import_check($config_var, $source, $use_target)
-{
-	global $convert;
-
-	$result = array(
-		'orig_source'	=> $source,
-		'copied'		=> false,
-		'relative_path'	=> (empty($convert->convertor['source_path_absolute'])) ? true : false,
-	);
-
-	// copy file will prepend PHPBB_ROOT_PATH
-	$target = phpbb::$config[$config_var] . '/' . basename(($use_target === false) ? $source : $use_target);
-
-	if (!empty($convert->convertor[$config_var]) && strpos($source, $convert->convertor[$config_var]) !== 0)
-	{
-		$source = $convert->convertor[$config_var] . $source;
-	}
-
-	$result['source'] = $source;
-
-	if (file_exists(relative_base($source, $result['relative_path'], __LINE__, __FILE__)))
-	{
-		$result['copied'] = copy_file($source, $target, false, false, $result['relative_path']);
-	}
-
-	if ($result['copied'])
-	{
-		$result['target'] = basename($target);
-	}
-	else
-	{
-		$result['target'] = ($use_target !== false) ? $result['orig_source'] : basename($target);
-	}
-
-	return $result;
-}
-
-function import_attachment($source, $use_target = false)
-{
-	if (empty($source))
-	{
-		return '';
-	}
-
-	global $convert, $user;
-
-	if (empty($convert->convertor['upload_path']))
-	{
-		$convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_UPLOAD_DIR'], 'import_attachment()'), __LINE__, __FILE__);
-	}
-
-	$result = _import_check('upload_path', $source, $use_target);
-
-	if ($result['copied'])
-	{
-		// Thumbnails?
-		if (is_array($convert->convertor['thumbnails']))
-		{
-			$thumb_dir = $convert->convertor['thumbnails'][0];
-			$thumb_prefix = $convert->convertor['thumbnails'][1];
-			$thumb_source = $thumb_dir . $thumb_prefix . basename($result['source']);
-
-			if (strpos($thumb_source, $convert->convertor['upload_path']) !== 0)
-			{
-				$thumb_source = $convert->convertor['upload_path'] . $thumb_source;
-			}
-			$thumb_target = phpbb::$config['upload_path'] . '/thumb_' . $result['target'];
-
-			if (file_exists(relative_base($thumb_source, $result['relative_path'], __LINE__, __FILE__)))
-			{
-				copy_file($thumb_source, $thumb_target, false, false, $result['relative_path']);
-			}
-		}
-	}
-
-	return $result['target'];
-}
-
-function import_rank($source, $use_target = false)
-{
-	if (empty($source))
-	{
-		return '';
-	}
-
-	global $convert, $user;
-
-	if (!isset($convert->convertor['ranks_path']))
-	{
-		$convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_RANKS_PATH'], 'import_rank()'), __LINE__, __FILE__);
-	}
-
-	$result = _import_check('ranks_path', $source, $use_target);
-	return $result['target'];
-}
-
-function import_smiley($source, $use_target = false)
-{
-	if (empty($source))
-	{
-		return '';
-	}
-
-	global $convert, $user;
-
-	if (!isset($convert->convertor['smilies_path']))
-	{
-		$convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_SMILIES_PATH'], 'import_smiley()'), __LINE__, __FILE__);
-	}
-
-	$result = _import_check('smilies_path', $source, $use_target);
-	return $result['target'];
-}
-
-/*
-*/
-function import_avatar($source, $use_target = false, $user_id = false)
-{
-	if (empty($source) || preg_match('#^https?:#i', $source) || preg_match('#blank\.(gif|png)$#i', $source))
-	{
-		return;
-	}
-
-	global $convert, $user;
-
-	if (!isset($convert->convertor['avatar_path']))
-	{
-		$convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_AVATAR_PATH'], 'import_avatar()'), __LINE__, __FILE__);
-	}
-
-	if ($use_target === false && $user_id !== false)
-	{
-		$use_target = phpbb::$config['avatar_salt'] . '_' . $user_id . '.' . substr(strrchr($source, '.'), 1);
-	}
-
-	$result = _import_check('avatar_path', $source, $use_target);
-
-	return ((!empty($user_id)) ? $user_id : $use_target) . '.' . substr(strrchr($source, '.'), 1);
-}
-
-/**
-* @todo all image dimension functions below (there are a *lot*) should get revisited and converted to one or two functions (no more needed, really).
-*/
-
-/**
-* Calculate the size of the specified image
-* Called from the following functions for calculating the size of specific image types
-*/
-function get_image_dim($source)
-{
-	if (empty($source))
-	{
-		return array(0, 0);
-	}
-
-	global $convert;
-
-	$relative_path = empty($convert->convertor['source_path_absolute']);
-
-	if (file_exists(relative_base($source, $relative_path)))
-	{
-		$image = relative_base($source, $relative_path);
-		return @getimagesize($image);
-	}
-
-	return false;
-}
-
-/**
-* Obtain the width of the specified smilie
-*/
-function get_smiley_width($src)
-{
-	return get_smiley_dim($src, 0);
-}
-
-/**
-* Obtain the height of the specified smilie
-*/
-function get_smiley_height($src)
-{
-	return get_smiley_dim($src, 1);
-}
-
-/**
-* Obtain the size of the specified smilie (using the cache if possible) and cache the value
-*/
-function get_smiley_dim($source, $axis)
-{
-	if (empty($source))
-	{
-		return 15;
-	}
-
-	static $smiley_cache = array();
-
-	if (isset($smiley_cache[$source]))
-	{
-		return $smiley_cache[$source][$axis];
-	}
-
-	global $convert, $user;
-
-	$orig_source = $source;
-
-	if (!isset($convert->convertor['smilies_path']))
-	{
-		$convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_SMILIES_PATH'], 'get_smiley_dim()'), __LINE__, __FILE__);
-	}
-
-	if (!empty($convert->convertor['smilies_path']) && strpos($source, $convert->convertor['smilies_path']) !== 0)
-	{
-		$source = $convert->convertor['smilies_path'] . $source;
-	}
-
-	$smiley_cache[$orig_source] = get_image_dim($source);
-
-	if (empty($smiley_cache[$orig_source]) || empty($smiley_cache[$orig_source][0]) || empty($smiley_cache[$orig_source][1]))
-	{
-		$smiley_cache[$orig_source] = array(15, 15);
-		return 15;
-	}
-
-	return $smiley_cache[$orig_source][$axis];
-}
-
-/**
-* Obtain the width of the specified avatar
-*/
-function get_avatar_width($src, $func = false, $arg1 = false, $arg2 = false)
-{
-	return get_avatar_dim($src, 0, $func, $arg1, $arg2);
-}
-
-/**
-* Obtain the height of the specified avatar
-*/
-function get_avatar_height($src, $func = false, $arg1 = false, $arg2 = false)
-{
-	return get_avatar_dim($src, 1, $func, $arg1, $arg2);
-}
-
-/**
-*/
-function get_avatar_dim($src, $axis, $func = false, $arg1 = false, $arg2 = false)
-{
-	$avatar_type = AVATAR_UPLOAD;
-
-	if ($func)
-	{
-		if ($arg1 || $arg2)
-		{
-			$ary = array($arg1);
-
-			if ($arg2)
-			{
-				$ary[] = $arg2;
-			}
-
-			$avatar_type = call_user_func_array($func, $ary);
-		}
-		else
-		{
-			$avatar_type = call_user_func($func);
-		}
-	}
-
-	switch ($avatar_type)
-	{
-		case AVATAR_UPLOAD:
-			return get_upload_avatar_dim($src, $axis);
-		break;
-
-		case AVATAR_GALLERY:
-			return get_gallery_avatar_dim($src, $axis);
-		break;
-
-		case AVATAR_REMOTE:
-			 // see notes on this functions usage and (hopefully) model $func to avoid this accordingly
-			return get_remote_avatar_dim($src, $axis);
-		break;
-
-		default:
-			$default_x = (defined('DEFAULT_AVATAR_X_CUSTOM')) ? DEFAULT_AVATAR_X_CUSTOM : DEFAULT_AVATAR_X;
-			$default_y = (defined('DEFAULT_AVATAR_Y_CUSTOM')) ? DEFAULT_AVATAR_Y_CUSTOM : DEFAULT_AVATAR_Y;
-
-			return $axis ? $default_y : $default_x;
-		break;
-	}
-}
-
-/**
-* Obtain the size of the specified uploaded avatar (using the cache if possible) and cache the value
-*/
-function get_upload_avatar_dim($source, $axis)
-{
-	static $cachedims = false;
-	static $cachekey = false;
-
-	if (empty($source))
-	{
-		return 0;
-	}
-
-	if ($cachekey == $source)
-	{
-		return $cachedims[$axis];
-	}
-
-	$orig_source = $source;
-
-	if (substr($source, 0, 7) == 'upload:')
-	{
-		$source = substr($source, 7);
-	}
-
-	global $convert, $user;
-
-	if (!isset($convert->convertor['avatar_path']))
-	{
-		$convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_AVATAR_PATH'], 'get_upload_avatar_dim()'), __LINE__, __FILE__);
-	}
-
-	if (!empty($convert->convertor['avatar_path']) && strpos($source, $convert->convertor['avatar_path']) !== 0)
-	{
-		$source = path($convert->convertor['avatar_path'], empty($convert->convertor['source_path_absolute'])) . $source;
-	}
-
-	$cachedims = get_image_dim($source);
-
-	if (empty($cachedims) || empty($cachedims[0]) || empty($cachedims[1]))
-	{
-		$default_x = (defined('DEFAULT_AVATAR_X_CUSTOM')) ? DEFAULT_AVATAR_X_CUSTOM : DEFAULT_AVATAR_X;
-		$default_y = (defined('DEFAULT_AVATAR_Y_CUSTOM')) ? DEFAULT_AVATAR_Y_CUSTOM : DEFAULT_AVATAR_Y;
-
-		$cachedims = array($default_x, $default_y);
-	}
-
-	return $cachedims[$axis];
-}
-
-/**
-* Obtain the size of the specified gallery avatar (using the cache if possible) and cache the value
-*/
-function get_gallery_avatar_dim($source, $axis)
-{
-	if (empty($source))
-	{
-		return 0;
-	}
-
-	static $avatar_cache = array();
-
-	if (isset($avatar_cache[$source]))
-	{
-		return $avatar_cache[$source][$axis];
-	}
-
-	global $convert, $user;
-
-	$orig_source = $source;
-
-	if (!isset($convert->convertor['avatar_gallery_path']))
-	{
-		$convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_GALLERY_PATH'], 'get_gallery_avatar_dim()'), __LINE__, __FILE__);
-	}
-
-	if (!empty($convert->convertor['avatar_gallery_path']) && strpos($source, $convert->convertor['avatar_gallery_path']) !== 0)
-	{
-		$source = path($convert->convertor['avatar_gallery_path'], empty($convert->convertor['source_path_absolute'])) . $source;
-	}
-
-	$avatar_cache[$orig_source] = get_image_dim($source);
-
-	if (empty($avatar_cache[$orig_source]) || empty($avatar_cache[$orig_source][0]) || empty($avatar_cache[$orig_source][1]))
-	{
-		$default_x = (defined('DEFAULT_AVATAR_X_CUSTOM')) ? DEFAULT_AVATAR_X_CUSTOM : DEFAULT_AVATAR_X;
-		$default_y = (defined('DEFAULT_AVATAR_Y_CUSTOM')) ? DEFAULT_AVATAR_Y_CUSTOM : DEFAULT_AVATAR_Y;
-
-		$avatar_cache[$orig_source] = array($default_x, $default_y);
-	}
-
-	return $avatar_cache[$orig_source][$axis];
-}
-
-/**
-* Obtain the size of the specified remote avatar (using the cache if possible) and cache the value
-* Whilst it's unlikely that remote avatars will be duplicated, it is possible so caching seems the best option
-* This should only be called from a post processing step due to the possibility of network timeouts
-*/
-function get_remote_avatar_dim($src, $axis)
-{
-	if (empty($src))
-	{
-		return 0;
-	}
-
-	static $remote_avatar_cache = array();
-
-	// an ugly hack: we assume that the dimensions of each remote avatar are accessed exactly twice (x and y)
-	if (isset($remote_avatar_cache[$src]))
-	{
-		$retval = $remote_avatar_cache[$src][$axis];
-		unset($remote_avatar_cache);
-		return $retval;
-	}
-
-	$url_info = @parse_url($src);
-	if (empty($url_info['host']))
-	{
-		return 0;
-	}
-	$host = $url_info['host'];
-	$port = (isset($url_info['port'])) ? $url_info['port'] : 0;
-	$protocol = (isset($url_info['scheme'])) ? $url_info['scheme'] : 'http';
-	if (empty($port))
-	{
-		switch(strtolower($protocol))
-		{
-			case 'ftp':
-				$port = 21;
-				break;
-
-			case 'https':
-				$port = 443;
-				break;
-
-			default:
-				$port = 80;
-		}
-	}
-
-	$timeout = @ini_get('default_socket_timeout');
-	@ini_set('default_socket_timeout', 2);
-
-	// We're just trying to reach the server to avoid timeouts
-	$fp = @fsockopen($host, $port, $errno, $errstr, 1);
-	if ($fp)
-	{
-		$remote_avatar_cache[$src] = @getimagesize($src);
-		fclose($fp);
-	}
-
-	$default_x 	= (defined('DEFAULT_AVATAR_X_CUSTOM')) ? DEFAULT_AVATAR_X_CUSTOM : DEFAULT_AVATAR_X;
-	$default_y 	= (defined('DEFAULT_AVATAR_Y_CUSTOM')) ? DEFAULT_AVATAR_Y_CUSTOM : DEFAULT_AVATAR_Y;
-	$default 	= array($default_x, $default_y);
-
-	if (empty($remote_avatar_cache[$src]) || empty($remote_avatar_cache[$src][0]) || empty($remote_avatar_cache[$src][1]))
-	{
-		$remote_avatar_cache[$src] = $default;
-	}
-	else
-	{
-		// We trust gallery and uploaded avatars to conform to the size settings; we might have to adjust here
-		if ($remote_avatar_cache[$src][0] > $default_x || $remote_avatar_cache[$src][1] > $default_y)
-		{
-			$bigger = ($remote_avatar_cache[$src][0] > $remote_avatar_cache[$src][1]) ? 0 : 1;
-			$ratio = $default[$bigger] / $remote_avatar_cache[$src][$bigger];
-			$remote_avatar_cache[$src][0] = (int)($remote_avatar_cache[$src][0] * $ratio);
-			$remote_avatar_cache[$src][1] = (int)($remote_avatar_cache[$src][1] * $ratio);
-		}
-	}
-
-	@ini_set('default_socket_timeout', $timeout);
-	return $remote_avatar_cache[$src][$axis];
-}
-
-function set_user_options()
-{
-	global $convert_row;
-
-	// Key need to be set in row, else default value is chosen
-	$keyoptions = array(
-		'viewimg'		=> array('bit' => 0, 'default' => 1),
-		'viewflash'		=> array('bit' => 1, 'default' => 1),
-		'viewsmilies'	=> array('bit' => 2, 'default' => 1),
-		'viewsigs'		=> array('bit' => 3, 'default' => 1),
-		'viewavatars'	=> array('bit' => 4, 'default' => 1),
-		'viewcensors'	=> array('bit' => 5, 'default' => 1),
-		'attachsig'		=> array('bit' => 6, 'default' => 0),
-		'bbcode'		=> array('bit' => 8, 'default' => 1),
-		'smilies'		=> array('bit' => 9, 'default' => 1),
-		'popuppm'		=> array('bit' => 10, 'default' => 0),
-	);
-
-	$option_field = 0;
-
-	foreach ($keyoptions as $key => $key_ary)
-	{
-		$value = (isset($convert_row[$key])) ? (int) $convert_row[$key] : $key_ary['default'];
-
-		if ($value && !($option_field & 1 << $key_ary['bit']))
-		{
-			$option_field += 1 << $key_ary['bit'];
-		}
-	}
-
-	return $option_field;
-}
-
-/**
-* Index messages on the fly as we convert them
-* @todo naderman, can you check that this works with the new search plugins as it's use is currently disabled (and thus untested)
-function search_indexing($message = '')
-{
-	global $fulltext_search, $convert_row;
-
-	if (!isset($convert_row['post_id']))
-	{
-		return;
-	}
-
-	if (!$message)
-	{
-		if (!isset($convert_row['message']))
-		{
-			return;
-		}
-
-		$message = $convert_row['message'];
-	}
-
-	$title = (isset($convert_row['title'])) ? $convert_row['title'] : '';
-
-	$fulltext_search->index('post', $convert_row['post_id'], $message, $title, $convert_row['poster_id'], $convert_row['forum_id']);
-}
-*/
-
-function make_unique_filename($filename)
-{
-	if (!strlen($filename))
-	{
-		$filename = md5(unique_id()) . '.dat';
-	}
-	else if ($filename[0] == '.')
-	{
-		$filename = md5(unique_id()) . $filename;
-	}
-	else if (preg_match('/\.([a-z]+)$/i', $filename, $m))
-	{
-		$filename = preg_replace('/\.([a-z]+)$/i', '_' . md5(unique_id()) . '.\1', $filename);
-	}
-	else
-	{
-		$filename .= '_' . md5(unique_id()) . '.dat';
-	}
-
-	return $filename;
-}
-
-function words_unique(&$words)
-{
-	reset($words);
-	$return_array = array();
-
-	$word = current($words);
-	do
-	{
-		$return_array[$word] = $word;
-	}
-	while ($word = next($words));
-
-	return $return_array;
-}
-
-/**
-* Adds a user to the specified group and optionally makes them a group leader
-* This function does not create the group if it does not exist and so should only be called after the groups have been created
-*/
-function add_user_group($group_id, $user_id, $group_leader=false)
-{
-	global $convert, $user, $db;
-
-	$sql = 'INSERT INTO ' . USER_GROUP_TABLE . ' ' . $db->sql_build_array('INSERT', array(
-		'group_id'		=> $group_id,
-		'user_id'		=> $user_id,
-		'group_leader'	=> ($group_leader) ? 1 : 0,
-		'user_pending'	=> 0));
-	$db->sql_query($sql);
-}
-
-// STANDALONE FUNCTIONS
-
-/**
-* Add users to the pre-defined "special" groups
-*
-* @param string $group The name of the special group to add to
-* @param string $select_query An SQL query to retrieve the user(s) to add to the group
-*/
-function user_group_auth($group, $select_query, $use_src_db)
-{
-	global $convert, $user, $db, $src_db, $same_db;
-
-	if (!in_array($group, array('guests', 'registered', 'registered_coppa', 'global_moderators', 'administrators', 'bots')))
-	{
-		$convert->p_master->error(sprintf($user->lang['CONV_ERROR_WRONG_GROUP'], $group, 'user_group_auth()'), __LINE__, __FILE__, true);
-		return;
-	}
-
-	$sql = 'SELECT group_id
-		FROM ' . GROUPS_TABLE . "
-		WHERE group_name_clean = '" . $db->sql_escape(utf8_clean_string($group)) . "'";
-	$result = $db->sql_query($sql);
-	$group_id = (int) $db->sql_fetchfield('group_id');
-	$db->sql_freeresult($result);
-
-	if (!$group_id)
-	{
-		$convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_GROUP'], $group, 'user_group_auth()'), __LINE__, __FILE__, true);
-		return;
-	}
-
-	if ($same_db || !$use_src_db)
-	{
-		$sql = 'INSERT INTO ' . USER_GROUP_TABLE . ' (user_id, group_id, user_pending)
-			' . str_replace('{' . strtoupper($group) . '}', $group_id . ', 0', $select_query);
-		$db->sql_query($sql);
-	}
-	else
-	{
-		$result = $src_db->sql_query(str_replace('{' . strtoupper($group) . '}', $group_id . ' ', $select_query));
-		while ($row = $src_db->sql_fetchrow($result))
-		{
-			// this might become quite a lot of INSERTS unfortunately
-			$sql = 'INSERT INTO ' . USER_GROUP_TABLE . " (user_id, group_id, user_pending)
-				VALUES ({$row['user_id']}, $group_id, 0)";
-			$db->sql_query($sql);
-		}
-		$src_db->sql_freeresult($result);
-	}
-}
-
-/**
-* Retrieves configuration information from the source forum and caches it as an array
-* Both database and file driven configuration formats can be handled
-* (the type used is specified in $config_schema, see convert_phpbb20.php for more details)
-*/
-function get_config()
-{
-	static $convert_config;
-	global $user;
-
-	if (isset($convert_config))
-	{
-		return $convert_config;
-	}
-
-	global $src_db, $same_db;
-	global $convert;
-
-	if ($convert->config_schema['table_format'] != 'file')
-	{
-		if ($convert->mysql_convert && $same_db)
-		{
-			$src_db->sql_query("SET NAMES 'binary'");
-		}
-
-		$sql = 'SELECT * FROM ' . $convert->src_table_prefix . $convert->config_schema['table_name'];
-		$result = $src_db->sql_query($sql);
-		$row = $src_db->sql_fetchrow($result);
-
-		if (!$row)
-		{
-			$convert->p_master->error($user->lang['CONV_ERROR_GET_CONFIG'], __LINE__, __FILE__);
-		}
-	}
-
-	if (is_array($convert->config_schema['table_format']))
-	{
-		$convert_config = array();
-		list($key, $val) = each($convert->config_schema['table_format']);
-
-		do
-		{
-			$convert_config[$row[$key]] = $row[$val];
-		}
-		while ($row = $src_db->sql_fetchrow($result));
-		$src_db->sql_freeresult($result);
-
-		if ($convert->mysql_convert && $same_db)
-		{
-			$src_db->sql_query("SET NAMES 'utf8'");
-		}
-	}
-	else if ($convert->config_schema['table_format'] == 'file')
-	{
-		$filename = $convert->options['forum_path'] . '/' . $convert->config_schema['filename'];
-		if (!file_exists($filename))
-		{
-			$convert->p_master->error($user->lang['FILE_NOT_FOUND'] . ': ' . $filename, __LINE__, __FILE__);
-		}
-
-		$convert_config = extract_variables_from_file($filename);
-		if (!empty($convert->config_schema['array_name']))
-		{
-			$convert_config = $convert_config[$convert->config_schema['array_name']];
-		}
-	}
-	else
-	{
-		$convert_config = $row;
-		if ($convert->mysql_convert && $same_db)
-		{
-			$src_db->sql_query("SET NAMES 'utf8'");
-		}
-	}
-
-	if (!sizeof($convert_config))
-	{
-		$convert->p_master->error($user->lang['CONV_ERROR_CONFIG_EMPTY'], __LINE__, __FILE__);
-	}
-
-	return $convert_config;
-}
-
-/**
-* Transfers the relevant configuration information from the source forum
-* The mapping of fields is specified in $config_schema, see convert_phpbb20.php for more details
-*/
-function restore_config($schema)
-{
-	global $db;
-
-	$convert_config = get_config();
-	foreach ($schema['settings'] as $config_name => $src)
-	{
-		if (preg_match('/(.*)\((.*)\)/', $src, $m))
-		{
-			$var = (empty($m[2]) || empty($convert_config[$m[2]])) ? "''" : "'" . addslashes($convert_config[$m[2]]) . "'";
-			$exec = '$config_value = ' . $m[1] . '(' . $var . ');';
-			eval($exec);
-		}
-		else
-		{
-			$config_value = (isset($convert_config[$src])) ? $convert_config[$src] : '';
-		}
-
-		if ($config_value !== '')
-		{
-			// Most are...
-			if (is_string($config_value))
-			{
-				$config_value = truncate_string(utf8_htmlspecialchars($config_value), 255, 255, false);
-			}
-
-			set_config($config_name, $config_value);
-		}
-	}
-}
-
-/**
-* Update the count of PM's in custom folders for all users
-*/
-function update_folder_pm_count()
-{
-	global $db, $convert, $user;
-
-	$sql = 'SELECT user_id, folder_id, COUNT(msg_id) as num_messages
-		FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE folder_id NOT IN (' . PRIVMSGS_NO_BOX . ', ' . PRIVMSGS_HOLD_BOX . ', ' . PRIVMSGS_INBOX . ', ' . PRIVMSGS_OUTBOX . ', ' . PRIVMSGS_SENTBOX . ')
-		GROUP BY folder_id, user_id';
-	$result = $db->sql_query($sql);
-
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$db->sql_query('UPDATE ' . PRIVMSGS_FOLDER_TABLE . ' SET pm_count = ' . $row['num_messages'] . '
-			WHERE user_id = ' . $row['user_id'] . ' AND folder_id = ' . $row['folder_id']);
-	}
-	$db->sql_freeresult($result);
-}
-
-// Functions mainly used by the main convertor script
-
-function path($path, $path_relative = true)
-{
-	if ($path === false)
-	{
-		return '';
-	}
-
-	if (substr($path, -1) != '/')
-	{
-		$path .= '/';
-	}
-
-	if (!$path_relative)
-	{
-		return $path;
-	}
-
-	if (substr($path, 0, 1) == '/')
-	{
-		$path = substr($path, 1);
-	}
-
-	return $path;
-}
-
-/**
-* Extract the variables defined in a configuration file
-* @todo As noted by Xore we need to look at this from a security perspective
-*/
-function extract_variables_from_file($_filename)
-{
-	include($_filename);
-
-	$vars = get_defined_vars();
-	unset($vars['_filename']);
-
-	return $vars;
-}
-
-function get_path($src_path, $src_url, $test_file)
-{
-	$board_config = get_config();
-
-	$test_file = preg_replace('/\.php$/i', '.' . PHP_EXT, $test_file);
-	$src_path = path($src_path);
-
-	if (@file_exists(PHPBB_ROOT_PATH . $src_path . $test_file))
-	{
-		return $src_path;
-	}
-
-	if (!empty($src_url) && !empty($board_config['server_name']))
-	{
-		if (!preg_match('#https?://([^/]+)(.*)#i', $src_url, $m))
-		{
-			return false;
-		}
-
-		if ($m[1] != $board_config['server_name'])
-		{
-			return false;
-		}
-
-		$url_parts = explode('/', $m[2]);
-		if (substr($src_url, -1) != '/')
-		{
-			if (preg_match('/.*\.([a-z0-9]{3,4})$/i', $url_parts[sizeof($url_parts) - 1]))
-			{
-				$url_parts[sizeof($url_parts) - 1] = '';
-			}
-			else
-			{
-				$url_parts[] = '';
-			}
-		}
-
-		$script_path = $board_config['script_path'];
-		if (substr($script_path, -1) == '/')
-		{
-			$script_path = substr($script_path, 0, -1);
-		}
-
-		$path_array = array();
-
-		$phpbb_parts = explode('/', $script_path);
-		for ($i = 0; $i < sizeof($url_parts); ++$i)
-		{
-			if ($i < sizeof($phpbb_parts[$i]) && $url_parts[$i] == $phpbb_parts[$i])
-			{
-				$path_array[] = $url_parts[$i];
-				unset($url_parts[$i]);
-			}
-			else
-			{
-				$path = '';
-				for ($j = $i; $j < sizeof($phpbb_parts); ++$j)
-				{
-					$path .= '../';
-				}
-				$path .= implode('/', $url_parts);
-				break;
-			}
-		}
-
-		if (!empty($path))
-		{
-			if (@file_exists(PHPBB_ROOT_PATH . $path . $test_file))
-			{
-				return $path;
-			}
-		}
-	}
-
-	return false;
-}
-
-function compare_table($tables, $tablename, &$prefixes)
-{
-	for ($i = 0, $table_size = sizeof($tables); $i < $table_size; ++$i)
-	{
-		if (preg_match('/(.*)' . $tables[$i] . '$/', $tablename, $m))
-		{
-			if (empty($m[1]))
-			{
-				$m[1] = '*';
-			}
-
-			if (isset($prefixes[$m[1]]))
-			{
-				$prefixes[$m[1]]++;
-			}
-			else
-			{
-				$prefixes[$m[1]] = 1;
-			}
-		}
-	}
-}
-
-/**
-* Grant permissions to a specified user or group
-*
-* @param string $ug_type user|group|user_role|group_role
-* @param mixed $forum_id forum ids (array|int|0) -> 0 == all forums
-* @param mixed $ug_id [int] user_id|group_id : [string] usergroup name
-* @param mixed $acl_list [string] acl entry : [array] acl entries : [string] role entry
-* @param int $setting phpbb::ACL_YES|ACL_NO|ACL_NEVER
-*/
-function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting = ACL_NO)
-{
-	global $db, $convert, $user;
-	static $acl_option_ids, $group_ids;
-
-	if (($ug_type == 'group' || $ug_type == 'group_role') && is_string($ug_id))
-	{
-		if (!isset($group_ids[$ug_id]))
-		{
-			$sql = 'SELECT group_id
-				FROM ' . GROUPS_TABLE . "
-				WHERE group_name_clean = '" . $db->sql_escape(utf8_clean_string($ug_id)) . "'";
-			$result = $db->sql_query_limit($sql, 1);
-			$id = (int) $db->sql_fetchfield('group_id');
-			$db->sql_freeresult($result);
-
-			if (!$id)
-			{
-				return;
-			}
-
-			$group_ids[$ug_id] = $id;
-		}
-
-		$ug_id = (int) $group_ids[$ug_id];
-	}
-
-	$table = ($ug_type == 'user' || $ug_type == 'user_role') ? ACL_USERS_TABLE : ACL_GROUPS_TABLE;
-	$id_field = ($ug_type == 'user' || $ug_type == 'user_role') ? 'user_id' : 'group_id';
-
-	// Role based permissions are the simplest to handle so check for them first
-	if ($ug_type == 'user_role' || $ug_type == 'group_role')
-	{
-		if (is_numeric($forum_id))
-		{
-			$sql = 'SELECT role_id
-				FROM ' . ACL_ROLES_TABLE . "
-				WHERE role_name = 'ROLE_" . $db->sql_escape($acl_list) . "'";
-			$result = $db->sql_query_limit($sql, 1);
-			$row = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-
-			// If we have no role id there is something wrong here
-			if ($row)
-			{
-				$sql = "INSERT INTO $table ($id_field, forum_id, auth_role_id) VALUES ($ug_id, $forum_id, " . $row['role_id'] . ')';
-				$db->sql_query($sql);
-			}
-		}
-
-		return;
-	}
-
-	// Build correct parameters
-	$auth = array();
-
-	if (!is_array($acl_list))
-	{
-		$auth = array($acl_list => $setting);
-	}
-	else
-	{
-		foreach ($acl_list as $auth_option)
-		{
-			$auth[$auth_option] = $setting;
-		}
-	}
-	unset($acl_list);
-
-	if (!is_array($forum_id))
-	{
-		$forum_id = array($forum_id);
-	}
-
-	// Set any flags as required
-	foreach ($auth as $auth_option => $acl_setting)
-	{
-		$flag = substr($auth_option, 0, strpos($auth_option, '_') + 1);
-		if (empty($auth[$flag]))
-		{
-			$auth[$flag] = $acl_setting;
-		}
-	}
-
-	if (!is_array($acl_option_ids) || empty($acl_option_ids))
-	{
-		$sql = 'SELECT auth_option_id, auth_option
-			FROM ' . ACL_OPTIONS_TABLE;
-		$result = $db->sql_query($sql);
-
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$acl_option_ids[$row['auth_option']] = $row['auth_option_id'];
-		}
-		$db->sql_freeresult($result);
-	}
-
-	$sql_forum = 'AND ' . $db->sql_in_set('a.forum_id', array_map('intval', $forum_id), false, true);
-
-	$sql = ($ug_type == 'user') ? 'SELECT o.auth_option_id, o.auth_option, a.forum_id, a.auth_setting FROM ' . ACL_USERS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . " o WHERE a.auth_option_id = o.auth_option_id $sql_forum AND a.user_id = $ug_id" : 'SELECT o.auth_option_id, o.auth_option, a.forum_id, a.auth_setting FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . " o WHERE a.auth_option_id = o.auth_option_id $sql_forum AND a.group_id = $ug_id";
-	$result = $db->sql_query($sql);
-
-	$cur_auth = array();
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$cur_auth[$row['forum_id']][$row['auth_option_id']] = $row['auth_setting'];
-	}
-	$db->sql_freeresult($result);
-
-	$sql_ary = array();
-	foreach ($forum_id as $forum)
-	{
-		foreach ($auth as $auth_option => $setting)
-		{
-			$auth_option_id = $acl_option_ids[$auth_option];
-
-			if (!$auth_option_id)
-			{
-				continue;
-			}
-
-			switch ($setting)
-			{
-				case ACL_NO:
-					if (isset($cur_auth[$forum][$auth_option_id]))
-					{
-						$sql_ary['delete'][] = "DELETE FROM $table
-							WHERE forum_id = $forum
-								AND auth_option_id = $auth_option_id
-								AND $id_field = $ug_id";
-					}
-				break;
-
-				default:
-					if (!isset($cur_auth[$forum][$auth_option_id]))
-					{
-						$sql_ary['insert'][] = "$ug_id, $forum, $auth_option_id, $setting";
-					}
-					else if ($cur_auth[$forum][$auth_option_id] != $setting)
-					{
-						$sql_ary['update'][] = "UPDATE " . $table . "
-							SET auth_setting = $setting
-							WHERE $id_field = $ug_id
-								AND forum_id = $forum
-								AND auth_option_id = $auth_option_id";
-					}
-			}
-		}
-	}
-	unset($cur_auth);
-
-	$sql = '';
-	foreach ($sql_ary as $sql_type => $sql_subary)
-	{
-		switch ($sql_type)
-		{
-			case 'insert':
-				switch ($db->dbms_type)
-				{
-					case 'mysql':
-						$sql = 'VALUES ' . implode(', ', preg_replace('#^(.*?)$#', '(\1)', $sql_subary));
-					break;
-
-					case 'mssql':
-					case 'sqlite':
-						$sql = implode(' UNION ALL ', preg_replace('#^(.*?)$#', 'SELECT \1', $sql_subary));
-					break;
-
-					default:
-						foreach ($sql_subary as $sql)
-						{
-							$sql = "INSERT INTO $table ($id_field, forum_id, auth_option_id, auth_setting) VALUES ($sql)";
-							$db->sql_query($sql);
-							$sql = '';
-						}
-				}
-
-				if ($sql != '')
-				{
-					$sql = "INSERT INTO $table ($id_field, forum_id, auth_option_id, auth_setting) $sql";
-					$db->sql_query($sql);
-				}
-			break;
-
-			case 'update':
-			case 'delete':
-				foreach ($sql_subary as $sql)
-				{
-					$db->sql_query($sql);
-					$sql = '';
-				}
-			break;
-		}
-		unset($sql_ary[$sql_type]);
-	}
-	unset($sql_ary);
-
-}
-
-/**
-* Update the count of unread private messages for all users
-*/
-function update_unread_count()
-{
-	global $db;
-
-	$sql = 'SELECT user_id, COUNT(msg_id) as num_messages
-		FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE pm_unread = 1
-			AND folder_id <> ' . PRIVMSGS_OUTBOX . '
-		GROUP BY user_id';
-	$result = $db->sql_query($sql);
-
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_unread_privmsg = ' . $row['num_messages'] . '
-			WHERE user_id = ' . $row['user_id']);
-	}
-	$db->sql_freeresult($result);
-}
-
-/**
-* Add any of the pre-defined "special" groups which are missing from the database
-*/
-function add_default_groups()
-{
-	global $db;
-
-	$default_groups = array(
-		'GUESTS'			=> array('', 0, 0),
-		'REGISTERED'		=> array('', 0, 0),
-		'REGISTERED_COPPA'	=> array('', 0, 0),
-		'GLOBAL_MODERATORS'	=> array('00AA00', 1, 0),
-		'ADMINISTRATORS'	=> array('AA0000', 1, 1),
-		'BOTS'				=> array('9E8DA7', 0, 0)
-	);
-
-	$sql = 'SELECT *
-		FROM ' . GROUPS_TABLE . '
-		WHERE ' . $db->sql_in_set('group_name_clean', array_map('utf8_clean_string', array_keys($default_groups)));
-	$result = $db->sql_query($sql);
-
-	while ($row = $db->sql_fetchrow($result))
-	{
-		unset($default_groups[strtoupper($row['group_name'])]);
-	}
-	$db->sql_freeresult($result);
-
-	$sql_ary = array();
-
-	foreach ($default_groups as $name => $data)
-	{
-		$sql_ary[] = array(
-			'group_name'			=> (string) $name,
-			'group_name_clean'		=> (string) utf8_clean_string($name),
-			'group_desc'			=> '',
-			'group_desc_uid'		=> '',
-			'group_desc_bitfield'	=> '',
-			'group_type'			=> GROUP_SPECIAL,
-			'group_colour'			=> (string) $data[0],
-			'group_legend'			=> (int) $data[1],
-			'group_founder_manage'	=> (int) $data[2]
-		);
-	}
-
-	if (sizeof($sql_ary))
-	{
-		$db->sql_multi_insert(GROUPS_TABLE, $sql_ary);
-	}
-}
-
-
-/**
-* Sync post count. We might need to do this in batches.
-*/
-function sync_post_count($offset, $limit)
-{
-	global $db;
-	$sql = 'SELECT COUNT(post_id) AS num_posts, poster_id
-			FROM ' . POSTS_TABLE . '
-			WHERE post_postcount = 1
-				AND post_approved = 1
-			GROUP BY poster_id
-			ORDER BY poster_id';
-	$result = $db->sql_query_limit($sql, $limit, $offset);
-
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$db->sql_query('UPDATE ' . USERS_TABLE . " SET user_posts = {$row['num_posts']} WHERE user_id = {$row['poster_id']}");
-	}
-	$db->sql_freeresult($result);
-}
-
-/**
-* Add the search bots into the database
-* This code should be used in execute_last if the source database did not have bots
-* If you are converting bots this function should not be called
-* @todo We might want to look at sharing the bot list between the install code and this code for consistancy
-*/
-function add_bots()
-{
-	global $db, $convert, $user;
-
-	$db->sql_query($convert->truncate_statement . BOTS_TABLE);
-
-	$sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name_clean = 'bots'";
-	$result = $db->sql_query($sql);
-	$group_id = (int) $db->sql_fetchfield('group_id', $result);
-	$db->sql_freeresult($result);
-
-	if (!$group_id)
-	{
-		add_default_groups();
-
-		$sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name_clean = 'bots'";
-		$result = $db->sql_query($sql);
-		$group_id = (int) $db->sql_fetchfield('group_id', $result);
-		$db->sql_freeresult($result);
-
-		if (!$group_id)
-		{
-			global $install;
-			$install->error($user->lang['CONV_ERROR_INCONSISTENT_GROUPS'], __LINE__, __FILE__);
-		}
-	}
-
-	$bots = array(
-		'AdsBot [Google]'			=> array('AdsBot-Google', ''),
-		'Alexa [Bot]'				=> array('ia_archiver', ''),
-		'Alta Vista [Bot]'			=> array('Scooter/', ''),
-		'Ask Jeeves [Bot]'			=> array('Ask Jeeves', ''),
-		'Baidu [Spider]'			=> array('Baiduspider+(', ''),
-		'Exabot [Bot]'				=> array('Exabot/', ''),
-		'FAST Enterprise [Crawler]'	=> array('FAST Enterprise Crawler', ''),
-		'FAST WebCrawler [Crawler]'	=> array('FAST-WebCrawler/', ''),
-		'Francis [Bot]'				=> array('http://www.neomo.de/', ''),
-		'Gigabot [Bot]'				=> array('Gigabot/', ''),
-		'Google Adsense [Bot]'		=> array('Mediapartners-Google', ''),
-		'Google Desktop'			=> array('Google Desktop', ''),
-		'Google Feedfetcher'		=> array('Feedfetcher-Google', ''),
-		'Google [Bot]'				=> array('Googlebot', ''),
-		'Heise IT-Markt [Crawler]'	=> array('heise-IT-Markt-Crawler', ''),
-		'Heritrix [Crawler]'		=> array('heritrix/1.', ''),
-		'IBM Research [Bot]'		=> array('ibm.com/cs/crawler', ''),
-		'ICCrawler - ICjobs'		=> array('ICCrawler - ICjobs', ''),
-		'ichiro [Crawler]'			=> array('ichiro/2', ''),
-		'Majestic-12 [Bot]'			=> array('MJ12bot/', ''),
-		'Metager [Bot]'				=> array('MetagerBot/', ''),
-		'MSN NewsBlogs'				=> array('msnbot-NewsBlogs/', ''),
-		'MSN [Bot]'					=> array('msnbot/', ''),
-		'MSNbot Media'				=> array('msnbot-media/', ''),
-		'NG-Search [Bot]'			=> array('NG-Search/', ''),
-		'Nutch [Bot]'				=> array('http://lucene.apache.org/nutch/', ''),
-		'Nutch/CVS [Bot]'			=> array('NutchCVS/', ''),
-		'OmniExplorer [Bot]'		=> array('OmniExplorer_Bot/', ''),
-		'Online link [Validator]'	=> array('online link validator', ''),
-		'psbot [Picsearch]'			=> array('psbot/0', ''),
-		'Seekport [Bot]'			=> array('Seekbot/', ''),
-		'Sensis [Crawler]'			=> array('Sensis Web Crawler', ''),
-		'SEO Crawler'				=> array('SEO search Crawler/', ''),
-		'Seoma [Crawler]'			=> array('Seoma [SEO Crawler]', ''),
-		'SEOSearch [Crawler]'		=> array('SEOsearch/', ''),
-		'Snappy [Bot]'				=> array('Snappy/1.1 ( http://www.urltrends.com/ )', ''),
-		'Steeler [Crawler]'			=> array('http://www.tkl.iis.u-tokyo.ac.jp/~crawler/', ''),
-		'Synoo [Bot]'				=> array('SynooBot/', ''),
-		'Telekom [Bot]'				=> array('crawleradmin.t-info@telekom.de', ''),
-		'TurnitinBot [Bot]'			=> array('TurnitinBot/', ''),
-		'Voyager [Bot]'				=> array('voyager/1.0', ''),
-		'W3 [Sitesearch]'			=> array('W3 SiteSearch Crawler', ''),
-		'W3C [Linkcheck]'			=> array('W3C-checklink/', ''),
-		'W3C [Validator]'			=> array('W3C_*Validator', ''),
-		'WiseNut [Bot]'				=> array('http://www.WISEnutbot.com', ''),
-		'YaCy [Bot]'				=> array('yacybot', ''),
-		'Yahoo MMCrawler [Bot]'		=> array('Yahoo-MMCrawler/', ''),
-		'Yahoo Slurp [Bot]'			=> array('Yahoo! DE Slurp', ''),
-		'Yahoo [Bot]'				=> array('Yahoo! Slurp', ''),
-		'YahooSeeker [Bot]'			=> array('YahooSeeker/', ''),
-	);
-
-	if (!function_exists('user_add'))
-	{
-		include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-	}
-
-	foreach ($bots as $bot_name => $bot_ary)
-	{
-		$user_row = array(
-			'user_type'				=> phpbb::USER_IGNORE,
-			'group_id'				=> $group_id,
-			'username'				=> $bot_name,
-			'user_regdate'			=> time(),
-			'user_password'			=> '',
-			'user_colour'			=> '9E8DA7',
-			'user_email'			=> '',
-			'user_lang'				=> phpbb::$config['default_lang'],
-			'user_style'			=> 1,
-			'user_timezone'			=> 0,
-			'user_allow_massemail'	=> 0,
-		);
-
-		$user_id = user_add($user_row);
-
-		if ($user_id)
-		{
-			$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $db->sql_build_array('INSERT', array(
-				'bot_active'	=> 1,
-				'bot_name'		=> $bot_name,
-				'user_id'		=> $user_id,
-				'bot_agent'		=> $bot_ary[0],
-				'bot_ip'		=> $bot_ary[1])
-			);
-			$db->sql_query($sql);
-		}
-	}
-}
-
-/**
-* Update any dynamic configuration variables after the conversion is finished
-* @todo Confirm that this updates all relevant values since it has not necessarily been kept in sync with all changes
-*/
-function update_dynamic_config()
-{
-	global $db;
-
-	// Get latest username
-	$sql = 'SELECT user_id, username, user_colour
-		FROM ' . USERS_TABLE . '
-		WHERE user_type IN (' . phpbb::USER_NORMAL . ', ' . phpbb::USER_FOUNDER . ')';
-
-	if (!empty(phpbb::$config['increment_user_id']))
-	{
-		$sql .= ' AND user_id <> ' . phpbb::$config['increment_user_id'];
-	}
-
-	$sql .= ' ORDER BY user_id DESC';
-
-	$result = $db->sql_query_limit($sql, 1);
-	$row = $db->sql_fetchrow($result);
-	$db->sql_freeresult($result);
-
-	if ($row)
-	{
-		set_config('newest_user_id', $row['user_id'], true);
-		set_config('newest_username', $row['username'], true);
-		set_config('newest_user_colour', $row['user_colour'], true);
-	}
-
-//	Also do not reset record online user/date. There will be old data or the fresh data from the schema.
-//	set_config('record_online_users', 1, true);
-//	set_config('record_online_date', time(), true);
-
-	$sql = 'SELECT COUNT(post_id) AS stat
-		FROM ' . POSTS_TABLE . '
-		WHERE post_approved = 1';
-	$result = $db->sql_query($sql);
-	$row = $db->sql_fetchrow($result);
-	$db->sql_freeresult($result);
-
-	set_config('num_posts', (int) $row['stat'], true);
-
-	$sql = 'SELECT COUNT(topic_id) AS stat
-		FROM ' . TOPICS_TABLE . '
-		WHERE topic_approved = 1';
-	$result = $db->sql_query($sql);
-	$row = $db->sql_fetchrow($result);
-	$db->sql_freeresult($result);
-
-	set_config('num_topics', (int) $row['stat'], true);
-
-	$sql = 'SELECT COUNT(user_id) AS stat
-		FROM ' . USERS_TABLE . '
-		WHERE user_type IN (' . phpbb::USER_NORMAL . ',' . phpbb::USER_FOUNDER . ')';
-	$result = $db->sql_query($sql);
-	$row = $db->sql_fetchrow($result);
-	$db->sql_freeresult($result);
-
-	set_config('num_users', (int) $row['stat'], true);
-
-	$sql = 'SELECT COUNT(attach_id) as stat
-		FROM ' . ATTACHMENTS_TABLE . '
-		WHERE is_orphan = 0';
-	$result = $db->sql_query($sql);
-	set_config('num_files', (int) $db->sql_fetchfield('stat'), true);
-	$db->sql_freeresult($result);
-
-	$sql = 'SELECT SUM(filesize) as stat
-		FROM ' . ATTACHMENTS_TABLE . '
-		WHERE is_orphan = 0';
-	$result = $db->sql_query($sql);
-	set_config('upload_dir_size', (float) $db->sql_fetchfield('stat'), true);
-	$db->sql_freeresult($result);
-
-	/**
-	* We do not resync users post counts - this can be done by the admin after conversion if wanted.
-	$sql = 'SELECT COUNT(post_id) AS num_posts, poster_id
-		FROM ' . POSTS_TABLE . '
-		WHERE post_postcount = 1
-		GROUP BY poster_id';
-	$result = $db->sql_query($sql);
-
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$db->sql_query('UPDATE ' . USERS_TABLE . " SET user_posts = {$row['num_posts']} WHERE user_id = {$row['poster_id']}");
-	}
-	$db->sql_freeresult($result);
-	*/
-}
-
-/**
-* Updates topics_posted entries
-*/
-function update_topics_posted()
-{
-	global $db;
-
-	if ($db->truncate)
-	{
-		$db->sql_query('DELETE FROM ' . TOPICS_POSTED_TABLE);
-	}
-	else
-	{
-		$db->sql_query('TRUNCATE TABLE ' . TOPICS_POSTED_TABLE);
-	}
-
-	// This can get really nasty... therefore we only do the last six months
-	$get_from_time = time() - (6 * 4 * 7 * 24 * 60 * 60);
-
-	// Select forum ids, do not include categories
-	$sql = 'SELECT forum_id
-		FROM ' . FORUMS_TABLE . '
-		WHERE forum_type <> ' . FORUM_CAT;
-	$result = $db->sql_query($sql);
-
-	$forum_ids = array();
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$forum_ids[] = $row['forum_id'];
-	}
-	$db->sql_freeresult($result);
-
-	// Any global announcements? ;)
-	$forum_ids[] = 0;
-
-	// Now go through the forums and get us some topics...
-	foreach ($forum_ids as $forum_id)
-	{
-		$sql = 'SELECT p.poster_id, p.topic_id
-			FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t
-			WHERE t.forum_id = ' . $forum_id . '
-				AND t.topic_moved_id = 0
-				AND t.topic_last_post_time > ' . $get_from_time . '
-				AND t.topic_id = p.topic_id
-				AND p.poster_id <> ' . ANONYMOUS . '
-			GROUP BY p.poster_id, p.topic_id';
-		$result = $db->sql_query($sql);
-
-		$posted = array();
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$posted[$row['poster_id']][] = $row['topic_id'];
-		}
-		$db->sql_freeresult($result);
-
-		$sql_ary = array();
-		foreach ($posted as $user_id => $topic_row)
-		{
-			foreach ($topic_row as $topic_id)
-			{
-				$sql_ary[] = array(
-					'user_id'		=> (int) $user_id,
-					'topic_id'		=> (int) $topic_id,
-					'topic_posted'	=> 1,
-				);
-			}
-		}
-		unset($posted);
-
-		if (sizeof($sql_ary))
-		{
-			$db->sql_multi_insert(TOPICS_POSTED_TABLE, $sql_ary);
-		}
-	}
-}
-
-/**
-* Ensure that all users have a default group specified and update related information such as their colour
-*/
-function fix_empty_primary_groups()
-{
-	global $db;
-
-	// Set group ids for users not already having it
-	$sql = 'UPDATE ' . USERS_TABLE . ' SET group_id = ' . get_group_id('registered') . '
-		WHERE group_id = 0 AND user_type = ' . phpbb::USER_INACTIVE;
-	$db->sql_query($sql);
-
-	$sql = 'UPDATE ' . USERS_TABLE . ' SET group_id = ' . get_group_id('registered') . '
-		WHERE group_id = 0 AND user_type = ' . phpbb::USER_NORMAL;
-	$db->sql_query($sql);
-
-	$db->sql_query('UPDATE ' . USERS_TABLE . ' SET group_id = ' . get_group_id('guests') . ' WHERE user_id = ' . ANONYMOUS);
-
-	$sql = 'SELECT user_id FROM ' . USER_GROUP_TABLE . ' WHERE group_id = ' . get_group_id('administrators');
-	$result = $db->sql_query($sql);
-
-	$user_ids = array();
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$user_ids[] = $row['user_id'];
-	}
-	$db->sql_freeresult($result);
-
-	if (sizeof($user_ids))
-	{
-		$db->sql_query('UPDATE ' . USERS_TABLE . ' SET group_id = ' . get_group_id('administrators') . '
-			WHERE group_id = 0 AND ' . $db->sql_in_set('user_id', $user_ids));
-	}
-
-	$sql = 'SELECT user_id FROM ' . USER_GROUP_TABLE . ' WHERE group_id = ' . get_group_id('global_moderators');
-
-	$user_ids = array();
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$user_ids[] = $row['user_id'];
-	}
-	$db->sql_freeresult($result);
-
-	if (sizeof($user_ids))
-	{
-		$db->sql_query('UPDATE ' . USERS_TABLE . ' SET group_id = ' . get_group_id('global_moderators') . '
-			WHERE group_id = 0 AND ' . $db->sql_in_set('user_id', $user_ids));
-	}
-
-	// Set user colour
-	$sql = 'SELECT group_id, group_colour FROM ' . GROUPS_TABLE . "
-		WHERE group_colour <> ''";
-	$result = $db->sql_query($sql);
-
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$db->sql_query('UPDATE ' . USERS_TABLE . " SET user_colour = '{$row['group_colour']}' WHERE group_id = {$row['group_id']}");
-	}
-	$db->sql_freeresult($result);
-}
-
-/**
-* Cleanly remove invalid user entries after converting the users table...
-*/
-function remove_invalid_users()
-{
-	global $convert, $db;
-
-	// username_clean is UNIQUE
-	$sql = 'SELECT user_id
-		FROM ' . USERS_TABLE . "
-		WHERE username_clean = ''";
-	$result = $db->sql_query($sql);
-	$row = $db->sql_fetchrow($result);
-	$db->sql_freeresult($result);
-
-	if ($row)
-	{
-		if (!function_exists('user_delete'))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-		}
-
-		user_delete('remove', $row['user_id']);
-	}
-}
-
-function convert_bbcode($message, $convert_size = true, $extended_bbcodes = false)
-{
-	static $orig, $repl, $origx, $replx, $str_from, $str_to;
-
-	if (empty($orig))
-	{
-		$orig = $repl = array();
-
-		$orig[] = '#\[(php|sql)\](.*?)\[/(php|sql)\]#is';
-		$repl[] = '[code]\2[/code]';
-
-		$orig[] = '#\[font=[^\]]+\](.*?)\[/font\]#is';
-		$repl[] = '\1';
-
-		$orig[] = '#\[align=[a-z]+\](.*?)\[/align\]#is';
-		$repl[] = '\1';
-
-		$orig[] = '#\[/list=.*?\]#is';
-		$repl[] = '[/list]';
-
-		$origx = array(
-			'#\[glow[^\]]+\](.*?)\[/glow\]#is',
-			'#\[shadow[^\]]+\](.*?)\[/shadow\]#is',
-			'#\[flash[^\]]+\](.*?)\[/flash\]#is'
-		);
-
-		$replx = array(
-			'\1',
-			'\1',
-			'[url=\1]Flash[/url]'
-		);
-
-		$str_from = array(
-			'[ftp]',	'[/ftp]',
-			'[ftp=',	'[/ftp]',
-			'[pre]',	'[/pre]',
-			'[table]',	'[/table]',
-			'[td]',		'[/td]',
-			'[tr]',		'[/tr]',
-			'[s]',		'[/s]',
-			'[left]',	'[/left]',
-			'[right]',	'[/right]',
-			'[center]',	'[/center]',
-			'[sub]',	'[/sub]',
-			'[sup]',	'[/sup]',
-			'[tt]',		'[/tt]',
-			'[move]',	'[/move]',
-			'[hr]'
-		);
-
-		$str_to = array(
-			'[url]',	'[/url]',
-			'[url=',	'[/url]',
-			'[code]',	'[/code]',
-			"\n",		'',
-			'',			'',
-			"\n",		'',
-			'',			'',
-			'',			'',
-			'',			'',
-			'',			'',
-			'',			'',
-			'',			'',
-			'',			'',
-			'',			'',
-			"\n\n"
-		);
-
-		for ($i = 0; $i < sizeof($str_from); ++$i)
-		{
-			$origx[] = '#\\' . str_replace(']', '\\]', $str_from[$i]) . '#is';
-			$replx[] = $str_to[$i];
-		}
-	}
-
-	if (preg_match_all('#\[email=([^\]]+)\](.*?)\[/email\]#i', $message, $m))
-	{
-		for ($i = 0; $i < sizeof($m[1]); ++$i)
-		{
-			if ($m[1][$i] == $m[2][$i])
-			{
-				$message = str_replace($m[0][$i], '[email]' . $m[1][$i] . '[/email]', $message);
-			}
-			else
-			{
-				$message = str_replace($m[0][$i], $m[2][$i] . ' ([email]' . $m[1][$i] . '[/email])', $message);
-			}
-		}
-	}
-
-	if ($convert_size && preg_match('#\[size=[0-9]+\].*?\[/size\]#i', $message))
-	{
-		$size = array(9, 9, 12, 15, 18, 24, 29, 29, 29, 29);
-		$message = preg_replace('#\[size=([0-9]+)\](.*?)\[/size\]#i', '[size=\1]\2[/size]', $message);
-		$message = preg_replace('#\[size=[0-9]{2,}\](.*?)\[/size\]#i', '[size=29]\1[/size]', $message);
-
-		for ($i = sizeof($size); $i; )
-		{
-			$i--;
-			$message = str_replace('[size=' . $i . ']', '[size=' . $size[$i] . ']', $message);
-		}
-	}
-
-	if ($extended_bbcodes)
-	{
-		$message = preg_replace($origx, $replx, $message);
-	}
-
-	$message = preg_replace($orig, $repl, $message);
-	return $message;
-}
-
-
-function copy_file($src, $trg, $overwrite = false, $die_on_failure = true, $source_relative_path = true)
-{
-	global $convert, $user, $db;
-
-	if (substr($trg, -1) == '/')
-	{
-		$trg .= basename($src);
-	}
-	$src_path = relative_base($src, $source_relative_path, __LINE__, __FILE__);
-	$trg_path = $trg;
-
-	if (!$overwrite && @file_exists($trg_path))
-	{
-		return true;
-	}
-
-	if (!@file_exists($src_path))
-	{
-		return;
-	}
-
-	$path = PHPBB_ROOT_PATH;
-	$parts = explode('/', $trg);
-	unset($parts[sizeof($parts) - 1]);
-
-	for ($i = 0; $i < sizeof($parts); ++$i)
-	{
-		$path .= $parts[$i] . '/';
-
-		if (!is_dir($path))
-		{
-			@mkdir($path, 0777);
-		}
-	}
-
-	if (!is_writable($path))
-	{
-		@chmod($path, 0777);
-	}
-
-	if (!@copy($src_path, PHPBB_ROOT_PATH . $trg_path))
-	{
-		$convert->p_master->error(sprintf($user->lang['COULD_NOT_COPY'], $src_path, PHPBB_ROOT_PATH . $trg_path), __LINE__, __FILE__, !$die_on_failure);
-		return;
-	}
-
-	if ($perm = @fileperms($src_path))
-	{
-		@chmod(PHPBB_ROOT_PATH . $trg_path, $perm);
-	}
-
-	return true;
-}
-
-function copy_dir($src, $trg, $copy_subdirs = true, $overwrite = false, $die_on_failure = true, $source_relative_path = true)
-{
-	global $convert, $user, $db;
-
-	$dirlist = $filelist = $bad_dirs = array();
-	$src = path($src, $source_relative_path);
-	$trg = path($trg);
-	$src_path = relative_base($src, $source_relative_path, __LINE__, __FILE__);
-	$trg_path = PHPBB_ROOT_PATH . $trg;
-
-	if (!is_dir($trg_path))
-	{
-		@mkdir($trg_path, 0777);
-		@chmod($trg_path, 0777);
-	}
-
-	if (!@is_writable($trg_path))
-	{
-		$bad_dirs[] = path(phpbb::$config['script_path']) . $trg;
-	}
-
-	if ($handle = @opendir($src_path))
-	{
-		while ($entry = readdir($handle))
-		{
-			if ($entry[0] == '.' || $entry == 'CVS' || $entry == 'index.htm')
-			{
-				continue;
-			}
-
-			if (is_dir($src_path . $entry))
-			{
-				$dirlist[] = $entry;
-			}
-			else
-			{
-				$filelist[] = $entry;
-			}
-		}
-		closedir($handle);
-	}
-	else if ($dir = @dir($src_path))
-	{
-		while ($entry = $dir->read())
-		{
-			if ($entry[0] == '.' || $entry == 'CVS' || $entry == 'index.htm')
-			{
-				continue;
-			}
-
-			if (is_dir($src_path . $entry))
-			{
-				$dirlist[] = $entry;
-			}
-			else
-			{
-				$filelist[] = $entry;
-			}
-		}
-		$dir->close();
-	}
-	else
-	{
-		$convert->p_master->error(sprintf($user->lang['CONV_ERROR_COULD_NOT_READ'], relative_base($src, $source_relative_path)), __LINE__, __FILE__);
-	}
-
-	if ($copy_subdirs)
-	{
-		for ($i = 0; $i < sizeof($dirlist); ++$i)
-		{
-			$dir = $dirlist[$i];
-
-			if ($dir == 'CVS')
-			{
-				continue;
-			}
-
-			if (!is_dir($trg_path . $dir))
-			{
-				@mkdir($trg_path . $dir, 0777);
-				@chmod($trg_path . $dir, 0777);
-			}
-
-			if (!@is_writable($trg_path . $dir))
-			{
-				$bad_dirs[] = $trg . $dir;
-				$bad_dirs[] = $trg_path . $dir;
-			}
-
-			if (!sizeof($bad_dirs))
-			{
-				copy_dir($src . $dir, $trg . $dir, true, $overwrite, $die_on_failure, $source_relative_path);
-			}
-		}
-	}
-
-	if (sizeof($bad_dirs))
-	{
-		$str = (sizeof($bad_dirs) == 1) ? $user->lang['MAKE_FOLDER_WRITABLE'] : $user->lang['MAKE_FOLDERS_WRITABLE'];
-		sort($bad_dirs);
-		$convert->p_master->error(sprintf($str, implode('<br />', $bad_dirs)), __LINE__, __FILE__);
-	}
-
-	for ($i = 0; $i < sizeof($filelist); ++$i)
-	{
-		copy_file($src . $filelist[$i], $trg . $filelist[$i], $overwrite, $die_on_failure, $source_relative_path);
-	}
-}
-
-function relative_base($path, $is_relative = true, $line = false, $file = false)
-{
-	global $convert, $user, $db;
-
-	if (!$is_relative)
-	{
-		return $path;
-	}
-
-	if (empty($convert->options['forum_path']) && $is_relative)
-	{
-		$line = $line ? $line : __LINE__;
-		$file = $file ? $file : __FILE__;
-
-		$convert->p_master->error($user->lang['CONV_ERROR_NO_FORUM_PATH'], $line, $file);
-	}
-
-	return $convert->options['forum_path'] . '/' . $path;
-}
-
-function get_smiley_display()
-{
-	static $smiley_count = 0;
-	$smiley_count++;
-	return ($smiley_count < 50) ? 1 : 0;
-}
-
-
-function fill_dateformat($user_dateformat)
-{
-	return ((empty($user_dateformat)) ? phpbb::$config['default_dateformat'] : $user_dateformat);
-}
-
-
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
deleted file mode 100644
index cf12a60aec..0000000000
--- a/phpBB/includes/functions_display.php
+++ /dev/null
@@ -1,1202 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Display Forums
-*/
-function display_forums($root_data = '', $display_moderators = true, $return_moderators = false)
-{
-	$forum_rows = $subforums = $forum_ids = $forum_ids_moderator = $forum_moderators = $active_forum_ary = array();
-	$parent_id = $visible_forums = 0;
-	$sql_from = '';
-
-	// Mark forums read?
-	$mark_read = request_var('mark', '');
-
-	if ($mark_read == 'all')
-	{
-		$mark_read = '';
-	}
-
-	if (!$root_data)
-	{
-		if ($mark_read == 'forums')
-		{
-			$mark_read = 'all';
-		}
-
-		$root_data = array('forum_id' => 0);
-		$sql_where = '';
-	}
-	else
-	{
-		$sql_where = 'left_id > ' . $root_data['left_id'] . ' AND left_id < ' . $root_data['right_id'];
-	}
-
-	// Display list of active topics for this category?
-	$show_active = (isset($root_data['forum_flags']) && ($root_data['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS)) ? true : false;
-
-	$sql_array = array(
-		'SELECT'	=> 'f.*',
-		'FROM'		=> array(
-			FORUMS_TABLE		=> 'f'
-		),
-		'LEFT_JOIN'	=> array(),
-	);
-
-	if (phpbb::$config['load_db_lastread'] && phpbb::$user->is_registered)
-	{
-		$sql_array['LEFT_JOIN'][] = array('FROM' => array(FORUMS_TRACK_TABLE => 'ft'), 'ON' => 'ft.user_id = ' . phpbb::$user->data['user_id'] . ' AND ft.forum_id = f.forum_id');
-		$sql_array['SELECT'] .= ', ft.mark_time';
-	}
-	else if (phpbb::$config['load_anon_lastread'] || phpbb::$user->is_registered)
-	{
-		$tracking_topics = request::variable(phpbb::$config['cookie_name'] . '_track', '', false, request::COOKIE);
-		$tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array();
-
-		if (!phpbb::$user->is_registered)
-		{
-			phpbb::$user->data['user_lastmark'] = (isset($tracking_topics['l'])) ? (int) (base_convert($tracking_topics['l'], 36, 10) + phpbb::$config['board_startdate']) : 0;
-		}
-	}
-
-	if ($show_active)
-	{
-		$sql_array['LEFT_JOIN'][] = array(
-			'FROM'	=> array(FORUMS_ACCESS_TABLE => 'fa'),
-			'ON'	=> "fa.forum_id = f.forum_id AND fa.session_id = '" . phpbb::$db->sql_escape(phpbb::$user->session_id) . "'"
-		);
-
-		$sql_array['SELECT'] .= ', fa.user_id';
-	}
-
-	$sql = phpbb::$db->sql_build_query('SELECT', array(
-		'SELECT'	=> $sql_array['SELECT'],
-		'FROM'		=> $sql_array['FROM'],
-		'LEFT_JOIN'	=> $sql_array['LEFT_JOIN'],
-
-		'WHERE'		=> $sql_where,
-
-		'ORDER_BY'	=> 'f.left_id',
-	));
-
-	$result = phpbb::$db->sql_query($sql);
-
-	$forum_tracking_info = array();
-	$branch_root_id = $root_data['forum_id'];
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$forum_id = $row['forum_id'];
-
-		// Mark forums read?
-		if ($mark_read == 'forums' || $mark_read == 'all')
-		{
-			if (phpbb::$acl->acl_get('f_list', $forum_id))
-			{
-				$forum_ids[] = $forum_id;
-				continue;
-			}
-		}
-
-		// Category with no members
-		if ($row['forum_type'] == FORUM_CAT && ($row['left_id'] + 1 == $row['right_id']))
-		{
-			continue;
-		}
-
-		// Skip branch
-		if (isset($right_id))
-		{
-			if ($row['left_id'] < $right_id)
-			{
-				continue;
-			}
-			unset($right_id);
-		}
-
-		if (!phpbb::$acl->acl_get('f_list', $forum_id))
-		{
-			// if the user does not have permissions to list this forum, skip everything until next branch
-			$right_id = $row['right_id'];
-			continue;
-		}
-
-		$forum_ids[] = $forum_id;
-
-		if (phpbb::$config['load_db_lastread'] && phpbb::$user->is_registered)
-		{
-			$forum_tracking_info[$forum_id] = (!empty($row['mark_time'])) ? $row['mark_time'] : phpbb::$user->data['user_lastmark'];
-		}
-		else if (phpbb::$config['load_anon_lastread'] || phpbb::$user->is_registered)
-		{
-			if (!phpbb::$user->is_registered)
-			{
-				phpbb::$user->data['user_lastmark'] = (isset($tracking_topics['l'])) ? (int) (base_convert($tracking_topics['l'], 36, 10) + phpbb::$config['board_startdate']) : 0;
-			}
-			$forum_tracking_info[$forum_id] = (isset($tracking_topics['f'][$forum_id])) ? (int) (base_convert($tracking_topics['f'][$forum_id], 36, 10) + phpbb::$config['board_startdate']) : phpbb::$user->data['user_lastmark'];
-		}
-
-		$row['forum_topics'] = (phpbb::$acl->acl_get('m_approve', $forum_id)) ? $row['forum_topics_real'] : $row['forum_topics'];
-
-		// Display active topics from this forum?
-		if ($show_active && $row['forum_type'] == FORUM_POST && phpbb::$acl->acl_get('f_read', $forum_id) && ($row['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS))
-		{
-			if (!isset($active_forum_ary['forum_topics']))
-			{
-				$active_forum_ary['forum_topics'] = 0;
-			}
-
-			if (!isset($active_forum_ary['forum_posts']))
-			{
-				$active_forum_ary['forum_posts'] = 0;
-			}
-
-			$active_forum_ary['forum_id'][]		= $forum_id;
-			$active_forum_ary['enable_icons'][]	= $row['enable_icons'];
-			$active_forum_ary['forum_topics']	+= $row['forum_topics'];
-			$active_forum_ary['forum_posts']	+= $row['forum_posts'];
-
-			// If this is a passworded forum we do not show active topics from it if the user is not authorised to view it...
-			if ($row['forum_password'] && $row['user_id'] != phpbb::$user->data['user_id'])
-			{
-				$active_forum_ary['exclude_forum_id'][] = $forum_id;
-			}
-		}
-
-		//
-		if ($row['parent_id'] == $root_data['forum_id'] || $row['parent_id'] == $branch_root_id)
-		{
-			if ($row['forum_type'] != FORUM_CAT)
-			{
-				$forum_ids_moderator[] = (int) $forum_id;
-			}
-
-			// Direct child of current branch
-			$parent_id = $forum_id;
-			$forum_rows[$forum_id] = $row;
-
-			if ($row['forum_type'] == FORUM_CAT && $row['parent_id'] == $root_data['forum_id'])
-			{
-				$branch_root_id = $forum_id;
-			}
-			$forum_rows[$parent_id]['forum_id_last_post'] = $row['forum_id'];
-			$forum_rows[$parent_id]['orig_forum_last_post_time'] = $row['forum_last_post_time'];
-		}
-		else if ($row['forum_type'] != FORUM_CAT)
-		{
-			$subforums[$parent_id][$forum_id]['display'] = ($row['display_on_index']) ? true : false;
-			$subforums[$parent_id][$forum_id]['name'] = $row['forum_name'];
-			$subforums[$parent_id][$forum_id]['orig_forum_last_post_time'] = $row['forum_last_post_time'];
-			$subforums[$parent_id][$forum_id]['children'] = array();
-
-			if (isset($subforums[$parent_id][$row['parent_id']]) && !$row['display_on_index'])
-			{
-				$subforums[$parent_id][$row['parent_id']]['children'][] = $forum_id;
-			}
-
-			$forum_rows[$parent_id]['forum_topics'] += $row['forum_topics'];
-
-			// Do not list redirects in LINK Forums as Posts.
-			if ($row['forum_type'] != FORUM_LINK)
-			{
-				$forum_rows[$parent_id]['forum_posts'] += $row['forum_posts'];
-			}
-
-			if ($row['forum_last_post_time'] > $forum_rows[$parent_id]['forum_last_post_time'])
-			{
-				$forum_rows[$parent_id]['forum_last_post_id'] = $row['forum_last_post_id'];
-				$forum_rows[$parent_id]['forum_last_post_subject'] = $row['forum_last_post_subject'];
-				$forum_rows[$parent_id]['forum_last_post_time'] = $row['forum_last_post_time'];
-				$forum_rows[$parent_id]['forum_last_poster_id'] = $row['forum_last_poster_id'];
-				$forum_rows[$parent_id]['forum_last_poster_name'] = $row['forum_last_poster_name'];
-				$forum_rows[$parent_id]['forum_last_poster_colour'] = $row['forum_last_poster_colour'];
-				$forum_rows[$parent_id]['forum_id_last_post'] = $forum_id;
-			}
-		}
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	// Handle marking posts
-	if ($mark_read == 'forums' || $mark_read == 'all')
-	{
-		$redirect = phpbb::$url->build_url(array('mark', 'hash'));
-		$token = request_var('hash', '');
-
-		if (phpbb::$security->check_link($token, 'global'))
-		{
-			if ($mark_read == 'all')
-			{
-				markread('all');
-				$message = phpbb::$user->lang('RETURN_INDEX', '<a href="' . $redirect . '">', '</a>');
-			}
-			else
-			{
-				markread('topics', $forum_ids);
-				$message = phpbb::$user->lang('RETURN_FORUM', '<a href="' . $redirect . '">', '</a>');
-			}
-			meta_refresh(3, $redirect);
-			trigger_error(phpbb::$user->lang['FORUMS_MARKED'] . '<br /><br />' . $message);
-		}
-		else
-		{
-			$message = phpbb::$user->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>');
-			phpbb::$url->meta_refresh(3, $redirect);
-			trigger_error($message);
-		}
-	}
-
-	// Grab moderators ... if necessary
-	if ($display_moderators)
-	{
-		if ($return_moderators)
-		{
-			$forum_ids_moderator[] = $root_data['forum_id'];
-		}
-		get_moderators($forum_moderators, $forum_ids_moderator);
-	}
-
-	// Used to tell whatever we have to create a dummy category or not.
-	$last_catless = true;
-	foreach ($forum_rows as $row)
-	{
-		// Empty category
-		if ($row['parent_id'] == $root_data['forum_id'] && $row['forum_type'] == FORUM_CAT)
-		{
-			phpbb::$template->assign_block_vars('forumrow', array(
-				'S_IS_CAT'				=> true,
-				'FORUM_ID'				=> $row['forum_id'],
-				'FORUM_NAME'			=> $row['forum_name'],
-				'FORUM_DESC'			=> generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield'], $row['forum_desc_options']),
-				'FORUM_FOLDER_IMG'		=> '',
-				'FORUM_FOLDER_IMG_SRC'	=> '',
-				'FORUM_IMAGE'			=> ($row['forum_image']) ? '<img src="' . PHPBB_ROOT_PATH . $row['forum_image'] . '" alt="' . phpbb::$user->lang['FORUM_CAT'] . '" />' : '',
-				'FORUM_IMAGE_SRC'		=> ($row['forum_image']) ? PHPBB_ROOT_PATH . $row['forum_image'] : '',
-				'U_VIEWFORUM'			=> phpbb::$url->append_sid('viewforum', 'f=' . $row['forum_id']),
-			));
-
-			continue;
-		}
-
-		$visible_forums++;
-		$forum_id = $row['forum_id'];
-
-		$forum_unread = (isset($forum_tracking_info[$forum_id]) && $row['orig_forum_last_post_time'] > $forum_tracking_info[$forum_id]) ? true : false;
-
-		$folder_image = $folder_alt = $l_subforums = '';
-		$subforums_list = array();
-
-		// Generate list of subforums if we need to
-		if (isset($subforums[$forum_id]))
-		{
-			foreach ($subforums[$forum_id] as $subforum_id => $subforum_row)
-			{
-				$subforum_unread = (isset($forum_tracking_info[$subforum_id]) && $subforum_row['orig_forum_last_post_time'] > $forum_tracking_info[$subforum_id]) ? true : false;
-
-				if (!$subforum_unread && !empty($subforum_row['children']))
-				{
-					foreach ($subforum_row['children'] as $child_id)
-					{
-						if (isset($forum_tracking_info[$child_id]) && $subforums[$forum_id][$child_id]['orig_forum_last_post_time'] > $forum_tracking_info[$child_id])
-						{
-							// Once we found an unread child forum, we can drop out of this loop
-							$subforum_unread = true;
-							break;
-						}
-					}
-				}
-
-				if ($subforum_row['display'] && $subforum_row['name'])
-				{
-					$subforums_list[] = array(
-						'link'		=> phpbb::$url->append_sid('viewforum', 'f=' . $subforum_id),
-						'name'		=> $subforum_row['name'],
-						'unread'	=> $subforum_unread,
-					);
-				}
-				else
-				{
-					unset($subforums[$forum_id][$subforum_id]);
-				}
-
-				// If one subforum is unread the forum gets unread too...
-				if ($subforum_unread)
-				{
-					$forum_unread = true;
-				}
-			}
-
-			$folder_image = ($forum_unread) ? 'forum_unread_subforum' : 'forum_read_subforum';
-		}
-		else
-		{
-			switch ($row['forum_type'])
-			{
-				case FORUM_POST:
-					$folder_image = ($forum_unread) ? 'forum_unread' : 'forum_read';
-				break;
-
-				case FORUM_LINK:
-					$folder_image = 'forum_link';
-				break;
-			}
-		}
-
-		// Which folder should we display?
-		if ($row['forum_status'] == ITEM_LOCKED)
-		{
-			$folder_image = ($forum_unread) ? 'forum_unread_locked' : 'forum_read_locked';
-			$folder_alt = 'FORUM_LOCKED';
-		}
-		else
-		{
-			$folder_alt = ($forum_unread) ? 'NEW_POSTS' : 'NO_NEW_POSTS';
-		}
-
-		// Create last post link information, if appropriate
-		if ($row['forum_last_post_id'])
-		{
-			$last_post_subject = $row['forum_last_post_subject'];
-			$last_post_time = phpbb::$user->format_date($row['forum_last_post_time']);
-			$last_post_url = phpbb::$url->append_sid('viewtopic', 'f=' . $row['forum_id_last_post'] . '&amp;p=' . $row['forum_last_post_id']) . '#p' . $row['forum_last_post_id'];
-		}
-		else
-		{
-			$last_post_subject = $last_post_time = $last_post_url = '';
-		}
-
-		// Output moderator listing ... if applicable
-		$moderators_list = array();
-		if ($display_moderators && !empty($forum_moderators[$forum_id]))
-		{
-			$moderators_list = $forum_moderators[$forum_id];
-		}
-
-		$l_post_click_count = ($row['forum_type'] == FORUM_LINK) ? 'CLICKS' : 'POSTS';
-		$post_click_count = ($row['forum_type'] != FORUM_LINK || $row['forum_flags'] & FORUM_FLAG_LINK_TRACK) ? $row['forum_posts'] : '';
-
-		$s_subforums_list = array();
-		foreach ($subforums_list as $subforum)
-		{
-			$s_subforums_list[] = '<a href="' . $subforum['link'] . '" class="subforum ' . (($subforum['unread']) ? 'unread' : 'read') . '" title="' . (($subforum['unread']) ? phpbb::$user->lang['NEW_POSTS'] : phpbb::$user->lang['NO_NEW_POSTS']) . '">' . $subforum['name'] . '</a>';
-		}
-		$s_subforums_list = (string) implode(', ', $s_subforums_list);
-		$catless = ($row['parent_id'] == $root_data['forum_id']) ? true : false;
-
-		if ($row['forum_type'] != FORUM_LINK)
-		{
-			$u_viewforum = phpbb::$url->append_sid('viewforum', 'f=' . $row['forum_id']);
-		}
-		else
-		{
-			// If the forum is a link and we count redirects we need to visit it
-			// If the forum is having a password or no read access we do not expose the link, but instead handle it in viewforum
-			if (($row['forum_flags'] & FORUM_FLAG_LINK_TRACK) || $row['forum_password'] || !phpbb::$acl->acl_get('f_read', $forum_id))
-			{
-				$u_viewforum = phpbb::$url->append_sid('viewforum', 'f=' . $row['forum_id']);
-			}
-			else
-			{
-				$u_viewforum = $row['forum_link'];
-			}
-		}
-
-		phpbb::$template->assign_block_vars('forumrow', array(
-			'S_IS_CAT'			=> false,
-			'S_NO_CAT'			=> $catless && !$last_catless,
-			'S_IS_LINK'			=> ($row['forum_type'] == FORUM_LINK) ? true : false,
-			'S_UNREAD_FORUM'	=> $forum_unread,
-			'S_LOCKED_FORUM'	=> ($row['forum_status'] == ITEM_LOCKED) ? true : false,
-			'S_LIST_SUBFORUMS'	=> ($row['display_subforum_list']) ? true : false,
-			'S_SUBFORUMS'		=> (sizeof($subforums_list)) ? true : false,
-
-			'FORUM_ID'				=> $row['forum_id'],
-			'FORUM_NAME'			=> $row['forum_name'],
-			'FORUM_DESC'			=> generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield'], $row['forum_desc_options']),
-			'TOPICS'				=> $row['forum_topics'],
-			$l_post_click_count		=> $post_click_count,
-			'FORUM_FOLDER_IMG'		=> phpbb::$user->img($folder_image, $folder_alt),
-			'FORUM_FOLDER_IMG_SRC'	=> phpbb::$user->img($folder_image, $folder_alt, 'src'),
-			'FORUM_FOLDER_IMG_ALT'	=> isset(phpbb::$user->lang[$folder_alt]) ? phpbb::$user->lang[$folder_alt] : '',
-			'FORUM_IMAGE'			=> ($row['forum_image']) ? '<img src="' . PHPBB_ROOT_PATH . $row['forum_image'] . '" alt="' . phpbb::$user->lang[$folder_alt] . '" />' : '',
-			'FORUM_IMAGE_SRC'		=> ($row['forum_image']) ? PHPBB_ROOT_PATH . $row['forum_image'] : '',
-			'LAST_POST_SUBJECT'		=> censor_text($last_post_subject),
-			'LAST_POST_TIME'		=> $last_post_time,
-			'LAST_POSTER'			=> get_username_string('username', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),
-			'LAST_POSTER_COLOUR'	=> get_username_string('colour', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),
-			'LAST_POSTER_FULL'		=> get_username_string('full', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),
-			'MODERATORS'			=> implode(', ', $moderators_list),
-			'SUBFORUMS'				=> $s_subforums_list,
-
-			'L_SUBFORUM_STR'		=> phpbb::$user->lang('SUBFORUMS', sizeof($subforums_list)),
-			'L_FORUM_FOLDER_ALT'	=> $folder_alt,
-			'L_MODERATOR_STR'		=> phpbb::$user->lang('MODERATORS', sizeof($moderators_list)),
-
-			'U_VIEWFORUM'		=> $u_viewforum,
-			'U_LAST_POSTER'		=> get_username_string('profile', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),
-			'U_LAST_POST'		=> $last_post_url,
-		));
-
-		// Assign subforums loop for style authors
-		foreach ($subforums_list as $subforum)
-		{
-			phpbb::$template->assign_block_vars('forumrow.subforum', array(
-				'U_SUBFORUM'	=> $subforum['link'],
-				'SUBFORUM_NAME'	=> $subforum['name'],
-				'S_UNREAD'		=> $subforum['unread'],
-			));
-		}
-
-		$last_catless = $catless;
-	}
-
-	phpbb::$template->assign_vars(array(
-		'U_MARK_FORUMS'		=> (phpbb::$user->is_registered || phpbb::$config['load_anon_lastread']) ? phpbb::$url->append_sid('viewforum', 'hash=' . generate_link_hash('global') . '&amp;f=' . $root_data['forum_id'] . '&amp;mark=forums') : '',
-		'S_HAS_SUBFORUM'	=> ($visible_forums) ? true : false,
-		'L_SUBFORUM'		=> phpbb::$user->lang('SUBFORUMS', $visible_forums),
-		'LAST_POST_IMG'		=> phpbb::$user->img('icon_topic_latest', 'VIEW_LATEST_POST'),
-	));
-
-	if ($return_moderators)
-	{
-		return array($active_forum_ary, $forum_moderators);
-	}
-
-	return array($active_forum_ary, array());
-}
-
-/**
-* Create forum rules for given forum
-*/
-function generate_forum_rules(&$forum_data)
-{
-	if (!$forum_data['forum_rules'] && !$forum_data['forum_rules_link'])
-	{
-		return;
-	}
-
-	if ($forum_data['forum_rules'])
-	{
-		$forum_data['forum_rules'] = generate_text_for_display($forum_data['forum_rules'], $forum_data['forum_rules_uid'], $forum_data['forum_rules_bitfield'], $forum_data['forum_rules_options']);
-	}
-
-	phpbb::$template->assign_vars(array(
-		'S_FORUM_RULES'	=> true,
-		'U_FORUM_RULES'	=> $forum_data['forum_rules_link'],
-		'FORUM_RULES'	=> $forum_data['forum_rules'],
-	));
-}
-
-/**
-* Create forum navigation links for given forum, create parent
-* list if currently null, assign basic forum info to template
-*/
-function generate_forum_nav(&$forum_data)
-{
-	if (!phpbb::$acl->acl_get('f_list', $forum_data['forum_id']))
-	{
-		return;
-	}
-
-	// Get forum parents
-	$forum_parents = get_forum_parents($forum_data);
-
-	// Build navigation links
-	if (!empty($forum_parents))
-	{
-		foreach ($forum_parents as $parent_forum_id => $parent_data)
-		{
-			list($parent_name, $parent_type) = array_values($parent_data);
-
-			// Skip this parent if the user does not have the permission to view it
-			if (!phpbb::$acl->acl_get('f_list', $parent_forum_id))
-			{
-				continue;
-			}
-
-			phpbb::$template->assign_block_vars('navlinks', array(
-				'S_IS_CAT'		=> ($parent_type == FORUM_CAT) ? true : false,
-				'S_IS_LINK'		=> ($parent_type == FORUM_LINK) ? true : false,
-				'S_IS_POST'		=> ($parent_type == FORUM_POST) ? true : false,
-				'FORUM_NAME'	=> $parent_name,
-				'FORUM_ID'		=> $parent_forum_id,
-				'U_VIEW_FORUM'	=> phpbb::$url->append_sid('viewforum', 'f=' . $parent_forum_id),
-			));
-		}
-	}
-
-	phpbb::$template->assign_block_vars('navlinks', array(
-		'S_IS_CAT'		=> ($forum_data['forum_type'] == FORUM_CAT) ? true : false,
-		'S_IS_LINK'		=> ($forum_data['forum_type'] == FORUM_LINK) ? true : false,
-		'S_IS_POST'		=> ($forum_data['forum_type'] == FORUM_POST) ? true : false,
-		'FORUM_NAME'	=> $forum_data['forum_name'],
-		'FORUM_ID'		=> $forum_data['forum_id'],
-		'U_VIEW_FORUM'	=> phpbb::$url->append_sid('viewforum', 'f=' . $forum_data['forum_id']),
-	));
-
-	phpbb::$template->assign_vars(array(
-		'FORUM_ID' 		=> $forum_data['forum_id'],
-		'FORUM_NAME'	=> $forum_data['forum_name'],
-		'FORUM_DESC'	=> generate_text_for_display($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_bitfield'], $forum_data['forum_desc_options']),
-	));
-
-	return;
-}
-
-/**
-* Returns forum parents as an array. Get them from forum_data if available, or update the database otherwise
-*/
-function get_forum_parents(&$forum_data)
-{
-	$forum_parents = array();
-
-	if ($forum_data['parent_id'] > 0)
-	{
-		if ($forum_data['forum_parents'] == '')
-		{
-			$sql = 'SELECT forum_id, forum_name, forum_type
-				FROM ' . FORUMS_TABLE . '
-				WHERE left_id < ' . $forum_data['left_id'] . '
-					AND right_id > ' . $forum_data['right_id'] . '
-				ORDER BY left_id ASC';
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$forum_parents[$row['forum_id']] = array($row['forum_name'], (int) $row['forum_type']);
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			$forum_data['forum_parents'] = serialize($forum_parents);
-
-			$sql = 'UPDATE ' . FORUMS_TABLE . "
-				SET forum_parents = '" . phpbb::$db->sql_escape($forum_data['forum_parents']) . "'
-				WHERE parent_id = " . $forum_data['parent_id'];
-			phpbb::$db->sql_query($sql);
-		}
-		else
-		{
-			$forum_parents = unserialize($forum_data['forum_parents']);
-		}
-	}
-
-	return $forum_parents;
-}
-
-/**
-* Generate topic pagination
-*/
-function topic_generate_pagination($replies, $url)
-{
-	// Make sure $per_page is a valid value
-	$per_page = (phpbb::$config['posts_per_page'] <= 0) ? 1 : phpbb::$config['posts_per_page'];
-
-	if (($replies + 1) > $per_page)
-	{
-		$total_pages = ceil(($replies + 1) / $per_page);
-		$pagination = '';
-
-		$times = 1;
-		for ($j = 0; $j < $replies + 1; $j += $per_page)
-		{
-			$pagination .= '<a href="' . $url . '&amp;start=' . $j . '">' . $times . '</a>';
-			if ($times == 1 && $total_pages > 5)
-			{
-				$pagination .= ' ... ';
-
-				// Display the last three pages
-				$times = $total_pages - 3;
-				$j += ($total_pages - 4) * $per_page;
-			}
-			else if ($times < $total_pages)
-			{
-				$pagination .= '<span class="page-sep">' . phpbb::$user->lang['COMMA_SEPARATOR'] . '</span>';
-			}
-			$times++;
-		}
-	}
-	else
-	{
-		$pagination = '';
-	}
-
-	return $pagination;
-}
-
-/**
-* Obtain list of moderators of each forum
-*/
-function get_moderators(&$forum_moderators, $forum_id = false)
-{
-	// Have we disabled the display of moderators? If so, then return
-	// from whence we came ...
-	if (!phpbb::$config['load_moderators'])
-	{
-		return;
-	}
-
-	$forum_sql = '';
-
-	if ($forum_id !== false)
-	{
-		if (!is_array($forum_id))
-		{
-			$forum_id = array($forum_id);
-		}
-
-		// If we don't have a forum then we can't have a moderator
-		if (!sizeof($forum_id))
-		{
-			return;
-		}
-
-		$forum_sql = 'AND m.' . phpbb::$db->sql_in_set('forum_id', $forum_id);
-	}
-
-	$sql_array = array(
-		'SELECT'	=> 'm.*, u.user_colour, g.group_colour, g.group_type',
-
-		'FROM'		=> array(
-			MODERATOR_CACHE_TABLE	=> 'm',
-		),
-
-		'LEFT_JOIN'	=> array(
-			array(
-				'FROM'	=> array(USERS_TABLE => 'u'),
-				'ON'	=> 'm.user_id = u.user_id',
-			),
-			array(
-				'FROM'	=> array(GROUPS_TABLE => 'g'),
-				'ON'	=> 'm.group_id = g.group_id',
-			),
-		),
-
-		'WHERE'		=> "m.display_on_index = 1 $forum_sql",
-	);
-
-	$sql = phpbb::$db->sql_build_query('SELECT', $sql_array);
-	$result = phpbb::$db->sql_query($sql, 3600);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		if (!empty($row['user_id']))
-		{
-			$forum_moderators[$row['forum_id']][] = get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']);
-		}
-		else
-		{
-			$group_name = (($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name']);
-
-			if (!phpbb::$user->is_guest && !phpbb::$acl->acl_get('u_viewprofile'))
-			{
-				$forum_moderators[$row['forum_id']][] = '<span' . (($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . ';"' : '') . '>' . $group_name . '</span>';
-			}
-			else
-			{
-				$forum_moderators[$row['forum_id']][] = '<a' . (($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . ';"' : '') . ' href="' . phpbb::$url->append_sid('memberlist', 'mode=group&amp;g=' . $row['group_id']) . '">' . $group_name . '</a>';
-			}
-		}
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	return;
-}
-
-/**
-* User authorisation levels output
-*
-* @param	string	$mode			Can be forum or topic. Not in use at the moment.
-* @param	int		$forum_id		The current forum the user is in.
-* @param	int		$forum_status	The forums status bit.
-*/
-function gen_forum_auth_level($mode, $forum_id, $forum_status)
-{
-	$locked = ($forum_status == ITEM_LOCKED && !phpbb::$acl->acl_get('m_edit', $forum_id)) ? true : false;
-
-	$rules = array(
-		(phpbb::$acl->acl_get('f_post', $forum_id) && !$locked) ? phpbb::$user->lang['RULES_POST_CAN'] : phpbb::$user->lang['RULES_POST_CANNOT'],
-		(phpbb::$acl->acl_get('f_reply', $forum_id) && !$locked) ? phpbb::$user->lang['RULES_REPLY_CAN'] : phpbb::$user->lang['RULES_REPLY_CANNOT'],
-		(phpbb::$user->is_registered && phpbb::$acl->acl_gets('f_edit', 'm_edit', $forum_id) && !$locked) ? phpbb::$user->lang['RULES_EDIT_CAN'] : phpbb::$user->lang['RULES_EDIT_CANNOT'],
-		(phpbb::$user->is_registered && phpbb::$acl->acl_gets('f_delete', 'm_delete', $forum_id) && !$locked) ? phpbb::$user->lang['RULES_DELETE_CAN'] : phpbb::$user->lang['RULES_DELETE_CANNOT'],
-	);
-
-	if (phpbb::$config['allow_attachments'])
-	{
-		$rules[] = (phpbb::$acl->acl_get('f_attach', $forum_id) && phpbb::$acl->acl_get('u_attach') && !$locked) ? phpbb::$user->lang['RULES_ATTACH_CAN'] : phpbb::$user->lang['RULES_ATTACH_CANNOT'];
-	}
-
-	foreach ($rules as $rule)
-	{
-		phpbb::$template->assign_block_vars('rules', array('RULE' => $rule));
-	}
-
-	return;
-}
-
-/**
-* Generate topic status
-*/
-function topic_status(&$topic_row, $replies, $unread_topic, &$folder_img, &$folder_alt, &$topic_type)
-{
-	$folder = $folder_new = '';
-
-	if ($topic_row['topic_status'] == ITEM_MOVED)
-	{
-		$topic_type = phpbb::$user->lang['VIEW_TOPIC_MOVED'];
-		$folder_img = 'topic_moved';
-		$folder_alt = 'TOPIC_MOVED';
-	}
-	else
-	{
-		switch ($topic_row['topic_type'])
-		{
-			case POST_GLOBAL:
-				$topic_type = phpbb::$user->lang['VIEW_TOPIC_GLOBAL'];
-				$folder = 'global_read';
-				$folder_new = 'global_unread';
-			break;
-
-			case POST_ANNOUNCE:
-				$topic_type = phpbb::$user->lang['VIEW_TOPIC_ANNOUNCEMENT'];
-				$folder = 'announce_read';
-				$folder_new = 'announce_unread';
-			break;
-
-			case POST_STICKY:
-				$topic_type = phpbb::$user->lang['VIEW_TOPIC_STICKY'];
-				$folder = 'sticky_read';
-				$folder_new = 'sticky_unread';
-			break;
-
-			default:
-				$topic_type = '';
-				$folder = 'topic_read';
-				$folder_new = 'topic_unread';
-
-				// Hot topic threshold is for posts in a topic, which is replies + the first post. ;)
-				if (phpbb::$config['hot_threshold'] && ($replies + 1) >= phpbb::$config['hot_threshold'] && $topic_row['topic_status'] != ITEM_LOCKED)
-				{
-					$folder .= '_hot';
-					$folder_new .= '_hot';
-				}
-			break;
-		}
-
-		if ($topic_row['topic_status'] == ITEM_LOCKED)
-		{
-			$topic_type = phpbb::$user->lang['VIEW_TOPIC_LOCKED'];
-			$folder .= '_locked';
-			$folder_new .= '_locked';
-		}
-
-
-		$folder_img = ($unread_topic) ? $folder_new : $folder;
-		$folder_alt = ($unread_topic) ? 'NEW_POSTS' : (($topic_row['topic_status'] == ITEM_LOCKED) ? 'TOPIC_LOCKED' : 'NO_NEW_POSTS');
-
-		// Posted image?
-		if (!empty($topic_row['topic_posted']) && $topic_row['topic_posted'])
-		{
-			$folder_img .= '_mine';
-		}
-	}
-
-	if ($topic_row['poll_start'] && $topic_row['topic_status'] != ITEM_MOVED)
-	{
-		$topic_type = phpbb::$user->lang['VIEW_TOPIC_POLL'];
-	}
-}
-
-/**
-* Assign/Build custom bbcodes for display in screens supporting using of bbcodes
-* The custom bbcodes buttons will be placed within the template block 'custom_codes'
-*/
-function display_custom_bbcodes()
-{
-	// Start counting from 22 for the bbcode ids (every bbcode takes two ids - opening/closing)
-	$num_predefined_bbcodes = 22;
-
-	$sql = 'SELECT bbcode_id, bbcode_tag, bbcode_helpline
-		FROM ' . BBCODES_TABLE . '
-		WHERE display_on_posting = 1
-		ORDER BY bbcode_tag';
-	$result = phpbb::$db->sql_query($sql);
-
-	$i = 0;
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		// If the helpline is defined within the language file, we will use the localised version, else just use the database entry...
-		if (isset(phpbb::$user->lang[strtoupper($row['bbcode_helpline'])]))
-		{
-			$row['bbcode_helpline'] = phpbb::$user->lang[strtoupper($row['bbcode_helpline'])];
-		}
-
-		phpbb::$template->assign_block_vars('custom_tags', array(
-			'BBCODE_NAME'		=> "'[{$row['bbcode_tag']}]', '[/" . str_replace('=', '', $row['bbcode_tag']) . "]'",
-			'BBCODE_ID'			=> $num_predefined_bbcodes + ($i * 2),
-			'BBCODE_TAG'		=> $row['bbcode_tag'],
-			'BBCODE_HELPLINE'	=> $row['bbcode_helpline'],
-			'A_BBCODE_HELPLINE'	=> str_replace(array('&amp;', '&quot;', "'", '&lt;', '&gt;'), array('&', '"', "\'", '<', '>'), $row['bbcode_helpline']),
-		));
-
-		$i++;
-	}
-	phpbb::$db->sql_freeresult($result);
-}
-
-/**
-* Display reasons
-*/
-function display_reasons($reason_id = 0)
-{
-	$sql = 'SELECT *
-		FROM ' . REPORTS_REASONS_TABLE . '
-		ORDER BY reason_order ASC';
-	$result = phpbb::$db->sql_query($sql);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		// If the reason is defined within the language file, we will use the localized version, else just use the database entry...
-		if (isset(phpbb::$user->lang['report_reasons']['TITLE'][strtoupper($row['reason_title'])]) && isset(phpbb::$user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])]))
-		{
-			$row['reason_description'] = phpbb::$user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])];
-			$row['reason_title'] = phpbb::$user->lang['report_reasons']['TITLE'][strtoupper($row['reason_title'])];
-		}
-
-		phpbb::$template->assign_block_vars('reason', array(
-			'ID'			=> $row['reason_id'],
-			'TITLE'			=> $row['reason_title'],
-			'DESCRIPTION'	=> $row['reason_description'],
-			'S_SELECTED'	=> ($row['reason_id'] == $reason_id) ? true : false,
-		));
-	}
-	phpbb::$db->sql_freeresult($result);
-}
-
-/**
-* Display user activity (action forum/topic)
-*/
-function display_user_activity(&$userdata)
-{
-	// Do not display user activity for users having more than 5000 posts...
-	if ($userdata['user_posts'] > 5000)
-	{
-		return;
-	}
-
-	$forum_ary = array();
-
-	// Do not include those forums the user is not having read access to...
-	$forum_read_ary = phpbb::$acl->acl_getf('!f_read');
-
-	foreach ($forum_read_ary as $forum_id => $not_allowed)
-	{
-		if ($not_allowed['f_read'])
-		{
-			$forum_ary[] = (int) $forum_id;
-		}
-	}
-
-	$forum_ary = array_unique($forum_ary);
-	$forum_sql = (sizeof($forum_ary)) ? 'AND ' . phpbb::$db->sql_in_set('forum_id', $forum_ary, true) : '';
-
-	// Obtain active forum
-	$sql = 'SELECT forum_id, COUNT(post_id) AS num_posts
-		FROM ' . POSTS_TABLE . '
-		WHERE poster_id = ' . $userdata['user_id'] . "
-			AND post_postcount = 1
-			$forum_sql
-		GROUP BY forum_id
-		ORDER BY num_posts DESC";
-	$result = phpbb::$db->sql_query_limit($sql, 1);
-	$active_f_row = phpbb::$db->sql_fetchrow($result);
-	phpbb::$db->sql_freeresult($result);
-
-	if (!empty($active_f_row))
-	{
-		$sql = 'SELECT forum_name
-			FROM ' . FORUMS_TABLE . '
-			WHERE forum_id = ' . $active_f_row['forum_id'];
-		$result = phpbb::$db->sql_query($sql, 3600);
-		$active_f_row['forum_name'] = (string) phpbb::$db->sql_fetchfield('forum_name');
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	// Obtain active topic
-	$sql = 'SELECT topic_id, COUNT(post_id) AS num_posts
-		FROM ' . POSTS_TABLE . '
-		WHERE poster_id = ' . $userdata['user_id'] . "
-			AND post_postcount = 1
-			$forum_sql
-		GROUP BY topic_id
-		ORDER BY num_posts DESC";
-	$result = phpbb::$db->sql_query_limit($sql, 1);
-	$active_t_row = phpbb::$db->sql_fetchrow($result);
-	phpbb::$db->sql_freeresult($result);
-
-	if (!empty($active_t_row))
-	{
-		$sql = 'SELECT topic_title
-			FROM ' . TOPICS_TABLE . '
-			WHERE topic_id = ' . $active_t_row['topic_id'];
-		$result = phpbb::$db->sql_query($sql);
-		$active_t_row['topic_title'] = (string) phpbb::$db->sql_fetchfield('topic_title');
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	$userdata['active_t_row'] = $active_t_row;
-	$userdata['active_f_row'] = $active_f_row;
-
-	$active_f_name = $active_f_id = $active_f_count = $active_f_pct = '';
-	if (!empty($active_f_row['num_posts']))
-	{
-		$active_f_name = $active_f_row['forum_name'];
-		$active_f_id = $active_f_row['forum_id'];
-		$active_f_count = $active_f_row['num_posts'];
-		$active_f_pct = ($userdata['user_posts']) ? ($active_f_count / $userdata['user_posts']) * 100 : 0;
-	}
-
-	$active_t_name = $active_t_id = $active_t_count = $active_t_pct = '';
-	if (!empty($active_t_row['num_posts']))
-	{
-		$active_t_name = $active_t_row['topic_title'];
-		$active_t_id = $active_t_row['topic_id'];
-		$active_t_count = $active_t_row['num_posts'];
-		$active_t_pct = ($userdata['user_posts']) ? ($active_t_count / $userdata['user_posts']) * 100 : 0;
-	}
-
-	$l_active_pct = ($userdata['user_id'] != ANONYMOUS && $userdata['user_id'] == phpbb::$user->data['user_id']) ? phpbb::$user->lang['POST_PCT_ACTIVE_OWN'] : phpbb::$user->lang['POST_PCT_ACTIVE'];
-
-	phpbb::$template->assign_vars(array(
-		'ACTIVE_FORUM'			=> $active_f_name,
-		'ACTIVE_FORUM_POSTS'	=> ($active_f_count == 1) ? sprintf(phpbb::$user->lang['USER_POST'], 1) : sprintf(phpbb::$user->lang['USER_POSTS'], $active_f_count),
-		'ACTIVE_FORUM_PCT'		=> sprintf($l_active_pct, $active_f_pct),
-		'ACTIVE_TOPIC'			=> censor_text($active_t_name),
-		'ACTIVE_TOPIC_POSTS'	=> ($active_t_count == 1) ? sprintf(phpbb::$user->lang['USER_POST'], 1) : sprintf(phpbb::$user->lang['USER_POSTS'], $active_t_count),
-		'ACTIVE_TOPIC_PCT'		=> sprintf($l_active_pct, $active_t_pct),
-		'U_ACTIVE_FORUM'		=> phpbb::$url->append_sid('viewforum', 'f=' . $active_f_id),
-		'U_ACTIVE_TOPIC'		=> phpbb::$url->append_sid('viewtopic', 't=' . $active_t_id),
-		'S_SHOW_ACTIVITY'		=> true,
-	));
-}
-
-/**
-* Topic and forum watching common code
-*/
-function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id, $notify_status = 'unset', $start = 0)
-{
-	global $start;
-
-	$table_sql = ($mode == 'forum') ? FORUMS_WATCH_TABLE : TOPICS_WATCH_TABLE;
-	$where_sql = ($mode == 'forum') ? 'forum_id' : 'topic_id';
-	$match_id = ($mode == 'forum') ? $forum_id : $topic_id;
-	$u_url = 'uid=' . phpbb::$user->data['user_id'];
-	$u_url .= ($mode == 'forum') ? '&amp;f' : '&amp;f=' . $forum_id . '&amp;t';
-
-	// Is user watching this thread?
-	if ($user_id != ANONYMOUS)
-	{
-		$can_watch = true;
-
-		if ($notify_status == 'unset')
-		{
-			$sql = "SELECT notify_status
-				FROM $table_sql
-				WHERE $where_sql = $match_id
-					AND user_id = $user_id";
-			$result = phpbb::$db->sql_query($sql);
-
-			$notify_status = ($row = phpbb::$db->sql_fetchrow($result)) ? $row['notify_status'] : NULL;
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		if (!is_null($notify_status) && $notify_status !== '')
-		{
-
-			if (phpbb_request::is_set('unwatch', phpbb_request::GET))
-			{
-				$uid = request_var('uid', 0);
-				if ($uid != $user_id)
-				{
-					$redirect_url = phpbb::$url->append_sid("view$mode", "$u_url=$match_id&amp;start=$start");
-					$message = phpbb::$user->lang['ERR_UNWATCHING'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
-					trigger_error($message);
-				}
-				if (phpbb_request::variable('unwatch', '', false, phpbb_request::GET) == $mode)
-				{
-					$is_watching = 0;
-
-					$sql = 'DELETE FROM ' . $table_sql . "
-						WHERE $where_sql = $match_id
-							AND user_id = $user_id";
-					phpbb::$db->sql_query($sql);
-				}
-
-				$redirect_url = phpbb::$url->append_sid("view$mode", "$u_url=$match_id&amp;start=$start");
-
-				meta_refresh(3, $redirect_url);
-
-				$message = phpbb::$user->lang['NOT_WATCHING_' . strtoupper($mode)] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
-				trigger_error($message);
-			}
-			else
-			{
-				$is_watching = true;
-
-				if ($notify_status)
-				{
-					$sql = 'UPDATE ' . $table_sql . "
-						SET notify_status = 0
-						WHERE $where_sql = $match_id
-							AND user_id = $user_id";
-					phpbb::$db->sql_query($sql);
-				}
-			}
-		}
-		else
-		{
-			if (phpbb_request::is_set('watch', phpbb_request::GET))
-			{
-				$token = request_var('hash', '');
-				$redirect_url = phpbb::$url->append_sid("view$mode", "$u_url=$match_id&amp;start=$start");
-
-				if (phpbb_request::variable('watch', '', false, phpbb_request::GET) == $mode && check_link_hash($token, "{$mode}_$match_id"))
-				{
-					$is_watching = true;
-
-					$sql = 'INSERT INTO ' . $table_sql . " (user_id, $where_sql, notify_status)
-						VALUES ($user_id, $match_id, 0)";
-					phpbb::$db->sql_query($sql);
-					$message = phpbb::$user->lang['ARE_WATCHING_' . strtoupper($mode)] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
-				}
-				else
-				{
-					$message = phpbb::$user->lang['ERR_WATCHING'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
-				}
-
-				meta_refresh(3, $redirect_url);
-
-				trigger_error($message);
-			}
-			else
-			{
-				$is_watching = 0;
-			}
-		}
-	}
-	else
-	{
-		if (phpbb_request::variable('unwatch', '', false, phpbb_request::GET) == $mode)
-		{
-			login_box();
-		}
-		else
-		{
-			$can_watch = 0;
-			$is_watching = 0;
-		}
-	}
-
-	if ($can_watch)
-	{
-		$s_watching['link'] = phpbb::$url->append_sid("view$mode", "$u_url=$match_id&amp;" . (($is_watching) ? 'unwatch' : 'watch') . "=$mode&amp;start=$start&amp;hash=" . generate_link_hash("{$mode}_$match_id"));
-		$s_watching['title'] = phpbb::$user->lang[(($is_watching) ? 'STOP' : 'START') . '_WATCHING_' . strtoupper($mode)];
-		$s_watching['is_watching'] = $is_watching;
-	}
-
-	return;
-}
-
-/**
-* Get user rank title and image
-*
-* @param int $user_id the users user id
-* @param int $user_rank the current stored users rank id
-* @param int $user_posts the users number of posts
-* @param string &$rank_title the rank title will be stored here after execution
-* @param string &$rank_img the rank image as full img tag is stored here after execution
-* @param string &$rank_img_src the rank image source is stored here after execution
-*
-*/
-function get_user_rank($user_id, $user_rank, $user_posts, &$rank_title, &$rank_img, &$rank_img_src)
-{
-	global $ranks;
-
-	if (empty($ranks))
-	{
-		$ranks = phpbb_cache::obtain_ranks();
-	}
-
-	if (!empty($user_rank))
-	{
-		$rank_title = (isset($ranks['special'][$user_rank]['rank_title'])) ? $ranks['special'][$user_rank]['rank_title'] : '';
-		$rank_img = (!empty($ranks['special'][$user_rank]['rank_image'])) ? '<img src="' . PHPBB_ROOT_PATH . phpbb::$config['ranks_path'] . '/' . $ranks['special'][$user_rank]['rank_image'] . '" alt="' . $ranks['special'][$user_rank]['rank_title'] . '" title="' . $ranks['special'][$user_rank]['rank_title'] . '" />' : '';
-		$rank_img_src = (!empty($ranks['special'][$user_rank]['rank_image'])) ? PHPBB_ROOT_PATH . phpbb::$config['ranks_path'] . '/' . $ranks['special'][$user_rank]['rank_image'] : '';
-	}
-	else if ($user_id != ANONYMOUS)
-	{
-		if (!empty($ranks['normal']))
-		{
-			foreach ($ranks['normal'] as $rank)
-			{
-				if ($user_posts >= $rank['rank_min'])
-				{
-					$rank_title = $rank['rank_title'];
-					$rank_img = (!empty($rank['rank_image'])) ? '<img src="' . PHPBB_ROOT_PATH . phpbb::$config['ranks_path'] . '/' . $rank['rank_image'] . '" alt="' . $rank['rank_title'] . '" title="' . $rank['rank_title'] . '" />' : '';
-					$rank_img_src = (!empty($rank['rank_image'])) ? PHPBB_ROOT_PATH . phpbb::$config['ranks_path'] . '/' . $rank['rank_image'] : '';
-					break;
-				}
-			}
-		}
-	}
-}
-
-/**
-* Get user avatar
-*
-* @param string $avatar Users assigned avatar name
-* @param int $avatar_type Type of avatar
-* @param string $avatar_width Width of users avatar
-* @param string $avatar_height Height of users avatar
-* @param string $alt Optional language string for alt tag within image, can be a language key or text
-*
-* @return string Avatar image
-*/
-function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $alt = 'USER_AVATAR')
-{
-	if (empty($avatar) || !$avatar_type)
-	{
-		return '';
-	}
-
-	$avatar_img = '';
-
-	switch ($avatar_type)
-	{
-		case AVATAR_UPLOAD:
-			$avatar_img = PHPBB_ROOT_PATH . 'download/file.' . PHP_EXT . '?avatar=';
-		break;
-
-		case AVATAR_GALLERY:
-			$avatar_img = PHPBB_ROOT_PATH . phpbb::$config['avatar_gallery_path'] . '/';
-		break;
-	}
-
-	$avatar_img .= $avatar;
-	return '<img src="' . (str_replace(' ', '%20', $avatar_img)) . '" width="' . $avatar_width . '" height="' . $avatar_height . '" alt="' . ((!empty(phpbb::$user->lang[$alt])) ? phpbb::$user->lang[$alt] : $alt) . '" />';
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
deleted file mode 100644
index 630bb78a71..0000000000
--- a/phpBB/includes/functions_install.php
+++ /dev/null
@@ -1,531 +0,0 @@
-<?php
-/**
-*
-* @package install
-* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Determine if we are able to load a specified PHP module and do so if possible
-*
-* @param string	$dll	Name of the DLL without extension. For example 'sqlite'.
-* @return bool	Returns true of successfully loaded, else false.
-*/
-function can_load_dll($dll)
-{
-	return ((@ini_get('enable_dl') || strtolower(@ini_get('enable_dl')) == 'on') && (!@ini_get('safe_mode') || strtolower(@ini_get('safe_mode')) == 'off') && @dl($dll . '.' . PHP_SHLIB_SUFFIX)) ? true : false;
-}
-
-/**
-* Returns an array of available DBMS with some data, if a DBMS is specified it will only return data for that DBMS and will load its extension if necessary.
-*
-*/
-function get_available_dbms($dbms = false, $return_unavailable = false, $only_30x_options = false)
-{
-	$available_dbms = array(
-		'firebird'	=> array(
-			'LABEL'			=> 'FireBird',
-			'MODULE'		=> 'interbase',
-			'DRIVER'		=> 'firebird',
-			'AVAILABLE'		=> true,
-			'3.0.x'			=> true,
-		),
-		'mysqli'	=> array(
-			'LABEL'			=> 'MySQL with MySQLi Extension',
-			'MODULE'		=> 'mysqli',
-			'DRIVER'		=> 'mysqli',
-			'AVAILABLE'		=> true,
-			'3.0.x'			=> true,
-		),
-		'mysql'		=> array(
-			'LABEL'			=> 'MySQL',
-			'MODULE'		=> 'mysql',
-			'DRIVER'		=> 'mysql',
-			'AVAILABLE'		=> true,
-			'3.0.x'			=> true,
-		),
-		'mssql'		=> array(
-			'LABEL'			=> 'MS SQL Server 2000+',
-			'MODULE'		=> 'mssql',
-			'DRIVER'		=> 'mssql',
-			'AVAILABLE'		=> true,
-			'3.0.x'			=> true,
-		),
-		'mssql_odbc'=>	array(
-			'LABEL'			=> 'MS SQL Server [ ODBC ]',
-			'MODULE'		=> 'odbc',
-			'DRIVER'		=> 'mssql_odbc',
-			'AVAILABLE'		=> true,
-			'3.0.x'			=> true,
-		),
-		'mssql_2005'=>	array(
-			'LABEL'			=> 'MS SQL Server [ 2005/2008 ]',
-			'MODULE'		=> array('sqlsrv', 'sqlsrv_ts'),
-			'DRIVER'		=> 'mssql_2005',
-			'AVAILABLE'		=> true,
-			'3.0.x'			=> true,
-		),
-		'db2'		=> array(
-			'LABEL'			=> 'IBM DB2',
-			'MODULE'		=> 'ibm_db2',
-			'DRIVER'		=> 'db2',
-			'AVAILABLE'		=> true,
-			'3.0.x'			=> false,
-		),
-		'oracle'	=>	array(
-			'LABEL'			=> 'Oracle',
-			'MODULE'		=> 'oci8',
-			'DRIVER'		=> 'oracle',
-			'AVAILABLE'		=> true,
-			'3.0.x'			=> true,
-		),
-		'postgres' => array(
-			'LABEL'			=> 'PostgreSQL 7.x/8.x',
-			'MODULE'		=> 'pgsql',
-			'DRIVER'		=> 'postgres',
-			'AVAILABLE'		=> true,
-			'3.0.x'			=> true,
-		),
-		'sqlite'		=> array(
-			'LABEL'			=> 'SQLite',
-			'MODULE'		=> 'sqlite',
-			'DRIVER'		=> 'sqlite',
-			'AVAILABLE'		=> true,
-			'3.0.x'			=> true,
-		),
-	);
-
-	if ($dbms)
-	{
-		if (isset($available_dbms[$dbms]))
-		{
-			$available_dbms = array($dbms => $available_dbms[$dbms]);
-		}
-		else
-		{
-			return array();
-		}
-	}
-
-	$any_db_support = false;
-
-	// now perform some checks whether they are really available
-	foreach ($available_dbms as $db_name => $db_ary)
-	{
-		if ($only_30x_options && !$db_ary['3.0.x'])
-		{
-			if ($return_unavailable)
-			{
-				$available_dbms[$db_name]['AVAILABLE'] = false;
-			}
-			else
-			{
-				unset($available_dbms[$db_name]);
-			}
-			continue;
-		}
-
-		$dll = $db_ary['MODULE'];
-
-		if (!is_array($dll))
-		{
-			$dll = array($dll);
-		}
-
-		$is_available = false;
-		foreach ($dll as $test_dll)
-		{
-			if (@extension_loaded($test_dll) || can_load_dll($test_dll))
-			{
-				$is_available = true;
-				break;
-			}
-		}
-
-		if (!$is_available)
-		{
-			if ($return_unavailable)
-			{
-				$available_dbms[$db_name]['AVAILABLE'] = false;
-			}
-			else
-			{
-				unset($available_dbms[$db_name]);
-			}
-			continue;
-		}
-
-		$any_db_support = true;
-	}
-
-	if ($return_unavailable)
-	{
-		$available_dbms['ANY_DB_SUPPORT'] = $any_db_support;
-	}
-
-	return $available_dbms;
-}
-
-/**
-* Generate the drop down of available database options
-*/
-function dbms_select($default = '', $only_30x_options = false)
-{
-	$available_dbms = get_available_dbms(false, false, $only_30x_options);
-
-	$dbms_options = '';
-	foreach ($available_dbms as $dbms_name => $details)
-	{
-		$selected = ($dbms_name == $default) ? ' selected="selected"' : '';
-		$dbms_options .= '<option value="' . $dbms_name . '"' . $selected .'>' . phpbb::$user->lang['DLL_' . strtoupper($dbms_name)] . '</option>';
-	}
-
-	return $dbms_options;
-}
-
-/**
-* Get tables of a database
-*/
-function get_tables($db)
-{
-	switch ($db->dbms_type)
-	{
-		case 'mysql':
-			$sql = 'SHOW TABLES';
-		break;
-
-		case 'sqlite':
-			$sql = 'SELECT name
-				FROM sqlite_master
-				WHERE type = "table"';
-		break;
-
-		case 'mssql':
-			$sql = "SELECT name
-				FROM sysobjects
-				WHERE type='U'";
-		break;
-
-		case 'postgres':
-			$sql = 'SELECT relname
-				FROM pg_stat_user_tables';
-		break;
-
-		case 'firebird':
-			$sql = 'SELECT rdb$relation_name
-				FROM rdb$relations
-				WHERE rdb$view_source is null
-					AND rdb$system_flag = 0';
-		break;
-
-		case 'db2':
-			$sql = "SELECT tabname
-				FROM SYSCAT.TABLES
-				WHERE type = 'T'
-					AND tabschema = 'DB2ADMIN'";
-			$field = 'tabname';
-		break;
-
-		case 'oracle':
-			$sql = 'SELECT table_name
-				FROM USER_TABLES';
-		break;
-	}
-
-	$result = $db->sql_query($sql);
-
-	$tables = array();
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$tables[] = current($row);
-	}
-	$db->sql_freeresult($result);
-
-	return $tables;
-}
-
-/**
-* Used to test whether we are able to connect to the database the user has specified
-* and identify any problems (eg there are already tables with the names we want to use
-* @param	array	$dbms should be of the format of an element of the array returned by {@link get_available_dbms get_available_dbms()}
-*					necessary extensions should be loaded already
-*/
-function connect_check_db($dbms_details, $table_prefix, $dbhost, $dbuser, $dbpasswd, $dbname, $dbport, &$error, $prefix_may_exist = false)
-{
-	$dbms = $dbms_details['DRIVER'];
-
-	phpbb::assign('checkdb', phpbb_db_dbal::new_instance($dbms));
-	$db = phpbb::get_instance('checkdb');
-
-	$db->sql_return_on_error(true);
-
-	// Check that we actually have a database name before going any further.....
-	if ($dbms_details['DRIVER'] != 'sqlite' && $dbms_details['DRIVER'] != 'oracle' && $dbname === '')
-	{
-		$error[] = phpbb::$user->lang['INST_ERR_DB_NO_NAME'];
-		return false;
-	}
-
-	// Make sure we don't have a daft user who thinks having the SQLite database in the forum directory is a good idea
-	if ($dbms_details['DRIVER'] == 'sqlite' && stripos(phpbb::$url->realpath($dbhost), phpbb::$url->realpath('../')) === 0)
-	{
-		$error[] = phpbb::$user->lang['INST_ERR_DB_FORUM_PATH'];
-		return false;
-	}
-
-	// Check the prefix length to ensure that index names are not too long and does not contain invalid characters
-	switch ($dbms_details['DRIVER'])
-	{
-		case 'mysql':
-		case 'mysqli':
-			if (strspn($table_prefix, '-./\\') !== 0)
-			{
-				$error[] = phpbb::$user->lang['INST_ERR_PREFIX_INVALID'];
-				return false;
-			}
-
-		// no break;
-
-		case 'postgres':
-			$prefix_length = 36;
-		break;
-
-		case 'mssql':
-		case 'mssql_odbc':
-		case 'mssql_2005':
-			$prefix_length = 90;
-		break;
-
-		case 'db2':
-			$prefix_length = 108;
-		break;
-
-		case 'sqlite':
-			$prefix_length = 200;
-		break;
-
-		case 'firebird':
-		case 'oracle':
-			$prefix_length = 6;
-		break;
-	}
-
-	if (strlen($table_prefix) > $prefix_length)
-	{
-		$error[] = phpbb::$user->lang('INST_ERR_PREFIX_TOO_LONG', $prefix_length);
-		return false;
-	}
-
-	// Try and connect ...
-	if (is_array($db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true)))
-	{
-		$db_error = $db->sql_error();
-		$error[] = phpbb::$user->lang['INST_ERR_DB_CONNECT'] . '<br />' . (($db_error['message']) ? $db_error['message'] : phpbb::$user->lang['INST_ERR_DB_NO_ERROR']);
-		return false;
-	}
-
-	// Likely matches for an existing phpBB installation
-	if (!$prefix_may_exist)
-	{
-		$temp_prefix = strtolower($table_prefix);
-		$table_ary = array($temp_prefix . 'attachments', $temp_prefix . 'config', $temp_prefix . 'sessions', $temp_prefix . 'topics', $temp_prefix . 'users');
-
-		$tables = get_tables($db);
-		$tables = array_map('strtolower', $tables);
-		$table_intersect = array_intersect($tables, $table_ary);
-
-		if (sizeof($table_intersect))
-		{
-			$error[] = phpbb::$user->lang['INST_ERR_PREFIX'];
-			return false;
-		}
-	}
-
-	// Make sure that the user has selected a sensible DBAL for the DBMS actually installed
-	switch ($dbms_details['DRIVER'])
-	{
-		case 'mysql':
-			if (version_compare($db->sql_server_info(true), '4.1.3', '<'))
-			{
-				$error[] = phpbb::$user->lang['INST_ERR_DB_MYSQL_VERSION'];
-			}
-		break;
-
-		case 'mysqli':
-			if (version_compare($db->sql_server_info(true), '4.1.3', '<'))
-			{
-				$error[] = phpbb::$user->lang['INST_ERR_DB_MYSQLI_VERSION'];
-			}
-		break;
-
-		case 'sqlite':
-			if (version_compare($db->sql_server_info(true), '2.8.2', '<'))
-			{
-				$error[] = phpbb::$user->lang['INST_ERR_DB_SQLITE_VERSION'];
-			}
-		break;
-
-		case 'firebird':
-			// check the version of FB, use some hackery if we can't get access to the server info
-			if ($db->service_handle !== false && strtolower($dbuser) == 'sysdba')
-			{
-				$val = @ibase_server_info($db->service_handle, IBASE_SVC_SERVER_VERSION);
-				preg_match('#V([\d.]+)#', $val, $match);
-				if ($match[1] < 2)
-				{
-					$error[] = phpbb::$user->lang['INST_ERR_DB_FIREBIRD_VERSION'];
-				}
-				$db_info = @ibase_db_info($db->service_handle, $dbname, IBASE_STS_HDR_PAGES);
-
-				preg_match('/^\\s*Page size\\s*(\\d+)/m', $db_info, $regs);
-				$page_size = intval($regs[1]);
-				if ($page_size < 8192)
-				{
-					$error[] = phpbb::$user->lang['INST_ERR_DB_NO_FIREBIRD_PS'];
-				}
-			}
-			else
-			{
-				$sql = "SELECT *
-					FROM RDB\$FUNCTIONS
-					WHERE RDB\$SYSTEM_FLAG IS NULL
-						AND RDB\$FUNCTION_NAME = 'CHAR_LENGTH'";
-				$result = $db->sql_query($sql);
-				$row = $db->sql_fetchrow($result);
-				$db->sql_freeresult($result);
-
-				// if its a UDF, its too old
-				if ($row)
-				{
-					$error[] = phpbb::$user->lang['INST_ERR_DB_FIREBIRD_VERSION'];
-				}
-				else
-				{
-					$sql = "SELECT FIRST 0 char_length('')
-						FROM RDB\$DATABASE";
-					$result = $db->sql_query($sql);
-					if (!$result) // This can only fail if char_length is not defined
-					{
-						$error[] = phpbb::$user->lang['INST_ERR_DB_FIREBIRD_VERSION'];
-					}
-					$db->sql_freeresult($result);
-				}
-
-				// Setup the stuff for our random table
-				$char_array = array_merge(range('A', 'Z'), range('0', '9'));
-				$char_len = mt_rand(7, 9);
-				$char_array_len = sizeof($char_array) - 1;
-
-				$final = '';
-
-				for ($i = 0; $i < $char_len; $i++)
-				{
-					$final .= $char_array[mt_rand(0, $char_array_len)];
-				}
-
-				// Create some random table
-				$sql = 'CREATE TABLE ' . $final . " (
-					FIELD1 VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
-					FIELD2 INTEGER DEFAULT 0 NOT NULL);";
-				$db->sql_query($sql);
-
-				// Create an index that should fail if the page size is less than 8192
-				$sql = 'CREATE INDEX ' . $final . ' ON ' . $final . '(FIELD1, FIELD2);';
-				$db->sql_query($sql);
-
-				if (ibase_errmsg() !== false)
-				{
-					$error[] = phpbb::$user->lang['INST_ERR_DB_NO_FIREBIRD_PS'];
-				}
-
-				// Kill the old table
-				$db->sql_query('DROP TABLE ' . $final . ';');
-
-				unset($final);
-			}
-		break;
-
-		case 'oracle':
-			$sql = "SELECT *
-				FROM NLS_DATABASE_PARAMETERS
-				WHERE PARAMETER = 'NLS_RDBMS_VERSION'
-					OR PARAMETER = 'NLS_CHARACTERSET'";
-			$result = $db->sql_query($sql);
-
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$stats[$row['parameter']] = $row['value'];
-			}
-			$db->sql_freeresult($result);
-
-			if (version_compare($stats['NLS_RDBMS_VERSION'], '9.2', '<'))
-			{
-				$error[] = phpbb::$user->lang['INST_ERR_DB_ORACLE_VERSION'];
-			}
-
-			if ($stats['NLS_CHARACTERSET'] !== 'AL32UTF8')
-			{
-				$error[] = phpbb::$user->lang['INST_ERR_DB_NO_ORACLE_NLS'];
-			}
-		break;
-
-		case 'postgres':
-
-			if (version_compare($db->sql_server_info(true), '8.2', '<'))
-			{
-				$error[] = phpbb::$user->lang['INST_ERR_DB_POSTGRES_VERSION'];
-			}
-			else
-			{
-				$sql = "SHOW server_encoding;";
-				$result = $db->sql_query($sql);
-				$row = $db->sql_fetchrow($result);
-				$db->sql_freeresult($result);
-
-				if ($row['server_encoding'] !== 'UNICODE' && $row['server_encoding'] !== 'UTF8')
-				{
-					$error[] = phpbb::$user->lang['INST_ERR_DB_NO_POSTGRES_UTF8'];
-				}
-			}
-		break;
-
-		case 'mssql_odbc':
-			/**
-			* @todo check odbc.defaultlrl (min 128K) and odbc.defaultbinmode (1)
-			*/
-		break;
-
-		case 'db2':
-			if (version_compare($db->sql_server_info(true), '8.2.2', '<'))
-			{
-				$error[] = phpbb::$user->lang['INST_ERR_DB_DB2_VERSION'];
-			}
-
-			// Now check the extension version
-			if (!function_exists('db2_escape_string'))
-			{
-				$error[] = phpbb::$user->lang['INST_ERR_DB_DB2_EXT_VERSION'];
-			}
-		break;
-	}
-
-	if (sizeof($error))
-	{
-		return false;
-	}
-
-	return true;
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php
deleted file mode 100644
index 5fc7123db7..0000000000
--- a/phpBB/includes/functions_jabber.php
+++ /dev/null
@@ -1,872 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2007 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-*
-* Jabber class from Flyspray project
-*
-* @version class.jabber2.php 1595 2008-09-19 (0.9.9)
-* @copyright 2006 Flyspray.org
-* @author Florian Schmitz (floele)
-*
-* Only slightly modified by Acyd Burn
-*
-* @package phpBB3
-*/
-class jabber
-{
-	private $connection = null;
-	private $session = array();
-	private $timeout = 10;
-
-	private $server;
-	private $connect_server;
-	private $port;
-	private $username;
-	private $password;
-	private $use_ssl;
-	private $resource = 'functions_jabber.phpbb.php';
-
-	private $enable_logging;
-	private $log_array;
-
-	private $features = array();
-
-	/**
-	*/
-	function __construct($server, $port, $username, $password, $use_ssl = false)
-	{
-		$this->connect_server		= ($server) ? $server : 'localhost';
-		$this->port					= ($port) ? $port : 5222;
-
-		// Get the server and the username
-		if (strpos($username, '@') === false)
-		{
-			$this->server = $this->connect_server;
-			$this->username = $username;
-		}
-		else
-		{
-			$jid = explode('@', $username, 2);
-
-			$this->username = $jid[0];
-			$this->server = $jid[1];
-		}
-
-		$this->password				= $password;
-		$this->use_ssl				= ($use_ssl && self::can_use_ssl()) ? true : false;
-
-		// Change port if we use SSL
-		if ($this->port == 5222 && $this->use_ssl)
-		{
-			$this->port = 5223;
-		}
-
-		$this->enable_logging		= true;
-		$this->log_array			= array();
-	}
-
-	/**
-	* Able to use the SSL functionality?
-	*/
-	public static function can_use_ssl()
-	{
-		// Will not work with PHP >= 5.2.1 or < 5.2.3RC2 until timeout problem with ssl hasn't been fixed (http://bugs.php.net/41236)
-		return ((version_compare(PHP_VERSION, '5.2.1', '<') || version_compare(PHP_VERSION, '5.2.3RC2', '>=')) && @extension_loaded('openssl')) ? true : false;
-	}
-
-	/**
-	* Able to use TLS?
-	*/
-	public static function can_use_tls()
-	{
-		if (!@extension_loaded('openssl') || !function_exists('stream_socket_enable_crypto') || !function_exists('stream_get_meta_data') || !function_exists('socket_set_blocking') || !function_exists('stream_get_wrappers'))
-		{
-			return false;
-		}
-
-		/**
-		* Make sure the encryption stream is supported
-		* Also seem to work without the crypto stream if correctly compiled
-
-		$streams = stream_get_wrappers();
-
-		if (!in_array('streams.crypto', $streams))
-		{
-			return false;
-		}
-		*/
-
-		return true;
-	}
-
-	/**
-	* Sets the resource which is used. No validation is done here, only escaping.
-	* @param string $name
-	* @access public
-	*/
-	public function set_resource($name)
-	{
-		$this->resource = $name;
-	}
-
-	/**
-	* Connect
-	*/
-	public function connect()
-	{
-/*		if (!$this->check_jid($this->username . '@' . $this->server))
-		{
-			$this->add_to_log('Error: Jabber ID is not valid: ' . $this->username . '@' . $this->server);
-			return false;
-		}*/
-
-		$this->session['ssl'] = $this->use_ssl;
-
-		if ($this->open_socket($this->connect_server, $this->port, $this->use_ssl))
-		{
-			$this->send("<?xml version='1.0' encoding='UTF-8' ?" . ">\n");
-			$this->send("<stream:stream to='{$this->server}' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' version='1.0'>\n");
-		}
-		else
-		{
-			$this->add_to_log('Error: connect() #2');
-			return false;
-		}
-
-		// Now we listen what the server has to say...and give appropriate responses
-		$this->response($this->listen());
-		return true;
-	}
-
-	/**
-	* Disconnect
-	*/
-	public function disconnect()
-	{
-		if ($this->connected())
-		{
-			// disconnect gracefully
-			if (isset($this->session['sent_presence']))
-			{
-				$this->send_presence('offline', '', true);
-			}
-
-			$this->send('</stream:stream>');
-			$this->session = array();
-			return fclose($this->connection);
-		}
-
-		return false;
-	}
-
-	/**
-	* Connected?
-	*/
-	public function connected()
-	{
-		return (is_resource($this->connection) && !feof($this->connection)) ? true : false;
-	}
-
-
-	/**
-	* Initiates login (using data from contructor, after calling connect())
-	* @access public
-	* @return bool
-	*/
-	public function login()
-	{
-		if (!sizeof($this->features))
-		{
-			$this->add_to_log('Error: No feature information from server available.');
-			return false;
-		}
-
-		return $this->response($this->features);
-	}
-
-	/**
-	* Send data to the Jabber server
-	* @param string $xml
-	* @access private
-	* @return bool
-	*/
-	private function send($xml)
-	{
-		if ($this->connected())
-		{
-			$xml = trim($xml);
-			$this->add_to_log('SEND: '. $xml);
-			return fwrite($this->connection, $xml);
-		}
-		else
-		{
-			$this->add_to_log('Error: Could not send, connection lost (flood?).');
-			return false;
-		}
-	}
-
-	/**
-	* OpenSocket
-	* @param string $server host to connect to
-	* @param int $port port number
-	* @param bool $use_ssl use ssl or not
-	* @access private
-	* @return bool
-	*/
-	private function open_socket($server, $port, $use_ssl = false)
-	{
-		if (@function_exists('dns_get_record'))
-		{
-			$record = @dns_get_record("_xmpp-client._tcp.$server", DNS_SRV);
-			if (!empty($record) && !empty($record[0]['target']))
-			{
-				$server = $record[0]['target'];
-			}
-		}
-
-		$server = $use_ssl ? 'ssl://' . $server : $server;
-
-		if ($this->connection = @fsockopen($server, $port, $errorno, $errorstr, $this->timeout))
-		{
-			socket_set_blocking($this->connection, 0);
-			socket_set_timeout($this->connection, 60);
-
-			return true;
-		}
-
-		// Apparently an error occured...
-		$this->add_to_log('Error: open_socket() - ' . $errorstr);
-		return false;
-	}
-
-	/**
-	* Return log
-	*/
-	public function get_log()
-	{
-		if ($this->enable_logging && sizeof($this->log_array))
-		{
-			return implode("<br /><br />", $this->log_array);
-		}
-
-		return '';
-	}
-
-	/**
-	* Add information to log
-	*/
-	private function add_to_log($string)
-	{
-		if ($this->enable_logging)
-		{
-			$this->log_array[] = utf8_htmlspecialchars($string);
-		}
-	}
-
-	/**
-	* Listens to the connection until it gets data or the timeout is reached.
-	* Thus, it should only be called if data is expected to be received.
-	* @access private
-	* @return mixed either false for timeout or an array with the received data
-	*/
-	private function listen($timeout = 10, $wait = false)
-	{
-		if (!$this->connected())
-		{
-			return false;
-		}
-
-		// Wait for a response until timeout is reached
-		$start = time();
-		$data = '';
-
-		do
-		{
-			$read = trim(fread($this->connection, 4096));
-			$data .= $read;
-		}
-		while (time() <= $start + $timeout && !feof($this->connection) && ($wait || $data == '' || $read != '' || (substr(rtrim($data), -1) != '>')));
-
-		if ($data != '')
-		{
-			$this->add_to_log('RECV: '. $data);
-			return self::xmlize($data);
-		}
-		else
-		{
-			$this->add_to_log('Timeout, no response from server.');
-			return false;
-		}
-	}
-
-	/**
-	* Initiates account registration (based on data used for contructor)
-	* @access private
-	* @return bool
-	*/
-	private function register()
-	{
-		if (!isset($this->session['id']) || isset($this->session['jid']))
-		{
-			$this->add_to_log('Error: Cannot initiate registration.');
-			return false;
-		}
-
-		$this->send("<iq type='get' id='reg_1'><query xmlns='jabber:iq:register'/></iq>");
-		return $this->response($this->listen());
-	}
-
-	/**
-	* Sets account presence. No additional info required (default is "online" status)
-	* @param $message online, offline...
-	* @param $type dnd, away, chat, xa or nothing
-	* @param $unavailable set this to true if you want to become unavailable
-	* @access private
-	* @return bool
-	*/
-	private function send_presence($message = '', $type = '', $unavailable = false)
-	{
-		if (!isset($this->session['jid']))
-		{
-			$this->add_to_log('ERROR: send_presence() - Cannot set presence at this point, no jid given.');
-			return false;
-		}
-
-		$type = strtolower($type);
-		$type = (in_array($type, array('dnd', 'away', 'chat', 'xa'))) ? '<show>'. $type .'</show>' : '';
-
-		$unavailable = ($unavailable) ? " type='unavailable'" : '';
-		$message = ($message) ? '<status>' . utf8_htmlspecialchars($message) .'</status>' : '';
-
-		$this->session['sent_presence'] = !$unavailable;
-
-		return $this->send("<presence$unavailable>" . $type . $message . '</presence>');
-	}
-
-	/**
-	* This handles all the different XML elements
-	* @param array $xml
-	* @access private
-	* @return bool
-	*/
-	private function response($xml)
-	{
-		if (!is_array($xml) || !sizeof($xml))
-		{
-			return false;
-		}
-
-		// did we get multiple elements? do one after another
-		// array('message' => ..., 'presence' => ...)
-		if (sizeof($xml) > 1)
-		{
-			foreach ($xml as $key => $value)
-			{
-				$this->response(array($key => $value));
-			}
-			return;
-		}
-		else
-		{
-			// or even multiple elements of the same type?
-			// array('message' => array(0 => ..., 1 => ...))
-			if (sizeof(reset($xml)) > 1)
-			{
-				foreach (reset($xml) as $value)
-				{
-					$this->response(array(key($xml) => array(0 => $value)));
-				}
-				return;
-			}
-		}
-
-		switch (key($xml))
-		{
-			case 'stream:stream':
-				// Connection initialised (or after authentication). Not much to do here...
-
-				if (isset($xml['stream:stream'][0]['#']['stream:features']))
-				{
-					// we already got all info we need
-					$this->features = $xml['stream:stream'][0]['#'];
-				}
-				else
-				{
-					$this->features = $this->listen();
-				}
-
-				$second_time = isset($this->session['id']);
-				$this->session['id'] = $xml['stream:stream'][0]['@']['id'];
-
-				if ($second_time)
-				{
-					// If we are here for the second time after TLS, we need to continue logging in
-					return $this->login();
-				}
-
-				// go on with authentication?
-				if (isset($this->features['stream:features'][0]['#']['bind']) || !empty($this->session['tls']))
-				{
-					return $this->response($this->features);
-				}
-			break;
-
-			case 'stream:features':
-				// Resource binding after successful authentication
-				if (isset($this->session['authenticated']))
-				{
-					// session required?
-					$this->session['sess_required'] = isset($xml['stream:features'][0]['#']['session']);
-
-					$this->send("<iq type='set' id='bind_1'>
-						<bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'>
-							<resource>" . utf8_htmlspecialchars($this->resource) . '</resource>
-						</bind>
-					</iq>');
-					return $this->response($this->listen());
-				}
-
-				// Let's use TLS if SSL is not enabled and we can actually use it
-				if (!$this->session['ssl'] && self::can_use_tls() && self::can_use_ssl() && isset($xml['stream:features'][0]['#']['starttls']))
-				{
-					$this->add_to_log('Switching to TLS.');
-					$this->send("<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>\n");
-					return $this->response($this->listen());
-				}
-
-				// Does the server support SASL authentication?
-
-				// I hope so, because we do (and no other method).
-				if (isset($xml['stream:features'][0]['#']['mechanisms'][0]['@']['xmlns']) && $xml['stream:features'][0]['#']['mechanisms'][0]['@']['xmlns'] == 'urn:ietf:params:xml:ns:xmpp-sasl')
-				{
-					// Now decide on method
-					$methods = array();
-
-					foreach ($xml['stream:features'][0]['#']['mechanisms'][0]['#']['mechanism'] as $value)
-					{
-						$methods[] = $value['#'];
-					}
-
-					// we prefer DIGEST-MD5
-					// we don't want to use plain authentication (neither does the server usually) if no encryption is in place
-
-					// http://www.xmpp.org/extensions/attic/jep-0078-1.7.html
-					// The plaintext mechanism SHOULD NOT be used unless the underlying stream is encrypted (using SSL or TLS)
-					// and the client has verified that the server certificate is signed by a trusted certificate authority.
-
-					if (in_array('DIGEST-MD5', $methods))
-					{
-						$this->send("<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='DIGEST-MD5'/>");
-					}
-					else if (in_array('PLAIN', $methods) && ($this->session['ssl'] || !empty($this->session['tls'])))
-					{
-						$this->send("<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='PLAIN'>"
-							. base64_encode(chr(0) . $this->username . '@' . $this->server . chr(0) . $this->password) .
-							'</auth>');
-					}
-					else if (in_array('ANONYMOUS', $methods))
-					{
-						$this->send("<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='ANONYMOUS'/>");
-					}
-					else
-					{
-						// not good...
-						$this->add_to_log('Error: No authentication method supported.');
-						$this->disconnect();
-						return false;
-					}
-
-					return $this->response($this->listen());
-				}
-				else
-				{
-					// ok, this is it. bye.
-					$this->add_to_log('Error: Server does not offer SASL authentication.');
-					$this->disconnect();
-					return false;
-				}
-			break;
-
-			case 'challenge':
-				// continue with authentication...a challenge literally -_-
-				$decoded = base64_decode($xml['challenge'][0]['#']);
-				$decoded = self::parse_data($decoded);
-
-				if (!isset($decoded['digest-uri']))
-				{
-					$decoded['digest-uri'] = 'xmpp/'. $this->server;
-				}
-
-				// better generate a cnonce, maybe it's needed
-				$decoded['cnonce'] = base64_encode(md5(uniqid(mt_rand(), true)));
-
-				// second challenge?
-				if (isset($decoded['rspauth']))
-				{
-					$this->send("<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'/>");
-				}
-				else
-				{
-					// Make sure we only use 'auth' for qop (relevant for $this->encrypt_password())
-					// If the <response> is choking up on the changed parameter we may need to adjust encrypt_password() directly
-					if (isset($decoded['qop']) && $decoded['qop'] != 'auth' && strpos($decoded['qop'], 'auth') !== false)
-					{
-						$decoded['qop'] = 'auth';
-					}
-
-					$response = array(
-						'username'	=> $this->username,
-						'response'	=> $this->encrypt_password(array_merge($decoded, array('nc' => '00000001'))),
-						'charset'	=> 'utf-8',
-						'nc'		=> '00000001',
-						'qop'		=> 'auth',			// only auth being supported
-					);
-
-					foreach (array('nonce', 'digest-uri', 'realm', 'cnonce') as $key)
-					{
-						if (isset($decoded[$key]))
-						{
-							$response[$key] = $decoded[$key];
-						}
-					}
-
-					$this->send("<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>" . base64_encode($this->implode_data($response)) . '</response>');
-				}
-
-				return $this->response($this->listen());
-			break;
-
-			case 'failure':
-				$this->add_to_log('Error: Server sent "failure".');
-				$this->disconnect();
-				return false;
-			break;
-
-			case 'proceed':
-				// continue switching to TLS
-				$meta = stream_get_meta_data($this->connection);
-				socket_set_blocking($this->connection, 1);
-
-				if (!stream_socket_enable_crypto($this->connection, true, STREAM_CRYPTO_METHOD_TLS_CLIENT))
-				{
-					$this->add_to_log('Error: TLS mode change failed.');
-					return false;
-				}
-
-				socket_set_blocking($this->connection, $meta['blocked']);
-				$this->session['tls'] = true;
-
-				// new stream
-				$this->send("<?xml version='1.0' encoding='UTF-8' ?" . ">\n");
-				$this->send("<stream:stream to='{$this->server}' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' version='1.0'>\n");
-
-				return $this->response($this->listen());
-			break;
-
-			case 'success':
-				// Yay, authentication successful.
-				$this->send("<stream:stream to='{$this->server}' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' version='1.0'>\n");
-				$this->session['authenticated'] = true;
-
-				// we have to wait for another response
-				return $this->response($this->listen());
-			break;
-
-			case 'iq':
-				// we are not interested in IQs we did not expect
-				if (!isset($xml['iq'][0]['@']['id']))
-				{
-					return false;
-				}
-
-				// multiple possibilities here
-				switch ($xml['iq'][0]['@']['id'])
-				{
-					case 'bind_1':
-						$this->session['jid'] = $xml['iq'][0]['#']['bind'][0]['#']['jid'][0]['#'];
-
-						// and (maybe) yet another request to be able to send messages *finally*
-						if ($this->session['sess_required'])
-						{
-							$this->send("<iq to='{$this->server}' type='set' id='sess_1'>
-								<session xmlns='urn:ietf:params:xml:ns:xmpp-session'/>
-								</iq>");
-							return $this->response($this->listen());
-						}
-
-						return true;
-					break;
-
-					case 'sess_1':
-						return true;
-					break;
-
-					case 'reg_1':
-						$this->send("<iq type='set' id='reg_2'>
-								<query xmlns='jabber:iq:register'>
-									<username>" . utf8_htmlspecialchars($this->username) . "</username>
-									<password>" . utf8_htmlspecialchars($this->password) . "</password>
-								</query>
-							</iq>");
-						return $this->response($this->listen());
-					break;
-
-					case 'reg_2':
-						// registration end
-						if (isset($xml['iq'][0]['#']['error']))
-						{
-							$this->add_to_log('Warning: Registration failed.');
-							return false;
-						}
-						return true;
-					break;
-
-					case 'unreg_1':
-						return true;
-					break;
-
-					default:
-						$this->add_to_log('Notice: Received unexpected IQ.');
-						return false;
-					break;
-				}
-			break;
-
-			case 'message':
-				// we are only interested in content...
-				if (!isset($xml['message'][0]['#']['body']))
-				{
-					return false;
-				}
-
-				$message['body'] = $xml['message'][0]['#']['body'][0]['#'];
-				$message['from'] = $xml['message'][0]['@']['from'];
-
-				if (isset($xml['message'][0]['#']['subject']))
-				{
-					$message['subject'] = $xml['message'][0]['#']['subject'][0]['#'];
-				}
-				$this->session['messages'][] = $message;
-			break;
-
-			default:
-				// hm...don't know this response
-				$this->add_to_log('Notice: Unknown server response (' . key($xml) . ')');
-				return false;
-			break;
-		}
-	}
-
-	public function send_message($to, $text, $subject = '', $type = 'normal')
-	{
-		if (!isset($this->session['jid']))
-		{
-			return false;
-		}
-
-		if (!in_array($type, array('chat', 'normal', 'error', 'groupchat', 'headline')))
-		{
-			$type = 'normal';
-		}
-
-		return $this->send("<message from='" . utf8_htmlspecialchars($this->session['jid']) . "' to='" . utf8_htmlspecialchars($to) . "' type='$type' id='" . uniqid('msg') . "'>
-			<subject>" . utf8_htmlspecialchars($subject) . "</subject>
-			<body>" . utf8_htmlspecialchars($text) . "</body>
-			</message>"
-		);
-	}
-
-	/**
-	* Encrypts a password as in RFC 2831
-	* @param array $data Needs data from the client-server connection
-	* @access public
-	* @return string
-	*/
-	public function encrypt_password($data)
-	{
-		// let's me think about <challenge> again...
-		foreach (array('realm', 'cnonce', 'digest-uri') as $key)
-		{
-			if (!isset($data[$key]))
-			{
-				$data[$key] = '';
-			}
-		}
-
-		$pack = md5($this->username . ':' . $data['realm'] . ':' . $this->password);
-
-		if (isset($data['authzid']))
-		{
-			$a1 = pack('H32', $pack)  . sprintf(':%s:%s:%s', $data['nonce'], $data['cnonce'], $data['authzid']);
-		}
-		else
-		{
-			$a1 = pack('H32', $pack)  . sprintf(':%s:%s', $data['nonce'], $data['cnonce']);
-		}
-
-		// should be: qop = auth
-		$a2 = 'AUTHENTICATE:'. $data['digest-uri'];
-
-		return md5(sprintf('%s:%s:%s:%s:%s:%s', md5($a1), $data['nonce'], $data['nc'], $data['cnonce'], $data['qop'], md5($a2)));
-	}
-
-	/**
-	* parse_data like a="b",c="d",... or like a="a, b", c, d="e", f=g,...
-	* @param string $data
-	* @access private
-	* @return array a => b ...
-	*/
-	private static function parse_data($data)
-	{
-		$data = explode(',', $data);
-		$pairs = array();
-		$key = false;
-
-		foreach ($data as $pair)
-		{
-			$dd = strpos($pair, '=');
-
-			if ($dd)
-			{
-				$key = trim(substr($pair, 0, $dd));
-				$pairs[$key] = trim(trim(substr($pair, $dd + 1)), '"');
-			}
-			else if (strpos(strrev(trim($pair)), '"') === 0 && $key)
-			{
-				// We are actually having something left from "a, b" values, add it to the last one we handled.
-				$pairs[$key] .= ',' . trim(trim($pair), '"');
-				continue;
-			}
-		}
-
-		return $pairs;
-	}
-
-	/**
-	* opposite of jabber::parse_data()
-	* @param array $data
-	* @access private
-	* @return string
-	*/
-	private function implode_data($data)
-	{
-		$return = array();
-		foreach ($data as $key => $value)
-		{
-			$return[] = $key . '="' . $value . '"';
-		}
-		return implode(',', $return);
-	}
-
-	/**
-	* xmlize()
-	* @author Hans Anderson
-	* @copyright Hans Anderson / http://www.hansanderson.com/php/xml/
-	*/
-	private static function xmlize($data, $skip_white = 1, $encoding = 'UTF-8')
-	{
-		$data = trim($data);
-
-		if (substr($data, 0, 5) != '<?xml')
-		{
-			// mod
-			$data = '<root>'. $data . '</root>';
-		}
-
-		$vals = $index = $array = array();
-		$parser = xml_parser_create($encoding);
-		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
-		xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, $skip_white);
-		xml_parse_into_struct($parser, $data, $vals, $index);
-		xml_parser_free($parser);
-
-		$i = 0;
-		$tagname = $vals[$i]['tag'];
-
-		$array[$tagname][0]['@'] = (isset($vals[$i]['attributes'])) ? $vals[$i]['attributes'] : array();
-		$array[$tagname][0]['#'] = self::_xml_depth($vals, $i);
-
-		if (substr($data, 0, 5) != '<?xml')
-		{
-			$array = $array['root'][0]['#'];
-		}
-
-		return $array;
-	}
-
-	/**
-	* _xml_depth()
-	* @author Hans Anderson
-	* @copyright Hans Anderson / http://www.hansanderson.com/php/xml/
-	*/
-	private static function _xml_depth($vals, &$i)
-	{
-		$children = array();
-
-		if (isset($vals[$i]['value']))
-		{
-			array_push($children, $vals[$i]['value']);
-		}
-
-		while (++$i < sizeof($vals))
-		{
-			switch ($vals[$i]['type'])
-			{
-				case 'open':
-
-					$tagname = (isset($vals[$i]['tag'])) ? $vals[$i]['tag'] : '';
-					$size = (isset($children[$tagname])) ? sizeof($children[$tagname]) : 0;
-
-					if (isset($vals[$i]['attributes']))
-					{
-						$children[$tagname][$size]['@'] = $vals[$i]['attributes'];
-					}
-
-					$children[$tagname][$size]['#'] = self::_xml_depth($vals, $i);
-
-				break;
-
-				case 'cdata':
-					array_push($children, $vals[$i]['value']);
-				break;
-
-				case 'complete':
-
-					$tagname = $vals[$i]['tag'];
-					$size = (isset($children[$tagname])) ? sizeof($children[$tagname]) : 0;
-					$children[$tagname][$size]['#'] = (isset($vals[$i]['value'])) ? $vals[$i]['value'] : array();
-
-					if (isset($vals[$i]['attributes']))
-					{
-						$children[$tagname][$size]['@'] = $vals[$i]['attributes'];
-					}
-
-				break;
-
-				case 'close':
-					return $children;
-				break;
-			}
-		}
-
-		return $children;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
deleted file mode 100644
index 8d15e8a13f..0000000000
--- a/phpBB/includes/functions_messenger.php
+++ /dev/null
@@ -1,1442 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Messenger
-* @package phpBB3
-*/
-class messenger
-{
-	private $vars, $msg, $extra_headers, $replyto, $from, $subject;
-	private $addresses = array();
-
-	private $mail_priority = MAIL_NORMAL_PRIORITY;
-	private $use_queue = true;
-	private $tpl_msg = array();
-
-	/**
-	* Constructor
-	*/
-	function __construct($use_queue = true)
-	{
-		$this->use_queue = (!phpbb::$config['email_package_size']) ? false : $use_queue;
-		$this->subject = '';
-	}
-
-	/**
-	* Resets all the data (address, template file, etc etc) to default
-	*/
-	private function reset()
-	{
-		$this->addresses = $this->extra_headers = array();
-		$this->vars = $this->msg = $this->replyto = $this->from = '';
-		$this->mail_priority = MAIL_NORMAL_PRIORITY;
-	}
-
-	/**
-	* Sets an email address to send to
-	*/
-	function to($address, $realname = '')
-	{
-		if (!trim($address))
-		{
-			return;
-		}
-
-		$pos = isset($this->addresses['to']) ? sizeof($this->addresses['to']) : 0;
-
-		$this->addresses['to'][$pos]['email'] = trim($address);
-
-		// If empty sendmail_path on windows, PHP changes the to line
-		if (!phpbb::$config['smtp_delivery'] && DIRECTORY_SEPARATOR == '\\')
-		{
-			$this->addresses['to'][$pos]['name'] = '';
-		}
-		else
-		{
-			$this->addresses['to'][$pos]['name'] = trim($realname);
-		}
-	}
-
-	/**
-	* Sets an cc address to send to
-	*/
-	function cc($address, $realname = '')
-	{
-		if (!trim($address))
-		{
-			return;
-		}
-
-		$pos = isset($this->addresses['cc']) ? sizeof($this->addresses['cc']) : 0;
-		$this->addresses['cc'][$pos]['email'] = trim($address);
-		$this->addresses['cc'][$pos]['name'] = trim($realname);
-	}
-
-	/**
-	* Sets an bcc address to send to
-	*/
-	function bcc($address, $realname = '')
-	{
-		if (!trim($address))
-		{
-			return;
-		}
-
-		$pos = isset($this->addresses['bcc']) ? sizeof($this->addresses['bcc']) : 0;
-		$this->addresses['bcc'][$pos]['email'] = trim($address);
-		$this->addresses['bcc'][$pos]['name'] = trim($realname);
-	}
-
-	/**
-	* Sets a im contact to send to
-	*/
-	function im($address, $realname = '')
-	{
-		// IM-Addresses could be empty
-		if (!trim($address))
-		{
-			return;
-		}
-
-		$pos = isset($this->addresses['im']) ? sizeof($this->addresses['im']) : 0;
-		$this->addresses['im'][$pos]['uid'] = trim($address);
-		$this->addresses['im'][$pos]['name'] = trim($realname);
-	}
-
-	/**
-	* Set the reply to address
-	*/
-	function replyto($address)
-	{
-		$this->replyto = trim($address);
-	}
-
-	/**
-	* Set the from address
-	*/
-	function from($address)
-	{
-		$this->from = trim($address);
-	}
-
-	/**
-	* set up subject for mail
-	*/
-	function subject($subject = '')
-	{
-		$this->subject = trim($subject);
-	}
-
-	/**
-	* set up extra mail headers
-	*/
-	function headers($headers)
-	{
-		$this->extra_headers[] = trim($headers);
-	}
-
-	/**
-	* Set the email priority
-	*/
-	function set_mail_priority($priority = MAIL_NORMAL_PRIORITY)
-	{
-		$this->mail_priority = $priority;
-	}
-
-	/**
-	* Set email template to use
-	*/
-	function template($template_file, $template_lang = '')
-	{
-		if (!trim($template_file))
-		{
-			trigger_error('No template file set', E_USER_ERROR);
-		}
-
-		if (!trim($template_lang))
-		{
-			$template_lang = basename(phpbb::$config['default_lang']);
-		}
-
-		if (empty($this->tpl_msg[$template_lang . $template_file]))
-		{
-			$tpl_file = (!empty(phpbb::$user->lang_path)) ? phpbb::$user->lang_path : PHPBB_ROOT_PATH . 'language/';
-			$tpl_file .= $template_lang . "/email/$template_file.txt";
-
-			if (!file_exists($tpl_file))
-			{
-				trigger_error("Could not find email template file [ $tpl_file ]", E_USER_ERROR);
-			}
-
-			if (($data = @file_get_contents($tpl_file)) === false)
-			{
-				trigger_error("Failed opening template file [ $tpl_file ]", E_USER_ERROR);
-			}
-
-			$this->tpl_msg[$template_lang . $template_file] = $data;
-		}
-
-		$this->msg = $this->tpl_msg[$template_lang . $template_file];
-
-		return true;
-	}
-
-	/**
-	* assign variables to email template
-	*/
-	function assign_vars($vars)
-	{
-		$this->vars = (empty($this->vars)) ? $vars : $this->vars + $vars;
-	}
-
-	/**
-	* Send the mail out to the recipients set previously in var $this->addresses
-	*/
-	function send($method = NOTIFY_EMAIL, $break = false)
-	{
-		// We add some standard variables we always use, no need to specify them always
-		$this->vars['U_BOARD'] = (!isset($this->vars['U_BOARD'])) ? generate_board_url() : $this->vars['U_BOARD'];
-		$this->vars['EMAIL_SIG'] = (!isset($this->vars['EMAIL_SIG'])) ? str_replace('<br />', "\n", "-- \n" . htmlspecialchars_decode(phpbb::$config['board_email_sig'])) : $this->vars['EMAIL_SIG'];
-		$this->vars['SITENAME'] = (!isset($this->vars['SITENAME'])) ? htmlspecialchars_decode(phpbb::$config['sitename']) : $this->vars['SITENAME'];
-
-		// Escape all quotes, else the eval will fail.
-		$this->msg = str_replace ("'", "\'", $this->msg);
-		$this->msg = preg_replace('#\{([a-z0-9\-_]*?)\}#is', "' . ((isset(\$this->vars['\\1'])) ? \$this->vars['\\1'] : '') . '", $this->msg);
-
-		eval("\$this->msg = '$this->msg';");
-
-		// We now try and pull a subject from the email body ... if it exists,
-		// do this here because the subject may contain a variable
-		$drop_header = '';
-		$match = array();
-		if (preg_match('#^(Subject:(.*?))$#m', $this->msg, $match))
-		{
-			$this->subject = (trim($match[2]) != '') ? trim($match[2]) : (($this->subject != '') ? $this->subject : phpbb::$user->lang['NO_EMAIL_SUBJECT']);
-			$drop_header .= '[\r\n]*?' . preg_quote($match[1], '#');
-		}
-		else
-		{
-			$this->subject = (($this->subject != '') ? $this->subject : phpbb::$user->lang['NO_EMAIL_SUBJECT']);
-		}
-
-		if ($drop_header)
-		{
-			$this->msg = trim(preg_replace('#' . $drop_header . '#s', '', $this->msg));
-		}
-
-		if ($break)
-		{
-			return true;
-		}
-
-		switch ($method)
-		{
-			case NOTIFY_EMAIL:
-				$result = $this->msg_email();
-			break;
-
-			case NOTIFY_IM:
-				$result = $this->msg_jabber();
-			break;
-
-			case NOTIFY_BOTH:
-				$result = $this->msg_email();
-				$this->msg_jabber();
-			break;
-		}
-
-		$this->reset();
-		return $result;
-	}
-
-	/**
-	* Add error message to log
-	*/
-	public static function error($type, $msg)
-	{
-		// Session doesn't exist, create it
-		if (!isset(phpbb::$user->session_id) || phpbb::$user->session_id === '')
-		{
-			phpbb::$user->session_begin();
-		}
-
-		$calling_page = (!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : $_ENV['PHP_SELF'];
-
-		$message = '';
-		switch ($type)
-		{
-			case 'EMAIL':
-				$message = '<strong>EMAIL/' . ((phpbb::$config['smtp_delivery']) ? 'SMTP' : 'PHP/' . phpbb::$config['email_function_name'] . '()') . '</strong>';
-			break;
-
-			default:
-				$message = "<strong>$type</strong>";
-			break;
-		}
-
-		$message .= '<br /><em>' . htmlspecialchars($calling_page) . '</em><br /><br />' . $msg . '<br />';
-		add_log('critical', 'LOG_ERROR_' . $type, $message);
-	}
-
-	/**
-	* Save to queue
-	*/
-	function save_queue()
-	{
-		if (phpbb::$config['email_package_size'] && $this->use_queue && !empty($this->queue))
-		{
-			$this->queue->save();
-			return;
-		}
-	}
-
-	/**
-	* Return email header
-	*/
-	private function build_header($to, $cc, $bcc)
-	{
-		$headers = array();
-
-		$headers[] = 'From: ' . $this->from;
-
-		if ($cc)
-		{
-			$headers[] = 'Cc: ' . $cc;
-		}
-
-		if ($bcc)
-		{
-			$headers[] = 'Bcc: ' . $bcc;
-		}
-
-		$headers[] = 'Reply-To: ' . $this->replyto;
-		$headers[] = 'Return-Path: <' . phpbb::$config['board_email'] . '>';
-		$headers[] = 'Sender: <' . phpbb::$config['board_email'] . '>';
-		$headers[] = 'MIME-Version: 1.0';
-		$headers[] = 'Message-ID: <' . md5(unique_id(time())) . '@' . phpbb::$config['server_name'] . '>';
-		$headers[] = 'Date: ' . date('r', time());
-		$headers[] = 'Content-Type: text/plain; charset=UTF-8'; // format=flowed
-		$headers[] = 'Content-Transfer-Encoding: 8bit'; // 7bit
-
-		$headers[] = 'X-Priority: ' . $this->mail_priority;
-		$headers[] = 'X-MSMail-Priority: ' . (($this->mail_priority == MAIL_LOW_PRIORITY) ? 'Low' : (($this->mail_priority == MAIL_NORMAL_PRIORITY) ? 'Normal' : 'High'));
-		$headers[] = 'X-Mailer: PhpBB3';
-		$headers[] = 'X-MimeOLE: phpBB3';
-		$headers[] = 'X-phpBB-Origin: phpbb://' . str_replace(array('http://', 'https://'), array('', ''), generate_board_url());
-
-		if (sizeof($this->extra_headers))
-		{
-			$headers = array_merge($headers, $this->extra_headers);
-		}
-
-		return $headers;
-	}
-
-	/**
-	* Send out emails
-	*/
-	private function msg_email()
-	{
-		if (empty(phpbb::$config['email_enable']))
-		{
-			return false;
-		}
-
-		// Addresses to send to?
-		if (empty($this->addresses) || (empty($this->addresses['to']) && empty($this->addresses['cc']) && empty($this->addresses['bcc'])))
-		{
-			// Send was successful. ;)
-			return true;
-		}
-
-		$use_queue = false;
-		if (phpbb::$config['email_package_size'] && $this->use_queue)
-		{
-			if (empty($this->queue))
-			{
-				$this->queue = new queue();
-				$this->queue->init('email', phpbb::$config['email_package_size']);
-			}
-			$use_queue = true;
-		}
-
-		if (empty($this->replyto))
-		{
-			$this->replyto = '<' . phpbb::$config['board_contact'] . '>';
-		}
-
-		if (empty($this->from))
-		{
-			$this->from = '<' . phpbb::$config['board_contact'] . '>';
-		}
-
-		// Build to, cc and bcc strings
-		$to = $cc = $bcc = '';
-		foreach ($this->addresses as $type => $address_ary)
-		{
-			if ($type == 'im')
-			{
-				continue;
-			}
-
-			foreach ($address_ary as $which_ary)
-			{
-				$$type .= (($$type != '') ? ', ' : '') . (($which_ary['name'] != '') ? '"' . mail_encode($which_ary['name']) . '" <' . $which_ary['email'] . '>' : $which_ary['email']);
-			}
-		}
-
-		// Build header
-		$headers = $this->build_header($to, $cc, $bcc);
-
-		// Send message ...
-		if (!$use_queue)
-		{
-			$mail_to = ($to == '') ? 'undisclosed-recipients:;' : $to;
-			$err_msg = '';
-
-			if (phpbb::$config['smtp_delivery'])
-			{
-				$result = smtpmail($this->addresses, mail_encode($this->subject), wordwrap(utf8_wordwrap($this->msg), 997, "\n", true), $err_msg, $headers);
-			}
-			else
-			{
-				// We use the EOL character for the OS here because the PHP mail function does not correctly transform line endings. On Windows SMTP is used (SMTP is \r\n), on UNIX a command is used...
-				// Reference: http://bugs.php.net/bug.php?id=15841
-				$headers = implode(PHP_EOL, $headers);
-
-				ob_start();
-				$result = phpbb::$config['email_function_name']($mail_to, mail_encode($this->subject), wordwrap(utf8_wordwrap($this->msg), 997, "\n", true), $headers);
-				$err_msg = ob_get_clean();
-			}
-
-			if (!$result)
-			{
-				self::error('EMAIL', $err_msg);
-				return false;
-			}
-		}
-		else
-		{
-			$this->queue->put('email', array(
-				'to'			=> $to,
-				'addresses'		=> $this->addresses,
-				'subject'		=> $this->subject,
-				'msg'			=> $this->msg,
-				'headers'		=> $headers)
-			);
-		}
-
-		return true;
-	}
-
-	/**
-	* Send jabber message out
-	*/
-	private function msg_jabber()
-	{
-		if (empty(phpbb::$config['jab_enable']) || empty(phpbb::$config['jab_host']) || empty(phpbb::$config['jab_username']) || empty(phpbb::$config['jab_password']))
-		{
-			return false;
-		}
-
-		if (empty($this->addresses['im']))
-		{
-			// Send was successful. ;)
-			return true;
-		}
-
-		$use_queue = false;
-		if (phpbb::$config['jab_package_size'] && $this->use_queue)
-		{
-			if (empty($this->queue))
-			{
-				$this->queue = new queue();
-				$this->queue->init('jabber', phpbb::$config['jab_package_size']);
-			}
-			$use_queue = true;
-		}
-
-		$addresses = array();
-		foreach ($this->addresses['im'] as $type => $uid_ary)
-		{
-			$addresses[] = $uid_ary['uid'];
-		}
-		$addresses = array_unique($addresses);
-
-		if (!$use_queue)
-		{
-			include_once(PHPBB_ROOT_PATH . 'includes/functions_jabber.' . PHP_EXT);
-			$this->jabber = new jabber(phpbb::$config['jab_host'], phpbb::$config['jab_port'], phpbb::$config['jab_username'], phpbb::$config['jab_password'], phpbb::$config['jab_use_ssl']);
-
-			if (!$this->jabber->connect())
-			{
-				self::error('JABBER', phpbb::$user->lang['ERR_JAB_CONNECT'] . '<br />' . $this->jabber->get_log());
-				return false;
-			}
-
-			if (!$this->jabber->login())
-			{
-				self::error('JABBER', phpbb::$user->lang['ERR_JAB_AUTH'] . '<br />' . $this->jabber->get_log());
-				return false;
-			}
-
-			foreach ($addresses as $address)
-			{
-				$this->jabber->send_message($address, $this->msg, $this->subject);
-			}
-
-			$this->jabber->disconnect();
-		}
-		else
-		{
-			$this->queue->put('jabber', array(
-				'addresses'		=> $addresses,
-				'subject'		=> $this->subject,
-				'msg'			=> $this->msg)
-			);
-		}
-		unset($addresses);
-		return true;
-	}
-}
-
-/**
-* handling email and jabber queue
-* @package phpBB3
-*/
-class queue
-{
-	private $data = array();
-	private $queue_data = array();
-	private $package_size = 0;
-	private $cache_file = '';
-
-	/**
-	* constructor
-	*/
-	function __construct()
-	{
-		$this->data = array();
-		$this->cache_file = PHPBB_ROOT_PATH . 'cache/queue.' . PHP_EXT;
-	}
-
-	/**
-	* Init a queue object
-	*/
-	public function init($object, $package_size)
-	{
-		$this->data[$object] = array();
-		$this->data[$object]['package_size'] = $package_size;
-		$this->data[$object]['data'] = array();
-	}
-
-	/**
-	* Put object in queue
-	*/
-	public function put($object, $scope)
-	{
-		$this->data[$object]['data'][] = $scope;
-	}
-
-	/**
-	* Process queue
-	* Using lock file
-	*/
-	public function process()
-	{
-		set_config('last_queue_run', time(), true);
-
-		// Delete stale lock file
-		if (file_exists($this->cache_file . '.lock') && !file_exists($this->cache_file))
-		{
-			@unlink($this->cache_file . '.lock');
-			return;
-		}
-
-		if (!file_exists($this->cache_file) || (file_exists($this->cache_file . '.lock') && filemtime($this->cache_file) > time() - phpbb::$config['queue_interval']))
-		{
-			return;
-		}
-
-		$fp = @fopen($this->cache_file . '.lock', 'wb');
-		fclose($fp);
-		phpbb::$system->chmod($this->cache_file . '.lock', phpbb::CHMOD_READ | phpbb::CHMOD_WRITE);
-
-		include($this->cache_file);
-
-		foreach ($this->queue_data as $object => $data_ary)
-		{
-			@set_time_limit(0);
-
-			if (!isset($data_ary['package_size']))
-			{
-				$data_ary['package_size'] = 0;
-			}
-
-			$package_size = $data_ary['package_size'];
-			$num_items = (!$package_size || sizeof($data_ary['data']) < $package_size) ? sizeof($data_ary['data']) : $package_size;
-
-			// If the amount of emails to be sent is way more than package_size than we need to increase it to prevent backlogs...
-			if (sizeof($data_ary['data']) > $package_size * 2.5)
-			{
-				$num_items = sizeof($data_ary['data']);
-			}
-
-			switch ($object)
-			{
-				case 'email':
-					// Delete the email queued objects if mailing is disabled
-					if (!phpbb::$config['email_enable'])
-					{
-						unset($this->queue_data['email']);
-						continue 2;
-					}
-				break;
-
-				case 'jabber':
-					if (!phpbb::$config['jab_enable'])
-					{
-						unset($this->queue_data['jabber']);
-						continue 2;
-					}
-
-					include_once(PHPBB_ROOT_PATH . 'includes/functions_jabber.' . PHP_EXT);
-					$this->jabber = new jabber(phpbb::$config['jab_host'], phpbb::$config['jab_port'], phpbb::$config['jab_username'], phpbb::$config['jab_password'], phpbb::$config['jab_use_ssl']);
-
-					if (!$this->jabber->connect())
-					{
-						messenger::error('JABBER', phpbb::$user->lang['ERR_JAB_CONNECT']);
-						continue 2;
-					}
-
-					if (!$this->jabber->login())
-					{
-						messenger::error('JABBER', phpbb::$user->lang['ERR_JAB_AUTH']);
-						continue 2;
-					}
-
-				break;
-
-				default:
-					return;
-			}
-
-			for ($i = 0; $i < $num_items; $i++)
-			{
-				// Make variables available...
-				extract(array_shift($this->queue_data[$object]['data']));
-
-				switch ($object)
-				{
-					case 'email':
-						$err_msg = '';
-						$to = (!$to) ? 'undisclosed-recipients:;' : $to;
-
-						if (phpbb::$config['smtp_delivery'])
-						{
-							$result = smtpmail($addresses, mail_encode($subject), wordwrap(utf8_wordwrap($msg), 997, "\n", true), $err_msg, $headers);
-						}
-						else
-						{
-							ob_start();
-							$result = phpbb::$config['email_function_name']($to, mail_encode($subject), wordwrap(utf8_wordwrap($msg), 997, "\n", true), implode(PHP_EOL, $headers));
-							$err_msg = ob_get_clean();
-						}
-
-						if (!$result)
-						{
-							@unlink($this->cache_file . '.lock');
-
-							messenger::error('EMAIL', $err_msg);
-							continue 2;
-						}
-					break;
-
-					case 'jabber':
-						foreach ($addresses as $address)
-						{
-							if ($this->jabber->send_message($address, $msg, $subject) === false)
-							{
-								messenger::error('JABBER', $this->jabber->get_log());
-								continue 3;
-							}
-						}
-					break;
-				}
-			}
-
-			// No more data for this object? Unset it
-			if (!sizeof($this->queue_data[$object]['data']))
-			{
-				unset($this->queue_data[$object]);
-			}
-
-			// Post-object processing
-			switch ($object)
-			{
-				case 'jabber':
-					// Hang about a couple of secs to ensure the messages are
-					// handled, then disconnect
-					$this->jabber->disconnect();
-				break;
-			}
-		}
-
-		if (!sizeof($this->queue_data))
-		{
-			@unlink($this->cache_file);
-		}
-		else
-		{
-			if ($fp = @fopen($this->cache_file, 'wb'))
-			{
-				@flock($fp, LOCK_EX);
-				fwrite($fp, "<?php\nif (!defined('IN_PHPBB')) exit;\n\$this->queue_data = unserialize(" . var_export(serialize($this->queue_data), true) . ");\n\n?>");
-				@flock($fp, LOCK_UN);
-				fclose($fp);
-
-				phpbb::$system->chmod($this->cache_file, phpbb::CHMOD_READ | phpbb::CHMOD_WRITE);
-			}
-		}
-
-		@unlink($this->cache_file . '.lock');
-	}
-
-	/**
-	* Save queue
-	*/
-	public function save()
-	{
-		if (!sizeof($this->data))
-		{
-			return;
-		}
-
-		if (file_exists($this->cache_file))
-		{
-			include($this->cache_file);
-
-			foreach ($this->queue_data as $object => $data_ary)
-			{
-				if (isset($this->data[$object]) && sizeof($this->data[$object]))
-				{
-					$this->data[$object]['data'] = array_merge($data_ary['data'], $this->data[$object]['data']);
-				}
-				else
-				{
-					$this->data[$object]['data'] = $data_ary['data'];
-				}
-			}
-		}
-
-		if ($fp = @fopen($this->cache_file, 'w'))
-		{
-			@flock($fp, LOCK_EX);
-			fwrite($fp, "<?php\nif (!defined('IN_PHPBB')) exit;\n\$this->queue_data = unserialize(" . var_export(serialize($this->data), true) . ");\n\n?>");
-			@flock($fp, LOCK_UN);
-			fclose($fp);
-
-			phpbb::$system->chmod($this->cache_file, phpbb::CHMOD_READ | phpbb::CHMOD_WRITE);
-		}
-	}
-}
-
-/**
-* Replacement or substitute for PHP's mail command
-*/
-function smtpmail($addresses, $subject, $message, &$err_msg, $headers = false)
-{
-	// Fix any bare linefeeds in the message to make it RFC821 Compliant.
-	$message = preg_replace("#(?<!\r)\n#si", "\r\n", $message);
-
-	if ($headers !== false)
-	{
-		if (!is_array($headers))
-		{
-			// Make sure there are no bare linefeeds in the headers
-			$headers = preg_replace('#(?<!\r)\n#si', "\n", $headers);
-			$headers = explode("\n", $headers);
-		}
-
-		// Ok this is rather confusing all things considered,
-		// but we have to grab bcc and cc headers and treat them differently
-		// Something we really didn't take into consideration originally
-		$headers_used = array();
-
-		foreach ($headers as $header)
-		{
-			if (strpos(strtolower($header), 'cc:') === 0 || strpos(strtolower($header), 'bcc:') === 0)
-			{
-				continue;
-			}
-			$headers_used[] = trim($header);
-		}
-
-		$headers = chop(implode("\r\n", $headers_used));
-	}
-
-	if (trim($subject) == '')
-	{
-		$err_msg = (isset(phpbb::$user->lang['NO_EMAIL_SUBJECT'])) ? phpbb::$user->lang['NO_EMAIL_SUBJECT'] : 'No email subject specified';
-		return false;
-	}
-
-	if (trim($message) == '')
-	{
-		$err_msg = (isset(phpbb::$user->lang['NO_EMAIL_MESSAGE'])) ? phpbb::$user->lang['NO_EMAIL_MESSAGE'] : 'Email message was blank';
-		return false;
-	}
-
-	$mail_rcpt = $mail_to = $mail_cc = array();
-
-	// Build correct addresses for RCPT TO command and the client side display (TO, CC)
-	if (isset($addresses['to']) && sizeof($addresses['to']))
-	{
-		foreach ($addresses['to'] as $which_ary)
-		{
-			$mail_to[] = ($which_ary['name'] != '') ? mail_encode(trim($which_ary['name'])) . ' <' . trim($which_ary['email']) . '>' : '<' . trim($which_ary['email']) . '>';
-			$mail_rcpt['to'][] = '<' . trim($which_ary['email']) . '>';
-		}
-	}
-
-	if (isset($addresses['bcc']) && sizeof($addresses['bcc']))
-	{
-		foreach ($addresses['bcc'] as $which_ary)
-		{
-			$mail_rcpt['bcc'][] = '<' . trim($which_ary['email']) . '>';
-		}
-	}
-
-	if (isset($addresses['cc']) && sizeof($addresses['cc']))
-	{
-		foreach ($addresses['cc'] as $which_ary)
-		{
-			$mail_cc[] = ($which_ary['name'] != '') ? mail_encode(trim($which_ary['name'])) . ' <' . trim($which_ary['email']) . '>' : '<' . trim($which_ary['email']) . '>';
-			$mail_rcpt['cc'][] = '<' . trim($which_ary['email']) . '>';
-		}
-	}
-
-	$smtp = new smtp_class();
-
-	$errno = 0;
-	$errstr = '';
-
-	$smtp->add_backtrace('Connecting to ' . phpbb::$config['smtp_host'] . ':' . phpbb::$config['smtp_port']);
-
-	// Ok we have error checked as much as we can to this point let's get on it already.
-	ob_start();
-	$smtp->socket = fsockopen(phpbb::$config['smtp_host'], phpbb::$config['smtp_port'], $errno, $errstr, 20);
-	$error_contents = ob_get_clean();
-
-	if (!$smtp->socket)
-	{
-		if ($errstr)
-		{
-			$errstr = utf8_convert_message($errstr);
-		}
-
-		$err_msg = (isset(phpbb::$user->lang['NO_CONNECT_TO_SMTP_HOST'])) ? sprintf(phpbb::$user->lang['NO_CONNECT_TO_SMTP_HOST'], $errno, $errstr) : "Could not connect to smtp host : $errno : $errstr";
-		$err_msg .= ($error_contents) ? '<br /><br />' . htmlspecialchars($error_contents) : '';
-		return false;
-	}
-
-	// Wait for reply
-	if ($err_msg = $smtp->server_parse('220', __LINE__))
-	{
-		$smtp->close_session($err_msg);
-		return false;
-	}
-
-	// Let me in. This function handles the complete authentication process
-	if ($err_msg = $smtp->log_into_server(phpbb::$config['smtp_host'], phpbb::$config['smtp_username'], phpbb::$config['smtp_password'], phpbb::$config['smtp_auth_method']))
-	{
-		$smtp->close_session($err_msg);
-		return false;
-	}
-
-	// From this point onward most server response codes should be 250
-	// Specify who the mail is from....
-	$smtp->server_send('MAIL FROM:<' . phpbb::$config['board_email'] . '>');
-	if ($err_msg = $smtp->server_parse('250', __LINE__))
-	{
-		$smtp->close_session($err_msg);
-		return false;
-	}
-
-	// Specify each user to send to and build to header.
-	$to_header = implode(', ', $mail_to);
-	$cc_header = implode(', ', $mail_cc);
-
-	// Now tell the MTA to send the Message to the following people... [TO, BCC, CC]
-	$rcpt = false;
-	foreach ($mail_rcpt as $type => $mail_to_addresses)
-	{
-		foreach ($mail_to_addresses as $mail_to_address)
-		{
-			// Add an additional bit of error checking to the To field.
-			if (preg_match('#[^ ]+\@[^ ]+#', $mail_to_address))
-			{
-				$smtp->server_send("RCPT TO:$mail_to_address");
-				if ($err_msg = $smtp->server_parse('250', __LINE__))
-				{
-					// We continue... if users are not resolved we do not care
-					if ($smtp->numeric_response_code != 550)
-					{
-						$smtp->close_session($err_msg);
-						return false;
-					}
-				}
-				else
-				{
-					$rcpt = true;
-				}
-			}
-		}
-	}
-
-	// We try to send messages even if a few people do not seem to have valid email addresses, but if no one has, we have to exit here.
-	if (!$rcpt)
-	{
-		phpbb::$user->session_begin();
-		$err_msg .= '<br /><br />';
-		$err_msg .= (isset(phpbb::$user->lang['INVALID_EMAIL_LOG'])) ? sprintf(phpbb::$user->lang['INVALID_EMAIL_LOG'], htmlspecialchars($mail_to_address)) : '<strong>' . htmlspecialchars($mail_to_address) . '</strong> possibly an invalid email address?';
-		$smtp->close_session($err_msg);
-		return false;
-	}
-
-	// Ok now we tell the server we are ready to start sending data
-	$smtp->server_send('DATA');
-
-	// This is the last response code we look for until the end of the message.
-	if ($err_msg = $smtp->server_parse('354', __LINE__))
-	{
-		$smtp->close_session($err_msg);
-		return false;
-	}
-
-	// Send the Subject Line...
-	$smtp->server_send("Subject: $subject");
-
-	// Now the To Header.
-	$to_header = ($to_header == '') ? 'undisclosed-recipients:;' : $to_header;
-	$smtp->server_send("To: $to_header");
-
-	// Now the CC Header.
-	if ($cc_header != '')
-	{
-		$smtp->server_send("CC: $cc_header");
-	}
-
-	// Now any custom headers....
-	if ($headers !== false)
-	{
-		$smtp->server_send("$headers\r\n");
-	}
-
-	// Ok now we are ready for the message...
-	$smtp->server_send($message);
-
-	// Ok the all the ingredients are mixed in let's cook this puppy...
-	$smtp->server_send('.');
-	if ($err_msg = $smtp->server_parse('250', __LINE__))
-	{
-		$smtp->close_session($err_msg);
-		return false;
-	}
-
-	// Now tell the server we are done and close the socket...
-	$smtp->server_send('QUIT');
-	$smtp->close_session($err_msg);
-
-	return true;
-}
-
-/**
-* SMTP Class
-* Auth Mechanisms originally taken from the AUTH Modules found within the PHP Extension and Application Repository (PEAR)
-* See docs/AUTHORS for more details
-* @package phpBB3
-*/
-class smtp_class
-{
-	private $server_response = '';
-	public $socket = 0;
-	private $responses = array();
-	private $commands = array();
-	public $numeric_response_code = 0;
-
-	private $backtrace = false;
-	private $backtrace_log = array();
-
-	function __construct()
-	{
-		// Always create a backtrace for admins to identify SMTP problems
-		$this->backtrace = true;
-		$this->backtrace_log = array();
-	}
-
-	/**
-	* Add backtrace message for debugging
-	*/
-	public function add_backtrace($message)
-	{
-		if ($this->backtrace)
-		{
-			$this->backtrace_log[] = utf8_htmlspecialchars($message);
-		}
-	}
-
-	/**
-	* Send command to smtp server
-	*/
-	public function server_send($command, $private_info = false)
-	{
-		fputs($this->socket, $command . "\r\n");
-
-		(!$private_info) ? $this->add_backtrace("# $command") : $this->add_backtrace('# Omitting sensitive information');
-
-		// We could put additional code here
-	}
-
-	/**
-	* We use the line to give the support people an indication at which command the error occurred
-	*/
-	public function server_parse($response, $line)
-	{
-		$this->server_response = '';
-		$this->responses = array();
-		$this->numeric_response_code = 0;
-
-		while (substr($this->server_response, 3, 1) != ' ')
-		{
-			if (!($this->server_response = fgets($this->socket, 256)))
-			{
-				return (isset(phpbb::$user->lang['NO_EMAIL_RESPONSE_CODE'])) ? phpbb::$user->lang['NO_EMAIL_RESPONSE_CODE'] : 'Could not get mail server response codes';
-			}
-			$this->responses[] = substr(rtrim($this->server_response), 4);
-			$this->numeric_response_code = (int) substr($this->server_response, 0, 3);
-
-			$this->add_backtrace("LINE: $line <- {$this->server_response}");
-		}
-
-		if (!(substr($this->server_response, 0, 3) == $response))
-		{
-			$this->numeric_response_code = (int) substr($this->server_response, 0, 3);
-			return (isset(phpbb::$user->lang['EMAIL_SMTP_ERROR_RESPONSE'])) ? sprintf(phpbb::$user->lang['EMAIL_SMTP_ERROR_RESPONSE'], $line, $this->server_response) : "Ran into problems sending Mail at <strong>Line $line</strong>. Response: $this->server_response";
-		}
-
-		return 0;
-	}
-
-	/**
-	* Close session
-	*/
-	public function close_session(&$err_msg)
-	{
-		fclose($this->socket);
-
-		if ($this->backtrace)
-		{
-			$message = '<h1>Backtrace</h1><p>' . implode('<br />', $this->backtrace_log) . '</p>';
-			$err_msg .= $message;
-		}
-	}
-
-	/**
-	* Log into server and get possible auth codes if neccessary
-	*/
-	public function log_into_server($hostname, $username, $password, $default_auth_method)
-	{
-		$err_msg = '';
-		$local_host = (function_exists('php_uname')) ? gethostbyaddr(gethostbyname(php_uname('n'))) : phpbb::$user->system['host'];
-
-		// If we are authenticating through pop-before-smtp, we
-		// have to login ones before we get authenticated
-		// NOTE: on some configurations the time between an update of the auth database takes so
-		// long that the first email send does not work. This is not a biggie on a live board (only
-		// the install mail will most likely fail) - but on a dynamic ip connection this might produce
-		// severe problems and is not fixable!
-		if ($default_auth_method == 'POP-BEFORE-SMTP' && $username && $password)
-		{
-			$errno = 0;
-			$errstr = '';
-
-			$this->server_send("QUIT");
-			fclose($this->socket);
-
-			$result = $this->pop_before_smtp($hostname, $username, $password);
-			$username = $password = $default_auth_method = '';
-
-			// We need to close the previous session, else the server is not
-			// able to get our ip for matching...
-			if (!$this->socket = @fsockopen(phpbb::$config['smtp_host'], phpbb::$config['smtp_port'], $errno, $errstr, 10))
-			{
-				if ($errstr)
-				{
-					$errstr = utf8_convert_message($errstr);
-				}
-
-				$err_msg = (isset(phpbb::$user->lang['NO_CONNECT_TO_SMTP_HOST'])) ? sprintf(phpbb::$user->lang['NO_CONNECT_TO_SMTP_HOST'], $errno, $errstr) : "Could not connect to smtp host : $errno : $errstr";
-				return $err_msg;
-			}
-
-			// Wait for reply
-			if ($err_msg = $this->server_parse('220', __LINE__))
-			{
-				$this->close_session($err_msg);
-				return $err_msg;
-			}
-		}
-
-		// Try EHLO first
-		$this->server_send("EHLO {$local_host}");
-		if ($err_msg = $this->server_parse('250', __LINE__))
-		{
-			// a 503 response code means that we're already authenticated
-			if ($this->numeric_response_code == 503)
-			{
-				return false;
-			}
-
-			// If EHLO fails, we try HELO
-			$this->server_send("HELO {$local_host}");
-			if ($err_msg = $this->server_parse('250', __LINE__))
-			{
-				return ($this->numeric_response_code == 503) ? false : $err_msg;
-			}
-		}
-
-		foreach ($this->responses as $response)
-		{
-			$response = explode(' ', $response);
-			$response_code = $response[0];
-			unset($response[0]);
-			$this->commands[$response_code] = implode(' ', $response);
-		}
-
-		// If we are not authenticated yet, something might be wrong if no username and passwd passed
-		if (!$username || !$password)
-		{
-			return false;
-		}
-
-		if (!isset($this->commands['AUTH']))
-		{
-			return (isset(phpbb::$user->lang['SMTP_NO_AUTH_SUPPORT'])) ? phpbb::$user->lang['SMTP_NO_AUTH_SUPPORT'] : 'SMTP server does not support authentication';
-		}
-
-		// Get best authentication method
-		$available_methods = explode(' ', $this->commands['AUTH']);
-
-		// Define the auth ordering if the default auth method was not found
-		$auth_methods = array('PLAIN', 'LOGIN', 'CRAM-MD5', 'DIGEST-MD5');
-		$method = '';
-
-		if (in_array($default_auth_method, $available_methods))
-		{
-			$method = $default_auth_method;
-		}
-		else
-		{
-			foreach ($auth_methods as $_method)
-			{
-				if (in_array($_method, $available_methods))
-				{
-					$method = $_method;
-					break;
-				}
-			}
-		}
-
-		if (!$method)
-		{
-			return (isset(phpbb::$user->lang['NO_SUPPORTED_AUTH_METHODS'])) ? phpbb::$user->lang['NO_SUPPORTED_AUTH_METHODS'] : 'No supported authentication methods';
-		}
-
-		$method = strtolower(str_replace('-', '_', $method));
-		return $this->$method($username, $password);
-	}
-
-	/**
-	* Pop before smtp authentication
-	*/
-	private function pop_before_smtp($hostname, $username, $password)
-	{
-		if (!$this->socket = @fsockopen($hostname, 110, $errno, $errstr, 10))
-		{
-			if ($errstr)
-			{
-				$errstr = utf8_convert_message($errstr);
-			}
-
-			return (isset(phpbb::$user->lang['NO_CONNECT_TO_SMTP_HOST'])) ? sprintf(phpbb::$user->lang['NO_CONNECT_TO_SMTP_HOST'], $errno, $errstr) : "Could not connect to smtp host : $errno : $errstr";
-		}
-
-		$this->server_send("USER $username", true);
-		if ($err_msg = $this->server_parse('+OK', __LINE__))
-		{
-			return $err_msg;
-		}
-
-		$this->server_send("PASS $password", true);
-		if ($err_msg = $this->server_parse('+OK', __LINE__))
-		{
-			return $err_msg;
-		}
-
-		$this->server_send('QUIT');
-		fclose($this->socket);
-
-		return false;
-	}
-
-	/**
-	* Plain authentication method
-	*/
-	private function plain($username, $password)
-	{
-		$this->server_send('AUTH PLAIN');
-		if ($err_msg = $this->server_parse('334', __LINE__))
-		{
-			return ($this->numeric_response_code == 503) ? false : $err_msg;
-		}
-
-		$base64_method_plain = base64_encode("\0" . $username . "\0" . $password);
-		$this->server_send($base64_method_plain, true);
-		if ($err_msg = $this->server_parse('235', __LINE__))
-		{
-			return $err_msg;
-		}
-
-		return false;
-	}
-
-	/**
-	* Login authentication method
-	*/
-	private function login($username, $password)
-	{
-		$this->server_send('AUTH LOGIN');
-		if ($err_msg = $this->server_parse('334', __LINE__))
-		{
-			return ($this->numeric_response_code == 503) ? false : $err_msg;
-		}
-
-		$this->server_send(base64_encode($username), true);
-		if ($err_msg = $this->server_parse('334', __LINE__))
-		{
-			return $err_msg;
-		}
-
-		$this->server_send(base64_encode($password), true);
-		if ($err_msg = $this->server_parse('235', __LINE__))
-		{
-			return $err_msg;
-		}
-
-		return false;
-	}
-
-	/**
-	* cram_md5 authentication method
-	*/
-	private function cram_md5($username, $password)
-	{
-		$this->server_send('AUTH CRAM-MD5');
-		if ($err_msg = $this->server_parse('334', __LINE__))
-		{
-			return ($this->numeric_response_code == 503) ? false : $err_msg;
-		}
-
-		$md5_challenge = base64_decode($this->responses[0]);
-		$password = (strlen($password) > 64) ? pack('H32', md5($password)) : ((strlen($password) < 64) ? str_pad($password, 64, chr(0)) : $password);
-		$md5_digest = md5((substr($password, 0, 64) ^ str_repeat(chr(0x5C), 64)) . (pack('H32', md5((substr($password, 0, 64) ^ str_repeat(chr(0x36), 64)) . $md5_challenge))));
-
-		$base64_method_cram_md5 = base64_encode($username . ' ' . $md5_digest);
-
-		$this->server_send($base64_method_cram_md5, true);
-		if ($err_msg = $this->server_parse('235', __LINE__))
-		{
-			return $err_msg;
-		}
-
-		return false;
-	}
-
-	/**
-	* digest_md5 authentication method
-	* A real pain in the ***
-	*/
-	private function digest_md5($username, $password)
-	{
-		$this->server_send('AUTH DIGEST-MD5');
-		if ($err_msg = $this->server_parse('334', __LINE__))
-		{
-			return ($this->numeric_response_code == 503) ? false : $err_msg;
-		}
-
-		$md5_challenge = base64_decode($this->responses[0]);
-
-		// Parse the md5 challenge - from AUTH_SASL (PEAR)
-		$tokens = array();
-		while (preg_match('/^([a-z-]+)=("[^"]+(?<!\\\)"|[^,]+)/i', $md5_challenge, $matches))
-		{
-			// Ignore these as per rfc2831
-			if ($matches[1] == 'opaque' || $matches[1] == 'domain')
-			{
-				$md5_challenge = substr($md5_challenge, strlen($matches[0]) + 1);
-				continue;
-			}
-
-			// Allowed multiple "realm" and "auth-param"
-			if (!empty($tokens[$matches[1]]) && ($matches[1] == 'realm' || $matches[1] == 'auth-param'))
-			{
-				if (is_array($tokens[$matches[1]]))
-				{
-					$tokens[$matches[1]][] = preg_replace('/^"(.*)"$/', '\\1', $matches[2]);
-				}
-				else
-				{
-					$tokens[$matches[1]] = array($tokens[$matches[1]], preg_replace('/^"(.*)"$/', '\\1', $matches[2]));
-				}
-			}
-			else if (!empty($tokens[$matches[1]])) // Any other multiple instance = failure
-			{
-				$tokens = array();
-				break;
-			}
-			else
-			{
-				$tokens[$matches[1]] = preg_replace('/^"(.*)"$/', '\\1', $matches[2]);
-			}
-
-			// Remove the just parsed directive from the challenge
-			$md5_challenge = substr($md5_challenge, strlen($matches[0]) + 1);
-		}
-
-		// Realm
-		if (empty($tokens['realm']))
-		{
-			$tokens['realm'] = (function_exists('php_uname')) ? php_uname('n') : phpbb::$user->system['host'];
-		}
-
-		// Maxbuf
-		if (empty($tokens['maxbuf']))
-		{
-			$tokens['maxbuf'] = 65536;
-		}
-
-		// Required: nonce, algorithm
-		if (empty($tokens['nonce']) || empty($tokens['algorithm']))
-		{
-			$tokens = array();
-		}
-		$md5_challenge = $tokens;
-
-		if (!empty($md5_challenge))
-		{
-			$str = '';
-			for ($i = 0; $i < 32; $i++)
-			{
-				$str .= chr(mt_rand(0, 255));
-			}
-			$cnonce = base64_encode($str);
-
-			$digest_uri = 'smtp/' . phpbb::$config['smtp_host'];
-
-			$auth_1 = sprintf('%s:%s:%s', pack('H32', md5(sprintf('%s:%s:%s', $username, $md5_challenge['realm'], $password))), $md5_challenge['nonce'], $cnonce);
-			$auth_2 = 'AUTHENTICATE:' . $digest_uri;
-			$response_value = md5(sprintf('%s:%s:00000001:%s:auth:%s', md5($auth_1), $md5_challenge['nonce'], $cnonce, md5($auth_2)));
-
-			$input_string = sprintf('username="%s",realm="%s",nonce="%s",cnonce="%s",nc="00000001",qop=auth,digest-uri="%s",response=%s,%d', $username, $md5_challenge['realm'], $md5_challenge['nonce'], $cnonce, $digest_uri, $response_value, $md5_challenge['maxbuf']);
-		}
-		else
-		{
-			return (isset(phpbb::$user->lang['INVALID_DIGEST_CHALLENGE'])) ? phpbb::$user->lang['INVALID_DIGEST_CHALLENGE'] : 'Invalid digest challenge';
-		}
-
-		$base64_method_digest_md5 = base64_encode($input_string);
-		$this->server_send($base64_method_digest_md5, true);
-		if ($err_msg = $this->server_parse('334', __LINE__))
-		{
-			return $err_msg;
-		}
-
-		$this->server_send(' ');
-		if ($err_msg = $this->server_parse('235', __LINE__))
-		{
-			return $err_msg;
-		}
-
-		return false;
-	}
-}
-
-/**
-* Encodes the given string for proper display in UTF-8.
-*
-* This version is using base64 encoded data. The downside of this
-* is if the mail client does not understand this encoding the user
-* is basically doomed with an unreadable subject.
-*
-* Please note that this version fully supports RFC 2045 section 6.8.
-*/
-function mail_encode($str)
-{
-	// define start delimimter, end delimiter and spacer
-	$start = "=?UTF-8?B?";
-	$end = "?=";
-	$delimiter = "\r\n ";
-
-	// Maximum length is 75. $split_length *must* be a multiple of 4, but <= 75 - strlen($start . $delimiter . $end)!!!
-	$split_length = 60;
-	$encoded_str = base64_encode($str);
-
-	// If encoded string meets the limits, we just return with the correct data.
-	if (strlen($encoded_str) <= $split_length)
-	{
-		return $start . $encoded_str . $end;
-	}
-
-	// If there is only ASCII data, we just return what we want, correctly splitting the lines.
-	if (strlen($str) === utf8_strlen($str))
-	{
-		return $start . implode($end . $delimiter . $start, str_split($encoded_str, $split_length)) . $end;
-	}
-
-	// UTF-8 data, compose encoded lines
-	$array = utf8_str_split($str);
-	$str = '';
-
-	while (sizeof($array))
-	{
-		$text = '';
-
-		while (sizeof($array) && intval((strlen($text . $array[0]) + 2) / 3) << 2 <= $split_length)
-		{
-			$text .= array_shift($array);
-		}
-
-		$str .= $start . base64_encode($text) . $end . $delimiter;
-	}
-
-	return substr($str, 0, -strlen($delimiter));
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
deleted file mode 100644
index c6c457aba4..0000000000
--- a/phpBB/includes/functions_module.php
+++ /dev/null
@@ -1,849 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Class handling all types of 'plugins' (a future term)
-* @package phpBB3
-*/
-class p_master
-{
-	var $p_id;
-	var $p_class;
-	var $p_name;
-	var $p_mode;
-	var $p_parent;
-
-	var $include_path = false;
-	var $active_module = false;
-	var $active_module_row_id = false;
-	var $acl_forum_id = false;
-	var $module_ary = array();
-
-	/**
-	* Constuctor
-	* Set module include path
-	*/
-	public function __construct($include_path = false)
-	{
-		$this->include_path = ($include_path !== false) ? $include_path : PHPBB_ROOT_PATH . 'modules/';
-
-		// Make sure the path ends with /
-		if (substr($this->include_path, -1) !== '/')
-		{
-			$this->include_path .= '/';
-		}
-	}
-
-	/**
-	* Set custom include path for modules
-	* Schema for inclusion is include_path . modulebase
-	*
-	* @param string $include_path include path to be used.
-	* @access public
-	*/
-	public function set_custom_include_path($include_path)
-	{
-		$this->include_path = $include_path;
-
-		// Make sure the path ends with /
-		if (substr($this->include_path, -1) !== '/')
-		{
-			$this->include_path .= '/';
-		}
-	}
-
-	/**
-	* List modules
-	*
-	* This creates a list, stored in $this->module_ary of all available
-	* modules for the given class (ucp, mcp and acp). Additionally
-	* $this->module_y_ary is created with indentation information for
-	* displaying the module list appropriately. Only modules for which
-	* the user has access rights are included in these lists.
-	*/
-	function list_modules($p_class)
-	{
-		// Sanitise for future path use, it's escaped as appropriate for queries
-		$this->p_class = str_replace(array('.', '/', '\\'), '', basename($p_class));
-
-		// Get cached modules
-		if (($this->module_cache = phpbb::$acm->get('modules_' . $this->p_class)) === false)
-		{
-			// Get modules
-			$sql = 'SELECT *
-				FROM ' . MODULES_TABLE . "
-				WHERE module_class = '" . phpbb::$db->sql_escape($this->p_class) . "'
-				ORDER BY left_id ASC";
-			$result = phpbb::$db->sql_query($sql);
-
-			$rows = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$rows[$row['module_id']] = $row;
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			$this->module_cache = array();
-			foreach ($rows as $module_id => $row)
-			{
-				$this->module_cache['modules'][] = $row;
-				$this->module_cache['parents'][$row['module_id']] = $this->get_parents($row['parent_id'], $row['left_id'], $row['right_id'], $rows);
-			}
-			unset($rows);
-
-			phpbb::$acm->put('modules_' . $this->p_class, $this->module_cache);
-		}
-
-		if (empty($this->module_cache))
-		{
-			$this->module_cache = array('modules' => array(), 'parents' => array());
-		}
-
-		// We "could" build a true tree with this function - maybe mod authors want to use this...
-		// Functions for traversing and manipulating the tree are not available though
-		// We might re-structure the module system to use true trees in 3.2.x...
-		// $tree = $this->build_tree($this->module_cache['modules'], $this->module_cache['parents']);
-
-		// Clean up module cache array to only let survive modules the user can access
-		$right_id = false;
-		foreach ($this->module_cache['modules'] as $key => $row)
-		{
-			// Not allowed to view module?
-			if (!$this->module_auth($row['module_auth']))
-			{
-				unset($this->module_cache['modules'][$key]);
-				continue;
-			}
-
-			// Category with no members, ignore
-			if (!$row['module_basename'] && ($row['left_id'] + 1 == $row['right_id']))
-			{
-				unset($this->module_cache['modules'][$key]);
-				continue;
-			}
-
-			// Skip branch
-			if ($right_id !== false)
-			{
-				if ($row['left_id'] < $right_id)
-				{
-					unset($this->module_cache['modules'][$key]);
-					continue;
-				}
-
-				$right_id = false;
-			}
-
-			// Not enabled?
-			if (!$row['module_enabled'])
-			{
-				// If category is disabled then disable every child too
-				unset($this->module_cache['modules'][$key]);
-				$right_id = $row['right_id'];
-				continue;
-			}
-		}
-
-		// Re-index (this is needed, else we are not able to array_slice later)
-		$this->module_cache['modules'] = array_merge($this->module_cache['modules']);
-
-		// Include MOD _info files for populating language entries within the menus
-		$this->add_mod_info($this->p_class);
-
-		// Now build the module array, but exclude completely empty categories...
-		$right_id = false;
-		$names = array();
-
-		foreach ($this->module_cache['modules'] as $key => $row)
-		{
-			// Skip branch
-			if ($right_id !== false)
-			{
-				if ($row['left_id'] < $right_id)
-				{
-					continue;
-				}
-
-				$right_id = false;
-			}
-
-			// Category with no members on their way down (we have to check every level)
-			if (!$row['module_basename'])
-			{
-				$empty_category = true;
-
-				// We go through the branch and look for an activated module
-				foreach (array_slice($this->module_cache['modules'], $key + 1) as $temp_row)
-				{
-					if ($temp_row['left_id'] > $row['left_id'] && $temp_row['left_id'] < $row['right_id'])
-					{
-						// Module there
-						if ($temp_row['module_basename'] && $temp_row['module_enabled'])
-						{
-							$empty_category = false;
-							break;
-						}
-						continue;
-					}
-					break;
-				}
-
-				// Skip the branch
-				if ($empty_category)
-				{
-					$right_id = $row['right_id'];
-					continue;
-				}
-			}
-
-			$depth = sizeof($this->module_cache['parents'][$row['module_id']]);
-
-			// We need to prefix the functions to not create a naming conflict
-
-			// Function for building 'url_extra'
-			$url_func = '_module_' . $row['module_basename'] . '_url';
-
-			// Function for building the language name
-			$lang_func = '_module_' . $row['module_basename'] . '_lang';
-
-			// Custom function for calling parameters on module init (for example assigning template variables)
-			$custom_func = '_module_' . $row['module_basename'];
-
-			$names[$row['module_basename'] . '_' . $row['module_mode']][] = true;
-
-			$module_row = array(
-				'depth'		=> $depth,
-
-				'id'		=> (int) $row['module_id'],
-				'parent'	=> (int) $row['parent_id'],
-				'cat'		=> ($row['right_id'] > $row['left_id'] + 1) ? true : false,
-
-				'is_duplicate'	=> ($row['module_basename'] && sizeof($names[$row['module_basename'] . '_' . $row['module_mode']]) > 1) ? true : false,
-
-				'name'		=> (string) $row['module_basename'],
-				'mode'		=> (string) $row['module_mode'],
-				'display'	=> (int) $row['module_display'],
-
-				'url_extra'	=> (function_exists($url_func)) ? $url_func($row['module_mode'], $row) : '',
-
-				'lang'		=> ($row['module_basename'] && function_exists($lang_func)) ? $lang_func($row['module_mode'], $row['module_langname']) : phpbb::$user->lang($row['module_langname']),
-				'langname'	=> $row['module_langname'],
-
-				'left'		=> $row['left_id'],
-				'right'		=> $row['right_id'],
-			);
-
-			if (function_exists($custom_func))
-			{
-				$custom_func($row['module_mode'], $module_row);
-			}
-
-			$this->module_ary[] = $module_row;
-		}
-
-		unset($this->module_cache['modules'], $names);
-	}
-
-	/**
-	* Check if a certain main module is accessible/loaded
-	* By giving the module mode you are able to additionally check for only one mode within the main module
-	*
-	* @param string $module_basename The module base name, for example logs, reports, main (for the mcp).
-	* @param mixed $module_mode The module mode to check. If provided the mode will be checked in addition for presence.
-	*
-	* @return bool Returns true if module is loaded and accessible, else returns false
-	*/
-	function loaded($module_basename, $module_mode = false)
-	{
-		if (empty($this->loaded_cache))
-		{
-			$this->loaded_cache = array();
-
-			foreach ($this->module_ary as $row)
-			{
-				if (!$row['name'])
-				{
-					continue;
-				}
-
-				if (!isset($this->loaded_cache[$row['name']]))
-				{
-					$this->loaded_cache[$row['name']] = array();
-				}
-
-				if (!$row['mode'])
-				{
-					continue;
-				}
-
-				$this->loaded_cache[$row['name']][$row['mode']] = true;
-			}
-		}
-
-		if ($module_mode === false)
-		{
-			return (isset($this->loaded_cache[$module_basename])) ? true : false;
-		}
-
-		return (!empty($this->loaded_cache[$module_basename][$module_mode])) ? true : false;
-	}
-
-	/**
-	* Check module authorisation
-	*/
-	function module_auth($module_auth, $forum_id = false)
-	{
-		$module_auth = trim($module_auth);
-
-		// Generally allowed to access module if module_auth is empty
-		if (!$module_auth)
-		{
-			return true;
-		}
-
-		// With the code below we make sure only those elements get eval'd we really want to be checked
-		preg_match_all('/(?:
-			"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"         |
-			\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'     |
-			[(),]                                  |
-			[^\s(),]+)/x', $module_auth, $match);
-
-		$tokens = $match[0];
-		for ($i = 0, $size = sizeof($tokens); $i < $size; $i++)
-		{
-			$token = &$tokens[$i];
-
-			switch ($token)
-			{
-				case ')':
-				case '(':
-				case '&&':
-				case '||':
-				case ',':
-				break;
-
-				default:
-					if (!preg_match('#(?:acl_([a-z0-9_]+)(,\$id)?)|(?:\$id)|(?:aclf_([a-z0-9_]+))|(?:cfg_([a-z0-9_]+))|(?:request_([a-zA-Z0-9_]+))#', $token))
-					{
-						$token = '';
-					}
-				break;
-			}
-		}
-
-		$module_auth = implode(' ', $tokens);
-
-		// Make sure $id seperation is working fine
-		$module_auth = str_replace(' , ', ',', $module_auth);
-
-		$forum_id = ($forum_id === false) ? $this->acl_forum_id : $forum_id;
-
-		$is_auth = false;
-		eval('$is_auth = (int) (' . preg_replace(array('#acl_([a-z0-9_]+)(,\$id)?#', '#\$id#', '#aclf_([a-z0-9_]+)#', '#cfg_([a-z0-9_]+)#', '#request_([a-zA-Z0-9_]+)#'), array('(int) phpbb::$acl->acl_get(\'\\1\'\\2)', '(int) $forum_id', '(int) phpbb::$acl->acl_getf_global(\'\\1\')', '(int) phpbb::$config[\'\\1\']', 'phpbb_request::variable(\'\\1\', false)'), $module_auth) . ');');
-
-		return $is_auth;
-	}
-
-	/**
-	* Set active module
-	*/
-	function set_active($id = false, $mode = false)
-	{
-		$icat = false;
-		$this->active_module = false;
-
-		if (request_var('icat', ''))
-		{
-			$icat = $id;
-			$id = request_var('icat', '');
-		}
-
-		$category = false;
-		foreach ($this->module_ary as $row_id => $item_ary)
-		{
-			// If this is a module and it's selected, active
-			// If this is a category and the module is the first within it, active
-			// If this is a module and no mode selected, select first mode
-			// If no category or module selected, go active for first module in first category
-			if (
-				(($item_ary['name'] === $id || $item_ary['id'] === (int) $id) && (($item_ary['mode'] == $mode && !$item_ary['cat']) || ($icat && $item_ary['cat']))) ||
-				($item_ary['parent'] === $category && !$item_ary['cat'] && !$icat && $item_ary['display']) ||
-				(($item_ary['name'] === $id || $item_ary['id'] === (int) $id) && !$mode && !$item_ary['cat']) ||
-				(!$id && !$mode && !$item_ary['cat'] && $item_ary['display'])
-				)
-			{
-				if ($item_ary['cat'])
-				{
-					$id = $icat;
-					$icat = false;
-
-					continue;
-				}
-
-				$this->p_id		= $item_ary['id'];
-				$this->p_parent	= $item_ary['parent'];
-				$this->p_name	= $item_ary['name'];
-				$this->p_mode 	= $item_ary['mode'];
-				$this->p_left	= $item_ary['left'];
-				$this->p_right	= $item_ary['right'];
-
-				$this->module_cache['parents'] = $this->module_cache['parents'][$this->p_id];
-				$this->active_module = $item_ary['id'];
-				$this->active_module_row_id = $row_id;
-
-				break;
-			}
-			else if (($item_ary['cat'] && $item_ary['id'] === (int) $id) || ($item_ary['parent'] === $category && $item_ary['cat']))
-			{
-				$category = $item_ary['id'];
-			}
-		}
-	}
-
-	/**
-	* Loads currently active module
-	*
-	* This method loads a given module, passing it the relevant id and mode.
-	*/
-	function load_active($mode = false, $module_url = false, $execute_module = true)
-	{
-		$module_path = $this->include_path . $this->p_class;
-		$icat = request_var('icat', '');
-
-		if ($this->active_module === false)
-		{
-			trigger_error('Module not accessible', E_USER_ERROR);
-		}
-
-		if (!class_exists("{$this->p_class}_$this->p_name"))
-		{
-			if (!file_exists("$module_path/{$this->p_class}_$this->p_name." . PHP_EXT))
-			{
-				trigger_error("Cannot find module $module_path/{$this->p_class}_$this->p_name." . PHP_EXT, E_USER_ERROR);
-			}
-
-			include("$module_path/{$this->p_class}_$this->p_name." . PHP_EXT);
-
-			if (!class_exists("{$this->p_class}_$this->p_name"))
-			{
-				trigger_error("Module file $module_path/{$this->p_class}_$this->p_name." . PHP_EXT . " does not contain correct class [{$this->p_class}_$this->p_name]", E_USER_ERROR);
-			}
-
-			if (!empty($mode))
-			{
-				$this->p_mode = $mode;
-			}
-
-			// Create a new instance of the desired module ... if it has a
-			// constructor it will of course be executed
-			$instance = "{$this->p_class}_$this->p_name";
-
-			$this->module = new $instance($this);
-
-			// We pre-define the action parameter we are using all over the place
-			if (defined('IN_ADMIN'))
-			{
-				// Is first module automatically enabled a duplicate and the category not passed yet?
-				if (!$icat && $this->module_ary[$this->active_module_row_id]['is_duplicate'])
-				{
-					$icat = $this->module_ary[$this->active_module_row_id]['parent'];
-				}
-
-				// Not being able to overwrite ;)
-				$this->module->u_action = phpbb::$url->append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i={$this->p_name}") . (($icat) ? '&amp;icat=' . $icat : '') . "&amp;mode={$this->p_mode}";
-			}
-			else
-			{
-				// If user specified the module url we will use it...
-				if ($module_url !== false)
-				{
-					$this->module->u_action = $module_url;
-				}
-				else
-				{
-					$this->module->u_action = PHPBB_ROOT_PATH . ((phpbb::$user->page['page_dir']) ? phpbb::$user->page['page_dir'] . '/' : '') . phpbb::$user->page['page_name'];
-				}
-
-				$this->module->u_action = phpbb::$url->append_sid($this->module->u_action, "i={$this->p_name}") . (($icat) ? '&amp;icat=' . $icat : '') . "&amp;mode={$this->p_mode}";
-			}
-
-			// Add url_extra parameter to u_action url
-			if (!empty($this->module_ary) && $this->active_module !== false && $this->module_ary[$this->active_module_row_id]['url_extra'])
-			{
-				$this->module->u_action .= $this->module_ary[$this->active_module_row_id]['url_extra'];
-			}
-
-			// Assign the module path for re-usage
-			$this->module->module_path = $module_path . '/';
-
-			// Execute the main method for the new instance, we send the module id and mode as parameters
-			// Users are able to call the main method after this function to be able to assign additional parameters manually
-			if ($execute_module)
-			{
-				$this->module->main($this->p_name, $this->p_mode);
-			}
-
-			return;
-		}
-	}
-
-	/**
-	* Appending url parameter to the currently active module.
-	*
-	* This function is called for adding specific url parameters while executing the current module.
-	* It is doing the same as the _module_{name}_url() function, apart from being able to be called after
-	* having dynamically parsed specific parameters. This allows more freedom in choosing additional parameters.
-	* One example can be seen in /includes/mcp/mcp_notes.php - $this->p_master->adjust_url() call.
-	*
-	* @param string $url_extra Extra url parameters, e.g.: &amp;u=$user_id
-	*
-	*/
-	function adjust_url($url_extra)
-	{
-		if (empty($this->module_ary[$this->active_module_row_id]))
-		{
-			return;
-		}
-
-		$row = &$this->module_ary[$this->active_module_row_id];
-
-		// We check for the same url_extra in $row['url_extra'] to overcome doubled additions...
-		if (strpos($row['url_extra'], $url_extra) === false)
-		{
-			$row['url_extra'] .= $url_extra;
-		}
-	}
-
-	/**
-	* Check if a module is active
-	*/
-	function is_active($id, $mode = false)
-	{
-		// If we find a name by this id and being enabled we have our active one...
-		foreach ($this->module_ary as $row_id => $item_ary)
-		{
-			if (($item_ary['name'] === $id || $item_ary['id'] === (int) $id) && $item_ary['display'])
-			{
-				if ($mode === false || $mode === $item_ary['mode'])
-				{
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	* Get parents
-	*/
-	function get_parents($parent_id, $left_id, $right_id, &$all_parents)
-	{
-		$parents = array();
-
-		if ($parent_id > 0)
-		{
-			foreach ($all_parents as $module_id => $row)
-			{
-				if ($row['left_id'] < $left_id && $row['right_id'] > $right_id)
-				{
-					$parents[$module_id] = $row['parent_id'];
-				}
-
-				if ($row['left_id'] > $left_id)
-				{
-					break;
-				}
-			}
-		}
-
-		return $parents;
-	}
-
-	/**
-	* Get tree branch
-	*/
-	function get_branch($left_id, $right_id, $remaining)
-	{
-		$branch = array();
-
-		foreach ($remaining as $key => $row)
-		{
-			if ($row['left_id'] > $left_id && $row['left_id'] < $right_id)
-			{
-				$branch[] = $row;
-				continue;
-			}
-			break;
-		}
-
-		return $branch;
-	}
-
-	/**
-	* Build true binary tree from given array
-	* Not in use
-	*/
-	function build_tree(&$modules, &$parents)
-	{
-		$tree = array();
-
-		foreach ($modules as $row)
-		{
-			$branch = &$tree;
-
-			if ($row['parent_id'])
-			{
-				// Go through the tree to find our branch
-				$parent_tree = $parents[$row['module_id']];
-
-				foreach ($parent_tree as $id => $value)
-				{
-					if (!isset($branch[$id]) && isset($branch['child']))
-					{
-						$branch = &$branch['child'];
-					}
-					$branch = &$branch[$id];
-				}
-				$branch = &$branch['child'];
-			}
-
-			$branch[$row['module_id']] = $row;
-			if (!isset($branch[$row['module_id']]['child']))
-			{
-				$branch[$row['module_id']]['child'] = array();
-			}
-		}
-
-		return $tree;
-	}
-
-	/**
-	* Build navigation structure
-	*/
-	function assign_tpl_vars($module_url)
-	{
-		$current_id = $right_id = false;
-
-		// Make sure the module_url has a question mark set, effectively determining the delimiter to use
-		$delim = (strpos($module_url, '?') === false) ? '?' : '&amp;';
-
-		$current_padding = $current_depth = 0;
-		$linear_offset 	= 'l_block1';
-		$tabular_offset = 't_block2';
-
-		// Generate the list of modules, we'll do this in two ways ...
-		// 1) In a linear fashion
-		// 2) In a combined tabbed + linear fashion ... tabs for the categories
-		//    and a linear list for subcategories/items
-		foreach ($this->module_ary as $row_id => $item_ary)
-		{
-			// Skip hidden modules
-			if (!$item_ary['display'])
-			{
-				continue;
-			}
-
-			// Skip branch
-			if ($right_id !== false)
-			{
-				if ($item_ary['left'] < $right_id)
-				{
-					continue;
-				}
-
-				$right_id = false;
-			}
-
-			// Category with no members on their way down (we have to check every level)
-			if (!$item_ary['name'])
-			{
-				$empty_category = true;
-
-				// We go through the branch and look for an activated module
-				foreach (array_slice($this->module_ary, $row_id + 1) as $temp_row)
-				{
-					if ($temp_row['left'] > $item_ary['left'] && $temp_row['left'] < $item_ary['right'])
-					{
-						// Module there and displayed?
-						if ($temp_row['name'] && $temp_row['display'])
-						{
-							$empty_category = false;
-							break;
-						}
-						continue;
-					}
-					break;
-				}
-
-				// Skip the branch
-				if ($empty_category)
-				{
-					$right_id = $item_ary['right'];
-					continue;
-				}
-			}
-
-			// Select first id we can get
-			if (!$current_id && (isset($this->module_cache['parents'][$item_ary['id']]) || $item_ary['id'] == $this->p_id))
-			{
-				$current_id = $item_ary['id'];
-			}
-
-			$depth = $item_ary['depth'];
-
-			if ($depth > $current_depth)
-			{
-				$linear_offset = $linear_offset . '.l_block' . ($depth + 1);
-				$tabular_offset = ($depth + 1 > 2) ? $tabular_offset . '.t_block' . ($depth + 1) : $tabular_offset;
-			}
-			else if ($depth < $current_depth)
-			{
-				for ($i = $current_depth - $depth; $i > 0; $i--)
-				{
-					$linear_offset = substr($linear_offset, 0, strrpos($linear_offset, '.'));
-					$tabular_offset = ($i + $depth > 1) ? substr($tabular_offset, 0, strrpos($tabular_offset, '.')) : $tabular_offset;
-				}
-			}
-
-			$u_title = $module_url . $delim . 'i=' . (($item_ary['cat']) ? $item_ary['id'] : $item_ary['name'] . (($item_ary['is_duplicate']) ? '&amp;icat=' . $current_id : '') . '&amp;mode=' . $item_ary['mode']);
-
-			// Was not allowed in categories before - /*!$item_ary['cat'] && */
-			$u_title .= (isset($item_ary['url_extra'])) ? $item_ary['url_extra'] : '';
-
-			// Only output a categories items if it's currently selected
-			if (!$depth || ($depth && (in_array($item_ary['parent'], array_values($this->module_cache['parents'])) || $item_ary['parent'] == $this->p_parent)))
-			{
-				$use_tabular_offset = (!$depth) ? 't_block1' : $tabular_offset;
-
-				$tpl_ary = array(
-					'L_TITLE'		=> $item_ary['lang'],
-					'S_SELECTED'	=> (isset($this->module_cache['parents'][$item_ary['id']]) || $item_ary['id'] == $this->p_id) ? true : false,
-					'U_TITLE'		=> $u_title
-				);
-
-				phpbb::$template->assign_block_vars($use_tabular_offset, array_merge($tpl_ary, array_change_key_case($item_ary, CASE_UPPER)));
-			}
-
-			$tpl_ary = array(
-				'L_TITLE'		=> $item_ary['lang'],
-				'S_SELECTED'	=> (isset($this->module_cache['parents'][$item_ary['id']]) || $item_ary['id'] == $this->p_id) ? true : false,
-				'U_TITLE'		=> $u_title
-			);
-
-			phpbb::$template->assign_block_vars($linear_offset, array_merge($tpl_ary, array_change_key_case($item_ary, CASE_UPPER)));
-
-			$current_depth = $depth;
-		}
-	}
-
-	/**
-	* Returns desired template name
-	*/
-	function get_tpl_name()
-	{
-		return $this->module->tpl_name . '.html';
-	}
-
-	/**
-	* Returns the desired page title
-	*/
-	function get_page_title()
-	{
-		if (!isset($this->module->page_title))
-		{
-			return '';
-		}
-
-		return phpbb::$user->lang($this->module->page_title);
-	}
-
-	/**
-	* Load module as the current active one without the need for registering it
-	*/
-	function load($class, $name, $mode = false)
-	{
-		$this->p_class = $class;
-		$this->p_name = $name;
-
-		// Set active module to true instead of using the id
-		$this->active_module = true;
-
-		$this->load_active($mode);
-	}
-
-	/**
-	* Display module
-	*/
-	function display($page_title, $display_online_list = true)
-	{
-		page_header($page_title, $display_online_list);
-
-		phpbb::$template->set_filenames(array(
-			'body' => $this->get_tpl_name())
-		);
-
-		page_footer();
-	}
-
-	/**
-	* Toggle whether this module will be displayed or not
-	*/
-	function set_display($id, $mode = false, $display = true)
-	{
-		foreach ($this->module_ary as $row_id => $item_ary)
-		{
-			if (($item_ary['name'] === $id || $item_ary['id'] === (int) $id) && (!$mode || $item_ary['mode'] === $mode))
-			{
-				$this->module_ary[$row_id]['display'] = (int) $display;
-			}
-		}
-	}
-
-	/**
-	* Add custom MOD info language file
-	*/
-	function add_mod_info($module_class)
-	{
-		if (file_exists(phpbb::$user->lang_path . phpbb::$user->lang_name . '/mods'))
-		{
-			$add_files = array();
-
-			$dir = @opendir(phpbb::$user->lang_path . phpbb::$user->lang_name . '/mods');
-
-			if ($dir)
-			{
-				while (($entry = readdir($dir)) !== false)
-				{
-					if (strpos($entry, 'info_' . strtolower($module_class) . '_') === 0 && substr(strrchr($entry, '.'), 1) == PHP_EXT)
-					{
-						$add_files[] = 'mods/' . substr(basename($entry), 0, -(strlen(PHP_EXT) + 1));
-					}
-				}
-				closedir($dir);
-			}
-
-			if (sizeof($add_files))
-			{
-				phpbb::$user->add_lang($add_files);
-			}
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
deleted file mode 100644
index 1b5e434215..0000000000
--- a/phpBB/includes/functions_posting.php
+++ /dev/null
@@ -1,2508 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Fill smiley templates (or just the variables) with smilies, either in a window or inline
-*/
-function generate_smilies($mode, $forum_id)
-{
-	if ($mode == 'window')
-	{
-		if ($forum_id)
-		{
-			$sql = 'SELECT forum_style
-				FROM ' . FORUMS_TABLE . "
-				WHERE forum_id = $forum_id";
-			$result = phpbb::$db->sql_query_limit($sql, 1);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			phpbb::$user->setup('posting', (int) $row['forum_style']);
-		}
-		else
-		{
-			phpbb::$user->setup('posting');
-		}
-
-		page_header(phpbb::$user->lang['SMILIES']);
-
-		phpbb::$template->set_filenames(array(
-			'body' => 'posting_smilies.html',
-		));
-	}
-
-	$display_link = false;
-	if ($mode == 'inline')
-	{
-		$sql = 'SELECT smiley_id
-			FROM ' . SMILIES_TABLE . '
-			WHERE display_on_posting = 0';
-		$result = phpbb::$db->sql_query_limit($sql, 1, 0, 3600);
-
-		if ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$display_link = true;
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	$last_url = '';
-
-	$sql = 'SELECT *
-		FROM ' . SMILIES_TABLE .
-		(($mode == 'inline') ? ' WHERE display_on_posting = 1 ' : '') . '
-		ORDER BY smiley_order';
-	$result = phpbb::$db->sql_query($sql, 3600);
-
-	$smilies = array();
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		if (empty($smilies[$row['smiley_url']]))
-		{
-			$smilies[$row['smiley_url']] = $row;
-		}
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	if (sizeof($smilies))
-	{
-		foreach ($smilies as $row)
-		{
-			phpbb::$template->assign_block_vars('smiley', array(
-				'SMILEY_CODE'	=> $row['code'],
-				'A_SMILEY_CODE'	=> addslashes($row['code']),
-				'SMILEY_IMG'	=> PHPBB_ROOT_PATH . phpbb::$config['smilies_path'] . '/' . $row['smiley_url'],
-				'SMILEY_WIDTH'	=> $row['smiley_width'],
-				'SMILEY_HEIGHT'	=> $row['smiley_height'],
-				'SMILEY_DESC'	=> $row['emotion'],
-			));
-		}
-	}
-
-	if ($mode == 'inline' && $display_link)
-	{
-		phpbb::$template->assign_vars(array(
-			'S_SHOW_SMILEY_LINK' 	=> true,
-			'U_MORE_SMILIES' 		=> append_sid('posting', 'mode=smilies&amp;f=' . $forum_id),
-		));
-	}
-
-	if ($mode == 'window')
-	{
-		page_footer();
-	}
-}
-
-/**
-* Update last post information
-* Should be used instead of sync() if only the last post information are out of sync... faster
-*
-* @param	string	$type				Can be forum|topic
-* @param	mixed	$ids				topic/forum ids
-* @param	bool	$return_update_sql	true: SQL query shall be returned, false: execute SQL
-*/
-function update_post_information($type, $ids, $return_update_sql = false)
-{
-	if (empty($ids))
-	{
-		return;
-	}
-	if (!is_array($ids))
-	{
-		$ids = array($ids);
-	}
-
-
-	$update_sql = $empty_forums = $not_empty_forums = array();
-
-	if ($type != 'topic')
-	{
-		$topic_join = ', ' . TOPICS_TABLE . ' t';
-		$topic_condition = 'AND t.topic_id = p.topic_id AND t.topic_approved = 1';
-	}
-	else
-	{
-		$topic_join = '';
-		$topic_condition = '';
-	}
-
-	if (sizeof($ids) == 1)
-	{
-		$sql = 'SELECT MAX(p.post_id) as last_post_id
-			FROM ' . POSTS_TABLE . " p $topic_join
-			WHERE " . phpbb::$db->sql_in_set('p.' . $type . '_id', $ids) . "
-				$topic_condition
-				AND p.post_approved = 1";
-	}
-	else
-	{
-		$sql = 'SELECT p.' . $type . '_id, MAX(p.post_id) as last_post_id
-			FROM ' . POSTS_TABLE . " p $topic_join
-			WHERE " . phpbb::$db->sql_in_set('p.' . $type . '_id', $ids) . "
-				$topic_condition
-				AND p.post_approved = 1
-			GROUP BY p.{$type}_id";
-	}
-	$result = phpbb::$db->sql_query($sql);
-
-	$last_post_ids = array();
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		if (sizeof($ids) == 1)
-		{
-			$row[$type . '_id'] = $ids[0];
-		}
-
-		if ($type == 'forum')
-		{
-			$not_empty_forums[] = $row['forum_id'];
-
-			if (empty($row['last_post_id']))
-			{
-				$empty_forums[] = $row['forum_id'];
-			}
-		}
-
-		$last_post_ids[] = $row['last_post_id'];
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	if ($type == 'forum')
-	{
-		$empty_forums = array_merge($empty_forums, array_diff($ids, $not_empty_forums));
-
-		foreach ($empty_forums as $void => $forum_id)
-		{
-			$update_sql[$forum_id][] = 'forum_last_post_id = 0';
-			$update_sql[$forum_id][] = "forum_last_post_subject = ''";
-			$update_sql[$forum_id][] = 'forum_last_post_time = 0';
-			$update_sql[$forum_id][] = 'forum_last_poster_id = 0';
-			$update_sql[$forum_id][] = "forum_last_poster_name = ''";
-			$update_sql[$forum_id][] = "forum_last_poster_colour = ''";
-		}
-	}
-
-	if (sizeof($last_post_ids))
-	{
-		$sql = 'SELECT p.' . $type . '_id, p.post_id, p.post_subject, p.post_time, p.poster_id, p.post_username, u.user_id, u.username, u.user_colour
-			FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
-			WHERE p.poster_id = u.user_id
-				AND ' . phpbb::$db->sql_in_set('p.post_id', $last_post_ids);
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$update_sql[$row["{$type}_id"]][] = $type . '_last_post_id = ' . (int) $row['post_id'];
-			$update_sql[$row["{$type}_id"]][] = "{$type}_last_post_subject = '" . phpbb::$db->sql_escape($row['post_subject']) . "'";
-			$update_sql[$row["{$type}_id"]][] = $type . '_last_post_time = ' . (int) $row['post_time'];
-			$update_sql[$row["{$type}_id"]][] = $type . '_last_poster_id = ' . (int) $row['poster_id'];
-			$update_sql[$row["{$type}_id"]][] = "{$type}_last_poster_colour = '" . phpbb::$db->sql_escape($row['user_colour']) . "'";
-			$update_sql[$row["{$type}_id"]][] = "{$type}_last_poster_name = '" . (($row['poster_id'] == ANONYMOUS) ? phpbb::$db->sql_escape($row['post_username']) : phpbb::$db->sql_escape($row['username'])) . "'";
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-	unset($empty_forums, $ids, $last_post_ids);
-
-	if ($return_update_sql || !sizeof($update_sql))
-	{
-		return $update_sql;
-	}
-
-	$table = ($type == 'forum') ? FORUMS_TABLE : TOPICS_TABLE;
-
-	foreach ($update_sql as $update_id => $update_sql_ary)
-	{
-		$sql = "UPDATE $table
-			SET " . implode(', ', $update_sql_ary) . "
-			WHERE {$type}_id = $update_id";
-		phpbb::$db->sql_query($sql);
-	}
-
-	return;
-}
-
-/**
-* Generate Topic Icons for display
-*/
-function posting_gen_topic_icons($mode, $icon_id)
-{
-	// Grab icons
-	$icons = phpbb_cache::obtain_icons();
-
-	if (!$icon_id)
-	{
-		phpbb::$template->assign_var('S_NO_ICON_CHECKED', ' checked="checked"');
-	}
-
-	if (sizeof($icons))
-	{
-		foreach ($icons as $id => $data)
-		{
-			if ($data['display'])
-			{
-				phpbb::$template->assign_block_vars('topic_icon', array(
-					'ICON_ID'		=> $id,
-					'ICON_IMG'		=> PHPBB_ROOT_PATH . phpbb::$config['icons_path'] . '/' . $data['img'],
-					'ICON_WIDTH'	=> $data['width'],
-					'ICON_HEIGHT'	=> $data['height'],
-
-					'S_CHECKED'			=> ($id == $icon_id) ? true : false,
-					'S_ICON_CHECKED'	=> ($id == $icon_id) ? ' checked="checked"' : '',
-				));
-			}
-		}
-
-		return true;
-	}
-
-	return false;
-}
-
-/**
-* Build topic types able to be selected
-*/
-function posting_gen_topic_types($forum_id, $cur_topic_type = POST_NORMAL)
-{
-	global $topic_type;
-
-	$toggle = false;
-
-	$topic_types = array(
-		'sticky'	=> array('const' => POST_STICKY, 'lang' => 'POST_STICKY'),
-		'announce'	=> array('const' => POST_ANNOUNCE, 'lang' => 'POST_ANNOUNCEMENT'),
-		'global'	=> array('const' => POST_GLOBAL, 'lang' => 'POST_GLOBAL')
-	);
-
-	$topic_type_array = array();
-
-	foreach ($topic_types as $auth_key => $topic_value)
-	{
-		// We do not have a special post global announcement permission
-		$auth_key = ($auth_key == 'global') ? 'announce' : $auth_key;
-
-		if (phpbb::$acl->acl_get('f_' . $auth_key, $forum_id))
-		{
-			$toggle = true;
-
-			$topic_type_array[] = array(
-				'VALUE'			=> $topic_value['const'],
-				'S_CHECKED'		=> ($cur_topic_type == $topic_value['const'] || ($forum_id == 0 && $topic_value['const'] == POST_GLOBAL)) ? ' checked="checked"' : '',
-				'L_TOPIC_TYPE'	=> phpbb::$user->lang[$topic_value['lang']]
-			);
-		}
-	}
-
-	if ($toggle)
-	{
-		$topic_type_array = array_merge(array(0 => array(
-			'VALUE'			=> POST_NORMAL,
-			'S_CHECKED'		=> ($topic_type == POST_NORMAL) ? ' checked="checked"' : '',
-			'L_TOPIC_TYPE'	=> phpbb::$user->lang['POST_NORMAL'])),
-
-			$topic_type_array
-		);
-
-		foreach ($topic_type_array as $array)
-		{
-			phpbb::$template->assign_block_vars('topic_type', $array);
-		}
-
-		phpbb::$template->assign_vars(array(
-			'S_TOPIC_TYPE_STICKY'	=> (phpbb::$acl->acl_get('f_sticky', $forum_id)),
-			'S_TOPIC_TYPE_ANNOUNCE'	=> (phpbb::$acl->acl_get('f_announce', $forum_id)),
-		));
-	}
-
-	return $toggle;
-}
-
-//
-// Attachment related functions
-//
-
-/**
-* Upload Attachment - filedata is generated here
-* Uses upload class
-*/
-function upload_attachment($form_name, $forum_id, $local = false, $local_storage = '', $is_message = false, $local_filedata = false)
-{
-	$filedata = array(
-		'error'	=> array()
-	);
-
-	include_once(PHPBB_ROOT_PATH . 'includes/functions_upload.' . PHP_EXT);
-	$upload = new fileupload();
-
-	if (phpbb::$config['check_attachment_content'])
-	{
-		$upload->set_disallowed_content(explode('|', phpbb::$config['mime_triggers']));
-	}
-
-	if (!$local)
-	{
-		$filedata['post_attach'] = ($upload->is_valid($form_name)) ? true : false;
-	}
-	else
-	{
-		$filedata['post_attach'] = true;
-	}
-
-	if (!$filedata['post_attach'])
-	{
-		$filedata['error'][] = phpbb::$user->lang['NO_UPLOAD_FORM_FOUND'];
-		return $filedata;
-	}
-
-	$extensions = ($is_message) ? phpbb_cache::obtain_extensions_pm() : phpbb_cache::obtain_extensions_forum($forum_id);
-	$upload->set_allowed_extensions(array_keys($extensions['_allowed_']));
-
-	$file = ($local) ? $upload->local_upload($local_storage, $local_filedata) : $upload->form_upload($form_name);
-
-	if ($file->init_error)
-	{
-		$filedata['post_attach'] = false;
-		return $filedata;
-	}
-
-	$cat_id = (isset($extensions[$file->get('extension')]['display_cat'])) ? $extensions[$file->get('extension')]['display_cat'] : ATTACHMENT_CATEGORY_NONE;
-
-	// Make sure the image category only holds valid images...
-	if ($cat_id == ATTACHMENT_CATEGORY_IMAGE && !$file->is_image())
-	{
-		$file->remove();
-
-		// If this error occurs a user tried to exploit an IE Bug by renaming extensions
-		// Since the image category is displaying content inline we need to catch this.
-		trigger_error(phpbb::$user->lang['ATTACHED_IMAGE_NOT_IMAGE']);
-	}
-
-	// Do we have to create a thumbnail?
-	$filedata['thumbnail'] = ($cat_id == ATTACHMENT_CATEGORY_IMAGE && phpbb::$config['img_create_thumbnail']) ? 1 : 0;
-
-	// Check Image Size, if it is an image
-	if (!phpbb::$acl->acl_get('a_') && !phpbb::$acl->acl_get('m_', $forum_id) && $cat_id == ATTACHMENT_CATEGORY_IMAGE)
-	{
-		$file->upload->set_allowed_dimensions(0, 0, phpbb::$config['img_max_width'], phpbb::$config['img_max_height']);
-	}
-
-	// Admins and mods are allowed to exceed the allowed filesize
-	if (!phpbb::$acl->acl_get('a_') && !phpbb::$acl->acl_get('m_', $forum_id))
-	{
-		if (!empty($extensions[$file->get('extension')]['max_filesize']))
-		{
-			$allowed_filesize = $extensions[$file->get('extension')]['max_filesize'];
-		}
-		else
-		{
-			$allowed_filesize = ($is_message) ? phpbb::$config['max_filesize_pm'] : phpbb::$config['max_filesize'];
-		}
-
-		$file->upload->set_max_filesize($allowed_filesize);
-	}
-
-	$file->clean_filename('unique', phpbb::$user->data['user_id'] . '_');
-
-	// Are we uploading an image *and* this image being within the image category? Only then perform additional image checks.
-	$no_image = ($cat_id == ATTACHMENT_CATEGORY_IMAGE) ? false : true;
-
-	$file->move_file(phpbb::$config['upload_path'], false, $no_image);
-
-	if (sizeof($file->error))
-	{
-		$file->remove();
-		$filedata['error'] = array_merge($filedata['error'], $file->error);
-		$filedata['post_attach'] = false;
-
-		return $filedata;
-	}
-
-	$filedata['filesize'] = $file->get('filesize');
-	$filedata['mimetype'] = $file->get('mimetype');
-	$filedata['extension'] = $file->get('extension');
-	$filedata['physical_filename'] = $file->get('realname');
-	$filedata['real_filename'] = $file->get('uploadname');
-	$filedata['filetime'] = time();
-
-	// Check our complete quota
-	if (phpbb::$config['attachment_quota'])
-	{
-		if (phpbb::$config['upload_dir_size'] + $file->get('filesize') > phpbb::$config['attachment_quota'])
-		{
-			$filedata['error'][] = phpbb::$user->lang['ATTACH_QUOTA_REACHED'];
-			$filedata['post_attach'] = false;
-
-			$file->remove();
-
-			return $filedata;
-		}
-	}
-
-	// Check free disk space
-	if ($free_space = @disk_free_space(PHPBB_ROOT_PATH . phpbb::$config['upload_path']))
-	{
-		if ($free_space <= $file->get('filesize'))
-		{
-			$filedata['error'][] = phpbb::$user->lang['ATTACH_QUOTA_REACHED'];
-			$filedata['post_attach'] = false;
-
-			$file->remove();
-
-			return $filedata;
-		}
-	}
-
-	// Create Thumbnail
-	if ($filedata['thumbnail'])
-	{
-		$source = $file->get('destination_file');
-		$destination = $file->get('destination_path') . '/thumb_' . $file->get('realname');
-
-		if (!create_thumbnail($source, $destination, $file->get('mimetype')))
-		{
-			$filedata['thumbnail'] = 0;
-		}
-	}
-
-	return $filedata;
-}
-
-/**
-* Calculate the needed size for Thumbnail
-*/
-function get_img_size_format($width, $height)
-{
-	// Maximum Width the Image can take
-	$max_width = (phpbb::$config['img_max_thumb_width']) ? phpbb::$config['img_max_thumb_width'] : 400;
-
-	if ($width > $height)
-	{
-		return array(
-			round($width * ($max_width / $width)),
-			round($height * ($max_width / $width))
-		);
-	}
-	else
-	{
-		return array(
-			round($width * ($max_width / $height)),
-			round($height * ($max_width / $height))
-		);
-	}
-}
-
-/**
-* Return supported image types
-*/
-function get_supported_image_types($type = false)
-{
-	if (@extension_loaded('gd'))
-	{
-		$format = imagetypes();
-		$new_type = 0;
-
-		if ($type !== false)
-		{
-			// Type is one of the IMAGETYPE constants - it is fetched from getimagesize()
-			// We do not use the constants here, because some were not available in PHP 4.3.x
-			switch ($type)
-			{
-				// GIF
-				case 1:
-					$new_type = ($format & IMG_GIF) ? IMG_GIF : false;
-				break;
-
-				// JPG, JPC, JP2
-				case 2:
-				case 9:
-				case 10:
-				case 11:
-				case 12:
-					$new_type = ($format & IMG_JPG) ? IMG_JPG : false;
-				break;
-
-				// PNG
-				case 3:
-					$new_type = ($format & IMG_PNG) ? IMG_PNG : false;
-				break;
-
-				// WBMP
-				case 15:
-					$new_type = ($format & IMG_WBMP) ? IMG_WBMP : false;
-				break;
-			}
-		}
-		else
-		{
-			$new_type = array();
-			$go_through_types = array(IMG_GIF, IMG_JPG, IMG_PNG, IMG_WBMP);
-
-			foreach ($go_through_types as $check_type)
-			{
-				if ($format & $check_type)
-				{
-					$new_type[] = $check_type;
-				}
-			}
-		}
-
-		return array(
-			'gd'		=> ($new_type) ? true : false,
-			'format'	=> $new_type,
-			'version'	=> (function_exists('imagecreatetruecolor')) ? 2 : 1
-		);
-	}
-
-	return array('gd' => false);
-}
-
-/**
-* Create Thumbnail
-*/
-function create_thumbnail($source, $destination, $mimetype)
-{
-	$min_filesize = (int) phpbb::$config['img_min_thumb_filesize'];
-	$img_filesize = (file_exists($source)) ? @filesize($source) : false;
-
-	if (!$img_filesize || $img_filesize <= $min_filesize)
-	{
-		return false;
-	}
-
-	$dimension = @getimagesize($source);
-
-	if ($dimension === false)
-	{
-		return false;
-	}
-
-	list($width, $height, $type, ) = $dimension;
-
-	if (empty($width) || empty($height))
-	{
-		return false;
-	}
-
-	list($new_width, $new_height) = get_img_size_format($width, $height);
-
-	// Do not create a thumbnail if the resulting width/height is bigger than the original one
-	if ($new_width >= $width && $new_height >= $height)
-	{
-		return false;
-	}
-
-	$used_imagick = false;
-
-	// Only use imagemagick if defined and the passthru function not disabled
-	if (phpbb::$config['img_imagick'] && function_exists('passthru'))
-	{
-		if (substr(phpbb::$config['img_imagick'], -1) !== '/')
-		{
-			phpbb::$config['img_imagick'] .= '/';
-		}
-
-		@passthru(escapeshellcmd(phpbb::$config['img_imagick']) . 'convert' . ((defined('PHP_OS') && preg_match('#^win#i', PHP_OS)) ? '.exe' : '') . ' -quality 85 -geometry ' . $new_width . 'x' . $new_height . ' "' . str_replace('\\', '/', $source) . '" "' . str_replace('\\', '/', $destination) . '"');
-
-		if (file_exists($destination))
-		{
-			$used_imagick = true;
-		}
-	}
-
-	if (!$used_imagick)
-	{
-		$type = get_supported_image_types($type);
-
-		if ($type['gd'])
-		{
-			// If the type is not supported, we are not able to create a thumbnail
-			if ($type['format'] === false)
-			{
-				return false;
-			}
-
-			switch ($type['format'])
-			{
-				case IMG_GIF:
-					$image = @imagecreatefromgif($source);
-				break;
-
-				case IMG_JPG:
-					$image = @imagecreatefromjpeg($source);
-				break;
-
-				case IMG_PNG:
-					$image = @imagecreatefrompng($source);
-				break;
-
-				case IMG_WBMP:
-					$image = @imagecreatefromwbmp($source);
-				break;
-			}
-
-			if ($type['version'] == 1)
-			{
-				$new_image = imagecreate($new_width, $new_height);
-
-				if ($new_image === false)
-				{
-					return false;
-				}
-
-				imagecopyresized($new_image, $image, 0, 0, 0, 0, $new_width, $new_height, $width, $height);
-			}
-			else
-			{
-				$new_image = imagecreatetruecolor($new_width, $new_height);
-
-				if ($new_image === false)
-				{
-					return false;
-				}
-
-				// Preserve alpha transparency (png for example)
-				@imagealphablending($new_image, false);
-				@imagesavealpha($new_image, true);
-
-				imagecopyresampled($new_image, $image, 0, 0, 0, 0, $new_width, $new_height, $width, $height);
-			}
-
-			// If we are in safe mode create the destination file prior to using the gd functions to circumvent a PHP bug
-			if (@ini_get('safe_mode') || @strtolower(ini_get('safe_mode')) == 'on')
-			{
-				@touch($destination);
-			}
-
-			switch ($type['format'])
-			{
-				case IMG_GIF:
-					imagegif($new_image, $destination);
-				break;
-
-				case IMG_JPG:
-					imagejpeg($new_image, $destination, 90);
-				break;
-
-				case IMG_PNG:
-					imagepng($new_image, $destination);
-				break;
-
-				case IMG_WBMP:
-					imagewbmp($new_image, $destination);
-				break;
-			}
-
-			imagedestroy($new_image);
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	if (!file_exists($destination))
-	{
-		return false;
-	}
-
-	phpbb::$system->chmod($destination, phpbb::CHMOD_READ | phpbb::CHMOD_WRITE);
-
-	return true;
-}
-
-/**
-* Assign Inline attachments (build option fields)
-*/
-function posting_gen_inline_attachments(&$attachment_data)
-{
-	if (sizeof($attachment_data))
-	{
-		$s_inline_attachment_options = '';
-
-		foreach ($attachment_data as $i => $attachment)
-		{
-			$s_inline_attachment_options .= '<option value="' . $i . '">' . basename($attachment['real_filename']) . '</option>';
-		}
-
-		phpbb::$template->assign_var('S_INLINE_ATTACHMENT_OPTIONS', $s_inline_attachment_options);
-
-		return true;
-	}
-
-	return false;
-}
-
-/**
-* Generate inline attachment entry
-*/
-function posting_gen_attachment_entry($attachment_data, &$filename_data, $show_attach_box = true)
-{
-	// Some default template variables
-	phpbb::$template->assign_vars(array(
-		'S_SHOW_ATTACH_BOX'	=> $show_attach_box,
-		'S_HAS_ATTACHMENTS'	=> sizeof($attachment_data),
-		'FILESIZE'			=> phpbb::$config['max_filesize'],
-		'FILE_COMMENT'		=> (isset($filename_data['filecomment'])) ? $filename_data['filecomment'] : '',
-	));
-
-	if (sizeof($attachment_data))
-	{
-		// We display the posted attachments within the desired order.
-		(phpbb::$config['display_order']) ? krsort($attachment_data) : ksort($attachment_data);
-
-		foreach ($attachment_data as $count => $attach_row)
-		{
-			$hidden = '';
-			$attach_row['real_filename'] = basename($attach_row['real_filename']);
-
-			foreach ($attach_row as $key => $value)
-			{
-				$hidden .= '<input type="hidden" name="attachment_data[' . $count . '][' . $key . ']" value="' . $value . '" />';
-			}
-
-			$download_link = append_sid('download/file', 'mode=view&amp;id=' . (int) $attach_row['attach_id'], true, ($attach_row['is_orphan']) ? phpbb::$user->session_id : false);
-
-			phpbb::$template->assign_block_vars('attach_row', array(
-				'FILENAME'			=> basename($attach_row['real_filename']),
-				'A_FILENAME'		=> addslashes(basename($attach_row['real_filename'])),
-				'FILE_COMMENT'		=> $attach_row['attach_comment'],
-				'ATTACH_ID'			=> $attach_row['attach_id'],
-				'S_IS_ORPHAN'		=> $attach_row['is_orphan'],
-				'ASSOC_INDEX'		=> $count,
-
-				'U_VIEW_ATTACHMENT'	=> $download_link,
-				'S_HIDDEN'			=> $hidden,
-			));
-		}
-	}
-
-	return sizeof($attachment_data);
-}
-
-//
-// General Post functions
-//
-
-/**
-* Load Drafts
-*/
-function load_drafts($topic_id = 0, $forum_id = 0, $id = 0)
-{
-	$topic_ids = $forum_ids = $draft_rows = array();
-
-	// Load those drafts not connected to forums/topics
-	// If forum_id == 0 AND topic_id == 0 then this is a PM draft
-	if (!$topic_id && !$forum_id)
-	{
-		$sql_and = ' AND d.forum_id = 0 AND d.topic_id = 0';
-	}
-	else
-	{
-		$sql_and = '';
-		$sql_and .= ($forum_id) ? ' AND d.forum_id = ' . (int) $forum_id : '';
-		$sql_and .= ($topic_id) ? ' AND d.topic_id = ' . (int) $topic_id : '';
-	}
-
-	$sql = 'SELECT d.*, f.forum_id, f.forum_name
-		FROM ' . DRAFTS_TABLE . ' d
-		LEFT JOIN ' . FORUMS_TABLE . ' f ON (f.forum_id = d.forum_id)
-			WHERE d.user_id = ' . phpbb::$user->data['user_id'] . "
-			$sql_and
-		ORDER BY d.save_time DESC";
-	$result = phpbb::$db->sql_query($sql);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		if ($row['topic_id'])
-		{
-			$topic_ids[] = (int) $row['topic_id'];
-		}
-		$draft_rows[] = $row;
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	if (!sizeof($draft_rows))
-	{
-		return;
-	}
-
-	$topic_rows = array();
-	if (sizeof($topic_ids))
-	{
-		$sql = 'SELECT topic_id, forum_id, topic_title
-			FROM ' . TOPICS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('topic_id', array_unique($topic_ids));
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$topic_rows[$row['topic_id']] = $row;
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-	unset($topic_ids);
-
-	phpbb::$template->assign_var('S_SHOW_DRAFTS', true);
-
-	foreach ($draft_rows as $draft)
-	{
-		$link_topic = $link_forum = $link_pm = false;
-		$insert_url = $view_url = $title = '';
-
-		if (isset($topic_rows[$draft['topic_id']])
-			&& (
-				($topic_rows[$draft['topic_id']]['forum_id'] && phpbb::$acl->acl_get('f_read', $topic_rows[$draft['topic_id']]['forum_id']))
-				||
-				(!$topic_rows[$draft['topic_id']]['forum_id'] && phpbb::$acl->acl_getf_global('f_read'))
-			))
-		{
-			$topic_forum_id = ($topic_rows[$draft['topic_id']]['forum_id']) ? $topic_rows[$draft['topic_id']]['forum_id'] : $forum_id;
-
-			$link_topic = true;
-			$view_url = append_sid('viewtopic', 'f=' . $topic_forum_id . '&amp;t=' . $draft['topic_id']);
-			$title = $topic_rows[$draft['topic_id']]['topic_title'];
-
-			$insert_url = append_sid('posting', 'f=' . $topic_forum_id . '&amp;t=' . $draft['topic_id'] . '&amp;mode=reply&amp;d=' . $draft['draft_id']);
-		}
-		else if ($draft['forum_id'] && phpbb::$acl->acl_get('f_read', $draft['forum_id']))
-		{
-			$link_forum = true;
-			$view_url = append_sid('viewforum', 'f=' . $draft['forum_id']);
-			$title = $draft['forum_name'];
-
-			$insert_url = append_sid('posting', 'f=' . $draft['forum_id'] . '&amp;mode=post&amp;d=' . $draft['draft_id']);
-		}
-		else
-		{
-			// Either display as PM draft if forum_id and topic_id are empty or if access to the forums has been denied afterwards...
-			$link_pm = true;
-			$insert_url = append_sid('ucp', "i=$id&amp;mode=compose&amp;d={$draft['draft_id']}");
-		}
-
-		phpbb::$template->assign_block_vars('draftrow', array(
-			'DRAFT_ID'		=> $draft['draft_id'],
-			'DATE'			=> phpbb::$user->format_date($draft['save_time']),
-			'DRAFT_SUBJECT'	=> $draft['draft_subject'],
-
-			'TITLE'			=> $title,
-			'U_VIEW'		=> $view_url,
-			'U_INSERT'		=> $insert_url,
-
-			'S_LINK_PM'		=> $link_pm,
-			'S_LINK_TOPIC'	=> $link_topic,
-			'S_LINK_FORUM'	=> $link_forum,
-		));
-	}
-}
-
-/**
-* Topic Review
-*/
-function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id = 0, $show_quote_button = true)
-{
-	global $bbcode;
-
-	// Go ahead and pull all data for this topic
-	$sql = 'SELECT p.post_id
-		FROM ' . POSTS_TABLE . ' p' . "
-		WHERE p.topic_id = $topic_id
-			" . ((!phpbb::$acl->acl_get('m_approve', $forum_id)) ? 'AND p.post_approved = 1' : '') . '
-			' . (($mode == 'post_review') ? " AND p.post_id > $cur_post_id" : '') . '
-		ORDER BY p.post_time ';
-	$sql .= ($mode == 'post_review') ? 'ASC' : 'DESC';
-	$result = phpbb::$db->sql_query_limit($sql, phpbb::$config['posts_per_page']);
-
-	$post_list = array();
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$post_list[] = $row['post_id'];
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	if (!sizeof($post_list))
-	{
-		return false;
-	}
-
-	$sql = phpbb::$db->sql_build_query('SELECT', array(
-		'SELECT'	=> 'u.username, u.user_id, u.user_colour, p.*, z.friend, z.foe',
-
-		'FROM'		=> array(
-			USERS_TABLE		=> 'u',
-			POSTS_TABLE		=> 'p',
-		),
-
-		'LEFT_JOIN'	=> array(
-			array(
-				'FROM'	=> array(ZEBRA_TABLE => 'z'),
-				'ON'	=> 'z.user_id = ' . phpbb::$user->data['user_id'] . ' AND z.zebra_id = p.poster_id'
-			)
-		),
-
-		'WHERE'		=> phpbb::$db->sql_in_set('p.post_id', $post_list) . '
-			AND u.user_id = p.poster_id'
-	));
-
-	$result = phpbb::$db->sql_query($sql);
-
-	$bbcode_bitfield = '';
-	$rowset = array();
-	$has_attachments = false;
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$rowset[$row['post_id']] = $row;
-		$bbcode_bitfield = $bbcode_bitfield | base64_decode($row['bbcode_bitfield']);
-
-		if ($row['post_attachment'])
-		{
-			$has_attachments = true;
-		}
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	// Instantiate BBCode class
-	if (!isset($bbcode) && $bbcode_bitfield !== '')
-	{
-		include_once(PHPBB_ROOT_PATH . 'includes/bbcode.' . PHP_EXT);
-		$bbcode = new bbcode(base64_encode($bbcode_bitfield));
-	}
-
-	// Grab extensions
-	$extensions = $attachments = array();
-	if ($has_attachments && phpbb::$acl->acl_get('u_download') && phpbb::$acl->acl_get('f_download', $forum_id))
-	{
-		$extensions = phpbb_cache::obtain_extensions_forum($forum_id);
-
-		// Get attachments...
-		$sql = 'SELECT *
-			FROM ' . ATTACHMENTS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('post_msg_id', $post_list) . '
-				AND in_message = 0
-			ORDER BY filetime DESC, post_msg_id ASC';
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$attachments[$row['post_msg_id']][] = $row;
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
-	{
-		// A non-existing rowset only happens if there was no user present for the entered poster_id
-		// This could be a broken posts table.
-		if (!isset($rowset[$post_list[$i]]))
-		{
-			continue;
-		}
-
-		$row =& $rowset[$post_list[$i]];
-
-		$poster_id		= $row['user_id'];
-		$post_subject	= $row['post_subject'];
-		$message		= censor_text($row['post_text']);
-
-		$decoded_message = false;
-
-		if ($show_quote_button && phpbb::$acl->acl_get('f_reply', $forum_id))
-		{
-			$decoded_message = $message;
-			decode_message($decoded_message, $row['bbcode_uid']);
-
-			$decoded_message = bbcode_nl2br($decoded_message);
-		}
-
-		if ($row['bbcode_bitfield'])
-		{
-			$bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']);
-		}
-
-		$message = bbcode_nl2br($message);
-		$message = smiley_text($message, !$row['enable_smilies']);
-
-		if (!empty($attachments[$row['post_id']]))
-		{
-			$update_count = array();
-			parse_attachments($forum_id, $message, $attachments[$row['post_id']], $update_count);
-		}
-
-		$post_subject = censor_text($post_subject);
-
-		$post_anchor = ($mode == 'post_review') ? 'ppr' . $row['post_id'] : 'pr' . $row['post_id'];
-		$u_show_post = append_sid('viewtopic', "f=$forum_id&amp;t=$topic_id&amp;p={$row['post_id']}&amp;view=show#p{$row['post_id']}");
-
-		phpbb::$template->assign_block_vars($mode . '_row', array(
-			'POST_AUTHOR_FULL'		=> get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
-			'POST_AUTHOR_COLOUR'	=> get_username_string('colour', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
-			'POST_AUTHOR'			=> get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
-			'U_POST_AUTHOR'			=> get_username_string('profile', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
-
-			'S_HAS_ATTACHMENTS'	=> (!empty($attachments[$row['post_id']])) ? true : false,
-			'S_FRIEND'			=> ($row['friend']) ? true : false,
-			'S_IGNORE_POST'		=> ($row['foe']) ? true : false,
-			'L_IGNORE_POST'		=> ($row['foe']) ? phpbb::$user->lang('POST_BY_FOE', get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), "<a href=\"{$u_show_post}\" onclick=\"dE('{$post_anchor}', 1); return false;\">", '</a>') : '',
-
-			'POST_SUBJECT'		=> $post_subject,
-			'MINI_POST_IMG'		=> phpbb::$user->img('icon_post_target', 'POST'),
-			'POST_DATE'			=> phpbb::$user->format_date($row['post_time']),
-			'MESSAGE'			=> $message,
-			'DECODED_MESSAGE'	=> $decoded_message,
-			'POST_ID'			=> $row['post_id'],
-			'U_MINI_POST'		=> append_sid('viewtopic', 'p=' . $row['post_id']) . '#p' . $row['post_id'],
-			'U_MCP_DETAILS'		=> (phpbb::$acl->acl_get('m_info', $forum_id)) ? append_sid('mcp', 'i=main&amp;mode=post_details&amp;f=' . $forum_id . '&amp;p=' . $row['post_id'], true, phpbb::$user->session_id) : '',
-			'POSTER_QUOTE'		=> ($show_quote_button && phpbb::$acl->acl_get('f_reply', $forum_id)) ? addslashes(get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username'])) : '',
-		));
-
-		// Display not already displayed Attachments for this post, we already parsed them. ;)
-		if (!empty($attachments[$row['post_id']]))
-		{
-			foreach ($attachments[$row['post_id']] as $attachment)
-			{
-				phpbb::$template->assign_block_vars($mode . '_row.attachment', array(
-					'DISPLAY_ATTACHMENT'	=> $attachment,
-				));
-			}
-		}
-
-		unset($rowset[$i]);
-	}
-
-	if ($mode == 'topic_review')
-	{
-		phpbb::$template->assign_var('QUOTE_IMG', phpbb::$user->img('icon_post_quote', 'REPLY_WITH_QUOTE'));
-	}
-
-	return true;
-}
-
-/**
-* User Notification
-*/
-function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id, $topic_id, $post_id)
-{
-	$topic_notification = ($mode == 'reply' || $mode == 'quote') ? true : false;
-	$forum_notification = ($mode == 'post') ? true : false;
-
-	if (!$topic_notification && !$forum_notification)
-	{
-		trigger_error('NO_MODE');
-	}
-
-	if (($topic_notification && !phpbb::$config['allow_topic_notify']) || ($forum_notification && !phpbb::$config['allow_forum_notify']))
-	{
-		return;
-	}
-
-	$topic_title = ($topic_notification) ? $topic_title : $subject;
-	$topic_title = censor_text($topic_title);
-
-	// Get banned User ID's
-	$sql = 'SELECT ban_userid
-		FROM ' . BANLIST_TABLE . '
-		WHERE ban_userid <> 0
-			AND ban_exclude <> 1';
-	$result = phpbb::$db->sql_query($sql);
-
-	$sql_ignore_users = ANONYMOUS . ', ' . phpbb::$user->data['user_id'];
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$sql_ignore_users .= ', ' . (int) $row['ban_userid'];
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	$notify_rows = array();
-
-	// -- get forum_userids	|| topic_userids
-	$sql = 'SELECT u.user_id, u.username, u.user_email, u.user_lang, u.user_notify_type, u.user_jabber
-		FROM ' . (($topic_notification) ? TOPICS_WATCH_TABLE : FORUMS_WATCH_TABLE) . ' w, ' . USERS_TABLE . ' u
-		WHERE w.' . (($topic_notification) ? 'topic_id' : 'forum_id') . ' = ' . (($topic_notification) ? $topic_id : $forum_id) . "
-			AND w.user_id NOT IN ($sql_ignore_users)
-			AND w.notify_status = 0
-			AND u.user_type IN (" . phpbb::USER_NORMAL . ', ' . phpbb::USER_FOUNDER . ')
-			AND u.user_id = w.user_id';
-	$result = phpbb::$db->sql_query($sql);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$notify_rows[$row['user_id']] = array(
-			'user_id'		=> $row['user_id'],
-			'username'		=> $row['username'],
-			'user_email'	=> $row['user_email'],
-			'user_jabber'	=> $row['user_jabber'],
-			'user_lang'		=> $row['user_lang'],
-			'notify_type'	=> ($topic_notification) ? 'topic' : 'forum',
-			'template'		=> ($topic_notification) ? 'topic_notify' : 'newtopic_notify',
-			'method'		=> $row['user_notify_type'],
-			'allowed'		=> false
-		);
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	// forum notification is sent to those not already receiving topic notifications
-	if ($topic_notification)
-	{
-		if (sizeof($notify_rows))
-		{
-			$sql_ignore_users .= ', ' . implode(', ', array_keys($notify_rows));
-		}
-
-		$sql = 'SELECT u.user_id, u.username, u.user_email, u.user_lang, u.user_notify_type, u.user_jabber
-			FROM ' . FORUMS_WATCH_TABLE . ' fw, ' . USERS_TABLE . " u
-			WHERE fw.forum_id = $forum_id
-				AND fw.user_id NOT IN ($sql_ignore_users)
-				AND fw.notify_status = 0
-				AND u.user_type IN (" . phpbb::USER_NORMAL . ', ' . phpbb::USER_FOUNDER . ')
-				AND u.user_id = fw.user_id';
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$notify_rows[$row['user_id']] = array(
-				'user_id'		=> $row['user_id'],
-				'username'		=> $row['username'],
-				'user_email'	=> $row['user_email'],
-				'user_jabber'	=> $row['user_jabber'],
-				'user_lang'		=> $row['user_lang'],
-				'notify_type'	=> 'forum',
-				'template'		=> 'forum_notify',
-				'method'		=> $row['user_notify_type'],
-				'allowed'		=> false
-			);
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	if (!sizeof($notify_rows))
-	{
-		return;
-	}
-
-	// Make sure users are allowed to read the forum
-	foreach (phpbb::$acl->acl_get_list(array_keys($notify_rows), 'f_read', $forum_id) as $forum_id => $forum_ary)
-	{
-		foreach ($forum_ary as $auth_option => $user_ary)
-		{
-			foreach ($user_ary as $user_id)
-			{
-				$notify_rows[$user_id]['allowed'] = true;
-			}
-		}
-	}
-
-
-	// Now, we have to do a little step before really sending, we need to distinguish our users a little bit. ;)
-	$msg_users = $delete_ids = $update_notification = array();
-	foreach ($notify_rows as $user_id => $row)
-	{
-		if (!$row['allowed'] || !trim($row['user_email']))
-		{
-			$delete_ids[$row['notify_type']][] = $row['user_id'];
-		}
-		else
-		{
-			$msg_users[] = $row;
-			$update_notification[$row['notify_type']][] = $row['user_id'];
-		}
-	}
-	unset($notify_rows);
-
-	// Now, we are able to really send out notifications
-	if (sizeof($msg_users))
-	{
-		include_once(PHPBB_ROOT_PATH . 'includes/functions_messenger.' . PHP_EXT);
-		$messenger = new messenger();
-
-		$msg_list_ary = array();
-		foreach ($msg_users as $row)
-		{
-			$pos = (!isset($msg_list_ary[$row['template']])) ? 0 : sizeof($msg_list_ary[$row['template']]);
-
-			$msg_list_ary[$row['template']][$pos]['method']	= $row['method'];
-			$msg_list_ary[$row['template']][$pos]['email']	= $row['user_email'];
-			$msg_list_ary[$row['template']][$pos]['jabber']	= $row['user_jabber'];
-			$msg_list_ary[$row['template']][$pos]['name']	= $row['username'];
-			$msg_list_ary[$row['template']][$pos]['lang']	= $row['user_lang'];
-			$msg_list_ary[$row['template']][$pos]['user_id']= $row['user_id'];
-		}
-		unset($msg_users);
-
-		foreach ($msg_list_ary as $email_template => $email_list)
-		{
-			foreach ($email_list as $addr)
-			{
-				$messenger->template($email_template, $addr['lang']);
-
-				$messenger->to($addr['email'], $addr['name']);
-				$messenger->im($addr['jabber'], $addr['name']);
-
-				$messenger->assign_vars(array(
-					'USERNAME'		=> htmlspecialchars_decode($addr['name']),
-					'TOPIC_TITLE'	=> htmlspecialchars_decode($topic_title),
-					'FORUM_NAME'	=> htmlspecialchars_decode($forum_name),
-
-					'U_FORUM'				=> generate_board_url() . '/viewforum.' . PHP_EXT . "?f=$forum_id",
-					'U_TOPIC'				=> generate_board_url() . '/viewtopic.' . PHP_EXT . "?f=$forum_id&t=$topic_id",
-					'U_NEWEST_POST'			=> generate_board_url() . '/viewtopic.' . PHP_EXT . "?f=$forum_id&t=$topic_id&p=$post_id&e=$post_id",
-					'U_STOP_WATCHING_TOPIC'	=> generate_board_url() . '/viewtopic.' . PHP_EXT . "?uid={$addr['user_id']}&f=$forum_id&t=$topic_id&unwatch=topic",
-					'U_STOP_WATCHING_FORUM'	=> generate_board_url() . '/viewforum.' . PHP_EXT . "?uid={$addr['user_id']}&f=$forum_id&unwatch=forum",
-				));
-
-				$messenger->send($addr['method']);
-			}
-		}
-		unset($msg_list_ary);
-
-		$messenger->save_queue();
-	}
-
-	// Handle the DB updates
-	phpbb::$db->sql_transaction('begin');
-
-	if (!empty($update_notification['topic']))
-	{
-		$sql = 'UPDATE ' . TOPICS_WATCH_TABLE . "
-			SET notify_status = 1
-			WHERE topic_id = $topic_id
-				AND " . phpbb::$db->sql_in_set('user_id', $update_notification['topic']);
-		phpbb::$db->sql_query($sql);
-	}
-
-	if (!empty($update_notification['forum']))
-	{
-		$sql = 'UPDATE ' . FORUMS_WATCH_TABLE . "
-			SET notify_status = 1
-			WHERE forum_id = $forum_id
-				AND " . phpbb::$db->sql_in_set('user_id', $update_notification['forum']);
-		phpbb::$db->sql_query($sql);
-	}
-
-	// Now delete the user_ids not authorised to receive notifications on this topic/forum
-	if (!empty($delete_ids['topic']))
-	{
-		$sql = 'DELETE FROM ' . TOPICS_WATCH_TABLE . "
-			WHERE topic_id = $topic_id
-				AND " . phpbb::$db->sql_in_set('user_id', $delete_ids['topic']);
-		phpbb::$db->sql_query($sql);
-	}
-
-	if (!empty($delete_ids['forum']))
-	{
-		$sql = 'DELETE FROM ' . FORUMS_WATCH_TABLE . "
-			WHERE forum_id = $forum_id
-				AND " . phpbb::$db->sql_in_set('user_id', $delete_ids['forum']);
-		phpbb::$db->sql_query($sql);
-	}
-
-	phpbb::$db->sql_transaction('commit');
-}
-
-//
-// Post handling functions
-//
-
-/**
-* Delete Post
-*/
-function delete_post($forum_id, $topic_id, $post_id, &$data)
-{
-	// Specify our post mode
-	$post_mode = 'delete';
-	if (($data['topic_first_post_id'] === $data['topic_last_post_id']) && $data['topic_replies_real'] == 0)
-	{
-		$post_mode = 'delete_topic';
-	}
-	else if ($data['topic_first_post_id'] == $post_id)
-	{
-		$post_mode = 'delete_first_post';
-	}
-	else if ($data['topic_last_post_id'] == $post_id)
-	{
-		$post_mode = 'delete_last_post';
-	}
-	$sql_data = array();
-	$next_post_id = false;
-
-	include_once(PHPBB_ROOT_PATH . 'includes/functions_admin.' . PHP_EXT);
-
-	phpbb::$db->sql_transaction('begin');
-
-	// we must make sure to update forums that contain the shadow'd topic
-	if ($post_mode == 'delete_topic')
-	{
-		$shadow_forum_ids = array();
-
-		$sql = 'SELECT forum_id
-			FROM ' . TOPICS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('topic_moved_id', $topic_id);
-		$result = phpbb::$db->sql_query($sql);
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			if (!isset($shadow_forum_ids[(int) $row['forum_id']]))
-			{
-				$shadow_forum_ids[(int) $row['forum_id']] = 1;
-			}
-			else
-			{
-				$shadow_forum_ids[(int) $row['forum_id']]++;
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	if (!delete_posts('post_id', array($post_id), false, false))
-	{
-		// Try to delete topic, we may had an previous error causing inconsistency
-		if ($post_mode == 'delete_topic')
-		{
-			delete_topics('topic_id', array($topic_id), false);
-		}
-		trigger_error('ALREADY_DELETED');
-	}
-
-	phpbb::$db->sql_transaction('commit');
-
-	// Collect the necessary information for updating the tables
-	$sql_data[FORUMS_TABLE] = '';
-	switch ($post_mode)
-	{
-		case 'delete_topic':
-
-			foreach ($shadow_forum_ids as $updated_forum => $topic_count)
-			{
-				// counting is fun! we only have to do sizeof($forum_ids) number of queries,
-				// even if the topic is moved back to where its shadow lives (we count how many times it is in a forum)
-				phpbb::$db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_topics_real = forum_topics_real - ' . $topic_count . ', forum_topics = forum_topics - ' . $topic_count . ' WHERE forum_id = ' . $updated_forum);
-				update_post_information('forum', $updated_forum);
-			}
-
-			delete_topics('topic_id', array($topic_id), false);
-
-			if ($data['topic_type'] != POST_GLOBAL)
-			{
-				$sql_data[FORUMS_TABLE] .= 'forum_topics_real = forum_topics_real - 1';
-				$sql_data[FORUMS_TABLE] .= ($data['topic_approved']) ? ', forum_posts = forum_posts - 1, forum_topics = forum_topics - 1' : '';
-			}
-
-			$update_sql = update_post_information('forum', $forum_id, true);
-			if (sizeof($update_sql))
-			{
-				$sql_data[FORUMS_TABLE] .= ($sql_data[FORUMS_TABLE]) ? ', ' : '';
-				$sql_data[FORUMS_TABLE] .= implode(', ', $update_sql[$forum_id]);
-			}
-		break;
-
-		case 'delete_first_post':
-			$sql = 'SELECT p.post_id, p.poster_id, p.post_username, u.username, u.user_colour
-				FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u
-				WHERE p.topic_id = $topic_id
-					AND p.poster_id = u.user_id
-				ORDER BY p.post_time ASC";
-			$result = phpbb::$db->sql_query_limit($sql, 1);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if ($data['topic_type'] != POST_GLOBAL)
-			{
-				$sql_data[FORUMS_TABLE] = ($data['post_approved']) ? 'forum_posts = forum_posts - 1' : '';
-			}
-
-			$sql_data[TOPICS_TABLE] = 'topic_poster = ' . intval($row['poster_id']) . ', topic_first_post_id = ' . intval($row['post_id']) . ", topic_first_poster_colour = '" . phpbb::$db->sql_escape($row['user_colour']) . "', topic_first_poster_name = '" . (($row['poster_id'] == ANONYMOUS) ? phpbb::$db->sql_escape($row['post_username']) : phpbb::$db->sql_escape($row['username'])) . "'";
-
-			// Decrementing topic_replies here is fine because this case only happens if there is more than one post within the topic - basically removing one "reply"
-			$sql_data[TOPICS_TABLE] .= ', topic_replies_real = topic_replies_real - 1' . (($data['post_approved']) ? ', topic_replies = topic_replies - 1' : '');
-
-			$next_post_id = (int) $row['post_id'];
-		break;
-
-		case 'delete_last_post':
-			if ($data['topic_type'] != POST_GLOBAL)
-			{
-				$sql_data[FORUMS_TABLE] = ($data['post_approved']) ? 'forum_posts = forum_posts - 1' : '';
-			}
-
-			$update_sql = update_post_information('forum', $forum_id, true);
-			if (sizeof($update_sql))
-			{
-				$sql_data[FORUMS_TABLE] .= ($sql_data[FORUMS_TABLE]) ? ', ' : '';
-				$sql_data[FORUMS_TABLE] .= implode(', ', $update_sql[$forum_id]);
-			}
-
-			$sql_data[TOPICS_TABLE] = 'topic_bumped = 0, topic_bumper = 0, topic_replies_real = topic_replies_real - 1' . (($data['post_approved']) ? ', topic_replies = topic_replies - 1' : '');
-
-			$update_sql = update_post_information('topic', $topic_id, true);
-			if (sizeof($update_sql))
-			{
-				$sql_data[TOPICS_TABLE] .= ', ' . implode(', ', $update_sql[$topic_id]);
-				$next_post_id = (int) str_replace('topic_last_post_id = ', '', $update_sql[$topic_id][0]);
-			}
-			else
-			{
-				$sql = 'SELECT MAX(post_id) as last_post_id
-					FROM ' . POSTS_TABLE . "
-					WHERE topic_id = $topic_id " .
-						((!phpbb::$acl->acl_get('m_approve', $forum_id)) ? 'AND post_approved = 1' : '');
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				$next_post_id = (int) $row['last_post_id'];
-			}
-		break;
-
-		case 'delete':
-			$sql = 'SELECT post_id
-				FROM ' . POSTS_TABLE . "
-				WHERE topic_id = $topic_id " .
-					((!phpbb::$acl->acl_get('m_approve', $forum_id)) ? 'AND post_approved = 1' : '') . '
-					AND post_time > ' . $data['post_time'] . '
-				ORDER BY post_time ASC';
-			$result = phpbb::$db->sql_query_limit($sql, 1);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if ($data['topic_type'] != POST_GLOBAL)
-			{
-				$sql_data[FORUMS_TABLE] = ($data['post_approved']) ? 'forum_posts = forum_posts - 1' : '';
-			}
-
-			$sql_data[TOPICS_TABLE] = 'topic_replies_real = topic_replies_real - 1' . (($data['post_approved']) ? ', topic_replies = topic_replies - 1' : '');
-			$next_post_id = (int) $row['post_id'];
-		break;
-	}
-
-//	$sql_data[USERS_TABLE] = ($data['post_postcount']) ? 'user_posts = user_posts - 1' : '';
-
-	phpbb::$db->sql_transaction('begin');
-
-	$where_sql = array(
-		FORUMS_TABLE	=> "forum_id = $forum_id",
-		TOPICS_TABLE	=> "topic_id = $topic_id",
-		USERS_TABLE		=> 'user_id = ' . $data['poster_id']
-	);
-
-	foreach ($sql_data as $table => $update_sql)
-	{
-		if ($update_sql)
-		{
-			phpbb::$db->sql_query("UPDATE $table SET $update_sql WHERE " . $where_sql[$table]);
-		}
-	}
-
-	// Adjust posted info for this user by looking for a post by him/her within this topic...
-	if ($post_mode != 'delete_topic' && phpbb::$config['load_db_track'] && $data['poster_id'] != ANONYMOUS)
-	{
-		$sql = 'SELECT poster_id
-			FROM ' . POSTS_TABLE . '
-			WHERE topic_id = ' . $topic_id . '
-				AND poster_id = ' . $data['poster_id'];
-		$result = phpbb::$db->sql_query_limit($sql, 1);
-		$poster_id = (int) phpbb::$db->sql_fetchfield('poster_id');
-		phpbb::$db->sql_freeresult($result);
-
-		// The user is not having any more posts within this topic
-		if (!$poster_id)
-		{
-			$sql = 'DELETE FROM ' . TOPICS_POSTED_TABLE . '
-				WHERE topic_id = ' . $topic_id . '
-					AND user_id = ' . $data['poster_id'];
-			phpbb::$db->sql_query($sql);
-		}
-	}
-
-	phpbb::$db->sql_transaction('commit');
-
-	if ($data['post_reported'] && ($post_mode != 'delete_topic'))
-	{
-		sync('topic_reported', 'topic_id', array($topic_id));
-	}
-
-	return $next_post_id;
-}
-
-/**
-* Submit Post
-*/
-function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $update_message = true)
-{
-	// We do not handle erasing posts here
-	if ($mode == 'delete')
-	{
-		return false;
-	}
-
-	$current_time = time();
-
-	if ($mode == 'post')
-	{
-		$post_mode = 'post';
-		$update_message = true;
-	}
-	else if ($mode != 'edit')
-	{
-		$post_mode = 'reply';
-		$update_message = true;
-	}
-	else if ($mode == 'edit')
-	{
-		$post_mode = ($data['topic_replies_real'] == 0) ? 'edit_topic' : (($data['topic_first_post_id'] == $data['post_id']) ? 'edit_first_post' : (($data['topic_last_post_id'] == $data['post_id']) ? 'edit_last_post' : 'edit'));
-	}
-
-	// First of all make sure the subject and topic title are having the correct length.
-	// To achieve this without cutting off between special chars we convert to an array and then count the elements.
-	$subject = truncate_string($subject);
-	$data['topic_title'] = truncate_string($data['topic_title']);
-
-	// Collect some basic information about which tables and which rows to update/insert
-	$sql_data = $topic_row = array();
-	$poster_id = ($mode == 'edit') ? $data['poster_id'] : (int) phpbb::$user->data['user_id'];
-
-	// Retrieve some additional information if not present
-	if ($mode == 'edit' && (!isset($data['post_approved']) || !isset($data['topic_approved']) || $data['post_approved'] === false || $data['topic_approved'] === false))
-	{
-		$sql = 'SELECT p.post_approved, t.topic_type, t.topic_replies, t.topic_replies_real, t.topic_approved
-			FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . ' p
-			WHERE t.topic_id = p.topic_id
-				AND p.post_id = ' . $data['post_id'];
-		$result = phpbb::$db->sql_query($sql);
-		$topic_row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		$data['topic_approved'] = $topic_row['topic_approved'];
-		$data['post_approved'] = $topic_row['post_approved'];
-	}
-
-	// This variable indicates if the user is able to post or put into the queue - it is used later for all code decisions regarding approval
-	$post_approval = 1;
-
-	// Check the permissions for post approval, as well as the queue trigger where users are put on approval with a post count lower than specified. Moderators are not affected.
-	if (((phpbb::$config['enable_queue_trigger'] && phpbb::$user->data['user_posts'] < phpbb::$config['queue_trigger_posts']) || !phpbb::$acl->acl_get('f_noapprove', $data['forum_id'])) && !phpbb::$acl->acl_get('m_approve', $data['forum_id']))
-	{
-		$post_approval = 0;
-	}
-
-	// Start the transaction here
-	phpbb::$db->sql_transaction('begin');
-
-	// Collect Information
-	switch ($post_mode)
-	{
-		case 'post':
-		case 'reply':
-			$sql_data[POSTS_TABLE]['sql'] = array(
-				'forum_id'			=> ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id'],
-				'poster_id'			=> (int) phpbb::$user->data['user_id'],
-				'icon_id'			=> $data['icon_id'],
-				'poster_ip'			=> phpbb::$user->ip,
-				'post_time'			=> $current_time,
-				'post_approved'		=> $post_approval,
-				'enable_bbcode'		=> $data['enable_bbcode'],
-				'enable_smilies'	=> $data['enable_smilies'],
-				'enable_magic_url'	=> $data['enable_urls'],
-				'enable_sig'		=> $data['enable_sig'],
-				'post_username'		=> (!phpbb::$user->is_registered) ? $username : '',
-				'post_subject'		=> $subject,
-				'post_text'			=> $data['message'],
-				'post_checksum'		=> $data['message_md5'],
-				'post_attachment'	=> (!empty($data['attachment_data'])) ? 1 : 0,
-				'bbcode_bitfield'	=> $data['bbcode_bitfield'],
-				'bbcode_uid'		=> $data['bbcode_uid'],
-				'post_postcount'	=> (phpbb::$acl->acl_get('f_postcount', $data['forum_id'])) ? 1 : 0,
-				'post_edit_locked'	=> $data['post_edit_locked']
-			);
-		break;
-
-		case 'edit_first_post':
-		case 'edit':
-
-		case 'edit_last_post':
-		case 'edit_topic':
-
-			// If edit reason is given always display edit info
-
-			// If editing last post then display no edit info
-			// If m_edit permission then display no edit info
-			// If normal edit display edit info
-
-			// Display edit info if edit reason given or user is editing his post, which is not the last within the topic.
-			if ($data['post_edit_reason'] || (!phpbb::$acl->acl_get('m_edit', $data['forum_id']) && ($post_mode == 'edit' || $post_mode == 'edit_first_post')))
-			{
-				$data['post_edit_reason']		= truncate_string($data['post_edit_reason'], 255, 255, false);
-
-				$sql_data[POSTS_TABLE]['sql']	= array(
-					'post_edit_time'	=> $current_time,
-					'post_edit_reason'	=> $data['post_edit_reason'],
-					'post_edit_user'	=> (int) $data['post_edit_user'],
-				);
-
-				$sql_data[POSTS_TABLE]['stat'][] = 'post_edit_count = post_edit_count + 1';
-			}
-			else if (!$data['post_edit_reason'] && $mode == 'edit' && phpbb::$acl->acl_get('m_edit', $data['forum_id']))
-			{
-				$sql_data[POSTS_TABLE]['sql'] = array(
-					'post_edit_reason'	=> '',
-				);
-			}
-
-			// If the person editing this post is different to the one having posted then we will add a log entry stating the edit
-			// Could be simplified by only adding to the log if the edit is not tracked - but this may confuse admins/mods
-			if (phpbb::$user->data['user_id'] != $poster_id)
-			{
-				$log_subject = ($subject) ? $subject : $data['topic_title'];
-				add_log('mod', $data['forum_id'], $data['topic_id'], 'LOG_POST_EDITED', $log_subject, (!empty($username)) ? $username : phpbb::$user->lang['GUEST']);
-			}
-
-			if (!isset($sql_data[POSTS_TABLE]['sql']))
-			{
-				$sql_data[POSTS_TABLE]['sql'] = array();
-			}
-
-			$sql_data[POSTS_TABLE]['sql'] = array_merge($sql_data[POSTS_TABLE]['sql'], array(
-				'forum_id'			=> ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id'],
-				'poster_id'			=> $data['poster_id'],
-				'icon_id'			=> $data['icon_id'],
-				'post_approved'		=> (!$post_approval) ? 0 : $data['post_approved'],
-				'enable_bbcode'		=> $data['enable_bbcode'],
-				'enable_smilies'	=> $data['enable_smilies'],
-				'enable_magic_url'	=> $data['enable_urls'],
-				'enable_sig'		=> $data['enable_sig'],
-				'post_username'		=> ($username && $data['poster_id'] == ANONYMOUS) ? $username : '',
-				'post_subject'		=> $subject,
-				'post_checksum'		=> $data['message_md5'],
-				'post_attachment'	=> (!empty($data['attachment_data'])) ? 1 : 0,
-				'bbcode_bitfield'	=> $data['bbcode_bitfield'],
-				'bbcode_uid'		=> $data['bbcode_uid'],
-				'post_edit_locked'	=> $data['post_edit_locked'])
-			);
-
-			if ($update_message)
-			{
-				$sql_data[POSTS_TABLE]['sql']['post_text'] = $data['message'];
-			}
-
-		break;
-	}
-
-	$post_approved = $sql_data[POSTS_TABLE]['sql']['post_approved'];
-	$topic_row = array();
-
-	// And the topic ladies and gentlemen
-	switch ($post_mode)
-	{
-		case 'post':
-			$sql_data[TOPICS_TABLE]['sql'] = array(
-				'topic_poster'				=> (int) phpbb::$user->data['user_id'],
-				'topic_time'				=> $current_time,
-				'topic_last_view_time'		=> $current_time,
-				'forum_id'					=> ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id'],
-				'icon_id'					=> $data['icon_id'],
-				'topic_approved'			=> $post_approval,
-				'topic_title'				=> $subject,
-				'topic_first_poster_name'	=> (!phpbb::$user->is_registered && $username) ? $username : ((!phpbb::$user->is_guest) ? phpbb::$user->data['username'] : ''),
-				'topic_first_poster_colour'	=> phpbb::$user->data['user_colour'],
-				'topic_type'				=> $topic_type,
-				'topic_time_limit'			=> ($topic_type == POST_STICKY || $topic_type == POST_ANNOUNCE) ? ($data['topic_time_limit'] * 86400) : 0,
-				'topic_attachment'			=> (!empty($data['attachment_data'])) ? 1 : 0,
-			);
-
-			if (isset($poll['poll_options']) && !empty($poll['poll_options']))
-			{
-				$poll_start = ($poll['poll_start']) ? $poll['poll_start'] : $current_time;
-				$poll_length = $poll['poll_length'] * 86400;
-				if ($poll_length < 0)
-				{
-					$poll_start = $poll_start + $poll_length;
-					if ($poll_start < 0)
-					{
-						$poll_start = 0;
-					}
-					$poll_length = 1;
-				}
-
-				$sql_data[TOPICS_TABLE]['sql'] = array_merge($sql_data[TOPICS_TABLE]['sql'], array(
-					'poll_title'		=> $poll['poll_title'],
-					'poll_start'		=> $poll_start,
-					'poll_max_options'	=> $poll['poll_max_options'],
-					'poll_length'		=> $poll_length,
-					'poll_vote_change'	=> $poll['poll_vote_change'])
-				);
-			}
-
-			$sql_data[USERS_TABLE]['stat'][] = "user_lastpost_time = $current_time" . ((phpbb::$acl->acl_get('f_postcount', $data['forum_id']) && $post_approval) ? ', user_posts = user_posts + 1' : '');
-
-			if ($topic_type != POST_GLOBAL)
-			{
-				if ($post_approval)
-				{
-					$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts + 1';
-				}
-				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_topics_real = forum_topics_real + 1' . (($post_approval) ? ', forum_topics = forum_topics + 1' : '');
-			}
-		break;
-
-		case 'reply':
-			$sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_view_time = ' . $current_time . ',
-				topic_replies_real = topic_replies_real + 1,
-				topic_bumped = 0,
-				topic_bumper = 0' .
-				(($post_approval) ? ', topic_replies = topic_replies + 1' : '') .
-				((!empty($data['attachment_data']) || (isset($data['topic_attachment']) && $data['topic_attachment'])) ? ', topic_attachment = 1' : '');
-
-			$sql_data[USERS_TABLE]['stat'][] = "user_lastpost_time = $current_time" . ((phpbb::$acl->acl_get('f_postcount', $data['forum_id']) && $post_approval) ? ', user_posts = user_posts + 1' : '');
-
-			if ($post_approval && $topic_type != POST_GLOBAL)
-			{
-				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts + 1';
-			}
-		break;
-
-		case 'edit_topic':
-		case 'edit_first_post':
-			if (isset($poll['poll_options']) && !empty($poll['poll_options']))
-			{
-				$poll_start = ($poll['poll_start']) ? $poll['poll_start'] : $current_time;
-				$poll_length = $poll['poll_length'] * 86400;
-				if ($poll_length < 0)
-				{
-					$poll_start = $poll_start + $poll_length;
-					if ($poll_start < 0)
-					{
-						$poll_start = 0;
-					}
-					$poll_length = 1;
-				}
-			}
-
-			$sql_data[TOPICS_TABLE]['sql'] = array(
-				'forum_id'					=> ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id'],
-				'icon_id'					=> $data['icon_id'],
-				'topic_approved'			=> (!$post_approval) ? 0 : $data['topic_approved'],
-				'topic_title'				=> $subject,
-				'topic_first_poster_name'	=> $username,
-				'topic_type'				=> $topic_type,
-				'topic_time_limit'			=> ($topic_type == POST_STICKY || $topic_type == POST_ANNOUNCE) ? ($data['topic_time_limit'] * 86400) : 0,
-				'poll_title'				=> (isset($poll['poll_options'])) ? $poll['poll_title'] : '',
-				'poll_start'				=> (isset($poll['poll_options'])) ? $poll_start : 0,
-				'poll_max_options'			=> (isset($poll['poll_options'])) ? $poll['poll_max_options'] : 1,
-				'poll_length'				=> (isset($poll['poll_options'])) ? $poll_length : 0,
-				'poll_vote_change'			=> (isset($poll['poll_vote_change'])) ? $poll['poll_vote_change'] : 0,
-				'topic_last_view_time'		=> $current_time,
-
-				'topic_attachment'			=> (!empty($data['attachment_data'])) ? 1 : (isset($data['topic_attachment']) ? $data['topic_attachment'] : 0),
-			);
-
-			// Correctly set back the topic replies and forum posts... only if the topic was approved before and now gets disapproved
-			if (!$post_approval && $data['topic_approved'])
-			{
-				// Do we need to grab some topic informations?
-				if (!sizeof($topic_row))
-				{
-					$sql = 'SELECT topic_type, topic_replies, topic_replies_real, topic_approved
-						FROM ' . TOPICS_TABLE . '
-						WHERE topic_id = ' . $data['topic_id'];
-					$result = phpbb::$db->sql_query($sql);
-					$topic_row = phpbb::$db->sql_fetchrow($result);
-					phpbb::$db->sql_freeresult($result);
-				}
-
-				// If this is the only post remaining we do not need to decrement topic_replies.
-				// Also do not decrement if first post - then the topic_replies will not be adjusted if approving the topic again.
-
-				// If this is an edited topic or the first post the topic gets completely disapproved later on...
-				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_topics = forum_topics - 1';
-				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts - ' . ($topic_row['topic_replies'] + 1);
-
-				set_config_count('num_topics', -1, true);
-				set_config_count('num_posts', ($topic_row['topic_replies'] + 1) * (-1), true);
-
-				// Only decrement this post, since this is the one non-approved now
-				if (phpbb::$acl->acl_get('f_postcount', $data['forum_id']))
-				{
-					$sql_data[USERS_TABLE]['stat'][] = 'user_posts = user_posts - 1';
-				}
-			}
-
-		break;
-
-		case 'edit':
-		case 'edit_last_post':
-
-			// Correctly set back the topic replies and forum posts... but only if the post was approved before.
-			if (!$post_approval && $data['post_approved'])
-			{
-				$sql_data[TOPICS_TABLE]['stat'][] = 'topic_replies = topic_replies - 1, topic_last_view_time = ' . $current_time;
-				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts - 1';
-
-				set_config_count('num_posts', -1, true);
-
-				if (phpbb::$acl->acl_get('f_postcount', $data['forum_id']))
-				{
-					$sql_data[USERS_TABLE]['stat'][] = 'user_posts = user_posts - 1';
-				}
-			}
-
-		break;
-	}
-
-	// Submit new topic
-	if ($post_mode == 'post')
-	{
-		$sql = 'INSERT INTO ' . TOPICS_TABLE . ' ' .
-			phpbb::$db->sql_build_array('INSERT', $sql_data[TOPICS_TABLE]['sql']);
-		phpbb::$db->sql_query($sql);
-
-		$data['topic_id'] = phpbb::$db->sql_nextid();
-
-		$sql_data[POSTS_TABLE]['sql'] = array_merge($sql_data[POSTS_TABLE]['sql'], array(
-			'topic_id' => $data['topic_id'])
-		);
-		unset($sql_data[TOPICS_TABLE]['sql']);
-	}
-
-	// Submit new post
-	if ($post_mode == 'post' || $post_mode == 'reply')
-	{
-		if ($post_mode == 'reply')
-		{
-			$sql_data[POSTS_TABLE]['sql'] = array_merge($sql_data[POSTS_TABLE]['sql'], array(
-				'topic_id' => $data['topic_id'])
-			);
-		}
-
-		$sql = 'INSERT INTO ' . POSTS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_data[POSTS_TABLE]['sql']);
-		phpbb::$db->sql_query($sql);
-		$data['post_id'] = phpbb::$db->sql_nextid();
-
-		if ($post_mode == 'post')
-		{
-			$sql_data[TOPICS_TABLE]['sql'] = array(
-				'topic_first_post_id'		=> $data['post_id'],
-				'topic_last_post_id'		=> $data['post_id'],
-				'topic_last_post_time'		=> $current_time,
-				'topic_last_poster_id'		=> (int) phpbb::$user->data['user_id'],
-				'topic_last_poster_name'	=> (!phpbb::$user->is_registered && $username) ? $username : ((!phpbb::$user->is_guest) ? phpbb::$user->data['username'] : ''),
-				'topic_last_poster_colour'	=> phpbb::$user->data['user_colour'],
-				'topic_last_post_subject'	=> (string) $subject,
-			);
-		}
-
-		unset($sql_data[POSTS_TABLE]['sql']);
-	}
-
-	$make_global = false;
-
-	// Are we globalising or unglobalising?
-	if ($post_mode == 'edit_first_post' || $post_mode == 'edit_topic')
-	{
-		if (!sizeof($topic_row))
-		{
-			$sql = 'SELECT topic_type, topic_replies, topic_replies_real, topic_approved, topic_last_post_id
-				FROM ' . TOPICS_TABLE . '
-				WHERE topic_id = ' . $data['topic_id'];
-			$result = phpbb::$db->sql_query($sql);
-			$topic_row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		// globalise/unglobalise?
-		if (($topic_row['topic_type'] != POST_GLOBAL && $topic_type == POST_GLOBAL) || ($topic_row['topic_type'] == POST_GLOBAL && $topic_type != POST_GLOBAL))
-		{
-			if (!empty($sql_data[FORUMS_TABLE]['stat']) && implode('', $sql_data[FORUMS_TABLE]['stat']))
-			{
-				phpbb::$db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET ' . implode(', ', $sql_data[FORUMS_TABLE]['stat']) . ' WHERE forum_id = ' . $data['forum_id']);
-			}
-
-			$make_global = true;
-			$sql_data[FORUMS_TABLE]['stat'] = array();
-		}
-
-		// globalise
-		if ($topic_row['topic_type'] != POST_GLOBAL && $topic_type == POST_GLOBAL)
-		{
-			// Decrement topic/post count
-			$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts - ' . ($topic_row['topic_replies_real'] + 1);
-			$sql_data[FORUMS_TABLE]['stat'][] = 'forum_topics_real = forum_topics_real - 1' . (($topic_row['topic_approved']) ? ', forum_topics = forum_topics - 1' : '');
-
-			// Update forum_ids for all posts
-			$sql = 'UPDATE ' . POSTS_TABLE . '
-				SET forum_id = 0
-				WHERE topic_id = ' . $data['topic_id'];
-			phpbb::$db->sql_query($sql);
-		}
-		// unglobalise
-		else if ($topic_row['topic_type'] == POST_GLOBAL && $topic_type != POST_GLOBAL)
-		{
-			// Increment topic/post count
-			$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts + ' . ($topic_row['topic_replies_real'] + 1);
-			$sql_data[FORUMS_TABLE]['stat'][] = 'forum_topics_real = forum_topics_real + 1' . (($topic_row['topic_approved']) ? ', forum_topics = forum_topics + 1' : '');
-
-			// Update forum_ids for all posts
-			$sql = 'UPDATE ' . POSTS_TABLE . '
-				SET forum_id = ' . $data['forum_id'] . '
-				WHERE topic_id = ' . $data['topic_id'];
-			phpbb::$db->sql_query($sql);
-		}
-	}
-
-	// Update the topics table
-	if (isset($sql_data[TOPICS_TABLE]['sql']))
-	{
-		$sql = 'UPDATE ' . TOPICS_TABLE . '
-			SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_data[TOPICS_TABLE]['sql']) . '
-			WHERE topic_id = ' . $data['topic_id'];
-		phpbb::$db->sql_query($sql);
-	}
-
-	// Update the posts table
-	if (isset($sql_data[POSTS_TABLE]['sql']))
-	{
-		$sql = 'UPDATE ' . POSTS_TABLE . '
-			SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_data[POSTS_TABLE]['sql']) . '
-			WHERE post_id = ' . $data['post_id'];
-		phpbb::$db->sql_query($sql);
-	}
-
-	// Update Poll Tables
-	if (isset($poll['poll_options']) && !empty($poll['poll_options']))
-	{
-		$cur_poll_options = array();
-
-		if ($poll['poll_start'] && $mode == 'edit')
-		{
-			$sql = 'SELECT *
-				FROM ' . POLL_OPTIONS_TABLE . '
-				WHERE topic_id = ' . $data['topic_id'] . '
-				ORDER BY poll_option_id';
-			$result = phpbb::$db->sql_query($sql);
-
-			$cur_poll_options = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$cur_poll_options[] = $row;
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		$sql_insert_ary = array();
-
-		for ($i = 0, $size = sizeof($poll['poll_options']); $i < $size; $i++)
-		{
-			if (strlen(trim($poll['poll_options'][$i])))
-			{
-				if (empty($cur_poll_options[$i]))
-				{
-					// If we add options we need to put them to the end to be able to preserve votes...
-					$sql_insert_ary[] = array(
-						'poll_option_id'	=> (int) sizeof($cur_poll_options) + 1 + sizeof($sql_insert_ary),
-						'topic_id'			=> (int) $data['topic_id'],
-						'poll_option_text'	=> (string) $poll['poll_options'][$i]
-					);
-				}
-				else if ($poll['poll_options'][$i] != $cur_poll_options[$i])
-				{
-					$sql = 'UPDATE ' . POLL_OPTIONS_TABLE . "
-						SET poll_option_text = '" . phpbb::$db->sql_escape($poll['poll_options'][$i]) . "'
-						WHERE poll_option_id = " . $cur_poll_options[$i]['poll_option_id'] . '
-							AND topic_id = ' . $data['topic_id'];
-					phpbb::$db->sql_query($sql);
-				}
-			}
-		}
-
-		phpbb::$db->sql_multi_insert(POLL_OPTIONS_TABLE, $sql_insert_ary);
-
-		if (sizeof($poll['poll_options']) < sizeof($cur_poll_options))
-		{
-			$sql = 'DELETE FROM ' . POLL_OPTIONS_TABLE . '
-				WHERE poll_option_id > ' . sizeof($poll['poll_options']) . '
-					AND topic_id = ' . $data['topic_id'];
-			phpbb::$db->sql_query($sql);
-		}
-
-		// If edited, we would need to reset votes (since options can be re-ordered above, you can't be sure if the change is for changing the text or adding an option
-		if ($mode == 'edit' && sizeof($poll['poll_options']) != sizeof($cur_poll_options))
-		{
-			phpbb::$db->sql_query('DELETE FROM ' . POLL_VOTES_TABLE . ' WHERE topic_id = ' . $data['topic_id']);
-			phpbb::$db->sql_query('UPDATE ' . POLL_OPTIONS_TABLE . ' SET poll_option_total = 0 WHERE topic_id = ' . $data['topic_id']);
-		}
-	}
-
-	// Submit Attachments
-	if (!empty($data['attachment_data']) && $data['post_id'] && in_array($mode, array('post', 'reply', 'quote', 'edit')))
-	{
-		$space_taken = $files_added = 0;
-		$orphan_rows = array();
-
-		foreach ($data['attachment_data'] as $pos => $attach_row)
-		{
-			$orphan_rows[(int) $attach_row['attach_id']] = array();
-		}
-
-		if (sizeof($orphan_rows))
-		{
-			$sql = 'SELECT attach_id, filesize, physical_filename
-				FROM ' . ATTACHMENTS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('attach_id', array_keys($orphan_rows)) . '
-					AND is_orphan = 1
-					AND poster_id = ' . phpbb::$user->data['user_id'];
-			$result = phpbb::$db->sql_query($sql);
-
-			$orphan_rows = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$orphan_rows[$row['attach_id']] = $row;
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		foreach ($data['attachment_data'] as $pos => $attach_row)
-		{
-			if ($attach_row['is_orphan'] && !isset($orphan_rows[$attach_row['attach_id']]))
-			{
-				continue;
-			}
-
-			if (!$attach_row['is_orphan'])
-			{
-				// update entry in db if attachment already stored in db and filespace
-				$sql = 'UPDATE ' . ATTACHMENTS_TABLE . "
-					SET attach_comment = '" . phpbb::$db->sql_escape($attach_row['attach_comment']) . "'
-					WHERE attach_id = " . (int) $attach_row['attach_id'] . '
-						AND is_orphan = 0';
-				phpbb::$db->sql_query($sql);
-			}
-			else
-			{
-				// insert attachment into db
-				if (!@file_exists(PHPBB_ROOT_PATH . phpbb::$config['upload_path'] . '/' . basename($orphan_rows[$attach_row['attach_id']]['physical_filename'])))
-				{
-					continue;
-				}
-
-				$space_taken += $orphan_rows[$attach_row['attach_id']]['filesize'];
-				$files_added++;
-
-				$attach_sql = array(
-					'post_msg_id'		=> $data['post_id'],
-					'topic_id'			=> $data['topic_id'],
-					'is_orphan'			=> 0,
-					'poster_id'			=> $poster_id,
-					'attach_comment'	=> $attach_row['attach_comment'],
-				);
-
-				$sql = 'UPDATE ' . ATTACHMENTS_TABLE . ' SET ' . phpbb::$db->sql_build_array('UPDATE', $attach_sql) . '
-					WHERE attach_id = ' . $attach_row['attach_id'] . '
-						AND is_orphan = 1
-						AND poster_id = ' . phpbb::$user->data['user_id'];
-				phpbb::$db->sql_query($sql);
-			}
-		}
-
-		if ($space_taken && $files_added)
-		{
-			set_config_count('upload_dir_size', $space_taken, true);
-			set_config_count('num_files', $files_added, true);
-		}
-	}
-
-	// we need to update the last forum information
-	// only applicable if the topic is not global and it is approved
-	// we also check to make sure we are not dealing with globaling the latest topic (pretty rare but still needs to be checked)
-	if ($topic_type != POST_GLOBAL && !$make_global && ($post_approved != $data['post_approved']))
-	{
-		// the last post makes us update the forum table. This can happen if...
-		// We make a new topic
-		// We reply to a topic
-		// We edit the last post in a topic and this post is the latest in the forum (maybe)
-		// We edit the only post in the topic
-		// We edit the first post in the topic and all the other posts are not approved
-		if (($post_mode == 'post' || $post_mode == 'reply') && $post_approved)
-		{
-			$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_id = ' . $data['post_id'];
-			$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_post_subject = '" . phpbb::$db->sql_escape($subject) . "'";
-			$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_time = ' . $current_time;
-			$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_poster_id = ' . (int) phpbb::$user->data['user_id'];
-			$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_name = '" . phpbb::$db->sql_escape((!phpbb::$user->is_registered && $username) ? $username : ((!phpbb::$user->is_guest) ? phpbb::$user->data['username'] : '')) . "'";
-			$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_colour = '" . phpbb::$db->sql_escape(phpbb::$user->data['user_colour']) . "'";
-		}
-		else if ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || ($post_mode == 'edit_first_post' && !$data['topic_replies']))
-		{
-			// this does not _necessarily_ mean that we must update the info again,
-			// it just means that we might have to
-			$sql = 'SELECT forum_last_post_id, forum_last_post_subject
-				FROM ' . FORUMS_TABLE . '
-				WHERE forum_id = ' . (int) $data['forum_id'];
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			// this post is the latest post in the forum, better update
-			if ($row['forum_last_post_id'] == $data['post_id'])
-			{
-				// If post approved and subject changed, or poster is anonymous, we need to update the forum_last* rows
-				if ($post_approved && ($row['forum_last_post_subject'] !== $subject || $data['poster_id'] == ANONYMOUS))
-				{
-					// the post's subject changed
-					if ($row['forum_last_post_subject'] !== $subject)
-					{
-						$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_subject = \'' . phpbb::$db->sql_escape($subject) . '\'';
-					}
-
-					// Update the user name if poster is anonymous... just in case an admin changed it
-					if ($data['poster_id'] == ANONYMOUS)
-					{
-						$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_name = '" . phpbb::$db->sql_escape($username) . "'";
-					}
-				}
-				else if ($data['post_approved'] !== $post_approved)
-				{
-					// we need a fresh change of socks, everything has become invalidated
-					$sql = 'SELECT MAX(topic_last_post_id) as last_post_id
-						FROM ' . TOPICS_TABLE . '
-						WHERE forum_id = ' . (int) $data['forum_id'] . '
-							AND topic_approved = 1';
-					$result = phpbb::$db->sql_query($sql);
-					$row = phpbb::$db->sql_fetchrow($result);
-					phpbb::$db->sql_freeresult($result);
-
-					// any posts left in this forum?
-					if (!empty($row['last_post_id']))
-					{
-						$sql = 'SELECT p.post_id, p.post_subject, p.post_time, p.poster_id, p.post_username, u.user_id, u.username, u.user_colour
-							FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
-							WHERE p.poster_id = u.user_id
-								AND p.post_id = ' . (int) $row['last_post_id'];
-						$result = phpbb::$db->sql_query($sql);
-						$row = phpbb::$db->sql_fetchrow($result);
-						phpbb::$db->sql_freeresult($result);
-
-						// salvation, a post is found! jam it into the forums table
-						$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_id = ' . (int) $row['post_id'];
-						$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_post_subject = '" . phpbb::$db->sql_escape($row['post_subject']) . "'";
-						$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_time = ' . (int) $row['post_time'];
-						$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_poster_id = ' . (int) $row['poster_id'];
-						$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_name = '" . phpbb::$db->sql_escape(($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username']) . "'";
-						$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_colour = '" . phpbb::$db->sql_escape($row['user_colour']) . "'";
-					}
-					else
-					{
-						// just our luck, the last topic in the forum has just been turned unapproved...
-						$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_id = 0';
-						$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_post_subject = ''";
-						$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_time = 0';
-						$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_poster_id = 0';
-						$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_name = ''";
-						$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_colour = ''";
-					}
-				}
-			}
-		}
-	}
-	else if ($make_global)
-	{
-		// somebody decided to be a party pooper, we must recalculate the whole shebang (maybe)
-		$sql = 'SELECT forum_last_post_id
-			FROM ' . FORUMS_TABLE . '
-			WHERE forum_id = ' . (int) $data['forum_id'];
-		$result = phpbb::$db->sql_query($sql);
-		$forum_row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		// we made a topic global, go get new data
-		if ($topic_row['topic_type'] != POST_GLOBAL && $topic_type == POST_GLOBAL && $forum_row['forum_last_post_id'] == $topic_row['topic_last_post_id'])
-		{
-			// we need a fresh change of socks, everything has become invalidated
-			$sql = 'SELECT MAX(topic_last_post_id) as last_post_id
-				FROM ' . TOPICS_TABLE . '
-				WHERE forum_id = ' . (int) $data['forum_id'] . '
-					AND topic_approved = 1';
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			// any posts left in this forum?
-			if (!empty($row['last_post_id']))
-			{
-				$sql = 'SELECT p.post_id, p.post_subject, p.post_time, p.poster_id, p.post_username, u.user_id, u.username, u.user_colour
-					FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
-					WHERE p.poster_id = u.user_id
-						AND p.post_id = ' . (int) $row['last_post_id'];
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				// salvation, a post is found! jam it into the forums table
-				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_id = ' . (int) $row['post_id'];
-				$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_post_subject = '" . phpbb::$db->sql_escape($row['post_subject']) . "'";
-				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_time = ' . (int) $row['post_time'];
-				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_poster_id = ' . (int) $row['poster_id'];
-				$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_name = '" . phpbb::$db->sql_escape(($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username']) . "'";
-				$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_colour = '" . phpbb::$db->sql_escape($row['user_colour']) . "'";
-			}
-			else
-			{
-				// just our luck, the last topic in the forum has just been globalized...
-				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_id = 0';
-				$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_post_subject = ''";
-				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_time = 0';
-				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_poster_id = 0';
-				$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_name = ''";
-				$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_colour = ''";
-			}
-		}
-		else if ($topic_row['topic_type'] == POST_GLOBAL && $topic_type != POST_GLOBAL && $forum_row['forum_last_post_id'] < $topic_row['topic_last_post_id'])
-		{
-			// this post has a higher id, it is newer
-			$sql = 'SELECT p.post_id, p.post_subject, p.post_time, p.poster_id, p.post_username, u.user_id, u.username, u.user_colour
-				FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
-				WHERE p.poster_id = u.user_id
-					AND p.post_id = ' . (int) $topic_row['topic_last_post_id'];
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			// salvation, a post is found! jam it into the forums table
-			$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_id = ' . (int) $row['post_id'];
-			$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_post_subject = '" . phpbb::$db->sql_escape($row['post_subject']) . "'";
-			$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_time = ' . (int) $row['post_time'];
-			$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_poster_id = ' . (int) $row['poster_id'];
-			$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_name = '" . phpbb::$db->sql_escape(($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username']) . "'";
-			$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_colour = '" . phpbb::$db->sql_escape($row['user_colour']) . "'";
-		}
-	}
-
-	// topic sync time!
-	// simply, we update if it is a reply or the last post is edited
-	if ($post_approved)
-	{
-		// reply requires the whole thing
-		if ($post_mode == 'reply')
-		{
-			$sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_post_id = ' . (int) $data['post_id'];
-			$sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_poster_id = ' . (int) phpbb::$user->data['user_id'];
-			$sql_data[TOPICS_TABLE]['stat'][] = "topic_last_poster_name = '" . phpbb::$db->sql_escape((!phpbb::$user->is_registered && $username) ? $username : ((!phpbb::$user->is_guest) ? phpbb::$user->data['username'] : '')) . "'";
-			$sql_data[TOPICS_TABLE]['stat'][] = "topic_last_poster_colour = '" . ((!phpbb::$user->is_guest) ? phpbb::$db->sql_escape(phpbb::$user->data['user_colour']) : '') . "'";
-			$sql_data[TOPICS_TABLE]['stat'][] = "topic_last_post_subject = '" . phpbb::$db->sql_escape($subject) . "'";
-			$sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_post_time = ' . (int) $current_time;
-		}
-		else if ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || ($post_mode == 'edit_first_post' && !$data['topic_replies']))
-		{
-			// only the subject can be changed from edit
-			$sql_data[TOPICS_TABLE]['stat'][] = "topic_last_post_subject = '" . phpbb::$db->sql_escape($subject) . "'";
-
-			// Maybe not only the subject, but also changing anonymous usernames. ;)
-			if ($data['poster_id'] == ANONYMOUS)
-			{
-				$sql_data[TOPICS_TABLE]['stat'][] = "topic_last_poster_name = '" . phpbb::$db->sql_escape($username) . "'";
-			}
-		}
-	}
-	else if (!$data['post_approved'] && ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || ($post_mode == 'edit_first_post' && !$data['topic_replies'])))
-	{
-		// like having the rug pulled from under us
-		$sql = 'SELECT MAX(post_id) as last_post_id
-			FROM ' . POSTS_TABLE . '
-			WHERE topic_id = ' . (int) $data['topic_id'] . '
-				AND post_approved = 1';
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		// any posts left in this forum?
-		if (!empty($row['last_post_id']))
-		{
-			$sql = 'SELECT p.post_id, p.post_subject, p.post_time, p.poster_id, p.post_username, u.user_id, u.username, u.user_colour
-				FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
-				WHERE p.poster_id = u.user_id
-					AND p.post_id = ' . (int) $row['last_post_id'];
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			// salvation, a post is found! jam it into the topics table
-			$sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_post_id = ' . (int) $row['post_id'];
-			$sql_data[TOPICS_TABLE]['stat'][] = "topic_last_post_subject = '" . phpbb::$db->sql_escape($row['post_subject']) . "'";
-			$sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_post_time = ' . (int) $row['post_time'];
-			$sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_poster_id = ' . (int) $row['poster_id'];
-			$sql_data[TOPICS_TABLE]['stat'][] = "topic_last_poster_name = '" . phpbb::$db->sql_escape(($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username']) . "'";
-			$sql_data[TOPICS_TABLE]['stat'][] = "topic_last_poster_colour = '" . phpbb::$db->sql_escape($row['user_colour']) . "'";
-		}
-	}
-
-	// Update total post count, do not consider moderated posts/topics
-	if ($post_approval)
-	{
-		if ($post_mode == 'post')
-		{
-			set_config_count('num_topics', 1, true);
-			set_config_count('num_posts', 1, true);
-		}
-
-		if ($post_mode == 'reply')
-		{
-			set_config_count('num_posts', 1, true);
-		}
-	}
-
-	// Update forum stats
-	$where_sql = array(POSTS_TABLE => 'post_id = ' . $data['post_id'], TOPICS_TABLE => 'topic_id = ' . $data['topic_id'], FORUMS_TABLE => 'forum_id = ' . $data['forum_id'], USERS_TABLE => 'user_id = ' . $poster_id);
-
-	foreach ($sql_data as $table => $update_ary)
-	{
-		if (isset($update_ary['stat']) && implode('', $update_ary['stat']))
-		{
-			$sql = "UPDATE $table SET " . implode(', ', $update_ary['stat']) . ' WHERE ' . $where_sql[$table];
-			phpbb::$db->sql_query($sql);
-		}
-	}
-
-	// Delete topic shadows (if any exist). We do not need a shadow topic for an global announcement
-	if ($make_global)
-	{
-		$sql = 'DELETE FROM ' . TOPICS_TABLE . '
-			WHERE topic_moved_id = ' . $data['topic_id'];
-		phpbb::$db->sql_query($sql);
-	}
-
-	// Committing the transaction before updating search index
-	phpbb::$db->sql_transaction('commit');
-
-	// Delete draft if post was loaded...
-	$draft_id = request_var('draft_loaded', 0);
-	if ($draft_id)
-	{
-		$sql = 'DELETE FROM ' . DRAFTS_TABLE . "
-			WHERE draft_id = $draft_id
-				AND user_id = " . phpbb::$user->data['user_id'];
-		phpbb::$db->sql_query($sql);
-	}
-
-	// Index message contents
-	if ($update_message && $data['enable_indexing'])
-	{
-		// Select the search method and do some additional checks to ensure it can actually be utilised
-		$search_type = basename(phpbb::$config['search_type']);
-
-		if (!file_exists(PHPBB_ROOT_PATH . 'includes/search/' . $search_type . '.' . PHP_EXT))
-		{
-			trigger_error('NO_SUCH_SEARCH_MODULE');
-		}
-
-		if (!class_exists($search_type))
-		{
-			include(PHPBB_ROOT_PATH . "includes/search/$search_type." . PHP_EXT);
-		}
-
-		$error = false;
-		$search = new $search_type($error);
-
-		if ($error)
-		{
-			trigger_error($error);
-		}
-
-		$search->index($mode, $data['post_id'], $data['message'], $subject, $poster_id, ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id']);
-	}
-
-	// Topic Notification, do not change if moderator is changing other users posts...
-	if (phpbb::$user->data['user_id'] == $poster_id)
-	{
-		if (!$data['notify_set'] && $data['notify'])
-		{
-			$sql = 'INSERT INTO ' . TOPICS_WATCH_TABLE . ' (user_id, topic_id)
-				VALUES (' . phpbb::$user->data['user_id'] . ', ' . $data['topic_id'] . ')';
-			phpbb::$db->sql_query($sql);
-		}
-		else if ($data['notify_set'] && !$data['notify'])
-		{
-			$sql = 'DELETE FROM ' . TOPICS_WATCH_TABLE . '
-				WHERE user_id = ' . phpbb::$user->data['user_id'] . '
-					AND topic_id = ' . $data['topic_id'];
-			phpbb::$db->sql_query($sql);
-		}
-	}
-
-	if ($mode == 'post' || $mode == 'reply' || $mode == 'quote')
-	{
-		// Mark this topic as posted to
-		markread('post', $data['forum_id'], $data['topic_id'], $data['post_time']);
-	}
-
-	// Mark this topic as read
-	// We do not use post_time here, this is intended (post_time can have a date in the past if editing a message)
-	markread('topic', $data['forum_id'], $data['topic_id'], time());
-
-	//
-	if (phpbb::$config['load_db_lastread'] && phpbb::$user->is_registered)
-	{
-		$sql = 'SELECT mark_time
-			FROM ' . FORUMS_TRACK_TABLE . '
-			WHERE user_id = ' . phpbb::$user->data['user_id'] . '
-				AND forum_id = ' . $data['forum_id'];
-		$result = phpbb::$db->sql_query($sql);
-		$f_mark_time = (int) phpbb::$db->sql_fetchfield('mark_time');
-		phpbb::$db->sql_freeresult($result);
-	}
-	else if (phpbb::$config['load_anon_lastread'] || phpbb::$user->is_registered)
-	{
-		$f_mark_time = false;
-	}
-
-	if ((phpbb::$config['load_db_lastread'] && phpbb::$user->is_registered) || phpbb::$config['load_anon_lastread'] || phpbb::$user->is_registered)
-	{
-		// Update forum info
-		$sql = 'SELECT forum_last_post_time
-			FROM ' . FORUMS_TABLE . '
-			WHERE forum_id = ' . $data['forum_id'];
-		$result = phpbb::$db->sql_query($sql);
-		$forum_last_post_time = (int) phpbb::$db->sql_fetchfield('forum_last_post_time');
-		phpbb::$db->sql_freeresult($result);
-
-		update_forum_tracking_info($data['forum_id'], $forum_last_post_time, $f_mark_time, false);
-	}
-
-	// Send Notifications
-	if ($mode != 'edit' && $mode != 'delete' && $post_approval)
-	{
-		user_notification($mode, $subject, $data['topic_title'], $data['forum_name'], $data['forum_id'], $data['topic_id'], $data['post_id']);
-	}
-
-	$params = $add_anchor = '';
-
-	if ($post_approval)
-	{
-		$params .= '&amp;t=' . $data['topic_id'];
-
-		if ($mode != 'post')
-		{
-			$params .= '&amp;p=' . $data['post_id'];
-			$add_anchor = '#p' . $data['post_id'];
-		}
-	}
-	else if ($mode != 'post' && $post_mode != 'edit_first_post' && $post_mode != 'edit_topic')
-	{
-		$params .= '&amp;t=' . $data['topic_id'];
-	}
-
-	$url = (!$params) ? 'viewforum' : 'viewtopic';
-	$url = append_sid($url, 'f=' . $data['forum_id'] . $params) . $add_anchor;
-
-	return $url;
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
deleted file mode 100644
index 90060519db..0000000000
--- a/phpBB/includes/functions_privmsgs.php
+++ /dev/null
@@ -1,1832 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/*
-	Ability to simply add own rules by doing three things:
-		1) Add an appropriate constant
-		2) Add a new check array to the global_privmsgs_rules variable and the condition array (if one is required)
-		3) Add a new language variable to ucp.php
-
-		The user is then able to select the new rule. It will be checked against and handled as specified.
-		To add new actions (yes, checks can be added here too) to the rule management, the core code has to be modified.
-*/
-
-define('RULE_IS_LIKE', 1);		// Is Like
-define('RULE_IS_NOT_LIKE', 2);	// Is Not Like
-define('RULE_IS', 3);			// Is
-define('RULE_IS_NOT', 4);		// Is Not
-define('RULE_BEGINS_WITH', 5);	// Begins with
-define('RULE_ENDS_WITH', 6);	// Ends with
-define('RULE_IS_FRIEND', 7);	// Is Friend
-define('RULE_IS_FOE', 8);		// Is Foe
-define('RULE_IS_USER', 9);		// Is User
-define('RULE_IS_GROUP', 10);	// Is In Usergroup
-define('RULE_ANSWERED', 11);	// Answered
-define('RULE_FORWARDED', 12);	// Forwarded
-define('RULE_TO_GROUP', 14);	// Usergroup
-define('RULE_TO_ME', 15);		// Me
-
-define('ACTION_PLACE_INTO_FOLDER', 1);
-define('ACTION_MARK_AS_READ', 2);
-define('ACTION_MARK_AS_IMPORTANT', 3);
-define('ACTION_DELETE_MESSAGE', 4);
-
-define('CHECK_SUBJECT', 1);
-define('CHECK_SENDER', 2);
-define('CHECK_MESSAGE', 3);
-define('CHECK_STATUS', 4);
-define('CHECK_TO', 5);
-
-/**
-* Global private message rules
-* These rules define what to do if a rule is hit
-*/
-$global_privmsgs_rules = array(
-	CHECK_SUBJECT	=> array(
-		RULE_IS_LIKE		=> array('check0' => 'message_subject', 'function' => 'preg_match("/" . preg_quote({STRING}, "/") . "/i", {CHECK0})'),
-		RULE_IS_NOT_LIKE	=> array('check0' => 'message_subject', 'function' => '!(preg_match("/" . preg_quote({STRING}, "/") . "/i", {CHECK0}))'),
-		RULE_IS				=> array('check0' => 'message_subject', 'function' => '{CHECK0} == {STRING}'),
-		RULE_IS_NOT			=> array('check0' => 'message_subject', 'function' => '{CHECK0} != {STRING}'),
-		RULE_BEGINS_WITH	=> array('check0' => 'message_subject', 'function' => 'preg_match("/^" . preg_quote({STRING}, "/") . "/i", {CHECK0})'),
-		RULE_ENDS_WITH		=> array('check0' => 'message_subject', 'function' => 'preg_match("/" . preg_quote({STRING}, "/") . "$/i", {CHECK0})'),
-	),
-
-	CHECK_SENDER	=> array(
-		RULE_IS_LIKE		=> array('check0' => 'username', 'function' => 'preg_match("/" . preg_quote({STRING}, "/") . "/i", {CHECK0})'),
-		RULE_IS_NOT_LIKE	=> array('check0' => 'username', 'function' => '!(preg_match("/" . preg_quote({STRING}, "/") . "/i", {CHECK0}))'),
-		RULE_IS				=> array('check0' => 'username', 'function' => '{CHECK0} == {STRING}'),
-		RULE_IS_NOT			=> array('check0' => 'username', 'function' => '{CHECK0} != {STRING}'),
-		RULE_BEGINS_WITH	=> array('check0' => 'username', 'function' => 'preg_match("/^" . preg_quote({STRING}, "/") . "/i", {CHECK0})'),
-		RULE_ENDS_WITH		=> array('check0' => 'username', 'function' => 'preg_match("/" . preg_quote({STRING}, "/") . "$/i", {CHECK0})'),
-		RULE_IS_FRIEND		=> array('check0' => 'friend', 'function' => '{CHECK0} == 1'),
-		RULE_IS_FOE			=> array('check0' => 'foe', 'function' => '{CHECK0} == 1'),
-		RULE_IS_USER		=> array('check0' => 'author_id', 'function' => '{CHECK0} == {USER_ID}'),
-		RULE_IS_GROUP		=> array('check0' => 'author_in_group', 'function' => 'in_array({GROUP_ID}, {CHECK0})'),
-	),
-
-	CHECK_MESSAGE	=> array(
-		RULE_IS_LIKE		=> array('check0' => 'message_text', 'function' => 'preg_match("/" . preg_quote({STRING}, "/") . "/i", {CHECK0})'),
-		RULE_IS_NOT_LIKE	=> array('check0' => 'message_text', 'function' => '!(preg_match("/" . preg_quote({STRING}, "/") . "/i", {CHECK0}))'),
-		RULE_IS				=> array('check0' => 'message_text', 'function' => '{CHECK0} == {STRING}'),
-		RULE_IS_NOT			=> array('check0' => 'message_text', 'function' => '{CHECK0} != {STRING}'),
-	),
-
-	CHECK_STATUS	=> array(
-		RULE_ANSWERED		=> array('check0' => 'pm_replied', 'function' => '{CHECK0} == 1'),
-		RULE_FORWARDED		=> array('check0' => 'pm_forwarded', 'function' => '{CHECK0} == 1'),
-	),
-
-	CHECK_TO		=> array(
-		RULE_TO_GROUP		=> array('check0' => 'to', 'check1' => 'bcc', 'check2' => 'user_in_group', 'function' => 'in_array("g_" . {CHECK2}, {CHECK0}) || in_array("g_" . {CHECK2}, {CHECK1})'),
-		RULE_TO_ME			=> array('check0' => 'to', 'check1' => 'bcc', 'function' => 'in_array("u_" . $user_id, {CHECK0}) || in_array("u_" . $user_id, {CHECK1})'),
-	)
-);
-
-/**
-* This is for defining which condition fields to show for which Rule
-*/
-$global_rule_conditions = array(
-	RULE_IS_LIKE		=> 'text',
-	RULE_IS_NOT_LIKE	=> 'text',
-	RULE_IS				=> 'text',
-	RULE_IS_NOT			=> 'text',
-	RULE_BEGINS_WITH	=> 'text',
-	RULE_ENDS_WITH		=> 'text',
-	RULE_IS_USER		=> 'user',
-	RULE_IS_GROUP		=> 'group'
-);
-
-/**
-* Get all folder
-*/
-function get_folder($user_id, $folder_id = false)
-{
-	$folder = array();
-
-	// Get folder information
-	$sql = 'SELECT folder_id, COUNT(msg_id) as num_messages, SUM(pm_unread) as num_unread
-		FROM ' . PRIVMSGS_TO_TABLE . "
-		WHERE user_id = $user_id
-			AND folder_id <> " . PRIVMSGS_NO_BOX . '
-		GROUP BY folder_id';
-	$result = phpbb::$db->sql_query($sql);
-
-	$num_messages = $num_unread = array();
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$num_messages[(int) $row['folder_id']] = $row['num_messages'];
-		$num_unread[(int) $row['folder_id']] = $row['num_unread'];
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	// Make sure the default boxes are defined
-	$available_folder = array(PRIVMSGS_INBOX, PRIVMSGS_OUTBOX, PRIVMSGS_SENTBOX);
-
-	foreach ($available_folder as $default_folder)
-	{
-		if (!isset($num_messages[$default_folder]))
-		{
-			$num_messages[$default_folder] = 0;
-		}
-
-		if (!isset($num_unread[$default_folder]))
-		{
-			$num_unread[$default_folder] = 0;
-		}
-	}
-
-	// Adjust unread status for outbox
-	$num_unread[PRIVMSGS_OUTBOX] = $num_messages[PRIVMSGS_OUTBOX];
-
-	$folder[PRIVMSGS_INBOX] = array(
-		'folder_name'		=> phpbb::$user->lang['PM_INBOX'],
-		'num_messages'		=> $num_messages[PRIVMSGS_INBOX],
-		'unread_messages'	=> $num_unread[PRIVMSGS_INBOX]
-	);
-
-	// Custom Folder
-	$sql = 'SELECT folder_id, folder_name, pm_count
-		FROM ' . PRIVMSGS_FOLDER_TABLE . "
-			WHERE user_id = $user_id";
-	$result = phpbb::$db->sql_query($sql);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$folder[$row['folder_id']] = array(
-			'folder_name'		=> $row['folder_name'],
-			'num_messages'		=> $row['pm_count'],
-			'unread_messages'	=> ((isset($num_unread[$row['folder_id']])) ? $num_unread[$row['folder_id']] : 0)
-		);
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	$folder[PRIVMSGS_OUTBOX] = array(
-		'folder_name'		=> phpbb::$user->lang['PM_OUTBOX'],
-		'num_messages'		=> $num_messages[PRIVMSGS_OUTBOX],
-		'unread_messages'	=> $num_unread[PRIVMSGS_OUTBOX]
-	);
-
-	$folder[PRIVMSGS_SENTBOX] = array(
-		'folder_name'		=> phpbb::$user->lang['PM_SENTBOX'],
-		'num_messages'		=> $num_messages[PRIVMSGS_SENTBOX],
-		'unread_messages'	=> $num_unread[PRIVMSGS_SENTBOX]
-	);
-
-	// Define Folder Array for template designers (and for making custom folders usable by the template too)
-	foreach ($folder as $f_id => $folder_ary)
-	{
-		$folder_id_name = ($f_id == PRIVMSGS_INBOX) ? 'inbox' : (($f_id == PRIVMSGS_OUTBOX) ? 'outbox' : 'sentbox');
-
-		phpbb::$template->assign_block_vars('folder', array(
-			'FOLDER_ID'			=> $f_id,
-			'FOLDER_NAME'		=> $folder_ary['folder_name'],
-			'NUM_MESSAGES'		=> $folder_ary['num_messages'],
-			'UNREAD_MESSAGES'	=> $folder_ary['unread_messages'],
-
-			'U_FOLDER'			=> ($f_id > 0) ? append_sid('ucp', 'i=pm&amp;folder=' . $f_id) : append_sid('ucp', 'i=pm&amp;folder=' . $folder_id_name),
-
-			'S_CUR_FOLDER'		=> ($f_id === $folder_id) ? true : false,
-			'S_UNREAD_MESSAGES'	=> ($folder_ary['unread_messages']) ? true : false,
-			'S_CUSTOM_FOLDER'	=> ($f_id > 0) ? true : false,
-		));
-	}
-
-	if ($folder_id !== false && !isset($folder[$folder_id]))
-	{
-		trigger_error('UNKNOWN_FOLDER');
-	}
-
-	return $folder;
-}
-
-/**
-* Delete Messages From Sentbox
-* we are doing this here because this saves us a bunch of checks and queries
-*/
-function clean_sentbox($num_sentbox_messages)
-{
-	// Check Message Limit
-	if (phpbb::$user->data['message_limit'] && $num_sentbox_messages > phpbb::$user->data['message_limit'])
-	{
-		// Delete old messages
-		$sql = 'SELECT t.msg_id
-			FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p
-			WHERE t.msg_id = p.msg_id
-				AND t.user_id = ' . phpbb::$user->data['user_id'] . '
-				AND t.folder_id = ' . PRIVMSGS_SENTBOX . '
-			ORDER BY p.message_time ASC';
-		$result = phpbb::$db->sql_query_limit($sql, ($num_sentbox_messages - phpbb::$user->data['message_limit']));
-
-		$delete_ids = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$delete_ids[] = $row['msg_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-		delete_pm(phpbb::$user->data['user_id'], $delete_ids, PRIVMSGS_SENTBOX);
-	}
-}
-
-/**
-* Check Rule against Message Information
-*/
-function check_rule(&$rules, &$rule_row, &$message_row, $user_id)
-{
-	if (!isset($rules[$rule_row['rule_check']][$rule_row['rule_connection']]))
-	{
-		return false;
-	}
-
-	$check_ary = $rules[$rule_row['rule_check']][$rule_row['rule_connection']];
-
-	// Replace Check Literals
-	$evaluate = $check_ary['function'];
-	$evaluate = preg_replace('/{(CHECK[0-9])}/', '$message_row[$check_ary[strtolower("\1")]]', $evaluate);
-
-	// Replace Rule Literals
-	$evaluate = preg_replace('/{(STRING|USER_ID|GROUP_ID)}/', '$rule_row["rule_" . strtolower("\1")]', $evaluate);
-
-	// Evil Statement
-	$result = false;
-	eval('$result = (' . $evaluate . ') ? true : false;');
-
-	if (!$result)
-	{
-		return false;
-	}
-
-	switch ($rule_row['rule_action'])
-	{
-		case ACTION_PLACE_INTO_FOLDER:
-			return array('action' => $rule_row['rule_action'], 'folder_id' => $rule_row['rule_folder_id']);
-		break;
-
-		case ACTION_MARK_AS_READ:
-		case ACTION_MARK_AS_IMPORTANT:
-			return array('action' => $rule_row['rule_action'], 'pm_unread' => $message_row['pm_unread'], 'pm_marked' => $message_row['pm_marked']);
-		break;
-
-		case ACTION_DELETE_MESSAGE:
-			// Check for admins/mods - users are not allowed to remove those messages...
-			// We do the check here to make sure the data we use is consistent
-			$sql = 'SELECT user_id, user_type, user_permissions
-				FROM ' . USERS_TABLE . '
-				WHERE user_id = ' . (int) $message_row['author_id'];
-			$result = phpbb::$db->sql_query($sql);
-			$userdata = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			$auth2 = new auth();
-			$auth2->acl($userdata);
-
-			if (!$auth2->acl_get('a_') && !$auth2->acl_get('m_') && !$auth2->acl_getf_global('m_'))
-			{
-				return array('action' => $rule_row['rule_action'], 'pm_unread' => $message_row['pm_unread'], 'pm_marked' => $message_row['pm_marked']);
-			}
-
-			return false;
-		break;
-
-		default:
-			return false;
-	}
-
-	return false;
-}
-
-/**
-* Update user PM count
-*/
-function update_pm_counts()
-{
-	// Update unread count
-	$sql = 'SELECT COUNT(msg_id) as num_messages
-		FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE pm_unread = 1
-			AND folder_id <> ' . PRIVMSGS_OUTBOX . '
-			AND user_id = ' . phpbb::$user->data['user_id'];
-	$result = phpbb::$db->sql_query($sql);
-	phpbb::$user->data['user_unread_privmsg'] = (int) phpbb::$db->sql_fetchfield('num_messages');
-	phpbb::$db->sql_freeresult($result);
-
-	// Update new pm count
-	$sql = 'SELECT COUNT(msg_id) as num_messages
-		FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE pm_new = 1
-			AND folder_id IN (' . PRIVMSGS_NO_BOX . ', ' . PRIVMSGS_HOLD_BOX . ')
-			AND user_id = ' . phpbb::$user->data['user_id'];
-	$result = phpbb::$db->sql_query($sql);
-	phpbb::$user->data['user_new_privmsg'] = (int) phpbb::$db->sql_fetchfield('num_messages');
-	phpbb::$db->sql_freeresult($result);
-
-	phpbb::$db->sql_query('UPDATE ' . USERS_TABLE . ' SET ' . phpbb::$db->sql_build_array('UPDATE', array(
-		'user_unread_privmsg'	=> (int) phpbb::$user->data['user_unread_privmsg'],
-		'user_new_privmsg'		=> (int) phpbb::$user->data['user_new_privmsg'],
-	)) . ' WHERE user_id = ' . phpbb::$user->data['user_id']);
-
-	// Ok, here we need to repair something, other boxes than privmsgs_no_box and privmsgs_hold_box should not carry the pm_new flag.
-	if (!phpbb::$user->data['user_new_privmsg'])
-	{
-		$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . '
-			SET pm_new = 0
-			WHERE pm_new = 1
-				AND folder_id NOT IN (' . PRIVMSGS_NO_BOX . ', ' . PRIVMSGS_HOLD_BOX . ')
-				AND user_id = ' . phpbb::$user->data['user_id'];
-		phpbb::$db->sql_query($sql);
-	}
-}
-
-/**
-* Place new messages into appropriate folder
-*/
-function place_pm_into_folder(&$global_privmsgs_rules, $release = false)
-{
-	if (!phpbb::$user->data['user_new_privmsg'])
-	{
-		return array('not_moved' => 0, 'removed' => 0);
-	}
-
-	$user_message_rules = (int) phpbb::$user->data['user_message_rules'];
-	$user_id = (int) phpbb::$user->data['user_id'];
-
-	$action_ary = $move_into_folder = array();
-	$num_removed = 0;
-
-	// Newly processing on-hold messages
-	if ($release)
-	{
-		$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . '
-			SET folder_id = ' . PRIVMSGS_NO_BOX . '
-			WHERE folder_id = ' . PRIVMSGS_HOLD_BOX . "
-				AND user_id = $user_id";
-		phpbb::$db->sql_query($sql);
-	}
-
-	// Get those messages not yet placed into any box
-	$retrieve_sql = 'SELECT t.*, p.*, u.username, u.user_id, u.group_id
-		FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p, ' . USERS_TABLE . " u
-		WHERE t.user_id = $user_id
-			AND p.author_id = u.user_id
-			AND t.folder_id = " . PRIVMSGS_NO_BOX . '
-			AND t.msg_id = p.msg_id';
-
-	// Just place into the appropriate arrays if no rules need to be checked
-	if (!$user_message_rules)
-	{
-		$result = phpbb::$db->sql_query($retrieve_sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$action_ary[$row['msg_id']][] = array('action' => false);
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-	else
-	{
-		$user_rules = $zebra = $check_rows = array();
-		$user_ids = $memberships = array();
-
-		// First of all, grab all rules and retrieve friends/foes
-		$sql = 'SELECT *
-			FROM ' . PRIVMSGS_RULES_TABLE . "
-			WHERE user_id = $user_id";
-		$result = phpbb::$db->sql_query($sql);
-		$user_rules = phpbb::$db->sql_fetchrowset($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (sizeof($user_rules))
-		{
-			$sql = 'SELECT zebra_id, friend, foe
-				FROM ' . ZEBRA_TABLE . "
-				WHERE user_id = $user_id";
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$zebra[$row['zebra_id']] = $row;
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		// Now build a bare-bone check_row array
-		$result = phpbb::$db->sql_query($retrieve_sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$check_rows[] = array_merge($row, array(
-				'to'				=> explode(':', $row['to_address']),
-				'bcc'				=> explode(':', $row['bcc_address']),
-				'friend'			=> (isset($zebra[$row['author_id']])) ? $zebra[$row['author_id']]['friend'] : 0,
-				'foe'				=> (isset($zebra[$row['author_id']])) ? $zebra[$row['author_id']]['foe'] : 0,
-				'user_in_group'		=> array(phpbb::$user->data['group_id']),
-				'author_in_group'	=> array())
-			);
-
-			$user_ids[] = $row['user_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// Retrieve user memberships
-		if (sizeof($user_ids))
-		{
-			$sql = 'SELECT *
-				FROM ' . USER_GROUP_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('user_id', $user_ids) . '
-					AND user_pending = 0';
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$memberships[$row['user_id']][] = $row['group_id'];
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		// Now place into the appropriate folder
-		foreach ($check_rows as $row)
-		{
-			// Add membership if set
-			if (isset($memberships[$row['author_id']]))
-			{
-				$row['author_in_group'] = $memberships[$row['user_id']];
-			}
-
-			// Check Rule - this should be very quick since we have all information we need
-			$is_match = false;
-			foreach ($user_rules as $rule_row)
-			{
-				if (($action = check_rule($global_privmsgs_rules, $rule_row, $row, $user_id)) !== false)
-				{
-					$is_match = true;
-					$action_ary[$row['msg_id']][] = $action;
-				}
-			}
-
-			if (!$is_match)
-			{
-				$action_ary[$row['msg_id']][] = array('action' => false);
-			}
-		}
-
-		unset($user_rules, $zebra, $check_rows, $user_ids, $memberships);
-	}
-
-	// We place actions into arrays, to save queries.
-	$sql = $unread_ids = $delete_ids = $important_ids = array();
-
-	foreach ($action_ary as $msg_id => $msg_ary)
-	{
-		// It is allowed to execute actions more than once, except placing messages into folder
-		$folder_action = $message_removed = false;
-
-		foreach ($msg_ary as $pos => $rule_ary)
-		{
-			if ($folder_action && $rule_ary['action'] == ACTION_PLACE_INTO_FOLDER)
-			{
-				continue;
-			}
-
-			switch ($rule_ary['action'])
-			{
-				case ACTION_PLACE_INTO_FOLDER:
-					// Folder actions have precedence, so we will remove any other ones
-					$folder_action = true;
-					$move_into_folder[(int) $rule_ary['folder_id']][] = $msg_id;
-				break;
-
-				case ACTION_MARK_AS_READ:
-					if ($rule_ary['pm_unread'])
-					{
-						$unread_ids[] = $msg_id;
-					}
-				break;
-
-				case ACTION_DELETE_MESSAGE:
-					$delete_ids[] = $msg_id;
-					$message_removed = true;
-				break;
-
-				case ACTION_MARK_AS_IMPORTANT:
-					if (!$rule_ary['pm_marked'])
-					{
-						$important_ids[] = $msg_id;
-					}
-				break;
-			}
-		}
-
-		// We place this here because it could happen that the messages are doubled if a rule marks a message and then moves it into a specific
-		// folder. Here we simply move the message into the INBOX if it gets not removed and also not put into a custom folder.
-		if (!$folder_action && !$message_removed)
-		{
-			$move_into_folder[PRIVMSGS_INBOX][] = $msg_id;
-		}
-	}
-
-	// Do not change the order of processing
-	// The number of queries needed to be executed here highly depends on the defined rules and are
-	// only gone through if new messages arrive.
-
-	// Delete messages
-	if (sizeof($delete_ids))
-	{
-		$num_removed += sizeof($delete_ids);
-		delete_pm($user_id, $delete_ids, PRIVMSGS_NO_BOX);
-	}
-
-	// Set messages to Unread
-	if (sizeof($unread_ids))
-	{
-		$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . '
-			SET pm_unread = 0
-			WHERE ' . phpbb::$db->sql_in_set('msg_id', $unread_ids) . "
-				AND user_id = $user_id
-				AND folder_id = " . PRIVMSGS_NO_BOX;
-		phpbb::$db->sql_query($sql);
-	}
-
-	// mark messages as important
-	if (sizeof($important_ids))
-	{
-		$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . '
-			SET pm_marked = 1 - pm_marked
-			WHERE folder_id = ' . PRIVMSGS_NO_BOX . "
-				AND user_id = $user_id
-				AND " . phpbb::$db->sql_in_set('msg_id', $important_ids);
-		phpbb::$db->sql_query($sql);
-	}
-
-	// Move into folder
-	$folder = array();
-
-	if (sizeof($move_into_folder))
-	{
-		// Determine Full Folder Action - we need the move to folder id later eventually
-		$full_folder_action = (phpbb::$user->data['user_full_folder'] == FULL_FOLDER_NONE) ? (phpbb::$config['full_folder_action'] - (FULL_FOLDER_NONE*(-1))) : phpbb::$user->data['user_full_folder'];
-
-		$sql_folder = array_keys($move_into_folder);
-		if ($full_folder_action >= 0)
-		{
-			$sql_folder[] = $full_folder_action;
-		}
-
-		$sql = 'SELECT folder_id, pm_count
-			FROM ' . PRIVMSGS_FOLDER_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('folder_id', $sql_folder) . "
-				AND user_id = $user_id";
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$folder[(int) $row['folder_id']] = (int) $row['pm_count'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		unset($sql_folder);
-
-		if (isset($move_into_folder[PRIVMSGS_INBOX]))
-		{
-			$sql = 'SELECT COUNT(msg_id) as num_messages
-				FROM ' . PRIVMSGS_TO_TABLE . "
-				WHERE user_id = $user_id
-					AND folder_id = " . PRIVMSGS_INBOX;
-			$result = phpbb::$db->sql_query($sql);
-			$folder[PRIVMSGS_INBOX] = (int) phpbb::$db->sql_fetchfield('num_messages');
-			phpbb::$db->sql_freeresult($result);
-		}
-	}
-
-	// Here we have ideally only one folder to move into
-	foreach ($move_into_folder as $folder_id => $msg_ary)
-	{
-		$dest_folder = $folder_id;
-		$full_folder_action = FULL_FOLDER_NONE;
-
-		// Check Message Limit - we calculate with the complete array, most of the time it is one message
-		// But we are making sure that the other way around works too (more messages in queue than allowed to be stored)
-		if (phpbb::$user->data['message_limit'] && $folder[$folder_id] && ($folder[$folder_id] + sizeof($msg_ary)) > phpbb::$user->data['message_limit'])
-		{
-			$full_folder_action = (phpbb::$user->data['user_full_folder'] == FULL_FOLDER_NONE) ? (phpbb::$config['full_folder_action'] - (FULL_FOLDER_NONE*(-1))) : phpbb::$user->data['user_full_folder'];
-
-			// If destination folder itself is full...
-			if ($full_folder_action >= 0 && ($folder[$full_folder_action] + sizeof($msg_ary)) > phpbb::$user->data['message_limit'])
-			{
-				$full_folder_action = phpbb::$config['full_folder_action'] - (FULL_FOLDER_NONE*(-1));
-			}
-
-			// If Full Folder Action is to move to another folder, we simply adjust the destination folder
-			if ($full_folder_action >= 0)
-			{
-				$dest_folder = $full_folder_action;
-			}
-			else if ($full_folder_action == FULL_FOLDER_DELETE)
-			{
-				// Delete some messages. NOTE: Ordered by msg_id here instead of message_time!
-				$sql = 'SELECT msg_id
-					FROM ' . PRIVMSGS_TO_TABLE . "
-					WHERE user_id = $user_id
-						AND folder_id = $dest_folder
-					ORDER BY msg_id ASC";
-				$result = phpbb::$db->sql_query_limit($sql, (($folder[$dest_folder] + sizeof($msg_ary)) - phpbb::$user->data['message_limit']));
-
-				$delete_ids = array();
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$delete_ids[] = $row['msg_id'];
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				$num_removed += sizeof($delete_ids);
-				delete_pm($user_id, $delete_ids, $dest_folder);
-			}
-		}
-
-		//
-		if ($full_folder_action == FULL_FOLDER_HOLD)
-		{
-			$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . '
-				SET folder_id = ' . PRIVMSGS_HOLD_BOX . '
-				WHERE folder_id = ' . PRIVMSGS_NO_BOX . "
-					AND user_id = $user_id
-					AND " . phpbb::$db->sql_in_set('msg_id', $msg_ary);
-			phpbb::$db->sql_query($sql);
-		}
-		else
-		{
-			$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . "
-				SET folder_id = $dest_folder, pm_new = 0
-				WHERE folder_id = " . PRIVMSGS_NO_BOX . "
-					AND user_id = $user_id
-					AND pm_new = 1
-					AND " . phpbb::$db->sql_in_set('msg_id', $msg_ary);
-			phpbb::$db->sql_query($sql);
-
-			if ($dest_folder != PRIVMSGS_INBOX)
-			{
-				$sql = 'UPDATE ' . PRIVMSGS_FOLDER_TABLE . '
-					SET pm_count = pm_count + ' . (int) phpbb::$db->sql_affectedrows() . "
-					WHERE folder_id = $dest_folder
-						AND user_id = $user_id";
-				phpbb::$db->sql_query($sql);
-			}
-		}
-	}
-
-	if (sizeof($action_ary))
-	{
-		// Move from OUTBOX to SENTBOX
-		// We are not checking any full folder status here... SENTBOX is a special treatment (old messages get deleted)
-		$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . '
-			SET folder_id = ' . PRIVMSGS_SENTBOX . '
-			WHERE folder_id = ' . PRIVMSGS_OUTBOX . '
-				AND ' . phpbb::$db->sql_in_set('msg_id', array_keys($action_ary));
-		phpbb::$db->sql_query($sql);
-	}
-
-	// Update new/unread count
-	update_pm_counts();
-
-	// Now check how many messages got not moved...
-	$sql = 'SELECT COUNT(msg_id) as num_messages
-		FROM ' . PRIVMSGS_TO_TABLE . "
-		WHERE user_id = $user_id
-			AND folder_id = " . PRIVMSGS_HOLD_BOX;
-	$result = phpbb::$db->sql_query($sql);
-	$num_not_moved = (int) phpbb::$db->sql_fetchfield('num_messages');
-	phpbb::$db->sql_freeresult($result);
-
-	return array('not_moved' => $num_not_moved, 'removed' => $num_removed);
-}
-
-/**
-* Move PM from one to another folder
-*/
-function move_pm($user_id, $message_limit, $move_msg_ids, $dest_folder, $cur_folder_id)
-{
-	$num_moved = 0;
-
-	if (!is_array($move_msg_ids))
-	{
-		$move_msg_ids = array($move_msg_ids);
-	}
-
-	if (sizeof($move_msg_ids) && !in_array($dest_folder, array(PRIVMSGS_NO_BOX, PRIVMSGS_OUTBOX, PRIVMSGS_SENTBOX)) &&
-		!in_array($cur_folder_id, array(PRIVMSGS_NO_BOX, PRIVMSGS_OUTBOX)) && $cur_folder_id != $dest_folder)
-	{
-		// We have to check the destination folder ;)
-		if ($dest_folder != PRIVMSGS_INBOX)
-		{
-			$sql = 'SELECT folder_id, folder_name, pm_count
-				FROM ' . PRIVMSGS_FOLDER_TABLE . "
-				WHERE folder_id = $dest_folder
-					AND user_id = $user_id";
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$row)
-			{
-				trigger_error('NOT_AUTHORISED');
-			}
-
-			if ($message_limit && $row['pm_count'] + sizeof($move_msg_ids) > $message_limit)
-			{
-				$message = sprintf(phpbb::$user->lang['NOT_ENOUGH_SPACE_FOLDER'], $row['folder_name']) . '<br /><br />';
-				$message .= sprintf(phpbb::$user->lang['CLICK_RETURN_FOLDER'], '<a href="' . append_sid('ucp', 'i=pm&amp;folder=' . $row['folder_id']) . '">', '</a>', $row['folder_name']);
-				trigger_error($message);
-			}
-		}
-		else
-		{
-			$sql = 'SELECT COUNT(msg_id) as num_messages
-				FROM ' . PRIVMSGS_TO_TABLE . '
-				WHERE folder_id = ' . PRIVMSGS_INBOX . "
-					AND user_id = $user_id";
-			$result = phpbb::$db->sql_query($sql);
-			$num_messages = (int) phpbb::$db->sql_fetchfield('num_messages');
-			phpbb::$db->sql_freeresult($result);
-
-			if ($message_limit && $num_messages + sizeof($move_msg_ids) > $message_limit)
-			{
-				$message = sprintf(phpbb::$user->lang['NOT_ENOUGH_SPACE_FOLDER'], phpbb::$user->lang['PM_INBOX']) . '<br /><br />';
-				$message .= sprintf(phpbb::$user->lang['CLICK_RETURN_FOLDER'], '<a href="' . append_sid('ucp', 'i=pm&amp;folder=inbox') . '">', '</a>', phpbb::$user->lang['PM_INBOX']);
-				trigger_error($message);
-			}
-		}
-
-		$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . "
-			SET folder_id = $dest_folder
-			WHERE folder_id = $cur_folder_id
-				AND user_id = $user_id
-				AND " . phpbb::$db->sql_in_set('msg_id', $move_msg_ids);
-		phpbb::$db->sql_query($sql);
-		$num_moved = phpbb::$db->sql_affectedrows();
-
-		// Update pm counts
-		if ($num_moved)
-		{
-			if (!in_array($cur_folder_id, array(PRIVMSGS_INBOX, PRIVMSGS_OUTBOX, PRIVMSGS_SENTBOX)))
-			{
-				$sql = 'UPDATE ' . PRIVMSGS_FOLDER_TABLE . "
-					SET pm_count = pm_count - $num_moved
-					WHERE folder_id = $cur_folder_id
-						AND user_id = $user_id";
-				phpbb::$db->sql_query($sql);
-			}
-
-			if ($dest_folder != PRIVMSGS_INBOX)
-			{
-				$sql = 'UPDATE ' . PRIVMSGS_FOLDER_TABLE . "
-					SET pm_count = pm_count + $num_moved
-					WHERE folder_id = $dest_folder
-						AND user_id = $user_id";
-				phpbb::$db->sql_query($sql);
-			}
-		}
-	}
-	else if (in_array($cur_folder_id, array(PRIVMSGS_NO_BOX, PRIVMSGS_OUTBOX)))
-	{
-		trigger_error('CANNOT_MOVE_SPECIAL');
-	}
-
-	return $num_moved;
-}
-
-/**
-* Update unread message status
-*/
-function update_unread_status($unread, $msg_id, $user_id, $folder_id)
-{
-	if (!$unread)
-	{
-		return;
-	}
-
-	$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . "
-		SET pm_unread = 0
-		WHERE msg_id = $msg_id
-			AND user_id = $user_id
-			AND folder_id = $folder_id";
-	phpbb::$db->sql_query($sql);
-
-	$sql = 'UPDATE ' . USERS_TABLE . "
-		SET user_unread_privmsg = user_unread_privmsg - 1
-		WHERE user_id = $user_id";
-	phpbb::$db->sql_query($sql);
-
-	if (phpbb::$user->data['user_id'] == $user_id)
-	{
-		phpbb::$user->data['user_unread_privmsg']--;
-
-		// Try to cope with previous wrong conversions...
-		if (phpbb::$user->data['user_unread_privmsg'] < 0)
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . "
-				SET user_unread_privmsg = 0
-				WHERE user_id = $user_id";
-			phpbb::$db->sql_query($sql);
-
-			phpbb::$user->data['user_unread_privmsg'] = 0;
-		}
-	}
-}
-
-/**
-* Handle all actions possible with marked messages
-*/
-function handle_mark_actions($user_id, $mark_action)
-{
-	$msg_ids		= request_var('marked_msg_id', array(0));
-	$cur_folder_id	= request_var('cur_folder_id', PRIVMSGS_NO_BOX);
-	$confirm		= phpbb_request::is_set_post('confirm');
-
-	if (!sizeof($msg_ids))
-	{
-		return false;
-	}
-
-	switch ($mark_action)
-	{
-		case 'mark_important':
-
-			$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . "
-				SET pm_marked = 1 - pm_marked
-				WHERE folder_id = $cur_folder_id
-					AND user_id = $user_id
-					AND " . phpbb::$db->sql_in_set('msg_id', $msg_ids);
-			phpbb::$db->sql_query($sql);
-
-		break;
-
-		case 'delete_marked':
-
-			if (confirm_box(true))
-			{
-				delete_pm($user_id, $msg_ids, $cur_folder_id);
-
-				$success_msg = (sizeof($msg_ids) == 1) ? 'MESSAGE_DELETED' : 'MESSAGES_DELETED';
-				$redirect = append_sid('ucp', 'i=pm&amp;folder=' . $cur_folder_id);
-
-				meta_refresh(3, $redirect);
-				trigger_error(phpbb::$user->lang[$success_msg] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_FOLDER'], '<a href="' . $redirect . '">', '</a>'));
-			}
-			else
-			{
-				$s_hidden_fields = array(
-					'cur_folder_id'	=> $cur_folder_id,
-					'mark_option'	=> 'delete_marked',
-					'submit_mark'	=> true,
-					'marked_msg_id'	=> $msg_ids
-				);
-
-				confirm_box(false, 'DELETE_MARKED_PM', build_hidden_fields($s_hidden_fields));
-			}
-
-		break;
-
-		default:
-			return false;
-	}
-
-	return true;
-}
-
-/**
-* Delete PM(s)
-*/
-function delete_pm($user_id, $msg_ids, $folder_id)
-{
-	$user_id	= (int) $user_id;
-	$folder_id	= (int) $folder_id;
-
-	if (!$user_id)
-	{
-		return false;
-	}
-
-	if (!is_array($msg_ids))
-	{
-		if (!$msg_ids)
-		{
-			return false;
-		}
-		$msg_ids = array($msg_ids);
-	}
-
-	if (!sizeof($msg_ids))
-	{
-		return false;
-	}
-
-	// Get PM Information for later deleting
-	$sql = 'SELECT msg_id, pm_unread, pm_new
-		FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE ' . phpbb::$db->sql_in_set('msg_id', array_map('intval', $msg_ids)) . "
-			AND folder_id = $folder_id
-			AND user_id = $user_id";
-	$result = phpbb::$db->sql_query($sql);
-
-	$delete_rows = array();
-	$num_unread = $num_new = $num_deleted = 0;
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$num_unread += (int) $row['pm_unread'];
-		$num_new += (int) $row['pm_new'];
-
-		$delete_rows[$row['msg_id']] = 1;
-	}
-	phpbb::$db->sql_freeresult($result);
-	unset($msg_ids);
-
-	if (!sizeof($delete_rows))
-	{
-		return false;
-	}
-
-	phpbb::$db->sql_transaction('begin');
-
-	// if no one has read the message yet (meaning it is in users outbox)
-	// then mark the message as deleted...
-	if ($folder_id == PRIVMSGS_OUTBOX)
-	{
-		// Remove PM from Outbox
-		$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . "
-			WHERE user_id = $user_id AND folder_id = " . PRIVMSGS_OUTBOX . '
-				AND ' . phpbb::$db->sql_in_set('msg_id', array_keys($delete_rows));
-		phpbb::$db->sql_query($sql);
-
-		// Update PM Information for safety
-		$sql = 'UPDATE ' . PRIVMSGS_TABLE . " SET message_text = ''
-			WHERE " . phpbb::$db->sql_in_set('msg_id', array_keys($delete_rows));
-		phpbb::$db->sql_query($sql);
-
-		// Set delete flag for those intended to receive the PM
-		// We do not remove the message actually, to retain some basic information (sent time for example)
-		$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . '
-			SET pm_deleted = 1
-			WHERE ' . phpbb::$db->sql_in_set('msg_id', array_keys($delete_rows));
-		phpbb::$db->sql_query($sql);
-
-		$num_deleted = phpbb::$db->sql_affectedrows();
-	}
-	else
-	{
-		// Delete private message data
-		$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . "
-			WHERE user_id = $user_id
-				AND folder_id = $folder_id
-				AND " . phpbb::$db->sql_in_set('msg_id', array_keys($delete_rows));
-		phpbb::$db->sql_query($sql);
-		$num_deleted = phpbb::$db->sql_affectedrows();
-	}
-
-	// if folder id is user defined folder then decrease pm_count
-	if (!in_array($folder_id, array(PRIVMSGS_INBOX, PRIVMSGS_OUTBOX, PRIVMSGS_SENTBOX, PRIVMSGS_NO_BOX)))
-	{
-		$sql = 'UPDATE ' . PRIVMSGS_FOLDER_TABLE . "
-			SET pm_count = pm_count - $num_deleted
-			WHERE folder_id = $folder_id";
-		phpbb::$db->sql_query($sql);
-	}
-
-	// Update unread and new status field
-	if ($num_unread || $num_new)
-	{
-		$set_sql = ($num_unread) ? 'user_unread_privmsg = user_unread_privmsg - ' . $num_unread : '';
-
-		if ($num_new)
-		{
-			$set_sql .= ($set_sql != '') ? ', ' : '';
-			$set_sql .= 'user_new_privmsg = user_new_privmsg - ' . $num_new;
-		}
-
-		phpbb::$db->sql_query('UPDATE ' . USERS_TABLE . " SET $set_sql WHERE user_id = $user_id");
-
-		phpbb::$user->data['user_new_privmsg'] -= $num_new;
-		phpbb::$user->data['user_unread_privmsg'] -= $num_unread;
-	}
-
-	// Now we have to check which messages we can delete completely
-	$sql = 'SELECT msg_id
-		FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE ' . phpbb::$db->sql_in_set('msg_id', array_keys($delete_rows));
-	$result = phpbb::$db->sql_query($sql);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		unset($delete_rows[$row['msg_id']]);
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	$delete_ids = array_keys($delete_rows);
-
-	if (sizeof($delete_ids))
-	{
-		// Check if there are any attachments we need to remove
-		if (!function_exists('delete_attachments'))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/functions_admin.' . PHP_EXT);
-		}
-
-		delete_attachments('message', $delete_ids, false);
-
-		$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('msg_id', $delete_ids);
-		phpbb::$db->sql_query($sql);
-	}
-
-	phpbb::$db->sql_transaction('commit');
-
-	return true;
-}
-
-/**
-* Rebuild message header
-*/
-function rebuild_header($check_ary)
-{
-	$address = array();
-
-	foreach ($check_ary as $check_type => $address_field)
-	{
-		// Split Addresses into users and groups
-		preg_match_all('/:?(u|g)_([0-9]+):?/', $address_field, $match);
-
-		$u = $g = array();
-		foreach ($match[1] as $id => $type)
-		{
-			${$type}[] = (int) $match[2][$id];
-		}
-
-		$_types = array('u', 'g');
-		foreach ($_types as $type)
-		{
-			if (sizeof($$type))
-			{
-				foreach ($$type as $id)
-				{
-					$address[$type][$id] = $check_type;
-				}
-			}
-		}
-	}
-
-	return $address;
-}
-
-/**
-* Print out/assign recipient information
-*/
-function write_pm_addresses($check_ary, $author_id, $plaintext = false)
-{
-	$addresses = array();
-
-	foreach ($check_ary as $check_type => $address_field)
-	{
-		if (!is_array($address_field))
-		{
-			// Split Addresses into users and groups
-			preg_match_all('/:?(u|g)_([0-9]+):?/', $address_field, $match);
-
-			$u = $g = array();
-			foreach ($match[1] as $id => $type)
-			{
-				${$type}[] = (int) $match[2][$id];
-			}
-		}
-		else
-		{
-			$u = $address_field['u'];
-			$g = $address_field['g'];
-		}
-
-		$address = array();
-		if (sizeof($u))
-		{
-			$sql = 'SELECT user_id, username, user_colour
-				FROM ' . USERS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('user_id', $u) . '
-					AND user_type IN (' . phpbb::USER_NORMAL . ', ' . phpbb::USER_FOUNDER . ')';
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				if ($check_type == 'to' || $author_id == phpbb::$user->data['user_id'] || $row['user_id'] == phpbb::$user->data['user_id'])
-				{
-					if ($plaintext)
-					{
-						$address[] = $row['username'];
-					}
-					else
-					{
-						$address['user'][$row['user_id']] = array('name' => $row['username'], 'colour' => $row['user_colour']);
-					}
-				}
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		if (sizeof($g))
-		{
-			if ($plaintext)
-			{
-				$sql = 'SELECT group_name, group_type
-					FROM ' . GROUPS_TABLE . '
-						WHERE ' . phpbb::$db->sql_in_set('group_id', $g);
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					if ($check_type == 'to' || $author_id == phpbb::$user->data['user_id'] || $row['user_id'] == phpbb::$user->data['user_id'])
-					{
-						$address[] = ($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name'];
-					}
-				}
-				phpbb::$db->sql_freeresult($result);
-			}
-			else
-			{
-				$sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_type, ug.user_id
-					FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . ' ug
-						WHERE ' . phpbb::$db->sql_in_set('g.group_id', $g) . '
-						AND g.group_id = ug.group_id
-						AND ug.user_pending = 0';
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					if (!isset($address['group'][$row['group_id']]))
-					{
-						if ($check_type == 'to' || $author_id == phpbb::$user->data['user_id'] || $row['user_id'] == phpbb::$user->data['user_id'])
-						{
-							$row['group_name'] = ($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name'];
-							$address['group'][$row['group_id']] = array('name' => $row['group_name'], 'colour' => $row['group_colour']);
-						}
-					}
-
-					if (isset($address['user'][$row['user_id']]))
-					{
-						$address['user'][$row['user_id']]['in_group'] = $row['group_id'];
-					}
-				}
-				phpbb::$db->sql_freeresult($result);
-			}
-		}
-
-		if (sizeof($address) && !$plaintext)
-		{
-			phpbb::$template->assign_var('S_' . strtoupper($check_type) . '_RECIPIENT', true);
-
-			foreach ($address as $type => $adr_ary)
-			{
-				foreach ($adr_ary as $id => $row)
-				{
-					$tpl_ary = array(
-						'IS_GROUP'	=> ($type == 'group') ? true : false,
-						'IS_USER'	=> ($type == 'user') ? true : false,
-						'UG_ID'		=> $id,
-						'NAME'		=> $row['name'],
-						'COLOUR'	=> ($row['colour']) ? '#' . $row['colour'] : '',
-						'TYPE'		=> $type,
-					);
-
-					if ($type == 'user')
-					{
-						$tpl_ary = array_merge($tpl_ary, array(
-							'U_VIEW'		=> get_username_string('profile', $id, $row['name'], $row['colour']),
-							'NAME_FULL'		=> get_username_string('full', $id, $row['name'], $row['colour']),
-						));
-					}
-					else
-					{
-						$tpl_ary = array_merge($tpl_ary, array(
-							'U_VIEW'		=> append_sid('memberlist', 'mode=group&amp;g=' . $id),
-						));
-					}
-
-					phpbb::$template->assign_block_vars($check_type . '_recipient', $tpl_ary);
-				}
-			}
-		}
-
-		$addresses[$check_type] = $address;
-	}
-
-	return $addresses;
-}
-
-/**
-* Get folder status
-*/
-function get_folder_status($folder_id, $folder)
-{
-	if (isset($folder[$folder_id]))
-	{
-		$folder = $folder[$folder_id];
-	}
-	else
-	{
-		return false;
-	}
-
-	$return = array(
-		'folder_name'	=> $folder['folder_name'],
-		'cur'			=> $folder['num_messages'],
-		'remaining'		=> (phpbb::$user->data['message_limit']) ? phpbb::$user->data['message_limit'] - $folder['num_messages'] : 0,
-		'max'			=> phpbb::$user->data['message_limit'],
-		'percent'		=> (phpbb::$user->data['message_limit']) ? ((phpbb::$user->data['message_limit'] > 0) ? round(($folder['num_messages'] / phpbb::$user->data['message_limit']) * 100) : 100) : 0,
-	);
-
-	$return['message']	= sprintf(phpbb::$user->lang['FOLDER_STATUS_MSG'], $return['percent'], $return['cur'], $return['max']);
-
-	return $return;
-}
-
-//
-// COMPOSE MESSAGES
-//
-
-/**
-* Submit PM
-*/
-function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
-{
-	// We do not handle erasing pms here
-	if ($mode == 'delete')
-	{
-		return false;
-	}
-
-	$current_time = time();
-
-	// Collect some basic information about which tables and which rows to update/insert
-	$sql_data = array();
-	$root_level = 0;
-
-	// Recipient Information
-	$recipients = $to = $bcc = array();
-
-	if ($mode != 'edit')
-	{
-		// Build Recipient List
-		// u|g => array($user_id => 'to'|'bcc')
-		$_types = array('u', 'g');
-		foreach ($_types as $ug_type)
-		{
-			if (isset($data['address_list'][$ug_type]) && sizeof($data['address_list'][$ug_type]))
-			{
-				foreach ($data['address_list'][$ug_type] as $id => $field)
-				{
-					$id = (int) $id;
-
-					// Do not rely on the address list being "valid"
-					if (!$id || ($ug_type == 'u' && $id == ANONYMOUS))
-					{
-						continue;
-					}
-
-					$field = ($field == 'to') ? 'to' : 'bcc';
-					if ($ug_type == 'u')
-					{
-						$recipients[$id] = $field;
-					}
-					${$field}[] = $ug_type . '_' . $id;
-				}
-			}
-		}
-
-		if (isset($data['address_list']['g']) && sizeof($data['address_list']['g']))
-		{
-			// We need to check the PM status of group members (do they want to receive PM's?)
-			// Only check if not a moderator or admin, since they are allowed to override this user setting
-			$sql_allow_pm = (!phpbb::$acl->acl_gets('a_', 'm_') && !phpbb::$acl->acl_getf_global('m_')) ? ' AND u.user_allow_pm = 1' : '';
-
-			$sql = 'SELECT u.user_type, ug.group_id, ug.user_id
-				FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . ' ug
-				WHERE ' . phpbb::$db->sql_in_set('ug.group_id', array_keys($data['address_list']['g'])) . '
-					AND ug.user_pending = 0
-					AND u.user_id = ug.user_id
-					AND u.user_type IN (' . phpbb::USER_NORMAL . ', ' . phpbb::USER_FOUNDER . ')' .
-					$sql_allow_pm;
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$field = ($data['address_list']['g'][$row['group_id']] == 'to') ? 'to' : 'bcc';
-				$recipients[$row['user_id']] = $field;
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		if (!sizeof($recipients))
-		{
-			trigger_error('NO_RECIPIENT');
-		}
-	}
-
-	phpbb::$db->sql_transaction('begin');
-
-	$sql = '';
-
-	switch ($mode)
-	{
-		case 'reply':
-		case 'quote':
-			$root_level = ($data['reply_from_root_level']) ? $data['reply_from_root_level'] : $data['reply_from_msg_id'];
-
-			// Set message_replied switch for this user
-			$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . '
-				SET pm_replied = 1
-				WHERE user_id = ' . $data['from_user_id'] . '
-					AND msg_id = ' . $data['reply_from_msg_id'];
-
-		// no break
-
-		case 'forward':
-		case 'post':
-		case 'quotepost':
-			$sql_data = array(
-				'root_level'		=> $root_level,
-				'author_id'			=> $data['from_user_id'],
-				'icon_id'			=> $data['icon_id'],
-				'author_ip'			=> $data['from_user_ip'],
-				'message_time'		=> $current_time,
-				'enable_bbcode'		=> $data['enable_bbcode'],
-				'enable_smilies'	=> $data['enable_smilies'],
-				'enable_magic_url'	=> $data['enable_urls'],
-				'enable_sig'		=> $data['enable_sig'],
-				'message_subject'	=> $subject,
-				'message_text'		=> $data['message'],
-				'message_attachment'=> (!empty($data['attachment_data'])) ? 1 : 0,
-				'bbcode_bitfield'	=> $data['bbcode_bitfield'],
-				'bbcode_uid'		=> $data['bbcode_uid'],
-				'to_address'		=> implode(':', $to),
-				'bcc_address'		=> implode(':', $bcc)
-			);
-		break;
-
-		case 'edit':
-			$sql_data = array(
-				'icon_id'			=> $data['icon_id'],
-				'message_edit_time'	=> $current_time,
-				'enable_bbcode'		=> $data['enable_bbcode'],
-				'enable_smilies'	=> $data['enable_smilies'],
-				'enable_magic_url'	=> $data['enable_urls'],
-				'enable_sig'		=> $data['enable_sig'],
-				'message_subject'	=> $subject,
-				'message_text'		=> $data['message'],
-				'message_attachment'=> (!empty($data['attachment_data'])) ? 1 : 0,
-				'bbcode_bitfield'	=> $data['bbcode_bitfield'],
-				'bbcode_uid'		=> $data['bbcode_uid']
-			);
-		break;
-	}
-
-	if (sizeof($sql_data))
-	{
-		$query = '';
-
-		if ($mode == 'post' || $mode == 'reply' || $mode == 'quote' || $mode == 'quotepost' || $mode == 'forward')
-		{
-			phpbb::$db->sql_query('INSERT INTO ' . PRIVMSGS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_data));
-			$data['msg_id'] = phpbb::$db->sql_nextid();
-		}
-		else if ($mode == 'edit')
-		{
-			$sql = 'UPDATE ' . PRIVMSGS_TABLE . '
-				SET message_edit_count = message_edit_count + 1, ' . phpbb::$db->sql_build_array('UPDATE', $sql_data) . '
-				WHERE msg_id = ' . $data['msg_id'];
-			phpbb::$db->sql_query($sql);
-		}
-	}
-
-	if ($mode != 'edit')
-	{
-		if ($sql)
-		{
-			phpbb::$db->sql_query($sql);
-		}
-		unset($sql);
-
-		$sql_ary = array();
-		foreach ($recipients as $user_id => $type)
-		{
-			$sql_ary[] = array(
-				'msg_id'		=> (int) $data['msg_id'],
-				'user_id'		=> (int) $user_id,
-				'author_id'		=> (int) $data['from_user_id'],
-				'folder_id'		=> PRIVMSGS_NO_BOX,
-				'pm_new'		=> 1,
-				'pm_unread'		=> 1,
-				'pm_forwarded'	=> ($mode == 'forward') ? 1 : 0
-			);
-		}
-
-		phpbb::$db->sql_multi_insert(PRIVMSGS_TO_TABLE, $sql_ary);
-
-		$sql = 'UPDATE ' . USERS_TABLE . '
-			SET user_new_privmsg = user_new_privmsg + 1, user_unread_privmsg = user_unread_privmsg + 1, user_last_privmsg = ' . time() . '
-			WHERE ' . phpbb::$db->sql_in_set('user_id', array_keys($recipients));
-		phpbb::$db->sql_query($sql);
-
-		// Put PM into outbox
-		if ($put_in_outbox)
-		{
-			phpbb::$db->sql_query('INSERT INTO ' . PRIVMSGS_TO_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', array(
-				'msg_id'		=> (int) $data['msg_id'],
-				'user_id'		=> (int) $data['from_user_id'],
-				'author_id'		=> (int) $data['from_user_id'],
-				'folder_id'		=> PRIVMSGS_OUTBOX,
-				'pm_new'		=> 0,
-				'pm_unread'		=> 0,
-				'pm_forwarded'	=> ($mode == 'forward') ? 1 : 0))
-			);
-		}
-	}
-
-	// Set user last post time
-	if ($mode == 'reply' || $mode == 'quote' || $mode == 'quotepost' || $mode == 'forward' || $mode == 'post')
-	{
-		$sql = 'UPDATE ' . USERS_TABLE . "
-			SET user_lastpost_time = $current_time
-			WHERE user_id = " . $data['from_user_id'];
-		phpbb::$db->sql_query($sql);
-	}
-
-	// Submit Attachments
-	if (!empty($data['attachment_data']) && $data['msg_id'] && in_array($mode, array('post', 'reply', 'quote', 'quotepost', 'edit', 'forward')))
-	{
-		$space_taken = $files_added = 0;
-		$orphan_rows = array();
-
-		foreach ($data['attachment_data'] as $pos => $attach_row)
-		{
-			$orphan_rows[(int) $attach_row['attach_id']] = array();
-		}
-
-		if (sizeof($orphan_rows))
-		{
-			$sql = 'SELECT attach_id, filesize, physical_filename
-				FROM ' . ATTACHMENTS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('attach_id', array_keys($orphan_rows)) . '
-					AND in_message = 1
-					AND is_orphan = 1
-					AND poster_id = ' . phpbb::$user->data['user_id'];
-			$result = phpbb::$db->sql_query($sql);
-
-			$orphan_rows = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$orphan_rows[$row['attach_id']] = $row;
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		foreach ($data['attachment_data'] as $pos => $attach_row)
-		{
-			if ($attach_row['is_orphan'] && !isset($orphan_rows[$attach_row['attach_id']]))
-			{
-				continue;
-			}
-
-			if (!$attach_row['is_orphan'])
-			{
-				// update entry in db if attachment already stored in db and filespace
-				$sql = 'UPDATE ' . ATTACHMENTS_TABLE . "
-					SET attach_comment = '" . phpbb::$db->sql_escape($attach_row['attach_comment']) . "'
-					WHERE attach_id = " . (int) $attach_row['attach_id'] . '
-						AND is_orphan = 0';
-				phpbb::$db->sql_query($sql);
-			}
-			else
-			{
-				// insert attachment into db
-				if (!@file_exists(PHPBB_ROOT_PATH . phpbb::$config['upload_path'] . '/' . basename($orphan_rows[$attach_row['attach_id']]['physical_filename'])))
-				{
-					continue;
-				}
-
-				$space_taken += $orphan_rows[$attach_row['attach_id']]['filesize'];
-				$files_added++;
-
-				$attach_sql = array(
-					'post_msg_id'		=> $data['msg_id'],
-					'topic_id'			=> 0,
-					'is_orphan'			=> 0,
-					'poster_id'			=> $data['from_user_id'],
-					'attach_comment'	=> $attach_row['attach_comment'],
-				);
-
-				$sql = 'UPDATE ' . ATTACHMENTS_TABLE . ' SET ' . phpbb::$db->sql_build_array('UPDATE', $attach_sql) . '
-					WHERE attach_id = ' . $attach_row['attach_id'] . '
-						AND is_orphan = 1
-						AND poster_id = ' . phpbb::$user->data['user_id'];
-				phpbb::$db->sql_query($sql);
-			}
-		}
-
-		if ($space_taken && $files_added)
-		{
-			set_config_count('upload_dir_size', $space_taken, true);
-			set_config_count('num_files', $files_added, true);
-		}
-	}
-
-	// Delete draft if post was loaded...
-	$draft_id = request_var('draft_loaded', 0);
-	if ($draft_id)
-	{
-		$sql = 'DELETE FROM ' . DRAFTS_TABLE . "
-			WHERE draft_id = $draft_id
-				AND user_id = " . $data['from_user_id'];
-		phpbb::$db->sql_query($sql);
-	}
-
-	phpbb::$db->sql_transaction('commit');
-
-	// Send Notifications
-	if ($mode != 'edit')
-	{
-		pm_notification($mode, $data['from_username'], $recipients, $subject, $data['message']);
-	}
-
-	return $data['msg_id'];
-}
-
-/**
-* PM Notification
-*/
-function pm_notification($mode, $author, $recipients, $subject, $message)
-{
-	$subject = censor_text($subject);
-
-	unset($recipients[ANONYMOUS], $recipients[phpbb::$user->data['user_id']]);
-
-	if (!sizeof($recipients))
-	{
-		return;
-	}
-
-	// Get banned User ID's
-	$sql = 'SELECT ban_userid
-		FROM ' . BANLIST_TABLE . '
-		WHERE ' . phpbb::$db->sql_in_set('ban_userid', array_map('intval', array_keys($recipients))) . '
-			AND ban_exclude = 0';
-	$result = phpbb::$db->sql_query($sql);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		unset($recipients[$row['ban_userid']]);
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	if (!sizeof($recipients))
-	{
-		return;
-	}
-
-	$sql = 'SELECT user_id, username, user_email, user_lang, user_notify_pm, user_notify_type, user_jabber
-		FROM ' . USERS_TABLE . '
-		WHERE ' . phpbb::$db->sql_in_set('user_id', array_map('intval', array_keys($recipients)));
-	$result = phpbb::$db->sql_query($sql);
-
-	$msg_list_ary = array();
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		if ($row['user_notify_pm'] == 1 && trim($row['user_email']))
-		{
-			$msg_list_ary[] = array(
-				'method'	=> $row['user_notify_type'],
-				'email'		=> $row['user_email'],
-				'jabber'	=> $row['user_jabber'],
-				'name'		=> $row['username'],
-				'lang'		=> $row['user_lang']
-			);
-		}
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	if (!sizeof($msg_list_ary))
-	{
-		return;
-	}
-
-	include_once(PHPBB_ROOT_PATH . 'includes/functions_messenger.' . PHP_EXT);
-	$messenger = new messenger();
-
-	foreach ($msg_list_ary as $pos => $addr)
-	{
-		$messenger->template('privmsg_notify', $addr['lang']);
-
-		$messenger->to($addr['email'], $addr['name']);
-		$messenger->im($addr['jabber'], $addr['name']);
-
-		$messenger->assign_vars(array(
-			'SUBJECT'		=> htmlspecialchars_decode($subject),
-			'AUTHOR_NAME'	=> htmlspecialchars_decode($author),
-			'USERNAME'		=> htmlspecialchars_decode($addr['name']),
-
-			'U_INBOX'		=> generate_board_url() . '/ucp.' . PHP_EXT . '?i=pm&folder=inbox')
-		);
-
-		$messenger->send($addr['method']);
-	}
-	unset($msg_list_ary);
-
-	$messenger->save_queue();
-
-	unset($messenger);
-}
-
-/**
-* Display Message History
-*/
-function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode = false)
-{
-	global $bbcode;
-
-	// Get History Messages (could be newer)
-	$sql = 'SELECT t.*, p.*, u.*
-		FROM ' . PRIVMSGS_TABLE . ' p, ' . PRIVMSGS_TO_TABLE . ' t, ' . USERS_TABLE . ' u
-		WHERE t.msg_id = p.msg_id
-			AND p.author_id = u.user_id
-			AND t.folder_id NOT IN (' . PRIVMSGS_NO_BOX . ', ' . PRIVMSGS_HOLD_BOX . ")
-			AND t.user_id = $user_id";
-
-	if (!$message_row['root_level'])
-	{
-		$sql .= " AND (p.root_level = $msg_id OR (p.root_level = 0 AND p.msg_id = $msg_id))";
-	}
-	else
-	{
-		$sql .= " AND (p.root_level = " . $message_row['root_level'] . ' OR p.msg_id = ' . $message_row['root_level'] . ')';
-	}
-	$sql .= ' ORDER BY p.message_time DESC';
-
-	$result = phpbb::$db->sql_query($sql);
-	$row = phpbb::$db->sql_fetchrow($result);
-
-	if (!$row)
-	{
-		phpbb::$db->sql_freeresult($result);
-		return false;
-	}
-
-	$rowset = array();
-	$bbcode_bitfield = '';
-	$folder_url = append_sid('ucp', 'i=pm') . '&amp;folder=';
-
-	do
-	{
-		$folder_id = (int) $row['folder_id'];
-
-		$row['folder'][] = (isset($folder[$folder_id])) ? '<a href="' . $folder_url . $folder_id . '">' . $folder[$folder_id]['folder_name'] . '</a>' : phpbb::$user->lang['UNKNOWN_FOLDER'];
-
-		if (isset($rowset[$row['msg_id']]))
-		{
-			$rowset[$row['msg_id']]['folder'][] = (isset($folder[$folder_id])) ? '<a href="' . $folder_url . $folder_id . '">' . $folder[$folder_id]['folder_name'] . '</a>' : phpbb::$user->lang['UNKNOWN_FOLDER'];
-		}
-		else
-		{
-			$rowset[$row['msg_id']] = $row;
-			$bbcode_bitfield = $bbcode_bitfield | base64_decode($row['bbcode_bitfield']);
-		}
-	}
-	while ($row = phpbb::$db->sql_fetchrow($result));
-	phpbb::$db->sql_freeresult($result);
-
-	$title = $row['message_subject'];
-
-	if (sizeof($rowset) == 1 && !$in_post_mode)
-	{
-		return false;
-	}
-
-	// Instantiate BBCode class
-	if ((empty($bbcode) || $bbcode === false) && $bbcode_bitfield !== '')
-	{
-		if (!class_exists('bbcode'))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/bbcode.' . PHP_EXT);
-		}
-		$bbcode = new bbcode(base64_encode($bbcode_bitfield));
-	}
-
-	$title = censor_text($title);
-
-	$url = append_sid('ucp', 'i=pm');
-	$next_history_pm = $previous_history_pm = $prev_id = 0;
-
-	// Re-order rowset to be able to get the next/prev message rows...
-	$rowset = array_values($rowset);
-
-	for ($i = 0, $size = sizeof($rowset); $i < $size; $i++)
-	{
-		$row = &$rowset[$i];
-		$id = (int) $row['msg_id'];
-
-		$author_id	= $row['author_id'];
-		$folder_id	= (int) $row['folder_id'];
-
-		$subject	= $row['message_subject'];
-		$message	= $row['message_text'];
-
-		$message = censor_text($message);
-
-		$decoded_message = false;
-
-		if ($in_post_mode && phpbb::$acl->acl_get('u_sendpm') && $author_id != ANONYMOUS && $author_id != phpbb::$user->data['user_id'])
-		{
-			$decoded_message = $message;
-			decode_message($decoded_message, $row['bbcode_uid']);
-
-			$decoded_message = bbcode_nl2br($decoded_message);
-		}
-
-		if ($row['bbcode_bitfield'])
-		{
-			$bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']);
-		}
-
-		$message = bbcode_nl2br($message);
-		$message = smiley_text($message, !$row['enable_smilies']);
-
-		$subject = censor_text($subject);
-
-		if ($id == $msg_id)
-		{
-			$next_history_pm = (isset($rowset[$i + 1])) ? (int) $rowset[$i + 1]['msg_id'] : 0;
-			$previous_history_pm = $prev_id;
-		}
-
-		phpbb::$template->assign_block_vars('history_row', array(
-			'MESSAGE_AUTHOR_QUOTE'		=> (($decoded_message) ? addslashes(get_username_string('username', $author_id, $row['username'], $row['user_colour'], $row['username'])) : ''),
-			'MESSAGE_AUTHOR_FULL'		=> get_username_string('full', $author_id, $row['username'], $row['user_colour'], $row['username']),
-			'MESSAGE_AUTHOR_COLOUR'		=> get_username_string('colour', $author_id, $row['username'], $row['user_colour'], $row['username']),
-			'MESSAGE_AUTHOR'			=> get_username_string('username', $author_id, $row['username'], $row['user_colour'], $row['username']),
-			'U_MESSAGE_AUTHOR'			=> get_username_string('profile', $author_id, $row['username'], $row['user_colour'], $row['username']),
-
-			'SUBJECT'			=> $subject,
-			'SENT_DATE'			=> phpbb::$user->format_date($row['message_time']),
-			'MESSAGE'			=> $message,
-			'FOLDER'			=> implode(', ', $row['folder']),
-			'DECODED_MESSAGE'	=> $decoded_message,
-
-			'S_CURRENT_MSG'		=> ($row['msg_id'] == $msg_id),
-			'S_AUTHOR_DELETED'	=> ($author_id == ANONYMOUS) ? true : false,
-			'S_IN_POST_MODE'	=> $in_post_mode,
-
-			'MSG_ID'			=> $row['msg_id'],
-			'U_VIEW_MESSAGE'	=> "$url&amp;f=$folder_id&amp;p=" . $row['msg_id'],
-			'U_QUOTE'			=> (!$in_post_mode && phpbb::$acl->acl_get('u_sendpm') && $author_id != ANONYMOUS && $author_id != phpbb::$user->data['user_id']) ? "$url&amp;mode=compose&amp;action=quote&amp;f=" . $folder_id . "&amp;p=" . $row['msg_id'] : '',
-			'U_POST_REPLY_PM'	=> ($author_id != phpbb::$user->data['user_id'] && $author_id != ANONYMOUS && phpbb::$acl->acl_get('u_sendpm')) ? "$url&amp;mode=compose&amp;action=reply&amp;f=$folder_id&amp;p=" . $row['msg_id'] : '',
-		));
-		unset($rowset[$id]);
-		$prev_id = $id;
-	}
-
-	phpbb::$template->assign_vars(array(
-		'QUOTE_IMG'			=> phpbb::$user->img('icon_post_quote', 'REPLY_WITH_QUOTE'),
-		'HISTORY_TITLE'		=> $title,
-
-		'U_VIEW_NEXT_HISTORY'		=> ($next_history_pm) ? "$url&amp;p=" . $next_history_pm : '',
-		'U_VIEW_PREVIOUS_HISTORY'	=> ($previous_history_pm) ? "$url&amp;p=" . $previous_history_pm : '',
-	));
-
-	return true;
-}
-
-/**
-* Set correct users max messages in PM folder.
-* If several group memberships define different amount of messages, the highest will be chosen.
-*/
-function set_user_message_limit()
-{
-	// Get maximum about from user memberships - if it is 0, there is no limit set and we use the maximum value within the config.
-	$sql = 'SELECT MAX(g.group_message_limit) as max_message_limit
-		FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . ' ug
-		WHERE ug.user_id = ' . phpbb::$user->data['user_id'] . '
-			AND ug.user_pending = 0
-			AND ug.group_id = g.group_id';
-	$result = phpbb::$db->sql_query($sql);
-	$message_limit = (int) phpbb::$db->sql_fetchfield('max_message_limit');
-	phpbb::$db->sql_freeresult($result);
-
-	phpbb::$user->data['message_limit'] = (!$message_limit) ? phpbb::$config['pm_max_msgs'] : $message_limit;
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
deleted file mode 100644
index 32c3782941..0000000000
--- a/phpBB/includes/functions_profile_fields.php
+++ /dev/null
@@ -1,1050 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Custom Profile Fields
-* @package phpBB3
-*/
-class custom_profile
-{
-	public static $profile_types = array(FIELD_INT => 'int', FIELD_STRING => 'string', FIELD_TEXT => 'text', FIELD_BOOL => 'bool', FIELD_DROPDOWN => 'dropdown', FIELD_DATE => 'date');
-	private $profile_cache = array();
-	private $options_lang = array();
-
-	/**
-	* 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
-	*/
-	public function generate_profile_fields($mode, $lang_id)
-	{
-		$sql_where = '';
-		switch ($mode)
-		{
-			case 'register':
-				// If the field is required we show it on the registration page
-				$sql_where .= ' AND f.field_show_on_reg = 1';
-			break;
-
-			case 'profile':
-				// Show hidden fields to moderators/admins
-				if (!phpbb::$acl->acl_gets('a_', 'm_') && !phpbb::$acl->acl_getf_global('m_'))
-				{
-					$sql_where .= ' AND f.field_hide = 0';
-				}
-			break;
-
-			default:
-				trigger_error('Wrong profile mode specified', E_USER_ERROR);
-			break;
-		}
-
-		$sql = 'SELECT l.*, f.*
-			FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . " f
-			WHERE f.field_active = 1
-				$sql_where
-				AND l.lang_id = $lang_id
-				AND l.field_id = f.field_id
-			ORDER BY f.field_order";
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			// Return templated field
-			$tpl_snippet = $this->process_field_row('change', $row);
-
-			// Some types are multivalue, we can't give them a field_id as we would not know which to pick
-			$type = (int) $row['field_type'];
-
-			phpbb::$template->assign_block_vars('profile_fields', array(
-				'LANG_NAME'		=> $row['lang_name'],
-				'LANG_EXPLAIN'	=> $row['lang_explain'],
-				'FIELD'			=> $tpl_snippet,
-				'FIELD_ID'		=> ($type == FIELD_DATE || ($type == FIELD_BOOL && $row['field_length'] == '1')) ? '' : 'pf_' . $row['field_ident'],
-				'S_REQUIRED'	=> ($row['field_required']) ? true : false,
-			));
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	/**
-	* Validate entered profile field data
-	* @access public
-	*/
-	public function validate_profile_field($field_type, &$field_value, $field_data)
-	{
-		switch ($field_type)
-		{
-			case FIELD_INT:
-			case FIELD_DROPDOWN:
-				$field_value = (int) $field_value;
-			break;
-
-			case FIELD_BOOL:
-				$field_value = (bool) $field_value;
-			break;
-		}
-
-		switch ($field_type)
-		{
-			case FIELD_DATE:
-				$field_validate = explode('-', $field_value);
-
-				$day = (isset($field_validate[0])) ? (int) $field_validate[0] : 0;
-				$month = (isset($field_validate[1])) ? (int) $field_validate[1] : 0;
-				$year = (isset($field_validate[2])) ? (int) $field_validate[2] : 0;
-
-				if ((!$day || !$month || !$year) && !$field_data['field_required'])
-				{
-					return false;
-				}
-
-				if ((!$day || !$month || !$year) && $field_data['field_required'])
-				{
-					return 'FIELD_REQUIRED';
-				}
-
-				if ($day < 0 || $day > 31 || $month < 0 || $month > 12 || ($year < 1901 && $year > 0) || $year > gmdate('Y', time()) + 50)
-				{
-					return 'FIELD_INVALID_DATE';
-				}
-
-				if (checkdate($month, $day, $year) === false)
-				{
-					return 'FIELD_INVALID_DATE';
-				}
-			break;
-
-			case FIELD_BOOL:
-				if (!$field_value && $field_data['field_required'])
-				{
-					return 'FIELD_REQUIRED';
-				}
-			break;
-
-			case FIELD_INT:
-				if (empty($field_value) && !$field_data['field_required'])
-				{
-					return false;
-				}
-
-				if ($field_value < $field_data['field_minlen'])
-				{
-					return 'FIELD_TOO_SMALL';
-				}
-				else if ($field_value > $field_data['field_maxlen'])
-				{
-					return 'FIELD_TOO_LARGE';
-				}
-			break;
-
-			case FIELD_DROPDOWN:
-				if ($field_value == $field_data['field_novalue'] && $field_data['field_required'])
-				{
-					return 'FIELD_REQUIRED';
-				}
-			break;
-
-			case FIELD_STRING:
-			case FIELD_TEXT:
-				if (empty($field_value) && !$field_data['field_required'])
-				{
-					return false;
-				}
-				else if (empty($field_value) && $field_data['field_required'])
-				{
-					return 'FIELD_REQUIRED';
-				}
-
-				if ($field_data['field_minlen'] && utf8_strlen($field_value) < $field_data['field_minlen'])
-				{
-					return 'FIELD_TOO_SHORT';
-				}
-				else if ($field_data['field_maxlen'] && utf8_strlen($field_value) > $field_data['field_maxlen'])
-				{
-					return 'FIELD_TOO_LONG';
-				}
-
-				if (!empty($field_data['field_validation']) && $field_data['field_validation'] != '.*')
-				{
-					$field_validate = ($field_type == FIELD_STRING) ? $field_value : bbcode_nl2br($field_value);
-					if (!preg_match('#^' . str_replace('\\\\', '\\', $field_data['field_validation']) . '$#i', $field_validate))
-					{
-						return 'FIELD_INVALID_CHARS';
-					}
-				}
-			break;
-		}
-
-		return false;
-	}
-
-	/**
-	* Build profile cache, used for display
-	* @access private
-	*/
-	private function build_cache()
-	{
-		$this->profile_cache = array();
-
-		// Display hidden/no_view fields for admin/moderator
-		$sql = 'SELECT l.*, f.*
-			FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f
-			WHERE l.lang_id = ' . phpbb::$user->get_iso_lang_id() . '
-				AND f.field_active = 1 ' .
-				((!phpbb::$acl->acl_gets('a_', 'm_') && !phpbb::$acl->acl_getf_global('m_')) ? '	AND f.field_hide = 0 ' : '') . '
-				AND f.field_no_view = 0
-				AND l.field_id = f.field_id
-			ORDER BY f.field_order';
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$this->profile_cache[$row['field_ident']] = $row;
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	/**
-	* Get language entries for options and store them here for later use
-	*/
-	private function get_option_lang($field_id, $lang_id, $field_type, $preview)
-	{
-		if ($preview)
-		{
-			$lang_options = (!is_array($this->vars['lang_options'])) ? explode("\n", $this->vars['lang_options']) : $this->vars['lang_options'];
-
-			// @todo: ref optimize
-			foreach ($lang_options as $num => $var)
-			{
-				$this->options_lang[$field_id][$lang_id][($num + 1)] = $var;
-			}
-		}
-		else
-		{
-			$sql = 'SELECT option_id, lang_value
-				FROM ' . PROFILE_FIELDS_LANG_TABLE . "
-					WHERE field_id = $field_id
-					AND lang_id = $lang_id
-					AND field_type = $field_type
-				ORDER BY option_id";
-			$result = phpbb::$db->sql_query($sql);
-
-			// @todo: ref optimize
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$this->options_lang[$field_id][$lang_id][($row['option_id'] + 1)] = $row['lang_value'];
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-	}
-
-	/**
-	* Submit profile field
-	* @access public
-	*/
-	public function submit_cp_field($mode, $lang_id, &$cp_data, &$cp_error)
-	{
-		$sql_where = '';
-		switch ($mode)
-		{
-			case 'register':
-				// If the field is required we show it on the registration page and do not show hidden fields
-				$sql_where .= ' AND (f.field_show_on_reg = 1 OR f.field_required = 1) AND f.field_hide = 0';
-			break;
-
-			case 'profile':
-				// Show hidden fields to moderators/admins
-				if (!phpbb::$acl->acl_gets('a_', 'm_') && !phpbb::$acl->acl_getf_global('m_'))
-				{
-					$sql_where .= ' AND f.field_hide = 0';
-				}
-			break;
-
-			default:
-				trigger_error('Wrong profile mode specified', E_USER_ERROR);
-			break;
-		}
-
-		$sql = 'SELECT l.*, f.*
-			FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . " f
-			WHERE l.lang_id = $lang_id
-				AND f.field_active = 1
-				$sql_where
-				AND l.field_id = f.field_id
-			ORDER BY f.field_order";
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$cp_data['pf_' . $row['field_ident']] = $this->get_profile_field($row);
-			$check_value = $cp_data['pf_' . $row['field_ident']];
-
-			if (($cp_result = $this->validate_profile_field($row['field_type'], $check_value, $row)) !== false)
-			{
-				// If not and only showing common error messages, use this one
-				$error = '';
-				switch ($cp_result)
-				{
-					case 'FIELD_INVALID_DATE':
-					case 'FIELD_REQUIRED':
-						$error = sprintf(phpbb::$user->lang[$cp_result], $row['lang_name']);
-					break;
-
-					case 'FIELD_TOO_SHORT':
-					case 'FIELD_TOO_SMALL':
-						$error = sprintf(phpbb::$user->lang[$cp_result], $row['lang_name'], $row['field_minlen']);
-					break;
-
-					case 'FIELD_TOO_LONG':
-					case 'FIELD_TOO_LARGE':
-						$error = sprintf(phpbb::$user->lang[$cp_result], $row['lang_name'], $row['field_maxlen']);
-					break;
-
-					case 'FIELD_INVALID_CHARS':
-						switch ($row['field_validation'])
-						{
-							case '[0-9]+':
-								$error = sprintf(phpbb::$user->lang[$cp_result . '_NUMBERS_ONLY'], $row['lang_name']);
-							break;
-
-							case '[\w]+':
-								$error = sprintf(phpbb::$user->lang[$cp_result . '_ALPHA_ONLY'], $row['lang_name']);
-							break;
-
-							case '[\w_\+\. \-\[\]]+':
-								$error = sprintf(phpbb::$user->lang[$cp_result . '_SPACERS_ONLY'], $row['lang_name']);
-							break;
-						}
-					break;
-				}
-
-				if ($error != '')
-				{
-					$cp_error[] = $error;
-				}
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	/**
-	* 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
-	*/
-	public function generate_profile_fields_template($mode, $user_id = 0, $profile_row = false)
-	{
-		if ($mode == 'grab')
-		{
-			if (!is_array($user_id))
-			{
-				$user_id = array($user_id);
-			}
-
-			if (!sizeof($this->profile_cache))
-			{
-				$this->build_cache();
-			}
-
-			if (!sizeof($user_id))
-			{
-				return array();
-			}
-
-			$sql = 'SELECT *
-				FROM ' . PROFILE_FIELDS_DATA_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('user_id', array_map('intval', $user_id));
-			$result = phpbb::$db->sql_query($sql);
-
-			$field_data = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$field_data[$row['user_id']] = $row;
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			$user_fields = array();
-
-			// Go through the fields in correct order
-			foreach (array_keys($this->profile_cache) as $used_ident)
-			{
-				foreach ($field_data as $user_id => $row)
-				{
-					$user_fields[$user_id][$used_ident]['value'] = $row['pf_' . $used_ident];
-					$user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];
-				}
-			}
-
-			return $user_fields;
-		}
-		else if ($mode == 'show')
-		{
-			// $profile_row == $user_fields[$row['user_id']];
-			$tpl_fields = array();
-			$tpl_fields['row'] = $tpl_fields['blockrow'] = array();
-
-			foreach ($profile_row as $ident => $ident_ary)
-			{
-				$value = $this->get_profile_value($ident_ary);
-
-				if ($value === NULL)
-				{
-					continue;
-				}
-
-				$tpl_fields['row'] += array(
-					'PROFILE_' . strtoupper($ident) . '_VALUE'	=> $value,
-					'PROFILE_' . strtoupper($ident) . '_TYPE'	=> $ident_ary['data']['field_type'],
-					'PROFILE_' . strtoupper($ident) . '_NAME'	=> $ident_ary['data']['lang_name'],
-					'PROFILE_' . strtoupper($ident) . '_EXPLAIN'=> $ident_ary['data']['lang_explain'],
-
-					'S_PROFILE_' . strtoupper($ident)			=> true
-				);
-
-				$tpl_fields['blockrow'][] = array(
-					'PROFILE_FIELD_VALUE'	=> $value,
-					'PROFILE_FIELD_TYPE'	=> $ident_ary['data']['field_type'],
-					'PROFILE_FIELD_NAME'	=> $ident_ary['data']['lang_name'],
-					'PROFILE_FIELD_EXPLAIN'	=> $ident_ary['data']['lang_explain'],
-
-					'S_PROFILE_' . strtoupper($ident)		=> true
-				);
-			}
-
-			return $tpl_fields;
-		}
-		else
-		{
-			trigger_error('Wrong mode for custom profile', E_USER_ERROR);
-		}
-	}
-
-	/**
-	* Get Profile Value for display
-	*/
-	private function get_profile_value($ident_ary)
-	{
-		$value = $ident_ary['value'];
-		$field_type = $ident_ary['data']['field_type'];
-
-		switch (self::$profile_types[$field_type])
-		{
-			case 'int':
-				if ($value == '')
-				{
-					return NULL;
-				}
-				return (int) $value;
-			break;
-
-			case 'string':
-			case 'text':
-				if (!$value)
-				{
-					return NULL;
-				}
-
-				$value = make_clickable($value);
-				$value = censor_text($value);
-				$value = bbcode_nl2br($value);
-				return $value;
-			break;
-
-			// case 'datetime':
-			case 'date':
-				$date = explode('-', $value);
-				$day = (isset($date[0])) ? (int) $date[0] : 0;
-				$month = (isset($date[1])) ? (int) $date[1] : 0;
-				$year = (isset($date[2])) ? (int) $date[2] : 0;
-
-				if (!$day && !$month && !$year)
-				{
-					return NULL;
-				}
-				else if ($day && $month && $year)
-				{
-					// d/m/y 00:00 GMT isn't necessarily on the same d/m/y in the user's timezone, so add the timezone seconds
-					return phpbb::$user->format_date(gmmktime(0, 0, 0, $month, $day, $year) + phpbb::$user->timezone + phpbb::$user->dst, phpbb::$user->lang['DATE_FORMAT'], true);
-				}
-
-				return $value;
-			break;
-
-			case 'dropdown':
-				$field_id = $ident_ary['data']['field_id'];
-				$lang_id = $ident_ary['data']['lang_id'];
-				if (!isset($this->options_lang[$field_id][$lang_id]))
-				{
-					$this->get_option_lang($field_id, $lang_id, FIELD_DROPDOWN, false);
-				}
-
-				if ($value == $ident_ary['data']['field_novalue'])
-				{
-					return NULL;
-				}
-
-				$value = (int) $value;
-
-				// User not having a value assigned
-				if (!isset($this->options_lang[$field_id][$lang_id][$value]))
-				{
-					return NULL;
-				}
-
-				return $this->options_lang[$field_id][$lang_id][$value];
-			break;
-
-			case 'bool':
-				$field_id = $ident_ary['data']['field_id'];
-				$lang_id = $ident_ary['data']['lang_id'];
-				if (!isset($this->options_lang[$field_id][$lang_id]))
-				{
-					$this->get_option_lang($field_id, $lang_id, FIELD_BOOL, false);
-				}
-
-				if ($ident_ary['data']['field_length'] == 1)
-				{
-					return (isset($this->options_lang[$field_id][$lang_id][(int) $value])) ? $this->options_lang[$field_id][$lang_id][(int) $value] : NULL;
-				}
-				else if (!$value)
-				{
-					return NULL;
-				}
-				else
-				{
-					return $this->options_lang[$field_id][$lang_id][(int) ($value) + 1];
-				}
-			break;
-
-			default:
-				trigger_error('Unknown profile type', E_USER_ERROR);
-			break;
-		}
-	}
-
-	/**
-	* Get field value for registration/profile
-	* @access private
-	*/
-	private function get_var($field_validation, &$profile_row, $default_value, $preview)
-	{
-		$profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];
-		$user_ident = $profile_row['field_ident'];
-		// checkbox - only testing for isset
-		if ($profile_row['field_type'] == FIELD_BOOL && $profile_row['field_length'] == 2)
-		{
-			$value = (phpbb_request::is_set($profile_row['field_ident'])) ? true : ((!isset(phpbb::$user->profile_fields[$user_ident]) || $preview) ? $default_value : phpbb::$user->profile_fields[$user_ident]);
-		}
-		else if ($profile_row['field_type'] == FIELD_INT)
-		{
-			if (phpbb_request::is_set($profile_row['field_ident']))
-			{
-				$value = (request_var($profile_row['field_ident'], '') === '') ? null : request_var($profile_row['field_ident'], $default_value);
-			}
-			else
-			{
-				if (!$preview && isset(phpbb::$user->profile_fields[$user_ident]) && is_null(phpbb::$user->profile_fields[$user_ident]))
-				{
-					$value = null;
-				}
-				else if (!isset(phpbb::$user->profile_fields[$user_ident]) || $preview)
-				{
-					$value = $default_value;
-				}
-				else
-				{
-					$value = phpbb::$user->profile_fields[$user_ident];
-				}
-			}
-
-			return (is_null($value)) ? '' : (int) $value;
-		}
-		else
-		{
-			$value = (phpbb_request::is_set($profile_row['field_ident'])) ? request_var($profile_row['field_ident'], $default_value, true) : ((!isset(phpbb::$user->profile_fields[$user_ident]) || $preview) ? $default_value : phpbb::$user->profile_fields[$user_ident]);
-
-			if (gettype($value) == 'string')
-			{
-				$value = utf8_normalize_nfc($value);
-			}
-		}
-
-		switch ($field_validation)
-		{
-			case 'int':
-				return (int) $value;
-			break;
-		}
-
-		return $value;
-	}
-
-	/**
-	* Process int-type
-	* @access private
-	*/
-	private function generate_int($profile_row, $preview = false)
-	{
-		$profile_row['field_value'] = $this->get_var('int', $profile_row, $profile_row['field_default_value'], $preview);
-		phpbb::$template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER));
-	}
-
-	/**
-	* Process date-type
-	* @access private
-	*/
-	private function generate_date($profile_row, $preview = false)
-	{
-		$profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];
-		$user_ident = $profile_row['field_ident'];
-
-		$now = getdate();
-
-		if (!phpbb_request::is_set($profile_row['field_ident'] . '_day'))
-		{
-			if ($profile_row['field_default_value'] == 'now')
-			{
-				$profile_row['field_default_value'] = sprintf('%2d-%2d-%4d', $now['mday'], $now['mon'], $now['year']);
-			}
-			list($day, $month, $year) = explode('-', ((!isset(phpbb::$user->profile_fields[$user_ident]) || $preview) ? $profile_row['field_default_value'] : phpbb::$user->profile_fields[$user_ident]));
-		}
-		else
-		{
-			if ($preview && $profile_row['field_default_value'] == 'now')
-			{
-				$profile_row['field_default_value'] = sprintf('%2d-%2d-%4d', $now['mday'], $now['mon'], $now['year']);
-				list($day, $month, $year) = explode('-', ((!isset(phpbb::$user->profile_fields[$user_ident]) || $preview) ? $profile_row['field_default_value'] : phpbb::$user->profile_fields[$user_ident]));
-			}
-			else
-			{
-				$day = request_var($profile_row['field_ident'] . '_day', 0);
-				$month = request_var($profile_row['field_ident'] . '_month', 0);
-				$year = request_var($profile_row['field_ident'] . '_year', 0);
-			}
-		}
-
-		$profile_row['s_day_options'] = '<option value="0"' . ((!$day) ? ' selected="selected"' : '') . '>--</option>';
-		for ($i = 1; $i < 32; $i++)
-		{
-			$profile_row['s_day_options'] .= '<option value="' . $i . '"' . (($i == $day) ? ' selected="selected"' : '') . ">$i</option>";
-		}
-
-		$profile_row['s_month_options'] = '<option value="0"' . ((!$month) ? ' selected="selected"' : '') . '>--</option>';
-		for ($i = 1; $i < 13; $i++)
-		{
-			$profile_row['s_month_options'] .= '<option value="' . $i . '"' . (($i == $month) ? ' selected="selected"' : '') . ">$i</option>";
-		}
-
-		$profile_row['s_year_options'] = '<option value="0"' . ((!$year) ? ' selected="selected"' : '') . '>--</option>';
-		for ($i = $now['year'] - 100; $i <= $now['year'] + 100; $i++)
-		{
-			$profile_row['s_year_options'] .= '<option value="' . $i . '"' . (($i == $year) ? ' selected="selected"' : '') . ">$i</option>";
-		}
-		unset($now);
-
-		$profile_row['field_value'] = 0;
-		phpbb::$template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER));
-	}
-
-	/**
-	* Process bool-type
-	* @access private
-	*/
-	private function generate_bool($profile_row, $preview = false)
-	{
-		$value = $this->get_var('int', $profile_row, $profile_row['field_default_value'], $preview);
-
-		$profile_row['field_value'] = $value;
-		phpbb::$template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER));
-
-		if ($profile_row['field_length'] == 1)
-		{
-			if (!isset($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']]) || !sizeof($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']]))
-			{
-				$this->get_option_lang($profile_row['field_id'], $profile_row['lang_id'], FIELD_BOOL, $preview);
-			}
-
-			foreach ($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']] as $option_id => $option_value)
-			{
-				phpbb::$template->assign_block_vars('bool.options', array(
-					'OPTION_ID'	=> $option_id,
-					'CHECKED'	=> ($value == $option_id) ? ' checked="checked"' : '',
-					'VALUE'		=> $option_value,
-				));
-			}
-		}
-	}
-
-	/**
-	* Process string-type
-	* @access private
-	*/
-	private function generate_string($profile_row, $preview = false)
-	{
-		$profile_row['field_value'] = $this->get_var('string', $profile_row, $profile_row['lang_default_value'], $preview);
-		phpbb::$template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER));
-	}
-
-	/**
-	* Process text-type
-	* @access private
-	*/
-	private function generate_text($profile_row, $preview = false)
-	{
-		$field_length = explode('|', $profile_row['field_length']);
-		$profile_row['field_rows'] = $field_length[0];
-		$profile_row['field_cols'] = $field_length[1];
-
-		$profile_row['field_value'] = $this->get_var('string', $profile_row, $profile_row['lang_default_value'], $preview);
-		phpbb::$template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER));
-	}
-
-	/**
-	* Process dropdown-type
-	* @access private
-	*/
-	private function generate_dropdown($profile_row, $preview = false)
-	{
-		$value = $this->get_var('int', $profile_row, $profile_row['field_default_value'], $preview);
-
-		if (!isset($this->options_lang[$profile_row['field_id']]) || !isset($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']]) || !sizeof($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']]))
-		{
-			$this->get_option_lang($profile_row['field_id'], $profile_row['lang_id'], FIELD_DROPDOWN, $preview);
-		}
-
-		$profile_row['field_value'] = $value;
-		phpbb::$template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER));
-
-		foreach ($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']] as $option_id => $option_value)
-		{
-			phpbb::$template->assign_block_vars('dropdown.options', array(
-				'OPTION_ID'	=> $option_id,
-				'SELECTED'	=> ($value == $option_id) ? ' selected="selected"' : '',
-				'VALUE'		=> $option_value,
-			));
-		}
-	}
-
-	/**
-	* 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
-	*/
-	private function process_field_row($mode, $profile_row)
-	{
-		$preview = ($mode == 'preview') ? true : false;
-
-		// set template filename
-		phpbb::$template->set_filenames(array(
-			'cp_body'		=> 'custom_profile_fields.html',
-		));
-
-		// empty previously filled blockvars
-		foreach (self::$profile_types as $field_case => $field_type)
-		{
-			phpbb::$template->destroy_block_vars($field_type);
-		}
-
-		// Assign template variables
-		$type_func = 'generate_' . self::$profile_types[$profile_row['field_type']];
-		$this->$type_func($profile_row, $preview);
-
-		// Return templated data
-		return phpbb::$template->assign_display('cp_body');
-	}
-
-	/**
-	* Build Array for user insertion into custom profile fields table
-	*/
-	public static function build_insert_sql_array($cp_data)
-	{
-		$sql_not_in = array();
-		foreach ($cp_data as $key => $null)
-		{
-			$sql_not_in[] = (strncmp($key, 'pf_', 3) === 0) ? substr($key, 3) : $key;
-		}
-
-		$sql = 'SELECT f.field_type, f.field_ident, f.field_default_value, l.lang_default_value
-			FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f
-			WHERE l.lang_id = ' . phpbb::$user->get_iso_lang_id() . '
-				' . ((sizeof($sql_not_in)) ? ' AND ' . phpbb::$db->sql_in_set('f.field_ident', $sql_not_in, true) : '') . '
-				AND l.field_id = f.field_id';
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			if ($row['field_default_value'] == 'now' && $row['field_type'] == FIELD_DATE)
-			{
-				$now = getdate();
-				$row['field_default_value'] = sprintf('%2d-%2d-%4d', $now['mday'], $now['mon'], $now['year']);
-			}
-
-			$cp_data['pf_' . $row['field_ident']] = (in_array($row['field_type'], array(FIELD_TEXT, FIELD_STRING))) ? $row['lang_default_value'] : $row['field_default_value'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		return $cp_data;
-	}
-
-	/**
-	* Get profile field value on submit
-	* @access private
-	*/
-	private function get_profile_field($profile_row)
-	{
-		$var_name = 'pf_' . $profile_row['field_ident'];
-
-		switch ($profile_row['field_type'])
-		{
-			case FIELD_DATE:
-
-				if (!phpbb_request::is_set($var_name . '_day'))
-				{
-					if ($profile_row['field_default_value'] == 'now')
-					{
-						$now = getdate();
-						$profile_row['field_default_value'] = sprintf('%2d-%2d-%4d', $now['mday'], $now['mon'], $now['year']);
-					}
-					list($day, $month, $year) = explode('-', $profile_row['field_default_value']);
-				}
-				else
-				{
-					$day = request_var($var_name . '_day', 0);
-					$month = request_var($var_name . '_month', 0);
-					$year = request_var($var_name . '_year', 0);
-				}
-
-				$var = sprintf('%2d-%2d-%4d', $day, $month, $year);
-			break;
-
-			case FIELD_BOOL:
-				// Checkbox
-				if ($profile_row['field_length'] == 2)
-				{
-					$var = phpbb_request::is_set($var_name) ? 1 : 0;
-				}
-				else
-				{
-					$var = request_var($var_name, (int) $profile_row['field_default_value']);
-				}
-			break;
-
-			case FIELD_STRING:
-			case FIELD_TEXT:
-				$var = utf8_normalize_nfc(request_var($var_name, (string) $profile_row['field_default_value'], true));
-			break;
-
-			case FIELD_INT:
-				if (phpbb_request::is_set($var_name) && request_var($var_name, '') === '')
-				{
-					$var = NULL;
-				}
-				else
-				{
-					$var = request_var($var_name, (int) $profile_row['field_default_value']);
-				}
-			break;
-
-			case FIELD_DROPDOWN:
-				$var = request_var($var_name, (int) $profile_row['field_default_value']);
-			break;
-
-			default:
-				$var = request_var($var_name, $profile_row['field_default_value']);
-			break;
-		}
-
-		return $var;
-	}
-}
-
-/**
-* Custom Profile Fields ACP
-* @package phpBB3
-*/
-class custom_profile_admin extends custom_profile
-{
-	public $vars = array();
-
-	/**
-	* Return possible validation options
-	*/
-	public function validate_options()
-	{
-		$validate_ary = array('CHARS_ANY' => '.*', 'NUMBERS_ONLY' => '[0-9]+', 'ALPHA_ONLY' => '[\w]+', 'ALPHA_SPACERS' => '[\w_\+\. \-\[\]]+');
-
-		$validate_options = '';
-		foreach ($validate_ary as $lang => $value)
-		{
-			$selected = ($this->vars['field_validation'] == $value) ? ' selected="selected"' : '';
-			$validate_options .= '<option value="' . $value . '"' . $selected . '>' . phpbb::$user->lang[$lang] . '</option>';
-		}
-
-		return $validate_options;
-	}
-
-	/**
-	* Get string options for second step in ACP
-	*/
-	public function get_string_options()
-	{
-		$options = array(
-			0 => array('TITLE' => phpbb::$user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="text" name="field_length" size="5" value="' . $this->vars['field_length'] . '" />'),
-			1 => array('TITLE' => phpbb::$user->lang['MIN_FIELD_CHARS'],	'FIELD' => '<input type="text" name="field_minlen" size="5" value="' . $this->vars['field_minlen'] . '" />'),
-			2 => array('TITLE' => phpbb::$user->lang['MAX_FIELD_CHARS'],	'FIELD' => '<input type="text" name="field_maxlen" size="5" value="' . $this->vars['field_maxlen'] . '" />'),
-			3 => array('TITLE' => phpbb::$user->lang['FIELD_VALIDATION'],	'FIELD' => '<select name="field_validation">' . $this->validate_options() . '</select>')
-		);
-
-		return $options;
-	}
-
-	/**
-	* Get text options for second step in ACP
-	*/
-	public function get_text_options()
-	{
-		$options = array(
-			0 => array('TITLE' => phpbb::$user->lang['FIELD_LENGTH'],		'FIELD' => '<input name="rows" size="5" value="' . $this->vars['rows'] . '" /> ' . phpbb::$user->lang['ROWS'] . '</dd><dd><input name="columns" size="5" value="' . $this->vars['columns'] . '" /> ' . phpbb::$user->lang['COLUMNS'] . ' <input type="hidden" name="field_length" value="' . $this->vars['field_length'] . '" />'),
-			1 => array('TITLE' => phpbb::$user->lang['MIN_FIELD_CHARS'],	'FIELD' => '<input type="text" name="field_minlen" size="10" value="' . $this->vars['field_minlen'] . '" />'),
-			2 => array('TITLE' => phpbb::$user->lang['MAX_FIELD_CHARS'],	'FIELD' => '<input type="text" name="field_maxlen" size="10" value="' . $this->vars['field_maxlen'] . '" />'),
-			3 => array('TITLE' => phpbb::$user->lang['FIELD_VALIDATION'],	'FIELD' => '<select name="field_validation">' . $this->validate_options() . '</select>')
-		);
-
-		return $options;
-	}
-
-	/**
-	* Get int options for second step in ACP
-	*/
-	public function get_int_options()
-	{
-		$options = array(
-			0 => array('TITLE' => phpbb::$user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="text" name="field_length" size="5" value="' . $this->vars['field_length'] . '" />'),
-			1 => array('TITLE' => phpbb::$user->lang['MIN_FIELD_NUMBER'],	'FIELD' => '<input type="text" name="field_minlen" size="5" value="' . $this->vars['field_minlen'] . '" />'),
-			2 => array('TITLE' => phpbb::$user->lang['MAX_FIELD_NUMBER'],	'FIELD' => '<input type="text" name="field_maxlen" size="5" value="' . $this->vars['field_maxlen'] . '" />'),
-			3 => array('TITLE' => phpbb::$user->lang['DEFAULT_VALUE'],		'FIELD' => '<input type="post" name="field_default_value" value="' . $this->vars['field_default_value'] . '" />')
-		);
-
-		return $options;
-	}
-
-	/**
-	* Get bool options for second step in ACP
-	*/
-	public function get_bool_options()
-	{
-		global $lang_defs;
-
-		$default_lang_id = $lang_defs['iso'][phpbb::$config['default_lang']];
-
-		$profile_row = array(
-			'var_name'				=> 'field_default_value',
-			'field_id'				=> 1,
-			'lang_name'				=> $this->vars['lang_name'],
-			'lang_explain'			=> $this->vars['lang_explain'],
-			'lang_id'				=> $default_lang_id,
-			'field_default_value'	=> $this->vars['field_default_value'],
-			'field_ident'			=> 'field_default_value',
-			'field_type'			=> FIELD_BOOL,
-			'field_length'			=> $this->vars['field_length'],
-			'lang_options'			=> $this->vars['lang_options']
-		);
-
-		$options = array(
-			0 => array('TITLE' => phpbb::$user->lang['FIELD_TYPE'], 'EXPLAIN' => phpbb::$user->lang['BOOL_TYPE_EXPLAIN'], 'FIELD' => '<label><input type="radio" class="radio" name="field_length" value="1"' . (($this->vars['field_length'] == 1) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();" /> ' . phpbb::$user->lang['RADIO_BUTTONS'] . '</label><label><input type="radio" class="radio" name="field_length" value="2"' . (($this->vars['field_length'] == 2) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();" /> ' . phpbb::$user->lang['CHECKBOX'] . '</label>'),
-			1 => array('TITLE' => phpbb::$user->lang['DEFAULT_VALUE'], 'FIELD' => $this->process_field_row('preview', $profile_row))
-		);
-
-		return $options;
-	}
-
-	/**
-	* Get dropdown options for second step in ACP
-	*/
-	public function get_dropdown_options()
-	{
-		global $lang_defs;
-
-		$default_lang_id = $lang_defs['iso'][phpbb::$config['default_lang']];
-
-		$profile_row[0] = array(
-			'var_name'				=> 'field_default_value',
-			'field_id'				=> 1,
-			'lang_name'				=> $this->vars['lang_name'],
-			'lang_explain'			=> $this->vars['lang_explain'],
-			'lang_id'				=> $default_lang_id,
-			'field_default_value'	=> $this->vars['field_default_value'],
-			'field_ident'			=> 'field_default_value',
-			'field_type'			=> FIELD_DROPDOWN,
-			'lang_options'			=> $this->vars['lang_options']
-		);
-
-		$profile_row[1] = $profile_row[0];
-		$profile_row[1]['var_name'] = 'field_novalue';
-		$profile_row[1]['field_ident'] = 'field_novalue';
-		$profile_row[1]['field_default_value']	= $this->vars['field_novalue'];
-
-		$options = array(
-			0 => array('TITLE' => phpbb::$user->lang['DEFAULT_VALUE'], 'FIELD' => $this->process_field_row('preview', $profile_row[0])),
-			1 => array('TITLE' => phpbb::$user->lang['NO_VALUE_OPTION'], 'EXPLAIN' => phpbb::$user->lang['NO_VALUE_OPTION_EXPLAIN'], 'FIELD' => $this->process_field_row('preview', $profile_row[1]))
-		);
-
-		return $options;
-	}
-
-	/**
-	* Get date options for second step in ACP
-	*/
-	public function get_date_options()
-	{
-		global $lang_defs;
-
-		$default_lang_id = $lang_defs['iso'][phpbb::$config['default_lang']];
-
-		$profile_row = array(
-			'var_name'				=> 'field_default_value',
-			'lang_name'				=> $this->vars['lang_name'],
-			'lang_explain'			=> $this->vars['lang_explain'],
-			'lang_id'				=> $default_lang_id,
-			'field_default_value'	=> $this->vars['field_default_value'],
-			'field_ident'			=> 'field_default_value',
-			'field_type'			=> FIELD_DATE,
-			'field_length'			=> $this->vars['field_length']
-		);
-
-		$always_now = request_var('always_now', -1);
-		if ($always_now == -1)
-		{
-			$s_checked = ($this->vars['field_default_value'] == 'now') ? true : false;
-		}
-		else
-		{
-			$s_checked = ($always_now) ? true : false;
-		}
-
-		$options = array(
-			0 => array('TITLE' => phpbb::$user->lang['DEFAULT_VALUE'],	'FIELD' => $this->process_field_row('preview', $profile_row)),
-			1 => array('TITLE' => phpbb::$user->lang['ALWAYS_TODAY'],	'FIELD' => '<label><input type="radio" class="radio" name="always_now" value="1"' . (($s_checked) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();" /> ' . phpbb::$user->lang['YES'] . '</label><label><input type="radio" class="radio" name="always_now" value="0"' . ((!$s_checked) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();" /> ' . phpbb::$user->lang['NO'] . '</label>'),
-		);
-
-		return $options;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/functions_transfer.php b/phpBB/includes/functions_transfer.php
deleted file mode 100644
index 351f9517c5..0000000000
--- a/phpBB/includes/functions_transfer.php
+++ /dev/null
@@ -1,1010 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-require_once PHPBB_ROOT_PATH . 'includes/libraries/sftp/sftp.' . PHP_EXT;
-
-/**
-* Transfer class, wrapper for ftp/sftp/ssh
-* @package phpBB3
-*/
-class transfer
-{
-	var $connection;
-	var $host;
-	var $port;
-	var $username;
-	var $password;
-	var $timeout;
-	var $root_path;
-	var $tmp_path;
-	var $file_perms;
-	var $dir_perms;
-
-	/**
-	* Constructor - init some basic values
-	*/
-	function __construct()
-	{
-		$this->file_perms	= 0644;
-		$this->dir_perms	= 0777;
-
-		// We use the store directory as temporary path to circumvent open basedir restrictions
-		$this->tmp_path = PHPBB_ROOT_PATH . 'store/';
-	}
-
-	/**
-	* Write file to location
-	*/
-	public function write_file($destination_file = '', $contents = '')
-	{
-		$destination_file = $this->root_path . str_replace(PHPBB_ROOT_PATH, '', $destination_file);
-
-		// need to create a temp file and then move that temp file.
-		// ftp functions can only move files around and can't create.
-		// This means that the users will need to have access to write
-		// temporary files or have write access on a folder within phpBB
-		// like the cache folder. If the user can't do either, then
-		// he/she needs to use the fsock ftp method
-		$temp_name = tempnam($this->tmp_path, 'transfer_');
-		@unlink($temp_name);
-
-		$fp = @fopen($temp_name, 'w');
-
-		if (!$fp)
-		{
-			trigger_error('Unable to create temporary file ' . $temp_name, E_USER_ERROR);
-		}
-
-		@fwrite($fp, $contents);
-		@fclose($fp);
-
-		$result = $this->overwrite_file($temp_name, $destination_file);
-
-		// remove temporary file now
-		@unlink($temp_name);
-
-		return $result;
-	}
-
-	/**
-	* Moving file into location. If the destination file already exists it gets overwritten
-	*/
-	public function overwrite_file($source_file, $destination_file)
-	{
-		/**
-		* @todo generally think about overwriting files in another way, by creating a temporary file and then renaming it
-		* @todo check for the destination file existance too
-		*/
-		$this->_delete($destination_file);
-		$result = $this->_put($source_file, $destination_file);
-		$this->_chmod($destination_file, $this->file_perms);
-
-		return $result;
-	}
-
-	/**
-	* Create directory structure
-	*/
-	public function make_dir($dir)
-	{
-		$dir = str_replace(PHPBB_ROOT_PATH, '', $dir);
-		$dir = explode('/', $dir);
-		$dirs = '';
-
-		for ($i = 0, $total = sizeof($dir); $i < $total; $i++)
-		{
-			$result = true;
-
-			if (strpos($dir[$i], '.') === 0)
-			{
-				continue;
-			}
-			$cur_dir = $dir[$i] . '/';
-
-			if (!file_exists(PHPBB_ROOT_PATH . $dirs . $cur_dir))
-			{
-				// create the directory
-				$result = $this->_mkdir($dir[$i]);
-				$this->_chmod($dir[$i], $this->dir_perms);
-			}
-
-			$this->_chdir($this->root_path . $dirs . $dir[$i]);
-			$dirs .= $cur_dir;
-		}
-
-		$this->_chdir($this->root_path);
-
-		/**
-		* @todo stack result into array to make sure every path creation has been taken care of
-		*/
-		return $result;
-	}
-
-	/**
-	* Copy file from source location to destination location
-	*/
-	public function copy_file($from_loc, $to_loc)
-	{
-		$from_loc = ((strpos($from_loc, PHPBB_ROOT_PATH) !== 0) ? PHPBB_ROOT_PATH : '') . $from_loc;
-		$to_loc = $this->root_path . str_replace(PHPBB_ROOT_PATH, '', $to_loc);
-
-		if (!file_exists($from_loc))
-		{
-			return false;
-		}
-
-		$result = $this->overwrite_file($from_loc, $to_loc);
-
-		return $result;
-	}
-
-	/**
-	* Remove file
-	*/
-	public function delete_file($file)
-	{
-		$file = $this->root_path . str_replace(PHPBB_ROOT_PATH, '', $file);
-
-		return $this->_delete($file);
-	}
-
-	/**
-	* Remove directory
-	* @todo remove child directories?
-	*/
-	public function remove_dir($dir)
-	{
-		$dir = $this->root_path . str_replace(PHPBB_ROOT_PATH, '', $dir);
-
-		return $this->_rmdir($dir);
-	}
-
-	/**
-	* Rename a file or folder
-	*/
-	public function rename($old_handle, $new_handle)
-	{
-		$old_handle = $this->root_path . str_replace(PHPBB_ROOT_PATH, '', $old_handle);
-
-		return $this->_rename($old_handle, $new_handle);
-	}
-
-	/**
-	* Check if a specified file exist...
-	*/
-	public function file_exists($directory, $filename)
-	{
-		$directory = $this->root_path . str_replace(PHPBB_ROOT_PATH, '', $directory);
-
-		$this->_chdir($directory);
-		$result = $this->_ls('');
-
-		if ($result !== false && is_array($result))
-		{
-			return (in_array($filename, $result)) ? true : false;
-		}
-
-		return false;
-	}
-
-	/**
-	* Open session
-	*/
-	public function open_session()
-	{
-		return $this->_init();
-	}
-
-	/**
-	* Close current session
-	*/
-	public function close_session()
-	{
-		return $this->_close();
-	}
-
-	/**
-	* Determine methods able to be used
-	*/
-	public static function methods()
-	{
-		$methods = array();
-		$disabled_functions = explode(',', @ini_get('disable_functions'));
-
-		if (@extension_loaded('ftp'))
-		{
-			$methods[] = 'ftp';
-		}
-
-		if (!in_array('fsockopen', $disabled_functions))
-		{
-			$methods[] = 'ftp_fsock';
-			$methods[] = 'sftp';
-		}
-
-		return $methods;
-	}
-}
-
-/**
-* FTP transfer class
-* @package phpBB3
-*/
-class ftp extends transfer
-{
-	/**
-	* Standard parameters for FTP session
-	*/
-	function __construct($host, $username, $password, $root_path, $port = 21, $timeout = 10)
-	{
-		$this->host			= $host;
-		$this->port			= $port;
-		$this->username		= $username;
-		$this->password		= $password;
-		$this->timeout		= $timeout;
-
-		// Make sure $this->root_path is layed out the same way as the phpbb::$user->page['root_script_path'] value (/ at the end)
-		$this->root_path	= str_replace('\\', '/', $this->root_path);
-
-		if (!empty($root_path))
-		{
-			$this->root_path = (($root_path[0] != '/' ) ? '/' : '') . $root_path . ((substr($root_path, -1, 1) == '/') ? '' : '/');
-		}
-
-		// Init some needed values
-		parent::__construct();
-
-		return;
-	}
-
-	/**
-	* Requests data
-	*/
-	public static function data()
-	{
-		$root_path = phpbb::$url->realpath(PHPBB_ROOT_PATH);
-		return array(
-			'host'		=> 'localhost',
-			'username'	=> preg_match('#^/home/([^/]+)#', $root_path, $matches) ? $matches[1] : 'anonymous',
-			'password'	=> '',
-			'root_path'	=> phpbb::$user->page['root_script_path'],
-			'port'		=> 21,
-			'timeout'	=> 10
-		);
-	}
-
-	/**
-	* Init FTP Session
-	* @access private
-	*/
-	protected function _init()
-	{
-		// connect to the server
-		$this->connection = @ftp_connect($this->host, $this->port, $this->timeout);
-
-		if (!$this->connection)
-		{
-			return 'ERR_CONNECTING_SERVER';
-		}
-
-		// attempt to turn pasv mode on
-		@ftp_pasv($this->connection, true);
-
-		// login to the server
-		if (!@ftp_login($this->connection, $this->username, $this->password))
-		{
-			return 'ERR_UNABLE_TO_LOGIN';
-		}
-
-		// change to the root directory
-		if (!$this->_chdir($this->root_path))
-		{
-			return 'ERR_CHANGING_DIRECTORY';
-		}
-
-		return true;
-	}
-
-	/**
-	* Create Directory (MKDIR)
-	* @access private
-	*/
-	protected function _mkdir($dir)
-	{
-		return @ftp_mkdir($this->connection, $dir);
-	}
-
-	/**
-	* Remove directory (RMDIR)
-	* @access private
-	*/
-	protected function _rmdir($dir)
-	{
-		return @ftp_rmdir($this->connection, $dir);
-	}
-
-	/**
-	* Rename file
-	* @access private
-	*/
-	protected function _rename($old_handle, $new_handle)
-	{
-		return @ftp_rename($this->connection, $old_handle, $new_handle);
-	}
-
-	/**
-	* Change current working directory (CHDIR)
-	* @access private
-	*/
-	protected function _chdir($dir = '')
-	{
-		if ($dir && $dir !== '/')
-		{
-			if (substr($dir, -1, 1) == '/')
-			{
-				$dir = substr($dir, 0, -1);
-			}
-		}
-
-		return @ftp_chdir($this->connection, $dir);
-	}
-
-	/**
-	* change file permissions (CHMOD)
-	* @access private
-	*/
-	protected function _chmod($file, $perms)
-	{
-		if (function_exists('ftp_chmod'))
-		{
-			$err = @ftp_chmod($this->connection, $perms, $file);
-		}
-		else
-		{
-			// Unfortunatly CHMOD is not expecting an octal value...
-			// We need to transform the integer (which was an octal) to an octal representation (to get the int) and then pass as is. ;)
-			$chmod_cmd = 'CHMOD ' . base_convert($perms, 10, 8) . ' ' . $file;
-			$err = $this->_site($chmod_cmd);
-		}
-
-		return $err;
-	}
-
-	/**
-	* Upload file to location (PUT)
-	* @access private
-	*/
-	protected function _put($from_file, $to_file)
-	{
-		// get the file extension
-		$file_extension = strtolower(substr(strrchr($to_file, '.'), 1));
-
-		// We only use the BINARY file mode to cicumvent rewrite actions from ftp server (mostly linefeeds being replaced)
-		$mode = FTP_BINARY;
-
-		$to_dir = dirname($to_file);
-		$to_file = basename($to_file);
-		$this->_chdir($to_dir);
-
-		$result = @ftp_put($this->connection, $to_file, $from_file, $mode);
-		$this->_chdir($this->root_path);
-
-		return $result;
-	}
-
-	/**
-	* Delete file (DELETE)
-	* @access private
-	*/
-	protected function _delete($file)
-	{
-		return @ftp_delete($this->connection, $file);
-	}
-
-	/**
-	* Close ftp session (CLOSE)
-	* @access private
-	*/
-	protected function _close()
-	{
-		if (!$this->connection)
-		{
-			return false;
-		}
-
-		return @ftp_quit($this->connection);
-	}
-
-	/**
-	* Return current working directory (CWD)
-	* At the moment not used by parent class
-	* @access private
-	*/
-	protected function _cwd()
-	{
-		return @ftp_pwd($this->connection);
-	}
-
-	/**
-	* Return list of files in a given directory (LS)
-	* @access private
-	*/
-	protected function _ls($dir = './')
-	{
-		$list = @ftp_nlist($this->connection, $dir);
-
-		// Remove path if prepended
-		foreach ($list as $key => $item)
-		{
-			// Use same separator for item and dir
-			$item = str_replace('\\', '/', $item);
-			$dir = str_replace('\\', '/', $dir);
-
-			if (!empty($dir) && strpos($item, $dir) === 0)
-			{
-				$item = substr($item, strlen($dir));
-			}
-
-			$list[$key] = $item;
-		}
-
-		return $list;
-	}
-
-	/**
-	* FTP SITE command (ftp-only function)
-	* @access private
-	*/
-	private function _site($command)
-	{
-		return @ftp_site($this->connection, $command);
-	}
-}
-
-/**
-* FTP fsock transfer class
-*
-* @author wGEric
-* @package phpBB3
-*/
-class ftp_fsock extends transfer
-{
-	var $data_connection;
-
-	/**
-	* Standard parameters for FTP session
-	*/
-	function __construct($host, $username, $password, $root_path, $port = 21, $timeout = 10)
-	{
-		$this->host			= $host;
-		$this->port			= $port;
-		$this->username		= $username;
-		$this->password		= $password;
-		$this->timeout		= $timeout;
-
-		// Make sure $this->root_path is layed out the same way as the phpbb::$user->page['root_script_path'] value (/ at the end)
-		$this->root_path	= str_replace('\\', '/', $this->root_path);
-
-		if (!empty($root_path))
-		{
-			$this->root_path = (($root_path[0] != '/' ) ? '/' : '') . $root_path . ((substr($root_path, -1, 1) == '/') ? '' : '/');
-		}
-
-		// Init some needed values
-		parent::__construct();
-
-		return;
-	}
-
-	/**
-	* Requests data
-	*/
-	public static function data()
-	{
-		$root_path = phpbb::$url->realpath(PHPBB_ROOT_PATH);
-		return array(
-			'host'		=> 'localhost',
-			'username'	=> preg_match('#^/home/([^/]+)#', $root_path, $matches) ? $matches[1] : 'anonymous',
-			'password'	=> '',
-			'root_path'	=> phpbb::$user->page['root_script_path'],
-			'port'		=> 21,
-			'timeout'	=> 10
-		);
-	}
-
-	/**
-	* Init FTP Session
-	* @access private
-	*/
-	protected function _init()
-	{
-		$errno = 0;
-		$errstr = '';
-
-		// connect to the server
-		$this->connection = @fsockopen($this->host, $this->port, $errno, $errstr, $this->timeout);
-
-		if (!$this->connection || !$this->_check_command())
-		{
-			return 'ERR_CONNECTING_SERVER';
-		}
-
-		@stream_set_timeout($this->connection, $this->timeout);
-
-		// login
-		if (!$this->_send_command('USER', $this->username))
-		{
-			return 'ERR_UNABLE_TO_LOGIN';
-		}
-
-		if (!$this->_send_command('PASS', $this->password))
-		{
-			return 'ERR_UNABLE_TO_LOGIN';
-		}
-
-		// change to the root directory
-		if (!$this->_chdir($this->root_path))
-		{
-			return 'ERR_CHANGING_DIRECTORY';
-		}
-
-		return true;
-	}
-
-	/**
-	* Create Directory (MKDIR)
-	* @access private
-	*/
-	protected function _mkdir($dir)
-	{
-		return $this->_send_command('MKD', $dir);
-	}
-
-	/**
-	* Remove directory (RMDIR)
-	* @access private
-	*/
-	protected function _rmdir($dir)
-	{
-		return $this->_send_command('RMD', $dir);
-	}
-
-	/**
-	* Rename File
-	* @access private
-	*/
-	protected function _rename($old_handle, $new_handle)
-	{
-		$this->_send_command('RNFR', $old_handle);
-		return $this->_send_command('RNTO', $new_handle);
-	}
-
-	/**
-	* Change current working directory (CHDIR)
-	* @access private
-	*/
-	protected function _chdir($dir = '')
-	{
-		if ($dir && $dir !== '/')
-		{
-			if (substr($dir, -1, 1) == '/')
-			{
-				$dir = substr($dir, 0, -1);
-			}
-		}
-
-		return $this->_send_command('CWD', $dir);
-	}
-
-	/**
-	* change file permissions (CHMOD)
-	* @access private
-	*/
-	protected function _chmod($file, $perms)
-	{
-		// Unfortunatly CHMOD is not expecting an octal value...
-		// We need to transform the integer (which was an octal) to an octal representation (to get the int) and then pass as is. ;)
-		return $this->_send_command('SITE CHMOD', base_convert($perms, 10, 8) . ' ' . $file);
-	}
-
-	/**
-	* Upload file to location (PUT)
-	* @access private
-	*/
-	protected function _put($from_file, $to_file)
-	{
-		// We only use the BINARY file mode to cicumvent rewrite actions from ftp server (mostly linefeeds being replaced)
-		// 'I' == BINARY
-		// 'A' == ASCII
-		if (!$this->_send_command('TYPE', 'I'))
-		{
-			return false;
-		}
-
-		// open the connection to send file over
-		if (!$this->_open_data_connection())
-		{
-			return false;
-		}
-
-		$this->_send_command('STOR', $to_file, false);
-
-		// send the file
-		$fp = @fopen($from_file, 'rb');
-		while (!@feof($fp))
-		{
-			@fwrite($this->data_connection, @fread($fp, 4096));
-		}
-		@fclose($fp);
-
-		// close connection
-		$this->_close_data_connection();
-
-		return $this->_check_command();
-	}
-
-	/**
-	* Delete file (DELETE)
-	* @access private
-	*/
-	protected function _delete($file)
-	{
-		return $this->_send_command('DELE', $file);
-	}
-
-	/**
-	* Close ftp session (CLOSE)
-	* @access private
-	*/
-	protected function _close()
-	{
-		if (!$this->connection)
-		{
-			return false;
-		}
-
-		return $this->_send_command('QUIT');
-	}
-
-	/**
-	* Return current working directory (CWD)
-	* At the moment not used by parent class
-	* @access private
-	*/
-	protected function _cwd()
-	{
-		$this->_send_command('PWD', '', false);
-		return preg_replace('#^[0-9]{3} "(.+)" .+\r\n#', '\\1', $this->_check_command(true));
-	}
-
-	/**
-	* Return list of files in a given directory (LS)
-	* @access private
-	*/
-	protected function _ls($dir = './')
-	{
-		if (!$this->_open_data_connection())
-		{
-			return false;
-		}
-
-		$this->_send_command('NLST', $dir);
-
-		$list = array();
-		while (!@feof($this->data_connection))
-		{
-			$list[] = preg_replace('#[\r\n]#', '', @fgets($this->data_connection, 512));
-		}
-		$this->_close_data_connection();
-
-		// Clear buffer
-		$this->_check_command();
-
-		// Remove path if prepended
-		foreach ($list as $key => $item)
-		{
-			// Use same separator for item and dir
-			$item = str_replace('\\', '/', $item);
-			$dir = str_replace('\\', '/', $dir);
-
-			if (strpos($item, $dir) === 0)
-			{
-				$item = substr($item, strlen($dir));
-			}
-
-			$list[$key] = $item;
-		}
-
-		return $list;
-	}
-
-	/**
-	* Send a command to server (FTP fsock only function)
-	* @access private
-	*/
-	private function _send_command($command, $args = '', $check = true)
-	{
-		if (!empty($args))
-		{
-			$command = "$command $args";
-		}
-
-		fwrite($this->connection, $command . "\r\n");
-
-		if ($check === true && !$this->_check_command())
-		{
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	* Opens a connection to send data (FTP fosck only function)
-	* @access private
-	*/
-	private function _open_data_connection()
-	{
-		$this->_send_command('PASV', '', false);
-
-		if (!$ip_port = $this->_check_command(true))
-		{
-			return false;
-		}
-
-		// open the connection to start sending the file
-		if (!preg_match('#[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+#', $ip_port, $temp))
-		{
-			// bad ip and port
-			return false;
-		}
-
-		$temp = explode(',', $temp[0]);
-		$server_ip = $temp[0] . '.' . $temp[1] . '.' . $temp[2] . '.' . $temp[3];
-		$server_port = $temp[4] * 256 + $temp[5];
-		$errno = 0;
-		$errstr = '';
-
-		if (!$this->data_connection = @fsockopen($server_ip, $server_port, $errno, $errstr, $this->timeout))
-		{
-			return false;
-		}
-		@stream_set_timeout($this->data_connection, $this->timeout);
-
-		return true;
-	}
-
-	/**
-	* Closes a connection used to send data
-	* @access private
-	*/
-	private function _close_data_connection()
-	{
-		return @fclose($this->data_connection);
-	}
-
-	/**
-	* Check to make sure command was successful (FTP fsock only function)
-	* @access private
-	*/
-	private function _check_command($return = false)
-	{
-		$response = '';
-
-		do
-		{
-			$result = @fgets($this->connection, 512);
-			$response .= $result;
-		}
-		while (substr($response, 3, 1) != ' ');
-
-		if (!preg_match('#^[123]#', $response))
-		{
-			return false;
-		}
-
-		return ($return) ? $response : true;
-	}
-}
-
-/**
-* SFTP transfer class
-* @package phpBB3
-*/
-class sftp extends transfer
-{
-	var $current_path;
-
-	/**
-	* Standard parameters for SFTP session
-	*/
-	function __construct($host, $username, $password, $root_path, $port = 22, $timeout = 10)
-	{
-		$this->host			= $host;
-		$this->port			= $port;
-		$this->username		= $username;
-		$this->password		= $password;
-		$this->timeout		= $timeout;
-
-		// Make sure $this->root_path is layed out the same way as the phpbb::$user->page['root_script_path'] value (/ at the end)
-		$this->root_path	= str_replace('\\', '/', $this->root_path);
-
-		if (!empty($root_path))
-		{
-			$this->root_path = (($root_path[0] != '/' ) ? '/' : '') . $root_path . ((substr($root_path, -1, 1) == '/') ? '' : '/');
-		}
-
-		// Init some needed values
-		parent::__construct();
-
-		return;
-	}
-
-	/**
-	* Requests data
-	*/
-	public static function data()
-	{
-		$root_path = phpbb::$url->realpath(PHPBB_ROOT_PATH);
-		return array(
-			'host'		=> 'localhost',
-			'username'	=> preg_match('#^/home/([^/]+)#', $root_path, $matches) ? $matches[1] : 'anonymous',
-			'password'	=> '',
-			'root_path'	=> $root_path,
-			'port'		=> 22,
-			'timeout'	=> 10
-		);
-	}
-	/**
-	* Init SFTP Session
-	* @access private
-	*/
-	protected function _init()
-	{
-		// connect to the server
-		$this->connection = new ssh2_sftp($this->host, $this->port, $this->timeout);
-
-		if (!$this->connection->login($this->username, $this->password))
-		{
-			return 'ERR_CONNECTING_SERVER';
-		}
-
-		// change to the root directory
-		if (!$this->_chdir($this->root_path))
-		{
-			return 'ERR_CHANGING_DIRECTORY';
-		}
-
-		return true;
-	}
-
-	/**
-	* Create Directory (MKDIR)
-	* @access private
-	*/
-	protected function _mkdir($dir)
-	{
-		return $this->connection->mkdir($dir);
-	}
-
-	/**
-	* Remove directory (RMDIR)
-	* @access private
-	*/
-	protected function _rmdir($dir)
-	{
-		return $this->connection->rmdir($dir);
-	}
-
-	/**
-	* Rename File
-	* @access private
-	*/
-	protected function _rename($old_handle, $new_handle)
-	{
-		return $this->connection->rename($old_handle, $new_handle);
-	}
-
-	/**
-	* Change current working directory (CHDIR)
-	* @access private
-	*/
-	protected function _chdir($dir = '')
-	{
-		return $this->connection->chdir($dir);
-	}
-
-	/**
-	* change file permissions (CHMOD)
-	* @access private
-	*/
-	protected function _chmod($file, $perms)
-	{
-		return $this->connection->chmod($file, $perms);
-	}
-
-	/**
-	* Upload file to location (PUT)
-	* @access private
-	*/
-	protected function _put($from_file, $to_file)
-	{
-		return $this->connection->put($to_file, $from_file, NET_SFTP_LOCAL_FILE);
-	}
-
-	/**
-	* Delete file (DELETE)
-	* @access private
-	*/
-	protected function _delete($file)
-	{
-		return $this->connection->delete($file);
-	}
-
-	/**
-	* Close ftp session (CLOSE)
-	* @access private
-	*/
-	protected function _close()
-	{
-		if (!$this->connection)
-		{
-			return false;
-		}
-
-		return $this->connection->disconnect();
-	}
-
-	/**
-	* Return current working directory (CWD)
-	* At the moment not used by parent class
-	* @access private
-	*/
-	protected function _cwd()
-	{
-		return $this->connection->pwd();
-	}
-
-	/**
-	* Return list of files in a given directory (LS)
-	* @access private
-	*/
-	protected function _ls($dir = './')
-	{
-		$list = $this->connection->nlist($dir);
-
-		// Remove path if prepended
-		foreach ($list as $key => $item)
-		{
-			// Use same separator for item and dir
-			$item = str_replace('\\', '/', $item);
-			$dir = str_replace('\\', '/', $dir);
-
-			if (strpos($item, $dir) === 0)
-			{
-				$item = substr($item, strlen($dir));
-			}
-
-			$list[$key] = $item;
-		}
-
-		return $list;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php
deleted file mode 100644
index 363bfdd768..0000000000
--- a/phpBB/includes/functions_upload.php
+++ /dev/null
@@ -1,977 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Responsible for holding all file relevant information, as well as doing file-specific operations.
-* The {@link fileupload fileupload class} can be used to upload several files, each of them being this object to operate further on.
-* @package phpBB3
-*/
-class filespec
-{
-	var $filename = '';
-	var $realname = '';
-	var $uploadname = '';
-	var $mimetype = '';
-	var $extension = '';
-	var $filesize = 0;
-	var $width = 0;
-	var $height = 0;
-	var $image_info = array();
-
-	var $destination_file = '';
-	var $destination_path = '';
-
-	var $file_moved = false;
-	var $init_error = false;
-	var $local = false;
-
-	var $error = array();
-
-	var $upload = '';
-
-	/**
-	* File Class
-	* @access private
-	*/
-	function __construct($upload_ary, $upload_namespace)
-	{
-		if (!isset($upload_ary))
-		{
-			$this->init_error = true;
-			return;
-		}
-
-		$this->filename = $upload_ary['tmp_name'];
-		$this->filesize = $upload_ary['size'];
-		$name = trim(htmlspecialchars(basename($upload_ary['name'])));
-		$this->realname = $this->uploadname = (STRIP) ? stripslashes($name) : $name;
-		$this->mimetype = $upload_ary['type'];
-
-		// Opera adds the name to the mime type
-		$this->mimetype	= (strpos($this->mimetype, '; name') !== false) ? str_replace(strstr($this->mimetype, '; name'), '', $this->mimetype) : $this->mimetype;
-
-		if (!$this->mimetype)
-		{
-			$this->mimetype = 'application/octetstream';
-		}
-
-		$this->extension = strtolower($this->get_extension($this->realname));
-
-		// Try to get real filesize from temporary folder (not always working) ;)
-		$this->filesize = (@filesize($this->filename)) ? @filesize($this->filename) : $this->filesize;
-
-		$this->width = $this->height = 0;
-		$this->file_moved = false;
-
-		$this->local = (isset($upload_ary['local_mode'])) ? true : false;
-		$this->upload = $upload_namespace;
-	}
-
-	/**
-	* Cleans destination filename
-	*
-	* @param real|unique|unique_ext $mode real creates a realname, filtering some characters, lowering every character. Unique creates an unique filename
-	* @param string $prefix Prefix applied to filename
-	* @access public
-	*/
-	function clean_filename($mode = 'unique', $prefix = '', $user_id = '')
-	{
-		if ($this->init_error)
-		{
-			return;
-		}
-
-		switch ($mode)
-		{
-			case 'real':
-				// Remove every extension from filename (to not let the mime bug being exposed)
-				if (strpos($this->realname, '.') !== false)
-				{
-					$this->realname = substr($this->realname, 0, strpos($this->realname, '.'));
-				}
-
-				// Replace any chars which may cause us problems with _
-				$bad_chars = array("'", "\\", ' ', '/', ':', '*', '?', '"', '<', '>', '|');
-
-				$this->realname = rawurlencode(str_replace($bad_chars, '_', strtolower($this->realname)));
-				$this->realname = preg_replace("/%(\w{2})/", '_', $this->realname);
-
-				$this->realname = $prefix . $this->realname . '.' . $this->extension;
-			break;
-
-			case 'unique':
-				$this->realname = $prefix . md5(unique_id());
-			break;
-
-			case 'avatar':
-				$this->extension = strtolower($this->extension);
-				$this->realname = $prefix . $user_id . '.' . $this->extension;
-
-			break;
-
-			case 'unique_ext':
-			default:
-				$this->realname = $prefix . md5(unique_id()) . '.' . $this->extension;
-			break;
-		}
-	}
-
-	/**
-	* Get property from file object
-	*/
-	function get($property)
-	{
-		if ($this->init_error || !isset($this->$property))
-		{
-			return false;
-		}
-
-		return $this->$property;
-	}
-
-	/**
-	* Check if file is an image (mimetype)
-	*
-	* @return true if it is an image, false if not
-	*/
-	function is_image()
-	{
-		return (strpos($this->mimetype, 'image/') !== false) ? true : false;
-	}
-
-	/**
-	* Check if the file got correctly uploaded
-	*
-	* @return true if it is a valid upload, false if not
-	*/
-	function is_uploaded()
-	{
-		if (!$this->local && !is_uploaded_file($this->filename))
-		{
-			return false;
-		}
-
-		if ($this->local && !file_exists($this->filename))
-		{
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	* Remove file
-	*/
-	function remove()
-	{
-		if ($this->file_moved)
-		{
-			@unlink($this->destination_file);
-		}
-	}
-
-	/**
-	* Get file extension
-	*/
-	function get_extension($filename)
-	{
-		if (strpos($filename, '.') === false)
-		{
-			return '';
-		}
-
-		$filename = explode('.', $filename);
-		return array_pop($filename);
-	}
-
-	/**
-	* Get mimetype. Utilize mime_content_type if the function exist.
-	* Not used at the moment...
-	*/
-	function get_mimetype($filename)
-	{
-		$mimetype = '';
-
-		if (function_exists('mime_content_type'))
-		{
-			$mimetype = mime_content_type($filename);
-		}
-
-		// Some browsers choke on a mimetype of application/octet-stream
-		if (!$mimetype || $mimetype == 'application/octet-stream')
-		{
-			$mimetype = 'application/octetstream';
-		}
-
-		return $mimetype;
-	}
-
-	/**
-	* Get filesize
-	*/
-	function get_filesize($filename)
-	{
-		return @filesize($filename);
-	}
-
-
-	/**
-	* Check the first 256 bytes for forbidden content
-	*/
-	function check_content($disallowed_content)
-	{
-		if (empty($disallowed_content))
-		{
-			return true;
-		}
-
-		$fp = @fopen($this->filename, 'rb');
-
-		if ($fp !== false)
-		{
-			$ie_mime_relevant = fread($fp, 256);
-			fclose($fp);
-			foreach ($disallowed_content as $forbidden)
-			{
-				if (stripos($ie_mime_relevant, '<' . $forbidden) !== false)
-				{
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	/**
-	* Move file to destination folder
-	* The phpbb_root_path variable will be applied to the destination path
-	*
-	* @param string $destination_path Destination path, for example phpbb::$config['avatar_path']
-	* @param bool $overwrite If set to true, an already existing file will be overwritten
-	* @param string $chmod Permission mask for chmodding the file after a successful move. The mode entered here is the octal permission mask.
-	*
-	* @access public
-	*/
-	function move_file($destination, $overwrite = false, $skip_image_check = false, $chmod = false)
-	{
-		if (sizeof($this->error))
-		{
-			return false;
-		}
-
-		$chmod = ($chmod === false) ? phpbb::CHMOD_READ | phpbb::CHMOD_WRITE : $chmod;
-
-		// We need to trust the admin in specifying valid upload directories and an attacker not being able to overwrite it...
-		$this->destination_path = PHPBB_ROOT_PATH . $destination;
-
-		// Check if the destination path exist...
-		if (!file_exists($this->destination_path))
-		{
-			@unlink($this->filename);
-			return false;
-		}
-
-		$upload_mode = (@ini_get('open_basedir') || @ini_get('safe_mode') || strtolower(@ini_get('safe_mode')) == 'on') ? 'move' : 'copy';
-		$upload_mode = ($this->local) ? 'local' : $upload_mode;
-		$this->destination_file = $this->destination_path . '/' . basename($this->realname);
-
-		// Check if the file already exist, else there is something wrong...
-		if (file_exists($this->destination_file) && !$overwrite)
-		{
-			@unlink($this->filename);
-		}
-		else
-		{
-			if (file_exists($this->destination_file))
-			{
-				@unlink($this->destination_file);
-			}
-
-			switch ($upload_mode)
-			{
-				case 'copy':
-
-					if (!@copy($this->filename, $this->destination_file))
-					{
-						if (!@move_uploaded_file($this->filename, $this->destination_file))
-						{
-							$this->error[] = sprintf(phpbb::$user->lang[$this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR'], $this->destination_file);
-							return false;
-						}
-					}
-
-					@unlink($this->filename);
-
-				break;
-
-				case 'move':
-
-					if (!@move_uploaded_file($this->filename, $this->destination_file))
-					{
-						if (!@copy($this->filename, $this->destination_file))
-						{
-							$this->error[] = sprintf(phpbb::$user->lang[$this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR'], $this->destination_file);
-							return false;
-						}
-					}
-
-					@unlink($this->filename);
-
-				break;
-
-				case 'local':
-
-					if (!@copy($this->filename, $this->destination_file))
-					{
-						$this->error[] = sprintf(phpbb::$user->lang[$this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR'], $this->destination_file);
-						return false;
-					}
-					@unlink($this->filename);
-
-				break;
-			}
-
-			phpbb::$system->chmod($this->destination_file, $chmod);
-		}
-
-		// Try to get real filesize from destination folder
-		$this->filesize = (@filesize($this->destination_file)) ? @filesize($this->destination_file) : $this->filesize;
-
-		if ($this->is_image() && !$skip_image_check)
-		{
-			$this->width = $this->height = 0;
-
-			if (($this->image_info = @getimagesize($this->destination_file)) !== false)
-			{
-				$this->width = $this->image_info[0];
-				$this->height = $this->image_info[1];
-
-				if (!empty($this->image_info['mime']))
-				{
-					$this->mimetype = $this->image_info['mime'];
-				}
-
-				// Check image type
-				$types = $this->upload->image_types();
-
-				if (!isset($types[$this->image_info[2]]) || !in_array($this->extension, $types[$this->image_info[2]]))
-				{
-					if (!isset($types[$this->image_info[2]]))
-					{
-						$this->error[] = sprintf(phpbb::$user->lang['IMAGE_FILETYPE_INVALID'], $this->image_info[2], $this->mimetype);
-					}
-					else
-					{
-						$this->error[] = sprintf(phpbb::$user->lang['IMAGE_FILETYPE_MISMATCH'], $types[$this->image_info[2]][0], $this->extension);
-					}
-				}
-
-				// Make sure the dimensions match a valid image
-				if (empty($this->width) || empty($this->height))
-				{
-					$this->error[] = phpbb::$user->lang['ATTACHED_IMAGE_NOT_IMAGE'];
-				}
-			}
-			else
-			{
-				$this->error[] = phpbb::$user->lang['UNABLE_GET_IMAGE_SIZE'];
-			}
-		}
-
-		$this->file_moved = true;
-		$this->additional_checks();
-		unset($this->upload);
-
-		return true;
-	}
-
-	/**
-	* Performing additional checks
-	*/
-	function additional_checks()
-	{
-		if (!$this->file_moved)
-		{
-			return false;
-		}
-
-		// Filesize is too big or it's 0 if it was larger than the maxsize in the upload form
-		if ($this->upload->max_filesize && ($this->get('filesize') > $this->upload->max_filesize || $this->filesize == 0))
-		{
-			$size_lang = ($this->upload->max_filesize >= 1048576) ? phpbb::$user->lang['MIB'] : (($this->upload->max_filesize >= 1024) ? phpbb::$user->lang['KIB'] : phpbb::$user->lang['BYTES'] );
-			$max_filesize = get_formatted_filesize($this->upload->max_filesize, false);
-
-			$this->error[] = sprintf(phpbb::$user->lang[$this->upload->error_prefix . 'WRONG_FILESIZE'], $max_filesize, $size_lang);
-
-			return false;
-		}
-
-		if (!$this->upload->valid_dimensions($this))
-		{
-			$this->error[] = sprintf(phpbb::$user->lang[$this->upload->error_prefix . 'WRONG_SIZE'], $this->upload->min_width, $this->upload->min_height, $this->upload->max_width, $this->upload->max_height, $this->width, $this->height);
-
-			return false;
-		}
-
-		return true;
-	}
-}
-
-/**
-* Class for assigning error messages before a real filespec class can be assigned
-*
-* @package phpBB3
-*/
-class fileerror extends filespec
-{
-	function fileerror($error_msg)
-	{
-		$this->error[] = $error_msg;
-	}
-}
-
-/**
-* File upload class
-* Init class (all parameters optional and able to be set/overwritten separately) - scope is global and valid for all uploads
-*
-* @package phpBB3
-*/
-class fileupload
-{
-	var $allowed_extensions = array();
-	var $disallowed_content = array();
-	var $max_filesize = 0;
-	var $min_width = 0;
-	var $min_height = 0;
-	var $max_width = 0;
-	var $max_height = 0;
-	var $error_prefix = '';
-
-	/**
-	* Init file upload class.
-	*
-	* @param string $error_prefix Used error messages will get prefixed by this string
-	* @param array $allowed_extensions Array of allowed extensions, for example array('jpg', 'jpeg', 'gif', 'png')
-	* @param int $max_filesize Maximum filesize
-	* @param int $min_width Minimum image width (only checked for images)
-	* @param int $min_height Minimum image height (only checked for images)
-	* @param int $max_width Maximum image width (only checked for images)
-	* @param int $max_height Maximum image height (only checked for images)
-	*
-	*/
-	function __construct($error_prefix = '', $allowed_extensions = false, $max_filesize = false, $min_width = false, $min_height = false, $max_width = false, $max_height = false, $disallowed_content = false)
-	{
-		$this->set_allowed_extensions($allowed_extensions);
-		$this->set_max_filesize($max_filesize);
-		$this->set_allowed_dimensions($min_width, $min_height, $max_width, $max_height);
-		$this->set_error_prefix($error_prefix);
-		$this->set_disallowed_content($disallowed_content);
-	}
-
-	/**
-	* Reset vars
-	*/
-	function reset_vars()
-	{
-		$this->max_filesize = 0;
-		$this->min_width = $this->min_height = $this->max_width = $this->max_height = 0;
-		$this->error_prefix = '';
-		$this->allowed_extensions = array();
-		$this->disallowed_content = array();
-	}
-
-	/**
-	* Set allowed extensions
-	*/
-	function set_allowed_extensions($allowed_extensions)
-	{
-		if ($allowed_extensions !== false && is_array($allowed_extensions))
-		{
-			$this->allowed_extensions = $allowed_extensions;
-		}
-	}
-
-	/**
-	* Set allowed dimensions
-	*/
-	function set_allowed_dimensions($min_width, $min_height, $max_width, $max_height)
-	{
-		$this->min_width = (int) $min_width;
-		$this->min_height = (int) $min_height;
-		$this->max_width = (int) $max_width;
-		$this->max_height = (int) $max_height;
-	}
-
-	/**
-	* Set maximum allowed filesize
-	*/
-	function set_max_filesize($max_filesize)
-	{
-		if ($max_filesize !== false && (int) $max_filesize)
-		{
-			$this->max_filesize = (int) $max_filesize;
-		}
-	}
-
-	/**
-	* Set disallowed strings
-	*/
-	function set_disallowed_content($disallowed_content)
-	{
-		if ($disallowed_content !== false && is_array($disallowed_content))
-		{
-			$this->disallowed_content = $disallowed_content;
-		}
-	}
-
-	/**
-	* Set error prefix
-	*/
-	function set_error_prefix($error_prefix)
-	{
-		$this->error_prefix = $error_prefix;
-	}
-
-	/**
-	* Form upload method
-	* Upload file from users harddisk
-	*
-	* @param string $form_name Form name assigned to the file input field (if it is an array, the key has to be specified)
-	* @return object $file Object "filespec" is returned, all further operations can be done with this object
-	* @access public
-	*/
-	function form_upload($form_name)
-	{
-		unset($_FILES[$form_name]['local_mode']);
-		$file = new filespec($_FILES[$form_name], $this);
-
-		if ($file->init_error)
-		{
-			$file->error[] = '';
-			return $file;
-		}
-
-		// Error array filled?
-		if (isset($_FILES[$form_name]['error']))
-		{
-			$error = $this->assign_internal_error($_FILES[$form_name]['error']);
-
-			if ($error !== false)
-			{
-				$file->error[] = $error;
-				return $file;
-			}
-		}
-
-		// Check if empty file got uploaded (not catched by is_uploaded_file)
-		if (isset($_FILES[$form_name]['size']) && $_FILES[$form_name]['size'] == 0)
-		{
-			$file->error[] = phpbb::$user->lang[$this->error_prefix . 'EMPTY_FILEUPLOAD'];
-			return $file;
-		}
-
-		// PHP Upload filesize exceeded
-		if ($file->get('filename') == 'none')
-		{
-			$max_filesize = @ini_get('upload_max_filesize');
-			$unit = 'MB';
-
-			if (!empty($max_filesize))
-			{
-				$unit = strtolower(substr($max_filesize, -1, 1));
-				$max_filesize = (int) $max_filesize;
-
-				$unit = ($unit == 'k') ? 'KB' : (($unit == 'g') ? 'GB' : 'MB');
-			}
-
-			$file->error[] = (empty($max_filesize)) ? phpbb::$user->lang[$this->error_prefix . 'PHP_SIZE_NA'] : phpbb::$user->lang($this->error_prefix . 'PHP_SIZE_OVERRUN', $max_filesize, phpbb::$user->lang[$unit]);
-			return $file;
-		}
-
-		// Not correctly uploaded
-		if (!$file->is_uploaded())
-		{
-			$file->error[] = phpbb::$user->lang[$this->error_prefix . 'NOT_UPLOADED'];
-			return $file;
-		}
-
-		$this->common_checks($file);
-
-		return $file;
-	}
-
-	/**
-	* Move file from another location to phpBB
-	*/
-	function local_upload($source_file, $filedata = false)
-	{
-		$form_name = 'local';
-
-		$_FILES[$form_name]['local_mode'] = true;
-		$_FILES[$form_name]['tmp_name'] = $source_file;
-
-		if ($filedata === false)
-		{
-			$_FILES[$form_name]['name'] = basename($source_file);
-			$_FILES[$form_name]['size'] = 0;
-			$mimetype = '';
-
-			if (function_exists('mime_content_type'))
-			{
-				$mimetype = mime_content_type($source_file);
-			}
-
-			// Some browsers choke on a mimetype of application/octet-stream
-			if (!$mimetype || $mimetype == 'application/octet-stream')
-			{
-				$mimetype = 'application/octetstream';
-			}
-
-			$_FILES[$form_name]['type'] = $mimetype;
-		}
-		else
-		{
-			$_FILES[$form_name]['name'] = $filedata['realname'];
-			$_FILES[$form_name]['size'] = $filedata['size'];
-			$_FILES[$form_name]['type'] = $filedata['type'];
-		}
-
-		$file = new filespec($_FILES[$form_name], $this);
-
-		if ($file->init_error)
-		{
-			$file->error[] = '';
-			return $file;
-		}
-
-		if (isset($_FILES[$form_name]['error']))
-		{
-			$error = $this->assign_internal_error($_FILES[$form_name]['error']);
-
-			if ($error !== false)
-			{
-				$file->error[] = $error;
-				return $file;
-			}
-		}
-
-		// PHP Upload filesize exceeded
-		if ($file->get('filename') == 'none')
-		{
-			$max_filesize = @ini_get('upload_max_filesize');
-			$unit = 'MB';
-
-			if (!empty($max_filesize))
-			{
-				$unit = strtolower(substr($max_filesize, -1, 1));
-				$max_filesize = (int) $max_filesize;
-
-				$unit = ($unit == 'k') ? 'KB' : (($unit == 'g') ? 'GB' : 'MB');
-			}
-
-			$file->error[] = (empty($max_filesize)) ? phpbb::$user->lang[$this->error_prefix . 'PHP_SIZE_NA'] : phpbb::$user->lang($this->error_prefix . 'PHP_SIZE_OVERRUN', $max_filesize, phpbb::$user->lang[$unit]);
-			return $file;
-		}
-
-		// Not correctly uploaded
-		if (!$file->is_uploaded())
-		{
-			$file->error[] = phpbb::$user->lang[$this->error_prefix . 'NOT_UPLOADED'];
-			return $file;
-		}
-
-		$this->common_checks($file);
-
-		return $file;
-	}
-
-	/**
-	* Remote upload method
-	* Uploads file from given url
-	*
-	* @param string $upload_url URL pointing to file to upload, for example http://www.foobar.com/example.gif
-	* @return object $file Object "filespec" is returned, all further operations can be done with this object
-	* @access public
-	*/
-	function remote_upload($upload_url)
-	{
-		$upload_ary = array();
-		$upload_ary['local_mode'] = true;
-
-		if (!preg_match('#^(https?://).*?\.(' . implode('|', $this->allowed_extensions) . ')$#i', $upload_url, $match))
-		{
-			$file = new fileerror(phpbb::$user->lang[$this->error_prefix . 'URL_INVALID']);
-			return $file;
-		}
-
-		if (empty($match[2]))
-		{
-			$file = new fileerror(phpbb::$user->lang[$this->error_prefix . 'URL_INVALID']);
-			return $file;
-		}
-
-		$url = parse_url($upload_url);
-
-		$host = $url['host'];
-		$path = $url['path'];
-		$port = (!empty($url['port'])) ? (int) $url['port'] : 80;
-
-		$upload_ary['type'] = 'application/octet-stream';
-
-		$url['path'] = explode('.', $url['path']);
-		$ext = array_pop($url['path']);
-
-		$url['path'] = implode('', $url['path']);
-		$upload_ary['name'] = basename($url['path']) . (($ext) ? '.' . $ext : '');
-		$filename = $url['path'];
-		$filesize = 0;
-
-		$errno = 0;
-		$errstr = '';
-
-		if (!($fsock = @fsockopen($host, $port, $errno, $errstr)))
-		{
-			$file = new fileerror(phpbb::$user->lang[$this->error_prefix . 'NOT_UPLOADED']);
-			return $file;
-		}
-
-		// Make sure $path not beginning with /
-		if (strpos($path, '/') === 0)
-		{
-			$path = substr($path, 1);
-		}
-
-		fputs($fsock, 'GET /' . $path . " HTTP/1.1\r\n");
-		fputs($fsock, "HOST: " . $host . "\r\n");
-		fputs($fsock, "Connection: close\r\n\r\n");
-
-		$get_info = false;
-		$data = '';
-		while (!@feof($fsock))
-		{
-			if ($get_info)
-			{
-				$data .= @fread($fsock, 1024);
-			}
-			else
-			{
-				$line = @fgets($fsock, 1024);
-
-				if ($line == "\r\n")
-				{
-					$get_info = true;
-				}
-				else
-				{
-					if (stripos($line, 'content-type: ') !== false)
-					{
-						$upload_ary['type'] = rtrim(str_replace('content-type: ', '', strtolower($line)));
-					}
-					else if (stripos($line, '404 not found') !== false)
-					{
-						$file = new fileerror(phpbb::$user->lang[$this->error_prefix . 'URL_NOT_FOUND']);
-						return $file;
-					}
-				}
-			}
-		}
-		@fclose($fsock);
-
-		if (empty($data))
-		{
-			$file = new fileerror(phpbb::$user->lang[$this->error_prefix . 'EMPTY_REMOTE_DATA']);
-			return $file;
-		}
-
-		$tmp_path = (!@ini_get('safe_mode') || strtolower(@ini_get('safe_mode')) == 'off') ? false : PHPBB_ROOT_PATH . 'cache';
-		$filename = tempnam($tmp_path, unique_id() . '-');
-
-		if (!($fp = @fopen($filename, 'wb')))
-		{
-			$file = new fileerror(phpbb::$user->lang[$this->error_prefix . 'NOT_UPLOADED']);
-			return $file;
-		}
-
-		$upload_ary['size'] = fwrite($fp, $data);
-		fclose($fp);
-		unset($data);
-
-		$upload_ary['tmp_name'] = $filename;
-
-		$file = new filespec($upload_ary, $this);
-		$this->common_checks($file);
-
-		return $file;
-	}
-
-	/**
-	* Assign internal error
-	* @access private
-	*/
-	function assign_internal_error($errorcode)
-	{
-		switch ($errorcode)
-		{
-			case 1:
-				$max_filesize = @ini_get('upload_max_filesize');
-				$unit = 'MB';
-
-				if (!empty($max_filesize))
-				{
-					$unit = strtolower(substr($max_filesize, -1, 1));
-					$max_filesize = (int) $max_filesize;
-
-					$unit = ($unit == 'k') ? 'KB' : (($unit == 'g') ? 'GB' : 'MB');
-				}
-
-				$error = (empty($max_filesize)) ? phpbb::$user->lang[$this->error_prefix . 'PHP_SIZE_NA'] : phpbb::$user->lang($this->error_prefix . 'PHP_SIZE_OVERRUN', $max_filesize, phpbb::$user->lang[$unit]);
-			break;
-
-			case 2:
-				$size_lang = ($this->max_filesize >= 1048576) ? phpbb::$user->lang['MIB'] : (($this->max_filesize >= 1024) ? phpbb::$user->lang['KIB'] : phpbb::$user->lang['BYTES']);
-				$max_filesize = get_formatted_filesize($this->max_filesize, false);
-
-				$error = sprintf(phpbb::$user->lang[$this->error_prefix . 'WRONG_FILESIZE'], $max_filesize, $size_lang);
-			break;
-
-			case 3:
-				$error = phpbb::$user->lang[$this->error_prefix . 'PARTIAL_UPLOAD'];
-			break;
-
-			case 4:
-				$error = phpbb::$user->lang[$this->error_prefix . 'NOT_UPLOADED'];
-			break;
-
-			case 6:
-				$error = 'Temporary folder could not be found. Please check your PHP installation.';
-			break;
-
-			default:
-				$error = false;
-			break;
-		}
-
-		return $error;
-	}
-
-	/**
-	* Perform common checks
-	*/
-	function common_checks(&$file)
-	{
-		// Filesize is too big or it's 0 if it was larger than the maxsize in the upload form
-		if ($this->max_filesize && ($file->get('filesize') > $this->max_filesize || $file->get('filesize') == 0))
-		{
-			$size_lang = ($this->max_filesize >= 1048576) ? phpbb::$user->lang['MIB'] : (($this->max_filesize >= 1024) ? phpbb::$user->lang['KIB'] : phpbb::$user->lang['BYTES']);
-			$max_filesize = get_formatted_filesize($this->max_filesize, false);
-
-			$file->error[] = sprintf(phpbb::$user->lang[$this->error_prefix . 'WRONG_FILESIZE'], $max_filesize, $size_lang);
-		}
-
-		// check Filename
-		if (preg_match("#[\\/:*?\"<>|]#i", $file->get('realname')))
-		{
-			$file->error[] = sprintf(phpbb::$user->lang[$this->error_prefix . 'INVALID_FILENAME'], $file->get('realname'));
-		}
-
-		// Invalid Extension
-		if (!$this->valid_extension($file))
-		{
-			$file->error[] = sprintf(phpbb::$user->lang[$this->error_prefix . 'DISALLOWED_EXTENSION'], $file->get('extension'));
-		}
-
-		// MIME Sniffing
-		if (!$this->valid_content($file))
-		{
-			$file->error[] = sprintf(phpbb::$user->lang[$this->error_prefix . 'DISALLOWED_CONTENT']);
-		}
-	}
-
-	/**
-	* Check for allowed extension
-	*/
-	function valid_extension(&$file)
-	{
-		return (in_array($file->get('extension'), $this->allowed_extensions)) ? true : false;
-	}
-
-	/**
-	* Check for allowed dimension
-	*/
-	function valid_dimensions(&$file)
-	{
-		if (!$this->max_width && !$this->max_height && !$this->min_width && !$this->min_height)
-		{
-			return true;
-		}
-
-		if (($file->get('width') > $this->max_width && $this->max_width) ||
-			($file->get('height') > $this->max_height && $this->max_height) ||
-			($file->get('width') < $this->min_width && $this->min_width) ||
-			($file->get('height') < $this->min_height && $this->min_height))
-		{
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	* Check if form upload is valid
-	*/
-	function is_valid($form_name)
-	{
-		return (isset($_FILES[$form_name]) && $_FILES[$form_name]['name'] != 'none') ? true : false;
-	}
-
-
-	/**
-	* Check for allowed extension
-	*/
-	function valid_content(&$file)
-	{
-		return ($file->check_content($this->disallowed_content));
-	}
-
-	/**
-	* Return image type/extension mapping
-	*/
-	function image_types()
-	{
-		return array(
-			1 => array('gif'),
-			2 => array('jpg', 'jpeg'),
-			3 => array('png'),
-			4 => array('swf'),
-			5 => array('psd'),
-			6 => array('bmp'),
-			7 => array('tif', 'tiff'),
-			8 => array('tif', 'tiff'),
-			9 => array('jpg', 'jpeg'),
-			10 => array('jpg', 'jpeg'),
-			11 => array('jpg', 'jpeg'),
-			12 => array('jpg', 'jpeg'),
-			13 => array('swc'),
-			14 => array('iff'),
-			15 => array('wbmp'),
-			16 => array('xbm'),
-		);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
deleted file mode 100644
index 5c22cfb4ef..0000000000
--- a/phpBB/includes/functions_user.php
+++ /dev/null
@@ -1,3247 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Obtain user_ids from usernames or vice versa. Returns false on
-* success else the error string
-*
-* @param array &$user_id_ary The user ids to check or empty if usernames used
-* @param array &$username_ary The usernames to check or empty if user ids used
-* @param mixed $user_type Array of user types to check, false if not restricting by user type
-*/
-function user_get_id_name(&$user_id_ary, &$username_ary, $user_type = false)
-{
-	// Are both arrays already filled? Yep, return else
-	// are neither array filled?
-	if ($user_id_ary && $username_ary)
-	{
-		return false;
-	}
-	else if (!$user_id_ary && !$username_ary)
-	{
-		return 'NO_USERS';
-	}
-
-	$which_ary = ($user_id_ary) ? 'user_id_ary' : 'username_ary';
-
-	if ($$which_ary && !is_array($$which_ary))
-	{
-		$$which_ary = array($$which_ary);
-	}
-
-	$sql_in = ($which_ary == 'user_id_ary') ? array_map('intval', $$which_ary) : array_map('utf8_clean_string', $$which_ary);
-	unset($$which_ary);
-
-	$user_id_ary = $username_ary = array();
-
-	// Grab the user id/username records
-	$sql_where = ($which_ary == 'user_id_ary') ? 'user_id' : 'username_clean';
-	$sql = 'SELECT user_id, username
-		FROM ' . USERS_TABLE . '
-		WHERE ' . phpbb::$db->sql_in_set($sql_where, $sql_in);
-
-	if ($user_type !== false && !empty($user_type))
-	{
-		$sql .= ' AND ' . phpbb::$db->sql_in_set('user_type', $user_type);
-	}
-
-	$result = phpbb::$db->sql_query($sql);
-
-	if (!($row = phpbb::$db->sql_fetchrow($result)))
-	{
-		phpbb::$db->sql_freeresult($result);
-		return 'NO_USERS';
-	}
-
-	do
-	{
-		$username_ary[$row['user_id']] = $row['username'];
-		$user_id_ary[] = $row['user_id'];
-	}
-	while ($row = phpbb::$db->sql_fetchrow($result));
-	phpbb::$db->sql_freeresult($result);
-
-	return false;
-}
-
-/**
-* Get latest registered username and update database to reflect it
-*/
-function update_last_username()
-{
-	// Get latest username
-	$sql = 'SELECT user_id, username, user_colour
-		FROM ' . USERS_TABLE . '
-		WHERE user_type IN (' . phpbb::USER_NORMAL . ', ' . phpbb::USER_FOUNDER . ')
-		ORDER BY user_id DESC';
-	$result = phpbb::$db->sql_query_limit($sql, 1);
-	$row = phpbb::$db->sql_fetchrow($result);
-	phpbb::$db->sql_freeresult($result);
-
-	if ($row)
-	{
-		set_config('newest_user_id', $row['user_id'], true);
-		set_config('newest_username', $row['username'], true);
-		set_config('newest_user_colour', $row['user_colour'], true);
-	}
-}
-
-/**
-* Updates a username across all relevant tables/fields
-*
-* @param string $old_name the old/current username
-* @param string $new_name the new username
-*/
-function user_update_name($old_name, $new_name)
-{
-	$update_ary = array(
-		FORUMS_TABLE			=> array('forum_last_poster_name'),
-		MODERATOR_CACHE_TABLE	=> array('username'),
-		POSTS_TABLE				=> array('post_username'),
-		TOPICS_TABLE			=> array('topic_first_poster_name', 'topic_last_poster_name'),
-	);
-
-	foreach ($update_ary as $table => $field_ary)
-	{
-		foreach ($field_ary as $field)
-		{
-			$sql = "UPDATE $table
-				SET $field = '" . phpbb::$db->sql_escape($new_name) . "'
-				WHERE $field = '" . phpbb::$db->sql_escape($old_name) . "'";
-			phpbb::$db->sql_query($sql);
-		}
-	}
-
-	if (phpbb::$config['newest_username'] == $old_name)
-	{
-		set_config('newest_username', $new_name, true);
-	}
-
-	// Because some tables/caches use username-specific data we need to purge this here.
-	phpbb::$acm->destroy_sql(MODERATOR_CACHE_TABLE);
-}
-
-/**
-* Adds a user
-*
-* @param mixed $user_row An array containing the following keys (and the appropriate values): username, group_id (the group to place the user in), user_email and the user_type(usually 0). Additional entries not overridden by defaults will be forwarded.
-* @param string $cp_data custom profile fields, see custom_profile::build_insert_sql_array
-* @return the new user's ID.
-*/
-function user_add($user_row, $cp_data = false)
-{
-	if (empty($user_row['username']) || !isset($user_row['group_id']) || !isset($user_row['user_email']) || !isset($user_row['user_type']))
-	{
-		return false;
-	}
-
-	$username_clean = utf8_clean_string($user_row['username']);
-
-	if (empty($username_clean))
-	{
-		return false;
-	}
-
-	$sql_ary = array(
-		'username'			=> $user_row['username'],
-		'username_clean'	=> $username_clean,
-		'user_password'		=> (isset($user_row['user_password'])) ? $user_row['user_password'] : '',
-		'user_pass_convert'	=> 0,
-		'user_email'		=> strtolower($user_row['user_email']),
-		'user_email_hash'	=> hexdec(crc32(strtolower($user_row['user_email'])) . strlen($user_row['user_email'])),
-		'group_id'			=> $user_row['group_id'],
-		'user_type'			=> $user_row['user_type'],
-	);
-
-	// These are the additional vars able to be specified
-	$additional_vars = array(
-		'user_permissions'	=> '',
-		'user_timezone'		=> phpbb::$config['board_timezone'],
-		'user_dateformat'	=> phpbb::$config['default_dateformat'],
-		'user_lang'			=> phpbb::$config['default_lang'],
-		'user_style'		=> phpbb::$config['default_style'],
-		'user_actkey'		=> '',
-		'user_ip'			=> '',
-		'user_regdate'		=> time(),
-		'user_passchg'		=> time(),
-		'user_options'		=> 895,
-
-		'user_inactive_reason'	=> 0,
-		'user_inactive_time'	=> 0,
-		'user_lastmark'			=> time(),
-		'user_lastvisit'		=> 0,
-		'user_lastpost_time'	=> 0,
-		'user_lastpage'			=> '',
-		'user_posts'			=> 0,
-		'user_dst'				=> (int) phpbb::$config['board_dst'],
-		'user_colour'			=> '',
-		'user_occ'				=> '',
-		'user_interests'		=> '',
-		'user_avatar'			=> '',
-		'user_avatar_type'		=> 0,
-		'user_avatar_width'		=> 0,
-		'user_avatar_height'	=> 0,
-		'user_new_privmsg'		=> 0,
-		'user_unread_privmsg'	=> 0,
-		'user_last_privmsg'		=> 0,
-		'user_message_rules'	=> 0,
-		'user_full_folder'		=> PRIVMSGS_NO_BOX,
-		'user_emailtime'		=> 0,
-
-		'user_notify'			=> 0,
-		'user_notify_pm'		=> 1,
-		'user_notify_type'		=> NOTIFY_EMAIL,
-		'user_allow_pm'			=> 1,
-		'user_allow_viewonline'	=> 1,
-		'user_allow_viewemail'	=> 1,
-		'user_allow_massemail'	=> 1,
-
-		'user_sig'					=> '',
-		'user_sig_bbcode_uid'		=> '',
-		'user_sig_bbcode_bitfield'	=> '',
-
-		'user_form_salt'			=> phpbb::$security->unique_id(),
-	);
-
-	// Now fill the sql array with not required variables
-	foreach ($additional_vars as $key => $default_value)
-	{
-		$sql_ary[$key] = (isset($user_row[$key])) ? $user_row[$key] : $default_value;
-	}
-
-	// Any additional variables in $user_row not covered above?
-	$remaining_vars = array_diff(array_keys($user_row), array_keys($sql_ary));
-
-	// Now fill our sql array with the remaining vars
-	if (sizeof($remaining_vars))
-	{
-		foreach ($remaining_vars as $key)
-		{
-			$sql_ary[$key] = $user_row[$key];
-		}
-	}
-
-	$sql = 'INSERT INTO ' . USERS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary);
-	phpbb::$db->sql_query($sql);
-
-	$user_id = phpbb::$db->sql_nextid();
-
-	// Insert Custom Profile Fields
-	if ($cp_data !== false && sizeof($cp_data))
-	{
-		$cp_data['user_id'] = (int) $user_id;
-
-		if (!class_exists('custom_profile'))
-		{
-			include_once PHPBB_ROOT_PATH . 'includes/functions_profile_fields.' . PHP_EXT;
-		}
-
-		$sql = 'INSERT INTO ' . PROFILE_FIELDS_DATA_TABLE . ' ' .
-			phpbb::$db->sql_build_array('INSERT', custom_profile::build_insert_sql_array($cp_data));
-		phpbb::$db->sql_query($sql);
-	}
-
-	// Place into appropriate group...
-	$sql = 'INSERT INTO ' . USER_GROUP_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', array(
-		'user_id'		=> (int) $user_id,
-		'group_id'		=> (int) $user_row['group_id'],
-		'user_pending'	=> 0)
-	);
-	phpbb::$db->sql_query($sql);
-
-	// Now make it the users default group...
-	group_set_user_default($user_row['group_id'], array($user_id), false);
-
-	// set the newest user and adjust the user count if the user is a normal user and no activation mail is sent
-	if ($user_row['user_type'] == phpbb::USER_NORMAL)
-	{
-		set_config('newest_user_id', $user_id, true);
-		set_config('newest_username', $user_row['username'], true);
-		set_config_count('num_users', 1, true);
-
-		$sql = 'SELECT group_colour
-			FROM ' . GROUPS_TABLE . '
-			WHERE group_id = ' . (int) $user_row['group_id'];
-		$result = phpbb::$db->sql_query_limit($sql, 1);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		set_config('newest_user_colour', $row['group_colour'], true);
-	}
-
-	return $user_id;
-}
-
-/**
-* Remove User
-*/
-function user_delete($mode, $user_id, $post_username = false)
-{
-	$sql = 'SELECT *
-		FROM ' . USERS_TABLE . '
-		WHERE user_id = ' . $user_id;
-	$result = phpbb::$db->sql_query($sql);
-	$user_row = phpbb::$db->sql_fetchrow($result);
-	phpbb::$db->sql_freeresult($result);
-
-	if (!$user_row)
-	{
-		return false;
-	}
-
-	// Before we begin, we will remove the reports the user issued.
-	$sql = 'SELECT r.post_id, p.topic_id
-		FROM ' . REPORTS_TABLE . ' r, ' . POSTS_TABLE . ' p
-		WHERE r.user_id = ' . $user_id . '
-			AND p.post_id = r.post_id';
-	$result = phpbb::$db->sql_query($sql);
-
-	$report_posts = $report_topics = array();
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$report_posts[] = $row['post_id'];
-		$report_topics[] = $row['topic_id'];
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	if (sizeof($report_posts))
-	{
-		$report_posts = array_unique($report_posts);
-		$report_topics = array_unique($report_topics);
-
-		// Get a list of topics that still contain reported posts
-		$sql = 'SELECT DISTINCT topic_id
-			FROM ' . POSTS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('topic_id', $report_topics) . '
-				AND post_reported = 1
-				AND ' . phpbb::$db->sql_in_set('post_id', $report_posts, true);
-		$result = phpbb::$db->sql_query($sql);
-
-		$keep_report_topics = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$keep_report_topics[] = $row['topic_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if (sizeof($keep_report_topics))
-		{
-			$report_topics = array_diff($report_topics, $keep_report_topics);
-		}
-		unset($keep_report_topics);
-
-		// Now set the flags back
-		$sql = 'UPDATE ' . POSTS_TABLE . '
-			SET post_reported = 0
-			WHERE ' . phpbb::$db->sql_in_set('post_id', $report_posts);
-		phpbb::$db->sql_query($sql);
-
-		if (sizeof($report_topics))
-		{
-			$sql = 'UPDATE ' . TOPICS_TABLE . '
-				SET topic_reported = 0
-				WHERE ' . phpbb::$db->sql_in_set('topic_id', $report_topics);
-			phpbb::$db->sql_query($sql);
-		}
-	}
-
-	// Remove reports
-	phpbb::$db->sql_query('DELETE FROM ' . REPORTS_TABLE . ' WHERE user_id = ' . $user_id);
-
-	if ($user_row['user_avatar'] && $user_row['user_avatar_type'] == AVATAR_UPLOAD)
-	{
-		avatar_delete('user', $user_row);
-	}
-
-	switch ($mode)
-	{
-		case 'retain':
-
-			phpbb::$db->sql_transaction('begin');
-
-			if ($post_username === false)
-			{
-				$post_username = phpbb::$user->lang['GUEST'];
-			}
-
-			// If the user is inactive and newly registered we assume no posts from this user being there...
-			if ($user_row['user_type'] == phpbb::USER_INACTIVE && $user_row['user_inactive_reason'] == INACTIVE_REGISTER && !$user_row['user_posts'])
-			{
-			}
-			else
-			{
-				$sql = 'UPDATE ' . FORUMS_TABLE . '
-					SET forum_last_poster_id = ' . ANONYMOUS . ", forum_last_poster_name = '" . phpbb::$db->sql_escape($post_username) . "', forum_last_poster_colour = ''
-					WHERE forum_last_poster_id = $user_id";
-				phpbb::$db->sql_query($sql);
-
-				$sql = 'UPDATE ' . POSTS_TABLE . '
-					SET poster_id = ' . ANONYMOUS . ", post_username = '" . phpbb::$db->sql_escape($post_username) . "'
-					WHERE poster_id = $user_id";
-				phpbb::$db->sql_query($sql);
-
-				$sql = 'UPDATE ' . POSTS_TABLE . '
-					SET post_edit_user = ' . ANONYMOUS . "
-					WHERE post_edit_user = $user_id";
-				phpbb::$db->sql_query($sql);
-
-				$sql = 'UPDATE ' . TOPICS_TABLE . '
-					SET topic_poster = ' . ANONYMOUS . ", topic_first_poster_name = '" . phpbb::$db->sql_escape($post_username) . "', topic_first_poster_colour = ''
-					WHERE topic_poster = $user_id";
-				phpbb::$db->sql_query($sql);
-
-				$sql = 'UPDATE ' . TOPICS_TABLE . '
-					SET topic_last_poster_id = ' . ANONYMOUS . ", topic_last_poster_name = '" . phpbb::$db->sql_escape($post_username) . "', topic_last_poster_colour = ''
-					WHERE topic_last_poster_id = $user_id";
-				phpbb::$db->sql_query($sql);
-
-				// Since we change every post by this author, we need to count this amount towards the anonymous user
-
-				// Update the post count for the anonymous user
-				if ($user_row['user_posts'])
-				{
-					$sql = 'UPDATE ' . USERS_TABLE . '
-						SET user_posts = user_posts + ' . $user_row['user_posts'] . '
-						WHERE user_id = ' . ANONYMOUS;
-					phpbb::$db->sql_query($sql);
-				}
-			}
-
-			phpbb::$db->sql_transaction('commit');
-
-		break;
-
-		case 'remove':
-
-			if (!function_exists('delete_posts'))
-			{
-				include(PHPBB_ROOT_PATH . 'includes/functions_admin.' . PHP_EXT);
-			}
-
-			$sql = 'SELECT topic_id, COUNT(post_id) AS total_posts
-				FROM ' . POSTS_TABLE . "
-				WHERE poster_id = $user_id
-				GROUP BY topic_id";
-			$result = phpbb::$db->sql_query($sql);
-
-			$topic_id_ary = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$topic_id_ary[$row['topic_id']] = $row['total_posts'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			if (sizeof($topic_id_ary))
-			{
-				$sql = 'SELECT topic_id, topic_replies, topic_replies_real
-					FROM ' . TOPICS_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('topic_id', array_keys($topic_id_ary));
-				$result = phpbb::$db->sql_query($sql);
-
-				$del_topic_ary = array();
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					if (max($row['topic_replies'], $row['topic_replies_real']) + 1 == $topic_id_ary[$row['topic_id']])
-					{
-						$del_topic_ary[] = $row['topic_id'];
-					}
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				if (sizeof($del_topic_ary))
-				{
-					$sql = 'DELETE FROM ' . TOPICS_TABLE . '
-						WHERE ' . phpbb::$db->sql_in_set('topic_id', $del_topic_ary);
-					phpbb::$db->sql_query($sql);
-				}
-			}
-
-			// Delete posts, attachments, etc.
-			delete_posts('poster_id', $user_id);
-
-		break;
-	}
-
-	phpbb::$db->sql_transaction('begin');
-
-	$table_ary = array(USERS_TABLE, USER_GROUP_TABLE, TOPICS_WATCH_TABLE, FORUMS_WATCH_TABLE, ACL_USERS_TABLE, TOPICS_TRACK_TABLE, TOPICS_POSTED_TABLE, FORUMS_TRACK_TABLE, PROFILE_FIELDS_DATA_TABLE, MODERATOR_CACHE_TABLE, DRAFTS_TABLE, BOOKMARKS_TABLE, SESSIONS_KEYS_TABLE);
-
-	foreach ($table_ary as $table)
-	{
-		$sql = "DELETE FROM $table
-			WHERE user_id = $user_id";
-		phpbb::$db->sql_query($sql);
-	}
-
-	phpbb::$acm->destroy_sql(MODERATOR_CACHE_TABLE);
-
-	// Delete the user_id from the banlist
-	$sql = 'DELETE FROM ' . BANLIST_TABLE . '
-		WHERE ban_userid = ' . $user_id;
-	phpbb::$db->sql_query($sql);
-
-	// Delete the user_id from the session table
-	$sql = 'DELETE FROM ' . SESSIONS_TABLE . '
-		WHERE session_user_id = ' . $user_id;
-	phpbb::$db->sql_query($sql);
-
-	// Remove any undelivered mails...
-	$sql = 'SELECT msg_id, user_id
-		FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE author_id = ' . $user_id . '
-			AND folder_id = ' . PRIVMSGS_NO_BOX;
-	$result = phpbb::$db->sql_query($sql);
-
-	$undelivered_msg = $undelivered_user = array();
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$undelivered_msg[] = $row['msg_id'];
-		$undelivered_user[$row['user_id']][] = true;
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	if (sizeof($undelivered_msg))
-	{
-		$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('msg_id', $undelivered_msg);
-		phpbb::$db->sql_query($sql);
-	}
-
-	$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE author_id = ' . $user_id . '
-			AND folder_id = ' . PRIVMSGS_NO_BOX;
-	phpbb::$db->sql_query($sql);
-
-	// Delete all to-information
-	$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE user_id = ' . $user_id;
-	phpbb::$db->sql_query($sql);
-
-	// Set the remaining author id to anonymous - this way users are still able to read messages from users being removed
-	$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . '
-		SET author_id = ' . ANONYMOUS . '
-		WHERE author_id = ' . $user_id;
-	phpbb::$db->sql_query($sql);
-
-	$sql = 'UPDATE ' . PRIVMSGS_TABLE . '
-		SET author_id = ' . ANONYMOUS . '
-		WHERE author_id = ' . $user_id;
-	phpbb::$db->sql_query($sql);
-
-	foreach ($undelivered_user as $_user_id => $ary)
-	{
-		if ($_user_id == $user_id)
-		{
-			continue;
-		}
-
-		$sql = 'UPDATE ' . USERS_TABLE . '
-			SET user_new_privmsg = user_new_privmsg - ' . sizeof($ary) . ',
-				user_unread_privmsg = user_unread_privmsg - ' . sizeof($ary) . '
-			WHERE user_id = ' . $_user_id;
-		phpbb::$db->sql_query($sql);
-	}
-
-	phpbb::$db->sql_transaction('commit');
-
-	// Reset newest user info if appropriate
-	if (phpbb::$config['newest_user_id'] == $user_id)
-	{
-		update_last_username();
-	}
-
-	// Decrement number of users if this user is active
-	if ($user_row['user_type'] != phpbb::USER_INACTIVE && $user_row['user_type'] != phpbb::USER_IGNORE)
-	{
-		set_config_count('num_users', -1, true);
-	}
-
-	return false;
-}
-
-/**
-* Flips user_type from active to inactive and vice versa, handles group membership updates
-*
-* @param string $mode can be flip for flipping from active/inactive, activate or deactivate
-*/
-function user_active_flip($mode, $user_id_ary, $reason = INACTIVE_MANUAL)
-{
-	$deactivated = $activated = 0;
-	$sql_statements = array();
-
-	if (!is_array($user_id_ary))
-	{
-		$user_id_ary = array($user_id_ary);
-	}
-
-	if (!sizeof($user_id_ary))
-	{
-		return;
-	}
-
-	$sql = 'SELECT user_id, group_id, user_type, user_inactive_reason
-		FROM ' . USERS_TABLE . '
-		WHERE ' . phpbb::$db->sql_in_set('user_id', $user_id_ary);
-	$result = phpbb::$db->sql_query($sql);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$sql_ary = array();
-
-		if ($row['user_type'] == phpbb::USER_IGNORE || $row['user_type'] == phpbb::USER_FOUNDER ||
-			($mode == 'activate' && $row['user_type'] != phpbb::USER_INACTIVE) ||
-			($mode == 'deactivate' && $row['user_type'] == phpbb::USER_INACTIVE))
-		{
-			continue;
-		}
-
-		if ($row['user_type'] == phpbb::USER_INACTIVE)
-		{
-			$activated++;
-		}
-		else
-		{
-			$deactivated++;
-
-			// Remove the users session key...
-			phpbb::$user->reset_login_keys($row['user_id']);
-		}
-
-		$sql_ary += array(
-			'user_type'				=> ($row['user_type'] == phpbb::USER_NORMAL) ? phpbb::USER_INACTIVE : phpbb::USER_NORMAL,
-			'user_inactive_time'	=> ($row['user_type'] == phpbb::USER_NORMAL) ? time() : 0,
-			'user_inactive_reason'	=> ($row['user_type'] == phpbb::USER_NORMAL) ? $reason : 0,
-		);
-
-		$sql_statements[$row['user_id']] = $sql_ary;
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	if (sizeof($sql_statements))
-	{
-		foreach ($sql_statements as $user_id => $sql_ary)
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-				WHERE user_id = ' . $user_id;
-			phpbb::$db->sql_query($sql);
-		}
-
-		phpbb::$acl->acl_clear_prefetch(array_keys($sql_statements));
-	}
-
-	if ($deactivated)
-	{
-		set_config_count('num_users', $deactivated * (-1), true);
-	}
-
-	if ($activated)
-	{
-		set_config_count('num_users', $activated, true);
-	}
-
-	// Update latest username
-	update_last_username();
-}
-
-/**
-* Add a ban or ban exclusion to the banlist. Bans either a user, an IP or an email address
-*
-* @param string $mode Type of ban. One of the following: user, ip, email
-* @param mixed $ban Banned entity. Either string or array with usernames, ips or email addresses
-* @param int $ban_len Ban length in minutes
-* @param string $ban_len_other Ban length as a date (YYYY-MM-DD)
-* @param boolean $ban_exclude Exclude these entities from banning?
-* @param string $ban_reason String describing the reason for this ban
-* @return boolean
-*/
-function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reason, $ban_give_reason = '')
-{
-	// Delete stale bans
-	$sql = 'DELETE FROM ' . BANLIST_TABLE . '
-		WHERE ban_end < ' . time() . '
-			AND ban_end <> 0';
-	phpbb::$db->sql_query($sql);
-
-	$ban_list = (!is_array($ban)) ? array_unique(explode("\n", $ban)) : $ban;
-	$ban_list_log = implode(', ', $ban_list);
-
-	$current_time = time();
-
-	// Set $ban_end to the unix time when the ban should end. 0 is a permanent ban.
-	if ($ban_len)
-	{
-		if ($ban_len != -1 || !$ban_len_other)
-		{
-			$ban_end = max($current_time, $current_time + ($ban_len) * 60);
-		}
-		else
-		{
-			$ban_other = explode('-', $ban_len_other);
-			if (sizeof($ban_other) == 3 && ((int)$ban_other[0] < 9999) &&
-				(strlen($ban_other[0]) == 4) && (strlen($ban_other[1]) == 2) && (strlen($ban_other[2]) == 2))
-			{
-				$ban_end = max($current_time, gmmktime(0, 0, 0, (int)$ban_other[1], (int)$ban_other[2], (int)$ban_other[0]));
-			}
-			else
-			{
-				trigger_error('LENGTH_BAN_INVALID');
-			}
-		}
-	}
-	else
-	{
-		$ban_end = 0;
-	}
-
-	$founder = $founder_names = array();
-
-	if (!$ban_exclude)
-	{
-		// Create a list of founder...
-		$sql = 'SELECT user_id, user_email, username_clean
-			FROM ' . USERS_TABLE . '
-			WHERE user_type = ' . phpbb::USER_FOUNDER;
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$founder[$row['user_id']] = $row['user_email'];
-			$founder_names[$row['user_id']] = $row['username_clean'];
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	$banlist_ary = array();
-
-	switch ($mode)
-	{
-		case 'user':
-			$type = 'ban_userid';
-
-			// At the moment we do not support wildcard username banning
-
-			// Select the relevant user_ids.
-			$sql_usernames = array();
-
-			foreach ($ban_list as $username)
-			{
-				$username = trim($username);
-				if ($username != '')
-				{
-					$clean_name = utf8_clean_string($username);
-					if ($clean_name == phpbb::$user->data['username_clean'])
-					{
-						trigger_error('CANNOT_BAN_YOURSELF', E_USER_WARNING);
-					}
-					if (in_array($clean_name, $founder_names))
-					{
-						trigger_error('CANNOT_BAN_FOUNDER', E_USER_WARNING);
-					}
-					$sql_usernames[] = $clean_name;
-				}
-			}
-
-			// Make sure we have been given someone to ban
-			if (!sizeof($sql_usernames))
-			{
-				trigger_error('NO_USER_SPECIFIED');
-			}
-
-			$sql = 'SELECT user_id
-				FROM ' . USERS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('username_clean', $sql_usernames);
-
-			// Do not allow banning yourself
-			if (sizeof($founder))
-			{
-				$sql .= ' AND ' . phpbb::$db->sql_in_set('user_id', array_merge(array_keys($founder), array(phpbb::$user->data['user_id'])), true);
-			}
-			else
-			{
-				$sql .= ' AND user_id <> ' . phpbb::$user->data['user_id'];
-			}
-
-			$result = phpbb::$db->sql_query($sql);
-
-			if ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				do
-				{
-					$banlist_ary[] = (int) $row['user_id'];
-				}
-				while ($row = phpbb::$db->sql_fetchrow($result));
-			}
-			else
-			{
-				phpbb::$db->sql_freeresult($result);
-				trigger_error('NO_USERS');
-			}
-			phpbb::$db->sql_freeresult($result);
-		break;
-
-		case 'ip':
-			$type = 'ban_ip';
-
-			foreach ($ban_list as $ban_item)
-			{
-				if (preg_match('#^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})[ ]*\-[ ]*([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$#', trim($ban_item), $ip_range_explode))
-				{
-					// This is an IP range
-					// Don't ask about all this, just don't ask ... !
-					$ip_1_counter = $ip_range_explode[1];
-					$ip_1_end = $ip_range_explode[5];
-
-					while ($ip_1_counter <= $ip_1_end)
-					{
-						$ip_2_counter = ($ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[2] : 0;
-						$ip_2_end = ($ip_1_counter < $ip_1_end) ? 254 : $ip_range_explode[6];
-
-						if ($ip_2_counter == 0 && $ip_2_end == 254)
-						{
-							$ip_2_counter = 256;
-							$ip_2_fragment = 256;
-
-							$banlist_ary[] = "$ip_1_counter.*";
-						}
-
-						while ($ip_2_counter <= $ip_2_end)
-						{
-							$ip_3_counter = ($ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[3] : 0;
-							$ip_3_end = ($ip_2_counter < $ip_2_end || $ip_1_counter < $ip_1_end) ? 254 : $ip_range_explode[7];
-
-							if ($ip_3_counter == 0 && $ip_3_end == 254)
-							{
-								$ip_3_counter = 256;
-								$ip_3_fragment = 256;
-
-								$banlist_ary[] = "$ip_1_counter.$ip_2_counter.*";
-							}
-
-							while ($ip_3_counter <= $ip_3_end)
-							{
-								$ip_4_counter = ($ip_3_counter == $ip_range_explode[3] && $ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[4] : 0;
-								$ip_4_end = ($ip_3_counter < $ip_3_end || $ip_2_counter < $ip_2_end) ? 254 : $ip_range_explode[8];
-
-								if ($ip_4_counter == 0 && $ip_4_end == 254)
-								{
-									$ip_4_counter = 256;
-									$ip_4_fragment = 256;
-
-									$banlist_ary[] = "$ip_1_counter.$ip_2_counter.$ip_3_counter.*";
-								}
-
-								while ($ip_4_counter <= $ip_4_end)
-								{
-									$banlist_ary[] = "$ip_1_counter.$ip_2_counter.$ip_3_counter.$ip_4_counter";
-									$ip_4_counter++;
-								}
-								$ip_3_counter++;
-							}
-							$ip_2_counter++;
-						}
-						$ip_1_counter++;
-					}
-				}
-				else if (preg_match('#^([0-9]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})$#', trim($ban_item)) || preg_match('#^[a-f0-9:]+\*?$#i', trim($ban_item)))
-				{
-					// Normal IP address
-					$banlist_ary[] = trim($ban_item);
-				}
-				else if (preg_match('#^\*$#', trim($ban_item)))
-				{
-					// Ban all IPs
-					$banlist_ary[] = '*';
-				}
-				else if (preg_match('#^([\w\-_]\.?){2,}$#is', trim($ban_item)))
-				{
-					// hostname
-					$ip_ary = gethostbynamel(trim($ban_item));
-
-					if (!empty($ip_ary))
-					{
-						foreach ($ip_ary as $ip)
-						{
-							if ($ip)
-							{
-								if (strlen($ip) > 40)
-								{
-									continue;
-								}
-
-								$banlist_ary[] = $ip;
-							}
-						}
-					}
-				}
-				else
-				{
-					trigger_error('NO_IPS_DEFINED');
-				}
-			}
-		break;
-
-		case 'email':
-			$type = 'ban_email';
-
-			foreach ($ban_list as $ban_item)
-			{
-				$ban_item = trim($ban_item);
-
-				if (preg_match('#^.*?@*|(([a-z0-9\-]+\.)+([a-z]{2,3}))$#i', $ban_item))
-				{
-					if (strlen($ban_item) > 100)
-					{
-						continue;
-					}
-
-					if (!sizeof($founder) || !in_array($ban_item, $founder))
-					{
-						$banlist_ary[] = $ban_item;
-					}
-				}
-			}
-
-			if (sizeof($ban_list) == 0)
-			{
-				trigger_error('NO_EMAILS_DEFINED');
-			}
-		break;
-
-		default:
-			trigger_error('NO_MODE');
-		break;
-	}
-
-	// Fetch currently set bans of the specified type and exclude state. Prevent duplicate bans.
-	$sql_where = ($type == 'ban_userid') ? 'ban_userid <> 0' : "$type <> ''";
-
-	$sql = "SELECT $type
-		FROM " . BANLIST_TABLE . "
-		WHERE $sql_where
-			AND ban_exclude = " . (int) $ban_exclude;
-	$result = phpbb::$db->sql_query($sql);
-
-	// Reset $sql_where, because we use it later...
-	$sql_where = '';
-
-	if ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$banlist_ary_tmp = array();
-		do
-		{
-			switch ($mode)
-			{
-				case 'user':
-					$banlist_ary_tmp[] = $row['ban_userid'];
-				break;
-
-				case 'ip':
-					$banlist_ary_tmp[] = $row['ban_ip'];
-				break;
-
-				case 'email':
-					$banlist_ary_tmp[] = $row['ban_email'];
-				break;
-			}
-		}
-		while ($row = phpbb::$db->sql_fetchrow($result));
-
-		$banlist_ary = array_unique(array_diff($banlist_ary, $banlist_ary_tmp));
-		unset($banlist_ary_tmp);
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	// We have some entities to ban
-	if (sizeof($banlist_ary))
-	{
-		$sql_ary = array();
-
-		foreach ($banlist_ary as $ban_entry)
-		{
-			$sql_ary[] = array(
-				$type				=> $ban_entry,
-				'ban_start'			=> (int) $current_time,
-				'ban_end'			=> (int) $ban_end,
-				'ban_exclude'		=> (int) $ban_exclude,
-				'ban_reason'		=> (string) $ban_reason,
-				'ban_give_reason'	=> (string) $ban_give_reason,
-			);
-		}
-
-		phpbb::$db->sql_multi_insert(BANLIST_TABLE, $sql_ary);
-
-		// If we are banning we want to logout anyone matching the ban
-		if (!$ban_exclude)
-		{
-			switch ($mode)
-			{
-				case 'user':
-					$sql_where = 'WHERE ' . phpbb::$db->sql_in_set('session_user_id', $banlist_ary);
-				break;
-
-				case 'ip':
-					$sql_where = 'WHERE ' . phpbb::$db->sql_in_set('session_ip', $banlist_ary);
-				break;
-
-				case 'email':
-					$banlist_ary_sql = array();
-
-					foreach ($banlist_ary as $ban_entry)
-					{
-						$banlist_ary_sql[] = (string) str_replace('*', '%', $ban_entry);
-					}
-
-					$sql = 'SELECT user_id
-						FROM ' . USERS_TABLE . '
-						WHERE ' . phpbb::$db->sql_in_set('user_email', $banlist_ary_sql);
-					$result = phpbb::$db->sql_query($sql);
-
-					$sql_in = array();
-
-					if ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						do
-						{
-							$sql_in[] = $row['user_id'];
-						}
-						while ($row = phpbb::$db->sql_fetchrow($result));
-
-						$sql_where = 'WHERE ' . phpbb::$db->sql_in_set('session_user_id', $sql_in);
-					}
-					phpbb::$db->sql_freeresult($result);
-				break;
-			}
-
-			if (isset($sql_where) && $sql_where)
-			{
-				$sql = 'DELETE FROM ' . SESSIONS_TABLE . "
-					$sql_where";
-				phpbb::$db->sql_query($sql);
-
-				if ($mode == 'user')
-				{
-					$sql = 'DELETE FROM ' . SESSIONS_KEYS_TABLE . ' ' . ((in_array('*', $banlist_ary)) ? '' : 'WHERE ' . phpbb::$db->sql_in_set('user_id', $banlist_ary));
-					phpbb::$db->sql_query($sql);
-				}
-			}
-		}
-
-		// Update log
-		$log_entry = ($ban_exclude) ? 'LOG_BAN_EXCLUDE_' : 'LOG_BAN_';
-
-		// Add to moderator and admin log
-		add_log('admin', $log_entry . strtoupper($mode), $ban_reason, $ban_list_log);
-		add_log('mod', 0, 0, $log_entry . strtoupper($mode), $ban_reason, $ban_list_log);
-
-		phpbb::$acm->destroy_sql(BANLIST_TABLE);
-
-		return true;
-	}
-
-	// There was nothing to ban/exclude. But destroying the cache because of the removal of stale bans.
-	phpbb::$acm->destroy_sql(BANLIST_TABLE);
-
-	return false;
-}
-
-/**
-* Unban User
-*/
-function user_unban($mode, $ban)
-{
-	// Delete stale bans
-	$sql = 'DELETE FROM ' . BANLIST_TABLE . '
-		WHERE ban_end < ' . time() . '
-			AND ban_end <> 0';
-	phpbb::$db->sql_query($sql);
-
-	if (!is_array($ban))
-	{
-		$ban = array($ban);
-	}
-
-	$unban_sql = array_map('intval', $ban);
-
-	if (sizeof($unban_sql))
-	{
-		// Grab details of bans for logging information later
-		switch ($mode)
-		{
-			case 'user':
-				$sql = 'SELECT u.username AS unban_info
-					FROM ' . USERS_TABLE . ' u, ' . BANLIST_TABLE . ' b
-					WHERE ' . phpbb::$db->sql_in_set('b.ban_id', $unban_sql) . '
-						AND u.user_id = b.ban_userid';
-			break;
-
-			case 'email':
-				$sql = 'SELECT ban_email AS unban_info
-					FROM ' . BANLIST_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('ban_id', $unban_sql);
-			break;
-
-			case 'ip':
-				$sql = 'SELECT ban_ip AS unban_info
-					FROM ' . BANLIST_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('ban_id', $unban_sql);
-			break;
-		}
-		$result = phpbb::$db->sql_query($sql);
-
-		$l_unban_list = '';
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$l_unban_list .= (($l_unban_list != '') ? ', ' : '') . $row['unban_info'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$sql = 'DELETE FROM ' . BANLIST_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('ban_id', $unban_sql);
-		phpbb::$db->sql_query($sql);
-
-		// Add to moderator and admin log
-		add_log('admin', 'LOG_UNBAN_' . strtoupper($mode), $l_unban_list);
-		add_log('mod', 0, 0, 'LOG_UNBAN_' . strtoupper($mode), $l_unban_list);
-	}
-
-	phpbb::$acm->destroy_sql(BANLIST_TABLE);
-
-	return false;
-}
-
-/**
-* Whois facility
-*
-* @link http://tools.ietf.org/html/rfc3912 RFC3912: WHOIS Protocol Specification
-*/
-function user_ipwhois($ip)
-{
-	$ipwhois = '';
-
-	// Check IP
-	// Only supporting IPv4 at the moment...
-	if (empty($ip) || !preg_match(get_preg_expression('ipv4'), $ip))
-	{
-		return '';
-	}
-
-	if (($fsk = @fsockopen('whois.arin.net', 43)))
-	{
-		// CRLF as per RFC3912
-		fputs($fsk, "$ip\r\n");
-		while (!feof($fsk))
-		{
-			$ipwhois .= fgets($fsk, 1024);
-		}
-		@fclose($fsk);
-	}
-
-	$match = array();
-
-	// Test for referrals from ARIN to other whois databases, roll on rwhois
-	if (preg_match('#ReferralServer: whois://(.+)#im', $ipwhois, $match))
-	{
-		if (strpos($match[1], ':') !== false)
-		{
-			$pos	= strrpos($match[1], ':');
-			$server	= substr($match[1], 0, $pos);
-			$port	= (int) substr($match[1], $pos + 1);
-			unset($pos);
-		}
-		else
-		{
-			$server	= $match[1];
-			$port	= 43;
-		}
-
-		$buffer = '';
-
-		if (($fsk = @fsockopen($server, $port)))
-		{
-			fputs($fsk, "$ip\r\n");
-			while (!feof($fsk))
-			{
-				$buffer .= fgets($fsk, 1024);
-			}
-			@fclose($fsk);
-		}
-
-		// Use the result from ARIN if we don't get any result here
-		$ipwhois = (empty($buffer)) ? $ipwhois : $buffer;
-	}
-
-	$ipwhois = htmlspecialchars($ipwhois);
-
-	// Magic URL ;)
-	return trim(make_clickable($ipwhois, false, ''));
-}
-
-/**
-* Data validation ... used primarily but not exclusively by ucp modules
-*
-* "Master" function for validating a range of data types
-*/
-function validate_data($data, $val_ary)
-{
-	$error = array();
-
-	foreach ($val_ary as $var => $val_seq)
-	{
-		if (!is_array($val_seq[0]))
-		{
-			$val_seq = array($val_seq);
-		}
-
-		foreach ($val_seq as $validate)
-		{
-			$function = array_shift($validate);
-			array_unshift($validate, $data[$var]);
-
-			if ($result = call_user_func_array('validate_' . $function, $validate))
-			{
-				// Since errors are checked later for their language file existence, we need to make sure custom errors are not adjusted.
-				$error[] = (empty(phpbb::$user->lang[$result . '_' . strtoupper($var)])) ? $result : $result . '_' . strtoupper($var);
-			}
-		}
-	}
-
-	return $error;
-}
-
-/**
-* Validate String
-*
-* @return	boolean|string	Either false if validation succeeded or a string which will be used as the error message (with the variable name appended)
-*/
-function validate_string($string, $optional = false, $min = 0, $max = 0)
-{
-	if (empty($string) && $optional)
-	{
-		return false;
-	}
-
-	if ($min && utf8_strlen(htmlspecialchars_decode($string)) < $min)
-	{
-		return 'TOO_SHORT';
-	}
-	else if ($max && utf8_strlen(htmlspecialchars_decode($string)) > $max)
-	{
-		return 'TOO_LONG';
-	}
-
-	return false;
-}
-
-/**
-* Validate Number
-*
-* @return	boolean|string	Either false if validation succeeded or a string which will be used as the error message (with the variable name appended)
-*/
-function validate_num($num, $optional = false, $min = 0, $max = 1E99)
-{
-	if (empty($num) && $optional)
-	{
-		return false;
-	}
-
-	if ($num < $min)
-	{
-		return 'TOO_SMALL';
-	}
-	else if ($num > $max)
-	{
-		return 'TOO_LARGE';
-	}
-
-	return false;
-}
-
-/**
-* Validate Date
-* @param String $string a date in the dd-mm-yyyy format
-* @return	boolean
-*/
-function validate_date($date_string, $optional = false)
-{
-	$date = explode('-', $date_string);
-	if ((empty($date) || sizeof($date) != 3) && $optional)
-	{
-		return false;
-	}
-	else if ($optional)
-	{
-		for ($field = 0; $field <= 1; $field++)
-		{
-			$date[$field] = (int) $date[$field];
-			if (empty($date[$field]))
-			{
-				$date[$field] = 1;
-			}
-		}
-		$date[2] = (int) $date[2];
-		// assume an arbitrary leap year
-		if (empty($date[2]))
-		{
-			$date[2] = 1980;
-		}
-	}
-
-	if (sizeof($date) != 3 || !checkdate($date[1], $date[0], $date[2]))
-	{
-		return 'INVALID';
-	}
-
-	return false;
-}
-
-
-/**
-* Validate Match
-*
-* @return	boolean|string	Either false if validation succeeded or a string which will be used as the error message (with the variable name appended)
-*/
-function validate_match($string, $optional = false, $match = '')
-{
-	if (empty($string) && $optional)
-	{
-		return false;
-	}
-
-	if (empty($match))
-	{
-		return false;
-	}
-
-	if (!preg_match($match, $string))
-	{
-		return 'WRONG_DATA';
-	}
-
-	return false;
-}
-
-/**
-* Check to see if the username has been taken, or if it is disallowed.
-* Also checks if it includes the " character, which we don't allow in usernames.
-* Used for registering, changing names, and posting anonymously with a username
-*
-* @param string $username The username to check
-* @param string $allowed_username An allowed username, default being phpbb::$user->data['username']
-*
-* @return	mixed	Either false if validation succeeded or a string which will be used as the error message (with the variable name appended)
-*/
-function validate_username($username, $allowed_username = false)
-{
-	$clean_username = utf8_clean_string($username);
-	$allowed_username = ($allowed_username === false) ? phpbb::$user->data['username_clean'] : utf8_clean_string($allowed_username);
-
-	if ($allowed_username == $clean_username)
-	{
-		return false;
-	}
-
-	// ... fast checks first.
-	if (strpos($username, '&quot;') !== false || strpos($username, '"') !== false || empty($clean_username))
-	{
-		return 'INVALID_CHARS';
-	}
-
-	$mbstring = $pcre = false;
-
-	// generic UTF-8 character types supported
-	switch (phpbb::$config['allow_name_chars'])
-	{
-		case 'USERNAME_CHARS_ANY':
-			$regex = '.+';
-		break;
-
-		case 'USERNAME_ALPHA_ONLY':
-			$regex = '[A-Za-z0-9]+';
-		break;
-
-		case 'USERNAME_ALPHA_SPACERS':
-			$regex = '[A-Za-z0-9-[\]_+ ]+';
-		break;
-
-		case 'USERNAME_LETTER_NUM':
-			$regex = '[\p{Lu}\p{Ll}\p{N}]+';
-		break;
-
-		case 'USERNAME_LETTER_NUM_SPACERS':
-			$regex = '[-\]_+ [\p{Lu}\p{Ll}\p{N}]+';
-		break;
-
-		case 'USERNAME_ASCII':
-		default:
-			$regex = '[\x01-\x7F]+';
-		break;
-	}
-
-	if (!preg_match('#^' . $regex . '$#u', $username))
-	{
-		return 'INVALID_CHARS';
-	}
-
-	$sql = 'SELECT username
-		FROM ' . USERS_TABLE . "
-		WHERE username_clean = '" . phpbb::$db->sql_escape($clean_username) . "'";
-	$result = phpbb::$db->sql_query($sql);
-	$row = phpbb::$db->sql_fetchrow($result);
-	phpbb::$db->sql_freeresult($result);
-
-	if ($row)
-	{
-		return 'USERNAME_TAKEN';
-	}
-
-	$sql = 'SELECT group_name
-		FROM ' . GROUPS_TABLE . "
-		WHERE group_name = '" . phpbb::$db->sql_escape($clean_username) . "'";
-	$result = phpbb::$db->sql_query($sql);
-	$row = phpbb::$db->sql_fetchrow($result);
-	phpbb::$db->sql_freeresult($result);
-
-	if ($row)
-	{
-		return 'USERNAME_TAKEN';
-	}
-
-	$bad_usernames = phpbb_cache::obtain_disallowed_usernames();
-
-	foreach ($bad_usernames as $bad_username)
-	{
-		if (preg_match('#^' . $bad_username . '$#', $clean_username))
-		{
-			return 'USERNAME_DISALLOWED';
-		}
-	}
-
-	return false;
-}
-
-/**
-* Check to see if the password meets the complexity settings
-*
-* @return	boolean|string	Either false if validation succeeded or a string which will be used as the error message (with the variable name appended)
-*/
-function validate_password($password)
-{
-	if (!$password)
-	{
-		return false;
-	}
-
-	// generic UTF-8 character types supported
-	$upp = '\p{Lu}';
-	$low = '\p{Ll}';
-	$let = '\p{L}';
-	$num = '\p{N}';
-	$sym = '[^\p{Lu}\p{Ll}\p{N}]';
-
-	$chars = array();
-
-	switch (phpbb::$config['pass_complex'])
-	{
-		case 'PASS_TYPE_CASE':
-			$chars[] = $low;
-			$chars[] = $upp;
-		break;
-
-		case 'PASS_TYPE_ALPHA':
-			$chars[] = $let;
-			$chars[] = $num;
-		break;
-
-		case 'PASS_TYPE_SYMBOL':
-			$chars[] = $low;
-			$chars[] = $upp;
-			$chars[] = $num;
-			$chars[] = $sym;
-		break;
-	}
-
-	if ($pcre)
-	{
-		foreach ($chars as $char)
-		{
-			if (!preg_match('#' . $char . '#u', $password))
-			{
-				return 'INVALID_CHARS';
-			}
-		}
-	}
-	else if ($mbstring)
-	{
-		foreach ($chars as $char)
-		{
-			if (mb_ereg($char, $password) === false)
-			{
-				return 'INVALID_CHARS';
-			}
-		}
-	}
-
-	return false;
-}
-
-/**
-* Check to see if email address is banned or already present in the DB
-*
-* @param string $email The email to check
-* @param string $allowed_email An allowed email, default being phpbb::$user->data['user_email']
-*
-* @return mixed Either false if validation succeeded or a string which will be used as the error message (with the variable name appended)
-*/
-function validate_email($email, $allowed_email = false)
-{
-	$email = strtolower($email);
-	$allowed_email = ($allowed_email === false) ? strtolower(phpbb::$user->data['user_email']) : strtolower($allowed_email);
-
-	if ($allowed_email == $email)
-	{
-		return false;
-	}
-
-	if (!preg_match('/^' . get_preg_expression('email') . '$/i', $email))
-	{
-		return 'EMAIL_INVALID';
-	}
-
-	// Check MX record.
-	// The idea for this is from reading the UseBB blog/announcement. :)
-	if (phpbb::$config['email_check_mx'])
-	{
-		list(, $domain) = explode('@', $email);
-
-		if (phpbb_checkdnsrr($domain, 'A') === false && phpbb_checkdnsrr($domain, 'MX') === false)
-		{
-			return 'DOMAIN_NO_MX_RECORD';
-		}
-	}
-
-	if (($ban_reason = phpbb::$user->check_ban(false, false, $email, true)) !== false)
-	{
-		return ($ban_reason === true) ? 'EMAIL_BANNED' : $ban_reason;
-	}
-
-	if (!phpbb::$config['allow_emailreuse'])
-	{
-		$sql = 'SELECT user_email_hash
-			FROM ' . USERS_TABLE . "
-			WHERE user_email_hash = " . hexdec(crc32($email) . strlen($email));
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if ($row)
-		{
-			return 'EMAIL_TAKEN';
-		}
-	}
-
-	return false;
-}
-
-/**
-* Validate jabber address
-* Taken from the jabber class within flyspray (see author notes)
-*
-* @author flyspray.org
-*/
-function validate_jabber($jid)
-{
-	if (!$jid)
-	{
-		return false;
-	}
-
-	$seperator_pos = strpos($jid, '@');
-
-	if ($seperator_pos === false)
-	{
-		return 'WRONG_DATA';
-	}
-
-	$username = substr($jid, 0, $seperator_pos);
-	$realm = substr($jid, $seperator_pos + 1);
-
-	if (strlen($username) == 0 || strlen($realm) < 3)
-	{
-		return 'WRONG_DATA';
-	}
-
-	$arr = explode('.', $realm);
-
-	if (sizeof($arr) == 0)
-	{
-		return 'WRONG_DATA';
-	}
-
-	foreach ($arr as $part)
-	{
-		if (substr($part, 0, 1) == '-' || substr($part, -1, 1) == '-')
-		{
-			return 'WRONG_DATA';
-		}
-
-		if (!preg_match("@^[a-zA-Z0-9-.]+$@", $part))
-		{
-			return 'WRONG_DATA';
-		}
-	}
-
-	$boundary = array(array(0, 127), array(192, 223), array(224, 239), array(240, 247), array(248, 251), array(252, 253));
-
-	// Prohibited Characters RFC3454 + RFC3920
-	$prohibited = array(
-		// Table C.1.1
-		array(0x0020, 0x0020),		// SPACE
-		// Table C.1.2
-		array(0x00A0, 0x00A0),		// NO-BREAK SPACE
-		array(0x1680, 0x1680),		// OGHAM SPACE MARK
-		array(0x2000, 0x2001),		// EN QUAD
-		array(0x2001, 0x2001),		// EM QUAD
-		array(0x2002, 0x2002),		// EN SPACE
-		array(0x2003, 0x2003),		// EM SPACE
-		array(0x2004, 0x2004),		// THREE-PER-EM SPACE
-		array(0x2005, 0x2005),		// FOUR-PER-EM SPACE
-		array(0x2006, 0x2006),		// SIX-PER-EM SPACE
-		array(0x2007, 0x2007),		// FIGURE SPACE
-		array(0x2008, 0x2008),		// PUNCTUATION SPACE
-		array(0x2009, 0x2009),		// THIN SPACE
-		array(0x200A, 0x200A),		// HAIR SPACE
-		array(0x200B, 0x200B),		// ZERO WIDTH SPACE
-		array(0x202F, 0x202F),		// NARROW NO-BREAK SPACE
-		array(0x205F, 0x205F),		// MEDIUM MATHEMATICAL SPACE
-		array(0x3000, 0x3000),		// IDEOGRAPHIC SPACE
-		// Table C.2.1
-		array(0x0000, 0x001F),		// [CONTROL CHARACTERS]
-		array(0x007F, 0x007F),		// DELETE
-		// Table C.2.2
-		array(0x0080, 0x009F),		// [CONTROL CHARACTERS]
-		array(0x06DD, 0x06DD),		// ARABIC END OF AYAH
-		array(0x070F, 0x070F),		// SYRIAC ABBREVIATION MARK
-		array(0x180E, 0x180E),		// MONGOLIAN VOWEL SEPARATOR
-		array(0x200C, 0x200C), 		// ZERO WIDTH NON-JOINER
-		array(0x200D, 0x200D),		// ZERO WIDTH JOINER
-		array(0x2028, 0x2028),		// LINE SEPARATOR
-		array(0x2029, 0x2029),		// PARAGRAPH SEPARATOR
-		array(0x2060, 0x2060),		// WORD JOINER
-		array(0x2061, 0x2061),		// FUNCTION APPLICATION
-		array(0x2062, 0x2062),		// INVISIBLE TIMES
-		array(0x2063, 0x2063),		// INVISIBLE SEPARATOR
-		array(0x206A, 0x206F),		// [CONTROL CHARACTERS]
-		array(0xFEFF, 0xFEFF),		// ZERO WIDTH NO-BREAK SPACE
-		array(0xFFF9, 0xFFFC),		// [CONTROL CHARACTERS]
-		array(0x1D173, 0x1D17A),	// [MUSICAL CONTROL CHARACTERS]
-		// Table C.3
-		array(0xE000, 0xF8FF),		// [PRIVATE USE, PLANE 0]
-		array(0xF0000, 0xFFFFD),	// [PRIVATE USE, PLANE 15]
-		array(0x100000, 0x10FFFD),	// [PRIVATE USE, PLANE 16]
-		// Table C.4
-		array(0xFDD0, 0xFDEF),		// [NONCHARACTER CODE POINTS]
-		array(0xFFFE, 0xFFFF),		// [NONCHARACTER CODE POINTS]
-		array(0x1FFFE, 0x1FFFF),	// [NONCHARACTER CODE POINTS]
-		array(0x2FFFE, 0x2FFFF),	// [NONCHARACTER CODE POINTS]
-		array(0x3FFFE, 0x3FFFF),	// [NONCHARACTER CODE POINTS]
-		array(0x4FFFE, 0x4FFFF),	// [NONCHARACTER CODE POINTS]
-		array(0x5FFFE, 0x5FFFF),	// [NONCHARACTER CODE POINTS]
-		array(0x6FFFE, 0x6FFFF),	// [NONCHARACTER CODE POINTS]
-		array(0x7FFFE, 0x7FFFF),	// [NONCHARACTER CODE POINTS]
-		array(0x8FFFE, 0x8FFFF),	// [NONCHARACTER CODE POINTS]
-		array(0x9FFFE, 0x9FFFF),	// [NONCHARACTER CODE POINTS]
-		array(0xAFFFE, 0xAFFFF),	// [NONCHARACTER CODE POINTS]
-		array(0xBFFFE, 0xBFFFF),	// [NONCHARACTER CODE POINTS]
-		array(0xCFFFE, 0xCFFFF),	// [NONCHARACTER CODE POINTS]
-		array(0xDFFFE, 0xDFFFF),	// [NONCHARACTER CODE POINTS]
-		array(0xEFFFE, 0xEFFFF),	// [NONCHARACTER CODE POINTS]
-		array(0xFFFFE, 0xFFFFF),	// [NONCHARACTER CODE POINTS]
-		array(0x10FFFE, 0x10FFFF),	// [NONCHARACTER CODE POINTS]
-		// Table C.5
-		array(0xD800, 0xDFFF),		// [SURROGATE CODES]
-		// Table C.6
-		array(0xFFF9, 0xFFF9),		// INTERLINEAR ANNOTATION ANCHOR
-		array(0xFFFA, 0xFFFA),		// INTERLINEAR ANNOTATION SEPARATOR
-		array(0xFFFB, 0xFFFB),		// INTERLINEAR ANNOTATION TERMINATOR
-		array(0xFFFC, 0xFFFC),		// OBJECT REPLACEMENT CHARACTER
-		array(0xFFFD, 0xFFFD),		// REPLACEMENT CHARACTER
-		// Table C.7
-		array(0x2FF0, 0x2FFB),		// [IDEOGRAPHIC DESCRIPTION CHARACTERS]
-		// Table C.8
-		array(0x0340, 0x0340),		// COMBINING GRAVE TONE MARK
-		array(0x0341, 0x0341),		// COMBINING ACUTE TONE MARK
-		array(0x200E, 0x200E),		// LEFT-TO-RIGHT MARK
-		array(0x200F, 0x200F),		// RIGHT-TO-LEFT MARK
-		array(0x202A, 0x202A),		// LEFT-TO-RIGHT EMBEDDING
-		array(0x202B, 0x202B),		// RIGHT-TO-LEFT EMBEDDING
-		array(0x202C, 0x202C),		// POP DIRECTIONAL FORMATTING
-		array(0x202D, 0x202D),		// LEFT-TO-RIGHT OVERRIDE
-		array(0x202E, 0x202E),		// RIGHT-TO-LEFT OVERRIDE
-		array(0x206A, 0x206A),		// INHIBIT SYMMETRIC SWAPPING
-		array(0x206B, 0x206B),		// ACTIVATE SYMMETRIC SWAPPING
-		array(0x206C, 0x206C),		// INHIBIT ARABIC FORM SHAPING
-		array(0x206D, 0x206D),		// ACTIVATE ARABIC FORM SHAPING
-		array(0x206E, 0x206E),		// NATIONAL DIGIT SHAPES
-		array(0x206F, 0x206F),		// NOMINAL DIGIT SHAPES
-		// Table C.9
-		array(0xE0001, 0xE0001),	// LANGUAGE TAG
-		array(0xE0020, 0xE007F),	// [TAGGING CHARACTERS]
-		// RFC3920
-		array(0x22, 0x22),			// "
-		array(0x26, 0x26),			// &
-		array(0x27, 0x27),			// '
-		array(0x2F, 0x2F),			// /
-		array(0x3A, 0x3A),			// :
-		array(0x3C, 0x3C),			// <
-		array(0x3E, 0x3E),			// >
-		array(0x40, 0x40)			// @
-	);
-
-	$pos = 0;
-	$result = true;
-
-	// @todo: rewrite this!
-	while ($pos < strlen($username))
-	{
-		$len = $uni = 0;
-		for ($i = 0; $i <= 5; $i++)
-		{
-			if (ord($username[$pos]) >= $boundary[$i][0] && ord($username[$pos]) <= $boundary[$i][1])
-			{
-				$len = $i + 1;
-				$uni = (ord($username[$pos]) - $boundary[$i][0]) * pow(2, $i * 6);
-
-				for ($k = 1; $k < $len; $k++)
-				{
-					$uni += (ord($username[$pos + $k]) - 128) * pow(2, ($i - $k) * 6);
-				}
-
-				break;
-			}
-		}
-
-		if ($len == 0)
-		{
-			return 'WRONG_DATA';
-		}
-
-		foreach ($prohibited as $pval)
-		{
-			if ($uni >= $pval[0] && $uni <= $pval[1])
-			{
-				$result = false;
-				break 2;
-			}
-		}
-
-		$pos = $pos + $len;
-	}
-
-	if (!$result)
-	{
-		return 'WRONG_DATA';
-	}
-
-	return false;
-}
-
-/**
-* Remove avatar
-*/
-function avatar_delete($mode, $row, $clean_db = false)
-{
-	// Check if the users avatar is actually *not* a group avatar
-	if ($mode == 'user')
-	{
-		if (strpos($row['user_avatar'], 'g') === 0 || (((int)$row['user_avatar'] !== 0) && ((int)$row['user_avatar'] !== (int)$row['user_id'])))
-		{
-			return false;
-		}
-	}
-
-	if ($clean_db)
-	{
-		avatar_remove_db($row[$mode . '_avatar']);
-	}
-	$filename = get_avatar_filename($row[$mode . '_avatar']);
-	if (file_exists(PHPBB_ROOT_PATH . phpbb::$config['avatar_path'] . '/' . $filename))
-	{
-		@unlink(PHPBB_ROOT_PATH . phpbb::$config['avatar_path'] . '/' . $filename);
-		return true;
-	}
-
-	return false;
-}
-
-/**
-* Remote avatar linkage
-*/
-function avatar_remote($data, &$error)
-{
-	if (!preg_match('#^(http|https|ftp)://#i', $data['remotelink']))
-	{
-		$data['remotelink'] = 'http://' . $data['remotelink'];
-	}
-	if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.(gif|jpg|jpeg|png)$#i', $data['remotelink']))
-	{
-		$error[] = phpbb::$user->lang['AVATAR_URL_INVALID'];
-		return false;
-	}
-
-	// Make sure getimagesize works...
-	if (($image_data = @getimagesize($data['remotelink'])) === false && (empty($data['width']) || empty($data['height'])))
-	{
-		$error[] = phpbb::$user->lang['UNABLE_GET_IMAGE_SIZE'];
-		return false;
-	}
-
-	if (!empty($image_data) && ($image_data[0] < 2 || $image_data[1] < 2))
-	{
-		$error[] = phpbb::$user->lang['AVATAR_NO_SIZE'];
-		return false;
-	}
-
-	$width = ($data['width'] && $data['height']) ? $data['width'] : $image_data[0];
-	$height = ($data['width'] && $data['height']) ? $data['height'] : $image_data[1];
-
-	if ($width < 2 || $height < 2)
-	{
-		$error[] = phpbb::$user->lang['AVATAR_NO_SIZE'];
-		return false;
-	}
-
-	// Check image type
-	include_once(PHPBB_ROOT_PATH . 'includes/functions_upload.' . PHP_EXT);
-	$types = fileupload::image_types();
-	$extension = strtolower(filespec::get_extension($data['remotelink']));
-
-	if (!empty($image_data) && (!isset($types[$image_data[2]]) || !in_array($extension, $types[$image_data[2]])))
-	{
-		if (!isset($types[$image_data[2]]))
-		{
-			$error[] = phpbb::$user->lang['UNABLE_GET_IMAGE_SIZE'];
-		}
-		else
-		{
-			$error[] = sprintf(phpbb::$user->lang['IMAGE_FILETYPE_MISMATCH'], $types[$image_data[2]][0], $extension);
-		}
-		return false;
-	}
-
-	if (phpbb::$config['avatar_max_width'] || phpbb::$config['avatar_max_height'])
-	{
-		if ($width > phpbb::$config['avatar_max_width'] || $height > phpbb::$config['avatar_max_height'])
-		{
-			$error[] = sprintf(phpbb::$user->lang['AVATAR_WRONG_SIZE'], phpbb::$config['avatar_min_width'], phpbb::$config['avatar_min_height'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], $width, $height);
-			return false;
-		}
-	}
-
-	if (phpbb::$config['avatar_min_width'] || phpbb::$config['avatar_min_height'])
-	{
-		if ($width < phpbb::$config['avatar_min_width'] || $height < phpbb::$config['avatar_min_height'])
-		{
-			$error[] = sprintf(phpbb::$user->lang['AVATAR_WRONG_SIZE'], phpbb::$config['avatar_min_width'], phpbb::$config['avatar_min_height'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], $width, $height);
-			return false;
-		}
-	}
-
-	return array(AVATAR_REMOTE, $data['remotelink'], $width, $height);
-}
-
-/**
-* Avatar upload using the upload class
-*/
-function avatar_upload($data, &$error)
-{
-	// Init upload class
-	include_once(PHPBB_ROOT_PATH . 'includes/functions_upload.' . PHP_EXT);
-	$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), phpbb::$config['avatar_filesize'], phpbb::$config['avatar_min_width'], phpbb::$config['avatar_min_height'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], explode('|', phpbb::$config['mime_triggers']));
-
-	if (!empty($_FILES['uploadfile']['name']))
-	{
-		$file = $upload->form_upload('uploadfile');
-	}
-	else
-	{
-		$file = $upload->remote_upload($data['uploadurl']);
-	}
-
-	$prefix = phpbb::$config['avatar_salt'] . '_';
-	$file->clean_filename('avatar', $prefix, $data['user_id']);
-
-	$destination = phpbb::$config['avatar_path'];
-
-	// Adjust destination path (no trailing slash)
-	if (substr($destination, -1, 1) == '/' || substr($destination, -1, 1) == '\\')
-	{
-		$destination = substr($destination, 0, -1);
-	}
-
-	$destination = str_replace(array('../', '..\\', './', '.\\'), '', $destination);
-	if ($destination && ($destination[0] == '/' || $destination[0] == "\\"))
-	{
-		$destination = '';
-	}
-
-	// Move file and overwrite any existing image
-	$file->move_file($destination, true);
-
-	if (sizeof($file->error))
-	{
-		$file->remove();
-		$error = array_merge($error, $file->error);
-	}
-
-	return array(AVATAR_UPLOAD, $data['user_id'] . '_' . time() . '.' . $file->get('extension'), $file->get('width'), $file->get('height'));
-}
-
-/**
-* Generates avatar filename from the database entry
-*/
-function get_avatar_filename($avatar_entry)
-{
-	if ($avatar_entry[0] === 'g')
-	{
-		$avatar_group = true;
-		$avatar_entry = substr($avatar_entry, 1);
-	}
-	else
-	{
-		$avatar_group = false;
-	}
-	$ext 			= substr(strrchr($avatar_entry, '.'), 1);
-	$avatar_entry	= intval($avatar_entry);
-	return phpbb::$config['avatar_salt'] . '_' . (($avatar_group) ? 'g' : '') . $avatar_entry . '.' . $ext;
-}
-
-/**
-* Avatar Gallery
-*/
-function avatar_gallery($category, $avatar_select, $items_per_column, $block_var = 'avatar_row')
-{
-	$avatar_list = array();
-
-	$path = PHPBB_ROOT_PATH . phpbb::$config['avatar_gallery_path'];
-
-	if (!file_exists($path) || !is_dir($path))
-	{
-		$avatar_list = array(phpbb::$user->lang['NO_AVATAR_CATEGORY'] => array());
-	}
-	else
-	{
-		// Collect images
-		$dp = @opendir($path);
-
-		if (!$dp)
-		{
-			return array(phpbb::$user->lang['NO_AVATAR_CATEGORY'] => array());
-		}
-
-		while (($file = readdir($dp)) !== false)
-		{
-			if ($file[0] != '.' && preg_match('#^[^&"\'<>]+$#i', $file) && is_dir("$path/$file"))
-			{
-				$avatar_row_count = $avatar_col_count = 0;
-
-				if ($dp2 = @opendir("$path/$file"))
-				{
-					while (($sub_file = readdir($dp2)) !== false)
-					{
-						if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $sub_file))
-						{
-							$avatar_list[$file][$avatar_row_count][$avatar_col_count] = array(
-								'file'		=> "$file/$sub_file",
-								'filename'	=> $sub_file,
-								'name'		=> ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $sub_file))),
-							);
-							$avatar_col_count++;
-							if ($avatar_col_count == $items_per_column)
-							{
-								$avatar_row_count++;
-								$avatar_col_count = 0;
-							}
-						}
-					}
-					closedir($dp2);
-				}
-			}
-		}
-		closedir($dp);
-	}
-
-	if (!sizeof($avatar_list))
-	{
-		$avatar_list = array(phpbb::$user->lang['NO_AVATAR_CATEGORY'] => array());
-	}
-
-	@ksort($avatar_list);
-
-	$category = (!$category) ? key($avatar_list) : $category;
-	$avatar_categories = array_keys($avatar_list);
-
-	$s_category_options = '';
-	foreach ($avatar_categories as $cat)
-	{
-		$s_category_options .= '<option value="' . $cat . '"' . (($cat == $category) ? ' selected="selected"' : '') . '>' . $cat . '</option>';
-	}
-
-	phpbb::$template->assign_vars(array(
-		'S_AVATARS_ENABLED'		=> true,
-		'S_IN_AVATAR_GALLERY'	=> true,
-		'S_CAT_OPTIONS'			=> $s_category_options,
-	));
-
-	$avatar_list = (isset($avatar_list[$category])) ? $avatar_list[$category] : array();
-
-	foreach ($avatar_list as $avatar_row_ary)
-	{
-		phpbb::$template->assign_block_vars($block_var, array());
-
-		foreach ($avatar_row_ary as $avatar_col_ary)
-		{
-			phpbb::$template->assign_block_vars($block_var . '.avatar_column', array(
-				'AVATAR_IMAGE'	=> PHPBB_ROOT_PATH . phpbb::$config['avatar_gallery_path'] . '/' . $avatar_col_ary['file'],
-				'AVATAR_NAME'	=> $avatar_col_ary['name'],
-				'AVATAR_FILE'	=> $avatar_col_ary['filename'],
-			));
-
-			phpbb::$template->assign_block_vars($block_var . '.avatar_option_column', array(
-				'AVATAR_IMAGE'	=> PHPBB_ROOT_PATH . phpbb::$config['avatar_gallery_path'] . '/' . $avatar_col_ary['file'],
-				'S_OPTIONS_AVATAR'	=> $avatar_col_ary['filename'],
-			));
-		}
-	}
-
-	return $avatar_list;
-}
-
-
-/**
-* Tries to (re-)establish avatar dimensions
-*/
-function avatar_get_dimensions($avatar, $avatar_type, &$error, $current_x = 0, $current_y = 0)
-{
-	switch ($avatar_type)
-	{
-		case AVATAR_REMOTE :
-			break;
-
-		case AVATAR_UPLOAD :
-			$avatar = PHPBB_ROOT_PATH . phpbb::$config['avatar_path'] . '/' . get_avatar_filename($avatar);
-			break;
-
-		case AVATAR_GALLERY :
-			$avatar = PHPBB_ROOT_PATH . phpbb::$config['avatar_gallery_path'] . '/' . $avatar ;
-			break;
-	}
-
-	// Make sure getimagesize works...
-	if (($image_data = @getimagesize($avatar)) === false)
-	{
-		$error[] = phpbb::$user->lang['UNABLE_GET_IMAGE_SIZE'];
-		return false;
-	}
-
-	if ($image_data[0] < 2 || $image_data[1] < 2)
-	{
-		$error[] = phpbb::$user->lang['AVATAR_NO_SIZE'];
-		return false;
-	}
-
-	// try to maintain ratio
-	if (!(empty($current_x) && empty($current_y)))
-	{
-		if ($current_x != 0)
-		{
-			$image_data[1] = (int) floor(($current_x / $image_data[0]) * $image_data[1]);
-			$image_data[1] = min(phpbb::$config['avatar_max_height'], $image_data[1]);
-			$image_data[1] = max(phpbb::$config['avatar_min_height'], $image_data[1]);
-		}
-		if ($current_y != 0)
-		{
-			$image_data[0] = (int) floor(($current_y / $image_data[1]) * $image_data[0]);
-			$image_data[0] = min(phpbb::$config['avatar_max_width'], $image_data[1]);
-			$image_data[0] = max(phpbb::$config['avatar_min_width'], $image_data[1]);
-		}
-	}
-	return array($image_data[0], $image_data[1]);
-}
-
-/**
-* Uploading/Changing user avatar
-*/
-function avatar_process_user(&$error, $custom_userdata = false)
-{
-	$data = array(
-		'uploadurl'		=> request_var('uploadurl', ''),
-		'remotelink'	=> request_var('remotelink', ''),
-		'width'			=> request_var('width', 0),
-		'height'		=> request_var('height', 0),
-	);
-
-	$error = validate_data($data, array(
-		'uploadurl'		=> array('string', true, 5, 255),
-		'remotelink'	=> array('string', true, 5, 255),
-		'width'			=> array('string', true, 1, 3),
-		'height'		=> array('string', true, 1, 3),
-	));
-
-	if (sizeof($error))
-	{
-		return false;
-	}
-
-	$sql_ary = array();
-
-	if ($custom_userdata === false)
-	{
-		$userdata = &phpbb::$user->data;
-	}
-	else
-	{
-		$userdata = &$custom_userdata;
-	}
-
-	$data['user_id'] = $userdata['user_id'];
-	$change_avatar = ($custom_userdata === false) ? phpbb::$acl->acl_get('u_chgavatar') : true;
-	$avatar_select = basename(request_var('avatar_select', ''));
-
-	// Can we upload?
-	$can_upload = (phpbb::$config['allow_avatar_upload'] && file_exists(PHPBB_ROOT_PATH . phpbb::$config['avatar_path']) && @is_writable(PHPBB_ROOT_PATH . phpbb::$config['avatar_path']) && $change_avatar && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
-
-	if ((!empty($_FILES['uploadfile']['name']) || $data['uploadurl']) && $can_upload)
-	{
-		list($sql_ary['user_avatar_type'], $sql_ary['user_avatar'], $sql_ary['user_avatar_width'], $sql_ary['user_avatar_height']) = avatar_upload($data, $error);
-	}
-	else if ($data['remotelink'] && $change_avatar && phpbb::$config['allow_avatar_remote'])
-	{
-		list($sql_ary['user_avatar_type'], $sql_ary['user_avatar'], $sql_ary['user_avatar_width'], $sql_ary['user_avatar_height']) = avatar_remote($data, $error);
-	}
-	else if ($avatar_select && $change_avatar && phpbb::$config['allow_avatar_local'])
-	{
-		$category = basename(request_var('category', ''));
-
-		$sql_ary['user_avatar_type'] = AVATAR_GALLERY;
-		$sql_ary['user_avatar'] = $avatar_select;
-
-		// check avatar gallery
-		if (!is_dir(PHPBB_ROOT_PATH . phpbb::$config['avatar_gallery_path'] . '/' . $category))
-		{
-			$sql_ary['user_avatar'] = '';
-			$sql_ary['user_avatar_type'] = $sql_ary['user_avatar_width'] = $sql_ary['user_avatar_height'] = 0;
-		}
-		else
-		{
-			list($sql_ary['user_avatar_width'], $sql_ary['user_avatar_height']) = getimagesize(PHPBB_ROOT_PATH . phpbb::$config['avatar_gallery_path'] . '/' . $category . '/' . $sql_ary['user_avatar']);
-			$sql_ary['user_avatar'] = $category . '/' . $sql_ary['user_avatar'];
-		}
-	}
-	else if (phpbb_request::is_set_post('delete') && $change_avatar)
-	{
-		$sql_ary['user_avatar'] = '';
-		$sql_ary['user_avatar_type'] = $sql_ary['user_avatar_width'] = $sql_ary['user_avatar_height'] = 0;
-	}
-	else if (!empty($userdata['user_avatar']))
-	{
-		// Only update the dimensions
-
-		if (empty($data['width']) || empty($data['height']))
-		{
-			if ($dims = avatar_get_dimensions($userdata['user_avatar'], $userdata['user_avatar_type'], $error, $data['width'], $data['height']))
-			{
-				list($guessed_x, $guessed_y) = $dims;
-				if (empty($data['width']))
-				{
-					$data['width'] = $guessed_x;
-				}
-				if (empty($data['height']))
-				{
-					$data['height'] = $guessed_y;
-				}
-			}
-		}
-		if ((phpbb::$config['avatar_max_width'] || phpbb::$config['avatar_max_height']) &&
-			(($data['width'] != $userdata['user_avatar_width']) || $data['height'] != $userdata['user_avatar_height']))
-		{
-			if ($data['width'] > phpbb::$config['avatar_max_width'] || $data['height'] > phpbb::$config['avatar_max_height'])
-			{
-				$error[] = sprintf(phpbb::$user->lang['AVATAR_WRONG_SIZE'], phpbb::$config['avatar_min_width'], phpbb::$config['avatar_min_height'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], $data['width'], $data['height']);
-			}
-		}
-
-		if (!sizeof($error))
-		{
-			if (phpbb::$config['avatar_min_width'] || phpbb::$config['avatar_min_height'])
-			{
-				if ($data['width'] < phpbb::$config['avatar_min_width'] || $data['height'] < phpbb::$config['avatar_min_height'])
-				{
-					$error[] = sprintf(phpbb::$user->lang['AVATAR_WRONG_SIZE'], phpbb::$config['avatar_min_width'], phpbb::$config['avatar_min_height'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], $data['width'], $data['height']);
-				}
-			}
-		}
-
-		if (!sizeof($error))
-		{
-			$sql_ary['user_avatar_width'] = $data['width'];
-			$sql_ary['user_avatar_height'] = $data['height'];
-		}
-	}
-
-	if (!sizeof($error))
-	{
-		// Do we actually have any data to update?
-		if (sizeof($sql_ary))
-		{
-			$ext_new = $ext_old = '';
-			if (isset($sql_ary['user_avatar']))
-			{
-				$userdata = ($custom_userdata === false) ? phpbb::$user->data : $custom_userdata;
-				$ext_new = (empty($sql_ary['user_avatar'])) ? '' : substr(strrchr($sql_ary['user_avatar'], '.'), 1);
-				$ext_old = (empty($userdata['user_avatar'])) ? '' : substr(strrchr($userdata['user_avatar'], '.'), 1);
-
-				if ($userdata['user_avatar_type'] == AVATAR_UPLOAD)
-				{
-					// Delete old avatar if present
-					if ((!empty($userdata['user_avatar']) && empty($sql_ary['user_avatar']))
-					   || ( !empty($userdata['user_avatar']) && !empty($sql_ary['user_avatar']) && $ext_new !== $ext_old))
-					{
-						avatar_delete('user', $userdata);
-					}
-				}
-			}
-
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-				WHERE user_id = ' . (($custom_userdata === false) ? phpbb::$user->data['user_id'] : $custom_userdata['user_id']);
-			phpbb::$db->sql_query($sql);
-
-		}
-	}
-
-	return (sizeof($error)) ? false : true;
-}
-
-//
-// Usergroup functions
-//
-
-/**
-* Add or edit a group. If we're editing a group we only update user
-* parameters such as rank, etc. if they are changed
-*/
-function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow_desc_bbcode = false, $allow_desc_urls = false, $allow_desc_smilies = false)
-{
-	global $file_upload;
-
-	$error = array();
-	$attribute_ary = array(
-		'group_colour'			=> 'string',
-		'group_rank'			=> 'int',
-		'group_avatar'			=> 'string',
-		'group_avatar_type'		=> 'int',
-		'group_avatar_width'	=> 'int',
-		'group_avatar_height'	=> 'int',
-
-		'group_receive_pm'		=> 'int',
-		'group_legend'			=> 'int',
-		'group_message_limit'	=> 'int',
-		'group_max_recipients'	=> 'int',
-
-		'group_founder_manage'	=> 'int',
-	);
-
-	// Those are group-only attributes
-	$group_only_ary = array('group_receive_pm', 'group_legend', 'group_message_limit', 'group_max_recipients', 'group_founder_manage');
-
-	// Check data. Limit group name length.
-	if (!utf8_strlen($name) || utf8_strlen($name) > 60)
-	{
-		$error[] = (!utf8_strlen($name)) ? phpbb::$user->lang['GROUP_ERR_USERNAME'] : phpbb::$user->lang['GROUP_ERR_USER_LONG'];
-	}
-
-	$err = group_validate_groupname($group_id, $name);
-	if (!empty($err))
-	{
-		$error[] = phpbb::$user->lang[$err];
-	}
-
-	if (!in_array($type, array(GROUP_OPEN, GROUP_CLOSED, GROUP_HIDDEN, GROUP_SPECIAL, GROUP_FREE)))
-	{
-		$error[] = phpbb::$user->lang['GROUP_ERR_TYPE'];
-	}
-
-	if (!sizeof($error))
-	{
-		$user_ary = array();
-		$sql_ary = array(
-			'group_name'			=> (string) $name,
-			'group_name_clean'		=> (string) utf8_clean_string($name),
-			'group_desc'			=> (string) $desc,
-			'group_desc_uid'		=> '',
-			'group_desc_bitfield'	=> '',
-			'group_type'			=> (int) $type,
-		);
-
-		// Parse description
-		if ($desc)
-		{
-			generate_text_for_storage($sql_ary['group_desc'], $sql_ary['group_desc_uid'], $sql_ary['group_desc_bitfield'], $sql_ary['group_desc_options'], $allow_desc_bbcode, $allow_desc_urls, $allow_desc_smilies);
-		}
-
-		if (sizeof($group_attributes))
-		{
-			foreach ($attribute_ary as $attribute => $_type)
-			{
-				if (isset($group_attributes[$attribute]))
-				{
-					settype($group_attributes[$attribute], $_type);
-					$sql_ary[$attribute] = $group_attributes[$attribute];
-				}
-			}
-		}
-
-		// Setting the log message before we set the group id (if group gets added)
-		$log = ($group_id) ? 'LOG_GROUP_UPDATED' : 'LOG_GROUP_CREATED';
-
-		$query = '';
-
-		if ($group_id)
-		{
-			$sql = 'SELECT user_id
-				FROM ' . USERS_TABLE . '
-				WHERE group_id = ' . $group_id;
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$user_ary[] = $row['user_id'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			if (isset($sql_ary['group_avatar']) && !$sql_ary['group_avatar'])
-			{
-				remove_default_avatar($group_id, $user_ary);
-			}
-			if (isset($sql_ary['group_rank']) && !$sql_ary['group_rank'])
-			{
-				remove_default_rank($group_id, $user_ary);
-			}
-
-			$sql = 'UPDATE ' . GROUPS_TABLE . '
-				SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . "
-				WHERE group_id = $group_id";
-			phpbb::$db->sql_query($sql);
-
-			// Since we may update the name too, we need to do this on other tables too...
-			$sql = 'UPDATE ' . MODERATOR_CACHE_TABLE . "
-				SET group_name = '" . phpbb::$db->sql_escape($sql_ary['group_name']) . "'
-				WHERE group_id = $group_id";
-			phpbb::$db->sql_query($sql);
-		}
-		else
-		{
-			$sql = 'INSERT INTO ' . GROUPS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary);
-			phpbb::$db->sql_query($sql);
-		}
-
-		if (!$group_id)
-		{
-			$group_id = phpbb::$db->sql_nextid();
-			if (isset($sql_ary['group_avatar_type']) && $sql_ary['group_avatar_type'] == AVATAR_UPLOAD)
-			{
-				group_correct_avatar($group_id, $sql_ary['group_avatar']);
-			}
-		}
-
-		// Set user attributes
-		$sql_ary = array();
-		if (sizeof($group_attributes))
-		{
-			foreach ($attribute_ary as $attribute => $_type)
-			{
-				if (isset($group_attributes[$attribute]) && !in_array($attribute, $group_only_ary))
-				{
-					// If we are about to set an avatar, we will not overwrite user avatars if no group avatar is set...
-					if (strpos($attribute, 'group_avatar') === 0 && !$group_attributes[$attribute])
-					{
-						continue;
-					}
-
-					$sql_ary[$attribute] = $group_attributes[$attribute];
-				}
-			}
-		}
-
-		if (sizeof($sql_ary) && sizeof($user_ary))
-		{
-			group_set_user_default($group_id, $user_ary, $sql_ary);
-		}
-
-		$name = ($type == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $name] : $name;
-		add_log('admin', $log, $name);
-
-		group_update_listings($group_id);
-	}
-
-	return (sizeof($error)) ? $error : false;
-}
-
-
-/**
-* Changes a group avatar's filename to conform to the naming scheme
-*/
-function group_correct_avatar($group_id, $old_entry)
-{
-	$group_id		= (int)$group_id;
-	$ext 			= substr(strrchr($old_entry, '.'), 1);
-	$old_filename 	= get_avatar_filename($old_entry);
-	$new_filename 	= phpbb::$config['avatar_salt'] . "_g$group_id.$ext";
-	$new_entry 		= 'g' . $group_id . '_' . substr(time(), -5) . ".$ext";
-
-	$avatar_path = PHPBB_ROOT_PATH . phpbb::$config['avatar_path'];
-	if (@rename($avatar_path . '/'. $old_filename, $avatar_path . '/' . $new_filename))
-	{
-		$sql = 'UPDATE ' . GROUPS_TABLE . '
-			SET group_avatar = \'' . phpbb::$db->sql_escape($new_entry) . "'
-			WHERE group_id = $group_id";
-		phpbb::$db->sql_query($sql);
-	}
-}
-
-
-/**
-* Remove avatar also for users not having the group as default
-*/
-function avatar_remove_db($avatar_name)
-{
-	$sql = 'UPDATE ' . USERS_TABLE . "
-		SET user_avatar = '',
-		user_avatar_type = 0
-		WHERE user_avatar = '" . phpbb::$db->sql_escape($avatar_name) . '\'';
-	phpbb::$db->sql_query($sql);
-}
-
-
-/**
-* Group Delete
-*/
-function group_delete($group_id, $group_name = false)
-{
-	if (!$group_name)
-	{
-		$group_name = get_group_name($group_id);
-	}
-
-	$start = 0;
-
-	do
-	{
-		$user_id_ary = $username_ary = array();
-
-		// Batch query for group members, call group_user_del
-		$sql = 'SELECT u.user_id, u.username
-			FROM ' . USER_GROUP_TABLE . ' ug, ' . USERS_TABLE . " u
-			WHERE ug.group_id = $group_id
-				AND u.user_id = ug.user_id";
-		$result = phpbb::$db->sql_query_limit($sql, 200, $start);
-
-		if ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			do
-			{
-				$user_id_ary[] = $row['user_id'];
-				$username_ary[] = $row['username'];
-
-				$start++;
-			}
-			while ($row = phpbb::$db->sql_fetchrow($result));
-
-			group_user_del($group_id, $user_id_ary, $username_ary, $group_name);
-		}
-		else
-		{
-			$start = 0;
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-	while ($start);
-
-	// Delete group
-	$sql = 'DELETE FROM ' . GROUPS_TABLE . "
-		WHERE group_id = $group_id";
-	phpbb::$db->sql_query($sql);
-
-	// Delete auth entries from the groups table
-	$sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . "
-		WHERE group_id = $group_id";
-	phpbb::$db->sql_query($sql);
-
-	// Re-cache moderators
-	if (!function_exists('cache_moderators'))
-	{
-		include(PHPBB_ROOT_PATH . 'includes/functions_admin.' . PHP_EXT);
-	}
-
-	cache_moderators();
-
-	add_log('admin', 'LOG_GROUP_DELETE', $group_name);
-
-	// Return false - no error
-	return false;
-}
-
-/**
-* Add user(s) to group
-*
-* @return mixed false if no errors occurred, else the user lang string for the relevant error, for example 'NO_USER'
-*/
-function group_user_add($group_id, $user_id_ary = false, $username_ary = false, $group_name = false, $default = false, $leader = 0, $pending = 0, $group_attributes = false)
-{
-	// We need both username and user_id info
-	$result = user_get_id_name($user_id_ary, $username_ary);
-
-	if (!sizeof($user_id_ary) || $result !== false)
-	{
-		return 'NO_USER';
-	}
-
-	// Remove users who are already members of this group
-	$sql = 'SELECT user_id, group_leader
-		FROM ' . USER_GROUP_TABLE . '
-		WHERE ' . phpbb::$db->sql_in_set('user_id', $user_id_ary) . "
-			AND group_id = $group_id";
-	$result = phpbb::$db->sql_query($sql);
-
-	$add_id_ary = $update_id_ary = array();
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$add_id_ary[] = (int) $row['user_id'];
-
-		if ($leader && !$row['group_leader'])
-		{
-			$update_id_ary[] = (int) $row['user_id'];
-		}
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	// Do all the users exist in this group?
-	$add_id_ary = array_diff($user_id_ary, $add_id_ary);
-
-	// If we have no users
-	if (!sizeof($add_id_ary) && !sizeof($update_id_ary))
-	{
-		return 'GROUP_USERS_EXIST';
-	}
-
-	phpbb::$db->sql_transaction('begin');
-
-	// Insert the new users
-	if (sizeof($add_id_ary))
-	{
-		$sql_ary = array();
-
-		foreach ($add_id_ary as $user_id)
-		{
-			$sql_ary[] = array(
-				'user_id'		=> (int) $user_id,
-				'group_id'		=> (int) $group_id,
-				'group_leader'	=> (int) $leader,
-				'user_pending'	=> (int) $pending,
-			);
-		}
-
-		phpbb::$db->sql_multi_insert(USER_GROUP_TABLE, $sql_ary);
-	}
-
-	if (sizeof($update_id_ary))
-	{
-		$sql = 'UPDATE ' . USER_GROUP_TABLE . '
-			SET group_leader = 1
-			WHERE ' . phpbb::$db->sql_in_set('user_id', $update_id_ary) . "
-				AND group_id = $group_id";
-		phpbb::$db->sql_query($sql);
-	}
-
-	if ($default)
-	{
-		group_set_user_default($group_id, $user_id_ary, $group_attributes);
-	}
-
-	phpbb::$db->sql_transaction('commit');
-
-	// Clear permissions cache of relevant users
-	phpbb::$acl->acl_clear_prefetch($user_id_ary);
-
-	if (!$group_name)
-	{
-		$group_name = get_group_name($group_id);
-	}
-
-	$log = ($leader) ? 'LOG_MODS_ADDED' : 'LOG_USERS_ADDED';
-
-	add_log('admin', $log, $group_name, implode(', ', $username_ary));
-
-	group_update_listings($group_id);
-
-	// Return false - no error
-	return false;
-}
-
-/**
-* Remove a user/s from a given group. When we remove users we update their
-* default group_id. We do this by examining which "special" groups they belong
-* to. The selection is made based on a reasonable priority system
-*
-* @return false if no errors occurred, else the user lang string for the relevant error, for example 'NO_USER'
-*/
-function group_user_del($group_id, $user_id_ary = false, $username_ary = false, $group_name = false)
-{
-	if (phpbb::$config['coppa_enable'])
-	{
-		$group_order = array('ADMINISTRATORS', 'GLOBAL_MODERATORS', 'REGISTERED_COPPA', 'REGISTERED', 'BOTS', 'GUESTS');
-	}
-	else
-	{
-		$group_order = array('ADMINISTRATORS', 'GLOBAL_MODERATORS', 'REGISTERED', 'BOTS', 'GUESTS');
-	}
-
-	// We need both username and user_id info
-	$result = user_get_id_name($user_id_ary, $username_ary);
-
-	if (!sizeof($user_id_ary) || $result !== false)
-	{
-		return 'NO_USER';
-	}
-
-	$clean_group_order = array_map('utf8_clean_string', $group_order);
-
-	$sql = 'SELECT *
-		FROM ' . GROUPS_TABLE . '
-		WHERE ' . phpbb::$db->sql_in_set('group_name_clean', $clean_group_order);
-	$result = phpbb::$db->sql_query($sql);
-
-	$group_order_id = $special_group_data = array();
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$group_order_id[$row['group_name']] = $row['group_id'];
-
-		$special_group_data[$row['group_id']] = array(
-			'group_colour'			=> $row['group_colour'],
-			'group_rank'				=> $row['group_rank'],
-		);
-
-		// Only set the group avatar if one is defined...
-		if ($row['group_avatar'])
-		{
-			$special_group_data[$row['group_id']] = array_merge($special_group_data[$row['group_id']], array(
-				'group_avatar'			=> $row['group_avatar'],
-				'group_avatar_type'		=> $row['group_avatar_type'],
-				'group_avatar_width'		=> $row['group_avatar_width'],
-				'group_avatar_height'	=> $row['group_avatar_height'])
-			);
-		}
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	// Get users default groups - we only need to reset default group membership if the group from which the user gets removed is set as default
-	$sql = 'SELECT user_id, group_id
-		FROM ' . USERS_TABLE . '
-		WHERE ' . phpbb::$db->sql_in_set('user_id', $user_id_ary);
-	$result = phpbb::$db->sql_query($sql);
-
-	$default_groups = array();
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$default_groups[$row['user_id']] = $row['group_id'];
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	// What special group memberships exist for these users?
-	$sql = 'SELECT g.group_id, g.group_name_clean, ug.user_id
-		FROM ' . USER_GROUP_TABLE . ' ug, ' . GROUPS_TABLE . ' g
-		WHERE ' . phpbb::$db->sql_in_set('ug.user_id', $user_id_ary) . "
-			AND g.group_id = ug.group_id
-			AND g.group_id <> $group_id
-			AND g.group_type = " . GROUP_SPECIAL . '
-		ORDER BY ug.user_id, g.group_id';
-	$result = phpbb::$db->sql_query($sql);
-
-	$temp_ary = array();
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		if ($default_groups[$row['user_id']] == $group_id && (!isset($temp_ary[$row['user_id']]) || $group_order_id[$row['group_name']] < $temp_ary[$row['user_id']]))
-		{
-			$temp_ary[$row['user_id']] = $row['group_id'];
-		}
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	// sql_where_ary holds the new default groups and their users
-	$sql_where_ary = array();
-	foreach ($temp_ary as $uid => $gid)
-	{
-		$sql_where_ary[$gid][] = $uid;
-	}
-	unset($temp_ary);
-
-	foreach ($special_group_data as $gid => $default_data_ary)
-	{
-		if (isset($sql_where_ary[$gid]) && sizeof($sql_where_ary[$gid]))
-		{
-			remove_default_rank($gid, $sql_where_ary[$gid]);
-			remove_default_avatar($group_id, $sql_where_ary[$gid]);
-			group_set_user_default($gid, $sql_where_ary[$gid], $default_data_ary);
-		}
-	}
-	unset($special_group_data);
-
-	$sql = 'DELETE FROM ' . USER_GROUP_TABLE . "
-		WHERE group_id = $group_id
-			AND " . phpbb::$db->sql_in_set('user_id', $user_id_ary);
-	phpbb::$db->sql_query($sql);
-
-	// Clear permissions cache of relevant users
-	phpbb::$acl->acl_clear_prefetch($user_id_ary);
-
-	if (!$group_name)
-	{
-		$group_name = get_group_name($group_id);
-	}
-
-	$log = 'LOG_GROUP_REMOVE';
-
-	add_log('admin', $log, $group_name, implode(', ', $username_ary));
-
-	group_update_listings($group_id);
-
-	// Return false - no error
-	return false;
-}
-
-
-/**
-* Removes the group avatar of the default group from the users in user_ids who have that group as default.
-*/
-function remove_default_avatar($group_id, $user_ids)
-{
-	if (!is_array($user_ids))
-	{
-		$user_ids = array($user_ids);
-	}
-	if (empty($user_ids))
-	{
-		return false;
-	}
-
-	$user_ids = array_map('intval', $user_ids);
-
-	$sql = 'SELECT *
-		FROM ' . GROUPS_TABLE . '
-		WHERE group_id = ' . (int)$group_id;
-	$result = phpbb::$db->sql_query($sql);
-	if (!$row = phpbb::$db->sql_fetchrow($result))
-	{
-		phpbb::$db->sql_freeresult($result);
-		return false;
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	$sql = 'UPDATE ' . USERS_TABLE . "
-		SET user_avatar = '',
-			user_avatar_type = 0,
-			user_avatar_width = 0,
-			user_avatar_height = 0
-		WHERE group_id = " . (int) $group_id . "
-		AND user_avatar = '" . phpbb::$db->sql_escape($row['group_avatar']) . "'
-		AND " . phpbb::$db->sql_in_set('user_id', $user_ids);
-
-	phpbb::$db->sql_query($sql);
-}
-
-/**
-* Removes the group rank of the default group from the users in user_ids who have that group as default.
-*/
-function remove_default_rank($group_id, $user_ids)
-{
-	if (!is_array($user_ids))
-	{
-		$user_ids = array($user_ids);
-	}
-	if (empty($user_ids))
-	{
-		return false;
-	}
-
-	$user_ids = array_map('intval', $user_ids);
-
-	$sql = 'SELECT *
-		FROM ' . GROUPS_TABLE . '
-		WHERE group_id = ' . (int)$group_id;
-	$result = phpbb::$db->sql_query($sql);
-	if (!$row = phpbb::$db->sql_fetchrow($result))
-	{
-		phpbb::$db->sql_freeresult($result);
-		return false;
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	$sql = 'UPDATE ' . USERS_TABLE . '
-		SET user_rank = 0
-		WHERE group_id = ' . (int)$group_id . '
-		AND user_rank <> 0
-		AND user_rank = ' . (int)$row['group_rank'] . '
-		AND ' . phpbb::$db->sql_in_set('user_id', $user_ids);
-	phpbb::$db->sql_query($sql);
-}
-
-/**
-* This is used to promote (to leader), demote or set as default a member/s
-*/
-function group_user_attributes($action, $group_id, $user_id_ary = false, $username_ary = false, $group_name = false, $group_attributes = false)
-{
-	// We need both username and user_id info
-	$result = user_get_id_name($user_id_ary, $username_ary);
-
-	if (!sizeof($user_id_ary) || $result !== false)
-	{
-		return 'NO_USERS';
-	}
-
-	if (!$group_name)
-	{
-		$group_name = get_group_name($group_id);
-	}
-
-	switch ($action)
-	{
-		case 'demote':
-		case 'promote':
-
-			$sql = 'SELECT user_id FROM ' . USER_GROUP_TABLE . "
-				WHERE group_id = $group_id
-					AND user_pending = 1
-					AND " . phpbb::$db->sql_in_set('user_id', $user_id_ary);
-			$result = phpbb::$db->sql_query_limit($sql, 1);
-			$not_empty = (phpbb::$db->sql_fetchrow($result));
-			phpbb::$db->sql_freeresult($result);
-			if ($not_empty)
-			{
-				return 'NO_VALID_USERS';
-			}
-
-			$sql = 'UPDATE ' . USER_GROUP_TABLE . '
-				SET group_leader = ' . (($action == 'promote') ? 1 : 0) . "
-				WHERE group_id = $group_id
-					AND user_pending = 0
-					AND " . phpbb::$db->sql_in_set('user_id', $user_id_ary);
-			phpbb::$db->sql_query($sql);
-
-			$log = ($action == 'promote') ? 'LOG_GROUP_PROMOTED' : 'LOG_GROUP_DEMOTED';
-		break;
-
-		case 'approve':
-			// Make sure we only approve those which are pending ;)
-			$sql = 'SELECT u.user_id, u.user_email, u.username, u.username_clean, u.user_notify_type, u.user_jabber, u.user_lang
-				FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . ' ug
-				WHERE ug.group_id = ' . $group_id . '
-					AND ug.user_pending = 1
-					AND ug.user_id = u.user_id
-					AND ' . phpbb::$db->sql_in_set('ug.user_id', $user_id_ary);
-			$result = phpbb::$db->sql_query($sql);
-
-			$user_id_ary = $email_users = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$user_id_ary[] = $row['user_id'];
-				$email_users[] = $row;
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			if (!sizeof($user_id_ary))
-			{
-				return false;
-			}
-
-			$sql = 'UPDATE ' . USER_GROUP_TABLE . "
-				SET user_pending = 0
-				WHERE group_id = $group_id
-					AND " . phpbb::$db->sql_in_set('user_id', $user_id_ary);
-			phpbb::$db->sql_query($sql);
-
-			// Send approved email to users...
-			include_once(PHPBB_ROOT_PATH . 'includes/functions_messenger.' . PHP_EXT);
-			$messenger = new messenger();
-
-			foreach ($email_users as $row)
-			{
-				$messenger->template('group_approved', $row['user_lang']);
-
-				$messenger->to($row['user_email'], $row['username']);
-				$messenger->im($row['user_jabber'], $row['username']);
-
-				$messenger->assign_vars(array(
-					'USERNAME'		=> htmlspecialchars_decode($row['username']),
-					'GROUP_NAME'	=> htmlspecialchars_decode($group_name),
-					'U_GROUP'		=> generate_board_url() . '/ucp.' . PHP_EXT . '?i=groups&mode=membership',
-				));
-
-				$messenger->send($row['user_notify_type']);
-			}
-
-			$messenger->save_queue();
-
-			$log = 'LOG_USERS_APPROVED';
-		break;
-
-		case 'default':
-			$sql = 'SELECT user_id, group_id FROM ' . USERS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('user_id', $user_id_ary, false, true);
-			$result = phpbb::$db->sql_query($sql);
-
-			$groups = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				if (!isset($groups[$row['group_id']]))
-				{
-					$groups[$row['group_id']] = array();
-				}
-				$groups[$row['group_id']][] = $row['user_id'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			foreach ($groups as $gid => $uids)
-			{
-				remove_default_rank($gid, $uids);
-				remove_default_avatar($gid, $uids);
-			}
-			group_set_user_default($group_id, $user_id_ary, $group_attributes);
-			$log = 'LOG_GROUP_DEFAULTS';
-		break;
-	}
-
-	// Clear permissions cache of relevant users
-	phpbb::$acl->acl_clear_prefetch($user_id_ary);
-
-	add_log('admin', $log, $group_name, implode(', ', $username_ary));
-
-	group_update_listings($group_id);
-
-	return false;
-}
-
-/**
-* A small version of validate_username to check for a group name's existence. To be called directly.
-*/
-function group_validate_groupname($group_id, $group_name)
-{
-	$group_name =  utf8_clean_string($group_name);
-
-	if (!empty($group_id))
-	{
-		$sql = 'SELECT group_name_clean
-			FROM ' . GROUPS_TABLE . '
-			WHERE group_id = ' . (int) $group_id;
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$row)
-		{
-			return false;
-		}
-
-		$allowed_groupname = utf8_clean_string($row['group_name']);
-
-		if ($allowed_groupname == $group_name)
-		{
-			return false;
-		}
-	}
-
-	$sql = 'SELECT group_name
-		FROM ' . GROUPS_TABLE . "
-		WHERE group_name_clean = '" . phpbb::$db->sql_escape(utf8_clean_string($group_name)) . "'";
-	$result = phpbb::$db->sql_query($sql);
-	$row = phpbb::$db->sql_fetchrow($result);
-	phpbb::$db->sql_freeresult($result);
-
-	if ($row)
-	{
-		return 'GROUP_NAME_TAKEN';
-	}
-
-	return false;
-}
-
-/**
-* Set users default group
-*
-* @access private
-*/
-function group_set_user_default($group_id, $user_id_ary, $group_attributes = false, $update_listing = false)
-{
-	if (empty($user_id_ary))
-	{
-		return;
-	}
-
-	$attribute_ary = array(
-		'group_colour'			=> 'string',
-		'group_rank'			=> 'int',
-		'group_avatar'			=> 'string',
-		'group_avatar_type'		=> 'int',
-		'group_avatar_width'	=> 'int',
-		'group_avatar_height'	=> 'int',
-	);
-
-	$sql_ary = array(
-		'group_id'		=> $group_id
-	);
-
-	// Were group attributes passed to the function? If not we need to obtain them
-	if ($group_attributes === false)
-	{
-		$sql = 'SELECT ' . implode(', ', array_keys($attribute_ary)) . '
-			FROM ' . GROUPS_TABLE . "
-			WHERE group_id = $group_id";
-		$result = phpbb::$db->sql_query($sql);
-		$group_attributes = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	foreach ($attribute_ary as $attribute => $type)
-	{
-		if (isset($group_attributes[$attribute]))
-		{
-			// If we are about to set an avatar or rank, we will not overwrite with empty, unless we are not actually changing the default group
-			if ((strpos($attribute, 'group_avatar') === 0 || strpos($attribute, 'group_rank') === 0) && !$group_attributes[$attribute])
-			{
-				continue;
-			}
-
-			settype($group_attributes[$attribute], $type);
-			$sql_ary[str_replace('group_', 'user_', $attribute)] = $group_attributes[$attribute];
-		}
-	}
-
-	// Before we update the user attributes, we will make a list of those having now the group avatar assigned
-	if (isset($sql_ary['user_avatar']))
-	{
-		// Ok, get the original avatar data from users having an uploaded one (we need to remove these from the filesystem)
-		$sql = 'SELECT user_id, group_id, user_avatar
-			FROM ' . USERS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('user_id', $user_id_ary) . '
-				AND user_avatar_type = ' . AVATAR_UPLOAD;
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			avatar_delete('user', $row);
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-	else
-	{
-		unset($sql_ary['user_avatar_type']);
-		unset($sql_ary['user_avatar_height']);
-		unset($sql_ary['user_avatar_width']);
-	}
-
-	$sql = 'UPDATE ' . USERS_TABLE . ' SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-		WHERE ' . phpbb::$db->sql_in_set('user_id', $user_id_ary);
-	phpbb::$db->sql_query($sql);
-
-	if (isset($sql_ary['user_colour']))
-	{
-		// Update any cached colour information for these users
-		$sql = 'UPDATE ' . FORUMS_TABLE . " SET forum_last_poster_colour = '" . phpbb::$db->sql_escape($sql_ary['user_colour']) . "'
-			WHERE " . phpbb::$db->sql_in_set('forum_last_poster_id', $user_id_ary);
-		phpbb::$db->sql_query($sql);
-
-		$sql = 'UPDATE ' . TOPICS_TABLE . " SET topic_first_poster_colour = '" . phpbb::$db->sql_escape($sql_ary['user_colour']) . "'
-			WHERE " . phpbb::$db->sql_in_set('topic_poster', $user_id_ary);
-		phpbb::$db->sql_query($sql);
-
-		$sql = 'UPDATE ' . TOPICS_TABLE . " SET topic_last_poster_colour = '" . phpbb::$db->sql_escape($sql_ary['user_colour']) . "'
-			WHERE " . phpbb::$db->sql_in_set('topic_last_poster_id', $user_id_ary);
-		phpbb::$db->sql_query($sql);
-
-		if (in_array(phpbb::$config['newest_user_id'], $user_id_ary))
-		{
-			set_config('newest_user_colour', $sql_ary['user_colour'], true);
-		}
-	}
-
-	if ($update_listing)
-	{
-		group_update_listings($group_id);
-	}
-}
-
-/**
-* Get group name
-*/
-function get_group_name($group_id)
-{
-	$sql = 'SELECT group_name, group_type
-		FROM ' . GROUPS_TABLE . '
-		WHERE group_id = ' . (int) $group_id;
-	$result = phpbb::$db->sql_query($sql);
-	$row = phpbb::$db->sql_fetchrow($result);
-	phpbb::$db->sql_freeresult($result);
-
-	if (!$row)
-	{
-		return '';
-	}
-
-	return ($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name'];
-}
-
-/**
-* Obtain either the members of a specified group, the groups the specified user is subscribed to
-* or checking if a specified user is in a specified group. This function does not return pending memberships.
-*
-* Note: Never use this more than once... first group your users/groups
-*/
-function group_memberships($group_id_ary = false, $user_id_ary = false, $return_bool = false)
-{
-	if (!$group_id_ary && !$user_id_ary)
-	{
-		return true;
-	}
-
-	if ($user_id_ary)
-	{
-		$user_id_ary = (!is_array($user_id_ary)) ? array($user_id_ary) : $user_id_ary;
-	}
-
-	if ($group_id_ary)
-	{
-		$group_id_ary = (!is_array($group_id_ary)) ? array($group_id_ary) : $group_id_ary;
-	}
-
-	$sql = 'SELECT ug.*, u.username, u.username_clean, u.user_email
-		FROM ' . USER_GROUP_TABLE . ' ug, ' . USERS_TABLE . ' u
-		WHERE ug.user_id = u.user_id
-			AND ug.user_pending = 0 AND ';
-
-	if ($group_id_ary)
-	{
-		$sql .= ' ' . phpbb::$db->sql_in_set('ug.group_id', $group_id_ary);
-	}
-
-	if ($user_id_ary)
-	{
-		$sql .= ($group_id_ary) ? ' AND ' : ' ';
-		$sql .= phpbb::$db->sql_in_set('ug.user_id', $user_id_ary);
-	}
-
-	$result = ($return_bool) ? phpbb::$db->sql_query_limit($sql, 1) : phpbb::$db->sql_query($sql);
-
-	$row = phpbb::$db->sql_fetchrow($result);
-
-	if ($return_bool)
-	{
-		phpbb::$db->sql_freeresult($result);
-		return ($row) ? true : false;
-	}
-
-	if (!$row)
-	{
-		return false;
-	}
-
-	$return = array();
-
-	do
-	{
-		$return[] = $row;
-	}
-	while ($row = phpbb::$db->sql_fetchrow($result));
-
-	phpbb::$db->sql_freeresult($result);
-
-	return $return;
-}
-
-/**
-* Re-cache moderators and foes if group has a_ or m_ permissions
-*/
-function group_update_listings($group_id)
-{
-	$hold_ary = phpbb::$acl->acl_group_raw_data($group_id, array('a_', 'm_'));
-
-	if (!sizeof($hold_ary))
-	{
-		return;
-	}
-
-	$mod_permissions = $admin_permissions = false;
-
-	foreach ($hold_ary as $g_id => $forum_ary)
-	{
-		foreach ($forum_ary as $forum_id => $auth_ary)
-		{
-			foreach ($auth_ary as $auth_option => $setting)
-			{
-				if ($mod_permissions && $admin_permissions)
-				{
-					break 3;
-				}
-
-				if ($setting != phpbb::ACL_YES)
-				{
-					continue;
-				}
-
-				if ($auth_option == 'm_')
-				{
-					$mod_permissions = true;
-				}
-
-				if ($auth_option == 'a_')
-				{
-					$admin_permissions = true;
-				}
-			}
-		}
-	}
-
-	if ($mod_permissions)
-	{
-		if (!function_exists('cache_moderators'))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/functions_admin.' . PHP_EXT);
-		}
-		cache_moderators();
-	}
-
-	if ($mod_permissions || $admin_permissions)
-	{
-		if (!function_exists('update_foes'))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/functions_admin.' . PHP_EXT);
-		}
-		update_foes(array($group_id));
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/libraries/diff/diff.php b/phpBB/includes/libraries/diff/diff.php
deleted file mode 100644
index c5249ee3c1..0000000000
--- a/phpBB/includes/libraries/diff/diff.php
+++ /dev/null
@@ -1,823 +0,0 @@
-<?php
-/**
-*
-* @package diff
-* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Code from pear.php.net, Text_Diff-1.1.0 package
-* http://pear.php.net/package/Text_Diff/
-*
-* Modified by phpBB Group to meet our coding standards
-* and being able to integrate into phpBB
-*
-* General API for generating and formatting diffs - the differences between
-* two sequences of strings.
-*
-* Copyright 2004 Geoffrey T. Dairiki <dairiki@dairiki.org>
-* Copyright 2004-2008 The Horde Project (http://www.horde.org/)
-*
-* @package diff
-* @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
-*/
-class diff
-{
-	/**
-	* Array of changes.
-	* @var array
-	*/
-	var $_edits;
-
-	/**
-	* Computes diffs between sequences of strings.
-	*
-	* @param array $from_lines  An array of strings. Typically these are lines from a file.
-	* @param array $to_lines    An array of strings.
-	*/
-	function __construct(&$from_content, &$to_content, $preserve_cr = true)
-	{
-		$diff_engine = new diff_engine();
-		$this->_edits = $diff_engine->diff($from_content, $to_content, $preserve_cr);
-	}
-
-	/**
-	* Returns the array of differences.
-	*/
-	function get_diff()
-	{
-		return $this->_edits;
-	}
-
-	/**
-	* returns the number of new (added) lines in a given diff.
-	*
-	* @since Text_Diff 1.1.0
-	*
-	* @return integer The number of new lines
-	*/
-	function count_added_lines()
-	{
-		$count = 0;
-
-		foreach ($this->_edits as $edit)
-		{
-			if (is_a($edit, 'diff_op_add') || is_a($edit, 'diff_op_change'))
-			{
-				$count += $edit->nfinal();
-			}
-		}
-		return $count;
-	}
-
-	/**
-	* Returns the number of deleted (removed) lines in a given diff.
-	*
-	* @since Text_Diff 1.1.0
-	*
-	* @return integer The number of deleted lines
-	*/
-	function count_deleted_lines()
-	{
-		$count = 0;
-
-		foreach ($this->_edits as $edit)
-		{
-			if (is_a($edit, 'diff_op_delete') || is_a($edit, 'diff_op_change'))
-			{
-				$count += $edit->norig();
-			}
-		}
-		return $count;
-	}
-
-	/**
-	* Computes a reversed diff.
-	*
-	* Example:
-	* <code>
-	* $diff = new diff($lines1, $lines2);
-	* $rev = $diff->reverse();
-	* </code>
-	*
-	* @return diff  A Diff object representing the inverse of the original diff.
-	*               Note that we purposely don't return a reference here, since
-	*               this essentially is a clone() method.
-	*/
-	function reverse()
-	{
-		if (version_compare(zend_version(), '2', '>'))
-		{
-			$rev = clone($this);
-		}
-		else
-		{
-			$rev = $this;
-		}
-
-		$rev->_edits = array();
-
-		foreach ($this->_edits as $edit)
-		{
-			$rev->_edits[] = $edit->reverse();
-		}
-
-		return $rev;
-	}
-
-	/**
-	* Checks for an empty diff.
-	*
-	* @return boolean  True if two sequences were identical.
-	*/
-	function is_empty()
-	{
-		foreach ($this->_edits as $edit)
-		{
-			if (!is_a($edit, 'diff_op_copy'))
-			{
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	* Computes the length of the Longest Common Subsequence (LCS).
-	*
-	* This is mostly for diagnostic purposes.
-	*
-	* @return integer  The length of the LCS.
-	*/
-	function lcs()
-	{
-		$lcs = 0;
-
-		foreach ($this->_edits as $edit)
-		{
-			if (is_a($edit, 'diff_op_copy'))
-			{
-				$lcs += sizeof($edit->orig);
-			}
-		}
-		return $lcs;
-	}
-
-	/**
-	* Gets the original set of lines.
-	*
-	* This reconstructs the $from_lines parameter passed to the constructor.
-	*
-	* @return array  The original sequence of strings.
-	*/
-	function get_original()
-	{
-		$lines = array();
-
-		foreach ($this->_edits as $edit)
-		{
-			if ($edit->orig)
-			{
-				array_splice($lines, sizeof($lines), 0, $edit->orig);
-			}
-		}
-		return $lines;
-	}
-
-	/**
-	* Gets the final set of lines.
-	*
-	* This reconstructs the $to_lines parameter passed to the constructor.
-	*
-	* @return array  The sequence of strings.
-	*/
-	function get_final()
-	{
-		$lines = array();
-
-		foreach ($this->_edits as $edit)
-		{
-			if ($edit->final)
-			{
-				array_splice($lines, sizeof($lines), 0, $edit->final);
-			}
-		}
-		return $lines;
-	}
-
-	/**
-	* Removes trailing newlines from a line of text. This is meant to be used with array_walk().
-	*
-	* @param string &$line  The line to trim.
-	* @param integer $key  The index of the line in the array. Not used.
-	*/
-	function trim_newlines(&$line, $key)
-	{
-		$line = str_replace(array("\n", "\r"), '', $line);
-	}
-
-	/**
-	* Checks a diff for validity.
-	*
-	* This is here only for debugging purposes.
-	*/
-	function _check($from_lines, $to_lines)
-	{
-		if (serialize($from_lines) != serialize($this->get_original()))
-		{
-			trigger_error("[diff] Reconstructed original doesn't match", E_USER_ERROR);
-		}
-
-		if (serialize($to_lines) != serialize($this->get_final()))
-		{
-			trigger_error("[diff] Reconstructed final doesn't match", E_USER_ERROR);
-		}
-
-		$rev = $this->reverse();
-
-		if (serialize($to_lines) != serialize($rev->get_original()))
-		{
-			trigger_error("[diff] Reversed original doesn't match", E_USER_ERROR);
-		}
-
-		if (serialize($from_lines) != serialize($rev->get_final()))
-		{
-			trigger_error("[diff] Reversed final doesn't match", E_USER_ERROR);
-		}
-
-		$prevtype = null;
-
-		foreach ($this->_edits as $edit)
-		{
-			if ($prevtype == get_class($edit))
-			{
-				trigger_error("[diff] Edit sequence is non-optimal", E_USER_ERROR);
-			}
-			$prevtype = get_class($edit);
-		}
-
-		return true;
-	}
-}
-
-/**
-* @package diff
-* @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
-*/
-class mapped_diff extends diff
-{
-	/**
-	* Computes a diff between sequences of strings.
-	*
-	* This can be used to compute things like case-insensitve diffs, or diffs
-	* which ignore changes in white-space.
-	*
-	* @param array $from_lines         An array of strings.
-	* @param array $to_lines           An array of strings.
-	* @param array $mapped_from_lines  This array should have the same size number of elements as $from_lines.
-	*                                  The elements in $mapped_from_lines and $mapped_to_lines are what is actually
-	*                                  compared when computing the diff.
-	* @param array $mapped_to_lines    This array should have the same number of elements as $to_lines.
-	*/
-	function mapped_diff(&$from_lines, &$to_lines, &$mapped_from_lines, &$mapped_to_lines)
-	{
-		if (sizeof($from_lines) != sizeof($mapped_from_lines) || sizeof($to_lines) != sizeof($mapped_to_lines))
-		{
-			return false;
-		}
-
-		parent::diff($mapped_from_lines, $mapped_to_lines);
-
-		$xi = $yi = 0;
-		for ($i = 0; $i < sizeof($this->_edits); $i++)
-		{
-			$orig = &$this->_edits[$i]->orig;
-			if (is_array($orig))
-			{
-				$orig = array_slice($from_lines, $xi, sizeof($orig));
-				$xi += sizeof($orig);
-			}
-
-			$final = &$this->_edits[$i]->final;
-			if (is_array($final))
-			{
-				$final = array_slice($to_lines, $yi, sizeof($final));
-				$yi += sizeof($final);
-			}
-		}
-	}
-}
-
-/**
-* @package diff
-* @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
-*
-* @access private
-*/
-class diff_op
-{
-	var $orig;
-	var $final;
-
-	function &reverse()
-	{
-		trigger_error('[diff] Abstract method', E_USER_ERROR);
-	}
-
-	function norig()
-	{
-		return ($this->orig) ? sizeof($this->orig) : 0;
-	}
-
-	function nfinal()
-	{
-		return ($this->final) ? sizeof($this->final) : 0;
-	}
-}
-
-/**
-* @package diff
-* @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
-*
-* @access private
-*/
-class diff_op_copy extends diff_op
-{
-	function diff_op_copy($orig, $final = false)
-	{
-		if (!is_array($final))
-		{
-			$final = $orig;
-		}
-		$this->orig = $orig;
-		$this->final = $final;
-	}
-
-	function &reverse()
-	{
-		$reverse = new diff_op_copy($this->final, $this->orig);
-		return $reverse;
-	}
-}
-
-/**
-* @package diff
-* @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
-*
-* @access private
-*/
-class diff_op_delete extends diff_op
-{
-	function diff_op_delete($lines)
-	{
-		$this->orig = $lines;
-		$this->final = false;
-	}
-
-	function &reverse()
-	{
-		$reverse = new diff_op_add($this->orig);
-		return $reverse;
-	}
-}
-
-/**
-* @package diff
-* @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
-*
-* @access private
-*/
-class diff_op_add extends diff_op
-{
-	function diff_op_add($lines)
-	{
-		$this->final = $lines;
-		$this->orig = false;
-	}
-
-	function &reverse()
-	{
-		$reverse = new diff_op_delete($this->final);
-		return $reverse;
-	}
-}
-
-/**
-* @package diff
-* @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
-*
-* @access private
-*/
-class diff_op_change extends diff_op
-{
-	function diff_op_change($orig, $final)
-	{
-		$this->orig = $orig;
-		$this->final = $final;
-	}
-
-	function &reverse()
-	{
-		$reverse = new diff_op_change($this->final, $this->orig);
-		return $reverse;
-	}
-}
-
-
-/**
-* A class for computing three way diffs.
-*
-* @package diff
-* @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
-*/
-class diff3 extends diff
-{
-	/**
-	* Conflict counter.
-	* @var integer
-	*/
-	var $_conflicting_blocks = 0;
-
-	/**
-	* Computes diff between 3 sequences of strings.
-	*
-	* @param array $orig    The original lines to use.
-	* @param array $final1  The first version to compare to.
-	* @param array $final2  The second version to compare to.
-	*/
-	function diff3(&$orig, &$final1, &$final2)
-	{
-		$diff_engine = new diff_engine();
-
-		$diff_1 = $diff_engine->diff($orig, $final1);
-		$diff_2 = $diff_engine->diff($orig, $final2);
-
-		unset($engine);
-
-		$this->_edits = $this->_diff3($diff_1, $diff_2);
-	}
-
-	/**
-	* Return number of conflicts
-	*/
-	function get_num_conflicts()
-	{
-		$conflicts = 0;
-
-		foreach ($this->_edits as $edit)
-		{
-			if ($edit->is_conflict())
-			{
-				$conflicts++;
-			}
-		}
-
-		return $conflicts;
-	}
-
-	/**
-	* Get conflicts content for download. This is generally a merged file, but preserving conflicts and adding explanations to it.
-	* A user could then go through this file, search for the conflicts and changes the code accordingly.
-	*
-	* @param string $label1 the cvs file version/label from the original set of lines
-	* @param string $label2 the cvs file version/label from the new set of lines
-	* @param string $label_sep the explanation between label1 and label2 - more of a helper for the user
-	*
-	* @return mixed the merged output
-	*/
-	function get_conflicts_content($label1 = 'CURRENT_FILE', $label2 = 'NEW_FILE', $label_sep = 'DIFF_SEP_EXPLAIN')
-	{
-		$label1 = (!empty(phpbb::$user->lang[$label1])) ? phpbb::$user->lang[$label1] : $label1;
-		$label2 = (!empty(phpbb::$user->lang[$label2])) ? phpbb::$user->lang[$label2] : $label2;
-		$label_sep = (!empty(phpbb::$user->lang[$label_sep])) ? phpbb::$user->lang[$label_sep] : $label_sep;
-
-		$lines = array();
-
-		foreach ($this->_edits as $edit)
-		{
-			if ($edit->is_conflict())
-			{
-				// Start conflict label
-				$label_start	= array('<<<<<<< ' . $label1);
-				$label_mid		= array('======= ' . $label_sep);
-				$label_end		= array('>>>>>>> ' . $label2);
-
-				$lines = array_merge($lines, $label_start, $edit->final1, $label_mid, $edit->final2, $label_end);
-			}
-			else
-			{
-				$lines = array_merge($lines, $edit->merged());
-			}
-		}
-
-		return $lines;
-	}
-
-	/**
-	* Merge the output and use the new file code for conflicts
-	*/
-	function merged_new_output()
-	{
-		$lines = array();
-
-		foreach ($this->_edits as $edit)
-		{
-			if ($edit->is_conflict())
-			{
-				$lines = array_merge($lines, $edit->final2);
-			}
-			else
-			{
-				$lines = array_merge($lines, $edit->merged());
-			}
-		}
-
-		return $lines;
-	}
-
-	/**
-	* Merge the output and use the original file code for conflicts
-	*/
-	function merged_orig_output()
-	{
-		$lines = array();
-
-		foreach ($this->_edits as $edit)
-		{
-			if ($edit->is_conflict())
-			{
-				$lines = array_merge($lines, $edit->final1);
-			}
-			else
-			{
-				$lines = array_merge($lines, $edit->merged());
-			}
-		}
-
-		return $lines;
-	}
-
-	/**
-	* Get conflicting block(s)
-	*/
-	function get_conflicts()
-	{
-		$conflicts = array();
-
-		foreach ($this->_edits as $edit)
-		{
-			if ($edit->is_conflict())
-			{
-				$conflicts[] = array($edit->final1, $edit->final2);
-			}
-		}
-
-		return $conflicts;
-	}
-
-	/**
-	* @access private
-	*/
-	function _diff3(&$edits1, &$edits2)
-	{
-		$edits = array();
-		$bb = new diff3_block_builder();
-
-		$e1 = current($edits1);
-		$e2 = current($edits2);
-
-		while ($e1 || $e2)
-		{
-			if ($e1 && $e2 && is_a($e1, 'diff_op_copy') && is_a($e2, 'diff_op_copy'))
-			{
-				// We have copy blocks from both diffs. This is the (only) time we want to emit a diff3 copy block.
-				// Flush current diff3 diff block, if any.
-				if ($edit = $bb->finish())
-				{
-					$edits[] = $edit;
-				}
-
-				$ncopy = min($e1->norig(), $e2->norig());
-				$edits[] = new diff3_op_copy(array_slice($e1->orig, 0, $ncopy));
-
-				if ($e1->norig() > $ncopy)
-				{
-					array_splice($e1->orig, 0, $ncopy);
-					array_splice($e1->final, 0, $ncopy);
-				}
-				else
-				{
-					$e1 = next($edits1);
-				}
-
-				if ($e2->norig() > $ncopy)
-				{
-					array_splice($e2->orig, 0, $ncopy);
-					array_splice($e2->final, 0, $ncopy);
-				}
-				else
-				{
-					$e2 = next($edits2);
-				}
-			}
-			else
-			{
-				if ($e1 && $e2)
-				{
-					if ($e1->orig && $e2->orig)
-					{
-						$norig = min($e1->norig(), $e2->norig());
-						$orig = array_splice($e1->orig, 0, $norig);
-						array_splice($e2->orig, 0, $norig);
-						$bb->input($orig);
-					}
-					else
-					{
-						$norig = 0;
-					}
-
-					if (is_a($e1, 'diff_op_copy'))
-					{
-						$bb->out1(array_splice($e1->final, 0, $norig));
-					}
-
-					if (is_a($e2, 'diff_op_copy'))
-					{
-						$bb->out2(array_splice($e2->final, 0, $norig));
-					}
-				}
-
-				if ($e1 && ! $e1->orig)
-				{
-					$bb->out1($e1->final);
-					$e1 = next($edits1);
-				}
-
-				if ($e2 && ! $e2->orig)
-				{
-					$bb->out2($e2->final);
-					$e2 = next($edits2);
-				}
-			}
-		}
-
-		if ($edit = $bb->finish())
-		{
-			$edits[] = $edit;
-		}
-
-		return $edits;
-	}
-}
-
-/**
-* @package diff
-* @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
-*
-* @access private
-*/
-class diff3_op
-{
-	function __construct($orig = false, $final1 = false, $final2 = false)
-	{
-		$this->orig = $orig ? $orig : array();
-		$this->final1 = $final1 ? $final1 : array();
-		$this->final2 = $final2 ? $final2 : array();
-	}
-
-	function merged()
-	{
-		if (!isset($this->_merged))
-		{
-			if ($this->final1 === $this->final2)
-			{
-				$this->_merged = &$this->final1;
-			}
-			else if ($this->final1 === $this->orig)
-			{
-				$this->_merged = &$this->final2;
-			}
-			else if ($this->final2 === $this->orig)
-			{
-				$this->_merged = &$this->final1;
-			}
-			else
-			{
-				$this->_merged = false;
-			}
-		}
-
-		return $this->_merged;
-	}
-
-	function is_conflict()
-	{
-		return ($this->merged() === false) ? true : false;
-	}
-}
-
-/**
-* @package diff
-* @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
-*
-* @access private
-*/
-class diff3_op_copy extends diff3_op
-{
-	function diff3_op_copy($lines = false)
-	{
-		$this->orig = $lines ? $lines : array();
-		$this->final1 = &$this->orig;
-		$this->final2 = &$this->orig;
-	}
-
-	function merged()
-	{
-		return $this->orig;
-	}
-
-	function is_conflict()
-	{
-		return false;
-	}
-}
-
-/**
-* @package diff
-* @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
-*
-* @access private
-*/
-class diff3_block_builder
-{
-	function __construct()
-	{
-		$this->_init();
-	}
-
-	function input($lines)
-	{
-		if ($lines)
-		{
-			$this->_append($this->orig, $lines);
-		}
-	}
-
-	function out1($lines)
-	{
-		if ($lines)
-		{
-			$this->_append($this->final1, $lines);
-		}
-	}
-
-	function out2($lines)
-	{
-		if ($lines)
-		{
-			$this->_append($this->final2, $lines);
-		}
-	}
-
-	function is_empty()
-	{
-		return !$this->orig && !$this->final1 && !$this->final2;
-	}
-
-	function finish()
-	{
-		if ($this->is_empty())
-		{
-			return false;
-		}
-		else
-		{
-			$edit = new diff3_op($this->orig, $this->final1, $this->final2);
-			$this->_init();
-			return $edit;
-		}
-	}
-
-	function _init()
-	{
-		$this->orig = $this->final1 = $this->final2 = array();
-	}
-
-	function _append(&$array, $lines)
-	{
-		array_splice($array, sizeof($array), 0, $lines);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/libraries/diff/engine.php b/phpBB/includes/libraries/diff/engine.php
deleted file mode 100644
index eb0dcce395..0000000000
--- a/phpBB/includes/libraries/diff/engine.php
+++ /dev/null
@@ -1,536 +0,0 @@
-<?php
-/**
-*
-* @package diff
-* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Code from pear.php.net, Text_Diff-1.1.0 package
-* http://pear.php.net/package/Text_Diff/ (native engine)
-*
-* Modified by phpBB Group to meet our coding standards
-* and being able to integrate into phpBB
-*
-* Class used internally by Text_Diff to actually compute the diffs. This
-* class is implemented using native PHP code.
-*
-* The algorithm used here is mostly lifted from the perl module
-* Algorithm::Diff (version 1.06) by Ned Konz, which is available at:
-* http://www.perl.com/CPAN/authors/id/N/NE/NEDKONZ/Algorithm-Diff-1.06.zip
-*
-* More ideas are taken from: http://www.ics.uci.edu/~eppstein/161/960229.html
-*
-* Some ideas (and a bit of code) are taken from analyze.c, of GNU
-* diffutils-2.7, which can be found at:
-* ftp://gnudist.gnu.org/pub/gnu/diffutils/diffutils-2.7.tar.gz
-*
-* Some ideas (subdivision by NCHUNKS > 2, and some optimizations) are from
-* Geoffrey T. Dairiki <dairiki@dairiki.org>. The original PHP version of this
-* code was written by him, and is used/adapted with his permission.
-*
-* Copyright 2004-2008 The Horde Project (http://www.horde.org/)
-*
-* @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
-* @package diff
-*
-* @access private
-*/
-class diff_engine
-{
-	function diff(&$from_lines, &$to_lines, $preserve_cr = true)
-	{
-		// Remove empty lines...
-		// If preserve_cr is true, we basically only change \r\n and bare \r to \n to get the same carriage returns for both files
-		// If it is false, we try to only use \n once per line and ommit all empty lines to be able to get a proper data diff
-
-		if (is_array($from_lines))
-		{
-			$from_lines = implode("\n", $from_lines);
-		}
-
-		if (is_array($to_lines))
-		{
-			$to_lines = implode("\n", $to_lines);
-		}
-
-		if ($preserve_cr)
-		{
-			$from_lines = explode("\n", str_replace("\r", "\n", str_replace("\r\n", "\n", $from_lines)));
-			$to_lines = explode("\n", str_replace("\r", "\n", str_replace("\r\n", "\n", $to_lines)));
-		}
-		else
-		{
-			$from_lines = explode("\n", preg_replace('#[\n\r]+#', "\n", $from_lines));
-			$to_lines = explode("\n", preg_replace('#[\n\r]+#', "\n", $to_lines));
-		}
-
-		$n_from = sizeof($from_lines);
-		$n_to = sizeof($to_lines);
-
-		$this->xchanged = $this->ychanged = $this->xv = $this->yv = $this->xind = $this->yind = array();
-		unset($this->seq, $this->in_seq, $this->lcs);
-
-		// Skip leading common lines.
-		for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++)
-		{
-			if ($from_lines[$skip] !== $to_lines[$skip])
-			{
-				break;
-			}
-			$this->xchanged[$skip] = $this->ychanged[$skip] = false;
-		}
-
-		// Skip trailing common lines.
-		$xi = $n_from;
-		$yi = $n_to;
-
-		for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++)
-		{
-			if ($from_lines[$xi] !== $to_lines[$yi])
-			{
-				break;
-			}
-			$this->xchanged[$xi] = $this->ychanged[$yi] = false;
-		}
-
-		// Ignore lines which do not exist in both files.
-		for ($xi = $skip; $xi < $n_from - $endskip; $xi++)
-		{
-			$xhash[$from_lines[$xi]] = 1;
-		}
-
-		for ($yi = $skip; $yi < $n_to - $endskip; $yi++)
-		{
-			$line = $to_lines[$yi];
-
-			if (($this->ychanged[$yi] = empty($xhash[$line])))
-			{
-				continue;
-			}
-			$yhash[$line] = 1;
-			$this->yv[] = $line;
-			$this->yind[] = $yi;
-		}
-
-		for ($xi = $skip; $xi < $n_from - $endskip; $xi++)
-		{
-			$line = $from_lines[$xi];
-
-			if (($this->xchanged[$xi] = empty($yhash[$line])))
-			{
-				continue;
-			}
-			$this->xv[] = $line;
-			$this->xind[] = $xi;
-		}
-
-		// Find the LCS.
-		$this->_compareseq(0, sizeof($this->xv), 0, sizeof($this->yv));
-
-		// Merge edits when possible.
-		$this->_shift_boundaries($from_lines, $this->xchanged, $this->ychanged);
-		$this->_shift_boundaries($to_lines, $this->ychanged, $this->xchanged);
-
-		// Compute the edit operations.
-		$edits = array();
-		$xi = $yi = 0;
-
-		while ($xi < $n_from || $yi < $n_to)
-		{
-			// Skip matching "snake".
-			$copy = array();
-
-			while ($xi < $n_from && $yi < $n_to && !$this->xchanged[$xi] && !$this->ychanged[$yi])
-			{
-				$copy[] = $from_lines[$xi++];
-				$yi++;
-			}
-
-			if ($copy)
-			{
-				$edits[] = new diff_op_copy($copy);
-			}
-
-			// Find deletes & adds.
-			$delete = array();
-			while ($xi < $n_from && $this->xchanged[$xi])
-			{
-				$delete[] = $from_lines[$xi++];
-			}
-
-			$add = array();
-			while ($yi < $n_to && $this->ychanged[$yi])
-			{
-				$add[] = $to_lines[$yi++];
-			}
-
-			if ($delete && $add)
-			{
-				$edits[] = new diff_op_change($delete, $add);
-			}
-			else if ($delete)
-			{
-				$edits[] = new diff_op_delete($delete);
-			}
-			else if ($add)
-			{
-				$edits[] = new diff_op_add($add);
-			}
-		}
-
-		return $edits;
-	}
-
-	/**
-	* Divides the Largest Common Subsequence (LCS) of the sequences (XOFF,
-	* XLIM) and (YOFF, YLIM) into NCHUNKS approximately equally sized segments.
-	*
-	* Returns (LCS, PTS).  LCS is the length of the LCS. PTS is an array of
-	* NCHUNKS+1 (X, Y) indexes giving the diving points between sub
-	* sequences.  The first sub-sequence is contained in (X0, X1), (Y0, Y1),
-	* the second in (X1, X2), (Y1, Y2) and so on.  Note that (X0, Y0) ==
-	* (XOFF, YOFF) and (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM).
-	*
-	* This function assumes that the first lines of the specified portions of
-	* the two files do not match, and likewise that the last lines do not
-	* match.  The caller must trim matching lines from the beginning and end
-	* of the portions it is going to specify.
-	*/
-	function _diag($xoff, $xlim, $yoff, $ylim, $nchunks)
-	{
-		$flip = false;
-
-		if ($xlim - $xoff > $ylim - $yoff)
-		{
-			// Things seems faster (I'm not sure I understand why) when the shortest sequence is in X.
-			$flip = true;
-			list($xoff, $xlim, $yoff, $ylim) = array($yoff, $ylim, $xoff, $xlim);
-		}
-
-		if ($flip)
-		{
-			for ($i = $ylim - 1; $i >= $yoff; $i--)
-			{
-				$ymatches[$this->xv[$i]][] = $i;
-			}
-		}
-		else
-		{
-			for ($i = $ylim - 1; $i >= $yoff; $i--)
-			{
-				$ymatches[$this->yv[$i]][] = $i;
-			}
-		}
-
-		$this->lcs = 0;
-		$this->seq[0]= $yoff - 1;
-		$this->in_seq = array();
-		$ymids[0] = array();
-
-		$numer = $xlim - $xoff + $nchunks - 1;
-		$x = $xoff;
-
-		for ($chunk = 0; $chunk < $nchunks; $chunk++)
-		{
-			if ($chunk > 0)
-			{
-				for ($i = 0; $i <= $this->lcs; $i++)
-				{
-					$ymids[$i][$chunk - 1] = $this->seq[$i];
-				}
-			}
-
-			$x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $chunk) / $nchunks);
-
-			for (; $x < $x1; $x++)
-			{
-				$line = $flip ? $this->yv[$x] : $this->xv[$x];
-				if (empty($ymatches[$line]))
-				{
-					continue;
-				}
-				$matches = $ymatches[$line];
-
-				reset($matches);
-				while (list(, $y) = each($matches))
-				{
-					if (empty($this->in_seq[$y]))
-					{
-						$k = $this->_lcs_pos($y);
-						$ymids[$k] = $ymids[$k - 1];
-						break;
-					}
-				}
-
-				// no reset() here
-				while (list(, $y) = each($matches))
-				{
-					if ($y > $this->seq[$k - 1])
-					{
-						// Optimization: this is a common case: next match is just replacing previous match.
-						$this->in_seq[$this->seq[$k]] = false;
-						$this->seq[$k] = $y;
-						$this->in_seq[$y] = 1;
-					}
-					else if (empty($this->in_seq[$y]))
-					{
-						$k = $this->_lcs_pos($y);
-						$ymids[$k] = $ymids[$k - 1];
-					}
-				}
-			}
-		}
-
-		$seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
-		$ymid = $ymids[$this->lcs];
-
-		for ($n = 0; $n < $nchunks - 1; $n++)
-		{
-			$x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
-			$y1 = $ymid[$n] + 1;
-			$seps[] = $flip ? array($y1, $x1) : array($x1, $y1);
-		}
-		$seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim);
-
-		return array($this->lcs, $seps);
-	}
-
-	function _lcs_pos($ypos)
-	{
-		$end = $this->lcs;
-
-		if ($end == 0 || $ypos > $this->seq[$end])
-		{
-			$this->seq[++$this->lcs] = $ypos;
-			$this->in_seq[$ypos] = 1;
-			return $this->lcs;
-		}
-
-		$beg = 1;
-		while ($beg < $end)
-		{
-			$mid = (int)(($beg + $end) / 2);
-			if ($ypos > $this->seq[$mid])
-			{
-				$beg = $mid + 1;
-			}
-			else
-			{
-				$end = $mid;
-			}
-		}
-
-		$this->in_seq[$this->seq[$end]] = false;
-		$this->seq[$end] = $ypos;
-		$this->in_seq[$ypos] = 1;
-
-		return $end;
-	}
-
-	/**
-	* Finds LCS of two sequences.
-	*
-	* The results are recorded in the vectors $this->{x,y}changed[], by
-	* storing a 1 in the element for each line that is an insertion or
-	* deletion (ie. is not in the LCS).
-	*
-	* The subsequence of file 0 is (XOFF, XLIM) and likewise for file 1.
-	*
-	* Note that XLIM, YLIM are exclusive bounds.  All line numbers are
-	* origin-0 and discarded lines are not counted.
-	*/
-	function _compareseq($xoff, $xlim, $yoff, $ylim)
-	{
-		// Slide down the bottom initial diagonal.
-		while ($xoff < $xlim && $yoff < $ylim && $this->xv[$xoff] == $this->yv[$yoff])
-		{
-			++$xoff;
-			++$yoff;
-		}
-
-		// Slide up the top initial diagonal.
-		while ($xlim > $xoff && $ylim > $yoff && $this->xv[$xlim - 1] == $this->yv[$ylim - 1])
-		{
-			--$xlim;
-			--$ylim;
-		}
-
-		if ($xoff == $xlim || $yoff == $ylim)
-		{
-			$lcs = 0;
-		}
-		else
-		{
-			// This is ad hoc but seems to work well.
-			// $nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5);
-			// $nchunks = max(2,min(8,(int)$nchunks));
-			$nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1;
-			list($lcs, $seps) = $this->_diag($xoff, $xlim, $yoff, $ylim, $nchunks);
-		}
-
-		if ($lcs == 0)
-		{
-			// X and Y sequences have no common subsequence: mark all changed.
-			while ($yoff < $ylim)
-			{
-				$this->ychanged[$this->yind[$yoff++]] = 1;
-			}
-
-			while ($xoff < $xlim)
-			{
-				$this->xchanged[$this->xind[$xoff++]] = 1;
-			}
-		}
-		else
-		{
-			// Use the partitions to split this problem into subproblems.
-			reset($seps);
-			$pt1 = $seps[0];
-
-			while ($pt2 = next($seps))
-			{
-				$this->_compareseq($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
-				$pt1 = $pt2;
-			}
-		}
-	}
-
-	/**
-	* Adjusts inserts/deletes of identical lines to join changes as much as possible.
-	*
-	* We do something when a run of changed lines include a line at one end
-	* and has an excluded, identical line at the other.  We are free to
-	* choose which identical line is included. 'compareseq' usually chooses
-	* the one at the beginning, but usually it is cleaner to consider the
-	* following identical line to be the "change".
-	*
-	* This is extracted verbatim from analyze.c (GNU diffutils-2.7).
-	*/
-	function _shift_boundaries($lines, &$changed, $other_changed)
-	{
-		$i = 0;
-		$j = 0;
-
-		$len = sizeof($lines);
-		$other_len = sizeof($other_changed);
-
-		while (1)
-		{
-			// Scan forward to find the beginning of another run of
-			// changes. Also keep track of the corresponding point in the other file.
-			//
-			// Throughout this code, $i and $j are adjusted together so that
-			// the first $i elements of $changed and the first $j elements of
-			// $other_changed both contain the same number of zeros (unchanged lines).
-			//
-			// Furthermore, $j is always kept so that $j == $other_len or $other_changed[$j] == false.
-			while ($j < $other_len && $other_changed[$j])
-			{
-				$j++;
-			}
-
-			while ($i < $len && ! $changed[$i])
-			{
-				$i++;
-				$j++;
-
-				while ($j < $other_len && $other_changed[$j])
-				{
-					$j++;
-				}
-			}
-
-			if ($i == $len)
-			{
-				break;
-			}
-
-			$start = $i;
-
-			// Find the end of this run of changes.
-			while (++$i < $len && $changed[$i])
-			{
-				continue;
-			}
-
-			do
-			{
-				// Record the length of this run of changes, so that we can later determine whether the run has grown.
-				$runlength = $i - $start;
-
-				// Move the changed region back, so long as the previous unchanged line matches the last changed one.
-				// This merges with previous changed regions.
-				while ($start > 0 && $lines[$start - 1] == $lines[$i - 1])
-				{
-					$changed[--$start] = 1;
-					$changed[--$i] = false;
-
-					while ($start > 0 && $changed[$start - 1])
-					{
-						$start--;
-					}
-
-					while ($other_changed[--$j])
-					{
-						continue;
-					}
-				}
-
-				// Set CORRESPONDING to the end of the changed run, at the last point where it corresponds to a changed run in the
-				// other file. CORRESPONDING == LEN means no such point has been found.
-				$corresponding = $j < $other_len ? $i : $len;
-
-				// Move the changed region forward, so long as the first changed line matches the following unchanged one.
-				// This merges with following changed regions.
-				// Do this second, so that if there are no merges, the changed region is moved forward as far as possible.
-				while ($i < $len && $lines[$start] == $lines[$i])
-				{
-					$changed[$start++] = false;
-					$changed[$i++] = 1;
-
-					while ($i < $len && $changed[$i])
-					{
-						$i++;
-					}
-
-					$j++;
-					if ($j < $other_len && $other_changed[$j])
-					{
-						$corresponding = $i;
-						while ($j < $other_len && $other_changed[$j])
-						{
-							$j++;
-						}
-					}
-				}
-			}
-			while ($runlength != $i - $start);
-
-			// If possible, move the fully-merged run of changes back to a corresponding run in the other file.
-			while ($corresponding < $i)
-			{
-				$changed[--$start] = 1;
-				$changed[--$i] = 0;
-
-				while ($other_changed[--$j])
-				{
-					continue;
-				}
-			}
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/libraries/diff/renderer.php b/phpBB/includes/libraries/diff/renderer.php
deleted file mode 100644
index 2d3ab88a26..0000000000
--- a/phpBB/includes/libraries/diff/renderer.php
+++ /dev/null
@@ -1,858 +0,0 @@
-<?php
-/**
-*
-* @package diff
-* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Code from pear.php.net, Text_Diff-1.1.0 package
-* http://pear.php.net/package/Text_Diff/
-*
-* Modified by phpBB Group to meet our coding standards
-* and being able to integrate into phpBB
-*
-* A class to render Diffs in different formats.
-*
-* This class renders the diff in classic diff format. It is intended that
-* this class be customized via inheritance, to obtain fancier outputs.
-*
-* Copyright 2004-2008 The Horde Project (http://www.horde.org/)
-*
-* @package diff
-*/
-class diff_renderer
-{
-	/**
-	* Number of leading context "lines" to preserve.
-	*
-	* This should be left at zero for this class, but subclasses may want to
-	* set this to other values.
-	*/
-	var $_leading_context_lines = 0;
-
-	/**
-	* Number of trailing context "lines" to preserve.
-	*
-	* This should be left at zero for this class, but subclasses may want to
-	* set this to other values.
-	*/
-	var $_trailing_context_lines = 0;
-
-	/**
-	* Constructor.
-	*/
-	function __construct($params = array())
-	{
-		foreach ($params as $param => $value)
-		{
-			$v = '_' . $param;
-			if (isset($this->$v))
-			{
-				$this->$v = $value;
-			}
-		}
-	}
-
-	/**
-	* Get any renderer parameters.
-	*
-	* @return array  All parameters of this renderer object.
-	*/
-	function get_params()
-	{
-		$params = array();
-		foreach (get_object_vars($this) as $k => $v)
-		{
-			if ($k[0] == '_')
-			{
-				$params[substr($k, 1)] = $v;
-			}
-		}
-
-		return $params;
-	}
-
-	/**
-	* Renders a diff.
-	*
-	* @param diff &$diff A diff object.
-	*
-	* @return string  The formatted output.
-	*/
-	function render(&$diff)
-	{
-		$xi = $yi = 1;
-		$block = false;
-		$context = array();
-
-		// Create a new diff object if it is a 3-way diff
-		if (is_a($diff, 'diff3'))
-		{
-			$diff3 = &$diff;
-
-			$diff_1 = $diff3->get_original();
-			$diff_2 = $diff3->merged_output();
-
-			unset($diff3);
-
-			$diff = new diff($diff_1, $diff_2);
-		}
-
-		$nlead = $this->_leading_context_lines;
-		$ntrail = $this->_trailing_context_lines;
-
-		$output = $this->_start_diff();
-		$diffs = $diff->get_diff();
-
-		foreach ($diffs as $i => $edit)
-		{
-			// If these are unchanged (copied) lines, and we want to keep leading or trailing context lines, extract them from the copy block.
-			if (is_a($edit, 'diff_op_copy'))
-			{
-				// Do we have any diff blocks yet?
-				if (is_array($block))
-				{
-					// How many lines to keep as context from the copy block.
-					$keep = ($i == sizeof($diffs) - 1) ? $ntrail : $nlead + $ntrail;
-					if (sizeof($edit->orig) <= $keep)
-					{
-						// We have less lines in the block than we want for context => keep the whole block.
-						$block[] = $edit;
-					}
-					else
-					{
-						if ($ntrail)
-						{
-							// Create a new block with as many lines as we need for the trailing context.
-							$context = array_slice($edit->orig, 0, $ntrail);
-							$block[] = new diff_op_copy($context);
-						}
-
-						$output .= $this->_block($x0, $ntrail + $xi - $x0, $y0, $ntrail + $yi - $y0, $block);
-						$block = false;
-					}
-				}
-				// Keep the copy block as the context for the next block.
-				$context = $edit->orig;
-			}
-			else
-			{
-				// Don't we have any diff blocks yet?
-				if (!is_array($block))
-				{
-					// Extract context lines from the preceding copy block.
-					$context = array_slice($context, sizeof($context) - $nlead);
-					$x0 = $xi - sizeof($context);
-					$y0 = $yi - sizeof($context);
-					$block = array();
-
-					if ($context)
-					{
-						$block[] = new diff_op_copy($context);
-					}
-				}
-				$block[] = $edit;
-			}
-
-			$xi += ($edit->orig) ? sizeof($edit->orig) : 0;
-			$yi += ($edit->final) ? sizeof($edit->final) : 0;
-		}
-
-		if (is_array($block))
-		{
-			$output .= $this->_block($x0, $xi - $x0, $y0, $yi - $y0, $block);
-		}
-
-		return $output . $this->_end_diff();
-	}
-
-	function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
-	{
-		$output = $this->_start_block($this->_block_header($xbeg, $xlen, $ybeg, $ylen));
-
-		foreach ($edits as $edit)
-		{
-			switch (get_class($edit))
-			{
-				case 'diff_op_copy':
-					$output .= $this->_context($edit->orig);
-				break;
-
-				case 'diff_op_add':
-					$output .= $this->_added($edit->final);
-				break;
-
-				case 'diff_op_delete':
-					$output .= $this->_deleted($edit->orig);
-				break;
-
-				case 'diff_op_change':
-					$output .= $this->_changed($edit->orig, $edit->final);
-				break;
-			}
-		}
-
-		return $output . $this->_end_block();
-	}
-
-	function _start_diff()
-	{
-		return '';
-	}
-
-	function _end_diff()
-	{
-		return '';
-	}
-
-	function _block_header($xbeg, $xlen, $ybeg, $ylen)
-	{
-		if ($xlen > 1)
-		{
-			$xbeg .= ',' . ($xbeg + $xlen - 1);
-		}
-
-		if ($ylen > 1)
-		{
-			$ybeg .= ',' . ($ybeg + $ylen - 1);
-		}
-
-		// this matches the GNU Diff behaviour
-		if ($xlen && !$ylen)
-		{
-			$ybeg--;
-		}
-		else if (!$xlen)
-		{
-			$xbeg--;
-		}
-
-		return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
-	}
-
-	function _start_block($header)
-	{
-		return $header . "\n";
-	}
-
-	function _end_block()
-	{
-		return '';
-	}
-
-	function _lines($lines, $prefix = ' ')
-	{
-		return $prefix . implode("\n$prefix", $lines) . "\n";
-	}
-
-	function _context($lines)
-	{
-		return $this->_lines($lines, '  ');
-	}
-
-	function _added($lines)
-	{
-		return $this->_lines($lines, '> ');
-	}
-
-	function _deleted($lines)
-	{
-		return $this->_lines($lines, '< ');
-	}
-
-	function _changed($orig, $final)
-	{
-		return $this->_deleted($orig) . "---\n" . $this->_added($final);
-	}
-
-	/**
-	* Our function to get the diff
-	*/
-	function get_diff_content($diff)
-	{
-		return $this->render($diff);
-	}
-}
-
-/**
-* Renders a unified diff
-* @package diff
-*/
-class diff_renderer_unified extends diff_renderer
-{
-	var $_leading_context_lines = 4;
-	var $_trailing_context_lines = 4;
-
-	/**
-	* Our function to get the diff
-	*/
-	function get_diff_content($diff)
-	{
-		return nl2br($this->render($diff));
-	}
-
-	function _block_header($xbeg, $xlen, $ybeg, $ylen)
-	{
-		if ($xlen != 1)
-		{
-			$xbeg .= ',' . $xlen;
-		}
-
-		if ($ylen != 1)
-		{
-			$ybeg .= ',' . $ylen;
-		}
-		return '<div class="diff"><big class="info">@@ -' . $xbeg . ' +' . $ybeg . ' @@</big></div>';
-	}
-
-	function _context($lines)
-	{
-		return '<pre class="diff context">' . htmlspecialchars($this->_lines($lines, ' ')) . '<br /></pre>';
-	}
-
-	function _added($lines)
-	{
-		return '<pre class="diff added">' . htmlspecialchars($this->_lines($lines, '+')) . '<br /></pre>';
-	}
-
-	function _deleted($lines)
-	{
-		return '<pre class="diff removed">' . htmlspecialchars($this->_lines($lines, '-')) . '<br /></pre>';
-	}
-
-	function _changed($orig, $final)
-	{
-		return $this->_deleted($orig) . $this->_added($final);
-	}
-
-	function _start_diff()
-	{
-		$start = '<div class="file">';
-
-		return $start;
-	}
-
-	function _end_diff()
-	{
-		return '</div>';
-	}
-
-	function _end_block()
-	{
-		return '';
-	}
-}
-
-/**
-* "Inline" diff renderer.
-*
-* This class renders diffs in the Wiki-style "inline" format.
-*
-* @author  Ciprian Popovici
-* @package diff
-*/
-class diff_renderer_inline extends diff_renderer
-{
-	var $_leading_context_lines = 10000;
-	var $_trailing_context_lines = 10000;
-
-	// Prefix and suffix for inserted text
-	var $_ins_prefix = '<span class="ins">';
-	var $_ins_suffix = '</span>';
-
-	// Prefix and suffix for deleted text
-	var $_del_prefix = '<span class="del">';
-	var $_del_suffix = '</span>';
-
-	var $_block_head = '';
-
-	// What are we currently splitting on? Used to recurse to show word-level
-	var $_split_level = 'lines';
-
-	/**
-	* Our function to get the diff
-	*/
-	function get_diff_content($diff)
-	{
-		return '<pre>' . nl2br($this->render($diff)) . '<br /></pre>';
-	}
-
-	function _start_diff()
-	{
-		return '';
-	}
-
-	function _end_diff()
-	{
-		return '';
-	}
-
-	function _block_header($xbeg, $xlen, $ybeg, $ylen)
-	{
-		return $this->_block_head;
-	}
-
-	function _start_block($header)
-	{
-		return $header;
-	}
-
-	function _lines($lines, $prefix = ' ', $encode = true)
-	{
-		if ($encode)
-		{
-			array_walk($lines, array(&$this, '_encode'));
-		}
-
-		if ($this->_split_level == 'words')
-		{
-			return implode('', $lines);
-		}
-		else
-		{
-			return implode("\n", $lines) . "\n";
-		}
-	}
-
-	function _added($lines)
-	{
-		array_walk($lines, array(&$this, '_encode'));
-		$lines[0] = $this->_ins_prefix . $lines[0];
-		$lines[sizeof($lines) - 1] .= $this->_ins_suffix;
-		return $this->_lines($lines, ' ', false);
-	}
-
-	function _deleted($lines, $words = false)
-	{
-		array_walk($lines, array(&$this, '_encode'));
-		$lines[0] = $this->_del_prefix . $lines[0];
-		$lines[sizeof($lines) - 1] .= $this->_del_suffix;
-		return $this->_lines($lines, ' ', false);
-	}
-
-	function _changed($orig, $final)
-	{
-		// If we've already split on words, don't try to do so again - just display.
-		if ($this->_split_level == 'words')
-		{
-			$prefix = '';
-			while ($orig[0] !== false && $final[0] !== false && substr($orig[0], 0, 1) == ' ' && substr($final[0], 0, 1) == ' ')
-			{
-				$prefix .= substr($orig[0], 0, 1);
-				$orig[0] = substr($orig[0], 1);
-				$final[0] = substr($final[0], 1);
-			}
-
-			return $prefix . $this->_deleted($orig) . $this->_added($final);
-		}
-
-		$text1 = implode("\n", $orig);
-		$text2 = implode("\n", $final);
-
-		// Non-printing newline marker.
-		$nl = "\0";
-
-		// We want to split on word boundaries, but we need to preserve whitespace as well.
-		// Therefore we split on words, but include all blocks of whitespace in the wordlist.
-		$splitted_text_1 = $this->_split_on_words($text1, $nl);
-		$splitted_text_2 = $this->_split_on_words($text2, $nl);
-
-		$diff = new diff($splitted_text_1, $splitted_text_2);
-		unset($splitted_text_1, $splitted_text_2);
-
-		// Get the diff in inline format.
-		$renderer = new diff_renderer_inline(array_merge($this->get_params(), array('split_level' => 'words')));
-
-		// Run the diff and get the output.
-		return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
-	}
-
-	function _split_on_words($string, $newline_escape = "\n")
-	{
-		// Ignore \0; otherwise the while loop will never finish.
-		$string = str_replace("\0", '', $string);
-
-		$words = array();
-		$length = strlen($string);
-		$pos = 0;
-
-		$tab_there = true;
-		while ($pos < $length)
-		{
-			// Check for tabs... do not include them
-			if ($tab_there && substr($string, $pos, 1) === "\t")
-			{
-				$words[] = "\t";
-				$pos++;
-
-				continue;
-			}
-			else
-			{
-				$tab_there = false;
-			}
-
-			// Eat a word with any preceding whitespace.
-			$spaces = strspn(substr($string, $pos), " \n");
-			$nextpos = strcspn(substr($string, $pos + $spaces), " \n");
-			$words[] = str_replace("\n", $newline_escape, substr($string, $pos, $spaces + $nextpos));
-			$pos += $spaces + $nextpos;
-		}
-
-		return $words;
-	}
-
-	function _encode(&$string)
-	{
-		$string = htmlspecialchars($string);
-	}
-}
-
-/**
-* "raw" diff renderer.
-* This class could be used to output a raw unified patch file
-*
-* @package diff
-*/
-class diff_renderer_raw extends diff_renderer
-{
-	var $_leading_context_lines = 4;
-	var $_trailing_context_lines = 4;
-
-	/**
-	* Our function to get the diff
-	*/
-	function get_diff_content($diff)
-	{
-		return '<textarea style="height: 290px;" class="full">' . htmlspecialchars($this->render($diff)) . '</textarea>';
-	}
-
-	function _block_header($xbeg, $xlen, $ybeg, $ylen)
-	{
-		if ($xlen != 1)
-		{
-			$xbeg .= ',' . $xlen;
-		}
-
-		if ($ylen != 1)
-		{
-			$ybeg .= ',' . $ylen;
-		}
-		return '@@ -' . $xbeg . ' +' . $ybeg . ' @@';
-	}
-
-	function _context($lines)
-	{
-		return $this->_lines($lines, ' ');
-	}
-
-	function _added($lines)
-	{
-		return $this->_lines($lines, '+');
-	}
-
-	function _deleted($lines)
-	{
-		return $this->_lines($lines, '-');
-	}
-
-	function _changed($orig, $final)
-	{
-		return $this->_deleted($orig) . $this->_added($final);
-	}
-}
-
-/**
-* "chora (Horde)" diff renderer - similar style.
-* This renderer class is a modified human_readable function from the Horde Framework.
-*
-* @package diff
-*/
-class diff_renderer_side_by_side extends diff_renderer
-{
-	var $_leading_context_lines = 3;
-	var $_trailing_context_lines = 3;
-
-	var $lines = array();
-
-	// Hold the left and right columns of lines for change blocks.
-	var $cols;
-	var $state;
-
-	var $data = false;
-
-	/**
-	* Our function to get the diff
-	*/
-	function get_diff_content($diff)
-	{
-		$output = '';
-		$output .= '<table cellspacing="0" class="hrdiff">
-<caption>
-	<span class="unmodified">&nbsp;</span> ' . phpbb::$user->lang['LINE_UNMODIFIED'] . '
-	<span class="added">&nbsp;</span> ' . phpbb::$user->lang['LINE_ADDED'] . '
-	<span class="modified">&nbsp;</span> ' . phpbb::$user->lang['LINE_MODIFIED'] . '
-	<span class="removed">&nbsp;</span> ' . phpbb::$user->lang['LINE_REMOVED'] . '
-</caption>
-<tbody>
-';
-
-		$this->render($diff);
-
-		// Is the diff empty?
-		if (!sizeof($this->lines))
-		{
-			$output .= '<tr><th colspan="2">' . phpbb::$user->lang['NO_VISIBLE_CHANGES'] . '</th></tr>';
-		}
-		else
-		{
-			// Iterate through every header block of changes
-			foreach ($this->lines as $header)
-			{
-				$output .= '<tr><th>' . phpbb::$user->lang['LINE'] . ' ' . $header['oldline'] . '</th><th>' . phpbb::$user->lang['LINE'] . ' ' . $header['newline'] . '</th></tr>';
-
-				// Each header block consists of a number of changes (add, remove, change).
-				$current_context = '';
-
-				foreach ($header['contents'] as $change)
-				{
-					if (!empty($current_context) && $change['type'] != 'empty')
-					{
-						$line = $current_context;
-						$current_context = '';
-
-						$output .= '<tr class="unmodified"><td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br /></pre></td>
-							<td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br /></pre></td></tr>';
-					}
-
-					switch ($change['type'])
-					{
-						case 'add':
-							$line = '';
-
-							foreach ($change['lines'] as $_line)
-							{
-								$line .= htmlspecialchars($_line) . '<br />';
-							}
-
-							$output .= '<tr><td class="added_empty">&nbsp;</td><td class="added"><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br /></pre></td></tr>';
-						break;
-
-						case 'remove':
-							$line = '';
-
-							foreach ($change['lines'] as $_line)
-							{
-								$line .= htmlspecialchars($_line) . '<br />';
-							}
-
-							$output .= '<tr><td class="removed"><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br /></pre></td><td class="removed_empty">&nbsp;</td></tr>';
-						break;
-
-						case 'empty':
-							$current_context .= htmlspecialchars($change['line']) . '<br />';
-						break;
-
-						case 'change':
-							// Pop the old/new stacks one by one, until both are empty.
-							$oldsize = sizeof($change['old']);
-							$newsize = sizeof($change['new']);
-							$left = $right = '';
-
-							for ($row = 0, $row_max = max($oldsize, $newsize); $row < $row_max; ++$row)
-							{
-								$left .= isset($change['old'][$row]) ? htmlspecialchars($change['old'][$row]) : '';
-								$left .= '<br />';
-								$right .= isset($change['new'][$row]) ? htmlspecialchars($change['new'][$row]) : '';
-								$right .= '<br />';
-							}
-
-							$output .= '<tr>';
-
-							if (!empty($left))
-							{
-								$output .= '<td class="modified"><pre>' . $left . '<br /></pre></td>';
-							}
-							else if ($row < $oldsize)
-							{
-								$output .= '<td class="modified">&nbsp;</td>';
-							}
-							else
-							{
-								$output .= '<td class="unmodified">&nbsp;</td>';
-							}
-
-							if (!empty($right))
-							{
-								$output .= '<td class="modified"><pre>' . $right . '<br /></pre></td>';
-							}
-							else if ($row < $newsize)
-							{
-								$output .= '<td class="modified">&nbsp;</td>';
-							}
-							else
-							{
-								$output .= '<td class="unmodified">&nbsp;</td>';
-							}
-
-							$output .= '</tr>';
-						break;
-					}
-				}
-
-				if (!empty($current_context))
-				{
-					$line = $current_context;
-					$current_context = '';
-
-					$output .= '<tr class="unmodified"><td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br /></pre></td>';
-					$output .= '<td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br /></pre></td></tr>';
-				}
-			}
-		}
-
-		$output .= '</tbody></table>';
-
-		return $output;
-	}
-
-	function _start_diff()
-	{
-		$this->lines = array();
-
-		$this->data = false;
-		$this->cols = array(array(), array());
-		$this->state = 'empty';
-
-		return '';
-	}
-
-	function _end_diff()
-	{
-		// Just flush any remaining entries in the columns stack.
-		switch ($this->state)
-		{
-			case 'add':
-				$this->data['contents'][] = array('type' => 'add', 'lines' => $this->cols[0]);
-			break;
-
-			case 'remove':
-				// We have some removal lines pending in our stack, so flush them.
-				$this->data['contents'][] = array('type' => 'remove', 'lines' => $this->cols[0]);
-			break;
-
-			case 'change':
-				// We have both remove and addition lines, so this is a change block.
-				$this->data['contents'][] = array('type' => 'change', 'old' => $this->cols[0], 'new' => $this->cols[1]);
-			break;
-		}
-
-		if ($this->data !== false)
-		{
-			$this->lines[] = $this->data;
-		}
-
-		return '';
-	}
-
-	function _block_header($xbeg, $xlen, $ybeg, $ylen)
-	{
-		// Push any previous header information to the return stack.
-		if ($this->data !== false)
-		{
-			$this->lines[] = $this->data;
-		}
-
-		$this->data = array('type' => 'header', 'oldline' => $xbeg, 'newline' => $ybeg, 'contents' => array());
-		$this->state = 'dump';
-	}
-
-	function _added($lines)
-	{
-		array_walk($lines, array(&$this, '_perform_add'));
-	}
-
-	function _perform_add($line)
-	{
-		if ($this->state == 'empty')
-		{
-			return '';
-		}
-
-		// This is just an addition line.
-		if ($this->state == 'dump' || $this->state == 'add')
-		{
-			// Start adding to the addition stack.
-			$this->cols[0][] = $line;
-			$this->state = 'add';
-		}
-		else
-		{
-			// This is inside a change block, so start accumulating lines.
-			$this->state = 'change';
-			$this->cols[1][] = $line;
-		}
-	}
-
-	function _deleted($lines)
-	{
-		array_walk($lines, array(&$this, '_perform_delete'));
-	}
-
-	function _perform_delete($line)
-	{
-		// This is a removal line.
-		$this->state = 'remove';
-		$this->cols[0][] = $line;
-	}
-
-	function _context($lines)
-	{
-		array_walk($lines, array(&$this, '_perform_context'));
-	}
-
-	function _perform_context($line)
-	{
-		// An empty block with no action.
-		switch ($this->state)
-		{
-			case 'add':
-				$this->data['contents'][] = array('type' => 'add', 'lines' => $this->cols[0]);
-			break;
-
-			case 'remove':
-				// We have some removal lines pending in our stack, so flush them.
-				$this->data['contents'][] = array('type' => 'remove', 'lines' => $this->cols[0]);
-			break;
-
-			case 'change':
-				// We have both remove and addition lines, so this is a change block.
-				$this->data['contents'][] = array('type' => 'change', 'old' => $this->cols[0], 'new' => $this->cols[1]);
-			break;
-		}
-
-		$this->cols = array(array(), array());
-		$this->data['contents'][] = array('type' => 'empty', 'line' => $line);
-		$this->state = 'dump';
-	}
-
-	function _changed($orig, $final)
-	{
-		return $this->_deleted($orig) . $this->_added($final);
-	}
-
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/libraries/ezcomponents/loader.php b/phpBB/includes/libraries/ezcomponents/loader.php
deleted file mode 100644
index 62aaa7667d..0000000000
--- a/phpBB/includes/libraries/ezcomponents/loader.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
-*
-* @package ezcomponents
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* eZ components class loader
-* Replaces the autoload mechanism eZ Components normally use
-* @package ezcomponents
-*/
-class phpbb_ezcomponents_loader
-{
-	var $loaded;
-
-	/**
-	* Constructor which makes sure the PHP version requirement is met.
-	*/
-	function phpbb_ezcomponents_loader()
-	{
-		$this->loaded = array();
-		if (version_compare(PHP_VERSION, '5.2.1', '<'))
-		{
-			trigger_error('PHP >= 5.2.1 required', E_USER_ERROR);
-		}
-	}
-
-	/**
-	* Loads all classes of a particular component.
-	* The base component is always loaded first.
-	*
-	* @param	$component	string	Lower case component name
-	*/
-	function load_component($component)
-	{
-		global $phpbb_root_path;
-
-		// don't allow loading the same component twice
-		if (isset($this->loaded[$component]) && $this->loaded[$component])
-		{
-			return;
-		}
-
-		// make sure base is always loaded first
-		if ($component != 'base' && !isset($this->loaded['base']))
-		{
-			$this->load_component('base');
-		}
-
-		$ezc_path = $phpbb_root_path . 'includes/ezcomponents/';
-
-		// retrieve the autoload list
-		$classes = include($ezc_path . ucfirst($component) . '/' . $component . '_autoload.php');
-
-		// include all files related to this component
-		foreach ($classes as $class => $path)
-		{
-			include($ezc_path . $path);
-		}
-	}
-}
-\ No newline at end of file
diff --git a/phpBB/includes/libraries/sftp/aes.php b/phpBB/includes/libraries/sftp/aes.php
deleted file mode 100644
index 612e20830b..0000000000
--- a/phpBB/includes/libraries/sftp/aes.php
+++ /dev/null
@@ -1,1526 +0,0 @@
-<?php
-/**
-*
-* @package sftp
-* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Code from http://phpseclib.sourceforge.net/
-*
-* Modified by phpBB Group to meet our coding standards
-* and being able to integrate into phpBB
-*
-* Pure-PHP implementation of AES
-*
-* Copyright 2007-2009 TerraFrost <terrafrost@php.net>
-* Copyright 2009+ phpBB
-*
-* @package sftp
-* @author  TerraFrost <terrafrost@php.net>
-*/
-
-/**#@+
- * @access public
- * @see rijndael::encrypt()
- * @see rijndael::decrypt()
- */
-/**
- * Encrypt / decrypt using the Electronic Code Book mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
- */
-define('CRYPT_RIJNDAEL_MODE_ECB', 1);
-/**
- * Encrypt / decrypt using the Code Book Chaining mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
- */
-define('CRYPT_RIJNDAEL_MODE_CBC', 2);
-/**#@-*/
-
-/**#@+
- * @access private
- * @see rijndael::__construct()
- */
-/**
- * Toggles the internal implementation
- */
-define('CRYPT_RIJNDAEL_MODE_INTERNAL', 1);
-/**
- * Toggles the mcrypt implementation
- */
-define('CRYPT_RIJNDAEL_MODE_MCRYPT', 2);
-/**#@-*/
-
-/**#@+
- * @access public
- * @see aes::encrypt()
- * @see aes::decrypt()
- */
-/**
- * Encrypt / decrypt using the Electronic Code Book mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
- */
-define('CRYPT_AES_MODE_ECB', 1);
-/**
- * Encrypt / decrypt using the Code Book Chaining mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
- */
-define('CRYPT_AES_MODE_CBC', 2);
-/**#@-*/
-
-/**#@+
- * @access private
- * @see aes::__construct()
- */
-/**
- * Toggles the internal implementation
- */
-define('CRYPT_AES_MODE_INTERNAL', 1);
-/**
- * Toggles the mcrypt implementation
- */
-define('CRYPT_AES_MODE_MCRYPT', 2);
-/**#@-*/
-
-/**
- * Pure-PHP implementation of Rijndael.
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- * @version 0.1.0
- * @access  public
- * @package rijndael
- */
-class rijndael
-{
-	/**
-	 * The Encryption Mode
-	 *
-	 * @see rijndael::__construct()
-	 * @var Integer
-	 * @access private
-	 */
-	var $mode;
-
-	/**
-	 * The Key
-	 *
-	 * @see rijndael::set_key()
-	 * @var String
-	 * @access private
-	 */
-	var $key = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
-
-	/**
-	 * The Initialization Vector
-	 *
-	 * @see rijndael::set_iv()
-	 * @var String
-	 * @access private
-	 */
-	var $iv = '';
-
-	/**
-	 * A "sliding" Initialization Vector
-	 *
-	 * @see rijndael::enable_continuous_buffer()
-	 * @var String
-	 * @access private
-	 */
-	var $encryptIV = '';
-
-	/**
-	 * A "sliding" Initialization Vector
-	 *
-	 * @see rijndael::enableContinuousBuffer()
-	 * @var String
-	 * @access private
-	 */
-	var $decryptIV = '';
-
-	/**
-	 * Continuous Buffer status
-	 *
-	 * @see rijndael::enable_continuous_buffer()
-	 * @var Boolean
-	 * @access private
-	 */
-	var $continuousBuffer = false;
-
-	/**
-	 * Padding status
-	 *
-	 * @see rijndael::enable_padding()
-	 * @var Boolean
-	 * @access private
-	 */
-	var $padding = true;
-
-	/**
-	 * Does the key schedule need to be (re)calculated?
-	 *
-	 * @see setKey()
-	 * @see setBlockLength()
-	 * @see setKeyLength()
-	 * @var Boolean
-	 * @access private
-	 */
-	var $changed = true;
-
-	/**
-	 * Has the key length explicitly been set or should it be derived from the key, itself?
-	 *
-	 * @see setKeyLength()
-	 * @var Boolean
-	 * @access private
-	 */
-	var $explicit_key_length = false;
-
-	/**
-	 * The Key Schedule
-	 *
-	 * @see _setup()
-	 * @var Array
-	 * @access private
-	 */
-	var $w;
-
-	/**
-	 * The Inverse Key Schedule
-	 *
-	 * @see _setup()
-	 * @var Array
-	 * @access private
-	 */
-	var $dw;
-
-	/**
-	 * The Block Length
-	 *
-	 * @see setBlockLength()
-	 * @var Integer
-	 * @access private
-	 * @internal The max value is 32, the min value is 16.  All valid values are multiples of 4.  Exists in conjunction with
-	 *	 $Nb because we need this value and not $Nb to pad strings appropriately.  
-	 */
-	var $block_size = 16;
-
-	/**
-	 * The Block Length divided by 32
-	 *
-	 * @see setBlockLength()
-	 * @var Integer
-	 * @access private
-	 * @internal The max value is 256 / 32 = 8, the min value is 128 / 32 = 4.  Exists in conjunction with $block_size 
-	 *	because the encryption / decryption / key schedule creation requires this number and not $block_size.  We could 
-	 *	derive this from $block_size or vice versa, but that'd mean we'd have to do multiple shift operations, so in lieu
-	 *	of that, we'll just precompute it once.
-	 *
-	 */
-	var $Nb = 4;
-
-	/**
-	 * The Key Length
-	 *
-	 * @see setKeyLength()
-	 * @var Integer
-	 * @access private
-	 * @internal The max value is 256 / 32 = 8, the min value is 128 / 32 = 4.  Exists in conjunction with $key_size
-	 *	because the encryption / decryption / key schedule creation requires this number and not $key_size.  We could 
-	 *	derive this from $key_size or vice versa, but that'd mean we'd have to do multiple shift operations, so in lieu
-	 *	of that, we'll just precompute it once.
-	 */
-	var $key_size = 16;
-
-	/**
-	 * The Key Length divided by 32
-	 *
-	 * @see setKeyLength()
-	 * @var Integer
-	 * @access private
-	 * @internal The max value is 256 / 32 = 8, the min value is 128 / 32 = 4
-	 */
-	var $Nk = 4;
-
-	/**
-	 * The Number of Rounds
-	 *
-	 * @var Integer
-	 * @access private
-	 * @internal The max value is 14, the min value is 10.
-	 */
-	var $Nr;
-
-	/**
-	 * Shift offsets
-	 *
-	 * @var Array
-	 * @access private
-	 */
-	var $c;
-
-	/**
-	 * Precomputed mixColumns table
-	 *
-	 * @see rijndael()
-	 * @var Array
-	 * @access private
-	 */
-	var $t0;
-
-	/**
-	 * Precomputed mixColumns table
-	 *
-	 * @see rijndael()
-	 * @var Array
-	 * @access private
-	 */
-	var $t1;
-
-	/**
-	 * Precomputed mixColumns table
-	 *
-	 * @see rijndael()
-	 * @var Array
-	 * @access private
-	 */
-	var $t2;
-
-	/**
-	 * Precomputed mixColumns table
-	 *
-	 * @see rijndael()
-	 * @var Array
-	 * @access private
-	 */
-	var $t3;
-
-	/**
-	 * Precomputed invMixColumns table
-	 *
-	 * @see rijndael()
-	 * @var Array
-	 * @access private
-	 */
-	var $dt0;
-
-	/**
-	 * Precomputed invMixColumns table
-	 *
-	 * @see rijndael()
-	 * @var Array
-	 * @access private
-	 */
-	var $dt1;
-
-	/**
-	 * Precomputed invMixColumns table
-	 *
-	 * @see rijndael()
-	 * @var Array
-	 * @access private
-	 */
-	var $dt2;
-
-	/**
-	 * Precomputed invMixColumns table
-	 *
-	 * @see rijndael()
-	 * @var Array
-	 * @access private
-	 */
-	var $dt3;
-
-	/**
-	 * Default Constructor.
-	 *
-	 * Determines whether or not the mcrypt extension should be used.  $mode should only, at present, be
-	 * CRYPT_RIJNDAEL_MODE_ECB or CRYPT_RIJNDAEL_MODE_CBC.  If not explictly set, CRYPT_RIJNDAEL_MODE_CBC will be used.
-	 *
-	 * @param optional Integer $mode
-	 * @return rijndael
-	 * @access public
-	 */
-	function __construct($mode = CRYPT_MODE_CRYPT_RIJNDAEL_CBC)
-	{
-		switch ($mode)
-		{
-			case CRYPT_RIJNDAEL_MODE_ECB:
-			case CRYPT_RIJNDAEL_MODE_CBC:
-				$this->mode = $mode;
-				break;
-			default:
-				$this->mode = CRYPT_RIJNDAEL_MODE_CBC;
-		}
-
-		// according to <http://csrc.nist.gov/archive/aes/rijndael/Rijndael-ammended.pdf#page=19> (section 5.2.1), 
-		// precomputed tables can be used in the mixColumns phase.  in that example, they're assigned t0...t3, so
-		// those are the names we'll use.
-		$this->t3 = array(
-			0x6363A5C6, 0x7C7C84F8, 0x777799EE, 0x7B7B8DF6, 0xF2F20DFF, 0x6B6BBDD6, 0x6F6FB1DE, 0xC5C55491, 
-			0x30305060, 0x01010302, 0x6767A9CE, 0x2B2B7D56, 0xFEFE19E7, 0xD7D762B5, 0xABABE64D, 0x76769AEC, 
-			0xCACA458F, 0x82829D1F, 0xC9C94089, 0x7D7D87FA, 0xFAFA15EF, 0x5959EBB2, 0x4747C98E, 0xF0F00BFB, 
-			0xADADEC41, 0xD4D467B3, 0xA2A2FD5F, 0xAFAFEA45, 0x9C9CBF23, 0xA4A4F753, 0x727296E4, 0xC0C05B9B, 
-			0xB7B7C275, 0xFDFD1CE1, 0x9393AE3D, 0x26266A4C, 0x36365A6C, 0x3F3F417E, 0xF7F702F5, 0xCCCC4F83, 
-			0x34345C68, 0xA5A5F451, 0xE5E534D1, 0xF1F108F9, 0x717193E2, 0xD8D873AB, 0x31315362, 0x15153F2A, 
-			0x04040C08, 0xC7C75295, 0x23236546, 0xC3C35E9D, 0x18182830, 0x9696A137, 0x05050F0A, 0x9A9AB52F, 
-			0x0707090E, 0x12123624, 0x80809B1B, 0xE2E23DDF, 0xEBEB26CD, 0x2727694E, 0xB2B2CD7F, 0x75759FEA, 
-			0x09091B12, 0x83839E1D, 0x2C2C7458, 0x1A1A2E34, 0x1B1B2D36, 0x6E6EB2DC, 0x5A5AEEB4, 0xA0A0FB5B, 
-			0x5252F6A4, 0x3B3B4D76, 0xD6D661B7, 0xB3B3CE7D, 0x29297B52, 0xE3E33EDD, 0x2F2F715E, 0x84849713, 
-			0x5353F5A6, 0xD1D168B9, 0x00000000, 0xEDED2CC1, 0x20206040, 0xFCFC1FE3, 0xB1B1C879, 0x5B5BEDB6, 
-			0x6A6ABED4, 0xCBCB468D, 0xBEBED967, 0x39394B72, 0x4A4ADE94, 0x4C4CD498, 0x5858E8B0, 0xCFCF4A85, 
-			0xD0D06BBB, 0xEFEF2AC5, 0xAAAAE54F, 0xFBFB16ED, 0x4343C586, 0x4D4DD79A, 0x33335566, 0x85859411, 
-			0x4545CF8A, 0xF9F910E9, 0x02020604, 0x7F7F81FE, 0x5050F0A0, 0x3C3C4478, 0x9F9FBA25, 0xA8A8E34B, 
-			0x5151F3A2, 0xA3A3FE5D, 0x4040C080, 0x8F8F8A05, 0x9292AD3F, 0x9D9DBC21, 0x38384870, 0xF5F504F1, 
-			0xBCBCDF63, 0xB6B6C177, 0xDADA75AF, 0x21216342, 0x10103020, 0xFFFF1AE5, 0xF3F30EFD, 0xD2D26DBF, 
-			0xCDCD4C81, 0x0C0C1418, 0x13133526, 0xECEC2FC3, 0x5F5FE1BE, 0x9797A235, 0x4444CC88, 0x1717392E, 
-			0xC4C45793, 0xA7A7F255, 0x7E7E82FC, 0x3D3D477A, 0x6464ACC8, 0x5D5DE7BA, 0x19192B32, 0x737395E6, 
-			0x6060A0C0, 0x81819819, 0x4F4FD19E, 0xDCDC7FA3, 0x22226644, 0x2A2A7E54, 0x9090AB3B, 0x8888830B, 
-			0x4646CA8C, 0xEEEE29C7, 0xB8B8D36B, 0x14143C28, 0xDEDE79A7, 0x5E5EE2BC, 0x0B0B1D16, 0xDBDB76AD, 
-			0xE0E03BDB, 0x32325664, 0x3A3A4E74, 0x0A0A1E14, 0x4949DB92, 0x06060A0C, 0x24246C48, 0x5C5CE4B8, 
-			0xC2C25D9F, 0xD3D36EBD, 0xACACEF43, 0x6262A6C4, 0x9191A839, 0x9595A431, 0xE4E437D3, 0x79798BF2, 
-			0xE7E732D5, 0xC8C8438B, 0x3737596E, 0x6D6DB7DA, 0x8D8D8C01, 0xD5D564B1, 0x4E4ED29C, 0xA9A9E049, 
-			0x6C6CB4D8, 0x5656FAAC, 0xF4F407F3, 0xEAEA25CF, 0x6565AFCA, 0x7A7A8EF4, 0xAEAEE947, 0x08081810, 
-			0xBABAD56F, 0x787888F0, 0x25256F4A, 0x2E2E725C, 0x1C1C2438, 0xA6A6F157, 0xB4B4C773, 0xC6C65197, 
-			0xE8E823CB, 0xDDDD7CA1, 0x74749CE8, 0x1F1F213E, 0x4B4BDD96, 0xBDBDDC61, 0x8B8B860D, 0x8A8A850F, 
-			0x707090E0, 0x3E3E427C, 0xB5B5C471, 0x6666AACC, 0x4848D890, 0x03030506, 0xF6F601F7, 0x0E0E121C, 
-			0x6161A3C2, 0x35355F6A, 0x5757F9AE, 0xB9B9D069, 0x86869117, 0xC1C15899, 0x1D1D273A, 0x9E9EB927, 
-			0xE1E138D9, 0xF8F813EB, 0x9898B32B, 0x11113322, 0x6969BBD2, 0xD9D970A9, 0x8E8E8907, 0x9494A733, 
-			0x9B9BB62D, 0x1E1E223C, 0x87879215, 0xE9E920C9, 0xCECE4987, 0x5555FFAA, 0x28287850, 0xDFDF7AA5, 
-			0x8C8C8F03, 0xA1A1F859, 0x89898009, 0x0D0D171A, 0xBFBFDA65, 0xE6E631D7, 0x4242C684, 0x6868B8D0, 
-			0x4141C382, 0x9999B029, 0x2D2D775A, 0x0F0F111E, 0xB0B0CB7B, 0x5454FCA8, 0xBBBBD66D, 0x16163A2C
-		);
-
-		$this->dt3 = array(
-			0xF4A75051, 0x4165537E, 0x17A4C31A, 0x275E963A, 0xAB6BCB3B, 0x9D45F11F, 0xFA58ABAC, 0xE303934B, 
-			0x30FA5520, 0x766DF6AD, 0xCC769188, 0x024C25F5, 0xE5D7FC4F, 0x2ACBD7C5, 0x35448026, 0x62A38FB5, 
-			0xB15A49DE, 0xBA1B6725, 0xEA0E9845, 0xFEC0E15D, 0x2F7502C3, 0x4CF01281, 0x4697A38D, 0xD3F9C66B, 
-			0x8F5FE703, 0x929C9515, 0x6D7AEBBF, 0x5259DA95, 0xBE832DD4, 0x7421D358, 0xE0692949, 0xC9C8448E, 
-			0xC2896A75, 0x8E7978F4, 0x583E6B99, 0xB971DD27, 0xE14FB6BE, 0x88AD17F0, 0x20AC66C9, 0xCE3AB47D, 
-			0xDF4A1863, 0x1A3182E5, 0x51336097, 0x537F4562, 0x6477E0B1, 0x6BAE84BB, 0x81A01CFE, 0x082B94F9, 
-			0x48685870, 0x45FD198F, 0xDE6C8794, 0x7BF8B752, 0x73D323AB, 0x4B02E272, 0x1F8F57E3, 0x55AB2A66, 
-			0xEB2807B2, 0xB5C2032F, 0xC57B9A86, 0x3708A5D3, 0x2887F230, 0xBFA5B223, 0x036ABA02, 0x16825CED, 
-			0xCF1C2B8A, 0x79B492A7, 0x07F2F0F3, 0x69E2A14E, 0xDAF4CD65, 0x05BED506, 0x34621FD1, 0xA6FE8AC4, 
-			0x2E539D34, 0xF355A0A2, 0x8AE13205, 0xF6EB75A4, 0x83EC390B, 0x60EFAA40, 0x719F065E, 0x6E1051BD, 
-			0x218AF93E, 0xDD063D96, 0x3E05AEDD, 0xE6BD464D, 0x548DB591, 0xC45D0571, 0x06D46F04, 0x5015FF60, 
-			0x98FB2419, 0xBDE997D6, 0x4043CC89, 0xD99E7767, 0xE842BDB0, 0x898B8807, 0x195B38E7, 0xC8EEDB79, 
-			0x7C0A47A1, 0x420FE97C, 0x841EC9F8, 0x00000000, 0x80868309, 0x2BED4832, 0x1170AC1E, 0x5A724E6C, 
-			0x0EFFFBFD, 0x8538560F, 0xAED51E3D, 0x2D392736, 0x0FD9640A, 0x5CA62168, 0x5B54D19B, 0x362E3A24, 
-			0x0A67B10C, 0x57E70F93, 0xEE96D2B4, 0x9B919E1B, 0xC0C54F80, 0xDC20A261, 0x774B695A, 0x121A161C, 
-			0x93BA0AE2, 0xA02AE5C0, 0x22E0433C, 0x1B171D12, 0x090D0B0E, 0x8BC7ADF2, 0xB6A8B92D, 0x1EA9C814, 
-			0xF1198557, 0x75074CAF, 0x99DDBBEE, 0x7F60FDA3, 0x01269FF7, 0x72F5BC5C, 0x663BC544, 0xFB7E345B, 
-			0x4329768B, 0x23C6DCCB, 0xEDFC68B6, 0xE4F163B8, 0x31DCCAD7, 0x63851042, 0x97224013, 0xC6112084, 
-			0x4A247D85, 0xBB3DF8D2, 0xF93211AE, 0x29A16DC7, 0x9E2F4B1D, 0xB230F3DC, 0x8652EC0D, 0xC1E3D077, 
-			0xB3166C2B, 0x70B999A9, 0x9448FA11, 0xE9642247, 0xFC8CC4A8, 0xF03F1AA0, 0x7D2CD856, 0x3390EF22, 
-			0x494EC787, 0x38D1C1D9, 0xCAA2FE8C, 0xD40B3698, 0xF581CFA6, 0x7ADE28A5, 0xB78E26DA, 0xADBFA43F, 
-			0x3A9DE42C, 0x78920D50, 0x5FCC9B6A, 0x7E466254, 0x8D13C2F6, 0xD8B8E890, 0x39F75E2E, 0xC3AFF582, 
-			0x5D80BE9F, 0xD0937C69, 0xD52DA96F, 0x2512B3CF, 0xAC993BC8, 0x187DA710, 0x9C636EE8, 0x3BBB7BDB, 
-			0x267809CD, 0x5918F46E, 0x9AB701EC, 0x4F9AA883, 0x956E65E6, 0xFFE67EAA, 0xBCCF0821, 0x15E8E6EF, 
-			0xE79BD9BA, 0x6F36CE4A, 0x9F09D4EA, 0xB07CD629, 0xA4B2AF31, 0x3F23312A, 0xA59430C6, 0xA266C035, 
-			0x4EBC3774, 0x82CAA6FC, 0x90D0B0E0, 0xA7D81533, 0x04984AF1, 0xECDAF741, 0xCD500E7F, 0x91F62F17, 
-			0x4DD68D76, 0xEFB04D43, 0xAA4D54CC, 0x9604DFE4, 0xD1B5E39E, 0x6A881B4C, 0x2C1FB8C1, 0x65517F46, 
-			0x5EEA049D, 0x8C355D01, 0x877473FA, 0x0B412EFB, 0x671D5AB3, 0xDBD25292, 0x105633E9, 0xD647136D, 
-			0xD7618C9A, 0xA10C7A37, 0xF8148E59, 0x133C89EB, 0xA927EECE, 0x61C935B7, 0x1CE5EDE1, 0x47B13C7A, 
-			0xD2DF599C, 0xF2733F55, 0x14CE7918, 0xC737BF73, 0xF7CDEA53, 0xFDAA5B5F, 0x3D6F14DF, 0x44DB8678, 
-			0xAFF381CA, 0x68C43EB9, 0x24342C38, 0xA3405FC2, 0x1DC37216, 0xE2250CBC, 0x3C498B28, 0x0D9541FF, 
-			0xA8017139, 0x0CB3DE08, 0xB4E49CD8, 0x56C19064, 0xCB84617B, 0x32B670D5, 0x6C5C7448, 0xB85742D0
-		);
-
-		for ($i = 0; $i < 256; $i++)
-		{
-			$this->t2[$i <<  8] = (($this->t3[$i] <<  8) & 0xFFFFFF00) | (($this->t3[$i] >> 24) & 0x000000FF);
-			$this->t1[$i << 16] = (($this->t3[$i] << 16) & 0xFFFF0000) | (($this->t3[$i] >> 16) & 0x0000FFFF);
-			$this->t0[$i << 24] = (($this->t3[$i] << 24) & 0xFF000000) | (($this->t3[$i] >>  8) & 0x00FFFFFF);
-
-			$this->dt2[$i <<  8] = (($this->dt3[$i] <<  8) & 0xFFFFFF00) | (($this->dt3[$i] >> 24) & 0x000000FF);
-			$this->dt1[$i << 16] = (($this->dt3[$i] << 16) & 0xFFFF0000) | (($this->dt3[$i] >> 16) & 0x0000FFFF);
-			$this->dt0[$i << 24] = (($this->dt3[$i] << 24) & 0xFF000000) | (($this->dt3[$i] >>  8) & 0x00FFFFFF);
-		}
-	}
-
-	/**
-	 * Sets the key.
-	 *
-	 * Keys can be of any length.  Rijndael, itself, requires the use of a key that's between 128-bits and 256-bits long and
-	 * whose length is a multiple of 32.  If the key is less than 256-bits and the key length isn't set, we round the length
-	 * up to the closest valid key length, padding $key with null bytes.  If the key is more tan 256-bits, we trim the
-	 * excess bits.
-	 *
-	 * If the key is not explicitly set, it'll be assumed to be all null bytes.
-	 *
-	 * @access public
-	 * @param String $key
-	 */
-	function set_key($key)
-	{
-		$this->key = $key;
-		$this->changed = true;
-	}
-
-	/**
-	 * Sets the initialization vector. (optional)
-	 *
-	 * SetIV is not required when CRYPT_RIJNDAEL_MODE_ECB is being used.  If not explictly set, it'll be assumed
-	 * to be all zero's.
-	 *
-	 * @access public
-	 * @param String $iv
-	 */
-	function set_iv($iv)
-	{
-		$this->encryptIV = $this->decryptIV = $this->iv = str_pad(substr($iv, 0, $this->block_size), $this->block_size, chr(0));;
-	}
-
-	/**
-	 * Sets the key length
-	 *
-	 * Valid key lengths are 128, 160, 192, 224, and 256.  If the length is less than 128, it will be rounded up to
-	 * 128.  If the length is greater then 128 and invalid, it will be rounded down to the closest valid amount.
-	 *
-	 * @access public
-	 * @param Integer $length
-	 */
-	function set_key_length($length)
-	{
-		$length >>= 5;
-		if ($length > 8)
-		{
-			$length = 8;
-		}
-		else if ($length < 4)
-		{
-			$length = 4;
-		}
-		$this->Nk = $length;
-		$this->key_size = $length << 2;
-
-		$this->explicit_key_length = true;
-		$this->changed = true;
-	}
-
-	/**
-	 * Sets the block length
-	 *
-	 * Valid block lengths are 128, 160, 192, 224, and 256.  If the length is less than 128, it will be rounded up to
-	 * 128.  If the length is greater then 128 and invalid, it will be rounded down to the closest valid amount.
-	 *
-	 * @access public
-	 * @param Integer $length
-	 */
-	function set_block_length($length)
-	{
-		$length >>= 5;
-		if ($length > 8)
-		{
-			$length = 8;
-		}
-		else if ($length < 4)
-		{
-			$length = 4;
-		}
-		$this->Nb = $length;
-		$this->block_size = $length << 2;
-		$this->changed = true;
-	}
-
-	/**
-	 * Encrypts a message.
-	 *
-	 * $plaintext will be padded with additional bytes such that it's length is a multiple of the block size.  Other Rjindael
-	 * implementations may or may not pad in the same manner.  Other common approaches to padding and the reasons why it's
-	 * necessary are discussed in the following
-	 * URL:
-	 *
-	 * {@link http://www.di-mgt.com.au/cryptopad.html http://www.di-mgt.com.au/cryptopad.html}
-	 *
-	 * An alternative to padding is to, separately, send the length of the file.  This is what SSH, in fact, does.
-	 * strlen($plaintext) will still need to be a multiple of 8, however, arbitrary values can be added to make it that
-	 * length.
-	 *
-	 * @see rijndael::decrypt()
-	 * @access public
-	 * @param String $plaintext
-	 */
-	function encrypt($plaintext)
-	{
-		$this->_setup();
-		$plaintext = $this->_pad($plaintext);
-
-		$ciphertext = '';
-		switch ($this->mode)
-		{
-			case CRYPT_RIJNDAEL_MODE_ECB:
-				for ($i = 0; $i < strlen($plaintext); $i+=$this->block_size)
-				{
-					$ciphertext.= $this->_encrypt_block(substr($plaintext, $i, $this->block_size));
-				}
-				break;
-			case CRYPT_RIJNDAEL_MODE_CBC:
-				$xor = $this->encryptIV;
-				for ($i = 0; $i < strlen($plaintext); $i+=$this->block_size)
-				{
-					$block = substr($plaintext, $i, $this->block_size);
-					$block = $this->_encrypt_block($block ^ $xor);
-					$xor = $block;
-					$ciphertext.= $block;
-				}
-				if ($this->continuousBuffer)
-				{
-					$this->encryptIV = $xor;
-				}
-		}
-
-		return $ciphertext;
-	}
-
-	/**
-	 * Decrypts a message.
-	 *
-	 * If strlen($ciphertext) is not a multiple of the block size, null bytes will be added to the end of the string until
-	 * it is.
-	 *
-	 * @see rijndael::encrypt()
-	 * @access public
-	 * @param String $ciphertext
-	 */
-	function decrypt($ciphertext)
-	{
-		$this->_setup();
-		// we pad with chr(0) since that's what mcrypt_generic does.  to quote from http://php.net/function.mcrypt-generic :
-		// "The data is padded with "\0" to make sure the length of the data is n * blocksize."
-		$ciphertext = str_pad($ciphertext, (strlen($ciphertext) + $this->block_size - 1) % $this->block_size, chr(0));
-
-		$plaintext = '';
-		switch ($this->mode)
-		{
-			case CRYPT_RIJNDAEL_MODE_ECB:
-				for ($i = 0; $i < strlen($ciphertext); $i+=$this->block_size)
-				{
-					$plaintext.= $this->_decrypt_block(substr($ciphertext, $i, $this->block_size));
-				}
-				break;
-			case CRYPT_RIJNDAEL_MODE_CBC:
-				$xor = $this->decryptIV;
-				for ($i = 0; $i < strlen($ciphertext); $i+=$this->block_size)
-				{
-					$block = substr($ciphertext, $i, $this->block_size);
-					$plaintext.= $this->_decrypt_block($block) ^ $xor;
-					$xor = $block;
-				}
-				if ($this->continuousBuffer)
-				{
-					$this->decryptIV = $xor;
-				}
-		}
-
-		return $this->_unpad($plaintext);
-	}
-
-	/**
-	 * Encrypts a block
-	 *
-	 * @access private
-	 * @param String $in
-	 * @return String
-	 */
-	function _encrypt_block($in)
-	{
-		// unpack starts it's indices at 1 - not 0.
-		$state = unpack('N*', $in);
-
-		// addRoundKey and reindex $state
-		for ($i = 0; $i < $this->Nb; $i++)
-		{
-			$state[$i] = $state[$i + 1] ^ $this->w[0][$i];
-		}
-		unset($state[$i]);
-
-		// fips-197.pdf#page=19, "Figure 5. Pseudo Code for the Cipher", states that this loop has four components - 
-		// subBytes, shiftRows, mixColumns, and addRoundKey. fips-197.pdf#page=30, "Implementation Suggestions Regarding 
-		// Various Platforms" suggests that performs enhanced implementations are described in Rijndael-ammended.pdf.
-		// Rijndael-ammended.pdf#page=20, "Implementation aspects / 32-bit processor", discusses such an optimization.
-		// Unfortunately, the description given there is not quite correct.  Per aes.spec.v316.pdf#page=19 [1], 
-		// equation (7.4.7) is supposed to use addition instead of subtraction, so we'll do that here, as well.
-
-		// [1] http://fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.v316.pdf
-		$temp = array();
-		for ($round = 1; $round < $this->Nr; $round++)
-		{
-			$i = 0; // $this->c[0] == 0
-			$j = $this->c[1];
-			$k = $this->c[2];
-			$l = $this->c[3];
-
-			while ($i < $this->Nb)
-			{
-				$temp[$i] = $this->t0[$state[$i] & 0xFF000000] ^ 
-							$this->t1[$state[$j] & 0x00FF0000] ^ 
-							$this->t2[$state[$k] & 0x0000FF00] ^ 
-							$this->t3[$state[$l] & 0x000000FF] ^ 
-							$this->w[$round][$i];
-				$i++;
-				$j = ($j + 1) % $this->Nb;
-				$k = ($k + 1) % $this->Nb;
-				$l = ($l + 1) % $this->Nb;
-			}
-
-			for ($i = 0; $i < $this->Nb; $i++)
-			{
-				$state[$i] = $temp[$i];
-			}
-		}
-
-		// subWord
-		for ($i = 0; $i < $this->Nb; $i++)
-		{
-			$state[$i] = $this->_sub_word($state[$i]);
-		}
-
-		// shiftRows + addRoundKey
-		$i = 0; // $this->c[0] == 0
-		$j = $this->c[1];
-		$k = $this->c[2];
-		$l = $this->c[3];
-		while ($i < $this->Nb)
-		{
-			$temp[$i] = ($state[$i] & 0xFF000000) ^ 
-						($state[$j] & 0x00FF0000) ^ 
-						($state[$k] & 0x0000FF00) ^ 
-						($state[$l] & 0x000000FF) ^
-						 $this->w[$this->Nr][$i];
-			$i++;
-			$j = ($j + 1) % $this->Nb;
-			$k = ($k + 1) % $this->Nb;
-			$l = ($l + 1) % $this->Nb;
-		}
-		$state = $temp;
-
-		array_unshift($state, 'N*');
-
-		return call_user_func_array('pack', $state);
-	}
-
-	/**
-	 * Decrypts a block
-	 *
-	 * @access private
-	 * @param String $in
-	 * @return String
-	 */
-	function _decrypt_block($in)
-	{
-		// unpack starts it's indices at 1 - not 0.
-		$state = unpack('N*', $in);
-
-		// addRoundKey and reindex $state
-		for ($i = 0; $i < $this->Nb; $i++)
-		{
-			$state[$i] = $state[$i + 1] ^ $this->dw[$this->Nr][$i];
-		}
-		unset($state[$i]);
-
-		$temp = array();
-		for ($round = $this->Nr - 1; $round > 0; $round--)
-		{
-			$i = 0; // $this->c[0] == 0
-			$j = $this->Nb - $this->c[1];
-			$k = $this->Nb - $this->c[2];
-			$l = $this->Nb - $this->c[3];
-
-			while ($i < $this->Nb)
-			{
-				$temp[$i] = $this->dt0[$state[$i] & 0xFF000000] ^ 
-							$this->dt1[$state[$j] & 0x00FF0000] ^ 
-							$this->dt2[$state[$k] & 0x0000FF00] ^ 
-							$this->dt3[$state[$l] & 0x000000FF] ^ 
-							$this->dw[$round][$i];
-				$i++;
-				$j = ($j + 1) % $this->Nb;
-				$k = ($k + 1) % $this->Nb;
-				$l = ($l + 1) % $this->Nb;
-			}
-
-			for ($i = 0; $i < $this->Nb; $i++)
-			{
-				$state[$i] = $temp[$i];
-			}
-		}
-
-		// invShiftRows + invSubWord + addRoundKey
-		$i = 0; // $this->c[0] == 0
-		$j = $this->Nb - $this->c[1];
-		$k = $this->Nb - $this->c[2];
-		$l = $this->Nb - $this->c[3];
-
-		while ($i < $this->Nb)
-		{
-			$temp[$i] = $this->dw[0][$i] ^ 
-						$this->_inv_sub_word(($state[$i] & 0xFF000000) | 
-										   ($state[$j] & 0x00FF0000) | 
-										   ($state[$k] & 0x0000FF00) | 
-										   ($state[$l] & 0x000000FF));
-			$i++;
-			$j = ($j + 1) % $this->Nb;
-			$k = ($k + 1) % $this->Nb;
-			$l = ($l + 1) % $this->Nb;
-		}
-
-		$state = $temp;
-
-		array_unshift($state, 'N*');
-
-		return call_user_func_array('pack', $state);
-	}
-
-	/**
-	 * Setup Rijndael
-	 *
-	 * Validates all the variables and calculates $Nr - the number of rounds that need to be performed - and $w - the key
-	 * key schedule.
-	 *
-	 * @access private
-	 */
-	function _setup()
-	{
-		// Each number in $rcon is equal to the previous number multiplied by two in Rijndael's finite field.
-		// See http://en.wikipedia.org/wiki/Finite_field_arithmetic#Multiplicative_inverse
-		static $rcon = array(0,
-			0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x10000000,
-			0x20000000, 0x40000000, 0x80000000, 0x1B000000, 0x36000000,
-			0x6C000000, 0xD8000000, 0xAB000000, 0x4D000000, 0x9A000000,
-			0x2F000000, 0x5E000000, 0xBC000000, 0x63000000, 0xC6000000,
-			0x97000000, 0x35000000, 0x6A000000, 0xD4000000, 0xB3000000,
-			0x7D000000, 0xFA000000, 0xEF000000, 0xC5000000, 0x91000000
-		);
-
-		if (!$this->changed)
-		{
-			return;
-		}
-
-		if (!$this->explicit_key_length)
-		{
-			// we do >> 2, here, and not >> 5, as we do above, since strlen($this->key) tells us the number of bytes - not bits
-			$length = strlen($this->key) >> 2;
-			if ($length > 8)
-			{
-				$length = 8;
-			}
-			else if ($length < 4)
-			{
-				$length = 4;
-			}
-			$this->Nk = $length;
-			$this->key_size = $length << 2;
-		}
-
-		$this->key = str_pad(substr($this->key, 0, $this->key_size), $this->key_size, chr(0));
-		$this->encryptIV = $this->decryptIV = $this->iv = str_pad(substr($this->iv, 0, $this->block_size), $this->block_size, chr(0));
-
-		// see Rijndael-ammended.pdf#page=44
-		$this->Nr = max($this->Nk, $this->Nb) + 6;
-
-		// shift offsets for Nb = 5, 7 are defined in Rijndael-ammended.pdf#page=44,
-		//	 "Table 8: Shift offsets in Shiftrow for the alternative block lengths"
-		// shift offsets for Nb = 4, 6, 8 are defined in Rijndael-ammended.pdf#page=14,
-		//	 "Table 2: Shift offsets for different block lengths"
-		switch ($this->Nb)
-		{
-			case 4:
-			case 5:
-			case 6:
-				$this->c = array(0, 1, 2, 3);
-				break;
-			case 7:
-				$this->c = array(0, 1, 2, 4);
-				break;
-			case 8:
-				$this->c = array(0, 1, 3, 4);
-		}
-
-		$key = $this->key;
-
-		$w = array();
-		for ($i = 0; $i < $this->Nk; $i++)
-		{
-			list(, $w[$i]) = unpack('N', $this->_string_shift($key, 4));
-		}
-
-		$length = $this->Nb * ($this->Nr + 1);
-		for (; $i < $length; $i++)
-		{
-			$temp = $w[$i - 1];
-			if ($i % $this->Nk == 0)
-			{
-				// according to <http://php.net/language.types.integer>, "the size of an integer is platform-dependent".
-				// on a 32-bit machine, it's 32-bits, and on a 64-bit machine, it's 64-bits. on a 32-bit machine,
-				// 0xFFFFFFFF << 8 == 0xFFFFFF00, but on a 64-bit machine, it equals 0xFFFFFFFF00. as such, doing 'and'
-				// with 0xFFFFFFFF (or 0xFFFFFF00) on a 32-bit machine is unnecessary, but on a 64-bit machine, it is.
-				$temp = (($temp << 8) & 0xFFFFFF00) | (($temp >> 24) & 0x000000FF); // rotWord
-				$temp = $this->_sub_word($temp) ^ $rcon[$i / $this->Nk];
-			}
-			else if ($this->Nk > 6 && $i % $this->Nk == 4)
-			{
-				$temp = $this->_sub_word($temp);
-			}
-			$w[$i] = $w[$i - $this->Nk] ^ $temp;
-		}
-
-		// convert the key schedule from a vector of $Nb * ($Nr + 1) length to a matrix with $Nr + 1 rows and $Nb columns
-		// and generate the inverse key schedule.  more specifically,
-		// according to <http://csrc.nist.gov/archive/aes/rijndael/Rijndael-ammended.pdf#page=23> (section 5.3.3), 
-		// "The key expansion for the Inverse Cipher is defined as follows:
-		//		1. Apply the Key Expansion.
-		//		2. Apply InvMixColumn to all Round Keys except the first and the last one."
-		// also, see fips-197.pdf#page=27, "5.3.5 Equivalent Inverse Cipher"
-		$temp = array();
-		for ($i = $row = $col = 0; $i < $length; $i++, $col++)
-		{
-			if ($col == $this->Nb)
-			{
-				if ($row == 0)
-				{
-					$this->dw[0] = $this->w[0];
-				}
-				else
-				{
-					// subWord + invMixColumn + invSubWord = invMixColumn
-					$j = 0;
-					while ($j < $this->Nb)
-					{
-						$dw = $this->_sub_word($this->w[$row][$j]);
-						$temp[$j] = $this->dt0[$dw & 0xFF000000] ^ 
-									$this->dt1[$dw & 0x00FF0000] ^ 
-									$this->dt2[$dw & 0x0000FF00] ^ 
-									$this->dt3[$dw & 0x000000FF];
-						$j++;
-					}
-					$this->dw[$row] = $temp;
-				}
-
-				$col = 0;
-				$row++;
-			}
-			$this->w[$row][$col] = $w[$i];
-		}
-
-		$this->dw[$row] = $this->w[$row];
-
-		$this->changed = false;
-	}
-
-	/**
-	 * Performs S-Box substitutions
-	 *
-	 * @access private
-	 */
-	function _sub_word($word)
-	{
-		static $sbox0, $sbox1, $sbox2, $sbox3;
-
-		if (empty($sbox0))
-		{
-			$sbox0 = array(
-				0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5, 0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76,
-				0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0, 0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0,
-				0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC, 0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15,
-				0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A, 0x07, 0x12, 0x80, 0xE2, 0xEB, 0x27, 0xB2, 0x75,
-				0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0, 0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84,
-				0x53, 0xD1, 0x00, 0xED, 0x20, 0xFC, 0xB1, 0x5B, 0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF,
-				0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85, 0x45, 0xF9, 0x02, 0x7F, 0x50, 0x3C, 0x9F, 0xA8,
-				0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5, 0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2,
-				0xCD, 0x0C, 0x13, 0xEC, 0x5F, 0x97, 0x44, 0x17, 0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73,
-				0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88, 0x46, 0xEE, 0xB8, 0x14, 0xDE, 0x5E, 0x0B, 0xDB,
-				0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C, 0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79,
-				0xE7, 0xC8, 0x37, 0x6D, 0x8D, 0xD5, 0x4E, 0xA9, 0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08,
-				0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6, 0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A,
-				0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E, 0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E,
-				0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94, 0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF,
-				0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68, 0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16
-			);
-
-			$sbox1 = array();
-			$sbox2 = array();
-			$sbox3 = array();
-
-			for ($i = 0; $i < 256; $i++)
-			{
-				$sbox1[$i <<  8] = $sbox0[$i] <<  8;
-				$sbox2[$i << 16] = $sbox0[$i] << 16;
-				$sbox3[$i << 24] = $sbox0[$i] << 24;
-			}
-		}
-
-		return $sbox0[$word & 0x000000FF] | 
-			   $sbox1[$word & 0x0000FF00] | 
-			   $sbox2[$word & 0x00FF0000] | 
-			   $sbox3[$word & 0xFF000000];
-	}
-
-	/**
-	 * Performs inverse S-Box substitutions
-	 *
-	 * @access private
-	 */
-	function _inv_sub_word($word)
-	{
-		static $sbox0, $sbox1, $sbox2, $sbox3;
-
-		if (empty($sbox0))
-		{
-			$sbox0 = array(
-				0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38, 0xBF, 0x40, 0xA3, 0x9E, 0x81, 0xF3, 0xD7, 0xFB,
-				0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87, 0x34, 0x8E, 0x43, 0x44, 0xC4, 0xDE, 0xE9, 0xCB,
-				0x54, 0x7B, 0x94, 0x32, 0xA6, 0xC2, 0x23, 0x3D, 0xEE, 0x4C, 0x95, 0x0B, 0x42, 0xFA, 0xC3, 0x4E,
-				0x08, 0x2E, 0xA1, 0x66, 0x28, 0xD9, 0x24, 0xB2, 0x76, 0x5B, 0xA2, 0x49, 0x6D, 0x8B, 0xD1, 0x25,
-				0x72, 0xF8, 0xF6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xD4, 0xA4, 0x5C, 0xCC, 0x5D, 0x65, 0xB6, 0x92,
-				0x6C, 0x70, 0x48, 0x50, 0xFD, 0xED, 0xB9, 0xDA, 0x5E, 0x15, 0x46, 0x57, 0xA7, 0x8D, 0x9D, 0x84,
-				0x90, 0xD8, 0xAB, 0x00, 0x8C, 0xBC, 0xD3, 0x0A, 0xF7, 0xE4, 0x58, 0x05, 0xB8, 0xB3, 0x45, 0x06,
-				0xD0, 0x2C, 0x1E, 0x8F, 0xCA, 0x3F, 0x0F, 0x02, 0xC1, 0xAF, 0xBD, 0x03, 0x01, 0x13, 0x8A, 0x6B,
-				0x3A, 0x91, 0x11, 0x41, 0x4F, 0x67, 0xDC, 0xEA, 0x97, 0xF2, 0xCF, 0xCE, 0xF0, 0xB4, 0xE6, 0x73,
-				0x96, 0xAC, 0x74, 0x22, 0xE7, 0xAD, 0x35, 0x85, 0xE2, 0xF9, 0x37, 0xE8, 0x1C, 0x75, 0xDF, 0x6E,
-				0x47, 0xF1, 0x1A, 0x71, 0x1D, 0x29, 0xC5, 0x89, 0x6F, 0xB7, 0x62, 0x0E, 0xAA, 0x18, 0xBE, 0x1B,
-				0xFC, 0x56, 0x3E, 0x4B, 0xC6, 0xD2, 0x79, 0x20, 0x9A, 0xDB, 0xC0, 0xFE, 0x78, 0xCD, 0x5A, 0xF4,
-				0x1F, 0xDD, 0xA8, 0x33, 0x88, 0x07, 0xC7, 0x31, 0xB1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xEC, 0x5F,
-				0x60, 0x51, 0x7F, 0xA9, 0x19, 0xB5, 0x4A, 0x0D, 0x2D, 0xE5, 0x7A, 0x9F, 0x93, 0xC9, 0x9C, 0xEF,
-				0xA0, 0xE0, 0x3B, 0x4D, 0xAE, 0x2A, 0xF5, 0xB0, 0xC8, 0xEB, 0xBB, 0x3C, 0x83, 0x53, 0x99, 0x61,
-				0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26, 0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D
-			);
-
-			$sbox1 = array();
-			$sbox2 = array();
-			$sbox3 = array();
-
-			for ($i = 0; $i < 256; $i++)
-			{
-				$sbox1[$i <<  8] = $sbox0[$i] <<  8;
-				$sbox2[$i << 16] = $sbox0[$i] << 16;
-				$sbox3[$i << 24] = $sbox0[$i] << 24;
-			}
-		}
-
-		return $sbox0[$word & 0x000000FF] | 
-			   $sbox1[$word & 0x0000FF00] | 
-			   $sbox2[$word & 0x00FF0000] | 
-			   $sbox3[$word & 0xFF000000];
-	}
-
-	/**
-	 * Pad "packets".
-	 *
-	 * Rijndael works by encrypting between sixteen and thirty-two bytes at a time, provided that number is also a multiple
-	 * of four.  If you ever need to encrypt or decrypt something that isn't of the proper length, it becomes necessary to
-	 * pad the input so that it is of the proper length.
-	 *
-	 * Padding is enabled by default.  Sometimes, however, it is undesirable to pad strings.  Such is the case in SSH,
-	 * where "packets" are padded with random bytes before being encrypted.  Unpad these packets and you risk stripping
-	 * away characters that shouldn't be stripped away. (SSH knows how many bytes are added because the length is
-	 * transmitted separately)
-	 *
-	 * @see rijndael::disable_padding()
-	 * @access public
-	 */
-	function enable_padding()
-	{
-		$this->padding = true;
-	}
-
-	/**
-	 * Do not pad packets.
-	 *
-	 * @see rijndael::enable_padding()
-	 * @access public
-	 */
-	function disable_padding()
-	{
-		$this->padding = false;
-	}
-
-	/**
-	 * Pads a string
-	 *
-	 * Pads a string using the RSA PKCS padding standards so that its length is a multiple of the blocksize.
-	 * $block_size - (strlen($text) % $block_size) bytes are added, each of which is equal to 
-	 * chr($block_size - (strlen($text) % $block_size)
-	 *
-	 * If padding is disabled and $text is not a multiple of the blocksize, the string will be padded regardless
-	 * and padding will, hence forth, be enabled.
-	 *
-	 * @see rijndael::_unpad()
-	 * @access private
-	 */
-	function _pad($text)
-	{
-		$length = strlen($text);
-
-		if (!$this->padding)
-		{
-			if ($length % $this->block_size == 0)
-			{
-				return $text;
-			}
-			else
-			{
-				$this->padding = true;
-			}
-		}
-
-		$pad = $this->block_size - ($length % $this->block_size);
-
-		return str_pad($text, $length + $pad, chr($pad));
-	}
-
-	/**
-	 * Unpads a string.
-	 *
-	 * If padding is enabled and the reported padding length exceeds the block size, padding will be, hence forth, disabled.
-	 *
-	 * @see rijndael::_pad()
-	 * @access private
-	 */
-	function _unpad($text)
-	{
-		if (!$this->padding)
-		{
-			return $text;
-		}
-
-		$length = ord($text[strlen($text) - 1]);
-
-		if ($length > $this->block_size)
-		{
-			$this->padding = false;
-			return $text;
-		}
-
-		return substr($text, 0, -$length);
-	}
-
-	/**
-	 * Treat consecutive "packets" as if they are a continuous buffer.
-	 *
-	 * Say you have a 32-byte plaintext $plaintext.  Using the default behavior, the two following code snippets
-	 * will yield different outputs:
-	 *
-	 * <code>
-	 *	echo $rijndael->encrypt(substr($plaintext,  0, 16));
-	 *	echo $rijndael->encrypt(substr($plaintext, 16, 16));
-	 * </code>
-	 * <code>
-	 *	echo $rijndael->encrypt($plaintext);
-	 * </code>
-	 *
-	 * The solution is to enable the continuous buffer.  Although this will resolve the above discrepancy, it creates
-	 * another, as demonstrated with the following:
-	 *
-	 * <code>
-	 *	$rijndael->encrypt(substr($plaintext, 0, 16));
-	 *	echo $rijndael->decrypt($des->encrypt(substr($plaintext, 16, 16)));
-	 * </code>
-	 * <code>
-	 *	echo $rijndael->decrypt($des->encrypt(substr($plaintext, 16, 16)));
-	 * </code>
-	 *
-	 * With the continuous buffer disabled, these would yield the same output.  With it enabled, they yield different
-	 * outputs.  The reason is due to the fact that the initialization vector's change after every encryption /
-	 * decryption round when the continuous buffer is enabled.  When it's disabled, they remain constant.
-	 *
-	 * Put another way, when the continuous buffer is enabled, the state of the rijndael() object changes after each
-	 * encryption / decryption round, whereas otherwise, it'd remain constant.  For this reason, it's recommended that
-	 * continuous buffers not be used.  They do offer better security and are, in fact, sometimes required (SSH uses them),
-	 * however, they are also less intuitive and more likely to cause you problems.
-	 *
-	 * @see rijndael::disable_continuous_buffer()
-	 * @access public
-	 */
-	function enable_continuous_buffer()
-	{
-		$this->continuousBuffer = true;
-	}
-
-	/**
-	 * Treat consecutive packets as if they are a discontinuous buffer.
-	 *
-	 * The default behavior.
-	 *
-	 * @see rijndael::enable_continuous_buffer()
-	 * @access public
-	 */
-	function disable_continuous_buffer()
-	{
-		$this->continuousBuffer = false;
-		$this->encryptIV = $this->iv;
-		$this->decryptIV = $this->iv;
-	}
-
-	/**
-	 * String Shift
-	 *
-	 * Inspired by array_shift
-	 *
-	 * @param String $string
-	 * @param optional Integer $index
-	 * @return String
-	 * @access private
-	 */
-	function _string_shift(&$string, $index = 1)
-	{
-		$substr = substr($string, 0, $index);
-		$string = substr($string, $index);
-		return $substr;
-	}
-}
-
-/**
- * Pure-PHP implementation of AES.
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- * @version 0.1.0
- * @access  public
- * @package aes
- */
-class aes extends rijndael {
-	/**
-	 * MCrypt parameters
-	 *
-	 * @see aes::set_mcypt()
-	 * @var Array
-	 * @access private
-	 */
-	var $mcrypt = array('', '');
-
-	/**
-	 * Default Constructor.
-	 *
-	 * Determines whether or not the mcrypt extension should be used.  $mode should only, at present, be
-	 * CRYPT_AES_MODE_ECB or CRYPT_AES_MODE_CBC.  If not explictly set, CRYPT_AES_MODE_CBC will be used.
-	 *
-	 * @param optional Integer $mode
-	 * @return aes
-	 * @access public
-	 */
-	function __construct($mode = CRYPT_AES_MODE_CBC)
-	{
-		if ( !defined('CRYPT_AES_MODE') )
-		{
-			switch (true)
-			{
-				case extension_loaded('mcrypt'):
-					// i'd check to see if aes was supported, by doing in_array('des', mcrypt_list_algorithms('')),
-					// but since that can be changed after the object has been created, there doesn't seem to be
-					// a lot of point...
-					define('CRYPT_AES_MODE', CRYPT_AES_MODE_MCRYPT);
-					break;
-				default:
-					define('CRYPT_AES_MODE', CRYPT_AES_MODE_INTERNAL);
-			}
-		}
-
-		switch ( CRYPT_AES_MODE )
-		{
-			case CRYPT_AES_MODE_MCRYPT:
-				switch ($mode)
-				{
-					case CRYPT_AES_MODE_ECB:
-						$this->mode = MCRYPT_MODE_ECB;
-						break;
-					case CRYPT_AES_MODE_CBC:
-					default:
-						$this->mode = MCRYPT_MODE_CBC;
-				}
-
-				break;
-			default:
-				switch ($mode)
-				{
-					case CRYPT_AES_MODE_ECB:
-						$this->mode = CRYPT_RIJNDAEL_MODE_ECB;
-						break;
-					case CRYPT_AES_MODE_CBC:
-					default:
-						$this->mode = CRYPT_RIJNDAEL_MODE_CBC;
-				}
-		}
-
-		if (CRYPT_AES_MODE == CRYPT_AES_MODE_INTERNAL)
-		{
-			parent::__construct($this->mode);
-		}
-	}
-
-	/**
-	 * Dummy function
-	 *
-	 * Since aes extends rijndael, this function is, technically, available, but it doesn't do anything.
-	 *
-	 * @access public
-	 * @param Integer $length
-	 */
-	function set_block_length($length)
-	{
-		return;
-	}
-
-	/**
-	 * Encrypts a message.
-	 *
-	 * $plaintext will be padded with up to 16 additional bytes.  Other AES implementations may or may not pad in the
-	 * same manner.  Other common approaches to padding and the reasons why it's necessary are discussed in the following
-	 * URL:
-	 *
-	 * {@link http://www.di-mgt.com.au/cryptopad.html http://www.di-mgt.com.au/cryptopad.html}
-	 *
-	 * An alternative to padding is to, separately, send the length of the file.  This is what SSH, in fact, does.
-	 * strlen($plaintext) will still need to be a multiple of 16, however, arbitrary values can be added to make it that
-	 * length.
-	 *
-	 * @see aes::decrypt()
-	 * @access public
-	 * @param String $plaintext
-	 */
-	function encrypt($plaintext)
-	{
-		if ( CRYPT_AES_MODE == CRYPT_AES_MODE_MCRYPT )
-		{
-			$this->_mcrypt_setup();
-			$plaintext = $this->_pad($plaintext);
-
-			$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128, $this->mcrypt[0], $this->mode, $this->mcrypt[1]);
-			mcrypt_generic_init($td, $this->key, $this->encryptIV);
-
-			$ciphertext = mcrypt_generic($td, $plaintext);
-
-			mcrypt_generic_deinit($td);
-			mcrypt_module_close($td);
-
-			if ($this->continuousBuffer)
-			{
-				$this->encryptIV = substr($ciphertext, -16);
-			}
-
-			return $ciphertext;
-		}
-
-		return parent::encrypt($plaintext);
-	}
-
-	/**
-	 * Decrypts a message.
-	 *
-	 * If strlen($ciphertext) is not a multiple of 16, null bytes will be added to the end of the string until it is.
-	 *
-	 * @see aes::encrypt()
-	 * @access public
-	 * @param String $ciphertext
-	 */
-	function decrypt($ciphertext)
-	{
-		// we pad with chr(0) since that's what mcrypt_generic does.  to quote from http://php.net/function.mcrypt-generic :
-		// "The data is padded with "\0" to make sure the length of the data is n * blocksize."
-		$ciphertext = str_pad($ciphertext, (strlen($ciphertext) + 15) & 0xFFFFFFF0, chr(0));
-
-		if ( CRYPT_AES_MODE == CRYPT_AES_MODE_MCRYPT )
-		{
-			$this->_mcryptSetup();
-
-			$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128, $this->mcrypt[0], $this->mode, $this->mcrypt[1]);
-			mcrypt_generic_init($td, $this->key, $this->decryptIV);
-
-			$plaintext = mdecrypt_generic($td, $ciphertext);
-
-			mcrypt_generic_deinit($td);
-			mcrypt_module_close($td);
-
-			if ($this->continuousBuffer)
-			{
-				$this->decryptIV = substr($ciphertext, -16);
-			}
-
-			return $this->_unpad($plaintext);
-		}
-
-		return parent::decrypt($ciphertext);
-	}
-
-	/**
-	 * Sets MCrypt parameters. (optional)
-	 *
-	 * If MCrypt is being used, empty strings will be used, unless otherwise specified.
-	 *
-	 * @link http://php.net/function.mcrypt-module-open#function.mcrypt-module-open
-	 * @access public
-	 * @param optional Integer $algorithm_directory
-	 * @param optional Integer $mode_directory
-	 */
-	function set_mcrypt($algorithm_directory = '', $mode_directory = '')
-	{
-		$this->mcrypt = array($algorithm_directory, $mode_directory);
-	}
-
-	/**
-	 * Setup mcrypt
-	 *
-	 * Validates all the variables.
-	 *
-	 * @access private
-	 */
-	function _mcrypt_setup()
-	{
-		if (!$this->changed)
-		{
-			return;
-		}
-
-		if (!$this->explicit_key_length)
-		{
-			// this just copied from rijndael::_setup()
-			$length = strlen($this->key) >> 2;
-			if ($length > 8)
-			{
-				$length = 8;
-			}
-			else if ($length < 4)
-			{
-				$length = 4;
-			}
-			$this->Nk = $length;
-			$this->key_size = $length << 2;
-		}
-
-		switch ($this->Nk)
-		{
-			case 4: // 128
-				$this->key_size = 16;
-				break;
-			case 5: // 160
-			case 6: // 192
-				$this->key_size = 24;
-				break;
-			case 7: // 224
-			case 8: // 256
-				$this->key_size = 32;
-		}
-
-		$this->key = substr($this->key, 0, $this->key_size);
-		$this->encryptIV = $this->decryptIV = $this->iv = str_pad(substr($this->iv, 0, 16), 16, chr(0));
-
-		$this->changed = false;
-	}
-
-	/**
-	 * Encrypts a block
-	 *
-	 * Optimized over rijndael's implementation by means of loop unrolling.
-	 *
-	 * @see rijndael::_encrypt_block()
-	 * @access private
-	 * @param String $in
-	 * @return String
-	 */
-	function _encrypt_block($in)
-	{
-		// unpack starts it's indices at 1 - not 0.
-		$state = unpack('N*', $in);
-
-		// addRoundKey and reindex $state
-		$state = array(
-			$state[1] ^ $this->w[0][0],
-			$state[2] ^ $this->w[0][1],
-			$state[3] ^ $this->w[0][2],
-			$state[4] ^ $this->w[0][3]
-		);
-
-		// shiftRows + subWord + mixColumns + addRoundKey
-		// we could loop unroll this and use if statements to do more rounds as necessary, but, in my tests, that yields
-		// only a marginal improvement.  since that also, imho, hinders the readability of the code, i've opted not to do it.
-		for ($round = 1; $round < $this->Nr; $round++)
-		{
-			$state = array(
-				$this->t0[$state[0] & 0xFF000000] ^ $this->t1[$state[1] & 0x00FF0000] ^ $this->t2[$state[2] & 0x0000FF00] ^ $this->t3[$state[3] & 0x000000FF] ^ $this->w[$round][0],
-				$this->t0[$state[1] & 0xFF000000] ^ $this->t1[$state[2] & 0x00FF0000] ^ $this->t2[$state[3] & 0x0000FF00] ^ $this->t3[$state[0] & 0x000000FF] ^ $this->w[$round][1],
-				$this->t0[$state[2] & 0xFF000000] ^ $this->t1[$state[3] & 0x00FF0000] ^ $this->t2[$state[0] & 0x0000FF00] ^ $this->t3[$state[1] & 0x000000FF] ^ $this->w[$round][2],
-				$this->t0[$state[3] & 0xFF000000] ^ $this->t1[$state[0] & 0x00FF0000] ^ $this->t2[$state[1] & 0x0000FF00] ^ $this->t3[$state[2] & 0x000000FF] ^ $this->w[$round][3]
-			);
-
-		}
-
-		// subWord
-		$state = array(
-			$this->_sub_word($state[0]),
-			$this->_sub_word($state[1]),
-			$this->_sub_word($state[2]),
-			$this->_sub_word($state[3])
-		);
-
-		// shiftRows + addRoundKey
-		$state = array(
-			($state[0] & 0xFF000000) ^ ($state[1] & 0x00FF0000) ^ ($state[2] & 0x0000FF00) ^ ($state[3] & 0x000000FF) ^ $this->w[$this->Nr][0],
-			($state[1] & 0xFF000000) ^ ($state[2] & 0x00FF0000) ^ ($state[3] & 0x0000FF00) ^ ($state[0] & 0x000000FF) ^ $this->w[$this->Nr][1],
-			($state[2] & 0xFF000000) ^ ($state[3] & 0x00FF0000) ^ ($state[0] & 0x0000FF00) ^ ($state[1] & 0x000000FF) ^ $this->w[$this->Nr][2],
-			($state[3] & 0xFF000000) ^ ($state[0] & 0x00FF0000) ^ ($state[1] & 0x0000FF00) ^ ($state[2] & 0x000000FF) ^ $this->w[$this->Nr][3]
-		);
-
-		return pack('N*', $state[0], $state[1], $state[2], $state[3]);
-	}
-
-	/**
-	 * Decrypts a block
-	 *
-	 * Optimized over rijndael's implementation by means of loop unrolling.
-	 *
-	 * @see rijndael::_decrypt_block()
-	 * @access private
-	 * @param String $in
-	 * @return String
-	 */
-	function _decrypt_block($in)
-	{
-		// unpack starts it's indices at 1 - not 0.
-		$state = unpack('N*', $in);
-
-		// addRoundKey and reindex $state
-		$state = array(
-			$state[1] ^ $this->dw[$this->Nr][0],
-			$state[2] ^ $this->dw[$this->Nr][1],
-			$state[3] ^ $this->dw[$this->Nr][2],
-			$state[4] ^ $this->dw[$this->Nr][3]
-		);
-
-		// invShiftRows + invSubBytes + invMixColumns + addRoundKey
-		for ($round = $this->Nr - 1; $round > 0; $round--)
-		{
-			$state = array(
-				$this->dt0[$state[0] & 0xFF000000] ^ $this->dt1[$state[3] & 0x00FF0000] ^ $this->dt2[$state[2] & 0x0000FF00] ^ $this->dt3[$state[1] & 0x000000FF] ^ $this->dw[$round][0],
-				$this->dt0[$state[1] & 0xFF000000] ^ $this->dt1[$state[0] & 0x00FF0000] ^ $this->dt2[$state[3] & 0x0000FF00] ^ $this->dt3[$state[2] & 0x000000FF] ^ $this->dw[$round][1],
-				$this->dt0[$state[2] & 0xFF000000] ^ $this->dt1[$state[1] & 0x00FF0000] ^ $this->dt2[$state[0] & 0x0000FF00] ^ $this->dt3[$state[3] & 0x000000FF] ^ $this->dw[$round][2],
-				$this->dt0[$state[3] & 0xFF000000] ^ $this->dt1[$state[2] & 0x00FF0000] ^ $this->dt2[$state[1] & 0x0000FF00] ^ $this->dt3[$state[0] & 0x000000FF] ^ $this->dw[$round][3]
-			);
-		}
-
-		// invShiftRows + invSubWord + addRoundKey
-		$state = array(
-			$this->_inv_sub_word(($state[0] & 0xFF000000) ^ ($state[3] & 0x00FF0000) ^ ($state[2] & 0x0000FF00) ^ ($state[1] & 0x000000FF)) ^ $this->dw[0][0],
-			$this->_inv_sub_word(($state[1] & 0xFF000000) ^ ($state[0] & 0x00FF0000) ^ ($state[3] & 0x0000FF00) ^ ($state[2] & 0x000000FF)) ^ $this->dw[0][1],
-			$this->_inv_sub_word(($state[2] & 0xFF000000) ^ ($state[1] & 0x00FF0000) ^ ($state[0] & 0x0000FF00) ^ ($state[3] & 0x000000FF)) ^ $this->dw[0][2],
-			$this->_inv_sub_word(($state[3] & 0xFF000000) ^ ($state[2] & 0x00FF0000) ^ ($state[1] & 0x0000FF00) ^ ($state[0] & 0x000000FF)) ^ $this->dw[0][3]
-		);
-
-		return pack('N*', $state[0], $state[1], $state[2], $state[3]);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/libraries/sftp/biginteger.php b/phpBB/includes/libraries/sftp/biginteger.php
deleted file mode 100644
index d9b90dacb8..0000000000
--- a/phpBB/includes/libraries/sftp/biginteger.php
+++ /dev/null
@@ -1,2162 +0,0 @@
-<?php
-/**
-*
-* @package sftp
-* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Code from http://phpseclib.sourceforge.net/
-*
-* Modified by phpBB Group to meet our coding standards
-* and being able to integrate into phpBB
-*
-* Pure-PHP arbitrary precission integer arithmetic library
-*
-* Copyright 2007-2009 TerraFrost <terrafrost@php.net>
-* Copyright 2009+ phpBB
-*
-* @package sftp
-* @author  TerraFrost <terrafrost@php.net>
-*/
-
-/**#@+
- * @access private
- * @see biginteger::_sliding_window()
- */
-/**
- * @see biginteger::_montgomery()
- * @see biginteger::_undo_montgomery()
- */
-define('MATH_BIGINTEGER_MONTGOMERY', 0);
-/**
- * @see biginteger::_barrett()
- */
-define('MATH_BIGINTEGER_BARRETT', 1);
-/**
- * @see biginteger::_mod2()
- */
-define('MATH_BIGINTEGER_POWEROF2', 2);
-/**
- * @see biginteger::_remainder()
- */
-define('MATH_BIGINTEGER_CLASSIC', 3);
-/**
- * @see biginteger::_copy()
- */
-define('MATH_BIGINTEGER_NONE', 4);
-/**#@-*/
-
-/**#@+
- * @access private
- * @see biginteger::_montgomery()
- * @see biginteger::_barrett()
- */
-/**
- * $cache[MATH_BIGINTEGER_VARIABLE] tells us whether or not the cached data is still valid.
- */
-define('MATH_BIGINTEGER_VARIABLE', 0);
-/**
- * $cache[MATH_BIGINTEGER_DATA] contains the cached data.
- */
-define('MATH_BIGINTEGER_DATA', 1);
-/**#@-*/
-
-/**#@+
- * @access private
- * @see biginteger::biginteger()
- */
-/**
- * To use the pure-PHP implementation
- */
-define('MATH_BIGINTEGER_MODE_INTERNAL', 1);
-/**
- * To use the BCMath library
- *
- * (if enabled; otherwise, the internal implementation will be used)
- */
-define('MATH_BIGINTEGER_MODE_BCMATH', 2);
-/**
- * To use the GMP library
- *
- * (if present; otherwise, either the BCMath or the internal implementation will be used)
- */
-define('MATH_BIGINTEGER_MODE_GMP', 3);
-/**#@-*/
-
-/**
- * Pure-PHP arbitrary precision integer arithmetic library. Supports base-2, base-10, base-16, and base-256
- * numbers.
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- * @version 1.0.0RC3
- * @access  public
- * @package biginteger
- */
-class biginteger
-{
-	/**
-	 * Holds the BigInteger's value.
-	 *
-	 * @var Array
-	 * @access private
-	 */
-	var $value;
-
-	/**
-	 * Holds the BigInteger's magnitude.
-	 *
-	 * @var Boolean
-	 * @access private
-	 */
-	var $is_negative = false;
-
-	/**
-	 * Converts base-2, base-10, base-16, and binary strings (eg. base-256) to BigIntegers.
-	 *
-	 * If the second parameter - $base - is negative, then it will be assumed that the number's are encoded using
-	 * two's compliment.  The sole exception to this is -10, which is treated the same as 10 is.
-	 *
-	 * @param optional $x base-10 number or base-$base number if $base set.
-	 * @param optional integer $base
-	 * @return biginteger
-	 * @access public
-	 */
-	function __construct($x = 0, $base = 10)
-	{
-		if ( !defined('MATH_BIGINTEGER_MODE') )
-		{
-			switch (true)
-			{
-				case extension_loaded('gmp'):
-					define('MATH_BIGINTEGER_MODE', MATH_BIGINTEGER_MODE_GMP);
-					break;
-				case extension_loaded('bcmath'):
-					define('MATH_BIGINTEGER_MODE', MATH_BIGINTEGER_MODE_BCMATH);
-					break;
-				default:
-					define('MATH_BIGINTEGER_MODE', MATH_BIGINTEGER_MODE_INTERNAL);
-			}
-		}
-
-		switch ( MATH_BIGINTEGER_MODE )
-		{
-			case MATH_BIGINTEGER_MODE_GMP:
-				$this->value = gmp_init(0);
-				break;
-			case MATH_BIGINTEGER_MODE_BCMATH:
-				$this->value = '0';
-				break;
-			default:
-				$this->value = array();
-		}
-
-		if ($x === 0)
-		{
-			return;
-		}
-
-		switch ($base)
-		{
-			case -256:
-				if (ord($x[0]) & 0x80)
-				{
-					$x = ~$x;
-					$this->is_negative = true;
-				}
-			case  256:
-				switch ( MATH_BIGINTEGER_MODE )
-				{
-					case MATH_BIGINTEGER_MODE_GMP:
-						$temp = unpack('H*hex', $x);
-						$sign = $this->is_negative ? '-' : '';
-						$this->value = gmp_init($sign . '0x' . $temp['hex']);
-						break;
-					case MATH_BIGINTEGER_MODE_BCMATH:
-						// round $len to the nearest 4 (thanks, DavidMJ!)
-						$len = (strlen($x) + 3) & 0xFFFFFFFC;
-
-						$x = str_pad($x, $len, chr(0), STR_PAD_LEFT);
-
-						for ($i = 0; $i < $len; $i+= 4) {
-							$this->value = bcmul($this->value, '4294967296'); // 4294967296 == 2**32
-							$this->value = bcadd($this->value, 0x1000000 * ord($x[$i]) + ((ord($x[$i + 1]) << 16) | (ord($x[$i + 2]) << 8) | ord($x[$i + 3])));
-						}
-
-						if ($this->is_negative) {
-							$this->value = '-' . $this->value;
-						}
-
-						break;
-					// converts a base-2**8 (big endian / msb) number to base-2**26 (little endian / lsb)
-					case MATH_BIGINTEGER_MODE_INTERNAL:
-						while (strlen($x))
-						{
-							$this->value[] = $this->_bytes2int($this->_base256_rshift($x, 26));
-						}
-				}
-
-				if ($this->is_negative)
-				{
-					if (MATH_BIGINTEGER_MODE != MATH_BIGINTEGER_MODE_INTERNAL)
-					{
-						$this->is_negative = false;
-					}
-					$temp = $this->add(new biginteger('-1'));
-					$this->value = $temp->value;
-				}
-				break;
-			case  16:
-			case -16:
-				if ($base > 0 && $x[0] == '-')
-				{
-					$this->is_negative = true;
-					$x = substr($x, 1);
-				}
-
-				$x = preg_replace('#^(?:0x)?([A-Fa-f0-9]*).*#', '$1', $x);
-
-				$is_negative = false;
-				if ($base < 0 && hexdec($x[0]) >= 8)
-				{
-					$this->is_negative = $is_negative = true;
-					$x = bin2hex(~pack('H*', $x));
-				}
-
-				switch ( MATH_BIGINTEGER_MODE )
-				{
-					case MATH_BIGINTEGER_MODE_GMP:
-						$temp = $this->is_negative ? '-0x' . $x : '0x' . $x;
-						$this->value = gmp_init($temp);
-						$this->is_negative = false;
-						break;
-					case MATH_BIGINTEGER_MODE_BCMATH:
-						$x = ( strlen($x) & 1 ) ? '0' . $x : $x;
-						$temp = new biginteger(pack('H*', $x), 256);
-						$this->value = $this->is_negative ? '-' . $temp->value : $temp->value;
-						$this->is_negative = false;
-						break;
-					case MATH_BIGINTEGER_MODE_INTERNAL:
-						$x = ( strlen($x) & 1 ) ? '0' . $x : $x;
-						$temp = new biginteger(pack('H*', $x), 256);
-						$this->value = $temp->value;
-				}
-
-				if ($is_negative)
-				{
-					$temp = $this->add(new biginteger('-1'));
-					$this->value = $temp->value;
-				}
-				break;
-			case  10:
-			case -10:
-				$x = preg_replace('#^(-?[0-9]*).*#', '$1', $x);
-
-				switch ( MATH_BIGINTEGER_MODE )
-				{
-					case MATH_BIGINTEGER_MODE_GMP:
-						$this->value = gmp_init($x);
-						break;
-					case MATH_BIGINTEGER_MODE_BCMATH:
-						// explicitly casting $x to a string is necessary, here, since doing $x[0] on -1 yields different
-						// results then doing it on '-1' does (modInverse does $x[0])
-						$this->value = (string) $x;
-						break;
-					case MATH_BIGINTEGER_MODE_INTERNAL:
-						$temp = new biginteger();
-
-						// array(10000000) is 10**7 in base-2**26.  10**7 is the closest to 2**26 we can get without passing it.
-						$multiplier = new biginteger();
-						$multiplier->value = array(10000000);
-
-						if ($x[0] == '-')
-						{
-							$this->is_negative = true;
-							$x = substr($x, 1);
-						}
-
-						$x = str_pad($x, strlen($x) + (6 * strlen($x)) % 7, 0, STR_PAD_LEFT);
-
-						while (strlen($x))
-						{
-							$temp = $temp->multiply($multiplier);
-							$temp = $temp->add(new biginteger($this->_int2bytes(substr($x, 0, 7)), 256));
-							$x = substr($x, 7);
-						}
-
-						$this->value = $temp->value;
-				}
-				break;
-			case  2: // base-2 support originally implemented by Lluis Pamies - thanks!
-			case -2:
-				if ($base > 0 && $x[0] == '-')
-				{
-					$this->is_negative = true;
-					$x = substr($x, 1);
-				}
-
-				$x = preg_replace('#^([01]*).*#', '$1', $x);
-				$x = str_pad($x, strlen($x) + (3 * strlen($x)) % 4, 0, STR_PAD_LEFT);
-
-				$str = '0x';
-				while (strlen($x))
-				{
-					$part = substr($x, 0, 4);
-					$str.= dechex(bindec($part));
-					$x = substr($x, 4);
-				}
-
-				if ($this->is_negative)
-				{
-					$str = '-' . $str;
-				}
-
-				$temp = new biginteger($str, 8 * $base); // ie. either -16 or +16
-				$this->value = $temp->value;
-				$this->is_negative = $temp->is_negative;
-
-				break;
-			default:
-				// base not supported, so we'll let $this == 0
-		}
-	}
-
-	/**
-	 * Converts a BigInteger to a byte string (eg. base-256).
-	 *
-	 * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
-	 * saved as two's compliment.
-	 *
-	 * @param Boolean $twos_compliment
-	 * @return String
-	 * @access public
-	 * @internal Converts a base-2**26 number to base-2**8
-	 */
-	function to_bytes($twos_compliment = false)
-	{
-		if ($twos_compliment)
-		{
-			$comparison = $this->compare(new biginteger());
-			if ($comparison == 0)
-			{
-				return '';
-			}
-
-			$temp = $comparison < 0 ? $this->add(new biginteger(1)) : $this->_copy();
-			$bytes = $temp->to_bytes();
-
-			if (empty($bytes)) // eg. if the number we're trying to convert is -1
-			{
-				$bytes = chr(0);
-			}
-
-			if (ord($bytes[0]) & 0x80)
-			{
-				$bytes = chr(0) . $bytes;
-			}
-
-			return $comparison < 0 ? ~$bytes : $bytes;
-		}
-
-		switch ( MATH_BIGINTEGER_MODE )
-		{
-			case MATH_BIGINTEGER_MODE_GMP:
-				if (gmp_cmp($this->value, gmp_init(0)) == 0)
-				{
-					return '';
-				}
-
-				$temp = gmp_strval(gmp_abs($this->value), 16);
-				$temp = ( strlen($temp) & 1 ) ? '0' . $temp : $temp;
-
-				return ltrim(pack('H*', $temp), chr(0));
-			case MATH_BIGINTEGER_MODE_BCMATH:
-				if ($this->value === '0')
-				{
-					return '';
-				}
-
-				$value = '';
-				$current = $this->value;
-
-				if ($current[0] == '-')
-				{
-					$current = substr($current, 1);
-				}
-
-				// we don't do four bytes at a time because then numbers larger than 1<<31 would be negative
-				// two's complimented numbers, which would break chr.
-				while (bccomp($current, '0') > 0)
-				{
-					$temp = bcmod($current, 0x1000000);
-					$value = chr($temp >> 16) . chr($temp >> 8) . chr($temp) . $value;
-					$current = bcdiv($current, 0x1000000);
-				}
-
-				return ltrim($value, chr(0));
-		}
-
-		if (!count($this->value))
-		{
-			return '';
-		}
-
-		$result = $this->_int2bytes($this->value[count($this->value) - 1]);
-
-		$temp = $this->_copy();
-
-		for ($i = count($temp->value) - 2; $i >= 0; $i--)
-		{
-			$temp->_base256_lshift($result, 26);
-			$result = $result | str_pad($temp->_int2bytes($temp->value[$i]), strlen($result), chr(0), STR_PAD_LEFT);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Converts a BigInteger to a base-10 number.
-	 *
-	 * @return String
-	 * @access public
-	 * @internal Converts a base-2**26 number to base-10**7 (which is pretty much base-10)
-	 */
-	function to_string()
-	{
-		switch ( MATH_BIGINTEGER_MODE )
-		{
-			case MATH_BIGINTEGER_MODE_GMP:
-				return gmp_strval($this->value);
-			case MATH_BIGINTEGER_MODE_BCMATH:
-				if ($this->value === '0')
-				{
-					return '0';
-				}
-
-				return ltrim($this->value, '0');
-		}
-
-		if (!count($this->value))
-		{
-			return '0';
-		}
-
-		$temp = $this->_copy();
-		$temp->is_negative = false;
-
-		$divisor = new biginteger();
-		$divisor->value = array(10000000); // eg. 10**7
-		while (count($temp->value))
-		{
-			list($temp, $mod) = $temp->divide($divisor);
-			$result = str_pad($this->_bytes2int($mod->to_bytes()), 7, '0', STR_PAD_LEFT) . $result;
-		}
-		$result = ltrim($result, '0');
-
-		if ($this->is_negative)
-		{
-			$result = '-' . $result;
-		}
-
-		return $result;
-	}
-
-	/**
-	 *  __toString() magic method
-	 *
-	 * Will be called, automatically, if you're supporting just PHP5.  If you're supporting PHP4, you'll need to call
-	 * toString().
-	 *
-	 * @access public
-	 * @internal Implemented per a suggestion by Techie-Michael - thanks!
-	 */
-	function __toString()
-	{
-		return $this->to_string();
-	}
-
-	/**
-	 * Adds two BigIntegers.
-	 *
-	 * @param biginteger $y
-	 * @return biginteger
-	 * @access public
-	 * @internal Performs base-2**52 addition
-	 */
-	function add($y)
-	{
-		switch ( MATH_BIGINTEGER_MODE )
-		{
-			case MATH_BIGINTEGER_MODE_GMP:
-				$temp = new biginteger();
-				$temp->value = gmp_add($this->value, $y->value);
-
-				return $temp;
-			case MATH_BIGINTEGER_MODE_BCMATH:
-				$temp = new biginteger();
-				$temp->value = bcadd($this->value, $y->value);
-
-				return $temp;
-		}
-
-		// subtract, if appropriate
-		if ( $this->is_negative != $y->is_negative )
-		{
-			// is $y the negative number?
-			$y_negative = $this->compare($y) > 0;
-
-			$temp = $this->_copy();
-			$y = $y->_copy();
-			$temp->is_negative = $y->is_negative = false;
-
-			$diff = $temp->compare($y);
-			if ( !$diff )
-			{
-				return new biginteger();
-			}
-
-			$temp = $temp->subtract($y);
-
-			$temp->is_negative = ($diff > 0) ? !$y_negative : $y_negative;
-
-			return $temp;
-		}
-
-		$result = new biginteger();
-		$carry = 0;
-
-		$size = max(count($this->value), count($y->value));
-		$size+= $size & 1; // rounds $size to the nearest 2.
-
-		$x = array_pad($this->value, $size,0);
-		$y = array_pad($y->value, $size, 0);
-
-		for ($i = 0; $i < $size - 1; $i+=2)
-		{
-			$sum = $x[$i + 1] * 0x4000000 + $x[$i] + $y[$i + 1] * 0x4000000 + $y[$i] + $carry;
-			$carry = $sum >= 4503599627370496; // eg. floor($sum / 2**52); only possible values (in any base) are 0 and 1
-			$sum = $carry ? $sum - 4503599627370496 : $sum;
-
-			$temp = floor($sum / 0x4000000);
-
-			$result->value[] = $sum - 0x4000000 * $temp; // eg. a faster alternative to fmod($sum, 0x4000000)
-			$result->value[] = $temp;
-		}
-
-		if ($carry)
-		{
-			$result->value[] = $carry;
-		}
-
-		$result->is_negative = $this->is_negative;
-
-		return $result->_normalize();
-	}
-
-	/**
-	 * Subtracts two BigIntegers.
-	 *
-	 * @param biginteger $y
-	 * @return biginteger
-	 * @access public
-	 * @internal Performs base-2**52 subtraction
-	 */
-	function subtract($y)
-	{
-		switch ( MATH_BIGINTEGER_MODE )
-		{
-			case MATH_BIGINTEGER_MODE_GMP:
-				$temp = new biginteger();
-				$temp->value = gmp_sub($this->value, $y->value);
-
-				return $temp;
-			case MATH_BIGINTEGER_MODE_BCMATH:
-				$temp = new biginteger();
-				$temp->value = bcsub($this->value, $y->value);
-
-				return $temp;
-		}
-
-		// add, if appropriate
-		if ( $this->is_negative != $y->is_negative )
-		{
-			$is_negative = $y->compare($this) > 0;
-
-			$temp = $this->_copy();
-			$y = $y->_copy();
-			$temp->is_negative = $y->is_negative = false;
-
-			$temp = $temp->add($y);
-
-			$temp->is_negative = $is_negative;
-
-			return $temp;
-		}
-
-		$diff = $this->compare($y);
-
-		if ( !$diff )
-		{
-			return new biginteger();
-		}
-
-		// switch $this and $y around, if appropriate.
-		if ( (!$this->is_negative && $diff < 0) || ($this->is_negative && $diff > 0) )
-		{
-			$is_negative = $y->is_negative;
-
-			$temp = $this->_copy();
-			$y = $y->_copy();
-			$temp->is_negative = $y->is_negative = false;
-
-			$temp = $y->subtract($temp);
-			$temp->is_negative = !$is_negative;
-
-			return $temp;
-		}
-
-		$result = new biginteger();
-		$carry = 0;
-
-		$size = max(count($this->value), count($y->value));
-		$size+= $size % 2;
-
-		$x = array_pad($this->value, $size, 0);
-		$y = array_pad($y->value, $size, 0);
-
-		for ($i = 0; $i < $size - 1; $i+=2)
-		{
-			$sum = $x[$i + 1] * 0x4000000 + $x[$i] - $y[$i + 1] * 0x4000000 - $y[$i] + $carry;
-			$carry = $sum < 0 ? -1 : 0; // eg. floor($sum / 2**52); only possible values (in any base) are 0 and 1
-			$sum = $carry ? $sum + 4503599627370496 : $sum;
-
-			$temp = floor($sum / 0x4000000);
-
-			$result->value[] = $sum - 0x4000000 * $temp;
-			$result->value[] = $temp;
-		}
-
-		// $carry shouldn't be anything other than zero, at this point, since we already made sure that $this
-		// was bigger than $y.
-
-		$result->is_negative = $this->is_negative;
-
-		return $result->_normalize();
-	}
-
-	/**
-	 * Multiplies two BigIntegers
-	 *
-	 * @param biginteger $x
-	 * @return biginteger
-	 * @access public
-	 * @internal Modeled after 'multiply' in MutableBigInteger.java.
-	 */
-	function multiply($x)
-	{
-		switch ( MATH_BIGINTEGER_MODE )
-		{
-			case MATH_BIGINTEGER_MODE_GMP:
-				$temp = new biginteger();
-				$temp->value = gmp_mul($this->value, $x->value);
-
-				return $temp;
-			case MATH_BIGINTEGER_MODE_BCMATH:
-				$temp = new biginteger();
-				$temp->value = bcmul($this->value, $x->value);
-
-				return $temp;
-		}
-
-		if ( !$this->compare($x) )
-		{
-			return $this->_square();
-		}
-
-		$this_length = count($this->value);
-		$x_length = count($x->value);
-
-		if ( !$this_length || !$x_length ) // a 0 is being multiplied
-		{
-			return new biginteger();
-		}
-
-		$product = new biginteger();
-		$product->value = $this->_array_repeat(0, $this_length + $x_length);
-
-		// the following for loop could be removed if the for loop following it
-		// (the one with nested for loops) initially set $i to 0, but
-		// doing so would also make the result in one set of unnecessary adds,
-		// since on the outermost loops first pass, $product->value[$k] is going
-		// to always be 0
-
-		$carry = 0;
-		$i = 0;
-
-		for ($j = 0, $k = $i; $j < $this_length; $j++, $k++)
-		{
-			$temp = $product->value[$k] + $this->value[$j] * $x->value[$i] + $carry;
-			$carry = floor($temp / 0x4000000);
-			$product->value[$k] = $temp - 0x4000000 * $carry;
-		}
-
-		$product->value[$k] = $carry;
-
-		// the above for loop is what the previous comment was talking about.  the
-		// following for loop is the "one with nested for loops"
-
-		for ($i = 1; $i < $x_length; $i++)
-		{
-			$carry = 0;
-
-			for ($j = 0, $k = $i; $j < $this_length; $j++, $k++)
-			{
-				$temp = $product->value[$k] + $this->value[$j] * $x->value[$i] + $carry;
-				$carry = floor($temp / 0x4000000);
-				$product->value[$k] = $temp - 0x4000000 * $carry;
-			}
-
-			$product->value[$k] = $carry;
-		}
-
-		$product->is_negative = $this->is_negative != $x->is_negative;
-
-		return $product->_normalize();
-	}
-
-	/**
-	 * Squares a BigInteger
-	 *
-	 * Squaring can be done faster than multiplying a number by itself can be.  See
-	 * {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=7 HAC 14.2.4} /
-	 * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=141 MPM 5.3} for more information.
-	 *
-	 * @return biginteger
-	 * @access private
-	 */
-	function _square()
-	{
-		if ( empty($this->value) )
-		{
-			return new biginteger();
-		}
-
-		$max_index = count($this->value) - 1;
-
-		$square = new biginteger();
-		$square->value = $this->_array_repeat(0, 2 * $max_index);
-
-		for ($i = 0; $i <= $max_index; $i++)
-		{
-			$temp = $square->value[2 * $i] + $this->value[$i] * $this->value[$i];
-			$carry = floor($temp / 0x4000000);
-			$square->value[2 * $i] = $temp - 0x4000000 * $carry;
-
-			// note how we start from $i+1 instead of 0 as we do in multiplication.
-			for ($j = $i + 1; $j <= $max_index; $j++)
-			{
-				$temp = $square->value[$i + $j] + 2 * $this->value[$j] * $this->value[$i] + $carry;
-				$carry = floor($temp / 0x4000000);
-				$square->value[$i + $j] = $temp - 0x4000000 * $carry;
-			}
-
-			// the following line can yield values larger 2**15.  at this point, PHP should switch
-			// over to floats.
-			$square->value[$i + $max_index + 1] = $carry;
-		}
-
-		return $square->_normalize();
-	}
-
-	/**
-	 * Divides two BigIntegers.
-	 *
-	 * Returns an array whose first element contains the quotient and whose second element contains the
-	 * "common residue".  If the remainder would be positive, the "common residue" and the remainder are the
-	 * same.  If the remainder would be negative, the "common residue" is equal to the sum of the remainder
-	 * and the divisor (basically, the "common residue" is the first positive modulo).
-	 *
-	 * @param biginteger $y
-	 * @return Array
-	 * @access public
-	 * @internal This function is based off of {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=9 HAC 14.20}
-	 *	with a slight variation due to the fact that this script, initially, did not support negative numbers.  Now,
-	 *	it does, but I don't want to change that which already works.
-	 */
-	function divide($y)
-	{
-		switch ( MATH_BIGINTEGER_MODE )
-		{
-			case MATH_BIGINTEGER_MODE_GMP:
-				$quotient = new biginteger();
-				$remainder = new biginteger();
-
-				list($quotient->value, $remainder->value) = gmp_div_qr($this->value, $y->value);
-
-				if (gmp_sign($remainder->value) < 0)
-				{
-					$remainder->value = gmp_add($remainder->value, gmp_abs($y->value));
-				}
-
-				return array($quotient, $remainder);
-			case MATH_BIGINTEGER_MODE_BCMATH:
-				$quotient = new biginteger();
-				$remainder = new biginteger();
-
-				$quotient->value = bcdiv($this->value, $y->value);
-				$remainder->value = bcmod($this->value, $y->value);
-
-				if ($remainder->value[0] == '-')
-				{
-					$remainder->value = bcadd($remainder->value, $y->value[0] == '-' ? substr($y->value, 1) : $y->value);
-				}
-
-				return array($quotient, $remainder);
-		}
-
-		$x = $this->_copy();
-		$y = $y->_copy();
-
-		$x_sign = $x->is_negative;
-		$y_sign = $y->is_negative;
-
-		$x->is_negative = $y->is_negative = false;
-
-		$diff = $x->compare($y);
-
-		if ( !$diff )
-		{
-			$temp = new biginteger();
-			$temp->value = array(1);
-			$temp->is_negative = $x_sign != $y_sign;
-			return array($temp, new biginteger());
-		}
-
-		if ( $diff < 0 )
-		{
-			// if $x is negative, "add" $y.
-			if ( $x_sign )
-			{
-				$x = $y->subtract($x);
-			}
-			return array(new biginteger(), $x);
-		}
-
-		// normalize $x and $y as described in HAC 14.23 / 14.24
-		// (incidently, i haven't been able to find a definitive example showing that this
-		// results in worth-while speedup, but whatever)
-		$msb = $y->value[count($y->value) - 1];
-		for ($shift = 0; !($msb & 0x2000000); $shift++)
-		{
-			$msb <<= 1;
-		}
-		$x->_lshift($shift);
-		$y->_lshift($shift);
-
-		$x_max = count($x->value) - 1;
-		$y_max = count($y->value) - 1;
-
-		$quotient = new biginteger();
-		$quotient->value = $this->_array_repeat(0, $x_max - $y_max + 1);
-
-		// $temp = $y << ($x_max - $y_max-1) in base 2**26
-		$temp = new biginteger();
-		$temp->value = array_merge($this->_array_repeat(0, $x_max - $y_max), $y->value);
-
-		while ( $x->compare($temp) >= 0 )
-		{
-			// calculate the "common residue"
-			$quotient->value[$x_max - $y_max]++;
-			$x = $x->subtract($temp);
-			$x_max = count($x->value) - 1;
-		}
-
-		for ($i = $x_max; $i >= $y_max + 1; $i--)
-		{
-			$x_value = array(
-				$x->value[$i],
-				( $i > 0 ) ? $x->value[$i - 1] : 0,
-				( $i - 1 > 0 ) ? $x->value[$i - 2] : 0
-			);
-			$y_value = array(
-				$y->value[$y_max],
-				( $y_max > 0 ) ? $y_max - 1 : 0
-			);
-
-
-			$q_index = $i - $y_max - 1;
-			if ($x_value[0] == $y_value[0])
-			{
-				$quotient->value[$q_index] = 0x3FFFFFF;
-			}
-			else
-			{
-				$quotient->value[$q_index] = floor(
-					($x_value[0] * 0x4000000 + $x_value[1])
-					/
-					$y_value[0]
-				);
-			}
-
-			$temp = new biginteger();
-			$temp->value = array($y_value[1], $y_value[0]);
-
-			$lhs = new biginteger();
-			$lhs->value = array($quotient->value[$q_index]);
-			$lhs = $lhs->multiply($temp);
-
-			$rhs = new biginteger();
-			$rhs->value = array($x_value[2], $x_value[1], $x_value[0]);
-			
-			while ( $lhs->compare($rhs) > 0 )
-			{
-				$quotient->value[$q_index]--;
-
-				$lhs = new biginteger();
-				$lhs->value = array($quotient->value[$q_index]);
-				$lhs = $lhs->multiply($temp);
-			}
-
-			$corrector = new biginteger();
-			$temp = new biginteger();
-			$corrector->value = $temp->value = $this->_array_repeat(0, $q_index);
-			$temp->value[] = $quotient->value[$q_index];
-
-			$temp = $temp->multiply($y);
-
-			if ( $x->compare($temp) < 0 )
-			{
-				$corrector->value[] = 1;
-				$x = $x->add($corrector->multiply($y));
-				$quotient->value[$q_index]--;
-			}
-
-			$x = $x->subtract($temp);
-			$x_max = count($x->value) - 1;
-		}
-
-		// unnormalize the remainder
-		$x->_rshift($shift);
-
-		$quotient->is_negative = $x_sign != $y_sign;
-
-		// calculate the "common residue", if appropriate
-		if ( $x_sign )
-		{
-			$y->_rshift($shift);
-			$x = $y->subtract($x);
-		}
-
-		return array($quotient->_normalize(), $x);
-	}
-
-	/**
-	 * Performs modular exponentiation.
-	 *
-	 * @param biginteger $e
-	 * @param biginteger $n
-	 * @return biginteger
-	 * @access public
-	 * @internal The most naive approach to modular exponentiation has very unreasonable requirements, and
-	 *	and although the approach involving repeated squaring does vastly better, it, too, is impractical
-	 *	for our purposes.  The reason being that division - by far the most complicated and time-consuming
-	 *	of the basic operations (eg. +,-,*,/) - occurs multiple times within it.
-	 *
-	 *	Modular reductions resolve this issue.  Although an individual modular reduction takes more time
-	 *	then an individual division, when performed in succession (with the same modulo), they're a lot faster.
-	 *
-	 *	The two most commonly used modular reductions are Barrett and Montgomery reduction.  Montgomery reduction,
-	 *	although faster, only works when the gcd of the modulo and of the base being used is 1.  In RSA, when the
-	 *	base is a power of two, the modulo - a product of two primes - is always going to have a gcd of 1 (because
-	 *	the product of two odd numbers is odd), but what about when RSA isn't used?
-	 *
-	 *	In contrast, Barrett reduction has no such constraint.  As such, some bigint implementations perform a
-	 *	Barrett reduction after every operation in the modpow function.  Others perform Barrett reductions when the
-	 *	modulo is even and Montgomery reductions when the modulo is odd.  BigInteger.java's modPow method, however,
-	 *	uses a trick involving the Chinese Remainder Theorem to factor the even modulo into two numbers - one odd and
-	 *	the other, a power of two - and recombine them, later.  This is the method that this modPow function uses.
-	 *	{@link http://islab.oregonstate.edu/papers/j34monex.pdf Montgomery Reduction with Even Modulus} elaborates.
-	 */
-	function mod_pow($e, $n)
-	{
-		$n = $n->abs();
-		if ($e->compare(new biginteger()) < 0)
-		{
-			$e = $e->abs();
-
-			$temp = $this->modInverse($n);
-			if ($temp === false)
-			{
-				return false;
-			}
-
-			return $temp->modPow($e, $n);
-		}
-
-		switch ( MATH_BIGINTEGER_MODE )
-		{
-			case MATH_BIGINTEGER_MODE_GMP:
-				$temp = new biginteger();
-				$temp->value = gmp_powm($this->value, $e->value, $n->value);
-
-				return $temp;
-			case MATH_BIGINTEGER_MODE_BCMATH:
-				$temp = new biginteger();
-				$temp->value = bcpowmod($this->value, $e->value, $n->value);
-
-				return $temp;
-		}
-
-		if ( empty($e->value) )
-		{
-			$temp = new biginteger();
-			$temp->value = array(1);
-			return $temp;
-		}
-
-		if ( $e->value == array(1) )
-		{
-			list(, $temp) = $this->divide($n);
-			return $temp;
-		}
-
-		if ( $e->value == array(2) )
-		{
-			$temp = $this->_square();
-			list(, $temp) = $temp->divide($n);
-			return $temp;
-		}
-
-		// is the modulo odd?
-		if ( $n->value[0] & 1 )
-		{
-			return $this->_slidingWindow($e, $n, MATH_BIGINTEGER_MONTGOMERY);
-		}
-		// if it's not, it's even
-
-		// find the lowest set bit (eg. the max pow of 2 that divides $n)
-		for ($i = 0; $i < count($n->value); $i++)
-		{
-			if ( $n->value[$i] )
-			{
-				$temp = decbin($n->value[$i]);
-				$j = strlen($temp) - strrpos($temp, '1') - 1;
-				$j+= 26 * $i;
-				break;
-			}
-		}
-		// at this point, 2^$j * $n/(2^$j) == $n
-
-		$mod1 = $n->_copy();
-		$mod1->_rshift($j);
-		$mod2 = new biginteger();
-		$mod2->value = array(1);
-		$mod2->_lshift($j);
-
-		$part1 = ( $mod1->value != array(1) ) ? $this->_slidingWindow($e, $mod1, MATH_BIGINTEGER_MONTGOMERY) : new biginteger();
-		$part2 = $this->_sliding_window($e, $mod2, MATH_BIGINTEGER_POWEROF2);
-
-		$y1 = $mod2->mod_inverse($mod1);
-		$y2 = $mod1->mod_inverse($mod2);
-
-		$result = $part1->multiply($mod2);
-		$result = $result->multiply($y1);
-
-		$temp = $part2->multiply($mod1);
-		$temp = $temp->multiply($y2);
-
-		$result = $result->add($temp);
-		list(, $result) = $result->divide($n);
-
-		return $result;
-	}
-
-	/**
-	 * Sliding Window k-ary Modular Exponentiation
-	 *
-	 * Based on {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=27 HAC 14.85} /
-	 * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=210 MPM 7.7}.  In a departure from those algorithims,
-	 * however, this function performs a modular reduction after every multiplication and squaring operation.
-	 * As such, this function has the same preconditions that the reductions being used do.
-	 *
-	 * @param biginteger $e
-	 * @param biginteger $n
-	 * @param Integer $mode
-	 * @return biginteger
-	 * @access private
-	 */
-	function _sliding_window($e, $n, $mode)
-	{
-		static $window_ranges = array(7, 25, 81, 241, 673, 1793); // from BigInteger.java's oddModPow function
-		//static $window_ranges = array(0, 7, 36, 140, 450, 1303, 3529); // from MPM 7.3.1
-
-		$e_length = count($e->value) - 1;
-		$e_bits = decbin($e->value[$e_length]);
-		for ($i = $e_length - 1; $i >= 0; $i--)
-		{
-			$e_bits.= str_pad(decbin($e->value[$i]), 26, '0', STR_PAD_LEFT);
-		}
-		$e_length = strlen($e_bits);
-
-		// calculate the appropriate window size.
-		// $window_size == 3 if $window_ranges is between 25 and 81, for example.
-		for ($i = 0, $window_size = 1; $e_length > $window_ranges[$i] && $i < count($window_ranges); $window_size++, $i++);
-
-		switch ($mode)
-		{
-			case MATH_BIGINTEGER_MONTGOMERY:
-				$reduce = '_montgomery';
-				$undo = '_undo_montgomery';
-				break;
-			case MATH_BIGINTEGER_BARRETT:
-				$reduce = '_barrett';
-				$undo = '_barrett';
-				break;
-			case MATH_BIGINTEGER_POWEROF2:
-				$reduce = '_mod2';
-				$undo = '_mod2';
-				break;
-			case MATH_BIGINTEGER_CLASSIC:
-				$reduce = '_remainder';
-				$undo = '_remainder';
-				break;
-			case MATH_BIGINTEGER_NONE:
-				// ie. do no modular reduction.  useful if you want to just do pow as opposed to modPow.
-				$reduce = '_copy';
-				$undo = '_copy';
-				break;
-			default:
-				// an invalid $mode was provided
-		}
-
-		// precompute $this^0 through $this^$window_size
-		$powers = array();
-		$powers[1] = $this->$undo($n);
-		$powers[2] = $powers[1]->_square();
-		$powers[2] = $powers[2]->$reduce($n);
-
-		// we do every other number since substr($e_bits, $i, $j+1) (see below) is supposed to end
-		// in a 1.  ie. it's supposed to be odd.
-		$temp = 1 << ($window_size - 1);
-		for ($i = 1; $i < $temp; $i++)
-		{
-			$powers[2 * $i + 1] = $powers[2 * $i - 1]->multiply($powers[2]);
-			$powers[2 * $i + 1] = $powers[2 * $i + 1]->$reduce($n);
-		}
-
-		$result = new biginteger();
-		$result->value = array(1);
-		$result = $result->$undo($n);
-
-		for ($i = 0; $i < $e_length; )
-		{
-			if ( !$e_bits[$i] )
-			{
-				$result = $result->_square();
-				$result = $result->$reduce($n);
-				$i++;
-			}
-			else
-			{
-				for ($j = $window_size - 1; $j >= 0; $j--)
-				{
-					if ( $e_bits[$i + $j] )
-					{
-						break;
-					}
-				}
-
-				for ($k = 0; $k <= $j; $k++) // eg. the length of substr($e_bits, $i, $j+1)
-				{
-					$result = $result->_square();
-					$result = $result->$reduce($n);
-				}
-
-				$result = $result->multiply($powers[bindec(substr($e_bits, $i, $j + 1))]);
-				$result = $result->$reduce($n);
-
-				$i+=$j + 1;
-			}
-		}
-
-		$result = $result->$reduce($n);
-		return $result->_normalize();
-	}
-
-	/**
-	 * Remainder
-	 *
-	 * A wrapper for the divide function.
-	 *
-	 * @see divide()
-	 * @see _slidingWindow()
-	 * @access private
-	 * @param biginteger
-	 * @return biginteger
-	 */
-	function _remainder($n)
-	{
-		list(, $temp) = $this->divide($n);
-		return $temp;
-	}
-
-	/**
-	 * Modulos for Powers of Two
-	 *
-	 * Calculates $x%$n, where $n = 2**$e, for some $e.  Since this is basically the same as doing $x & ($n-1),
-	 * we'll just use this function as a wrapper for doing that.
-	 *
-	 * @see _slidingWindow()
-	 * @access private
-	 * @param biginteger
-	 * @return biginteger
-	 */
-	function _mod2($n)
-	{
-		$temp = new biginteger();
-		$temp->value = array(1);
-		return $this->bitwise_and($n->subtract($temp));
-	}
-
-	/**
-	 * Barrett Modular Reduction
-	 *
-	 * See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=14 HAC 14.3.3} /
-	 * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=165 MPM 6.2.5} for more information.  Modified slightly,
-	 * so as not to require negative numbers (initially, this script didn't support negative numbers).
-	 *
-	 * @see _slidingWindow()
-	 * @access private
-	 * @param biginteger
-	 * @return biginteger
-	 */
-	function _barrett($n)
-	{
-		static $cache;
-
-		$n_length = count($n->value);
-
-		if ( !isset($cache[MATH_BIGINTEGER_VARIABLE]) || $n->compare($cache[MATH_BIGINTEGER_VARIABLE]) )
-		{
-			$cache[MATH_BIGINTEGER_VARIABLE] = $n;
-			$temp = new biginteger();
-			$temp->value = $this->_array_repeat(0, 2 * $n_length);
-			$temp->value[] = 1;
-			list($cache[MATH_BIGINTEGER_DATA], ) = $temp->divide($n);
-		}
-
-		$temp = new biginteger();
-		$temp->value = array_slice($this->value, $n_length - 1);
-		$temp = $temp->multiply($cache[MATH_BIGINTEGER_DATA]);
-		$temp->value = array_slice($temp->value, $n_length + 1);
-
-		$result = new biginteger();
-		$result->value = array_slice($this->value, 0, $n_length + 1);
-		$temp = $temp->multiply($n);
-		$temp->value = array_slice($temp->value, 0, $n_length + 1);
-
-		if ($result->compare($temp) < 0)
-		{
-			$corrector = new biginteger();
-			$corrector->value = $this->_array_repeat(0, $n_length + 1);
-			$corrector->value[] = 1;
-			$result = $result->add($corrector);
-		}
-
-		$result = $result->subtract($temp);
-		while ($result->compare($n) > 0)
-		{
-			$result = $result->subtract($n);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Montgomery Modular Reduction
-	 *
-	 * ($this->_montgomery($n))->_undoMontgomery($n) yields $x%$n.
-	 * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=170 MPM 6.3} provides insights on how this can be
-	 * improved upon (basically, by using the comba method).  gcd($n, 2) must be equal to one for this function
-	 * to work correctly.
-	 *
-	 * @see _undoMontgomery()
-	 * @see _slidingWindow()
-	 * @access private
-	 * @param biginteger
-	 * @return biginteger
-	 */
-	function _montgomery($n)
-	{
-		static $cache;
-
-		if ( !isset($cache[MATH_BIGINTEGER_VARIABLE]) || $n->compare($cache[MATH_BIGINTEGER_VARIABLE]) )
-		{
-			$cache[MATH_BIGINTEGER_VARIABLE] = $n;
-			$cache[MATH_BIGINTEGER_DATA] = $n->_mod_inverse67108864();
-		}
-
-		$result = $this->_copy();
-
-		$n_length = count($n->value);
-
-		for ($i = 0; $i < $n_length; $i++)
-		{
-			$temp = new biginteger();
-			$temp->value = array(
-				($result->value[$i] * $cache[MATH_BIGINTEGER_DATA]) & 0x3FFFFFF
-			);
-			$temp = $temp->multiply($n);
-			$temp->value = array_merge($this->_array_repeat(0, $i), $temp->value);
-			$result = $result->add($temp);
-		}
-
-		$result->value = array_slice($result->value, $n_length);
-
-		if ($result->compare($n) >= 0)
-		{
-			$result = $result->subtract($n);
-		}
-
-		return $result->_normalize();
-	}
-
-	/**
-	 * Undo Montgomery Modular Reduction
-	 *
-	 * @see _montgomery()
-	 * @see _slidingWindow()
-	 * @access private
-	 * @param biginteger
-	 * @return biginteger
-	 */
-	function _undo_montgomery($n)
-	{
-		$temp = new biginteger();
-		$temp->value = array_merge($this->_array_repeat(0, count($n->value)), $this->value);
-		list(, $temp) = $temp->divide($n);
-		return $temp->_normalize();
-	}
-
-	/**
-	 * Modular Inverse of a number mod 2**26 (eg. 67108864)
-	 *
-	 * Based off of the bnpInvDigit function implemented and justified in the following URL:
-	 *
-	 * {@link http://www-cs-students.stanford.edu/~tjw/jsbn/jsbn.js}
-	 *
-	 * The following URL provides more info:
-	 *
-	 * {@link http://groups.google.com/group/sci.crypt/msg/7a137205c1be7d85}
-	 *
-	 * As for why we do all the bitmasking...  strange things can happen when converting from floats to ints. For
-	 * instance, on some computers, var_dump((int) -4294967297) yields int(-1) and on others, it yields 
-	 * int(-2147483648).  To avoid problems stemming from this, we use bitmasks to guarantee that ints aren't
-	 * auto-converted to floats.  The outermost bitmask is present because without it, there's no guarantee that
-	 * the "residue" returned would be the so-called "common residue".  We use fmod, in the last step, because the
-	 * maximum possible $x is 26 bits and the maximum $result is 16 bits.  Thus, we have to be able to handle up to
-	 * 40 bits, which only 64-bit floating points will support.
-	 *
-	 * Thanks to Pedro Gimeno Fortea for input!
-	 *
-	 * @see _montgomery()
-	 * @access private
-	 * @return Integer
-	 */
-	function _mod_inverse67108864() // 2**26 == 67108864
-	{
-		$x = -$this->value[0];
-		$result = $x & 0x3; // x**-1 mod 2**2
-		$result = ($result * (2 - $x * $result)) & 0xF; // x**-1 mod 2**4
-		$result = ($result * (2 - ($x & 0xFF) * $result))  & 0xFF; // x**-1 mod 2**8
-		$result = ($result * ((2 - ($x & 0xFFFF) * $result) & 0xFFFF)) & 0xFFFF; // x**-1 mod 2**16
-		$result = fmod($result * (2 - fmod($x * $result, 0x4000000)), 0x4000000); // x**-1 mod 2**26
-		return $result & 0x3FFFFFF;
-	}
-
-	/**
-	 * Calculates modular inverses.
-	 *
-	 * @param biginteger $n
-	 * @return mixed false, if no modular inverse exists, biginteger, otherwise.
-	 * @access public
-	 * @internal Calculates the modular inverse of $this mod $n using the binary xGCD algorithim described in
-	 *	{@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=19 HAC 14.61}.  As the text above 14.61 notes,
-	 *	the more traditional algorithim requires "relatively costly multiple-precision divisions".  See
-	 *	{@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=21 HAC 14.64} for more information.
-	 */
-	function mod_inverse($n)
-	{
-		switch ( MATH_BIGINTEGER_MODE )
-		{
-			case MATH_BIGINTEGER_MODE_GMP:
-				$temp = new biginteger();
-				$temp->value = gmp_invert($this->value, $n->value);
-
-				return ( $temp->value === false ) ? false : $temp;
-			case MATH_BIGINTEGER_MODE_BCMATH:
-				// it might be faster to use the binary xGCD algorithim here, as well, but (1) that algorithim works
-				// best when the base is a power of 2 and (2) i don't think it'd make much difference, anyway.  as is,
-				// the basic extended euclidean algorithim is what we're using.
-
-				// if $x is less than 0, the first character of $x is a '-', so we'll remove it.  we can do this because
-				// $x mod $n == $x mod -$n.
-				$n = (bccomp($n->value, '0') < 0) ? substr($n->value, 1) : $n->value;
-
-				if (bccomp($this->value,'0') < 0)
-				{
-					$negated_this = new biginteger();
-					$negated_this->value = substr($this->value, 1);
-
-					$temp = $negated_this->mod_inverse(new biginteger($n));
-
-					if ($temp === false)
-					{
-						return false;
-					}
-
-					$temp->value = bcsub($n, $temp->value);
-
-					return $temp;
-				}
-
-				$u = $this->value;
-				$v = $n;
-
-				$a = '1';
-				$c = '0';
-
-				while (true)
-				{
-					$q = bcdiv($u, $v);
-					$temp = $u;
-					$u = $v;
-					$v = bcsub($temp, bcmul($v, $q));
-
-					if (bccomp($v, '0') == 0) {
-						break;
-					}
-
-					$temp = $a;
-					$a = $c;
-					$c = bcsub($temp, bcmul($c, $q));
-				}
-
-				$temp = new biginteger();
-				$temp->value = (bccomp($c, '0') < 0) ? bcadd($c, $n) : $c;
-
-				// $u contains the gcd of $this and $n
-				return (bccomp($u,'1') == 0) ? $temp : false;
-		}
-
-		// if $this and $n are even, return false.
-		if ( !($this->value[0]&1) && !($n->value[0]&1) )
-		{
-			return false;
-		}
-
-		$n = $n->_copy();
-		$n->is_negative = false;
-
-		if ($this->compare(new biginteger()) < 0)
-		{
-			// is_negative is currently true.  since we need it to be false, we'll just set it to false, temporarily,
-			// and reset it as true, later.
-			$this->is_negative = false;
-
-			$temp = $this->mod_inverse($n);
-
-			if ($temp === false)
-			{
-				return false;
-			}
-
-			$temp = $n->subtract($temp);
-
-			$this->is_negative = true;
-
-			return $temp;
-		}
-
-		$u = $n->_copy();
-		$x = $this;
-		//list(, $x) = $this->divide($n);
-		$v = $x->_copy();
-
-		$a = new biginteger();
-		$b = new biginteger();
-		$c = new biginteger();
-		$d = new biginteger();
-
-		$a->value = $d->value = array(1);
-
-		while ( !empty($u->value) )
-		{
-			while ( !($u->value[0] & 1) )
-			{
-				$u->_rshift(1);
-				if ( ($a->value[0] & 1) || ($b->value[0] & 1) )
-				{
-					$a = $a->add($x);
-					$b = $b->subtract($n);
-				}
-				$a->_rshift(1);
-				$b->_rshift(1);
-			}
-
-			while ( !($v->value[0] & 1) )
-			{
-				$v->_rshift(1);
-				if ( ($c->value[0] & 1) || ($d->value[0] & 1) )
-				{
-					$c = $c->add($x);
-					$d = $d->subtract($n);
-				}
-				$c->_rshift(1);
-				$d->_rshift(1);
-			}
-
-			if ($u->compare($v) >= 0)
-			{
-				$u = $u->subtract($v);
-				$a = $a->subtract($c);
-				$b = $b->subtract($d);
-			}
-			else
-			{
-				$v = $v->subtract($u);
-				$c = $c->subtract($a);
-				$d = $d->subtract($b);
-			}
-
-			$u->_normalize();
-		}
-
-		// at this point, $v == gcd($this, $n).  if it's not equal to 1, no modular inverse exists.
-		if ( $v->value != array(1) )
-		{
-			return false;
-		}
-
-		$d = ($d->compare(new biginteger()) < 0) ? $d->add($n) : $d;
-
-		return ($this->is_negative) ? $n->subtract($d) : $d;
-	}
-
-	/**
-	 * Absolute value.
-	 *
-	 * @return biginteger
-	 * @access public
-	 */
-	function abs()
-	{
-		$temp = new biginteger();
-
-		switch ( MATH_BIGINTEGER_MODE )
-		{
-			case MATH_BIGINTEGER_MODE_GMP:
-				$temp->value = gmp_abs($this->value);
-				break;
-			case MATH_BIGINTEGER_MODE_BCMATH:
-				$temp->value = (bccomp($this->value, '0') < 0) ? substr($this->value, 1) : $this->value;
-				break;
-			default:
-				$temp->value = $this->value;
-		}
-
-		return $temp;
-	}
-
-	/**
-	 * Compares two numbers.
-	 *
-	 * @param biginteger $x
-	 * @return Integer < 0 if $this is less than $x; > 0 if $this is greater than $x, and 0 if they are equal.
-	 * @access public
-	 * @internal Could return $this->sub($x), but that's not as fast as what we do do.
-	 */
-	function compare($x)
-	{
-		switch ( MATH_BIGINTEGER_MODE )
-		{
-			case MATH_BIGINTEGER_MODE_GMP:
-				return gmp_cmp($this->value, $x->value);
-			case MATH_BIGINTEGER_MODE_BCMATH:
-				return bccomp($this->value, $x->value);
-		}
-
-		$this->_normalize();
-		$x->_normalize();
-
-		if ( $this->is_negative != $x->is_negative )
-		{
-			return ( !$this->is_negative && $x->is_negative ) ? 1 : -1;
-		}
-
-		$result = $this->is_negative ? -1 : 1;
-
-		if ( count($this->value) != count($x->value) )
-		{
-			return ( count($this->value) > count($x->value) ) ? $result : -$result;
-		}
-
-		for ($i = count($this->value) - 1; $i >= 0; $i--)
-		{
-			if ($this->value[$i] != $x->value[$i])
-			{
-				return ( $this->value[$i] > $x->value[$i] ) ? $result : -$result;
-			}
-		}
-
-		return 0;
-	}
-
-	/**
-	 * Returns a copy of $this
-	 *
-	 * PHP5 passes objects by reference while PHP4 passes by value.  As such, we need a function to guarantee
-	 * that all objects are passed by value, when appropriate.  More information can be found here:
-	 *
-	 * {@link http://www.php.net/manual/en/language.oop5.basic.php#51624}
-	 *
-	 * @access private
-	 * @return biginteger
-	 */
-	function _copy()
-	{
-		$temp = new biginteger();
-		$temp->value = $this->value;
-		$temp->is_negative = $this->is_negative;
-		return $temp;
-	}
-
-	/**
-	 * Logical And
-	 *
-	 * @param biginteger $x
-	 * @access public
-	 * @internal Implemented per a request by Lluis Pamies i Juarez <lluis _a_ pamies.cat>
-	 * @return biginteger
-	 */
-	function bitwise_and($x)
-	{
-		switch ( MATH_BIGINTEGER_MODE )
-		{
-			case MATH_BIGINTEGER_MODE_GMP:
-				$temp = new biginteger();
-				$temp->value = gmp_and($this->value, $x->value);
-
-				return $temp;
-			case MATH_BIGINTEGER_MODE_BCMATH:
-				return new biginteger($this->to_bytes() & $x->to_bytes(), 256);
-		}
-
-		$result = new biginteger();
-
-		$x_length = count($x->value);
-		for ($i = 0; $i < $x_length; $i++)
-		{
-			$result->value[] = $this->value[$i] & $x->value[$i];
-		}
-
-		return $result->_normalize();
-	}
-
-	/**
-	 * Logical Or
-	 *
-	 * @param biginteger $x
-	 * @access public
-	 * @internal Implemented per a request by Lluis Pamies i Juarez <lluis _a_ pamies.cat>
-	 * @return biginteger
-	 */
-	function bitwise_or($x)
-	{
-		switch ( MATH_BIGINTEGER_MODE )
-		{
-			case MATH_BIGINTEGER_MODE_GMP:
-				$temp = new biginteger();
-				$temp->value = gmp_or($this->value, $x->value);
-
-				return $temp;
-			case MATH_BIGINTEGER_MODE_BCMATH:
-				return new biginteger($this->to_bytes() | $x->to_bytes(), 256);
-		}
-
-		$result = $this->_copy();
-
-		$x_length = count($x->value);
-		for ($i = 0; $i < $x_length; $i++)
-		{
-			$result->value[$i] = $this->value[$i] | $x->value[$i];
-		}
-
-		return $result->_normalize();
-	}
-
-	/**
-	 * Logical Exclusive-Or
-	 *
-	 * @param biginteger $x
-	 * @access public
-	 * @internal Implemented per a request by Lluis Pamies i Juarez <lluis _a_ pamies.cat>
-	 * @return biginteger
-	 */
-	function bitwise_xor($x)
-	{
-		switch ( MATH_BIGINTEGER_MODE )
-		{
-			case MATH_BIGINTEGER_MODE_GMP:
-				$temp = new biginteger();
-				$temp->value = gmp_xor($this->value, $x->value);
-
-				return $temp;
-			case MATH_BIGINTEGER_MODE_BCMATH:
-				return new biginteger($this->to_bytes() ^ $x->to_bytes(), 256);
-		}
-
-		$result = $this->_copy();
-
-		$x_length = count($x->value);
-		for ($i = 0; $i < $x_length; $i++)
-		{
-			$result->value[$i] = $this->value[$i] ^ $x->value[$i];
-		}
-
-		return $result->_normalize();
-	}
-
-	/**
-	 * Logical Not
-	 *
-	 * Although integers can be converted to and from various bases with relative ease, there is one piece
-	 * of information that is lost during such conversions.  The number of leading zeros that number had
-	 * or should have in any given base.  Per that, if you convert 1 from decimal to binary, there's no
-	 * way to know just how many leading zero's there should be.  In truth, there could be any number.
-	 *
-	 * Normally, the number of leading zero's is unimportant.  When doing "not", however, it is.  The "not"
-	 * of 1 on an 8-bit representation of 1 is 1111 1110.  The "not" of 1 on a 16-bit representation of 1 is
-	 * 1111 1111 1111 1110.  When doing it on a number that's preceeded by an infinite number of zero's, it's
-	 * infinite.
-	 *
-	 * This function assumes that there are no leading zero's - that the bit-representation being used is
-	 * equal to the minimum number of required bits, unless otherwise specified in the optional parameter,
-	 * where the optional parameter represents the bit-representation being used.  If the specified
-	 * bit-representation is smaller than the minimum number of bits required to represent the number, the
-	 * latter will be used as the bit-representation.
-	 *
-	 * @param $bits Integer
-	 * @access public
-	 * @internal Implemented per a request by Lluis Pamies i Juarez <lluis _a_ pamies.cat>
-	 * @return biginteger
-	 */
-	function bitwise_not($bits = -1)
-	{
-		// calculuate "not" without regard to $bits
-		$temp = ~$this->to_bytes();
-		$msb = decbin(ord($temp[0]));
-		$msb = substr($msb, strpos($msb, '0'));
-		$temp[0] = chr(bindec($msb));
-
-		// see if we need to add extra leading 1's
-		$current_bits = strlen($msb) + 8 * strlen($temp) - 8;
-		$new_bits = $bits - $current_bits;
-		if ($new_bits <= 0)
-		{
-			return new biginteger($temp, 256);
-		}
-
-		// generate as many leading 1's as we need to.
-		$leading_ones = chr((1 << ($new_bits & 0x7)) - 1) . str_repeat(chr(0xFF), $new_bits >> 3);
-		$this->_base256_lshift($leading_ones, $current_bits);
-
-		$temp = str_pad($temp, ceil($bits / 8), chr(0), STR_PAD_LEFT);
-
-		return new biginteger($leading_ones | $temp, 256);
-	}
-
-	/**
-	 * Logical Right Shift
-	 *
-	 * Shifts BigInteger's by $shift bits, effectively dividing by 2**$shift.
-	 *
-	 * @param Integer $shift
-	 * @return biginteger
-	 * @access public
-	 * @internal The only version that yields any speed increases is the internal version.
-	 */
-	function bitwise_right_shift($shift)
-	{
-		$temp = new biginteger();
-
-		switch ( MATH_BIGINTEGER_MODE )
-		{
-			case MATH_BIGINTEGER_MODE_GMP:
-				static $two;
-
-				if (empty($two))
-				{
-					$two = gmp_init('2');
-				}
-
-				$temp->value = gmp_div_q($this->value, gmp_pow($two, $shift));
-
-				break;
-			case MATH_BIGINTEGER_MODE_BCMATH:
-				$temp->value = bcdiv($this->value, bcpow('2', $shift));
-
-				break;
-			default: // could just replace _lshift with this, but then all _lshift() calls would need to be rewritten
-					 // and I don't want to do that...
-				$temp->value = $this->value;
-				$temp->_rshift($shift);
-		}
-
-		return $temp;
-	}
-
-	/**
-	 * Logical Left Shift
-	 *
-	 * Shifts BigInteger's by $shift bits, effectively multiplying by 2**$shift.
-	 *
-	 * @param Integer $shift
-	 * @return biginteger
-	 * @access public
-	 * @internal The only version that yields any speed increases is the internal version.
-	 */
-	function bitwise_left_shift($shift)
-	{
-		$temp = new biginteger();
-
-		switch ( MATH_BIGINTEGER_MODE )
-		{
-			case MATH_BIGINTEGER_MODE_GMP:
-				static $two;
-
-				if (empty($two))
-				{
-					$two = gmp_init('2');
-				}
-
-				$temp->value = gmp_mul($this->value, gmp_pow($two, $shift));
-
-				break;
-			case MATH_BIGINTEGER_MODE_BCMATH:
-				$temp->value = bcmul($this->value, bcpow('2', $shift));
-
-				break;
-			default: // could just replace _rshift with this, but then all _lshift() calls would need to be rewritten
-					 // and I don't want to do that...
-				$temp->value = $this->value;
-				$temp->_lshift($shift);
-		}
-
-		return $temp;
-	}
-
-	/**
-	 * Generate a random number
-	 *
-	 * $generator should be the name of a random number generating function whose first parameter is the minimum
-	 * value and whose second parameter is the maximum value.  If this function needs to be seeded, it should be
-	 * done before this function is called.
-	 *
-	 * @param optional Integer $min
-	 * @param optional Integer $max
-	 * @param optional String $generator
-	 * @return biginteger
-	 * @access public
-	 */
-	function random($min = false, $max = false, $generator = 'mt_rand')
-	{
-		if ($min === false)
-		{
-			$min = new biginteger(0);
-		}
-
-		if ($max === false)
-		{
-			$max = new biginteger(0x7FFFFFFF);
-		}
-
-		$compare = $max->compare($min);
-
-		if (!$compare)
-		{
-			return $min;
-		}
-		else if ($compare < 0)
-		{
-			// if $min is bigger then $max, swap $min and $max
-			$temp = $max;
-			$max = $min;
-			$min = $temp;
-		}
-
-		$max = $max->subtract($min);
-		$max = ltrim($max->to_bytes(), chr(0));
-		$size = strlen($max) - 1;
-		$random = '';
-
-		$bytes = $size & 3;
-		for ($i = 0; $i < $bytes; $i++)
-		{
-			$random.= chr($generator(0, 255));
-		}
-
-		$blocks = $size >> 2;
-		for ($i = 0; $i < $blocks; $i++)
-		{
-			$random.= pack('N', $generator(-2147483648, 0x7FFFFFFF));
-		}
-
-		$temp = new biginteger($random, 256);
-		if ($temp->compare(new biginteger(substr($max, 1), 256)) > 0)
-		{
-			$random = chr($generator(0, ord($max[0]) - 1)) . $random;
-		}
-		else
-		{
-			$random = chr($generator(0, ord($max[0])	)) . $random;
-		}
-
-		$random = new biginteger($random, 256);
-
-		return $random->add($min);
-	}
-
-	/**
-	 * Logical Left Shift
-	 *
-	 * Shifts BigInteger's by $shift bits.
-	 *
-	 * @param Integer $shift
-	 * @access private
-	 */
-	function _lshift($shift)
-	{
-		if ( $shift == 0 )
-		{
-			return;
-		}
-
-		$num_digits = floor($shift / 26);
-		$shift %= 26;
-		$shift = 1 << $shift;
-
-		$carry = 0;
-
-		for ($i = 0; $i < count($this->value); $i++)
-		{
-			$temp = $this->value[$i] * $shift + $carry;
-			$carry = floor($temp / 0x4000000);
-			$this->value[$i] = $temp - $carry * 0x4000000;
-		}
-
-		if ( $carry )
-		{
-			$this->value[] = $carry;
-		}
-
-		while ($num_digits--)
-		{
-			array_unshift($this->value, 0);
-		}
-	}
-
-	/**
-	 * Logical Right Shift
-	 *
-	 * Shifts BigInteger's by $shift bits.
-	 *
-	 * @param Integer $shift
-	 * @access private
-	 */
-	function _rshift($shift)
-	{
-		if ($shift == 0)
-		{
-			$this->_normalize();
-		}
-
-		$num_digits = floor($shift / 26);
-		$shift %= 26;
-		$carry_shift = 26 - $shift;
-		$carry_mask = (1 << $shift) - 1;
-
-		if ( $num_digits )
-		{
-			$this->value = array_slice($this->value, $num_digits);
-		}
-
-		$carry = 0;
-
-		for ($i = count($this->value) - 1; $i >= 0; $i--)
-		{
-			$temp = $this->value[$i] >> $shift | $carry;
-			$carry = ($this->value[$i] & $carry_mask) << $carry_shift;
-			$this->value[$i] = $temp;
-		}
-
-		$this->_normalize();
-	}
-
-	/**
-	 * Normalize
-	 *
-	 * Deletes leading zeros.
-	 *
-	 * @see divide()
-	 * @return Math_BigInteger
-	 * @access private
-	 */
-	function _normalize()
-	{
-		if ( !count($this->value) )
-		{
-			return $this;
-		}
-
-		for ($i=count($this->value) - 1; $i >= 0; $i--)
-		{
-			if ( $this->value[$i] )
-			{
-				break;
-			}
-			unset($this->value[$i]);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Array Repeat
-	 *
-	 * @param $input Array
-	 * @param $multiplier mixed
-	 * @return Array
-	 * @access private
-	 */
-	function _array_repeat($input, $multiplier)
-	{
-		return ($multiplier) ? array_fill(0, $multiplier, $input) : array();
-	}
-
-	/**
-	 * Logical Left Shift
-	 *
-	 * Shifts binary strings $shift bits, essentially multiplying by 2**$shift.
-	 *
-	 * @param $x String
-	 * @param $shift Integer
-	 * @return String
-	 * @access private
-	 */
-	function _base256_lshift(&$x, $shift)
-	{
-		if ($shift == 0)
-		{
-			return;
-		}
-
-		$num_bytes = $shift >> 3; // eg. floor($shift/8)
-		$shift &= 7; // eg. $shift % 8
-
-		$carry = 0;
-		for ($i = strlen($x) - 1; $i >= 0; $i--)
-		{
-			$temp = ord($x[$i]) << $shift | $carry;
-			$x[$i] = chr($temp);
-			$carry = $temp >> 8;
-		}
-		$carry = ($carry != 0) ? chr($carry) : '';
-		$x = $carry . $x . str_repeat(chr(0), $num_bytes);
-	}
-
-	/**
-	 * Logical Right Shift
-	 *
-	 * Shifts binary strings $shift bits, essentially dividing by 2**$shift and returning the remainder.
-	 *
-	 * @param $x String
-	 * @param $shift Integer
-	 * @return String
-	 * @access private
-	 */
-	function _base256_rshift(&$x, $shift)
-	{
-		if ($shift == 0)
-		{
-			$x = ltrim($x, chr(0));
-			return '';
-		}
-
-		$num_bytes = $shift >> 3; // eg. floor($shift/8)
-		$shift &= 7; // eg. $shift % 8
-
-		$remainder = '';
-		if ($num_bytes)
-		{
-			$start = $num_bytes > strlen($x) ? -strlen($x) : -$num_bytes;
-			$remainder = substr($x, $start);
-			$x = substr($x, 0, -$num_bytes);
-		}
-
-		$carry = 0;
-		$carry_shift = 8 - $shift;
-		for ($i = 0; $i < strlen($x); $i++)
-		{
-			$temp = (ord($x[$i]) >> $shift) | $carry;
-			$carry = (ord($x[$i]) << $carry_shift) & 0xFF;
-			$x[$i] = chr($temp);
-		}
-		$x = ltrim($x, chr(0));
-
-		$remainder = chr($carry >> $carry_shift) . $remainder;
-
-		return ltrim($remainder, chr(0));
-	}
-
-	// one quirk about how the following functions are implemented is that PHP defines N to be an unsigned long
-	// at 32-bits, while java's longs are 64-bits.
-
-	/**
-	 * Converts 32-bit integers to bytes.
-	 *
-	 * @param Integer $x
-	 * @return String
-	 * @access private
-	 */
-	function _int2bytes($x)
-	{
-		return ltrim(pack('N', $x), chr(0));
-	}
-
-	/**
-	 * Converts bytes to 32-bit integers
-	 *
-	 * @param String $x
-	 * @return Integer
-	 * @access private
-	 */
-	function _bytes2int($x)
-	{
-		$temp = unpack('Nint', str_pad($x, 4, chr(0), STR_PAD_LEFT));
-		return $temp['int'];
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/libraries/sftp/des.php b/phpBB/includes/libraries/sftp/des.php
deleted file mode 100644
index 278de64a01..0000000000
--- a/phpBB/includes/libraries/sftp/des.php
+++ /dev/null
@@ -1,1428 +0,0 @@
-<?php
-/**
-*
-* @package sftp
-* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Code from http://phpseclib.sourceforge.net/
-*
-* Modified by phpBB Group to meet our coding standards
-* and being able to integrate into phpBB
-*
-* Pure-PHP implementation of DES.
-*
-* Copyright 2007-2009 TerraFrost <terrafrost@php.net>
-* Copyright 2009+ phpBB
-*
-* @package sftp
-* @author  TerraFrost <terrafrost@php.net>
-*/
-
-/**#@+
- * @access private
- * @see des::_prepare_key()
- * @see des::_process_block()
- */
-/**
- * Contains array_reverse($keys[CRYPT_DES_DECRYPT])
- */
-define('CRYPT_DES_ENCRYPT', 0);
-/**
- * Contains array_reverse($keys[CRYPT_DES_ENCRYPT])
- */
-define('CRYPT_DES_DECRYPT', 1);
-/**#@-*/
-
-/**#@+
- * @access public
- * @see des::encrypt()
- * @see des::decrypt()
- */
-/**
- * Encrypt / decrypt using the Electronic Code Book mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
- */
-define('CRYPT_DES_MODE_ECB', 1);
-/**
- * Encrypt / decrypt using the Code Book Chaining mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
- */
-define('CRYPT_DES_MODE_CBC', 2);
-/**#@-*/
-
-/**
- * Encrypt / decrypt using inner chaining
- *
- * Inner chaining is used by SSH-1 and is generally considered to be less secure then outer chaining (CRYPT_DES_MODE_CBC3).
- */
-define('CRYPT_DES_MODE_3CBC', 3);
-
-/**
- * Encrypt / decrypt using outer chaining
- *
- * Outer chaining is used by SSH-2 and when the mode is set to CRYPT_DES_MODE_CBC.
- */
-define('CRYPT_DES_MODE_CBC3', CRYPT_DES_MODE_CBC);
-
-/**#@+
- * @access private
- * @see des::__construct()
- */
-/**
- * Toggles the internal implementation
- */
-define('CRYPT_DES_MODE_INTERNAL', 1);
-/**
- * Toggles the mcrypt implementation
- */
-define('CRYPT_DES_MODE_MCRYPT', 2);
-/**#@-*/
-
-/**
- * Pure-PHP implementation of DES.
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- * @version 0.1.0
- * @access  public
- * @package des
- */
-class des
-{
-	/**
-	 * The Key Schedule
-	 *
-	 * @see des::setKey()
-	 * @var Array
-	 * @access private
-	 */
-	var $keys = "\0\0\0\0\0\0\0\0";
-
-	/**
-	 * The Encryption Mode
-	 *
-	 * @see des::des()
-	 * @var Integer
-	 * @access private
-	 */
-	var $mode;
-
-	/**
-	 * Continuous Buffer status
-	 *
-	 * @see des::enableContinuousBuffer()
-	 * @var Boolean
-	 * @access private
-	 */
-	var $continuousBuffer = false;
-
-	/**
-	 * Padding status
-	 *
-	 * @see des::enablePadding()
-	 * @var Boolean
-	 * @access private
-	 */
-	var $padding = true;
-
-	/**
-	 * The Initialization Vector
-	 *
-	 * @see des::setIV()
-	 * @var String
-	 * @access private
-	 */
-	var $iv = "\0\0\0\0\0\0\0\0";
-
-	/**
-	 * A "sliding" Initialization Vector
-	 *
-	 * @see des::enableContinuousBuffer()
-	 * @var String
-	 * @access private
-	 */
-	var $encryptIV = "\0\0\0\0\0\0\0\0";
-
-	/**
-	 * A "sliding" Initialization Vector
-	 *
-	 * @see des::enableContinuousBuffer()
-	 * @var String
-	 * @access private
-	 */
-	var $decryptIV = "\0\0\0\0\0\0\0\0";
-
-	/**
-	 * MCrypt parameters
-	 *
-	 * @see des::setMCrypt()
-	 * @var Array
-	 * @access private
-	 */
-	var $mcrypt = array('', '');
-
-	/**
-	 * Default Constructor.
-	 *
-	 * Determines whether or not the mcrypt extension should be used.  $mode should only, at present, be
-	 * CRYPT_DES_MODE_ECB or CRYPT_DES_MODE_CBC.  If not explictly set, CRYPT_DES_MODE_CBC will be used.
-	 *
-	 * @param optional Integer $mode
-	 * @return des
-	 * @access public
-	 */
-	function __construct($mode = CRYPT_MODE_DES_CBC)
-	{
-		if ( !defined('CRYPT_DES_MODE') )
-		{
-			switch (true)
-			{
-				case extension_loaded('mcrypt'):
-					// i'd check to see if des was supported, by doing in_array('des', mcrypt_list_algorithms('')),
-					// but since that can be changed after the object has been created, there doesn't seem to be
-					// a lot of point...
-					define('CRYPT_DES_MODE', CRYPT_DES_MODE_MCRYPT);
-					break;
-				default:
-					define('CRYPT_DES_MODE', CRYPT_DES_MODE_INTERNAL);
-			}
-		}
-
-		switch ( CRYPT_DES_MODE )
-		{
-			case CRYPT_DES_MODE_MCRYPT:
-				switch ($mode)
-				{
-					case CRYPT_DES_MODE_ECB:
-						$this->mode = MCRYPT_MODE_ECB;
-						break;
-					case CRYPT_DES_MODE_CBC:
-					default:
-						$this->mode = MCRYPT_MODE_CBC;
-				}
-
-				break;
-			default:
-				switch ($mode)
-				{
-					case CRYPT_DES_MODE_ECB:
-					case CRYPT_DES_MODE_CBC:
-						$this->mode = $mode;
-						break;
-					default:
-						$this->mode = CRYPT_DES_MODE_CBC;
-				}
-		}
-	}
-
-	/**
-	 * Sets the key.
-	 *
-	 * Keys can be of any length.  DES, itself, uses 64-bit keys (eg. strlen($key) == 8), however, we
-	 * only use the first eight, if $key has more then eight characters in it, and pad $key with the
-	 * null byte if it is less then eight characters long.
-	 *
-	 * DES also requires that every eighth bit be a parity bit, however, we'll ignore that.
-	 *
-	 * If the key is not explicitly set, it'll be assumed to be all zero's.
-	 *
-	 * @access public
-	 * @param String $key
-	 */
-	function set_key($key)
-	{
-		$this->keys = ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT ) ? substr($key, 0, 8) : $this->_prepare_key($key);
-	}
-
-	/**
-	 * Sets the initialization vector. (optional)
-	 *
-	 * SetIV is not required when CRYPT_DES_MODE_ECB is being used.  If not explictly set, it'll be assumed
-	 * to be all zero's.
-	 *
-	 * @access public
-	 * @param String $iv
-	 */
-	function set_iv($iv)
-	{
-		$this->encryptIV = $this->decryptIV = $this->iv = str_pad(substr($iv, 0, 8), 8, chr(0));;
-	}
-
-	/**
-	 * Sets MCrypt parameters. (optional)
-	 *
-	 * If MCrypt is being used, empty strings will be used, unless otherwise specified.
-	 *
-	 * @link http://php.net/function.mcrypt-module-open#function.mcrypt-module-open
-	 * @access public
-	 * @param optional Integer $algorithm_directory
-	 * @param optional Integer $mode_directory
-	 */
-	function set_mcrypt($algorithm_directory = '', $mode_directory = '')
-	{
-		$this->mcrypt = array($algorithm_directory, $mode_directory);
-	}
-
-	/**
-	 * Encrypts a message.
-	 *
-	 * $plaintext will be padded with up to 8 additional bytes.  Other DES implementations may or may not pad in the
-	 * same manner.  Other common approaches to padding and the reasons why it's necessary are discussed in the following
-	 * URL:
-	 *
-	 * {@link http://www.di-mgt.com.au/cryptopad.html http://www.di-mgt.com.au/cryptopad.html}
-	 *
-	 * An alternative to padding is to, separately, send the length of the file.  This is what SSH, in fact, does.
-	 * strlen($plaintext) will still need to be a multiple of 8, however, arbitrary values can be added to make it that
-	 * length.
-	 *
-	 * @see des::decrypt()
-	 * @access public
-	 * @param String $plaintext
-	 */
-	function encrypt($plaintext)
-	{
-		$plaintext = $this->_pad($plaintext);
-
-		if ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT )
-		{
-			$td = mcrypt_module_open(MCRYPT_DES, $this->mcrypt[0], $this->mode, $this->mcrypt[1]);
-			mcrypt_generic_init($td, $this->keys, $this->encryptIV);
-
-			$ciphertext = mcrypt_generic($td, $plaintext);
-
-			mcrypt_generic_deinit($td);
-			mcrypt_module_close($td);
-
-			if ($this->continuousBuffer)
-			{
-				$this->encryptIV = substr($ciphertext, -8);
-			}
-
-			return $ciphertext;
-		}
-
-		if (!is_array($this->keys))
-		{
-			$this->keys = $this->_prepare_key("\0\0\0\0\0\0\0\0");
-		}
-
-		$ciphertext = '';
-		switch ($this->mode)
-		{
-			case CRYPT_DES_MODE_ECB:
-				for ($i = 0; $i < strlen($plaintext); $i+=8)
-				{
-					$ciphertext.= $this->_process_block(substr($plaintext, $i, 8), CRYPT_DES_ENCRYPT);
-				}
-				break;
-			case CRYPT_DES_MODE_CBC:
-				$xor = $this->encryptIV;
-				for ($i = 0; $i < strlen($plaintext); $i+=8)
-				{
-					$block = substr($plaintext, $i, 8);
-					$block = $this->_process_block($block ^ $xor, CRYPT_DES_ENCRYPT);
-					$xor = $block;
-					$ciphertext.= $block;
-				}
-				if ($this->continuousBuffer)
-				{
-					$this->encryptIV = $xor;
-				}
-		}
-
-		return $ciphertext;
-	}
-
-	/**
-	 * Decrypts a message.
-	 *
-	 * If strlen($ciphertext) is not a multiple of 8, null bytes will be added to the end of the string until it is.
-	 *
-	 * @see des::encrypt()
-	 * @access public
-	 * @param String $ciphertext
-	 */
-	function decrypt($ciphertext)
-	{
-		// we pad with chr(0) since that's what mcrypt_generic does.  to quote from http://php.net/function.mcrypt-generic :
-		// "The data is padded with "\0" to make sure the length of the data is n * blocksize."
-		$ciphertext = str_pad($ciphertext, (strlen($ciphertext) + 7) & 0xFFFFFFF8, chr(0));
-
-		if ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT )
-		{
-			$td = mcrypt_module_open(MCRYPT_DES, $this->mcrypt[0], $this->mode, $this->mcrypt[1]);
-			mcrypt_generic_init($td, $this->keys, $this->decryptIV);
-
-			$plaintext = mdecrypt_generic($td, $ciphertext);
-
-			mcrypt_generic_deinit($td);
-			mcrypt_module_close($td);
-
-			if ($this->continuousBuffer)
-			{
-				$this->decryptIV = substr($ciphertext, -8);
-			}
-
-			return $this->_unpad($plaintext);
-		}
-
-	 	if (!is_array($this->keys))
-		{
-			$this->keys = $this->_prepare_key("\0\0\0\0\0\0\0\0");
-		}
-
-		$plaintext = '';
-		switch ($this->mode)
-		{
-			case CRYPT_DES_MODE_ECB:
-				for ($i = 0; $i < strlen($ciphertext); $i+=8)
-				{
-					$plaintext.= $this->_process_block(substr($ciphertext, $i, 8), CRYPT_DES_DECRYPT);
-				}
-				break;
-			case CRYPT_DES_MODE_CBC:
-				$xor = $this->decryptIV;
-				for ($i = 0; $i < strlen($ciphertext); $i+=8)
-				{
-					$block = substr($ciphertext, $i, 8);
-					$plaintext.= $this->_process_block($block, CRYPT_DES_DECRYPT) ^ $xor;
-					$xor = $block;
-				}
-				if ($this->continuousBuffer)
-				{
-					$this->decryptIV = $xor;
-				}
-		}
-
-		return $this->_unpad($plaintext);
-	}
-
-	/**
-	 * Treat consecutive "packets" as if they are a continuous buffer.
-	 *
-	 * Say you have a 16-byte plaintext $plaintext.  Using the default behavior, the two following code snippets
-	 * will yield different outputs:
-	 *
-	 * <code>
-	 *	echo $des->encrypt(substr($plaintext, 0, 8));
-	 *	echo $des->encrypt(substr($plaintext, 8, 8));
-	 * </code>
-	 * <code>
-	 *	echo $des->encrypt($plaintext);
-	 * </code>
-	 *
-	 * The solution is to enable the continuous buffer.  Although this will resolve the above discrepancy, it creates
-	 * another, as demonstrated with the following:
-	 *
-	 * <code>
-	 *	$des->encrypt(substr($plaintext, 0, 8));
-	 *	echo $des->decrypt($des->encrypt(substr($plaintext, 8, 8)));
-	 * </code>
-	 * <code>
-	 *	echo $des->decrypt($des->encrypt(substr($plaintext, 8, 8)));
-	 * </code>
-	 *
-	 * With the continuous buffer disabled, these would yield the same output.  With it enabled, they yield different
-	 * outputs.  The reason is due to the fact that the initialization vector's change after every encryption /
-	 * decryption round when the continuous buffer is enabled.  When it's disabled, they remain constant.
-	 *
-	 * Put another way, when the continuous buffer is enabled, the state of the des() object changes after each
-	 * encryption / decryption round, whereas otherwise, it'd remain constant.  For this reason, it's recommended that
-	 * continuous buffers not be used.  They do offer better security and are, in fact, sometimes required (SSH uses them),
-	 * however, they are also less intuitive and more likely to cause you problems.
-	 *
-	 * @see des::disableContinuousBuffer()
-	 * @access public
-	 */
-	function enable_continuous_buffer()
-	{
-		$this->continuousBuffer = true;
-	}
-
-	/**
-	 * Treat consecutive packets as if they are a discontinuous buffer.
-	 *
-	 * The default behavior.
-	 *
-	 * @see des::enableContinuousBuffer()
-	 * @access public
-	 */
-	function disable_continuous_buffer()
-	{
-		$this->continuousBuffer = false;
-		$this->encryptIV = $this->iv;
-		$this->decryptIV = $this->iv;
-	}
-
-	/**
-	 * Pad "packets".
-	 *
-	 * DES works by encrypting eight bytes at a time.  If you ever need to encrypt or decrypt something that's not
-	 * a multiple of eight, it becomes necessary to pad the input so that it's length is a multiple of eight.
-	 *
-	 * Padding is enabled by default.  Sometimes, however, it is undesirable to pad strings.  Such is the case in SSH1,
-	 * where "packets" are padded with random bytes before being encrypted.  Unpad these packets and you risk stripping
-	 * away characters that shouldn't be stripped away. (SSH knows how many bytes are added because the length is
-	 * transmitted separately)
-	 *
-	 * @see des::disablePadding()
-	 * @access public
-	 */
-	function enable_padding()
-	{
-		$this->padding = true;
-	}
-
-	/**
-	 * Do not pad packets.
-	 *
-	 * @see des::enablePadding()
-	 * @access public
-	 */
-	function disable_padding()
-	{
-		$this->padding = false;
-	}
-
-	/**
-	 * Pads a string
-	 *
-	 * Pads a string using the RSA PKCS padding standards so that its length is a multiple of the blocksize (8).
-	 * 8 - (strlen($text) & 7) bytes are added, each of which is equal to chr(8 - (strlen($text) & 7)
-	 *
-	 * If padding is disabled and $text is not a multiple of the blocksize, the string will be padded regardless
-	 * and padding will, hence forth, be enabled.
-	 *
-	 * @see des::_unpad()
-	 * @access private
-	 */
-	function _pad($text)
-	{
-		$length = strlen($text);
-
-		if (!$this->padding)
-		{
-			if (($length & 7) == 0)
-			{
-				return $text;
-			}
-			else
-			{
-				$this->padding = true;
-			}
-		}
-
-		$pad = 8 - ($length & 7);
-		return str_pad($text, $length + $pad, chr($pad));
-	}
-
-	/**
-	 * Unpads a string
-	 *
-	 * If padding is enabled and the reported padding length exceeds the block size, padding will be, hence forth, disabled.
-	 *
-	 * @see des::_pad()
-	 * @access private
-	 */
-	function _unpad($text)
-	{
-		if (!$this->padding)
-		{
-			return $text;
-		}
-
-		$length = ord($text[strlen($text) - 1]);
-
-		if ($length > 8)
-		{
-			$this->padding = false;
-			return $text;
-		}
-
-		return substr($text, 0, -$length);
-	}
-
-	/**
-	 * Encrypts or decrypts a 64-bit block
-	 *
-	 * $mode should be either CRYPT_DES_ENCRYPT or CRYPT_DES_DECRYPT.  See
-	 * {@link http://en.wikipedia.org/wiki/Image:Feistel.png Feistel.png} to get a general
-	 * idea of what this function does.
-	 *
-	 * @access private
-	 * @param String $block
-	 * @param Integer $mode
-	 * @return String
-	 */
-	function _process_block($block, $mode)
-	{
-		// s-boxes.  in the official DES docs, they're described as being matrices that
-		// one accesses by using the first and last bits to determine the row and the
-		// middle four bits to determine the column.  in this implementation, they've
-		// been converted to vectors
-		static $sbox = array(
-			array(
-				14,  0,  4, 15, 13,  7,  1,  4,  2, 14, 15,  2, 11, 13,  8,  1,
-				 3, 10 ,10,  6,  6, 12, 12, 11,  5,  9,  9,  5,  0,  3,  7,  8,
-				 4, 15,  1, 12, 14,  8,  8,  2, 13,  4,  6,  9,  2,  1, 11,  7,
-				15,  5, 12, 11,  9,  3,  7, 14,  3, 10, 10,  0,  5,  6,  0, 13
-			),
-			array(
-				15,  3,  1, 13,  8,  4, 14,  7,  6, 15, 11,  2,  3,  8,  4, 14,
-				 9, 12,  7,  0,  2,  1, 13, 10, 12,  6,  0,  9,  5, 11, 10,  5,
-				 0, 13, 14,  8,  7, 10, 11,  1, 10,  3,  4, 15, 13,  4,  1,  2,
-				 5, 11,  8,  6, 12,  7,  6, 12,  9,  0,  3,  5,  2, 14, 15,  9
-			),
-			array(
-				10, 13,  0,  7,  9,  0, 14,  9,  6,  3,  3,  4, 15,  6,  5, 10,
-				 1,  2, 13,  8, 12,  5,  7, 14, 11, 12,  4, 11,  2, 15,  8,  1,
-				13,  1,  6, 10,  4, 13,  9,  0,  8,  6, 15,  9,  3,  8,  0,  7,
-				11,  4,  1, 15,  2, 14, 12,  3,  5, 11, 10,  5, 14,  2,  7, 12
-			),
-			array(
-				 7, 13, 13,  8, 14, 11,  3,  5,  0,  6,  6, 15,  9,  0, 10,  3,
-				 1,  4,  2,  7,  8,  2,  5, 12, 11,  1, 12, 10,  4, 14, 15,  9,
-				10,  3,  6, 15,  9,  0,  0,  6, 12, 10, 11,  1,  7, 13, 13,  8,
-				15,  9,  1,  4,  3,  5, 14, 11,  5, 12,  2,  7,  8,  2,  4, 14
-			),
-			array(
-				 2, 14, 12, 11,  4,  2,  1, 12,  7,  4, 10,  7, 11, 13,  6,  1,
-				 8,  5,  5,  0,  3, 15, 15, 10, 13,  3,  0,  9, 14,  8,  9,  6,
-				 4, 11,  2,  8,  1, 12, 11,  7, 10,  1, 13, 14,  7,  2,  8, 13,
-				15,  6,  9, 15, 12,  0,  5,  9,  6, 10,  3,  4,  0,  5, 14,  3
-			),
-			array(
-				12, 10,  1, 15, 10,  4, 15,  2,  9,  7,  2, 12,  6,  9,  8,  5,
-				 0,  6, 13,  1,  3, 13,  4, 14, 14,  0,  7, 11,  5,  3, 11,  8,
-				 9,  4, 14,  3, 15,  2,  5, 12,  2,  9,  8,  5, 12, 15,  3, 10,
-				 7, 11,  0, 14,  4,  1, 10,  7,  1,  6, 13,  0, 11,  8,  6, 13
-			),
-			array(
-				 4, 13, 11,  0,  2, 11, 14,  7, 15,  4,  0,  9,  8,  1, 13, 10,
-				 3, 14, 12,  3,  9,  5,  7, 12,  5,  2, 10, 15,  6,  8,  1,  6,
-				 1,  6,  4, 11, 11, 13, 13,  8, 12,  1,  3,  4,  7, 10, 14,  7,
-				10,  9, 15,  5,  6,  0,  8, 15,  0, 14,  5,  2,  9,  3,  2, 12
-			),
-			array(
-				13,  1,  2, 15,  8, 13,  4,  8,  6, 10, 15,  3, 11,  7,  1,  4,
-				10, 12,  9,  5,  3,  6, 14, 11,  5,  0,  0, 14, 12,  9,  7,  2,
-				 7,  2, 11,  1,  4, 14,  1,  7,  9,  4, 12, 10, 14,  8,  2, 13,
-				 0, 15,  6, 12, 10,  9, 13,  0, 15,  3,  3,  5,  5,  6,  8, 11
-			)
-		);
-
-		$temp = unpack('Na/Nb', $block);
-		$block = array($temp['a'], $temp['b']);
-
-		// because php does arithmetic right shifts, if the most significant bits are set, right
-		// shifting those into the correct position will add 1's - not 0's.  this will intefere
-		// with the | operation unless a second & is done.  so we isolate these bits and left shift
-		// them into place.  we then & each block with 0x7FFFFFFF to prevennt 1's from being added
-		// for any other shifts.
-		$msb = array(
-			($block[0] >> 31) & 1,
-			($block[1] >> 31) & 1
-		);
-		$block[0] &= 0x7FFFFFFF;
-		$block[1] &= 0x7FFFFFFF;
-
-		// we isolate the appropriate bit in the appropriate integer and shift as appropriate.  in
-		// some cases, there are going to be multiple bits in the same integer that need to be shifted
-		// in the same way.  we combine those into one shift operation.
-		$block = array(
-			(($block[1] & 0x00000040) << 25) | (($block[1] & 0x00004000) << 16) |
-			(($block[1] & 0x00400001) <<  7) | (($block[1] & 0x40000100) >>  2) |
-			(($block[0] & 0x00000040) << 21) | (($block[0] & 0x00004000) << 12) |
-			(($block[0] & 0x00400001) <<  3) | (($block[0] & 0x40000100) >>  6) |
-			(($block[1] & 0x00000010) << 19) | (($block[1] & 0x00001000) << 10) |
-			(($block[1] & 0x00100000) <<  1) | (($block[1] & 0x10000000) >>  8) |
-			(($block[0] & 0x00000010) << 15) | (($block[0] & 0x00001000) <<  6) |
-			(($block[0] & 0x00100000) >>  3) | (($block[0] & 0x10000000) >> 12) |
-			(($block[1] & 0x00000004) << 13) | (($block[1] & 0x00000400) <<  4) |
-			(($block[1] & 0x00040000) >>  5) | (($block[1] & 0x04000000) >> 14) |
-			(($block[0] & 0x00000004) <<  9) | ( $block[0] & 0x00000400	   ) |
-			(($block[0] & 0x00040000) >>  9) | (($block[0] & 0x04000000) >> 18) |
-			(($block[1] & 0x00010000) >> 11) | (($block[1] & 0x01000000) >> 20) |
-			(($block[0] & 0x00010000) >> 15) | (($block[0] & 0x01000000) >> 24)
-		,
-			(($block[1] & 0x00000080) << 24) | (($block[1] & 0x00008000) << 15) |
-			(($block[1] & 0x00800002) <<  6) | (($block[0] & 0x00000080) << 20) |
-			(($block[0] & 0x00008000) << 11) | (($block[0] & 0x00800002) <<  2) |
-			(($block[1] & 0x00000020) << 18) | (($block[1] & 0x00002000) <<  9) |
-			( $block[1] & 0x00200000	   ) | (($block[1] & 0x20000000) >>  9) |
-			(($block[0] & 0x00000020) << 14) | (($block[0] & 0x00002000) <<  5) |
-			(($block[0] & 0x00200000) >>  4) | (($block[0] & 0x20000000) >> 13) |
-			(($block[1] & 0x00000008) << 12) | (($block[1] & 0x00000800) <<  3) |
-			(($block[1] & 0x00080000) >>  6) | (($block[1] & 0x08000000) >> 15) |
-			(($block[0] & 0x00000008) <<  8) | (($block[0] & 0x00000800) >>  1) |
-			(($block[0] & 0x00080000) >> 10) | (($block[0] & 0x08000000) >> 19) |
-			(($block[1] & 0x00000200) >>  3) | (($block[0] & 0x00000200) >>  7) |
-			(($block[1] & 0x00020000) >> 12) | (($block[1] & 0x02000000) >> 21) |
-			(($block[0] & 0x00020000) >> 16) | (($block[0] & 0x02000000) >> 25) |
-			($msb[1] << 28) | ($msb[0] << 24)
-		);
-
-		for ($i = 0; $i < 16; $i++)
-		{
-			// start of "the Feistel (F) function" - see the following URL:
-			// http://en.wikipedia.org/wiki/Image:Data_Encryption_Standard_InfoBox_Diagram.png
-			$temp = (($sbox[0][((($block[1] >> 27) & 0x1F) | (($block[1] & 1) << 5)) ^ $this->keys[$mode][$i][0]]) << 28)
-				  | (($sbox[1][(($block[1] & 0x1F800000) >> 23) ^ $this->keys[$mode][$i][1]]) << 24)
-				  | (($sbox[2][(($block[1] & 0x01F80000) >> 19) ^ $this->keys[$mode][$i][2]]) << 20)
-				  | (($sbox[3][(($block[1] & 0x001F8000) >> 15) ^ $this->keys[$mode][$i][3]]) << 16)
-				  | (($sbox[4][(($block[1] & 0x0001F800) >> 11) ^ $this->keys[$mode][$i][4]]) << 12)
-				  | (($sbox[5][(($block[1] & 0x00001F80) >>  7) ^ $this->keys[$mode][$i][5]]) <<  8)
-				  | (($sbox[6][(($block[1] & 0x000001F8) >>  3) ^ $this->keys[$mode][$i][6]]) <<  4)
-				  | ( $sbox[7][((($block[1] & 0x1F) << 1) | (($block[1] >> 31) & 1)) ^ $this->keys[$mode][$i][7]]);
-
-			$msb = ($temp >> 31) & 1;
-			$temp &= 0x7FFFFFFF;
-			$newBlock = (($temp & 0x00010000) << 15) | (($temp & 0x02020120) <<  5)
-					  | (($temp & 0x00001800) << 17) | (($temp & 0x01000000) >> 10)
-					  | (($temp & 0x00000008) << 24) | (($temp & 0x00100000) <<  6)
-					  | (($temp & 0x00000010) << 21) | (($temp & 0x00008000) <<  9)
-					  | (($temp & 0x00000200) << 12) | (($temp & 0x10000000) >> 27)
-					  | (($temp & 0x00000040) << 14) | (($temp & 0x08000000) >>  8)
-					  | (($temp & 0x00004000) <<  4) | (($temp & 0x00000002) << 16)
-					  | (($temp & 0x00442000) >>  6) | (($temp & 0x40800000) >> 15)
-					  | (($temp & 0x00000001) << 11) | (($temp & 0x20000000) >> 20)
-					  | (($temp & 0x00080000) >> 13) | (($temp & 0x00000004) <<  3)
-					  | (($temp & 0x04000000) >> 22) | (($temp & 0x00000480) >>  7)
-					  | (($temp & 0x00200000) >> 19) | ($msb << 23);
-			// end of "the Feistel (F) function" - $newBlock is F's output
-
-			$temp = $block[1];
-			$block[1] = $block[0] ^ $newBlock;
-			$block[0] = $temp;
-		}
-
-		$msb = array(
-			($block[0] >> 31) & 1,
-			($block[1] >> 31) & 1
-		);
-		$block[0] &= 0x7FFFFFFF;
-		$block[1] &= 0x7FFFFFFF;
-
-		$block = array(
-			(($block[0] & 0x01000004) <<  7) | (($block[1] & 0x01000004) <<  6) |
-			(($block[0] & 0x00010000) << 13) | (($block[1] & 0x00010000) << 12) |
-			(($block[0] & 0x00000100) << 19) | (($block[1] & 0x00000100) << 18) |
-			(($block[0] & 0x00000001) << 25) | (($block[1] & 0x00000001) << 24) |
-			(($block[0] & 0x02000008) >>  2) | (($block[1] & 0x02000008) >>  3) |
-			(($block[0] & 0x00020000) <<  4) | (($block[1] & 0x00020000) <<  3) |
-			(($block[0] & 0x00000200) << 10) | (($block[1] & 0x00000200) <<  9) |
-			(($block[0] & 0x00000002) << 16) | (($block[1] & 0x00000002) << 15) |
-			(($block[0] & 0x04000000) >> 11) | (($block[1] & 0x04000000) >> 12) |
-			(($block[0] & 0x00040000) >>  5) | (($block[1] & 0x00040000) >>  6) |
-			(($block[0] & 0x00000400) <<  1) | ( $block[1] & 0x00000400	   ) |
-			(($block[0] & 0x08000000) >> 20) | (($block[1] & 0x08000000) >> 21) |
-			(($block[0] & 0x00080000) >> 14) | (($block[1] & 0x00080000) >> 15) |
-			(($block[0] & 0x00000800) >>  8) | (($block[1] & 0x00000800) >>  9)
-		,
-			(($block[0] & 0x10000040) <<  3) | (($block[1] & 0x10000040) <<  2) |
-			(($block[0] & 0x00100000) <<  9) | (($block[1] & 0x00100000) <<  8) |
-			(($block[0] & 0x00001000) << 15) | (($block[1] & 0x00001000) << 14) |
-			(($block[0] & 0x00000010) << 21) | (($block[1] & 0x00000010) << 20) |
-			(($block[0] & 0x20000080) >>  6) | (($block[1] & 0x20000080) >>  7) |
-			( $block[0] & 0x00200000	   ) | (($block[1] & 0x00200000) >>  1) |
-			(($block[0] & 0x00002000) <<  6) | (($block[1] & 0x00002000) <<  5) |
-			(($block[0] & 0x00000020) << 12) | (($block[1] & 0x00000020) << 11) |
-			(($block[0] & 0x40000000) >> 15) | (($block[1] & 0x40000000) >> 16) |
-			(($block[0] & 0x00400000) >>  9) | (($block[1] & 0x00400000) >> 10) |
-			(($block[0] & 0x00004000) >>  3) | (($block[1] & 0x00004000) >>  4) |
-			(($block[0] & 0x00800000) >> 18) | (($block[1] & 0x00800000) >> 19) |
-			(($block[0] & 0x00008000) >> 12) | (($block[1] & 0x00008000) >> 13) |
-			($msb[0] <<  7) | ($msb[1] <<  6)
-		);
-
-		return pack('NN', $block[0], $block[1]);
-	}
-
-	/**
-	 * Creates the key schedule.
-	 *
-	 * @access private
-	 * @param String $key
-	 * @return Array
-	 */
-	function _prepare_key($key)
-	{
-		static $shifts = array( // number of key bits shifted per round
-			1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1
-		);
-
-		// pad the key and remove extra characters as appropriate.
-		$key = str_pad(substr($key, 0, 8), 8, chr(0));
-
-		$temp = unpack('Na/Nb', $key);
-		$key = array($temp['a'], $temp['b']);
-		$msb = array(
-			($key[0] >> 31) & 1,
-			($key[1] >> 31) & 1
-		);
-		$key[0] &= 0x7FFFFFFF;
-		$key[1] &= 0x7FFFFFFF;
-
-		$key = array(
-			(($key[1] & 0x00000002) << 26) | (($key[1] & 0x00000204) << 17) |
-			(($key[1] & 0x00020408) <<  8) | (($key[1] & 0x02040800) >>  1) |
-			(($key[0] & 0x00000002) << 22) | (($key[0] & 0x00000204) << 13) |
-			(($key[0] & 0x00020408) <<  4) | (($key[0] & 0x02040800) >>  5) |
-			(($key[1] & 0x04080000) >> 10) | (($key[0] & 0x04080000) >> 14) |
-			(($key[1] & 0x08000000) >> 19) | (($key[0] & 0x08000000) >> 23) |
-			(($key[0] & 0x00000010) >>  1) | (($key[0] & 0x00001000) >> 10) |
-			(($key[0] & 0x00100000) >> 19) | (($key[0] & 0x10000000) >> 28)
-		,
-			(($key[1] & 0x00000080) << 20) | (($key[1] & 0x00008000) << 11) |
-			(($key[1] & 0x00800000) <<  2) | (($key[0] & 0x00000080) << 16) |
-			(($key[0] & 0x00008000) <<  7) | (($key[0] & 0x00800000) >>  2) |
-			(($key[1] & 0x00000040) << 13) | (($key[1] & 0x00004000) <<  4) |
-			(($key[1] & 0x00400000) >>  5) | (($key[1] & 0x40000000) >> 14) |
-			(($key[0] & 0x00000040) <<  9) | ( $key[0] & 0x00004000	   ) |
-			(($key[0] & 0x00400000) >>  9) | (($key[0] & 0x40000000) >> 18) |
-			(($key[1] & 0x00000020) <<  6) | (($key[1] & 0x00002000) >>  3) |
-			(($key[1] & 0x00200000) >> 12) | (($key[1] & 0x20000000) >> 21) |
-			(($key[0] & 0x00000020) <<  2) | (($key[0] & 0x00002000) >>  7) |
-			(($key[0] & 0x00200000) >> 16) | (($key[0] & 0x20000000) >> 25) |
-			(($key[1] & 0x00000010) >>  1) | (($key[1] & 0x00001000) >> 10) |
-			(($key[1] & 0x00100000) >> 19) | (($key[1] & 0x10000000) >> 28) |
-			($msb[1] << 24) | ($msb[0] << 20)
-		); 
-
-		$keys = array();
-		for ($i = 0; $i < 16; $i++)
-		{
-			$key[0] <<= $shifts[$i];
-			$temp = ($key[0] & 0xF0000000) >> 28;
-			$key[0] = ($key[0] | $temp) & 0x0FFFFFFF;
-
-			$key[1] <<= $shifts[$i];
-			$temp = ($key[1] & 0xF0000000) >> 28;
-			$key[1] = ($key[1] | $temp) & 0x0FFFFFFF;
-
-			$temp = array(
-				(($key[1] & 0x00004000) >>  9) | (($key[1] & 0x00000800) >>  7) |
-				(($key[1] & 0x00020000) >> 14) | (($key[1] & 0x00000010) >>  2) |
-				(($key[1] & 0x08000000) >> 26) | (($key[1] & 0x00800000) >> 23)
-			,
-				(($key[1] & 0x02400000) >> 20) | (($key[1] & 0x00000001) <<  4) |
-				(($key[1] & 0x00002000) >> 10) | (($key[1] & 0x00040000) >> 18) |
-				(($key[1] & 0x00000080) >>  6)
-			,
-				( $key[1] & 0x00000020	   ) | (($key[1] & 0x00000200) >>  5) |
-				(($key[1] & 0x00010000) >> 13) | (($key[1] & 0x01000000) >> 22) |
-				(($key[1] & 0x00000004) >>  1) | (($key[1] & 0x00100000) >> 20)
-			,
-				(($key[1] & 0x00001000) >>  7) | (($key[1] & 0x00200000) >> 17) |
-				(($key[1] & 0x00000002) <<  2) | (($key[1] & 0x00000100) >>  6) |
-				(($key[1] & 0x00008000) >> 14) | (($key[1] & 0x04000000) >> 26)
-			,
-				(($key[0] & 0x00008000) >> 10) | ( $key[0] & 0x00000010	   ) |
-				(($key[0] & 0x02000000) >> 22) | (($key[0] & 0x00080000) >> 17) |
-				(($key[0] & 0x00000200) >>  8) | (($key[0] & 0x00000002) >>  1)
-			,
-				(($key[0] & 0x04000000) >> 21) | (($key[0] & 0x00010000) >> 12) |
-				(($key[0] & 0x00000020) >>  2) | (($key[0] & 0x00000800) >>  9) |
-				(($key[0] & 0x00800000) >> 22) | (($key[0] & 0x00000100) >>  8)
-			,
-				(($key[0] & 0x00001000) >>  7) | (($key[0] & 0x00000088) >>  3) |
-				(($key[0] & 0x00020000) >> 14) | (($key[0] & 0x00000001) <<  2) |
-				(($key[0] & 0x00400000) >> 21)
-			,
-				(($key[0] & 0x00000400) >>  5) | (($key[0] & 0x00004000) >> 10) |
-				(($key[0] & 0x00000040) >>  3) | (($key[0] & 0x00100000) >> 18) |
-				(($key[0] & 0x08000000) >> 26) | (($key[0] & 0x01000000) >> 24)
-			);
-
-			$keys[] = $temp;
-		}
-
-		$temp = array(
-			CRYPT_DES_ENCRYPT => $keys,
-			CRYPT_DES_DECRYPT => array_reverse($keys)
-		);
-
-		return $temp;
-	}
-}
-
-
-
-/**
- * Pure-PHP implementation of Triple DES.
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- * @version 0.1.0
- * @access  public
- * @package Crypt_TerraDES
- */
-class tripledes
-{
-	/**
-	 * The Three Keys
-	 *
-	 * @see tripledes::setKey()
-	 * @var String
-	 * @access private
-	 */
-	var $key = "\0\0\0\0\0\0\0\0";
-
-	/**
-	 * The Encryption Mode
-	 *
-	 * @see tripledes::tripledes()
-	 * @var Integer
-	 * @access private
-	 */
-	var $mode = CRYPT_DES_MODE_CBC;
-
-	/**
-	 * Continuous Buffer status
-	 *
-	 * @see tripledes::enableContinuousBuffer()
-	 * @var Boolean
-	 * @access private
-	 */
-	var $continuousBuffer = false;
-
-	/**
-	 * Padding status
-	 *
-	 * @see tripledes::enablePadding()
-	 * @var Boolean
-	 * @access private
-	 */
-	var $padding = true;
-
-	/**
-	 * The Initialization Vector
-	 *
-	 * @see tripledes::setIV()
-	 * @var String
-	 * @access private
-	 */
-	var $iv = "\0\0\0\0\0\0\0\0";
-
-	/**
-	 * A "sliding" Initialization Vector
-	 *
-	 * @see tripledes::enableContinuousBuffer()
-	 * @var String
-	 * @access private
-	 */
-	var $encryptIV = "\0\0\0\0\0\0\0\0";
-
-	/**
-	 * A "sliding" Initialization Vector
-	 *
-	 * @see tripledes::enableContinuousBuffer()
-	 * @var String
-	 * @access private
-	 */
-	var $decryptIV = "\0\0\0\0\0\0\0\0";
-
-	/**
-	 * MCrypt parameters
-	 *
-	 * @see tripledes::setMCrypt()
-	 * @var Array
-	 * @access private
-	 */
-	var $mcrypt = array('', '');
-
-	/**
-	 * The des objects
-	 *
-	 * @var Array
-	 * @access private
-	 */
-	var $des;
-
-	/**
-	 * Default Constructor.
-	 *
-	 * Determines whether or not the mcrypt extension should be used.  $mode should only, at present, be
-	 * CRYPT_DES_MODE_ECB or CRYPT_DES_MODE_CBC.  If not explictly set, CRYPT_DES_MODE_CBC will be used.
-	 *
-	 * @param optional Integer $mode
-	 * @return tripledes
-	 * @access public
-	 */
-	function __construct($mode = CRYPT_DES_MODE_CBC)
-	{
-		if ( !defined('CRYPT_DES_MODE') )
-		{
-			switch (true)
-			{
-				case extension_loaded('mcrypt'):
-					// i'd check to see if des was supported, by doing in_array('des', mcrypt_list_algorithms('')),
-					// but since that can be changed after the object has been created, there doesn't seem to be
-					// a lot of point...
-					define('CRYPT_DES_MODE', CRYPT_DES_MODE_MCRYPT);
-					break;
-				default:
-					define('CRYPT_DES_MODE', CRYPT_DES_MODE_INTERNAL);
-			}
-		}
-
-		if ( $mode == CRYPT_DES_MODE_3CBC )
-		{
-			$this->mode = CRYPT_DES_MODE_3CBC;
-			$this->des = array(
-				new des(CRYPT_DES_MODE_CBC),
-				new des(CRYPT_DES_MODE_CBC),
-				new des(CRYPT_DES_MODE_CBC)
-			);
-
-			// we're going to be doing the padding, ourselves, so disable it in the des objects
-			$this->des[0]->disable_padding();
-			$this->des[1]->disable_padding();
-			$this->des[2]->disable_padding();
-
-			return;
-		}
-
-		switch ( CRYPT_DES_MODE )
-		{
-			case CRYPT_DES_MODE_MCRYPT:
-				switch ($mode)
-				{
-					case CRYPT_DES_MODE_ECB:
-						$this->mode = MCRYPT_MODE_ECB;	break;
-					case CRYPT_DES_MODE_CBC:
-					default:
-						$this->mode = MCRYPT_MODE_CBC;
-				}
-
-				break;
-			default:
-				$this->des = array(
-					new des(CRYPT_DES_MODE_ECB),
-					new des(CRYPT_DES_MODE_ECB),
-					new des(CRYPT_DES_MODE_ECB)
-				);
- 
-				// we're going to be doing the padding, ourselves, so disable it in the des objects
-				$this->des[0]->disable_padding();
-				$this->des[1]->disable_padding();
-				$this->des[2]->disable_padding();
-
-				switch ($mode)
-				{
-					case CRYPT_DES_MODE_ECB:
-					case CRYPT_DES_MODE_CBC:
-						$this->mode = $mode;
-						break;
-					default:
-						$this->mode = CRYPT_DES_MODE_CBC;
-				}
-		}
-	}
-
-	/**
-	 * Sets the key.
-	 *
-	 * Keys can be of any length.  Triple DES, itself, can use 128-bit (eg. strlen($key) == 16) or
-	 * 192-bit (eg. strlen($key) == 24) keys.  This function pads and truncates $key as appropriate.
-	 *
-	 * DES also requires that every eighth bit be a parity bit, however, we'll ignore that.
-	 *
-	 * If the key is not explicitly set, it'll be assumed to be all zero's.
-	 *
-	 * @access public
-	 * @param String $key
-	 */
-	function set_key($key)
-	{
-		$length = strlen($key);
-		if ($length > 8)
-		{
-			$key = str_pad($key, 24, chr(0));
-			// if $key is between 64 and 128-bits, use the first 64-bits as the last, per this:
-			// http://php.net/function.mcrypt-encrypt#47973
-			$key = $length <= 16 ? substr_replace($key, substr($key, 0, 8), 16) : substr($key, 0, 24);
-		}
-		$this->key = $key;
-		switch (true)
-		{
-			case CRYPT_DES_MODE == CRYPT_DES_MODE_INTERNAL:
-			case $this->mode == CRYPT_DES_MODE_3CBC:
-				$this->des[0]->set_key(substr($key,  0, 8));
-				$this->des[1]->set_key(substr($key,  8, 8));
-				$this->des[2]->set_key(substr($key, 16, 8));
-		}
-	}
-
-	/**
-	 * Sets the initialization vector. (optional)
-	 *
-	 * SetIV is not required when CRYPT_DES_MODE_ECB is being used.  If not explictly set, it'll be assumed
-	 * to be all zero's.
-	 *
-	 * @access public
-	 * @param String $iv
-	 */
-	function set_iv($iv)
-	{
-		$this->encryptIV = $this->decryptIV = $this->iv = str_pad(substr($iv, 0, 8), 8, chr(0));
-		if ($this->mode == CRYPT_DES_MODE_3CBC)
-		{
-			$this->des[0]->set_iv($iv);
-			$this->des[1]->set_iv($iv);
-			$this->des[2]->set_iv($iv);
-		}
-	}
-
-	/**
-	 * Sets MCrypt parameters. (optional)
-	 *
-	 * If MCrypt is being used, empty strings will be used, unless otherwise specified.
-	 *
-	 * @link http://php.net/function.mcrypt-module-open#function.mcrypt-module-open
-	 * @access public
-	 * @param optional Integer $algorithm_directory
-	 * @param optional Integer $mode_directory
-	 */
-	function set_mcrypt($algorithm_directory = '', $mode_directory = '')
-	{
-		$this->mcrypt = array($algorithm_directory, $mode_directory);
-		if ( $this->mode == CRYPT_DES_MODE_3CBC )
-		{
-			$this->des[0]->set_mcrypt($algorithm_directory, $mode_directory);
-			$this->des[1]->set_mcrypt($algorithm_directory, $mode_directory);
-			$this->des[2]->set_mcrypt($algorithm_directory, $mode_directory);
-		}
-	}
-
-	/**
-	 * Encrypts a message.
-	 *
-	 * @access public
-	 * @param String $plaintext
-	 */
-	function encrypt($plaintext)
-	{
-		$plaintext = $this->_pad($plaintext);
-
-		// if the key is smaller then 8, do what we'd normally do
-		if ($this->mode == CRYPT_DES_MODE_3CBC && strlen($this->key) > 8)
-		{
-			$ciphertext = $this->des[2]->encrypt($this->des[1]->decrypt($this->des[0]->encrypt($plaintext)));
-
-			return $ciphertext;
-		}
-
-		if ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT )
-		{
-			$td = mcrypt_module_open(MCRYPT_3DES, $this->mcrypt[0], $this->mode, $this->mcrypt[1]);
-			mcrypt_generic_init($td, $this->key, $this->encryptIV);
-
-			$ciphertext = mcrypt_generic($td, $plaintext);
-
-			mcrypt_generic_deinit($td);
-			mcrypt_module_close($td);
-
-			if ($this->continuousBuffer)
-			{
-				$this->encryptIV = substr($ciphertext, -8);
-			}
-
-			return $ciphertext;
-		}
-
-		if (strlen($this->key) <= 8)
-		{
-			$this->des[0]->mode = $this->mode;
-
-			return $this->des[0]->encrypt($plaintext);
-		}
-
-		// we pad with chr(0) since that's what mcrypt_generic does.  to quote from http://php.net/function.mcrypt-generic :
-		// "The data is padded with "\0" to make sure the length of the data is n * blocksize."
-		$plaintext = str_pad($plaintext, ceil(strlen($plaintext) / 8) * 8, chr(0));
-
-		$ciphertext = '';
-		switch ($this->mode)
-		{
-			case CRYPT_DES_MODE_ECB:
-				for ($i = 0; $i < strlen($plaintext); $i+=8)
-				{
-					$block = substr($plaintext, $i, 8);
-					$block = $this->des[0]->_process_block($block, CRYPT_DES_ENCRYPT);
-					$block = $this->des[1]->_process_block($block, CRYPT_DES_DECRYPT);
-					$block = $this->des[2]->_process_block($block, CRYPT_DES_ENCRYPT);
-					$ciphertext.= $block;
-				}
-				break;
-			case CRYPT_DES_MODE_CBC:
-				$xor = $this->encryptIV;
-				for ($i = 0; $i < strlen($plaintext); $i+=8)
-				{
-					$block = substr($plaintext, $i, 8) ^ $xor;
-					$block = $this->des[0]->_process_block($block, CRYPT_DES_ENCRYPT);
-					$block = $this->des[1]->_process_block($block, CRYPT_DES_DECRYPT);
-					$block = $this->des[2]->_process_block($block, CRYPT_DES_ENCRYPT);
-					$xor = $block;
-					$ciphertext.= $block;
-				}
-				if ($this->continuousBuffer)
-				{
-					$this->encryptIV = $xor;
-				}
-		}
-
-		return $ciphertext;
-	}
-
-	/**
-	 * Decrypts a message.
-	 *
-	 * @access public
-	 * @param String $ciphertext
-	 */
-	function decrypt($ciphertext)
-	{
-		if ($this->mode == CRYPT_DES_MODE_3CBC && strlen($this->key) > 8)
-		{
-			$plaintext = $this->des[0]->decrypt($this->des[1]->encrypt($this->des[2]->decrypt($ciphertext)));
-
-			return $this->_unpad($plaintext);
-		}
-
-		// we pad with chr(0) since that's what mcrypt_generic does.  to quote from http://php.net/function.mcrypt-generic :
-		// "The data is padded with "\0" to make sure the length of the data is n * blocksize."
-		$ciphertext = str_pad($ciphertext, (strlen($ciphertext) + 7) & 0xFFFFFFF8, chr(0));
-
-		if ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT )
-		{
-			$td = mcrypt_module_open(MCRYPT_3DES, $this->mcrypt[0], $this->mode, $this->mcrypt[1]);
-			mcrypt_generic_init($td, $this->key, $this->decryptIV);
-
-			$plaintext = mdecrypt_generic($td, $ciphertext);
-
-			mcrypt_generic_deinit($td);
-			mcrypt_module_close($td);
-
-			if ($this->continuousBuffer)
-			{
-				$this->decryptIV = substr($ciphertext, -8);
-			}
-
-			return $this->_unpad($plaintext);
-		}
-
-		if (strlen($this->key) <= 8)
-		{
-			$this->des[0]->mode = $this->mode;
-
-			return $this->_unpad($this->des[0]->decrypt($plaintext));
-		}
-
-		$plaintext = '';
-		switch ($this->mode)
-		{
-			case CRYPT_DES_MODE_ECB:
-				for ($i = 0; $i < strlen($ciphertext); $i+=8)
-				{
-					$block = substr($ciphertext, $i, 8);
-					$block = $this->des[2]->_process_block($block, CRYPT_DES_DECRYPT);
-					$block = $this->des[1]->_process_block($block, CRYPT_DES_ENCRYPT);
-					$block = $this->des[0]->_process_block($block, CRYPT_DES_DECRYPT);
-					$plaintext.= $block;
-				}
-				break;
-			case CRYPT_DES_MODE_CBC:
-				$xor = $this->decryptIV;
-				for ($i = 0; $i < strlen($ciphertext); $i+=8)
-				{
-					$orig = $block = substr($ciphertext, $i, 8);
-					$block = $this->des[2]->_process_block($block, CRYPT_DES_DECRYPT);
-					$block = $this->des[1]->_process_block($block, CRYPT_DES_ENCRYPT);
-					$block = $this->des[0]->_process_block($block, CRYPT_DES_DECRYPT);
-					$plaintext.= $block ^ $xor;
-					$xor = $orig;
-				}
-				if ($this->continuousBuffer)
-				{
-					$this->decryptIV = $xor;
-				}
-		}
-
-		return $this->_unpad($plaintext);
-	}
-
-	/**
-	 * Treat consecutive "packets" as if they are a continuous buffer.
-	 *
-	 * Say you have a 16-byte plaintext $plaintext.  Using the default behavior, the two following code snippets
-	 * will yield different outputs:
-	 *
-	 * <code>
-	 *	echo $des->encrypt(substr($plaintext, 0, 8));
-	 *	echo $des->encrypt(substr($plaintext, 8, 8));
-	 * </code>
-	 * <code>
-	 *	echo $des->encrypt($plaintext);
-	 * </code>
-	 *
-	 * The solution is to enable the continuous buffer.  Although this will resolve the above discrepancy, it creates
-	 * another, as demonstrated with the following:
-	 *
-	 * <code>
-	 *	$des->encrypt(substr($plaintext, 0, 8));
-	 *	echo $des->decrypt($des->encrypt(substr($plaintext, 8, 8)));
-	 * </code>
-	 * <code>
-	 *	echo $des->decrypt($des->encrypt(substr($plaintext, 8, 8)));
-	 * </code>
-	 *
-	 * With the continuous buffer disabled, these would yield the same output.  With it enabled, they yield different
-	 * outputs.  The reason is due to the fact that the initialization vector's change after every encryption /
-	 * decryption round when the continuous buffer is enabled.  When it's disabled, they remain constant.
-	 *
-	 * Put another way, when the continuous buffer is enabled, the state of the des() object changes after each
-	 * encryption / decryption round, whereas otherwise, it'd remain constant.  For this reason, it's recommended that
-	 * continuous buffers not be used.  They do offer better security and are, in fact, sometimes required (SSH uses them),
-	 * however, they are also less intuitive and more likely to cause you problems.
-	 *
-	 * @see tripledes::disableContinuousBuffer()
-	 * @access public
-	 */
-	function enable_continuous_buffer()
-	{
-		$this->continuousBuffer = true;
-		if ($this->mode == CRYPT_DES_MODE_3CBC)
-		{
-			$this->des[0]->enable_continuous_buffer();
-			$this->des[1]->enable_continuous_buffer();
-			$this->des[2]->enable_continuous_buffer();
-		}
-	}
-
-	/**
-	 * Treat consecutive packets as if they are a discontinuous buffer.
-	 *
-	 * The default behavior.
-	 *
-	 * @see tripledes::enableContinuousBuffer()
-	 * @access public
-	 */
-	function disable_continuous_buffer()
-	{
-		$this->continuousBuffer = false;
-		$this->encryptIV = $this->iv;
-		$this->decryptIV = $this->iv;
-
-		if ($this->mode == CRYPT_DES_MODE_3CBC)
-		{
-			$this->des[0]->disable_continuous_buffer();
-			$this->des[1]->disable_continuous_buffer();
-			$this->des[2]->disable_continuous_buffer();
-		}
-	}
-
-	/**
-	 * Pad "packets".
-	 *
-	 * DES works by encrypting eight bytes at a time.  If you ever need to encrypt or decrypt something that's not
-	 * a multiple of eight, it becomes necessary to pad the input so that it's length is a multiple of eight.
-	 *
-	 * Padding is enabled by default.  Sometimes, however, it is undesirable to pad strings.  Such is the case in SSH1,
-	 * where "packets" are padded with random bytes before being encrypted.  Unpad these packets and you risk stripping
-	 * away characters that shouldn't be stripped away. (SSH knows how many bytes are added because the length is
-	 * transmitted separately)
-	 *
-	 * @see tripledes::disable_padding()
-	 * @access public
-	 */
-	function enable_padding()
-	{
-		$this->padding = true;
-	}
-
-	/**
-	 * Do not pad packets.
-	 *
-	 * @see tripledes::enablePadding()
-	 * @access public
-	 */
-	function disable_padding()
-	{
-		$this->padding = false;
-	}
-
-	/**
-	 * Pads a string
-	 *
-	 * Pads a string using the RSA PKCS padding standards so that its length is a multiple of the blocksize (8).
-	 * 8 - (strlen($text) & 7) bytes are added, each of which is equal to chr(8 - (strlen($text) & 7)
-	 *
-	 * If padding is disabled and $text is not a multiple of the blocksize, the string will be padded regardless
-	 * and padding will, hence forth, be enabled.
-	 *
-	 * @see tripledes::_unpad()
-	 * @access private
-	 */
-	function _pad($text)
-	{
-		$length = strlen($text);
-
-		if (!$this->padding)
-		{
-			if (($length & 7) == 0)
-			{
-				return $text;
-			}
-			else
-			{
-				$this->padding = true;
-			}
-		}
-
-		$pad = 8 - ($length & 7);
-		return str_pad($text, $length + $pad, chr($pad));
-	}
-
-	/**
-	 * Unpads a string
-	 *
-	 * If padding is enabled and the reported padding length exceeds the block size, padding will be, hence forth, disabled.
-	 *
-	 * @see tripledes::_pad()
-	 * @access private
-	 */
-	function _unpad($text)
-	{
-		if (!$this->padding)
-		{
-			return $text;
-		}
-
-		$length = ord($text[strlen($text) - 1]);
-
-		if ($length > 8)
-		{
-			$this->padding = false;
-			return $text;
-		}
-
-		return substr($text, 0, -$length);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/libraries/sftp/hash.php b/phpBB/includes/libraries/sftp/hash.php
deleted file mode 100644
index eb048f5d28..0000000000
--- a/phpBB/includes/libraries/sftp/hash.php
+++ /dev/null
@@ -1,278 +0,0 @@
-<?php
-/**
-*
-* @package sftp
-* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Code from http://phpseclib.sourceforge.net/
-*
-* Modified by phpBB Group to meet our coding standards
-* and being able to integrate into phpBB
-*
-* Pure-PHP implementations of keyed-hash message authentication codes (HMACs) and various cryptographic hashing functions.
-*
-* Copyright 2007-2009 TerraFrost <terrafrost@php.net>
-* Copyright 2009+ phpBB
-*
-* @package sftp
-* @author  TerraFrost <terrafrost@php.net>
-*/
-
-/**#@+
- * @access private
- * @see hash::__construct()
- */
-/**
- * Toggles the internal implementation
- */
-define('CRYPT_HASH_MODE_INTERNAL', 1);
-/**
- * Toggles the mhash() implementation, which has been deprecated on PHP 5.3.0+.
- */
-define('CRYPT_HASH_MODE_MHASH',	2);
-/**
- * Toggles the hash() implementation, which works on PHP 5.1.2+.
- */
-define('CRYPT_HASH_MODE_HASH',	 3);
-/**#@-*/
-
-/**
- * Pure-PHP implementations of keyed-hash message authentication codes (HMACs) and various cryptographic hashing functions.
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- * @version 0.1.0
- * @access  public
- * @package hash
- */
-class hash
-{
-	/**
-	 * Byte-length of compression blocks / key (Internal HMAC)
-	 *
-	 * @see hash::set_algorithm()
-	 * @var Integer
-	 * @access private
-	 */
-	var $b;
-
-	/**
-	 * Byte-length of hash output (Internal HMAC)
-	 *
-	 * @see hash::set_hash()
-	 * @var Integer
-	 * @access private
-	 */
-	var $l;
-
-	/**
-	 * Hash Algorithm
-	 *
-	 * @see hash::set_hash()
-	 * @var String
-	 * @access private
-	 */
-	var $hash;
-
-	/**
-	 * Key
-	 *
-	 * @see hash::setKey()
-	 * @var String
-	 * @access private
-	 */
-	var $key = '';
-
-	/**
-	 * Outer XOR (Internal HMAC)
-	 *
-	 * @see hash::setKey()
-	 * @var String
-	 * @access private
-	 */
-	var $opad;
-
-	/**
-	 * Inner XOR (Internal HMAC)
-	 *
-	 * @see hash::setKey()
-	 * @var String
-	 * @access private
-	 */
-	var $ipad;
-
-	/**
-	 * Default Constructor.
-	 *
-	 * @param optional String $hash
-	 * @return hash
-	 * @access public
-	 */
-	function __construct($hash = 'sha1')
-	{
-		if ( !defined('CRYPT_HASH_MODE') )
-		{
-			switch (true)
-			{
-				case extension_loaded('hash'):
-					define('CRYPT_HASH_MODE', CRYPT_HASH_MODE_HASH);
-					break;
-				case extension_loaded('mhash'):
-					define('CRYPT_HASH_MODE', CRYPT_HASH_MODE_MHASH);
-					break;
-				default:
-					define('CRYPT_HASH_MODE', CRYPT_HASH_MODE_INTERNAL);
-			}
-		}
-
-		$this->set_hash($hash);
-	}
-
-	/**
-	 * Sets the key for HMACs
-	 *
-	 * Keys can be of any length.
-	 *
-	 * @access public
-	 * @param String $key
-	 */
-	function set_key($key)
-	{
-		$this->key = $key;
-	}
-
-	/**
-	 * Sets the hash function.
-	 *
-	 * @access public
-	 * @param String $hash
-	 */
-	function set_hash($hash)
-	{
-		switch ($hash)
-		{
-			case 'md5-96':
-			case 'sha1-96':
-				$this->l = 12; // 96 / 8 = 12
-				break;
-			case 'md5':
-				$this->l = 16;
-				break;
-			case 'sha1':
-				$this->l = 20;
-		}
-
-		switch (CRYPT_HASH_MODE)
-		{
-			case CRYPT_HASH_MODE_MHASH:
-				switch ($hash)
-				{
-					case 'md5':
-					case 'md5-96':
-						$this->hash = MHASH_MD5;
-						break;
-					case 'sha1':
-					case 'sha1-96':
-					default:
-						$this->hash = MHASH_SHA1;
-				}
-				return;
-			case CRYPT_HASH_MODE_HASH:
-				switch ($hash)
-				{
-					case 'md5':
-					case 'md5-96':
-						$this->hash = 'md5';
-						return;
-					case 'sha1':
-					case 'sha1-96':
-					default:
-						$this->hash = 'sha1';
-				}
-				return;
-		}
-
-		switch ($hash)
-		{
-			case 'md5':
-			case 'md5-96':
-				 $this->b = 64;
-				 $this->hash = 'md5';
-				 break;
-			case 'sha1':
-			case 'sha1-96':
-			default:
-				 $this->b = 64;
-				 $this->hash = 'sha1';
-		}
-
-		$this->ipad = str_repeat(chr(0x36), $this->b);
-		$this->opad = str_repeat(chr(0x5C), $this->b);
-	}
-
-	/**
-	 * Compute the HMAC.
-	 *
-	 * @access public
-	 * @param String $text
-	 */
-	function create($text)
-	{
-		if (!empty($this->key))
-		{
-			switch (CRYPT_HASH_MODE)
-			{
-				case CRYPT_HASH_MODE_MHASH:
-					$output = mhash($this->hash, $text, $this->key);
-					break;
-				case CRYPT_HASH_MODE_HASH:
-					$output = hash_hmac($this->hash, $text, $this->key, true);
-					break;
-				case CRYPT_HASH_MODE_INTERNAL:
-					$hash = $this->hash;
-					/* "Applications that use keys longer than B bytes will first hash the key using H and then use the
-						resultant L byte string as the actual key to HMAC."
-
-						-- http://tools.ietf.org/html/rfc2104#section-2 */
-					$key = strlen($this->key) > $this->b ? $hash($this->key) : $this->key;
-
-					$key	= str_pad($key, $this->b, chr(0));// step 1
-					$temp   = $this->ipad ^ $key;			 // step 2
-					$temp  .= $text;						  // step 3
-					$temp   = pack('H*', $hash($temp));	   // step 4
-					$output = $this->opad ^ $key;			 // step 5
-					$output.= $temp;						  // step 6
-					$output = pack('H*', $hash($output));	 // step 7
-			}
-		}
-		else
-		{
-			switch (CRYPT_HASH_MODE)
-			{
-				case CRYPT_HASH_MODE_MHASH:
-					$output = mhash($this->hash, $text);
-					break;
-				case CRYPT_HASH_MODE_MHASH:
-					$output = hash($this->hash, $text, true);
-					break;
-				case CRYPT_HASH_MODE_INTERNAL:
-					$hash = $this->hash;
-					$output = pack('H*', $hash($output));
-			}
-		}
-
-		return substr($output, 0, $this->l);
-	}
-}
-\ No newline at end of file
diff --git a/phpBB/includes/libraries/sftp/random.php b/phpBB/includes/libraries/sftp/random.php
deleted file mode 100644
index cfc7ef0bc7..0000000000
--- a/phpBB/includes/libraries/sftp/random.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
-*
-* @package sftp
-* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Code from http://phpseclib.sourceforge.net/
-*
-* Modified by phpBB Group to meet our coding standards
-* and being able to integrate into phpBB
-*
-* Copyright 2007-2009 TerraFrost <terrafrost@php.net>
-* Copyright 2009+ phpBB
-*
-* @package sftp
-* @author  TerraFrost <terrafrost@php.net>
-*/
-
-/**
- * Generate a random value.  Feel free to replace this function with a cryptographically secure PRNG.
- *
- * @param optional Integer $min
- * @param optional Integer $max
- * @param optional String $randomness_path
- * @return Integer
- * @access public
- */
-function crypt_random($min = 0, $max = 0x7FFFFFFF, $randomness_path = '/dev/urandom')
-{
-	static $seeded = false;
-
-	if (!$seeded)
-	{
-		$seeded = true;
-		if (file_exists($randomness_path))
-		{
-			$fp = fopen($randomness_path, 'r');
-			$temp = unpack('Nint', fread($fp, 4));
-			mt_srand($temp['int']);
-			fclose($fp);
-		}
-		else
-		{
-			list($sec, $usec) = explode(' ', microtime());
-			mt_srand((float) $sec + ((float) $usec * 100000));
-		}
-	}
-
-	return mt_rand($min, $max);
-}
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/libraries/sftp/rc4.php b/phpBB/includes/libraries/sftp/rc4.php
deleted file mode 100644
index 88a5c2f345..0000000000
--- a/phpBB/includes/libraries/sftp/rc4.php
+++ /dev/null
@@ -1,490 +0,0 @@
-<?php
-/**
-*
-* @package sftp
-* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Code from http://phpseclib.sourceforge.net/
-*
-* Modified by phpBB Group to meet our coding standards
-* and being able to integrate into phpBB
-*
-* Pure-PHP implementation of RC4
-*
-* Copyright 2007-2009 TerraFrost <terrafrost@php.net>
-* Copyright 2009+ phpBB
-*
-* @package sftp
-* @author  TerraFrost <terrafrost@php.net>
-*/
-
-/**#@+
- * @access private
- * @see rc4::__construct()
- */
-/**
- * Toggles the internal implementation
- */
-define('CRYPT_RC4_MODE_INTERNAL', 1);
-/**
- * Toggles the mcrypt implementation
- */
-define('CRYPT_RC4_MODE_MCRYPT', 2);
-/**#@-*/
-
-/**#@+
- * @access private
- * @see rc4::_crypt()
- */
-define('CRYPT_RC4_ENCRYPT', 0);
-define('CRYPT_RC4_DECRYPT', 1);
-/**#@-*/
-
-/**
- * Pure-PHP implementation of RC4.
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- * @version 0.1.0
- * @access  public
- * @package rc4
- */
-class rc4
-{
-	/**
-	 * The Key
-	 *
-	 * @see rc4::set_key()
-	 * @var String
-	 * @access private
-	 */
-	var $key = "\0";
-
-	/**
-	 * The Key Stream for encryption
-	 *
-	 * If CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT, this will be equal to the mcrypt object
-	 *
-	 * @see rc4::set_key()
-	 * @var Array
-	 * @access private
-	 */
-	var $encryptStream = false;
-
-	/**
-	 * The Key Stream for decryption
-	 *
-	 * If CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT, this will be equal to the mcrypt object
-	 *
-	 * @see rc4::set_key()
-	 * @var Array
-	 * @access private
-	 */
-	var $decryptStream = false;
-
-	/**
-	 * The $i and $j indexes for encryption
-	 *
-	 * @see rc4::_crypt()
-	 * @var Integer
-	 * @access private
-	 */
-	var $encryptIndex = 0;
-
-	/**
-	 * The $i and $j indexes for decryption
-	 *
-	 * @see rc4::_crypt()
-	 * @var Integer
-	 * @access private
-	 */
-	var $decryptIndex = 0;
-
-	/**
-	 * MCrypt parameters
-	 *
-	 * @see rc4::set_mcrypt()
-	 * @var Array
-	 * @access private
-	 */
-	var $mcrypt = array('', '');
-
-	/**
-	 * The Encryption Algorithm
-	 *
-	 * Only used if CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT.  Only possible values are MCRYPT_RC4 or MCRYPT_ARCFOUR.
-	 *
-	 * @see rc4::__construct()
-	 * @var Integer
-	 * @access private
-	 */
-	var $mode;
-
-	/**
-	 * Default Constructor.
-	 *
-	 * Determines whether or not the mcrypt extension should be used.
-	 *
-	 * @param optional Integer $mode
-	 * @return rc4
-	 * @access public
-	 */
-	function __construct()
-	{
-		if ( !defined('CRYPT_RC4_MODE') )
-		{
-			switch (true)
-			{
-				case extension_loaded('mcrypt') && (defined('MCRYPT_ARCFOUR') || defined('MCRYPT_RC4')):
-					// i'd check to see if rc4 was supported, by doing in_array('arcfour', mcrypt_list_algorithms('')),
-					// but since that can be changed after the object has been created, there doesn't seem to be
-					// a lot of point...
-					define('CRYPT_RC4_MODE', CRYPT_RC4_MODE_MCRYPT);
-					break;
-				default:
-					define('CRYPT_RC4_MODE', CRYPT_RC4_MODE_INTERNAL);
-			}
-		}
-
-		switch ( CRYPT_RC4_MODE )
-		{
-			case CRYPT_RC4_MODE_MCRYPT:
-				switch (true)
-				{
-					case defined('MCRYPT_ARCFOUR'):
-						$this->mode = MCRYPT_ARCFOUR;
-						break;
-					case defined('MCRYPT_RC4');
-						$this->mode = MCRYPT_RC4;
-				}
-		}
-	}
-
-	/**
-	 * Sets the key.
-	 *
-	 * Keys can be between 1 and 256 bytes long.  If they are longer then 256 bytes, the first 256 bytes will
-	 * be used.  If no key is explicitly set, it'll be assumed to be a single null byte.
-	 *
-	 * @access public
-	 * @param String $key
-	 */
-	function set_key($key)
-	{
-		$this->key = $key;
-
-		if (CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT)
-		{
-			return;
-		}
-
-		$keyLength = strlen($key);
-		$keyStream = array();
-		for ($i = 0; $i < 256; $i++)
-		{
-			$keyStream[$i] = $i;
-		}
-		$j = 0;
-		for ($i = 0; $i < 256; $i++)
-		{
-			$j = ($j + $keyStream[$i] + ord($key[$i % $keyLength])) & 255;
-			$temp = $keyStream[$i];
-			$keyStream[$i] = $keyStream[$j];
-			$keyStream[$j] = $temp;
-		}
-
-		$this->encryptIndex = $this->decryptIndex = array(0, 0);
-		$this->encryptStream = $this->decryptStream = $keyStream;
-	}
-
-	/**
-	 * Dummy function.
-	 *
-	 * Some protocols, such as WEP, prepend an "initialization vector" to the key, effectively creating a new key [1].
-	 * If you need to use an initialization vector in this manner, feel free to prepend it to the key, yourself, before
-	 * calling set_key().
-	 *
-	 * [1] WEP's initialization vectors (IV's) are used in a somewhat insecure way.  Since, in that protocol,
-	 * the IV's are relatively easy to predict, an attack described by
-	 * {@link http://www.drizzle.com/~aboba/IEEE/rc4_ksaproc.pdf Scott Fluhrer, Itsik Mantin, and Adi Shamir}
-	 * can be used to quickly guess at the rest of the key.  The following links elaborate:
-	 *
-	 * {@link http://www.rsa.com/rsalabs/node.asp?id=2009 http://www.rsa.com/rsalabs/node.asp?id=2009}
-	 * {@link http://en.wikipedia.org/wiki/Related_key_attack http://en.wikipedia.org/wiki/Related_key_attack}
-	 *
-	 * @param String $iv
-	 * @see rc4::set_key()
-	 * @access public
-	 */
-	function setIV($iv)
-	{
-	}
-
-	/**
-	 * Sets MCrypt parameters. (optional)
-	 *
-	 * If MCrypt is being used, empty strings will be used, unless otherwise specified.
-	 *
-	 * @link http://php.net/function.mcrypt-module-open#function.mcrypt-module-open
-	 * @access public
-	 * @param optional Integer $algorithm_directory
-	 * @param optional Integer $mode_directory
-	 */
-	function set_mcrypt($algorithm_directory = '', $mode_directory = '')
-	{
-		if ( CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT )
-		{
-			$this->mcrypt = array($algorithm_directory, $mode_directory);
-			$this->_close_mcrypt();
-		}
-	}
-
-	/**
-	 * Encrypts a message.
-	 *
-	 * @see rc4::_crypt()
-	 * @access public
-	 * @param String $plaintext
-	 */
-	function encrypt($plaintext)
-	{
-		return $this->_crypt($plaintext, CRYPT_RC4_ENCRYPT);
-	}
-
-	/**
-	 * Decrypts a message.
-	 *
-	 * $this->decrypt($this->encrypt($plaintext)) == $this->encrypt($this->encrypt($plaintext)).
-	 * Atleast if the continuous buffer is disabled.
-	 *
-	 * @see rc4::_crypt()
-	 * @access public
-	 * @param String $ciphertext
-	 */
-	function decrypt($ciphertext)
-	{
-		return $this->_crypt($ciphertext, CRYPT_RC4_DECRYPT);
-	}
-
-	/**
-	 * Encrypts or decrypts a message.
-	 *
-	 * @see rc4::encrypt()
-	 * @see rc4::decrypt()
-	 * @access private
-	 * @param String $text
-	 * @param Integer $mode
-	 */
-	function _crypt($text, $mode)
-	{
-		if ( CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT )
-		{
-			$keyStream = $mode == CRYPT_RC4_ENCRYPT ? 'encryptStream' : 'decryptStream';
-
-			if ($this->$keyStream === false)
-			{
-				$this->$keyStream = mcrypt_module_open($this->mode, $this->mcrypt[0], MCRYPT_MODE_STREAM, $this->mcrypt[1]);
-				mcrypt_generic_init($this->$keyStream, $this->key, '');
-			}
-			else if (!$this->continuousBuffer)
-			{
-				mcrypt_generic_init($this->$keyStream, $this->key, '');
-			}
-			$newText = mcrypt_generic($this->$keyStream, $text);
-			if (!$this->continuousBuffer)
-			{
-				mcrypt_generic_deinit($this->$keyStream);
-			}
-
-			return $newText;
-		}
-
-		if ($this->encryptStream === false)
-		{
-			$this->set_key($this->key);
-		}
-
-		switch ($mode)
-		{
-			case CRYPT_RC4_ENCRYPT:
-				$keyStream = $this->encryptStream;
-				list($i, $j) = $this->encryptIndex;
-				break;
-			case CRYPT_RC4_DECRYPT:
-				$keyStream = $this->decryptStream;
-				list($i, $j) = $this->decryptIndex;
-		}
-
-		$newText = '';
-		for ($k = 0; $k < strlen($text); $k++)
-		{
-			$i = ($i + 1) & 255;
-			$j = ($j + $keyStream[$i]) & 255;
-			$temp = $keyStream[$i];
-			$keyStream[$i] = $keyStream[$j];
-			$keyStream[$j] = $temp;
-			$temp = $keyStream[($keyStream[$i] + $keyStream[$j]) & 255];
-			$newText.= chr(ord($text[$k]) ^ $temp);
-		}
-
-		if ($this->continuousBuffer)
-		{
-			switch ($mode)
-			{
-				case CRYPT_RC4_ENCRYPT:
-					$this->encryptStream = $keyStream;
-					$this->encryptIndex = array($i, $j);
-					break;
-				case CRYPT_RC4_DECRYPT:
-					$this->decryptStream = $keyStream;
-					$this->decryptIndex = array($i, $j);
-			}
-		}
-
-		return $newText;
-	}
-
-	/**
-	 * Treat consecutive "packets" as if they are a continuous buffer.
-	 *
-	 * Say you have a 16-byte plaintext $plaintext.  Using the default behavior, the two following code snippets
-	 * will yield different outputs:
-	 *
-	 * <code>
-	 *	echo $rc4->encrypt(substr($plaintext, 0, 8));
-	 *	echo $rc4->encrypt(substr($plaintext, 8, 8));
-	 * </code>
-	 * <code>
-	 *	echo $rc4->encrypt($plaintext);
-	 * </code>
-	 *
-	 * The solution is to enable the continuous buffer.  Although this will resolve the above discrepancy, it creates
-	 * another, as demonstrated with the following:
-	 *
-	 * <code>
-	 *	$rc4->encrypt(substr($plaintext, 0, 8));
-	 *	echo $rc4->decrypt($des->encrypt(substr($plaintext, 8, 8)));
-	 * </code>
-	 * <code>
-	 *	echo $rc4->decrypt($des->encrypt(substr($plaintext, 8, 8)));
-	 * </code>
-	 *
-	 * With the continuous buffer disabled, these would yield the same output.  With it enabled, they yield different
-	 * outputs.  The reason is due to the fact that the initialization vector's change after every encryption /
-	 * decryption round when the continuous buffer is enabled.  When it's disabled, they remain constant.
-	 *
-	 * Put another way, when the continuous buffer is enabled, the state of the Crypt_DES() object changes after each
-	 * encryption / decryption round, whereas otherwise, it'd remain constant.  For this reason, it's recommended that
-	 * continuous buffers not be used.  They do offer better security and are, in fact, sometimes required (SSH uses them),
-	 * however, they are also less intuitive and more likely to cause you problems.
-	 *
-	 * @see rc4::disable_continuous_buffer()
-	 * @access public
-	 */
-	function enable_continuous_buffer()
-	{
-		$this->continuousBuffer = true;
-	}
-
-	/**
-	 * Treat consecutive packets as if they are a discontinuous buffer.
-	 *
-	 * The default behavior.
-	 *
-	 * @see rc4::enable_continuous_buffer()
-	 * @access public
-	 */
-	function disable_continuous_buffer()
-	{
-		if ( CRYPT_RC4_MODE == CRYPT_RC4_MODE_INTERNAL )
-		{
-			$this->encryptIndex = $this->decryptIndex = array(0, 0);
-			$this->set_key($this->key);
-		}
-
-		$this->continuousBuffer = false;
-	}
-
-	/**
-	 * Dummy function.
-	 *
-	 * Since RC4 is a stream cipher and not a block cipher, no padding is necessary.  The only reason this function is
-	 * included is so that you can switch between a block cipher and a stream cipher transparently.
-	 *
-	 * @see rc4::disable_padding()
-	 * @access public
-	 */
-	function enable_padding()
-	{
-	}
-
-	/**
-	 * Dummy function.
-	 *
-	 * @see rc4::enable_padding()
-	 * @access public
-	 */
-	function disable_padding()
-	{
-	}
-
-	/**
-	 * Class destructor.
-	 *
-	 * Will be called, automatically, if you're using PHP5.  If you're using PHP4, call it yourself.  Only really
-	 * needs to be called if mcrypt is being used.
-	 *
-	 * @access public
-	 */
-	function __destruct()
-	{
-		if ( CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT )
-		{
-			$this->_close_mcrypt();
-		}
-	}
-
-	/**
-	 * Properly close the MCrypt objects.
-	 *
-	 * @access prviate
-	 */
-	function _close_mcrypt()
-	{
-		if ( $this->encryptStream !== false )
-		{
-			if ( $this->continuousBuffer )
-			{
-				mcrypt_generic_deinit($this->encryptStream);
-			}
-
-			mcrypt_module_close($this->encryptStream);
-
-			$this->encryptStream = false;
-		}
-
-		if ( $this->decryptStream !== false )
-		{
-			if ( $this->continuousBuffer )
-			{
-				mcrypt_generic_deinit($this->decryptStream);
-			}
-
-			mcrypt_module_close($this->decryptStream);
-
-			$this->decryptStream = false;
-		}
-	}
-}
-\ No newline at end of file
diff --git a/phpBB/includes/libraries/sftp/sftp.php b/phpBB/includes/libraries/sftp/sftp.php
deleted file mode 100644
index 41915c5ea9..0000000000
--- a/phpBB/includes/libraries/sftp/sftp.php
+++ /dev/null
@@ -1,3247 +0,0 @@
-<?php
-/**
-*
-* @package sftp
-* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Code from http://phpseclib.sourceforge.net/
-*
-* Modified by phpBB Group to meet our coding standards
-* and being able to integrate into phpBB
-*
-* Pure-PHP implementation of ssh2
-*
-* Copyright 2007-2009 TerraFrost <terrafrost@php.net>
-* Copyright 2009+ phpBB
-*
-* @package sftp
-* @author  TerraFrost <terrafrost@php.net>
-*/
-
-include('biginteger.' . PHP_EXT);
-include('random.' . PHP_EXT);
-include('hash.' . PHP_EXT);
-include('rc4.' . PHP_EXT);
-include('aes.' . PHP_EXT);
-include('des.' . PHP_EXT);
-
-/**#@+
- * Execution Bitmap Masks
- *
- * @see ssh2::bitmap
- * @access private
- */
-define('NET_SSH2_MASK_CONSTRUCTOR', 0x00000001);
-define('NET_SSH2_MASK_LOGIN', 0x00000002);
-/**#@-*/
-
-/**#@+
- * @access public
- * @see ssh2::getLog()
- */
-/**
- * Returns the message numbers
- */
-define('NET_SSH2_LOG_SIMPLE',  1);
-/**
- * Returns the message content
- */
-define('NET_SSH2_LOG_COMPLEX', 2);
-/**#@-*/
-
-/**#@+
- * @access public
- * @see ssh2_sftp::get_log()
- */
-/**
- * Returns the message numbers
- */
-define('NET_SFTP_LOG_SIMPLE',  NET_SSH2_LOG_SIMPLE);
-/**
- * Returns the message content
- */
-define('NET_SFTP_LOG_COMPLEX', NET_SSH2_LOG_COMPLEX);
-/**#@-*/
-
-/**
- * Pure-PHP implementation of SSHv2.
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- * @version 0.1.0
- * @access  public
- * @package ssh2
- */
-class ssh2
-{
-	/**
-	 * The SSH identifier
-	 *
-	 * @var String
-	 * @access private
-	 */
-	var $identifier = 'SSH-2.0-phpseclib_0.1';
-
-	/**
-	 * The Socket Object
-	 *
-	 * @var Object
-	 * @access private
-	 */
-	var $fsock;
-
-	/**
-	 * Execution Bitmap
-	 *
-	 * The bits that are set reprsent functions that have been called already.  This is used to determine
-	 * if a requisite function has been successfully executed.  If not, an error should be thrown.
-	 *
-	 * @var Integer
-	 * @access private
-	 */
-	var $bitmap = 0;
-
-	/**
-	 * Debug Info
-	 *
-	 * @see ssh2::get_debug_info()
-	 * @var String
-	 * @access private
-	 */
-	var $debug_info = '';
-
-	/**
-	 * Server Identifier
-	 *
-	 * @see ssh2::get_server_identification()
-	 * @var String
-	 * @access private
-	 */
-	var $server_identifier = '';
-
-	/**
-	 * Key Exchange Algorithms
-	 *
-	 * @see ssh2::get_kex_algorithims()
-	 * @var Array
-	 * @access private
-	 */
-	var $kex_algorithms;
-
-	/**
-	 * Server Host Key Algorithms
-	 *
-	 * @see ssh2::get_server_host_key_algorithms()
-	 * @var Array
-	 * @access private
-	 */
-	var $server_host_key_algorithms;
-
-	/**
-	 * Encryption Algorithms: Client to Server
-	 *
-	 * @see ssh2::get_encryption_algorithms_client_to_server()
-	 * @var Array
-	 * @access private
-	 */
-	var $encryption_algorithms_client_to_server;
-
-	/**
-	 * Encryption Algorithms: Server to Client
-	 *
-	 * @see ssh2::get_encryption_algorithms_server_to_client()
-	 * @var Array
-	 * @access private
-	 */
-	var $encryption_algorithms_server_to_client;
-
-	/**
-	 * MAC Algorithms: Client to Server
-	 *
-	 * @see ssh2::get_mac_algorithms_client_to_server()
-	 * @var Array
-	 * @access private
-	 */
-	var $mac_algorithms_client_to_server;
-
-	/**
-	 * MAC Algorithms: Server to Client
-	 *
-	 * @see ssh2::get_mac_algorithms_server_to_client()
-	 * @var Array
-	 * @access private
-	 */
-	var $mac_algorithms_server_to_client;
-
-	/**
-	 * Compression Algorithms: Client to Server
-	 *
-	 * @see ssh2::get_compression_algorithms_client_to_server()
-	 * @var Array
-	 * @access private
-	 */
-	var $compression_algorithms_client_to_server;
-
-	/**
-	 * Compression Algorithms: Server to Client
-	 *
-	 * @see ssh2::get_compression_algorithms_server_to_client()
-	 * @var Array
-	 * @access private
-	 */
-	var $compression_algorithms_server_to_client;
-
-	/**
-	 * Languages: Server to Client
-	 *
-	 * @see ssh2::get_languages_server_to_client()
-	 * @var Array
-	 * @access private
-	 */
-	var $languages_server_to_client;
-
-	/**
-	 * Languages: Client to Server
-	 *
-	 * @see ssh2::get_languages_client_to_server()
-	 * @var Array
-	 * @access private
-	 */
-	var $languages_client_to_server;
-
-	/**
-	 * Block Size for Server to Client Encryption
-	 *
-	 * "Note that the length of the concatenation of 'packet_length',
-	 *  'padding_length', 'payload', and 'random padding' MUST be a multiple
-	 *  of the cipher block size or 8, whichever is larger.  This constraint
-	 *  MUST be enforced, even when using stream ciphers."
-	 *
-	 *  -- http://tools.ietf.org/html/rfc4253#section-6
-	 *
-	 * @see ssh2::__constructor()
-	 * @see ssh2::_send_binary_packet()
-	 * @var Integer
-	 * @access private
-	 */
-	var $encrypt_block_size = 8;
-
-	/**
-	 * Block Size for Client to Server Encryption
-	 *
-	 * @see ssh2::ssh2()
-	 * @see ssh2::_get_binary_packet()
-	 * @var Integer
-	 * @access private
-	 */
-	var $decrypt_block_size = 8;
-
-	/**
-	 * Server to Client Encryption Object
-	 *
-	 * @see ssh2::_get_binary_packet()
-	 * @var Object
-	 * @access private
-	 */
-	var $decrypt = false;
-
-	/**
-	 * Client to Server Encryption Object
-	 *
-	 * @see ssh2::_send_binary_packet()
-	 * @var Object
-	 * @access private
-	 */
-	var $encrypt = false;
-
-	/**
-	 * Client to Server HMAC Object
-	 *
-	 * @see ssh2::_send_binary_packet()
-	 * @var Object
-	 * @access private
-	 */
-	var $hmac_create = false;
-
-	/**
-	 * Server to Client HMAC Object
-	 *
-	 * @see ssh2::_get_binary_packet()
-	 * @var Object
-	 * @access private
-	 */
-	var $hmac_check = false;
-
-	/**
-	 * Size of server to client HMAC
-	 *
-	 * We need to know how big the HMAC will be for the server to client direction so that we know how many bytes to read.
-	 * For the client to server side, the HMAC object will make the HMAC as long as it needs to be.  All we need to do is
-	 * append it.
-	 *
-	 * @see ssh2::_get_binary_packet()
-	 * @var Integer
-	 * @access private
-	 */
-	var $hmac_size = false;
-
-	/**
-	 * Server Public Host Key
-	 *
-	 * @see ssh2::getServerPublicHostKey()
-	 * @var String
-	 * @access private
-	 */
-	var $server_public_host_key;
-
-	/**
-	 * Session identifer
-	 *
-	 * "The exchange hash H from the first key exchange is additionally
-	 *  used as the session identifier, which is a unique identifier for
-	 *  this connection."
-	 *
-	 *  -- http://tools.ietf.org/html/rfc4253#section-7.2
-	 *
-	 * @see ssh2::_key_exchange()
-	 * @var String
-	 * @access private
-	 */
-	var $session_id = false;
-
-	/**
-	 * Message Numbers
-	 *
-	 * @see ssh2::ssh2()
-	 * @var Array
-	 * @access private
-	 */
-	var $message_numbers = array();
-
-	/**
-	 * Disconnection Message 'reason codes' defined in RFC4253
-	 *
-	 * @see ssh2::ssh2()
-	 * @var Array
-	 * @access private
-	 */
-	var $disconnect_reasons = array();
-
-	/**
-	 * SSH_MSG_CHANNEL_OPEN_FAILURE 'reason codes', defined in RFC4254
-	 *
-	 * @see ssh2::ssh2()
-	 * @var Array
-	 * @access private
-	 */
-	var $channel_open_failure_reasons = array();
-
-	/**
-	 * Terminal Modes
-	 *
-	 * @link http://tools.ietf.org/html/rfc4254#section-8
-	 * @see ssh2::ssh2()
-	 * @var Array
-	 * @access private
-	 */
-	var $terminal_modes = array();
-
-	/**
-	 * SSH_MSG_CHANNEL_EXTENDED_DATA's data_type_codes
-	 *
-	 * @link http://tools.ietf.org/html/rfc4254#section-5.2
-	 * @see ssh2::ssh2()
-	 * @var Array
-	 * @access private
-	 */
-	var $channel_extended_data_type_codes = array();
-
-	/**
-	 * Send Sequence Number
-	 *
-	 * See 'Section 6.4.  Data Integrity' of rfc4253 for more info.
-	 *
-	 * @see ssh2::_send_binary_packet()
-	 * @var Integer
-	 * @access private
-	 */
-	var $send_seq_no = 0;
-
-	/**
-	 * Get Sequence Number
-	 *
-	 * See 'Section 6.4.  Data Integrity' of rfc4253 for more info.
-	 *
-	 * @see ssh2::_get_binary_packet()
-	 * @var Integer
-	 * @access private
-	 */
-	var $get_seq_no = 0;
-
-	/**
-	 * Message Number Log
-	 *
-	 * @see ssh2::getLog()
-	 * @var Array
-	 * @access private
-	 */
-	var $message_number_log = array();
-
-	/**
-	 * Message Log
-	 *
-	 * @see ssh2::getLog()
-	 * @var Array
-	 * @access private
-	 */
-	var $message_log = array();
-
-	/**
-	 * Default Constructor.
-	 *
-	 * Connects to an SSHv2 server
-	 *
-	 * @param String $host
-	 * @param optional Integer $port
-	 * @param optional Integer $timeout
-	 * @return ssh2
-	 * @access public
-	 */
-	function __construct($host, $port = 22, $timeout = 10)
-	{
-		$this->message_numbers = array(
-			1 => 'NET_SSH2_MSG_DISCONNECT',
-			2 => 'NET_SSH2_MSG_IGNORE',
-			3 => 'NET_SSH2_MSG_UNIMPLEMENTED',
-			4 => 'NET_SSH2_MSG_DEBUG',
-			5 => 'NET_SSH2_MSG_SERVICE_REQUEST',
-			6 => 'NET_SSH2_MSG_SERVICE_ACCEPT',
-			20 => 'NET_SSH2_MSG_KEXINIT',
-			21 => 'NET_SSH2_MSG_NEWKEYS',
-			30 => 'NET_SSH2_MSG_KEXDH_INIT',
-			31 => 'NET_SSH2_MSG_KEXDH_REPLY',
-			50 => 'NET_SSH2_MSG_USERAUTH_REQUEST',
-			51 => 'NET_SSH2_MSG_USERAUTH_FAILURE',
-			52 => 'NET_SSH2_MSG_USERAUTH_SUCCESS',
-			53 => 'NET_SSH2_MSG_USERAUTH_BANNER',
-			60 => 'NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ',
-
-			80 => 'NET_SSH2_MSG_GLOBAL_REQUEST',
-			81 => 'NET_SSH2_MSG_REQUEST_SUCCESS',
-			82 => 'NET_SSH2_MSG_REQUEST_FAILURE',
-			90 => 'NET_SSH2_MSG_CHANNEL_OPEN',
-			91 => 'NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION',
-			92 => 'NET_SSH2_MSG_CHANNEL_OPEN_FAILURE',
-			93 => 'NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST',
-			94 => 'NET_SSH2_MSG_CHANNEL_DATA',
-			95 => 'NET_SSH2_MSG_CHANNEL_EXTENDED_DATA',
-			96 => 'NET_SSH2_MSG_CHANNEL_EOF',
-			97 => 'NET_SSH2_MSG_CHANNEL_CLOSE',
-			98 => 'NET_SSH2_MSG_CHANNEL_REQUEST',
-			99 => 'NET_SSH2_MSG_CHANNEL_SUCCESS',
-			100 => 'NET_SSH2_MSG_CHANNEL_FAILURE'
-		);
-		$this->disconnect_reasons = array(
-			1 => 'NET_SSH2_DISCONNECT_HOST_NOT_ALLOWED_TO_CONNECT',
-			2 => 'NET_SSH2_DISCONNECT_PROTOCOL_ERROR',
-			3 => 'NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED',
-			4 => 'NET_SSH2_DISCONNECT_RESERVED',
-			5 => 'NET_SSH2_DISCONNECT_MAC_ERROR',
-			6 => 'NET_SSH2_DISCONNECT_COMPRESSION_ERROR',
-			7 => 'NET_SSH2_DISCONNECT_SERVICE_NOT_AVAILABLE',
-			8 => 'NET_SSH2_DISCONNECT_PROTOCOL_VERSION_NOT_SUPPORTED',
-			9 => 'NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE',
-			10 => 'NET_SSH2_DISCONNECT_CONNECTION_LOST',
-			11 => 'NET_SSH2_DISCONNECT_BY_APPLICATION',
-			12 => 'NET_SSH2_DISCONNECT_TOO_MANY_CONNECTIONS',
-			13 => 'NET_SSH2_DISCONNECT_AUTH_CANCELLED_BY_USER',
-			14 => 'NET_SSH2_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE',
-			15 => 'NET_SSH2_DISCONNECT_ILLEGAL_USER_NAME'
-		);
-		$this->channel_open_failure_reasons = array(
-			1 => 'NET_SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED'
-		);
-		$this->terminal_modes = array(
-			0 => 'NET_SSH2_TTY_OP_END'
-		);
-		$this->channel_extended_data_type_codes = array(
-			1 => 'NET_SSH2_EXTENDED_DATA_STDERR'
-		);
-
-		$this->_define_array(
-			$this->message_numbers,
-			$this->disconnect_reasons,
-			$this->channel_open_failure_reasons,
-			$this->terminal_modes,
-			$this->channel_extended_data_type_codes
-		);
-
-		$this->fsock = @fsockopen($host, $port, $errno, $errstr, $timeout);
-		if (!$this->fsock)
-		{
-			return;
-		}
-
-		/* According to the SSH2 specs,
-
-		  "The server MAY send other lines of data before sending the version
-		   string.  Each line SHOULD be terminated by a Carriage Return and Line
-		   Feed.  Such lines MUST NOT begin with "SSH-", and SHOULD be encoded
-		   in ISO-10646 UTF-8 [RFC3629] (language is not specified).  Clients
-		   MUST be able to process such lines." */
-		$temp = '';
-		while (!feof($this->fsock) && !preg_match('#^SSH-(\d\.\d+)#', $temp, $matches))
-		{
-			if (substr($temp, -2) == "\r\n")
-			{
-				$this->debug_info.= $temp;
-				$temp = '';
-			}
-			$temp.= fgets($this->fsock, 255);
-		}
-		$this->server_identifier = trim($temp);
-		$this->debug_info = utf8_decode($this->debug_info);
-
-		if ($matches[1] != '1.99' && $matches[1] != '2.0')
-		{
-			return;
-		}
-
-		fputs($this->fsock, $this->identifier . "\r\n");
-
-		$response = $this->_get_binary_packet();
-		if ($response === false)
-		{
-			return;
-		}
-
-		if (ord($response[0]) != NET_SSH2_MSG_KEXINIT)
-		{
-			return;
-		}
-
-		if (!$this->_key_exchange($response))
-		{
-			return;
-		}
-
-		$this->bitmap = NET_SSH2_MASK_CONSTRUCTOR;
-	}
-
-	/**
-	 * Key Exchange
-	 *
-	 * @param String $kexinit_payload_server
-	 * @access private
-	 */
-	function _key_exchange($kexinit_payload_server)
-	{
-		static $kex_algorithms = array(
-			'diffie-hellman-group1-sha1', // REQUIRED
-			'diffie-hellman-group14-sha1' // REQUIRED
-		);
-
-		static $server_host_key_algorithms = array(
-			'ssh-rsa', // RECOMMENDED  sign   Raw RSA Key
-			'ssh-dss'  // REQUIRED	 sign   Raw DSS Key
-		);
-
-		static $encryption_algorithms = array(
-			'arcfour',	// OPTIONAL		  the ARCFOUR stream cipher with a 128-bit key
-			'aes128-cbc', // RECOMMENDED	   AES with a 128-bit key
-			'aes192-cbc', // OPTIONAL		  AES with a 192-bit key
-			'aes256-cbc', // OPTIONAL		  AES in CBC mode, with a 256-bit key
-			'3des-cbc',   // REQUIRED		  three-key 3DES in CBC mode
-			'none'		// OPTIONAL		  no encryption; NOT RECOMMENDED
-		);
-
-		static $mac_algorithms = array(
-			'hmac-sha1-96', // RECOMMENDED	 first 96 bits of HMAC-SHA1 (digest length = 12, key length = 20)
-			'hmac-sha1',	// REQUIRED		HMAC-SHA1 (digest length = key length = 20)
-			'hmac-md5-96',  // OPTIONAL		first 96 bits of HMAC-MD5 (digest length = 12, key length = 16)
-			'hmac-md5',	 // OPTIONAL		HMAC-MD5 (digest length = key length = 16)
-			'none'		  // OPTIONAL		no MAC; NOT RECOMMENDED
-		);
-
-		static $compression_algorithms = array(
-			'none'   // REQUIRED		no compression
-			//'zlib' // OPTIONAL		ZLIB (LZ77) compression
-		);
-
-		static $str_kex_algorithms, $str_server_host_key_algorithms,
-			   $encryption_algorithms_server_to_client, $mac_algorithms_server_to_client, $compression_algorithms_server_to_client,
-			   $encryption_algorithms_client_to_server, $mac_algorithms_client_to_server, $compression_algorithms_client_to_server;
-
-		if (empty($str_kex_algorithms)) {
-			$str_kex_algorithms = implode(',', $kex_algorithms);
-			$str_server_host_key_algorithms = implode(',', $server_host_key_algorithms);
-			$encryption_algorithms_server_to_client = $encryption_algorithms_client_to_server = implode(',', $encryption_algorithms);
-			$mac_algorithms_server_to_client = $mac_algorithms_client_to_server = implode(',', $mac_algorithms);
-			$compression_algorithms_server_to_client = $compression_algorithms_client_to_server = implode(',', $compression_algorithms);
-		}
-
-		$client_cookie = '';
-		for ($i = 0; $i < 16; $i++)
-		{
-			$client_cookie.= chr(crypt_random(0, 255));
-		}
-
-		$response = $kexinit_payload_server;
-		$this->_string_shift($response, 1); // skip past the message number (it should be SSH_MSG_KEXINIT)
-		list(, $server_cookie) = unpack('a16', $this->_string_shift($response, 16));
-
-		$temp = unpack('Nlength', $this->_string_shift($response, 4));
-		$this->kex_algorithms = explode(',', $this->_string_shift($response, $temp['length']));
-
-		$temp = unpack('Nlength', $this->_string_shift($response, 4));
-		$this->server_host_key_algorithms = explode(',', $this->_string_shift($response, $temp['length']));
-
-		$temp = unpack('Nlength', $this->_string_shift($response, 4));
-		$this->encryption_algorithms_client_to_server = explode(',', $this->_string_shift($response, $temp['length']));
-
-		$temp = unpack('Nlength', $this->_string_shift($response, 4));
-		$this->encryption_algorithms_server_to_client = explode(',', $this->_string_shift($response, $temp['length']));
-
-		$temp = unpack('Nlength', $this->_string_shift($response, 4));
-		$this->mac_algorithms_client_to_server = explode(',', $this->_string_shift($response, $temp['length']));
-
-		$temp = unpack('Nlength', $this->_string_shift($response, 4));
-		$this->mac_algorithms_server_to_client = explode(',', $this->_string_shift($response, $temp['length']));
-
-		$temp = unpack('Nlength', $this->_string_shift($response, 4));
-		$this->compression_algorithms_client_to_server = explode(',', $this->_string_shift($response, $temp['length']));
-
-		$temp = unpack('Nlength', $this->_string_shift($response, 4));
-		$this->compression_algorithms_server_to_client = explode(',', $this->_string_shift($response, $temp['length']));
-
-		$temp = unpack('Nlength', $this->_string_shift($response, 4));
-		$this->languages_client_to_server = explode(',', $this->_string_shift($response, $temp['length']));
-
-		$temp = unpack('Nlength', $this->_string_shift($response, 4));
-		$this->languages_server_to_client = explode(',', $this->_string_shift($response, $temp['length']));
-
-		list(, $first_kex_packet_follows) = unpack('C', $this->_string_shift($response, 1));
-		$first_kex_packet_follows = $first_kex_packet_follows != 0;
-
-		// the sending of NET_SSH2_MSG_KEXINIT could go in one of two places.  this is the second place.
-		$kexinit_payload_client = pack('Ca*Na*Na*Na*Na*Na*Na*Na*Na*Na*Na*CN',
-			NET_SSH2_MSG_KEXINIT, $client_cookie, strlen($str_kex_algorithms), $str_kex_algorithms,
-			strlen($str_server_host_key_algorithms), $str_server_host_key_algorithms, strlen($encryption_algorithms_client_to_server),
-			$encryption_algorithms_client_to_server, strlen($encryption_algorithms_server_to_client), $encryption_algorithms_server_to_client,
-			strlen($mac_algorithms_client_to_server), $mac_algorithms_client_to_server, strlen($mac_algorithms_server_to_client),
-			$mac_algorithms_server_to_client, strlen($compression_algorithms_client_to_server), $compression_algorithms_client_to_server,
-			strlen($compression_algorithms_server_to_client), $compression_algorithms_server_to_client, 0, '', 0, '',
-			0, 0
-		);
-
-		if (!$this->_send_binary_packet($kexinit_payload_client))
-		{
-			return false;
-		}
-		// here ends the second place.
-
-		// we need to decide upon the symmetric encryption algorithms before we do the diffie-hellman key exchange
-		for ($i = 0; $i < count($encryption_algorithms) && !in_array($encryption_algorithms[$i], $this->encryption_algorithms_server_to_client); $i++);
-		if ($i == count($encryption_algorithms))
-		{
-			return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-		}
-
-		// we don't initialize any crypto-objects, yet - we do that, later. for now, we need the lengths to make the
-		// diffie-hellman key exchange as fast as possible
-		$decrypt = $encryption_algorithms[$i];
-		switch ($decrypt)
-		{
-			case '3des-cbc':
-				$decryptKeyLength = 24; // eg. 192 / 8
-				break;
-			case 'aes256-cbc':
-				$decryptKeyLength = 32; // eg. 256 / 8
-				break;
-			case 'aes192-cbc':
-				$decryptKeyLength = 24; // eg. 192 / 8
-				break;
-			case 'aes128-cbc':
-				$decryptKeyLength = 16; // eg. 128 / 8
-				break;
-			case 'arcfour':
-				$decryptKeyLength = 16; // eg. 128 / 8
-				break;
-			case 'none';
-				$decryptKeyLength = 0;
-		}
-
-		for ($i = 0; $i < count($encryption_algorithms) && !in_array($encryption_algorithms[$i], $this->encryption_algorithms_client_to_server); $i++);
-		if ($i == count($encryption_algorithms))
-		{
-			return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-		}
-
-		$encrypt = $encryption_algorithms[$i];
-		switch ($encrypt)
-		{
-			case '3des-cbc':
-				$encryptKeyLength = 24;
-				break;
-			case 'aes256-cbc':
-				$encryptKeyLength = 32;
-				break;
-			case 'aes192-cbc':
-				$encryptKeyLength = 24;
-				break;
-			case 'aes128-cbc':
-				$encryptKeyLength = 16;
-				break;
-			case 'arcfour':
-				$encryptKeyLength = 16;
-				break;
-			case 'none';
-				$encryptKeyLength = 0;
-		}
-
-		$keyLength = $decryptKeyLength > $encryptKeyLength ? $decryptKeyLength : $encryptKeyLength;
-
-		// through diffie-hellman key exchange a symmetric key is obtained
-		for ($i = 0; $i < count($kex_algorithms) && !in_array($kex_algorithms[$i], $this->kex_algorithms); $i++);
-		if ($i == count($kex_algorithms))
-		{
-			return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-		}
-
-		switch ($kex_algorithms[$i])
-		{
-			// see http://tools.ietf.org/html/rfc2409#section-6.2 and 
-			// http://tools.ietf.org/html/rfc2412, appendex E
-			case 'diffie-hellman-group1-sha1':
-				$p = pack('N32', 0xFFFFFFFF, 0xFFFFFFFF, 0xC90FDAA2, 0x2168C234, 0xC4C6628B, 0x80DC1CD1,
-								 0x29024E08, 0x8A67CC74, 0x020BBEA6, 0x3B139B22, 0x514A0879, 0x8E3404DD,
-								 0xEF9519B3, 0xCD3A431B, 0x302B0A6D, 0xF25F1437, 0x4FE1356D, 0x6D51C245,
-								 0xE485B576, 0x625E7EC6, 0xF44C42E9, 0xA637ED6B, 0x0BFF5CB6, 0xF406B7ED,
-								 0xEE386BFB, 0x5A899FA5, 0xAE9F2411, 0x7C4B1FE6, 0x49286651, 0xECE65381,
-								 0xFFFFFFFF, 0xFFFFFFFF);
-				$keyLength = $keyLength < 160 ? $keyLength : 160;
-				$hash = 'sha1';
-				break;
-			// see http://tools.ietf.org/html/rfc3526#section-3
-			case 'diffie-hellman-group14-sha1':
-				$p = pack('N64', 0xFFFFFFFF, 0xFFFFFFFF, 0xC90FDAA2, 0x2168C234, 0xC4C6628B, 0x80DC1CD1,
-								 0x29024E08, 0x8A67CC74, 0x020BBEA6, 0x3B139B22, 0x514A0879, 0x8E3404DD,
-								 0xEF9519B3, 0xCD3A431B, 0x302B0A6D, 0xF25F1437, 0x4FE1356D, 0x6D51C245,
-								 0xE485B576, 0x625E7EC6, 0xF44C42E9, 0xA637ED6B, 0x0BFF5CB6, 0xF406B7ED,
-								 0xEE386BFB, 0x5A899FA5, 0xAE9F2411, 0x7C4B1FE6, 0x49286651, 0xECE45B3D,
-								 0xC2007CB8, 0xA163BF05, 0x98DA4836, 0x1C55D39A, 0x69163FA8, 0xFD24CF5F,
-								 0x83655D23, 0xDCA3AD96, 0x1C62F356, 0x208552BB, 0x9ED52907, 0x7096966D,
-								 0x670C354E, 0x4ABC9804, 0xF1746C08, 0xCA18217C, 0x32905E46, 0x2E36CE3B,
-								 0xE39E772C, 0x180E8603, 0x9B2783A2, 0xEC07A28F, 0xB5C55DF0, 0x6F4C52C9,
-								 0xDE2BCBF6, 0x95581718, 0x3995497C, 0xEA956AE5, 0x15D22618, 0x98FA0510,
-								 0x15728E5A, 0x8AACAA68, 0xFFFFFFFF, 0xFFFFFFFF);
-				$keyLength = $keyLength < 160 ? $keyLength : 160;
-				$hash = 'sha1';
-		}
-
-		$p = new biginteger($p, 256);
-		//$q = $p->bitwise_right_shift(1);
-
-		/* To increase the speed of the key exchange, both client and server may
-		   reduce the size of their private exponents.  It should be at least
-		   twice as long as the key material that is generated from the shared
-		   secret.  For more details, see the paper by van Oorschot and Wiener
-		   [VAN-OORSCHOT].
-
-		   -- http://tools.ietf.org/html/rfc4419#section-6.2 */
-		$q = new biginteger(1);
-		$q = $q->bitwise_left_shift(2 * $keyLength);
-		$q = $q->subtract(new biginteger(1));
-
-		$g = new biginteger(2);
-		$x = new biginteger();
-		$x = $x->random(new biginteger(1), $q, 'crypt_random');
-		$e = $g->mod_pow($x, $p);
-
-		$eBytes = $e->to_bytes(true);
-		$data = pack('CNa*', NET_SSH2_MSG_KEXDH_INIT, strlen($eBytes), $eBytes);
-
-		if (!$this->_send_binary_packet($data))
-		{
-			return false;
-		}
-
-		$response = $this->_get_binary_packet();
-		if ($response === false)
-		{
-			return false;
-		}
-
-		list(, $type) = unpack('C', $this->_string_shift($response, 1));
-
-		if ($type != NET_SSH2_MSG_KEXDH_REPLY)
-		{
-			return false;
-		}
-
-		$temp = unpack('Nlength', $this->_string_shift($response, 4));
-		$this->server_public_host_key = $server_public_host_key = $this->_string_shift($response, $temp['length']);
-
-		$temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-		$public_key_format = $this->_string_shift($server_public_host_key, $temp['length']);
-
-		$temp = unpack('Nlength', $this->_string_shift($response, 4));
-		$fBytes = $this->_string_shift($response, $temp['length']);
-		$f = new biginteger($fBytes, -256);
-
-		$temp = unpack('Nlength', $this->_string_shift($response, 4));
-		$signature = $this->_string_shift($response, $temp['length']);
-
-		$temp = unpack('Nlength', $this->_string_shift($signature, 4));
-		$signature_format = $this->_string_shift($signature, $temp['length']);
-
-		$key = $f->mod_pow($x, $p);
-		$keyBytes = $key->to_bytes(true);
-
-		$source = pack('Na*Na*Na*Na*Na*Na*Na*Na*',
-			strlen($this->identifier), $this->identifier, strlen($this->server_identifier), $this->server_identifier,
-			strlen($kexinit_payload_client), $kexinit_payload_client, strlen($kexinit_payload_server),
-			$kexinit_payload_server, strlen($this->server_public_host_key), $this->server_public_host_key, strlen($eBytes),
-			$eBytes, strlen($fBytes), $fBytes, strlen($keyBytes), $keyBytes
-		);
-
-		$source = pack('H*', $hash($source));
-
-		if ($this->session_id === false)
-		{
-			$this->session_id = $source;
-		}
-
-		// if you the server's assymetric key matches the one you have on file, then you should be able to decrypt the
-		// "signature" and get something that should equal the "exchange hash", as defined in the SSH-2 specs.
-		// here, we just check to see if the "signature" is good.  you can verify whether or not the assymetric key is good,
-		// later, with the getServerHostKeyAlgorithm() function
-		for ($i = 0; $i < count($server_host_key_algorithms) && !in_array($server_host_key_algorithms[$i], $this->server_host_key_algorithms); $i++);
-		if ($i == count($server_host_key_algorithms))
-		{
-			return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-		}
-
-		if ($public_key_format != $server_host_key_algorithms[$i] || $signature_format != $server_host_key_algorithms[$i])
-		{
-			return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-		}
-
-		switch ($server_host_key_algorithms[$i])
-		{
-			case 'ssh-dss':
-				$temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-				$p = new biginteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
-
-				$temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-				$q = new biginteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
-
-				$temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-				$g = new biginteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
-
-				$temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-				$y = new biginteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
-
-				/* The value for 'dss_signature_blob' is encoded as a string containing
-				   r, followed by s (which are 160-bit integers, without lengths or
-				   padding, unsigned, and in network byte order). */
-				$temp = unpack('Nlength', $this->_string_shift($signature, 4));
-				if ($temp['length'] != 40)
-				{
-					return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-				}
-
-				$r = new biginteger($this->_string_shift($signature, 20), 256);
-				$s = new biginteger($this->_string_shift($signature, 20), 256);
-
-				if ($r->compare($q) >= 0 || $s->compare($q) >= 0)
-				{
-					return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-				}
-
-				$w = $s->mod_inverse($q);
-
-				$u1 = $w->multiply(new biginteger(sha1($source), 16));
-				list(, $u1) = $u1->divide($q);
-
-				$u2 = $w->multiply($r);
-				list(, $u2) = $u2->divide($q);
-
-				$g = $g->mod_pow($u1, $p);
-				$y = $y->mod_pow($u2, $p);
-
-				$v = $g->multiply($y);
-				list(, $v) = $v->divide($p);
-				list(, $v) = $v->divide($q);
-
-				if ($v->compare($r) != 0)
-				{
-					return $this->_disconnect(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE);
-				}
-
-				break;
-			case 'ssh-rsa':
-				$temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-				$e = new biginteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
-
-				$temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-				$n = new biginteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
-				$nLength = $temp['length'];
-
-				$temp = unpack('Nlength', $this->_string_shift($signature, 4));
-				$s = new biginteger($this->_string_shift($signature, $temp['length']), 256);
-
-				// validate an RSA signature per "8.2 RSASSA-PKCS1-v1_5", "5.2.2 RSAVP1", and "9.1 EMSA-PSS" in the
-				// following URL:
-				// ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-1/pkcs-1v2-1.pdf
-
-				// also, see SSHRSA.c (rsa2_verifysig) in PuTTy's source.
-
-				if ($s->compare(new biginteger()) < 0 || $s->compare($n->subtract(new biginteger(1))) > 0)
-				{
-					return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-				}
-
-				$s = $s->mod_pow($e, $n);
-				$s = $s->to_bytes();
-
-				$h = pack('N4H*', 0x00302130, 0x0906052B, 0x0E03021A, 0x05000414, sha1($source));
-				$h = chr(0x01) . str_repeat(chr(0xFF), $nLength - 3 - strlen($h)) . $h;
-
-				if ($s != $h)
-				{
-					return $this->_disconnect(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE);
-				}
-		}
-
-		$packet = pack('C',
-			NET_SSH2_MSG_NEWKEYS
-		);
-
-		if (!$this->_send_binary_packet($packet))
-		{
-			return false;
-		}
-
-		$response = $this->_get_binary_packet();
-
-		if ($response === false)
-		{
-			return false;
-		}
-
-		list(, $type) = unpack('C', $this->_string_shift($response, 1));
-
-		if ($type != NET_SSH2_MSG_NEWKEYS)
-		{
-			return false;
-		}
-
-		switch ($encrypt)
-		{
-			case '3des-cbc':
-				$this->encrypt = new tripledes();
-				// $this->encrypt_block_size = 64 / 8 == the default
-				break;
-			case 'aes256-cbc':
-				$this->encrypt = new aes();
-				$this->encrypt_block_size = 16; // eg. 128 / 8
-				break;
-			case 'aes192-cbc':
-				$this->encrypt = new aes();
-				$this->encrypt_block_size = 16;
-				break;
-			case 'aes128-cbc':
-				$this->encrypt = new aes();
-				$this->encrypt_block_size = 16;
-				break;
-			case 'arcfour':
-				$this->encrypt = new rc4();
-		}
-
-		switch ($decrypt)
-		{
-			case '3des-cbc':
-				$this->decrypt = new tripledes();
-				break;
-			case 'aes256-cbc':
-				$this->decrypt = new aes();
-				$this->decrypt_block_size = 16;
-				break;
-			case 'aes192-cbc':
-				$this->decrypt = new aes();
-				$this->decrypt_block_size = 16;
-				break;
-			case 'aes128-cbc':
-				$this->decrypt = new aes();
-				$this->decrypt_block_size = 16;
-				break;
-			case 'arcfour':
-				$this->decrypt = new rc4();
-		}
-
-		$keyBytes = pack('Na*', strlen($keyBytes), $keyBytes);
-
-		if ($this->encrypt)
-		{
-			$this->encrypt->enable_continuous_buffer();
-			$this->encrypt->disable_padding();
-
-			$iv = pack('H*', $hash($keyBytes . $source . 'A' . $this->session_id));
-			while ($this->encrypt_block_size > strlen($iv)) {
-				$iv.= pack('H*', $hash($keyBytes . $source . $iv));
-			}
-			$this->encrypt->setIV(substr($iv, 0, $this->encrypt_block_size));
-
-			$key = pack('H*', $hash($keyBytes . $source . 'C' . $this->session_id));
-			while ($encryptKeyLength > strlen($key))
-			{
-				$key.= pack('H*', $hash($keyBytes . $source . $key));
-			}
-			$this->encrypt->set_key(substr($key, 0, $encryptKeyLength));
-		}
-
-		if ($this->decrypt)
-		{
-			$this->decrypt->enable_continuous_buffer();
-			$this->decrypt->disable_padding();
-
-			$iv = pack('H*', $hash($keyBytes . $source . 'B' . $this->session_id));
-			while ($this->decrypt_block_size > strlen($iv))
-			{
-				$iv.= pack('H*', $hash($keyBytes . $source . $iv));
-			}
-			$this->decrypt->setIV(substr($iv, 0, $this->decrypt_block_size));
-
-			$key = pack('H*', $hash($keyBytes . $source . 'D' . $this->session_id));
-			while ($decryptKeyLength > strlen($key))
-			{
-				$key.= pack('H*', $hash($keyBytes . $source . $key));
-			}
-			$this->decrypt->set_key(substr($key, 0, $decryptKeyLength));
-		}
-
-		for ($i = 0; $i < count($mac_algorithms) && !in_array($mac_algorithms[$i], $this->mac_algorithms_client_to_server); $i++);
-		if ($i == count($mac_algorithms))
-		{
-			return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-		}
-
-		$createKeyLength = 0; // ie. $mac_algorithms[$i] == 'none'
-		switch ($mac_algorithms[$i])
-		{
-			case 'hmac-sha1':
-				$this->hmac_create = new hash('sha1');
-				$createKeyLength = 20;
-				break;
-			case 'hmac-sha1-96':
-				$this->hmac_create = new hash('sha1-96');
-				$createKeyLength = 20;
-				break;
-			case 'hmac-md5':
-				$this->hmac_create = new hash('md5');
-				$createKeyLength = 16;
-				break;
-			case 'hmac-md5-96':
-				$this->hmac_create = new hash('md5-96');
-				$createKeyLength = 16;
-		}
-
-		for ($i = 0; $i < count($mac_algorithms) && !in_array($mac_algorithms[$i], $this->mac_algorithms_server_to_client); $i++);
-		if ($i == count($mac_algorithms))
-		{
-			return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-		}
-
-		$checkKeyLength = 0;
-		$this->hmac_size = 0;
-		switch ($mac_algorithms[$i])
-		{
-			case 'hmac-sha1':
-				$this->hmac_check = new hash('sha1');
-				$checkKeyLength = 20;
-				$this->hmac_size = 20;
-				break;
-			case 'hmac-sha1-96':
-				$this->hmac_check = new hash('sha1-96');
-				$checkKeyLength = 20;
-				$this->hmac_size = 12;
-				break;
-			case 'hmac-md5':
-				$this->hmac_check = new hash('md5');
-				$checkKeyLength = 16;
-				$this->hmac_size = 16;
-				break;
-			case 'hmac-md5-96':
-				$this->hmac_check = new hash('md5-96');
-				$checkKeyLength = 16;
-				$this->hmac_size = 12;
-		}
-
-		$key = pack('H*', $hash($keyBytes . $source . 'E' . $this->session_id));
-		while ($createKeyLength > strlen($key))
-		{
-			$key.= pack('H*', $hash($keyBytes . $source . $key));
-		}
-		$this->hmac_create->set_key(substr($key, 0, $createKeyLength));
-
-		$key = pack('H*', $hash($keyBytes . $source . 'F' . $this->session_id));
-		while ($checkKeyLength > strlen($key))
-		{
-			$key.= pack('H*', $hash($keyBytes . $source . $key));
-		}
-		$this->hmac_check->set_key(substr($key, 0, $checkKeyLength));
-
-		for ($i = 0; $i < count($compression_algorithms) && !in_array($compression_algorithms[$i], $this->compression_algorithms_server_to_client); $i++);
-		if ($i == count($compression_algorithms))
-		{
-			return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-		}
-		$this->decompress = $compression_algorithms[$i] == 'zlib';
-
-		for ($i = 0; $i < count($compression_algorithms) && !in_array($compression_algorithms[$i], $this->compression_algorithms_client_to_server); $i++);
-		if ($i == count($compression_algorithms))
-		{
-			return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-		}
-		$this->compress = $compression_algorithms[$i] == 'zlib';
-
-		return true;
-	}
-
-	/**
-	 * Login
-	 *
-	 * @param String $username
-	 * @param optional String $password
-	 * @return Boolean
-	 * @access public
-	 * @internal It might be worthwhile, at some point, to protect against {@link http://tools.ietf.org/html/rfc4251#section-9.3.9 traffic analysis}
-				 by sending dummy SSH_MSG_IGNORE messages.
-	 */
-	function login($username, $password = '')
-	{
-		if (!($this->bitmap & NET_SSH2_MASK_CONSTRUCTOR))
-		{
-			return false;
-		}
-
-		$packet = pack('CNa*',
-			NET_SSH2_MSG_SERVICE_REQUEST, strlen('ssh-userauth'), 'ssh-userauth'
-		);
-
-		if (!$this->_send_binary_packet($packet))
-		{
-			return false;
-		}
-
-		$response = $this->_get_binary_packet();
-		if ($response === false)
-		{
-			return false;
-		}
-
-		list(, $type) = unpack('C', $this->_string_shift($response, 1));
-
-		if ($type != NET_SSH2_MSG_SERVICE_ACCEPT)
-		{
-			return false;
-		}
-
-		// publickey authentication is required, per the SSH-2 specs, however, we don't support it.
-		$utf8_password = utf8_encode($password);
-		$packet = pack('CNa*Na*Na*CNa*',
-			NET_SSH2_MSG_USERAUTH_REQUEST, strlen($username), $username, strlen('ssh-connection'), 'ssh-connection',
-			strlen('password'), 'password', 0, strlen($utf8_password), $utf8_password
-		);
-
-		if (!$this->_send_binary_packet($packet))
-		{
-			return false;
-		}
-
-		// remove the username and password from the last logged packet
-		if (defined('NET_SSH2_LOGGING'))
-		{
-			$packet = pack('CNa*Na*Na*CNa*',
-				NET_SSH2_MSG_USERAUTH_REQUEST, strlen('username'), 'username', strlen('ssh-connection'), 'ssh-connection',
-				strlen('password'), 'password', 0, strlen('password'), 'password'
-			);
-			$this->message_log[count($this->message_log) - 1] = $packet;
-		}
-
-		$response = $this->_get_binary_packet();
-		if ($response === false)
-		{
-			return false;
-		}
-
-		list(, $type) = unpack('C', $this->_string_shift($response, 1));
-
-		switch ($type)
-		{
-			case NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ: // in theory, the password can be changed
-				list(, $length) = unpack('N', $this->_string_shift($response, 4));
-				$this->debug_info.= "\r\n\r\nSSH_MSG_USERAUTH_PASSWD_CHANGEREQ:\r\n" . utf8_decode($this->_string_shift($response, $length));
-				return $this->_disconnect(NET_SSH2_DISCONNECT_AUTH_CANCELLED_BY_USER);
-			case NET_SSH2_MSG_USERAUTH_FAILURE:
-				list(, $length) = unpack('Nlength', $this->_string_shift($response, 4));
-				$this->debug_info.= "\r\n\r\nSSH_MSG_USERAUTH_FAILURE:\r\n" . $this->_string_shift($response, $length);
-				return $this->_disconnect(NET_SSH2_DISCONNECT_AUTH_CANCELLED_BY_USER);
-			case NET_SSH2_MSG_USERAUTH_SUCCESS:
-				$this->bitmap |= NET_SSH2_MASK_LOGIN;
-				return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Execute Command
-	 *
-	 * @param String $command
-	 * @return String
-	 * @access public
-	 */
-	function exec($command)
-	{
-		if (!($this->bitmap & NET_SSH2_MASK_LOGIN))
-		{
-			return false;
-		}
-
-		$client_channel = 0; // PuTTy uses 0x100
-		// RFC4254 defines the window size as "bytes the other party can send before it must wait for the window to be 
-		// adjusted".  0x7FFFFFFF is, at 4GB, the max size.  technically, it should probably be decremented, but, honestly,
-		// if you're transfering more than 4GB, you probably shouldn't be using phpseclib, anyway.
-		// see http://tools.ietf.org/html/rfc4254#section-5.2 for more info
-		$window_size = 0x7FFFFFFF;
-		// 0x8000 is the maximum max packet size, per http://tools.ietf.org/html/rfc4253#section-6.1, although since PuTTy
-		// uses 0x4000, that's what will be used here, as well.  0x7FFFFFFF could be used, as well (i've not encountered
-		// any problems, using it, myself), but that's not what the specs say, so whatever.
-		$packet_size = 0x4000;
-
-		$packet = pack('CNa*N3',
-			NET_SSH2_MSG_CHANNEL_OPEN, strlen('session'), 'session', $client_channel, $window_size, $packet_size);
-
-		if (!$this->_send_binary_packet($packet))
-		{
-			return false;
-		}
-
-		$response = $this->_get_binary_packet();
-		if ($response === false)
-		{
-			return false;
-		}
-
-		list(, $type) = unpack('C', $this->_string_shift($response, 1));
-
-		switch ($type)
-		{
-			case NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION:
-				$this->_string_shift($response, 4);
-				list(, $server_channel) = unpack('N', $this->_string_shift($response, 4));
-				break;
-			case NET_SSH2_MSG_CHANNEL_OPEN_FAILURE:
-				return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-		}
-
-		$terminal_modes = pack('C', NET_SSH2_TTY_OP_END);
-		$packet = pack('CNNa*CNa*N5a*',
-			NET_SSH2_MSG_CHANNEL_REQUEST, $server_channel, strlen('pty-req'), 'pty-req', 1, strlen('vt100'), 'vt100',
-			80, 24, 0, 0, strlen($terminal_modes), $terminal_modes);
-
-		if (!$this->_send_binary_packet($packet))
-		{
-			return false;
-		}
-
-		$response = $this->_get_binary_packet();
-		if ($response === false)
-		{
-			return false;
-		}
-
-		list(, $type) = unpack('C', $this->_string_shift($response, 1));
-
-		switch ($type)
-		{
-			case NET_SSH2_MSG_CHANNEL_SUCCESS:
-				break;
-			case NET_SSH2_MSG_CHANNEL_FAILURE:
-			default:
-				return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-		}
-
-		$packet = pack('CNNa*CNa*',
-			NET_SSH2_MSG_CHANNEL_REQUEST, $server_channel, strlen('exec'), 'exec', 1, strlen($command), $command);
-		if (!$this->_send_binary_packet($packet))
-		{
-			return false;
-		}
-
-		$response = $this->_get_binary_packet();
-		if ($response === false)
-		{
-			return false;
-		}
-
-		list(, $type) = unpack('C', $this->_string_shift($response, 1));
-
-		switch ($type)
-		{
-			case NET_SSH2_MSG_CHANNEL_SUCCESS:
-				break;
-			case NET_SSH2_MSG_CHANNEL_FAILURE:
-			default:
-				return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-		}
-
-		$output = '';
-		while (true)
-		{
-			$temp = $this->_get_channel_packet();
-			switch (true)
-			{
-				case $temp === true:
-					return $output;
-				case $temp === false:
-					return false;
-				default:
-					$output.= $temp;
-			}
-		}
-	}
-
-	/**
-	 * Disconnect
-	 *
-	 * @access public
-	 */
-	function disconnect()
-	{
-		$this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-	}
-
-	/**
-	 * Destructor.
-	 *
-	 * Will be called, automatically, if you're supporting just PHP5.  If you're supporting PHP4, you'll need to call
-	 * disconnect().
-	 *
-	 * @access public
-	 */
-	function __destruct()
-	{
-		$this->disconnect();
-	}
-
-	/**
-	 * Gets Binary Packets
-	 *
-	 * See '6. Binary Packet Protocol' of rfc4253 for more info.
-	 *
-	 * @see ssh2::_send_binary_packet()
-	 * @return String
-	 * @access private
-	 */
-	function _get_binary_packet()
-	{
-		if (feof($this->fsock))
-		{
-			return false;
-		}
-
-		$raw = fread($this->fsock, $this->decrypt_block_size);
-
-		if ($this->decrypt !== false)
-		{
-			$raw = $this->decrypt->decrypt($raw);
-		}
-
-		$temp = unpack('Npacket_length/Cpadding_length', $this->_string_shift($raw, 5));
-		$packet_length = $temp['packet_length'];
-		$padding_length = $temp['padding_length'];
-
-		$remaining_length = $packet_length + 4 - $this->decrypt_block_size;
-		$buffer = '';
-		while ($remaining_length > 0)
-		{
-			$temp = fread($this->fsock, $remaining_length);
-			$buffer.= $temp;
-			$remaining_length-= strlen($temp);
-		}
-		if (!empty($buffer))
-		{
-			$raw.= $this->decrypt !== false ? $this->decrypt->decrypt($buffer) : $buffer;
-			$buffer = $temp = '';
-		}
-
-		$payload = $this->_string_shift($raw, $packet_length - $padding_length - 1);
-		$padding = $this->_string_shift($raw, $padding_length); // should leave $raw empty
-
-		if ($this->hmac_check !== false)
-		{
-			$hmac = fread($this->fsock, $this->hmac_size);
-			if ($hmac != $this->hmac_check->create(pack('NNCa*', $this->get_seq_no, $packet_length, $padding_length, $payload . $padding)))
-			{
-				return false;
-			}
-		}
-
-		//if ($this->decompress)
-		//{
-		//	$payload = gzinflate(substr($payload, 2));
-		//}
-
-		$this->get_seq_no++;
-
-		if (defined('NET_SSH2_LOGGING'))
-		{
-			$this->message_number_log[] = '<- ' . $this->message_numbers[ord($payload[0])];
-			$this->message_log[] = $payload;
-		}
-
-		return $this->_filter($payload);
-	}
-
-	/**
-	 * Filter Binary Packets
-	 *
-	 * Because some binary packets need to be ignored...
-	 *
-	 * @see ssh2::_get_binary_packet()
-	 * @return String
-	 * @access private
-	 */
-	function _filter($payload)
-	{
-		switch (ord($payload[0]))
-		{
-			case NET_SSH2_MSG_DISCONNECT:
-				$this->_string_shift($payload, 1);
-				list(, $reason_code, $length) = unpack('N2', $this->_string_shift($payload, 8));
-				$this->debug_info.= "\r\n\r\nSSH_MSG_DISCONNECT:\r\n" . $this->disconnect_reasons[$reason_code] . "\r\n" . utf8_decode($this->_string_shift($payload, $temp['length']));
-				$this->bitmask = 0;
-				return false;
-			case NET_SSH2_MSG_IGNORE:
-				$payload = $this->_get_binary_packet();
-				break;
-			case NET_SSH2_MSG_DEBUG:
-				$this->_string_shift($payload, 2);
-				list(, $length) = unpack('N', $payload);
-				$this->debug_info.= "\r\n\r\nSSH_MSG_DEBUG:\r\n" . utf8_decode($this->_string_shift($payload, $length));
-				$payload = $this->_get_binary_packet();
-				break;
-			case NET_SSH2_MSG_UNIMPLEMENTED:
-				return false;
-			case NET_SSH2_MSG_KEXINIT:
-				if ($this->session_id !== false)
-				{
-					if (!$this->_key_exchange($payload))
-					{
-						$this->bitmask = 0;
-						return false;
-					}
-					$payload = $this->_get_binary_packet();
-				}
-		}
-
-		// see http://tools.ietf.org/html/rfc4252#section-5.4; only called when the encryption has been activated and when we haven't already logged in
-		if (($this->bitmap & NET_SSH2_MASK_CONSTRUCTOR) && !($this->bitmap & NET_SSH2_MASK_LOGIN) && ord($payload[0]) == NET_SSH2_MSG_USERAUTH_BANNER)
-		{
-			$this->_string_shift($payload, 1);
-			list(, $length) = unpack('N', $payload);
-			$this->debug_info.= "\r\n\r\nSSH_MSG_USERAUTH_BANNER:\r\n" . utf8_decode($this->_string_shift($payload, $length));
-			$payload = $this->_get_binary_packet();
-		}
-
-		// only called when we've already logged in
-		if (($this->bitmap & NET_SSH2_MASK_CONSTRUCTOR) && ($this->bitmap & NET_SSH2_MASK_LOGIN))
-		{
-			switch (ord($payload[0]))
-			{
-				case NET_SSH2_MSG_GLOBAL_REQUEST: // see http://tools.ietf.org/html/rfc4254#section-4
-					$this->_string_shift($payload, 1);
-					list(, $length) = unpack('N', $payload);
-					$this->debug_info.= "\r\n\r\nSSH_MSG_GLOBAL_REQUEST:\r\n" . utf8_decode($this->_string_shift($payload, $length));
-
-					if (!$this->_send_binary_packet(pack('C', NET_SSH2_MSG_REQUEST_FAILURE)))
-					{
-						return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-					}
-
-					$payload = $this->_get_binary_packet();
-					break;
-				case NET_SSH2_MSG_CHANNEL_OPEN: // see http://tools.ietf.org/html/rfc4254#section-5.1
-					$this->_string_shift($payload, 1);
-					list(, $length) = unpack('N', $payload);
-					$this->debug_info.= "\r\n\r\nSSH_MSG_CHANNEL_OPEN:\r\n" . utf8_decode($this->_string_shift($payload, $length));
-
-					list(, $recipient_channel) = unpack('N', $this->_string_shift($payload, 4));
-
-					$packet = pack('CN3a*Na*',
-						NET_SSH2_MSG_REQUEST_FAILURE, $recipient_channel, NET_SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED, 0, '', 0, '');
-
-					if (!$this->_send_binary_packet($packet))
-					{
-						return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-					}
-
-					$payload = $this->_get_binary_packet();
-					break;
-				case NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST:
-					$payload = $this->_get_binary_packet();
-			}
-		}
-
-		return $payload;
-	}
-
-	/**
-	 * Gets channel data
-	 *
-	 * Returns the data as a string if it's available and false if not.
-	 *
-	 * @return Mixed
-	 * @access private
-	 */
-	function _get_channel_packet()
-	{
-		while (true)
-		{
-			$response = $this->_get_binary_packet();
-			if ($response === false)
-			{
-				return false;
-			}
-
-			list(, $type) = unpack('C', $this->_string_shift($response, 1));
-
-			switch ($type)
-			{
-				case NET_SSH2_MSG_CHANNEL_DATA:
-					$this->_string_shift($response, 4); // skip over server channel
-					list(, $length) = unpack('N', $this->_string_shift($response, 4));
-					return $this->_string_shift($response, $length);
-				case NET_SSH2_MSG_CHANNEL_EXTENDED_DATA:
-					$this->_string_shift($response, 4); // skip over server channel
-					list(, $data_type_code, $length) = unpack('N2', $this->_string_shift($response, 8));
-					$data = $this->_string_shift($response, $length);
-					switch ($data_type_code)
-					{
-						case NET_SSH2_EXTENDED_DATA_STDERR:
-							$this->debug_info.= "\r\n\r\nSSH_MSG_CHANNEL_EXTENDED_DATA (SSH_EXTENDED_DATA_STDERR):\r\n" . $data;
-					}
-					break;
-				case NET_SSH2_MSG_CHANNEL_REQUEST:
-					$this->_string_shift($response, 4); // skip over server channel
-					list(, $length) = unpack('N', $this->_string_shift($response, 4));
-					$value = $this->_string_shift($response, $length);
-					switch ($value)
-					{
-						case 'exit-signal':
-							$this->_string_shift($response, 1);
-							list(, $length) = unpack('N', $this->_string_shift($response, 4));
-							$this->debug_info.= "\r\n\r\nSSH_MSG_CHANNEL_REQUEST (exit-signal):\r\nSIG" . $this->_string_shift($response, $length);
-							$this->_string_shift($response, 1);
-							list(, $length) = unpack('N', $this->_string_shift($response, 4));
-							$this->debug_info.= "\r\n" . $this->_string_shift($response, $length);
-						case 'exit-status':
-						default:
-							// "Some systems may not implement signals, in which case they SHOULD ignore this message."
-							//  -- http://tools.ietf.org/html/rfc4254#section-6.9
-							//break 2;
-							break;
-					}
-					break;
-				case NET_SSH2_MSG_CHANNEL_CLOSE:
-					$this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $server_channel));
-					return true;
-				case NET_SSH2_MSG_CHANNEL_EOF:
-					break;
-				default:
-					return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-			}
-		}
-	}
-
-	/**
-	 * Sends Binary Packets
-	 *
-	 * See '6. Binary Packet Protocol' of rfc4253 for more info.
-	 *
-	 * @param String $data
-	 * @see ssh2::_get_binary_packet()
-	 * @return Boolean
-	 * @access private
-	 */
-	function _send_binary_packet($data)
-	{
-		if (feof($this->fsock))
-		{
-			return false;
-		}
-
-		if (defined('NET_SSH2_LOGGING'))
-		{
-			$this->message_number_log[] = '-> ' . $this->message_numbers[ord($data[0])];
-			$this->message_log[] = $data;
-		}
-
-		//if ($this->compress)
-		//{
-		//	// the -4 removes the checksum:
-		//	// http://php.net/function.gzcompress#57710
-		//	$data = substr(gzcompress($data), 0, -4);
-		//}
-
-		// 4 (packet length) + 1 (padding length) + 4 (minimal padding amount) == 9
-		$packet_length = strlen($data) + 9;
-		// round up to the nearest $this->encrypt_block_size
-		$packet_length+= (($this->encrypt_block_size - 1) * $packet_length) % $this->encrypt_block_size;
-		// subtracting strlen($data) is obvious - subtracting 5 is necessary because of packet_length and padding_length
-		$padding_length = $packet_length - strlen($data) - 5;
-
-		$padding = '';
-		for ($i = 0; $i < $padding_length; $i++)
-		{
-			$padding.= chr(crypt_random(0, 255));
-		}
-
-		// we subtract 4 from packet_length because the packet_length field isn't supposed to include itself
-		$packet = pack('NCa*', $packet_length - 4, $padding_length, $data . $padding);
-
-		$hmac = $this->hmac_create !== false ? $this->hmac_create->create(pack('Na*', $this->send_seq_no, $packet)) : '';
-		$this->send_seq_no++;
-
-		if ($this->encrypt !== false)
-		{
-			$packet = $this->encrypt->encrypt($packet);
-		}
-
-		$packet.= $hmac;
-
-		return strlen($packet) == fputs($this->fsock, $packet);
-	}
-
-	/**
-	 * Disconnect
-	 *
-	 * @param Integer $reason
-	 * @return Boolean
-	 * @access private
-	 */
-	function _disconnect($reason)
-	{
-		if ($this->bitmap)
-		{
-			$data = pack('CNNa*Na*', NET_SSH2_MSG_DISCONNECT, $reason, 0, '', 0, '');
-			$this->_send_binary_packet($data);
-			$this->bitmap = 0;
-			fclose($this->fsock);
-			return false;
-		}
-	}
-
-	/**
-	 * String Shift
-	 *
-	 * Inspired by array_shift
-	 *
-	 * @param String $string
-	 * @param optional Integer $index
-	 * @return String
-	 * @access private
-	 */
-	function _string_shift(&$string, $index = 1)
-	{
-		$substr = substr($string, 0, $index);
-		$string = substr($string, $index);
-		return $substr;
-	}
-
-	/**
-	 * Define Array
-	 *
-	 * Takes any number of arrays whose indices are integers and whose values are strings and defines a bunch of
-	 * named constants from it, using the value as the name of the constant and the index as the value of the constant.
-	 * If any of the constants that would be defined already exists, none of the constants will be defined.
-	 *
-	 * @param Array $array
-	 * @access private
-	 */
-	function _define_array()
-	{
-		$args = func_get_args();
-		foreach ($args as $arg)
-		{
-			foreach ($arg as $key=>$value)
-			{
-				if (!defined($value))
-				{
-					define($value, $key);
-				}
-				else
-				{
-					break 2;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Returns a log of the packets that have been sent and received.
-	 *
-	 * $type can be either NET_SSH2_LOG_SIMPLE or NET_SSH2_LOG_COMPLEX.  Enable by defining NET_SSH2_LOGGING.
-	 *
-	 * @param Integer $type
-	 * @access public
-	 * @return String or Array
-	 */
-	function get_log($type = NET_SSH2_LOG_COMPLEX)
-	{
-		if ($type == NET_SSH2_LOG_SIMPLE)
-		{
-			return $this->message_number_log;
-		}
-
-		static $boundary = ':', $long_width = 65, $short_width = 15;
-
-		$output = '';
-		for ($i = 0; $i < count($this->message_log); $i++)
-		{
-			$output.= $this->message_number_log[$i] . "\r\n";
-			$current_log = $this->message_log[$i];
-			do
-			{
-				$fragment = $this->_string_shift($current_log, $short_width);
-				$hex = substr(
-						   preg_replace(
-							   '#(.)#es',
-							   '"' . $boundary . '" . str_pad(dechex(ord(substr("\\1", -1))), 2, "0", STR_PAD_LEFT)',
-							   $fragment),
-						   strlen($boundary)
-					   );
-				// replace non ASCII printable characters with dots
-				// http://en.wikipedia.org/wiki/ASCII#ASCII_printable_characters
-				$raw = preg_replace('#[^\x20-\x7E]#', '.', $fragment);
-				$output.= str_pad($hex, $long_width - $short_width, ' ') . $raw . "\r\n";
-			}
-			while (!empty($current_log));
-			$output.= "\r\n";
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Returns Debug Information
-	 *
-	 * If any debug information is sent by the server, this function can be used to access it.
-	 *
-	 * @return String
-	 * @access public
-	 */
-	function get_debug_info()
-	{
-		return $this->debug_info;
-	}
-
-	/**
-	 * Return the server identification.
-	 *
-	 * @return String
-	 * @access public
-	 */
-	function get_server_identification()
-	{
-		return $this->server_identifier;
-	}
-
-	/**
-	 * Return a list of the key exchange algorithms the server supports.
-	 *
-	 * @return Array
-	 * @access public
-	 */
-	function get_kex_algorithms()
-	{
-		return $this->kex_algorithms;
-	}
-
-	/**
-	 * Return a list of the host key (public key) algorithms the server supports.
-	 *
-	 * @return Array
-	 * @access public
-	 */
-	function get_server_host_key_algorithms()
-	{
-		return $this->server_host_key_algorithms;
-	}
-
-	/**
-	 * Return a list of the (symmetric key) encryption algorithms the server supports, when receiving stuff from the client.
-	 *
-	 * @return Array
-	 * @access public
-	 */
-	function get_encryption_algorithms_client_to_server()
-	{
-		return $this->encryption_algorithms_client_to_server;
-	}
-
-	/**
-	 * Return a list of the (symmetric key) encryption algorithms the server supports, when sending stuff to the client.
-	 *
-	 * @return Array
-	 * @access public
-	 */
-	function get_encryption_algorithms_server_to_client()
-	{
-		return $this->encryption_algorithms_server_to_client;
-	}
-
-	/**
-	 * Return a list of the MAC algorithms the server supports, when receiving stuff from the client.
-	 *
-	 * @return Array
-	 * @access public
-	 */
-	function get_mac_algorithms_client_to_server()
-	{
-		return $this->mac_algorithms_client_to_server;
-	}
-
-	/**
-	 * Return a list of the MAC algorithms the server supports, when sending stuff to the client.
-	 *
-	 * @return Array
-	 * @access public
-	 */
-	function get_mac_algorithms_server_to_client()
-	{
-		return $this->mac_algorithms_server_to_client;
-	}
-
-	/**
-	 * Return a list of the compression algorithms the server supports, when receiving stuff from the client.
-	 *
-	 * @return Array
-	 * @access public
-	 */
-	function get_compression_algorithms_client_to_server()
-	{
-		return $this->compression_algorithms_client_to_server;
-	}
-
-	/**
-	 * Return a list of the compression algorithms the server supports, when sending stuff to the client.
-	 *
-	 * @return Array
-	 * @access public
-	 */
-	function get_compression_algorithms_server_to_client()
-	{
-		return $this->compression_algorithms_server_to_client;
-	}
-
-	/**
-	 * Return a list of the languages the server supports, when sending stuff to the client.
-	 *
-	 * @return Array
-	 * @access public
-	 */
-	function get_languages_server_to_client()
-	{
-		return $this->languages_server_to_client;
-	}
-
-	/**
-	 * Return a list of the languages the server supports, when receiving stuff from the client.
-	 *
-	 * @return Array
-	 * @access public
-	 */
-	function get_languages_client_to_server()
-	{
-		return $this->languages_client_to_server;
-	}
-
-	/**
-	 * Returns the server public host key.
-	 *
-	 * Caching this the first time you connect to a server and checking the result on subsequent connections
-	 * is recommended.
-	 *
-	 * @return Array
-	 * @access public
-	 */
-	function get_server_public_host_key()
-	{
-		return $this->server_public_host_key;
-	}
-}
-
-/**
- * Pure-PHP implementation of SFTP.
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- * @version 0.1.0
- * @access  public
- * @package sftp
- */
-class ssh2_sftp extends ssh2
-{
-	/**
-	 * Packet Types
-	 *
-	 * @see ssh2_sftp::__construct()
-	 * @var Array
-	 * @access private
-	 */
-	var $packet_types = array();
-
-	/**
-	 * Status Codes
-	 *
-	 * @see ssh2_sftp::__construct()
-	 * @var Array
-	 * @access private
-	 */
-	var $status_codes = array();
-
-	/**
-	 * The Window Size
-	 *
-	 * Bytes the other party can send before it must wait for the window to be adjusted (0x7FFFFFFF = 4GB)
-	 *
-	 * @var Integer
-	 * @see ssh2::exec()
-	 * @access private
-	 */
-	var $window_size = 0x7FFFFFFF;
-
-	/**
-	 * The Packet Size
-	 *
-	 * Maximum max packet size
-	 *
-	 * @var Integer
-	 * @see ssh2::exec()
-	 * @access private
-	 */
-	var $packet_size = 0x4000;
-
-	/**
-	 * The Client Channel
-	 *
-	 * Net_SSH2::exec() uses 0
-	 *
-	 * @var Integer
-	 * @see ssh2::exec()
-	 * @access private
-	 */
-	var $client_channel = 1;
-
-	/**
-	 * The Server Channel
-	 *
-	 * @var Integer
-	 * @see ssh2_sftp::_init_channel()
-	 * @access private
-	 */
-	var $server_channel = -1;
-
-	/**
-	 * The Request ID
-	 *
-	 * The request ID exists in the off chance that a packet is sent out-of-order.  Of course, this library doesn't support
-	 * concurrent actions, so it's somewhat academic, here.
-	 *
-	 * @var Integer
-	 * @see ssh2_sftp::_send_sftp_packet()
-	 * @access private
-	 */
-	var $request_id = false;
-
-	/**
-	 * The Packet Type
-	 *
-	 * The request ID exists in the off chance that a packet is sent out-of-order.  Of course, this library doesn't support
-	 * concurrent actions, so it's somewhat academic, here.
-	 *
-	 * @var Integer
-	 * @see ssh2_sftp::_send_sftp_packet()
-	 * @access private
-	 */
-	var $packet_type = -1;
-
-	/**
-	 * Extensions supported by the server
-	 *
-	 * @var Array
-	 * @see ssh2_sftp::_init_channel()
-	 * @access private
-	 */
-	var $extensions = array();
-
-	/**
-	 * Server SFTP version
-	 *
-	 * @var Integer
-	 * @see ssh2_sftp::_init_channel()
-	 * @access private
-	 */
-	var $version;
-
-	/**
-	 * Current working directory
-	 *
-	 * @var String
-	 * @see ssh2_sftp::_realpath()
-	 * @see ssh2_sftp::chdir()
-	 * @access private
-	 */
-	var $pwd = false;
-
-	/**
-	 * Packet Type Log
-	 *
-	 * @see ssh2_sftp::get_log()
-	 * @var Array
-	 * @access private
-	 */
-	var $packet_type_log = array();
-
-	/**
-	 * Packet Log
-	 *
-	 * @see ssh2_sftp::get_log()
-	 * @var Array
-	 * @access private
-	 */
-	var $packet_log = array();
-
-	/**
-	 * Default Constructor.
-	 *
-	 * Connects to an SFTP server
-	 *
-	 * @param String $host
-	 * @param optional Integer $port
-	 * @param optional Integer $timeout
-	 * @return sftp
-	 * @access public
-	 */
-	function __construct($host, $port = 22, $timeout = 10)
-	{
-		parent::__construct($host, $port, $timeout);
-		$this->packet_types = array(
-			1  => 'NET_SFTP_INIT',
-			2  => 'NET_SFTP_VERSION',
-			/* the format of SSH_FXP_OPEN changed between SFTPv4 and SFTPv5+:
-				   SFTPv5+: http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.1.1
-			   pre-SFTPv5 : http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.3 */
-			3  => 'NET_SFTP_OPEN',
-			4  => 'NET_SFTP_CLOSE',
-			5  => 'NET_SFTP_READ',
-			6  => 'NET_SFTP_WRITE',
-			8  => 'NET_SFTP_FSTAT',
-			9  => 'NET_SFTP_SETSTAT',
-			11 => 'NET_SFTP_OPENDIR',
-			12 => 'NET_SFTP_READDIR',
-			13 => 'NET_SFTP_REMOVE',
-			14 => 'NET_SFTP_MKDIR',
-			15 => 'NET_SFTP_RMDIR',
-			16 => 'NET_SFTP_REALPATH',
-			17 => 'NET_SFTP_STAT',
-			/* the format of SSH_FXP_RENAME changed between SFTPv4 and SFTPv5+:
-				   SFTPv5+: http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.3
-			   pre-SFTPv5 : http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.5 */
-			18 => 'NET_SFTP_RENAME',
-
-			101=> 'NET_SFTP_STATUS',
-			102=> 'NET_SFTP_HANDLE',
-			/* the format of SSH_FXP_NAME changed between SFTPv3 and SFTPv4+:
-				   SFTPv4+: http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-9.4
-			   pre-SFTPv4 : http://tools.ietf.org/html/draft-ietf-secsh-filexfer-02#section-7 */
-			103=> 'NET_SFTP_DATA',
-			104=> 'NET_SFTP_NAME',
-			105=> 'NET_SFTP_ATTRS',
-
-			200=> 'NET_SFTP_EXTENDED'
-		);
-		$this->status_codes = array(
-			0 => 'NET_SFTP_STATUS_OK',
-			1 => 'NET_SFTP_STATUS_EOF'
-		);
-		// http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-7.1
-		// the order, in this case, matters quite a lot - see ssh2_sftp::_parse_attributes() to understand why
-		$this->attributes = array(
-			0x00000001 => 'NET_SFTP_ATTR_SIZE',
-			0x00000002 => 'NET_SFTP_ATTR_UIDGID', // defined in SFTPv3, removed in SFTPv4+
-			0x00000004 => 'NET_SFTP_ATTR_PERMISSIONS',
-			0x00000008 => 'NET_SFTP_ATTR_ACCESSTIME',
-			0x80000000 => 'NET_SFTP_ATTR_EXTENDED'
-		);
-		// http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.3
-		// the flag definitions change somewhat in SFTPv5+.  if SFTPv5+ support is added to this library, maybe name
-		// the array for that $this->open5_flags and similarily alter the constant names.
-		$this->open_flags = array(
-			0x00000001 => 'NET_SFTP_OPEN_READ',
-			0x00000002 => 'NET_SFTP_OPEN_WRITE',
-			0x00000008 => 'NET_SFTP_OPEN_CREATE'
-		);
-		$this->_define_array(
-			$this->packet_types,
-			$this->status_codes,
-			$this->attributes,
-			$this->open_flags
-		);
-	}
-
-	/**
-	 * Login
-	 *
-	 * @param String $username
-	 * @param optional String $password
-	 * @return Boolean
-	 * @access public
-	 */
-	function login($username, $password = '')
-	{
-		if (!parent::login($username, $password))
-		{
-			return false;
-		}
-
-		$packet = pack('CNa*N3',
-			NET_SSH2_MSG_CHANNEL_OPEN, strlen('session'), 'session', $this->client_channel, $this->window_size, $this->packet_size);
-
-		if (!$this->_send_binary_packet($packet))
-		{
-			return false;
-		}
-
-		$response = $this->_get_binary_packet();
-		if ($response === false)
-		{
-			return false;
-		}
-
-		list(, $type) = unpack('C', $this->_string_shift($response, 1));
-
-		switch ($type)
-		{
-			case NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION:
-				$this->_string_shift($response, 4);
-				list(, $this->server_channel) = unpack('N', $this->_string_shift($response, 4));
-				break;
-			case NET_SSH2_MSG_CHANNEL_OPEN_FAILURE:
-				return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-		}
-
-		$packet = pack('CNNa*CNa*',
-			NET_SSH2_MSG_CHANNEL_REQUEST, $this->server_channel, strlen('subsystem'), 'subsystem', 1, strlen('sftp'), 'sftp');
-		if (!$this->_send_binary_packet($packet))
-		{
-			return false;
-		}
-
-		$response = $this->_get_binary_packet();
-		if ($response === false)
-		{
-			return false;
-		}
-
-		list(, $type) = unpack('C', $this->_string_shift($response, 1));
-
-		switch ($type)
-		{
-			case NET_SSH2_MSG_CHANNEL_SUCCESS:
-				break;
-			case NET_SSH2_MSG_CHANNEL_FAILURE:
-			default:
-				return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-		}
-
-		if (!$this->_send_sftp_packet(NET_SFTP_INIT, "\0\0\0\3"))
-		{
-			return false;
-		}
-
-		$response = $this->_get_sftp_packet();
-		if ($this->packet_type != NET_SFTP_VERSION)
-		{
-			return false;
-		}
-
-		list(, $this->version) = unpack('N', $this->_string_shift($response, 4));
-		while (!empty($response))
-		{
-			list(, $length) = unpack('N', $this->_string_shift($response, 4));
-			$key = $this->_string_shift($response, $length);
-			list(, $length) = unpack('N', $this->_string_shift($response, 4));
-			$value = $this->_string_shift($response, $length);
-			$this->extensions[$key] = $value;
-		}
-
-		/*
-		 SFTPv4+ defines a 'newline' extension.  SFTPv3 seems to have unofficial support for it via 'newline@vandyke.com',
-		 however, I'm not sure what 'newline@vandyke.com' is supposed to do (the fact that it's unofficial means that it's
-		 not in the official SFTPv3 specs) and 'newline@vandyke.com' / 'newline' are likely not drop-in substitutes for
-		 one another due to the fact that 'newline' comes with a SSH_FXF_TEXT bitmask whereas it seems unlikely that
-		 'newline@vandyke.com' would.
-		*/
-		/*
-		if (isset($this->extensions['newline@vandyke.com']))
-		{
-			$this->extensions['newline'] = $this->extensions['newline@vandyke.com'];
-			unset($this->extensions['newline@vandyke.com']);
-		}
-		*/
-
-		$this->request_id = 1;
-
-		/*
-		 A Note on SFTPv4/5/6 support:
-		 <http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-5.1> states the following:
-
-		 "If the client wishes to interoperate with servers that support noncontiguous version
-		  numbers it SHOULD send '3'"
-
-		 Given that the server only sends its version number after the client has already done so, the above
-		 seems to be suggesting that v3 should be the default version.  This makes sense given that v3 is the
-		 most popular.
-
-		 <http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-5.5> states the following;
-
-		 "If the server did not send the "versions" extension, or the version-from-list was not included, the
-		  server MAY send a status response describing the failure, but MUST then close the channel without
-		  processing any further requests."
-
-		 So what do you do if you have a client whose initial SSH_FXP_INIT packet says it implements v3 and
-		 a server whose initial SSH_FXP_VERSION reply says it implements v4 and only v4?  If it only implements
-		 v4, the "versions" extension is likely not going to have been sent so version re-negotiation as discussed
-		 in draft-ietf-secsh-filexfer-13 would be quite impossible.  As such, what sftp would do is close the
-		 channel and reopen it with a new and updated SSH_FXP_INIT packet.
-		*/
-		if ($this->version != 3)
-		{
-			return false;
-		}
-
-		$this->pwd = $this->_realpath('.');
-
-		return true;
-	}
-
-	/**
-	 * Returns the current directory name
-	 *
-	 * @return Mixed
-	 * @access public
-	 */
-	function pwd()
-	{
-		return $this->pwd;
-	}
-
-	/**
-	 * Canonicalize the Server-Side Path Name
-	 *
-	 * SFTP doesn't provide a mechanism by which the current working directory can be changed, so we'll emulate it.  Returns
-	 * the absolute (canonicalized) path.  If $mode is set to NET_SFTP_CONFIRM_DIR (as opposed to NET_SFTP_CONFIRM_NONE,
-	 * which is what it is set to by default), false is returned if $dir is not a valid directory.
-	 *
-	 * @see ssh2_sftp::chdir()
-	 * @param String $dir
-	 * @param optional Integer $mode
-	 * @return Mixed
-	 * @access private
-	 */
-	function _realpath($dir)
-	{
-		/*
-		"This protocol represents file names as strings.  File names are
-		 assumed to use the slash ('/') character as a directory separator.
-
-		 File names starting with a slash are "absolute", and are relative to
-		 the root of the file system.  Names starting with any other character
-		 are relative to the user's default directory (home directory).  Note
-		 that identifying the user is assumed to take place outside of this
-		 protocol."
-
-		 -- http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-6
-		*/
-		$file = '';
-		if ($this->pwd !== false)
-		{
-			// if the SFTP server returned the canonicalized path even for non-existant files this wouldn't be necessary
-			// on OpenSSH it isn't necessary but on other SFTP servers it is.  that and since the specs say nothing on
-			// the subject, we'll go ahead and work around it with the following.
-			if ($dir[strlen($dir) - 1] != '/')
-			{
-				$file = basename($dir);
-				$dir = dirname($dir);
-			}
-
-			if ($dir == '.' || $dir == $this->pwd)
-			{
-				return $this->pwd . $file;
-			}
-
-			if ($dir[0] != '/')
-			{
-				$dir = $this->pwd . '/' . $dir;
-			}
-			// on the surface it seems like maybe resolving a path beginning with / is unnecessary, but such paths
-			// can contain .'s and ..'s just like any other.  we could parse those out as appropriate or we can let
-			// the server do it.  we'll do the latter.
-		}
-
-		/*
-		 that SSH_FXP_REALPATH returns SSH_FXP_NAME does not necessarily mean that anything actually exists at the
-		 specified path.  generally speaking, no attributes are returned with this particular SSH_FXP_NAME packet
-		 regardless of whether or not a file actually exists.  and in SFTPv3, the longname field and the filename
-		 field match for this particular SSH_FXP_NAME packet.  for other SSH_FXP_NAME packets, this will likely
-		 not be the case, but for this one, it is.
-		*/
-		// http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.9
-		if (!$this->_send_sftp_packet(NET_SFTP_REALPATH, pack('Na*', strlen($dir), $dir)))
-		{
-			return false;
-		}
-
-		$response = $this->_get_sftp_packet();
-		switch ($this->packet_type)
-		{
-			case NET_SFTP_NAME:
-				// although SSH_FXP_NAME is implemented differently in SFTPv3 than it is in SFTPv4+, the following
-				// should work on all SFTP versions since the only part of the SSH_FXP_NAME packet the following looks
-				// at is the first part and that part is defined the same in SFTP versions 3 through 6.
-				$this->_string_shift($response, 4); // skip over the count - it should be 1, anyway
-				list(, $length) = unpack('N', $this->_string_shift($response, 4));
-				$realpath = $this->_string_shift($response, $length);
-				break;
-			case NET_SFTP_STATUS:
-				// skip over the status code - hopefully the error message will give us all the info we need, anyway
-				$this->_string_shift($response, 4);
-				list(, $length) = unpack('N', $this->_string_shift($response, 4));
-				$this->debug_info.= "\r\n\r\nSSH_FXP_STATUS:\r\n" . $this->_string_shift($response, $length);
-				return false;
-			default:
-				return false;
-		}
-
-		// if $this->pwd isn't set than the only thing $realpath could be is for '.', which is pretty much guaranteed to
-		// be a bonafide directory
-		return $realpath . '/' . $file;
-	}
-
-	/**
-	 * Changes the current directory
-	 *
-	 * @param String $dir
-	 * @return Boolean
-	 * @access public
-	 */
-	function chdir($dir)
-	{
-		if (!($this->bitmap & NET_SSH2_MASK_LOGIN))
-		{
-			return false;
-		}
-
-		if ($dir[strlen($dir) - 1] != '/')
-		{
-			$dir.= '/';
-		}
-		$dir = $this->_realpath($dir);
-
-		// confirm that $dir is, in fact, a valid directory
-		if (!$this->_send_sftp_packet(NET_SFTP_OPENDIR, pack('Na*', strlen($dir), $dir)))
-		{
-			return false;
-		}
-
-		// see ssh2_sftp::nlist() for a more thorough explanation of the following
-		$response = $this->_get_sftp_packet();
-		switch ($this->packet_type)
-		{
-			case NET_SFTP_HANDLE:
-				$handle = substr($response, 4);
-				break;
-			case NET_SFTP_STATUS:
-				return false;
-			default:
-				return false;
-		}
-
-		if (!$this->_send_sftp_packet(NET_SFTP_CLOSE, pack('Na*', strlen($handle), $handle)))
-		{
-			return false;
-		}
-
-		$this->_get_sftp_packet();
-		if ($this->packet_type != NET_SFTP_STATUS)
-		{
-			return false;
-		}
-
-		$this->pwd = $dir;
-		return true;
-	}
-
-	/**
-	 * Returns a list of files in the given directory
-	 *
-	 * @param optional String $dir
-	 * @return Mixed
-	 * @access public
-	 */
-	function nlist($dir = '.')
-	{
-		if (!($this->bitmap & NET_SSH2_MASK_LOGIN))
-		{
-			return false;
-		}
-
-		$dir = $this->_realpath($dir);
-		if ($dir === false)
-		{
-			return false;
-		}
-
-		// http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.1.2
-		if (!$this->_send_sftp_packet(NET_SFTP_OPENDIR, pack('Na*', strlen($dir), $dir)))
-		{
-			return false;
-		}
-
-		$response = $this->_get_sftp_packet();
-		switch ($this->packet_type)
-		{
-			case NET_SFTP_HANDLE:
-				// http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-9.2
-				// since 'handle' is the last field in the SSH_FXP_HANDLE packet, we'll just remove the first four bytes that
-				// represent the length of the string and leave it at that
-				$handle = substr($response, 4);
-				break;
-			case NET_SFTP_STATUS:
-				// presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-				return false;
-			default:
-				return false;
-		}
-
-		$contents = array();
-		while (true)
-		{
-			// http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.2.2
-			// why multiple SSH_FXP_READDIR packets would be sent when the response to a single one can span arbitrarily many
-			// SSH_MSG_CHANNEL_DATA messages is not known to me.
-			if (!$this->_send_sftp_packet(NET_SFTP_READDIR, pack('Na*', strlen($handle), $handle)))
-			{
-				return false;
-			}
-
-			$response = $this->_get_sftp_packet();
-			switch ($this->packet_type)
-			{
-				case NET_SFTP_NAME:
-					list(, $count) = unpack('N', $this->_string_shift($response, 4));
-					for ($i = 0; $i < $count; $i++)
-					{
-						list(, $length) = unpack('N', $this->_string_shift($response, 4));
-						$contents[] = $this->_string_shift($response, $length);
-						list(, $length) = unpack('N', $this->_string_shift($response, 4));
-						$this->_string_shift($response, $length); // we don't care about the longname
-						$this->_parse_attributes($response); // we also don't care about the attributes
-						// SFTPv6 has an optional boolean end-of-list field, but we'll ignore that, since the
-						// final SSH_FXP_STATUS packet should tell us that, already.
-					}
-					break;
-				case NET_SFTP_STATUS:
-					list(, $status) = unpack('N', $this->_string_shift($response, 4));
-					if ($status != NET_SFTP_STATUS_EOF)
-					{
-						list(, $length) = unpack('N', $this->_string_shift($response, 4));
-						$this->debug_info.= "\r\n\r\nSSH_FXP_STATUS:\r\n" . $this->_string_shift($response, $length);
-						return false;
-					}
-					break 2;
-				default:
-					return false;
-			}
-		}
-
-		if (!$this->_send_sftp_packet(NET_SFTP_CLOSE, pack('Na*', strlen($handle), $handle)))
-		{
-			return false;
-		}
-
-		// "The client MUST release all resources associated with the handle regardless of the status."
-		//  -- http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.1.3
-		$this->_get_sftp_packet();
-		if ($this->packet_type != NET_SFTP_STATUS)
-		{
-			return false;
-		}
-
-		return $contents;
-	}
-
-	/**
-	 * Set permissions on a file.
-	 *
-	 * Returns the new file permissions on success or FALSE on error.
-	 *
-	 * @param Integer $mode
-	 * @param String $filename
-	 * @return Mixed
-	 * @access public
-	 */
-	function chmod($mode, $filename)
-	{
-		if (!($this->bitmap & NET_SSH2_MASK_LOGIN))
-		{
-			return false;
-		}
-
-		$filename = $this->_realpath($filename);
-		if ($filename === false)
-		{
-			return false;
-		}
-
-		// SFTPv4+ has an additional byte field - type - that would need to be sent, as well. setting it to
-		// SSH_FILEXFER_TYPE_UNKNOWN might work. if not, we'd have to do an SSH_FXP_STAT before doing an SSH_FXP_SETSTAT.
-		$attr = pack('N2', NET_SFTP_ATTR_PERMISSIONS, $mode & 07777);
-		if (!$this->_send_sftp_packet(NET_SFTP_SETSTAT, pack('Na*a*', strlen($filename), $filename, $attr)))
-		{
-			return false;
-		}
-
-		/*
-		 "Because some systems must use separate system calls to set various attributes, it is possible that a failure 
-		  response will be returned, but yet some of the attributes may be have been successfully modified.  If possible,
-		  servers SHOULD avoid this situation; however, clients MUST be aware that this is possible."
-
-		  -- http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.6
-		*/
-		$this->_get_sftp_packet();
-		if ($this->packet_type != NET_SFTP_STATUS)
-		{
-			return false;
-		}
-
-		// rather than return what the permissions *should* be, we'll return what they actually are.  this will also
-		// tell us if the file actually exists.
-		// incidentally ,SFTPv4+ adds an additional 32-bit integer field - flags - to the following:
-		$packet = pack('Na*', strlen($filename), $filename);
-		if (!$this->_send_sftp_packet(NET_SFTP_STAT, $packet))
-		{
-			return false;
-		}
-
-		$response = $this->_get_sftp_packet();
-		switch ($this->packet_type)
-		{
-			case NET_SFTP_ATTRS:
-				$attrs = $this->_parse_attributes($response);
-				return $attrs['permissions'];
-			case NET_SFTP_STATUS:
-				return false;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Creates a directory.
-	 *
-	 * @param String $dir
-	 * @return Boolean
-	 * @access public
-	 */
-	function mkdir($dir)
-	{
-		if (!($this->bitmap & NET_SSH2_MASK_LOGIN))
-		{
-			return false;
-		}
-
-		$dir = $this->_realpath(rtrim($dir, '/'));
-		if ($dir === false)
-		{
-			return false;
-		}
-
-		// by not providing any permissions, hopefully the server will use the logged in users umask - their 
-		// default permissions.
-		if (!$this->_send_sftp_packet(NET_SFTP_MKDIR, pack('Na*N', strlen($dir), $dir, 0)))
-		{
-			return false;
-		}
-
-		$this->_get_sftp_packet();
-		if ($this->packet_type != NET_SFTP_STATUS)
-		{
-			return false;
-		}
-
-		list(, $status) = unpack('N', $this->_string_shift($response, 4));
-		if ($status != NET_SFTP_STATUS_OK)
-		{
-			list(, $length) = unpack('N', $this->_string_shift($response, 4));
-			$this->debug_info.= "\r\n\r\nSSH_FXP_STATUS:\r\n" . $this->_string_shift($response, $length);
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Removes a directory.
-	 *
-	 * @param String $dir
-	 * @return Boolean
-	 * @access public
-	 */
-	function rmdir($dir)
-	{
-		if (!($this->bitmap & NET_SSH2_MASK_LOGIN))
-		{
-			return false;
-		}
-
-		$dir = $this->_realpath($dir);
-		if ($dir === false)
-		{
-			return false;
-		}
-
-		if (!$this->_send_sftp_packet(NET_SFTP_RMDIR, pack('Na*', strlen($dir), $dir)))
-		{
-			return false;
-		}
-
-		$response = $this->_get_sftp_packet();
-		if ($this->packet_type != NET_SFTP_STATUS)
-		{
-			return false;
-		}
-
-		list(, $status) = unpack('N', $this->_string_shift($response, 4));
-		if ($status != NET_SFTP_STATUS_OK)
-		{
-			// presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED?
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Uploads a file to the SFTP server.
-	 *
-	 * By default, ssh2_sftp::put() does not read from the local filesystem.  $data is dumped directly into $remote_file.
-	 * So, for example, if you set $data to 'filename.ext' and then do ssh2_sftp::get(), you will get a file, twelve bytes
-	 * long, containing 'filename.ext' as its contents.
-	 *
-	 * Setting $mode to NET_SFTP_LOCAL_FILE will change the above behavior.  With NET_SFTP_LOCAL_FILE, $remote_file will 
-	 * contain as many bytes as filename.ext does on your local filesystem.  If your filename.ext is 1MB then that is how
-	 * large $remote_file will be, as well.
-	 *
-	 * Currently, only binary mode is supported.  As such, if the line endings need to be adjusted, you will need to take
-	 * care of that, yourself.
-	 *
-	 * @param String $remote_file
-	 * @param String $data
-	 * @param optional Integer $flags
-	 * @return Boolean
-	 * @access public
-	 * @internal ASCII mode for SFTPv4/5/6 can be supported by adding a new function - ssh2_sftp::setMode().
-	 */
-	function put($remote_file, $data, $mode = NET_SFTP_STRING)
-	{
-		if (!($this->bitmap & NET_SSH2_MASK_LOGIN))
-		{
-			return false;
-		}
-
-		$remote_file = $this->_realpath($remote_file);
-		if ($remote_file === false)
-		{
-			return false;
-		}
-
-		$packet = pack('Na*N2', strlen($remote_file), $remote_file, NET_SFTP_OPEN_WRITE | NET_SFTP_OPEN_CREATE, 0);
-		if (!$this->_send_sftp_packet(NET_SFTP_OPEN, $packet))
-		{
-			return false;
-		}
-
-		$response = $this->_get_sftp_packet();
-		switch ($this->packet_type)
-		{
-			case NET_SFTP_HANDLE:
-				$handle = substr($response, 4);
-				break;
-			case NET_SFTP_STATUS:
-				$this->_string_shift($response, 4);
-				list(, $length) = unpack('N', $this->_string_shift($response, 4));
-				$this->debug_info.= "\r\n\r\nSSH_FXP_STATUS:\r\n" . $this->_string_shift($response, $length);
-				return false;
-			default:
-				return false;
-		}
-
-		$initialize = true;
-
-		// http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.2.3
-		if ($mode == NET_SFTP_LOCAL_FILE)
-		{
-			if (!is_file($data))
-			{
-				return false;
-			}
-			$fp = fopen($data, 'r');
-			if (!$fp)
-			{
-				return false;
-			}
-			$sent = 0;
-			$size = filesize($data);
-			while ($sent < $size)
-			{
-				/*
-				 "The 'maximum packet size' specifies the maximum size of an individual data packet that can be sent to the
-				  sender.  For example, one might want to use smaller packets for interactive connections to get better
-				  interactive response on slow links."
-
-				 -- http://tools.ietf.org/html/rfc4254#section-5.1
-
-				 per that, we're going to assume that the 'maximum packet size' field of the SSH_MSG_CHANNEL_OPEN message 
-				 does not apply to the client.  the client is the one who sends the SSH_MSG_CHANNEL_OPEN message, anyway,
-				 so it's not as if the above could be referring to the server.
-
-				 the reason that's mentioned is because sending $this->packet_size as the payload will result in a packet
-				 that's larger than $this->packet_size, but that's not a problem, as per the above.
-				*/
-				if ($initialize)
-				{
-					$temp = fread($fp, $this->packet_size);
-					$sent+= strlen($temp);
-					$packet = pack('NCN2a*N3a*',
-						$size + strlen($handle) + 21, NET_SFTP_WRITE, $this->request_id, strlen($handle), $handle, 0, 0, $size, $temp
-					);
-					$initialize = false;
-					if (defined('NET_SFTP_LOGGING'))
-					{
-						$log_index = count($this->packet_type_log);
-						$this->packet_type_log[] = '<- ' . $this->packet_types[$packet_type];
-						$this->packet_log[] = $packet;
-					}
-				}
-				else
-				{
-					$packet = fread($fp, $this->packet_size);
-					$sent+= strlen($packet);
-					if (defined('NET_SFTP_LOGGING'))
-					{
-						$this->packet_log[$log_index].= $packet;
-					}
-				}
-				if (!$this->_send_channel_packet($packet))
-				{
-					fclose($fp);
-					return false;
-				}
-			}
-			fclose($fp);
-		}
-		else
-		{
-			while (strlen($data))
-			{
-				if ($initialize)
-				{
-					$packet = pack('NCN2a*N3a*',
-						strlen($data) + strlen($handle) + 21, NET_SFTP_WRITE, $this->request_id, strlen($handle), $handle, 0, 0, strlen($data),
-						$this->_string_shift($data, $this->packet_size)
-					);
-					$initialize = false;
-				}
-				else
-				{
-					$packet = $this->_string_shift($data, $this->packet_size);
-				}
-				if (!$this->_send_channel_packet($packet))
-				{
-					return false;
-				}
-			}
-		}
-
-		$this->_get_sftp_packet();
-		if ($this->packet_type != NET_SFTP_STATUS)
-		{
-			return false;
-		}
-
-		if (!$this->_send_sftp_packet(NET_SFTP_CLOSE, pack('Na*', strlen($handle), $handle)))
-		{
-			return false;
-		}
-
-		$this->_get_sftp_packet();
-		if ($this->packet_type != NET_SFTP_STATUS)
-		{
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Downloads a file from the SFTP server.
-	 *
-	 * Returns a string containing the contents of $remote_file if $local_file is left undefined or a boolean false if
-	 * the operation was unsuccessful.  If $local_file is defined, returns true or false depending on the success of the
-	 * operation
-	 *
-	 * @param String $remote_file
-	 * @param optional String $local_file
-	 * @return Mixed
-	 * @access public
-	 */
-	function get($remote_file, $local_file = false)
-	{
-		if (!($this->bitmap & NET_SSH2_MASK_LOGIN))
-		{
-			return false;
-		}
-
-		$remote_file = $this->_realpath($remote_file);
-		if ($remote_file === false)
-		{
-			return false;
-		}
-
-		$packet = pack('Na*N2', strlen($remote_file), $remote_file, NET_SFTP_OPEN_READ, 0);
-		if (!$this->_send_sftp_packet(NET_SFTP_OPEN, $packet))
-		{
-			return false;
-		}
-
-		$response = $this->_get_sftp_packet();
-		switch ($this->packet_type)
-		{
-			case NET_SFTP_HANDLE:
-				$handle = substr($response, 4);
-				break;
-			case NET_SFTP_STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-				return false;
-			default:
-				return false;
-		}
-
-		$packet = pack('Na*', strlen($handle), $handle);
-		if (!$this->_send_sftp_packet(NET_SFTP_FSTAT, $packet))
-		{
-			return false;
-		}
-
-		$response = $this->_get_sftp_packet();
-		switch ($this->packet_type)
-		{
-			case NET_SFTP_ATTRS:
-				$attrs = $this->_parse_attributes($response);
-				break;
-			case NET_SFTP_STATUS:
-				return false;
-			default:
-				return false;
-		}
-
-
-		if ($local_file !== false)
-		{
-			$fp = fopen($local_file, 'w');
-			if (!$fp)
-			{
-				return false;
-			}
-		}
-		else
-		{
-			$content = '';
-		}
-
-		$read = 0;
-		while ($read < $attrs['size'])
-		{
-			$packet = pack('Na*N3', strlen($handle), $handle, 0, $read, 100000); // 100000 is completely arbitrarily chosen
-			if (!$this->_send_sftp_packet(NET_SFTP_READ, $packet))
-			{
-				return false;
-			}
-
-			$response = $this->_get_sftp_packet();
-			switch ($this->packet_type)
-			{
-				case NET_SFTP_DATA:
-					$temp = substr($response, 4);
-					$read+= strlen($temp);
-					if ($local_file === false)
-					{
-						$content.= $temp;
-					}
-					else
-					{
-						fputs($fp, $temp);
-					}
-					break;
-				case NET_SFTP_STATUS:
-					$this->_string_shift($response, 4);
-					list(, $length) = unpack('N', $this->_string_shift($response, 4));
-					$this->debug_info.= "\r\n\r\nSSH_FXP_STATUS:\r\n" . $this->_string_shift($response, $length);
-					return false;
-				default:
-					return false;
-			}
-		}
-
-		if (!$this->_send_sftp_packet(NET_SFTP_CLOSE, pack('Na*', strlen($handle), $handle)))
-		{
-			return false;
-		}
-
-		$this->_get_sftp_packet();
-		if ($this->packet_type != NET_SFTP_STATUS)
-		{
-			return false;
-		}
-
-		if (isset($content))
-		{
-			return $content;
-		}
-
-		fclose($fp);
-		return true;
-	}
-
-	/**
-	 * Deletes a file on the SFTP server.
-	 *
-	 * @param String $path
-	 * @return Boolean
-	 * @access public
-	 */
-	function delete($path)
-	{
-		if (!($this->bitmap & NET_SSH2_MASK_LOGIN))
-		{
-			return false;
-		}
-
-		$remote_file = $this->_realpath($path);
-		if ($path === false)
-		{
-			return false;
-		}
-
-		// http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.3
-		if (!$this->_send_sftp_packet(NET_SFTP_REMOVE, pack('Na*', strlen($path), $path)))
-		{
-			return false;
-		}
-
-		$response = $this->_get_sftp_packet();
-		if ($this->packet_type != NET_SFTP_STATUS)
-		{
-			return false;
-		}
-
-		list(, $status) = unpack('N', $this->_string_shift($response, 4));
-
-		// if $status isn't SSH_FX_OK it's probably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-		return $status == NET_SFTP_STATUS_OK;
-	}
-
-	/**
-	 * Renames a file or a directory on the SFTP server
-	 *
-	 * @param String $oldname
-	 * @param String $newname
-	 * @return Boolean
-	 * @access public
-	 */
-	function rename($oldname, $newname)
-	{
-		if (!($this->bitmap & NET_SSH2_MASK_LOGIN))
-		{
-			return false;
-		}
-
-		$oldname = $this->_realpath($oldname);
-		$newname = $this->_realpath($newname);
-		if ($oldname === false || $newname === false)
-		{
-			return false;
-		}
-
-		// http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.3
-		$packet = pack('Na*Na*', strlen($oldname), $oldname, strlen($newname), $newname);
-		if (!$this->_send_sftp_packet(NET_SFTP_RENAME, $packet))
-		{
-			return false;
-		}
-
-		$response = $this->_get_sftp_packet();
-		if ($this->packet_type != NET_SFTP_STATUS)
-		{
-			return false;
-		}
-
-		list(, $status) = unpack('N', $this->_string_shift($response, 4));
-
-		// if $status isn't SSH_FX_OK it's probably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-		return $status == NET_SFTP_STATUS_OK;
-	}
-
-	/**
-	 * Parse Attributes
-	 *
-	 * See '7.  File Attributes' of draft-ietf-secsh-filexfer-13 for more info.
-	 *
-	 * @param String $response
-	 * @return Array
-	 * @access private
-	 */
-	function _parse_attributes(&$response)
-	{
-		$attr = array();
-		list(, $flags) = unpack('N', $this->_string_shift($response, 4));
-		// SFTPv4+ have a type field (a byte) that follows the above flag field
-		foreach ($this->attributes as $key => $value)
-		{
-			switch ($flags & $key)
-			{
-				case NET_SFTP_ATTR_SIZE: // 0x00000001
-					// size is represented by a 64-bit integer, so we perhaps ought to be doing the following:
-					//$attr['size'] = new Math_BigInteger($this->_string_shift($response, 8), 256);
-					// of course, you shouldn't be using sftp to transfer files that are in excess of 4GB
-					// (0xFFFFFFFF bytes), anyway.  as such, we'll just represent all file sizes that are bigger than
-					// 4GB as being 4GB.
-					list(, $upper) = unpack('N', $this->_string_shift($response, 4));
-					list(, $attr['size']) = unpack('N', $this->_string_shift($response, 4));
-					if ($upper)
-					{
-						$attr['size'] = 0xFFFFFFFF;
-					}
-					break;
-				case NET_SFTP_ATTR_UIDGID: // 0x00000002 (SFTPv3 only)
-					list(, $attr['uid']) = unpack('N', $this->_string_shift($response, 4));
-					list(, $attr['gid']) = unpack('N', $this->_string_shift($response, 4));
-					break;
-				case NET_SFTP_ATTR_PERMISSIONS: // 0x00000004
-					list(, $attr['permissions']) = unpack('N', $this->_string_shift($response, 4));
-					break;
-				case NET_SFTP_ATTR_ACCESSTIME: // 0x00000008
-					list(, $attr['atime']) = unpack('N', $this->_string_shift($response, 4));
-					list(, $attr['mtime']) = unpack('N', $this->_string_shift($response, 4));
-					break;
-				case NET_SFTP_ATTR_EXTENDED: // 0x80000000
-					list(, $count) = unpack('N', $this->_string_shift($response, 4));
-					for ($i = 0; $i < $count; $i++)
-					{
-						list(, $length) = unpack('N', $this->_string_shift($response, 4));
-						$key = $this->_string_shift($response, $length);
-						list(, $length) = unpack('N', $this->_string_shift($response, 4));
-						$attr[$key] = $this->_string_shift($response, $length);						
-					}
-			}
-		}
-		return $attr;
-	}
-
-	/**
-	 * Sends SFTP Packets
-	 *
-	 * See '6. General Packet Format' of draft-ietf-secsh-filexfer-13 for more info.
-	 *
-	 * @param Integer $type
-	 * @param String $data
-	 * @see ssh2_sftp::_get_sftp_packet()
-	 * @see ssh2_sftp::_send_channel_packet()
-	 * @return Boolean
-	 * @access private
-	 */
-	function _send_sftp_packet($type, $data)
-	{
-		$data = $this->request_id !== false ?
-			pack('NCNa*', strlen($data) + 5, $type, $this->request_id, $data) :
-			pack('NCa*',  strlen($data) + 1, $type, $data);
-
-		if (defined('NET_SFTP_LOGGING'))
-		{
-			$this->packet_type_log[] = '-> ' . $this->packet_types[$type];
-			$this->packet_log[] = $data;
-		}
-
-		return $this->_send_channel_packet($data);
-	}
-
-	/**
-	 * Sends Channel Packets
-	 *
-	 * If this function were in Net_SSH2, there'd have to be an additional server channel parameter since the Net_SSH2 object
-	 * doesn't currently have one.  Plus, it wouldn't actually make a lot of sense for Net_SSH2 even to have one - if it did
-	 * and if Net_SSH2::exec() used it then ssh2_sftp::exec() would also use it (through inheritance) and you'd have the
-	 * single server channel being overwritten and...  all in all, I think this is easier.
-	 *
-	 * @param Integer $type
-	 * @param String $data
-	 * @see ssh2_sftp::_send_sftp_packet()
-	 * @return Boolean
-	 * @access private
-	 */
-	function _send_channel_packet($data)
-	{
-		return $this->_send_binary_packet(pack('CN2a*', NET_SSH2_MSG_CHANNEL_DATA, $this->server_channel, strlen($data), $data));
-	}
-
-	/**
-	 * Receives SFTP Packets
-	 *
-	 * See '6. General Packet Format' of draft-ietf-secsh-filexfer-13 for more info.
-	 *
-	 * @see ssh2_sftp::_send_sftp_packet()
-	 * @return String
-	 * @access private
-	 */
-	function _get_sftp_packet()
-	{
-		$packet = $this->_get_channel_packet();
-		if (is_bool($packet))
-		{
-			$this->packet_type = false;
-			return false;
-		}
-		/*
-		 normally, strlen($packet) == $length, however, for really large packets, strlen($packet) < $length. what this means,
-		 when it happens, is that the string is being spanned out across multiple SSH_MSG_CHANNEL_DATA messages and we'll
-		 need to read them multiple times until we reach $length bytes.
-
-		 presumably, strlen($packet) > $length would never happen unless you were trying to employ steganography or
-		 something
-		*/
-		list(, $length) = unpack('N', $this->_string_shift($packet, 4));
-		$this->packet_type = ord($this->_string_shift($packet));
-		if ($this->request_id !== false)
-		{
-			$this->_string_shift($packet, 4); // remove the request id
-			$length-= 5; // account for the request id and the packet type
-		}
-		else
-		{
-			$length-= 1; // account for the packet type
-		}
-		$packet = substr($packet, 0, $length); // just in case strlen($packet) > $length
-		$length-= strlen($packet);
-		while ($length > 0)
-		{
-			$temp = $this->_get_channel_packet();
-			if (is_bool($temp))
-			{
-				$this->packet_type = false;
-				return false;
-			}
-			$packet.= $temp;
-			$length-= strlen($temp);
-		}
-
-		if (defined('NET_SFTP_LOGGING'))
-		{
-			$this->packet_type_log[] = '<- ' . $this->packet_types[$this->packet_type];
-			$this->packet_log[] = $packet;
-		}
-
-		return $packet;
-	}
-
-	/**
-	 * Returns a log of the packets that have been sent and received.
-	 *
-	 * $type can be either NET_SFTP_LOG_SIMPLE or NET_SFTP_LOG_COMPLEX.  Enable by defining NET_SSH2_LOGGING.
-	 *
-	 * @param Integer $type
-	 * @access public
-	 * @return String or Array
-	 */
-	function get_sftp_log($type = NET_SFTP_LOG_COMPLEX)
-	{
-		$message_number_log = $this->message_number_log;
-		$message_log = $this->message_log;
-
-		$this->message_number_log = $this->packet_type_log;
-		$this->message_log = $this->packet_log;
-
-		$return = $this->getLog($type);
-
-		$this->message_number_log = $message_number_log;
-		$this->message_log = $message_log;
-
-		return $return;
-	}
-
-	/**
-	 * Get supported SFTP versions
-	 *
-	 * @return Array
-	 * @access public
-	 */
-	function get_supported_versions()
-	{
-		$temp = array('version' => $this->version);
-		if (isset($this->extensions['versions']))
-		{
-			$temp['extensions'] = $this->extensions['versions'];
-		}
-		return $temp;
-	}
-
-	/**
-	 * Disconnect
-	 *
-	 * @param Integer $reason
-	 * @return Boolean
-	 * @access private
-	 */
-	function _disconnect($reason)
-	{
-		$this->pwd = false;
-		parent::_disconnect($reason);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/libraries/zend/Exception.php b/phpBB/includes/libraries/zend/Exception.php
deleted file mode 100644
index 599d8a033e..0000000000
--- a/phpBB/includes/libraries/zend/Exception.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend
- * @copyright  Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/**
- * @category   Zend
- * @package    Zend
- * @copyright  Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Exception extends Exception
-{}
-
diff --git a/phpBB/includes/libraries/zend/loader.php b/phpBB/includes/libraries/zend/loader.php
deleted file mode 100644
index 99a5543901..0000000000
--- a/phpBB/includes/libraries/zend/loader.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
-*
-* @package zend
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (version_compare(PHP_VERSION, '5.2.4', '<') || !function_exists('spl_autoload_register'))
-{
-	trigger_error('PHP >= 5.2.4 and spl_autoload_register() required', E_USER_ERROR);
-}
-
-/**
-* Autoload function for Zend framework classes
-*/
-function phpbb_zend_autoload($class_name)
-{
-	global $phpbb_root_path;
-
-	if (strpos($class_name, '_') !== false)
-	{
-		$path = str_replace('_', '/', $class_name) . '.php';
-		require("{$phpbb_root_path}includes/" . $path);
-		return true;
-	}
-}
-
-/**
-* @ignore
-*/
-// make sure Zend is in the include path
-ini_set( 'include_path', ini_get( 'include_path' ) . PATH_SEPARATOR . $phpbb_root_path . 'includes' );
-
-// check whether a regular autoload function already exists, so we can load it into the spl stack afterwards
-$register_autoload = false;
-if (function_exists('__autoload'))
-{
-	$register_autoload = true;
-}
-
-spl_autoload_register('phpbb_zend_autoload'); 
-
-// load the old autoload function into the spl stack if necessary
-if ($register_autoload)
-{
-	spl_autoload_register('__autoload');
-}
-\ No newline at end of file
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
deleted file mode 100644
index 39c65e054d..0000000000
--- a/phpBB/includes/message_parser.php
+++ /dev/null
@@ -1,1623 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (!class_exists('bbcode'))
-{
-	include(PHPBB_ROOT_PATH . 'includes/bbcode.' . PHP_EXT);
-}
-
-/**
-* BBCODE FIRSTPASS
-* BBCODE first pass class (functions for parsing messages for db storage)
-* @package phpBB3
-*/
-class bbcode_firstpass extends bbcode
-{
-	var $message = '';
-	var $warn_msg = array();
-	var $parsed_items = array();
-
-	/**
-	* Parse BBCode
-	*/
-	function parse_bbcode()
-	{
-		if (!$this->bbcodes)
-		{
-			$this->bbcode_init();
-		}
-
-		$this->bbcode_bitfield = '';
-		$bitfield = new bitfield();
-
-		foreach ($this->bbcodes as $bbcode_name => $bbcode_data)
-		{
-			if (isset($bbcode_data['disabled']) && $bbcode_data['disabled'])
-			{
-				foreach ($bbcode_data['regexp'] as $regexp => $replacement)
-				{
-					if (preg_match($regexp, $this->message))
-					{
-						$this->warn_msg[] = sprintf(phpbb::$user->lang['UNAUTHORISED_BBCODE'] , '[' . $bbcode_name . ']');
-						continue;
-					}
-				}
-			}
-			else
-			{
-				foreach ($bbcode_data['regexp'] as $regexp => $replacement)
-				{
-					// The pattern gets compiled and cached by the PCRE extension,
-					// it should not demand recompilation
-					if (preg_match($regexp, $this->message))
-					{
-						$this->message = preg_replace($regexp, $replacement, $this->message);
-						$bitfield->set($bbcode_data['bbcode_id']);
-					}
-				}
-			}
-		}
-
-		$this->bbcode_bitfield = $bitfield->get_base64();
-	}
-
-	/**
-	* Prepare some bbcodes for better parsing
-	*/
-	function prepare_bbcodes()
-	{
-		// Ok, seems like users instead want the no-parsing of urls, smilies, etc. after and before and within quote tags being tagged as "not a bug".
-		// Fine by me ;) Will ease our live... but do not come back and cry at us, we won't hear you.
-
-		/* Add newline at the end and in front of each quote block to prevent parsing errors (urls, smilies, etc.)
-		if (strpos($this->message, '[quote') !== false && strpos($this->message, '[/quote]') !== false)
-		{
-			$this->message = str_replace("\r\n", "\n", $this->message);
-
-			// We strip newlines and spaces after and before quotes in quotes (trimming) and then add exactly one newline
-			$this->message = preg_replace('#\[quote(=&quot;.*?&quot;)?\]\s*(.*?)\s*\[/quote\]#siu', '[quote\1]' . "\n" . '\2' ."\n[/quote]", $this->message);
-		}
-		*/
-
-		// Add other checks which needs to be placed before actually parsing anything (be it bbcodes, smilies, urls...)
-	}
-
-	/**
-	* Init bbcode data for later parsing
-	*/
-	function bbcode_init()
-	{
-		static $rowset;
-
-		// This array holds all bbcode data. BBCodes will be processed in this
-		// order, so it is important to keep [code] in first position and
-		// [quote] in second position.
-		$this->bbcodes = array(
-			'code'			=> array('bbcode_id' => 8,	'regexp' => array('#\[code(?:=([a-z]+))?\](.+\[/code\])#ise' => "\$this->bbcode_code('\$1', '\$2')")),
-			'quote'			=> array('bbcode_id' => 0,	'regexp' => array('#\[quote(?:=&quot;(.*?)&quot;)?\](.+)\[/quote\]#ise' => "\$this->bbcode_quote('\$0')")),
-			'attachment'	=> array('bbcode_id' => 12,	'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#ise' => "\$this->bbcode_attachment('\$1', '\$2')")),
-			'b'				=> array('bbcode_id' => 1,	'regexp' => array('#\[b\](.*?)\[/b\]#ise' => "\$this->bbcode_strong('\$1')")),
-			'i'				=> array('bbcode_id' => 2,	'regexp' => array('#\[i\](.*?)\[/i\]#ise' => "\$this->bbcode_italic('\$1')")),
-			'url'			=> array('bbcode_id' => 3,	'regexp' => array('#\[url(=(.*))?\](.*)\[/url\]#iUe' => "\$this->validate_url('\$2', '\$3')")),
-			'img'			=> array('bbcode_id' => 4,	'regexp' => array('#\[img\](.*)\[/img\]#iUe' => "\$this->bbcode_img('\$1')")),
-			'size'			=> array('bbcode_id' => 5,	'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#ise' => "\$this->bbcode_size('\$1', '\$2')")),
-			'color'			=> array('bbcode_id' => 6,	'regexp' => array('!\[color=(#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!ise' => "\$this->bbcode_color('\$1', '\$2')")),
-			'u'				=> array('bbcode_id' => 7,	'regexp' => array('#\[u\](.*?)\[/u\]#ise' => "\$this->bbcode_underline('\$1')")),
-			'list'			=> array('bbcode_id' => 9,	'regexp' => array('#\[list(?:=(?:[a-z0-9]|disc|circle|square))?].*\[/list]#ise' => "\$this->bbcode_parse_list('\$0')")),
-			'email'			=> array('bbcode_id' => 10,	'regexp' => array('#\[email=?(.*?)?\](.*?)\[/email\]#ise' => "\$this->validate_email('\$1', '\$2')")),
-			'flash'			=> array('bbcode_id' => 11,	'regexp' => array('#\[flash=([0-9]+),([0-9]+)\](.*?)\[/flash\]#ie' => "\$this->bbcode_flash('\$1', '\$2', '\$3')"))
-		);
-
-		// Zero the parsed items array
-		$this->parsed_items = array();
-
-		foreach ($this->bbcodes as $tag => $bbcode_data)
-		{
-			$this->parsed_items[$tag] = 0;
-		}
-
-		if (!is_array($rowset))
-		{
-			$rowset = array();
-
-			$sql = 'SELECT *
-				FROM ' . BBCODES_TABLE;
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$rowset[] = $row;
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		foreach ($rowset as $row)
-		{
-			$this->bbcodes[$row['bbcode_tag']] = array(
-				'bbcode_id'	=> (int) $row['bbcode_id'],
-				'regexp'	=> array($row['first_pass_match'] => str_replace('$uid', $this->bbcode_uid, $row['first_pass_replace']))
-			);
-		}
-	}
-
-	/**
-	* Making some pre-checks for bbcodes as well as increasing the number of parsed items
-	*/
-	function check_bbcode($bbcode, &$in)
-	{
-		// when using the /e modifier, preg_replace slashes double-quotes but does not
-		// seem to slash anything else
-		$in = str_replace("\r\n", "\n", str_replace('\"', '"', $in));
-
-		// Trimming here to make sure no empty bbcodes are parsed accidently
-		if (trim($in) == '')
-		{
-			return false;
-		}
-
-		$this->parsed_items[$bbcode]++;
-
-		return true;
-	}
-
-	/**
-	* Transform some characters in valid bbcodes
-	*/
-	function bbcode_specialchars($text)
-	{
-		$str_from = array('<', '>', '[', ']', '.', ':');
-		$str_to = array('&lt;', '&gt;', '&#91;', '&#93;', '&#46;', '&#58;');
-
-		return str_replace($str_from, $str_to, $text);
-	}
-
-	/**
-	* Parse size tag
-	*/
-	function bbcode_size($stx, $in)
-	{
-		if (!$this->check_bbcode('size', $in))
-		{
-			return $in;
-		}
-
-		if (phpbb::$config['max_' . $this->mode . '_font_size'] && phpbb::$config['max_' . $this->mode . '_font_size'] < $stx)
-		{
-			$this->warn_msg[] = sprintf(phpbb::$user->lang['MAX_FONT_SIZE_EXCEEDED'], phpbb::$config['max_' . $this->mode . '_font_size']);
-
-			return '[size=' . $stx . ']' . $in . '[/size]';
-		}
-
-		// Do not allow size=0
-		if ($stx <= 0)
-		{
-			return '[size=' . $stx . ']' . $in . '[/size]';
-		}
-
-		return '[size=' . $stx . ':' . $this->bbcode_uid . ']' . $in . '[/size:' . $this->bbcode_uid . ']';
-	}
-
-	/**
-	* Parse color tag
-	*/
-	function bbcode_color($stx, $in)
-	{
-		if (!$this->check_bbcode('color', $in))
-		{
-			return $in;
-		}
-
-		return '[color=' . $stx . ':' . $this->bbcode_uid . ']' . $in . '[/color:' . $this->bbcode_uid . ']';
-	}
-
-	/**
-	* Parse u tag
-	*/
-	function bbcode_underline($in)
-	{
-		if (!$this->check_bbcode('u', $in))
-		{
-			return $in;
-		}
-
-		return '[u:' . $this->bbcode_uid . ']' . $in . '[/u:' . $this->bbcode_uid . ']';
-	}
-
-	/**
-	* Parse b tag
-	*/
-	function bbcode_strong($in)
-	{
-		if (!$this->check_bbcode('b', $in))
-		{
-			return $in;
-		}
-
-		return '[b:' . $this->bbcode_uid . ']' . $in . '[/b:' . $this->bbcode_uid . ']';
-	}
-
-	/**
-	* Parse i tag
-	*/
-	function bbcode_italic($in)
-	{
-		if (!$this->check_bbcode('i', $in))
-		{
-			return $in;
-		}
-
-		return '[i:' . $this->bbcode_uid . ']' . $in . '[/i:' . $this->bbcode_uid . ']';
-	}
-
-	/**
-	* Parse img tag
-	*/
-	function bbcode_img($in)
-	{
-		if (!$this->check_bbcode('img', $in))
-		{
-			return $in;
-		}
-
-		$in = trim($in);
-		$error = false;
-
-		$in = str_replace(' ', '%20', $in);
-
-		// Checking urls
-		if (!preg_match('#^' . get_preg_expression('url') . '$#i', $in) && !preg_match('#^' . get_preg_expression('www_url') . '$#i', $in))
-		{
-			return '[img]' . $in . '[/img]';
-		}
-
-		// Try to cope with a common user error... not specifying a protocol but only a subdomain
-		if (!preg_match('#^[a-z0-9]+://#i', $in))
-		{
-			$in = 'http://' . $in;
-		}
-
-		if (phpbb::$config['max_' . $this->mode . '_img_height'] || phpbb::$config['max_' . $this->mode . '_img_width'])
-		{
-			$stats = @getimagesize($in);
-
-			if ($stats === false)
-			{
-				$error = true;
-				$this->warn_msg[] = phpbb::$user->lang['UNABLE_GET_IMAGE_SIZE'];
-			}
-			else
-			{
-				if (phpbb::$config['max_' . $this->mode . '_img_height'] && phpbb::$config['max_' . $this->mode . '_img_height'] < $stats[1])
-				{
-					$error = true;
-					$this->warn_msg[] = sprintf(phpbb::$user->lang['MAX_IMG_HEIGHT_EXCEEDED'], phpbb::$config['max_' . $this->mode . '_img_height']);
-				}
-
-				if (phpbb::$config['max_' . $this->mode . '_img_width'] && phpbb::$config['max_' . $this->mode . '_img_width'] < $stats[0])
-				{
-					$error = true;
-					$this->warn_msg[] = sprintf(phpbb::$user->lang['MAX_IMG_WIDTH_EXCEEDED'], phpbb::$config['max_' . $this->mode . '_img_width']);
-				}
-			}
-		}
-
-		if ($error || $this->path_in_domain($in))
-		{
-			return '[img]' . $in . '[/img]';
-		}
-
-		return '[img:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($in) . '[/img:' . $this->bbcode_uid . ']';
-	}
-
-	/**
-	* Parse flash tag
-	*/
-	function bbcode_flash($width, $height, $in)
-	{
-		if (!$this->check_bbcode('flash', $in))
-		{
-			return $in;
-		}
-
-		$in = trim($in);
-		$error = false;
-
-		// Do not allow 0-sizes generally being entered
-		if ($width <= 0 || $height <= 0)
-		{
-			return '[flash=' . $width . ',' . $height . ']' . $in . '[/flash]';
-		}
-
-		// Apply the same size checks on flash files as on images
-		if (phpbb::$config['max_' . $this->mode . '_img_height'] || phpbb::$config['max_' . $this->mode . '_img_width'])
-		{
-			if (phpbb::$config['max_' . $this->mode . '_img_height'] && phpbb::$config['max_' . $this->mode . '_img_height'] < $height)
-			{
-				$error = true;
-				$this->warn_msg[] = sprintf(phpbb::$user->lang['MAX_FLASH_HEIGHT_EXCEEDED'], phpbb::$config['max_' . $this->mode . '_img_height']);
-			}
-
-			if (phpbb::$config['max_' . $this->mode . '_img_width'] && phpbb::$config['max_' . $this->mode . '_img_width'] < $width)
-			{
-				$error = true;
-				$this->warn_msg[] = sprintf(phpbb::$user->lang['MAX_FLASH_WIDTH_EXCEEDED'], phpbb::$config['max_' . $this->mode . '_img_width']);
-			}
-		}
-
-		if ($error || $this->path_in_domain($in))
-		{
-			return '[flash=' . $width . ',' . $height . ']' . $in . '[/flash]';
-		}
-
-		return '[flash=' . $width . ',' . $height . ':' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($in) . '[/flash:' . $this->bbcode_uid . ']';
-	}
-
-	/**
-	* Parse inline attachments [ia]
-	*/
-	function bbcode_attachment($stx, $in)
-	{
-		if (!$this->check_bbcode('attachment', $in))
-		{
-			return $in;
-		}
-
-		return '[attachment=' . $stx . ':' . $this->bbcode_uid . ']<!-- ia' . $stx . ' -->' . trim($in) . '<!-- ia' . $stx . ' -->[/attachment:' . $this->bbcode_uid . ']';
-	}
-
-	/**
-	* Parse code text from code tag
-	* @access private
-	*/
-	function bbcode_parse_code($stx, &$code)
-	{
-		switch (strtolower($stx))
-		{
-			case 'php':
-
-				$remove_tags = false;
-
-				$str_from = array('&lt;', '&gt;', '&#91;', '&#93;', '&#46;', '&#58;', '&#058;');
-				$str_to = array('<', '>', '[', ']', '.', ':', ':');
-				$code = str_replace($str_from, $str_to, $code);
-
-				if (!preg_match('/\<\?.*?\?\>/is', $code))
-				{
-					$remove_tags = true;
-					$code = "<?php $code ?>";
-				}
-
-				$conf = array('highlight.bg', 'highlight.comment', 'highlight.default', 'highlight.html', 'highlight.keyword', 'highlight.string');
-				foreach ($conf as $ini_var)
-				{
-					@ini_set($ini_var, str_replace('highlight.', 'syntax', $ini_var));
-				}
-
-				// Because highlight_string is specialcharing the text (but we already did this before), we have to reverse this in order to get correct results
-				$code = htmlspecialchars_decode($code);
-				$code = highlight_string($code, true);
-
-				$str_from = array('<span style="color: ', '<font color="syntax', '</font>', '<code>', '</code>','[', ']', '.', ':');
-				$str_to = array('<span class="', '<span class="syntax', '</span>', '', '', '&#91;', '&#93;', '&#46;', '&#58;');
-
-				if ($remove_tags)
-				{
-					$str_from[] = '<span class="syntaxdefault">&lt;?php </span>';
-					$str_to[] = '';
-					$str_from[] = '<span class="syntaxdefault">&lt;?php&nbsp;';
-					$str_to[] = '<span class="syntaxdefault">';
-				}
-
-				$code = str_replace($str_from, $str_to, $code);
-				$code = preg_replace('#^(<span class="[a-z_]+">)\n?(.*?)\n?(</span>)$#is', '$1$2$3', $code);
-
-				if ($remove_tags)
-				{
-					$code = preg_replace('#(<span class="[a-z]+">)?\?&gt;(</span>)#', '$1&nbsp;$2', $code);
-				}
-
-				$code = preg_replace('#^<span class="[a-z]+"><span class="([a-z]+)">(.*)</span></span>#s', '<span class="$1">$2</span>', $code);
-				$code = preg_replace('#(?:\s++|&nbsp;)*+</span>$#u', '</span>', $code);
-
-				// remove newline at the end
-				if (!empty($code) && substr($code, -1) == "\n")
-				{
-					$code = substr($code, 0, -1);
-				}
-
-				return "[code=$stx:" . $this->bbcode_uid . ']' . $code . '[/code:' . $this->bbcode_uid . ']';
-			break;
-
-			default:
-				return '[code:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($code) . '[/code:' . $this->bbcode_uid . ']';
-			break;
-		}
-	}
-
-	/**
-	* Parse code tag
-	* Expects the argument to start right after the opening [code] tag and to end with [/code]
-	*/
-	function bbcode_code($stx, $in)
-	{
-		if (!$this->check_bbcode('code', $in))
-		{
-			return $in;
-		}
-
-		// We remove the hardcoded elements from the code block here because it is not used in code blocks
-		// Having it here saves us one preg_replace per message containing [code] blocks
-		// Additionally, magic url parsing should go after parsing bbcodes, but for safety those are stripped out too...
-		$htm_match = get_preg_expression('bbcode_htm');
-		unset($htm_match[4], $htm_match[5]);
-		$htm_replace = array('\1', '\1', '\2', '\1');
-
-		$out = $code_block = '';
-		$open = 1;
-
-		while ($in)
-		{
-			// Determine position and tag length of next code block
-			preg_match('#(.*?)(\[code(?:=([a-z]+))?\])(.+)#is', $in, $buffer);
-			$pos = (isset($buffer[1])) ? strlen($buffer[1]) : false;
-			$tag_length = (isset($buffer[2])) ? strlen($buffer[2]) : false;
-
-			// Determine position of ending code tag
-			$pos2 = stripos($in, '[/code]');
-
-			// Which is the next block, ending code or code block
-			if ($pos !== false && $pos < $pos2)
-			{
-				// Open new block
-				if (!$open)
-				{
-					$out .= substr($in, 0, $pos);
-					$in = substr($in, $pos);
-					$stx = (isset($buffer[3])) ? $buffer[3] : '';
-					$code_block = '';
-				}
-				else
-				{
-					// Already opened block, just append to the current block
-					$code_block .= substr($in, 0, $pos) . ((isset($buffer[2])) ? $buffer[2] : '');
-					$in = substr($in, $pos);
-				}
-
-				$in = substr($in, $tag_length);
-				$open++;
-			}
-			else
-			{
-				// Close the block
-				if ($open == 1)
-				{
-					$code_block .= substr($in, 0, $pos2);
-					$code_block = preg_replace($htm_match, $htm_replace, $code_block);
-
-					// Parse this code block
-					$out .= $this->bbcode_parse_code($stx, $code_block);
-					$code_block = '';
-					$open--;
-				}
-				else if ($open)
-				{
-					// Close one open tag... add to the current code block
-					$code_block .= substr($in, 0, $pos2 + 7);
-					$open--;
-				}
-				else
-				{
-					// end code without opening code... will be always outside code block
-					$out .= substr($in, 0, $pos2 + 7);
-				}
-
-				$in = substr($in, $pos2 + 7);
-			}
-		}
-
-		// if now $code_block has contents we need to parse the remaining code while removing the last closing tag to match up.
-		if ($code_block)
-		{
-			$code_block = substr($code_block, 0, -7);
-			$code_block = preg_replace($htm_match, $htm_replace, $code_block);
-
-			$out .= $this->bbcode_parse_code($stx, $code_block);
-		}
-
-		return $out;
-	}
-
-	/**
-	* Parse list bbcode
-	* Expects the argument to start with a tag
-	*/
-	function bbcode_parse_list($in)
-	{
-		if (!$this->check_bbcode('list', $in))
-		{
-			return $in;
-		}
-
-		// $tok holds characters to stop at. Since the string starts with a '[' we'll get everything up to the first ']' which should be the opening [list] tag
-		$tok = ']';
-		$out = '[';
-
-		// First character is [
-		$in = substr($in, 1);
-		$list_end_tags = $item_end_tags = array();
-
-		do
-		{
-			$pos = strlen($in);
-
-			for ($i = 0, $tok_len = strlen($tok); $i < $tok_len; ++$i)
-			{
-				$tmp_pos = strpos($in, $tok[$i]);
-
-				if ($tmp_pos !== false && $tmp_pos < $pos)
-				{
-					$pos = $tmp_pos;
-				}
-			}
-
-			$buffer = substr($in, 0, $pos);
-			$tok = $in[$pos];
-
-			$in = substr($in, $pos + 1);
-
-			if ($tok == ']')
-			{
-				// if $tok is ']' the buffer holds a tag
-				if (strtolower($buffer) == '/list' && sizeof($list_end_tags))
-				{
-					// valid [/list] tag, check nesting so that we don't hit false positives
-					if (sizeof($item_end_tags) && sizeof($item_end_tags) >= sizeof($list_end_tags))
-					{
-						// current li tag has not been closed
-						$out = preg_replace('/\n?\[$/', '[', $out) . array_pop($item_end_tags) . '][';
-					}
-
-					$out .= array_pop($list_end_tags) . ']';
-					$tok = '[';
-				}
-				else if (preg_match('#^list(=[0-9a-z]+)?$#i', $buffer, $m))
-				{
-					// sub-list, add a closing tag
-					if (empty($m[1]) || preg_match('/^=(?:disc|square|circle)$/i', $m[1]))
-					{
-						array_push($list_end_tags, '/list:u:' . $this->bbcode_uid);
-					}
-					else
-					{
-						array_push($list_end_tags, '/list:o:' . $this->bbcode_uid);
-					}
-					$out .= 'list' . substr($buffer, 4) . ':' . $this->bbcode_uid . ']';
-					$tok = '[';
-				}
-				else
-				{
-					if (($buffer == '*' || substr($buffer, -2) == '[*') && sizeof($list_end_tags))
-					{
-						// the buffer holds a bullet tag and we have a [list] tag open
-						if (sizeof($item_end_tags) >= sizeof($list_end_tags))
-						{
-							if (substr($buffer, -2) == '[*')
-							{
-								$out .= substr($buffer, 0, -2) . '[';
-							}
-							// current li tag has not been closed
-							if (preg_match('/\n\[$/', $out, $m))
-							{
-								$out = preg_replace('/\n\[$/', '[', $out);
-								$buffer = array_pop($item_end_tags) . "]\n[*:" . $this->bbcode_uid;
-							}
-							else
-							{
-								$buffer = array_pop($item_end_tags) . '][*:' . $this->bbcode_uid;
-							}
-						}
-						else
-						{
-							$buffer = '*:' . $this->bbcode_uid;
-						}
-
-						$item_end_tags[] = '/*:m:' . $this->bbcode_uid;
-					}
-					else if ($buffer == '/*')
-					{
-						array_pop($item_end_tags);
-						$buffer = '/*:' . $this->bbcode_uid;
-					}
-
-					$out .= $buffer . $tok;
-					$tok = '[]';
-				}
-			}
-			else
-			{
-				// Not within a tag, just add buffer to the return string
-				$out .= $buffer . $tok;
-				$tok = ($tok == '[') ? ']' : '[]';
-			}
-		}
-		while ($in);
-
-		// do we have some tags open? close them now
-		if (sizeof($item_end_tags))
-		{
-			$out .= '[' . implode('][', $item_end_tags) . ']';
-		}
-		if (sizeof($list_end_tags))
-		{
-			$out .= '[' . implode('][', $list_end_tags) . ']';
-		}
-
-		return $out;
-	}
-
-	/**
-	* Parse quote bbcode
-	* Expects the argument to start with a tag
-	*/
-	function bbcode_quote($in)
-	{
-		/**
-		* If you change this code, make sure the cases described within the following reports are still working:
-		* #3572 - [quote="[test]test"]test [ test[/quote] - (correct: parsed)
-		* #14667 - [quote]test[/quote] test ] and [ test [quote]test[/quote] (correct: parsed)
-		* #14770 - [quote="["]test[/quote] (correct: parsed)
-		* [quote="[i]test[/i]"]test[/quote] (correct: parsed)
-		* [quote="[quote]test[/quote]"]test[/quote] (correct: parsed - Username displayed as [quote]test[/quote])
-		* #20735 - [quote]test[/[/b]quote] test [/quote][/quote] test - (correct: quoted: "test[/[/b]quote] test" / non-quoted: "[/quote] test" - also failed if layout distorted)
-		* #40565 - [quote="a"]a[/quote][quote="a]a[/quote] (correct: first quote tag parsed, second quote tag unparsed)
-		*/
-
-		$in = str_replace("\r\n", "\n", str_replace('\"', '"', trim($in)));
-
-		if (!$in)
-		{
-			return '';
-		}
-
-		// To let the parser not catch tokens within quote_username quotes we encode them before we start this...
-		$in = preg_replace('#quote=&quot;(.*?)&quot;\]#ie', "'quote=&quot;' . str_replace(array('[', ']', '\\\"'), array('&#91;', '&#93;', '\"'), '\$1') . '&quot;]'", $in);
-
-		$tok = ']';
-		$out = '[';
-
-		$in = substr($in, 1);
-		$close_tags = $error_ary = array();
-		$buffer = '';
-
-		do
-		{
-			$pos = strlen($in);
-			for ($i = 0, $tok_len = strlen($tok); $i < $tok_len; ++$i)
-			{
-				$tmp_pos = strpos($in, $tok[$i]);
-				if ($tmp_pos !== false && $tmp_pos < $pos)
-				{
-					$pos = $tmp_pos;
-				}
-			}
-
-			$buffer .= substr($in, 0, $pos);
-			$tok = $in[$pos];
-			$in = substr($in, $pos + 1);
-
-			if ($tok == ']')
-			{
-				if (strtolower($buffer) == '/quote' && sizeof($close_tags) && substr($out, -1, 1) == '[')
-				{
-					// we have found a closing tag
-					$out .= array_pop($close_tags) . ']';
-					$tok = '[';
-					$buffer = '';
-
-					/* Add space at the end of the closing tag if not happened before to allow following urls/smilies to be parsed correctly
-					* Do not try to think for the user. :/ Do not parse urls/smilies if there is no space - is the same as with other bbcodes too.
-					* Also, we won't have any spaces within $in anyway, only adding up spaces -> #10982
-					if (!$in || $in[0] !== ' ')
-					{
-						$out .= ' ';
-					}*/
-				}
-				else if (preg_match('#^quote(?:=&quot;(.*?)&quot;)?$#is', $buffer, $m) && substr($out, -1, 1) == '[')
-				{
-					$this->parsed_items['quote']++;
-
-					// the buffer holds a valid opening tag
-					if (phpbb::$config['max_quote_depth'] && sizeof($close_tags) >= phpbb::$config['max_quote_depth'])
-					{
-						// there are too many nested quotes
-						$error_ary['quote_depth'] = sprintf(phpbb::$user->lang['QUOTE_DEPTH_EXCEEDED'], phpbb::$config['max_quote_depth']);
-
-						$out .= $buffer . $tok;
-						$tok = '[]';
-						$buffer = '';
-
-						continue;
-					}
-
-					array_push($close_tags, '/quote:' . $this->bbcode_uid);
-
-					if (isset($m[1]) && $m[1])
-					{
-						$username = str_replace(array('&#91;', '&#93;'), array('[', ']'), $m[1]);
-						$username = preg_replace('#\[(?!b|i|u|color|url|email|/b|/i|/u|/color|/url|/email)#iU', '&#91;$1', $username);
-
-						$end_tags = array();
-						$error = false;
-
-						preg_match_all('#\[((?:/)?(?:[a-z]+))#i', $username, $tags);
-						foreach ($tags[1] as $tag)
-						{
-							if ($tag[0] != '/')
-							{
-								$end_tags[] = '/' . $tag;
-							}
-							else
-							{
-								$end_tag = array_pop($end_tags);
-								$error = ($end_tag != $tag) ? true : false;
-							}
-						}
-
-						if ($error)
-						{
-							$username = $m[1];
-						}
-
-						$out .= 'quote=&quot;' . $username . '&quot;:' . $this->bbcode_uid . ']';
-					}
-					else
-					{
-						$out .= 'quote:' . $this->bbcode_uid . ']';
-					}
-
-					$tok = '[';
-					$buffer = '';
-				}
-				else if (preg_match('#^quote=&quot;(.*?)#is', $buffer, $m))
-				{
-					// the buffer holds an invalid opening tag
-					$buffer .= ']';
-				}
-				else
-				{
-					$out .= $buffer . $tok;
-					$tok = '[]';
-					$buffer = '';
-				}
-			}
-			else
-			{
-/**
-*				Old quote code working fine, but having errors listed in bug #3572
-*
-*				$out .= $buffer . $tok;
-*				$tok = ($tok == '[') ? ']' : '[]';
-*				$buffer = '';
-*/
-
-				$out .= $buffer . $tok;
-
-				if ($tok == '[')
-				{
-					// Search the text for the next tok... if an ending quote comes first, then change tok to []
-					$pos1 = stripos($in, '[/quote');
-					// If the token ] comes first, we change it to ]
-					$pos2 = strpos($in, ']');
-					// If the token [ comes first, we change it to [
-					$pos3 = strpos($in, '[');
-
-					if ($pos1 !== false && ($pos2 === false || $pos1 < $pos2) && ($pos3 === false || $pos1 < $pos3))
-					{
-						$tok = '[]';
-					}
-					else if ($pos3 !== false && ($pos2 === false || $pos3 < $pos2))
-					{
-						$tok = '[';
-					}
-					else
-					{
-						$tok = ']';
-					}
-				}
-				else
-				{
-					$tok = '[]';
-				}
-				$buffer = '';
-			}
-		}
-		while ($in);
-
-		$out .= $buffer;
-
-		if (sizeof($close_tags))
-		{
-			$out .= '[' . implode('][', $close_tags) . ']';
-		}
-
-		foreach ($error_ary as $error_msg)
-		{
-			$this->warn_msg[] = $error_msg;
-		}
-
-		return $out;
-	}
-
-	/**
-	* Validate email
-	*/
-	function validate_email($var1, $var2)
-	{
-		$var1 = str_replace("\r\n", "\n", str_replace('\"', '"', trim($var1)));
-		$var2 = str_replace("\r\n", "\n", str_replace('\"', '"', trim($var2)));
-
-		$txt = $var2;
-		$email = ($var1) ? $var1 : $var2;
-
-		$validated = true;
-
-		if (!preg_match('/^' . get_preg_expression('email') . '$/i', $email))
-		{
-			$validated = false;
-		}
-
-		if (!$validated)
-		{
-			return '[email' . (($var1) ? "=$var1" : '') . ']' . $var2 . '[/email]';
-		}
-
-		$this->parsed_items['email']++;
-
-		if ($var1)
-		{
-			$retval = '[email=' . $this->bbcode_specialchars($email) . ':' . $this->bbcode_uid . ']' . $txt . '[/email:' . $this->bbcode_uid . ']';
-		}
-		else
-		{
-			$retval = '[email:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($email) . '[/email:' . $this->bbcode_uid . ']';
-		}
-
-		return $retval;
-	}
-
-	/**
-	* Validate url
-	*
-	* @param string $var1 optional url parameter for url bbcode: [url(=$var1)]$var2[/url]
-	* @param string $var2 url bbcode content: [url(=$var1)]$var2[/url]
-	*/
-	function validate_url($var1, $var2)
-	{
-		$var1 = str_replace("\r\n", "\n", str_replace('\"', '"', trim($var1)));
-		$var2 = str_replace("\r\n", "\n", str_replace('\"', '"', trim($var2)));
-
-		$url = ($var1) ? $var1 : $var2;
-
-		if ($var1 && !$var2)
-		{
-			$var2 = $var1;
-		}
-
-		if (!$url)
-		{
-			return '[url' . (($var1) ? '=' . $var1 : '') . ']' . $var2 . '[/url]';
-		}
-
-		$valid = false;
-
-		$url = str_replace(' ', '%20', $url);
-
-		// Checking urls
-		if (preg_match('#^' . get_preg_expression('url') . '$#i', $url) ||
-			preg_match('#^' . get_preg_expression('www_url') . '$#i', $url) ||
-			preg_match('#^' . preg_quote(generate_board_url(), '#') . get_preg_expression('relative_url') . '$#i', $url))
-		{
-			$valid = true;
-		}
-
-		if ($valid)
-		{
-			$this->parsed_items['url']++;
-
-			// if there is no scheme, then add http schema
-			if (!preg_match('#^[a-z][a-z\d+\-.]*:/{2}#i', $url))
-			{
-				$url = 'http://' . $url;
-			}
-
-			// Is this a link to somewhere inside this board? If so then remove the session id from the url
-			if (strpos($url, generate_board_url()) !== false && strpos($url, 'sid=') !== false)
-			{
-				$url = preg_replace('/(&amp;|\?)sid=[0-9a-f]{32}&amp;/', '\1', $url);
-				$url = preg_replace('/(&amp;|\?)sid=[0-9a-f]{32}$/', '', $url);
-				$url = append_sid($url);
-			}
-
-			return ($var1) ? '[url=' . $this->bbcode_specialchars($url) . ':' . $this->bbcode_uid . ']' . $var2 . '[/url:' . $this->bbcode_uid . ']' : '[url:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($url) . '[/url:' . $this->bbcode_uid . ']';
-		}
-
-		return '[url' . (($var1) ? '=' . $var1 : '') . ']' . $var2 . '[/url]';
-	}
-
-	/**
-	* Check if url is pointing to this domain/script_path/php-file
-	*
-	* @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
-	*/
-	function path_in_domain($url)
-	{
-		if (phpbb::$config['force_server_vars'])
-		{
-			$check_path = phpbb::$config['script_path'];
-		}
-		else
-		{
-			$check_path = (phpbb::$user->page['root_script_path'] != '/') ? substr(phpbb::$user->page['root_script_path'], 0, -1) : '/';
-		}
-
-		// Is the user trying to link to a php file in this domain and script path?
-		if (strpos($url, '.' . PHP_EXT) !== false && strpos($url, $check_path) !== false)
-		{
-			$server_name = phpbb::$user->system['host'];
-
-			// Forcing server vars is the only way to specify/override the protocol
-			if (phpbb::$config['force_server_vars'] || !$server_name)
-			{
-				$server_name = phpbb::$config['server_name'];
-			}
-
-			// Check again in correct order...
-			$pos_ext = strpos($url, '.' . PHP_EXT);
-			$pos_path = strpos($url, $check_path);
-			$pos_domain = strpos($url, $server_name);
-
-			if ($pos_domain !== false && $pos_path >= $pos_domain && $pos_ext >= $pos_path)
-			{
-				// Ok, actually we allow linking to some files (this may be able to be extended in some way later...)
-				if (strpos($url, '/' . $check_path . '/download/file.' . PHP_EXT) !== 0)
-				{
-					return false;
-				}
-
-				return true;
-			}
-		}
-
-		return false;
-	}
-}
-
-/**
-* Main message parser for posting, pm, etc. takes raw message
-* and parses it for attachments, bbcode and smilies
-* @package phpBB3
-*/
-class parse_message extends bbcode_firstpass
-{
-	var $attachment_data = array();
-	var $filename_data = array();
-
-	// Helps ironing out user error
-	var $message_status = '';
-
-	var $allow_img_bbcode = true;
-	var $allow_flash_bbcode = true;
-	var $allow_quote_bbcode = true;
-	var $allow_url_bbcode = true;
-
-	var $mode;
-
-	/**
-	* Init - give message here or manually
-	*/
-	function parse_message($message = '')
-	{
-		// Init BBCode UID
-		$this->bbcode_uid = substr(base_convert(unique_id(), 16, 36), 0, BBCODE_UID_LEN);
-		$this->message = $message;
-	}
-
-	/**
-	* Parse Message
-	*/
-	function parse($allow_bbcode, $allow_magic_url, $allow_smilies, $allow_img_bbcode = true, $allow_flash_bbcode = true, $allow_quote_bbcode = true, $allow_url_bbcode = true, $update_this_message = true, $mode = 'post')
-	{
-		$mode = ($mode != 'post') ? 'sig' : 'post';
-
-		$this->mode = $mode;
-
-		$this->allow_img_bbcode = $allow_img_bbcode;
-		$this->allow_flash_bbcode = $allow_flash_bbcode;
-		$this->allow_quote_bbcode = $allow_quote_bbcode;
-		$this->allow_url_bbcode = $allow_url_bbcode;
-
-		// If false, then $this->message won't be altered, the text will be returned instead.
-		if (!$update_this_message)
-		{
-			$tmp_message = $this->message;
-			$return_message = &$this->message;
-		}
-
-		if ($this->message_status == 'display')
-		{
-			$this->decode_message();
-		}
-
-		// Do some general 'cleanup' first before processing message,
-		// e.g. remove excessive newlines(?), smilies(?)
-		$match = array('#(script|about|applet|activex|chrome):#i');
-		$replace = array("\\1&#058;");
-		$this->message = preg_replace($match, $replace, trim($this->message));
-
-		// Message length check. 0 disables this check completely.
-		if (phpbb::$config['max_' . $mode . '_chars'] > 0)
-		{
-			$msg_len = ($mode == 'post') ? utf8_strlen($this->message) : utf8_strlen(preg_replace('#\[\/?[a-z\*\+\-]+(=[\S]+)?\]#ius', ' ', $this->message));
-
-			if ((!$msg_len && $mode !== 'sig') || phpbb::$config['max_' . $mode . '_chars'] && $msg_len > phpbb::$config['max_' . $mode . '_chars'])
-			{
-				$this->warn_msg[] = (!$msg_len) ? phpbb::$user->lang['TOO_FEW_CHARS'] : sprintf(phpbb::$user->lang['TOO_MANY_CHARS_' . strtoupper($mode)], $msg_len, phpbb::$config['max_' . $mode . '_chars']);
-				return (!$update_this_message) ? $return_message : $this->warn_msg;
-			}
-		}
-
-		// Prepare BBcode (just prepares some tags for better parsing)
-		if ($allow_bbcode && strpos($this->message, '[') !== false)
-		{
-			$this->bbcode_init();
-			$disallow = array('img', 'flash', 'quote', 'url');
-			foreach ($disallow as $bool)
-			{
-				if (!${'allow_' . $bool . '_bbcode'})
-				{
-					$this->bbcodes[$bool]['disabled'] = true;
-				}
-			}
-
-			$this->prepare_bbcodes();
-		}
-
-		// Parse smilies
-		if ($allow_smilies)
-		{
-			$this->smilies(phpbb::$config['max_' . $mode . '_smilies']);
-		}
-
-		$num_urls = 0;
-
-		// Parse BBCode
-		if ($allow_bbcode && strpos($this->message, '[') !== false)
-		{
-			$this->parse_bbcode();
-			$num_urls += $this->parsed_items['url'];
-		}
-
-		// Parse URL's
-		if ($allow_magic_url)
-		{
-			$this->magic_url(generate_board_url());
-
-			if (phpbb::$config['max_' . $mode . '_urls'])
-			{
-				$num_urls += preg_match_all('#\<!-- ([lmwe]) --\>.*?\<!-- \1 --\>#', $this->message, $matches);
-			}
-		}
-
-		// Check for "empty" message. We do not check here for maximum length, because bbcode, smilies, etc. can add to the length.
-		// The maximum length check happened before any parsings.
-		if ($mode !== 'sig' && utf8_clean_string($this->message) === '')
-		{
-			$this->warn_msg[] = $user->lang['TOO_FEW_CHARS'];
-			return (!$update_this_message) ? $return_message : $this->warn_msg;
-		}
-
-		// Check number of links
-		if (phpbb::$config['max_' . $mode . '_urls'] && $num_urls > phpbb::$config['max_' . $mode . '_urls'])
-		{
-			$this->warn_msg[] = sprintf(phpbb::$user->lang['TOO_MANY_URLS'], phpbb::$config['max_' . $mode . '_urls']);
-			return (!$update_this_message) ? $return_message : $this->warn_msg;
-		}
-
-		if (!$update_this_message)
-		{
-			unset($this->message);
-			$this->message = $tmp_message;
-			return $return_message;
-		}
-
-		$this->message_status = 'parsed';
-		return false;
-	}
-
-	/**
-	* Formatting text for display
-	*/
-	function format_display($allow_bbcode, $allow_magic_url, $allow_smilies, $update_this_message = true)
-	{
-		// If false, then the parsed message get returned but internal message not processed.
-		if (!$update_this_message)
-		{
-			$tmp_message = $this->message;
-			$return_message = &$this->message;
-		}
-
-		if ($this->message_status == 'plain')
-		{
-			// Force updating message - of course.
-			$this->parse($allow_bbcode, $allow_magic_url, $allow_smilies, $this->allow_img_bbcode, $this->allow_flash_bbcode, $this->allow_quote_bbcode, $this->allow_url_bbcode, true);
-		}
-
-		// Replace naughty words such as farty pants
-		$this->message = censor_text($this->message);
-
-		// Parse BBcode
-		if ($allow_bbcode)
-		{
-			$this->bbcode_cache_init();
-
-			// We are giving those parameters to be able to use the bbcode class on its own
-			$this->bbcode_second_pass($this->message, $this->bbcode_uid);
-		}
-
-		$this->message = bbcode_nl2br($this->message);
-		$this->message = smiley_text($this->message, !$allow_smilies);
-
-		if (!$update_this_message)
-		{
-			unset($this->message);
-			$this->message = $tmp_message;
-			return $return_message;
-		}
-
-		$this->message_status = 'display';
-		return false;
-	}
-
-	/**
-	* Decode message to be placed back into form box
-	*/
-	function decode_message($custom_bbcode_uid = '', $update_this_message = true)
-	{
-		// If false, then the parsed message get returned but internal message not processed.
-		if (!$update_this_message)
-		{
-			$tmp_message = $this->message;
-			$return_message = &$this->message;
-		}
-
-		($custom_bbcode_uid) ? decode_message($this->message, $custom_bbcode_uid) : decode_message($this->message, $this->bbcode_uid);
-
-		if (!$update_this_message)
-		{
-			unset($this->message);
-			$this->message = $tmp_message;
-			return $return_message;
-		}
-
-		$this->message_status = 'plain';
-		return false;
-	}
-
-	/**
-	* Replace magic urls of form http://xxx.xxx., www.xxx. and xxx@xxx.xxx.
-	* Cuts down displayed size of link if over 50 chars, turns absolute links
-	* into relative versions when the server/script path matches the link
-	*/
-	function magic_url($server_url)
-	{
-		// We use the global make_clickable function
-		$this->message = make_clickable($this->message, $server_url);
-	}
-
-	/**
-	* Parse Smilies
-	*/
-	function smilies($max_smilies = 0)
-	{
-		static $match;
-		static $replace;
-
-		// See if the static arrays have already been filled on an earlier invocation
-		if (!is_array($match))
-		{
-			$match = $replace = array();
-
-			// NOTE: obtain_* function? chaching the table contents?
-
-			// For now setting the ttl to 10 minutes
-			$sql = 'SELECT *
-				FROM ' . SMILIES_TABLE . '
-				ORDER BY ' . phpbb::$db->sql_function('length_varchar', 'code') . ' DESC';
-			$result = phpbb::$db->sql_query($sql, 600);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				if (empty($row['code']))
-				{
-					continue;
-				}
-
-				// (assertion)
-				$match[] = '(?<=^|[\n .])' . preg_quote($row['code'], '#') . '(?![^<>]*>)';
-				$replace[] = '<!-- s' . $row['code'] . ' --><img src="{SMILIES_PATH}/' . $row['smiley_url'] . '" alt="' . $row['code'] . '" title="' . $row['emotion'] . '" /><!-- s' . $row['code'] . ' -->';
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		if (sizeof($match))
-		{
-			if ($max_smilies)
-			{
-				$num_matches = preg_match_all('#' . implode('|', $match) . '#', $this->message, $matches);
-				unset($matches);
-
-				if ($num_matches !== false && $num_matches > $max_smilies)
-				{
-					$this->warn_msg[] = sprintf(phpbb::$user->lang['TOO_MANY_SMILIES'], $max_smilies);
-					return;
-				}
-			}
-
-			// Make sure the delimiter # is added in front and at the end of every element within $match
-			$this->message = trim(preg_replace(explode(chr(0), '#' . implode('#' . chr(0) . '#', $match) . '#'), $replace, $this->message));
-		}
-	}
-
-	/**
-	* Parse Attachments
-	*/
-	function parse_attachments($form_name, $mode, $forum_id, $submit, $preview, $refresh, $is_message = false)
-	{
-		$error = array();
-
-		$num_attachments = sizeof($this->attachment_data);
-		$this->filename_data['filecomment'] = utf8_normalize_nfc(request_var('filecomment', '', true));
-		$upload_file = (isset($_FILES[$form_name]) && $_FILES[$form_name]['name'] != 'none' && trim($_FILES[$form_name]['name'])) ? true : false;
-
-		$add_file		= phpbb_request::is_set_post('add_file');
-		$delete_file	= phpbb_request::is_set_post('delete_file');
-
-		// First of all adjust comments if changed
-		$actual_comment_list = utf8_normalize_nfc(request_var('comment_list', array(''), true));
-
-		foreach ($actual_comment_list as $comment_key => $comment)
-		{
-			if (!isset($this->attachment_data[$comment_key]))
-			{
-				continue;
-			}
-
-			if ($this->attachment_data[$comment_key]['attach_comment'] != $actual_comment_list[$comment_key])
-			{
-				$this->attachment_data[$comment_key]['attach_comment'] = $actual_comment_list[$comment_key];
-			}
-		}
-
-		$cfg = array();
-		$cfg['max_attachments'] = ($is_message) ? phpbb::$config['max_attachments_pm'] : phpbb::$config['max_attachments'];
-		$forum_id = ($is_message) ? 0 : $forum_id;
-
-		if ($submit && in_array($mode, array('post', 'reply', 'quote', 'edit')) && $upload_file)
-		{
-			if ($num_attachments < $cfg['max_attachments'] || phpbb::$acl->acl_get('a_') || phpbb::$acl->acl_get('m_', $forum_id))
-			{
-				$filedata = upload_attachment($form_name, $forum_id, false, '', $is_message);
-				$error = $filedata['error'];
-
-				if ($filedata['post_attach'] && !sizeof($error))
-				{
-					$sql_ary = array(
-						'physical_filename'	=> $filedata['physical_filename'],
-						'attach_comment'	=> $this->filename_data['filecomment'],
-						'real_filename'		=> $filedata['real_filename'],
-						'extension'			=> $filedata['extension'],
-						'mimetype'			=> $filedata['mimetype'],
-						'filesize'			=> $filedata['filesize'],
-						'filetime'			=> $filedata['filetime'],
-						'thumbnail'			=> $filedata['thumbnail'],
-						'is_orphan'			=> 1,
-						'in_message'		=> ($is_message) ? 1 : 0,
-						'poster_id'			=> phpbb::$user->data['user_id'],
-					);
-
-					phpbb::$db->sql_query('INSERT INTO ' . ATTACHMENTS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary));
-
-					$new_entry = array(
-						'attach_id'		=> phpbb::$db->sql_nextid(),
-						'is_orphan'		=> 1,
-						'real_filename'	=> $filedata['real_filename'],
-						'attach_comment'=> $this->filename_data['filecomment'],
-					);
-
-					$this->attachment_data = array_merge(array(0 => $new_entry), $this->attachment_data);
-					$this->message = preg_replace('#\[attachment=([0-9]+)\](.*?)\[\/attachment\]#e', "'[attachment='.(\\1 + 1).']\\2[/attachment]'", $this->message);
-
-					$this->filename_data['filecomment'] = '';
-
-					// This Variable is set to false here, because Attachments are entered into the
-					// Database in two modes, one if the id_list is 0 and the second one if post_attach is true
-					// Since post_attach is automatically switched to true if an Attachment got added to the filesystem,
-					// but we are assigning an id of 0 here, we have to reset the post_attach variable to false.
-					//
-					// This is very relevant, because it could happen that the post got not submitted, but we do not
-					// know this circumstance here. We could be at the posting page or we could be redirected to the entered
-					// post. :)
-					$filedata['post_attach'] = false;
-				}
-			}
-			else
-			{
-				$error[] = sprintf(phpbb::$user->lang['TOO_MANY_ATTACHMENTS'], $cfg['max_attachments']);
-			}
-		}
-
-		if ($preview || $refresh || sizeof($error))
-		{
-			// Perform actions on temporary attachments
-			if ($delete_file)
-			{
-				include_once(PHPBB_ROOT_PATH . 'includes/functions_admin.' . PHP_EXT);
-
-				$index = array_keys(request_var('delete_file', array(0 => 0)));
-				$index = (!empty($index)) ? $index[0] : false;
-
-				if ($index !== false && !empty($this->attachment_data[$index]))
-				{
-					// delete selected attachment
-					if ($this->attachment_data[$index]['is_orphan'])
-					{
-						$sql = 'SELECT attach_id, physical_filename, thumbnail
-							FROM ' . ATTACHMENTS_TABLE . '
-							WHERE attach_id = ' . (int) $this->attachment_data[$index]['attach_id'] . '
-								AND is_orphan = 1
-								AND poster_id = ' . phpbb::$user->data['user_id'];
-						$result = phpbb::$db->sql_query($sql);
-						$row = phpbb::$db->sql_fetchrow($result);
-						phpbb::$db->sql_freeresult($result);
-
-						if ($row)
-						{
-							phpbb_unlink($row['physical_filename'], 'file');
-
-							if ($row['thumbnail'])
-							{
-								phpbb_unlink($row['physical_filename'], 'thumbnail');
-							}
-
-							phpbb::$db->sql_query('DELETE FROM ' . ATTACHMENTS_TABLE . ' WHERE attach_id = ' . (int) $this->attachment_data[$index]['attach_id']);
-						}
-					}
-					else
-					{
-						delete_attachments('attach', array(intval($this->attachment_data[$index]['attach_id'])));
-					}
-
-					unset($this->attachment_data[$index]);
-					$this->message = preg_replace('#\[attachment=([0-9]+)\](.*?)\[\/attachment\]#e', "(\\1 == \$index) ? '' : ((\\1 > \$index) ? '[attachment=' . (\\1 - 1) . ']\\2[/attachment]' : '\\0')", $this->message);
-
-					// Reindex Array
-					$this->attachment_data = array_values($this->attachment_data);
-				}
-			}
-			else if (($add_file || $preview) && $upload_file)
-			{
-				if ($num_attachments < $cfg['max_attachments'] || phpbb::$acl->acl_gets('m_', 'a_', $forum_id))
-				{
-					$filedata = upload_attachment($form_name, $forum_id, false, '', $is_message);
-					$error = array_merge($error, $filedata['error']);
-
-					if (!sizeof($error))
-					{
-						$sql_ary = array(
-							'physical_filename'	=> $filedata['physical_filename'],
-							'attach_comment'	=> $this->filename_data['filecomment'],
-							'real_filename'		=> $filedata['real_filename'],
-							'extension'			=> $filedata['extension'],
-							'mimetype'			=> $filedata['mimetype'],
-							'filesize'			=> $filedata['filesize'],
-							'filetime'			=> $filedata['filetime'],
-							'thumbnail'			=> $filedata['thumbnail'],
-							'is_orphan'			=> 1,
-							'in_message'		=> ($is_message) ? 1 : 0,
-							'poster_id'			=> phpbb::$user->data['user_id'],
-						);
-
-						phpbb::$db->sql_query('INSERT INTO ' . ATTACHMENTS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary));
-
-						$new_entry = array(
-							'attach_id'		=> phpbb::$db->sql_nextid(),
-							'is_orphan'		=> 1,
-							'real_filename'	=> $filedata['real_filename'],
-							'attach_comment'=> $this->filename_data['filecomment'],
-						);
-
-						$this->attachment_data = array_merge(array(0 => $new_entry), $this->attachment_data);
-						$this->message = preg_replace('#\[attachment=([0-9]+)\](.*?)\[\/attachment\]#e', "'[attachment='.(\\1 + 1).']\\2[/attachment]'", $this->message);
-						$this->filename_data['filecomment'] = '';
-					}
-				}
-				else
-				{
-					$error[] = sprintf(phpbb::$user->lang['TOO_MANY_ATTACHMENTS'], $cfg['max_attachments']);
-				}
-			}
-		}
-
-		foreach ($error as $error_msg)
-		{
-			$this->warn_msg[] = $error_msg;
-		}
-	}
-
-	/**
-	* Get Attachment Data
-	*/
-	function get_submitted_attachment_data($check_user_id = false)
-	{
-		$this->filename_data['filecomment'] = utf8_normalize_nfc(request_var('filecomment', '', true));
-		$attachment_data = phpbb_request::variable('attachment_data', array(0 => array('' => '')), true, phpbb_request::POST);
-		$this->attachment_data = array();
-
-		$check_user_id = ($check_user_id === false) ? phpbb::$user->data['user_id'] : $check_user_id;
-
-		if (!sizeof($attachment_data))
-		{
-			return;
-		}
-
-		$not_orphan = $orphan = array();
-
-		foreach ($attachment_data as $pos => $var_ary)
-		{
-			if ($var_ary['is_orphan'])
-			{
-				$orphan[(int) $var_ary['attach_id']] = $pos;
-			}
-			else
-			{
-				$not_orphan[(int) $var_ary['attach_id']] = $pos;
-			}
-		}
-
-		// Regenerate already posted attachments
-		if (sizeof($not_orphan))
-		{
-			// Get the attachment data, based on the poster id...
-			$sql = 'SELECT attach_id, is_orphan, real_filename, attach_comment
-				FROM ' . ATTACHMENTS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('attach_id', array_keys($not_orphan)) . '
-					AND poster_id = ' . $check_user_id;
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$pos = $not_orphan[(int) $row['attach_id']];
-				$this->attachment_data[$pos] = $row;
-				$this->attachment_data[$pos]['attach_comment'] = utf8_normalize_nfc($attachment_data[$pos]['attach_comment']);
-
-				unset($not_orphan[(int) $row['attach_id']]);
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		if (sizeof($not_orphan))
-		{
-			trigger_error('NO_ACCESS_ATTACHMENT', E_USER_ERROR);
-		}
-
-		// Regenerate newly uploaded attachments
-		if (sizeof($orphan))
-		{
-			$sql = 'SELECT attach_id, is_orphan, real_filename, attach_comment
-				FROM ' . ATTACHMENTS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('attach_id', array_keys($orphan)) . '
-					AND poster_id = ' . phpbb::$user->data['user_id'] . '
-					AND is_orphan = 1';
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$pos = $orphan[(int) $row['attach_id']];
-				$this->attachment_data[$pos] = $row;
-				$this->attachment_data[$pos]['attach_comment'] = utf8_normalize_nfc($attachment_data[$pos]['attach_comment']);
-
-				unset($orphan[(int) $row['attach_id']]);
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		if (sizeof($orphan))
-		{
-			trigger_error('NO_ACCESS_ATTACHMENT', E_USER_ERROR);
-		}
-
-		ksort($this->attachment_data);
-	}
-
-	/**
-	* Parse Poll
-	*/
-	function parse_poll(&$poll)
-	{
-		$poll_max_options = $poll['poll_max_options'];
-
-		// Parse Poll Option text ;)
-		$tmp_message = $this->message;
-		$this->message = $poll['poll_option_text'];
-		$bbcode_bitfield = $this->bbcode_bitfield;
-
-		$poll['poll_option_text'] = $this->parse($poll['enable_bbcode'], (phpbb::$config['allow_post_links']) ? $poll['enable_urls'] : false, $poll['enable_smilies'], $poll['img_status'], false, false, phpbb::$config['allow_post_links'], false);
-
-		$bbcode_bitfield = base64_encode(base64_decode($bbcode_bitfield) | base64_decode($this->bbcode_bitfield));
-		$this->message = $tmp_message;
-
-		// Parse Poll Title
-		$tmp_message = $this->message;
-		$this->message = $poll['poll_title'];
-		$this->bbcode_bitfield = $bbcode_bitfield;
-
-		$poll['poll_options'] = explode("\n", trim($poll['poll_option_text']));
-		$poll['poll_options_size'] = sizeof($poll['poll_options']);
-
-		if (!$poll['poll_title'] && $poll['poll_options_size'])
-		{
-			$this->warn_msg[] = phpbb::$user->lang['NO_POLL_TITLE'];
-		}
-		else
-		{
-			if (utf8_strlen(preg_replace('#\[\/?[a-z\*\+\-]+(=[\S]+)?\]#ius', ' ', $this->message)) > 100)
-			{
-				$this->warn_msg[] = phpbb::$user->lang['POLL_TITLE_TOO_LONG'];
-			}
-			$poll['poll_title'] = $this->parse($poll['enable_bbcode'], (phpbb::$config['allow_post_links']) ? $poll['enable_urls'] : false, $poll['enable_smilies'], $poll['img_status'], false, false, phpbb::$config['allow_post_links'], false);
-			if (strlen($poll['poll_title']) > 255)
-			{
-				$this->warn_msg[] = phpbb::$user->lang['POLL_TITLE_COMP_TOO_LONG'];
-			}
-		}
-
-		$this->bbcode_bitfield = base64_encode(base64_decode($bbcode_bitfield) | base64_decode($this->bbcode_bitfield));
-		$this->message = $tmp_message;
-		unset($tmp_message);
-
-		if (sizeof($poll['poll_options']) == 1)
-		{
-			$this->warn_msg[] = phpbb::$user->lang['TOO_FEW_POLL_OPTIONS'];
-		}
-		else if ($poll['poll_options_size'] > (int) phpbb::$config['max_poll_options'])
-		{
-			$this->warn_msg[] = phpbb::$user->lang['TOO_MANY_POLL_OPTIONS'];
-		}
-		else if ($poll_max_options > $poll['poll_options_size'])
-		{
-			$this->warn_msg[] = phpbb::$user->lang['TOO_MANY_USER_OPTIONS'];
-		}
-
-		$poll['poll_max_options'] = ($poll['poll_max_options'] < 1) ? 1 : (($poll['poll_max_options'] > phpbb::$config['max_poll_options']) ? phpbb::$config['max_poll_options'] : $poll['poll_max_options']);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
deleted file mode 100644
index 8c4b8f3c7d..0000000000
--- a/phpBB/includes/search/fulltext_mysql.php
+++ /dev/null
@@ -1,767 +0,0 @@
-<?php
-/**
-*
-* @package search
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @ignore
-*/
-include_once(PHPBB_ROOT_PATH . 'includes/search/search.' . PHP_EXT);
-
-/**
-* fulltext_mysql
-* Fulltext search for MySQL
-* @package search
-*/
-class fulltext_mysql extends search_backend
-{
-	private $stats = array();
-	public $word_length = array();
-	private $split_words = array();
-	public $search_query;
-	public $common_words = array();
-
-	function __construct(&$error)
-	{
-		$this->word_length = array('min' => phpbb::$config['fulltext_mysql_min_word_len'], 'max' => phpbb::$config['fulltext_mysql_max_word_len']);
-
-		$error = false;
-	}
-
-	/**
-	* Checks for correct MySQL version and stores min/max word length in the config
-	*/
-	public function init()
-	{
-		$result = phpbb::$db->sql_query('SHOW TABLE STATUS LIKE \'' . POSTS_TABLE . '\'');
-		$info = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		$engine = '';
-		if (isset($info['Engine']))
-		{
-			$engine = $info['Engine'];
-		}
-		else if (isset($info['Type']))
-		{
-			$engine = $info['Type'];
-		}
-
-		if ($engine != 'MyISAM')
-		{
-			return phpbb::$user->lang['FULLTEXT_MYSQL_NOT_MYISAM'];
-		}
-
-		$sql = 'SHOW VARIABLES
-			LIKE \'ft\_%\'';
-		$result = phpbb::$db->sql_query($sql);
-
-		$mysql_info = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$mysql_info[$row['Variable_name']] = $row['Value'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		set_config('fulltext_mysql_max_word_len', $mysql_info['ft_max_word_len']);
-		set_config('fulltext_mysql_min_word_len', $mysql_info['ft_min_word_len']);
-
-		return false;
-	}
-
-	/**
-	* Splits keywords entered by a user into an array of words stored in $this->split_words
-	* Stores the tidied search query in $this->search_query
-	*
-	* @param string &$keywords Contains the keyword as entered by the user
-	* @param string $terms is either 'all' or 'any'
-	* @return bool false if no valid keywords were found and otherwise true
-	*/
-	public function split_keywords(&$keywords, $terms)
-	{
-		if ($terms == 'all')
-		{
-			$match		= array('#\sand\s#iu', '#\sor\s#iu', '#\snot\s#iu', '#\+#', '#-#', '#\|#');
-			$replace	= array(' +', ' |', ' -', ' +', ' -', ' |');
-
-			$keywords = preg_replace($match, $replace, $keywords);
-		}
-
-		// Filter out as above
-		$split_keywords = preg_replace("#[\n\r\t]+#", ' ', trim(htmlspecialchars_decode($keywords)));
-
-		// Split words
-		$split_keywords = preg_replace('#([^\p{L}\p{N}\'*"()])#u', '$1$1', str_replace('\'\'', '\' \'', trim($split_keywords)));
-
-		$matches = array();
-		preg_match_all('#(?:[^\p{L}\p{N}*"()]|^)([+\-|]?(?:[\p{L}\p{N}*"()]+\'?)*[\p{L}\p{N}*"()])(?:[^\p{L}\p{N}*"()]|$)#u', $split_keywords, $matches);
-		$this->split_words = $matches[1];
-
-		// We limit the number of allowed keywords to minimize load on the database
-		if (phpbb::$config['max_num_search_keywords'] && sizeof($this->split_words) > phpbb::$config['max_num_search_keywords'])
-		{
-			trigger_error(phpbb::$user->lang('MAX_NUM_SEARCH_KEYWORDS_REFINE', phpbb::$config['max_num_search_keywords'], sizeof($this->split_words)));
-		}
-
-		// to allow phrase search, we need to concatenate quoted words
-		$tmp_split_words = array();
-		$phrase = '';
-		foreach ($this->split_words as $word)
-		{
-			if ($phrase)
-			{
-				$phrase .= ' ' . $word;
-				if (strpos($word, '"') !== false && substr_count($word, '"') % 2 == 1)
-				{
-					$tmp_split_words[] = $phrase;
-					$phrase = '';
-				}
-			}
-			else if (strpos($word, '"') !== false && substr_count($word, '"') % 2 == 1)
-			{
-				$phrase = $word;
-			}
-			else
-			{
-				$tmp_split_words[] = $word . ' ';
-			}
-		}
-		if ($phrase)
-		{
-			$tmp_split_words[] = $phrase;
-		}
-
-		$this->split_words = $tmp_split_words;
-
-		unset($tmp_split_words);
-		unset($phrase);
-
-		foreach ($this->split_words as $i => $word)
-		{
-			$clean_word = preg_replace('#^[+\-|"]#', '', $word);
-
-			// check word length
-			$clean_len = utf8_strlen(str_replace('*', '', $clean_word));
-			if (($clean_len < phpbb::$config['fulltext_mysql_min_word_len']) || ($clean_len > phpbb::$config['fulltext_mysql_max_word_len']))
-			{
-				$this->common_words[] = $word;
-				unset($this->split_words[$i]);
-			}
-		}
-
-		if ($terms == 'any')
-		{
-			$this->search_query = '';
-			foreach ($this->split_words as $word)
-			{
-				if ((strpos($word, '+') === 0) || (strpos($word, '-') === 0) || (strpos($word, '|') === 0))
-				{
-					$word = substr($word, 1);
-				}
-				$this->search_query .= $word . ' ';
-			}
-		}
-		else
-		{
-			$this->search_query = '';
-			foreach ($this->split_words as $word)
-			{
-				if ((strpos($word, '+') === 0) || (strpos($word, '-') === 0))
-				{
-					$this->search_query .= $word . ' ';
-				}
-				else if (strpos($word, '|') === 0)
-				{
-					$this->search_query .= substr($word, 1) . ' ';
-				}
-				else
-				{
-					$this->search_query .= '+' . $word . ' ';
-				}
-			}
-		}
-
-		$this->search_query = utf8_htmlspecialchars($this->search_query);
-
-		if ($this->search_query)
-		{
-			$this->split_words = array_values($this->split_words);
-			sort($this->split_words);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	* Turns text into an array of words
-	*/
-	private function split_message($text)
-	{
-		// Split words
-		$text = preg_replace('#([^\p{L}\p{N}\'*])#u', '$1$1', str_replace('\'\'', '\' \'', trim($text)));
-
-		$matches = array();
-		preg_match_all('#(?:[^\p{L}\p{N}*]|^)([+\-|]?(?:[\p{L}\p{N}*]+\'?)*[\p{L}\p{N}*])(?:[^\p{L}\p{N}*]|$)#u', $text, $matches);
-		$text = $matches[1];
-
-		// remove too short or too long words
-		$text = array_values($text);
-		for ($i = 0, $n = sizeof($text); $i < $n; $i++)
-		{
-			$text[$i] = trim($text[$i]);
-			if (utf8_strlen($text[$i]) < phpbb::$config['fulltext_mysql_min_word_len'] || utf8_strlen($text[$i]) > phpbb::$config['fulltext_mysql_max_word_len'])
-			{
-				unset($text[$i]);
-			}
-		}
-
-		return array_values($text);
-	}
-
-	/**
-	* Performs a search on keywords depending on display specific params. You have to run split_keywords() first.
-	*
-	* @param	string		$type				contains either posts or topics depending on what should be searched for
-	* @param	string		&$fields			contains either titleonly (topic titles should be searched), msgonly (only message bodies should be searched), firstpost (only subject and body of the first post should be searched) or all (all post bodies and subjects should be searched)
-	* @param	string		&$terms				is either 'all' (use query as entered, words without prefix should default to "have to be in field") or 'any' (ignore search query parts and just return all posts that contain any of the specified words)
-	* @param	array		&$sort_by_sql		contains SQL code for the ORDER BY part of a query
-	* @param	string		&$sort_key			is the key of $sort_by_sql for the selected sorting
-	* @param	string		&$sort_dir			is either a or d representing ASC and DESC
-	* @param	string		&$sort_days			specifies the maximum amount of days a post may be old
-	* @param	array		&$ex_fid_ary		specifies an array of forum ids which should not be searched
-	* @param	array		&$m_approve_fid_ary	specifies an array of forum ids in which the searcher is allowed to view unapproved posts
-	* @param	int			&$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
-	* @param	array		&$author_ary		an array of author ids if the author should be ignored during the search the array is empty
-	* @param	array		&$id_ary			passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
-	* @param	int			$start				indicates the first index of the page
-	* @param	int			$per_page			number of ids each page is supposed to contain
-	* @return	boolean|int						total number of results
-	*
-	* @access	public
-	*/
-	public function keyword_search($type, &$fields, &$terms, &$sort_by_sql, &$sort_key, &$sort_dir, &$sort_days, &$ex_fid_ary, &$m_approve_fid_ary, &$topic_id, &$author_ary, &$id_ary, $start, $per_page)
-	{
-		// No keywords? No posts.
-		if (!$this->search_query)
-		{
-			return false;
-		}
-
-		// generate a search_key from all the options to identify the results
-		$search_key = md5(implode('#', array(
-			implode(', ', $this->split_words),
-			$type,
-			$fields,
-			$terms,
-			$sort_days,
-			$sort_key,
-			$topic_id,
-			implode(',', $ex_fid_ary),
-			implode(',', $m_approve_fid_ary),
-			implode(',', $author_ary)
-		)));
-
-		// try reading the results from cache
-		$result_count = 0;
-		if ($this->obtain_ids($search_key, $result_count, $id_ary, $start, $per_page, $sort_dir) == self::SEARCH_RESULT_IN_CACHE)
-		{
-			return $result_count;
-		}
-
-		$id_ary = array();
-
-		$join_topic = ($type == 'posts') ? false : true;
-
-		// Build sql strings for sorting
-		$sql_sort = $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
-		$sql_sort_table = $sql_sort_join = '';
-
-		switch ($sql_sort[0])
-		{
-			case 'u':
-				$sql_sort_table	= USERS_TABLE . ' u, ';
-				$sql_sort_join	= ($type == 'posts') ? ' AND u.user_id = p.poster_id ' : ' AND u.user_id = t.topic_poster ';
-			break;
-
-			case 't':
-				$join_topic = true;
-			break;
-
-			case 'f':
-				$sql_sort_table	= FORUMS_TABLE . ' f, ';
-				$sql_sort_join	= ' AND f.forum_id = p.forum_id ';
-			break;
-		}
-
-		// Build some display specific sql strings
-		switch ($fields)
-		{
-			case 'titleonly':
-				$sql_match = 'p.post_subject';
-				$sql_match_where = ' AND p.post_id = t.topic_first_post_id';
-				$join_topic = true;
-			break;
-
-			case 'msgonly':
-				$sql_match = 'p.post_text';
-				$sql_match_where = '';
-			break;
-
-			case 'firstpost':
-				$sql_match = 'p.post_subject, p.post_text';
-				$sql_match_where = ' AND p.post_id = t.topic_first_post_id';
-				$join_topic = true;
-			break;
-
-			default:
-				$sql_match = 'p.post_subject, p.post_text';
-				$sql_match_where = '';
-			break;
-		}
-
-		if (!sizeof($m_approve_fid_ary))
-		{
-			$m_approve_fid_sql = ' AND p.post_approved = 1';
-		}
-		else if ($m_approve_fid_ary === array(-1))
-		{
-			$m_approve_fid_sql = '';
-		}
-		else
-		{
-			$m_approve_fid_sql = ' AND (p.post_approved = 1 OR ' . phpbb::$db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')';
-		}
-
-		$sql_select			= (!$result_count) ? 'SQL_CALC_FOUND_ROWS ' : '';
-		$sql_select			= ($type == 'posts') ? $sql_select . 'p.post_id' : 'DISTINCT ' . $sql_select . 't.topic_id';
-		$sql_from			= ($join_topic) ? TOPICS_TABLE . ' t, ' : '';
-		$field				= ($type == 'posts') ? 'post_id' : 'topic_id';
-		$sql_author			= (sizeof($author_ary) == 1) ? ' = ' . $author_ary[0] : 'IN (' . implode(', ', $author_ary) . ')';
-
-		$sql_where_options = $sql_sort_join;
-		$sql_where_options .= ($topic_id) ? ' AND p.topic_id = ' . $topic_id : '';
-		$sql_where_options .= ($join_topic) ? ' AND t.topic_id = p.topic_id' : '';
-		$sql_where_options .= (sizeof($ex_fid_ary)) ? ' AND ' . phpbb::$db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
-		$sql_where_options .= $m_approve_fid_sql;
-		$sql_where_options .= (sizeof($author_ary)) ? ' AND p.poster_id ' . $sql_author : '';
-		$sql_where_options .= ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
-		$sql_where_options .= $sql_match_where;
-
-		$sql = "SELECT $sql_select
-			FROM $sql_from$sql_sort_table" . POSTS_TABLE . " p
-			WHERE MATCH ($sql_match) AGAINST ('" . phpbb::$db->sql_escape(htmlspecialchars_decode($this->search_query)) . "' IN BOOLEAN MODE)
-				$sql_where_options
-			ORDER BY $sql_sort";
-		$result = phpbb::$db->sql_query_limit($sql, phpbb::$config['search_block_size'], $start);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$id_ary[] = $row[$field];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$id_ary = array_unique($id_ary);
-
-		if (!sizeof($id_ary))
-		{
-			return false;
-		}
-
-		// if the total result count is not cached yet, retrieve it from the db
-		if (!$result_count)
-		{
-			$sql = 'SELECT FOUND_ROWS() as result_count';
-			$result = phpbb::$db->sql_query($sql);
-			$result_count = (int) phpbb::$db->sql_fetchfield('result_count');
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$result_count)
-			{
-				return false;
-			}
-		}
-
-		// store the ids, from start on then delete anything that isn't on the current page because we only need ids for one page
-		$this->save_ids($search_key, implode(' ', $this->split_words), $author_ary, $result_count, $id_ary, $start, $sort_dir);
-		$id_ary = array_slice($id_ary, 0, (int) $per_page);
-
-		return $result_count;
-	}
-
-	/**
-	* Performs a search on an author's posts without caring about message contents. Depends on display specific params
-	*
-	* @param array &$id_ary passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
-	* @param int $start indicates the first index of the page
-	* @param int $per_page number of ids each page is supposed to contain
-	* @return total number of results
-	*/
-	public function author_search($type, $firstpost_only, &$sort_by_sql, &$sort_key, &$sort_dir, &$sort_days, &$ex_fid_ary, &$m_approve_fid_ary, &$topic_id, &$author_ary, &$id_ary, $start, $per_page)
-	{
-		// No author? No posts.
-		if (!sizeof($author_ary))
-		{
-			return 0;
-		}
-
-		// generate a search_key from all the options to identify the results
-		$search_key = md5(implode('#', array(
-			'',
-			$type,
-			($firstpost_only) ? 'firstpost' : '',
-			'',
-			'',
-			$sort_days,
-			$sort_key,
-			$topic_id,
-			implode(',', $ex_fid_ary),
-			implode(',', $m_approve_fid_ary),
-			implode(',', $author_ary)
-		)));
-
-		// try reading the results from cache
-		$result_count = 0;
-		if ($this->obtain_ids($search_key, $result_count, $id_ary, $start, $per_page, $sort_dir) == self::SEARCH_RESULT_IN_CACHE)
-		{
-			return $result_count;
-		}
-
-		$id_ary = array();
-
-		// Create some display specific sql strings
-		$sql_author		= phpbb::$db->sql_in_set('p.poster_id', $author_ary);
-		$sql_fora		= (sizeof($ex_fid_ary)) ? ' AND ' . phpbb::$db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
-		$sql_topic_id	= ($topic_id) ? ' AND p.topic_id = ' . (int) $topic_id : '';
-		$sql_time		= ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
-		$sql_firstpost = ($firstpost_only) ? ' AND p.post_id = t.topic_first_post_id' : '';
-
-		// Build sql strings for sorting
-		$sql_sort = $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
-		$sql_sort_table = $sql_sort_join = '';
-		switch ($sql_sort[0])
-		{
-			case 'u':
-				$sql_sort_table	= USERS_TABLE . ' u, ';
-				$sql_sort_join	= ($type == 'posts') ? ' AND u.user_id = p.poster_id ' : ' AND u.user_id = t.topic_poster ';
-			break;
-
-			case 't':
-				$sql_sort_table	= ($type == 'posts' && !$firstpost_only) ? TOPICS_TABLE . ' t, ' : '';
-				$sql_sort_join	= ($type == 'posts' && !$firstpost_only) ? ' AND t.topic_id = p.topic_id ' : '';
-			break;
-
-			case 'f':
-				$sql_sort_table	= FORUMS_TABLE . ' f, ';
-				$sql_sort_join	= ' AND f.forum_id = p.forum_id ';
-			break;
-		}
-
-		if (!sizeof($m_approve_fid_ary))
-		{
-			$m_approve_fid_sql = ' AND p.post_approved = 1';
-		}
-		else if ($m_approve_fid_ary == array(-1))
-		{
-			$m_approve_fid_sql = '';
-		}
-		else
-		{
-			$m_approve_fid_sql = ' AND (p.post_approved = 1 OR ' . phpbb::$db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')';
-		}
-
-		// If the cache was completely empty count the results
-		$calc_results = ($result_count) ? '' : 'SQL_CALC_FOUND_ROWS ';
-
-		// Build the query for really selecting the post_ids
-		if ($type == 'posts')
-		{
-			$sql = "SELECT {$calc_results}p.post_id
-				FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t ' : ' ') . "
-				WHERE $sql_author
-					$sql_topic_id
-					$sql_firstpost
-					$m_approve_fid_sql
-					$sql_fora
-					$sql_sort_join
-					$sql_time
-				ORDER BY $sql_sort";
-			$field = 'post_id';
-		}
-		else
-		{
-			$sql = "SELECT {$calc_results}t.topic_id
-				FROM " . $sql_sort_table . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
-				WHERE $sql_author
-					$sql_topic_id
-					$sql_firstpost
-					$m_approve_fid_sql
-					$sql_fora
-					AND t.topic_id = p.topic_id
-					$sql_sort_join
-					$sql_time
-				GROUP BY t.topic_id
-				ORDER BY $sql_sort";
-			$field = 'topic_id';
-		}
-
-		// Only read one block of posts from the db and then cache it
-		$result = phpbb::$db->sql_query_limit($sql, phpbb::$config['search_block_size'], $start);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$id_ary[] = $row[$field];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// retrieve the total result count if needed
-		if (!$result_count)
-		{
-			$sql = 'SELECT FOUND_ROWS() as result_count';
-			$result = phpbb::$db->sql_query($sql);
-			$result_count = (int) phpbb::$db->sql_fetchfield('result_count');
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$result_count)
-			{
-				return false;
-			}
-		}
-
-		if (sizeof($id_ary))
-		{
-			$this->save_ids($search_key, '', $author_ary, $result_count, $id_ary, $start, $sort_dir);
-			$id_ary = array_slice($id_ary, 0, $per_page);
-
-			return $result_count;
-		}
-		return false;
-	}
-
-	/**
-	* Destroys cached search results, that contained one of the new words in a post so the results won't be outdated.
-	*
-	* @param string $mode contains the post mode: edit, post, reply, quote ...
-	*/
-	public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_id)
-	{
-		// Split old and new post/subject to obtain array of words
-		$split_text = $this->split_message($message);
-		$split_title = ($subject) ? $this->split_message($subject) : array();
-
-		$words = array_unique(array_merge($split_text, $split_title));
-
-		unset($split_text);
-		unset($split_title);
-
-		// destroy cached search results containing any of the words removed or added
-		$this->destroy_cache($words, array($poster_id));
-
-		unset($words);
-	}
-
-	/**
-	* Destroy cached results, that might be outdated after deleting a post
-	*/
-	public function index_remove($post_ids, $author_ids, $forum_ids)
-	{
-		$this->destroy_cache(array(), $author_ids);
-	}
-
-	/**
-	* Destroy old cache entries
-	*/
-	public function tidy()
-	{
-		// destroy too old cached search results
-		$this->destroy_cache(array());
-
-		set_config('search_last_gc', time(), true);
-	}
-
-	/**
-	* Create fulltext index
-	*/
-	public function create_index($acp_module, $u_action)
-	{
-		// Make sure we can actually use MySQL with fulltext indexes
-		if ($error = $this->init())
-		{
-			return $error;
-		}
-
-		if (empty($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		$alter = array();
-
-		if (!isset($this->stats['post_subject']))
-		{
-			//$alter[] = 'MODIFY post_subject varchar(100) COLLATE utf8_unicode_ci DEFAULT \'\' NOT NULL';
-			$alter[] = 'ADD FULLTEXT (post_subject)';
-		}
-
-		if (!isset($this->stats['post_text']))
-		{
-			$alter[] = 'MODIFY post_text mediumtext COLLATE utf8_unicode_ci NOT NULL';
-			$alter[] = 'ADD FULLTEXT (post_text)';
-		}
-
-		if (!isset($this->stats['post_content']))
-		{
-			$alter[] = 'ADD FULLTEXT post_content (post_subject, post_text)';
-		}
-
-		if (sizeof($alter))
-		{
-			phpbb::$db->sql_query('ALTER TABLE ' . POSTS_TABLE . ' ' . implode(', ', $alter));
-		}
-
-		phpbb::$db->sql_query('TRUNCATE TABLE ' . SEARCH_RESULTS_TABLE);
-
-		return false;
-	}
-
-	/**
-	* Drop fulltext index
-	*/
-	public function delete_index($acp_module, $u_action)
-	{
-		// Make sure we can actually use MySQL with fulltext indexes
-		if ($error = $this->init())
-		{
-			return $error;
-		}
-
-		if (empty($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		$alter = array();
-
-		if (isset($this->stats['post_subject']))
-		{
-			$alter[] = 'DROP INDEX post_subject';
-		}
-
-		if (isset($this->stats['post_text']))
-		{
-			$alter[] = 'DROP INDEX post_text';
-		}
-
-		if (isset($this->stats['post_content']))
-		{
-			$alter[] = 'DROP INDEX post_content';
-		}
-
-		if (sizeof($alter))
-		{
-			phpbb::$db->sql_query('ALTER TABLE ' . POSTS_TABLE . ' ' . implode(', ', $alter));
-		}
-
-		phpbb::$db->sql_query('TRUNCATE TABLE ' . SEARCH_RESULTS_TABLE);
-
-		return false;
-	}
-
-	/**
-	* Returns true if both FULLTEXT indexes exist
-	*/
-	public function index_created()
-	{
-		if (empty($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		return (isset($this->stats['post_text']) && isset($this->stats['post_subject']) && isset($this->stats['post_content'])) ? true : false;
-	}
-
-	/**
-	* Returns an associative array containing information about the indexes
-	*/
-	public function index_stats()
-	{
-		if (empty($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		return array(
-			phpbb::$user->lang['FULLTEXT_MYSQL_TOTAL_POSTS']			=> ($this->index_created()) ? $this->stats['total_posts'] : 0,
-		);
-	}
-
-	private function get_stats()
-	{
-		if (phpbb::$db->dbms_type !== 'mysql')
-		{
-			$this->stats = array();
-			return;
-		}
-
-		$sql = 'SHOW INDEX
-			FROM ' . POSTS_TABLE;
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			// deal with older MySQL versions which didn't use Index_type
-			$index_type = (isset($row['Index_type'])) ? $row['Index_type'] : $row['Comment'];
-
-			if ($index_type == 'FULLTEXT')
-			{
-				if ($row['Key_name'] == 'post_text')
-				{
-					$this->stats['post_text'] = $row;
-				}
-				else if ($row['Key_name'] == 'post_subject')
-				{
-					$this->stats['post_subject'] = $row;
-				}
-				else if ($row['Key_name'] == 'post_content')
-				{
-					$this->stats['post_content'] = $row;
-				}
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$sql = 'SELECT COUNT(post_id) as total_posts
-			FROM ' . POSTS_TABLE;
-		$result = phpbb::$db->sql_query($sql);
-		$this->stats['total_posts'] = (int) phpbb::$db->sql_fetchfield('total_posts');
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	/**
-	* Display nothing, we force UTF-8 support in all versions of PHP
-	*/
-	function acp()
-	{
-		$tpl = '';
-
-		// These are fields required in the config table
-		return array(
-			'tpl'		=> $tpl,
-			'config'	=> array()
-		);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
deleted file mode 100644
index a2cb8936b5..0000000000
--- a/phpBB/includes/search/fulltext_native.php
+++ /dev/null
@@ -1,1667 +0,0 @@
-<?php
-/**
-*
-* @package search
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @ignore
-*/
-include_once(PHPBB_ROOT_PATH . 'includes/search/search.' . PHP_EXT);
-
-/**
-* fulltext_native
-* phpBB's own db driven fulltext search, version 2
-* @package search
-*/
-class fulltext_native extends search_backend
-{
-	private $stats = array();
-	public $word_length = array();
-	public $search_query;
-	public $common_words = array();
-
-	private $must_contain_ids = array();
-	private $must_not_contain_ids = array();
-	private $must_exclude_one_ids = array();
-
-	/**
-	* Initialises the fulltext_native search backend with min/max word length and makes sure the UTF-8 normalizer is loaded.
-	*
-	* @param	boolean|string	&$error	is passed by reference and should either be set to false on success or an error message on failure.
-	*
-	* @access	public
-	*/
-	function __construct(&$error)
-	{
-		$this->word_length = array('min' => phpbb::$config['fulltext_native_min_chars'], 'max' => phpbb::$config['fulltext_native_max_chars']);
-
-		/**
-		* Load the UTF tools
-		*/
-		if (!class_exists('utf_normalizer'))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/utf/utf_normalizer.' . PHP_EXT);
-		}
-
-
-		$error = false;
-	}
-
-	/**
-	* This function fills $this->search_query with the cleaned user search query.
-	*
-	* If $terms is 'any' then the words will be extracted from the search query
-	* and combined with | inside brackets. They will afterwards be treated like
-	* an standard search query.
-	*
-	* Then it analyses the query and fills the internal arrays $must_not_contain_ids,
-	* $must_contain_ids and $must_exclude_one_ids which are later used by keyword_search().
-	*
-	* @param	string	$keywords	contains the search query string as entered by the user
-	* @param	string	$terms		is either 'all' (use search query as entered, default words to 'must be contained in post')
-	* 	or 'any' (find all posts containing at least one of the given words)
-	* @return	boolean				false if no valid keywords were found and otherwise true
-	*
-	* @access	public
-	*/
-	public function split_keywords($keywords, $terms)
-	{
-		$keywords = trim($this->cleanup($keywords, '+-|()*'));
-
-		// allow word|word|word without brackets
-		if ((strpos($keywords, ' ') === false) && (strpos($keywords, '|') !== false) && (strpos($keywords, '(') === false))
-		{
-			$keywords = '(' . $keywords . ')';
-		}
-
-		$open_bracket = $space = false;
-		for ($i = 0, $n = strlen($keywords); $i < $n; $i++)
-		{
-			if ($open_bracket !== false)
-			{
-				switch ($keywords[$i])
-				{
-					case ')':
-						if ($open_bracket + 1 == $i)
-						{
-							$keywords[$i - 1] = '|';
-							$keywords[$i] = '|';
-						}
-						$open_bracket = false;
-					break;
-					case '(':
-						$keywords[$i] = '|';
-					break;
-					case '+':
-					case '-':
-					case ' ':
-						$keywords[$i] = '|';
-					break;
-				}
-			}
-			else
-			{
-				switch ($keywords[$i])
-				{
-					case ')':
-						$keywords[$i] = ' ';
-					break;
-					case '(':
-						$open_bracket = $i;
-						$space = false;
-					break;
-					case '|':
-						$keywords[$i] = ' ';
-					break;
-					case '-':
-					case '+':
-						$space = $keywords[$i];
-					break;
-					case ' ':
-						if ($space !== false)
-						{
-							$keywords[$i] = $space;
-						}
-					break;
-					default:
-						$space = false;
-				}
-			}
-		}
-
-		if ($open_bracket)
-		{
-			$keywords .= ')';
-		}
-
-		$match = array(
-			'#  +#',
-			'#\|\|+#',
-			'#(\+|\-)(?:\+|\-)+#',
-			'#\(\|#',
-			'#\|\)#',
-		);
-		$replace = array(
-			' ',
-			'|',
-			'$1',
-			'(',
-			')',
-		);
-
-		$keywords = preg_replace($match, $replace, $keywords);
-		$num_keywords = sizeof(explode(' ', $keywords));
-
-		// We limit the number of allowed keywords to minimize load on the database
-		if (phpbb::$config['max_num_search_keywords'] && $num_keywords > phpbb::$config['max_num_search_keywords'])
-		{
-			trigger_error(phpbb::$user->lang('MAX_NUM_SEARCH_KEYWORDS_REFINE', phpbb::$config['max_num_search_keywords'], $num_keywords));
-		}
-
-		// $keywords input format: each word separated by a space, words in a bracket are not separated
-
-		// the user wants to search for any word, convert the search query
-		if ($terms == 'any')
-		{
-			$words = array();
-
-			preg_match_all('#([^\\s+\\-|()]+)(?:$|[\\s+\\-|()])#u', $keywords, $words);
-			if (sizeof($words[1]))
-			{
-				$keywords = '(' . implode('|', $words[1]) . ')';
-			}
-		}
-
-		// set the search_query which is shown to the user
-		$this->search_query = $keywords;
-
-		$exact_words = array();
-		preg_match_all('#([^\\s+\\-|*()]+)(?:$|[\\s+\\-|()])#u', $keywords, $exact_words);
-		$exact_words = $exact_words[1];
-
-		$common_ids = $words = array();
-
-		if (sizeof($exact_words))
-		{
-			$sql = 'SELECT word_id, word_text, word_common
-				FROM ' . SEARCH_WORDLIST_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('word_text', $exact_words);
-			$result = phpbb::$db->sql_query($sql);
-
-			// store an array of words and ids, remove common words
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				if ($row['word_common'])
-				{
-					$this->common_words[] = $row['word_text'];
-					$common_ids[$row['word_text']] = (int) $row['word_id'];
-					continue;
-				}
-
-				$words[$row['word_text']] = (int) $row['word_id'];
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-		unset($exact_words);
-
-		// now analyse the search query, first split it using the spaces
-		$query = explode(' ', $keywords);
-
-		$this->must_contain_ids = array();
-		$this->must_not_contain_ids = array();
-		$this->must_exclude_one_ids = array();
-
-		$mode = '';
-		$ignore_no_id = true;
-
-		foreach ($query as $word)
-		{
-			if (empty($word))
-			{
-				continue;
-			}
-
-			// words which should not be included
-			if ($word[0] == '-')
-			{
-				$word = substr($word, 1);
-
-				// a group of which at least one may not be in the resulting posts
-				if ($word[0] == '(')
-				{
-					$word = array_unique(explode('|', substr($word, 1, -1)));
-					$mode = 'must_exclude_one';
-				}
-				// one word which should not be in the resulting posts
-				else
-				{
-					$mode = 'must_not_contain';
-				}
-				$ignore_no_id = true;
-			}
-			// words which have to be included
-			else
-			{
-				// no prefix is the same as a +prefix
-				if ($word[0] == '+')
-				{
-					$word = substr($word, 1);
-				}
-
-				// a group of words of which at least one word should be in every resulting post
-				if ($word[0] == '(')
-				{
-					$word = array_unique(explode('|', substr($word, 1, -1)));
-				}
-				$ignore_no_id = false;
-				$mode = 'must_contain';
-			}
-
-			if (empty($word))
-			{
-				continue;
-			}
-
-			// if this is an array of words then retrieve an id for each
-			if (is_array($word))
-			{
-				$non_common_words = array();
-				$id_words = array();
-				foreach ($word as $i => $word_part)
-				{
-					if (strpos($word_part, '*') !== false)
-					{
-						$id_words[] = '\'' . phpbb::$db->sql_escape(str_replace('*', '%', $word_part)) . '\'';
-						$non_common_words[] = $word_part;
-					}
-					else if (isset($words[$word_part]))
-					{
-						$id_words[] = $words[$word_part];
-						$non_common_words[] = $word_part;
-					}
-					else
-					{
-						$len = utf8_strlen($word_part);
-						if ($len < $this->word_length['min'] || $len > $this->word_length['max'])
-						{
-							$this->common_words[] = $word_part;
-						}
-					}
-				}
-				if (sizeof($id_words))
-				{
-					sort($id_words);
-					if (sizeof($id_words) > 1)
-					{
-						$this->{$mode . '_ids'}[] = $id_words;
-					}
-					else
-					{
-						$mode = ($mode == 'must_exclude_one') ? 'must_not_contain' : $mode;
-						$this->{$mode . '_ids'}[] = $id_words[0];
-					}
-				}
-				// throw an error if we shall not ignore unexistant words
-				else if (!$ignore_no_id && sizeof($non_common_words))
-				{
-					trigger_error(phpbb::$user->lang('WORDS_IN_NO_POST', implode(', ', $non_common_words)));
-				}
-				unset($non_common_words);
-			}
-			// else we only need one id
-			else if (($wildcard = strpos($word, '*') !== false) || isset($words[$word]))
-			{
-				if ($wildcard)
-				{
-					$len = utf8_strlen(str_replace('*', '', $word));
-					if ($len >= $this->word_length['min'] && $len <= $this->word_length['max'])
-					{
-						$this->{$mode . '_ids'}[] = '\'' . phpbb::$db->sql_escape(str_replace('*', '%', $word)) . '\'';
-					}
-					else
-					{
-						$this->common_words[] = $word;
-					}
-				}
-				else
-				{
-					$this->{$mode . '_ids'}[] = $words[$word];
-				}
-			}
-			// throw an error if we shall not ignore unexistant words
-			else if (!$ignore_no_id)
-			{
-				if (!isset($common_ids[$word]))
-				{
-					$len = utf8_strlen($word);
-					if ($len >= $this->word_length['min'] && $len <= $this->word_length['max'])
-					{
-						trigger_error(phpbb::$db->lang('WORD_IN_NO_POST', $word));
-					}
-					else
-					{
-						$this->common_words[] = $word;
-					}
-				}
-			}
-			else
-			{
-				$len = utf8_strlen($word);
-				if ($len < $this->word_length['min'] || $len > $this->word_length['max'])
-				{
-					$this->common_words[] = $word;
-				}
-			}
-		}
-
-		// we can't search for negatives only
-		if (!sizeof($this->must_contain_ids))
-		{
-			return false;
-		}
-
-		sort($this->must_contain_ids);
-		sort($this->must_not_contain_ids);
-		sort($this->must_exclude_one_ids);
-
-		if (!empty($this->search_query))
-		{
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	* Performs a search on keywords depending on display specific params. You have to run split_keywords() first.
-	*
-	* @param	string		$type				contains either posts or topics depending on what should be searched for
-	* @param	string		&$fields			contains either titleonly (topic titles should be searched), msgonly (only message bodies should be searched), firstpost (only subject and body of the first post should be searched) or all (all post bodies and subjects should be searched)
-	* @param	string		&$terms				is either 'all' (use query as entered, words without prefix should default to "have to be in field") or 'any' (ignore search query parts and just return all posts that contain any of the specified words)
-	* @param	array		&$sort_by_sql		contains SQL code for the ORDER BY part of a query
-	* @param	string		&$sort_key			is the key of $sort_by_sql for the selected sorting
-	* @param	string		&$sort_dir			is either a or d representing ASC and DESC
-	* @param	string		&$sort_days			specifies the maximum amount of days a post may be old
-	* @param	array		&$ex_fid_ary		specifies an array of forum ids which should not be searched
-	* @param	array		&$m_approve_fid_ary	specifies an array of forum ids in which the searcher is allowed to view unapproved posts
-	* @param	int			&$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
-	* @param	array		&$author_ary		an array of author ids if the author should be ignored during the search the array is empty
-	* @param	array		&$id_ary			passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
-	* @param	int			$start				indicates the first index of the page
-	* @param	int			$per_page			number of ids each page is supposed to contain
-	* @return	boolean|int						total number of results
-	*
-	* @access	public
-	*/
-	public function keyword_search($type, &$fields, &$terms, &$sort_by_sql, &$sort_key, &$sort_dir, &$sort_days, &$ex_fid_ary, &$m_approve_fid_ary, &$topic_id, &$author_ary, &$id_ary, $start, $per_page)
-	{
-		// No keywords? No posts.
-		if (empty($this->search_query))
-		{
-			return false;
-		}
-
-		// generate a search_key from all the options to identify the results
-		$search_key = md5(implode('#', array(
-			serialize($this->must_contain_ids),
-			serialize($this->must_not_contain_ids),
-			serialize($this->must_exclude_one_ids),
-			$type,
-			$fields,
-			$terms,
-			$sort_days,
-			$sort_key,
-			$topic_id,
-			implode(',', $ex_fid_ary),
-			implode(',', $m_approve_fid_ary),
-			implode(',', $author_ary)
-		)));
-
-		// try reading the results from cache
-		$total_results = 0;
-		if ($this->obtain_ids($search_key, $total_results, $id_ary, $start, $per_page, $sort_dir) == self::SEARCH_RESULT_IN_CACHE)
-		{
-			return $total_results;
-		}
-
-		$id_ary = array();
-
-		$sql_where = array();
-		$group_by = false;
-		$m_num = 0;
-		$w_num = 0;
-
-		$sql_array = array(
-			'SELECT'	=> ($type == 'posts') ? 'p.post_id' : 'p.topic_id',
-			'FROM'		=> array(
-				SEARCH_WORDMATCH_TABLE	=> array(),
-				SEARCH_WORDLIST_TABLE	=> array(),
-			),
-			'LEFT_JOIN' => array(array(
-				'FROM'	=> array(POSTS_TABLE => 'p'),
-				'ON'	=> 'm0.post_id = p.post_id',
-			)),
-		);
-
-		$title_match = '';
-		$group_by = true;
-		// Build some display specific sql strings
-		switch ($fields)
-		{
-			case 'titleonly':
-				$title_match = 'title_match = 1';
-				$group_by = false;
-			// no break
-			case 'firstpost':
-				$sql_array['FROM'][TOPICS_TABLE] = 't';
-				$sql_where[] = 'p.post_id = t.topic_first_post_id';
-			break;
-
-			case 'msgonly':
-				$title_match = 'title_match = 0';
-				$group_by = false;
-			break;
-		}
-
-		if ($type == 'topics')
-		{
-			if (!isset($sql_array['FROM'][TOPICS_TABLE]))
-			{
-				$sql_array['FROM'][TOPICS_TABLE] = 't';
-				$sql_where[] = 'p.topic_id = t.topic_id';
-			}
-			$group_by = true;
-		}
-
-		/**
-		* @todo Add a query optimizer (handle stuff like "+(4|3) +4")
-		*/
-
-		foreach ($this->must_contain_ids as $subquery)
-		{
-			if (is_array($subquery))
-			{
-				$group_by = true;
-
-				$word_id_sql = array();
-				$word_ids = array();
-				foreach ($subquery as $id)
-				{
-					if (is_string($id))
-					{
-						$sql_array['LEFT_JOIN'][] = array(
-							'FROM'	=> array(SEARCH_WORDLIST_TABLE => 'w' . $w_num),
-							'ON'	=> "w$w_num.word_text LIKE $id"
-						);
-						$word_ids[] = "w$w_num.word_id";
-
-						$w_num++;
-					}
-					else
-					{
-						$word_ids[] = $id;
-					}
-				}
-
-				$sql_where[] = phpbb::$db->sql_in_set("m$m_num.word_id", $word_ids);
-
-				unset($word_id_sql);
-				unset($word_ids);
-			}
-			else if (is_string($subquery))
-			{
-				$sql_array['FROM'][SEARCH_WORDLIST_TABLE][] = 'w' . $w_num;
-
-				$sql_where[] = "w$w_num.word_text LIKE $subquery";
-				$sql_where[] = "m$m_num.word_id = w$w_num.word_id";
-
-				$group_by = true;
-				$w_num++;
-			}
-			else
-			{
-				$sql_where[] = "m$m_num.word_id = $subquery";
-			}
-
-			$sql_array['FROM'][SEARCH_WORDMATCH_TABLE][] = 'm' . $m_num;
-
-			if ($title_match)
-			{
-				$sql_where[] = "m$m_num.$title_match";
-			}
-
-			if ($m_num != 0)
-			{
-				$sql_where[] = "m$m_num.post_id = m0.post_id";
-			}
-			$m_num++;
-		}
-
-		foreach ($this->must_not_contain_ids as $key => $subquery)
-		{
-			if (is_string($subquery))
-			{
-				$sql_array['LEFT_JOIN'][] = array(
-					'FROM'	=> array(SEARCH_WORDLIST_TABLE => 'w' . $w_num),
-					'ON'	=> "w$w_num.word_text LIKE $subquery"
-				);
-
-				$this->must_not_contain_ids[$key] = "w$w_num.word_id";
-
-				$group_by = true;
-				$w_num++;
-			}
-		}
-
-		if (sizeof($this->must_not_contain_ids))
-		{
-			$sql_array['LEFT_JOIN'][] = array(
-				'FROM'	=> array(SEARCH_WORDMATCH_TABLE => 'm' . $m_num),
-				'ON'	=> phpbb::$db->sql_in_set("m$m_num.word_id", $this->must_not_contain_ids) . (($title_match) ? " AND m$m_num.$title_match" : '') . " AND m$m_num.post_id = m0.post_id"
-			);
-
-			$sql_where[] = "m$m_num.word_id IS NULL";
-			$m_num++;
-		}
-
-		foreach ($this->must_exclude_one_ids as $ids)
-		{
-			$is_null_joins = array();
-			foreach ($ids as $id)
-			{
-				if (is_string($id))
-				{
-					$sql_array['LEFT_JOIN'][] = array(
-						'FROM'	=> array(SEARCH_WORDLIST_TABLE => 'w' . $w_num),
-						'ON'	=> "w$w_num.word_text LIKE $id"
-					);
-					$id = "w$w_num.word_id";
-
-					$group_by = true;
-					$w_num++;
-				}
-
-				$sql_array['LEFT_JOIN'][] = array(
-					'FROM'	=> array(SEARCH_WORDMATCH_TABLE => 'm' . $m_num),
-					'ON'	=> "m$m_num.word_id = $id AND m$m_num.post_id = m0.post_id" . (($title_match) ? " AND m$m_num.$title_match" : '')
-				);
-				$is_null_joins[] = "m$m_num.word_id IS NULL";
-
-				$m_num++;
-			}
-			$sql_where[] = '(' . implode(' OR ', $is_null_joins) . ')';
-		}
-
-		if (!sizeof($m_approve_fid_ary))
-		{
-			$sql_where[] = 'p.post_approved = 1';
-		}
-		else if ($m_approve_fid_ary !== array(-1))
-		{
-			$sql_where[] = '(p.post_approved = 1 OR ' . phpbb::$db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')';
-		}
-
-		if ($topic_id)
-		{
-			$sql_where[] = 'p.topic_id = ' . $topic_id;
-		}
-
-		if (sizeof($author_ary))
-		{
-			$sql_where[] = phpbb::$db->sql_in_set('p.poster_id', $author_ary);
-		}
-
-		if (sizeof($ex_fid_ary))
-		{
-			$sql_where[] = phpbb::$db->sql_in_set('p.forum_id', $ex_fid_ary, true);
-		}
-
-		if ($sort_days)
-		{
-			$sql_where[] = 'p.post_time >= ' . (time() - ($sort_days * 86400));
-		}
-
-		$sql_array['WHERE'] = implode(' AND ', $sql_where);
-
-		$is_mysql = false;
-		// if the total result count is not cached yet, retrieve it from the db
-		if (!$total_results)
-		{
-			$sql = '';
-			$sql_array_count = $sql_array;
-
-			if (phpbb::$db->dbms_type === 'mysql')
-			{
-				$sql_array_copy = $sql_array;
-
-				// $sql_array['SELECT'] = 'SQL_CALC_FOUND_ROWS ' . $sql_array['SELECT'];
-				$sql_array_copy['SELECT'] = 'SQL_CALC_FOUND_ROWS p.post_id ';
-
-				$is_mysql = true;
-			}
-			else
-			{
-				if (!phpbb::$db->count_distinct)
-				{
-					$sql_array_count['SELECT'] = ($type == 'posts') ? 'DISTINCT p.post_id' : 'DISTINCT p.topic_id';
-					$sql = 'SELECT COUNT(' . (($type == 'posts') ? 'post_id' : 'topic_id') . ') as total_results
-							FROM (' . phpbb::$db->sql_build_query('SELECT', $sql_array_count) . ')';
-				}
-
-				$sql_array_count['SELECT'] = ($type == 'posts') ? 'COUNT(DISTINCT p.post_id) AS total_results' : 'COUNT(DISTINCT p.topic_id) AS total_results';
-				$sql = (!$sql) ? phpbb::$db->sql_build_query('SELECT', $sql_array_count) : $sql;
-
-				$result = phpbb::$db->sql_query($sql);
-				$total_results = (int) phpbb::$db->sql_fetchfield('total_results');
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$total_results)
-				{
-					return false;
-				}
-			}
-
-			unset($sql_array_count, $sql);
-		}
-
-		// Build sql strings for sorting
-		$sql_sort = $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
-
-		switch ($sql_sort[0])
-		{
-			case 'u':
-				$sql_array['FROM'][USERS_TABLE] = 'u';
-				$sql_where[] = 'u.user_id = p.poster_id ';
-			break;
-
-			case 't':
-				if (!isset($sql_array['FROM'][TOPICS_TABLE]))
-				{
-					$sql_array['FROM'][TOPICS_TABLE] = 't';
-					$sql_where[] = 'p.topic_id = t.topic_id';
-				}
-			break;
-
-			case 'f':
-				$sql_array['FROM'][FORUMS_TABLE] = 'f';
-				$sql_where[] = 'f.forum_id = p.forum_id';
-			break;
-		}
-
-		$sql_array['WHERE'] = implode(' AND ', $sql_where);
-		$sql_array['GROUP_BY'] = ($group_by) ? (($type == 'posts') ? 'p.post_id' : 'p.topic_id') . ', ' . $sort_by_sql[$sort_key] : '';
-		$sql_array['ORDER_BY'] = $sql_sort;
-
-		unset($sql_where, $sql_sort, $group_by);
-
-		$sql = phpbb::$db->sql_build_query('SELECT', $sql_array);
-		$result = phpbb::$db->sql_query_limit($sql, phpbb::$config['search_block_size'], $start);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$id_ary[] = $row[(($type == 'posts') ? 'post_id' : 'topic_id')];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if (!sizeof($id_ary))
-		{
-			return false;
-		}
-
-		// if we use mysql and the total result count is not cached yet, retrieve it from the db
-		if (!$total_results && $is_mysql && !empty($sql_array_copy))
-		{
-			$sql = phpbb::$db->sql_build_query('SELECT', $sql_array_copy);
-			unset($sql_array_copy);
-
-			phpbb::$db->sql_query($sql);
-			phpbb::$db->sql_freeresult($result);
-
-			$sql = 'SELECT FOUND_ROWS() as total_results';
-			$result = phpbb::$db->sql_query($sql);
-			$total_results = (int) phpbb::$db->sql_fetchfield('total_results');
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$total_results)
-			{
-				return false;
-			}
-		}
-
-		// store the ids, from start on then delete anything that isn't on the current page because we only need ids for one page
-		$this->save_ids($search_key, $this->search_query, $author_ary, $total_results, $id_ary, $start, $sort_dir);
-		$id_ary = array_slice($id_ary, 0, (int) $per_page);
-
-		return $total_results;
-	}
-
-	/**
-	* Performs a search on an author's posts without caring about message contents. Depends on display specific params
-	*
-	* @param	string		$type				contains either posts or topics depending on what should be searched for
-	* @param	boolean		$firstpost_only		if true, only topic starting posts will be considered
-	* @param	array		&$sort_by_sql		contains SQL code for the ORDER BY part of a query
-	* @param	string		&$sort_key			is the key of $sort_by_sql for the selected sorting
-	* @param	string		&$sort_dir			is either a or d representing ASC and DESC
-	* @param	string		&$sort_days			specifies the maximum amount of days a post may be old
-	* @param	array		&$ex_fid_ary		specifies an array of forum ids which should not be searched
-	* @param	array		&$m_approve_fid_ary	specifies an array of forum ids in which the searcher is allowed to view unapproved posts
-	* @param	int			&$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
-	* @param	array		&$author_ary		an array of author ids
-	* @param	array		&$id_ary			passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
-	* @param	int			$start				indicates the first index of the page
-	* @param	int			$per_page			number of ids each page is supposed to contain
-	* @return	boolean|int						total number of results
-	*
-	* @access	public
-	*/
-	public function author_search($type, $firstpost_only, &$sort_by_sql, &$sort_key, &$sort_dir, &$sort_days, &$ex_fid_ary, &$m_approve_fid_ary, &$topic_id, &$author_ary, &$id_ary, $start, $per_page)
-	{
-		// No author? No posts.
-		if (!sizeof($author_ary))
-		{
-			return 0;
-		}
-
-		// generate a search_key from all the options to identify the results
-		$search_key = md5(implode('#', array(
-			'',
-			$type,
-			($firstpost_only) ? 'firstpost' : '',
-			'',
-			'',
-			$sort_days,
-			$sort_key,
-			$topic_id,
-			implode(',', $ex_fid_ary),
-			implode(',', $m_approve_fid_ary),
-			implode(',', $author_ary)
-		)));
-
-		// try reading the results from cache
-		$total_results = 0;
-		if ($this->obtain_ids($search_key, $total_results, $id_ary, $start, $per_page, $sort_dir) == self::SEARCH_RESULT_IN_CACHE)
-		{
-			return $total_results;
-		}
-
-		$id_ary = array();
-
-		// Create some display specific sql strings
-		$sql_author		= phpbb::$db->sql_in_set('p.poster_id', $author_ary);
-		$sql_fora		= (sizeof($ex_fid_ary)) ? ' AND ' . phpbb::$db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
-		$sql_time		= ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
-		$sql_topic_id	= ($topic_id) ? ' AND p.topic_id = ' . (int) $topic_id : '';
-		$sql_firstpost = ($firstpost_only) ? ' AND p.post_id = t.topic_first_post_id' : '';
-
-		// Build sql strings for sorting
-		$sql_sort = $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
-		$sql_sort_table = $sql_sort_join = '';
-		switch ($sql_sort[0])
-		{
-			case 'u':
-				$sql_sort_table	= USERS_TABLE . ' u, ';
-				$sql_sort_join	= ' AND u.user_id = p.poster_id ';
-			break;
-
-			case 't':
-				$sql_sort_table	= ($type == 'posts' && !$firstpost_only) ? TOPICS_TABLE . ' t, ' : '';
-				$sql_sort_join	= ($type == 'posts' && !$firstpost_only) ? ' AND t.topic_id = p.topic_id ' : '';
-			break;
-
-			case 'f':
-				$sql_sort_table	= FORUMS_TABLE . ' f, ';
-				$sql_sort_join	= ' AND f.forum_id = p.forum_id ';
-			break;
-		}
-
-		if (!sizeof($m_approve_fid_ary))
-		{
-			$m_approve_fid_sql = ' AND p.post_approved = 1';
-		}
-		else if ($m_approve_fid_ary == array(-1))
-		{
-			$m_approve_fid_sql = '';
-		}
-		else
-		{
-			$m_approve_fid_sql = ' AND (p.post_approved = 1 OR ' . phpbb::$db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')';
-		}
-
-		$select = ($type == 'posts') ? 'p.post_id' : 't.topic_id';
-		$is_mysql = false;
-
-		// If the cache was completely empty count the results
-		if (!$total_results)
-		{
-			if (phpbb::$db->dbms_type === 'mysql')
-			{
-//				$select = 'SQL_CALC_FOUND_ROWS ' . $select;
-				$is_mysql = true;
-			}
-			else
-			{
-				if ($type == 'posts')
-				{
-					$sql = 'SELECT COUNT(p.post_id) as total_results
-						FROM ' . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t ' : ' ') . "
-						WHERE $sql_author
-							$sql_topic_id
-							$sql_firstpost
-							$m_approve_fid_sql
-							$sql_fora
-							$sql_time";
-				}
-				else
-				{
-					if (phpbb::$db->count_distinct)
-					{
-						$sql = 'SELECT COUNT(DISTINCT t.topic_id) as total_results';
-					}
-					else
-					{
-						$sql = 'SELECT COUNT(topic_id) as total_results
-							FROM (SELECT DISTINCT t.topic_id';
-					}
-
-					$sql .= ' FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
-						WHERE $sql_author
-							$sql_topic_id
-							$sql_firstpost
-							$m_approve_fid_sql
-							$sql_fora
-							AND t.topic_id = p.topic_id
-							$sql_time" . ((phpbb::$db->count_distinct) ? '' : ')');
-				}
-				$result = phpbb::$db->sql_query($sql);
-
-				$total_results = (int) phpbb::$db->sql_fetchfield('total_results');
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$total_results)
-				{
-					return false;
-				}
-			}
-		}
-
-		// Build the query for really selecting the post_ids
-		if ($type == 'posts')
-		{
-			$sql = "SELECT $select
-				FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t' : '') . "
-				WHERE $sql_author
-					$sql_topic_id
-					$sql_firstpost
-					$m_approve_fid_sql
-					$sql_fora
-					$sql_sort_join
-					$sql_time
-				ORDER BY $sql_sort";
-			$field = 'post_id';
-		}
-		else
-		{
-			$sql = "SELECT $select
-				FROM " . $sql_sort_table . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
-				WHERE $sql_author
-					$sql_topic_id
-					$sql_firstpost
-					$m_approve_fid_sql
-					$sql_fora
-					AND t.topic_id = p.topic_id
-					$sql_sort_join
-					$sql_time
-				GROUP BY t.topic_id, " . $sort_by_sql[$sort_key] . '
-				ORDER BY ' . $sql_sort;
-			$field = 'topic_id';
-		}
-
-		// Only read one block of posts from the db and then cache it
-		$result = phpbb::$db->sql_query_limit($sql, phpbb::$config['search_block_size'], $start);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$id_ary[] = $row[$field];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$total_results && $is_mysql)
-		{
-			// Count rows for the executed queries. Replace $select within $sql with SQL_CALC_FOUND_ROWS, and run it.
-			$sql = str_replace('SELECT ' . $select, 'SELECT DISTINCT SQL_CALC_FOUND_ROWS p.post_id', $sql);
-
-			phpbb::$db->sql_query($sql);
-			phpbb::$db->sql_freeresult($result);
-
-			$sql = 'SELECT FOUND_ROWS() as total_results';
-			$result = phpbb::$db->sql_query($sql);
-			$total_results = (int) phpbb::$db->sql_fetchfield('total_results');
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$total_results)
-			{
-				return false;
-			}
-		}
-
-		if (sizeof($id_ary))
-		{
-			$this->save_ids($search_key, '', $author_ary, $total_results, $id_ary, $start, $sort_dir);
-			$id_ary = array_slice($id_ary, 0, $per_page);
-
-			return $total_results;
-		}
-		return false;
-	}
-
-	/**
-	* Split a text into words of a given length
-	*
-	* The text is converted to UTF-8, cleaned up, and split. Then, words that
-	* conform to the defined length range are returned in an array.
-	*
-	* NOTE: duplicates are NOT removed from the return array
-	*
-	* @param	string	$text	Text to split, encoded in UTF-8
-	* @return	array			Array of UTF-8 words
-	*
-	* @access	private
-	*/
-	private function split_message($text)
-	{
-		$match = $words = array();
-
-		/**
-		* Taken from the original code
-		*/
-		// Do not index code
-		$match[] = '#\[code(?:=.*?)?(\:?[0-9a-z]{5,})\].*?\[\/code(\:?[0-9a-z]{5,})\]#is';
-		// BBcode
-		$match[] = '#\[\/?[a-z0-9\*\+\-]+(?:=.*?)?(?::[a-z])?(\:?[0-9a-z]{5,})\]#';
-
-		$min = $this->word_length['min'];
-		$max = $this->word_length['max'];
-
-		$isset_min = $min - 1;
-
-		/**
-		* Clean up the string, remove HTML tags, remove BBCodes
-		*/
-		$word = strtok($this->cleanup(preg_replace($match, ' ', strip_tags($text)), -1), ' ');
-
-		while (strlen($word))
-		{
-			if (strlen($word) > 255 || strlen($word) <= $isset_min)
-			{
-				/**
-				* Words longer than 255 bytes are ignored. This will have to be
-				* changed whenever we change the length of search_wordlist.word_text
-				*
-				* Words shorter than $isset_min bytes are ignored, too
-				*/
-				$word = strtok(' ');
-				continue;
-			}
-
-			$len = utf8_strlen($word);
-
-			/**
-			* Test whether the word is too short to be indexed.
-			*
-			* Note that this limit does NOT apply to CJK and Hangul
-			*/
-			if ($len < $min)
-			{
-				/**
-				* Note: this could be optimized. If the codepoint is lower than Hangul's range
-				* we know that it will also be lower than CJK ranges
-				*/
-				if ((strncmp($word, utf_normalizer::UTF8_HANGUL_FIRST, 3) < 0 || strncmp($word, utf_normalizer::UTF8_HANGUL_LAST, 3) > 0)
-				 && (strncmp($word, utf_normalizer::UTF8_CJK_FIRST, 3) < 0 || strncmp($word, utf_normalizer::UTF8_CJK_LAST, 3) > 0)
-				 && (strncmp($word, utf_normalizer::UTF8_CJK_B_FIRST, 4) < 0 || strncmp($word, utf_normalizer::UTF8_CJK_B_LAST, 4) > 0))
-				{
-					$word = strtok(' ');
-					continue;
-				}
-			}
-
-			$words[] = $word;
-			$word = strtok(' ');
-		}
-
-		return $words;
-	}
-
-	/**
-	* Updates wordlist and wordmatch tables when a message is posted or changed
-	*
-	* @param	string	$mode		Contains the post mode: edit, post, reply, quote
-	* @param	int		$post_id	The id of the post which is modified/created
-	* @param	string	&$message	New or updated post content
-	* @param	string	&$subject	New or updated post subject
-	* @param	int		$poster_id	Post author's user id
-	* @param	int		$forum_id	The id of the forum in which the post is located
-	*
-	* @access	public
-	*/
-	public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_id)
-	{
-		if (!phpbb::$config['fulltext_native_load_upd'])
-		{
-			/**
-			* The search indexer is disabled, return
-			*/
-			return;
-		}
-
-		// Split old and new post/subject to obtain array of 'words'
-		$split_text = $this->split_message($message);
-		$split_title = $this->split_message($subject);
-
-		$cur_words = array('post' => array(), 'title' => array());
-
-		$words = array();
-		if ($mode == 'edit')
-		{
-			$words['add']['post'] = array();
-			$words['add']['title'] = array();
-			$words['del']['post'] = array();
-			$words['del']['title'] = array();
-
-			$sql = 'SELECT w.word_id, w.word_text, m.title_match
-				FROM ' . SEARCH_WORDLIST_TABLE . ' w, ' . SEARCH_WORDMATCH_TABLE . " m
-				WHERE m.post_id = $post_id
-					AND w.word_id = m.word_id";
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$which = ($row['title_match']) ? 'title' : 'post';
-				$cur_words[$which][$row['word_text']] = $row['word_id'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			$words['add']['post'] = array_diff($split_text, array_keys($cur_words['post']));
-			$words['add']['title'] = array_diff($split_title, array_keys($cur_words['title']));
-			$words['del']['post'] = array_diff(array_keys($cur_words['post']), $split_text);
-			$words['del']['title'] = array_diff(array_keys($cur_words['title']), $split_title);
-		}
-		else
-		{
-			$words['add']['post'] = $split_text;
-			$words['add']['title'] = $split_title;
-			$words['del']['post'] = array();
-			$words['del']['title'] = array();
-		}
-		unset($split_text);
-		unset($split_title);
-
-		// Get unique words from the above arrays
-		$unique_add_words = array_unique(array_merge($words['add']['post'], $words['add']['title']));
-
-		// We now have unique arrays of all words to be added and removed and
-		// individual arrays of added and removed words for text and title. What
-		// we need to do now is add the new words (if they don't already exist)
-		// and then add (or remove) matches between the words and this post
-		if (sizeof($unique_add_words))
-		{
-			$sql = 'SELECT word_id, word_text
-				FROM ' . SEARCH_WORDLIST_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('word_text', $unique_add_words);
-			$result = phpbb::$db->sql_query($sql);
-
-			$word_ids = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$word_ids[$row['word_text']] = $row['word_id'];
-			}
-			phpbb::$db->sql_freeresult($result);
-			$new_words = array_diff($unique_add_words, array_keys($word_ids));
-
-			phpbb::$db->sql_transaction('begin');
-			if (sizeof($new_words))
-			{
-				$sql_ary = array();
-
-				foreach ($new_words as $word)
-				{
-					$sql_ary[] = array('word_text' => (string) $word, 'word_count' => 0);
-				}
-				phpbb::$db->sql_return_on_error(true);
-				phpbb::$db->sql_multi_insert(SEARCH_WORDLIST_TABLE, $sql_ary);
-				phpbb::$db->sql_return_on_error(false);
-			}
-			unset($new_words, $sql_ary);
-		}
-		else
-		{
-			phpbb::$db->sql_transaction('begin');
-		}
-
-		// now update the search match table, remove links to removed words and add links to new words
-		foreach ($words['del'] as $word_in => $word_ary)
-		{
-			$title_match = ($word_in == 'title') ? 1 : 0;
-
-			if (sizeof($word_ary))
-			{
-				$sql_in = array();
-				foreach ($word_ary as $word)
-				{
-					$sql_in[] = $cur_words[$word_in][$word];
-				}
-
-				$sql = 'DELETE FROM ' . SEARCH_WORDMATCH_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('word_id', $sql_in) . '
-						AND post_id = ' . intval($post_id) . "
-						AND title_match = $title_match";
-				phpbb::$db->sql_query($sql);
-
-				$sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . '
-					SET word_count = word_count - 1
-					WHERE ' . phpbb::$db->sql_in_set('word_id', $sql_in) . '
-						AND word_count > 0';
-				phpbb::$db->sql_query($sql);
-
-				unset($sql_in);
-			}
-		}
-
-		phpbb::$db->sql_return_on_error(true);
-		foreach ($words['add'] as $word_in => $word_ary)
-		{
-			$title_match = ($word_in == 'title') ? 1 : 0;
-
-			if (sizeof($word_ary))
-			{
-				$sql = 'INSERT INTO ' . SEARCH_WORDMATCH_TABLE . ' (post_id, word_id, title_match)
-					SELECT ' . (int) $post_id . ', word_id, ' . (int) $title_match . '
-					FROM ' . SEARCH_WORDLIST_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('word_text', $word_ary);
-				phpbb::$db->sql_query($sql);
-
-				$sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . '
-					SET word_count = word_count + 1
-					WHERE ' . phpbb::$db->sql_in_set('word_text', $word_ary);
-				phpbb::$db->sql_query($sql);
-			}
-		}
-		phpbb::$db->sql_return_on_error(false);
-
-		phpbb::$db->sql_transaction('commit');
-
-		// destroy cached search results containing any of the words removed or added
-		$this->destroy_cache(array_unique(array_merge($words['add']['post'], $words['add']['title'], $words['del']['post'], $words['del']['title'])), array($poster_id));
-
-		unset($unique_add_words);
-		unset($words);
-		unset($cur_words);
-	}
-
-	/**
-	* Removes entries from the wordmatch table for the specified post_ids
-	*/
-	public function index_remove($post_ids, $author_ids, $forum_ids)
-	{
-		if (sizeof($post_ids))
-		{
-			$sql = 'SELECT w.word_id, w.word_text, m.title_match
-				FROM ' . SEARCH_WORDMATCH_TABLE . ' m, ' . SEARCH_WORDLIST_TABLE . ' w
-				WHERE ' . phpbb::$db->sql_in_set('m.post_id', $post_ids) . '
-					AND w.word_id = m.word_id';
-			$result = phpbb::$db->sql_query($sql);
-
-			$message_word_ids = $title_word_ids = $word_texts = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				if ($row['title_match'])
-				{
-					$title_word_ids[] = $row['word_id'];
-				}
-				else
-				{
-					$message_word_ids[] = $row['word_id'];
-				}
-				$word_texts[] = $row['word_text'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			if (sizeof($title_word_ids))
-			{
-				$sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . '
-					SET word_count = word_count - 1
-					WHERE ' . phpbb::$db->sql_in_set('word_id', $title_word_ids) . '
-						AND word_count > 0';
-				phpbb::$db->sql_query($sql);
-			}
-
-			if (sizeof($message_word_ids))
-			{
-				$sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . '
-					SET word_count = word_count - 1
-					WHERE ' . phpbb::$db->sql_in_set('word_id', $message_word_ids) . '
-						AND word_count > 0';
-				phpbb::$db->sql_query($sql);
-			}
-
-			unset($title_word_ids);
-			unset($message_word_ids);
-
-			$sql = 'DELETE FROM ' . SEARCH_WORDMATCH_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('post_id', $post_ids);
-			phpbb::$db->sql_query($sql);
-		}
-
-		$this->destroy_cache(array_unique($word_texts), $author_ids);
-	}
-
-	/**
-	* Tidy up indexes: Tag 'common words' and remove
-	* words no longer referenced in the match table
-	*/
-	public function tidy()
-	{
-		// Is the fulltext indexer disabled? If yes then we need not
-		// carry on ... it's okay ... I know when I'm not wanted boo hoo
-		if (!phpbb::$config['fulltext_native_load_upd'])
-		{
-			set_config('search_last_gc', time(), true);
-			return;
-		}
-
-		$destroy_cache_words = array();
-
-		// Remove common words
-		if (phpbb::$config['num_posts'] >= 100 && phpbb::$config['fulltext_native_common_thres'])
-		{
-			$common_threshold = ((double) phpbb::$config['fulltext_native_common_thres']) / 100.0;
-			// First, get the IDs of common words
-			$sql = 'SELECT word_id, word_text
-				FROM ' . SEARCH_WORDLIST_TABLE . '
-				WHERE word_count > ' . floor(phpbb::$config['num_posts'] * $common_threshold) . '
-					OR word_common = 1';
-			$result = phpbb::$db->sql_query($sql);
-
-			$sql_in = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$sql_in[] = $row['word_id'];
-				$destroy_cache_words[] = $row['word_text'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			if (sizeof($sql_in))
-			{
-				// Flag the words
-				$sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . '
-					SET word_common = 1
-					WHERE ' . phpbb::$db->sql_in_set('word_id', $sql_in);
-				phpbb::$db->sql_query($sql);
-
-				// by setting search_last_gc to the new time here we make sure that if a user reloads because the
-				// following query takes too long, he won't run into it again
-				set_config('search_last_gc', time(), true);
-
-				// Delete the matches
-				$sql = 'DELETE FROM ' . SEARCH_WORDMATCH_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('word_id', $sql_in);
-				phpbb::$db->sql_query($sql);
-			}
-			unset($sql_in);
-		}
-
-		if (sizeof($destroy_cache_words))
-		{
-			// destroy cached search results containing any of the words that are now common or were removed
-			$this->destroy_cache(array_unique($destroy_cache_words));
-		}
-
-		set_config('search_last_gc', time(), true);
-	}
-
-	/**
-	* Deletes all words from the index
-	*/
-	public function delete_index($acp_module, $u_action)
-	{
-		if (phpbb::$db->features['truncate'])
-		{
-			phpbb::$db->sql_query('TRUNCATE TABLE ' . SEARCH_WORDLIST_TABLE);
-			phpbb::$db->sql_query('TRUNCATE TABLE ' . SEARCH_WORDMATCH_TABLE);
-			phpbb::$db->sql_query('TRUNCATE TABLE ' . SEARCH_RESULTS_TABLE);
-		}
-		else
-		{
-			phpbb::$db->sql_query('DELETE FROM ' . SEARCH_WORDLIST_TABLE);
-			phpbb::$db->sql_query('DELETE FROM ' . SEARCH_WORDMATCH_TABLE);
-			phpbb::$db->sql_query('DELETE FROM ' . SEARCH_RESULTS_TABLE);
-		}
-	}
-
-	/**
-	* Returns true if both FULLTEXT indexes exist
-	*/
-	public function index_created()
-	{
-		if (!sizeof($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		return ($this->stats['total_words'] && $this->stats['total_matches']) ? true : false;
-	}
-
-	/**
-	* Returns an associative array containing information about the indexes
-	*/
-	public function index_stats()
-	{
-		if (!sizeof($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		return array(
-			phpbb::$db->lang['TOTAL_WORDS']		=> $this->stats['total_words'],
-			phpbb::$db->lang['TOTAL_MATCHES']	=> $this->stats['total_matches'],
-		);
-	}
-
-	private function get_stats()
-	{
-		$sql = 'SELECT COUNT(*) as total_words
-			FROM ' . SEARCH_WORDLIST_TABLE;
-		$result = phpbb::$db->sql_query($sql);
-		$this->stats['total_words'] = (int) phpbb::$db->sql_fetchfield('total_words');
-		phpbb::$db->sql_freeresult($result);
-
-		$sql = 'SELECT COUNT(*) as total_matches
-			FROM ' . SEARCH_WORDMATCH_TABLE;
-		$result = phpbb::$db->sql_query($sql);
-		$this->stats['total_matches'] = (int) phpbb::$db->sql_fetchfield('total_matches');
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	/**
-	* Clean up a text to remove non-alphanumeric characters
-	*
-	* This method receives a UTF-8 string, normalizes and validates it, replaces all
-	* non-alphanumeric characters with strings then returns the result.
-	*
-	* Any number of "allowed chars" can be passed as a UTF-8 string in NFC.
-	*
-	* @param	string	$text			Text to split, in UTF-8 (not normalized or sanitized)
-	* @param	string	$allowed_chars	String of special chars to allow
-	* @return	string					Cleaned up text, only alphanumeric chars are left
-	*
-	* @todo normalizer::cleanup being able to be used?
-	*/
-	private function cleanup($text, $allowed_chars = null)
-	{
-		static $conv = array(), $conv_loaded = array();
-		$words = $allow = array();
-
-		$utf_len_mask = array(
-			"\xC0"	=>	2,
-			"\xD0"	=>	2,
-			"\xE0"	=>	3,
-			"\xF0"	=>	4
-		);
-
-		/**
-		* Replace HTML entities and NCRs
-		*/
-		$text = htmlspecialchars_decode(utf8_decode_ncr($text), ENT_QUOTES);
-
-		/**
-		* Load the UTF-8 normalizer
-		*
-		* If we use it more widely, an instance of that class should be held in a
-		* a global variable instead
-		*/
-		utf_normalizer::nfc($text);
-
-		/**
-		* The first thing we do is:
-		*
-		* - convert ASCII-7 letters to lowercase
-		* - remove the ASCII-7 non-alpha characters
-		* - remove the bytes that should not appear in a valid UTF-8 string: 0xC0,
-		*   0xC1 and 0xF5-0xFF
-		*
-		* @todo in theory, the third one is already taken care of during normalization and those chars should have been replaced by Unicode replacement chars
-		*/
-		$sb_match	= "ISTCPAMELRDOJBNHFGVWUQKYXZ\r\n\t!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~\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\xC0\xC1\xF5\xF6\xF7\xF8\xF9\xFA\xFB\xFC\xFD\xFE\xFF";
-		$sb_replace	= 'istcpamelrdojbnhfgvwuqkyxz                                                                              ';
-
-		/**
-		* This is the list of legal ASCII chars, it is automatically extended
-		* with ASCII chars from $allowed_chars
-		*/
-		$legal_ascii = ' eaisntroludcpmghbfvq10xy2j9kw354867z';
-
-		/**
-		* Prepare an array containing the extra chars to allow
-		*/
-		if (isset($allowed_chars[0]))
-		{
-			$pos = 0;
-			$len = strlen($allowed_chars);
-			do
-			{
-				$c = $allowed_chars[$pos];
-
-				if ($c < "\x80")
-				{
-					/**
-					* ASCII char
-					*/
-					$sb_pos = strpos($sb_match, $c);
-					if (is_int($sb_pos))
-					{
-						/**
-						* Remove the char from $sb_match and its corresponding
-						* replacement in $sb_replace
-						*/
-						$sb_match = substr($sb_match, 0, $sb_pos) . substr($sb_match, $sb_pos + 1);
-						$sb_replace = substr($sb_replace, 0, $sb_pos) . substr($sb_replace, $sb_pos + 1);
-						$legal_ascii .= $c;
-					}
-
-					++$pos;
-				}
-				else
-				{
-					/**
-					* UTF-8 char
-					*/
-					$utf_len = $utf_len_mask[$c & "\xF0"];
-					$allow[substr($allowed_chars, $pos, $utf_len)] = 1;
-					$pos += $utf_len;
-				}
-			}
-			while ($pos < $len);
-		}
-
-		$text = strtr($text, $sb_match, $sb_replace);
-		$ret = '';
-
-		$pos = 0;
-		$len = strlen($text);
-
-		do
-		{
-			/**
-			* Do all consecutive ASCII chars at once
-			*/
-			if ($spn = strspn($text, $legal_ascii, $pos))
-			{
-				$ret .= substr($text, $pos, $spn);
-				$pos += $spn;
-			}
-
-			if ($pos >= $len)
-			{
-				return $ret;
-			}
-
-			/**
-			* Capture the UTF char
-			*/
-			$utf_len = $utf_len_mask[$text[$pos] & "\xF0"];
-			$utf_char = substr($text, $pos, $utf_len);
-			$pos += $utf_len;
-
-			if (($utf_char >= UTF8_HANGUL_FIRST && $utf_char <= UTF8_HANGUL_LAST)
-			 || ($utf_char >= UTF8_CJK_FIRST && $utf_char <= UTF8_CJK_LAST)
-			 || ($utf_char >= UTF8_CJK_B_FIRST && $utf_char <= UTF8_CJK_B_LAST))
-			{
-				/**
-				* All characters within these ranges are valid
-				*
-				* We separate them with a space in order to index each character
-				* individually
-				*/
-				$ret .= ' ' . $utf_char . ' ';
-				continue;
-			}
-
-			if (isset($allow[$utf_char]))
-			{
-				/**
-				* The char is explicitly allowed
-				*/
-				$ret .= $utf_char;
-				continue;
-			}
-
-			if (isset($conv[$utf_char]))
-			{
-				/**
-				* The char is mapped to something, maybe to itself actually
-				*/
-				$ret .= $conv[$utf_char];
-				continue;
-			}
-
-			/**
-			* The char isn't mapped, but did we load its conversion table?
-			*
-			* The search indexer table is split into blocks. The block number of
-			* each char is equal to its codepoint right-shifted for 11 bits. It
-			* means that out of the 11, 16 or 21 meaningful bits of a 2-, 3- or
-			* 4- byte sequence we only keep the leftmost 0, 5 or 10 bits. Thus,
-			* all UTF chars encoded in 2 bytes are in the same first block.
-			*/
-			if (isset($utf_char[2]))
-			{
-				if (isset($utf_char[3]))
-				{
-					/**
-					* 1111 0nnn 10nn nnnn 10nx xxxx 10xx xxxx
-					* 0000 0111 0011 1111 0010 0000
-					*/
-					$idx = ((ord($utf_char[0]) & 0x07) << 7) | ((ord($utf_char[1]) & 0x3F) << 1) | ((ord($utf_char[2]) & 0x20) >> 5);
-				}
-				else
-				{
-					/**
-					* 1110 nnnn 10nx xxxx 10xx xxxx
-					* 0000 0111 0010 0000
-					*/
-					$idx = ((ord($utf_char[0]) & 0x07) << 1) | ((ord($utf_char[1]) & 0x20) >> 5);
-				}
-			}
-			else
-			{
-				/**
-				* 110x xxxx 10xx xxxx
-				* 0000 0000 0000 0000
-				*/
-				$idx = 0;
-			}
-
-			/**
-			* Check if the required conv table has been loaded already
-			*/
-			if (!isset($conv_loaded[$idx]))
-			{
-				$conv_loaded[$idx] = 1;
-				$file = PHPBB_ROOT_PATH . 'includes/utf/data/search_indexer_' . $idx . '.' . PHP_EXT;
-
-				if (file_exists($file))
-				{
-					$conv += include($file);
-				}
-			}
-
-			if (isset($conv[$utf_char]))
-			{
-				$ret .= $conv[$utf_char];
-			}
-			else
-			{
-				/**
-				* We add an entry to the conversion table so that we
-				* don't have to convert to codepoint and perform the checks
-				* that are above this block
-				*/
-				$conv[$utf_char] = ' ';
-				$ret .= ' ';
-			}
-		}
-		while (1);
-
-		return $ret;
-	}
-
-	/**
-	* Returns a list of options for the ACP to display
-	*/
-	public function acp()
-	{
-		/**
-		* if we need any options, copied from fulltext_native for now, will have to be adjusted or removed
-		*/
-
-		$tpl = '
-		<dl>
-			<dt><label for="fulltext_native_load_upd">' . phpbb::$db->lang['YES_SEARCH_UPDATE'] . ':</label><br /><span>' . phpbb::$db->lang['YES_SEARCH_UPDATE_EXPLAIN'] . '</span></dt>
-			<dd><label><input type="radio" id="fulltext_native_load_upd" name="config[fulltext_native_load_upd]" value="1"' . ((phpbb::$config['fulltext_native_load_upd']) ? ' checked="checked"' : '') . ' class="radio" /> ' . phpbb::$db->lang['YES'] . '</label><label><input type="radio" name="config[fulltext_native_load_upd]" value="0"' . ((!phpbb::$config['fulltext_native_load_upd']) ? ' checked="checked"' : '') . ' class="radio" /> ' . phpbb::$db->lang['NO'] . '</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="fulltext_native_min_chars">' . phpbb::$db->lang['MIN_SEARCH_CHARS'] . ':</label><br /><span>' . phpbb::$db->lang['MIN_SEARCH_CHARS_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_native_min_chars" type="text" size="3" maxlength="3" name="config[fulltext_native_min_chars]" value="' . (int) phpbb::$config['fulltext_native_min_chars'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="fulltext_native_max_chars">' . phpbb::$db->lang['MAX_SEARCH_CHARS'] . ':</label><br /><span>' . phpbb::$db->lang['MAX_SEARCH_CHARS_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_native_max_chars" type="text" size="3" maxlength="3" name="config[fulltext_native_max_chars]" value="' . (int) phpbb::$config['fulltext_native_max_chars'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="fulltext_native_common_thres">' . phpbb::$db->lang['COMMON_WORD_THRESHOLD'] . ':</label><br /><span>' . phpbb::$db->lang['COMMON_WORD_THRESHOLD_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_native_common_thres" type="text" size="3" maxlength="3" name="config[fulltext_native_common_thres]" value="' . (int) phpbb::$config['fulltext_native_common_thres'] . '" /> %</dd>
-		</dl>
-		';
-
-		// These are fields required in the config table
-		return array(
-			'tpl'		=> $tpl,
-			'config'	=> array('fulltext_native_load_upd' => 'bool', 'fulltext_native_min_chars' => 'integer:0:255', 'fulltext_native_max_chars' => 'integer:0:255', 'fulltext_native_common_thres' => 'double:0:100')
-		);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/search/search.php b/phpBB/includes/search/search.php
deleted file mode 100644
index 89d5935258..0000000000
--- a/phpBB/includes/search/search.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
-*
-* @package search
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* search_backend
-* optional base class for search plugins providing simple caching based on ACM
-* and functions to retrieve ignore_words and synonyms
-* @package search
-*/
-class search_backend
-{
-	const SEARCH_RESULT_NOT_IN_CACHE = 0;
-	const SEARCH_RESULT_IN_CACHE = 1;
-	const SEARCH_RESULT_INCOMPLETE = 2;
-
-	public $ignore_words = array();
-	public $match_synonym = array();
-	public $replace_synonym = array();
-
-	function __construct(&$error)
-	{
-		// This class cannot be used as a search plugin
-		$error = true;
-	}
-
-	/**
-	* Retrieves a language dependend list of words that should be ignored by the search
-	*/
-	public function get_ignore_words()
-	{
-		if (!sizeof($this->ignore_words))
-		{
-			$words = array();
-
-			if (file_exists(phpbb::$user->lang_path . phpbb::$user->lang_name . '/search_ignore_words.' . PHP_EXT))
-			{
-				// include the file containing ignore words
-				include(phpbb::$user->lang_path . phpbb::$user->lang_name . '/search_ignore_words.' . PHP_EXT);
-			}
-
-			$this->ignore_words = $words;
-			unset($words);
-		}
-	}
-
-	/**
-	* Stores a list of synonyms that should be replaced in $this->match_synonym and $this->replace_synonym and caches them
-	*/
-	public function get_synonyms()
-	{
-		if (!sizeof($this->match_synonym))
-		{
-			$synonyms = array();
-
-			if (file_exists(phpbb::$user->lang_path . phpbb::$user->lang_name . '/search_synonyms.' . PHP_EXT))
-			{
-				// include the file containing synonyms
-				include(phpbb::$user->lang_path . phpbb::$user->lang_name . '/search_synonyms.' . PHP_EXT);
-			}
-
-			$this->match_synonym = array_keys($synonyms);
-			$this->replace_synonym = array_values($synonyms);
-
-			unset($synonyms);
-		}
-	}
-
-	/**
-	* Retrieves cached search results
-	*
-	* @param int &$result_count will contain the number of all results for the search (not only for the current page)
-	* @param array &$id_ary is filled with the ids belonging to the requested page that are stored in the cache
-	*
-	* @return int SEARCH_RESULT_NOT_IN_CACHE or SEARCH_RESULT_IN_CACHE or SEARCH_RESULT_INCOMPLETE
-	*/
-	protected function obtain_ids($search_key, &$result_count, &$id_ary, $start, $per_page, $sort_dir)
-	{
-		if (!($stored_ids = phpbb::$acm->get('search_results_' . $search_key)))
-		{
-			// no search results cached for this search_key
-			return self::SEARCH_RESULT_NOT_IN_CACHE;
-		}
-		else
-		{
-			$result_count = $stored_ids[-1];
-			$reverse_ids = ($stored_ids[-2] != $sort_dir) ? true : false;
-			$complete = true;
-
-			// change the start to the actual end of the current request if the sort direction differs
-			// from the dirction in the cache and reverse the ids later
-			if ($reverse_ids)
-			{
-				$start = $result_count - $start - $per_page;
-
-				// the user requested a page past the last index
-				if ($start < 0)
-				{
-					return self::SEARCH_RESULT_NOT_IN_CACHE;
-				}
-			}
-
-			for ($i = $start, $n = $start + $per_page; ($i < $n) && ($i < $result_count); $i++)
-			{
-				if (!isset($stored_ids[$i]))
-				{
-					$complete = false;
-				}
-				else
-				{
-					$id_ary[] = $stored_ids[$i];
-				}
-			}
-			unset($stored_ids);
-
-			if ($reverse_ids)
-			{
-				$id_ary = array_reverse($id_ary);
-			}
-
-			if (!$complete)
-			{
-				return self::SEARCH_RESULT_INCOMPLETE;
-			}
-			return self::SEARCH_RESULT_IN_CACHE;
-		}
-	}
-
-	/**
-	* Caches post/topic ids
-	*
-	* @param array &$id_ary contains a list of post or topic ids that shall be cached, the first element
-	* 	must have the absolute index $start in the result set.
-	*/
-	protected function save_ids($search_key, $keywords, $author_ary, $result_count, &$id_ary, $start, $sort_dir)
-	{
-		$length = min(sizeof($id_ary), phpbb::$config['search_block_size']);
-
-		// nothing to cache so exit
-		if (!$length)
-		{
-			return;
-		}
-
-		$store_ids = array_slice($id_ary, 0, $length);
-
-		// create a new resultset if there is none for this search_key yet
-		// or add the ids to the existing resultset
-		if (!($store = phpbb::$acm->get('search_results_' . $search_key)))
-		{
-			// add the current keywords to the recent searches in the cache which are listed on the search page
-			if (!empty($keywords) || sizeof($author_ary))
-			{
-				$sql = 'SELECT search_time
-					FROM ' . SEARCH_RESULTS_TABLE . '
-					WHERE search_key = \'' . phpbb::$db->sql_escape($search_key) . '\'';
-				$result = phpbb::$db->sql_query($sql);
-
-				if (!phpbb::$db->sql_fetchrow($result))
-				{
-					$sql_ary = array(
-						'search_key'		=> $search_key,
-						'search_time'		=> time(),
-						'search_keywords'	=> $keywords,
-						'search_authors'	=> ' ' . implode(' ', $author_ary) . ' '
-					);
-
-					$sql = 'INSERT INTO ' . SEARCH_RESULTS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary);
-					phpbb::$db->sql_query($sql);
-				}
-				phpbb::$db->sql_freeresult($result);
-			}
-
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_last_search = ' . time() . '
-				WHERE user_id = ' . phpbb::$user->data['user_id'];
-			phpbb::$db->sql_query($sql);
-
-			$store = array(-1 => $result_count, -2 => $sort_dir);
-			$id_range = range($start, $start + $length - 1);
-		}
-		else
-		{
-			// we use one set of results for both sort directions so we have to calculate the indizes
-			// for the reversed array and we also have to reverse the ids themselves
-			if ($store[-2] != $sort_dir)
-			{
-				$store_ids = array_reverse($store_ids);
-				$id_range = range($store[-1] - $start - $length, $store[-1] - $start - 1);
-			}
-			else
-			{
-				$id_range = range($start, $start + $length - 1);
-			}
-		}
-
-		$store_ids = array_combine($id_range, $store_ids);
-
-		// append the ids
-		if (is_array($store_ids))
-		{
-			$store += $store_ids;
-
-			// if the cache is too big
-			if (sizeof($store) - 2 > 20 * phpbb::$config['search_block_size'])
-			{
-				// remove everything in front of two blocks in front of the current start index
-				for ($i = 0, $n = $id_range[0] - 2 * phpbb::$config['search_block_size']; $i < $n; $i++)
-				{
-					if (isset($store[$i]))
-					{
-						unset($store[$i]);
-					}
-				}
-
-				// remove everything after two blocks after the current stop index
-				end($id_range);
-				for ($i = $store[-1] - 1, $n = current($id_range) + 2 * phpbb::$config['search_block_size']; $i > $n; $i--)
-				{
-					if (isset($store[$i]))
-					{
-						unset($store[$i]);
-					}
-				}
-			}
-			phpbb::$acm->put('search_results_' . $search_key, $store, phpbb::$config['search_store_results']);
-
-			$sql = 'UPDATE ' . SEARCH_RESULTS_TABLE . '
-				SET search_time = ' . time() . '
-				WHERE search_key = \'' . phpbb::$db->sql_escape($search_key) . '\'';
-			phpbb::$db->sql_query($sql);
-		}
-
-		unset($store);
-		unset($store_ids);
-		unset($id_range);
-	}
-
-	/**
-	* Removes old entries from the search results table and removes searches with keywords that contain a word in $words.
-	*/
-	public function destroy_cache($words, $authors = false)
-	{
-		// clear all searches that searched for the specified words
-		if (sizeof($words))
-		{
-			$sql_where = '';
-			foreach ($words as $word)
-			{
-				$sql_where .= " OR search_keywords " . phpbb::$db->sql_like_expression(phpbb::$db->any_char . $word . phpbb::$db->any_char);
-			}
-
-			$sql = 'SELECT search_key
-				FROM ' . SEARCH_RESULTS_TABLE . "
-				WHERE search_keywords LIKE '%*%' $sql_where";
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				phpbb::$acm->destroy('search_results_' . $row['search_key']);
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		// clear all searches that searched for the specified authors
-		if (is_array($authors) && sizeof($authors))
-		{
-			$sql_where = '';
-			foreach ($authors as $author)
-			{
-				$sql_where .= (($sql_where) ? ' OR ' : '') . 'search_authors LIKE \'% ' . (int) $author . ' %\'';
-			}
-
-			$sql = 'SELECT search_key
-				FROM ' . SEARCH_RESULTS_TABLE . "
-				WHERE $sql_where";
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				phpbb::$acm->destroy('search_results_' . $row['search_key']);
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		$sql = 'DELETE
-			FROM ' . SEARCH_RESULTS_TABLE . '
-			WHERE search_time < ' . (time() - phpbb::$config['search_store_results']);
-		phpbb::$db->sql_query($sql);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/case_fold_c.php b/phpBB/includes/utf/data/case_fold_c.php
deleted file mode 100644
index 00de1ba349..0000000000
--- a/phpBB/includes/utf/data/case_fold_c.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('A'=>'a','B'=>'b','C'=>'c','D'=>'d','E'=>'e','F'=>'f','G'=>'g','H'=>'h','I'=>'i','J'=>'j','K'=>'k','L'=>'l','M'=>'m','N'=>'n','O'=>'o','P'=>'p','Q'=>'q','R'=>'r','S'=>'s','T'=>'t','U'=>'u','V'=>'v','W'=>'w','X'=>'x','Y'=>'y','Z'=>'z','µ'=>'μ','À'=>'à','Á'=>'á','Â'=>'â','Ã'=>'ã','Ä'=>'ä','Å'=>'å','Æ'=>'æ','Ç'=>'ç','È'=>'è','É'=>'é','Ê'=>'ê','Ë'=>'ë','Ì'=>'ì','Í'=>'í','Î'=>'î','Ï'=>'ï','Ð'=>'ð','Ñ'=>'ñ','Ò'=>'ò','Ó'=>'ó','Ô'=>'ô','Õ'=>'õ','Ö'=>'ö','Ø'=>'ø','Ù'=>'ù','Ú'=>'ú','Û'=>'û','Ü'=>'ü','Ý'=>'ý','Þ'=>'þ','Ā'=>'ā','Ă'=>'ă','Ą'=>'ą','Ć'=>'ć','Ĉ'=>'ĉ','Ċ'=>'ċ','Č'=>'č','Ď'=>'ď','Đ'=>'đ','Ē'=>'ē','Ĕ'=>'ĕ','Ė'=>'ė','Ę'=>'ę','Ě'=>'ě','Ĝ'=>'ĝ','Ğ'=>'ğ','Ġ'=>'ġ','Ģ'=>'ģ','Ĥ'=>'ĥ','Ħ'=>'ħ','Ĩ'=>'ĩ','Ī'=>'ī','Ĭ'=>'ĭ','Į'=>'į','Ĳ'=>'ĳ','Ĵ'=>'ĵ','Ķ'=>'ķ','Ĺ'=>'ĺ','Ļ'=>'ļ','Ľ'=>'ľ','Ŀ'=>'ŀ','Ł'=>'ł','Ń'=>'ń','Ņ'=>'ņ','Ň'=>'ň','Ŋ'=>'ŋ','Ō'=>'ō','Ŏ'=>'ŏ','Ő'=>'ő','Œ'=>'œ','Ŕ'=>'ŕ','Ŗ'=>'ŗ','Ř'=>'ř','Ś'=>'ś','Ŝ'=>'ŝ','Ş'=>'ş','Š'=>'š','Ţ'=>'ţ','Ť'=>'ť','Ŧ'=>'ŧ','Ũ'=>'ũ','Ū'=>'ū','Ŭ'=>'ŭ','Ů'=>'ů','Ű'=>'ű','Ų'=>'ų','Ŵ'=>'ŵ','Ŷ'=>'ŷ','Ÿ'=>'ÿ','Ź'=>'ź','Ż'=>'ż','Ž'=>'ž','ſ'=>'s','Ɓ'=>'ɓ','Ƃ'=>'ƃ','Ƅ'=>'ƅ','Ɔ'=>'ɔ','Ƈ'=>'ƈ','Ɖ'=>'ɖ','Ɗ'=>'ɗ','Ƌ'=>'ƌ','Ǝ'=>'ǝ','Ə'=>'ə','Ɛ'=>'ɛ','Ƒ'=>'ƒ','Ɠ'=>'ɠ','Ɣ'=>'ɣ','Ɩ'=>'ɩ','Ɨ'=>'ɨ','Ƙ'=>'ƙ','Ɯ'=>'ɯ','Ɲ'=>'ɲ','Ɵ'=>'ɵ','Ơ'=>'ơ','Ƣ'=>'ƣ','Ƥ'=>'ƥ','Ʀ'=>'ʀ','Ƨ'=>'ƨ','Ʃ'=>'ʃ','Ƭ'=>'ƭ','Ʈ'=>'ʈ','Ư'=>'ư','Ʊ'=>'ʊ','Ʋ'=>'ʋ','Ƴ'=>'ƴ','Ƶ'=>'ƶ','Ʒ'=>'ʒ','Ƹ'=>'ƹ','Ƽ'=>'ƽ','Ǆ'=>'ǆ','ǅ'=>'ǆ','Ǉ'=>'ǉ','ǈ'=>'ǉ','Ǌ'=>'ǌ','ǋ'=>'ǌ','Ǎ'=>'ǎ','Ǐ'=>'ǐ','Ǒ'=>'ǒ','Ǔ'=>'ǔ','Ǖ'=>'ǖ','Ǘ'=>'ǘ','Ǚ'=>'ǚ','Ǜ'=>'ǜ','Ǟ'=>'ǟ','Ǡ'=>'ǡ','Ǣ'=>'ǣ','Ǥ'=>'ǥ','Ǧ'=>'ǧ','Ǩ'=>'ǩ','Ǫ'=>'ǫ','Ǭ'=>'ǭ','Ǯ'=>'ǯ','Ǳ'=>'ǳ','ǲ'=>'ǳ','Ǵ'=>'ǵ','Ƕ'=>'ƕ','Ƿ'=>'ƿ','Ǹ'=>'ǹ','Ǻ'=>'ǻ','Ǽ'=>'ǽ','Ǿ'=>'ǿ','Ȁ'=>'ȁ','Ȃ'=>'ȃ','Ȅ'=>'ȅ','Ȇ'=>'ȇ','Ȉ'=>'ȉ','Ȋ'=>'ȋ','Ȍ'=>'ȍ','Ȏ'=>'ȏ','Ȑ'=>'ȑ','Ȓ'=>'ȓ','Ȕ'=>'ȕ','Ȗ'=>'ȗ','Ș'=>'ș','Ț'=>'ț','Ȝ'=>'ȝ','Ȟ'=>'ȟ','Ƞ'=>'ƞ','Ȣ'=>'ȣ','Ȥ'=>'ȥ','Ȧ'=>'ȧ','Ȩ'=>'ȩ','Ȫ'=>'ȫ','Ȭ'=>'ȭ','Ȯ'=>'ȯ','Ȱ'=>'ȱ','Ȳ'=>'ȳ','Ⱥ'=>'ⱥ','Ȼ'=>'ȼ','Ƚ'=>'ƚ','Ⱦ'=>'ⱦ','Ɂ'=>'ɂ','Ƀ'=>'ƀ','Ʉ'=>'ʉ','Ʌ'=>'ʌ','Ɇ'=>'ɇ','Ɉ'=>'ɉ','Ɋ'=>'ɋ','Ɍ'=>'ɍ','Ɏ'=>'ɏ','ͅ'=>'ι','Ά'=>'ά','Έ'=>'έ','Ή'=>'ή','Ί'=>'ί','Ό'=>'ό','Ύ'=>'ύ','Ώ'=>'ώ','Α'=>'α','Β'=>'β','Γ'=>'γ','Δ'=>'δ','Ε'=>'ε','Ζ'=>'ζ','Η'=>'η','Θ'=>'θ','Ι'=>'ι','Κ'=>'κ','Λ'=>'λ','Μ'=>'μ','Ν'=>'ν','Ξ'=>'ξ','Ο'=>'ο','Π'=>'π','Ρ'=>'ρ','Σ'=>'σ','Τ'=>'τ','Υ'=>'υ','Φ'=>'φ','Χ'=>'χ','Ψ'=>'ψ','Ω'=>'ω','Ϊ'=>'ϊ','Ϋ'=>'ϋ','ς'=>'σ','ϐ'=>'β','ϑ'=>'θ','ϕ'=>'φ','ϖ'=>'π','Ϙ'=>'ϙ','Ϛ'=>'ϛ','Ϝ'=>'ϝ','Ϟ'=>'ϟ','Ϡ'=>'ϡ','Ϣ'=>'ϣ','Ϥ'=>'ϥ','Ϧ'=>'ϧ','Ϩ'=>'ϩ','Ϫ'=>'ϫ','Ϭ'=>'ϭ','Ϯ'=>'ϯ','ϰ'=>'κ','ϱ'=>'ρ','ϴ'=>'θ','ϵ'=>'ε','Ϸ'=>'ϸ','Ϲ'=>'ϲ','Ϻ'=>'ϻ','Ͻ'=>'ͻ','Ͼ'=>'ͼ','Ͽ'=>'ͽ','Ѐ'=>'ѐ','Ё'=>'ё','Ђ'=>'ђ','Ѓ'=>'ѓ','Є'=>'є','Ѕ'=>'ѕ','І'=>'і','Ї'=>'ї','Ј'=>'ј','Љ'=>'љ','Њ'=>'њ','Ћ'=>'ћ','Ќ'=>'ќ','Ѝ'=>'ѝ','Ў'=>'ў','Џ'=>'џ','А'=>'а','Б'=>'б','В'=>'в','Г'=>'г','Д'=>'д','Е'=>'е','Ж'=>'ж','З'=>'з','И'=>'и','Й'=>'й','К'=>'к','Л'=>'л','М'=>'м','Н'=>'н','О'=>'о','П'=>'п','Р'=>'р','С'=>'с','Т'=>'т','У'=>'у','Ф'=>'ф','Х'=>'х','Ц'=>'ц','Ч'=>'ч','Ш'=>'ш','Щ'=>'щ','Ъ'=>'ъ','Ы'=>'ы','Ь'=>'ь','Э'=>'э','Ю'=>'ю','Я'=>'я','Ѡ'=>'ѡ','Ѣ'=>'ѣ','Ѥ'=>'ѥ','Ѧ'=>'ѧ','Ѩ'=>'ѩ','Ѫ'=>'ѫ','Ѭ'=>'ѭ','Ѯ'=>'ѯ','Ѱ'=>'ѱ','Ѳ'=>'ѳ','Ѵ'=>'ѵ','Ѷ'=>'ѷ','Ѹ'=>'ѹ','Ѻ'=>'ѻ','Ѽ'=>'ѽ','Ѿ'=>'ѿ','Ҁ'=>'ҁ','Ҋ'=>'ҋ','Ҍ'=>'ҍ','Ҏ'=>'ҏ','Ґ'=>'ґ','Ғ'=>'ғ','Ҕ'=>'ҕ','Җ'=>'җ','Ҙ'=>'ҙ','Қ'=>'қ','Ҝ'=>'ҝ','Ҟ'=>'ҟ','Ҡ'=>'ҡ','Ң'=>'ң','Ҥ'=>'ҥ','Ҧ'=>'ҧ','Ҩ'=>'ҩ','Ҫ'=>'ҫ','Ҭ'=>'ҭ','Ү'=>'ү','Ұ'=>'ұ','Ҳ'=>'ҳ','Ҵ'=>'ҵ','Ҷ'=>'ҷ','Ҹ'=>'ҹ','Һ'=>'һ','Ҽ'=>'ҽ','Ҿ'=>'ҿ','Ӏ'=>'ӏ','Ӂ'=>'ӂ','Ӄ'=>'ӄ','Ӆ'=>'ӆ','Ӈ'=>'ӈ','Ӊ'=>'ӊ','Ӌ'=>'ӌ','Ӎ'=>'ӎ','Ӑ'=>'ӑ','Ӓ'=>'ӓ','Ӕ'=>'ӕ','Ӗ'=>'ӗ','Ә'=>'ә','Ӛ'=>'ӛ','Ӝ'=>'ӝ','Ӟ'=>'ӟ','Ӡ'=>'ӡ','Ӣ'=>'ӣ','Ӥ'=>'ӥ','Ӧ'=>'ӧ','Ө'=>'ө','Ӫ'=>'ӫ','Ӭ'=>'ӭ','Ӯ'=>'ӯ','Ӱ'=>'ӱ','Ӳ'=>'ӳ','Ӵ'=>'ӵ','Ӷ'=>'ӷ','Ӹ'=>'ӹ','Ӻ'=>'ӻ','Ӽ'=>'ӽ','Ӿ'=>'ӿ','Ԁ'=>'ԁ','Ԃ'=>'ԃ','Ԅ'=>'ԅ','Ԇ'=>'ԇ','Ԉ'=>'ԉ','Ԋ'=>'ԋ','Ԍ'=>'ԍ','Ԏ'=>'ԏ','Ԑ'=>'ԑ','Ԓ'=>'ԓ','Ա'=>'ա','Բ'=>'բ','Գ'=>'գ','Դ'=>'դ','Ե'=>'ե','Զ'=>'զ','Է'=>'է','Ը'=>'ը','Թ'=>'թ','Ժ'=>'ժ','Ի'=>'ի','Լ'=>'լ','Խ'=>'խ','Ծ'=>'ծ','Կ'=>'կ','Հ'=>'հ','Ձ'=>'ձ','Ղ'=>'ղ','Ճ'=>'ճ','Մ'=>'մ','Յ'=>'յ','Ն'=>'ն','Շ'=>'շ','Ո'=>'ո','Չ'=>'չ','Պ'=>'պ','Ջ'=>'ջ','Ռ'=>'ռ','Ս'=>'ս','Վ'=>'վ','Տ'=>'տ','Ր'=>'ր','Ց'=>'ց','Ւ'=>'ւ','Փ'=>'փ','Ք'=>'ք','Օ'=>'օ','Ֆ'=>'ֆ','Ⴀ'=>'ⴀ','Ⴁ'=>'ⴁ','Ⴂ'=>'ⴂ','Ⴃ'=>'ⴃ','Ⴄ'=>'ⴄ','Ⴅ'=>'ⴅ','Ⴆ'=>'ⴆ','Ⴇ'=>'ⴇ','Ⴈ'=>'ⴈ','Ⴉ'=>'ⴉ','Ⴊ'=>'ⴊ','Ⴋ'=>'ⴋ','Ⴌ'=>'ⴌ','Ⴍ'=>'ⴍ','Ⴎ'=>'ⴎ','Ⴏ'=>'ⴏ','Ⴐ'=>'ⴐ','Ⴑ'=>'ⴑ','Ⴒ'=>'ⴒ','Ⴓ'=>'ⴓ','Ⴔ'=>'ⴔ','Ⴕ'=>'ⴕ','Ⴖ'=>'ⴖ','Ⴗ'=>'ⴗ','Ⴘ'=>'ⴘ','Ⴙ'=>'ⴙ','Ⴚ'=>'ⴚ','Ⴛ'=>'ⴛ','Ⴜ'=>'ⴜ','Ⴝ'=>'ⴝ','Ⴞ'=>'ⴞ','Ⴟ'=>'ⴟ','Ⴠ'=>'ⴠ','Ⴡ'=>'ⴡ','Ⴢ'=>'ⴢ','Ⴣ'=>'ⴣ','Ⴤ'=>'ⴤ','Ⴥ'=>'ⴥ','Ḁ'=>'ḁ','Ḃ'=>'ḃ','Ḅ'=>'ḅ','Ḇ'=>'ḇ','Ḉ'=>'ḉ','Ḋ'=>'ḋ','Ḍ'=>'ḍ','Ḏ'=>'ḏ','Ḑ'=>'ḑ','Ḓ'=>'ḓ','Ḕ'=>'ḕ','Ḗ'=>'ḗ','Ḙ'=>'ḙ','Ḛ'=>'ḛ','Ḝ'=>'ḝ','Ḟ'=>'ḟ','Ḡ'=>'ḡ','Ḣ'=>'ḣ','Ḥ'=>'ḥ','Ḧ'=>'ḧ','Ḩ'=>'ḩ','Ḫ'=>'ḫ','Ḭ'=>'ḭ','Ḯ'=>'ḯ','Ḱ'=>'ḱ','Ḳ'=>'ḳ','Ḵ'=>'ḵ','Ḷ'=>'ḷ','Ḹ'=>'ḹ','Ḻ'=>'ḻ','Ḽ'=>'ḽ','Ḿ'=>'ḿ','Ṁ'=>'ṁ','Ṃ'=>'ṃ','Ṅ'=>'ṅ','Ṇ'=>'ṇ','Ṉ'=>'ṉ','Ṋ'=>'ṋ','Ṍ'=>'ṍ','Ṏ'=>'ṏ','Ṑ'=>'ṑ','Ṓ'=>'ṓ','Ṕ'=>'ṕ','Ṗ'=>'ṗ','Ṙ'=>'ṙ','Ṛ'=>'ṛ','Ṝ'=>'ṝ','Ṟ'=>'ṟ','Ṡ'=>'ṡ','Ṣ'=>'ṣ','Ṥ'=>'ṥ','Ṧ'=>'ṧ','Ṩ'=>'ṩ','Ṫ'=>'ṫ','Ṭ'=>'ṭ','Ṯ'=>'ṯ','Ṱ'=>'ṱ','Ṳ'=>'ṳ','Ṵ'=>'ṵ','Ṷ'=>'ṷ','Ṹ'=>'ṹ','Ṻ'=>'ṻ','Ṽ'=>'ṽ','Ṿ'=>'ṿ','Ẁ'=>'ẁ','Ẃ'=>'ẃ','Ẅ'=>'ẅ','Ẇ'=>'ẇ','Ẉ'=>'ẉ','Ẋ'=>'ẋ','Ẍ'=>'ẍ','Ẏ'=>'ẏ','Ẑ'=>'ẑ','Ẓ'=>'ẓ','Ẕ'=>'ẕ','ẛ'=>'ṡ','Ạ'=>'ạ','Ả'=>'ả','Ấ'=>'ấ','Ầ'=>'ầ','Ẩ'=>'ẩ','Ẫ'=>'ẫ','Ậ'=>'ậ','Ắ'=>'ắ','Ằ'=>'ằ','Ẳ'=>'ẳ','Ẵ'=>'ẵ','Ặ'=>'ặ','Ẹ'=>'ẹ','Ẻ'=>'ẻ','Ẽ'=>'ẽ','Ế'=>'ế','Ề'=>'ề','Ể'=>'ể','Ễ'=>'ễ','Ệ'=>'ệ','Ỉ'=>'ỉ','Ị'=>'ị','Ọ'=>'ọ','Ỏ'=>'ỏ','Ố'=>'ố','Ồ'=>'ồ','Ổ'=>'ổ','Ỗ'=>'ỗ','Ộ'=>'ộ','Ớ'=>'ớ','Ờ'=>'ờ','Ở'=>'ở','Ỡ'=>'ỡ','Ợ'=>'ợ','Ụ'=>'ụ','Ủ'=>'ủ','Ứ'=>'ứ','Ừ'=>'ừ','Ử'=>'ử','Ữ'=>'ữ','Ự'=>'ự','Ỳ'=>'ỳ','Ỵ'=>'ỵ','Ỷ'=>'ỷ','Ỹ'=>'ỹ','Ἀ'=>'ἀ','Ἁ'=>'ἁ','Ἂ'=>'ἂ','Ἃ'=>'ἃ','Ἄ'=>'ἄ','Ἅ'=>'ἅ','Ἆ'=>'ἆ','Ἇ'=>'ἇ','Ἐ'=>'ἐ','Ἑ'=>'ἑ','Ἒ'=>'ἒ','Ἓ'=>'ἓ','Ἔ'=>'ἔ','Ἕ'=>'ἕ','Ἠ'=>'ἠ','Ἡ'=>'ἡ','Ἢ'=>'ἢ','Ἣ'=>'ἣ','Ἤ'=>'ἤ','Ἥ'=>'ἥ','Ἦ'=>'ἦ','Ἧ'=>'ἧ','Ἰ'=>'ἰ','Ἱ'=>'ἱ','Ἲ'=>'ἲ','Ἳ'=>'ἳ','Ἴ'=>'ἴ','Ἵ'=>'ἵ','Ἶ'=>'ἶ','Ἷ'=>'ἷ','Ὀ'=>'ὀ','Ὁ'=>'ὁ','Ὂ'=>'ὂ','Ὃ'=>'ὃ','Ὄ'=>'ὄ','Ὅ'=>'ὅ','Ὑ'=>'ὑ','Ὓ'=>'ὓ','Ὕ'=>'ὕ','Ὗ'=>'ὗ','Ὠ'=>'ὠ','Ὡ'=>'ὡ','Ὢ'=>'ὢ','Ὣ'=>'ὣ','Ὤ'=>'ὤ','Ὥ'=>'ὥ','Ὦ'=>'ὦ','Ὧ'=>'ὧ','Ᾰ'=>'ᾰ','Ᾱ'=>'ᾱ','Ὰ'=>'ὰ','Ά'=>'ά','ι'=>'ι','Ὲ'=>'ὲ','Έ'=>'έ','Ὴ'=>'ὴ','Ή'=>'ή','Ῐ'=>'ῐ','Ῑ'=>'ῑ','Ὶ'=>'ὶ','Ί'=>'ί','Ῠ'=>'ῠ','Ῡ'=>'ῡ','Ὺ'=>'ὺ','Ύ'=>'ύ','Ῥ'=>'ῥ','Ὸ'=>'ὸ','Ό'=>'ό','Ὼ'=>'ὼ','Ώ'=>'ώ','Ω'=>'ω','K'=>'k','Å'=>'å','Ⅎ'=>'ⅎ','Ⅰ'=>'ⅰ','Ⅱ'=>'ⅱ','Ⅲ'=>'ⅲ','Ⅳ'=>'ⅳ','Ⅴ'=>'ⅴ','Ⅵ'=>'ⅵ','Ⅶ'=>'ⅶ','Ⅷ'=>'ⅷ','Ⅸ'=>'ⅸ','Ⅹ'=>'ⅹ','Ⅺ'=>'ⅺ','Ⅻ'=>'ⅻ','Ⅼ'=>'ⅼ','Ⅽ'=>'ⅽ','Ⅾ'=>'ⅾ','Ⅿ'=>'ⅿ','Ↄ'=>'ↄ','Ⓐ'=>'ⓐ','Ⓑ'=>'ⓑ','Ⓒ'=>'ⓒ','Ⓓ'=>'ⓓ','Ⓔ'=>'ⓔ','Ⓕ'=>'ⓕ','Ⓖ'=>'ⓖ','Ⓗ'=>'ⓗ','Ⓘ'=>'ⓘ','Ⓙ'=>'ⓙ','Ⓚ'=>'ⓚ','Ⓛ'=>'ⓛ','Ⓜ'=>'ⓜ','Ⓝ'=>'ⓝ','Ⓞ'=>'ⓞ','Ⓟ'=>'ⓟ','Ⓠ'=>'ⓠ','Ⓡ'=>'ⓡ','Ⓢ'=>'ⓢ','Ⓣ'=>'ⓣ','Ⓤ'=>'ⓤ','Ⓥ'=>'ⓥ','Ⓦ'=>'ⓦ','Ⓧ'=>'ⓧ','Ⓨ'=>'ⓨ','Ⓩ'=>'ⓩ','Ⰰ'=>'ⰰ','Ⰱ'=>'ⰱ','Ⰲ'=>'ⰲ','Ⰳ'=>'ⰳ','Ⰴ'=>'ⰴ','Ⰵ'=>'ⰵ','Ⰶ'=>'ⰶ','Ⰷ'=>'ⰷ','Ⰸ'=>'ⰸ','Ⰹ'=>'ⰹ','Ⰺ'=>'ⰺ','Ⰻ'=>'ⰻ','Ⰼ'=>'ⰼ','Ⰽ'=>'ⰽ','Ⰾ'=>'ⰾ','Ⰿ'=>'ⰿ','Ⱀ'=>'ⱀ','Ⱁ'=>'ⱁ','Ⱂ'=>'ⱂ','Ⱃ'=>'ⱃ','Ⱄ'=>'ⱄ','Ⱅ'=>'ⱅ','Ⱆ'=>'ⱆ','Ⱇ'=>'ⱇ','Ⱈ'=>'ⱈ','Ⱉ'=>'ⱉ','Ⱊ'=>'ⱊ','Ⱋ'=>'ⱋ','Ⱌ'=>'ⱌ','Ⱍ'=>'ⱍ','Ⱎ'=>'ⱎ','Ⱏ'=>'ⱏ','Ⱐ'=>'ⱐ','Ⱑ'=>'ⱑ','Ⱒ'=>'ⱒ','Ⱓ'=>'ⱓ','Ⱔ'=>'ⱔ','Ⱕ'=>'ⱕ','Ⱖ'=>'ⱖ','Ⱗ'=>'ⱗ','Ⱘ'=>'ⱘ','Ⱙ'=>'ⱙ','Ⱚ'=>'ⱚ','Ⱛ'=>'ⱛ','Ⱜ'=>'ⱜ','Ⱝ'=>'ⱝ','Ⱞ'=>'ⱞ','Ⱡ'=>'ⱡ','Ɫ'=>'ɫ','Ᵽ'=>'ᵽ','Ɽ'=>'ɽ','Ⱨ'=>'ⱨ','Ⱪ'=>'ⱪ','Ⱬ'=>'ⱬ','Ⱶ'=>'ⱶ','Ⲁ'=>'ⲁ','Ⲃ'=>'ⲃ','Ⲅ'=>'ⲅ','Ⲇ'=>'ⲇ','Ⲉ'=>'ⲉ','Ⲋ'=>'ⲋ','Ⲍ'=>'ⲍ','Ⲏ'=>'ⲏ','Ⲑ'=>'ⲑ','Ⲓ'=>'ⲓ','Ⲕ'=>'ⲕ','Ⲗ'=>'ⲗ','Ⲙ'=>'ⲙ','Ⲛ'=>'ⲛ','Ⲝ'=>'ⲝ','Ⲟ'=>'ⲟ','Ⲡ'=>'ⲡ','Ⲣ'=>'ⲣ','Ⲥ'=>'ⲥ','Ⲧ'=>'ⲧ','Ⲩ'=>'ⲩ','Ⲫ'=>'ⲫ','Ⲭ'=>'ⲭ','Ⲯ'=>'ⲯ','Ⲱ'=>'ⲱ','Ⲳ'=>'ⲳ','Ⲵ'=>'ⲵ','Ⲷ'=>'ⲷ','Ⲹ'=>'ⲹ','Ⲻ'=>'ⲻ','Ⲽ'=>'ⲽ','Ⲿ'=>'ⲿ','Ⳁ'=>'ⳁ','Ⳃ'=>'ⳃ','Ⳅ'=>'ⳅ','Ⳇ'=>'ⳇ','Ⳉ'=>'ⳉ','Ⳋ'=>'ⳋ','Ⳍ'=>'ⳍ','Ⳏ'=>'ⳏ','Ⳑ'=>'ⳑ','Ⳓ'=>'ⳓ','Ⳕ'=>'ⳕ','Ⳗ'=>'ⳗ','Ⳙ'=>'ⳙ','Ⳛ'=>'ⳛ','Ⳝ'=>'ⳝ','Ⳟ'=>'ⳟ','Ⳡ'=>'ⳡ','Ⳣ'=>'ⳣ','Ａ'=>'ａ','Ｂ'=>'ｂ','Ｃ'=>'ｃ','Ｄ'=>'ｄ','Ｅ'=>'ｅ','Ｆ'=>'ｆ','Ｇ'=>'ｇ','Ｈ'=>'ｈ','Ｉ'=>'ｉ','Ｊ'=>'ｊ','Ｋ'=>'ｋ','Ｌ'=>'ｌ','Ｍ'=>'ｍ','Ｎ'=>'ｎ','Ｏ'=>'ｏ','Ｐ'=>'ｐ','Ｑ'=>'ｑ','Ｒ'=>'ｒ','Ｓ'=>'ｓ','Ｔ'=>'ｔ','Ｕ'=>'ｕ','Ｖ'=>'ｖ','Ｗ'=>'ｗ','Ｘ'=>'ｘ','Ｙ'=>'ｙ','Ｚ'=>'ｚ','𐐀'=>'𐐨','𐐁'=>'𐐩','𐐂'=>'𐐪','𐐃'=>'𐐫','𐐄'=>'𐐬','𐐅'=>'𐐭','𐐆'=>'𐐮','𐐇'=>'𐐯','𐐈'=>'𐐰','𐐉'=>'𐐱','𐐊'=>'𐐲','𐐋'=>'𐐳','𐐌'=>'𐐴','𐐍'=>'𐐵','𐐎'=>'𐐶','𐐏'=>'𐐷','𐐐'=>'𐐸','𐐑'=>'𐐹','𐐒'=>'𐐺','𐐓'=>'𐐻','𐐔'=>'𐐼','𐐕'=>'𐐽','𐐖'=>'𐐾','𐐗'=>'𐐿','𐐘'=>'𐑀','𐐙'=>'𐑁','𐐚'=>'𐑂','𐐛'=>'𐑃','𐐜'=>'𐑄','𐐝'=>'𐑅','𐐞'=>'𐑆','𐐟'=>'𐑇','𐐠'=>'𐑈','𐐡'=>'𐑉','𐐢'=>'𐑊','𐐣'=>'𐑋','𐐤'=>'𐑌','𐐥'=>'𐑍','𐐦'=>'𐑎','𐐧'=>'𐑏');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/case_fold_f.php b/phpBB/includes/utf/data/case_fold_f.php
deleted file mode 100644
index 7e2ffb25ec..0000000000
--- a/phpBB/includes/utf/data/case_fold_f.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('ß'=>'ss','İ'=>'i̇','ŉ'=>'ʼn','ǰ'=>'ǰ','ΐ'=>'ΐ','ΰ'=>'ΰ','և'=>'եւ','ẖ'=>'ẖ','ẗ'=>'ẗ','ẘ'=>'ẘ','ẙ'=>'ẙ','ẚ'=>'aʾ','ὐ'=>'ὐ','ὒ'=>'ὒ','ὔ'=>'ὔ','ὖ'=>'ὖ','ᾀ'=>'ἀι','ᾁ'=>'ἁι','ᾂ'=>'ἂι','ᾃ'=>'ἃι','ᾄ'=>'ἄι','ᾅ'=>'ἅι','ᾆ'=>'ἆι','ᾇ'=>'ἇι','ᾈ'=>'ἀι','ᾉ'=>'ἁι','ᾊ'=>'ἂι','ᾋ'=>'ἃι','ᾌ'=>'ἄι','ᾍ'=>'ἅι','ᾎ'=>'ἆι','ᾏ'=>'ἇι','ᾐ'=>'ἠι','ᾑ'=>'ἡι','ᾒ'=>'ἢι','ᾓ'=>'ἣι','ᾔ'=>'ἤι','ᾕ'=>'ἥι','ᾖ'=>'ἦι','ᾗ'=>'ἧι','ᾘ'=>'ἠι','ᾙ'=>'ἡι','ᾚ'=>'ἢι','ᾛ'=>'ἣι','ᾜ'=>'ἤι','ᾝ'=>'ἥι','ᾞ'=>'ἦι','ᾟ'=>'ἧι','ᾠ'=>'ὠι','ᾡ'=>'ὡι','ᾢ'=>'ὢι','ᾣ'=>'ὣι','ᾤ'=>'ὤι','ᾥ'=>'ὥι','ᾦ'=>'ὦι','ᾧ'=>'ὧι','ᾨ'=>'ὠι','ᾩ'=>'ὡι','ᾪ'=>'ὢι','ᾫ'=>'ὣι','ᾬ'=>'ὤι','ᾭ'=>'ὥι','ᾮ'=>'ὦι','ᾯ'=>'ὧι','ᾲ'=>'ὰι','ᾳ'=>'αι','ᾴ'=>'άι','ᾶ'=>'ᾶ','ᾷ'=>'ᾶι','ᾼ'=>'αι','ῂ'=>'ὴι','ῃ'=>'ηι','ῄ'=>'ήι','ῆ'=>'ῆ','ῇ'=>'ῆι','ῌ'=>'ηι','ῒ'=>'ῒ','ΐ'=>'ΐ','ῖ'=>'ῖ','ῗ'=>'ῗ','ῢ'=>'ῢ','ΰ'=>'ΰ','ῤ'=>'ῤ','ῦ'=>'ῦ','ῧ'=>'ῧ','ῲ'=>'ὼι','ῳ'=>'ωι','ῴ'=>'ώι','ῶ'=>'ῶ','ῷ'=>'ῶι','ῼ'=>'ωι','ﬀ'=>'ff','ﬁ'=>'fi','ﬂ'=>'fl','ﬃ'=>'ffi','ﬄ'=>'ffl','ﬅ'=>'st','ﬆ'=>'st','ﬓ'=>'մն','ﬔ'=>'մե','ﬕ'=>'մի','ﬖ'=>'վն','ﬗ'=>'մխ');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/case_fold_s.php b/phpBB/includes/utf/data/case_fold_s.php
deleted file mode 100644
index 5f09ffa1dd..0000000000
--- a/phpBB/includes/utf/data/case_fold_s.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('ᾈ'=>'ᾀ','ᾉ'=>'ᾁ','ᾊ'=>'ᾂ','ᾋ'=>'ᾃ','ᾌ'=>'ᾄ','ᾍ'=>'ᾅ','ᾎ'=>'ᾆ','ᾏ'=>'ᾇ','ᾘ'=>'ᾐ','ᾙ'=>'ᾑ','ᾚ'=>'ᾒ','ᾛ'=>'ᾓ','ᾜ'=>'ᾔ','ᾝ'=>'ᾕ','ᾞ'=>'ᾖ','ᾟ'=>'ᾗ','ᾨ'=>'ᾠ','ᾩ'=>'ᾡ','ᾪ'=>'ᾢ','ᾫ'=>'ᾣ','ᾬ'=>'ᾤ','ᾭ'=>'ᾥ','ᾮ'=>'ᾦ','ᾯ'=>'ᾧ','ᾼ'=>'ᾳ','ῌ'=>'ῃ','ῼ'=>'ῳ');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/confusables.php b/phpBB/includes/utf/data/confusables.php
deleted file mode 100644
index 7564978a26..0000000000
--- a/phpBB/includes/utf/data/confusables.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('¡'=>'i','ǃ'=>'!','α'=>'a',' '=>' ',''=>'','۝'=>'','܏'=>'','᠆'=>'','᠎'=>'',''=>'','‌'=>'','‍'=>'',' '=>'',' '=>'','⁠'=>'','⁡'=>'','⁢'=>'','⁣'=>'','⁪'=>'','⁫'=>'','⁬'=>'','⁭'=>'','⁮'=>'','⁯'=>'',''=>'','￹'=>'','￺'=>'','￻'=>'',''=>'','𝅳'=>'','𝅴'=>'','𝅵'=>'','𝅶'=>'','𝅷'=>'','𝅸'=>'','𝅹'=>'','𝅺'=>'','۬'=>'۟','̓'=>'̓','ُ'=>'̓','֜'=>'́','́'=>'́','݇'=>'́','॔'=>'́','̀'=>'̀','॓'=>'̀','̌'=>'̆','̑'=>'̂','֯'=>'̊','ஂ'=>'̊','ํ'=>'̊','ໍ'=>'̊','ံ'=>'̊','ំ'=>'̊','៓'=>'̊','゚'=>'̊','ﾟ'=>'̊','ͦ'=>'̊','͂'=>'̃','ׄ'=>'̇','ֹ'=>'̇','ׂ'=>'̇','ׁ'=>'̇','݁'=>'̇','ं'=>'̇','ਂ'=>'̇','ં'=>'̇','்'=>'̇','̅'=>'̄','〬'=>'̉','̱'=>'̠','॒'=>'̠','̧'=>'̡','̦'=>'̡','̨'=>'̢','़'=>'̣','়'=>'̣','਼'=>'̣','઼'=>'̣','଼'=>'̣','͇'=>'̳','̶'=>'̵','ﱞ'=>'ﹲّ','ﱟ'=>'ﹴّ','ﳲ'=>'ﹷّ','ﱠ'=>'ﹶّ','ﳳ'=>'ﹹّ','ﱡ'=>'ﹸّ','ﳴ'=>'ﹻّ','ﱢ'=>'ﹺّ','ﱣ'=>'ﹼٰ','ٴ'=>'ٔ','݂'=>'ܼ','౦'=>'o','೦'=>'o','ﾞ'=>'゙','　'=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ','`'=>'`','｀'=>'`','῀'=>'˜','＾'=>'^','︿'=>'^','＿'=>'_','﹍'=>'_','﹎'=>'_','﹏'=>'_','⌇'=>'︴','－'=>'-','‐'=>'-','‑'=>'-','‒'=>'-','–'=>'-','﹘'=>'-','∼'=>'⁓','･'=>'・','•'=>'・','，'=>',','‚'=>',','٬'=>'،','､'=>'、',';'=>';','；'=>';','：'=>':','։'=>':','︰'=>':','׃'=>':','⩴'=>'::=','．'=>'.','․'=>'.','܂'=>'.','‥'=>'..','…'=>'...','｡'=>'。','·'=>'·','‧'=>'·','∙'=>'·','⋅'=>'·','ᐧ'=>'·','ᔯ'=>'·4','ᐌ'=>'·ᐁ','ᐎ'=>'·ᐃ','ᐐ'=>'·ᐄ','ᐒ'=>'·ᐅ','ᐔ'=>'·ᐆ','ᐗ'=>'·ᐊ','ᐙ'=>'·ᐋ','ᐷ'=>'·ᐳ','ᑀ'=>'·ᐳ','ᑂ'=>'·ᐴ','ᑄ'=>'·ᐸ','ᑆ'=>'·ᐹ','ᑗ'=>'·ᑌ','ᑙ'=>'·ᑎ','ᑛ'=>'·ᑏ','ᑔ'=>'·ᑐ','ᑝ'=>'·ᑐ','ᑟ'=>'·ᑑ','ᑡ'=>'·ᑕ','ᑣ'=>'·ᑖ','ᑴ'=>'·ᑫ','ᑸ'=>'·ᑮ','ᑼ'=>'·ᑰ','ᑾ'=>'·ᑲ','ᒀ'=>'·ᑳ','ᒒ'=>'·ᒉ','ᒔ'=>'·ᒋ','ᒖ'=>'·ᒌ','ᒚ'=>'·ᒎ','ᒜ'=>'·ᒐ','ᒞ'=>'·ᒑ','ᒬ'=>'·ᒣ','ᒮ'=>'·ᒥ','ᒰ'=>'·ᒦ','ᒲ'=>'·ᒧ','ᒴ'=>'·ᒨ','ᒶ'=>'·L','ᒸ'=>'·ᒫ','ᓉ'=>'·ᓀ','ᓋ'=>'·ᓇ','ᓍ'=>'·ᓈ','ᓜ'=>'·ᓓ','ᓞ'=>'·ᓕ','ᓠ'=>'·ᓖ','ᓢ'=>'·ᓗ','ᓤ'=>'·ᓘ','ᓦ'=>'·ᓚ','ᓨ'=>'·ᓛ','ᓶ'=>'·ᓭ','ᓸ'=>'·ᓯ','ᓺ'=>'·ᓰ','ᓼ'=>'·ᓱ','ᓾ'=>'·ᓲ','ᔀ'=>'·ᓴ','ᔂ'=>'·ᓵ','ᔗ'=>'·ᔐ','ᔙ'=>'·ᔑ','ᔛ'=>'·ᔒ','ᔝ'=>'·ᔓ','ᔟ'=>'·ᔔ','ᔡ'=>'·ᔕ','ᔣ'=>'·ᔖ','ᔱ'=>'·ᔨ','ᔳ'=>'·ᔩ','ᔵ'=>'·ᔪ','ᔷ'=>'·ᔫ','ᔹ'=>'·ᔭ','ᔻ'=>'·ᔮ','ᕎ'=>'·ᕌ','ᕛ'=>'·ᕚ','ᕨ'=>'·ᕧ','（'=>'(','⑴'=>'(1)','⒧'=>'(l)','⑽'=>'(10)','⑾'=>'(11)','⑿'=>'(12)','⒀'=>'(13)','⒁'=>'(14)','⒂'=>'(15)','⒃'=>'(16)','⒄'=>'(17)','⒅'=>'(18)','⒆'=>'(19)','⑵'=>'(2)','⒇'=>'(20)','⑶'=>'(3)','⑷'=>'(4)','⑸'=>'(5)','⑹'=>'(6)','⑺'=>'(7)','⑻'=>'(8)','⑼'=>'(9)','⒜'=>'(a)','⒝'=>'(b)','⒞'=>'(c)','⒟'=>'(d)','⒠'=>'(e)','⒡'=>'(f)','⒢'=>'(g)','⒣'=>'(h)','⒤'=>'(i)','⒥'=>'(j)','⒦'=>'(k)','⒨'=>'(m)','⒩'=>'(n)','⒪'=>'(o)','⒫'=>'(p)','⒬'=>'(q)','⒭'=>'(r)','⒮'=>'(s)','⒯'=>'(t)','⒰'=>'(u)','⒱'=>'(v)','⒲'=>'(w)','⒳'=>'(x)','⒴'=>'(y)','⒵'=>'(z)','㈀'=>'(ᄀ)','㈎'=>'(가)','㈁'=>'(ᄂ)','㈏'=>'(나)','㈂'=>'(ᄃ)','㈐'=>'(다)','㈃'=>'(ᄅ)','㈑'=>'(라)','㈄'=>'(ᄆ)','㈒'=>'(마)','㈅'=>'(ᄇ)','㈓'=>'(바)','㈆'=>'(ᄉ)','㈔'=>'(사)','㈇'=>'(ᄋ)','㈕'=>'(아)','㈝'=>'(오전)','㈞'=>'(오후)','㈈'=>'(ᄌ)','㈖'=>'(자)','㈜'=>'(주)','㈉'=>'(ᄎ)','㈗'=>'(차)','㈊'=>'(ᄏ)','㈘'=>'(카)','㈋'=>'(ᄐ)','㈙'=>'(타)','㈌'=>'(ᄑ)','㈚'=>'(파)','㈍'=>'(ᄒ)','㈛'=>'(하)','㈠'=>'(一)','㈦'=>'(七)','㈢'=>'(三)','㈨'=>'(九)','㈡'=>'(二)','㈤'=>'(五)','㈹'=>'(代)','㈽'=>'(企)','㉁'=>'(休)','㈧'=>'(八)','㈥'=>'(六)','㈸'=>'(労)','㈩'=>'(十)','㈿'=>'(協)','㈴'=>'(名)','㈺'=>'(呼)','㈣'=>'(四)','㈯'=>'(土)','㈻'=>'(学)','㈰'=>'(日)','㈪'=>'(月)','㈲'=>'(有)','㈭'=>'(木)','㈱'=>'(株)','㈬'=>'(水)','㈫'=>'(火)','㈵'=>'(特)','㈼'=>'(監)','㈳'=>'(社)','㈷'=>'(祝)','㉀'=>'(祭)','㉂'=>'(自)','㉃'=>'(至)','㈶'=>'(財)','㈾'=>'(資)','㈮'=>'(金)','）'=>')','［'=>'[','〔'=>'[','］'=>']','〕'=>']','｛'=>'{','｝'=>'}','｟'=>'⦅','｠'=>'⦆','｢'=>'「','｣'=>'」','＠'=>'@','＊'=>'*','／'=>'/','⁄'=>'/','∕'=>'/','＼'=>'\\','＆'=>'&','＃'=>'#','％'=>'%','‶'=>'‵‵','‷'=>'‵‵‵','༌'=>'་','´'=>'ʹ','΄'=>'ʹ','´'=>'ʹ','\''=>'ʹ','＇'=>'ʹ','′'=>'ʹ','׳'=>'ʹ','ʹ'=>'ʹ','ˊ'=>'ʹ','"'=>'ʹʹ','＂'=>'ʹʹ','″'=>'ʹʹ','〃'=>'ʹʹ','״'=>'ʹʹ','ʺ'=>'ʹʹ','‴'=>'ʹʹʹ','⁗'=>'ʹʹʹʹ','¯'=>'ˉ','￣'=>'ˉ','‾'=>'ˉ','﹉'=>'ˉ','﹊'=>'ˉ','﹋'=>'ˉ','﹌'=>'ˉ','˚'=>'°','௵'=>'௳','￩'=>'←','￫'=>'→','￪'=>'↑','￬'=>'↓','↵'=>'↲','⨡'=>'↾','𝛛'=>'∂','𝜕'=>'∂','𝝏'=>'∂','𝞉'=>'∂','𝟃'=>'∂','𝛁'=>'∇','𝛻'=>'∇','𝜵'=>'∇','𝝯'=>'∇','𝞩'=>'∇','＋'=>'+','﬩'=>'+','‹'=>'<','＜'=>'<','＝'=>'=','⩵'=>'==','⩶'=>'===','›'=>'>','＞'=>'>','￢'=>'¬','￤'=>'¦','〜'=>'~','～'=>'~','﹨'=>'∖','⋀'=>'∧','⋁'=>'∨','⋂'=>'∩','⋃'=>'∪','∯'=>'∮∮','∰'=>'∮∮∮','≣'=>'≡','♁'=>'⊕','☉'=>'⊙','⟂'=>'⊥','▷'=>'⊲','⨝'=>'⋈','⨽'=>'⌙','☸'=>'⎈','⎮'=>'⎥','￨'=>'│','▐'=>'▌','￭'=>'■','☐'=>'□','￮'=>'○','⦾'=>'◎','〛'=>'⟧','〈'=>'⟨','〈'=>'⟨','〉'=>'⟩','〉'=>'⟩','⧙'=>'⦚','〶'=>'〒','ｰ'=>'ー','￠'=>'¢','＄'=>'$','￡'=>'£','￥'=>'Y̵','￦'=>'W̵','０'=>'0','𝟎'=>'0','𝟘'=>'0','𝟢'=>'0','𝟬'=>'0','𝟶'=>'0','০'=>'0','୦'=>'0','௦'=>'0','᠐'=>'0','〇'=>'0','𝐎'=>'0','𝑂'=>'0','𝑶'=>'0','𝒪'=>'0','𝓞'=>'0','𝔒'=>'0','𝕆'=>'0','𝕺'=>'0','𝖮'=>'0','𝗢'=>'0','𝘖'=>'0','𝙊'=>'0','𝙾'=>'0','𝚶'=>'0','𝛰'=>'0','𝜪'=>'0','𝝤'=>'0','𝞞'=>'0','ⵔ'=>'0','ഠ'=>'0','⊖'=>'0̵','𝚯'=>'0̵','𝚹'=>'0̵','𝛩'=>'0̵','𝛳'=>'0̵','𝜣'=>'0̵','𝜭'=>'0̵','𝝝'=>'0̵','𝝧'=>'0̵','𝞗'=>'0̵','𝞡'=>'0̵','ⴱ'=>'0̵','Ꮎ'=>'0̵','۰'=>'٠','᭜'=>'᭐','㍘'=>'0点','１'=>'1','𝟏'=>'1','𝟙'=>'1','𝟣'=>'1','𝟭'=>'1','𝟷'=>'1','ℐ'=>'1','ℑ'=>'1','𝐈'=>'1','𝐼'=>'1','𝑰'=>'1','𝓘'=>'1','𝕀'=>'1','𝕴'=>'1','𝖨'=>'1','𝗜'=>'1','𝘐'=>'1','𝙄'=>'1','𝙸'=>'1','l'=>'l','ｌ'=>'l','ⅼ'=>'1','ℓ'=>'l','𝐥'=>'l','𝑙'=>'l','𝒍'=>'l','𝓁'=>'l','𝓵'=>'l','𝔩'=>'l','𝕝'=>'l','𝖑'=>'l','𝗅'=>'l','𝗹'=>'l','𝘭'=>'l','𝙡'=>'l','𝚕'=>'l','𝚰'=>'l','𝛪'=>'l','𝜤'=>'l','𝝞'=>'l','𝞘'=>'l','①'=>'➀','ɭ'=>'l̢','ɫ'=>'l̴','ƚ'=>'l̵','ł'=>'l̷','۱'=>'١','⒈'=>'1.','ŀ'=>'l·','ᒷ'=>'1·','⑩'=>'➉','⒑'=>'10.','㏩'=>'10日','㋉'=>'10月','㍢'=>'10点','⒒'=>'11.','㏪'=>'11日','㋊'=>'11月','㍣'=>'11点','⒓'=>'12.','㏫'=>'12日','㋋'=>'12月','㍤'=>'12点','⒔'=>'13.','㏬'=>'13日','㍥'=>'13点','⒕'=>'14.','㏭'=>'14日','㍦'=>'14点','⒖'=>'15.','㏮'=>'15日','㍧'=>'15点','⒗'=>'16.','㏯'=>'16日','㍨'=>'16点','⒘'=>'17.','㏰'=>'17日','㍩'=>'17点','⒙'=>'18.','㏱'=>'18日','㍪'=>'18点','⒚'=>'19.','㏲'=>'19日','㍫'=>'19点','ǉ'=>'lj','㏠'=>'1日','㋀'=>'1月','㍙'=>'1点','２'=>'2','𝟐'=>'2','𝟚'=>'2','𝟤'=>'2','𝟮'=>'2','𝟸'=>'2','ᒿ'=>'2','②'=>'➁','۲'=>'٢','⒉'=>'2.','⒛'=>'20.','㏳'=>'20日','㍬'=>'20点','㏴'=>'21日','㍭'=>'21点','㏵'=>'22日','㍮'=>'22点','㏶'=>'23日','㍯'=>'23点','㏷'=>'24日','㍰'=>'24点','㏸'=>'25日','㏹'=>'26日','㏺'=>'27日','㏻'=>'28日','㏼'=>'29日','㏡'=>'2日','㋁'=>'2月','㍚'=>'2点','３'=>'3','𝟑'=>'3','𝟛'=>'3','𝟥'=>'3','𝟯'=>'3','𝟹'=>'3','③'=>'➂','۳'=>'٣','⒊'=>'3.','㏽'=>'30日','㏾'=>'31日','㏢'=>'3日','㋂'=>'3月','㍛'=>'3点','４'=>'4','𝟒'=>'4','𝟜'=>'4','𝟦'=>'4','𝟰'=>'4','𝟺'=>'4','Ꮞ'=>'4','④'=>'➃','⒋'=>'4.','ᔰ'=>'4·','㏣'=>'4日','㋃'=>'4月','㍜'=>'4点','５'=>'5','𝟓'=>'5','𝟝'=>'5','𝟧'=>'5','𝟱'=>'5','𝟻'=>'5','⑤'=>'➄','⒌'=>'5.','㏤'=>'5日','㋄'=>'5月','㍝'=>'5点','６'=>'6','𝟔'=>'6','𝟞'=>'6','𝟨'=>'6','𝟲'=>'6','𝟼'=>'6','б'=>'6','⑥'=>'➅','⒍'=>'6.','㏥'=>'6日','㋅'=>'6月','㍞'=>'6点','７'=>'7','𝟕'=>'7','𝟟'=>'7','𝟩'=>'7','𝟳'=>'7','𝟽'=>'7','⑦'=>'➆','۷'=>'٧','⒎'=>'7.','㏦'=>'7日','㋆'=>'7月','㍟'=>'7点','ଃ'=>'8','৪'=>'8','੪'=>'8','８'=>'8','𝟖'=>'8','𝟠'=>'8','𝟪'=>'8','𝟴'=>'8','𝟾'=>'8','ȣ'=>'8','⑧'=>'➇','۸'=>'٨','⒏'=>'8.','㏧'=>'8日','㋇'=>'8月','㍠'=>'8点','੧'=>'9','୨'=>'9','৭'=>'9','９'=>'9','𝟗'=>'9','𝟡'=>'9','𝟫'=>'9','𝟵'=>'9','𝟿'=>'9','⑨'=>'➈','۹'=>'٩','⒐'=>'9.','㏨'=>'9日','㋈'=>'9月','㍡'=>'9点','ａ'=>'a','𝐚'=>'a','𝑎'=>'a','𝒂'=>'a','𝒶'=>'a','𝓪'=>'a','𝔞'=>'a','𝕒'=>'a','𝖆'=>'a','𝖺'=>'a','𝗮'=>'a','𝘢'=>'a','𝙖'=>'a','𝚊'=>'a','℀'=>'a/c','℁'=>'a/s','æ'=>'ae','ｂ'=>'b','𝐛'=>'b','𝑏'=>'b','𝒃'=>'b','𝒷'=>'b','𝓫'=>'b','𝔟'=>'b','𝕓'=>'b','𝖇'=>'b','𝖻'=>'b','𝗯'=>'b','𝘣'=>'b','𝙗'=>'b','𝚋'=>'b','ɓ'=>'b̔','ƃ'=>'b̄','ƀ'=>'b̵','ｃ'=>'c','ⅽ'=>'c','𝐜'=>'c','𝑐'=>'c','𝒄'=>'c','𝒸'=>'c','𝓬'=>'c','𝔠'=>'c','𝕔'=>'c','𝖈'=>'c','𝖼'=>'c','𝗰'=>'c','𝘤'=>'c','𝙘'=>'c','𝚌'=>'c','𝛓'=>'c','𝜍'=>'c','𝝇'=>'c','𝞁'=>'c','𝞻'=>'c','℅'=>'c/o','℆'=>'c/u','ｄ'=>'d','ⅾ'=>'d','ⅆ'=>'d','𝐝'=>'d','𝑑'=>'d','𝒅'=>'d','𝒹'=>'d','𝓭'=>'d','𝔡'=>'d','𝕕'=>'d','𝖉'=>'d','𝖽'=>'d','𝗱'=>'d','𝘥'=>'d','𝙙'=>'d','𝚍'=>'d','ɗ'=>'d̔','ƌ'=>'d̄','ɖ'=>'d̢','đ'=>'d̵','ǳ'=>'dz','ǆ'=>'dž','ｅ'=>'e','ℯ'=>'e','ⅇ'=>'e','𝐞'=>'e','𝑒'=>'e','𝒆'=>'e','𝓮'=>'e','𝔢'=>'e','𝕖'=>'e','𝖊'=>'e','𝖾'=>'e','𝗲'=>'e','𝘦'=>'e','𝙚'=>'e','𝚎'=>'e','ⴹ'=>'E','ə'=>'ǝ','ɚ'=>'ǝ˞','⋴'=>'ɛ','𝛆'=>'ɛ','𝛜'=>'ɛ','𝜀'=>'ɛ','𝜖'=>'ɛ','𝜺'=>'ɛ','𝝐'=>'ɛ','𝝴'=>'ɛ','𝞊'=>'ɛ','𝞮'=>'ɛ','𝟄'=>'ɛ','ｆ'=>'f','𝐟'=>'f','𝑓'=>'f','𝒇'=>'f','𝒻'=>'f','𝓯'=>'f','𝔣'=>'f','𝕗'=>'f','𝖋'=>'f','𝖿'=>'f','𝗳'=>'f','𝘧'=>'f','𝙛'=>'f','𝚏'=>'f','ƒ'=>'f̡','ｇ'=>'g','ℊ'=>'g','𝐠'=>'g','𝑔'=>'g','𝒈'=>'g','𝓰'=>'g','𝔤'=>'g','𝕘'=>'g','𝖌'=>'g','𝗀'=>'g','𝗴'=>'g','𝘨'=>'g','𝙜'=>'g','𝚐'=>'g','ɡ'=>'g','ɠ'=>'g̔','ǥ'=>'g̵','ｈ'=>'h','ℎ'=>'h','𝐡'=>'h','𝒉'=>'h','𝒽'=>'h','𝓱'=>'h','𝔥'=>'h','𝕙'=>'h','𝖍'=>'h','𝗁'=>'h','𝗵'=>'h','𝘩'=>'h','𝙝'=>'h','𝚑'=>'h','ɦ'=>'h̔','ħ'=>'h̵','ℏ'=>'h̵','῾'=>'ʻ','‘'=>'ʻ','‛'=>'ʻ','ʽ'=>'ʻ','⍳'=>'i','ｉ'=>'i','ⅰ'=>'i','ℹ'=>'i','ⅈ'=>'i','𝐢'=>'i','𝑖'=>'i','𝒊'=>'i','𝒾'=>'i','𝓲'=>'i','𝔦'=>'i','𝕚'=>'i','𝖎'=>'i','𝗂'=>'i','𝗶'=>'i','𝘪'=>'i','𝙞'=>'i','𝚒'=>'i','ı'=>'i','𝚤'=>'i','ɪ'=>'i','ɩ'=>'i','𝛊'=>'i','𝜄'=>'i','𝜾'=>'i','𝝸'=>'i','𝞲'=>'i','ɨ'=>'i̵','ⅱ'=>'ii','ⅲ'=>'iii','ĳ'=>'ij','ⅳ'=>'iv','ⅸ'=>'ix','ｊ'=>'j','ⅉ'=>'j','𝐣'=>'j','𝑗'=>'j','𝒋'=>'j','𝒿'=>'j','𝓳'=>'j','𝔧'=>'j','𝕛'=>'j','𝖏'=>'j','𝗃'=>'j','𝗷'=>'j','𝘫'=>'j','𝙟'=>'j','𝚓'=>'j','ϳ'=>'j','𝚥'=>'ȷ','ｋ'=>'k','𝐤'=>'k','𝑘'=>'k','𝒌'=>'k','𝓀'=>'k','𝓴'=>'k','𝔨'=>'k','𝕜'=>'k','𝖐'=>'k','𝗄'=>'k','𝗸'=>'k','𝘬'=>'k','𝙠'=>'k','𝚔'=>'k','ƙ'=>'k̔','ｍ'=>'m','ⅿ'=>'m','𝐦'=>'m','𝑚'=>'m','𝒎'=>'m','𝓂'=>'m','𝓶'=>'m','𝔪'=>'m','𝕞'=>'m','𝖒'=>'m','𝗆'=>'m','𝗺'=>'m','𝘮'=>'m','𝙢'=>'m','𝚖'=>'m','ɱ'=>'m̡','ｎ'=>'n','𝐧'=>'n','𝑛'=>'n','𝒏'=>'n','𝓃'=>'n','𝓷'=>'n','𝔫'=>'n','𝕟'=>'n','𝖓'=>'n','𝗇'=>'n','𝗻'=>'n','𝘯'=>'n','𝙣'=>'n','𝚗'=>'n','𝐍'=>'N','𝑁'=>'N','𝑵'=>'N','𝒩'=>'N','𝓝'=>'N','𝔑'=>'N','𝕹'=>'N','𝖭'=>'N','𝗡'=>'N','𝘕'=>'N','𝙉'=>'N','𝙽'=>'N','𝚴'=>'N','𝛮'=>'N','𝜨'=>'N','𝝢'=>'N','𝞜'=>'N','ɲ'=>'ņ','ɳ'=>'n̢','ƞ'=>'n̩','𝛈'=>'n̩','𝜂'=>'n̩','𝜼'=>'n̩','𝝶'=>'n̩','𝞰'=>'n̩','ǌ'=>'nj','ｏ'=>'o','ℴ'=>'o','𝐨'=>'o','𝑜'=>'o','𝒐'=>'o','𝓸'=>'o','𝔬'=>'o','𝕠'=>'o','𝖔'=>'o','𝗈'=>'o','𝗼'=>'o','𝘰'=>'o','𝙤'=>'o','𝚘'=>'o','ᴏ'=>'o','𝛐'=>'o','𝜊'=>'o','𝝄'=>'o','𝝾'=>'o','𝞸'=>'o','ɵ'=>'o̵','ǿ'=>'ó̵','ø'=>'o̷','œ'=>'oe','ơ'=>'oʼ','⍴'=>'p','ｐ'=>'p','𝐩'=>'p','𝑝'=>'p','𝒑'=>'p','𝓅'=>'p','𝓹'=>'p','𝔭'=>'p','𝕡'=>'p','𝖕'=>'p','𝗉'=>'p','𝗽'=>'p','𝘱'=>'p','𝙥'=>'p','𝚙'=>'p','𝛒'=>'p','𝛠'=>'p','𝜌'=>'p','𝜚'=>'p','𝝆'=>'p','𝝔'=>'p','𝞀'=>'p','𝞎'=>'p','𝞺'=>'p','𝟈'=>'p','ƥ'=>'p̔','ｑ'=>'q','𝐪'=>'q','𝑞'=>'q','𝒒'=>'q','𝓆'=>'q','𝓺'=>'q','𝔮'=>'q','𝕢'=>'q','𝖖'=>'q','𝗊'=>'q','𝗾'=>'q','𝘲'=>'q','𝙦'=>'q','𝚚'=>'q','𝐐'=>'Q','𝑄'=>'Q','𝑸'=>'Q','𝒬'=>'Q','𝓠'=>'Q','𝔔'=>'Q','𝕼'=>'Q','𝖰'=>'Q','𝗤'=>'Q','𝘘'=>'Q','𝙌'=>'Q','𝚀'=>'Q','ʠ'=>'q̔','𝛋'=>'ĸ','𝛞'=>'ĸ','𝜅'=>'ĸ','𝜘'=>'ĸ','𝜿'=>'ĸ','𝝒'=>'ĸ','𝝹'=>'ĸ','𝞌'=>'ĸ','𝞳'=>'ĸ','𝟆'=>'ĸ','ｒ'=>'r','𝐫'=>'r','𝑟'=>'r','𝒓'=>'r','𝓇'=>'r','𝓻'=>'r','𝔯'=>'r','𝕣'=>'r','𝖗'=>'r','𝗋'=>'r','𝗿'=>'r','𝘳'=>'r','𝙧'=>'r','𝚛'=>'r','ɽ'=>'r̢','ɼ'=>'r̩','ｓ'=>'s','𝐬'=>'s','𝑠'=>'s','𝒔'=>'s','𝓈'=>'s','𝓼'=>'s','𝔰'=>'s','𝕤'=>'s','𝖘'=>'s','𝗌'=>'s','𝘀'=>'s','𝘴'=>'s','𝙨'=>'s','𝚜'=>'s','ƽ'=>'s','ʂ'=>'s̢','∫'=>'ʃ','∬'=>'ʃʃ','∭'=>'ʃʃʃ','⨌'=>'ʃʃʃʃ','ｔ'=>'t','𝐭'=>'t','𝑡'=>'t','𝒕'=>'t','𝓉'=>'t','𝓽'=>'t','𝔱'=>'t','𝕥'=>'t','𝖙'=>'t','𝗍'=>'t','𝘁'=>'t','𝘵'=>'t','𝙩'=>'t','𝚝'=>'t','𝑇'=>'T','𝑻'=>'T','𝒯'=>'T','𝓣'=>'T','𝔗'=>'T','𝕋'=>'T','𝕿'=>'T','𝖳'=>'T','𝗧'=>'T','𝘛'=>'T','𝙏'=>'T','𝚃'=>'T','𝚻'=>'T','𝛵'=>'T','𝜯'=>'T','𝝩'=>'T','𝞣'=>'T','ƭ'=>'t̔','ț'=>'ţ','ƫ'=>'ţ','ŧ'=>'t̵','ｕ'=>'u','𝐮'=>'u','𝑢'=>'u','𝒖'=>'u','𝓊'=>'u','𝓾'=>'u','𝔲'=>'u','𝕦'=>'u','𝖚'=>'u','𝗎'=>'u','𝘂'=>'u','𝘶'=>'u','𝙪'=>'u','𝚞'=>'u','ʊ'=>'u','ʋ'=>'u','𝛖'=>'u','𝜐'=>'u','𝝊'=>'u','𝞄'=>'u','𝞾'=>'u','𝑈'=>'U','𝑼'=>'U','𝒰'=>'U','𝓤'=>'U','𝔘'=>'U','𝕌'=>'U','𝖀'=>'U','𝖴'=>'U','𝗨'=>'U','𝘜'=>'U','𝙐'=>'U','𝚄'=>'U','ｖ'=>'v','ⅴ'=>'v','𝐯'=>'v','𝑣'=>'v','𝒗'=>'v','𝓋'=>'v','𝓿'=>'v','𝔳'=>'v','𝕧'=>'v','𝖛'=>'v','𝗏'=>'v','𝘃'=>'v','𝘷'=>'v','𝙫'=>'v','𝚟'=>'v','𝛎'=>'v','𝜈'=>'v','𝝂'=>'v','𝝼'=>'v','𝞶'=>'v','ⅵ'=>'vi','ⅶ'=>'vii','ⅷ'=>'viii','ɯ'=>'w','ｗ'=>'w','𝐰'=>'w','𝑤'=>'w','𝒘'=>'w','𝓌'=>'w','𝔀'=>'w','𝔴'=>'w','𝕨'=>'w','𝖜'=>'w','𝗐'=>'w','𝘄'=>'w','𝘸'=>'w','𝙬'=>'w','𝚠'=>'w','𝑊'=>'W','𝑾'=>'W','𝒲'=>'W','𝓦'=>'W','𝔚'=>'W','𝕎'=>'W','𝖂'=>'W','𝖶'=>'W','𝗪'=>'W','𝘞'=>'W','𝙒'=>'W','𝚆'=>'W','×'=>'x','ｘ'=>'x','ⅹ'=>'x','𝐱'=>'x','𝑥'=>'x','𝒙'=>'x','𝓍'=>'x','𝔁'=>'x','𝔵'=>'x','𝕩'=>'x','𝖝'=>'x','𝗑'=>'x','𝘅'=>'x','𝘹'=>'x','𝙭'=>'x','𝚡'=>'x','᙭'=>'X','𝑋'=>'X','𝑿'=>'X','𝒳'=>'X','𝓧'=>'X','𝔛'=>'X','𝕏'=>'X','𝖃'=>'X','𝖷'=>'X','𝗫'=>'X','𝘟'=>'X','𝙓'=>'X','𝚇'=>'X','𝚾'=>'X','𝛸'=>'X','𝜲'=>'X','𝝬'=>'X','𝞦'=>'X','ⅺ'=>'xi','ⅻ'=>'xii','ｙ'=>'y','𝐲'=>'y','𝑦'=>'y','𝒚'=>'y','𝓎'=>'y','𝔂'=>'y','𝔶'=>'y','𝕪'=>'y','𝖞'=>'y','𝗒'=>'y','𝘆'=>'y','𝘺'=>'y','𝙮'=>'y','𝚢'=>'y','ƴ'=>'y̔','ｚ'=>'z','𝐳'=>'z','𝑧'=>'z','𝒛'=>'z','𝓏'=>'z','𝔃'=>'z','𝔷'=>'z','𝕫'=>'z','𝖟'=>'z','𝗓'=>'z','𝘇'=>'z','𝘻'=>'z','𝙯'=>'z','𝚣'=>'z','ȥ'=>'z̡','ʐ'=>'z̢','ƶ'=>'z̵','ȝ'=>'ʒ','?'=>'ʔ','？'=>'ʔ','⁇'=>'ʔʔ','⁈'=>'ʔǃ','᾽'=>'ʼ','᾿'=>'ʼ','’'=>'ʼ','ʾ'=>'ʼ','!'=>'ǃ','！'=>'ǃ','⁉'=>'ǃʔ','‼'=>'ǃǃ','⍺'=>'α','𝛂'=>'α','𝛼'=>'α','𝜶'=>'α','𝝰'=>'α','𝞪'=>'α','𝛃'=>'β','𝛽'=>'β','𝜷'=>'β','𝝱'=>'β','𝞫'=>'β','ℽ'=>'γ','𝛄'=>'γ','𝛾'=>'γ','𝜸'=>'γ','𝝲'=>'γ','𝞬'=>'γ','𝛅'=>'δ','𝛿'=>'δ','𝜹'=>'δ','𝝳'=>'δ','𝞭'=>'δ','𝟋'=>'ϝ','𝛇'=>'ζ','𝜁'=>'ζ','𝜻'=>'ζ','𝝵'=>'ζ','𝞯'=>'ζ','⍬'=>'θ','𝛉'=>'θ','𝛝'=>'θ','𝜃'=>'θ','𝜗'=>'θ','𝜽'=>'θ','𝝑'=>'θ','𝝷'=>'θ','𝞋'=>'θ','𝞱'=>'θ','𝟅'=>'θ','𝛌'=>'λ','𝜆'=>'λ','𝝀'=>'λ','𝝺'=>'λ','𝞴'=>'λ','𝛬'=>'Λ','𝜦'=>'Λ','𝝠'=>'Λ','𝞚'=>'Λ','𝛍'=>'μ','𝜇'=>'μ','𝝁'=>'μ','𝝻'=>'μ','𝞵'=>'μ','𝛏'=>'ξ','𝜉'=>'ξ','𝝃'=>'ξ','𝝽'=>'ξ','𝞷'=>'ξ','𝛯'=>'Ξ','𝜩'=>'Ξ','𝝣'=>'Ξ','𝞝'=>'Ξ','ℼ'=>'π','𝛑'=>'π','𝛡'=>'π','𝜋'=>'π','𝜛'=>'π','𝝅'=>'π','𝝕'=>'π','𝝿'=>'π','𝞏'=>'π','𝞹'=>'π','𝟉'=>'π','ᴨ'=>'π','∏'=>'Π','𝚷'=>'Π','𝛱'=>'Π','𝜫'=>'Π','𝝥'=>'Π','𝞟'=>'Π','𝛔'=>'σ','𝜎'=>'σ','𝝈'=>'σ','𝞂'=>'σ','𝞼'=>'σ','𝛕'=>'τ','𝜏'=>'τ','𝝉'=>'τ','𝞃'=>'τ','𝞽'=>'τ','𝐘'=>'Y','𝑌'=>'Y','𝒀'=>'Y','𝒴'=>'Y','𝓨'=>'Y','𝔜'=>'Y','𝕐'=>'Y','𝖄'=>'Y','𝖸'=>'Y','𝗬'=>'Y','𝘠'=>'Y','𝙔'=>'Y','𝚈'=>'Y','𝚼'=>'Y','𝛶'=>'Y','𝜰'=>'Y','𝝪'=>'Y','𝞤'=>'Y','𝛗'=>'φ','𝛟'=>'φ','𝜑'=>'φ','𝜙'=>'φ','𝝋'=>'φ','𝝓'=>'φ','𝞅'=>'φ','𝞍'=>'φ','𝞿'=>'φ','𝟇'=>'φ','𝛷'=>'Φ','𝜱'=>'Φ','𝝫'=>'Φ','𝞥'=>'Φ','𝛘'=>'χ','𝜒'=>'χ','𝝌'=>'χ','𝞆'=>'χ','𝟀'=>'χ','𝛙'=>'ψ','𝜓'=>'ψ','𝝍'=>'ψ','𝞇'=>'ψ','𝟁'=>'ψ','𝛹'=>'Ψ','𝜳'=>'Ψ','𝝭'=>'Ψ','𝞧'=>'Ψ','⍵'=>'ω','𝛚'=>'ω','𝜔'=>'ω','𝝎'=>'ω','𝞈'=>'ω','𝟂'=>'ω','ӕ'=>'ae','ғ'=>'r̵','ґ'=>'rᑊ','җ'=>'ж̩','ҙ'=>'з̡','ӏ'=>'i','ҋ'=>'й̡','қ'=>'ĸ̩','ҟ'=>'ĸ̵','ᴫ'=>'л','ӆ'=>'л̡','ӎ'=>'м̡','ӊ'=>'н̡','ӈ'=>'н̡','ң'=>'н̩','ө'=>'o̵','ѳ'=>'o̵','ҫ'=>'c̡','ҭ'=>'т̩','ү'=>'y','ұ'=>'y̵','ћ'=>'h̵','ѽ'=>'ѡ҃','ӌ'=>'ҷ','ҿ'=>'ҽ̢','ҍ'=>'Ь̵','զ'=>'q','ռ'=>'n','ℵ'=>'א','ﬡ'=>'א','אָ'=>'אַ','אּ'=>'אַ','ﭏ'=>'אל','ℶ'=>'ב','ℷ'=>'ג','ℸ'=>'ד','ﬢ'=>'ד','ﬣ'=>'ה','ﬤ'=>'כ','ﬥ'=>'ל','ﬦ'=>'ם','ﬠ'=>'ע','ﬧ'=>'ר','ﬨ'=>'ת','ﺀ'=>'ء','ﺂ'=>'آ','ﺁ'=>'آ','ﺄ'=>'أ','ﺃ'=>'أ','ٵ'=>'أ','ﭑ'=>'ٱ','ﭐ'=>'ٱ','ﺆ'=>'ؤ','ﺅ'=>'ؤ','ٶ'=>'ؤ','ﺈ'=>'إ','ﺇ'=>'إ','ﺋ'=>'ئ','ﺌ'=>'ئ','ﺊ'=>'ئ','ﺉ'=>'ئ','ﯫ'=>'ئا','ﯪ'=>'ئا','ﯸ'=>'ئٻ','ﯷ'=>'ئٻ','ﯶ'=>'ئٻ','ﲗ'=>'ئج','ﰀ'=>'ئج','ﲘ'=>'ئح','ﰁ'=>'ئح','ﲙ'=>'ئخ','ﱤ'=>'ئر','ﱥ'=>'ئز','ﲚ'=>'ئم','ﳟ'=>'ئم','ﱦ'=>'ئم','ﰂ'=>'ئم','ﱧ'=>'ئن','ﲛ'=>'ئه','ﳠ'=>'ئه','ﯭ'=>'ئه','ﯬ'=>'ئه','ﯯ'=>'ئو','ﯮ'=>'ئو','ﯳ'=>'ئۆ','ﯲ'=>'ئۆ','ﯱ'=>'ئۇ','ﯰ'=>'ئۇ','ﯵ'=>'ئۈ','ﯴ'=>'ئۈ','ﯻ'=>'ئى','ﯺ'=>'ئى','ﱨ'=>'ئى','ﯹ'=>'ئى','ﰃ'=>'ئى','ﱩ'=>'ئى','ﰄ'=>'ئى','ﺎ'=>'ا','ﺍ'=>'ا','ﴼ'=>'اً','ﴽ'=>'اً','ﷳ'=>'اكبر','ﷲ'=>'الله','ﺑ'=>'ب','ﺒ'=>'ب','ﺐ'=>'ب','ﺏ'=>'ب','ﲜ'=>'بج','ﰅ'=>'بج','ﲝ'=>'بح','ﰆ'=>'بح','ﷂ'=>'بحى','ﲞ'=>'بخ','ﰇ'=>'بخ','ﶞ'=>'بخى','ﱪ'=>'بر','ﱫ'=>'بز','ﲟ'=>'بم','ﳡ'=>'بم','ﱬ'=>'بم','ﰈ'=>'بم','ﱭ'=>'بن','ﲠ'=>'به','ﳢ'=>'به','ﱮ'=>'بى','ﰉ'=>'بى','ﱯ'=>'بى','ﰊ'=>'بى','ﭔ'=>'ٻ','ﭕ'=>'ٻ','ﭓ'=>'ٻ','ﭒ'=>'ٻ','ې'=>'ٻ','ﯦ'=>'ٻ','ﯧ'=>'ٻ','ﯥ'=>'ٻ','ﯤ'=>'ٻ','ﭘ'=>'پ','ﭙ'=>'پ','ﭗ'=>'پ','ﭖ'=>'پ','ﭜ'=>'ڀ','ﭝ'=>'ڀ','ﭛ'=>'ڀ','ﭚ'=>'ڀ','ﺔ'=>'ة','ﺓ'=>'ة','ﺗ'=>'ت','ﺘ'=>'ت','ﺖ'=>'ت','ﺕ'=>'ت','ﲡ'=>'تج','ﰋ'=>'تج','ﵐ'=>'تجم','ﶠ'=>'تجى','ﶟ'=>'تجى','ﲢ'=>'تح','ﰌ'=>'تح','ﵒ'=>'تحج','ﵑ'=>'تحج','ﵓ'=>'تحم','ﲣ'=>'تخ','ﰍ'=>'تخ','ﵔ'=>'تخم','ﶢ'=>'تخى','ﶡ'=>'تخى','ﱰ'=>'تر','ﱱ'=>'تز','ﲤ'=>'تم','ﳣ'=>'تم','ﱲ'=>'تم','ﰎ'=>'تم','ﵕ'=>'تمج','ﵖ'=>'تمح','ﵗ'=>'تمخ','ﶤ'=>'تمى','ﶣ'=>'تمى','ﱳ'=>'تن','ﲥ'=>'ته','ﳤ'=>'ته','ﱴ'=>'تى','ﰏ'=>'تى','ﱵ'=>'تى','ﰐ'=>'تى','ﺛ'=>'ث','ﺜ'=>'ث','ﺚ'=>'ث','ﺙ'=>'ث','ﰑ'=>'ثج','ﱶ'=>'ثر','ﱷ'=>'ثز','ﲦ'=>'ثم','ﳥ'=>'ثم','ﱸ'=>'ثم','ﰒ'=>'ثم','ﱹ'=>'ثن','ﳦ'=>'ثه','ﱺ'=>'ثى','ﰓ'=>'ثى','ﱻ'=>'ثى','ﰔ'=>'ثى','ﭨ'=>'ٹ','ﭩ'=>'ٹ','ﭧ'=>'ٹ','ﭦ'=>'ٹ','ڻ'=>'ٹ','ﮢ'=>'ٹ','ﮣ'=>'ٹ','ﮡ'=>'ٹ','ﮠ'=>'ٹ','ﭠ'=>'ٺ','ﭡ'=>'ٺ','ﭟ'=>'ٺ','ﭞ'=>'ٺ','ﭤ'=>'ٿ','ﭥ'=>'ٿ','ﭣ'=>'ٿ','ﭢ'=>'ٿ','ﺟ'=>'ج','ﺠ'=>'ج','ﺞ'=>'ج','ﺝ'=>'ج','ﲧ'=>'جح','ﰕ'=>'جح','ﶦ'=>'جحى','ﶾ'=>'جحى','ﷻ'=>'جل جلاله','ﲨ'=>'جم','ﰖ'=>'جم','ﵙ'=>'جمح','ﵘ'=>'جمح','ﶧ'=>'جمى','ﶥ'=>'جمى','ﴝ'=>'جى','ﴁ'=>'جى','ﴞ'=>'جى','ﴂ'=>'جى','ﭸ'=>'ڃ','ﭹ'=>'ڃ','ﭷ'=>'ڃ','ﭶ'=>'ڃ','ﭴ'=>'ڄ','ﭵ'=>'ڄ','ﭳ'=>'ڄ','ﭲ'=>'ڄ','ﭼ'=>'چ','ﭽ'=>'چ','ﭻ'=>'چ','ﭺ'=>'چ','ﮀ'=>'ڇ','ﮁ'=>'ڇ','ﭿ'=>'ڇ','ﭾ'=>'ڇ','ﺣ'=>'ح','ﺤ'=>'ح','ﺢ'=>'ح','ﺡ'=>'ح','ﲩ'=>'حج','ﰗ'=>'حج','ﶿ'=>'حجى','ﲪ'=>'حم','ﰘ'=>'حم','ﵛ'=>'حمى','ﵚ'=>'حمى','ﴛ'=>'حى','ﳿ'=>'حى','ﴜ'=>'حى','ﴀ'=>'حى','ﺧ'=>'خ','ﺨ'=>'خ','ﺦ'=>'خ','ﺥ'=>'خ','ﲫ'=>'خج','ﰙ'=>'خج','ﰚ'=>'خح','ﲬ'=>'خم','ﰛ'=>'خم','ﴟ'=>'خى','ﴃ'=>'خى','ﴠ'=>'خى','ﴄ'=>'خى','ﺪ'=>'د','ﺩ'=>'د','ﺬ'=>'ذ','ﺫ'=>'ذ','ﱛ'=>'ذٰ','ﮉ'=>'ڈ','ﮈ'=>'ڈ','ﮅ'=>'ڌ','ﮄ'=>'ڌ','ﮃ'=>'ڍ','ﮂ'=>'ڍ','ﮇ'=>'ڎ','ﮆ'=>'ڎ','ﺮ'=>'ر','ﺭ'=>'ر','ﱜ'=>'رٰ','ﷶ'=>'رسول','﷼'=>'رىال','ﺰ'=>'ز','ﺯ'=>'ز','ﮍ'=>'ڑ','ﮌ'=>'ڑ','ﮋ'=>'ژ','ﮊ'=>'ژ','ﺳ'=>'س','ﺴ'=>'س','ﺲ'=>'س','ﺱ'=>'س','ﲭ'=>'سج','ﴴ'=>'سج','ﰜ'=>'سج','ﵝ'=>'سجح','ﵞ'=>'سجى','ﲮ'=>'سح','ﴵ'=>'سح','ﰝ'=>'سح','ﵜ'=>'سحج','ﲯ'=>'سخ','ﴶ'=>'سخ','ﰞ'=>'سخ','ﶨ'=>'سخى','ﷆ'=>'سخى','ﴪ'=>'سر','ﴎ'=>'سر','ﲰ'=>'سم','ﳧ'=>'سم','ﰟ'=>'سم','ﵡ'=>'سمج','ﵠ'=>'سمح','ﵟ'=>'سمح','ﵣ'=>'سمم','ﵢ'=>'سمم','ﴱ'=>'سه','ﳨ'=>'سه','ﴗ'=>'سى','ﳻ'=>'سى','ﴘ'=>'سى','ﳼ'=>'سى','ﺷ'=>'ش','ﺸ'=>'ش','ﺶ'=>'ش','ﺵ'=>'ش','ﴭ'=>'شج','ﴷ'=>'شج','ﴥ'=>'شج','ﴉ'=>'شج','ﵩ'=>'شجى','ﴮ'=>'شح','ﴸ'=>'شح','ﴦ'=>'شح','ﴊ'=>'شح','ﵨ'=>'شحم','ﵧ'=>'شحم','ﶪ'=>'شحى','ﴯ'=>'شخ','ﴹ'=>'شخ','ﴧ'=>'شخ','ﴋ'=>'شخ','ﴩ'=>'شر','ﴍ'=>'شر','ﴰ'=>'شم','ﳩ'=>'شم','ﴨ'=>'شم','ﴌ'=>'شم','ﵫ'=>'شمخ','ﵪ'=>'شمخ','ﵭ'=>'شمم','ﵬ'=>'شمم','ﴲ'=>'شه','ﳪ'=>'شه','ﴙ'=>'شى','ﳽ'=>'شى','ﴚ'=>'شى','ﳾ'=>'شى','ﺻ'=>'ص','ﺼ'=>'ص','ﺺ'=>'ص','ﺹ'=>'ص','ﲱ'=>'صح','ﰠ'=>'صح','ﵥ'=>'صحح','ﵤ'=>'صحح','ﶩ'=>'صحى','ﲲ'=>'صخ','ﴫ'=>'صر','ﴏ'=>'صر','ﷵ'=>'صلعم','ﷹ'=>'صلى','ﷺ'=>'صلى الله علىه وسلم','ﷰ'=>'صلے','ﲳ'=>'صم','ﰡ'=>'صم','ﷅ'=>'صمم','ﵦ'=>'صمم','ﴡ'=>'صى','ﴅ'=>'صى','ﴢ'=>'صى','ﴆ'=>'صى','ﺿ'=>'ض','ﻀ'=>'ض','ﺾ'=>'ض','ﺽ'=>'ض','ﲴ'=>'ضج','ﰢ'=>'ضج','ﲵ'=>'ضح','ﰣ'=>'ضح','ﵮ'=>'ضحى','ﶫ'=>'ضحى','ﲶ'=>'ضخ','ﰤ'=>'ضخ','ﵰ'=>'ضخم','ﵯ'=>'ضخم','ﴬ'=>'ضر','ﴐ'=>'ضر','ﲷ'=>'ضم','ﰥ'=>'ضم','ﴣ'=>'ضى','ﴇ'=>'ضى','ﴤ'=>'ضى','ﴈ'=>'ضى','ﻃ'=>'ط','ﻄ'=>'ط','ﻂ'=>'ط','ﻁ'=>'ط','ﲸ'=>'طح','ﰦ'=>'طح','ﴳ'=>'طم','ﴺ'=>'طم','ﰧ'=>'طم','ﵲ'=>'طمح','ﵱ'=>'طمح','ﵳ'=>'طمم','ﵴ'=>'طمى','ﴑ'=>'طى','ﳵ'=>'طى','ﴒ'=>'طى','ﳶ'=>'طى','ﻇ'=>'ظ','ﻈ'=>'ظ','ﻆ'=>'ظ','ﻅ'=>'ظ','ﲹ'=>'ظم','ﴻ'=>'ظم','ﰨ'=>'ظم','ﻋ'=>'ع','ﻌ'=>'ع','ﻊ'=>'ع','ﻉ'=>'ع','ﲺ'=>'عج','ﰩ'=>'عج','ﷄ'=>'عجم','ﵵ'=>'عجم','ﷷ'=>'علىه','ﲻ'=>'عم','ﰪ'=>'عم','ﵷ'=>'عمم','ﵶ'=>'عمم','ﵸ'=>'عمى','ﶶ'=>'عمى','ﴓ'=>'عى','ﳷ'=>'عى','ﴔ'=>'عى','ﳸ'=>'عى','ﻏ'=>'غ','ﻐ'=>'غ','ﻎ'=>'غ','ﻍ'=>'غ','ﲼ'=>'غج','ﰫ'=>'غج','ﲽ'=>'غم','ﰬ'=>'غم','ﵹ'=>'غمم','ﵻ'=>'غمى','ﵺ'=>'غمى','ﴕ'=>'غى','ﳹ'=>'غى','ﴖ'=>'غى','ﳺ'=>'غى','ﻓ'=>'ف','ﻔ'=>'ف','ﻒ'=>'ف','ﻑ'=>'ف','ﲾ'=>'فج','ﰭ'=>'فج','ﲿ'=>'فح','ﰮ'=>'فح','ﳀ'=>'فخ','ﰯ'=>'فخ','ﵽ'=>'فخم','ﵼ'=>'فخم','ﳁ'=>'فم','ﰰ'=>'فم','ﷁ'=>'فمى','ﱼ'=>'فى','ﰱ'=>'فى','ﱽ'=>'فى','ﰲ'=>'فى','ﭬ'=>'ڤ','ﭭ'=>'ڤ','ﭫ'=>'ڤ','ﭪ'=>'ڤ','ﭰ'=>'ڦ','ﭱ'=>'ڦ','ﭯ'=>'ڦ','ﭮ'=>'ڦ','ﻗ'=>'ق','ﻘ'=>'ق','ﻖ'=>'ق','ﻕ'=>'ق','ﳂ'=>'قح','ﰳ'=>'قح','ﷱ'=>'قلے','ﳃ'=>'قم','ﰴ'=>'قم','ﶴ'=>'قمح','ﵾ'=>'قمح','ﵿ'=>'قمم','ﶲ'=>'قمى','ﱾ'=>'قى','ﰵ'=>'قى','ﱿ'=>'قى','ﰶ'=>'قى','ﻛ'=>'ك','ﻜ'=>'ك','ﻚ'=>'ك','ﻙ'=>'ك','ک'=>'ك','ﮐ'=>'ك','ﮑ'=>'ك','ﮏ'=>'ك','ﮎ'=>'ك','ﲀ'=>'كا','ﰷ'=>'كا','ﳄ'=>'كج','ﰸ'=>'كج','ﳅ'=>'كح','ﰹ'=>'كح','ﳆ'=>'كخ','ﰺ'=>'كخ','ﳇ'=>'كل','ﳫ'=>'كل','ﲁ'=>'كل','ﰻ'=>'كل','ﳈ'=>'كم','ﳬ'=>'كم','ﲂ'=>'كم','ﰼ'=>'كم','ﷃ'=>'كمم','ﶻ'=>'كمم','ﶷ'=>'كمى','ﲃ'=>'كى','ﰽ'=>'كى','ﲄ'=>'كى','ﰾ'=>'كى','ﯕ'=>'ڭ','ﯖ'=>'ڭ','ﯔ'=>'ڭ','ﯓ'=>'ڭ','ﮔ'=>'گ','ﮕ'=>'گ','ﮓ'=>'گ','ﮒ'=>'گ','ﮜ'=>'ڱ','ﮝ'=>'ڱ','ﮛ'=>'ڱ','ﮚ'=>'ڱ','ﮘ'=>'ڳ','ﮙ'=>'ڳ','ﮗ'=>'ڳ','ﮖ'=>'ڳ','ﻟ'=>'ل','ﻠ'=>'ل','ﻞ'=>'ل','ﻝ'=>'ل','ﻶ'=>'لآ','ﻵ'=>'لآ','ﻸ'=>'لأ','ﻷ'=>'لأ','ﻺ'=>'لإ','ﻹ'=>'لإ','ﻼ'=>'لا','ﻻ'=>'لا','ﳉ'=>'لج','ﰿ'=>'لج','ﶃ'=>'لجج','ﶄ'=>'لجج','ﶺ'=>'لجم','ﶼ'=>'لجم','ﶬ'=>'لجى','ﳊ'=>'لح','ﱀ'=>'لح','ﶵ'=>'لحم','ﶀ'=>'لحم','ﶂ'=>'لحى','ﶁ'=>'لحى','ﳋ'=>'لخ','ﱁ'=>'لخ','ﶆ'=>'لخم','ﶅ'=>'لخم','ﳌ'=>'لم','ﳭ'=>'لم','ﲅ'=>'لم','ﱂ'=>'لم','ﶈ'=>'لمح','ﶇ'=>'لمح','ﶭ'=>'لمى','ﳍ'=>'له','ﲆ'=>'لى','ﱃ'=>'لى','ﲇ'=>'لى','ﱄ'=>'لى','ﻣ'=>'م','ﻤ'=>'م','ﻢ'=>'م','ﻡ'=>'م','ﲈ'=>'ما','ﳎ'=>'مج','ﱅ'=>'مج','ﶌ'=>'مجح','ﶒ'=>'مجخ','ﶍ'=>'مجم','ﷀ'=>'مجى','ﳏ'=>'مح','ﱆ'=>'مح','ﶉ'=>'محج','ﶊ'=>'محم','ﷴ'=>'محمد','ﶋ'=>'محى','ﳐ'=>'مخ','ﱇ'=>'مخ','ﶎ'=>'مخج','ﶏ'=>'مخم','ﶹ'=>'مخى','ﳑ'=>'مم','ﲉ'=>'مم','ﱈ'=>'مم','ﶱ'=>'ممى','ﱉ'=>'مى','ﱊ'=>'مى','ﻧ'=>'ن','ﻨ'=>'ن','ﻦ'=>'ن','ﻥ'=>'ن','ﳒ'=>'نج','ﱋ'=>'نج','ﶸ'=>'نجح','ﶽ'=>'نجح','ﶘ'=>'نجم','ﶗ'=>'نجم','ﶙ'=>'نجى','ﷇ'=>'نجى','ﳓ'=>'نح','ﱌ'=>'نح','ﶕ'=>'نحم','ﶖ'=>'نحى','ﶳ'=>'نحى','ﳔ'=>'نخ','ﱍ'=>'نخ','ﲊ'=>'نر','ﲋ'=>'نز','ﳕ'=>'نم','ﳮ'=>'نم','ﲌ'=>'نم','ﱎ'=>'نم','ﶛ'=>'نمى','ﶚ'=>'نمى','ﲍ'=>'نن','ﳖ'=>'نه','ﳯ'=>'نه','ﲎ'=>'نى','ﱏ'=>'نى','ﲏ'=>'نى','ﱐ'=>'نى','ﮟ'=>'ں','ﮞ'=>'ں','ﻫ'=>'ه','ﻬ'=>'ه','ﻪ'=>'ه','ﻩ'=>'ه','ھ'=>'ه','ﮬ'=>'ه','ﮭ'=>'ه','ﮫ'=>'ه','ﮪ'=>'ه','ہ'=>'ه','ﮨ'=>'ه','ﮩ'=>'ه','ﮧ'=>'ه','ﮦ'=>'ه','ە'=>'ه','ﳙ'=>'هٰ','ﳗ'=>'هج','ﱑ'=>'هج','ﳘ'=>'هم','ﱒ'=>'هم','ﶓ'=>'همج','ﶔ'=>'همم','ﱓ'=>'هى','ﱔ'=>'هى','ﮥ'=>'ۀ','ﮤ'=>'ۀ','ﻮ'=>'و','ﻭ'=>'و','ﷸ'=>'وسلم','ﯡ'=>'ۅ','ﯠ'=>'ۅ','ﯚ'=>'ۆ','ﯙ'=>'ۆ','ﯘ'=>'ۇ','ﯗ'=>'ۇ','ٷ'=>'ۇٔ','ﯝ'=>'ۇٔ','ﯜ'=>'ۈ','ﯛ'=>'ۈ','ﯣ'=>'ۉ','ﯢ'=>'ۉ','ﯟ'=>'ۋ','ﯞ'=>'ۋ','ﯨ'=>'ى','ﯩ'=>'ى','ﻰ'=>'ى','ﻯ'=>'ى','ي'=>'ى','ﻳ'=>'ى','ﻴ'=>'ى','ﻲ'=>'ى','ﻱ'=>'ى','ی'=>'ى','ﯾ'=>'ى','ﯿ'=>'ى','ﯽ'=>'ى','ﯼ'=>'ى','ٸ'=>'ىٔ','ﲐ'=>'ىٰ','ﱝ'=>'ىٰ','ﳚ'=>'ىج','ﱕ'=>'ىج','ﶯ'=>'ىجى','ﳛ'=>'ىح','ﱖ'=>'ىح','ﶮ'=>'ىحى','ﳜ'=>'ىخ','ﱗ'=>'ىخ','ﲑ'=>'ىر','ﲒ'=>'ىز','ﳝ'=>'ىم','ﳰ'=>'ىم','ﲓ'=>'ىم','ﱘ'=>'ىم','ﶝ'=>'ىمم','ﶜ'=>'ىمم','ﶰ'=>'ىمى','ﲔ'=>'ىن','ﳞ'=>'ىه','ﳱ'=>'ىه','ﲕ'=>'ىى','ﱙ'=>'ىى','ﲖ'=>'ىى','ﱚ'=>'ىى','ۧ'=>'ۦ','ﮯ'=>'ے','ﮮ'=>'ے','ﮱ'=>'ۓ','ﮰ'=>'ۓ','∃'=>'ⴺ','आ'=>'अा','ऒ'=>'अाॆ','ओ'=>'अाे','औ'=>'अाै','ऄ'=>'अॆ','ऑ'=>'अॉ','ऍ'=>'एॅ','ऎ'=>'एॆ','ऐ'=>'एे','ई'=>'र्इ','আ'=>'অা','ৠ'=>'ঋৃ','ৡ'=>'ঌৢ','ਉ'=>'ੳੁ','ਊ'=>'ੳੂ','ਆ'=>'ਅਾ','ਐ'=>'ਅੈ','ਔ'=>'ਅੌ','ਇ'=>'ੲਿ','ਈ'=>'ੲੀ','ਏ'=>'ੲੇ','આ'=>'અા','ઑ'=>'અાૅ','ઓ'=>'અાે','ઔ'=>'અાૈ','ઍ'=>'અૅ','એ'=>'અે','ઐ'=>'અૈ','ଆ'=>'ଅା','௮'=>'அ','ர'=>'ஈ','ா'=>'ஈ','௫'=>'ஈு','௨'=>'உ','ஊ'=>'உள','௭'=>'எ','௷'=>'எவ','ஜ'=>'ஐ','௧'=>'க','௪'=>'ச','௬'=>'சு','௲'=>'சூ','௺'=>'நீ','ை'=>'ன','௴'=>'மீ','௰'=>'ய','ௗ'=>'ள','௸'=>'ஷ','ொ'=>'ெஈ','ௌ'=>'ெள','ோ'=>'ேஈ','ౠ'=>'ఋా','ౡ'=>'ఌా','ఔ'=>'ఒౌ','ఓ'=>'ఒౕ','ఢ'=>'డ̣','భ'=>'బ̣','ష'=>'వ̣','హ'=>'వా','మ'=>'వు','ూ'=>'ుా','ౄ'=>'ృా','ೡ'=>'ಌಾ','ಔ'=>'ఒౌ','ഈ'=>'ഇൗ','ഊ'=>'உൗ','ഐ'=>'എെ','ഓ'=>'ഒാ','ഔ'=>'ഒൗ','ൡ'=>'ഞ','൫'=>'ദ്ര','ഌ'=>'നூ','ങ'=>'നூ','൯'=>'ന്','റ'=>'ര','൪'=>'ര്','൮'=>'വ്','ീ'=>'ி','ൂ'=>'ூ','ൃ'=>'ூ','ൈ'=>'െെ','ฃ'=>'ข','ด'=>'ค','ต'=>'ค','ม'=>'ฆ','ซ'=>'ช','ฏ'=>'ฎ','ท'=>'ฑ','ๅ'=>'า','ำ'=>'̊า','แ'=>'เเ','ໜ'=>'ຫນ','ໝ'=>'ຫມ','ຳ'=>'̊າ','ཷ'=>'ྲཱྀ','ཹ'=>'ླཱྀ','၀'=>'o','ឣ'=>'អ','᧐'=>'ᦞ','᭒'=>'ᬍ','᭓'=>'ᬑ','᭘'=>'ᬨ','ᢖ'=>'ᡜ','ᡕ'=>'ᠵ','Ꮢ'=>'Ꭱ','Ꮍ'=>'y','𝐀'=>'A','𝐴'=>'A','𝑨'=>'A','𝒜'=>'A','𝓐'=>'A','𝔄'=>'A','𝔸'=>'A','𝕬'=>'A','𝖠'=>'A','𝗔'=>'A','𝘈'=>'A','𝘼'=>'A','𝙰'=>'A','𝚨'=>'A','𝛢'=>'A','𝜜'=>'A','𝝖'=>'A','𝞐'=>'A','𝐉'=>'J','𝐽'=>'J','𝑱'=>'J','𝒥'=>'J','𝓙'=>'J','𝔍'=>'J','𝕁'=>'J','𝕵'=>'J','𝖩'=>'J','𝗝'=>'J','𝘑'=>'J','𝙅'=>'J','𝙹'=>'J','Ꮷ'=>'J','⋿'=>'E','ℰ'=>'E','𝐄'=>'E','𝐸'=>'E','𝑬'=>'E','𝓔'=>'E','𝔈'=>'E','𝔼'=>'E','𝕰'=>'E','𝖤'=>'E','𝗘'=>'E','𝘌'=>'E','𝙀'=>'E','𝙴'=>'E','𝚬'=>'E','𝛦'=>'E','𝜠'=>'E','𝝚'=>'E','𝞔'=>'E','ℾ'=>'Ꮁ','𝚪'=>'Ꮁ','𝛤'=>'Ꮁ','𝜞'=>'Ꮁ','𝝘'=>'Ꮁ','𝞒'=>'Ꮁ','Ꮤ'=>'w','ℳ'=>'M','𝐌'=>'M','𝑀'=>'M','𝑴'=>'M','𝓜'=>'M','𝔐'=>'M','𝕄'=>'M','𝕸'=>'M','𝖬'=>'M','𝗠'=>'M','𝘔'=>'M','𝙈'=>'M','𝙼'=>'M','𝚳'=>'M','𝛭'=>'M','𝜧'=>'M','𝝡'=>'M','𝞛'=>'M','ℋ'=>'H','ℌ'=>'H','ℍ'=>'H','𝐇'=>'H','𝐻'=>'H','𝑯'=>'H','𝓗'=>'H','𝕳'=>'H','𝖧'=>'H','𝗛'=>'H','𝘏'=>'H','𝙃'=>'H','𝙷'=>'H','𝚮'=>'H','𝛨'=>'H','𝜢'=>'H','𝝜'=>'H','𝞖'=>'H','𝐆'=>'G','𝐺'=>'G','𝑮'=>'G','𝒢'=>'G','𝓖'=>'G','𝔊'=>'G','𝔾'=>'G','𝕲'=>'G','𝖦'=>'G','𝗚'=>'G','𝘎'=>'G','𝙂'=>'G','𝙶'=>'G','Ᏻ'=>'G','ℤ'=>'Z','ℨ'=>'Z','𝐙'=>'Z','𝑍'=>'Z','𝒁'=>'Z','𝒵'=>'Z','𝓩'=>'Z','𝖅'=>'Z','𝖹'=>'Z','𝗭'=>'Z','𝘡'=>'Z','𝙕'=>'Z','𝚉'=>'Z','𝚭'=>'Z','𝛧'=>'Z','𝜡'=>'Z','𝝛'=>'Z','𝞕'=>'Z','𝐒'=>'S','𝑆'=>'S','𝑺'=>'S','𝒮'=>'S','𝓢'=>'S','𝔖'=>'S','𝕊'=>'S','𝕾'=>'S','𝖲'=>'S','𝗦'=>'S','𝘚'=>'S','𝙎'=>'S','𝚂'=>'S','Ꮪ'=>'S','𝐕'=>'V','𝑉'=>'V','𝑽'=>'V','𝒱'=>'V','𝓥'=>'V','𝔙'=>'V','𝕍'=>'V','𝖁'=>'V','𝖵'=>'V','𝗩'=>'V','𝘝'=>'V','𝙑'=>'V','𝚅'=>'V','ℒ'=>'L','𝐋'=>'L','𝐿'=>'L','𝑳'=>'L','𝓛'=>'L','𝔏'=>'L','𝕃'=>'L','𝕷'=>'L','𝖫'=>'L','𝗟'=>'L','𝘓'=>'L','𝙇'=>'L','𝙻'=>'L','∑'=>'C','⅀'=>'C','ℂ'=>'C','ℭ'=>'C','𝐂'=>'C','𝐶'=>'C','𝑪'=>'C','𝒞'=>'C','𝓒'=>'C','𝕮'=>'C','𝖢'=>'C','𝗖'=>'C','𝘊'=>'C','𝘾'=>'C','𝙲'=>'C','𝚺'=>'C','𝛴'=>'C','𝜮'=>'C','𝝨'=>'C','𝞢'=>'C','ℙ'=>'P','𝐏'=>'P','𝑃'=>'P','𝑷'=>'P','𝒫'=>'P','𝓟'=>'P','𝔓'=>'P','𝕻'=>'P','𝖯'=>'P','𝗣'=>'P','𝘗'=>'P','𝙋'=>'P','𝙿'=>'P','𝚸'=>'P','𝛲'=>'P','𝜬'=>'P','𝝦'=>'P','𝞠'=>'P','𝐊'=>'K','𝐾'=>'K','𝑲'=>'K','𝒦'=>'K','𝓚'=>'K','𝔎'=>'K','𝕂'=>'K','𝕶'=>'K','𝖪'=>'K','𝗞'=>'K','𝘒'=>'K','𝙆'=>'K','𝙺'=>'K','𝚱'=>'K','𝛫'=>'K','𝜥'=>'K','𝝟'=>'K','𝞙'=>'K','ℬ'=>'B','𝐁'=>'B','𝐵'=>'B','𝑩'=>'B','𝓑'=>'B','𝔅'=>'B','𝔹'=>'B','𝕭'=>'B','𝖡'=>'B','𝗕'=>'B','𝘉'=>'B','𝘽'=>'B','𝙱'=>'B','𝚩'=>'B','𝛣'=>'B','𝜝'=>'B','𝝗'=>'B','𝞑'=>'B','ᐍ'=>'ᐁ·','∆'=>'ᐃ','𝚫'=>'ᐃ','𝛥'=>'ᐃ','𝜟'=>'ᐃ','𝝙'=>'ᐃ','𝞓'=>'ᐃ','ᐏ'=>'ᐃ·','ᐑ'=>'ᐄ·','ᐓ'=>'ᐅ·','ᐕ'=>'ᐆ·','ᐘ'=>'ᐊ·','ᐚ'=>'ᐋ·','ᓑ'=>'ᐡ','ᑶ'=>'·P','ᑺ'=>'·d','ᒘ'=>'·J','ᑁ'=>'ᐳ·','ᑃ'=>'ᐴ·','ᑅ'=>'ᐸ·','ᑇ'=>'ᐹ·','ˈ'=>'ᑊ','ᑘ'=>'ᑌ·','ᑧ'=>'ᑌᑊ','ᑚ'=>'ᑎ·','ᑨ'=>'ᑎᑊ','ᑜ'=>'ᑏ·','ᑞ'=>'ᑐ·','ᑩ'=>'ᑐᑊ','ᑠ'=>'ᑑ·','ᑢ'=>'ᑕ·','ᑪ'=>'ᑕᑊ','ᑤ'=>'ᑖ·','ᑵ'=>'ᑫ·','ᒅ'=>'ᑫᑊ','ᑷ'=>'P·','ᒆ'=>'Pᑊ','ᑹ'=>'ᑮ·','ᑻ'=>'d·','ᒇ'=>'dᑊ','ᑽ'=>'ᑰ·','ᑿ'=>'ᑲ·','ᒈ'=>'ᑲᑊ','ᒁ'=>'ᑳ·','ᘃ'=>'ᒉ','ᒓ'=>'ᒉ·','ᒕ'=>'ᒋ·','ᒗ'=>'ᒌ·','ᒙ'=>'J·','ᒛ'=>'ᒎ·','ᘂ'=>'ᒐ','ᒝ'=>'ᒐ·','ᒟ'=>'ᒑ·','ᒭ'=>'ᒣ·','ᒯ'=>'ᒥ·','ᒱ'=>'ᒦ·','ᒳ'=>'ᒧ·','ᒵ'=>'ᒨ·','ᒹ'=>'ᒫ·','ᓊ'=>'ᓀ·','ᓌ'=>'ᓇ·','ᓎ'=>'ᓈᒫ','ᘄ'=>'ᓓ','ᓝ'=>'ᓓ·','ᓟ'=>'ᓕ·','ᓡ'=>'ᓖ·','ᓣ'=>'ᓗ·','ᓥ'=>'ᓘ·','ᘇ'=>'ᓚ','ᓧ'=>'ᓚ·','ᓩ'=>'ᓛ·','ᓷ'=>'ᓭ·','ᓹ'=>'ᓯ·','ᓻ'=>'ᓰ·','ᓽ'=>'ᓱ·','ᓿ'=>'ᓲ·','ᔁ'=>'ᓴ·','ᔃ'=>'ᓵ·','ᔌ'=>'ᔋᐸ','ᔍ'=>'ᔋᑕ','ᔎ'=>'ᔋᑲ','ᔏ'=>'ᔋᒐ','ᔘ'=>'ᔐ·','ᔚ'=>'ᔑ·','ᔜ'=>'ᔒ·','ᔞ'=>'ᔓ·','ᔠ'=>'ᔔ·','ᔢ'=>'ᔕ·','ᔤ'=>'ᔖ·','ᔲ'=>'ᔨ·','ᔴ'=>'ᔩ·','ᔶ'=>'ᔪ·','ᔸ'=>'ᔫ·','ᔺ'=>'ᔭ·','ᔼ'=>'ᔮ·','᙮'=>'x','ᕽ'=>'x','ᘢ'=>'ᕃ','ᘣ'=>'ᕆ','ᘤ'=>'ᕊ','ᕏ'=>'ᕌ·','ᙯ'=>'ᕐᑫ','ᕾ'=>'ᕐᑬ','ᕿ'=>'ᕐP','ᖀ'=>'ᕐᑮ','ᖁ'=>'ᕐd','ᖂ'=>'ᕐᑰ','ᖃ'=>'ᕐᑲ','ᖄ'=>'ᕐᑳ','ᖅ'=>'ᕐᒃ','ᕜ'=>'ᕚ·','ᕩ'=>'ᕧ·','ℛ'=>'R','ℜ'=>'R','ℝ'=>'R','𝐑'=>'R','𝑅'=>'R','𝑹'=>'R','𝓡'=>'R','𝕽'=>'R','𝖱'=>'R','𝗥'=>'R','𝘙'=>'R','𝙍'=>'R','𝚁'=>'R','ᙰ'=>'ᖕᒉ','ᖎ'=>'ᖕᒊ','ᖏ'=>'ᖕᒋ','ᖐ'=>'ᖕᒌ','ᖑ'=>'ᖕJ','ᖒ'=>'ᖕᒎ','ᖓ'=>'ᖕᒐ','ᖔ'=>'ᖕᒑ','ᙱ'=>'ᖖᒋ','ᙲ'=>'ᖖᒌ','ᙳ'=>'ᖖJ','ᙴ'=>'ᖖᒎ','ᙵ'=>'ᖖᒐ','ᙶ'=>'ᖖᒑ','ℱ'=>'F','𝐅'=>'F','𝐹'=>'F','𝑭'=>'F','𝓕'=>'F','𝔉'=>'F','𝔽'=>'F','𝕱'=>'F','𝖥'=>'F','𝗙'=>'F','𝘍'=>'F','𝙁'=>'F','𝙵'=>'F','𝟊'=>'F','ⅅ'=>'D','𝐃'=>'D','𝐷'=>'D','𝑫'=>'D','𝒟'=>'D','𝓓'=>'D','𝔇'=>'D','𝔻'=>'D','𝕯'=>'D','𝖣'=>'D','𝗗'=>'D','𝘋'=>'D','𝘿'=>'D','𝙳'=>'D','ᗪ'=>'D','℧'=>'ᘮ','ᘴ'=>'ᘮ','𝛀'=>'ᘯ','𝛺'=>'ᘯ','𝜴'=>'ᘯ','𝝮'=>'ᘯ','𝞨'=>'ᘯ','ᘵ'=>'ᘯ','ㄱ'=>'ᄀ','ﾡ'=>'ᄀ','ᆨ'=>'ᄀ','ㄲ'=>'ᄁ','ﾢ'=>'ᄁ','ᆩ'=>'ᄁ','ㄴ'=>'ᄂ','ﾤ'=>'ᄂ','ᆫ'=>'ᄂ','ㄷ'=>'ᄃ','ﾧ'=>'ᄃ','ᆮ'=>'ᄃ','ㄸ'=>'ᄄ','ﾨ'=>'ᄄ','ㄹ'=>'ᄅ','ﾩ'=>'ᄅ','ᆯ'=>'ᄅ','ㅁ'=>'ᄆ','ﾱ'=>'ᄆ','ᆷ'=>'ᄆ','ㅂ'=>'ᄇ','ﾲ'=>'ᄇ','ᆸ'=>'ᄇ','ㅃ'=>'ᄈ','ﾳ'=>'ᄈ','ㅅ'=>'ᄉ','ﾵ'=>'ᄉ','ᆺ'=>'ᄉ','ㅆ'=>'ᄊ','ﾶ'=>'ᄊ','ᆻ'=>'ᄊ','ㅇ'=>'ᄋ','ﾷ'=>'ᄋ','ᆼ'=>'ᄋ','ㅈ'=>'ᄌ','ﾸ'=>'ᄌ','ᆽ'=>'ᄌ','ㅉ'=>'ᄍ','ﾹ'=>'ᄍ','ㅊ'=>'ᄎ','ﾺ'=>'ᄎ','ᆾ'=>'ᄎ','ㅋ'=>'ᄏ','ﾻ'=>'ᄏ','ᆿ'=>'ᄏ','ㅌ'=>'ᄐ','ﾼ'=>'ᄐ','ᇀ'=>'ᄐ','ㅍ'=>'ᄑ','ﾽ'=>'ᄑ','ᇁ'=>'ᄑ','ㅎ'=>'ᄒ','ﾾ'=>'ᄒ','ᇂ'=>'ᄒ','ᇅ'=>'ᄓ','ㅥ'=>'ᄔ','ㅦ'=>'ᄕ','ᇆ'=>'ᄕ','ᇊ'=>'ᄗ','ᇍ'=>'ᄘ','ᇐ'=>'ᄙ','ㅀ'=>'ᄚ','ﾰ'=>'ᄚ','ᄻ'=>'ᄚ','ᆶ'=>'ᄚ','ㅮ'=>'ᄜ','ᇜ'=>'ᄜ','ㅱ'=>'ᄝ','ᇢ'=>'ᄝ','ㅲ'=>'ᄞ','ㅳ'=>'ᄠ','ㅄ'=>'ᄡ','ﾴ'=>'ᄡ','ᆹ'=>'ᄡ','ㅴ'=>'ᄢ','ㅵ'=>'ᄣ','ㅶ'=>'ᄧ','ㅷ'=>'ᄩ','ㅸ'=>'ᄫ','ᇦ'=>'ᄫ','ㅹ'=>'ᄬ','ㅺ'=>'ᄭ','ᇧ'=>'ᄭ','ㅻ'=>'ᄮ','ㅼ'=>'ᄯ','ᇨ'=>'ᄯ','ᇩ'=>'ᄰ','ㅽ'=>'ᄲ','ᇪ'=>'ᄲ','ㅾ'=>'ᄶ','ㅿ'=>'ᅀ','ᇫ'=>'ᅀ','ᇬ'=>'ᅁ','ᇱ'=>'ᅅ','ㆂ'=>'ᅅ','ᇲ'=>'ᅆ','ㆃ'=>'ᅆ','ㆀ'=>'ᅇ','ᇮ'=>'ᅇ','ㆁ'=>'ᅌ','ᇰ'=>'ᅌ','ᇳ'=>'ᅖ','ㆄ'=>'ᅗ','ᇴ'=>'ᅗ','ㆅ'=>'ᅘ','ㆆ'=>'ᅙ','ᇹ'=>'ᅙ','ㅤ'=>'ᅠ','ﾠ'=>'ᅠ','ㅏ'=>'ᅡ','ￂ'=>'ᅡ','ㅐ'=>'ᅢ','ￃ'=>'ᅢ','ㅑ'=>'ᅣ','ￄ'=>'ᅣ','ㅒ'=>'ᅤ','ￅ'=>'ᅤ','ㅓ'=>'ᅥ','ￆ'=>'ᅥ','ㅔ'=>'ᅦ','ￇ'=>'ᅦ','ㅕ'=>'ᅧ','ￊ'=>'ᅧ','ㅖ'=>'ᅨ','ￋ'=>'ᅨ','ㅗ'=>'ᅩ','ￌ'=>'ᅩ','ㅘ'=>'ᅪ','ￍ'=>'ᅪ','ㅙ'=>'ᅫ','ￎ'=>'ᅫ','ㅚ'=>'ᅬ','ￏ'=>'ᅬ','ㅛ'=>'ᅭ','ￒ'=>'ᅭ','ㅜ'=>'ᅮ','ￓ'=>'ᅮ','ㅝ'=>'ᅯ','ￔ'=>'ᅯ','ㅞ'=>'ᅰ','ￕ'=>'ᅰ','ㅟ'=>'ᅱ','ￖ'=>'ᅱ','ㅠ'=>'ᅲ','ￗ'=>'ᅲ','ㅡ'=>'一','ￚ'=>'一','ㅢ'=>'ᅴ','ￛ'=>'ᅴ','ㅣ'=>'丨','ￜ'=>'丨','ㆇ'=>'ᆄ','ᆆ'=>'ᆄ','ㆈ'=>'ᆅ','ㆉ'=>'ᆈ','ㆊ'=>'ᆑ','ㆋ'=>'ᆒ','ㆌ'=>'ᆔ','ㆍ'=>'ᆞ','ㆎ'=>'ᆡ','ㄳ'=>'ᆪ','ﾣ'=>'ᆪ','ㄵ'=>'ᆬ','ﾥ'=>'ᆬ','ㄶ'=>'ᆭ','ﾦ'=>'ᆭ','ㄺ'=>'ᆰ','ﾪ'=>'ᆰ','ㄻ'=>'ᆱ','ﾫ'=>'ᆱ','ㄼ'=>'ᆲ','ﾬ'=>'ᆲ','ㄽ'=>'ᆳ','ﾭ'=>'ᆳ','ㄾ'=>'ᆴ','ﾮ'=>'ᆴ','ㄿ'=>'ᆵ','ﾯ'=>'ᆵ','ㅧ'=>'ᇇ','ㅨ'=>'ᇈ','ㅩ'=>'ᇌ','ㅪ'=>'ᇎ','ㅫ'=>'ᇓ','ㅬ'=>'ᇗ','ㅭ'=>'ᇙ','ㅯ'=>'ᇝ','ㅰ'=>'ᇟ','ｧ'=>'ァ','ｱ'=>'ア','ｨ'=>'ィ','ｲ'=>'イ','ｩ'=>'ゥ','ｳ'=>'ウ','ｪ'=>'ェ','ｴ'=>'エ','ｫ'=>'ォ','ｵ'=>'オ','ｶ'=>'カ','ｷ'=>'キ','ｸ'=>'ク','ｹ'=>'ケ','ｺ'=>'コ','ｻ'=>'サ','ｼ'=>'シ','ｽ'=>'ス','ｾ'=>'セ','ｿ'=>'ソ','ﾀ'=>'タ','ﾁ'=>'チ','ｯ'=>'ッ','ﾂ'=>'ツ','ﾃ'=>'テ','ﾄ'=>'ト','ﾅ'=>'ナ','ﾆ'=>'ニ','ﾇ'=>'ヌ','ﾈ'=>'ネ','ﾉ'=>'ノ','ﾊ'=>'ハ','ﾋ'=>'ヒ','ﾌ'=>'フ','ﾍ'=>'へ','ﾎ'=>'ホ','ﾏ'=>'マ','⧄'=>'〼','ﾐ'=>'ミ','ﾑ'=>'ム','ﾒ'=>'メ','ﾓ'=>'モ','ｬ'=>'ャ','ﾔ'=>'ヤ','ｭ'=>'ュ','ﾕ'=>'ユ','ｮ'=>'ョ','ﾖ'=>'ヨ','ﾗ'=>'ラ','ﾘ'=>'リ','ﾙ'=>'ル','ﾚ'=>'レ','ﾛ'=>'ロ','ﾜ'=>'ワ','ｦ'=>'ヲ','ﾝ'=>'ン','꒞'=>'ꁊ','꒬'=>'ꁐ','꒜'=>'ꃀ','꒿'=>'ꉙ','꒾'=>'ꊱ','꓀'=>'ꎫ','꓂'=>'ꎵ','꒺'=>'ꎿ','꒰'=>'ꏂ','𐒠'=>'𐒆','—'=>'一','―'=>'一','−'=>'一','─'=>'一','⼀'=>'一','不'=>'不','並'=>'並','|'=>'丨','｜'=>'丨','∣'=>'丨','⼁'=>'丨','‖'=>'丨丨','∥'=>'丨丨','串'=>'串','⼂'=>'丶','丸'=>'丸','丹'=>'丹','丽'=>'丽','⼃'=>'丿','乁'=>'乁','⼄'=>'乙','亂'=>'亂','⼅'=>'亅','了'=>'了','⼆'=>'二','⼇'=>'亠','亮'=>'亮','⼈'=>'人','什'=>'什','仌'=>'仌','令'=>'令','你'=>'你','倂'=>'併','倂'=>'併','侀'=>'侀','來'=>'來','例'=>'例','侮'=>'侮','侮'=>'侮','侻'=>'侻','便'=>'便','值'=>'値','倫'=>'倫','偺'=>'偺','備'=>'備','像'=>'像','僚'=>'僚','僧'=>'僧','僧'=>'僧','⼉'=>'儿','兀'=>'兀','充'=>'充','免'=>'免','免'=>'免','兔'=>'兔','兤'=>'兤','⼊'=>'入','內'=>'內','全'=>'全','兩'=>'兩','⼋'=>'八','六'=>'六','具'=>'具','冀'=>'冀','⼌'=>'冂','再'=>'再','冒'=>'冒','冕'=>'冕','⼍'=>'冖','冗'=>'冗','冤'=>'冤','⼎'=>'冫','冬'=>'冬','况'=>'况','况'=>'况','冷'=>'冷','凉'=>'凉','凌'=>'凌','凜'=>'凜','凞'=>'凞','⼏'=>'几','凵'=>'凵','⼐'=>'凵','⼑'=>'刀','刃'=>'刃','切'=>'切','切'=>'切','列'=>'列','利'=>'利','刺'=>'刺','刻'=>'刻','剆'=>'剆','割'=>'割','剷'=>'剷','劉'=>'劉','力'=>'力','⼒'=>'力','劣'=>'劣','劳'=>'劳','勇'=>'勇','勇'=>'勇','勉'=>'勉','勉'=>'勉','勒'=>'勒','勞'=>'勞','勤'=>'勤','勤'=>'勤','勵'=>'勵','⼓'=>'勹','勺'=>'勺','勺'=>'勺','包'=>'包','匆'=>'匆','⼔'=>'匕','北'=>'北','北'=>'北','⼕'=>'匚','⼖'=>'匸','匿'=>'匿','⼗'=>'十','〸'=>'十','〹'=>'卄','〺'=>'卅','卉'=>'卉','卑'=>'卑','卑'=>'卑','博'=>'博','⼘'=>'卜','⼙'=>'卩','即'=>'即','卵'=>'卵','卽'=>'卽','卿'=>'卿','卿'=>'卿','卿'=>'卿','⼚'=>'厂','⼛'=>'厶','參'=>'參','⼜'=>'又','及'=>'及','叟'=>'叟','⼝'=>'口','句'=>'句','叫'=>'叫','叱'=>'叱','吆'=>'吆','吏'=>'吏','吝'=>'吝','吸'=>'吸','呂'=>'呂','呈'=>'呈','周'=>'周','咞'=>'咞','咢'=>'咢','咽'=>'咽','哶'=>'哶','唐'=>'唐','啓'=>'啓','啟'=>'啓','啕'=>'啕','啣'=>'啣','善'=>'善','善'=>'善','喇'=>'喇','喙'=>'喙','喙'=>'喙','喝'=>'喝','喝'=>'喝','喫'=>'喫','喳'=>'喳','嗀'=>'嗀','嗂'=>'嗂','嗢'=>'嗢','嘆'=>'嘆','嘆'=>'嘆','噑'=>'噑','器'=>'器','噴'=>'噴','⼞'=>'囗','囹'=>'囹','圖'=>'圖','圗'=>'圗','⼟'=>'土','型'=>'型','城'=>'城','埴'=>'埴','堍'=>'堍','報'=>'報','堲'=>'堲','塀'=>'塀','塚'=>'塚','塚'=>'塚','塞'=>'塞','填'=>'塡','墨'=>'墨','壿'=>'墫','墬'=>'墬','墳'=>'墳','壘'=>'壘','壟'=>'壟','⼠'=>'士','壮'=>'壮','売'=>'売','壷'=>'壷','⼡'=>'夂','夆'=>'夆','⼢'=>'夊','⼣'=>'夕','多'=>'多','夢'=>'夢','⼤'=>'大','奄'=>'奄','奈'=>'奈','契'=>'契','奔'=>'奔','奢'=>'奢','女'=>'女','⼥'=>'女','姘'=>'姘','姬'=>'姬','娛'=>'娛','娧'=>'娧','婢'=>'婢','婦'=>'婦','嬀'=>'媯','媵'=>'媵','嬈'=>'嬈','嬨'=>'嬨','嬾'=>'嬾','嬾'=>'嬾','⼦'=>'子','⼧'=>'宀','宅'=>'宅','寃'=>'寃','寘'=>'寘','寧'=>'寧','寧'=>'寧','寧'=>'寧','寮'=>'寮','寳'=>'寳','⼨'=>'寸','寿'=>'寿','将'=>'将','⼩'=>'小','尢'=>'尢','⼪'=>'尢','⼫'=>'尸','尿'=>'尿','屠'=>'屠','屢'=>'屢','層'=>'層','履'=>'履','屮'=>'屮','屮'=>'屮','⼬'=>'屮','⼭'=>'山','岍'=>'岍','峀'=>'峀','崙'=>'崙','嵃'=>'嵃','嵐'=>'嵐','嵫'=>'嵫','嵮'=>'嵮','嵼'=>'嵼','嶲'=>'嶲','嶺'=>'嶺','⼮'=>'巛','巡'=>'巡','巢'=>'巢','⼯'=>'工','⼰'=>'己','巽'=>'巽','⼱'=>'巾','帲'=>'帡','帨'=>'帨','帽'=>'帽','幩'=>'幩','⼲'=>'干','年'=>'年','⼳'=>'幺','⼴'=>'广','度'=>'度','庰'=>'庰','庳'=>'庳','庶'=>'庶','廉'=>'廉','廊'=>'廊','廊'=>'廊','廒'=>'廒','廓'=>'廓','廙'=>'廙','廬'=>'廬','⼵'=>'廴','廾'=>'廾','⼶'=>'廾','弄'=>'弄','⼷'=>'弋','⼸'=>'弓','弢'=>'弢','弢'=>'弢','⼹'=>'彐','当'=>'当','⼺'=>'彡','形'=>'形','彩'=>'彩','彫'=>'彫','⼻'=>'彳','律'=>'律','徚'=>'徚','復'=>'復','徭'=>'徭','⼼'=>'心','忍'=>'忍','志'=>'志','念'=>'念','忹'=>'忹','怒'=>'怒','怜'=>'怜','悁'=>'悁','悔'=>'悔','悔'=>'悔','惇'=>'惇','惘'=>'惘','惡'=>'惡','愈'=>'愈','慄'=>'慄','慈'=>'慈','慌'=>'慌','慌'=>'慌','慎'=>'慎','慎'=>'慎','慠'=>'慠','慨'=>'慨','慺'=>'慺','憎'=>'憎','憎'=>'憎','憎'=>'憎','憐'=>'憐','憤'=>'憤','憯'=>'憯','憲'=>'憲','懞'=>'懞','懲'=>'懲','懲'=>'懲','懲'=>'懲','懶'=>'懶','懶'=>'懶','戀'=>'戀','⼽'=>'戈','成'=>'成','戛'=>'戛','戮'=>'戮','戴'=>'戴','⼾'=>'戶','⼿'=>'手','扝'=>'扝','抱'=>'抱','拉'=>'拉','拏'=>'拏','拓'=>'拓','拔'=>'拔','拼'=>'拼','拾'=>'拾','挽'=>'挽','捐'=>'捐','捨'=>'捨','捻'=>'捻','掃'=>'掃','掠'=>'掠','掩'=>'掩','揄'=>'揄','揅'=>'揅','揤'=>'揤','㩁'=>'搉','搜'=>'搜','搢'=>'搢','摒'=>'摒','摩'=>'摩','摷'=>'摷','摾'=>'摾','撚'=>'撚','撝'=>'撝','擄'=>'擄','⽀'=>'支','⽁'=>'攴','敏'=>'敏','敏'=>'敏','敖'=>'敖','敬'=>'敬','數'=>'數','⽂'=>'文','⽃'=>'斗','料'=>'料','⽄'=>'斤','⽅'=>'方','旅'=>'旅','⽆'=>'无','既'=>'既','旣'=>'旣','⽇'=>'日','易'=>'易','晉'=>'晉','晩'=>'晚','䀿'=>'晣','晴'=>'晴','晴'=>'晴','暈'=>'暈','暑'=>'暑','暑'=>'暑','暜'=>'暜','暴'=>'暴','曆'=>'曆','⽈'=>'曰','更'=>'更','㫚'=>'曶','書'=>'書','最'=>'最','⽉'=>'月','肦'=>'朌','胐'=>'朏','胊'=>'朐','脁'=>'朓','朗'=>'朗','朗'=>'朗','朗'=>'朗','脧'=>'朘','望'=>'望','望'=>'望','朡'=>'朡','膧'=>'朣','⽊'=>'木','李'=>'李','杓'=>'杓','杖'=>'杖','杞'=>'杞','柿'=>'杮','杻'=>'杻','枅'=>'枅','林'=>'林','柳'=>'柳','柺'=>'柺','栗'=>'栗','栟'=>'栟','桒'=>'桒','梁'=>'梁','梅'=>'梅','梅'=>'梅','梎'=>'梎','梨'=>'梨','椔'=>'椔','楂'=>'楂','樧'=>'榝','榣'=>'榣','槪'=>'槪','樂'=>'樂','樂'=>'樂','樂'=>'樂','樓'=>'樓','檨'=>'檨','櫓'=>'櫓','櫛'=>'櫛','欄'=>'欄','⽋'=>'欠','次'=>'次','歔'=>'歔','⽌'=>'止','歲'=>'歲','歷'=>'歷','歹'=>'歹','⽍'=>'歹','殟'=>'殟','殮'=>'殮','⽎'=>'殳','殺'=>'殺','殺'=>'殺','殺'=>'殺','殻'=>'殻','⽏'=>'毋','⺟'=>'母','⽐'=>'比','⽑'=>'毛','⽒'=>'氏','⽓'=>'气','⽔'=>'水','汎'=>'汎','汧'=>'汧','沈'=>'沈','沿'=>'沿','泌'=>'泌','泍'=>'泍','泥'=>'泥','洖'=>'洖','洛'=>'洛','洞'=>'洞','洴'=>'洴','派'=>'派','流'=>'流','流'=>'流','流'=>'流','浩'=>'浩','浪'=>'浪','海'=>'海','海'=>'海','浸'=>'浸','涅'=>'涅','淋'=>'淋','淚'=>'淚','淪'=>'淪','淹'=>'淹','渚'=>'渚','港'=>'港','湮'=>'湮','潙'=>'溈','溜'=>'溜','溺'=>'溺','滇'=>'滇','滋'=>'滋','滋'=>'滋','滑'=>'滑','滛'=>'滛','漏'=>'漏','漢'=>'漢','漢'=>'漢','漣'=>'漣','潮'=>'潮','濆'=>'濆','濫'=>'濫','濾'=>'濾','瀛'=>'瀛','瀞'=>'瀞','瀞'=>'瀞','瀹'=>'瀹','灊'=>'灊','⽕'=>'火','灰'=>'灰','灷'=>'灷','災'=>'災','炙'=>'炙','炭'=>'炭','烈'=>'烈','烙'=>'烙','煅'=>'煅','煉'=>'煉','煮'=>'煮','煮'=>'煮','熜'=>'熜','燎'=>'燎','燐'=>'燐','爐'=>'爐','爛'=>'爛','爨'=>'爨','⽖'=>'爪','爫'=>'爫','⺤'=>'爫','爵'=>'爵','爵'=>'爵','⽗'=>'父','⽘'=>'爻','⽙'=>'爿','⽚'=>'片','牐'=>'牐','⽛'=>'牙','⽜'=>'牛','牢'=>'牢','犀'=>'犀','犕'=>'犕','⽝'=>'犬','犯'=>'犯','狀'=>'狀','狼'=>'狼','猪'=>'猪','猪'=>'猪','獵'=>'獵','獺'=>'獺','⽞'=>'玄','率'=>'率','率'=>'率','⽟'=>'玉','王'=>'王','玥'=>'玥','玲'=>'玲','珞'=>'珞','理'=>'理','琉'=>'琉','琢'=>'琢','瑇'=>'瑇','瑜'=>'瑜','瑩'=>'瑩','瑱'=>'瑱','瑱'=>'瑱','璅'=>'璅','璉'=>'璉','璘'=>'璘','瓊'=>'瓊','⽠'=>'瓜','⽡'=>'瓦','甆'=>'甆','⽢'=>'甘','⽣'=>'生','甤'=>'甤','⽤'=>'用','⽥'=>'田','画'=>'画','甾'=>'甾','留'=>'留','略'=>'略','異'=>'異','異'=>'異','⽦'=>'疋','⽧'=>'疒','痢'=>'痢','瘐'=>'瘐','瘝'=>'瘝','瘟'=>'瘟','療'=>'療','癩'=>'癩','⽨'=>'癶','⽩'=>'白','⽪'=>'皮','⽫'=>'皿','益'=>'益','益'=>'益','盛'=>'盛','盧'=>'盧','⽬'=>'目','直'=>'直','直'=>'直','省'=>'省','眞'=>'眞','真'=>'真','真'=>'真','着'=>'着','睊'=>'睊','睊'=>'睊','瞋'=>'瞋','瞧'=>'瞧','⽭'=>'矛','⽮'=>'矢','⽯'=>'石','硏'=>'研','硎'=>'硎','硫'=>'硫','碌'=>'碌','碌'=>'碌','碑'=>'碑','磊'=>'磊','磌'=>'磌','磌'=>'磌','磻'=>'磻','礪'=>'礪','⽰'=>'示','礼'=>'礼','社'=>'社','祈'=>'祈','祉'=>'祉','祐'=>'祐','祖'=>'祖','祖'=>'祖','祝'=>'祝','神'=>'神','祥'=>'祥','祿'=>'祿','禍'=>'禍','禎'=>'禎','福'=>'福','福'=>'福','禮'=>'禮','⽱'=>'禸','⽲'=>'禾','秊'=>'秊','秫'=>'秫','稜'=>'稜','穀'=>'穀','穀'=>'穀','穊'=>'穊','穏'=>'穏','⽳'=>'穴','突'=>'突','窱'=>'窱','立'=>'立','⽴'=>'立','竮'=>'竮','⽵'=>'竹','笠'=>'笠','節'=>'節','節'=>'節','篆'=>'篆','築'=>'築','簾'=>'簾','籠'=>'籠','⽶'=>'米','类'=>'类','粒'=>'粒','精'=>'精','糒'=>'糒','糖'=>'糖','糣'=>'糣','糧'=>'糧','糨'=>'糨','⽷'=>'糸','紀'=>'紀','紐'=>'紐','索'=>'索','累'=>'累','絶'=>'絕','絛'=>'絛','絣'=>'絣','綠'=>'綠','綾'=>'綾','緇'=>'緇','練'=>'練','練'=>'練','練'=>'練','縂'=>'縂','縉'=>'縉','縷'=>'縷','繁'=>'繁','繅'=>'繅','⽸'=>'缶','缾'=>'缾','⽹'=>'网','⺫'=>'罒','署'=>'署','罹'=>'罹','罺'=>'罺','羅'=>'羅','⽺'=>'羊','羕'=>'羕','羚'=>'羚','羽'=>'羽','⽻'=>'羽','翺'=>'翺','老'=>'老','⽼'=>'老','者'=>'者','者'=>'者','者'=>'者','⽽'=>'而','⽾'=>'耒','⽿'=>'耳','聆'=>'聆','聠'=>'聠','聯'=>'聯','聰'=>'聰','聾'=>'聾','⾀'=>'聿','⾁'=>'肉','肋'=>'肋','肭'=>'肭','育'=>'育','㬵'=>'胶','腁'=>'胼','脃'=>'脃','脾'=>'脾','臘'=>'臘','⾂'=>'臣','臨'=>'臨','⾃'=>'自','臭'=>'臭','⾄'=>'至','⾅'=>'臼','舁'=>'舁','舁'=>'舁','舄'=>'舄','⾆'=>'舌','⾇'=>'舛','⾈'=>'舟','⾉'=>'艮','良'=>'良','⾊'=>'色','⾋'=>'艸','艹'=>'艹','艹'=>'艹','芋'=>'芋','芑'=>'芑','芝'=>'芝','花'=>'花','芳'=>'芳','芽'=>'芽','若'=>'若','若'=>'若','苦'=>'苦','茝'=>'茝','茣'=>'茣','茶'=>'茶','荒'=>'荒','荓'=>'荓','荣'=>'荣','莭'=>'莭','莽'=>'莽','菉'=>'菉','菊'=>'菊','菌'=>'菌','菜'=>'菜','菧'=>'菧','華'=>'華','菱'=>'菱','落'=>'落','葉'=>'葉','著'=>'著','著'=>'著','蔿'=>'蒍','蓮'=>'蓮','蓱'=>'蓱','蓳'=>'蓳','蓼'=>'蓼','蔖'=>'蔖','蕤'=>'蕤','藍'=>'藍','藺'=>'藺','蘆'=>'蘆','蘒'=>'蘒','蘭'=>'蘭','虁'=>'蘷','蘿'=>'蘿','⾌'=>'虍','虐'=>'虐','虜'=>'虜','虜'=>'虜','虧'=>'虧','虩'=>'虩','⾍'=>'虫','蚈'=>'蚈','蚩'=>'蚩','蛢'=>'蛢','蜎'=>'蜎','蜨'=>'蜨','蝫'=>'蝫','蝹'=>'蝹','蝹'=>'蝹','螆'=>'螆','螺'=>'螺','蟡'=>'蟡','蠁'=>'蠁','蠟'=>'蠟','⾎'=>'血','行'=>'行','⾏'=>'行','衠'=>'衠','衣'=>'衣','⾐'=>'衣','裂'=>'裂','裏'=>'裏','裗'=>'裗','裞'=>'裞','裡'=>'裡','裸'=>'裸','裺'=>'裺','褐'=>'褐','襁'=>'襁','襤'=>'襤','⾑'=>'襾','覆'=>'覆','見'=>'見','⾒'=>'見','視'=>'視','視'=>'視','⾓'=>'角','⾔'=>'言','䚶'=>'訞','詽'=>'訮','誠'=>'誠','說'=>'說','說'=>'說','調'=>'調','請'=>'請','諒'=>'諒','論'=>'論','諭'=>'諭','諭'=>'諭','諸'=>'諸','諸'=>'諸','諾'=>'諾','諾'=>'諾','謁'=>'謁','謁'=>'謁','謹'=>'謹','謹'=>'謹','識'=>'識','讀'=>'讀','讏'=>'讆','變'=>'變','變'=>'變','⾕'=>'谷','⾖'=>'豆','豈'=>'豈','豕'=>'豕','⾗'=>'豕','⾘'=>'豸','⾙'=>'貝','貫'=>'貫','賁'=>'賁','賂'=>'賂','賈'=>'賈','賓'=>'賓','贈'=>'贈','贈'=>'贈','贛'=>'贛','⾚'=>'赤','⾛'=>'走','起'=>'起','趆'=>'赿','⾜'=>'足','趼'=>'趼','跋'=>'跋','跺'=>'跥','路'=>'路','跰'=>'跰','躛'=>'躗','⾝'=>'身','車'=>'車','⾞'=>'車','軔'=>'軔','輧'=>'軿','輦'=>'輦','輪'=>'輪','輸'=>'輸','輸'=>'輸','輻'=>'輻','轢'=>'轢','⾟'=>'辛','辞'=>'辞','辰'=>'辰','⾠'=>'辰','⾡'=>'辵','辶'=>'辶','⻌'=>'辶','連'=>'連','逸'=>'逸','逸'=>'逸','遲'=>'遲','遼'=>'遼','邏'=>'邏','⾢'=>'邑','邔'=>'邔','郎'=>'郎','郱'=>'郱','都'=>'都','鄑'=>'鄑','鄛'=>'鄛','⾣'=>'酉','酪'=>'酪','醙'=>'醙','醴'=>'醴','⾤'=>'釆','里'=>'里','⾥'=>'里','量'=>'量','金'=>'金','⾦'=>'金','鈴'=>'鈴','鈸'=>'鈸','鉶'=>'鉶','鉼'=>'鉼','鋗'=>'鋗','鋘'=>'鋘','錄'=>'錄','鍊'=>'鍊','鎮'=>'鎭','鏹'=>'鏹','鐕'=>'鐕','⾧'=>'長','⾨'=>'門','開'=>'開','閭'=>'閭','閷'=>'閷','⾩'=>'阜','阮'=>'阮','陋'=>'陋','降'=>'降','陵'=>'陵','陸'=>'陸','陼'=>'陼','隆'=>'隆','隣'=>'隣','⾪'=>'隶','隸'=>'隸','⾫'=>'隹','雃'=>'雃','離'=>'離','難'=>'難','難'=>'難','⾬'=>'雨','零'=>'零','雷'=>'雷','霣'=>'霣','露'=>'露','靈'=>'靈','⾭'=>'靑','靖'=>'靖','靖'=>'靖','⾮'=>'非','⾯'=>'面','⾰'=>'革','⾱'=>'韋','韛'=>'韛','韠'=>'韠','⾲'=>'韭','⾳'=>'音','響'=>'響','響'=>'響','⾴'=>'頁','頋'=>'頋','頋'=>'頋','頋'=>'頋','領'=>'領','頩'=>'頩','頻'=>'頻','頻'=>'頻','類'=>'類','⾵'=>'風','⾶'=>'飛','⻝'=>'食','⾷'=>'食','飢'=>'飢','飯'=>'飯','飼'=>'飼','館'=>'館','餩'=>'餩','⾸'=>'首','⾹'=>'香','馧'=>'馧','⾺'=>'馬','駂'=>'駂','駱'=>'駱','駾'=>'駾','驪'=>'驪','⾻'=>'骨','⾼'=>'高','⾽'=>'髟','鬒'=>'鬒','鬒'=>'鬒','⾾'=>'鬥','⾿'=>'鬯','⿀'=>'鬲','⿁'=>'鬼','⿂'=>'魚','魯'=>'魯','鱀'=>'鱀','鱗'=>'鱗','⿃'=>'鳥','鳽'=>'鳽','鵧'=>'鵧','鶴'=>'鶴','鷺'=>'鷺','鸞'=>'鸞','鹃'=>'鹂','⿄'=>'鹵','鹿'=>'鹿','⿅'=>'鹿','麗'=>'麗','麟'=>'麟','⿆'=>'麥','麻'=>'麻','⿇'=>'麻','⿈'=>'黃','⿉'=>'黍','黎'=>'黎','⿊'=>'黑','黹'=>'黹','⿋'=>'黹','⿌'=>'黽','黾'=>'黾','鼅'=>'鼅','⿍'=>'鼎','鼏'=>'鼏','⿎'=>'鼓','鼖'=>'鼖','⿏'=>'鼠','鼻'=>'鼻','⿐'=>'鼻','齃'=>'齃','⿑'=>'齊','⿒'=>'齒','龍'=>'龍','⿓'=>'龍','龎'=>'龎','龜'=>'龜','龜'=>'龜','龜'=>'龜','⿔'=>'龜','⻳'=>'龟','⿕'=>'龠','㒞'=>'㒞','㒹'=>'㒹','㒻'=>'㒻','㓟'=>'㓟','㔕'=>'㔕','䎛'=>'㖈','㛮'=>'㛮','㛼'=>'㛼','㞁'=>'㞁','㠯'=>'㠯','㡢'=>'㡢','㡼'=>'㡼','㣇'=>'㣇','㣣'=>'㣣','㤜'=>'㤜','㤺'=>'㤺','㨮'=>'㨮','㩬'=>'㩬','㫤'=>'㫤','㬈'=>'㬈','㬙'=>'㬙','䐠'=>'㬻','㭉'=>'㭉','㮝'=>'㮝','㮝'=>'㮝','㰘'=>'㰘','㱎'=>'㱎','㴳'=>'㴳','㶖'=>'㶖','㺬'=>'㺬','㺸'=>'㺸','㺸'=>'㺸','㼛'=>'㼛','㿼'=>'㿼','䀈'=>'䀈','䀘'=>'䀘','䀹'=>'䀹','䀹'=>'䀹','䁆'=>'䁆','䂖'=>'䂖','䃣'=>'䃣','䄯'=>'䄯','䈂'=>'䈂','䈧'=>'䈧','䊠'=>'䊠','䌁'=>'䌁','䌴'=>'䌴','䍙'=>'䍙','䏕'=>'䏕','䏙'=>'䏙','䐋'=>'䐋','䑫'=>'䑫','䔫'=>'䔫','䕝'=>'䕝','䕡'=>'䕡','䕫'=>'䕫','䗗'=>'䗗','䗹'=>'䗹','䘵'=>'䘵','䚾'=>'䚾','䛇'=>'䛇','䦕'=>'䦕','䧦'=>'䧦','䩮'=>'䩮','䩶'=>'䩶','䪲'=>'䪲','䬳'=>'䬳','䯎'=>'䯎','䳎'=>'䳎','䳭'=>'䳭','䳸'=>'䳸','䵖'=>'䵖','𠄢'=>'𠄢','𠔜'=>'𠔜','𠔥'=>'𠔥','𠕋'=>'𠕋','𠘺'=>'𠘺','𠠄'=>'𠠄','𠣞'=>'𠣞','𠨬'=>'𠨬','𠭣'=>'𠭣','𡓤'=>'𡓤','𡚨'=>'𡚨','𡛪'=>'𡛪','𡧈'=>'𡧈','𡬘'=>'𡬘','𡴋'=>'𡴋','𡷤'=>'𡷤','𡷦'=>'𡷦','𢆃'=>'𢆃','𢆟'=>'𢆟','𢌱'=>'𢌱','𢌱'=>'𢌱','𢛔'=>'𢛔','𢡄'=>'𢡄','𢡊'=>'𢡊','𢬌'=>'𢬌','𢯱'=>'𢯱','𣀊'=>'𣀊','𣊸'=>'𣊸','𣍟'=>'𣍟','𣎓'=>'𣎓','𣎜'=>'𣎜','𣏃'=>'𣏃','𣏕'=>'𣏕','𣑭'=>'𣑭','𣚣'=>'𣚣','𣢧'=>'𣢧','𣪍'=>'𣪍','𣫺'=>'𣫺','𣲼'=>'𣲼','𣴞'=>'𣴞','𣻑'=>'𣻑','𣽞'=>'𣽞','𣾎'=>'𣾎','𤉣'=>'𤉣','𤎫'=>'𤎫','𤘈'=>'𤘈','𤜵'=>'𤜵','𤠔'=>'𤠔','𤰶'=>'𤰶','𤲒'=>'𤲒','𤾡'=>'𤾡','𤾸'=>'𤾸','𥁄'=>'𥁄','𥃲'=>'𥃲','𥃳'=>'𥃳','𥄙'=>'𥄙','𥄳'=>'𥄳','𥉉'=>'𥉉','𥐝'=>'𥐝','𥘦'=>'𥘦','𥚚'=>'𥚚','𥛅'=>'𥛅','𥥼'=>'𥥼','𥪧'=>'𥪧','𥪧'=>'𥪧','𥮫'=>'𥮫','𥲀'=>'𥲀','𥳐'=>'𥳐','𥾆'=>'𥾆','𦇚'=>'𦇚','𦈨'=>'𦈨','𦉇'=>'𦉇','𦋙'=>'𦋙','𦌾'=>'𦌾','𦓚'=>'𦓚','𦔣'=>'𦔣','𦖨'=>'𦖨','𦞧'=>'𦞧','𦞵'=>'𦞵','𦬼'=>'𦬼','𦰶'=>'𦰶','𦳕'=>'𦳕','𦵫'=>'𦵫','𦼬'=>'𦼬','𦾱'=>'𦾱','𧃒'=>'𧃒','𧏊'=>'𧏊','𧙧'=>'𧙧','𧢮'=>'𧢮','𧥦'=>'𧥦','𧲨'=>'𧲨','𧻓'=>'𧻓','𧼯'=>'𧼯','𨗒'=>'𨗒','𨗭'=>'𨗭','𨜮'=>'𨜮','𨯺'=>'𨯺','𨵷'=>'𨵷','𩅅'=>'𩅅','𩇟'=>'𩇟','𩈚'=>'𩈚','𩐊'=>'𩐊','𩒖'=>'𩒖','𩖶'=>'𩖶','𩬰'=>'𩬰','𪃎'=>'𪃎','𪄅'=>'𪄅','𪈎'=>'𪈎','𪊑'=>'𪊑','𪎒'=>'𪎒','𪘀'=>'𪘀','℃'=>'°C','℉'=>'°F','ℇ'=>'Ɛ','℻'=>'FAX','ℕ'=>'N','№'=>'No','ℚ'=>'Q','₨'=>'Rs','𝐓'=>'T','℡'=>'TEL','𝐔'=>'U','𝐖'=>'W','₩'=>'W̵','𝐗'=>'X','¥'=>'Y̵','𝚲'=>'Λ','𝚵'=>'Ξ','ℿ'=>'Π','ϲ'=>'c','ϒ'=>'Y','𝚽'=>'Φ','𝚿'=>'Ψ','ѣ'=>'Ь̵','ਃ'=>'ঃ','ಃ'=>'ః','່'=>'่','់'=>'่','້'=>'้','໊'=>'๊','໋'=>'๋','៕'=>'๚','៚'=>'๛','ъ'=>'ˉb','៙'=>'๏','೧'=>'౧','૨'=>'२','೨'=>'౨','૩'=>'३','૪'=>'४','૮'=>'८','೯'=>'౯','а'=>'a','Ꮟ'=>'b','ᖯ'=>'b','с'=>'c','ԁ'=>'d','ᑯ'=>'d','е'=>'e','ә'=>'ǝ','ε'=>'ɛ','є'=>'ɛ','ք'=>'f','ց'=>'g','һ'=>'h','հ'=>'h','Ꮒ'=>'h','Ᏺ'=>'h̔','ι'=>'i','і'=>'i','Ꭵ'=>'i','ј'=>'j','յ'=>'j','ᗰ'=>'m','ո'=>'n','η'=>'n̩','ం'=>'o','ಂ'=>'o','ം'=>'o','०'=>'o','੦'=>'o','૦'=>'o','๐'=>'o','໐'=>'o','ο'=>'o','о'=>'o','օ'=>'o','ဝ'=>'o','ρ'=>'p','р'=>'p','ᴩ'=>'ᴘ','գ'=>'q','κ'=>'ĸ','к'=>'ĸ','ᴦ'=>'r','г'=>'r','ѕ'=>'s','υ'=>'u','ս'=>'u','ν'=>'v','ѵ'=>'v','Ꮃ'=>'w','ᗯ'=>'w','х'=>'x','ᕁ'=>'x','у'=>'y','Ꭹ'=>'y','ӡ'=>'ʒ','ჳ'=>'ʒ','ϩ'=>'ƨ','ь'=>'ƅ','ы'=>'ƅi','ɑ'=>'α','ծ'=>'δ','ᕷ'=>'δ','п'=>'π','ɸ'=>'φ','ф'=>'φ','ʙ'=>'в','ɜ'=>'з','ᴍ'=>'м','ʜ'=>'н','ɢ'=>'ԍ','ᴛ'=>'т','ᴙ'=>'я','ઽ'=>'ऽ','ુ'=>'ु','ૂ'=>'ू','ੋ'=>'ॆ','੍'=>'्','્'=>'्','ഉ'=>'உ','ജ'=>'ஐ','ണ'=>'ண','ഴ'=>'ழ','ി'=>'ி','ു'=>'ூ','ಅ'=>'అ','ಆ'=>'ఆ','ಇ'=>'ఇ','ಒ'=>'ఒ','ಓ'=>'ఒౕ','ಜ'=>'జ','ಞ'=>'ఞ','ಣ'=>'ణ','థ'=>'ధּ','ಯ'=>'య','ఠ'=>'రּ','ಱ'=>'ఱ','ಲ'=>'ల','ඌ'=>'ന്ന','ஶ'=>'ശ','ຈ'=>'จ','ບ'=>'บ','ປ'=>'ป','ຝ'=>'ฝ','ພ'=>'พ','ຟ'=>'ฟ','ຍ'=>'ย','។'=>'ฯ','ិ'=>'ิ','ី'=>'ี','ឹ'=>'ึ','ឺ'=>'ื','ຸ'=>'ุ','ູ'=>'ู','ᗅ'=>'A','ᒍ'=>'J','ᕼ'=>'H','ᐯ'=>'V','ᑭ'=>'P','ᗷ'=>'B','ヘ'=>'へ','𐏑'=>'𐎂','𐏓'=>'𐎓','𒀸'=>'𐎚','ᅳ'=>'一','ǀ'=>'丨','ᅵ'=>'丨','Ꭺ'=>'A','Ᏼ'=>'B','Ꮯ'=>'C','ᗞ'=>'D','Ꭼ'=>'E','ᖴ'=>'F','Ꮐ'=>'G','Ꮋ'=>'H','Ꭻ'=>'J','Ꮶ'=>'K','Ꮮ'=>'L','Ꮇ'=>'M','Ꮲ'=>'P','ᖇ'=>'R','Ꮥ'=>'S','Ꮩ'=>'V','Ꮓ'=>'Z');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/search_indexer_0.php b/phpBB/includes/utf/data/search_indexer_0.php
deleted file mode 100644
index 3304b18cdd..0000000000
--- a/phpBB/includes/utf/data/search_indexer_0.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array(0=>'0',1=>'1',2=>'2',3=>'3',4=>'4',5=>'5',6=>'6',7=>'7',8=>'8',9=>'9','A'=>'a','B'=>'b','C'=>'c','D'=>'d','E'=>'e','F'=>'f','G'=>'g','H'=>'h','I'=>'i','J'=>'j','K'=>'k','L'=>'l','M'=>'m','N'=>'n','O'=>'o','P'=>'p','Q'=>'q','R'=>'r','S'=>'s','T'=>'t','U'=>'u','V'=>'v','W'=>'w','X'=>'x','Y'=>'y','Z'=>'z','a'=>'a','b'=>'b','c'=>'c','d'=>'d','e'=>'e','f'=>'f','g'=>'g','h'=>'h','i'=>'i','j'=>'j','k'=>'k','l'=>'l','m'=>'m','n'=>'n','o'=>'o','p'=>'p','q'=>'q','r'=>'r','s'=>'s','t'=>'t','u'=>'u','v'=>'v','w'=>'w','x'=>'x','y'=>'y','z'=>'z','ª'=>'ª','²'=>'2','³'=>'3','µ'=>'µ','¹'=>'1','º'=>'º','¼'=>'1/4','½'=>'1/2','¾'=>'3/4','À'=>'à','Á'=>'á','Â'=>'â','Ã'=>'ã','Ä'=>'ae','Å'=>'å','Æ'=>'ae','Ç'=>'ç','È'=>'è','É'=>'é','Ê'=>'ê','Ë'=>'ë','Ì'=>'ì','Í'=>'í','Î'=>'î','Ï'=>'ï','Ð'=>'ð','Ñ'=>'ñ','Ò'=>'ò','Ó'=>'ó','Ô'=>'ô','Õ'=>'õ','Ö'=>'oe','Ø'=>'ø','Ù'=>'ù','Ú'=>'ú','Û'=>'û','Ü'=>'ü','Ý'=>'ý','Þ'=>'þ','ß'=>'ss','à'=>'à','á'=>'á','â'=>'â','ã'=>'ã','ä'=>'ae','å'=>'å','æ'=>'ae','ç'=>'ç','è'=>'è','é'=>'é','ê'=>'ê','ë'=>'ë','ì'=>'ì','í'=>'í','î'=>'î','ï'=>'ï','ð'=>'ð','ñ'=>'ñ','ò'=>'ò','ó'=>'ó','ô'=>'ô','õ'=>'õ','ö'=>'oe','ø'=>'ø','ù'=>'ù','ú'=>'ú','û'=>'û','ü'=>'ue','ý'=>'ý','þ'=>'þ','ÿ'=>'ÿ','Ā'=>'ā','ā'=>'ā','Ă'=>'ă','ă'=>'ă','Ą'=>'ą','ą'=>'ą','Ć'=>'ć','ć'=>'ć','Ĉ'=>'ĉ','ĉ'=>'ĉ','Ċ'=>'ċ','ċ'=>'ċ','Č'=>'č','č'=>'č','Ď'=>'ď','ď'=>'ď','Đ'=>'đ','đ'=>'đ','Ē'=>'ē','ē'=>'ē','Ĕ'=>'ĕ','ĕ'=>'ĕ','Ė'=>'ė','ė'=>'ė','Ę'=>'ę','ę'=>'ę','Ě'=>'ě','ě'=>'ě','Ĝ'=>'ĝ','ĝ'=>'ĝ','Ğ'=>'ğ','ğ'=>'ğ','Ġ'=>'ġ','ġ'=>'ġ','Ģ'=>'ģ','ģ'=>'ģ','Ĥ'=>'ĥ','ĥ'=>'ĥ','Ħ'=>'ħ','ħ'=>'ħ','Ĩ'=>'ĩ','ĩ'=>'ĩ','Ī'=>'ī','ī'=>'ī','Ĭ'=>'ĭ','ĭ'=>'ĭ','Į'=>'į','į'=>'į','İ'=>'i','ı'=>'ı','Ĳ'=>'ij','ĳ'=>'ij','Ĵ'=>'ĵ','ĵ'=>'ĵ','Ķ'=>'ķ','ķ'=>'ķ','ĸ'=>'ĸ','Ĺ'=>'ĺ','ĺ'=>'ĺ','Ļ'=>'ļ','ļ'=>'ļ','Ľ'=>'ľ','ľ'=>'ľ','Ŀ'=>'ŀ','ŀ'=>'ŀ','Ł'=>'ł','ł'=>'ł','Ń'=>'ń','ń'=>'ń','Ņ'=>'ņ','ņ'=>'ņ','Ň'=>'ň','ň'=>'ň','ŉ'=>'ŉ','Ŋ'=>'ŋ','ŋ'=>'ŋ','Ō'=>'ō','ō'=>'ō','Ŏ'=>'ŏ','ŏ'=>'ŏ','Ő'=>'ő','ő'=>'ő','Œ'=>'oe','œ'=>'oe','Ŕ'=>'ŕ','ŕ'=>'ŕ','Ŗ'=>'ŗ','ŗ'=>'ŗ','Ř'=>'ř','ř'=>'ř','Ś'=>'ś','ś'=>'ś','Ŝ'=>'ŝ','ŝ'=>'ŝ','Ş'=>'ş','ş'=>'ş','Š'=>'š','š'=>'š','Ţ'=>'ţ','ţ'=>'ţ','Ť'=>'ť','ť'=>'ť','Ŧ'=>'ŧ','ŧ'=>'ŧ','Ũ'=>'ũ','ũ'=>'ũ','Ū'=>'ū','ū'=>'ū','Ŭ'=>'ŭ','ŭ'=>'ŭ','Ů'=>'ů','ů'=>'ů','Ű'=>'ű','ű'=>'ű','Ų'=>'ų','ų'=>'ų','Ŵ'=>'ŵ','ŵ'=>'ŵ','Ŷ'=>'ŷ','ŷ'=>'ŷ','Ÿ'=>'ÿ','Ź'=>'ź','ź'=>'ź','Ż'=>'ż','ż'=>'ż','Ž'=>'ž','ž'=>'ž','ſ'=>'ſ','ƀ'=>'ƀ','Ɓ'=>'ɓ','Ƃ'=>'ƃ','ƃ'=>'ƃ','Ƅ'=>'ƅ','ƅ'=>'ƅ','Ɔ'=>'ɔ','Ƈ'=>'ƈ','ƈ'=>'ƈ','Ɖ'=>'ɖ','Ɗ'=>'ɗ','Ƌ'=>'ƌ','ƌ'=>'ƌ','ƍ'=>'ƍ','Ǝ'=>'ǝ','Ə'=>'ə','Ɛ'=>'ɛ','Ƒ'=>'ƒ','ƒ'=>'ƒ','Ɠ'=>'ɠ','Ɣ'=>'ɣ','ƕ'=>'hv','Ɩ'=>'ɩ','Ɨ'=>'ɨ','Ƙ'=>'ƙ','ƙ'=>'ƙ','ƚ'=>'ƚ','ƛ'=>'ƛ','Ɯ'=>'ɯ','Ɲ'=>'ɲ','ƞ'=>'ƞ','Ɵ'=>'ɵ','Ơ'=>'ơ','ơ'=>'ơ','Ƣ'=>'oi','ƣ'=>'oi','Ƥ'=>'ƥ','ƥ'=>'ƥ','Ʀ'=>'yr','Ƨ'=>'ƨ','ƨ'=>'ƨ','Ʃ'=>'ʃ','ƪ'=>'ƪ','ƫ'=>'ƫ','Ƭ'=>'ƭ','ƭ'=>'ƭ','Ʈ'=>'ʈ','Ư'=>'ư','ư'=>'ư','Ʊ'=>'ʊ','Ʋ'=>'ʋ','Ƴ'=>'ƴ','ƴ'=>'ƴ','Ƶ'=>'ƶ','ƶ'=>'ƶ','Ʒ'=>'ʒ','Ƹ'=>'ƹ','ƹ'=>'ƹ','ƺ'=>'ƺ','ƻ'=>'ƻ','Ƽ'=>'ƽ','ƽ'=>'ƽ','ƾ'=>'ƾ','ƿ'=>'ƿ','ǀ'=>'ǀ','ǁ'=>'ǁ','ǂ'=>'ǂ','ǃ'=>'ǃ','Ǆ'=>'ǆ','ǅ'=>'ǆ','ǆ'=>'ǆ','Ǉ'=>'lj','ǈ'=>'ǉ','ǉ'=>'lj','Ǌ'=>'nj','ǋ'=>'ǌ','ǌ'=>'nj','Ǎ'=>'ǎ','ǎ'=>'ǎ','Ǐ'=>'ǐ','ǐ'=>'ǐ','Ǒ'=>'ǒ','ǒ'=>'ǒ','Ǔ'=>'ǔ','ǔ'=>'ǔ','Ǖ'=>'ǖ','ǖ'=>'ǖ','Ǘ'=>'ǘ','ǘ'=>'ǘ','Ǚ'=>'ǚ','ǚ'=>'ǚ','Ǜ'=>'ǜ','ǜ'=>'ǜ','ǝ'=>'ǝ','Ǟ'=>'ǟ','ǟ'=>'ǟ','Ǡ'=>'ǡ','ǡ'=>'ǡ','Ǣ'=>'ǣ','ǣ'=>'ǣ','Ǥ'=>'ǥ','ǥ'=>'ǥ','Ǧ'=>'ǧ','ǧ'=>'ǧ','Ǩ'=>'ǩ','ǩ'=>'ǩ','Ǫ'=>'ǫ','ǫ'=>'ǫ','Ǭ'=>'ǭ','ǭ'=>'ǭ','Ǯ'=>'ǯ','ǯ'=>'ǯ','ǰ'=>'ǰ','Ǳ'=>'dz','ǲ'=>'ǳ','ǳ'=>'dz','Ǵ'=>'ǵ','ǵ'=>'ǵ','Ƕ'=>'ƕ','Ƿ'=>'ƿ','Ǹ'=>'ǹ','ǹ'=>'ǹ','Ǻ'=>'ǻ','ǻ'=>'ǻ','Ǽ'=>'ǽ','ǽ'=>'ǽ','Ǿ'=>'ǿ','ǿ'=>'ǿ','Ȁ'=>'ȁ','ȁ'=>'ȁ','Ȃ'=>'ȃ','ȃ'=>'ȃ','Ȅ'=>'ȅ','ȅ'=>'ȅ','Ȇ'=>'ȇ','ȇ'=>'ȇ','Ȉ'=>'ȉ','ȉ'=>'ȉ','Ȋ'=>'ȋ','ȋ'=>'ȋ','Ȍ'=>'ȍ','ȍ'=>'ȍ','Ȏ'=>'ȏ','ȏ'=>'ȏ','Ȑ'=>'ȑ','ȑ'=>'ȑ','Ȓ'=>'ȓ','ȓ'=>'ȓ','Ȕ'=>'ȕ','ȕ'=>'ȕ','Ȗ'=>'ȗ','ȗ'=>'ȗ','Ș'=>'ș','ș'=>'ș','Ț'=>'ț','ț'=>'ț','Ȝ'=>'ȝ','ȝ'=>'ȝ','Ȟ'=>'ȟ','ȟ'=>'ȟ','Ƞ'=>'ƞ','ȡ'=>'ȡ','Ȣ'=>'ou','ȣ'=>'ou','Ȥ'=>'ȥ','ȥ'=>'ȥ','Ȧ'=>'ȧ','ȧ'=>'ȧ','Ȩ'=>'ȩ','ȩ'=>'ȩ','Ȫ'=>'ȫ','ȫ'=>'ȫ','Ȭ'=>'ȭ','ȭ'=>'ȭ','Ȯ'=>'ȯ','ȯ'=>'ȯ','Ȱ'=>'ȱ','ȱ'=>'ȱ','Ȳ'=>'ȳ','ȳ'=>'ȳ','ȴ'=>'ȴ','ȵ'=>'ȵ','ȶ'=>'ȶ','ȷ'=>'ȷ','ȸ'=>'ȸ','ȹ'=>'ȹ','Ⱥ'=>'ⱥ','Ȼ'=>'ȼ','ȼ'=>'ȼ','Ƚ'=>'ƚ','Ⱦ'=>'ⱦ','ȿ'=>'ȿ','ɀ'=>'ɀ','Ɂ'=>'ɂ','ɂ'=>'ɂ','Ƀ'=>'ƀ','Ʉ'=>'ʉ','Ʌ'=>'ʌ','Ɇ'=>'ɇ','ɇ'=>'ɇ','Ɉ'=>'ɉ','ɉ'=>'ɉ','Ɋ'=>'ɋ','ɋ'=>'ɋ','Ɍ'=>'ɍ','ɍ'=>'ɍ','Ɏ'=>'ɏ','ɏ'=>'ɏ','ɐ'=>'ɐ','ɑ'=>'ɑ','ɒ'=>'ɒ','ɓ'=>'ɓ','ɔ'=>'ɔ','ɕ'=>'ɕ','ɖ'=>'ɖ','ɗ'=>'ɗ','ɘ'=>'ɘ','ə'=>'ə','ɚ'=>'ɚ','ɛ'=>'ɛ','ɜ'=>'ɜ','ɝ'=>'ɝ','ɞ'=>'ɞ','ɟ'=>'ɟ','ɠ'=>'ɠ','ɡ'=>'ɡ','ɢ'=>'ɢ','ɣ'=>'ɣ','ɤ'=>'ɤ','ɥ'=>'ɥ','ɦ'=>'ɦ','ɧ'=>'ɧ','ɨ'=>'ɨ','ɩ'=>'ɩ','ɪ'=>'ɪ','ɫ'=>'ɫ','ɬ'=>'ɬ','ɭ'=>'ɭ','ɮ'=>'ɮ','ɯ'=>'ɯ','ɰ'=>'ɰ','ɱ'=>'ɱ','ɲ'=>'ɲ','ɳ'=>'ɳ','ɴ'=>'ɴ','ɵ'=>'ɵ','ɶ'=>'ɶ','ɷ'=>'ɷ','ɸ'=>'ɸ','ɹ'=>'ɹ','ɺ'=>'ɺ','ɻ'=>'ɻ','ɼ'=>'ɼ','ɽ'=>'ɽ','ɾ'=>'ɾ','ɿ'=>'ɿ','ʀ'=>'ʀ','ʁ'=>'ʁ','ʂ'=>'ʂ','ʃ'=>'ʃ','ʄ'=>'ʄ','ʅ'=>'ʅ','ʆ'=>'ʆ','ʇ'=>'ʇ','ʈ'=>'ʈ','ʉ'=>'ʉ','ʊ'=>'ʊ','ʋ'=>'ʋ','ʌ'=>'ʌ','ʍ'=>'ʍ','ʎ'=>'ʎ','ʏ'=>'ʏ','ʐ'=>'ʐ','ʑ'=>'ʑ','ʒ'=>'ʒ','ʓ'=>'ʓ','ʔ'=>'ʔ','ʕ'=>'ʕ','ʖ'=>'ʖ','ʗ'=>'ʗ','ʘ'=>'ʘ','ʙ'=>'ʙ','ʚ'=>'ʚ','ʛ'=>'ʛ','ʜ'=>'ʜ','ʝ'=>'ʝ','ʞ'=>'ʞ','ʟ'=>'ʟ','ʠ'=>'ʠ','ʡ'=>'ʡ','ʢ'=>'ʢ','ʣ'=>'ʣ','ʤ'=>'ʤ','ʥ'=>'ʥ','ʦ'=>'ʦ','ʧ'=>'ʧ','ʨ'=>'ʨ','ʩ'=>'ʩ','ʪ'=>'ʪ','ʫ'=>'ʫ','ʬ'=>'ʬ','ʭ'=>'ʭ','ʮ'=>'ʮ','ʯ'=>'ʯ','ʰ'=>'ʰ','ʱ'=>'ʱ','ʲ'=>'ʲ','ʳ'=>'ʳ','ʴ'=>'ʴ','ʵ'=>'ʵ','ʶ'=>'ʶ','ʷ'=>'ʷ','ʸ'=>'ʸ','ʹ'=>'ʹ','ʺ'=>'ʺ','ʻ'=>'ʻ','ʼ'=>'ʼ','ʽ'=>'ʽ','ʾ'=>'ʾ','ʿ'=>'ʿ','ˀ'=>'ˀ','ˁ'=>'ˁ','ˆ'=>'ˆ','ˇ'=>'ˇ','ˈ'=>'ˈ','ˉ'=>'ˉ','ˊ'=>'ˊ','ˋ'=>'ˋ','ˌ'=>'ˌ','ˍ'=>'ˍ','ˎ'=>'ˎ','ˏ'=>'ˏ','ː'=>'ː','ˑ'=>'ˑ','ˠ'=>'ˠ','ˡ'=>'ˡ','ˢ'=>'ˢ','ˣ'=>'ˣ','ˤ'=>'ˤ','ˮ'=>'ˮ','̀'=>'̀','́'=>'́','̂'=>'̂','̃'=>'̃','̄'=>'̄','̅'=>'̅','̆'=>'̆','̇'=>'̇','̈'=>'̈','̉'=>'̉','̊'=>'̊','̋'=>'̋','̌'=>'̌','̍'=>'̍','̎'=>'̎','̏'=>'̏','̐'=>'̐','̑'=>'̑','̒'=>'̒','̓'=>'̓','̔'=>'̔','̕'=>'̕','̖'=>'̖','̗'=>'̗','̘'=>'̘','̙'=>'̙','̚'=>'̚','̛'=>'̛','̜'=>'̜','̝'=>'̝','̞'=>'̞','̟'=>'̟','̠'=>'̠','̡'=>'̡','̢'=>'̢','̣'=>'̣','̤'=>'̤','̥'=>'̥','̦'=>'̦','̧'=>'̧','̨'=>'̨','̩'=>'̩','̪'=>'̪','̫'=>'̫','̬'=>'̬','̭'=>'̭','̮'=>'̮','̯'=>'̯','̰'=>'̰','̱'=>'̱','̲'=>'̲','̳'=>'̳','̴'=>'̴','̵'=>'̵','̶'=>'̶','̷'=>'̷','̸'=>'̸','̹'=>'̹','̺'=>'̺','̻'=>'̻','̼'=>'̼','̽'=>'̽','̾'=>'̾','̿'=>'̿','̀'=>'̀','́'=>'́','͂'=>'͂','̓'=>'̓','̈́'=>'̈́','ͅ'=>'ͅ','͆'=>'͆','͇'=>'͇','͈'=>'͈','͉'=>'͉','͊'=>'͊','͋'=>'͋','͌'=>'͌','͍'=>'͍','͎'=>'͎','͏'=>'͏','͐'=>'͐','͑'=>'͑','͒'=>'͒','͓'=>'͓','͔'=>'͔','͕'=>'͕','͖'=>'͖','͗'=>'͗','͘'=>'͘','͙'=>'͙','͚'=>'͚','͛'=>'͛','͜'=>'͜','͝'=>'͝','͞'=>'͞','͟'=>'͟','͠'=>'͠','͡'=>'͡','͢'=>'͢','ͣ'=>'ͣ','ͤ'=>'ͤ','ͥ'=>'ͥ','ͦ'=>'ͦ','ͧ'=>'ͧ','ͨ'=>'ͨ','ͩ'=>'ͩ','ͪ'=>'ͪ','ͫ'=>'ͫ','ͬ'=>'ͬ','ͭ'=>'ͭ','ͮ'=>'ͮ','ͯ'=>'ͯ','ͺ'=>'ͺ','ͻ'=>'ͻ','ͼ'=>'ͼ','ͽ'=>'ͽ','Ά'=>'ά','Έ'=>'έ','Ή'=>'ή','Ί'=>'ί','Ό'=>'ό','Ύ'=>'ύ','Ώ'=>'ώ','ΐ'=>'ΐ','Α'=>'α','Β'=>'β','Γ'=>'γ','Δ'=>'δ','Ε'=>'ε','Ζ'=>'ζ','Η'=>'η','Θ'=>'θ','Ι'=>'ι','Κ'=>'κ','Λ'=>'λ','Μ'=>'μ','Ν'=>'ν','Ξ'=>'ξ','Ο'=>'ο','Π'=>'π','Ρ'=>'ρ','Σ'=>'σ','Τ'=>'τ','Υ'=>'υ','Φ'=>'φ','Χ'=>'χ','Ψ'=>'ψ','Ω'=>'ω','Ϊ'=>'ϊ','Ϋ'=>'ϋ','ά'=>'ά','έ'=>'έ','ή'=>'ή','ί'=>'ί','ΰ'=>'ΰ','α'=>'α','β'=>'β','γ'=>'γ','δ'=>'δ','ε'=>'ε','ζ'=>'ζ','η'=>'η','θ'=>'θ','ι'=>'ι','κ'=>'κ','λ'=>'λ','μ'=>'μ','ν'=>'ν','ξ'=>'ξ','ο'=>'ο','π'=>'π','ρ'=>'ρ','ς'=>'ς','σ'=>'σ','τ'=>'τ','υ'=>'υ','φ'=>'φ','χ'=>'χ','ψ'=>'ψ','ω'=>'ω','ϊ'=>'ϊ','ϋ'=>'ϋ','ό'=>'ό','ύ'=>'ύ','ώ'=>'ώ','ϐ'=>'ϐ','ϑ'=>'ϑ','ϒ'=>'ϒ','ϓ'=>'ϓ','ϔ'=>'ϔ','ϕ'=>'ϕ','ϖ'=>'ϖ','ϗ'=>'ϗ','Ϙ'=>'ϙ','ϙ'=>'ϙ','Ϛ'=>'ϛ','ϛ'=>'ϛ','Ϝ'=>'ϝ','ϝ'=>'ϝ','Ϟ'=>'ϟ','ϟ'=>'ϟ','Ϡ'=>'ϡ','ϡ'=>'ϡ','Ϣ'=>'ϣ','ϣ'=>'ϣ','Ϥ'=>'ϥ','ϥ'=>'ϥ','Ϧ'=>'ϧ','ϧ'=>'ϧ','Ϩ'=>'ϩ','ϩ'=>'ϩ','Ϫ'=>'ϫ','ϫ'=>'ϫ','Ϭ'=>'ϭ','ϭ'=>'ϭ','Ϯ'=>'ϯ','ϯ'=>'ϯ','ϰ'=>'ϰ','ϱ'=>'ϱ','ϲ'=>'ϲ','ϳ'=>'ϳ','ϴ'=>'θ','ϵ'=>'ϵ','Ϸ'=>'ϸ','ϸ'=>'ϸ','Ϲ'=>'ϲ','Ϻ'=>'ϻ','ϻ'=>'ϻ','ϼ'=>'ϼ','Ͻ'=>'ͻ','Ͼ'=>'ͼ','Ͽ'=>'ͽ','Ѐ'=>'ѐ','Ё'=>'ё','Ђ'=>'ђ','Ѓ'=>'ѓ','Є'=>'є','Ѕ'=>'ѕ','І'=>'і','Ї'=>'ї','Ј'=>'ј','Љ'=>'љ','Њ'=>'њ','Ћ'=>'ћ','Ќ'=>'ќ','Ѝ'=>'ѝ','Ў'=>'ў','Џ'=>'џ','А'=>'а','Б'=>'б','В'=>'в','Г'=>'г','Д'=>'д','Е'=>'е','Ж'=>'ж','З'=>'з','И'=>'и','Й'=>'й','К'=>'к','Л'=>'л','М'=>'м','Н'=>'н','О'=>'о','П'=>'п','Р'=>'р','С'=>'с','Т'=>'т','У'=>'у','Ф'=>'ф','Х'=>'х','Ц'=>'ц','Ч'=>'ч','Ш'=>'ш','Щ'=>'щ','Ъ'=>'ъ','Ы'=>'ы','Ь'=>'ь','Э'=>'э','Ю'=>'ю','Я'=>'я','а'=>'а','б'=>'б','в'=>'в','г'=>'г','д'=>'д','е'=>'е','ж'=>'ж','з'=>'з','и'=>'и','й'=>'й','к'=>'к','л'=>'л','м'=>'м','н'=>'н','о'=>'о','п'=>'п','р'=>'р','с'=>'с','т'=>'т','у'=>'у','ф'=>'ф','х'=>'х','ц'=>'ц','ч'=>'ч','ш'=>'ш','щ'=>'щ','ъ'=>'ъ','ы'=>'ы','ь'=>'ь','э'=>'э','ю'=>'ю','я'=>'я','ѐ'=>'ѐ','ё'=>'ё','ђ'=>'ђ','ѓ'=>'ѓ','є'=>'є','ѕ'=>'ѕ','і'=>'і','ї'=>'ї','ј'=>'ј','љ'=>'љ','њ'=>'њ','ћ'=>'ћ','ќ'=>'ќ','ѝ'=>'ѝ','ў'=>'ў','џ'=>'џ','Ѡ'=>'ѡ','ѡ'=>'ѡ','Ѣ'=>'ѣ','ѣ'=>'ѣ','Ѥ'=>'ѥ','ѥ'=>'ѥ','Ѧ'=>'ѧ','ѧ'=>'ѧ','Ѩ'=>'ѩ','ѩ'=>'ѩ','Ѫ'=>'ѫ','ѫ'=>'ѫ','Ѭ'=>'ѭ','ѭ'=>'ѭ','Ѯ'=>'ѯ','ѯ'=>'ѯ','Ѱ'=>'ѱ','ѱ'=>'ѱ','Ѳ'=>'ѳ','ѳ'=>'ѳ','Ѵ'=>'ѵ','ѵ'=>'ѵ','Ѷ'=>'ѷ','ѷ'=>'ѷ','Ѹ'=>'ѹ','ѹ'=>'ѹ','Ѻ'=>'ѻ','ѻ'=>'ѻ','Ѽ'=>'ѽ','ѽ'=>'ѽ','Ѿ'=>'ѿ','ѿ'=>'ѿ','Ҁ'=>'ҁ','ҁ'=>'ҁ','҃'=>'҃','҄'=>'҄','҅'=>'҅','҆'=>'҆','҈'=>'҈','҉'=>'҉','Ҋ'=>'ҋ','ҋ'=>'ҋ','Ҍ'=>'ҍ','ҍ'=>'ҍ','Ҏ'=>'ҏ','ҏ'=>'ҏ','Ґ'=>'ґ','ґ'=>'ґ','Ғ'=>'ғ','ғ'=>'ғ','Ҕ'=>'ҕ','ҕ'=>'ҕ','Җ'=>'җ','җ'=>'җ','Ҙ'=>'ҙ','ҙ'=>'ҙ','Қ'=>'қ','қ'=>'қ','Ҝ'=>'ҝ','ҝ'=>'ҝ','Ҟ'=>'ҟ','ҟ'=>'ҟ','Ҡ'=>'ҡ','ҡ'=>'ҡ','Ң'=>'ң','ң'=>'ң','Ҥ'=>'ҥ','ҥ'=>'ҥ','Ҧ'=>'ҧ','ҧ'=>'ҧ','Ҩ'=>'ҩ','ҩ'=>'ҩ','Ҫ'=>'ҫ','ҫ'=>'ҫ','Ҭ'=>'ҭ','ҭ'=>'ҭ','Ү'=>'ү','ү'=>'ү','Ұ'=>'ұ','ұ'=>'ұ','Ҳ'=>'ҳ','ҳ'=>'ҳ','Ҵ'=>'ҵ','ҵ'=>'ҵ','Ҷ'=>'ҷ','ҷ'=>'ҷ','Ҹ'=>'ҹ','ҹ'=>'ҹ','Һ'=>'һ','һ'=>'һ','Ҽ'=>'ҽ','ҽ'=>'ҽ','Ҿ'=>'ҿ','ҿ'=>'ҿ','Ӏ'=>'ӏ','Ӂ'=>'ӂ','ӂ'=>'ӂ','Ӄ'=>'ӄ','ӄ'=>'ӄ','Ӆ'=>'ӆ','ӆ'=>'ӆ','Ӈ'=>'ӈ','ӈ'=>'ӈ','Ӊ'=>'ӊ','ӊ'=>'ӊ','Ӌ'=>'ӌ','ӌ'=>'ӌ','Ӎ'=>'ӎ','ӎ'=>'ӎ','ӏ'=>'ӏ','Ӑ'=>'ӑ','ӑ'=>'ӑ','Ӓ'=>'ӓ','ӓ'=>'ӓ','Ӕ'=>'ӕ','ӕ'=>'ӕ','Ӗ'=>'ӗ','ӗ'=>'ӗ','Ә'=>'ә','ә'=>'ә','Ӛ'=>'ӛ','ӛ'=>'ӛ','Ӝ'=>'ӝ','ӝ'=>'ӝ','Ӟ'=>'ӟ','ӟ'=>'ӟ','Ӡ'=>'ӡ','ӡ'=>'ӡ','Ӣ'=>'ӣ','ӣ'=>'ӣ','Ӥ'=>'ӥ','ӥ'=>'ӥ','Ӧ'=>'ӧ','ӧ'=>'ӧ','Ө'=>'ө','ө'=>'ө','Ӫ'=>'ӫ','ӫ'=>'ӫ','Ӭ'=>'ӭ','ӭ'=>'ӭ','Ӯ'=>'ӯ','ӯ'=>'ӯ','Ӱ'=>'ӱ','ӱ'=>'ӱ','Ӳ'=>'ӳ','ӳ'=>'ӳ','Ӵ'=>'ӵ','ӵ'=>'ӵ','Ӷ'=>'ӷ','ӷ'=>'ӷ','Ӹ'=>'ӹ','ӹ'=>'ӹ','Ӻ'=>'ӻ','ӻ'=>'ӻ','Ӽ'=>'ӽ','ӽ'=>'ӽ','Ӿ'=>'ӿ','ӿ'=>'ӿ','Ԁ'=>'ԁ','ԁ'=>'ԁ','Ԃ'=>'ԃ','ԃ'=>'ԃ','Ԅ'=>'ԅ','ԅ'=>'ԅ','Ԇ'=>'ԇ','ԇ'=>'ԇ','Ԉ'=>'ԉ','ԉ'=>'ԉ','Ԋ'=>'ԋ','ԋ'=>'ԋ','Ԍ'=>'ԍ','ԍ'=>'ԍ','Ԏ'=>'ԏ','ԏ'=>'ԏ','Ԑ'=>'ԑ','ԑ'=>'ԑ','Ԓ'=>'ԓ','ԓ'=>'ԓ','Ա'=>'ա','Բ'=>'բ','Գ'=>'գ','Դ'=>'դ','Ե'=>'ե','Զ'=>'զ','Է'=>'է','Ը'=>'ը','Թ'=>'թ','Ժ'=>'ժ','Ի'=>'ի','Լ'=>'լ','Խ'=>'խ','Ծ'=>'ծ','Կ'=>'կ','Հ'=>'հ','Ձ'=>'ձ','Ղ'=>'ղ','Ճ'=>'ճ','Մ'=>'մ','Յ'=>'յ','Ն'=>'ն','Շ'=>'շ','Ո'=>'ո','Չ'=>'չ','Պ'=>'պ','Ջ'=>'ջ','Ռ'=>'ռ','Ս'=>'ս','Վ'=>'վ','Տ'=>'տ','Ր'=>'ր','Ց'=>'ց','Ւ'=>'ւ','Փ'=>'փ','Ք'=>'ք','Օ'=>'օ','Ֆ'=>'ֆ','ՙ'=>'ՙ','ա'=>'ա','բ'=>'բ','գ'=>'գ','դ'=>'դ','ե'=>'ե','զ'=>'զ','է'=>'է','ը'=>'ը','թ'=>'թ','ժ'=>'ժ','ի'=>'ի','լ'=>'լ','խ'=>'խ','ծ'=>'ծ','կ'=>'կ','հ'=>'հ','ձ'=>'ձ','ղ'=>'ղ','ճ'=>'ճ','մ'=>'մ','յ'=>'յ','ն'=>'ն','շ'=>'շ','ո'=>'ո','չ'=>'չ','պ'=>'պ','ջ'=>'ջ','ռ'=>'ռ','ս'=>'ս','վ'=>'վ','տ'=>'տ','ր'=>'ր','ց'=>'ց','ւ'=>'ւ','փ'=>'փ','ք'=>'ք','օ'=>'օ','ֆ'=>'ֆ','և'=>'և','֑'=>'֑','֒'=>'֒','֓'=>'֓','֔'=>'֔','֕'=>'֕','֖'=>'֖','֗'=>'֗','֘'=>'֘','֙'=>'֙','֚'=>'֚','֛'=>'֛','֜'=>'֜','֝'=>'֝','֞'=>'֞','֟'=>'֟','֠'=>'֠','֡'=>'֡','֢'=>'֢','֣'=>'֣','֤'=>'֤','֥'=>'֥','֦'=>'֦','֧'=>'֧','֨'=>'֨','֩'=>'֩','֪'=>'֪','֫'=>'֫','֬'=>'֬','֭'=>'֭','֮'=>'֮','֯'=>'֯','ְ'=>'ְ','ֱ'=>'ֱ','ֲ'=>'ֲ','ֳ'=>'ֳ','ִ'=>'ִ','ֵ'=>'ֵ','ֶ'=>'ֶ','ַ'=>'ַ','ָ'=>'ָ','ֹ'=>'ֹ','ֺ'=>'ֺ','ֻ'=>'ֻ','ּ'=>'ּ','ֽ'=>'ֽ','ֿ'=>'ֿ','ׁ'=>'ׁ','ׂ'=>'ׂ','ׄ'=>'ׄ','ׅ'=>'ׅ','ׇ'=>'ׇ','א'=>'א','ב'=>'ב','ג'=>'ג','ד'=>'ד','ה'=>'ה','ו'=>'ו','ז'=>'ז','ח'=>'ח','ט'=>'ט','י'=>'י','ך'=>'ך','כ'=>'כ','ל'=>'ל','ם'=>'ם','מ'=>'מ','ן'=>'ן','נ'=>'נ','ס'=>'ס','ע'=>'ע','ף'=>'ף','פ'=>'פ','ץ'=>'ץ','צ'=>'צ','ק'=>'ק','ר'=>'ר','ש'=>'ש','ת'=>'ת','װ'=>'װ','ױ'=>'ױ','ײ'=>'ײ','ؐ'=>'ؐ','ؑ'=>'ؑ','ؒ'=>'ؒ','ؓ'=>'ؓ','ؔ'=>'ؔ','ؕ'=>'ؕ','ء'=>'ء','آ'=>'آ','أ'=>'أ','ؤ'=>'ؤ','إ'=>'إ','ئ'=>'ئ','ا'=>'ا','ب'=>'ب','ة'=>'ة','ت'=>'ت','ث'=>'ث','ج'=>'ج','ح'=>'ح','خ'=>'خ','د'=>'د','ذ'=>'ذ','ر'=>'ر','ز'=>'ز','س'=>'س','ش'=>'ش','ص'=>'ص','ض'=>'ض','ط'=>'ط','ظ'=>'ظ','ع'=>'ع','غ'=>'غ','ـ'=>'ـ','ف'=>'ف','ق'=>'ق','ك'=>'ك','ل'=>'ل','م'=>'م','ن'=>'ن','ه'=>'ه','و'=>'و','ى'=>'ى','ي'=>'ي','ً'=>'ً','ٌ'=>'ٌ','ٍ'=>'ٍ','َ'=>'َ','ُ'=>'ُ','ِ'=>'ِ','ّ'=>'ّ','ْ'=>'ْ','ٓ'=>'ٓ','ٔ'=>'ٔ','ٕ'=>'ٕ','ٖ'=>'ٖ','ٗ'=>'ٗ','٘'=>'٘','ٙ'=>'ٙ','ٚ'=>'ٚ','ٛ'=>'ٛ','ٜ'=>'ٜ','ٝ'=>'ٝ','ٞ'=>'ٞ','٠'=>'0','١'=>'1','٢'=>'2','٣'=>'3','٤'=>'4','٥'=>'5','٦'=>'6','٧'=>'7','٨'=>'8','٩'=>'9','ٮ'=>'ٮ','ٯ'=>'ٯ','ٰ'=>'ٰ','ٱ'=>'ٱ','ٲ'=>'ٲ','ٳ'=>'ٳ','ٴ'=>'ٴ','ٵ'=>'ٵ','ٶ'=>'ٶ','ٷ'=>'ٷ','ٸ'=>'ٸ','ٹ'=>'ٹ','ٺ'=>'ٺ','ٻ'=>'ٻ','ټ'=>'ټ','ٽ'=>'ٽ','پ'=>'پ','ٿ'=>'ٿ','ڀ'=>'ڀ','ځ'=>'ځ','ڂ'=>'ڂ','ڃ'=>'ڃ','ڄ'=>'ڄ','څ'=>'څ','چ'=>'چ','ڇ'=>'ڇ','ڈ'=>'ڈ','ډ'=>'ډ','ڊ'=>'ڊ','ڋ'=>'ڋ','ڌ'=>'ڌ','ڍ'=>'ڍ','ڎ'=>'ڎ','ڏ'=>'ڏ','ڐ'=>'ڐ','ڑ'=>'ڑ','ڒ'=>'ڒ','ړ'=>'ړ','ڔ'=>'ڔ','ڕ'=>'ڕ','ږ'=>'ږ','ڗ'=>'ڗ','ژ'=>'ژ','ڙ'=>'ڙ','ښ'=>'ښ','ڛ'=>'ڛ','ڜ'=>'ڜ','ڝ'=>'ڝ','ڞ'=>'ڞ','ڟ'=>'ڟ','ڠ'=>'ڠ','ڡ'=>'ڡ','ڢ'=>'ڢ','ڣ'=>'ڣ','ڤ'=>'ڤ','ڥ'=>'ڥ','ڦ'=>'ڦ','ڧ'=>'ڧ','ڨ'=>'ڨ','ک'=>'ک','ڪ'=>'ڪ','ګ'=>'ګ','ڬ'=>'ڬ','ڭ'=>'ڭ','ڮ'=>'ڮ','گ'=>'گ','ڰ'=>'ڰ','ڱ'=>'ڱ','ڲ'=>'ڲ','ڳ'=>'ڳ','ڴ'=>'ڴ','ڵ'=>'ڵ','ڶ'=>'ڶ','ڷ'=>'ڷ','ڸ'=>'ڸ','ڹ'=>'ڹ','ں'=>'ں','ڻ'=>'ڻ','ڼ'=>'ڼ','ڽ'=>'ڽ','ھ'=>'ھ','ڿ'=>'ڿ','ۀ'=>'ۀ','ہ'=>'ہ','ۂ'=>'ۂ','ۃ'=>'ۃ','ۄ'=>'ۄ','ۅ'=>'ۅ','ۆ'=>'ۆ','ۇ'=>'ۇ','ۈ'=>'ۈ','ۉ'=>'ۉ','ۊ'=>'ۊ','ۋ'=>'ۋ','ی'=>'ی','ۍ'=>'ۍ','ێ'=>'ێ','ۏ'=>'ۏ','ې'=>'ې','ۑ'=>'ۑ','ے'=>'ے','ۓ'=>'ۓ','ە'=>'ە','ۖ'=>'ۖ','ۗ'=>'ۗ','ۘ'=>'ۘ','ۙ'=>'ۙ','ۚ'=>'ۚ','ۛ'=>'ۛ','ۜ'=>'ۜ','۞'=>'۞','۟'=>'۟','۠'=>'۠','ۡ'=>'ۡ','ۢ'=>'ۢ','ۣ'=>'ۣ','ۤ'=>'ۤ','ۥ'=>'ۥ','ۦ'=>'ۦ','ۧ'=>'ۧ','ۨ'=>'ۨ','۪'=>'۪','۫'=>'۫','۬'=>'۬','ۭ'=>'ۭ','ۮ'=>'ۮ','ۯ'=>'ۯ','۰'=>'0','۱'=>'1','۲'=>'2','۳'=>'3','۴'=>'4','۵'=>'5','۶'=>'6','۷'=>'7','۸'=>'8','۹'=>'9','ۺ'=>'ۺ','ۻ'=>'ۻ','ۼ'=>'ۼ','ۿ'=>'ۿ','ܐ'=>'ܐ','ܑ'=>'ܑ','ܒ'=>'ܒ','ܓ'=>'ܓ','ܔ'=>'ܔ','ܕ'=>'ܕ','ܖ'=>'ܖ','ܗ'=>'ܗ','ܘ'=>'ܘ','ܙ'=>'ܙ','ܚ'=>'ܚ','ܛ'=>'ܛ','ܜ'=>'ܜ','ܝ'=>'ܝ','ܞ'=>'ܞ','ܟ'=>'ܟ','ܠ'=>'ܠ','ܡ'=>'ܡ','ܢ'=>'ܢ','ܣ'=>'ܣ','ܤ'=>'ܤ','ܥ'=>'ܥ','ܦ'=>'ܦ','ܧ'=>'ܧ','ܨ'=>'ܨ','ܩ'=>'ܩ','ܪ'=>'ܪ','ܫ'=>'ܫ','ܬ'=>'ܬ','ܭ'=>'ܭ','ܮ'=>'ܮ','ܯ'=>'ܯ','ܰ'=>'ܰ','ܱ'=>'ܱ','ܲ'=>'ܲ','ܳ'=>'ܳ','ܴ'=>'ܴ','ܵ'=>'ܵ','ܶ'=>'ܶ','ܷ'=>'ܷ','ܸ'=>'ܸ','ܹ'=>'ܹ','ܺ'=>'ܺ','ܻ'=>'ܻ','ܼ'=>'ܼ','ܽ'=>'ܽ','ܾ'=>'ܾ','ܿ'=>'ܿ','݀'=>'݀','݁'=>'݁','݂'=>'݂','݃'=>'݃','݄'=>'݄','݅'=>'݅','݆'=>'݆','݇'=>'݇','݈'=>'݈','݉'=>'݉','݊'=>'݊','ݍ'=>'ݍ','ݎ'=>'ݎ','ݏ'=>'ݏ','ݐ'=>'ݐ','ݑ'=>'ݑ','ݒ'=>'ݒ','ݓ'=>'ݓ','ݔ'=>'ݔ','ݕ'=>'ݕ','ݖ'=>'ݖ','ݗ'=>'ݗ','ݘ'=>'ݘ','ݙ'=>'ݙ','ݚ'=>'ݚ','ݛ'=>'ݛ','ݜ'=>'ݜ','ݝ'=>'ݝ','ݞ'=>'ݞ','ݟ'=>'ݟ','ݠ'=>'ݠ','ݡ'=>'ݡ','ݢ'=>'ݢ','ݣ'=>'ݣ','ݤ'=>'ݤ','ݥ'=>'ݥ','ݦ'=>'ݦ','ݧ'=>'ݧ','ݨ'=>'ݨ','ݩ'=>'ݩ','ݪ'=>'ݪ','ݫ'=>'ݫ','ݬ'=>'ݬ','ݭ'=>'ݭ','ހ'=>'ހ','ށ'=>'ށ','ނ'=>'ނ','ރ'=>'ރ','ބ'=>'ބ','ޅ'=>'ޅ','ކ'=>'ކ','އ'=>'އ','ވ'=>'ވ','މ'=>'މ','ފ'=>'ފ','ދ'=>'ދ','ތ'=>'ތ','ލ'=>'ލ','ގ'=>'ގ','ޏ'=>'ޏ','ސ'=>'ސ','ޑ'=>'ޑ','ޒ'=>'ޒ','ޓ'=>'ޓ','ޔ'=>'ޔ','ޕ'=>'ޕ','ޖ'=>'ޖ','ޗ'=>'ޗ','ޘ'=>'ޘ','ޙ'=>'ޙ','ޚ'=>'ޚ','ޛ'=>'ޛ','ޜ'=>'ޜ','ޝ'=>'ޝ','ޞ'=>'ޞ','ޟ'=>'ޟ','ޠ'=>'ޠ','ޡ'=>'ޡ','ޢ'=>'ޢ','ޣ'=>'ޣ','ޤ'=>'ޤ','ޥ'=>'ޥ','ަ'=>'ަ','ާ'=>'ާ','ި'=>'ި','ީ'=>'ީ','ު'=>'ު','ޫ'=>'ޫ','ެ'=>'ެ','ޭ'=>'ޭ','ޮ'=>'ޮ','ޯ'=>'ޯ','ް'=>'ް','ޱ'=>'ޱ','߀'=>'0','߁'=>'1','߂'=>'2','߃'=>'3','߄'=>'4','߅'=>'5','߆'=>'6','߇'=>'7','߈'=>'8','߉'=>'9','ߊ'=>'ߊ','ߋ'=>'ߋ','ߌ'=>'ߌ','ߍ'=>'ߍ','ߎ'=>'ߎ','ߏ'=>'ߏ','ߐ'=>'ߐ','ߑ'=>'ߑ','ߒ'=>'ߒ','ߓ'=>'ߓ','ߔ'=>'ߔ','ߕ'=>'ߕ','ߖ'=>'ߖ','ߗ'=>'ߗ','ߘ'=>'ߘ','ߙ'=>'ߙ','ߚ'=>'ߚ','ߛ'=>'ߛ','ߜ'=>'ߜ','ߝ'=>'ߝ','ߞ'=>'ߞ','ߟ'=>'ߟ','ߠ'=>'ߠ','ߡ'=>'ߡ','ߢ'=>'ߢ','ߣ'=>'ߣ','ߤ'=>'ߤ','ߥ'=>'ߥ','ߦ'=>'ߦ','ߧ'=>'ߧ','ߨ'=>'ߨ','ߩ'=>'ߩ','ߪ'=>'ߪ','߫'=>'߫','߬'=>'߬','߭'=>'߭','߮'=>'߮','߯'=>'߯','߰'=>'߰','߱'=>'߱','߲'=>'߲','߳'=>'߳','ߴ'=>'ߴ','ߵ'=>'ߵ','ߺ'=>'ߺ');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/search_indexer_1.php b/phpBB/includes/utf/data/search_indexer_1.php
deleted file mode 100644
index 6173117ffc..0000000000
--- a/phpBB/includes/utf/data/search_indexer_1.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('ँ'=>'ँ','ं'=>'ं','ः'=>'ः','ऄ'=>'ऄ','अ'=>'अ','आ'=>'आ','इ'=>'इ','ई'=>'ई','उ'=>'उ','ऊ'=>'ऊ','ऋ'=>'ऋ','ऌ'=>'ऌ','ऍ'=>'ऍ','ऎ'=>'ऎ','ए'=>'ए','ऐ'=>'ऐ','ऑ'=>'ऑ','ऒ'=>'ऒ','ओ'=>'ओ','औ'=>'औ','क'=>'क','ख'=>'ख','ग'=>'ग','घ'=>'घ','ङ'=>'ङ','च'=>'च','छ'=>'छ','ज'=>'ज','झ'=>'झ','ञ'=>'ञ','ट'=>'ट','ठ'=>'ठ','ड'=>'ड','ढ'=>'ढ','ण'=>'ण','त'=>'त','थ'=>'थ','द'=>'द','ध'=>'ध','न'=>'न','ऩ'=>'ऩ','प'=>'प','फ'=>'फ','ब'=>'ब','भ'=>'भ','म'=>'म','य'=>'य','र'=>'र','ऱ'=>'ऱ','ल'=>'ल','ळ'=>'ळ','ऴ'=>'ऴ','व'=>'व','श'=>'श','ष'=>'ष','स'=>'स','ह'=>'ह','़'=>'़','ऽ'=>'ऽ','ा'=>'ा','ि'=>'ि','ी'=>'ी','ु'=>'ु','ू'=>'ू','ृ'=>'ृ','ॄ'=>'ॄ','ॅ'=>'ॅ','ॆ'=>'ॆ','े'=>'े','ै'=>'ै','ॉ'=>'ॉ','ॊ'=>'ॊ','ो'=>'ो','ौ'=>'ौ','्'=>'्','ॐ'=>'ॐ','॑'=>'॑','॒'=>'॒','॓'=>'॓','॔'=>'॔','क़'=>'क़','ख़'=>'ख़','ग़'=>'ग़','ज़'=>'ज़','ड़'=>'ड़','ढ़'=>'ढ़','फ़'=>'फ़','य़'=>'य़','ॠ'=>'ॠ','ॡ'=>'ॡ','ॢ'=>'ॢ','ॣ'=>'ॣ','०'=>'0','१'=>'1','२'=>'2','३'=>'3','४'=>'4','५'=>'5','६'=>'6','७'=>'7','८'=>'8','९'=>'9','ॻ'=>'ॻ','ॼ'=>'ॼ','ॽ'=>'ॽ','ॾ'=>'ॾ','ॿ'=>'ॿ','ঁ'=>'ঁ','ং'=>'ং','ঃ'=>'ঃ','অ'=>'অ','আ'=>'আ','ই'=>'ই','ঈ'=>'ঈ','উ'=>'উ','ঊ'=>'ঊ','ঋ'=>'ঋ','ঌ'=>'ঌ','এ'=>'এ','ঐ'=>'ঐ','ও'=>'ও','ঔ'=>'ঔ','ক'=>'ক','খ'=>'খ','গ'=>'গ','ঘ'=>'ঘ','ঙ'=>'ঙ','চ'=>'চ','ছ'=>'ছ','জ'=>'জ','ঝ'=>'ঝ','ঞ'=>'ঞ','ট'=>'ট','ঠ'=>'ঠ','ড'=>'ড','ঢ'=>'ঢ','ণ'=>'ণ','ত'=>'ত','থ'=>'থ','দ'=>'দ','ধ'=>'ধ','ন'=>'ন','প'=>'প','ফ'=>'ফ','ব'=>'ব','ভ'=>'ভ','ম'=>'ম','য'=>'য','র'=>'র','ল'=>'ল','শ'=>'শ','ষ'=>'ষ','স'=>'স','হ'=>'হ','়'=>'়','ঽ'=>'ঽ','া'=>'া','ি'=>'ি','ী'=>'ী','ু'=>'ু','ূ'=>'ূ','ৃ'=>'ৃ','ৄ'=>'ৄ','ে'=>'ে','ৈ'=>'ৈ','ো'=>'ো','ৌ'=>'ৌ','্'=>'্','ৎ'=>'ৎ','ৗ'=>'ৗ','ড়'=>'ড়','ঢ়'=>'ঢ়','য়'=>'য়','ৠ'=>'ৠ','ৡ'=>'ৡ','ৢ'=>'ৢ','ৣ'=>'ৣ','০'=>'0','১'=>'1','২'=>'2','৩'=>'3','৪'=>'4','৫'=>'5','৬'=>'6','৭'=>'7','৮'=>'8','৯'=>'9','ৰ'=>'ৰ','ৱ'=>'ৱ','৴'=>'1','৵'=>'2','৶'=>'3','৷'=>'4','৸'=>'৸','৹'=>'16','ਁ'=>'ਁ','ਂ'=>'ਂ','ਃ'=>'ਃ','ਅ'=>'ਅ','ਆ'=>'ਆ','ਇ'=>'ਇ','ਈ'=>'ਈ','ਉ'=>'ਉ','ਊ'=>'ਊ','ਏ'=>'ਏ','ਐ'=>'ਐ','ਓ'=>'ਓ','ਔ'=>'ਔ','ਕ'=>'ਕ','ਖ'=>'ਖ','ਗ'=>'ਗ','ਘ'=>'ਘ','ਙ'=>'ਙ','ਚ'=>'ਚ','ਛ'=>'ਛ','ਜ'=>'ਜ','ਝ'=>'ਝ','ਞ'=>'ਞ','ਟ'=>'ਟ','ਠ'=>'ਠ','ਡ'=>'ਡ','ਢ'=>'ਢ','ਣ'=>'ਣ','ਤ'=>'ਤ','ਥ'=>'ਥ','ਦ'=>'ਦ','ਧ'=>'ਧ','ਨ'=>'ਨ','ਪ'=>'ਪ','ਫ'=>'ਫ','ਬ'=>'ਬ','ਭ'=>'ਭ','ਮ'=>'ਮ','ਯ'=>'ਯ','ਰ'=>'ਰ','ਲ'=>'ਲ','ਲ਼'=>'ਲ਼','ਵ'=>'ਵ','ਸ਼'=>'ਸ਼','ਸ'=>'ਸ','ਹ'=>'ਹ','਼'=>'਼','ਾ'=>'ਾ','ਿ'=>'ਿ','ੀ'=>'ੀ','ੁ'=>'ੁ','ੂ'=>'ੂ','ੇ'=>'ੇ','ੈ'=>'ੈ','ੋ'=>'ੋ','ੌ'=>'ੌ','੍'=>'੍','ਖ਼'=>'ਖ਼','ਗ਼'=>'ਗ਼','ਜ਼'=>'ਜ਼','ੜ'=>'ੜ','ਫ਼'=>'ਫ਼','੦'=>'0','੧'=>'1','੨'=>'2','੩'=>'3','੪'=>'4','੫'=>'5','੬'=>'6','੭'=>'7','੮'=>'8','੯'=>'9','ੰ'=>'ੰ','ੱ'=>'ੱ','ੲ'=>'ੲ','ੳ'=>'ੳ','ੴ'=>'ੴ','ઁ'=>'ઁ','ં'=>'ં','ઃ'=>'ઃ','અ'=>'અ','આ'=>'આ','ઇ'=>'ઇ','ઈ'=>'ઈ','ઉ'=>'ઉ','ઊ'=>'ઊ','ઋ'=>'ઋ','ઌ'=>'ઌ','ઍ'=>'ઍ','એ'=>'એ','ઐ'=>'ઐ','ઑ'=>'ઑ','ઓ'=>'ઓ','ઔ'=>'ઔ','ક'=>'ક','ખ'=>'ખ','ગ'=>'ગ','ઘ'=>'ઘ','ઙ'=>'ઙ','ચ'=>'ચ','છ'=>'છ','જ'=>'જ','ઝ'=>'ઝ','ઞ'=>'ઞ','ટ'=>'ટ','ઠ'=>'ઠ','ડ'=>'ડ','ઢ'=>'ઢ','ણ'=>'ણ','ત'=>'ત','થ'=>'થ','દ'=>'દ','ધ'=>'ધ','ન'=>'ન','પ'=>'પ','ફ'=>'ફ','બ'=>'બ','ભ'=>'ભ','મ'=>'મ','ય'=>'ય','ર'=>'ર','લ'=>'લ','ળ'=>'ળ','વ'=>'વ','શ'=>'શ','ષ'=>'ષ','સ'=>'સ','હ'=>'હ','઼'=>'઼','ઽ'=>'ઽ','ા'=>'ા','િ'=>'િ','ી'=>'ી','ુ'=>'ુ','ૂ'=>'ૂ','ૃ'=>'ૃ','ૄ'=>'ૄ','ૅ'=>'ૅ','ે'=>'ે','ૈ'=>'ૈ','ૉ'=>'ૉ','ો'=>'ો','ૌ'=>'ૌ','્'=>'્','ૐ'=>'ૐ','ૠ'=>'ૠ','ૡ'=>'ૡ','ૢ'=>'ૢ','ૣ'=>'ૣ','૦'=>'0','૧'=>'1','૨'=>'2','૩'=>'3','૪'=>'4','૫'=>'5','૬'=>'6','૭'=>'7','૮'=>'8','૯'=>'9','ଁ'=>'ଁ','ଂ'=>'ଂ','ଃ'=>'ଃ','ଅ'=>'ଅ','ଆ'=>'ଆ','ଇ'=>'ଇ','ଈ'=>'ଈ','ଉ'=>'ଉ','ଊ'=>'ଊ','ଋ'=>'ଋ','ଌ'=>'ଌ','ଏ'=>'ଏ','ଐ'=>'ଐ','ଓ'=>'ଓ','ଔ'=>'ଔ','କ'=>'କ','ଖ'=>'ଖ','ଗ'=>'ଗ','ଘ'=>'ଘ','ଙ'=>'ଙ','ଚ'=>'ଚ','ଛ'=>'ଛ','ଜ'=>'ଜ','ଝ'=>'ଝ','ଞ'=>'ଞ','ଟ'=>'ଟ','ଠ'=>'ଠ','ଡ'=>'ଡ','ଢ'=>'ଢ','ଣ'=>'ଣ','ତ'=>'ତ','ଥ'=>'ଥ','ଦ'=>'ଦ','ଧ'=>'ଧ','ନ'=>'ନ','ପ'=>'ପ','ଫ'=>'ଫ','ବ'=>'ବ','ଭ'=>'ଭ','ମ'=>'ମ','ଯ'=>'ଯ','ର'=>'ର','ଲ'=>'ଲ','ଳ'=>'ଳ','ଵ'=>'ଵ','ଶ'=>'ଶ','ଷ'=>'ଷ','ସ'=>'ସ','ହ'=>'ହ','଼'=>'଼','ଽ'=>'ଽ','ା'=>'ା','ି'=>'ି','ୀ'=>'ୀ','ୁ'=>'ୁ','ୂ'=>'ୂ','ୃ'=>'ୃ','େ'=>'େ','ୈ'=>'ୈ','ୋ'=>'ୋ','ୌ'=>'ୌ','୍'=>'୍','ୖ'=>'ୖ','ୗ'=>'ୗ','ଡ଼'=>'ଡ଼','ଢ଼'=>'ଢ଼','ୟ'=>'ୟ','ୠ'=>'ୠ','ୡ'=>'ୡ','୦'=>'0','୧'=>'1','୨'=>'2','୩'=>'3','୪'=>'4','୫'=>'5','୬'=>'6','୭'=>'7','୮'=>'8','୯'=>'9','ୱ'=>'ୱ','ஂ'=>'ஂ','ஃ'=>'ஃ','அ'=>'அ','ஆ'=>'ஆ','இ'=>'இ','ஈ'=>'ஈ','உ'=>'உ','ஊ'=>'ஊ','எ'=>'எ','ஏ'=>'ஏ','ஐ'=>'ஐ','ஒ'=>'ஒ','ஓ'=>'ஓ','ஔ'=>'ஔ','க'=>'க','ங'=>'ங','ச'=>'ச','ஜ'=>'ஜ','ஞ'=>'ஞ','ட'=>'ட','ண'=>'ண','த'=>'த','ந'=>'ந','ன'=>'ன','ப'=>'ப','ம'=>'ம','ய'=>'ய','ர'=>'ர','ற'=>'ற','ல'=>'ல','ள'=>'ள','ழ'=>'ழ','வ'=>'வ','ஶ'=>'ஶ','ஷ'=>'ஷ','ஸ'=>'ஸ','ஹ'=>'ஹ','ா'=>'ா','ி'=>'ி','ீ'=>'ீ','ு'=>'ு','ூ'=>'ூ','ெ'=>'ெ','ே'=>'ே','ை'=>'ை','ொ'=>'ொ','ோ'=>'ோ','ௌ'=>'ௌ','்'=>'்','ௗ'=>'ௗ','௦'=>'0','௧'=>'1','௨'=>'2','௩'=>'3','௪'=>'4','௫'=>'5','௬'=>'6','௭'=>'7','௮'=>'8','௯'=>'9','௰'=>'10','௱'=>'100','௲'=>'1000','ఁ'=>'ఁ','ం'=>'ం','ః'=>'ః','అ'=>'అ','ఆ'=>'ఆ','ఇ'=>'ఇ','ఈ'=>'ఈ','ఉ'=>'ఉ','ఊ'=>'ఊ','ఋ'=>'ఋ','ఌ'=>'ఌ','ఎ'=>'ఎ','ఏ'=>'ఏ','ఐ'=>'ఐ','ఒ'=>'ఒ','ఓ'=>'ఓ','ఔ'=>'ఔ','క'=>'క','ఖ'=>'ఖ','గ'=>'గ','ఘ'=>'ఘ','ఙ'=>'ఙ','చ'=>'చ','ఛ'=>'ఛ','జ'=>'జ','ఝ'=>'ఝ','ఞ'=>'ఞ','ట'=>'ట','ఠ'=>'ఠ','డ'=>'డ','ఢ'=>'ఢ','ణ'=>'ణ','త'=>'త','థ'=>'థ','ద'=>'ద','ధ'=>'ధ','న'=>'న','ప'=>'ప','ఫ'=>'ఫ','బ'=>'బ','భ'=>'భ','మ'=>'మ','య'=>'య','ర'=>'ర','ఱ'=>'ఱ','ల'=>'ల','ళ'=>'ళ','వ'=>'వ','శ'=>'శ','ష'=>'ష','స'=>'స','హ'=>'హ','ా'=>'ా','ి'=>'ి','ీ'=>'ీ','ు'=>'ు','ూ'=>'ూ','ృ'=>'ృ','ౄ'=>'ౄ','ె'=>'ె','ే'=>'ే','ై'=>'ై','ొ'=>'ొ','ో'=>'ో','ౌ'=>'ౌ','్'=>'్','ౕ'=>'ౕ','ౖ'=>'ౖ','ౠ'=>'ౠ','ౡ'=>'ౡ','౦'=>'0','౧'=>'1','౨'=>'2','౩'=>'3','౪'=>'4','౫'=>'5','౬'=>'6','౭'=>'7','౮'=>'8','౯'=>'9','ಂ'=>'ಂ','ಃ'=>'ಃ','ಅ'=>'ಅ','ಆ'=>'ಆ','ಇ'=>'ಇ','ಈ'=>'ಈ','ಉ'=>'ಉ','ಊ'=>'ಊ','ಋ'=>'ಋ','ಌ'=>'ಌ','ಎ'=>'ಎ','ಏ'=>'ಏ','ಐ'=>'ಐ','ಒ'=>'ಒ','ಓ'=>'ಓ','ಔ'=>'ಔ','ಕ'=>'ಕ','ಖ'=>'ಖ','ಗ'=>'ಗ','ಘ'=>'ಘ','ಙ'=>'ಙ','ಚ'=>'ಚ','ಛ'=>'ಛ','ಜ'=>'ಜ','ಝ'=>'ಝ','ಞ'=>'ಞ','ಟ'=>'ಟ','ಠ'=>'ಠ','ಡ'=>'ಡ','ಢ'=>'ಢ','ಣ'=>'ಣ','ತ'=>'ತ','ಥ'=>'ಥ','ದ'=>'ದ','ಧ'=>'ಧ','ನ'=>'ನ','ಪ'=>'ಪ','ಫ'=>'ಫ','ಬ'=>'ಬ','ಭ'=>'ಭ','ಮ'=>'ಮ','ಯ'=>'ಯ','ರ'=>'ರ','ಱ'=>'ಱ','ಲ'=>'ಲ','ಳ'=>'ಳ','ವ'=>'ವ','ಶ'=>'ಶ','ಷ'=>'ಷ','ಸ'=>'ಸ','ಹ'=>'ಹ','಼'=>'಼','ಽ'=>'ಽ','ಾ'=>'ಾ','ಿ'=>'ಿ','ೀ'=>'ೀ','ು'=>'ು','ೂ'=>'ೂ','ೃ'=>'ೃ','ೄ'=>'ೄ','ೆ'=>'ೆ','ೇ'=>'ೇ','ೈ'=>'ೈ','ೊ'=>'ೊ','ೋ'=>'ೋ','ೌ'=>'ೌ','್'=>'್','ೕ'=>'ೕ','ೖ'=>'ೖ','ೞ'=>'ೞ','ೠ'=>'ೠ','ೡ'=>'ೡ','ೢ'=>'ೢ','ೣ'=>'ೣ','೦'=>'0','೧'=>'1','೨'=>'2','೩'=>'3','೪'=>'4','೫'=>'5','೬'=>'6','೭'=>'7','೮'=>'8','೯'=>'9','ം'=>'ം','ഃ'=>'ഃ','അ'=>'അ','ആ'=>'ആ','ഇ'=>'ഇ','ഈ'=>'ഈ','ഉ'=>'ഉ','ഊ'=>'ഊ','ഋ'=>'ഋ','ഌ'=>'ഌ','എ'=>'എ','ഏ'=>'ഏ','ഐ'=>'ഐ','ഒ'=>'ഒ','ഓ'=>'ഓ','ഔ'=>'ഔ','ക'=>'ക','ഖ'=>'ഖ','ഗ'=>'ഗ','ഘ'=>'ഘ','ങ'=>'ങ','ച'=>'ച','ഛ'=>'ഛ','ജ'=>'ജ','ഝ'=>'ഝ','ഞ'=>'ഞ','ട'=>'ട','ഠ'=>'ഠ','ഡ'=>'ഡ','ഢ'=>'ഢ','ണ'=>'ണ','ത'=>'ത','ഥ'=>'ഥ','ദ'=>'ദ','ധ'=>'ധ','ന'=>'ന','പ'=>'പ','ഫ'=>'ഫ','ബ'=>'ബ','ഭ'=>'ഭ','മ'=>'മ','യ'=>'യ','ര'=>'ര','റ'=>'റ','ല'=>'ല','ള'=>'ള','ഴ'=>'ഴ','വ'=>'വ','ശ'=>'ശ','ഷ'=>'ഷ','സ'=>'സ','ഹ'=>'ഹ','ാ'=>'ാ','ി'=>'ി','ീ'=>'ീ','ു'=>'ു','ൂ'=>'ൂ','ൃ'=>'ൃ','െ'=>'െ','േ'=>'േ','ൈ'=>'ൈ','ൊ'=>'ൊ','ോ'=>'ോ','ൌ'=>'ൌ','്'=>'്','ൗ'=>'ൗ','ൠ'=>'ൠ','ൡ'=>'ൡ','൦'=>'0','൧'=>'1','൨'=>'2','൩'=>'3','൪'=>'4','൫'=>'5','൬'=>'6','൭'=>'7','൮'=>'8','൯'=>'9','ං'=>'ං','ඃ'=>'ඃ','අ'=>'අ','ආ'=>'ආ','ඇ'=>'ඇ','ඈ'=>'ඈ','ඉ'=>'ඉ','ඊ'=>'ඊ','උ'=>'උ','ඌ'=>'ඌ','ඍ'=>'ඍ','ඎ'=>'ඎ','ඏ'=>'ඏ','ඐ'=>'ඐ','එ'=>'එ','ඒ'=>'ඒ','ඓ'=>'ඓ','ඔ'=>'ඔ','ඕ'=>'ඕ','ඖ'=>'ඖ','ක'=>'ක','ඛ'=>'ඛ','ග'=>'ග','ඝ'=>'ඝ','ඞ'=>'ඞ','ඟ'=>'ඟ','ච'=>'ච','ඡ'=>'ඡ','ජ'=>'ජ','ඣ'=>'ඣ','ඤ'=>'ඤ','ඥ'=>'ඥ','ඦ'=>'ඦ','ට'=>'ට','ඨ'=>'ඨ','ඩ'=>'ඩ','ඪ'=>'ඪ','ණ'=>'ණ','ඬ'=>'ඬ','ත'=>'ත','ථ'=>'ථ','ද'=>'ද','ධ'=>'ධ','න'=>'න','ඳ'=>'ඳ','ප'=>'ප','ඵ'=>'ඵ','බ'=>'බ','භ'=>'භ','ම'=>'ම','ඹ'=>'ඹ','ය'=>'ය','ර'=>'ර','ල'=>'ල','ව'=>'ව','ශ'=>'ශ','ෂ'=>'ෂ','ස'=>'ස','හ'=>'හ','ළ'=>'ළ','ෆ'=>'ෆ','්'=>'්','ා'=>'ා','ැ'=>'ැ','ෑ'=>'ෑ','ි'=>'ි','ී'=>'ී','ු'=>'ු','ූ'=>'ූ','ෘ'=>'ෘ','ෙ'=>'ෙ','ේ'=>'ේ','ෛ'=>'ෛ','ො'=>'ො','ෝ'=>'ෝ','ෞ'=>'ෞ','ෟ'=>'ෟ','ෲ'=>'ෲ','ෳ'=>'ෳ','ก'=>'ก','ข'=>'ข','ฃ'=>'ฃ','ค'=>'ค','ฅ'=>'ฅ','ฆ'=>'ฆ','ง'=>'ง','จ'=>'จ','ฉ'=>'ฉ','ช'=>'ช','ซ'=>'ซ','ฌ'=>'ฌ','ญ'=>'ญ','ฎ'=>'ฎ','ฏ'=>'ฏ','ฐ'=>'ฐ','ฑ'=>'ฑ','ฒ'=>'ฒ','ณ'=>'ณ','ด'=>'ด','ต'=>'ต','ถ'=>'ถ','ท'=>'ท','ธ'=>'ธ','น'=>'น','บ'=>'บ','ป'=>'ป','ผ'=>'ผ','ฝ'=>'ฝ','พ'=>'พ','ฟ'=>'ฟ','ภ'=>'ภ','ม'=>'ม','ย'=>'ย','ร'=>'ร','ฤ'=>'ฤ','ล'=>'ล','ฦ'=>'ฦ','ว'=>'ว','ศ'=>'ศ','ษ'=>'ษ','ส'=>'ส','ห'=>'ห','ฬ'=>'ฬ','อ'=>'อ','ฮ'=>'ฮ','ฯ'=>'ฯ','ะ'=>'ะ','ั'=>'ั','า'=>'า','ำ'=>'ำ','ิ'=>'ิ','ี'=>'ี','ึ'=>'ึ','ื'=>'ื','ุ'=>'ุ','ู'=>'ู','ฺ'=>'ฺ','เ'=>'เ','แ'=>'แ','โ'=>'โ','ใ'=>'ใ','ไ'=>'ไ','ๅ'=>'ๅ','ๆ'=>'ๆ','็'=>'็','่'=>'่','้'=>'้','๊'=>'๊','๋'=>'๋','์'=>'์','ํ'=>'ํ','๎'=>'๎','๐'=>'0','๑'=>'1','๒'=>'2','๓'=>'3','๔'=>'4','๕'=>'5','๖'=>'6','๗'=>'7','๘'=>'8','๙'=>'9','ກ'=>'ກ','ຂ'=>'ຂ','ຄ'=>'ຄ','ງ'=>'ງ','ຈ'=>'ຈ','ຊ'=>'ຊ','ຍ'=>'ຍ','ດ'=>'ດ','ຕ'=>'ຕ','ຖ'=>'ຖ','ທ'=>'ທ','ນ'=>'ນ','ບ'=>'ບ','ປ'=>'ປ','ຜ'=>'ຜ','ຝ'=>'ຝ','ພ'=>'ພ','ຟ'=>'ຟ','ມ'=>'ມ','ຢ'=>'ຢ','ຣ'=>'ຣ','ລ'=>'ລ','ວ'=>'ວ','ສ'=>'ສ','ຫ'=>'ຫ','ອ'=>'ອ','ຮ'=>'ຮ','ຯ'=>'ຯ','ະ'=>'ະ','ັ'=>'ັ','າ'=>'າ','ຳ'=>'ຳ','ິ'=>'ິ','ີ'=>'ີ','ຶ'=>'ຶ','ື'=>'ື','ຸ'=>'ຸ','ູ'=>'ູ','ົ'=>'ົ','ຼ'=>'ຼ','ຽ'=>'ຽ','ເ'=>'ເ','ແ'=>'ແ','ໂ'=>'ໂ','ໃ'=>'ໃ','ໄ'=>'ໄ','ໆ'=>'ໆ','່'=>'່','້'=>'້','໊'=>'໊','໋'=>'໋','໌'=>'໌','ໍ'=>'ໍ','໐'=>'0','໑'=>'1','໒'=>'2','໓'=>'3','໔'=>'4','໕'=>'5','໖'=>'6','໗'=>'7','໘'=>'8','໙'=>'9','ໜ'=>'ໜ','ໝ'=>'ໝ','ༀ'=>'ༀ','༘'=>'༘','༙'=>'༙','༠'=>'0','༡'=>'1','༢'=>'2','༣'=>'3','༤'=>'4','༥'=>'5','༦'=>'6','༧'=>'7','༨'=>'8','༩'=>'9','༪'=>'1/2','༫'=>'3/2','༬'=>'5/2','༭'=>'7/2','༮'=>'9/2','༯'=>'11/2','༰'=>'13/2','༱'=>'15/2','༲'=>'17/2','༳'=>'-1/2','༵'=>'༵','༷'=>'༷','༹'=>'༹','༾'=>'༾','༿'=>'༿','ཀ'=>'ཀ','ཁ'=>'ཁ','ག'=>'ག','གྷ'=>'གྷ','ང'=>'ང','ཅ'=>'ཅ','ཆ'=>'ཆ','ཇ'=>'ཇ','ཉ'=>'ཉ','ཊ'=>'ཊ','ཋ'=>'ཋ','ཌ'=>'ཌ','ཌྷ'=>'ཌྷ','ཎ'=>'ཎ','ཏ'=>'ཏ','ཐ'=>'ཐ','ད'=>'ད','དྷ'=>'དྷ','ན'=>'ན','པ'=>'པ','ཕ'=>'ཕ','བ'=>'བ','བྷ'=>'བྷ','མ'=>'མ','ཙ'=>'ཙ','ཚ'=>'ཚ','ཛ'=>'ཛ','ཛྷ'=>'ཛྷ','ཝ'=>'ཝ','ཞ'=>'ཞ','ཟ'=>'ཟ','འ'=>'འ','ཡ'=>'ཡ','ར'=>'ར','ལ'=>'ལ','ཤ'=>'ཤ','ཥ'=>'ཥ','ས'=>'ས','ཧ'=>'ཧ','ཨ'=>'ཨ','ཀྵ'=>'ཀྵ','ཪ'=>'ཪ','ཱ'=>'ཱ','ི'=>'ི','ཱི'=>'ཱི','ུ'=>'ུ','ཱུ'=>'ཱུ','ྲྀ'=>'ྲྀ','ཷ'=>'ཷ','ླྀ'=>'ླྀ','ཹ'=>'ཹ','ེ'=>'ེ','ཻ'=>'ཻ','ོ'=>'ོ','ཽ'=>'ཽ','ཾ'=>'ཾ','ཿ'=>'ཿ','ྀ'=>'ྀ','ཱྀ'=>'ཱྀ','ྂ'=>'ྂ','ྃ'=>'ྃ','྄'=>'྄','྆'=>'྆','྇'=>'྇','ྈ'=>'ྈ','ྉ'=>'ྉ','ྊ'=>'ྊ','ྋ'=>'ྋ','ྐ'=>'ྐ','ྑ'=>'ྑ','ྒ'=>'ྒ','ྒྷ'=>'ྒྷ','ྔ'=>'ྔ','ྕ'=>'ྕ','ྖ'=>'ྖ','ྗ'=>'ྗ','ྙ'=>'ྙ','ྚ'=>'ྚ','ྛ'=>'ྛ','ྜ'=>'ྜ','ྜྷ'=>'ྜྷ','ྞ'=>'ྞ','ྟ'=>'ྟ','ྠ'=>'ྠ','ྡ'=>'ྡ','ྡྷ'=>'ྡྷ','ྣ'=>'ྣ','ྤ'=>'ྤ','ྥ'=>'ྥ','ྦ'=>'ྦ','ྦྷ'=>'ྦྷ','ྨ'=>'ྨ','ྩ'=>'ྩ','ྪ'=>'ྪ','ྫ'=>'ྫ','ྫྷ'=>'ྫྷ','ྭ'=>'ྭ','ྮ'=>'ྮ','ྯ'=>'ྯ','ྰ'=>'ྰ','ྱ'=>'ྱ','ྲ'=>'ྲ','ླ'=>'ླ','ྴ'=>'ྴ','ྵ'=>'ྵ','ྶ'=>'ྶ','ྷ'=>'ྷ','ྸ'=>'ྸ','ྐྵ'=>'ྐྵ','ྺ'=>'ྺ','ྻ'=>'ྻ','ྼ'=>'ྼ','࿆'=>'࿆');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/search_indexer_19.php b/phpBB/includes/utf/data/search_indexer_19.php
deleted file mode 100644
index e26f7d81a0..0000000000
--- a/phpBB/includes/utf/data/search_indexer_19.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('龻'=>'龻');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/search_indexer_2.php b/phpBB/includes/utf/data/search_indexer_2.php
deleted file mode 100644
index 751226ed22..0000000000
--- a/phpBB/includes/utf/data/search_indexer_2.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('က'=>'က','ခ'=>'ခ','ဂ'=>'ဂ','ဃ'=>'ဃ','င'=>'င','စ'=>'စ','ဆ'=>'ဆ','ဇ'=>'ဇ','ဈ'=>'ဈ','ဉ'=>'ဉ','ည'=>'ည','ဋ'=>'ဋ','ဌ'=>'ဌ','ဍ'=>'ဍ','ဎ'=>'ဎ','ဏ'=>'ဏ','တ'=>'တ','ထ'=>'ထ','ဒ'=>'ဒ','ဓ'=>'ဓ','န'=>'န','ပ'=>'ပ','ဖ'=>'ဖ','ဗ'=>'ဗ','ဘ'=>'ဘ','မ'=>'မ','ယ'=>'ယ','ရ'=>'ရ','လ'=>'လ','ဝ'=>'ဝ','သ'=>'သ','ဟ'=>'ဟ','ဠ'=>'ဠ','အ'=>'အ','ဣ'=>'ဣ','ဤ'=>'ဤ','ဥ'=>'ဥ','ဦ'=>'ဦ','ဧ'=>'ဧ','ဩ'=>'ဩ','ဪ'=>'ဪ','ာ'=>'ာ','ိ'=>'ိ','ီ'=>'ီ','ု'=>'ု','ူ'=>'ူ','ေ'=>'ေ','ဲ'=>'ဲ','ံ'=>'ံ','့'=>'့','း'=>'း','္'=>'္','၀'=>'0','၁'=>'1','၂'=>'2','၃'=>'3','၄'=>'4','၅'=>'5','၆'=>'6','၇'=>'7','၈'=>'8','၉'=>'9','ၐ'=>'ၐ','ၑ'=>'ၑ','ၒ'=>'ၒ','ၓ'=>'ၓ','ၔ'=>'ၔ','ၕ'=>'ၕ','ၖ'=>'ၖ','ၗ'=>'ၗ','ၘ'=>'ၘ','ၙ'=>'ၙ','Ⴀ'=>'ⴀ','Ⴁ'=>'ⴁ','Ⴂ'=>'ⴂ','Ⴃ'=>'ⴃ','Ⴄ'=>'ⴄ','Ⴅ'=>'ⴅ','Ⴆ'=>'ⴆ','Ⴇ'=>'ⴇ','Ⴈ'=>'ⴈ','Ⴉ'=>'ⴉ','Ⴊ'=>'ⴊ','Ⴋ'=>'ⴋ','Ⴌ'=>'ⴌ','Ⴍ'=>'ⴍ','Ⴎ'=>'ⴎ','Ⴏ'=>'ⴏ','Ⴐ'=>'ⴐ','Ⴑ'=>'ⴑ','Ⴒ'=>'ⴒ','Ⴓ'=>'ⴓ','Ⴔ'=>'ⴔ','Ⴕ'=>'ⴕ','Ⴖ'=>'ⴖ','Ⴗ'=>'ⴗ','Ⴘ'=>'ⴘ','Ⴙ'=>'ⴙ','Ⴚ'=>'ⴚ','Ⴛ'=>'ⴛ','Ⴜ'=>'ⴜ','Ⴝ'=>'ⴝ','Ⴞ'=>'ⴞ','Ⴟ'=>'ⴟ','Ⴠ'=>'ⴠ','Ⴡ'=>'ⴡ','Ⴢ'=>'ⴢ','Ⴣ'=>'ⴣ','Ⴤ'=>'ⴤ','Ⴥ'=>'ⴥ','ა'=>'ა','ბ'=>'ბ','გ'=>'გ','დ'=>'დ','ე'=>'ე','ვ'=>'ვ','ზ'=>'ზ','თ'=>'თ','ი'=>'ი','კ'=>'კ','ლ'=>'ლ','მ'=>'მ','ნ'=>'ნ','ო'=>'ო','პ'=>'პ','ჟ'=>'ჟ','რ'=>'რ','ს'=>'ს','ტ'=>'ტ','უ'=>'უ','ფ'=>'ფ','ქ'=>'ქ','ღ'=>'ღ','ყ'=>'ყ','შ'=>'შ','ჩ'=>'ჩ','ც'=>'ც','ძ'=>'ძ','წ'=>'წ','ჭ'=>'ჭ','ხ'=>'ხ','ჯ'=>'ჯ','ჰ'=>'ჰ','ჱ'=>'ჱ','ჲ'=>'ჲ','ჳ'=>'ჳ','ჴ'=>'ჴ','ჵ'=>'ჵ','ჶ'=>'ჶ','ჷ'=>'ჷ','ჸ'=>'ჸ','ჹ'=>'ჹ','ჺ'=>'ჺ','ჼ'=>'ჼ','ᄀ'=>'ᄀ','ᄁ'=>'ᄁ','ᄂ'=>'ᄂ','ᄃ'=>'ᄃ','ᄄ'=>'ᄄ','ᄅ'=>'ᄅ','ᄆ'=>'ᄆ','ᄇ'=>'ᄇ','ᄈ'=>'ᄈ','ᄉ'=>'ᄉ','ᄊ'=>'ᄊ','ᄋ'=>'ᄋ','ᄌ'=>'ᄌ','ᄍ'=>'ᄍ','ᄎ'=>'ᄎ','ᄏ'=>'ᄏ','ᄐ'=>'ᄐ','ᄑ'=>'ᄑ','ᄒ'=>'ᄒ','ᄓ'=>'ᄓ','ᄔ'=>'ᄔ','ᄕ'=>'ᄕ','ᄖ'=>'ᄖ','ᄗ'=>'ᄗ','ᄘ'=>'ᄘ','ᄙ'=>'ᄙ','ᄚ'=>'ᄚ','ᄛ'=>'ᄛ','ᄜ'=>'ᄜ','ᄝ'=>'ᄝ','ᄞ'=>'ᄞ','ᄟ'=>'ᄟ','ᄠ'=>'ᄠ','ᄡ'=>'ᄡ','ᄢ'=>'ᄢ','ᄣ'=>'ᄣ','ᄤ'=>'ᄤ','ᄥ'=>'ᄥ','ᄦ'=>'ᄦ','ᄧ'=>'ᄧ','ᄨ'=>'ᄨ','ᄩ'=>'ᄩ','ᄪ'=>'ᄪ','ᄫ'=>'ᄫ','ᄬ'=>'ᄬ','ᄭ'=>'ᄭ','ᄮ'=>'ᄮ','ᄯ'=>'ᄯ','ᄰ'=>'ᄰ','ᄱ'=>'ᄱ','ᄲ'=>'ᄲ','ᄳ'=>'ᄳ','ᄴ'=>'ᄴ','ᄵ'=>'ᄵ','ᄶ'=>'ᄶ','ᄷ'=>'ᄷ','ᄸ'=>'ᄸ','ᄹ'=>'ᄹ','ᄺ'=>'ᄺ','ᄻ'=>'ᄻ','ᄼ'=>'ᄼ','ᄽ'=>'ᄽ','ᄾ'=>'ᄾ','ᄿ'=>'ᄿ','ᅀ'=>'ᅀ','ᅁ'=>'ᅁ','ᅂ'=>'ᅂ','ᅃ'=>'ᅃ','ᅄ'=>'ᅄ','ᅅ'=>'ᅅ','ᅆ'=>'ᅆ','ᅇ'=>'ᅇ','ᅈ'=>'ᅈ','ᅉ'=>'ᅉ','ᅊ'=>'ᅊ','ᅋ'=>'ᅋ','ᅌ'=>'ᅌ','ᅍ'=>'ᅍ','ᅎ'=>'ᅎ','ᅏ'=>'ᅏ','ᅐ'=>'ᅐ','ᅑ'=>'ᅑ','ᅒ'=>'ᅒ','ᅓ'=>'ᅓ','ᅔ'=>'ᅔ','ᅕ'=>'ᅕ','ᅖ'=>'ᅖ','ᅗ'=>'ᅗ','ᅘ'=>'ᅘ','ᅙ'=>'ᅙ','ᅟ'=>'ᅟ','ᅠ'=>'ᅠ','ᅡ'=>'ᅡ','ᅢ'=>'ᅢ','ᅣ'=>'ᅣ','ᅤ'=>'ᅤ','ᅥ'=>'ᅥ','ᅦ'=>'ᅦ','ᅧ'=>'ᅧ','ᅨ'=>'ᅨ','ᅩ'=>'ᅩ','ᅪ'=>'ᅪ','ᅫ'=>'ᅫ','ᅬ'=>'ᅬ','ᅭ'=>'ᅭ','ᅮ'=>'ᅮ','ᅯ'=>'ᅯ','ᅰ'=>'ᅰ','ᅱ'=>'ᅱ','ᅲ'=>'ᅲ','ᅳ'=>'ᅳ','ᅴ'=>'ᅴ','ᅵ'=>'ᅵ','ᅶ'=>'ᅶ','ᅷ'=>'ᅷ','ᅸ'=>'ᅸ','ᅹ'=>'ᅹ','ᅺ'=>'ᅺ','ᅻ'=>'ᅻ','ᅼ'=>'ᅼ','ᅽ'=>'ᅽ','ᅾ'=>'ᅾ','ᅿ'=>'ᅿ','ᆀ'=>'ᆀ','ᆁ'=>'ᆁ','ᆂ'=>'ᆂ','ᆃ'=>'ᆃ','ᆄ'=>'ᆄ','ᆅ'=>'ᆅ','ᆆ'=>'ᆆ','ᆇ'=>'ᆇ','ᆈ'=>'ᆈ','ᆉ'=>'ᆉ','ᆊ'=>'ᆊ','ᆋ'=>'ᆋ','ᆌ'=>'ᆌ','ᆍ'=>'ᆍ','ᆎ'=>'ᆎ','ᆏ'=>'ᆏ','ᆐ'=>'ᆐ','ᆑ'=>'ᆑ','ᆒ'=>'ᆒ','ᆓ'=>'ᆓ','ᆔ'=>'ᆔ','ᆕ'=>'ᆕ','ᆖ'=>'ᆖ','ᆗ'=>'ᆗ','ᆘ'=>'ᆘ','ᆙ'=>'ᆙ','ᆚ'=>'ᆚ','ᆛ'=>'ᆛ','ᆜ'=>'ᆜ','ᆝ'=>'ᆝ','ᆞ'=>'ᆞ','ᆟ'=>'ᆟ','ᆠ'=>'ᆠ','ᆡ'=>'ᆡ','ᆢ'=>'ᆢ','ᆨ'=>'ᆨ','ᆩ'=>'ᆩ','ᆪ'=>'ᆪ','ᆫ'=>'ᆫ','ᆬ'=>'ᆬ','ᆭ'=>'ᆭ','ᆮ'=>'ᆮ','ᆯ'=>'ᆯ','ᆰ'=>'ᆰ','ᆱ'=>'ᆱ','ᆲ'=>'ᆲ','ᆳ'=>'ᆳ','ᆴ'=>'ᆴ','ᆵ'=>'ᆵ','ᆶ'=>'ᆶ','ᆷ'=>'ᆷ','ᆸ'=>'ᆸ','ᆹ'=>'ᆹ','ᆺ'=>'ᆺ','ᆻ'=>'ᆻ','ᆼ'=>'ᆼ','ᆽ'=>'ᆽ','ᆾ'=>'ᆾ','ᆿ'=>'ᆿ','ᇀ'=>'ᇀ','ᇁ'=>'ᇁ','ᇂ'=>'ᇂ','ᇃ'=>'ᇃ','ᇄ'=>'ᇄ','ᇅ'=>'ᇅ','ᇆ'=>'ᇆ','ᇇ'=>'ᇇ','ᇈ'=>'ᇈ','ᇉ'=>'ᇉ','ᇊ'=>'ᇊ','ᇋ'=>'ᇋ','ᇌ'=>'ᇌ','ᇍ'=>'ᇍ','ᇎ'=>'ᇎ','ᇏ'=>'ᇏ','ᇐ'=>'ᇐ','ᇑ'=>'ᇑ','ᇒ'=>'ᇒ','ᇓ'=>'ᇓ','ᇔ'=>'ᇔ','ᇕ'=>'ᇕ','ᇖ'=>'ᇖ','ᇗ'=>'ᇗ','ᇘ'=>'ᇘ','ᇙ'=>'ᇙ','ᇚ'=>'ᇚ','ᇛ'=>'ᇛ','ᇜ'=>'ᇜ','ᇝ'=>'ᇝ','ᇞ'=>'ᇞ','ᇟ'=>'ᇟ','ᇠ'=>'ᇠ','ᇡ'=>'ᇡ','ᇢ'=>'ᇢ','ᇣ'=>'ᇣ','ᇤ'=>'ᇤ','ᇥ'=>'ᇥ','ᇦ'=>'ᇦ','ᇧ'=>'ᇧ','ᇨ'=>'ᇨ','ᇩ'=>'ᇩ','ᇪ'=>'ᇪ','ᇫ'=>'ᇫ','ᇬ'=>'ᇬ','ᇭ'=>'ᇭ','ᇮ'=>'ᇮ','ᇯ'=>'ᇯ','ᇰ'=>'ᇰ','ᇱ'=>'ᇱ','ᇲ'=>'ᇲ','ᇳ'=>'ᇳ','ᇴ'=>'ᇴ','ᇵ'=>'ᇵ','ᇶ'=>'ᇶ','ᇷ'=>'ᇷ','ᇸ'=>'ᇸ','ᇹ'=>'ᇹ','ሀ'=>'ሀ','ሁ'=>'ሁ','ሂ'=>'ሂ','ሃ'=>'ሃ','ሄ'=>'ሄ','ህ'=>'ህ','ሆ'=>'ሆ','ሇ'=>'ሇ','ለ'=>'ለ','ሉ'=>'ሉ','ሊ'=>'ሊ','ላ'=>'ላ','ሌ'=>'ሌ','ል'=>'ል','ሎ'=>'ሎ','ሏ'=>'ሏ','ሐ'=>'ሐ','ሑ'=>'ሑ','ሒ'=>'ሒ','ሓ'=>'ሓ','ሔ'=>'ሔ','ሕ'=>'ሕ','ሖ'=>'ሖ','ሗ'=>'ሗ','መ'=>'መ','ሙ'=>'ሙ','ሚ'=>'ሚ','ማ'=>'ማ','ሜ'=>'ሜ','ም'=>'ም','ሞ'=>'ሞ','ሟ'=>'ሟ','ሠ'=>'ሠ','ሡ'=>'ሡ','ሢ'=>'ሢ','ሣ'=>'ሣ','ሤ'=>'ሤ','ሥ'=>'ሥ','ሦ'=>'ሦ','ሧ'=>'ሧ','ረ'=>'ረ','ሩ'=>'ሩ','ሪ'=>'ሪ','ራ'=>'ራ','ሬ'=>'ሬ','ር'=>'ር','ሮ'=>'ሮ','ሯ'=>'ሯ','ሰ'=>'ሰ','ሱ'=>'ሱ','ሲ'=>'ሲ','ሳ'=>'ሳ','ሴ'=>'ሴ','ስ'=>'ስ','ሶ'=>'ሶ','ሷ'=>'ሷ','ሸ'=>'ሸ','ሹ'=>'ሹ','ሺ'=>'ሺ','ሻ'=>'ሻ','ሼ'=>'ሼ','ሽ'=>'ሽ','ሾ'=>'ሾ','ሿ'=>'ሿ','ቀ'=>'ቀ','ቁ'=>'ቁ','ቂ'=>'ቂ','ቃ'=>'ቃ','ቄ'=>'ቄ','ቅ'=>'ቅ','ቆ'=>'ቆ','ቇ'=>'ቇ','ቈ'=>'ቈ','ቊ'=>'ቊ','ቋ'=>'ቋ','ቌ'=>'ቌ','ቍ'=>'ቍ','ቐ'=>'ቐ','ቑ'=>'ቑ','ቒ'=>'ቒ','ቓ'=>'ቓ','ቔ'=>'ቔ','ቕ'=>'ቕ','ቖ'=>'ቖ','ቘ'=>'ቘ','ቚ'=>'ቚ','ቛ'=>'ቛ','ቜ'=>'ቜ','ቝ'=>'ቝ','በ'=>'በ','ቡ'=>'ቡ','ቢ'=>'ቢ','ባ'=>'ባ','ቤ'=>'ቤ','ብ'=>'ብ','ቦ'=>'ቦ','ቧ'=>'ቧ','ቨ'=>'ቨ','ቩ'=>'ቩ','ቪ'=>'ቪ','ቫ'=>'ቫ','ቬ'=>'ቬ','ቭ'=>'ቭ','ቮ'=>'ቮ','ቯ'=>'ቯ','ተ'=>'ተ','ቱ'=>'ቱ','ቲ'=>'ቲ','ታ'=>'ታ','ቴ'=>'ቴ','ት'=>'ት','ቶ'=>'ቶ','ቷ'=>'ቷ','ቸ'=>'ቸ','ቹ'=>'ቹ','ቺ'=>'ቺ','ቻ'=>'ቻ','ቼ'=>'ቼ','ች'=>'ች','ቾ'=>'ቾ','ቿ'=>'ቿ','ኀ'=>'ኀ','ኁ'=>'ኁ','ኂ'=>'ኂ','ኃ'=>'ኃ','ኄ'=>'ኄ','ኅ'=>'ኅ','ኆ'=>'ኆ','ኇ'=>'ኇ','ኈ'=>'ኈ','ኊ'=>'ኊ','ኋ'=>'ኋ','ኌ'=>'ኌ','ኍ'=>'ኍ','ነ'=>'ነ','ኑ'=>'ኑ','ኒ'=>'ኒ','ና'=>'ና','ኔ'=>'ኔ','ን'=>'ን','ኖ'=>'ኖ','ኗ'=>'ኗ','ኘ'=>'ኘ','ኙ'=>'ኙ','ኚ'=>'ኚ','ኛ'=>'ኛ','ኜ'=>'ኜ','ኝ'=>'ኝ','ኞ'=>'ኞ','ኟ'=>'ኟ','አ'=>'አ','ኡ'=>'ኡ','ኢ'=>'ኢ','ኣ'=>'ኣ','ኤ'=>'ኤ','እ'=>'እ','ኦ'=>'ኦ','ኧ'=>'ኧ','ከ'=>'ከ','ኩ'=>'ኩ','ኪ'=>'ኪ','ካ'=>'ካ','ኬ'=>'ኬ','ክ'=>'ክ','ኮ'=>'ኮ','ኯ'=>'ኯ','ኰ'=>'ኰ','ኲ'=>'ኲ','ኳ'=>'ኳ','ኴ'=>'ኴ','ኵ'=>'ኵ','ኸ'=>'ኸ','ኹ'=>'ኹ','ኺ'=>'ኺ','ኻ'=>'ኻ','ኼ'=>'ኼ','ኽ'=>'ኽ','ኾ'=>'ኾ','ዀ'=>'ዀ','ዂ'=>'ዂ','ዃ'=>'ዃ','ዄ'=>'ዄ','ዅ'=>'ዅ','ወ'=>'ወ','ዉ'=>'ዉ','ዊ'=>'ዊ','ዋ'=>'ዋ','ዌ'=>'ዌ','ው'=>'ው','ዎ'=>'ዎ','ዏ'=>'ዏ','ዐ'=>'ዐ','ዑ'=>'ዑ','ዒ'=>'ዒ','ዓ'=>'ዓ','ዔ'=>'ዔ','ዕ'=>'ዕ','ዖ'=>'ዖ','ዘ'=>'ዘ','ዙ'=>'ዙ','ዚ'=>'ዚ','ዛ'=>'ዛ','ዜ'=>'ዜ','ዝ'=>'ዝ','ዞ'=>'ዞ','ዟ'=>'ዟ','ዠ'=>'ዠ','ዡ'=>'ዡ','ዢ'=>'ዢ','ዣ'=>'ዣ','ዤ'=>'ዤ','ዥ'=>'ዥ','ዦ'=>'ዦ','ዧ'=>'ዧ','የ'=>'የ','ዩ'=>'ዩ','ዪ'=>'ዪ','ያ'=>'ያ','ዬ'=>'ዬ','ይ'=>'ይ','ዮ'=>'ዮ','ዯ'=>'ዯ','ደ'=>'ደ','ዱ'=>'ዱ','ዲ'=>'ዲ','ዳ'=>'ዳ','ዴ'=>'ዴ','ድ'=>'ድ','ዶ'=>'ዶ','ዷ'=>'ዷ','ዸ'=>'ዸ','ዹ'=>'ዹ','ዺ'=>'ዺ','ዻ'=>'ዻ','ዼ'=>'ዼ','ዽ'=>'ዽ','ዾ'=>'ዾ','ዿ'=>'ዿ','ጀ'=>'ጀ','ጁ'=>'ጁ','ጂ'=>'ጂ','ጃ'=>'ጃ','ጄ'=>'ጄ','ጅ'=>'ጅ','ጆ'=>'ጆ','ጇ'=>'ጇ','ገ'=>'ገ','ጉ'=>'ጉ','ጊ'=>'ጊ','ጋ'=>'ጋ','ጌ'=>'ጌ','ግ'=>'ግ','ጎ'=>'ጎ','ጏ'=>'ጏ','ጐ'=>'ጐ','ጒ'=>'ጒ','ጓ'=>'ጓ','ጔ'=>'ጔ','ጕ'=>'ጕ','ጘ'=>'ጘ','ጙ'=>'ጙ','ጚ'=>'ጚ','ጛ'=>'ጛ','ጜ'=>'ጜ','ጝ'=>'ጝ','ጞ'=>'ጞ','ጟ'=>'ጟ','ጠ'=>'ጠ','ጡ'=>'ጡ','ጢ'=>'ጢ','ጣ'=>'ጣ','ጤ'=>'ጤ','ጥ'=>'ጥ','ጦ'=>'ጦ','ጧ'=>'ጧ','ጨ'=>'ጨ','ጩ'=>'ጩ','ጪ'=>'ጪ','ጫ'=>'ጫ','ጬ'=>'ጬ','ጭ'=>'ጭ','ጮ'=>'ጮ','ጯ'=>'ጯ','ጰ'=>'ጰ','ጱ'=>'ጱ','ጲ'=>'ጲ','ጳ'=>'ጳ','ጴ'=>'ጴ','ጵ'=>'ጵ','ጶ'=>'ጶ','ጷ'=>'ጷ','ጸ'=>'ጸ','ጹ'=>'ጹ','ጺ'=>'ጺ','ጻ'=>'ጻ','ጼ'=>'ጼ','ጽ'=>'ጽ','ጾ'=>'ጾ','ጿ'=>'ጿ','ፀ'=>'ፀ','ፁ'=>'ፁ','ፂ'=>'ፂ','ፃ'=>'ፃ','ፄ'=>'ፄ','ፅ'=>'ፅ','ፆ'=>'ፆ','ፇ'=>'ፇ','ፈ'=>'ፈ','ፉ'=>'ፉ','ፊ'=>'ፊ','ፋ'=>'ፋ','ፌ'=>'ፌ','ፍ'=>'ፍ','ፎ'=>'ፎ','ፏ'=>'ፏ','ፐ'=>'ፐ','ፑ'=>'ፑ','ፒ'=>'ፒ','ፓ'=>'ፓ','ፔ'=>'ፔ','ፕ'=>'ፕ','ፖ'=>'ፖ','ፗ'=>'ፗ','ፘ'=>'ፘ','ፙ'=>'ፙ','ፚ'=>'ፚ','፟'=>'፟','፩'=>'1','፪'=>'2','፫'=>'3','፬'=>'4','፭'=>'5','፮'=>'6','፯'=>'7','፰'=>'8','፱'=>'9','፲'=>'10','፳'=>'20','፴'=>'30','፵'=>'40','፶'=>'50','፷'=>'60','፸'=>'70','፹'=>'80','፺'=>'90','፻'=>'100','፼'=>'10000','ᎀ'=>'ᎀ','ᎁ'=>'ᎁ','ᎂ'=>'ᎂ','ᎃ'=>'ᎃ','ᎄ'=>'ᎄ','ᎅ'=>'ᎅ','ᎆ'=>'ᎆ','ᎇ'=>'ᎇ','ᎈ'=>'ᎈ','ᎉ'=>'ᎉ','ᎊ'=>'ᎊ','ᎋ'=>'ᎋ','ᎌ'=>'ᎌ','ᎍ'=>'ᎍ','ᎎ'=>'ᎎ','ᎏ'=>'ᎏ','Ꭰ'=>'Ꭰ','Ꭱ'=>'Ꭱ','Ꭲ'=>'Ꭲ','Ꭳ'=>'Ꭳ','Ꭴ'=>'Ꭴ','Ꭵ'=>'Ꭵ','Ꭶ'=>'Ꭶ','Ꭷ'=>'Ꭷ','Ꭸ'=>'Ꭸ','Ꭹ'=>'Ꭹ','Ꭺ'=>'Ꭺ','Ꭻ'=>'Ꭻ','Ꭼ'=>'Ꭼ','Ꭽ'=>'Ꭽ','Ꭾ'=>'Ꭾ','Ꭿ'=>'Ꭿ','Ꮀ'=>'Ꮀ','Ꮁ'=>'Ꮁ','Ꮂ'=>'Ꮂ','Ꮃ'=>'Ꮃ','Ꮄ'=>'Ꮄ','Ꮅ'=>'Ꮅ','Ꮆ'=>'Ꮆ','Ꮇ'=>'Ꮇ','Ꮈ'=>'Ꮈ','Ꮉ'=>'Ꮉ','Ꮊ'=>'Ꮊ','Ꮋ'=>'Ꮋ','Ꮌ'=>'Ꮌ','Ꮍ'=>'Ꮍ','Ꮎ'=>'Ꮎ','Ꮏ'=>'Ꮏ','Ꮐ'=>'Ꮐ','Ꮑ'=>'Ꮑ','Ꮒ'=>'Ꮒ','Ꮓ'=>'Ꮓ','Ꮔ'=>'Ꮔ','Ꮕ'=>'Ꮕ','Ꮖ'=>'Ꮖ','Ꮗ'=>'Ꮗ','Ꮘ'=>'Ꮘ','Ꮙ'=>'Ꮙ','Ꮚ'=>'Ꮚ','Ꮛ'=>'Ꮛ','Ꮜ'=>'Ꮜ','Ꮝ'=>'Ꮝ','Ꮞ'=>'Ꮞ','Ꮟ'=>'Ꮟ','Ꮠ'=>'Ꮠ','Ꮡ'=>'Ꮡ','Ꮢ'=>'Ꮢ','Ꮣ'=>'Ꮣ','Ꮤ'=>'Ꮤ','Ꮥ'=>'Ꮥ','Ꮦ'=>'Ꮦ','Ꮧ'=>'Ꮧ','Ꮨ'=>'Ꮨ','Ꮩ'=>'Ꮩ','Ꮪ'=>'Ꮪ','Ꮫ'=>'Ꮫ','Ꮬ'=>'Ꮬ','Ꮭ'=>'Ꮭ','Ꮮ'=>'Ꮮ','Ꮯ'=>'Ꮯ','Ꮰ'=>'Ꮰ','Ꮱ'=>'Ꮱ','Ꮲ'=>'Ꮲ','Ꮳ'=>'Ꮳ','Ꮴ'=>'Ꮴ','Ꮵ'=>'Ꮵ','Ꮶ'=>'Ꮶ','Ꮷ'=>'Ꮷ','Ꮸ'=>'Ꮸ','Ꮹ'=>'Ꮹ','Ꮺ'=>'Ꮺ','Ꮻ'=>'Ꮻ','Ꮼ'=>'Ꮼ','Ꮽ'=>'Ꮽ','Ꮾ'=>'Ꮾ','Ꮿ'=>'Ꮿ','Ᏸ'=>'Ᏸ','Ᏹ'=>'Ᏹ','Ᏺ'=>'Ᏺ','Ᏻ'=>'Ᏻ','Ᏼ'=>'Ᏼ','ᐁ'=>'ᐁ','ᐂ'=>'ᐂ','ᐃ'=>'ᐃ','ᐄ'=>'ᐄ','ᐅ'=>'ᐅ','ᐆ'=>'ᐆ','ᐇ'=>'ᐇ','ᐈ'=>'ᐈ','ᐉ'=>'ᐉ','ᐊ'=>'ᐊ','ᐋ'=>'ᐋ','ᐌ'=>'ᐌ','ᐍ'=>'ᐍ','ᐎ'=>'ᐎ','ᐏ'=>'ᐏ','ᐐ'=>'ᐐ','ᐑ'=>'ᐑ','ᐒ'=>'ᐒ','ᐓ'=>'ᐓ','ᐔ'=>'ᐔ','ᐕ'=>'ᐕ','ᐖ'=>'ᐖ','ᐗ'=>'ᐗ','ᐘ'=>'ᐘ','ᐙ'=>'ᐙ','ᐚ'=>'ᐚ','ᐛ'=>'ᐛ','ᐜ'=>'ᐜ','ᐝ'=>'ᐝ','ᐞ'=>'ᐞ','ᐟ'=>'ᐟ','ᐠ'=>'ᐠ','ᐡ'=>'ᐡ','ᐢ'=>'ᐢ','ᐣ'=>'ᐣ','ᐤ'=>'ᐤ','ᐥ'=>'ᐥ','ᐦ'=>'ᐦ','ᐧ'=>'ᐧ','ᐨ'=>'ᐨ','ᐩ'=>'ᐩ','ᐪ'=>'ᐪ','ᐫ'=>'ᐫ','ᐬ'=>'ᐬ','ᐭ'=>'ᐭ','ᐮ'=>'ᐮ','ᐯ'=>'ᐯ','ᐰ'=>'ᐰ','ᐱ'=>'ᐱ','ᐲ'=>'ᐲ','ᐳ'=>'ᐳ','ᐴ'=>'ᐴ','ᐵ'=>'ᐵ','ᐶ'=>'ᐶ','ᐷ'=>'ᐷ','ᐸ'=>'ᐸ','ᐹ'=>'ᐹ','ᐺ'=>'ᐺ','ᐻ'=>'ᐻ','ᐼ'=>'ᐼ','ᐽ'=>'ᐽ','ᐾ'=>'ᐾ','ᐿ'=>'ᐿ','ᑀ'=>'ᑀ','ᑁ'=>'ᑁ','ᑂ'=>'ᑂ','ᑃ'=>'ᑃ','ᑄ'=>'ᑄ','ᑅ'=>'ᑅ','ᑆ'=>'ᑆ','ᑇ'=>'ᑇ','ᑈ'=>'ᑈ','ᑉ'=>'ᑉ','ᑊ'=>'ᑊ','ᑋ'=>'ᑋ','ᑌ'=>'ᑌ','ᑍ'=>'ᑍ','ᑎ'=>'ᑎ','ᑏ'=>'ᑏ','ᑐ'=>'ᑐ','ᑑ'=>'ᑑ','ᑒ'=>'ᑒ','ᑓ'=>'ᑓ','ᑔ'=>'ᑔ','ᑕ'=>'ᑕ','ᑖ'=>'ᑖ','ᑗ'=>'ᑗ','ᑘ'=>'ᑘ','ᑙ'=>'ᑙ','ᑚ'=>'ᑚ','ᑛ'=>'ᑛ','ᑜ'=>'ᑜ','ᑝ'=>'ᑝ','ᑞ'=>'ᑞ','ᑟ'=>'ᑟ','ᑠ'=>'ᑠ','ᑡ'=>'ᑡ','ᑢ'=>'ᑢ','ᑣ'=>'ᑣ','ᑤ'=>'ᑤ','ᑥ'=>'ᑥ','ᑦ'=>'ᑦ','ᑧ'=>'ᑧ','ᑨ'=>'ᑨ','ᑩ'=>'ᑩ','ᑪ'=>'ᑪ','ᑫ'=>'ᑫ','ᑬ'=>'ᑬ','ᑭ'=>'ᑭ','ᑮ'=>'ᑮ','ᑯ'=>'ᑯ','ᑰ'=>'ᑰ','ᑱ'=>'ᑱ','ᑲ'=>'ᑲ','ᑳ'=>'ᑳ','ᑴ'=>'ᑴ','ᑵ'=>'ᑵ','ᑶ'=>'ᑶ','ᑷ'=>'ᑷ','ᑸ'=>'ᑸ','ᑹ'=>'ᑹ','ᑺ'=>'ᑺ','ᑻ'=>'ᑻ','ᑼ'=>'ᑼ','ᑽ'=>'ᑽ','ᑾ'=>'ᑾ','ᑿ'=>'ᑿ','ᒀ'=>'ᒀ','ᒁ'=>'ᒁ','ᒂ'=>'ᒂ','ᒃ'=>'ᒃ','ᒄ'=>'ᒄ','ᒅ'=>'ᒅ','ᒆ'=>'ᒆ','ᒇ'=>'ᒇ','ᒈ'=>'ᒈ','ᒉ'=>'ᒉ','ᒊ'=>'ᒊ','ᒋ'=>'ᒋ','ᒌ'=>'ᒌ','ᒍ'=>'ᒍ','ᒎ'=>'ᒎ','ᒏ'=>'ᒏ','ᒐ'=>'ᒐ','ᒑ'=>'ᒑ','ᒒ'=>'ᒒ','ᒓ'=>'ᒓ','ᒔ'=>'ᒔ','ᒕ'=>'ᒕ','ᒖ'=>'ᒖ','ᒗ'=>'ᒗ','ᒘ'=>'ᒘ','ᒙ'=>'ᒙ','ᒚ'=>'ᒚ','ᒛ'=>'ᒛ','ᒜ'=>'ᒜ','ᒝ'=>'ᒝ','ᒞ'=>'ᒞ','ᒟ'=>'ᒟ','ᒠ'=>'ᒠ','ᒡ'=>'ᒡ','ᒢ'=>'ᒢ','ᒣ'=>'ᒣ','ᒤ'=>'ᒤ','ᒥ'=>'ᒥ','ᒦ'=>'ᒦ','ᒧ'=>'ᒧ','ᒨ'=>'ᒨ','ᒩ'=>'ᒩ','ᒪ'=>'ᒪ','ᒫ'=>'ᒫ','ᒬ'=>'ᒬ','ᒭ'=>'ᒭ','ᒮ'=>'ᒮ','ᒯ'=>'ᒯ','ᒰ'=>'ᒰ','ᒱ'=>'ᒱ','ᒲ'=>'ᒲ','ᒳ'=>'ᒳ','ᒴ'=>'ᒴ','ᒵ'=>'ᒵ','ᒶ'=>'ᒶ','ᒷ'=>'ᒷ','ᒸ'=>'ᒸ','ᒹ'=>'ᒹ','ᒺ'=>'ᒺ','ᒻ'=>'ᒻ','ᒼ'=>'ᒼ','ᒽ'=>'ᒽ','ᒾ'=>'ᒾ','ᒿ'=>'ᒿ','ᓀ'=>'ᓀ','ᓁ'=>'ᓁ','ᓂ'=>'ᓂ','ᓃ'=>'ᓃ','ᓄ'=>'ᓄ','ᓅ'=>'ᓅ','ᓆ'=>'ᓆ','ᓇ'=>'ᓇ','ᓈ'=>'ᓈ','ᓉ'=>'ᓉ','ᓊ'=>'ᓊ','ᓋ'=>'ᓋ','ᓌ'=>'ᓌ','ᓍ'=>'ᓍ','ᓎ'=>'ᓎ','ᓏ'=>'ᓏ','ᓐ'=>'ᓐ','ᓑ'=>'ᓑ','ᓒ'=>'ᓒ','ᓓ'=>'ᓓ','ᓔ'=>'ᓔ','ᓕ'=>'ᓕ','ᓖ'=>'ᓖ','ᓗ'=>'ᓗ','ᓘ'=>'ᓘ','ᓙ'=>'ᓙ','ᓚ'=>'ᓚ','ᓛ'=>'ᓛ','ᓜ'=>'ᓜ','ᓝ'=>'ᓝ','ᓞ'=>'ᓞ','ᓟ'=>'ᓟ','ᓠ'=>'ᓠ','ᓡ'=>'ᓡ','ᓢ'=>'ᓢ','ᓣ'=>'ᓣ','ᓤ'=>'ᓤ','ᓥ'=>'ᓥ','ᓦ'=>'ᓦ','ᓧ'=>'ᓧ','ᓨ'=>'ᓨ','ᓩ'=>'ᓩ','ᓪ'=>'ᓪ','ᓫ'=>'ᓫ','ᓬ'=>'ᓬ','ᓭ'=>'ᓭ','ᓮ'=>'ᓮ','ᓯ'=>'ᓯ','ᓰ'=>'ᓰ','ᓱ'=>'ᓱ','ᓲ'=>'ᓲ','ᓳ'=>'ᓳ','ᓴ'=>'ᓴ','ᓵ'=>'ᓵ','ᓶ'=>'ᓶ','ᓷ'=>'ᓷ','ᓸ'=>'ᓸ','ᓹ'=>'ᓹ','ᓺ'=>'ᓺ','ᓻ'=>'ᓻ','ᓼ'=>'ᓼ','ᓽ'=>'ᓽ','ᓾ'=>'ᓾ','ᓿ'=>'ᓿ','ᔀ'=>'ᔀ','ᔁ'=>'ᔁ','ᔂ'=>'ᔂ','ᔃ'=>'ᔃ','ᔄ'=>'ᔄ','ᔅ'=>'ᔅ','ᔆ'=>'ᔆ','ᔇ'=>'ᔇ','ᔈ'=>'ᔈ','ᔉ'=>'ᔉ','ᔊ'=>'ᔊ','ᔋ'=>'ᔋ','ᔌ'=>'ᔌ','ᔍ'=>'ᔍ','ᔎ'=>'ᔎ','ᔏ'=>'ᔏ','ᔐ'=>'ᔐ','ᔑ'=>'ᔑ','ᔒ'=>'ᔒ','ᔓ'=>'ᔓ','ᔔ'=>'ᔔ','ᔕ'=>'ᔕ','ᔖ'=>'ᔖ','ᔗ'=>'ᔗ','ᔘ'=>'ᔘ','ᔙ'=>'ᔙ','ᔚ'=>'ᔚ','ᔛ'=>'ᔛ','ᔜ'=>'ᔜ','ᔝ'=>'ᔝ','ᔞ'=>'ᔞ','ᔟ'=>'ᔟ','ᔠ'=>'ᔠ','ᔡ'=>'ᔡ','ᔢ'=>'ᔢ','ᔣ'=>'ᔣ','ᔤ'=>'ᔤ','ᔥ'=>'ᔥ','ᔦ'=>'ᔦ','ᔧ'=>'ᔧ','ᔨ'=>'ᔨ','ᔩ'=>'ᔩ','ᔪ'=>'ᔪ','ᔫ'=>'ᔫ','ᔬ'=>'ᔬ','ᔭ'=>'ᔭ','ᔮ'=>'ᔮ','ᔯ'=>'ᔯ','ᔰ'=>'ᔰ','ᔱ'=>'ᔱ','ᔲ'=>'ᔲ','ᔳ'=>'ᔳ','ᔴ'=>'ᔴ','ᔵ'=>'ᔵ','ᔶ'=>'ᔶ','ᔷ'=>'ᔷ','ᔸ'=>'ᔸ','ᔹ'=>'ᔹ','ᔺ'=>'ᔺ','ᔻ'=>'ᔻ','ᔼ'=>'ᔼ','ᔽ'=>'ᔽ','ᔾ'=>'ᔾ','ᔿ'=>'ᔿ','ᕀ'=>'ᕀ','ᕁ'=>'ᕁ','ᕂ'=>'ᕂ','ᕃ'=>'ᕃ','ᕄ'=>'ᕄ','ᕅ'=>'ᕅ','ᕆ'=>'ᕆ','ᕇ'=>'ᕇ','ᕈ'=>'ᕈ','ᕉ'=>'ᕉ','ᕊ'=>'ᕊ','ᕋ'=>'ᕋ','ᕌ'=>'ᕌ','ᕍ'=>'ᕍ','ᕎ'=>'ᕎ','ᕏ'=>'ᕏ','ᕐ'=>'ᕐ','ᕑ'=>'ᕑ','ᕒ'=>'ᕒ','ᕓ'=>'ᕓ','ᕔ'=>'ᕔ','ᕕ'=>'ᕕ','ᕖ'=>'ᕖ','ᕗ'=>'ᕗ','ᕘ'=>'ᕘ','ᕙ'=>'ᕙ','ᕚ'=>'ᕚ','ᕛ'=>'ᕛ','ᕜ'=>'ᕜ','ᕝ'=>'ᕝ','ᕞ'=>'ᕞ','ᕟ'=>'ᕟ','ᕠ'=>'ᕠ','ᕡ'=>'ᕡ','ᕢ'=>'ᕢ','ᕣ'=>'ᕣ','ᕤ'=>'ᕤ','ᕥ'=>'ᕥ','ᕦ'=>'ᕦ','ᕧ'=>'ᕧ','ᕨ'=>'ᕨ','ᕩ'=>'ᕩ','ᕪ'=>'ᕪ','ᕫ'=>'ᕫ','ᕬ'=>'ᕬ','ᕭ'=>'ᕭ','ᕮ'=>'ᕮ','ᕯ'=>'ᕯ','ᕰ'=>'ᕰ','ᕱ'=>'ᕱ','ᕲ'=>'ᕲ','ᕳ'=>'ᕳ','ᕴ'=>'ᕴ','ᕵ'=>'ᕵ','ᕶ'=>'ᕶ','ᕷ'=>'ᕷ','ᕸ'=>'ᕸ','ᕹ'=>'ᕹ','ᕺ'=>'ᕺ','ᕻ'=>'ᕻ','ᕼ'=>'ᕼ','ᕽ'=>'ᕽ','ᕾ'=>'ᕾ','ᕿ'=>'ᕿ','ᖀ'=>'ᖀ','ᖁ'=>'ᖁ','ᖂ'=>'ᖂ','ᖃ'=>'ᖃ','ᖄ'=>'ᖄ','ᖅ'=>'ᖅ','ᖆ'=>'ᖆ','ᖇ'=>'ᖇ','ᖈ'=>'ᖈ','ᖉ'=>'ᖉ','ᖊ'=>'ᖊ','ᖋ'=>'ᖋ','ᖌ'=>'ᖌ','ᖍ'=>'ᖍ','ᖎ'=>'ᖎ','ᖏ'=>'ᖏ','ᖐ'=>'ᖐ','ᖑ'=>'ᖑ','ᖒ'=>'ᖒ','ᖓ'=>'ᖓ','ᖔ'=>'ᖔ','ᖕ'=>'ᖕ','ᖖ'=>'ᖖ','ᖗ'=>'ᖗ','ᖘ'=>'ᖘ','ᖙ'=>'ᖙ','ᖚ'=>'ᖚ','ᖛ'=>'ᖛ','ᖜ'=>'ᖜ','ᖝ'=>'ᖝ','ᖞ'=>'ᖞ','ᖟ'=>'ᖟ','ᖠ'=>'ᖠ','ᖡ'=>'ᖡ','ᖢ'=>'ᖢ','ᖣ'=>'ᖣ','ᖤ'=>'ᖤ','ᖥ'=>'ᖥ','ᖦ'=>'ᖦ','ᖧ'=>'ᖧ','ᖨ'=>'ᖨ','ᖩ'=>'ᖩ','ᖪ'=>'ᖪ','ᖫ'=>'ᖫ','ᖬ'=>'ᖬ','ᖭ'=>'ᖭ','ᖮ'=>'ᖮ','ᖯ'=>'ᖯ','ᖰ'=>'ᖰ','ᖱ'=>'ᖱ','ᖲ'=>'ᖲ','ᖳ'=>'ᖳ','ᖴ'=>'ᖴ','ᖵ'=>'ᖵ','ᖶ'=>'ᖶ','ᖷ'=>'ᖷ','ᖸ'=>'ᖸ','ᖹ'=>'ᖹ','ᖺ'=>'ᖺ','ᖻ'=>'ᖻ','ᖼ'=>'ᖼ','ᖽ'=>'ᖽ','ᖾ'=>'ᖾ','ᖿ'=>'ᖿ','ᗀ'=>'ᗀ','ᗁ'=>'ᗁ','ᗂ'=>'ᗂ','ᗃ'=>'ᗃ','ᗄ'=>'ᗄ','ᗅ'=>'ᗅ','ᗆ'=>'ᗆ','ᗇ'=>'ᗇ','ᗈ'=>'ᗈ','ᗉ'=>'ᗉ','ᗊ'=>'ᗊ','ᗋ'=>'ᗋ','ᗌ'=>'ᗌ','ᗍ'=>'ᗍ','ᗎ'=>'ᗎ','ᗏ'=>'ᗏ','ᗐ'=>'ᗐ','ᗑ'=>'ᗑ','ᗒ'=>'ᗒ','ᗓ'=>'ᗓ','ᗔ'=>'ᗔ','ᗕ'=>'ᗕ','ᗖ'=>'ᗖ','ᗗ'=>'ᗗ','ᗘ'=>'ᗘ','ᗙ'=>'ᗙ','ᗚ'=>'ᗚ','ᗛ'=>'ᗛ','ᗜ'=>'ᗜ','ᗝ'=>'ᗝ','ᗞ'=>'ᗞ','ᗟ'=>'ᗟ','ᗠ'=>'ᗠ','ᗡ'=>'ᗡ','ᗢ'=>'ᗢ','ᗣ'=>'ᗣ','ᗤ'=>'ᗤ','ᗥ'=>'ᗥ','ᗦ'=>'ᗦ','ᗧ'=>'ᗧ','ᗨ'=>'ᗨ','ᗩ'=>'ᗩ','ᗪ'=>'ᗪ','ᗫ'=>'ᗫ','ᗬ'=>'ᗬ','ᗭ'=>'ᗭ','ᗮ'=>'ᗮ','ᗯ'=>'ᗯ','ᗰ'=>'ᗰ','ᗱ'=>'ᗱ','ᗲ'=>'ᗲ','ᗳ'=>'ᗳ','ᗴ'=>'ᗴ','ᗵ'=>'ᗵ','ᗶ'=>'ᗶ','ᗷ'=>'ᗷ','ᗸ'=>'ᗸ','ᗹ'=>'ᗹ','ᗺ'=>'ᗺ','ᗻ'=>'ᗻ','ᗼ'=>'ᗼ','ᗽ'=>'ᗽ','ᗾ'=>'ᗾ','ᗿ'=>'ᗿ','ᘀ'=>'ᘀ','ᘁ'=>'ᘁ','ᘂ'=>'ᘂ','ᘃ'=>'ᘃ','ᘄ'=>'ᘄ','ᘅ'=>'ᘅ','ᘆ'=>'ᘆ','ᘇ'=>'ᘇ','ᘈ'=>'ᘈ','ᘉ'=>'ᘉ','ᘊ'=>'ᘊ','ᘋ'=>'ᘋ','ᘌ'=>'ᘌ','ᘍ'=>'ᘍ','ᘎ'=>'ᘎ','ᘏ'=>'ᘏ','ᘐ'=>'ᘐ','ᘑ'=>'ᘑ','ᘒ'=>'ᘒ','ᘓ'=>'ᘓ','ᘔ'=>'ᘔ','ᘕ'=>'ᘕ','ᘖ'=>'ᘖ','ᘗ'=>'ᘗ','ᘘ'=>'ᘘ','ᘙ'=>'ᘙ','ᘚ'=>'ᘚ','ᘛ'=>'ᘛ','ᘜ'=>'ᘜ','ᘝ'=>'ᘝ','ᘞ'=>'ᘞ','ᘟ'=>'ᘟ','ᘠ'=>'ᘠ','ᘡ'=>'ᘡ','ᘢ'=>'ᘢ','ᘣ'=>'ᘣ','ᘤ'=>'ᘤ','ᘥ'=>'ᘥ','ᘦ'=>'ᘦ','ᘧ'=>'ᘧ','ᘨ'=>'ᘨ','ᘩ'=>'ᘩ','ᘪ'=>'ᘪ','ᘫ'=>'ᘫ','ᘬ'=>'ᘬ','ᘭ'=>'ᘭ','ᘮ'=>'ᘮ','ᘯ'=>'ᘯ','ᘰ'=>'ᘰ','ᘱ'=>'ᘱ','ᘲ'=>'ᘲ','ᘳ'=>'ᘳ','ᘴ'=>'ᘴ','ᘵ'=>'ᘵ','ᘶ'=>'ᘶ','ᘷ'=>'ᘷ','ᘸ'=>'ᘸ','ᘹ'=>'ᘹ','ᘺ'=>'ᘺ','ᘻ'=>'ᘻ','ᘼ'=>'ᘼ','ᘽ'=>'ᘽ','ᘾ'=>'ᘾ','ᘿ'=>'ᘿ','ᙀ'=>'ᙀ','ᙁ'=>'ᙁ','ᙂ'=>'ᙂ','ᙃ'=>'ᙃ','ᙄ'=>'ᙄ','ᙅ'=>'ᙅ','ᙆ'=>'ᙆ','ᙇ'=>'ᙇ','ᙈ'=>'ᙈ','ᙉ'=>'ᙉ','ᙊ'=>'ᙊ','ᙋ'=>'ᙋ','ᙌ'=>'ᙌ','ᙍ'=>'ᙍ','ᙎ'=>'ᙎ','ᙏ'=>'ᙏ','ᙐ'=>'ᙐ','ᙑ'=>'ᙑ','ᙒ'=>'ᙒ','ᙓ'=>'ᙓ','ᙔ'=>'ᙔ','ᙕ'=>'ᙕ','ᙖ'=>'ᙖ','ᙗ'=>'ᙗ','ᙘ'=>'ᙘ','ᙙ'=>'ᙙ','ᙚ'=>'ᙚ','ᙛ'=>'ᙛ','ᙜ'=>'ᙜ','ᙝ'=>'ᙝ','ᙞ'=>'ᙞ','ᙟ'=>'ᙟ','ᙠ'=>'ᙠ','ᙡ'=>'ᙡ','ᙢ'=>'ᙢ','ᙣ'=>'ᙣ','ᙤ'=>'ᙤ','ᙥ'=>'ᙥ','ᙦ'=>'ᙦ','ᙧ'=>'ᙧ','ᙨ'=>'ᙨ','ᙩ'=>'ᙩ','ᙪ'=>'ᙪ','ᙫ'=>'ᙫ','ᙬ'=>'ᙬ','ᙯ'=>'ᙯ','ᙰ'=>'ᙰ','ᙱ'=>'ᙱ','ᙲ'=>'ᙲ','ᙳ'=>'ᙳ','ᙴ'=>'ᙴ','ᙵ'=>'ᙵ','ᙶ'=>'ᙶ','ᚁ'=>'ᚁ','ᚂ'=>'ᚂ','ᚃ'=>'ᚃ','ᚄ'=>'ᚄ','ᚅ'=>'ᚅ','ᚆ'=>'ᚆ','ᚇ'=>'ᚇ','ᚈ'=>'ᚈ','ᚉ'=>'ᚉ','ᚊ'=>'ᚊ','ᚋ'=>'ᚋ','ᚌ'=>'ᚌ','ᚍ'=>'ᚍ','ᚎ'=>'ᚎ','ᚏ'=>'ᚏ','ᚐ'=>'ᚐ','ᚑ'=>'ᚑ','ᚒ'=>'ᚒ','ᚓ'=>'ᚓ','ᚔ'=>'ᚔ','ᚕ'=>'ᚕ','ᚖ'=>'ᚖ','ᚗ'=>'ᚗ','ᚘ'=>'ᚘ','ᚙ'=>'ᚙ','ᚚ'=>'ᚚ','ᚠ'=>'ᚠ','ᚡ'=>'ᚡ','ᚢ'=>'ᚢ','ᚣ'=>'ᚣ','ᚤ'=>'ᚤ','ᚥ'=>'ᚥ','ᚦ'=>'ᚦ','ᚧ'=>'ᚧ','ᚨ'=>'ᚨ','ᚩ'=>'ᚩ','ᚪ'=>'ᚪ','ᚫ'=>'ᚫ','ᚬ'=>'ᚬ','ᚭ'=>'ᚭ','ᚮ'=>'ᚮ','ᚯ'=>'ᚯ','ᚰ'=>'ᚰ','ᚱ'=>'ᚱ','ᚲ'=>'ᚲ','ᚳ'=>'ᚳ','ᚴ'=>'ᚴ','ᚵ'=>'ᚵ','ᚶ'=>'ᚶ','ᚷ'=>'ᚷ','ᚸ'=>'ᚸ','ᚹ'=>'ᚹ','ᚺ'=>'ᚺ','ᚻ'=>'ᚻ','ᚼ'=>'ᚼ','ᚽ'=>'ᚽ','ᚾ'=>'ᚾ','ᚿ'=>'ᚿ','ᛀ'=>'ᛀ','ᛁ'=>'ᛁ','ᛂ'=>'ᛂ','ᛃ'=>'ᛃ','ᛄ'=>'ᛄ','ᛅ'=>'ᛅ','ᛆ'=>'ᛆ','ᛇ'=>'ᛇ','ᛈ'=>'ᛈ','ᛉ'=>'ᛉ','ᛊ'=>'ᛊ','ᛋ'=>'ᛋ','ᛌ'=>'ᛌ','ᛍ'=>'ᛍ','ᛎ'=>'ᛎ','ᛏ'=>'ᛏ','ᛐ'=>'ᛐ','ᛑ'=>'ᛑ','ᛒ'=>'ᛒ','ᛓ'=>'ᛓ','ᛔ'=>'ᛔ','ᛕ'=>'ᛕ','ᛖ'=>'ᛖ','ᛗ'=>'ᛗ','ᛘ'=>'ᛘ','ᛙ'=>'ᛙ','ᛚ'=>'ᛚ','ᛛ'=>'ᛛ','ᛜ'=>'ᛜ','ᛝ'=>'ᛝ','ᛞ'=>'ᛞ','ᛟ'=>'ᛟ','ᛠ'=>'ᛠ','ᛡ'=>'ᛡ','ᛢ'=>'ᛢ','ᛣ'=>'ᛣ','ᛤ'=>'ᛤ','ᛥ'=>'ᛥ','ᛦ'=>'ᛦ','ᛧ'=>'ᛧ','ᛨ'=>'ᛨ','ᛩ'=>'ᛩ','ᛪ'=>'ᛪ','ᛮ'=>'17','ᛯ'=>'18','ᛰ'=>'19','ᜀ'=>'ᜀ','ᜁ'=>'ᜁ','ᜂ'=>'ᜂ','ᜃ'=>'ᜃ','ᜄ'=>'ᜄ','ᜅ'=>'ᜅ','ᜆ'=>'ᜆ','ᜇ'=>'ᜇ','ᜈ'=>'ᜈ','ᜉ'=>'ᜉ','ᜊ'=>'ᜊ','ᜋ'=>'ᜋ','ᜌ'=>'ᜌ','ᜎ'=>'ᜎ','ᜏ'=>'ᜏ','ᜐ'=>'ᜐ','ᜑ'=>'ᜑ','ᜒ'=>'ᜒ','ᜓ'=>'ᜓ','᜔'=>'᜔','ᜠ'=>'ᜠ','ᜡ'=>'ᜡ','ᜢ'=>'ᜢ','ᜣ'=>'ᜣ','ᜤ'=>'ᜤ','ᜥ'=>'ᜥ','ᜦ'=>'ᜦ','ᜧ'=>'ᜧ','ᜨ'=>'ᜨ','ᜩ'=>'ᜩ','ᜪ'=>'ᜪ','ᜫ'=>'ᜫ','ᜬ'=>'ᜬ','ᜭ'=>'ᜭ','ᜮ'=>'ᜮ','ᜯ'=>'ᜯ','ᜰ'=>'ᜰ','ᜱ'=>'ᜱ','ᜲ'=>'ᜲ','ᜳ'=>'ᜳ','᜴'=>'᜴','ᝀ'=>'ᝀ','ᝁ'=>'ᝁ','ᝂ'=>'ᝂ','ᝃ'=>'ᝃ','ᝄ'=>'ᝄ','ᝅ'=>'ᝅ','ᝆ'=>'ᝆ','ᝇ'=>'ᝇ','ᝈ'=>'ᝈ','ᝉ'=>'ᝉ','ᝊ'=>'ᝊ','ᝋ'=>'ᝋ','ᝌ'=>'ᝌ','ᝍ'=>'ᝍ','ᝎ'=>'ᝎ','ᝏ'=>'ᝏ','ᝐ'=>'ᝐ','ᝑ'=>'ᝑ','ᝒ'=>'ᝒ','ᝓ'=>'ᝓ','ᝠ'=>'ᝠ','ᝡ'=>'ᝡ','ᝢ'=>'ᝢ','ᝣ'=>'ᝣ','ᝤ'=>'ᝤ','ᝥ'=>'ᝥ','ᝦ'=>'ᝦ','ᝧ'=>'ᝧ','ᝨ'=>'ᝨ','ᝩ'=>'ᝩ','ᝪ'=>'ᝪ','ᝫ'=>'ᝫ','ᝬ'=>'ᝬ','ᝮ'=>'ᝮ','ᝯ'=>'ᝯ','ᝰ'=>'ᝰ','ᝲ'=>'ᝲ','ᝳ'=>'ᝳ','ក'=>'ក','ខ'=>'ខ','គ'=>'គ','ឃ'=>'ឃ','ង'=>'ង','ច'=>'ច','ឆ'=>'ឆ','ជ'=>'ជ','ឈ'=>'ឈ','ញ'=>'ញ','ដ'=>'ដ','ឋ'=>'ឋ','ឌ'=>'ឌ','ឍ'=>'ឍ','ណ'=>'ណ','ត'=>'ត','ថ'=>'ថ','ទ'=>'ទ','ធ'=>'ធ','ន'=>'ន','ប'=>'ប','ផ'=>'ផ','ព'=>'ព','ភ'=>'ភ','ម'=>'ម','យ'=>'យ','រ'=>'រ','ល'=>'ល','វ'=>'វ','ឝ'=>'ឝ','ឞ'=>'ឞ','ស'=>'ស','ហ'=>'ហ','ឡ'=>'ឡ','អ'=>'អ','ឣ'=>'ឣ','ឤ'=>'ឤ','ឥ'=>'ឥ','ឦ'=>'ឦ','ឧ'=>'ឧ','ឨ'=>'ឨ','ឩ'=>'ឩ','ឪ'=>'ឪ','ឫ'=>'ឫ','ឬ'=>'ឬ','ឭ'=>'ឭ','ឮ'=>'ឮ','ឯ'=>'ឯ','ឰ'=>'ឰ','ឱ'=>'ឱ','ឲ'=>'ឲ','ឳ'=>'ឳ','ា'=>'ា','ិ'=>'ិ','ី'=>'ី','ឹ'=>'ឹ','ឺ'=>'ឺ','ុ'=>'ុ','ូ'=>'ូ','ួ'=>'ួ','ើ'=>'ើ','ឿ'=>'ឿ','ៀ'=>'ៀ','េ'=>'េ','ែ'=>'ែ','ៃ'=>'ៃ','ោ'=>'ោ','ៅ'=>'ៅ','ំ'=>'ំ','ះ'=>'ះ','ៈ'=>'ៈ','៉'=>'៉','៊'=>'៊','់'=>'់','៌'=>'៌','៍'=>'៍','៎'=>'៎','៏'=>'៏','័'=>'័','៑'=>'៑','្'=>'្','៓'=>'៓','ៗ'=>'ៗ','ៜ'=>'ៜ','៝'=>'៝','០'=>'0','១'=>'1','២'=>'2','៣'=>'3','៤'=>'4','៥'=>'5','៦'=>'6','៧'=>'7','៨'=>'8','៩'=>'9','៰'=>'0','៱'=>'1','៲'=>'2','៳'=>'3','៴'=>'4','៵'=>'5','៶'=>'6','៷'=>'7','៸'=>'8','៹'=>'9');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/search_indexer_20.php b/phpBB/includes/utf/data/search_indexer_20.php
deleted file mode 100644
index caab3c540b..0000000000
--- a/phpBB/includes/utf/data/search_indexer_20.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('ꀀ'=>'ꀀ','ꀁ'=>'ꀁ','ꀂ'=>'ꀂ','ꀃ'=>'ꀃ','ꀄ'=>'ꀄ','ꀅ'=>'ꀅ','ꀆ'=>'ꀆ','ꀇ'=>'ꀇ','ꀈ'=>'ꀈ','ꀉ'=>'ꀉ','ꀊ'=>'ꀊ','ꀋ'=>'ꀋ','ꀌ'=>'ꀌ','ꀍ'=>'ꀍ','ꀎ'=>'ꀎ','ꀏ'=>'ꀏ','ꀐ'=>'ꀐ','ꀑ'=>'ꀑ','ꀒ'=>'ꀒ','ꀓ'=>'ꀓ','ꀔ'=>'ꀔ','ꀕ'=>'ꀕ','ꀖ'=>'ꀖ','ꀗ'=>'ꀗ','ꀘ'=>'ꀘ','ꀙ'=>'ꀙ','ꀚ'=>'ꀚ','ꀛ'=>'ꀛ','ꀜ'=>'ꀜ','ꀝ'=>'ꀝ','ꀞ'=>'ꀞ','ꀟ'=>'ꀟ','ꀠ'=>'ꀠ','ꀡ'=>'ꀡ','ꀢ'=>'ꀢ','ꀣ'=>'ꀣ','ꀤ'=>'ꀤ','ꀥ'=>'ꀥ','ꀦ'=>'ꀦ','ꀧ'=>'ꀧ','ꀨ'=>'ꀨ','ꀩ'=>'ꀩ','ꀪ'=>'ꀪ','ꀫ'=>'ꀫ','ꀬ'=>'ꀬ','ꀭ'=>'ꀭ','ꀮ'=>'ꀮ','ꀯ'=>'ꀯ','ꀰ'=>'ꀰ','ꀱ'=>'ꀱ','ꀲ'=>'ꀲ','ꀳ'=>'ꀳ','ꀴ'=>'ꀴ','ꀵ'=>'ꀵ','ꀶ'=>'ꀶ','ꀷ'=>'ꀷ','ꀸ'=>'ꀸ','ꀹ'=>'ꀹ','ꀺ'=>'ꀺ','ꀻ'=>'ꀻ','ꀼ'=>'ꀼ','ꀽ'=>'ꀽ','ꀾ'=>'ꀾ','ꀿ'=>'ꀿ','ꁀ'=>'ꁀ','ꁁ'=>'ꁁ','ꁂ'=>'ꁂ','ꁃ'=>'ꁃ','ꁄ'=>'ꁄ','ꁅ'=>'ꁅ','ꁆ'=>'ꁆ','ꁇ'=>'ꁇ','ꁈ'=>'ꁈ','ꁉ'=>'ꁉ','ꁊ'=>'ꁊ','ꁋ'=>'ꁋ','ꁌ'=>'ꁌ','ꁍ'=>'ꁍ','ꁎ'=>'ꁎ','ꁏ'=>'ꁏ','ꁐ'=>'ꁐ','ꁑ'=>'ꁑ','ꁒ'=>'ꁒ','ꁓ'=>'ꁓ','ꁔ'=>'ꁔ','ꁕ'=>'ꁕ','ꁖ'=>'ꁖ','ꁗ'=>'ꁗ','ꁘ'=>'ꁘ','ꁙ'=>'ꁙ','ꁚ'=>'ꁚ','ꁛ'=>'ꁛ','ꁜ'=>'ꁜ','ꁝ'=>'ꁝ','ꁞ'=>'ꁞ','ꁟ'=>'ꁟ','ꁠ'=>'ꁠ','ꁡ'=>'ꁡ','ꁢ'=>'ꁢ','ꁣ'=>'ꁣ','ꁤ'=>'ꁤ','ꁥ'=>'ꁥ','ꁦ'=>'ꁦ','ꁧ'=>'ꁧ','ꁨ'=>'ꁨ','ꁩ'=>'ꁩ','ꁪ'=>'ꁪ','ꁫ'=>'ꁫ','ꁬ'=>'ꁬ','ꁭ'=>'ꁭ','ꁮ'=>'ꁮ','ꁯ'=>'ꁯ','ꁰ'=>'ꁰ','ꁱ'=>'ꁱ','ꁲ'=>'ꁲ','ꁳ'=>'ꁳ','ꁴ'=>'ꁴ','ꁵ'=>'ꁵ','ꁶ'=>'ꁶ','ꁷ'=>'ꁷ','ꁸ'=>'ꁸ','ꁹ'=>'ꁹ','ꁺ'=>'ꁺ','ꁻ'=>'ꁻ','ꁼ'=>'ꁼ','ꁽ'=>'ꁽ','ꁾ'=>'ꁾ','ꁿ'=>'ꁿ','ꂀ'=>'ꂀ','ꂁ'=>'ꂁ','ꂂ'=>'ꂂ','ꂃ'=>'ꂃ','ꂄ'=>'ꂄ','ꂅ'=>'ꂅ','ꂆ'=>'ꂆ','ꂇ'=>'ꂇ','ꂈ'=>'ꂈ','ꂉ'=>'ꂉ','ꂊ'=>'ꂊ','ꂋ'=>'ꂋ','ꂌ'=>'ꂌ','ꂍ'=>'ꂍ','ꂎ'=>'ꂎ','ꂏ'=>'ꂏ','ꂐ'=>'ꂐ','ꂑ'=>'ꂑ','ꂒ'=>'ꂒ','ꂓ'=>'ꂓ','ꂔ'=>'ꂔ','ꂕ'=>'ꂕ','ꂖ'=>'ꂖ','ꂗ'=>'ꂗ','ꂘ'=>'ꂘ','ꂙ'=>'ꂙ','ꂚ'=>'ꂚ','ꂛ'=>'ꂛ','ꂜ'=>'ꂜ','ꂝ'=>'ꂝ','ꂞ'=>'ꂞ','ꂟ'=>'ꂟ','ꂠ'=>'ꂠ','ꂡ'=>'ꂡ','ꂢ'=>'ꂢ','ꂣ'=>'ꂣ','ꂤ'=>'ꂤ','ꂥ'=>'ꂥ','ꂦ'=>'ꂦ','ꂧ'=>'ꂧ','ꂨ'=>'ꂨ','ꂩ'=>'ꂩ','ꂪ'=>'ꂪ','ꂫ'=>'ꂫ','ꂬ'=>'ꂬ','ꂭ'=>'ꂭ','ꂮ'=>'ꂮ','ꂯ'=>'ꂯ','ꂰ'=>'ꂰ','ꂱ'=>'ꂱ','ꂲ'=>'ꂲ','ꂳ'=>'ꂳ','ꂴ'=>'ꂴ','ꂵ'=>'ꂵ','ꂶ'=>'ꂶ','ꂷ'=>'ꂷ','ꂸ'=>'ꂸ','ꂹ'=>'ꂹ','ꂺ'=>'ꂺ','ꂻ'=>'ꂻ','ꂼ'=>'ꂼ','ꂽ'=>'ꂽ','ꂾ'=>'ꂾ','ꂿ'=>'ꂿ','ꃀ'=>'ꃀ','ꃁ'=>'ꃁ','ꃂ'=>'ꃂ','ꃃ'=>'ꃃ','ꃄ'=>'ꃄ','ꃅ'=>'ꃅ','ꃆ'=>'ꃆ','ꃇ'=>'ꃇ','ꃈ'=>'ꃈ','ꃉ'=>'ꃉ','ꃊ'=>'ꃊ','ꃋ'=>'ꃋ','ꃌ'=>'ꃌ','ꃍ'=>'ꃍ','ꃎ'=>'ꃎ','ꃏ'=>'ꃏ','ꃐ'=>'ꃐ','ꃑ'=>'ꃑ','ꃒ'=>'ꃒ','ꃓ'=>'ꃓ','ꃔ'=>'ꃔ','ꃕ'=>'ꃕ','ꃖ'=>'ꃖ','ꃗ'=>'ꃗ','ꃘ'=>'ꃘ','ꃙ'=>'ꃙ','ꃚ'=>'ꃚ','ꃛ'=>'ꃛ','ꃜ'=>'ꃜ','ꃝ'=>'ꃝ','ꃞ'=>'ꃞ','ꃟ'=>'ꃟ','ꃠ'=>'ꃠ','ꃡ'=>'ꃡ','ꃢ'=>'ꃢ','ꃣ'=>'ꃣ','ꃤ'=>'ꃤ','ꃥ'=>'ꃥ','ꃦ'=>'ꃦ','ꃧ'=>'ꃧ','ꃨ'=>'ꃨ','ꃩ'=>'ꃩ','ꃪ'=>'ꃪ','ꃫ'=>'ꃫ','ꃬ'=>'ꃬ','ꃭ'=>'ꃭ','ꃮ'=>'ꃮ','ꃯ'=>'ꃯ','ꃰ'=>'ꃰ','ꃱ'=>'ꃱ','ꃲ'=>'ꃲ','ꃳ'=>'ꃳ','ꃴ'=>'ꃴ','ꃵ'=>'ꃵ','ꃶ'=>'ꃶ','ꃷ'=>'ꃷ','ꃸ'=>'ꃸ','ꃹ'=>'ꃹ','ꃺ'=>'ꃺ','ꃻ'=>'ꃻ','ꃼ'=>'ꃼ','ꃽ'=>'ꃽ','ꃾ'=>'ꃾ','ꃿ'=>'ꃿ','ꄀ'=>'ꄀ','ꄁ'=>'ꄁ','ꄂ'=>'ꄂ','ꄃ'=>'ꄃ','ꄄ'=>'ꄄ','ꄅ'=>'ꄅ','ꄆ'=>'ꄆ','ꄇ'=>'ꄇ','ꄈ'=>'ꄈ','ꄉ'=>'ꄉ','ꄊ'=>'ꄊ','ꄋ'=>'ꄋ','ꄌ'=>'ꄌ','ꄍ'=>'ꄍ','ꄎ'=>'ꄎ','ꄏ'=>'ꄏ','ꄐ'=>'ꄐ','ꄑ'=>'ꄑ','ꄒ'=>'ꄒ','ꄓ'=>'ꄓ','ꄔ'=>'ꄔ','ꄕ'=>'ꄕ','ꄖ'=>'ꄖ','ꄗ'=>'ꄗ','ꄘ'=>'ꄘ','ꄙ'=>'ꄙ','ꄚ'=>'ꄚ','ꄛ'=>'ꄛ','ꄜ'=>'ꄜ','ꄝ'=>'ꄝ','ꄞ'=>'ꄞ','ꄟ'=>'ꄟ','ꄠ'=>'ꄠ','ꄡ'=>'ꄡ','ꄢ'=>'ꄢ','ꄣ'=>'ꄣ','ꄤ'=>'ꄤ','ꄥ'=>'ꄥ','ꄦ'=>'ꄦ','ꄧ'=>'ꄧ','ꄨ'=>'ꄨ','ꄩ'=>'ꄩ','ꄪ'=>'ꄪ','ꄫ'=>'ꄫ','ꄬ'=>'ꄬ','ꄭ'=>'ꄭ','ꄮ'=>'ꄮ','ꄯ'=>'ꄯ','ꄰ'=>'ꄰ','ꄱ'=>'ꄱ','ꄲ'=>'ꄲ','ꄳ'=>'ꄳ','ꄴ'=>'ꄴ','ꄵ'=>'ꄵ','ꄶ'=>'ꄶ','ꄷ'=>'ꄷ','ꄸ'=>'ꄸ','ꄹ'=>'ꄹ','ꄺ'=>'ꄺ','ꄻ'=>'ꄻ','ꄼ'=>'ꄼ','ꄽ'=>'ꄽ','ꄾ'=>'ꄾ','ꄿ'=>'ꄿ','ꅀ'=>'ꅀ','ꅁ'=>'ꅁ','ꅂ'=>'ꅂ','ꅃ'=>'ꅃ','ꅄ'=>'ꅄ','ꅅ'=>'ꅅ','ꅆ'=>'ꅆ','ꅇ'=>'ꅇ','ꅈ'=>'ꅈ','ꅉ'=>'ꅉ','ꅊ'=>'ꅊ','ꅋ'=>'ꅋ','ꅌ'=>'ꅌ','ꅍ'=>'ꅍ','ꅎ'=>'ꅎ','ꅏ'=>'ꅏ','ꅐ'=>'ꅐ','ꅑ'=>'ꅑ','ꅒ'=>'ꅒ','ꅓ'=>'ꅓ','ꅔ'=>'ꅔ','ꅕ'=>'ꅕ','ꅖ'=>'ꅖ','ꅗ'=>'ꅗ','ꅘ'=>'ꅘ','ꅙ'=>'ꅙ','ꅚ'=>'ꅚ','ꅛ'=>'ꅛ','ꅜ'=>'ꅜ','ꅝ'=>'ꅝ','ꅞ'=>'ꅞ','ꅟ'=>'ꅟ','ꅠ'=>'ꅠ','ꅡ'=>'ꅡ','ꅢ'=>'ꅢ','ꅣ'=>'ꅣ','ꅤ'=>'ꅤ','ꅥ'=>'ꅥ','ꅦ'=>'ꅦ','ꅧ'=>'ꅧ','ꅨ'=>'ꅨ','ꅩ'=>'ꅩ','ꅪ'=>'ꅪ','ꅫ'=>'ꅫ','ꅬ'=>'ꅬ','ꅭ'=>'ꅭ','ꅮ'=>'ꅮ','ꅯ'=>'ꅯ','ꅰ'=>'ꅰ','ꅱ'=>'ꅱ','ꅲ'=>'ꅲ','ꅳ'=>'ꅳ','ꅴ'=>'ꅴ','ꅵ'=>'ꅵ','ꅶ'=>'ꅶ','ꅷ'=>'ꅷ','ꅸ'=>'ꅸ','ꅹ'=>'ꅹ','ꅺ'=>'ꅺ','ꅻ'=>'ꅻ','ꅼ'=>'ꅼ','ꅽ'=>'ꅽ','ꅾ'=>'ꅾ','ꅿ'=>'ꅿ','ꆀ'=>'ꆀ','ꆁ'=>'ꆁ','ꆂ'=>'ꆂ','ꆃ'=>'ꆃ','ꆄ'=>'ꆄ','ꆅ'=>'ꆅ','ꆆ'=>'ꆆ','ꆇ'=>'ꆇ','ꆈ'=>'ꆈ','ꆉ'=>'ꆉ','ꆊ'=>'ꆊ','ꆋ'=>'ꆋ','ꆌ'=>'ꆌ','ꆍ'=>'ꆍ','ꆎ'=>'ꆎ','ꆏ'=>'ꆏ','ꆐ'=>'ꆐ','ꆑ'=>'ꆑ','ꆒ'=>'ꆒ','ꆓ'=>'ꆓ','ꆔ'=>'ꆔ','ꆕ'=>'ꆕ','ꆖ'=>'ꆖ','ꆗ'=>'ꆗ','ꆘ'=>'ꆘ','ꆙ'=>'ꆙ','ꆚ'=>'ꆚ','ꆛ'=>'ꆛ','ꆜ'=>'ꆜ','ꆝ'=>'ꆝ','ꆞ'=>'ꆞ','ꆟ'=>'ꆟ','ꆠ'=>'ꆠ','ꆡ'=>'ꆡ','ꆢ'=>'ꆢ','ꆣ'=>'ꆣ','ꆤ'=>'ꆤ','ꆥ'=>'ꆥ','ꆦ'=>'ꆦ','ꆧ'=>'ꆧ','ꆨ'=>'ꆨ','ꆩ'=>'ꆩ','ꆪ'=>'ꆪ','ꆫ'=>'ꆫ','ꆬ'=>'ꆬ','ꆭ'=>'ꆭ','ꆮ'=>'ꆮ','ꆯ'=>'ꆯ','ꆰ'=>'ꆰ','ꆱ'=>'ꆱ','ꆲ'=>'ꆲ','ꆳ'=>'ꆳ','ꆴ'=>'ꆴ','ꆵ'=>'ꆵ','ꆶ'=>'ꆶ','ꆷ'=>'ꆷ','ꆸ'=>'ꆸ','ꆹ'=>'ꆹ','ꆺ'=>'ꆺ','ꆻ'=>'ꆻ','ꆼ'=>'ꆼ','ꆽ'=>'ꆽ','ꆾ'=>'ꆾ','ꆿ'=>'ꆿ','ꇀ'=>'ꇀ','ꇁ'=>'ꇁ','ꇂ'=>'ꇂ','ꇃ'=>'ꇃ','ꇄ'=>'ꇄ','ꇅ'=>'ꇅ','ꇆ'=>'ꇆ','ꇇ'=>'ꇇ','ꇈ'=>'ꇈ','ꇉ'=>'ꇉ','ꇊ'=>'ꇊ','ꇋ'=>'ꇋ','ꇌ'=>'ꇌ','ꇍ'=>'ꇍ','ꇎ'=>'ꇎ','ꇏ'=>'ꇏ','ꇐ'=>'ꇐ','ꇑ'=>'ꇑ','ꇒ'=>'ꇒ','ꇓ'=>'ꇓ','ꇔ'=>'ꇔ','ꇕ'=>'ꇕ','ꇖ'=>'ꇖ','ꇗ'=>'ꇗ','ꇘ'=>'ꇘ','ꇙ'=>'ꇙ','ꇚ'=>'ꇚ','ꇛ'=>'ꇛ','ꇜ'=>'ꇜ','ꇝ'=>'ꇝ','ꇞ'=>'ꇞ','ꇟ'=>'ꇟ','ꇠ'=>'ꇠ','ꇡ'=>'ꇡ','ꇢ'=>'ꇢ','ꇣ'=>'ꇣ','ꇤ'=>'ꇤ','ꇥ'=>'ꇥ','ꇦ'=>'ꇦ','ꇧ'=>'ꇧ','ꇨ'=>'ꇨ','ꇩ'=>'ꇩ','ꇪ'=>'ꇪ','ꇫ'=>'ꇫ','ꇬ'=>'ꇬ','ꇭ'=>'ꇭ','ꇮ'=>'ꇮ','ꇯ'=>'ꇯ','ꇰ'=>'ꇰ','ꇱ'=>'ꇱ','ꇲ'=>'ꇲ','ꇳ'=>'ꇳ','ꇴ'=>'ꇴ','ꇵ'=>'ꇵ','ꇶ'=>'ꇶ','ꇷ'=>'ꇷ','ꇸ'=>'ꇸ','ꇹ'=>'ꇹ','ꇺ'=>'ꇺ','ꇻ'=>'ꇻ','ꇼ'=>'ꇼ','ꇽ'=>'ꇽ','ꇾ'=>'ꇾ','ꇿ'=>'ꇿ','ꈀ'=>'ꈀ','ꈁ'=>'ꈁ','ꈂ'=>'ꈂ','ꈃ'=>'ꈃ','ꈄ'=>'ꈄ','ꈅ'=>'ꈅ','ꈆ'=>'ꈆ','ꈇ'=>'ꈇ','ꈈ'=>'ꈈ','ꈉ'=>'ꈉ','ꈊ'=>'ꈊ','ꈋ'=>'ꈋ','ꈌ'=>'ꈌ','ꈍ'=>'ꈍ','ꈎ'=>'ꈎ','ꈏ'=>'ꈏ','ꈐ'=>'ꈐ','ꈑ'=>'ꈑ','ꈒ'=>'ꈒ','ꈓ'=>'ꈓ','ꈔ'=>'ꈔ','ꈕ'=>'ꈕ','ꈖ'=>'ꈖ','ꈗ'=>'ꈗ','ꈘ'=>'ꈘ','ꈙ'=>'ꈙ','ꈚ'=>'ꈚ','ꈛ'=>'ꈛ','ꈜ'=>'ꈜ','ꈝ'=>'ꈝ','ꈞ'=>'ꈞ','ꈟ'=>'ꈟ','ꈠ'=>'ꈠ','ꈡ'=>'ꈡ','ꈢ'=>'ꈢ','ꈣ'=>'ꈣ','ꈤ'=>'ꈤ','ꈥ'=>'ꈥ','ꈦ'=>'ꈦ','ꈧ'=>'ꈧ','ꈨ'=>'ꈨ','ꈩ'=>'ꈩ','ꈪ'=>'ꈪ','ꈫ'=>'ꈫ','ꈬ'=>'ꈬ','ꈭ'=>'ꈭ','ꈮ'=>'ꈮ','ꈯ'=>'ꈯ','ꈰ'=>'ꈰ','ꈱ'=>'ꈱ','ꈲ'=>'ꈲ','ꈳ'=>'ꈳ','ꈴ'=>'ꈴ','ꈵ'=>'ꈵ','ꈶ'=>'ꈶ','ꈷ'=>'ꈷ','ꈸ'=>'ꈸ','ꈹ'=>'ꈹ','ꈺ'=>'ꈺ','ꈻ'=>'ꈻ','ꈼ'=>'ꈼ','ꈽ'=>'ꈽ','ꈾ'=>'ꈾ','ꈿ'=>'ꈿ','ꉀ'=>'ꉀ','ꉁ'=>'ꉁ','ꉂ'=>'ꉂ','ꉃ'=>'ꉃ','ꉄ'=>'ꉄ','ꉅ'=>'ꉅ','ꉆ'=>'ꉆ','ꉇ'=>'ꉇ','ꉈ'=>'ꉈ','ꉉ'=>'ꉉ','ꉊ'=>'ꉊ','ꉋ'=>'ꉋ','ꉌ'=>'ꉌ','ꉍ'=>'ꉍ','ꉎ'=>'ꉎ','ꉏ'=>'ꉏ','ꉐ'=>'ꉐ','ꉑ'=>'ꉑ','ꉒ'=>'ꉒ','ꉓ'=>'ꉓ','ꉔ'=>'ꉔ','ꉕ'=>'ꉕ','ꉖ'=>'ꉖ','ꉗ'=>'ꉗ','ꉘ'=>'ꉘ','ꉙ'=>'ꉙ','ꉚ'=>'ꉚ','ꉛ'=>'ꉛ','ꉜ'=>'ꉜ','ꉝ'=>'ꉝ','ꉞ'=>'ꉞ','ꉟ'=>'ꉟ','ꉠ'=>'ꉠ','ꉡ'=>'ꉡ','ꉢ'=>'ꉢ','ꉣ'=>'ꉣ','ꉤ'=>'ꉤ','ꉥ'=>'ꉥ','ꉦ'=>'ꉦ','ꉧ'=>'ꉧ','ꉨ'=>'ꉨ','ꉩ'=>'ꉩ','ꉪ'=>'ꉪ','ꉫ'=>'ꉫ','ꉬ'=>'ꉬ','ꉭ'=>'ꉭ','ꉮ'=>'ꉮ','ꉯ'=>'ꉯ','ꉰ'=>'ꉰ','ꉱ'=>'ꉱ','ꉲ'=>'ꉲ','ꉳ'=>'ꉳ','ꉴ'=>'ꉴ','ꉵ'=>'ꉵ','ꉶ'=>'ꉶ','ꉷ'=>'ꉷ','ꉸ'=>'ꉸ','ꉹ'=>'ꉹ','ꉺ'=>'ꉺ','ꉻ'=>'ꉻ','ꉼ'=>'ꉼ','ꉽ'=>'ꉽ','ꉾ'=>'ꉾ','ꉿ'=>'ꉿ','ꊀ'=>'ꊀ','ꊁ'=>'ꊁ','ꊂ'=>'ꊂ','ꊃ'=>'ꊃ','ꊄ'=>'ꊄ','ꊅ'=>'ꊅ','ꊆ'=>'ꊆ','ꊇ'=>'ꊇ','ꊈ'=>'ꊈ','ꊉ'=>'ꊉ','ꊊ'=>'ꊊ','ꊋ'=>'ꊋ','ꊌ'=>'ꊌ','ꊍ'=>'ꊍ','ꊎ'=>'ꊎ','ꊏ'=>'ꊏ','ꊐ'=>'ꊐ','ꊑ'=>'ꊑ','ꊒ'=>'ꊒ','ꊓ'=>'ꊓ','ꊔ'=>'ꊔ','ꊕ'=>'ꊕ','ꊖ'=>'ꊖ','ꊗ'=>'ꊗ','ꊘ'=>'ꊘ','ꊙ'=>'ꊙ','ꊚ'=>'ꊚ','ꊛ'=>'ꊛ','ꊜ'=>'ꊜ','ꊝ'=>'ꊝ','ꊞ'=>'ꊞ','ꊟ'=>'ꊟ','ꊠ'=>'ꊠ','ꊡ'=>'ꊡ','ꊢ'=>'ꊢ','ꊣ'=>'ꊣ','ꊤ'=>'ꊤ','ꊥ'=>'ꊥ','ꊦ'=>'ꊦ','ꊧ'=>'ꊧ','ꊨ'=>'ꊨ','ꊩ'=>'ꊩ','ꊪ'=>'ꊪ','ꊫ'=>'ꊫ','ꊬ'=>'ꊬ','ꊭ'=>'ꊭ','ꊮ'=>'ꊮ','ꊯ'=>'ꊯ','ꊰ'=>'ꊰ','ꊱ'=>'ꊱ','ꊲ'=>'ꊲ','ꊳ'=>'ꊳ','ꊴ'=>'ꊴ','ꊵ'=>'ꊵ','ꊶ'=>'ꊶ','ꊷ'=>'ꊷ','ꊸ'=>'ꊸ','ꊹ'=>'ꊹ','ꊺ'=>'ꊺ','ꊻ'=>'ꊻ','ꊼ'=>'ꊼ','ꊽ'=>'ꊽ','ꊾ'=>'ꊾ','ꊿ'=>'ꊿ','ꋀ'=>'ꋀ','ꋁ'=>'ꋁ','ꋂ'=>'ꋂ','ꋃ'=>'ꋃ','ꋄ'=>'ꋄ','ꋅ'=>'ꋅ','ꋆ'=>'ꋆ','ꋇ'=>'ꋇ','ꋈ'=>'ꋈ','ꋉ'=>'ꋉ','ꋊ'=>'ꋊ','ꋋ'=>'ꋋ','ꋌ'=>'ꋌ','ꋍ'=>'ꋍ','ꋎ'=>'ꋎ','ꋏ'=>'ꋏ','ꋐ'=>'ꋐ','ꋑ'=>'ꋑ','ꋒ'=>'ꋒ','ꋓ'=>'ꋓ','ꋔ'=>'ꋔ','ꋕ'=>'ꋕ','ꋖ'=>'ꋖ','ꋗ'=>'ꋗ','ꋘ'=>'ꋘ','ꋙ'=>'ꋙ','ꋚ'=>'ꋚ','ꋛ'=>'ꋛ','ꋜ'=>'ꋜ','ꋝ'=>'ꋝ','ꋞ'=>'ꋞ','ꋟ'=>'ꋟ','ꋠ'=>'ꋠ','ꋡ'=>'ꋡ','ꋢ'=>'ꋢ','ꋣ'=>'ꋣ','ꋤ'=>'ꋤ','ꋥ'=>'ꋥ','ꋦ'=>'ꋦ','ꋧ'=>'ꋧ','ꋨ'=>'ꋨ','ꋩ'=>'ꋩ','ꋪ'=>'ꋪ','ꋫ'=>'ꋫ','ꋬ'=>'ꋬ','ꋭ'=>'ꋭ','ꋮ'=>'ꋮ','ꋯ'=>'ꋯ','ꋰ'=>'ꋰ','ꋱ'=>'ꋱ','ꋲ'=>'ꋲ','ꋳ'=>'ꋳ','ꋴ'=>'ꋴ','ꋵ'=>'ꋵ','ꋶ'=>'ꋶ','ꋷ'=>'ꋷ','ꋸ'=>'ꋸ','ꋹ'=>'ꋹ','ꋺ'=>'ꋺ','ꋻ'=>'ꋻ','ꋼ'=>'ꋼ','ꋽ'=>'ꋽ','ꋾ'=>'ꋾ','ꋿ'=>'ꋿ','ꌀ'=>'ꌀ','ꌁ'=>'ꌁ','ꌂ'=>'ꌂ','ꌃ'=>'ꌃ','ꌄ'=>'ꌄ','ꌅ'=>'ꌅ','ꌆ'=>'ꌆ','ꌇ'=>'ꌇ','ꌈ'=>'ꌈ','ꌉ'=>'ꌉ','ꌊ'=>'ꌊ','ꌋ'=>'ꌋ','ꌌ'=>'ꌌ','ꌍ'=>'ꌍ','ꌎ'=>'ꌎ','ꌏ'=>'ꌏ','ꌐ'=>'ꌐ','ꌑ'=>'ꌑ','ꌒ'=>'ꌒ','ꌓ'=>'ꌓ','ꌔ'=>'ꌔ','ꌕ'=>'ꌕ','ꌖ'=>'ꌖ','ꌗ'=>'ꌗ','ꌘ'=>'ꌘ','ꌙ'=>'ꌙ','ꌚ'=>'ꌚ','ꌛ'=>'ꌛ','ꌜ'=>'ꌜ','ꌝ'=>'ꌝ','ꌞ'=>'ꌞ','ꌟ'=>'ꌟ','ꌠ'=>'ꌠ','ꌡ'=>'ꌡ','ꌢ'=>'ꌢ','ꌣ'=>'ꌣ','ꌤ'=>'ꌤ','ꌥ'=>'ꌥ','ꌦ'=>'ꌦ','ꌧ'=>'ꌧ','ꌨ'=>'ꌨ','ꌩ'=>'ꌩ','ꌪ'=>'ꌪ','ꌫ'=>'ꌫ','ꌬ'=>'ꌬ','ꌭ'=>'ꌭ','ꌮ'=>'ꌮ','ꌯ'=>'ꌯ','ꌰ'=>'ꌰ','ꌱ'=>'ꌱ','ꌲ'=>'ꌲ','ꌳ'=>'ꌳ','ꌴ'=>'ꌴ','ꌵ'=>'ꌵ','ꌶ'=>'ꌶ','ꌷ'=>'ꌷ','ꌸ'=>'ꌸ','ꌹ'=>'ꌹ','ꌺ'=>'ꌺ','ꌻ'=>'ꌻ','ꌼ'=>'ꌼ','ꌽ'=>'ꌽ','ꌾ'=>'ꌾ','ꌿ'=>'ꌿ','ꍀ'=>'ꍀ','ꍁ'=>'ꍁ','ꍂ'=>'ꍂ','ꍃ'=>'ꍃ','ꍄ'=>'ꍄ','ꍅ'=>'ꍅ','ꍆ'=>'ꍆ','ꍇ'=>'ꍇ','ꍈ'=>'ꍈ','ꍉ'=>'ꍉ','ꍊ'=>'ꍊ','ꍋ'=>'ꍋ','ꍌ'=>'ꍌ','ꍍ'=>'ꍍ','ꍎ'=>'ꍎ','ꍏ'=>'ꍏ','ꍐ'=>'ꍐ','ꍑ'=>'ꍑ','ꍒ'=>'ꍒ','ꍓ'=>'ꍓ','ꍔ'=>'ꍔ','ꍕ'=>'ꍕ','ꍖ'=>'ꍖ','ꍗ'=>'ꍗ','ꍘ'=>'ꍘ','ꍙ'=>'ꍙ','ꍚ'=>'ꍚ','ꍛ'=>'ꍛ','ꍜ'=>'ꍜ','ꍝ'=>'ꍝ','ꍞ'=>'ꍞ','ꍟ'=>'ꍟ','ꍠ'=>'ꍠ','ꍡ'=>'ꍡ','ꍢ'=>'ꍢ','ꍣ'=>'ꍣ','ꍤ'=>'ꍤ','ꍥ'=>'ꍥ','ꍦ'=>'ꍦ','ꍧ'=>'ꍧ','ꍨ'=>'ꍨ','ꍩ'=>'ꍩ','ꍪ'=>'ꍪ','ꍫ'=>'ꍫ','ꍬ'=>'ꍬ','ꍭ'=>'ꍭ','ꍮ'=>'ꍮ','ꍯ'=>'ꍯ','ꍰ'=>'ꍰ','ꍱ'=>'ꍱ','ꍲ'=>'ꍲ','ꍳ'=>'ꍳ','ꍴ'=>'ꍴ','ꍵ'=>'ꍵ','ꍶ'=>'ꍶ','ꍷ'=>'ꍷ','ꍸ'=>'ꍸ','ꍹ'=>'ꍹ','ꍺ'=>'ꍺ','ꍻ'=>'ꍻ','ꍼ'=>'ꍼ','ꍽ'=>'ꍽ','ꍾ'=>'ꍾ','ꍿ'=>'ꍿ','ꎀ'=>'ꎀ','ꎁ'=>'ꎁ','ꎂ'=>'ꎂ','ꎃ'=>'ꎃ','ꎄ'=>'ꎄ','ꎅ'=>'ꎅ','ꎆ'=>'ꎆ','ꎇ'=>'ꎇ','ꎈ'=>'ꎈ','ꎉ'=>'ꎉ','ꎊ'=>'ꎊ','ꎋ'=>'ꎋ','ꎌ'=>'ꎌ','ꎍ'=>'ꎍ','ꎎ'=>'ꎎ','ꎏ'=>'ꎏ','ꎐ'=>'ꎐ','ꎑ'=>'ꎑ','ꎒ'=>'ꎒ','ꎓ'=>'ꎓ','ꎔ'=>'ꎔ','ꎕ'=>'ꎕ','ꎖ'=>'ꎖ','ꎗ'=>'ꎗ','ꎘ'=>'ꎘ','ꎙ'=>'ꎙ','ꎚ'=>'ꎚ','ꎛ'=>'ꎛ','ꎜ'=>'ꎜ','ꎝ'=>'ꎝ','ꎞ'=>'ꎞ','ꎟ'=>'ꎟ','ꎠ'=>'ꎠ','ꎡ'=>'ꎡ','ꎢ'=>'ꎢ','ꎣ'=>'ꎣ','ꎤ'=>'ꎤ','ꎥ'=>'ꎥ','ꎦ'=>'ꎦ','ꎧ'=>'ꎧ','ꎨ'=>'ꎨ','ꎩ'=>'ꎩ','ꎪ'=>'ꎪ','ꎫ'=>'ꎫ','ꎬ'=>'ꎬ','ꎭ'=>'ꎭ','ꎮ'=>'ꎮ','ꎯ'=>'ꎯ','ꎰ'=>'ꎰ','ꎱ'=>'ꎱ','ꎲ'=>'ꎲ','ꎳ'=>'ꎳ','ꎴ'=>'ꎴ','ꎵ'=>'ꎵ','ꎶ'=>'ꎶ','ꎷ'=>'ꎷ','ꎸ'=>'ꎸ','ꎹ'=>'ꎹ','ꎺ'=>'ꎺ','ꎻ'=>'ꎻ','ꎼ'=>'ꎼ','ꎽ'=>'ꎽ','ꎾ'=>'ꎾ','ꎿ'=>'ꎿ','ꏀ'=>'ꏀ','ꏁ'=>'ꏁ','ꏂ'=>'ꏂ','ꏃ'=>'ꏃ','ꏄ'=>'ꏄ','ꏅ'=>'ꏅ','ꏆ'=>'ꏆ','ꏇ'=>'ꏇ','ꏈ'=>'ꏈ','ꏉ'=>'ꏉ','ꏊ'=>'ꏊ','ꏋ'=>'ꏋ','ꏌ'=>'ꏌ','ꏍ'=>'ꏍ','ꏎ'=>'ꏎ','ꏏ'=>'ꏏ','ꏐ'=>'ꏐ','ꏑ'=>'ꏑ','ꏒ'=>'ꏒ','ꏓ'=>'ꏓ','ꏔ'=>'ꏔ','ꏕ'=>'ꏕ','ꏖ'=>'ꏖ','ꏗ'=>'ꏗ','ꏘ'=>'ꏘ','ꏙ'=>'ꏙ','ꏚ'=>'ꏚ','ꏛ'=>'ꏛ','ꏜ'=>'ꏜ','ꏝ'=>'ꏝ','ꏞ'=>'ꏞ','ꏟ'=>'ꏟ','ꏠ'=>'ꏠ','ꏡ'=>'ꏡ','ꏢ'=>'ꏢ','ꏣ'=>'ꏣ','ꏤ'=>'ꏤ','ꏥ'=>'ꏥ','ꏦ'=>'ꏦ','ꏧ'=>'ꏧ','ꏨ'=>'ꏨ','ꏩ'=>'ꏩ','ꏪ'=>'ꏪ','ꏫ'=>'ꏫ','ꏬ'=>'ꏬ','ꏭ'=>'ꏭ','ꏮ'=>'ꏮ','ꏯ'=>'ꏯ','ꏰ'=>'ꏰ','ꏱ'=>'ꏱ','ꏲ'=>'ꏲ','ꏳ'=>'ꏳ','ꏴ'=>'ꏴ','ꏵ'=>'ꏵ','ꏶ'=>'ꏶ','ꏷ'=>'ꏷ','ꏸ'=>'ꏸ','ꏹ'=>'ꏹ','ꏺ'=>'ꏺ','ꏻ'=>'ꏻ','ꏼ'=>'ꏼ','ꏽ'=>'ꏽ','ꏾ'=>'ꏾ','ꏿ'=>'ꏿ','ꐀ'=>'ꐀ','ꐁ'=>'ꐁ','ꐂ'=>'ꐂ','ꐃ'=>'ꐃ','ꐄ'=>'ꐄ','ꐅ'=>'ꐅ','ꐆ'=>'ꐆ','ꐇ'=>'ꐇ','ꐈ'=>'ꐈ','ꐉ'=>'ꐉ','ꐊ'=>'ꐊ','ꐋ'=>'ꐋ','ꐌ'=>'ꐌ','ꐍ'=>'ꐍ','ꐎ'=>'ꐎ','ꐏ'=>'ꐏ','ꐐ'=>'ꐐ','ꐑ'=>'ꐑ','ꐒ'=>'ꐒ','ꐓ'=>'ꐓ','ꐔ'=>'ꐔ','ꐕ'=>'ꐕ','ꐖ'=>'ꐖ','ꐗ'=>'ꐗ','ꐘ'=>'ꐘ','ꐙ'=>'ꐙ','ꐚ'=>'ꐚ','ꐛ'=>'ꐛ','ꐜ'=>'ꐜ','ꐝ'=>'ꐝ','ꐞ'=>'ꐞ','ꐟ'=>'ꐟ','ꐠ'=>'ꐠ','ꐡ'=>'ꐡ','ꐢ'=>'ꐢ','ꐣ'=>'ꐣ','ꐤ'=>'ꐤ','ꐥ'=>'ꐥ','ꐦ'=>'ꐦ','ꐧ'=>'ꐧ','ꐨ'=>'ꐨ','ꐩ'=>'ꐩ','ꐪ'=>'ꐪ','ꐫ'=>'ꐫ','ꐬ'=>'ꐬ','ꐭ'=>'ꐭ','ꐮ'=>'ꐮ','ꐯ'=>'ꐯ','ꐰ'=>'ꐰ','ꐱ'=>'ꐱ','ꐲ'=>'ꐲ','ꐳ'=>'ꐳ','ꐴ'=>'ꐴ','ꐵ'=>'ꐵ','ꐶ'=>'ꐶ','ꐷ'=>'ꐷ','ꐸ'=>'ꐸ','ꐹ'=>'ꐹ','ꐺ'=>'ꐺ','ꐻ'=>'ꐻ','ꐼ'=>'ꐼ','ꐽ'=>'ꐽ','ꐾ'=>'ꐾ','ꐿ'=>'ꐿ','ꑀ'=>'ꑀ','ꑁ'=>'ꑁ','ꑂ'=>'ꑂ','ꑃ'=>'ꑃ','ꑄ'=>'ꑄ','ꑅ'=>'ꑅ','ꑆ'=>'ꑆ','ꑇ'=>'ꑇ','ꑈ'=>'ꑈ','ꑉ'=>'ꑉ','ꑊ'=>'ꑊ','ꑋ'=>'ꑋ','ꑌ'=>'ꑌ','ꑍ'=>'ꑍ','ꑎ'=>'ꑎ','ꑏ'=>'ꑏ','ꑐ'=>'ꑐ','ꑑ'=>'ꑑ','ꑒ'=>'ꑒ','ꑓ'=>'ꑓ','ꑔ'=>'ꑔ','ꑕ'=>'ꑕ','ꑖ'=>'ꑖ','ꑗ'=>'ꑗ','ꑘ'=>'ꑘ','ꑙ'=>'ꑙ','ꑚ'=>'ꑚ','ꑛ'=>'ꑛ','ꑜ'=>'ꑜ','ꑝ'=>'ꑝ','ꑞ'=>'ꑞ','ꑟ'=>'ꑟ','ꑠ'=>'ꑠ','ꑡ'=>'ꑡ','ꑢ'=>'ꑢ','ꑣ'=>'ꑣ','ꑤ'=>'ꑤ','ꑥ'=>'ꑥ','ꑦ'=>'ꑦ','ꑧ'=>'ꑧ','ꑨ'=>'ꑨ','ꑩ'=>'ꑩ','ꑪ'=>'ꑪ','ꑫ'=>'ꑫ','ꑬ'=>'ꑬ','ꑭ'=>'ꑭ','ꑮ'=>'ꑮ','ꑯ'=>'ꑯ','ꑰ'=>'ꑰ','ꑱ'=>'ꑱ','ꑲ'=>'ꑲ','ꑳ'=>'ꑳ','ꑴ'=>'ꑴ','ꑵ'=>'ꑵ','ꑶ'=>'ꑶ','ꑷ'=>'ꑷ','ꑸ'=>'ꑸ','ꑹ'=>'ꑹ','ꑺ'=>'ꑺ','ꑻ'=>'ꑻ','ꑼ'=>'ꑼ','ꑽ'=>'ꑽ','ꑾ'=>'ꑾ','ꑿ'=>'ꑿ','ꒀ'=>'ꒀ','ꒁ'=>'ꒁ','ꒂ'=>'ꒂ','ꒃ'=>'ꒃ','ꒄ'=>'ꒄ','ꒅ'=>'ꒅ','ꒆ'=>'ꒆ','ꒇ'=>'ꒇ','ꒈ'=>'ꒈ','ꒉ'=>'ꒉ','ꒊ'=>'ꒊ','ꒋ'=>'ꒋ','ꒌ'=>'ꒌ','ꜗ'=>'ꜗ','ꜘ'=>'ꜘ','ꜙ'=>'ꜙ','ꜚ'=>'ꜚ');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/search_indexer_21.php b/phpBB/includes/utf/data/search_indexer_21.php
deleted file mode 100644
index 7fc3e4dc09..0000000000
--- a/phpBB/includes/utf/data/search_indexer_21.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('ꠀ'=>'ꠀ','ꠁ'=>'ꠁ','ꠂ'=>'ꠂ','ꠃ'=>'ꠃ','ꠄ'=>'ꠄ','ꠅ'=>'ꠅ','꠆'=>'꠆','ꠇ'=>'ꠇ','ꠈ'=>'ꠈ','ꠉ'=>'ꠉ','ꠊ'=>'ꠊ','ꠋ'=>'ꠋ','ꠌ'=>'ꠌ','ꠍ'=>'ꠍ','ꠎ'=>'ꠎ','ꠏ'=>'ꠏ','ꠐ'=>'ꠐ','ꠑ'=>'ꠑ','ꠒ'=>'ꠒ','ꠓ'=>'ꠓ','ꠔ'=>'ꠔ','ꠕ'=>'ꠕ','ꠖ'=>'ꠖ','ꠗ'=>'ꠗ','ꠘ'=>'ꠘ','ꠙ'=>'ꠙ','ꠚ'=>'ꠚ','ꠛ'=>'ꠛ','ꠜ'=>'ꠜ','ꠝ'=>'ꠝ','ꠞ'=>'ꠞ','ꠟ'=>'ꠟ','ꠠ'=>'ꠠ','ꠡ'=>'ꠡ','ꠢ'=>'ꠢ','ꠣ'=>'ꠣ','ꠤ'=>'ꠤ','ꠥ'=>'ꠥ','ꠦ'=>'ꠦ','ꠧ'=>'ꠧ','ꡀ'=>'ꡀ','ꡁ'=>'ꡁ','ꡂ'=>'ꡂ','ꡃ'=>'ꡃ','ꡄ'=>'ꡄ','ꡅ'=>'ꡅ','ꡆ'=>'ꡆ','ꡇ'=>'ꡇ','ꡈ'=>'ꡈ','ꡉ'=>'ꡉ','ꡊ'=>'ꡊ','ꡋ'=>'ꡋ','ꡌ'=>'ꡌ','ꡍ'=>'ꡍ','ꡎ'=>'ꡎ','ꡏ'=>'ꡏ','ꡐ'=>'ꡐ','ꡑ'=>'ꡑ','ꡒ'=>'ꡒ','ꡓ'=>'ꡓ','ꡔ'=>'ꡔ','ꡕ'=>'ꡕ','ꡖ'=>'ꡖ','ꡗ'=>'ꡗ','ꡘ'=>'ꡘ','ꡙ'=>'ꡙ','ꡚ'=>'ꡚ','ꡛ'=>'ꡛ','ꡜ'=>'ꡜ','ꡝ'=>'ꡝ','ꡞ'=>'ꡞ','ꡟ'=>'ꡟ','ꡠ'=>'ꡠ','ꡡ'=>'ꡡ','ꡢ'=>'ꡢ','ꡣ'=>'ꡣ','ꡤ'=>'ꡤ','ꡥ'=>'ꡥ','ꡦ'=>'ꡦ','ꡧ'=>'ꡧ','ꡨ'=>'ꡨ','ꡩ'=>'ꡩ','ꡪ'=>'ꡪ','ꡫ'=>'ꡫ','ꡬ'=>'ꡬ','ꡭ'=>'ꡭ','ꡮ'=>'ꡮ','ꡯ'=>'ꡯ','ꡰ'=>'ꡰ','ꡱ'=>'ꡱ','ꡲ'=>'ꡲ','ꡳ'=>'ꡳ','가'=>'가');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/search_indexer_26.php b/phpBB/includes/utf/data/search_indexer_26.php
deleted file mode 100644
index b8718bd608..0000000000
--- a/phpBB/includes/utf/data/search_indexer_26.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('힣'=>'힣');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/search_indexer_3.php b/phpBB/includes/utf/data/search_indexer_3.php
deleted file mode 100644
index 41798c9e86..0000000000
--- a/phpBB/includes/utf/data/search_indexer_3.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('᠋'=>'᠋','᠌'=>'᠌','᠍'=>'᠍','᠐'=>'0','᠑'=>'1','᠒'=>'2','᠓'=>'3','᠔'=>'4','᠕'=>'5','᠖'=>'6','᠗'=>'7','᠘'=>'8','᠙'=>'9','ᠠ'=>'ᠠ','ᠡ'=>'ᠡ','ᠢ'=>'ᠢ','ᠣ'=>'ᠣ','ᠤ'=>'ᠤ','ᠥ'=>'ᠥ','ᠦ'=>'ᠦ','ᠧ'=>'ᠧ','ᠨ'=>'ᠨ','ᠩ'=>'ᠩ','ᠪ'=>'ᠪ','ᠫ'=>'ᠫ','ᠬ'=>'ᠬ','ᠭ'=>'ᠭ','ᠮ'=>'ᠮ','ᠯ'=>'ᠯ','ᠰ'=>'ᠰ','ᠱ'=>'ᠱ','ᠲ'=>'ᠲ','ᠳ'=>'ᠳ','ᠴ'=>'ᠴ','ᠵ'=>'ᠵ','ᠶ'=>'ᠶ','ᠷ'=>'ᠷ','ᠸ'=>'ᠸ','ᠹ'=>'ᠹ','ᠺ'=>'ᠺ','ᠻ'=>'ᠻ','ᠼ'=>'ᠼ','ᠽ'=>'ᠽ','ᠾ'=>'ᠾ','ᠿ'=>'ᠿ','ᡀ'=>'ᡀ','ᡁ'=>'ᡁ','ᡂ'=>'ᡂ','ᡃ'=>'ᡃ','ᡄ'=>'ᡄ','ᡅ'=>'ᡅ','ᡆ'=>'ᡆ','ᡇ'=>'ᡇ','ᡈ'=>'ᡈ','ᡉ'=>'ᡉ','ᡊ'=>'ᡊ','ᡋ'=>'ᡋ','ᡌ'=>'ᡌ','ᡍ'=>'ᡍ','ᡎ'=>'ᡎ','ᡏ'=>'ᡏ','ᡐ'=>'ᡐ','ᡑ'=>'ᡑ','ᡒ'=>'ᡒ','ᡓ'=>'ᡓ','ᡔ'=>'ᡔ','ᡕ'=>'ᡕ','ᡖ'=>'ᡖ','ᡗ'=>'ᡗ','ᡘ'=>'ᡘ','ᡙ'=>'ᡙ','ᡚ'=>'ᡚ','ᡛ'=>'ᡛ','ᡜ'=>'ᡜ','ᡝ'=>'ᡝ','ᡞ'=>'ᡞ','ᡟ'=>'ᡟ','ᡠ'=>'ᡠ','ᡡ'=>'ᡡ','ᡢ'=>'ᡢ','ᡣ'=>'ᡣ','ᡤ'=>'ᡤ','ᡥ'=>'ᡥ','ᡦ'=>'ᡦ','ᡧ'=>'ᡧ','ᡨ'=>'ᡨ','ᡩ'=>'ᡩ','ᡪ'=>'ᡪ','ᡫ'=>'ᡫ','ᡬ'=>'ᡬ','ᡭ'=>'ᡭ','ᡮ'=>'ᡮ','ᡯ'=>'ᡯ','ᡰ'=>'ᡰ','ᡱ'=>'ᡱ','ᡲ'=>'ᡲ','ᡳ'=>'ᡳ','ᡴ'=>'ᡴ','ᡵ'=>'ᡵ','ᡶ'=>'ᡶ','ᡷ'=>'ᡷ','ᢀ'=>'ᢀ','ᢁ'=>'ᢁ','ᢂ'=>'ᢂ','ᢃ'=>'ᢃ','ᢄ'=>'ᢄ','ᢅ'=>'ᢅ','ᢆ'=>'ᢆ','ᢇ'=>'ᢇ','ᢈ'=>'ᢈ','ᢉ'=>'ᢉ','ᢊ'=>'ᢊ','ᢋ'=>'ᢋ','ᢌ'=>'ᢌ','ᢍ'=>'ᢍ','ᢎ'=>'ᢎ','ᢏ'=>'ᢏ','ᢐ'=>'ᢐ','ᢑ'=>'ᢑ','ᢒ'=>'ᢒ','ᢓ'=>'ᢓ','ᢔ'=>'ᢔ','ᢕ'=>'ᢕ','ᢖ'=>'ᢖ','ᢗ'=>'ᢗ','ᢘ'=>'ᢘ','ᢙ'=>'ᢙ','ᢚ'=>'ᢚ','ᢛ'=>'ᢛ','ᢜ'=>'ᢜ','ᢝ'=>'ᢝ','ᢞ'=>'ᢞ','ᢟ'=>'ᢟ','ᢠ'=>'ᢠ','ᢡ'=>'ᢡ','ᢢ'=>'ᢢ','ᢣ'=>'ᢣ','ᢤ'=>'ᢤ','ᢥ'=>'ᢥ','ᢦ'=>'ᢦ','ᢧ'=>'ᢧ','ᢨ'=>'ᢨ','ᢩ'=>'ᢩ','ᤀ'=>'ᤀ','ᤁ'=>'ᤁ','ᤂ'=>'ᤂ','ᤃ'=>'ᤃ','ᤄ'=>'ᤄ','ᤅ'=>'ᤅ','ᤆ'=>'ᤆ','ᤇ'=>'ᤇ','ᤈ'=>'ᤈ','ᤉ'=>'ᤉ','ᤊ'=>'ᤊ','ᤋ'=>'ᤋ','ᤌ'=>'ᤌ','ᤍ'=>'ᤍ','ᤎ'=>'ᤎ','ᤏ'=>'ᤏ','ᤐ'=>'ᤐ','ᤑ'=>'ᤑ','ᤒ'=>'ᤒ','ᤓ'=>'ᤓ','ᤔ'=>'ᤔ','ᤕ'=>'ᤕ','ᤖ'=>'ᤖ','ᤗ'=>'ᤗ','ᤘ'=>'ᤘ','ᤙ'=>'ᤙ','ᤚ'=>'ᤚ','ᤛ'=>'ᤛ','ᤜ'=>'ᤜ','ᤠ'=>'ᤠ','ᤡ'=>'ᤡ','ᤢ'=>'ᤢ','ᤣ'=>'ᤣ','ᤤ'=>'ᤤ','ᤥ'=>'ᤥ','ᤦ'=>'ᤦ','ᤧ'=>'ᤧ','ᤨ'=>'ᤨ','ᤩ'=>'ᤩ','ᤪ'=>'ᤪ','ᤫ'=>'ᤫ','ᤰ'=>'ᤰ','ᤱ'=>'ᤱ','ᤲ'=>'ᤲ','ᤳ'=>'ᤳ','ᤴ'=>'ᤴ','ᤵ'=>'ᤵ','ᤶ'=>'ᤶ','ᤷ'=>'ᤷ','ᤸ'=>'ᤸ','᤹'=>'᤹','᤺'=>'᤺','᤻'=>'᤻','᥆'=>'0','᥇'=>'1','᥈'=>'2','᥉'=>'3','᥊'=>'4','᥋'=>'5','᥌'=>'6','᥍'=>'7','᥎'=>'8','᥏'=>'9','ᥐ'=>'ᥐ','ᥑ'=>'ᥑ','ᥒ'=>'ᥒ','ᥓ'=>'ᥓ','ᥔ'=>'ᥔ','ᥕ'=>'ᥕ','ᥖ'=>'ᥖ','ᥗ'=>'ᥗ','ᥘ'=>'ᥘ','ᥙ'=>'ᥙ','ᥚ'=>'ᥚ','ᥛ'=>'ᥛ','ᥜ'=>'ᥜ','ᥝ'=>'ᥝ','ᥞ'=>'ᥞ','ᥟ'=>'ᥟ','ᥠ'=>'ᥠ','ᥡ'=>'ᥡ','ᥢ'=>'ᥢ','ᥣ'=>'ᥣ','ᥤ'=>'ᥤ','ᥥ'=>'ᥥ','ᥦ'=>'ᥦ','ᥧ'=>'ᥧ','ᥨ'=>'ᥨ','ᥩ'=>'ᥩ','ᥪ'=>'ᥪ','ᥫ'=>'ᥫ','ᥬ'=>'ᥬ','ᥭ'=>'ᥭ','ᥰ'=>'ᥰ','ᥱ'=>'ᥱ','ᥲ'=>'ᥲ','ᥳ'=>'ᥳ','ᥴ'=>'ᥴ','ᦀ'=>'ᦀ','ᦁ'=>'ᦁ','ᦂ'=>'ᦂ','ᦃ'=>'ᦃ','ᦄ'=>'ᦄ','ᦅ'=>'ᦅ','ᦆ'=>'ᦆ','ᦇ'=>'ᦇ','ᦈ'=>'ᦈ','ᦉ'=>'ᦉ','ᦊ'=>'ᦊ','ᦋ'=>'ᦋ','ᦌ'=>'ᦌ','ᦍ'=>'ᦍ','ᦎ'=>'ᦎ','ᦏ'=>'ᦏ','ᦐ'=>'ᦐ','ᦑ'=>'ᦑ','ᦒ'=>'ᦒ','ᦓ'=>'ᦓ','ᦔ'=>'ᦔ','ᦕ'=>'ᦕ','ᦖ'=>'ᦖ','ᦗ'=>'ᦗ','ᦘ'=>'ᦘ','ᦙ'=>'ᦙ','ᦚ'=>'ᦚ','ᦛ'=>'ᦛ','ᦜ'=>'ᦜ','ᦝ'=>'ᦝ','ᦞ'=>'ᦞ','ᦟ'=>'ᦟ','ᦠ'=>'ᦠ','ᦡ'=>'ᦡ','ᦢ'=>'ᦢ','ᦣ'=>'ᦣ','ᦤ'=>'ᦤ','ᦥ'=>'ᦥ','ᦦ'=>'ᦦ','ᦧ'=>'ᦧ','ᦨ'=>'ᦨ','ᦩ'=>'ᦩ','ᦰ'=>'ᦰ','ᦱ'=>'ᦱ','ᦲ'=>'ᦲ','ᦳ'=>'ᦳ','ᦴ'=>'ᦴ','ᦵ'=>'ᦵ','ᦶ'=>'ᦶ','ᦷ'=>'ᦷ','ᦸ'=>'ᦸ','ᦹ'=>'ᦹ','ᦺ'=>'ᦺ','ᦻ'=>'ᦻ','ᦼ'=>'ᦼ','ᦽ'=>'ᦽ','ᦾ'=>'ᦾ','ᦿ'=>'ᦿ','ᧀ'=>'ᧀ','ᧁ'=>'ᧁ','ᧂ'=>'ᧂ','ᧃ'=>'ᧃ','ᧄ'=>'ᧄ','ᧅ'=>'ᧅ','ᧆ'=>'ᧆ','ᧇ'=>'ᧇ','ᧈ'=>'ᧈ','ᧉ'=>'ᧉ','᧐'=>'0','᧑'=>'1','᧒'=>'2','᧓'=>'3','᧔'=>'4','᧕'=>'5','᧖'=>'6','᧗'=>'7','᧘'=>'8','᧙'=>'9','ᨀ'=>'ᨀ','ᨁ'=>'ᨁ','ᨂ'=>'ᨂ','ᨃ'=>'ᨃ','ᨄ'=>'ᨄ','ᨅ'=>'ᨅ','ᨆ'=>'ᨆ','ᨇ'=>'ᨇ','ᨈ'=>'ᨈ','ᨉ'=>'ᨉ','ᨊ'=>'ᨊ','ᨋ'=>'ᨋ','ᨌ'=>'ᨌ','ᨍ'=>'ᨍ','ᨎ'=>'ᨎ','ᨏ'=>'ᨏ','ᨐ'=>'ᨐ','ᨑ'=>'ᨑ','ᨒ'=>'ᨒ','ᨓ'=>'ᨓ','ᨔ'=>'ᨔ','ᨕ'=>'ᨕ','ᨖ'=>'ᨖ','ᨗ'=>'ᨗ','ᨘ'=>'ᨘ','ᨙ'=>'ᨙ','ᨚ'=>'ᨚ','ᨛ'=>'ᨛ','ᬀ'=>'ᬀ','ᬁ'=>'ᬁ','ᬂ'=>'ᬂ','ᬃ'=>'ᬃ','ᬄ'=>'ᬄ','ᬅ'=>'ᬅ','ᬆ'=>'ᬆ','ᬇ'=>'ᬇ','ᬈ'=>'ᬈ','ᬉ'=>'ᬉ','ᬊ'=>'ᬊ','ᬋ'=>'ᬋ','ᬌ'=>'ᬌ','ᬍ'=>'ᬍ','ᬎ'=>'ᬎ','ᬏ'=>'ᬏ','ᬐ'=>'ᬐ','ᬑ'=>'ᬑ','ᬒ'=>'ᬒ','ᬓ'=>'ᬓ','ᬔ'=>'ᬔ','ᬕ'=>'ᬕ','ᬖ'=>'ᬖ','ᬗ'=>'ᬗ','ᬘ'=>'ᬘ','ᬙ'=>'ᬙ','ᬚ'=>'ᬚ','ᬛ'=>'ᬛ','ᬜ'=>'ᬜ','ᬝ'=>'ᬝ','ᬞ'=>'ᬞ','ᬟ'=>'ᬟ','ᬠ'=>'ᬠ','ᬡ'=>'ᬡ','ᬢ'=>'ᬢ','ᬣ'=>'ᬣ','ᬤ'=>'ᬤ','ᬥ'=>'ᬥ','ᬦ'=>'ᬦ','ᬧ'=>'ᬧ','ᬨ'=>'ᬨ','ᬩ'=>'ᬩ','ᬪ'=>'ᬪ','ᬫ'=>'ᬫ','ᬬ'=>'ᬬ','ᬭ'=>'ᬭ','ᬮ'=>'ᬮ','ᬯ'=>'ᬯ','ᬰ'=>'ᬰ','ᬱ'=>'ᬱ','ᬲ'=>'ᬲ','ᬳ'=>'ᬳ','᬴'=>'᬴','ᬵ'=>'ᬵ','ᬶ'=>'ᬶ','ᬷ'=>'ᬷ','ᬸ'=>'ᬸ','ᬹ'=>'ᬹ','ᬺ'=>'ᬺ','ᬻ'=>'ᬻ','ᬼ'=>'ᬼ','ᬽ'=>'ᬽ','ᬾ'=>'ᬾ','ᬿ'=>'ᬿ','ᭀ'=>'ᭀ','ᭁ'=>'ᭁ','ᭂ'=>'ᭂ','ᭃ'=>'ᭃ','᭄'=>'᭄','ᭅ'=>'ᭅ','ᭆ'=>'ᭆ','ᭇ'=>'ᭇ','ᭈ'=>'ᭈ','ᭉ'=>'ᭉ','ᭊ'=>'ᭊ','ᭋ'=>'ᭋ','᭐'=>'0','᭑'=>'1','᭒'=>'2','᭓'=>'3','᭔'=>'4','᭕'=>'5','᭖'=>'6','᭗'=>'7','᭘'=>'8','᭙'=>'9','᭫'=>'᭫','᭬'=>'᭬','᭭'=>'᭭','᭮'=>'᭮','᭯'=>'᭯','᭰'=>'᭰','᭱'=>'᭱','᭲'=>'᭲','᭳'=>'᭳','ᴀ'=>'ᴀ','ᴁ'=>'ᴁ','ᴂ'=>'ᴂ','ᴃ'=>'ᴃ','ᴄ'=>'ᴄ','ᴅ'=>'ᴅ','ᴆ'=>'ᴆ','ᴇ'=>'ᴇ','ᴈ'=>'ᴈ','ᴉ'=>'ᴉ','ᴊ'=>'ᴊ','ᴋ'=>'ᴋ','ᴌ'=>'ᴌ','ᴍ'=>'ᴍ','ᴎ'=>'ᴎ','ᴏ'=>'ᴏ','ᴐ'=>'ᴐ','ᴑ'=>'ᴑ','ᴒ'=>'ᴒ','ᴓ'=>'ᴓ','ᴔ'=>'ᴔ','ᴕ'=>'ᴕ','ᴖ'=>'ᴖ','ᴗ'=>'ᴗ','ᴘ'=>'ᴘ','ᴙ'=>'ᴙ','ᴚ'=>'ᴚ','ᴛ'=>'ᴛ','ᴜ'=>'ᴜ','ᴝ'=>'ᴝ','ᴞ'=>'ᴞ','ᴟ'=>'ᴟ','ᴠ'=>'ᴠ','ᴡ'=>'ᴡ','ᴢ'=>'ᴢ','ᴣ'=>'ᴣ','ᴤ'=>'ᴤ','ᴥ'=>'ᴥ','ᴦ'=>'ᴦ','ᴧ'=>'ᴧ','ᴨ'=>'ᴨ','ᴩ'=>'ᴩ','ᴪ'=>'ᴪ','ᴫ'=>'ᴫ','ᴬ'=>'ᴬ','ᴭ'=>'ᴭ','ᴮ'=>'ᴮ','ᴯ'=>'ᴯ','ᴰ'=>'ᴰ','ᴱ'=>'ᴱ','ᴲ'=>'ᴲ','ᴳ'=>'ᴳ','ᴴ'=>'ᴴ','ᴵ'=>'ᴵ','ᴶ'=>'ᴶ','ᴷ'=>'ᴷ','ᴸ'=>'ᴸ','ᴹ'=>'ᴹ','ᴺ'=>'ᴺ','ᴻ'=>'ᴻ','ᴼ'=>'ᴼ','ᴽ'=>'ᴽ','ᴾ'=>'ᴾ','ᴿ'=>'ᴿ','ᵀ'=>'ᵀ','ᵁ'=>'ᵁ','ᵂ'=>'ᵂ','ᵃ'=>'ᵃ','ᵄ'=>'ᵄ','ᵅ'=>'ᵅ','ᵆ'=>'ᵆ','ᵇ'=>'ᵇ','ᵈ'=>'ᵈ','ᵉ'=>'ᵉ','ᵊ'=>'ᵊ','ᵋ'=>'ᵋ','ᵌ'=>'ᵌ','ᵍ'=>'ᵍ','ᵎ'=>'ᵎ','ᵏ'=>'ᵏ','ᵐ'=>'ᵐ','ᵑ'=>'ᵑ','ᵒ'=>'ᵒ','ᵓ'=>'ᵓ','ᵔ'=>'ᵔ','ᵕ'=>'ᵕ','ᵖ'=>'ᵖ','ᵗ'=>'ᵗ','ᵘ'=>'ᵘ','ᵙ'=>'ᵙ','ᵚ'=>'ᵚ','ᵛ'=>'ᵛ','ᵜ'=>'ᵜ','ᵝ'=>'ᵝ','ᵞ'=>'ᵞ','ᵟ'=>'ᵟ','ᵠ'=>'ᵠ','ᵡ'=>'ᵡ','ᵢ'=>'ᵢ','ᵣ'=>'ᵣ','ᵤ'=>'ᵤ','ᵥ'=>'ᵥ','ᵦ'=>'ᵦ','ᵧ'=>'ᵧ','ᵨ'=>'ᵨ','ᵩ'=>'ᵩ','ᵪ'=>'ᵪ','ᵫ'=>'ue','ᵬ'=>'ᵬ','ᵭ'=>'ᵭ','ᵮ'=>'ᵮ','ᵯ'=>'ᵯ','ᵰ'=>'ᵰ','ᵱ'=>'ᵱ','ᵲ'=>'ᵲ','ᵳ'=>'ᵳ','ᵴ'=>'ᵴ','ᵵ'=>'ᵵ','ᵶ'=>'ᵶ','ᵷ'=>'ᵷ','ᵸ'=>'ᵸ','ᵹ'=>'ᵹ','ᵺ'=>'ᵺ','ᵻ'=>'ᵻ','ᵼ'=>'ᵼ','ᵽ'=>'ᵽ','ᵾ'=>'ᵾ','ᵿ'=>'ᵿ','ᶀ'=>'ᶀ','ᶁ'=>'ᶁ','ᶂ'=>'ᶂ','ᶃ'=>'ᶃ','ᶄ'=>'ᶄ','ᶅ'=>'ᶅ','ᶆ'=>'ᶆ','ᶇ'=>'ᶇ','ᶈ'=>'ᶈ','ᶉ'=>'ᶉ','ᶊ'=>'ᶊ','ᶋ'=>'ᶋ','ᶌ'=>'ᶌ','ᶍ'=>'ᶍ','ᶎ'=>'ᶎ','ᶏ'=>'ᶏ','ᶐ'=>'ᶐ','ᶑ'=>'ᶑ','ᶒ'=>'ᶒ','ᶓ'=>'ᶓ','ᶔ'=>'ᶔ','ᶕ'=>'ᶕ','ᶖ'=>'ᶖ','ᶗ'=>'ᶗ','ᶘ'=>'ᶘ','ᶙ'=>'ᶙ','ᶚ'=>'ᶚ','ᶛ'=>'ᶛ','ᶜ'=>'ᶜ','ᶝ'=>'ᶝ','ᶞ'=>'ᶞ','ᶟ'=>'ᶟ','ᶠ'=>'ᶠ','ᶡ'=>'ᶡ','ᶢ'=>'ᶢ','ᶣ'=>'ᶣ','ᶤ'=>'ᶤ','ᶥ'=>'ᶥ','ᶦ'=>'ᶦ','ᶧ'=>'ᶧ','ᶨ'=>'ᶨ','ᶩ'=>'ᶩ','ᶪ'=>'ᶪ','ᶫ'=>'ᶫ','ᶬ'=>'ᶬ','ᶭ'=>'ᶭ','ᶮ'=>'ᶮ','ᶯ'=>'ᶯ','ᶰ'=>'ᶰ','ᶱ'=>'ᶱ','ᶲ'=>'ᶲ','ᶳ'=>'ᶳ','ᶴ'=>'ᶴ','ᶵ'=>'ᶵ','ᶶ'=>'ᶶ','ᶷ'=>'ᶷ','ᶸ'=>'ᶸ','ᶹ'=>'ᶹ','ᶺ'=>'ᶺ','ᶻ'=>'ᶻ','ᶼ'=>'ᶼ','ᶽ'=>'ᶽ','ᶾ'=>'ᶾ','ᶿ'=>'ᶿ','᷀'=>'᷀','᷁'=>'᷁','᷂'=>'᷂','᷃'=>'᷃','᷄'=>'᷄','᷅'=>'᷅','᷆'=>'᷆','᷇'=>'᷇','᷈'=>'᷈','᷉'=>'᷉','᷊'=>'᷊','᷾'=>'᷾','᷿'=>'᷿','Ḁ'=>'ḁ','ḁ'=>'ḁ','Ḃ'=>'ḃ','ḃ'=>'ḃ','Ḅ'=>'ḅ','ḅ'=>'ḅ','Ḇ'=>'ḇ','ḇ'=>'ḇ','Ḉ'=>'ḉ','ḉ'=>'ḉ','Ḋ'=>'ḋ','ḋ'=>'ḋ','Ḍ'=>'ḍ','ḍ'=>'ḍ','Ḏ'=>'ḏ','ḏ'=>'ḏ','Ḑ'=>'ḑ','ḑ'=>'ḑ','Ḓ'=>'ḓ','ḓ'=>'ḓ','Ḕ'=>'ḕ','ḕ'=>'ḕ','Ḗ'=>'ḗ','ḗ'=>'ḗ','Ḙ'=>'ḙ','ḙ'=>'ḙ','Ḛ'=>'ḛ','ḛ'=>'ḛ','Ḝ'=>'ḝ','ḝ'=>'ḝ','Ḟ'=>'ḟ','ḟ'=>'ḟ','Ḡ'=>'ḡ','ḡ'=>'ḡ','Ḣ'=>'ḣ','ḣ'=>'ḣ','Ḥ'=>'ḥ','ḥ'=>'ḥ','Ḧ'=>'ḧ','ḧ'=>'ḧ','Ḩ'=>'ḩ','ḩ'=>'ḩ','Ḫ'=>'ḫ','ḫ'=>'ḫ','Ḭ'=>'ḭ','ḭ'=>'ḭ','Ḯ'=>'ḯ','ḯ'=>'ḯ','Ḱ'=>'ḱ','ḱ'=>'ḱ','Ḳ'=>'ḳ','ḳ'=>'ḳ','Ḵ'=>'ḵ','ḵ'=>'ḵ','Ḷ'=>'ḷ','ḷ'=>'ḷ','Ḹ'=>'ḹ','ḹ'=>'ḹ','Ḻ'=>'ḻ','ḻ'=>'ḻ','Ḽ'=>'ḽ','ḽ'=>'ḽ','Ḿ'=>'ḿ','ḿ'=>'ḿ','Ṁ'=>'ṁ','ṁ'=>'ṁ','Ṃ'=>'ṃ','ṃ'=>'ṃ','Ṅ'=>'ṅ','ṅ'=>'ṅ','Ṇ'=>'ṇ','ṇ'=>'ṇ','Ṉ'=>'ṉ','ṉ'=>'ṉ','Ṋ'=>'ṋ','ṋ'=>'ṋ','Ṍ'=>'ṍ','ṍ'=>'ṍ','Ṏ'=>'ṏ','ṏ'=>'ṏ','Ṑ'=>'ṑ','ṑ'=>'ṑ','Ṓ'=>'ṓ','ṓ'=>'ṓ','Ṕ'=>'ṕ','ṕ'=>'ṕ','Ṗ'=>'ṗ','ṗ'=>'ṗ','Ṙ'=>'ṙ','ṙ'=>'ṙ','Ṛ'=>'ṛ','ṛ'=>'ṛ','Ṝ'=>'ṝ','ṝ'=>'ṝ','Ṟ'=>'ṟ','ṟ'=>'ṟ','Ṡ'=>'ṡ','ṡ'=>'ṡ','Ṣ'=>'ṣ','ṣ'=>'ṣ','Ṥ'=>'ṥ','ṥ'=>'ṥ','Ṧ'=>'ṧ','ṧ'=>'ṧ','Ṩ'=>'ṩ','ṩ'=>'ṩ','Ṫ'=>'ṫ','ṫ'=>'ṫ','Ṭ'=>'ṭ','ṭ'=>'ṭ','Ṯ'=>'ṯ','ṯ'=>'ṯ','Ṱ'=>'ṱ','ṱ'=>'ṱ','Ṳ'=>'ṳ','ṳ'=>'ṳ','Ṵ'=>'ṵ','ṵ'=>'ṵ','Ṷ'=>'ṷ','ṷ'=>'ṷ','Ṹ'=>'ṹ','ṹ'=>'ṹ','Ṻ'=>'ṻ','ṻ'=>'ṻ','Ṽ'=>'ṽ','ṽ'=>'ṽ','Ṿ'=>'ṿ','ṿ'=>'ṿ','Ẁ'=>'ẁ','ẁ'=>'ẁ','Ẃ'=>'ẃ','ẃ'=>'ẃ','Ẅ'=>'ẅ','ẅ'=>'ẅ','Ẇ'=>'ẇ','ẇ'=>'ẇ','Ẉ'=>'ẉ','ẉ'=>'ẉ','Ẋ'=>'ẋ','ẋ'=>'ẋ','Ẍ'=>'ẍ','ẍ'=>'ẍ','Ẏ'=>'ẏ','ẏ'=>'ẏ','Ẑ'=>'ẑ','ẑ'=>'ẑ','Ẓ'=>'ẓ','ẓ'=>'ẓ','Ẕ'=>'ẕ','ẕ'=>'ẕ','ẖ'=>'ẖ','ẗ'=>'ẗ','ẘ'=>'ẘ','ẙ'=>'ẙ','ẚ'=>'ẚ','ẛ'=>'ẛ','Ạ'=>'ạ','ạ'=>'ạ','Ả'=>'ả','ả'=>'ả','Ấ'=>'ấ','ấ'=>'ấ','Ầ'=>'ầ','ầ'=>'ầ','Ẩ'=>'ẩ','ẩ'=>'ẩ','Ẫ'=>'ẫ','ẫ'=>'ẫ','Ậ'=>'ậ','ậ'=>'ậ','Ắ'=>'ắ','ắ'=>'ắ','Ằ'=>'ằ','ằ'=>'ằ','Ẳ'=>'ẳ','ẳ'=>'ẳ','Ẵ'=>'ẵ','ẵ'=>'ẵ','Ặ'=>'ặ','ặ'=>'ặ','Ẹ'=>'ẹ','ẹ'=>'ẹ','Ẻ'=>'ẻ','ẻ'=>'ẻ','Ẽ'=>'ẽ','ẽ'=>'ẽ','Ế'=>'ế','ế'=>'ế','Ề'=>'ề','ề'=>'ề','Ể'=>'ể','ể'=>'ể','Ễ'=>'ễ','ễ'=>'ễ','Ệ'=>'ệ','ệ'=>'ệ','Ỉ'=>'ỉ','ỉ'=>'ỉ','Ị'=>'ị','ị'=>'ị','Ọ'=>'ọ','ọ'=>'ọ','Ỏ'=>'ỏ','ỏ'=>'ỏ','Ố'=>'ố','ố'=>'ố','Ồ'=>'ồ','ồ'=>'ồ','Ổ'=>'ổ','ổ'=>'ổ','Ỗ'=>'ỗ','ỗ'=>'ỗ','Ộ'=>'ộ','ộ'=>'ộ','Ớ'=>'ớ','ớ'=>'ớ','Ờ'=>'ờ','ờ'=>'ờ','Ở'=>'ở','ở'=>'ở','Ỡ'=>'ỡ','ỡ'=>'ỡ','Ợ'=>'ợ','ợ'=>'ợ','Ụ'=>'ụ','ụ'=>'ụ','Ủ'=>'ủ','ủ'=>'ủ','Ứ'=>'ứ','ứ'=>'ứ','Ừ'=>'ừ','ừ'=>'ừ','Ử'=>'ử','ử'=>'ử','Ữ'=>'ữ','ữ'=>'ữ','Ự'=>'ự','ự'=>'ự','Ỳ'=>'ỳ','ỳ'=>'ỳ','Ỵ'=>'ỵ','ỵ'=>'ỵ','Ỷ'=>'ỷ','ỷ'=>'ỷ','Ỹ'=>'ỹ','ỹ'=>'ỹ','ἀ'=>'ἀ','ἁ'=>'ἁ','ἂ'=>'ἂ','ἃ'=>'ἃ','ἄ'=>'ἄ','ἅ'=>'ἅ','ἆ'=>'ἆ','ἇ'=>'ἇ','Ἀ'=>'ἀ','Ἁ'=>'ἁ','Ἂ'=>'ἂ','Ἃ'=>'ἃ','Ἄ'=>'ἄ','Ἅ'=>'ἅ','Ἆ'=>'ἆ','Ἇ'=>'ἇ','ἐ'=>'ἐ','ἑ'=>'ἑ','ἒ'=>'ἒ','ἓ'=>'ἓ','ἔ'=>'ἔ','ἕ'=>'ἕ','Ἐ'=>'ἐ','Ἑ'=>'ἑ','Ἒ'=>'ἒ','Ἓ'=>'ἓ','Ἔ'=>'ἔ','Ἕ'=>'ἕ','ἠ'=>'ἠ','ἡ'=>'ἡ','ἢ'=>'ἢ','ἣ'=>'ἣ','ἤ'=>'ἤ','ἥ'=>'ἥ','ἦ'=>'ἦ','ἧ'=>'ἧ','Ἠ'=>'ἠ','Ἡ'=>'ἡ','Ἢ'=>'ἢ','Ἣ'=>'ἣ','Ἤ'=>'ἤ','Ἥ'=>'ἥ','Ἦ'=>'ἦ','Ἧ'=>'ἧ','ἰ'=>'ἰ','ἱ'=>'ἱ','ἲ'=>'ἲ','ἳ'=>'ἳ','ἴ'=>'ἴ','ἵ'=>'ἵ','ἶ'=>'ἶ','ἷ'=>'ἷ','Ἰ'=>'ἰ','Ἱ'=>'ἱ','Ἲ'=>'ἲ','Ἳ'=>'ἳ','Ἴ'=>'ἴ','Ἵ'=>'ἵ','Ἶ'=>'ἶ','Ἷ'=>'ἷ','ὀ'=>'ὀ','ὁ'=>'ὁ','ὂ'=>'ὂ','ὃ'=>'ὃ','ὄ'=>'ὄ','ὅ'=>'ὅ','Ὀ'=>'ὀ','Ὁ'=>'ὁ','Ὂ'=>'ὂ','Ὃ'=>'ὃ','Ὄ'=>'ὄ','Ὅ'=>'ὅ','ὐ'=>'ὐ','ὑ'=>'ὑ','ὒ'=>'ὒ','ὓ'=>'ὓ','ὔ'=>'ὔ','ὕ'=>'ὕ','ὖ'=>'ὖ','ὗ'=>'ὗ','Ὑ'=>'ὑ','Ὓ'=>'ὓ','Ὕ'=>'ὕ','Ὗ'=>'ὗ','ὠ'=>'ὠ','ὡ'=>'ὡ','ὢ'=>'ὢ','ὣ'=>'ὣ','ὤ'=>'ὤ','ὥ'=>'ὥ','ὦ'=>'ὦ','ὧ'=>'ὧ','Ὠ'=>'ὠ','Ὡ'=>'ὡ','Ὢ'=>'ὢ','Ὣ'=>'ὣ','Ὤ'=>'ὤ','Ὥ'=>'ὥ','Ὦ'=>'ὦ','Ὧ'=>'ὧ','ὰ'=>'ὰ','ά'=>'ά','ὲ'=>'ὲ','έ'=>'έ','ὴ'=>'ὴ','ή'=>'ή','ὶ'=>'ὶ','ί'=>'ί','ὸ'=>'ὸ','ό'=>'ό','ὺ'=>'ὺ','ύ'=>'ύ','ὼ'=>'ὼ','ώ'=>'ώ','ᾀ'=>'ᾀ','ᾁ'=>'ᾁ','ᾂ'=>'ᾂ','ᾃ'=>'ᾃ','ᾄ'=>'ᾄ','ᾅ'=>'ᾅ','ᾆ'=>'ᾆ','ᾇ'=>'ᾇ','ᾈ'=>'ᾀ','ᾉ'=>'ᾁ','ᾊ'=>'ᾂ','ᾋ'=>'ᾃ','ᾌ'=>'ᾄ','ᾍ'=>'ᾅ','ᾎ'=>'ᾆ','ᾏ'=>'ᾇ','ᾐ'=>'ᾐ','ᾑ'=>'ᾑ','ᾒ'=>'ᾒ','ᾓ'=>'ᾓ','ᾔ'=>'ᾔ','ᾕ'=>'ᾕ','ᾖ'=>'ᾖ','ᾗ'=>'ᾗ','ᾘ'=>'ᾐ','ᾙ'=>'ᾑ','ᾚ'=>'ᾒ','ᾛ'=>'ᾓ','ᾜ'=>'ᾔ','ᾝ'=>'ᾕ','ᾞ'=>'ᾖ','ᾟ'=>'ᾗ','ᾠ'=>'ᾠ','ᾡ'=>'ᾡ','ᾢ'=>'ᾢ','ᾣ'=>'ᾣ','ᾤ'=>'ᾤ','ᾥ'=>'ᾥ','ᾦ'=>'ᾦ','ᾧ'=>'ᾧ','ᾨ'=>'ᾠ','ᾩ'=>'ᾡ','ᾪ'=>'ᾢ','ᾫ'=>'ᾣ','ᾬ'=>'ᾤ','ᾭ'=>'ᾥ','ᾮ'=>'ᾦ','ᾯ'=>'ᾧ','ᾰ'=>'ᾰ','ᾱ'=>'ᾱ','ᾲ'=>'ᾲ','ᾳ'=>'ᾳ','ᾴ'=>'ᾴ','ᾶ'=>'ᾶ','ᾷ'=>'ᾷ','Ᾰ'=>'ᾰ','Ᾱ'=>'ᾱ','Ὰ'=>'ὰ','Ά'=>'ά','ᾼ'=>'ᾳ','ι'=>'ι','ῂ'=>'ῂ','ῃ'=>'ῃ','ῄ'=>'ῄ','ῆ'=>'ῆ','ῇ'=>'ῇ','Ὲ'=>'ὲ','Έ'=>'έ','Ὴ'=>'ὴ','Ή'=>'ή','ῌ'=>'ῃ','ῐ'=>'ῐ','ῑ'=>'ῑ','ῒ'=>'ῒ','ΐ'=>'ΐ','ῖ'=>'ῖ','ῗ'=>'ῗ','Ῐ'=>'ῐ','Ῑ'=>'ῑ','Ὶ'=>'ὶ','Ί'=>'ί','ῠ'=>'ῠ','ῡ'=>'ῡ','ῢ'=>'ῢ','ΰ'=>'ΰ','ῤ'=>'ῤ','ῥ'=>'ῥ','ῦ'=>'ῦ','ῧ'=>'ῧ','Ῠ'=>'ῠ','Ῡ'=>'ῡ','Ὺ'=>'ὺ','Ύ'=>'ύ','Ῥ'=>'ῥ','ῲ'=>'ῲ','ῳ'=>'ῳ','ῴ'=>'ῴ','ῶ'=>'ῶ','ῷ'=>'ῷ','Ὸ'=>'ὸ','Ό'=>'ό','Ὼ'=>'ὼ','Ώ'=>'ώ','ῼ'=>'ῳ');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/search_indexer_31.php b/phpBB/includes/utf/data/search_indexer_31.php
deleted file mode 100644
index 191365a313..0000000000
--- a/phpBB/includes/utf/data/search_indexer_31.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('豈'=>'豈','更'=>'更','車'=>'車','賈'=>'賈','滑'=>'滑','串'=>'串','句'=>'句','龜'=>'龜','龜'=>'龜','契'=>'契','金'=>'金','喇'=>'喇','奈'=>'奈','懶'=>'懶','癩'=>'癩','羅'=>'羅','蘿'=>'蘿','螺'=>'螺','裸'=>'裸','邏'=>'邏','樂'=>'樂','洛'=>'洛','烙'=>'烙','珞'=>'珞','落'=>'落','酪'=>'酪','駱'=>'駱','亂'=>'亂','卵'=>'卵','欄'=>'欄','爛'=>'爛','蘭'=>'蘭','鸞'=>'鸞','嵐'=>'嵐','濫'=>'濫','藍'=>'藍','襤'=>'襤','拉'=>'拉','臘'=>'臘','蠟'=>'蠟','廊'=>'廊','朗'=>'朗','浪'=>'浪','狼'=>'狼','郎'=>'郎','來'=>'來','冷'=>'冷','勞'=>'勞','擄'=>'擄','櫓'=>'櫓','爐'=>'爐','盧'=>'盧','老'=>'老','蘆'=>'蘆','虜'=>'虜','路'=>'路','露'=>'露','魯'=>'魯','鷺'=>'鷺','碌'=>'碌','祿'=>'祿','綠'=>'綠','菉'=>'菉','錄'=>'錄','鹿'=>'鹿','論'=>'論','壟'=>'壟','弄'=>'弄','籠'=>'籠','聾'=>'聾','牢'=>'牢','磊'=>'磊','賂'=>'賂','雷'=>'雷','壘'=>'壘','屢'=>'屢','樓'=>'樓','淚'=>'淚','漏'=>'漏','累'=>'累','縷'=>'縷','陋'=>'陋','勒'=>'勒','肋'=>'肋','凜'=>'凜','凌'=>'凌','稜'=>'稜','綾'=>'綾','菱'=>'菱','陵'=>'陵','讀'=>'讀','拏'=>'拏','樂'=>'樂','諾'=>'諾','丹'=>'丹','寧'=>'寧','怒'=>'怒','率'=>'率','異'=>'異','北'=>'北','磻'=>'磻','便'=>'便','復'=>'復','不'=>'不','泌'=>'泌','數'=>'數','索'=>'索','參'=>'參','塞'=>'塞','省'=>'省','葉'=>'葉','說'=>'說','殺'=>'殺','辰'=>'辰','沈'=>'沈','拾'=>'拾','若'=>'若','掠'=>'掠','略'=>'略','亮'=>'亮','兩'=>'兩','凉'=>'凉','梁'=>'梁','糧'=>'糧','良'=>'良','諒'=>'諒','量'=>'量','勵'=>'勵','呂'=>'呂','女'=>'女','廬'=>'廬','旅'=>'旅','濾'=>'濾','礪'=>'礪','閭'=>'閭','驪'=>'驪','麗'=>'麗','黎'=>'黎','力'=>'力','曆'=>'曆','歷'=>'歷','轢'=>'轢','年'=>'年','憐'=>'憐','戀'=>'戀','撚'=>'撚','漣'=>'漣','煉'=>'煉','璉'=>'璉','秊'=>'秊','練'=>'練','聯'=>'聯','輦'=>'輦','蓮'=>'蓮','連'=>'連','鍊'=>'鍊','列'=>'列','劣'=>'劣','咽'=>'咽','烈'=>'烈','裂'=>'裂','說'=>'說','廉'=>'廉','念'=>'念','捻'=>'捻','殮'=>'殮','簾'=>'簾','獵'=>'獵','令'=>'令','囹'=>'囹','寧'=>'寧','嶺'=>'嶺','怜'=>'怜','玲'=>'玲','瑩'=>'瑩','羚'=>'羚','聆'=>'聆','鈴'=>'鈴','零'=>'零','靈'=>'靈','領'=>'領','例'=>'例','禮'=>'禮','醴'=>'醴','隸'=>'隸','惡'=>'惡','了'=>'了','僚'=>'僚','寮'=>'寮','尿'=>'尿','料'=>'料','樂'=>'樂','燎'=>'燎','療'=>'療','蓼'=>'蓼','遼'=>'遼','龍'=>'龍','暈'=>'暈','阮'=>'阮','劉'=>'劉','杻'=>'杻','柳'=>'柳','流'=>'流','溜'=>'溜','琉'=>'琉','留'=>'留','硫'=>'硫','紐'=>'紐','類'=>'類','六'=>'六','戮'=>'戮','陸'=>'陸','倫'=>'倫','崙'=>'崙','淪'=>'淪','輪'=>'輪','律'=>'律','慄'=>'慄','栗'=>'栗','率'=>'率','隆'=>'隆','利'=>'利','吏'=>'吏','履'=>'履','易'=>'易','李'=>'李','梨'=>'梨','泥'=>'泥','理'=>'理','痢'=>'痢','罹'=>'罹','裏'=>'裏','裡'=>'裡','里'=>'里','離'=>'離','匿'=>'匿','溺'=>'溺','吝'=>'吝','燐'=>'燐','璘'=>'璘','藺'=>'藺','隣'=>'隣','鱗'=>'鱗','麟'=>'麟','林'=>'林','淋'=>'淋','臨'=>'臨','立'=>'立','笠'=>'笠','粒'=>'粒','狀'=>'狀','炙'=>'炙','識'=>'識','什'=>'什','茶'=>'茶','刺'=>'刺','切'=>'切','度'=>'度','拓'=>'拓','糖'=>'糖','宅'=>'宅','洞'=>'洞','暴'=>'暴','輻'=>'輻','行'=>'行','降'=>'降','見'=>'見','廓'=>'廓','兀'=>'兀','嗀'=>'嗀','﨎'=>'﨎','﨏'=>'﨏','塚'=>'塚','﨑'=>'﨑','晴'=>'晴','﨓'=>'﨓','﨔'=>'﨔','凞'=>'凞','猪'=>'猪','益'=>'益','礼'=>'礼','神'=>'神','祥'=>'祥','福'=>'福','靖'=>'靖','精'=>'精','羽'=>'羽','﨟'=>'﨟','蘒'=>'蘒','﨡'=>'﨡','諸'=>'諸','﨣'=>'﨣','﨤'=>'﨤','逸'=>'逸','都'=>'都','﨧'=>'﨧','﨨'=>'﨨','﨩'=>'﨩','飯'=>'飯','飼'=>'飼','館'=>'館','鶴'=>'鶴','侮'=>'侮','僧'=>'僧','免'=>'免','勉'=>'勉','勤'=>'勤','卑'=>'卑','喝'=>'喝','嘆'=>'嘆','器'=>'器','塀'=>'塀','墨'=>'墨','層'=>'層','屮'=>'屮','悔'=>'悔','慨'=>'慨','憎'=>'憎','懲'=>'懲','敏'=>'敏','既'=>'既','暑'=>'暑','梅'=>'梅','海'=>'海','渚'=>'渚','漢'=>'漢','煮'=>'煮','爫'=>'爫','琢'=>'琢','碑'=>'碑','社'=>'社','祉'=>'祉','祈'=>'祈','祐'=>'祐','祖'=>'祖','祝'=>'祝','禍'=>'禍','禎'=>'禎','穀'=>'穀','突'=>'突','節'=>'節','練'=>'練','縉'=>'縉','繁'=>'繁','署'=>'署','者'=>'者','臭'=>'臭','艹'=>'艹','艹'=>'艹','著'=>'著','褐'=>'褐','視'=>'視','謁'=>'謁','謹'=>'謹','賓'=>'賓','贈'=>'贈','辶'=>'辶','逸'=>'逸','難'=>'難','響'=>'響','頻'=>'頻','並'=>'並','况'=>'况','全'=>'全','侀'=>'侀','充'=>'充','冀'=>'冀','勇'=>'勇','勺'=>'勺','喝'=>'喝','啕'=>'啕','喙'=>'喙','嗢'=>'嗢','塚'=>'塚','墳'=>'墳','奄'=>'奄','奔'=>'奔','婢'=>'婢','嬨'=>'嬨','廒'=>'廒','廙'=>'廙','彩'=>'彩','徭'=>'徭','惘'=>'惘','慎'=>'慎','愈'=>'愈','憎'=>'憎','慠'=>'慠','懲'=>'懲','戴'=>'戴','揄'=>'揄','搜'=>'搜','摒'=>'摒','敖'=>'敖','晴'=>'晴','朗'=>'朗','望'=>'望','杖'=>'杖','歹'=>'歹','殺'=>'殺','流'=>'流','滛'=>'滛','滋'=>'滋','漢'=>'漢','瀞'=>'瀞','煮'=>'煮','瞧'=>'瞧','爵'=>'爵','犯'=>'犯','猪'=>'猪','瑱'=>'瑱','甆'=>'甆','画'=>'画','瘝'=>'瘝','瘟'=>'瘟','益'=>'益','盛'=>'盛','直'=>'直','睊'=>'睊','着'=>'着','磌'=>'磌','窱'=>'窱','節'=>'節','类'=>'类','絛'=>'絛','練'=>'練','缾'=>'缾','者'=>'者','荒'=>'荒','華'=>'華','蝹'=>'蝹','襁'=>'襁','覆'=>'覆','視'=>'視','調'=>'調','諸'=>'諸','請'=>'請','謁'=>'謁','諾'=>'諾','諭'=>'諭','謹'=>'謹','變'=>'變','贈'=>'贈','輸'=>'輸','遲'=>'遲','醙'=>'醙','鉶'=>'鉶','陼'=>'陼','難'=>'難','靖'=>'靖','韛'=>'韛','響'=>'響','頋'=>'頋','頻'=>'頻','鬒'=>'鬒','龜'=>'龜','𢡊'=>'𢡊','𢡄'=>'𢡄','𣏕'=>'𣏕','㮝'=>'㮝','䀘'=>'䀘','䀹'=>'䀹','𥉉'=>'𥉉','𥳐'=>'𥳐','𧻓'=>'𧻓','齃'=>'齃','龎'=>'龎','ﬀ'=>'ff','ﬁ'=>'fi','ﬂ'=>'fl','ﬃ'=>'ﬃ','ﬄ'=>'ﬄ','ﬅ'=>'ﬅ','ﬆ'=>'st','ﬓ'=>'ﬓ','ﬔ'=>'ﬔ','ﬕ'=>'ﬕ','ﬖ'=>'ﬖ','ﬗ'=>'ﬗ','יִ'=>'יִ','ﬞ'=>'ﬞ','ײַ'=>'ײַ','ﬠ'=>'ﬠ','ﬡ'=>'ﬡ','ﬢ'=>'ﬢ','ﬣ'=>'ﬣ','ﬤ'=>'ﬤ','ﬥ'=>'ﬥ','ﬦ'=>'ﬦ','ﬧ'=>'ﬧ','ﬨ'=>'ﬨ','שׁ'=>'שׁ','שׂ'=>'שׂ','שּׁ'=>'שּׁ','שּׂ'=>'שּׂ','אַ'=>'אַ','אָ'=>'אָ','אּ'=>'אּ','בּ'=>'בּ','גּ'=>'גּ','דּ'=>'דּ','הּ'=>'הּ','וּ'=>'וּ','זּ'=>'זּ','טּ'=>'טּ','יּ'=>'יּ','ךּ'=>'ךּ','כּ'=>'כּ','לּ'=>'לּ','מּ'=>'מּ','נּ'=>'נּ','סּ'=>'סּ','ףּ'=>'ףּ','פּ'=>'פּ','צּ'=>'צּ','קּ'=>'קּ','רּ'=>'רּ','שּ'=>'שּ','תּ'=>'תּ','וֹ'=>'וֹ','בֿ'=>'בֿ','כֿ'=>'כֿ','פֿ'=>'פֿ','ﭏ'=>'ﭏ','ﭐ'=>'ﭐ','ﭑ'=>'ﭑ','ﭒ'=>'ﭒ','ﭓ'=>'ﭓ','ﭔ'=>'ﭔ','ﭕ'=>'ﭕ','ﭖ'=>'ﭖ','ﭗ'=>'ﭗ','ﭘ'=>'ﭘ','ﭙ'=>'ﭙ','ﭚ'=>'ﭚ','ﭛ'=>'ﭛ','ﭜ'=>'ﭜ','ﭝ'=>'ﭝ','ﭞ'=>'ﭞ','ﭟ'=>'ﭟ','ﭠ'=>'ﭠ','ﭡ'=>'ﭡ','ﭢ'=>'ﭢ','ﭣ'=>'ﭣ','ﭤ'=>'ﭤ','ﭥ'=>'ﭥ','ﭦ'=>'ﭦ','ﭧ'=>'ﭧ','ﭨ'=>'ﭨ','ﭩ'=>'ﭩ','ﭪ'=>'ﭪ','ﭫ'=>'ﭫ','ﭬ'=>'ﭬ','ﭭ'=>'ﭭ','ﭮ'=>'ﭮ','ﭯ'=>'ﭯ','ﭰ'=>'ﭰ','ﭱ'=>'ﭱ','ﭲ'=>'ﭲ','ﭳ'=>'ﭳ','ﭴ'=>'ﭴ','ﭵ'=>'ﭵ','ﭶ'=>'ﭶ','ﭷ'=>'ﭷ','ﭸ'=>'ﭸ','ﭹ'=>'ﭹ','ﭺ'=>'ﭺ','ﭻ'=>'ﭻ','ﭼ'=>'ﭼ','ﭽ'=>'ﭽ','ﭾ'=>'ﭾ','ﭿ'=>'ﭿ','ﮀ'=>'ﮀ','ﮁ'=>'ﮁ','ﮂ'=>'ﮂ','ﮃ'=>'ﮃ','ﮄ'=>'ﮄ','ﮅ'=>'ﮅ','ﮆ'=>'ﮆ','ﮇ'=>'ﮇ','ﮈ'=>'ﮈ','ﮉ'=>'ﮉ','ﮊ'=>'ﮊ','ﮋ'=>'ﮋ','ﮌ'=>'ﮌ','ﮍ'=>'ﮍ','ﮎ'=>'ﮎ','ﮏ'=>'ﮏ','ﮐ'=>'ﮐ','ﮑ'=>'ﮑ','ﮒ'=>'ﮒ','ﮓ'=>'ﮓ','ﮔ'=>'ﮔ','ﮕ'=>'ﮕ','ﮖ'=>'ﮖ','ﮗ'=>'ﮗ','ﮘ'=>'ﮘ','ﮙ'=>'ﮙ','ﮚ'=>'ﮚ','ﮛ'=>'ﮛ','ﮜ'=>'ﮜ','ﮝ'=>'ﮝ','ﮞ'=>'ﮞ','ﮟ'=>'ﮟ','ﮠ'=>'ﮠ','ﮡ'=>'ﮡ','ﮢ'=>'ﮢ','ﮣ'=>'ﮣ','ﮤ'=>'ﮤ','ﮥ'=>'ﮥ','ﮦ'=>'ﮦ','ﮧ'=>'ﮧ','ﮨ'=>'ﮨ','ﮩ'=>'ﮩ','ﮪ'=>'ﮪ','ﮫ'=>'ﮫ','ﮬ'=>'ﮬ','ﮭ'=>'ﮭ','ﮮ'=>'ﮮ','ﮯ'=>'ﮯ','ﮰ'=>'ﮰ','ﮱ'=>'ﮱ','ﯓ'=>'ﯓ','ﯔ'=>'ﯔ','ﯕ'=>'ﯕ','ﯖ'=>'ﯖ','ﯗ'=>'ﯗ','ﯘ'=>'ﯘ','ﯙ'=>'ﯙ','ﯚ'=>'ﯚ','ﯛ'=>'ﯛ','ﯜ'=>'ﯜ','ﯝ'=>'ﯝ','ﯞ'=>'ﯞ','ﯟ'=>'ﯟ','ﯠ'=>'ﯠ','ﯡ'=>'ﯡ','ﯢ'=>'ﯢ','ﯣ'=>'ﯣ','ﯤ'=>'ﯤ','ﯥ'=>'ﯥ','ﯦ'=>'ﯦ','ﯧ'=>'ﯧ','ﯨ'=>'ﯨ','ﯩ'=>'ﯩ','ﯪ'=>'ﯪ','ﯫ'=>'ﯫ','ﯬ'=>'ﯬ','ﯭ'=>'ﯭ','ﯮ'=>'ﯮ','ﯯ'=>'ﯯ','ﯰ'=>'ﯰ','ﯱ'=>'ﯱ','ﯲ'=>'ﯲ','ﯳ'=>'ﯳ','ﯴ'=>'ﯴ','ﯵ'=>'ﯵ','ﯶ'=>'ﯶ','ﯷ'=>'ﯷ','ﯸ'=>'ﯸ','ﯹ'=>'ﯹ','ﯺ'=>'ﯺ','ﯻ'=>'ﯻ','ﯼ'=>'ﯼ','ﯽ'=>'ﯽ','ﯾ'=>'ﯾ','ﯿ'=>'ﯿ','ﰀ'=>'ﰀ','ﰁ'=>'ﰁ','ﰂ'=>'ﰂ','ﰃ'=>'ﰃ','ﰄ'=>'ﰄ','ﰅ'=>'ﰅ','ﰆ'=>'ﰆ','ﰇ'=>'ﰇ','ﰈ'=>'ﰈ','ﰉ'=>'ﰉ','ﰊ'=>'ﰊ','ﰋ'=>'ﰋ','ﰌ'=>'ﰌ','ﰍ'=>'ﰍ','ﰎ'=>'ﰎ','ﰏ'=>'ﰏ','ﰐ'=>'ﰐ','ﰑ'=>'ﰑ','ﰒ'=>'ﰒ','ﰓ'=>'ﰓ','ﰔ'=>'ﰔ','ﰕ'=>'ﰕ','ﰖ'=>'ﰖ','ﰗ'=>'ﰗ','ﰘ'=>'ﰘ','ﰙ'=>'ﰙ','ﰚ'=>'ﰚ','ﰛ'=>'ﰛ','ﰜ'=>'ﰜ','ﰝ'=>'ﰝ','ﰞ'=>'ﰞ','ﰟ'=>'ﰟ','ﰠ'=>'ﰠ','ﰡ'=>'ﰡ','ﰢ'=>'ﰢ','ﰣ'=>'ﰣ','ﰤ'=>'ﰤ','ﰥ'=>'ﰥ','ﰦ'=>'ﰦ','ﰧ'=>'ﰧ','ﰨ'=>'ﰨ','ﰩ'=>'ﰩ','ﰪ'=>'ﰪ','ﰫ'=>'ﰫ','ﰬ'=>'ﰬ','ﰭ'=>'ﰭ','ﰮ'=>'ﰮ','ﰯ'=>'ﰯ','ﰰ'=>'ﰰ','ﰱ'=>'ﰱ','ﰲ'=>'ﰲ','ﰳ'=>'ﰳ','ﰴ'=>'ﰴ','ﰵ'=>'ﰵ','ﰶ'=>'ﰶ','ﰷ'=>'ﰷ','ﰸ'=>'ﰸ','ﰹ'=>'ﰹ','ﰺ'=>'ﰺ','ﰻ'=>'ﰻ','ﰼ'=>'ﰼ','ﰽ'=>'ﰽ','ﰾ'=>'ﰾ','ﰿ'=>'ﰿ','ﱀ'=>'ﱀ','ﱁ'=>'ﱁ','ﱂ'=>'ﱂ','ﱃ'=>'ﱃ','ﱄ'=>'ﱄ','ﱅ'=>'ﱅ','ﱆ'=>'ﱆ','ﱇ'=>'ﱇ','ﱈ'=>'ﱈ','ﱉ'=>'ﱉ','ﱊ'=>'ﱊ','ﱋ'=>'ﱋ','ﱌ'=>'ﱌ','ﱍ'=>'ﱍ','ﱎ'=>'ﱎ','ﱏ'=>'ﱏ','ﱐ'=>'ﱐ','ﱑ'=>'ﱑ','ﱒ'=>'ﱒ','ﱓ'=>'ﱓ','ﱔ'=>'ﱔ','ﱕ'=>'ﱕ','ﱖ'=>'ﱖ','ﱗ'=>'ﱗ','ﱘ'=>'ﱘ','ﱙ'=>'ﱙ','ﱚ'=>'ﱚ','ﱛ'=>'ﱛ','ﱜ'=>'ﱜ','ﱝ'=>'ﱝ','ﱞ'=>'ﱞ','ﱟ'=>'ﱟ','ﱠ'=>'ﱠ','ﱡ'=>'ﱡ','ﱢ'=>'ﱢ','ﱣ'=>'ﱣ','ﱤ'=>'ﱤ','ﱥ'=>'ﱥ','ﱦ'=>'ﱦ','ﱧ'=>'ﱧ','ﱨ'=>'ﱨ','ﱩ'=>'ﱩ','ﱪ'=>'ﱪ','ﱫ'=>'ﱫ','ﱬ'=>'ﱬ','ﱭ'=>'ﱭ','ﱮ'=>'ﱮ','ﱯ'=>'ﱯ','ﱰ'=>'ﱰ','ﱱ'=>'ﱱ','ﱲ'=>'ﱲ','ﱳ'=>'ﱳ','ﱴ'=>'ﱴ','ﱵ'=>'ﱵ','ﱶ'=>'ﱶ','ﱷ'=>'ﱷ','ﱸ'=>'ﱸ','ﱹ'=>'ﱹ','ﱺ'=>'ﱺ','ﱻ'=>'ﱻ','ﱼ'=>'ﱼ','ﱽ'=>'ﱽ','ﱾ'=>'ﱾ','ﱿ'=>'ﱿ','ﲀ'=>'ﲀ','ﲁ'=>'ﲁ','ﲂ'=>'ﲂ','ﲃ'=>'ﲃ','ﲄ'=>'ﲄ','ﲅ'=>'ﲅ','ﲆ'=>'ﲆ','ﲇ'=>'ﲇ','ﲈ'=>'ﲈ','ﲉ'=>'ﲉ','ﲊ'=>'ﲊ','ﲋ'=>'ﲋ','ﲌ'=>'ﲌ','ﲍ'=>'ﲍ','ﲎ'=>'ﲎ','ﲏ'=>'ﲏ','ﲐ'=>'ﲐ','ﲑ'=>'ﲑ','ﲒ'=>'ﲒ','ﲓ'=>'ﲓ','ﲔ'=>'ﲔ','ﲕ'=>'ﲕ','ﲖ'=>'ﲖ','ﲗ'=>'ﲗ','ﲘ'=>'ﲘ','ﲙ'=>'ﲙ','ﲚ'=>'ﲚ','ﲛ'=>'ﲛ','ﲜ'=>'ﲜ','ﲝ'=>'ﲝ','ﲞ'=>'ﲞ','ﲟ'=>'ﲟ','ﲠ'=>'ﲠ','ﲡ'=>'ﲡ','ﲢ'=>'ﲢ','ﲣ'=>'ﲣ','ﲤ'=>'ﲤ','ﲥ'=>'ﲥ','ﲦ'=>'ﲦ','ﲧ'=>'ﲧ','ﲨ'=>'ﲨ','ﲩ'=>'ﲩ','ﲪ'=>'ﲪ','ﲫ'=>'ﲫ','ﲬ'=>'ﲬ','ﲭ'=>'ﲭ','ﲮ'=>'ﲮ','ﲯ'=>'ﲯ','ﲰ'=>'ﲰ','ﲱ'=>'ﲱ','ﲲ'=>'ﲲ','ﲳ'=>'ﲳ','ﲴ'=>'ﲴ','ﲵ'=>'ﲵ','ﲶ'=>'ﲶ','ﲷ'=>'ﲷ','ﲸ'=>'ﲸ','ﲹ'=>'ﲹ','ﲺ'=>'ﲺ','ﲻ'=>'ﲻ','ﲼ'=>'ﲼ','ﲽ'=>'ﲽ','ﲾ'=>'ﲾ','ﲿ'=>'ﲿ','ﳀ'=>'ﳀ','ﳁ'=>'ﳁ','ﳂ'=>'ﳂ','ﳃ'=>'ﳃ','ﳄ'=>'ﳄ','ﳅ'=>'ﳅ','ﳆ'=>'ﳆ','ﳇ'=>'ﳇ','ﳈ'=>'ﳈ','ﳉ'=>'ﳉ','ﳊ'=>'ﳊ','ﳋ'=>'ﳋ','ﳌ'=>'ﳌ','ﳍ'=>'ﳍ','ﳎ'=>'ﳎ','ﳏ'=>'ﳏ','ﳐ'=>'ﳐ','ﳑ'=>'ﳑ','ﳒ'=>'ﳒ','ﳓ'=>'ﳓ','ﳔ'=>'ﳔ','ﳕ'=>'ﳕ','ﳖ'=>'ﳖ','ﳗ'=>'ﳗ','ﳘ'=>'ﳘ','ﳙ'=>'ﳙ','ﳚ'=>'ﳚ','ﳛ'=>'ﳛ','ﳜ'=>'ﳜ','ﳝ'=>'ﳝ','ﳞ'=>'ﳞ','ﳟ'=>'ﳟ','ﳠ'=>'ﳠ','ﳡ'=>'ﳡ','ﳢ'=>'ﳢ','ﳣ'=>'ﳣ','ﳤ'=>'ﳤ','ﳥ'=>'ﳥ','ﳦ'=>'ﳦ','ﳧ'=>'ﳧ','ﳨ'=>'ﳨ','ﳩ'=>'ﳩ','ﳪ'=>'ﳪ','ﳫ'=>'ﳫ','ﳬ'=>'ﳬ','ﳭ'=>'ﳭ','ﳮ'=>'ﳮ','ﳯ'=>'ﳯ','ﳰ'=>'ﳰ','ﳱ'=>'ﳱ','ﳲ'=>'ﳲ','ﳳ'=>'ﳳ','ﳴ'=>'ﳴ','ﳵ'=>'ﳵ','ﳶ'=>'ﳶ','ﳷ'=>'ﳷ','ﳸ'=>'ﳸ','ﳹ'=>'ﳹ','ﳺ'=>'ﳺ','ﳻ'=>'ﳻ','ﳼ'=>'ﳼ','ﳽ'=>'ﳽ','ﳾ'=>'ﳾ','ﳿ'=>'ﳿ','ﴀ'=>'ﴀ','ﴁ'=>'ﴁ','ﴂ'=>'ﴂ','ﴃ'=>'ﴃ','ﴄ'=>'ﴄ','ﴅ'=>'ﴅ','ﴆ'=>'ﴆ','ﴇ'=>'ﴇ','ﴈ'=>'ﴈ','ﴉ'=>'ﴉ','ﴊ'=>'ﴊ','ﴋ'=>'ﴋ','ﴌ'=>'ﴌ','ﴍ'=>'ﴍ','ﴎ'=>'ﴎ','ﴏ'=>'ﴏ','ﴐ'=>'ﴐ','ﴑ'=>'ﴑ','ﴒ'=>'ﴒ','ﴓ'=>'ﴓ','ﴔ'=>'ﴔ','ﴕ'=>'ﴕ','ﴖ'=>'ﴖ','ﴗ'=>'ﴗ','ﴘ'=>'ﴘ','ﴙ'=>'ﴙ','ﴚ'=>'ﴚ','ﴛ'=>'ﴛ','ﴜ'=>'ﴜ','ﴝ'=>'ﴝ','ﴞ'=>'ﴞ','ﴟ'=>'ﴟ','ﴠ'=>'ﴠ','ﴡ'=>'ﴡ','ﴢ'=>'ﴢ','ﴣ'=>'ﴣ','ﴤ'=>'ﴤ','ﴥ'=>'ﴥ','ﴦ'=>'ﴦ','ﴧ'=>'ﴧ','ﴨ'=>'ﴨ','ﴩ'=>'ﴩ','ﴪ'=>'ﴪ','ﴫ'=>'ﴫ','ﴬ'=>'ﴬ','ﴭ'=>'ﴭ','ﴮ'=>'ﴮ','ﴯ'=>'ﴯ','ﴰ'=>'ﴰ','ﴱ'=>'ﴱ','ﴲ'=>'ﴲ','ﴳ'=>'ﴳ','ﴴ'=>'ﴴ','ﴵ'=>'ﴵ','ﴶ'=>'ﴶ','ﴷ'=>'ﴷ','ﴸ'=>'ﴸ','ﴹ'=>'ﴹ','ﴺ'=>'ﴺ','ﴻ'=>'ﴻ','ﴼ'=>'ﴼ','ﴽ'=>'ﴽ','ﵐ'=>'ﵐ','ﵑ'=>'ﵑ','ﵒ'=>'ﵒ','ﵓ'=>'ﵓ','ﵔ'=>'ﵔ','ﵕ'=>'ﵕ','ﵖ'=>'ﵖ','ﵗ'=>'ﵗ','ﵘ'=>'ﵘ','ﵙ'=>'ﵙ','ﵚ'=>'ﵚ','ﵛ'=>'ﵛ','ﵜ'=>'ﵜ','ﵝ'=>'ﵝ','ﵞ'=>'ﵞ','ﵟ'=>'ﵟ','ﵠ'=>'ﵠ','ﵡ'=>'ﵡ','ﵢ'=>'ﵢ','ﵣ'=>'ﵣ','ﵤ'=>'ﵤ','ﵥ'=>'ﵥ','ﵦ'=>'ﵦ','ﵧ'=>'ﵧ','ﵨ'=>'ﵨ','ﵩ'=>'ﵩ','ﵪ'=>'ﵪ','ﵫ'=>'ﵫ','ﵬ'=>'ﵬ','ﵭ'=>'ﵭ','ﵮ'=>'ﵮ','ﵯ'=>'ﵯ','ﵰ'=>'ﵰ','ﵱ'=>'ﵱ','ﵲ'=>'ﵲ','ﵳ'=>'ﵳ','ﵴ'=>'ﵴ','ﵵ'=>'ﵵ','ﵶ'=>'ﵶ','ﵷ'=>'ﵷ','ﵸ'=>'ﵸ','ﵹ'=>'ﵹ','ﵺ'=>'ﵺ','ﵻ'=>'ﵻ','ﵼ'=>'ﵼ','ﵽ'=>'ﵽ','ﵾ'=>'ﵾ','ﵿ'=>'ﵿ','ﶀ'=>'ﶀ','ﶁ'=>'ﶁ','ﶂ'=>'ﶂ','ﶃ'=>'ﶃ','ﶄ'=>'ﶄ','ﶅ'=>'ﶅ','ﶆ'=>'ﶆ','ﶇ'=>'ﶇ','ﶈ'=>'ﶈ','ﶉ'=>'ﶉ','ﶊ'=>'ﶊ','ﶋ'=>'ﶋ','ﶌ'=>'ﶌ','ﶍ'=>'ﶍ','ﶎ'=>'ﶎ','ﶏ'=>'ﶏ','ﶒ'=>'ﶒ','ﶓ'=>'ﶓ','ﶔ'=>'ﶔ','ﶕ'=>'ﶕ','ﶖ'=>'ﶖ','ﶗ'=>'ﶗ','ﶘ'=>'ﶘ','ﶙ'=>'ﶙ','ﶚ'=>'ﶚ','ﶛ'=>'ﶛ','ﶜ'=>'ﶜ','ﶝ'=>'ﶝ','ﶞ'=>'ﶞ','ﶟ'=>'ﶟ','ﶠ'=>'ﶠ','ﶡ'=>'ﶡ','ﶢ'=>'ﶢ','ﶣ'=>'ﶣ','ﶤ'=>'ﶤ','ﶥ'=>'ﶥ','ﶦ'=>'ﶦ','ﶧ'=>'ﶧ','ﶨ'=>'ﶨ','ﶩ'=>'ﶩ','ﶪ'=>'ﶪ','ﶫ'=>'ﶫ','ﶬ'=>'ﶬ','ﶭ'=>'ﶭ','ﶮ'=>'ﶮ','ﶯ'=>'ﶯ','ﶰ'=>'ﶰ','ﶱ'=>'ﶱ','ﶲ'=>'ﶲ','ﶳ'=>'ﶳ','ﶴ'=>'ﶴ','ﶵ'=>'ﶵ','ﶶ'=>'ﶶ','ﶷ'=>'ﶷ','ﶸ'=>'ﶸ','ﶹ'=>'ﶹ','ﶺ'=>'ﶺ','ﶻ'=>'ﶻ','ﶼ'=>'ﶼ','ﶽ'=>'ﶽ','ﶾ'=>'ﶾ','ﶿ'=>'ﶿ','ﷀ'=>'ﷀ','ﷁ'=>'ﷁ','ﷂ'=>'ﷂ','ﷃ'=>'ﷃ','ﷄ'=>'ﷄ','ﷅ'=>'ﷅ','ﷆ'=>'ﷆ','ﷇ'=>'ﷇ','ﷰ'=>'ﷰ','ﷱ'=>'ﷱ','ﷲ'=>'ﷲ','ﷳ'=>'ﷳ','ﷴ'=>'ﷴ','ﷵ'=>'ﷵ','ﷶ'=>'ﷶ','ﷷ'=>'ﷷ','ﷸ'=>'ﷸ','ﷹ'=>'ﷹ','ﷺ'=>'ﷺ','ﷻ'=>'ﷻ','︀'=>'︀','︁'=>'︁','︂'=>'︂','︃'=>'︃','︄'=>'︄','︅'=>'︅','︆'=>'︆','︇'=>'︇','︈'=>'︈','︉'=>'︉','︊'=>'︊','︋'=>'︋','︌'=>'︌','︍'=>'︍','︎'=>'︎','️'=>'️','︠'=>'︠','︡'=>'︡','︢'=>'︢','︣'=>'︣','ﹰ'=>'ﹰ','ﹱ'=>'ﹱ','ﹲ'=>'ﹲ','ﹳ'=>'ﹳ','ﹴ'=>'ﹴ','ﹶ'=>'ﹶ','ﹷ'=>'ﹷ','ﹸ'=>'ﹸ','ﹹ'=>'ﹹ','ﹺ'=>'ﹺ','ﹻ'=>'ﹻ','ﹼ'=>'ﹼ','ﹽ'=>'ﹽ','ﹾ'=>'ﹾ','ﹿ'=>'ﹿ','ﺀ'=>'ﺀ','ﺁ'=>'ﺁ','ﺂ'=>'ﺂ','ﺃ'=>'ﺃ','ﺄ'=>'ﺄ','ﺅ'=>'ﺅ','ﺆ'=>'ﺆ','ﺇ'=>'ﺇ','ﺈ'=>'ﺈ','ﺉ'=>'ﺉ','ﺊ'=>'ﺊ','ﺋ'=>'ﺋ','ﺌ'=>'ﺌ','ﺍ'=>'ﺍ','ﺎ'=>'ﺎ','ﺏ'=>'ﺏ','ﺐ'=>'ﺐ','ﺑ'=>'ﺑ','ﺒ'=>'ﺒ','ﺓ'=>'ﺓ','ﺔ'=>'ﺔ','ﺕ'=>'ﺕ','ﺖ'=>'ﺖ','ﺗ'=>'ﺗ','ﺘ'=>'ﺘ','ﺙ'=>'ﺙ','ﺚ'=>'ﺚ','ﺛ'=>'ﺛ','ﺜ'=>'ﺜ','ﺝ'=>'ﺝ','ﺞ'=>'ﺞ','ﺟ'=>'ﺟ','ﺠ'=>'ﺠ','ﺡ'=>'ﺡ','ﺢ'=>'ﺢ','ﺣ'=>'ﺣ','ﺤ'=>'ﺤ','ﺥ'=>'ﺥ','ﺦ'=>'ﺦ','ﺧ'=>'ﺧ','ﺨ'=>'ﺨ','ﺩ'=>'ﺩ','ﺪ'=>'ﺪ','ﺫ'=>'ﺫ','ﺬ'=>'ﺬ','ﺭ'=>'ﺭ','ﺮ'=>'ﺮ','ﺯ'=>'ﺯ','ﺰ'=>'ﺰ','ﺱ'=>'ﺱ','ﺲ'=>'ﺲ','ﺳ'=>'ﺳ','ﺴ'=>'ﺴ','ﺵ'=>'ﺵ','ﺶ'=>'ﺶ','ﺷ'=>'ﺷ','ﺸ'=>'ﺸ','ﺹ'=>'ﺹ','ﺺ'=>'ﺺ','ﺻ'=>'ﺻ','ﺼ'=>'ﺼ','ﺽ'=>'ﺽ','ﺾ'=>'ﺾ','ﺿ'=>'ﺿ','ﻀ'=>'ﻀ','ﻁ'=>'ﻁ','ﻂ'=>'ﻂ','ﻃ'=>'ﻃ','ﻄ'=>'ﻄ','ﻅ'=>'ﻅ','ﻆ'=>'ﻆ','ﻇ'=>'ﻇ','ﻈ'=>'ﻈ','ﻉ'=>'ﻉ','ﻊ'=>'ﻊ','ﻋ'=>'ﻋ','ﻌ'=>'ﻌ','ﻍ'=>'ﻍ','ﻎ'=>'ﻎ','ﻏ'=>'ﻏ','ﻐ'=>'ﻐ','ﻑ'=>'ﻑ','ﻒ'=>'ﻒ','ﻓ'=>'ﻓ','ﻔ'=>'ﻔ','ﻕ'=>'ﻕ','ﻖ'=>'ﻖ','ﻗ'=>'ﻗ','ﻘ'=>'ﻘ','ﻙ'=>'ﻙ','ﻚ'=>'ﻚ','ﻛ'=>'ﻛ','ﻜ'=>'ﻜ','ﻝ'=>'ﻝ','ﻞ'=>'ﻞ','ﻟ'=>'ﻟ','ﻠ'=>'ﻠ','ﻡ'=>'ﻡ','ﻢ'=>'ﻢ','ﻣ'=>'ﻣ','ﻤ'=>'ﻤ','ﻥ'=>'ﻥ','ﻦ'=>'ﻦ','ﻧ'=>'ﻧ','ﻨ'=>'ﻨ','ﻩ'=>'ﻩ','ﻪ'=>'ﻪ','ﻫ'=>'ﻫ','ﻬ'=>'ﻬ','ﻭ'=>'ﻭ','ﻮ'=>'ﻮ','ﻯ'=>'ﻯ','ﻰ'=>'ﻰ','ﻱ'=>'ﻱ','ﻲ'=>'ﻲ','ﻳ'=>'ﻳ','ﻴ'=>'ﻴ','ﻵ'=>'ﻵ','ﻶ'=>'ﻶ','ﻷ'=>'ﻷ','ﻸ'=>'ﻸ','ﻹ'=>'ﻹ','ﻺ'=>'ﻺ','ﻻ'=>'ﻻ','ﻼ'=>'ﻼ','０'=>'0','１'=>'1','２'=>'2','３'=>'3','４'=>'4','５'=>'5','６'=>'6','７'=>'7','８'=>'8','９'=>'9','Ａ'=>'ａ','Ｂ'=>'ｂ','Ｃ'=>'ｃ','Ｄ'=>'ｄ','Ｅ'=>'ｅ','Ｆ'=>'ｆ','Ｇ'=>'ｇ','Ｈ'=>'ｈ','Ｉ'=>'ｉ','Ｊ'=>'ｊ','Ｋ'=>'ｋ','Ｌ'=>'ｌ','Ｍ'=>'ｍ','Ｎ'=>'ｎ','Ｏ'=>'ｏ','Ｐ'=>'ｐ','Ｑ'=>'ｑ','Ｒ'=>'ｒ','Ｓ'=>'ｓ','Ｔ'=>'ｔ','Ｕ'=>'ｕ','Ｖ'=>'ｖ','Ｗ'=>'ｗ','Ｘ'=>'ｘ','Ｙ'=>'ｙ','Ｚ'=>'ｚ','ａ'=>'ａ','ｂ'=>'ｂ','ｃ'=>'ｃ','ｄ'=>'ｄ','ｅ'=>'ｅ','ｆ'=>'ｆ','ｇ'=>'ｇ','ｈ'=>'ｈ','ｉ'=>'ｉ','ｊ'=>'ｊ','ｋ'=>'ｋ','ｌ'=>'ｌ','ｍ'=>'ｍ','ｎ'=>'ｎ','ｏ'=>'ｏ','ｐ'=>'ｐ','ｑ'=>'ｑ','ｒ'=>'ｒ','ｓ'=>'ｓ','ｔ'=>'ｔ','ｕ'=>'ｕ','ｖ'=>'ｖ','ｗ'=>'ｗ','ｘ'=>'ｘ','ｙ'=>'ｙ','ｚ'=>'ｚ','ｦ'=>'ｦ','ｧ'=>'ｧ','ｨ'=>'ｨ','ｩ'=>'ｩ','ｪ'=>'ｪ','ｫ'=>'ｫ','ｬ'=>'ｬ','ｭ'=>'ｭ','ｮ'=>'ｮ','ｯ'=>'ｯ','ｰ'=>'ｰ','ｱ'=>'ｱ','ｲ'=>'ｲ','ｳ'=>'ｳ','ｴ'=>'ｴ','ｵ'=>'ｵ','ｶ'=>'ｶ','ｷ'=>'ｷ','ｸ'=>'ｸ','ｹ'=>'ｹ','ｺ'=>'ｺ','ｻ'=>'ｻ','ｼ'=>'ｼ','ｽ'=>'ｽ','ｾ'=>'ｾ','ｿ'=>'ｿ','ﾀ'=>'ﾀ','ﾁ'=>'ﾁ','ﾂ'=>'ﾂ','ﾃ'=>'ﾃ','ﾄ'=>'ﾄ','ﾅ'=>'ﾅ','ﾆ'=>'ﾆ','ﾇ'=>'ﾇ','ﾈ'=>'ﾈ','ﾉ'=>'ﾉ','ﾊ'=>'ﾊ','ﾋ'=>'ﾋ','ﾌ'=>'ﾌ','ﾍ'=>'ﾍ','ﾎ'=>'ﾎ','ﾏ'=>'ﾏ','ﾐ'=>'ﾐ','ﾑ'=>'ﾑ','ﾒ'=>'ﾒ','ﾓ'=>'ﾓ','ﾔ'=>'ﾔ','ﾕ'=>'ﾕ','ﾖ'=>'ﾖ','ﾗ'=>'ﾗ','ﾘ'=>'ﾘ','ﾙ'=>'ﾙ','ﾚ'=>'ﾚ','ﾛ'=>'ﾛ','ﾜ'=>'ﾜ','ﾝ'=>'ﾝ','ﾞ'=>'ﾞ','ﾟ'=>'ﾟ','ﾠ'=>'ﾠ','ﾡ'=>'ﾡ','ﾢ'=>'ﾢ','ﾣ'=>'ﾣ','ﾤ'=>'ﾤ','ﾥ'=>'ﾥ','ﾦ'=>'ﾦ','ﾧ'=>'ﾧ','ﾨ'=>'ﾨ','ﾩ'=>'ﾩ','ﾪ'=>'ﾪ','ﾫ'=>'ﾫ','ﾬ'=>'ﾬ','ﾭ'=>'ﾭ','ﾮ'=>'ﾮ','ﾯ'=>'ﾯ','ﾰ'=>'ﾰ','ﾱ'=>'ﾱ','ﾲ'=>'ﾲ','ﾳ'=>'ﾳ','ﾴ'=>'ﾴ','ﾵ'=>'ﾵ','ﾶ'=>'ﾶ','ﾷ'=>'ﾷ','ﾸ'=>'ﾸ','ﾹ'=>'ﾹ','ﾺ'=>'ﾺ','ﾻ'=>'ﾻ','ﾼ'=>'ﾼ','ﾽ'=>'ﾽ','ﾾ'=>'ﾾ','ￂ'=>'ￂ','ￃ'=>'ￃ','ￄ'=>'ￄ','ￅ'=>'ￅ','ￆ'=>'ￆ','ￇ'=>'ￇ','ￊ'=>'ￊ','ￋ'=>'ￋ','ￌ'=>'ￌ','ￍ'=>'ￍ','ￎ'=>'ￎ','ￏ'=>'ￏ','ￒ'=>'ￒ','ￓ'=>'ￓ','ￔ'=>'ￔ','ￕ'=>'ￕ','ￖ'=>'ￖ','ￗ'=>'ￗ','ￚ'=>'ￚ','ￛ'=>'ￛ','ￜ'=>'ￜ');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/search_indexer_32.php b/phpBB/includes/utf/data/search_indexer_32.php
deleted file mode 100644
index 73ed2924ab..0000000000
--- a/phpBB/includes/utf/data/search_indexer_32.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('𐀀'=>'𐀀','𐀁'=>'𐀁','𐀂'=>'𐀂','𐀃'=>'𐀃','𐀄'=>'𐀄','𐀅'=>'𐀅','𐀆'=>'𐀆','𐀇'=>'𐀇','𐀈'=>'𐀈','𐀉'=>'𐀉','𐀊'=>'𐀊','𐀋'=>'𐀋','𐀍'=>'𐀍','𐀎'=>'𐀎','𐀏'=>'𐀏','𐀐'=>'𐀐','𐀑'=>'𐀑','𐀒'=>'𐀒','𐀓'=>'𐀓','𐀔'=>'𐀔','𐀕'=>'𐀕','𐀖'=>'𐀖','𐀗'=>'𐀗','𐀘'=>'𐀘','𐀙'=>'𐀙','𐀚'=>'𐀚','𐀛'=>'𐀛','𐀜'=>'𐀜','𐀝'=>'𐀝','𐀞'=>'𐀞','𐀟'=>'𐀟','𐀠'=>'𐀠','𐀡'=>'𐀡','𐀢'=>'𐀢','𐀣'=>'𐀣','𐀤'=>'𐀤','𐀥'=>'𐀥','𐀦'=>'𐀦','𐀨'=>'𐀨','𐀩'=>'𐀩','𐀪'=>'𐀪','𐀫'=>'𐀫','𐀬'=>'𐀬','𐀭'=>'𐀭','𐀮'=>'𐀮','𐀯'=>'𐀯','𐀰'=>'𐀰','𐀱'=>'𐀱','𐀲'=>'𐀲','𐀳'=>'𐀳','𐀴'=>'𐀴','𐀵'=>'𐀵','𐀶'=>'𐀶','𐀷'=>'𐀷','𐀸'=>'𐀸','𐀹'=>'𐀹','𐀺'=>'𐀺','𐀼'=>'𐀼','𐀽'=>'𐀽','𐀿'=>'𐀿','𐁀'=>'𐁀','𐁁'=>'𐁁','𐁂'=>'𐁂','𐁃'=>'𐁃','𐁄'=>'𐁄','𐁅'=>'𐁅','𐁆'=>'𐁆','𐁇'=>'𐁇','𐁈'=>'𐁈','𐁉'=>'𐁉','𐁊'=>'𐁊','𐁋'=>'𐁋','𐁌'=>'𐁌','𐁍'=>'𐁍','𐁐'=>'𐁐','𐁑'=>'𐁑','𐁒'=>'𐁒','𐁓'=>'𐁓','𐁔'=>'𐁔','𐁕'=>'𐁕','𐁖'=>'𐁖','𐁗'=>'𐁗','𐁘'=>'𐁘','𐁙'=>'𐁙','𐁚'=>'𐁚','𐁛'=>'𐁛','𐁜'=>'𐁜','𐁝'=>'𐁝','𐂀'=>'𐂀','𐂁'=>'𐂁','𐂂'=>'𐂂','𐂃'=>'𐂃','𐂄'=>'𐂄','𐂅'=>'𐂅','𐂆'=>'𐂆','𐂇'=>'𐂇','𐂈'=>'𐂈','𐂉'=>'𐂉','𐂊'=>'𐂊','𐂋'=>'𐂋','𐂌'=>'𐂌','𐂍'=>'𐂍','𐂎'=>'𐂎','𐂏'=>'𐂏','𐂐'=>'𐂐','𐂑'=>'𐂑','𐂒'=>'𐂒','𐂓'=>'𐂓','𐂔'=>'𐂔','𐂕'=>'𐂕','𐂖'=>'𐂖','𐂗'=>'𐂗','𐂘'=>'𐂘','𐂙'=>'𐂙','𐂚'=>'𐂚','𐂛'=>'𐂛','𐂜'=>'𐂜','𐂝'=>'𐂝','𐂞'=>'𐂞','𐂟'=>'𐂟','𐂠'=>'𐂠','𐂡'=>'𐂡','𐂢'=>'𐂢','𐂣'=>'𐂣','𐂤'=>'𐂤','𐂥'=>'𐂥','𐂦'=>'𐂦','𐂧'=>'𐂧','𐂨'=>'𐂨','𐂩'=>'𐂩','𐂪'=>'𐂪','𐂫'=>'𐂫','𐂬'=>'𐂬','𐂭'=>'𐂭','𐂮'=>'𐂮','𐂯'=>'𐂯','𐂰'=>'𐂰','𐂱'=>'𐂱','𐂲'=>'𐂲','𐂳'=>'𐂳','𐂴'=>'𐂴','𐂵'=>'𐂵','𐂶'=>'𐂶','𐂷'=>'𐂷','𐂸'=>'𐂸','𐂹'=>'𐂹','𐂺'=>'𐂺','𐂻'=>'𐂻','𐂼'=>'𐂼','𐂽'=>'𐂽','𐂾'=>'𐂾','𐂿'=>'𐂿','𐃀'=>'𐃀','𐃁'=>'𐃁','𐃂'=>'𐃂','𐃃'=>'𐃃','𐃄'=>'𐃄','𐃅'=>'𐃅','𐃆'=>'𐃆','𐃇'=>'𐃇','𐃈'=>'𐃈','𐃉'=>'𐃉','𐃊'=>'𐃊','𐃋'=>'𐃋','𐃌'=>'𐃌','𐃍'=>'𐃍','𐃎'=>'𐃎','𐃏'=>'𐃏','𐃐'=>'𐃐','𐃑'=>'𐃑','𐃒'=>'𐃒','𐃓'=>'𐃓','𐃔'=>'𐃔','𐃕'=>'𐃕','𐃖'=>'𐃖','𐃗'=>'𐃗','𐃘'=>'𐃘','𐃙'=>'𐃙','𐃚'=>'𐃚','𐃛'=>'𐃛','𐃜'=>'𐃜','𐃝'=>'𐃝','𐃞'=>'𐃞','𐃟'=>'𐃟','𐃠'=>'𐃠','𐃡'=>'𐃡','𐃢'=>'𐃢','𐃣'=>'𐃣','𐃤'=>'𐃤','𐃥'=>'𐃥','𐃦'=>'𐃦','𐃧'=>'𐃧','𐃨'=>'𐃨','𐃩'=>'𐃩','𐃪'=>'𐃪','𐃫'=>'𐃫','𐃬'=>'𐃬','𐃭'=>'𐃭','𐃮'=>'𐃮','𐃯'=>'𐃯','𐃰'=>'𐃰','𐃱'=>'𐃱','𐃲'=>'𐃲','𐃳'=>'𐃳','𐃴'=>'𐃴','𐃵'=>'𐃵','𐃶'=>'𐃶','𐃷'=>'𐃷','𐃸'=>'𐃸','𐃹'=>'𐃹','𐃺'=>'𐃺','𐄇'=>'1','𐄈'=>'2','𐄉'=>'3','𐄊'=>'4','𐄋'=>'5','𐄌'=>'6','𐄍'=>'7','𐄎'=>'8','𐄏'=>'9','𐄐'=>'10','𐄑'=>'20','𐄒'=>'30','𐄓'=>'40','𐄔'=>'50','𐄕'=>'60','𐄖'=>'70','𐄗'=>'80','𐄘'=>'90','𐄙'=>'100','𐄚'=>'200','𐄛'=>'300','𐄜'=>'400','𐄝'=>'500','𐄞'=>'600','𐄟'=>'700','𐄠'=>'800','𐄡'=>'900','𐄢'=>'1000','𐄣'=>'2000','𐄤'=>'3000','𐄥'=>'4000','𐄦'=>'5000','𐄧'=>'6000','𐄨'=>'7000','𐄩'=>'8000','𐄪'=>'9000','𐄫'=>'10000','𐄬'=>'20000','𐄭'=>'30000','𐄮'=>'40000','𐄯'=>'50000','𐄰'=>'60000','𐄱'=>'70000','𐄲'=>'80000','𐄳'=>'90000','𐅀'=>'1/4','𐅁'=>'1/2','𐅂'=>'1','𐅃'=>'5','𐅄'=>'50','𐅅'=>'500','𐅆'=>'5000','𐅇'=>'50000','𐅈'=>'5','𐅉'=>'10','𐅊'=>'50','𐅋'=>'100','𐅌'=>'500','𐅍'=>'1000','𐅎'=>'5000','𐅏'=>'5','𐅐'=>'10','𐅑'=>'50','𐅒'=>'100','𐅓'=>'500','𐅔'=>'1000','𐅕'=>'10000','𐅖'=>'50000','𐅗'=>'10','𐅘'=>'1','𐅙'=>'1','𐅚'=>'1','𐅛'=>'2','𐅜'=>'2','𐅝'=>'2','𐅞'=>'2','𐅟'=>'5','𐅠'=>'10','𐅡'=>'10','𐅢'=>'10','𐅣'=>'10','𐅤'=>'10','𐅥'=>'30','𐅦'=>'50','𐅧'=>'50','𐅨'=>'50','𐅩'=>'50','𐅪'=>'100','𐅫'=>'300','𐅬'=>'500','𐅭'=>'500','𐅮'=>'500','𐅯'=>'500','𐅰'=>'500','𐅱'=>'1000','𐅲'=>'5000','𐅳'=>'5','𐅴'=>'50','𐅵'=>'1/2','𐅶'=>'1/2','𐅷'=>'2/3','𐅸'=>'3/4','𐆊'=>'0','𐌀'=>'𐌀','𐌁'=>'𐌁','𐌂'=>'𐌂','𐌃'=>'𐌃','𐌄'=>'𐌄','𐌅'=>'𐌅','𐌆'=>'𐌆','𐌇'=>'𐌇','𐌈'=>'𐌈','𐌉'=>'𐌉','𐌊'=>'𐌊','𐌋'=>'𐌋','𐌌'=>'𐌌','𐌍'=>'𐌍','𐌎'=>'𐌎','𐌏'=>'𐌏','𐌐'=>'𐌐','𐌑'=>'𐌑','𐌒'=>'𐌒','𐌓'=>'𐌓','𐌔'=>'𐌔','𐌕'=>'𐌕','𐌖'=>'𐌖','𐌗'=>'𐌗','𐌘'=>'𐌘','𐌙'=>'𐌙','𐌚'=>'𐌚','𐌛'=>'𐌛','𐌜'=>'𐌜','𐌝'=>'𐌝','𐌞'=>'𐌞','𐌠'=>'1','𐌡'=>'5','𐌢'=>'10','𐌣'=>'50','𐌰'=>'𐌰','𐌱'=>'𐌱','𐌲'=>'𐌲','𐌳'=>'𐌳','𐌴'=>'𐌴','𐌵'=>'𐌵','𐌶'=>'𐌶','𐌷'=>'𐌷','𐌸'=>'𐌸','𐌹'=>'𐌹','𐌺'=>'𐌺','𐌻'=>'𐌻','𐌼'=>'𐌼','𐌽'=>'𐌽','𐌾'=>'𐌾','𐌿'=>'𐌿','𐍀'=>'𐍀','𐍁'=>'90','𐍂'=>'𐍂','𐍃'=>'𐍃','𐍄'=>'𐍄','𐍅'=>'𐍅','𐍆'=>'𐍆','𐍇'=>'𐍇','𐍈'=>'𐍈','𐍉'=>'𐍉','𐍊'=>'900','𐎀'=>'𐎀','𐎁'=>'𐎁','𐎂'=>'𐎂','𐎃'=>'𐎃','𐎄'=>'𐎄','𐎅'=>'𐎅','𐎆'=>'𐎆','𐎇'=>'𐎇','𐎈'=>'𐎈','𐎉'=>'𐎉','𐎊'=>'𐎊','𐎋'=>'𐎋','𐎌'=>'𐎌','𐎍'=>'𐎍','𐎎'=>'𐎎','𐎏'=>'𐎏','𐎐'=>'𐎐','𐎑'=>'𐎑','𐎒'=>'𐎒','𐎓'=>'𐎓','𐎔'=>'𐎔','𐎕'=>'𐎕','𐎖'=>'𐎖','𐎗'=>'𐎗','𐎘'=>'𐎘','𐎙'=>'𐎙','𐎚'=>'𐎚','𐎛'=>'𐎛','𐎜'=>'𐎜','𐎝'=>'𐎝','𐎠'=>'𐎠','𐎡'=>'𐎡','𐎢'=>'𐎢','𐎣'=>'𐎣','𐎤'=>'𐎤','𐎥'=>'𐎥','𐎦'=>'𐎦','𐎧'=>'𐎧','𐎨'=>'𐎨','𐎩'=>'𐎩','𐎪'=>'𐎪','𐎫'=>'𐎫','𐎬'=>'𐎬','𐎭'=>'𐎭','𐎮'=>'𐎮','𐎯'=>'𐎯','𐎰'=>'𐎰','𐎱'=>'𐎱','𐎲'=>'𐎲','𐎳'=>'𐎳','𐎴'=>'𐎴','𐎵'=>'𐎵','𐎶'=>'𐎶','𐎷'=>'𐎷','𐎸'=>'𐎸','𐎹'=>'𐎹','𐎺'=>'𐎺','𐎻'=>'𐎻','𐎼'=>'𐎼','𐎽'=>'𐎽','𐎾'=>'𐎾','𐎿'=>'𐎿','𐏀'=>'𐏀','𐏁'=>'𐏁','𐏂'=>'𐏂','𐏃'=>'𐏃','𐏈'=>'𐏈','𐏉'=>'𐏉','𐏊'=>'𐏊','𐏋'=>'𐏋','𐏌'=>'𐏌','𐏍'=>'𐏍','𐏎'=>'𐏎','𐏏'=>'𐏏','𐏑'=>'1','𐏒'=>'2','𐏓'=>'10','𐏔'=>'20','𐏕'=>'100','𐐀'=>'𐐨','𐐁'=>'𐐩','𐐂'=>'𐐪','𐐃'=>'𐐫','𐐄'=>'𐐬','𐐅'=>'𐐭','𐐆'=>'𐐮','𐐇'=>'𐐯','𐐈'=>'𐐰','𐐉'=>'𐐱','𐐊'=>'𐐲','𐐋'=>'𐐳','𐐌'=>'𐐴','𐐍'=>'𐐵','𐐎'=>'𐐶','𐐏'=>'𐐷','𐐐'=>'𐐸','𐐑'=>'𐐹','𐐒'=>'𐐺','𐐓'=>'𐐻','𐐔'=>'𐐼','𐐕'=>'𐐽','𐐖'=>'𐐾','𐐗'=>'𐐿','𐐘'=>'𐑀','𐐙'=>'𐑁','𐐚'=>'𐑂','𐐛'=>'𐑃','𐐜'=>'𐑄','𐐝'=>'𐑅','𐐞'=>'𐑆','𐐟'=>'𐑇','𐐠'=>'𐑈','𐐡'=>'𐑉','𐐢'=>'𐑊','𐐣'=>'𐑋','𐐤'=>'𐑌','𐐥'=>'𐑍','𐐦'=>'𐑎','𐐧'=>'𐑏','𐐨'=>'𐐨','𐐩'=>'𐐩','𐐪'=>'𐐪','𐐫'=>'𐐫','𐐬'=>'𐐬','𐐭'=>'𐐭','𐐮'=>'𐐮','𐐯'=>'𐐯','𐐰'=>'𐐰','𐐱'=>'𐐱','𐐲'=>'𐐲','𐐳'=>'𐐳','𐐴'=>'𐐴','𐐵'=>'𐐵','𐐶'=>'𐐶','𐐷'=>'𐐷','𐐸'=>'𐐸','𐐹'=>'𐐹','𐐺'=>'𐐺','𐐻'=>'𐐻','𐐼'=>'𐐼','𐐽'=>'𐐽','𐐾'=>'𐐾','𐐿'=>'𐐿','𐑀'=>'𐑀','𐑁'=>'𐑁','𐑂'=>'𐑂','𐑃'=>'𐑃','𐑄'=>'𐑄','𐑅'=>'𐑅','𐑆'=>'𐑆','𐑇'=>'𐑇','𐑈'=>'𐑈','𐑉'=>'𐑉','𐑊'=>'𐑊','𐑋'=>'𐑋','𐑌'=>'𐑌','𐑍'=>'𐑍','𐑎'=>'𐑎','𐑏'=>'𐑏','𐑐'=>'𐑐','𐑑'=>'𐑑','𐑒'=>'𐑒','𐑓'=>'𐑓','𐑔'=>'𐑔','𐑕'=>'𐑕','𐑖'=>'𐑖','𐑗'=>'𐑗','𐑘'=>'𐑘','𐑙'=>'𐑙','𐑚'=>'𐑚','𐑛'=>'𐑛','𐑜'=>'𐑜','𐑝'=>'𐑝','𐑞'=>'𐑞','𐑟'=>'𐑟','𐑠'=>'𐑠','𐑡'=>'𐑡','𐑢'=>'𐑢','𐑣'=>'𐑣','𐑤'=>'𐑤','𐑥'=>'𐑥','𐑦'=>'𐑦','𐑧'=>'𐑧','𐑨'=>'𐑨','𐑩'=>'𐑩','𐑪'=>'𐑪','𐑫'=>'𐑫','𐑬'=>'𐑬','𐑭'=>'𐑭','𐑮'=>'𐑮','𐑯'=>'𐑯','𐑰'=>'𐑰','𐑱'=>'𐑱','𐑲'=>'𐑲','𐑳'=>'𐑳','𐑴'=>'𐑴','𐑵'=>'𐑵','𐑶'=>'𐑶','𐑷'=>'𐑷','𐑸'=>'𐑸','𐑹'=>'𐑹','𐑺'=>'𐑺','𐑻'=>'𐑻','𐑼'=>'𐑼','𐑽'=>'𐑽','𐑾'=>'𐑾','𐑿'=>'𐑿','𐒀'=>'𐒀','𐒁'=>'𐒁','𐒂'=>'𐒂','𐒃'=>'𐒃','𐒄'=>'𐒄','𐒅'=>'𐒅','𐒆'=>'𐒆','𐒇'=>'𐒇','𐒈'=>'𐒈','𐒉'=>'𐒉','𐒊'=>'𐒊','𐒋'=>'𐒋','𐒌'=>'𐒌','𐒍'=>'𐒍','𐒎'=>'𐒎','𐒏'=>'𐒏','𐒐'=>'𐒐','𐒑'=>'𐒑','𐒒'=>'𐒒','𐒓'=>'𐒓','𐒔'=>'𐒔','𐒕'=>'𐒕','𐒖'=>'𐒖','𐒗'=>'𐒗','𐒘'=>'𐒘','𐒙'=>'𐒙','𐒚'=>'𐒚','𐒛'=>'𐒛','𐒜'=>'𐒜','𐒝'=>'𐒝','𐒠'=>'0','𐒡'=>'1','𐒢'=>'2','𐒣'=>'3','𐒤'=>'4','𐒥'=>'5','𐒦'=>'6','𐒧'=>'7','𐒨'=>'8','𐒩'=>'9');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/search_indexer_33.php b/phpBB/includes/utf/data/search_indexer_33.php
deleted file mode 100644
index 4e8762a646..0000000000
--- a/phpBB/includes/utf/data/search_indexer_33.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('𐠀'=>'𐠀','𐠁'=>'𐠁','𐠂'=>'𐠂','𐠃'=>'𐠃','𐠄'=>'𐠄','𐠅'=>'𐠅','𐠈'=>'𐠈','𐠊'=>'𐠊','𐠋'=>'𐠋','𐠌'=>'𐠌','𐠍'=>'𐠍','𐠎'=>'𐠎','𐠏'=>'𐠏','𐠐'=>'𐠐','𐠑'=>'𐠑','𐠒'=>'𐠒','𐠓'=>'𐠓','𐠔'=>'𐠔','𐠕'=>'𐠕','𐠖'=>'𐠖','𐠗'=>'𐠗','𐠘'=>'𐠘','𐠙'=>'𐠙','𐠚'=>'𐠚','𐠛'=>'𐠛','𐠜'=>'𐠜','𐠝'=>'𐠝','𐠞'=>'𐠞','𐠟'=>'𐠟','𐠠'=>'𐠠','𐠡'=>'𐠡','𐠢'=>'𐠢','𐠣'=>'𐠣','𐠤'=>'𐠤','𐠥'=>'𐠥','𐠦'=>'𐠦','𐠧'=>'𐠧','𐠨'=>'𐠨','𐠩'=>'𐠩','𐠪'=>'𐠪','𐠫'=>'𐠫','𐠬'=>'𐠬','𐠭'=>'𐠭','𐠮'=>'𐠮','𐠯'=>'𐠯','𐠰'=>'𐠰','𐠱'=>'𐠱','𐠲'=>'𐠲','𐠳'=>'𐠳','𐠴'=>'𐠴','𐠵'=>'𐠵','𐠷'=>'𐠷','𐠸'=>'𐠸','𐠼'=>'𐠼','𐠿'=>'𐠿','𐤀'=>'𐤀','𐤁'=>'𐤁','𐤂'=>'𐤂','𐤃'=>'𐤃','𐤄'=>'𐤄','𐤅'=>'𐤅','𐤆'=>'𐤆','𐤇'=>'𐤇','𐤈'=>'𐤈','𐤉'=>'𐤉','𐤊'=>'𐤊','𐤋'=>'𐤋','𐤌'=>'𐤌','𐤍'=>'𐤍','𐤎'=>'𐤎','𐤏'=>'𐤏','𐤐'=>'𐤐','𐤑'=>'𐤑','𐤒'=>'𐤒','𐤓'=>'𐤓','𐤔'=>'𐤔','𐤕'=>'𐤕','𐤖'=>'1','𐤗'=>'10','𐤘'=>'20','𐤙'=>'100','𐨀'=>'𐨀','𐨁'=>'𐨁','𐨂'=>'𐨂','𐨃'=>'𐨃','𐨅'=>'𐨅','𐨆'=>'𐨆','𐨌'=>'𐨌','𐨍'=>'𐨍','𐨎'=>'𐨎','𐨏'=>'𐨏','𐨐'=>'𐨐','𐨑'=>'𐨑','𐨒'=>'𐨒','𐨓'=>'𐨓','𐨕'=>'𐨕','𐨖'=>'𐨖','𐨗'=>'𐨗','𐨙'=>'𐨙','𐨚'=>'𐨚','𐨛'=>'𐨛','𐨜'=>'𐨜','𐨝'=>'𐨝','𐨞'=>'𐨞','𐨟'=>'𐨟','𐨠'=>'𐨠','𐨡'=>'𐨡','𐨢'=>'𐨢','𐨣'=>'𐨣','𐨤'=>'𐨤','𐨥'=>'𐨥','𐨦'=>'𐨦','𐨧'=>'𐨧','𐨨'=>'𐨨','𐨩'=>'𐨩','𐨪'=>'𐨪','𐨫'=>'𐨫','𐨬'=>'𐨬','𐨭'=>'𐨭','𐨮'=>'𐨮','𐨯'=>'𐨯','𐨰'=>'𐨰','𐨱'=>'𐨱','𐨲'=>'𐨲','𐨳'=>'𐨳','𐨸'=>'𐨸','𐨹'=>'𐨹','𐨺'=>'𐨺','𐨿'=>'𐨿','𐩀'=>'1','𐩁'=>'2','𐩂'=>'3','𐩃'=>'4','𐩄'=>'10','𐩅'=>'20','𐩆'=>'100','𐩇'=>'1000');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/search_indexer_36.php b/phpBB/includes/utf/data/search_indexer_36.php
deleted file mode 100644
index 8bf908e514..0000000000
--- a/phpBB/includes/utf/data/search_indexer_36.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('𒀀'=>'𒀀','𒀁'=>'𒀁','𒀂'=>'𒀂','𒀃'=>'𒀃','𒀄'=>'𒀄','𒀅'=>'𒀅','𒀆'=>'𒀆','𒀇'=>'𒀇','𒀈'=>'𒀈','𒀉'=>'𒀉','𒀊'=>'𒀊','𒀋'=>'𒀋','𒀌'=>'𒀌','𒀍'=>'𒀍','𒀎'=>'𒀎','𒀏'=>'𒀏','𒀐'=>'𒀐','𒀑'=>'𒀑','𒀒'=>'𒀒','𒀓'=>'𒀓','𒀔'=>'𒀔','𒀕'=>'𒀕','𒀖'=>'𒀖','𒀗'=>'𒀗','𒀘'=>'𒀘','𒀙'=>'𒀙','𒀚'=>'𒀚','𒀛'=>'𒀛','𒀜'=>'𒀜','𒀝'=>'𒀝','𒀞'=>'𒀞','𒀟'=>'𒀟','𒀠'=>'𒀠','𒀡'=>'𒀡','𒀢'=>'𒀢','𒀣'=>'𒀣','𒀤'=>'𒀤','𒀥'=>'𒀥','𒀦'=>'𒀦','𒀧'=>'𒀧','𒀨'=>'𒀨','𒀩'=>'𒀩','𒀪'=>'𒀪','𒀫'=>'𒀫','𒀬'=>'𒀬','𒀭'=>'𒀭','𒀮'=>'𒀮','𒀯'=>'𒀯','𒀰'=>'𒀰','𒀱'=>'𒀱','𒀲'=>'𒀲','𒀳'=>'𒀳','𒀴'=>'𒀴','𒀵'=>'𒀵','𒀶'=>'𒀶','𒀷'=>'𒀷','𒀸'=>'𒀸','𒀹'=>'𒀹','𒀺'=>'𒀺','𒀻'=>'𒀻','𒀼'=>'𒀼','𒀽'=>'𒀽','𒀾'=>'𒀾','𒀿'=>'𒀿','𒁀'=>'𒁀','𒁁'=>'𒁁','𒁂'=>'𒁂','𒁃'=>'𒁃','𒁄'=>'𒁄','𒁅'=>'𒁅','𒁆'=>'𒁆','𒁇'=>'𒁇','𒁈'=>'𒁈','𒁉'=>'𒁉','𒁊'=>'𒁊','𒁋'=>'𒁋','𒁌'=>'𒁌','𒁍'=>'𒁍','𒁎'=>'𒁎','𒁏'=>'𒁏','𒁐'=>'𒁐','𒁑'=>'𒁑','𒁒'=>'𒁒','𒁓'=>'𒁓','𒁔'=>'𒁔','𒁕'=>'𒁕','𒁖'=>'𒁖','𒁗'=>'𒁗','𒁘'=>'𒁘','𒁙'=>'𒁙','𒁚'=>'𒁚','𒁛'=>'𒁛','𒁜'=>'𒁜','𒁝'=>'𒁝','𒁞'=>'𒁞','𒁟'=>'𒁟','𒁠'=>'𒁠','𒁡'=>'𒁡','𒁢'=>'𒁢','𒁣'=>'𒁣','𒁤'=>'𒁤','𒁥'=>'𒁥','𒁦'=>'𒁦','𒁧'=>'𒁧','𒁨'=>'𒁨','𒁩'=>'𒁩','𒁪'=>'𒁪','𒁫'=>'𒁫','𒁬'=>'𒁬','𒁭'=>'𒁭','𒁮'=>'𒁮','𒁯'=>'𒁯','𒁰'=>'𒁰','𒁱'=>'𒁱','𒁲'=>'𒁲','𒁳'=>'𒁳','𒁴'=>'𒁴','𒁵'=>'𒁵','𒁶'=>'𒁶','𒁷'=>'𒁷','𒁸'=>'𒁸','𒁹'=>'𒁹','𒁺'=>'𒁺','𒁻'=>'𒁻','𒁼'=>'𒁼','𒁽'=>'𒁽','𒁾'=>'𒁾','𒁿'=>'𒁿','𒂀'=>'𒂀','𒂁'=>'𒂁','𒂂'=>'𒂂','𒂃'=>'𒂃','𒂄'=>'𒂄','𒂅'=>'𒂅','𒂆'=>'𒂆','𒂇'=>'𒂇','𒂈'=>'𒂈','𒂉'=>'𒂉','𒂊'=>'𒂊','𒂋'=>'𒂋','𒂌'=>'𒂌','𒂍'=>'𒂍','𒂎'=>'𒂎','𒂏'=>'𒂏','𒂐'=>'𒂐','𒂑'=>'𒂑','𒂒'=>'𒂒','𒂓'=>'𒂓','𒂔'=>'𒂔','𒂕'=>'𒂕','𒂖'=>'𒂖','𒂗'=>'𒂗','𒂘'=>'𒂘','𒂙'=>'𒂙','𒂚'=>'𒂚','𒂛'=>'𒂛','𒂜'=>'𒂜','𒂝'=>'𒂝','𒂞'=>'𒂞','𒂟'=>'𒂟','𒂠'=>'𒂠','𒂡'=>'𒂡','𒂢'=>'𒂢','𒂣'=>'𒂣','𒂤'=>'𒂤','𒂥'=>'𒂥','𒂦'=>'𒂦','𒂧'=>'𒂧','𒂨'=>'𒂨','𒂩'=>'𒂩','𒂪'=>'𒂪','𒂫'=>'𒂫','𒂬'=>'𒂬','𒂭'=>'𒂭','𒂮'=>'𒂮','𒂯'=>'𒂯','𒂰'=>'𒂰','𒂱'=>'𒂱','𒂲'=>'𒂲','𒂳'=>'𒂳','𒂴'=>'𒂴','𒂵'=>'𒂵','𒂶'=>'𒂶','𒂷'=>'𒂷','𒂸'=>'𒂸','𒂹'=>'𒂹','𒂺'=>'𒂺','𒂻'=>'𒂻','𒂼'=>'𒂼','𒂽'=>'𒂽','𒂾'=>'𒂾','𒂿'=>'𒂿','𒃀'=>'𒃀','𒃁'=>'𒃁','𒃂'=>'𒃂','𒃃'=>'𒃃','𒃄'=>'𒃄','𒃅'=>'𒃅','𒃆'=>'𒃆','𒃇'=>'𒃇','𒃈'=>'𒃈','𒃉'=>'𒃉','𒃊'=>'𒃊','𒃋'=>'𒃋','𒃌'=>'𒃌','𒃍'=>'𒃍','𒃎'=>'𒃎','𒃏'=>'𒃏','𒃐'=>'𒃐','𒃑'=>'𒃑','𒃒'=>'𒃒','𒃓'=>'𒃓','𒃔'=>'𒃔','𒃕'=>'𒃕','𒃖'=>'𒃖','𒃗'=>'𒃗','𒃘'=>'𒃘','𒃙'=>'𒃙','𒃚'=>'𒃚','𒃛'=>'𒃛','𒃜'=>'𒃜','𒃝'=>'𒃝','𒃞'=>'𒃞','𒃟'=>'𒃟','𒃠'=>'𒃠','𒃡'=>'𒃡','𒃢'=>'𒃢','𒃣'=>'𒃣','𒃤'=>'𒃤','𒃥'=>'𒃥','𒃦'=>'𒃦','𒃧'=>'𒃧','𒃨'=>'𒃨','𒃩'=>'𒃩','𒃪'=>'𒃪','𒃫'=>'𒃫','𒃬'=>'𒃬','𒃭'=>'𒃭','𒃮'=>'𒃮','𒃯'=>'𒃯','𒃰'=>'𒃰','𒃱'=>'𒃱','𒃲'=>'𒃲','𒃳'=>'𒃳','𒃴'=>'𒃴','𒃵'=>'𒃵','𒃶'=>'𒃶','𒃷'=>'𒃷','𒃸'=>'𒃸','𒃹'=>'𒃹','𒃺'=>'𒃺','𒃻'=>'𒃻','𒃼'=>'𒃼','𒃽'=>'𒃽','𒃾'=>'𒃾','𒃿'=>'𒃿','𒄀'=>'𒄀','𒄁'=>'𒄁','𒄂'=>'𒄂','𒄃'=>'𒄃','𒄄'=>'𒄄','𒄅'=>'𒄅','𒄆'=>'𒄆','𒄇'=>'𒄇','𒄈'=>'𒄈','𒄉'=>'𒄉','𒄊'=>'𒄊','𒄋'=>'𒄋','𒄌'=>'𒄌','𒄍'=>'𒄍','𒄎'=>'𒄎','𒄏'=>'𒄏','𒄐'=>'𒄐','𒄑'=>'𒄑','𒄒'=>'𒄒','𒄓'=>'𒄓','𒄔'=>'𒄔','𒄕'=>'𒄕','𒄖'=>'𒄖','𒄗'=>'𒄗','𒄘'=>'𒄘','𒄙'=>'𒄙','𒄚'=>'𒄚','𒄛'=>'𒄛','𒄜'=>'𒄜','𒄝'=>'𒄝','𒄞'=>'𒄞','𒄟'=>'𒄟','𒄠'=>'𒄠','𒄡'=>'𒄡','𒄢'=>'𒄢','𒄣'=>'𒄣','𒄤'=>'𒄤','𒄥'=>'𒄥','𒄦'=>'𒄦','𒄧'=>'𒄧','𒄨'=>'𒄨','𒄩'=>'𒄩','𒄪'=>'𒄪','𒄫'=>'𒄫','𒄬'=>'𒄬','𒄭'=>'𒄭','𒄮'=>'𒄮','𒄯'=>'𒄯','𒄰'=>'𒄰','𒄱'=>'𒄱','𒄲'=>'𒄲','𒄳'=>'𒄳','𒄴'=>'𒄴','𒄵'=>'𒄵','𒄶'=>'𒄶','𒄷'=>'𒄷','𒄸'=>'𒄸','𒄹'=>'𒄹','𒄺'=>'𒄺','𒄻'=>'𒄻','𒄼'=>'𒄼','𒄽'=>'𒄽','𒄾'=>'𒄾','𒄿'=>'𒄿','𒅀'=>'𒅀','𒅁'=>'𒅁','𒅂'=>'𒅂','𒅃'=>'𒅃','𒅄'=>'𒅄','𒅅'=>'𒅅','𒅆'=>'𒅆','𒅇'=>'𒅇','𒅈'=>'𒅈','𒅉'=>'𒅉','𒅊'=>'𒅊','𒅋'=>'𒅋','𒅌'=>'𒅌','𒅍'=>'𒅍','𒅎'=>'𒅎','𒅏'=>'𒅏','𒅐'=>'𒅐','𒅑'=>'𒅑','𒅒'=>'𒅒','𒅓'=>'𒅓','𒅔'=>'𒅔','𒅕'=>'𒅕','𒅖'=>'𒅖','𒅗'=>'𒅗','𒅘'=>'𒅘','𒅙'=>'𒅙','𒅚'=>'𒅚','𒅛'=>'𒅛','𒅜'=>'𒅜','𒅝'=>'𒅝','𒅞'=>'𒅞','𒅟'=>'𒅟','𒅠'=>'𒅠','𒅡'=>'𒅡','𒅢'=>'𒅢','𒅣'=>'𒅣','𒅤'=>'𒅤','𒅥'=>'𒅥','𒅦'=>'𒅦','𒅧'=>'𒅧','𒅨'=>'𒅨','𒅩'=>'𒅩','𒅪'=>'𒅪','𒅫'=>'𒅫','𒅬'=>'𒅬','𒅭'=>'𒅭','𒅮'=>'𒅮','𒅯'=>'𒅯','𒅰'=>'𒅰','𒅱'=>'𒅱','𒅲'=>'𒅲','𒅳'=>'𒅳','𒅴'=>'𒅴','𒅵'=>'𒅵','𒅶'=>'𒅶','𒅷'=>'𒅷','𒅸'=>'𒅸','𒅹'=>'𒅹','𒅺'=>'𒅺','𒅻'=>'𒅻','𒅼'=>'𒅼','𒅽'=>'𒅽','𒅾'=>'𒅾','𒅿'=>'𒅿','𒆀'=>'𒆀','𒆁'=>'𒆁','𒆂'=>'𒆂','𒆃'=>'𒆃','𒆄'=>'𒆄','𒆅'=>'𒆅','𒆆'=>'𒆆','𒆇'=>'𒆇','𒆈'=>'𒆈','𒆉'=>'𒆉','𒆊'=>'𒆊','𒆋'=>'𒆋','𒆌'=>'𒆌','𒆍'=>'𒆍','𒆎'=>'𒆎','𒆏'=>'𒆏','𒆐'=>'𒆐','𒆑'=>'𒆑','𒆒'=>'𒆒','𒆓'=>'𒆓','𒆔'=>'𒆔','𒆕'=>'𒆕','𒆖'=>'𒆖','𒆗'=>'𒆗','𒆘'=>'𒆘','𒆙'=>'𒆙','𒆚'=>'𒆚','𒆛'=>'𒆛','𒆜'=>'𒆜','𒆝'=>'𒆝','𒆞'=>'𒆞','𒆟'=>'𒆟','𒆠'=>'𒆠','𒆡'=>'𒆡','𒆢'=>'𒆢','𒆣'=>'𒆣','𒆤'=>'𒆤','𒆥'=>'𒆥','𒆦'=>'𒆦','𒆧'=>'𒆧','𒆨'=>'𒆨','𒆩'=>'𒆩','𒆪'=>'𒆪','𒆫'=>'𒆫','𒆬'=>'𒆬','𒆭'=>'𒆭','𒆮'=>'𒆮','𒆯'=>'𒆯','𒆰'=>'𒆰','𒆱'=>'𒆱','𒆲'=>'𒆲','𒆳'=>'𒆳','𒆴'=>'𒆴','𒆵'=>'𒆵','𒆶'=>'𒆶','𒆷'=>'𒆷','𒆸'=>'𒆸','𒆹'=>'𒆹','𒆺'=>'𒆺','𒆻'=>'𒆻','𒆼'=>'𒆼','𒆽'=>'𒆽','𒆾'=>'𒆾','𒆿'=>'𒆿','𒇀'=>'𒇀','𒇁'=>'𒇁','𒇂'=>'𒇂','𒇃'=>'𒇃','𒇄'=>'𒇄','𒇅'=>'𒇅','𒇆'=>'𒇆','𒇇'=>'𒇇','𒇈'=>'𒇈','𒇉'=>'𒇉','𒇊'=>'𒇊','𒇋'=>'𒇋','𒇌'=>'𒇌','𒇍'=>'𒇍','𒇎'=>'𒇎','𒇏'=>'𒇏','𒇐'=>'𒇐','𒇑'=>'𒇑','𒇒'=>'𒇒','𒇓'=>'𒇓','𒇔'=>'𒇔','𒇕'=>'𒇕','𒇖'=>'𒇖','𒇗'=>'𒇗','𒇘'=>'𒇘','𒇙'=>'𒇙','𒇚'=>'𒇚','𒇛'=>'𒇛','𒇜'=>'𒇜','𒇝'=>'𒇝','𒇞'=>'𒇞','𒇟'=>'𒇟','𒇠'=>'𒇠','𒇡'=>'𒇡','𒇢'=>'𒇢','𒇣'=>'𒇣','𒇤'=>'𒇤','𒇥'=>'𒇥','𒇦'=>'𒇦','𒇧'=>'𒇧','𒇨'=>'𒇨','𒇩'=>'𒇩','𒇪'=>'𒇪','𒇫'=>'𒇫','𒇬'=>'𒇬','𒇭'=>'𒇭','𒇮'=>'𒇮','𒇯'=>'𒇯','𒇰'=>'𒇰','𒇱'=>'𒇱','𒇲'=>'𒇲','𒇳'=>'𒇳','𒇴'=>'𒇴','𒇵'=>'𒇵','𒇶'=>'𒇶','𒇷'=>'𒇷','𒇸'=>'𒇸','𒇹'=>'𒇹','𒇺'=>'𒇺','𒇻'=>'𒇻','𒇼'=>'𒇼','𒇽'=>'𒇽','𒇾'=>'𒇾','𒇿'=>'𒇿','𒈀'=>'𒈀','𒈁'=>'𒈁','𒈂'=>'𒈂','𒈃'=>'𒈃','𒈄'=>'𒈄','𒈅'=>'𒈅','𒈆'=>'𒈆','𒈇'=>'𒈇','𒈈'=>'𒈈','𒈉'=>'𒈉','𒈊'=>'𒈊','𒈋'=>'𒈋','𒈌'=>'𒈌','𒈍'=>'𒈍','𒈎'=>'𒈎','𒈏'=>'𒈏','𒈐'=>'𒈐','𒈑'=>'𒈑','𒈒'=>'𒈒','𒈓'=>'𒈓','𒈔'=>'𒈔','𒈕'=>'𒈕','𒈖'=>'𒈖','𒈗'=>'𒈗','𒈘'=>'𒈘','𒈙'=>'𒈙','𒈚'=>'𒈚','𒈛'=>'𒈛','𒈜'=>'𒈜','𒈝'=>'𒈝','𒈞'=>'𒈞','𒈟'=>'𒈟','𒈠'=>'𒈠','𒈡'=>'𒈡','𒈢'=>'𒈢','𒈣'=>'𒈣','𒈤'=>'𒈤','𒈥'=>'𒈥','𒈦'=>'𒈦','𒈧'=>'𒈧','𒈨'=>'𒈨','𒈩'=>'𒈩','𒈪'=>'𒈪','𒈫'=>'𒈫','𒈬'=>'𒈬','𒈭'=>'𒈭','𒈮'=>'𒈮','𒈯'=>'𒈯','𒈰'=>'𒈰','𒈱'=>'𒈱','𒈲'=>'𒈲','𒈳'=>'𒈳','𒈴'=>'𒈴','𒈵'=>'𒈵','𒈶'=>'𒈶','𒈷'=>'𒈷','𒈸'=>'𒈸','𒈹'=>'𒈹','𒈺'=>'𒈺','𒈻'=>'𒈻','𒈼'=>'𒈼','𒈽'=>'𒈽','𒈾'=>'𒈾','𒈿'=>'𒈿','𒉀'=>'𒉀','𒉁'=>'𒉁','𒉂'=>'𒉂','𒉃'=>'𒉃','𒉄'=>'𒉄','𒉅'=>'𒉅','𒉆'=>'𒉆','𒉇'=>'𒉇','𒉈'=>'𒉈','𒉉'=>'𒉉','𒉊'=>'𒉊','𒉋'=>'𒉋','𒉌'=>'𒉌','𒉍'=>'𒉍','𒉎'=>'𒉎','𒉏'=>'𒉏','𒉐'=>'𒉐','𒉑'=>'𒉑','𒉒'=>'𒉒','𒉓'=>'𒉓','𒉔'=>'𒉔','𒉕'=>'𒉕','𒉖'=>'𒉖','𒉗'=>'𒉗','𒉘'=>'𒉘','𒉙'=>'𒉙','𒉚'=>'𒉚','𒉛'=>'𒉛','𒉜'=>'𒉜','𒉝'=>'𒉝','𒉞'=>'𒉞','𒉟'=>'𒉟','𒉠'=>'𒉠','𒉡'=>'𒉡','𒉢'=>'𒉢','𒉣'=>'𒉣','𒉤'=>'𒉤','𒉥'=>'𒉥','𒉦'=>'𒉦','𒉧'=>'𒉧','𒉨'=>'𒉨','𒉩'=>'𒉩','𒉪'=>'𒉪','𒉫'=>'𒉫','𒉬'=>'𒉬','𒉭'=>'𒉭','𒉮'=>'𒉮','𒉯'=>'𒉯','𒉰'=>'𒉰','𒉱'=>'𒉱','𒉲'=>'𒉲','𒉳'=>'𒉳','𒉴'=>'𒉴','𒉵'=>'𒉵','𒉶'=>'𒉶','𒉷'=>'𒉷','𒉸'=>'𒉸','𒉹'=>'𒉹','𒉺'=>'𒉺','𒉻'=>'𒉻','𒉼'=>'𒉼','𒉽'=>'𒉽','𒉾'=>'𒉾','𒉿'=>'𒉿','𒊀'=>'𒊀','𒊁'=>'𒊁','𒊂'=>'𒊂','𒊃'=>'𒊃','𒊄'=>'𒊄','𒊅'=>'𒊅','𒊆'=>'𒊆','𒊇'=>'𒊇','𒊈'=>'𒊈','𒊉'=>'𒊉','𒊊'=>'𒊊','𒊋'=>'𒊋','𒊌'=>'𒊌','𒊍'=>'𒊍','𒊎'=>'𒊎','𒊏'=>'𒊏','𒊐'=>'𒊐','𒊑'=>'𒊑','𒊒'=>'𒊒','𒊓'=>'𒊓','𒊔'=>'𒊔','𒊕'=>'𒊕','𒊖'=>'𒊖','𒊗'=>'𒊗','𒊘'=>'𒊘','𒊙'=>'𒊙','𒊚'=>'𒊚','𒊛'=>'𒊛','𒊜'=>'𒊜','𒊝'=>'𒊝','𒊞'=>'𒊞','𒊟'=>'𒊟','𒊠'=>'𒊠','𒊡'=>'𒊡','𒊢'=>'𒊢','𒊣'=>'𒊣','𒊤'=>'𒊤','𒊥'=>'𒊥','𒊦'=>'𒊦','𒊧'=>'𒊧','𒊨'=>'𒊨','𒊩'=>'𒊩','𒊪'=>'𒊪','𒊫'=>'𒊫','𒊬'=>'𒊬','𒊭'=>'𒊭','𒊮'=>'𒊮','𒊯'=>'𒊯','𒊰'=>'𒊰','𒊱'=>'𒊱','𒊲'=>'𒊲','𒊳'=>'𒊳','𒊴'=>'𒊴','𒊵'=>'𒊵','𒊶'=>'𒊶','𒊷'=>'𒊷','𒊸'=>'𒊸','𒊹'=>'𒊹','𒊺'=>'𒊺','𒊻'=>'𒊻','𒊼'=>'𒊼','𒊽'=>'𒊽','𒊾'=>'𒊾','𒊿'=>'𒊿','𒋀'=>'𒋀','𒋁'=>'𒋁','𒋂'=>'𒋂','𒋃'=>'𒋃','𒋄'=>'𒋄','𒋅'=>'𒋅','𒋆'=>'𒋆','𒋇'=>'𒋇','𒋈'=>'𒋈','𒋉'=>'𒋉','𒋊'=>'𒋊','𒋋'=>'𒋋','𒋌'=>'𒋌','𒋍'=>'𒋍','𒋎'=>'𒋎','𒋏'=>'𒋏','𒋐'=>'𒋐','𒋑'=>'𒋑','𒋒'=>'𒋒','𒋓'=>'𒋓','𒋔'=>'𒋔','𒋕'=>'𒋕','𒋖'=>'𒋖','𒋗'=>'𒋗','𒋘'=>'𒋘','𒋙'=>'𒋙','𒋚'=>'𒋚','𒋛'=>'𒋛','𒋜'=>'𒋜','𒋝'=>'𒋝','𒋞'=>'𒋞','𒋟'=>'𒋟','𒋠'=>'𒋠','𒋡'=>'𒋡','𒋢'=>'𒋢','𒋣'=>'𒋣','𒋤'=>'𒋤','𒋥'=>'𒋥','𒋦'=>'𒋦','𒋧'=>'𒋧','𒋨'=>'𒋨','𒋩'=>'𒋩','𒋪'=>'𒋪','𒋫'=>'𒋫','𒋬'=>'𒋬','𒋭'=>'𒋭','𒋮'=>'𒋮','𒋯'=>'𒋯','𒋰'=>'𒋰','𒋱'=>'𒋱','𒋲'=>'𒋲','𒋳'=>'𒋳','𒋴'=>'𒋴','𒋵'=>'𒋵','𒋶'=>'𒋶','𒋷'=>'𒋷','𒋸'=>'𒋸','𒋹'=>'𒋹','𒋺'=>'𒋺','𒋻'=>'𒋻','𒋼'=>'𒋼','𒋽'=>'𒋽','𒋾'=>'𒋾','𒋿'=>'𒋿','𒌀'=>'𒌀','𒌁'=>'𒌁','𒌂'=>'𒌂','𒌃'=>'𒌃','𒌄'=>'𒌄','𒌅'=>'𒌅','𒌆'=>'𒌆','𒌇'=>'𒌇','𒌈'=>'𒌈','𒌉'=>'𒌉','𒌊'=>'𒌊','𒌋'=>'𒌋','𒌌'=>'𒌌','𒌍'=>'𒌍','𒌎'=>'𒌎','𒌏'=>'𒌏','𒌐'=>'𒌐','𒌑'=>'𒌑','𒌒'=>'𒌒','𒌓'=>'𒌓','𒌔'=>'𒌔','𒌕'=>'𒌕','𒌖'=>'𒌖','𒌗'=>'𒌗','𒌘'=>'𒌘','𒌙'=>'𒌙','𒌚'=>'𒌚','𒌛'=>'𒌛','𒌜'=>'𒌜','𒌝'=>'𒌝','𒌞'=>'𒌞','𒌟'=>'𒌟','𒌠'=>'𒌠','𒌡'=>'𒌡','𒌢'=>'𒌢','𒌣'=>'𒌣','𒌤'=>'𒌤','𒌥'=>'𒌥','𒌦'=>'𒌦','𒌧'=>'𒌧','𒌨'=>'𒌨','𒌩'=>'𒌩','𒌪'=>'𒌪','𒌫'=>'𒌫','𒌬'=>'𒌬','𒌭'=>'𒌭','𒌮'=>'𒌮','𒌯'=>'𒌯','𒌰'=>'𒌰','𒌱'=>'𒌱','𒌲'=>'𒌲','𒌳'=>'𒌳','𒌴'=>'𒌴','𒌵'=>'𒌵','𒌶'=>'𒌶','𒌷'=>'𒌷','𒌸'=>'𒌸','𒌹'=>'𒌹','𒌺'=>'𒌺','𒌻'=>'𒌻','𒌼'=>'𒌼','𒌽'=>'𒌽','𒌾'=>'𒌾','𒌿'=>'𒌿','𒍀'=>'𒍀','𒍁'=>'𒍁','𒍂'=>'𒍂','𒍃'=>'𒍃','𒍄'=>'𒍄','𒍅'=>'𒍅','𒍆'=>'𒍆','𒍇'=>'𒍇','𒍈'=>'𒍈','𒍉'=>'𒍉','𒍊'=>'𒍊','𒍋'=>'𒍋','𒍌'=>'𒍌','𒍍'=>'𒍍','𒍎'=>'𒍎','𒍏'=>'𒍏','𒍐'=>'𒍐','𒍑'=>'𒍑','𒍒'=>'𒍒','𒍓'=>'𒍓','𒍔'=>'𒍔','𒍕'=>'𒍕','𒍖'=>'𒍖','𒍗'=>'𒍗','𒍘'=>'𒍘','𒍙'=>'𒍙','𒍚'=>'𒍚','𒍛'=>'𒍛','𒍜'=>'𒍜','𒍝'=>'𒍝','𒍞'=>'𒍞','𒍟'=>'𒍟','𒍠'=>'𒍠','𒍡'=>'𒍡','𒍢'=>'𒍢','𒍣'=>'𒍣','𒍤'=>'𒍤','𒍥'=>'𒍥','𒍦'=>'𒍦','𒍧'=>'𒍧','𒍨'=>'𒍨','𒍩'=>'𒍩','𒍪'=>'𒍪','𒍫'=>'𒍫','𒍬'=>'𒍬','𒍭'=>'𒍭','𒍮'=>'𒍮','𒐀'=>'2','𒐁'=>'3','𒐂'=>'4','𒐃'=>'5','𒐄'=>'6','𒐅'=>'7','𒐆'=>'8','𒐇'=>'9','𒐈'=>'3','𒐉'=>'4','𒐊'=>'5','𒐋'=>'6','𒐌'=>'7','𒐍'=>'8','𒐎'=>'9','𒐏'=>'4','𒐐'=>'5','𒐑'=>'6','𒐒'=>'7','𒐓'=>'8','𒐔'=>'9','𒐕'=>'1','𒐖'=>'2','𒐗'=>'3','𒐘'=>'4','𒐙'=>'5','𒐚'=>'6','𒐛'=>'7','𒐜'=>'8','𒐝'=>'9','𒐞'=>'1','𒐟'=>'2','𒐠'=>'3','𒐡'=>'4','𒐢'=>'5','𒐣'=>'2','𒐤'=>'3','𒐥'=>'3','𒐦'=>'4','𒐧'=>'5','𒐨'=>'6','𒐩'=>'7','𒐪'=>'8','𒐫'=>'9','𒐬'=>'1','𒐭'=>'2','𒐮'=>'3','𒐯'=>'3','𒐰'=>'4','𒐱'=>'5','𒐲'=>'𒐲','𒐳'=>'𒐳','𒐴'=>'1','𒐵'=>'2','𒐶'=>'3','𒐷'=>'3','𒐸'=>'4','𒐹'=>'5','𒐺'=>'3','𒐻'=>'3','𒐼'=>'4','𒐽'=>'4','𒐾'=>'4','𒐿'=>'4','𒑀'=>'6','𒑁'=>'7','𒑂'=>'7','𒑃'=>'7','𒑄'=>'8','𒑅'=>'8','𒑆'=>'9','𒑇'=>'9','𒑈'=>'9','𒑉'=>'9','𒑊'=>'2','𒑋'=>'3','𒑌'=>'4','𒑍'=>'5','𒑎'=>'6','𒑏'=>'1','𒑐'=>'2','𒑑'=>'3','𒑒'=>'4','𒑓'=>'4','𒑔'=>'5','𒑕'=>'5','𒑖'=>'𒑖','𒑗'=>'𒑗','𒑘'=>'1','𒑙'=>'2','𒑚'=>'1/3','𒑛'=>'2/3','𒑜'=>'5/6','𒑝'=>'1/3','𒑞'=>'2/3','𒑟'=>'1/8','𒑠'=>'1/4','𒑡'=>'1/6','𒑢'=>'1/4');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/search_indexer_4.php b/phpBB/includes/utf/data/search_indexer_4.php
deleted file mode 100644
index 51acbff1c2..0000000000
--- a/phpBB/includes/utf/data/search_indexer_4.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('⁰'=>'0','ⁱ'=>'ⁱ','⁴'=>'4','⁵'=>'5','⁶'=>'6','⁷'=>'7','⁸'=>'8','⁹'=>'9','ⁿ'=>'ⁿ','₀'=>'0','₁'=>'1','₂'=>'2','₃'=>'3','₄'=>'4','₅'=>'5','₆'=>'6','₇'=>'7','₈'=>'8','₉'=>'9','ₐ'=>'ₐ','ₑ'=>'ₑ','ₒ'=>'ₒ','ₓ'=>'ₓ','ₔ'=>'ₔ','⃐'=>'⃐','⃑'=>'⃑','⃒'=>'⃒','⃓'=>'⃓','⃔'=>'⃔','⃕'=>'⃕','⃖'=>'⃖','⃗'=>'⃗','⃘'=>'⃘','⃙'=>'⃙','⃚'=>'⃚','⃛'=>'⃛','⃜'=>'⃜','⃝'=>'⃝','⃞'=>'⃞','⃟'=>'⃟','⃠'=>'⃠','⃡'=>'⃡','⃢'=>'⃢','⃣'=>'⃣','⃤'=>'⃤','⃥'=>'⃥','⃦'=>'⃦','⃧'=>'⃧','⃨'=>'⃨','⃩'=>'⃩','⃪'=>'⃪','⃫'=>'⃫','⃬'=>'⃬','⃭'=>'⃭','⃮'=>'⃮','⃯'=>'⃯','ℂ'=>'ℂ','ℇ'=>'ℇ','ℊ'=>'ℊ','ℋ'=>'ℋ','ℌ'=>'ℌ','ℍ'=>'ℍ','ℎ'=>'ℎ','ℏ'=>'ℏ','ℐ'=>'ℐ','ℑ'=>'ℑ','ℒ'=>'ℒ','ℓ'=>'ℓ','ℕ'=>'ℕ','ℙ'=>'ℙ','ℚ'=>'ℚ','ℛ'=>'ℛ','ℜ'=>'ℜ','ℝ'=>'ℝ','ℤ'=>'ℤ','Ω'=>'ω','ℨ'=>'ℨ','K'=>'k','Å'=>'å','ℬ'=>'ℬ','ℭ'=>'ℭ','ℯ'=>'ℯ','ℰ'=>'ℰ','ℱ'=>'ℱ','Ⅎ'=>'ⅎ','ℳ'=>'ℳ','ℴ'=>'ℴ','ℵ'=>'ℵ','ℶ'=>'ℶ','ℷ'=>'ℷ','ℸ'=>'ℸ','ℹ'=>'ℹ','ℼ'=>'ℼ','ℽ'=>'ℽ','ℾ'=>'ℾ','ℿ'=>'ℿ','ⅅ'=>'ⅅ','ⅆ'=>'ⅆ','ⅇ'=>'ⅇ','ⅈ'=>'ⅈ','ⅉ'=>'ⅉ','ⅎ'=>'ⅎ','⅓'=>'1/3','⅔'=>'2/3','⅕'=>'1/5','⅖'=>'2/5','⅗'=>'3/5','⅘'=>'4/5','⅙'=>'1/6','⅚'=>'5/6','⅛'=>'1/8','⅜'=>'3/8','⅝'=>'5/8','⅞'=>'7/8','⅟'=>'1','Ⅰ'=>'1','Ⅱ'=>'2','Ⅲ'=>'3','Ⅳ'=>'4','Ⅴ'=>'5','Ⅵ'=>'6','Ⅶ'=>'7','Ⅷ'=>'8','Ⅸ'=>'9','Ⅹ'=>'10','Ⅺ'=>'11','Ⅻ'=>'12','Ⅼ'=>'50','Ⅽ'=>'100','Ⅾ'=>'500','Ⅿ'=>'1000','ⅰ'=>'1','ⅱ'=>'2','ⅲ'=>'3','ⅳ'=>'4','ⅴ'=>'5','ⅵ'=>'6','ⅶ'=>'7','ⅷ'=>'8','ⅸ'=>'9','ⅹ'=>'10','ⅺ'=>'11','ⅻ'=>'12','ⅼ'=>'50','ⅽ'=>'100','ⅾ'=>'500','ⅿ'=>'1000','ↀ'=>'1000','ↁ'=>'5000','ↂ'=>'10000','Ↄ'=>'ↄ','ↄ'=>'ↄ','①'=>'1','②'=>'2','③'=>'3','④'=>'4','⑤'=>'5','⑥'=>'6','⑦'=>'7','⑧'=>'8','⑨'=>'9','⑩'=>'10','⑪'=>'11','⑫'=>'12','⑬'=>'13','⑭'=>'14','⑮'=>'15','⑯'=>'16','⑰'=>'17','⑱'=>'18','⑲'=>'19','⑳'=>'20','⑴'=>'1','⑵'=>'2','⑶'=>'3','⑷'=>'4','⑸'=>'5','⑹'=>'6','⑺'=>'7','⑻'=>'8','⑼'=>'9','⑽'=>'10','⑾'=>'11','⑿'=>'12','⒀'=>'13','⒁'=>'14','⒂'=>'15','⒃'=>'16','⒄'=>'17','⒅'=>'18','⒆'=>'19','⒇'=>'20','⒈'=>'1','⒉'=>'2','⒊'=>'3','⒋'=>'4','⒌'=>'5','⒍'=>'6','⒎'=>'7','⒏'=>'8','⒐'=>'9','⒑'=>'10','⒒'=>'11','⒓'=>'12','⒔'=>'13','⒕'=>'14','⒖'=>'15','⒗'=>'16','⒘'=>'17','⒙'=>'18','⒚'=>'19','⒛'=>'20','⓪'=>'0','⓫'=>'11','⓬'=>'12','⓭'=>'13','⓮'=>'14','⓯'=>'15','⓰'=>'16','⓱'=>'17','⓲'=>'18','⓳'=>'19','⓴'=>'20','⓵'=>'1','⓶'=>'2','⓷'=>'3','⓸'=>'4','⓹'=>'5','⓺'=>'6','⓻'=>'7','⓼'=>'8','⓽'=>'9','⓾'=>'10','⓿'=>'0','❶'=>'1','❷'=>'2','❸'=>'3','❹'=>'4','❺'=>'5','❻'=>'6','❼'=>'7','❽'=>'8','❾'=>'9','❿'=>'10','➀'=>'1','➁'=>'2','➂'=>'3','➃'=>'4','➄'=>'5','➅'=>'6','➆'=>'7','➇'=>'8','➈'=>'9','➉'=>'10','➊'=>'1','➋'=>'2','➌'=>'3','➍'=>'4','➎'=>'5','➏'=>'6','➐'=>'7','➑'=>'8','➒'=>'9','➓'=>'10');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/search_indexer_448.php b/phpBB/includes/utf/data/search_indexer_448.php
deleted file mode 100644
index 32ac28a549..0000000000
--- a/phpBB/includes/utf/data/search_indexer_448.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('󠄀'=>'󠄀','󠄁'=>'󠄁','󠄂'=>'󠄂','󠄃'=>'󠄃','󠄄'=>'󠄄','󠄅'=>'󠄅','󠄆'=>'󠄆','󠄇'=>'󠄇','󠄈'=>'󠄈','󠄉'=>'󠄉','󠄊'=>'󠄊','󠄋'=>'󠄋','󠄌'=>'󠄌','󠄍'=>'󠄍','󠄎'=>'󠄎','󠄏'=>'󠄏','󠄐'=>'󠄐','󠄑'=>'󠄑','󠄒'=>'󠄒','󠄓'=>'󠄓','󠄔'=>'󠄔','󠄕'=>'󠄕','󠄖'=>'󠄖','󠄗'=>'󠄗','󠄘'=>'󠄘','󠄙'=>'󠄙','󠄚'=>'󠄚','󠄛'=>'󠄛','󠄜'=>'󠄜','󠄝'=>'󠄝','󠄞'=>'󠄞','󠄟'=>'󠄟','󠄠'=>'󠄠','󠄡'=>'󠄡','󠄢'=>'󠄢','󠄣'=>'󠄣','󠄤'=>'󠄤','󠄥'=>'󠄥','󠄦'=>'󠄦','󠄧'=>'󠄧','󠄨'=>'󠄨','󠄩'=>'󠄩','󠄪'=>'󠄪','󠄫'=>'󠄫','󠄬'=>'󠄬','󠄭'=>'󠄭','󠄮'=>'󠄮','󠄯'=>'󠄯','󠄰'=>'󠄰','󠄱'=>'󠄱','󠄲'=>'󠄲','󠄳'=>'󠄳','󠄴'=>'󠄴','󠄵'=>'󠄵','󠄶'=>'󠄶','󠄷'=>'󠄷','󠄸'=>'󠄸','󠄹'=>'󠄹','󠄺'=>'󠄺','󠄻'=>'󠄻','󠄼'=>'󠄼','󠄽'=>'󠄽','󠄾'=>'󠄾','󠄿'=>'󠄿','󠅀'=>'󠅀','󠅁'=>'󠅁','󠅂'=>'󠅂','󠅃'=>'󠅃','󠅄'=>'󠅄','󠅅'=>'󠅅','󠅆'=>'󠅆','󠅇'=>'󠅇','󠅈'=>'󠅈','󠅉'=>'󠅉','󠅊'=>'󠅊','󠅋'=>'󠅋','󠅌'=>'󠅌','󠅍'=>'󠅍','󠅎'=>'󠅎','󠅏'=>'󠅏','󠅐'=>'󠅐','󠅑'=>'󠅑','󠅒'=>'󠅒','󠅓'=>'󠅓','󠅔'=>'󠅔','󠅕'=>'󠅕','󠅖'=>'󠅖','󠅗'=>'󠅗','󠅘'=>'󠅘','󠅙'=>'󠅙','󠅚'=>'󠅚','󠅛'=>'󠅛','󠅜'=>'󠅜','󠅝'=>'󠅝','󠅞'=>'󠅞','󠅟'=>'󠅟','󠅠'=>'󠅠','󠅡'=>'󠅡','󠅢'=>'󠅢','󠅣'=>'󠅣','󠅤'=>'󠅤','󠅥'=>'󠅥','󠅦'=>'󠅦','󠅧'=>'󠅧','󠅨'=>'󠅨','󠅩'=>'󠅩','󠅪'=>'󠅪','󠅫'=>'󠅫','󠅬'=>'󠅬','󠅭'=>'󠅭','󠅮'=>'󠅮','󠅯'=>'󠅯','󠅰'=>'󠅰','󠅱'=>'󠅱','󠅲'=>'󠅲','󠅳'=>'󠅳','󠅴'=>'󠅴','󠅵'=>'󠅵','󠅶'=>'󠅶','󠅷'=>'󠅷','󠅸'=>'󠅸','󠅹'=>'󠅹','󠅺'=>'󠅺','󠅻'=>'󠅻','󠅼'=>'󠅼','󠅽'=>'󠅽','󠅾'=>'󠅾','󠅿'=>'󠅿','󠆀'=>'󠆀','󠆁'=>'󠆁','󠆂'=>'󠆂','󠆃'=>'󠆃','󠆄'=>'󠆄','󠆅'=>'󠆅','󠆆'=>'󠆆','󠆇'=>'󠆇','󠆈'=>'󠆈','󠆉'=>'󠆉','󠆊'=>'󠆊','󠆋'=>'󠆋','󠆌'=>'󠆌','󠆍'=>'󠆍','󠆎'=>'󠆎','󠆏'=>'󠆏','󠆐'=>'󠆐','󠆑'=>'󠆑','󠆒'=>'󠆒','󠆓'=>'󠆓','󠆔'=>'󠆔','󠆕'=>'󠆕','󠆖'=>'󠆖','󠆗'=>'󠆗','󠆘'=>'󠆘','󠆙'=>'󠆙','󠆚'=>'󠆚','󠆛'=>'󠆛','󠆜'=>'󠆜','󠆝'=>'󠆝','󠆞'=>'󠆞','󠆟'=>'󠆟','󠆠'=>'󠆠','󠆡'=>'󠆡','󠆢'=>'󠆢','󠆣'=>'󠆣','󠆤'=>'󠆤','󠆥'=>'󠆥','󠆦'=>'󠆦','󠆧'=>'󠆧','󠆨'=>'󠆨','󠆩'=>'󠆩','󠆪'=>'󠆪','󠆫'=>'󠆫','󠆬'=>'󠆬','󠆭'=>'󠆭','󠆮'=>'󠆮','󠆯'=>'󠆯','󠆰'=>'󠆰','󠆱'=>'󠆱','󠆲'=>'󠆲','󠆳'=>'󠆳','󠆴'=>'󠆴','󠆵'=>'󠆵','󠆶'=>'󠆶','󠆷'=>'󠆷','󠆸'=>'󠆸','󠆹'=>'󠆹','󠆺'=>'󠆺','󠆻'=>'󠆻','󠆼'=>'󠆼','󠆽'=>'󠆽','󠆾'=>'󠆾','󠆿'=>'󠆿','󠇀'=>'󠇀','󠇁'=>'󠇁','󠇂'=>'󠇂','󠇃'=>'󠇃','󠇄'=>'󠇄','󠇅'=>'󠇅','󠇆'=>'󠇆','󠇇'=>'󠇇','󠇈'=>'󠇈','󠇉'=>'󠇉','󠇊'=>'󠇊','󠇋'=>'󠇋','󠇌'=>'󠇌','󠇍'=>'󠇍','󠇎'=>'󠇎','󠇏'=>'󠇏','󠇐'=>'󠇐','󠇑'=>'󠇑','󠇒'=>'󠇒','󠇓'=>'󠇓','󠇔'=>'󠇔','󠇕'=>'󠇕','󠇖'=>'󠇖','󠇗'=>'󠇗','󠇘'=>'󠇘','󠇙'=>'󠇙','󠇚'=>'󠇚','󠇛'=>'󠇛','󠇜'=>'󠇜','󠇝'=>'󠇝','󠇞'=>'󠇞','󠇟'=>'󠇟','󠇠'=>'󠇠','󠇡'=>'󠇡','󠇢'=>'󠇢','󠇣'=>'󠇣','󠇤'=>'󠇤','󠇥'=>'󠇥','󠇦'=>'󠇦','󠇧'=>'󠇧','󠇨'=>'󠇨','󠇩'=>'󠇩','󠇪'=>'󠇪','󠇫'=>'󠇫','󠇬'=>'󠇬','󠇭'=>'󠇭','󠇮'=>'󠇮','󠇯'=>'󠇯');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/search_indexer_5.php b/phpBB/includes/utf/data/search_indexer_5.php
deleted file mode 100644
index 0f1228a394..0000000000
--- a/phpBB/includes/utf/data/search_indexer_5.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('Ⰰ'=>'ⰰ','Ⰱ'=>'ⰱ','Ⰲ'=>'ⰲ','Ⰳ'=>'ⰳ','Ⰴ'=>'ⰴ','Ⰵ'=>'ⰵ','Ⰶ'=>'ⰶ','Ⰷ'=>'ⰷ','Ⰸ'=>'ⰸ','Ⰹ'=>'ⰹ','Ⰺ'=>'ⰺ','Ⰻ'=>'ⰻ','Ⰼ'=>'ⰼ','Ⰽ'=>'ⰽ','Ⰾ'=>'ⰾ','Ⰿ'=>'ⰿ','Ⱀ'=>'ⱀ','Ⱁ'=>'ⱁ','Ⱂ'=>'ⱂ','Ⱃ'=>'ⱃ','Ⱄ'=>'ⱄ','Ⱅ'=>'ⱅ','Ⱆ'=>'ⱆ','Ⱇ'=>'ⱇ','Ⱈ'=>'ⱈ','Ⱉ'=>'ⱉ','Ⱊ'=>'ⱊ','Ⱋ'=>'ⱋ','Ⱌ'=>'ⱌ','Ⱍ'=>'ⱍ','Ⱎ'=>'ⱎ','Ⱏ'=>'ⱏ','Ⱐ'=>'ⱐ','Ⱑ'=>'ⱑ','Ⱒ'=>'ⱒ','Ⱓ'=>'ⱓ','Ⱔ'=>'ⱔ','Ⱕ'=>'ⱕ','Ⱖ'=>'ⱖ','Ⱗ'=>'ⱗ','Ⱘ'=>'ⱘ','Ⱙ'=>'ⱙ','Ⱚ'=>'ⱚ','Ⱛ'=>'ⱛ','Ⱜ'=>'ⱜ','Ⱝ'=>'ⱝ','Ⱞ'=>'ⱞ','ⰰ'=>'ⰰ','ⰱ'=>'ⰱ','ⰲ'=>'ⰲ','ⰳ'=>'ⰳ','ⰴ'=>'ⰴ','ⰵ'=>'ⰵ','ⰶ'=>'ⰶ','ⰷ'=>'ⰷ','ⰸ'=>'ⰸ','ⰹ'=>'ⰹ','ⰺ'=>'ⰺ','ⰻ'=>'ⰻ','ⰼ'=>'ⰼ','ⰽ'=>'ⰽ','ⰾ'=>'ⰾ','ⰿ'=>'ⰿ','ⱀ'=>'ⱀ','ⱁ'=>'ⱁ','ⱂ'=>'ⱂ','ⱃ'=>'ⱃ','ⱄ'=>'ⱄ','ⱅ'=>'ⱅ','ⱆ'=>'ⱆ','ⱇ'=>'ⱇ','ⱈ'=>'ⱈ','ⱉ'=>'ⱉ','ⱊ'=>'ⱊ','ⱋ'=>'ⱋ','ⱌ'=>'ⱌ','ⱍ'=>'ⱍ','ⱎ'=>'ⱎ','ⱏ'=>'ⱏ','ⱐ'=>'ⱐ','ⱑ'=>'ⱑ','ⱒ'=>'ⱒ','ⱓ'=>'ⱓ','ⱔ'=>'ⱔ','ⱕ'=>'ⱕ','ⱖ'=>'ⱖ','ⱗ'=>'ⱗ','ⱘ'=>'ⱘ','ⱙ'=>'ⱙ','ⱚ'=>'ⱚ','ⱛ'=>'ⱛ','ⱜ'=>'ⱜ','ⱝ'=>'ⱝ','ⱞ'=>'ⱞ','Ⱡ'=>'ⱡ','ⱡ'=>'ⱡ','Ɫ'=>'ɫ','Ᵽ'=>'ᵽ','Ɽ'=>'ɽ','ⱥ'=>'ⱥ','ⱦ'=>'ⱦ','Ⱨ'=>'ⱨ','ⱨ'=>'ⱨ','Ⱪ'=>'ⱪ','ⱪ'=>'ⱪ','Ⱬ'=>'ⱬ','ⱬ'=>'ⱬ','ⱴ'=>'ⱴ','Ⱶ'=>'ⱶ','ⱶ'=>'ⱶ','ⱷ'=>'ⱷ','Ⲁ'=>'ⲁ','ⲁ'=>'ⲁ','Ⲃ'=>'ⲃ','ⲃ'=>'ⲃ','Ⲅ'=>'ⲅ','ⲅ'=>'ⲅ','Ⲇ'=>'ⲇ','ⲇ'=>'ⲇ','Ⲉ'=>'ⲉ','ⲉ'=>'ⲉ','Ⲋ'=>'ⲋ','ⲋ'=>'ⲋ','Ⲍ'=>'ⲍ','ⲍ'=>'ⲍ','Ⲏ'=>'ⲏ','ⲏ'=>'ⲏ','Ⲑ'=>'ⲑ','ⲑ'=>'ⲑ','Ⲓ'=>'ⲓ','ⲓ'=>'ⲓ','Ⲕ'=>'ⲕ','ⲕ'=>'ⲕ','Ⲗ'=>'ⲗ','ⲗ'=>'ⲗ','Ⲙ'=>'ⲙ','ⲙ'=>'ⲙ','Ⲛ'=>'ⲛ','ⲛ'=>'ⲛ','Ⲝ'=>'ⲝ','ⲝ'=>'ⲝ','Ⲟ'=>'ⲟ','ⲟ'=>'ⲟ','Ⲡ'=>'ⲡ','ⲡ'=>'ⲡ','Ⲣ'=>'ⲣ','ⲣ'=>'ⲣ','Ⲥ'=>'ⲥ','ⲥ'=>'ⲥ','Ⲧ'=>'ⲧ','ⲧ'=>'ⲧ','Ⲩ'=>'ⲩ','ⲩ'=>'ⲩ','Ⲫ'=>'ⲫ','ⲫ'=>'ⲫ','Ⲭ'=>'ⲭ','ⲭ'=>'ⲭ','Ⲯ'=>'ⲯ','ⲯ'=>'ⲯ','Ⲱ'=>'ⲱ','ⲱ'=>'ⲱ','Ⲳ'=>'ⲳ','ⲳ'=>'ⲳ','Ⲵ'=>'ⲵ','ⲵ'=>'ⲵ','Ⲷ'=>'ⲷ','ⲷ'=>'ⲷ','Ⲹ'=>'ⲹ','ⲹ'=>'ⲹ','Ⲻ'=>'ⲻ','ⲻ'=>'ⲻ','Ⲽ'=>'ⲽ','ⲽ'=>'ⲽ','Ⲿ'=>'ⲿ','ⲿ'=>'ⲿ','Ⳁ'=>'ⳁ','ⳁ'=>'ⳁ','Ⳃ'=>'ⳃ','ⳃ'=>'ⳃ','Ⳅ'=>'ⳅ','ⳅ'=>'ⳅ','Ⳇ'=>'ⳇ','ⳇ'=>'ⳇ','Ⳉ'=>'ⳉ','ⳉ'=>'ⳉ','Ⳋ'=>'ⳋ','ⳋ'=>'ⳋ','Ⳍ'=>'ⳍ','ⳍ'=>'ⳍ','Ⳏ'=>'ⳏ','ⳏ'=>'ⳏ','Ⳑ'=>'ⳑ','ⳑ'=>'ⳑ','Ⳓ'=>'ⳓ','ⳓ'=>'ⳓ','Ⳕ'=>'ⳕ','ⳕ'=>'ⳕ','Ⳗ'=>'ⳗ','ⳗ'=>'ⳗ','Ⳙ'=>'ⳙ','ⳙ'=>'ⳙ','Ⳛ'=>'ⳛ','ⳛ'=>'ⳛ','Ⳝ'=>'ⳝ','ⳝ'=>'ⳝ','Ⳟ'=>'ⳟ','ⳟ'=>'ⳟ','Ⳡ'=>'ⳡ','ⳡ'=>'ⳡ','Ⳣ'=>'ⳣ','ⳣ'=>'ⳣ','ⳤ'=>'ⳤ','⳽'=>'1/2','ⴀ'=>'ⴀ','ⴁ'=>'ⴁ','ⴂ'=>'ⴂ','ⴃ'=>'ⴃ','ⴄ'=>'ⴄ','ⴅ'=>'ⴅ','ⴆ'=>'ⴆ','ⴇ'=>'ⴇ','ⴈ'=>'ⴈ','ⴉ'=>'ⴉ','ⴊ'=>'ⴊ','ⴋ'=>'ⴋ','ⴌ'=>'ⴌ','ⴍ'=>'ⴍ','ⴎ'=>'ⴎ','ⴏ'=>'ⴏ','ⴐ'=>'ⴐ','ⴑ'=>'ⴑ','ⴒ'=>'ⴒ','ⴓ'=>'ⴓ','ⴔ'=>'ⴔ','ⴕ'=>'ⴕ','ⴖ'=>'ⴖ','ⴗ'=>'ⴗ','ⴘ'=>'ⴘ','ⴙ'=>'ⴙ','ⴚ'=>'ⴚ','ⴛ'=>'ⴛ','ⴜ'=>'ⴜ','ⴝ'=>'ⴝ','ⴞ'=>'ⴞ','ⴟ'=>'ⴟ','ⴠ'=>'ⴠ','ⴡ'=>'ⴡ','ⴢ'=>'ⴢ','ⴣ'=>'ⴣ','ⴤ'=>'ⴤ','ⴥ'=>'ⴥ','ⴰ'=>'ⴰ','ⴱ'=>'ⴱ','ⴲ'=>'ⴲ','ⴳ'=>'ⴳ','ⴴ'=>'ⴴ','ⴵ'=>'ⴵ','ⴶ'=>'ⴶ','ⴷ'=>'ⴷ','ⴸ'=>'ⴸ','ⴹ'=>'ⴹ','ⴺ'=>'ⴺ','ⴻ'=>'ⴻ','ⴼ'=>'ⴼ','ⴽ'=>'ⴽ','ⴾ'=>'ⴾ','ⴿ'=>'ⴿ','ⵀ'=>'ⵀ','ⵁ'=>'ⵁ','ⵂ'=>'ⵂ','ⵃ'=>'ⵃ','ⵄ'=>'ⵄ','ⵅ'=>'ⵅ','ⵆ'=>'ⵆ','ⵇ'=>'ⵇ','ⵈ'=>'ⵈ','ⵉ'=>'ⵉ','ⵊ'=>'ⵊ','ⵋ'=>'ⵋ','ⵌ'=>'ⵌ','ⵍ'=>'ⵍ','ⵎ'=>'ⵎ','ⵏ'=>'ⵏ','ⵐ'=>'ⵐ','ⵑ'=>'ⵑ','ⵒ'=>'ⵒ','ⵓ'=>'ⵓ','ⵔ'=>'ⵔ','ⵕ'=>'ⵕ','ⵖ'=>'ⵖ','ⵗ'=>'ⵗ','ⵘ'=>'ⵘ','ⵙ'=>'ⵙ','ⵚ'=>'ⵚ','ⵛ'=>'ⵛ','ⵜ'=>'ⵜ','ⵝ'=>'ⵝ','ⵞ'=>'ⵞ','ⵟ'=>'ⵟ','ⵠ'=>'ⵠ','ⵡ'=>'ⵡ','ⵢ'=>'ⵢ','ⵣ'=>'ⵣ','ⵤ'=>'ⵤ','ⵥ'=>'ⵥ','ⵯ'=>'ⵯ','ⶀ'=>'ⶀ','ⶁ'=>'ⶁ','ⶂ'=>'ⶂ','ⶃ'=>'ⶃ','ⶄ'=>'ⶄ','ⶅ'=>'ⶅ','ⶆ'=>'ⶆ','ⶇ'=>'ⶇ','ⶈ'=>'ⶈ','ⶉ'=>'ⶉ','ⶊ'=>'ⶊ','ⶋ'=>'ⶋ','ⶌ'=>'ⶌ','ⶍ'=>'ⶍ','ⶎ'=>'ⶎ','ⶏ'=>'ⶏ','ⶐ'=>'ⶐ','ⶑ'=>'ⶑ','ⶒ'=>'ⶒ','ⶓ'=>'ⶓ','ⶔ'=>'ⶔ','ⶕ'=>'ⶕ','ⶖ'=>'ⶖ','ⶠ'=>'ⶠ','ⶡ'=>'ⶡ','ⶢ'=>'ⶢ','ⶣ'=>'ⶣ','ⶤ'=>'ⶤ','ⶥ'=>'ⶥ','ⶦ'=>'ⶦ','ⶨ'=>'ⶨ','ⶩ'=>'ⶩ','ⶪ'=>'ⶪ','ⶫ'=>'ⶫ','ⶬ'=>'ⶬ','ⶭ'=>'ⶭ','ⶮ'=>'ⶮ','ⶰ'=>'ⶰ','ⶱ'=>'ⶱ','ⶲ'=>'ⶲ','ⶳ'=>'ⶳ','ⶴ'=>'ⶴ','ⶵ'=>'ⶵ','ⶶ'=>'ⶶ','ⶸ'=>'ⶸ','ⶹ'=>'ⶹ','ⶺ'=>'ⶺ','ⶻ'=>'ⶻ','ⶼ'=>'ⶼ','ⶽ'=>'ⶽ','ⶾ'=>'ⶾ','ⷀ'=>'ⷀ','ⷁ'=>'ⷁ','ⷂ'=>'ⷂ','ⷃ'=>'ⷃ','ⷄ'=>'ⷄ','ⷅ'=>'ⷅ','ⷆ'=>'ⷆ','ⷈ'=>'ⷈ','ⷉ'=>'ⷉ','ⷊ'=>'ⷊ','ⷋ'=>'ⷋ','ⷌ'=>'ⷌ','ⷍ'=>'ⷍ','ⷎ'=>'ⷎ','ⷐ'=>'ⷐ','ⷑ'=>'ⷑ','ⷒ'=>'ⷒ','ⷓ'=>'ⷓ','ⷔ'=>'ⷔ','ⷕ'=>'ⷕ','ⷖ'=>'ⷖ','ⷘ'=>'ⷘ','ⷙ'=>'ⷙ','ⷚ'=>'ⷚ','ⷛ'=>'ⷛ','ⷜ'=>'ⷜ','ⷝ'=>'ⷝ','ⷞ'=>'ⷞ');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/search_indexer_58.php b/phpBB/includes/utf/data/search_indexer_58.php
deleted file mode 100644
index 8902bc7995..0000000000
--- a/phpBB/includes/utf/data/search_indexer_58.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('𝅥'=>'𝅥','𝅦'=>'𝅦','𝅧'=>'𝅧','𝅨'=>'𝅨','𝅩'=>'𝅩','𝅭'=>'𝅭','𝅮'=>'𝅮','𝅯'=>'𝅯','𝅰'=>'𝅰','𝅱'=>'𝅱','𝅲'=>'𝅲','𝅻'=>'𝅻','𝅼'=>'𝅼','𝅽'=>'𝅽','𝅾'=>'𝅾','𝅿'=>'𝅿','𝆀'=>'𝆀','𝆁'=>'𝆁','𝆂'=>'𝆂','𝆅'=>'𝆅','𝆆'=>'𝆆','𝆇'=>'𝆇','𝆈'=>'𝆈','𝆉'=>'𝆉','𝆊'=>'𝆊','𝆋'=>'𝆋','𝆪'=>'𝆪','𝆫'=>'𝆫','𝆬'=>'𝆬','𝆭'=>'𝆭','𝉂'=>'𝉂','𝉃'=>'𝉃','𝉄'=>'𝉄','𝍠'=>'1','𝍡'=>'2','𝍢'=>'3','𝍣'=>'4','𝍤'=>'5','𝍥'=>'6','𝍦'=>'7','𝍧'=>'8','𝍨'=>'9','𝍩'=>'10','𝍪'=>'20','𝍫'=>'30','𝍬'=>'40','𝍭'=>'50','𝍮'=>'60','𝍯'=>'70','𝍰'=>'80','𝍱'=>'90','𝐀'=>'𝐀','𝐁'=>'𝐁','𝐂'=>'𝐂','𝐃'=>'𝐃','𝐄'=>'𝐄','𝐅'=>'𝐅','𝐆'=>'𝐆','𝐇'=>'𝐇','𝐈'=>'𝐈','𝐉'=>'𝐉','𝐊'=>'𝐊','𝐋'=>'𝐋','𝐌'=>'𝐌','𝐍'=>'𝐍','𝐎'=>'𝐎','𝐏'=>'𝐏','𝐐'=>'𝐐','𝐑'=>'𝐑','𝐒'=>'𝐒','𝐓'=>'𝐓','𝐔'=>'𝐔','𝐕'=>'𝐕','𝐖'=>'𝐖','𝐗'=>'𝐗','𝐘'=>'𝐘','𝐙'=>'𝐙','𝐚'=>'𝐚','𝐛'=>'𝐛','𝐜'=>'𝐜','𝐝'=>'𝐝','𝐞'=>'𝐞','𝐟'=>'𝐟','𝐠'=>'𝐠','𝐡'=>'𝐡','𝐢'=>'𝐢','𝐣'=>'𝐣','𝐤'=>'𝐤','𝐥'=>'𝐥','𝐦'=>'𝐦','𝐧'=>'𝐧','𝐨'=>'𝐨','𝐩'=>'𝐩','𝐪'=>'𝐪','𝐫'=>'𝐫','𝐬'=>'𝐬','𝐭'=>'𝐭','𝐮'=>'𝐮','𝐯'=>'𝐯','𝐰'=>'𝐰','𝐱'=>'𝐱','𝐲'=>'𝐲','𝐳'=>'𝐳','𝐴'=>'𝐴','𝐵'=>'𝐵','𝐶'=>'𝐶','𝐷'=>'𝐷','𝐸'=>'𝐸','𝐹'=>'𝐹','𝐺'=>'𝐺','𝐻'=>'𝐻','𝐼'=>'𝐼','𝐽'=>'𝐽','𝐾'=>'𝐾','𝐿'=>'𝐿','𝑀'=>'𝑀','𝑁'=>'𝑁','𝑂'=>'𝑂','𝑃'=>'𝑃','𝑄'=>'𝑄','𝑅'=>'𝑅','𝑆'=>'𝑆','𝑇'=>'𝑇','𝑈'=>'𝑈','𝑉'=>'𝑉','𝑊'=>'𝑊','𝑋'=>'𝑋','𝑌'=>'𝑌','𝑍'=>'𝑍','𝑎'=>'𝑎','𝑏'=>'𝑏','𝑐'=>'𝑐','𝑑'=>'𝑑','𝑒'=>'𝑒','𝑓'=>'𝑓','𝑔'=>'𝑔','𝑖'=>'𝑖','𝑗'=>'𝑗','𝑘'=>'𝑘','𝑙'=>'𝑙','𝑚'=>'𝑚','𝑛'=>'𝑛','𝑜'=>'𝑜','𝑝'=>'𝑝','𝑞'=>'𝑞','𝑟'=>'𝑟','𝑠'=>'𝑠','𝑡'=>'𝑡','𝑢'=>'𝑢','𝑣'=>'𝑣','𝑤'=>'𝑤','𝑥'=>'𝑥','𝑦'=>'𝑦','𝑧'=>'𝑧','𝑨'=>'𝑨','𝑩'=>'𝑩','𝑪'=>'𝑪','𝑫'=>'𝑫','𝑬'=>'𝑬','𝑭'=>'𝑭','𝑮'=>'𝑮','𝑯'=>'𝑯','𝑰'=>'𝑰','𝑱'=>'𝑱','𝑲'=>'𝑲','𝑳'=>'𝑳','𝑴'=>'𝑴','𝑵'=>'𝑵','𝑶'=>'𝑶','𝑷'=>'𝑷','𝑸'=>'𝑸','𝑹'=>'𝑹','𝑺'=>'𝑺','𝑻'=>'𝑻','𝑼'=>'𝑼','𝑽'=>'𝑽','𝑾'=>'𝑾','𝑿'=>'𝑿','𝒀'=>'𝒀','𝒁'=>'𝒁','𝒂'=>'𝒂','𝒃'=>'𝒃','𝒄'=>'𝒄','𝒅'=>'𝒅','𝒆'=>'𝒆','𝒇'=>'𝒇','𝒈'=>'𝒈','𝒉'=>'𝒉','𝒊'=>'𝒊','𝒋'=>'𝒋','𝒌'=>'𝒌','𝒍'=>'𝒍','𝒎'=>'𝒎','𝒏'=>'𝒏','𝒐'=>'𝒐','𝒑'=>'𝒑','𝒒'=>'𝒒','𝒓'=>'𝒓','𝒔'=>'𝒔','𝒕'=>'𝒕','𝒖'=>'𝒖','𝒗'=>'𝒗','𝒘'=>'𝒘','𝒙'=>'𝒙','𝒚'=>'𝒚','𝒛'=>'𝒛','𝒜'=>'𝒜','𝒞'=>'𝒞','𝒟'=>'𝒟','𝒢'=>'𝒢','𝒥'=>'𝒥','𝒦'=>'𝒦','𝒩'=>'𝒩','𝒪'=>'𝒪','𝒫'=>'𝒫','𝒬'=>'𝒬','𝒮'=>'𝒮','𝒯'=>'𝒯','𝒰'=>'𝒰','𝒱'=>'𝒱','𝒲'=>'𝒲','𝒳'=>'𝒳','𝒴'=>'𝒴','𝒵'=>'𝒵','𝒶'=>'𝒶','𝒷'=>'𝒷','𝒸'=>'𝒸','𝒹'=>'𝒹','𝒻'=>'𝒻','𝒽'=>'𝒽','𝒾'=>'𝒾','𝒿'=>'𝒿','𝓀'=>'𝓀','𝓁'=>'𝓁','𝓂'=>'𝓂','𝓃'=>'𝓃','𝓅'=>'𝓅','𝓆'=>'𝓆','𝓇'=>'𝓇','𝓈'=>'𝓈','𝓉'=>'𝓉','𝓊'=>'𝓊','𝓋'=>'𝓋','𝓌'=>'𝓌','𝓍'=>'𝓍','𝓎'=>'𝓎','𝓏'=>'𝓏','𝓐'=>'𝓐','𝓑'=>'𝓑','𝓒'=>'𝓒','𝓓'=>'𝓓','𝓔'=>'𝓔','𝓕'=>'𝓕','𝓖'=>'𝓖','𝓗'=>'𝓗','𝓘'=>'𝓘','𝓙'=>'𝓙','𝓚'=>'𝓚','𝓛'=>'𝓛','𝓜'=>'𝓜','𝓝'=>'𝓝','𝓞'=>'𝓞','𝓟'=>'𝓟','𝓠'=>'𝓠','𝓡'=>'𝓡','𝓢'=>'𝓢','𝓣'=>'𝓣','𝓤'=>'𝓤','𝓥'=>'𝓥','𝓦'=>'𝓦','𝓧'=>'𝓧','𝓨'=>'𝓨','𝓩'=>'𝓩','𝓪'=>'𝓪','𝓫'=>'𝓫','𝓬'=>'𝓬','𝓭'=>'𝓭','𝓮'=>'𝓮','𝓯'=>'𝓯','𝓰'=>'𝓰','𝓱'=>'𝓱','𝓲'=>'𝓲','𝓳'=>'𝓳','𝓴'=>'𝓴','𝓵'=>'𝓵','𝓶'=>'𝓶','𝓷'=>'𝓷','𝓸'=>'𝓸','𝓹'=>'𝓹','𝓺'=>'𝓺','𝓻'=>'𝓻','𝓼'=>'𝓼','𝓽'=>'𝓽','𝓾'=>'𝓾','𝓿'=>'𝓿','𝔀'=>'𝔀','𝔁'=>'𝔁','𝔂'=>'𝔂','𝔃'=>'𝔃','𝔄'=>'𝔄','𝔅'=>'𝔅','𝔇'=>'𝔇','𝔈'=>'𝔈','𝔉'=>'𝔉','𝔊'=>'𝔊','𝔍'=>'𝔍','𝔎'=>'𝔎','𝔏'=>'𝔏','𝔐'=>'𝔐','𝔑'=>'𝔑','𝔒'=>'𝔒','𝔓'=>'𝔓','𝔔'=>'𝔔','𝔖'=>'𝔖','𝔗'=>'𝔗','𝔘'=>'𝔘','𝔙'=>'𝔙','𝔚'=>'𝔚','𝔛'=>'𝔛','𝔜'=>'𝔜','𝔞'=>'𝔞','𝔟'=>'𝔟','𝔠'=>'𝔠','𝔡'=>'𝔡','𝔢'=>'𝔢','𝔣'=>'𝔣','𝔤'=>'𝔤','𝔥'=>'𝔥','𝔦'=>'𝔦','𝔧'=>'𝔧','𝔨'=>'𝔨','𝔩'=>'𝔩','𝔪'=>'𝔪','𝔫'=>'𝔫','𝔬'=>'𝔬','𝔭'=>'𝔭','𝔮'=>'𝔮','𝔯'=>'𝔯','𝔰'=>'𝔰','𝔱'=>'𝔱','𝔲'=>'𝔲','𝔳'=>'𝔳','𝔴'=>'𝔴','𝔵'=>'𝔵','𝔶'=>'𝔶','𝔷'=>'𝔷','𝔸'=>'𝔸','𝔹'=>'𝔹','𝔻'=>'𝔻','𝔼'=>'𝔼','𝔽'=>'𝔽','𝔾'=>'𝔾','𝕀'=>'𝕀','𝕁'=>'𝕁','𝕂'=>'𝕂','𝕃'=>'𝕃','𝕄'=>'𝕄','𝕆'=>'𝕆','𝕊'=>'𝕊','𝕋'=>'𝕋','𝕌'=>'𝕌','𝕍'=>'𝕍','𝕎'=>'𝕎','𝕏'=>'𝕏','𝕐'=>'𝕐','𝕒'=>'𝕒','𝕓'=>'𝕓','𝕔'=>'𝕔','𝕕'=>'𝕕','𝕖'=>'𝕖','𝕗'=>'𝕗','𝕘'=>'𝕘','𝕙'=>'𝕙','𝕚'=>'𝕚','𝕛'=>'𝕛','𝕜'=>'𝕜','𝕝'=>'𝕝','𝕞'=>'𝕞','𝕟'=>'𝕟','𝕠'=>'𝕠','𝕡'=>'𝕡','𝕢'=>'𝕢','𝕣'=>'𝕣','𝕤'=>'𝕤','𝕥'=>'𝕥','𝕦'=>'𝕦','𝕧'=>'𝕧','𝕨'=>'𝕨','𝕩'=>'𝕩','𝕪'=>'𝕪','𝕫'=>'𝕫','𝕬'=>'𝕬','𝕭'=>'𝕭','𝕮'=>'𝕮','𝕯'=>'𝕯','𝕰'=>'𝕰','𝕱'=>'𝕱','𝕲'=>'𝕲','𝕳'=>'𝕳','𝕴'=>'𝕴','𝕵'=>'𝕵','𝕶'=>'𝕶','𝕷'=>'𝕷','𝕸'=>'𝕸','𝕹'=>'𝕹','𝕺'=>'𝕺','𝕻'=>'𝕻','𝕼'=>'𝕼','𝕽'=>'𝕽','𝕾'=>'𝕾','𝕿'=>'𝕿','𝖀'=>'𝖀','𝖁'=>'𝖁','𝖂'=>'𝖂','𝖃'=>'𝖃','𝖄'=>'𝖄','𝖅'=>'𝖅','𝖆'=>'𝖆','𝖇'=>'𝖇','𝖈'=>'𝖈','𝖉'=>'𝖉','𝖊'=>'𝖊','𝖋'=>'𝖋','𝖌'=>'𝖌','𝖍'=>'𝖍','𝖎'=>'𝖎','𝖏'=>'𝖏','𝖐'=>'𝖐','𝖑'=>'𝖑','𝖒'=>'𝖒','𝖓'=>'𝖓','𝖔'=>'𝖔','𝖕'=>'𝖕','𝖖'=>'𝖖','𝖗'=>'𝖗','𝖘'=>'𝖘','𝖙'=>'𝖙','𝖚'=>'𝖚','𝖛'=>'𝖛','𝖜'=>'𝖜','𝖝'=>'𝖝','𝖞'=>'𝖞','𝖟'=>'𝖟','𝖠'=>'𝖠','𝖡'=>'𝖡','𝖢'=>'𝖢','𝖣'=>'𝖣','𝖤'=>'𝖤','𝖥'=>'𝖥','𝖦'=>'𝖦','𝖧'=>'𝖧','𝖨'=>'𝖨','𝖩'=>'𝖩','𝖪'=>'𝖪','𝖫'=>'𝖫','𝖬'=>'𝖬','𝖭'=>'𝖭','𝖮'=>'𝖮','𝖯'=>'𝖯','𝖰'=>'𝖰','𝖱'=>'𝖱','𝖲'=>'𝖲','𝖳'=>'𝖳','𝖴'=>'𝖴','𝖵'=>'𝖵','𝖶'=>'𝖶','𝖷'=>'𝖷','𝖸'=>'𝖸','𝖹'=>'𝖹','𝖺'=>'𝖺','𝖻'=>'𝖻','𝖼'=>'𝖼','𝖽'=>'𝖽','𝖾'=>'𝖾','𝖿'=>'𝖿','𝗀'=>'𝗀','𝗁'=>'𝗁','𝗂'=>'𝗂','𝗃'=>'𝗃','𝗄'=>'𝗄','𝗅'=>'𝗅','𝗆'=>'𝗆','𝗇'=>'𝗇','𝗈'=>'𝗈','𝗉'=>'𝗉','𝗊'=>'𝗊','𝗋'=>'𝗋','𝗌'=>'𝗌','𝗍'=>'𝗍','𝗎'=>'𝗎','𝗏'=>'𝗏','𝗐'=>'𝗐','𝗑'=>'𝗑','𝗒'=>'𝗒','𝗓'=>'𝗓','𝗔'=>'𝗔','𝗕'=>'𝗕','𝗖'=>'𝗖','𝗗'=>'𝗗','𝗘'=>'𝗘','𝗙'=>'𝗙','𝗚'=>'𝗚','𝗛'=>'𝗛','𝗜'=>'𝗜','𝗝'=>'𝗝','𝗞'=>'𝗞','𝗟'=>'𝗟','𝗠'=>'𝗠','𝗡'=>'𝗡','𝗢'=>'𝗢','𝗣'=>'𝗣','𝗤'=>'𝗤','𝗥'=>'𝗥','𝗦'=>'𝗦','𝗧'=>'𝗧','𝗨'=>'𝗨','𝗩'=>'𝗩','𝗪'=>'𝗪','𝗫'=>'𝗫','𝗬'=>'𝗬','𝗭'=>'𝗭','𝗮'=>'𝗮','𝗯'=>'𝗯','𝗰'=>'𝗰','𝗱'=>'𝗱','𝗲'=>'𝗲','𝗳'=>'𝗳','𝗴'=>'𝗴','𝗵'=>'𝗵','𝗶'=>'𝗶','𝗷'=>'𝗷','𝗸'=>'𝗸','𝗹'=>'𝗹','𝗺'=>'𝗺','𝗻'=>'𝗻','𝗼'=>'𝗼','𝗽'=>'𝗽','𝗾'=>'𝗾','𝗿'=>'𝗿','𝘀'=>'𝘀','𝘁'=>'𝘁','𝘂'=>'𝘂','𝘃'=>'𝘃','𝘄'=>'𝘄','𝘅'=>'𝘅','𝘆'=>'𝘆','𝘇'=>'𝘇','𝘈'=>'𝘈','𝘉'=>'𝘉','𝘊'=>'𝘊','𝘋'=>'𝘋','𝘌'=>'𝘌','𝘍'=>'𝘍','𝘎'=>'𝘎','𝘏'=>'𝘏','𝘐'=>'𝘐','𝘑'=>'𝘑','𝘒'=>'𝘒','𝘓'=>'𝘓','𝘔'=>'𝘔','𝘕'=>'𝘕','𝘖'=>'𝘖','𝘗'=>'𝘗','𝘘'=>'𝘘','𝘙'=>'𝘙','𝘚'=>'𝘚','𝘛'=>'𝘛','𝘜'=>'𝘜','𝘝'=>'𝘝','𝘞'=>'𝘞','𝘟'=>'𝘟','𝘠'=>'𝘠','𝘡'=>'𝘡','𝘢'=>'𝘢','𝘣'=>'𝘣','𝘤'=>'𝘤','𝘥'=>'𝘥','𝘦'=>'𝘦','𝘧'=>'𝘧','𝘨'=>'𝘨','𝘩'=>'𝘩','𝘪'=>'𝘪','𝘫'=>'𝘫','𝘬'=>'𝘬','𝘭'=>'𝘭','𝘮'=>'𝘮','𝘯'=>'𝘯','𝘰'=>'𝘰','𝘱'=>'𝘱','𝘲'=>'𝘲','𝘳'=>'𝘳','𝘴'=>'𝘴','𝘵'=>'𝘵','𝘶'=>'𝘶','𝘷'=>'𝘷','𝘸'=>'𝘸','𝘹'=>'𝘹','𝘺'=>'𝘺','𝘻'=>'𝘻','𝘼'=>'𝘼','𝘽'=>'𝘽','𝘾'=>'𝘾','𝘿'=>'𝘿','𝙀'=>'𝙀','𝙁'=>'𝙁','𝙂'=>'𝙂','𝙃'=>'𝙃','𝙄'=>'𝙄','𝙅'=>'𝙅','𝙆'=>'𝙆','𝙇'=>'𝙇','𝙈'=>'𝙈','𝙉'=>'𝙉','𝙊'=>'𝙊','𝙋'=>'𝙋','𝙌'=>'𝙌','𝙍'=>'𝙍','𝙎'=>'𝙎','𝙏'=>'𝙏','𝙐'=>'𝙐','𝙑'=>'𝙑','𝙒'=>'𝙒','𝙓'=>'𝙓','𝙔'=>'𝙔','𝙕'=>'𝙕','𝙖'=>'𝙖','𝙗'=>'𝙗','𝙘'=>'𝙘','𝙙'=>'𝙙','𝙚'=>'𝙚','𝙛'=>'𝙛','𝙜'=>'𝙜','𝙝'=>'𝙝','𝙞'=>'𝙞','𝙟'=>'𝙟','𝙠'=>'𝙠','𝙡'=>'𝙡','𝙢'=>'𝙢','𝙣'=>'𝙣','𝙤'=>'𝙤','𝙥'=>'𝙥','𝙦'=>'𝙦','𝙧'=>'𝙧','𝙨'=>'𝙨','𝙩'=>'𝙩','𝙪'=>'𝙪','𝙫'=>'𝙫','𝙬'=>'𝙬','𝙭'=>'𝙭','𝙮'=>'𝙮','𝙯'=>'𝙯','𝙰'=>'𝙰','𝙱'=>'𝙱','𝙲'=>'𝙲','𝙳'=>'𝙳','𝙴'=>'𝙴','𝙵'=>'𝙵','𝙶'=>'𝙶','𝙷'=>'𝙷','𝙸'=>'𝙸','𝙹'=>'𝙹','𝙺'=>'𝙺','𝙻'=>'𝙻','𝙼'=>'𝙼','𝙽'=>'𝙽','𝙾'=>'𝙾','𝙿'=>'𝙿','𝚀'=>'𝚀','𝚁'=>'𝚁','𝚂'=>'𝚂','𝚃'=>'𝚃','𝚄'=>'𝚄','𝚅'=>'𝚅','𝚆'=>'𝚆','𝚇'=>'𝚇','𝚈'=>'𝚈','𝚉'=>'𝚉','𝚊'=>'𝚊','𝚋'=>'𝚋','𝚌'=>'𝚌','𝚍'=>'𝚍','𝚎'=>'𝚎','𝚏'=>'𝚏','𝚐'=>'𝚐','𝚑'=>'𝚑','𝚒'=>'𝚒','𝚓'=>'𝚓','𝚔'=>'𝚔','𝚕'=>'𝚕','𝚖'=>'𝚖','𝚗'=>'𝚗','𝚘'=>'𝚘','𝚙'=>'𝚙','𝚚'=>'𝚚','𝚛'=>'𝚛','𝚜'=>'𝚜','𝚝'=>'𝚝','𝚞'=>'𝚞','𝚟'=>'𝚟','𝚠'=>'𝚠','𝚡'=>'𝚡','𝚢'=>'𝚢','𝚣'=>'𝚣','𝚤'=>'𝚤','𝚥'=>'𝚥','𝚨'=>'𝚨','𝚩'=>'𝚩','𝚪'=>'𝚪','𝚫'=>'𝚫','𝚬'=>'𝚬','𝚭'=>'𝚭','𝚮'=>'𝚮','𝚯'=>'𝚯','𝚰'=>'𝚰','𝚱'=>'𝚱','𝚲'=>'𝚲','𝚳'=>'𝚳','𝚴'=>'𝚴','𝚵'=>'𝚵','𝚶'=>'𝚶','𝚷'=>'𝚷','𝚸'=>'𝚸','𝚹'=>'𝚹','𝚺'=>'𝚺','𝚻'=>'𝚻','𝚼'=>'𝚼','𝚽'=>'𝚽','𝚾'=>'𝚾','𝚿'=>'𝚿','𝛀'=>'𝛀','𝛂'=>'𝛂','𝛃'=>'𝛃','𝛄'=>'𝛄','𝛅'=>'𝛅','𝛆'=>'𝛆','𝛇'=>'𝛇','𝛈'=>'𝛈','𝛉'=>'𝛉','𝛊'=>'𝛊','𝛋'=>'𝛋','𝛌'=>'𝛌','𝛍'=>'𝛍','𝛎'=>'𝛎','𝛏'=>'𝛏','𝛐'=>'𝛐','𝛑'=>'𝛑','𝛒'=>'𝛒','𝛓'=>'𝛓','𝛔'=>'𝛔','𝛕'=>'𝛕','𝛖'=>'𝛖','𝛗'=>'𝛗','𝛘'=>'𝛘','𝛙'=>'𝛙','𝛚'=>'𝛚','𝛜'=>'𝛜','𝛝'=>'𝛝','𝛞'=>'𝛞','𝛟'=>'𝛟','𝛠'=>'𝛠','𝛡'=>'𝛡','𝛢'=>'𝛢','𝛣'=>'𝛣','𝛤'=>'𝛤','𝛥'=>'𝛥','𝛦'=>'𝛦','𝛧'=>'𝛧','𝛨'=>'𝛨','𝛩'=>'𝛩','𝛪'=>'𝛪','𝛫'=>'𝛫','𝛬'=>'𝛬','𝛭'=>'𝛭','𝛮'=>'𝛮','𝛯'=>'𝛯','𝛰'=>'𝛰','𝛱'=>'𝛱','𝛲'=>'𝛲','𝛳'=>'𝛳','𝛴'=>'𝛴','𝛵'=>'𝛵','𝛶'=>'𝛶','𝛷'=>'𝛷','𝛸'=>'𝛸','𝛹'=>'𝛹','𝛺'=>'𝛺','𝛼'=>'𝛼','𝛽'=>'𝛽','𝛾'=>'𝛾','𝛿'=>'𝛿','𝜀'=>'𝜀','𝜁'=>'𝜁','𝜂'=>'𝜂','𝜃'=>'𝜃','𝜄'=>'𝜄','𝜅'=>'𝜅','𝜆'=>'𝜆','𝜇'=>'𝜇','𝜈'=>'𝜈','𝜉'=>'𝜉','𝜊'=>'𝜊','𝜋'=>'𝜋','𝜌'=>'𝜌','𝜍'=>'𝜍','𝜎'=>'𝜎','𝜏'=>'𝜏','𝜐'=>'𝜐','𝜑'=>'𝜑','𝜒'=>'𝜒','𝜓'=>'𝜓','𝜔'=>'𝜔','𝜖'=>'𝜖','𝜗'=>'𝜗','𝜘'=>'𝜘','𝜙'=>'𝜙','𝜚'=>'𝜚','𝜛'=>'𝜛','𝜜'=>'𝜜','𝜝'=>'𝜝','𝜞'=>'𝜞','𝜟'=>'𝜟','𝜠'=>'𝜠','𝜡'=>'𝜡','𝜢'=>'𝜢','𝜣'=>'𝜣','𝜤'=>'𝜤','𝜥'=>'𝜥','𝜦'=>'𝜦','𝜧'=>'𝜧','𝜨'=>'𝜨','𝜩'=>'𝜩','𝜪'=>'𝜪','𝜫'=>'𝜫','𝜬'=>'𝜬','𝜭'=>'𝜭','𝜮'=>'𝜮','𝜯'=>'𝜯','𝜰'=>'𝜰','𝜱'=>'𝜱','𝜲'=>'𝜲','𝜳'=>'𝜳','𝜴'=>'𝜴','𝜶'=>'𝜶','𝜷'=>'𝜷','𝜸'=>'𝜸','𝜹'=>'𝜹','𝜺'=>'𝜺','𝜻'=>'𝜻','𝜼'=>'𝜼','𝜽'=>'𝜽','𝜾'=>'𝜾','𝜿'=>'𝜿','𝝀'=>'𝝀','𝝁'=>'𝝁','𝝂'=>'𝝂','𝝃'=>'𝝃','𝝄'=>'𝝄','𝝅'=>'𝝅','𝝆'=>'𝝆','𝝇'=>'𝝇','𝝈'=>'𝝈','𝝉'=>'𝝉','𝝊'=>'𝝊','𝝋'=>'𝝋','𝝌'=>'𝝌','𝝍'=>'𝝍','𝝎'=>'𝝎','𝝐'=>'𝝐','𝝑'=>'𝝑','𝝒'=>'𝝒','𝝓'=>'𝝓','𝝔'=>'𝝔','𝝕'=>'𝝕','𝝖'=>'𝝖','𝝗'=>'𝝗','𝝘'=>'𝝘','𝝙'=>'𝝙','𝝚'=>'𝝚','𝝛'=>'𝝛','𝝜'=>'𝝜','𝝝'=>'𝝝','𝝞'=>'𝝞','𝝟'=>'𝝟','𝝠'=>'𝝠','𝝡'=>'𝝡','𝝢'=>'𝝢','𝝣'=>'𝝣','𝝤'=>'𝝤','𝝥'=>'𝝥','𝝦'=>'𝝦','𝝧'=>'𝝧','𝝨'=>'𝝨','𝝩'=>'𝝩','𝝪'=>'𝝪','𝝫'=>'𝝫','𝝬'=>'𝝬','𝝭'=>'𝝭','𝝮'=>'𝝮','𝝰'=>'𝝰','𝝱'=>'𝝱','𝝲'=>'𝝲','𝝳'=>'𝝳','𝝴'=>'𝝴','𝝵'=>'𝝵','𝝶'=>'𝝶','𝝷'=>'𝝷','𝝸'=>'𝝸','𝝹'=>'𝝹','𝝺'=>'𝝺','𝝻'=>'𝝻','𝝼'=>'𝝼','𝝽'=>'𝝽','𝝾'=>'𝝾','𝝿'=>'𝝿','𝞀'=>'𝞀','𝞁'=>'𝞁','𝞂'=>'𝞂','𝞃'=>'𝞃','𝞄'=>'𝞄','𝞅'=>'𝞅','𝞆'=>'𝞆','𝞇'=>'𝞇','𝞈'=>'𝞈','𝞊'=>'𝞊','𝞋'=>'𝞋','𝞌'=>'𝞌','𝞍'=>'𝞍','𝞎'=>'𝞎','𝞏'=>'𝞏','𝞐'=>'𝞐','𝞑'=>'𝞑','𝞒'=>'𝞒','𝞓'=>'𝞓','𝞔'=>'𝞔','𝞕'=>'𝞕','𝞖'=>'𝞖','𝞗'=>'𝞗','𝞘'=>'𝞘','𝞙'=>'𝞙','𝞚'=>'𝞚','𝞛'=>'𝞛','𝞜'=>'𝞜','𝞝'=>'𝞝','𝞞'=>'𝞞','𝞟'=>'𝞟','𝞠'=>'𝞠','𝞡'=>'𝞡','𝞢'=>'𝞢','𝞣'=>'𝞣','𝞤'=>'𝞤','𝞥'=>'𝞥','𝞦'=>'𝞦','𝞧'=>'𝞧','𝞨'=>'𝞨','𝞪'=>'𝞪','𝞫'=>'𝞫','𝞬'=>'𝞬','𝞭'=>'𝞭','𝞮'=>'𝞮','𝞯'=>'𝞯','𝞰'=>'𝞰','𝞱'=>'𝞱','𝞲'=>'𝞲','𝞳'=>'𝞳','𝞴'=>'𝞴','𝞵'=>'𝞵','𝞶'=>'𝞶','𝞷'=>'𝞷','𝞸'=>'𝞸','𝞹'=>'𝞹','𝞺'=>'𝞺','𝞻'=>'𝞻','𝞼'=>'𝞼','𝞽'=>'𝞽','𝞾'=>'𝞾','𝞿'=>'𝞿','𝟀'=>'𝟀','𝟁'=>'𝟁','𝟂'=>'𝟂','𝟄'=>'𝟄','𝟅'=>'𝟅','𝟆'=>'𝟆','𝟇'=>'𝟇','𝟈'=>'𝟈','𝟉'=>'𝟉','𝟊'=>'𝟊','𝟋'=>'𝟋','𝟎'=>'0','𝟏'=>'1','𝟐'=>'2','𝟑'=>'3','𝟒'=>'4','𝟓'=>'5','𝟔'=>'6','𝟕'=>'7','𝟖'=>'8','𝟗'=>'9','𝟘'=>'0','𝟙'=>'1','𝟚'=>'2','𝟛'=>'3','𝟜'=>'4','𝟝'=>'5','𝟞'=>'6','𝟟'=>'7','𝟠'=>'8','𝟡'=>'9','𝟢'=>'0','𝟣'=>'1','𝟤'=>'2','𝟥'=>'3','𝟦'=>'4','𝟧'=>'5','𝟨'=>'6','𝟩'=>'7','𝟪'=>'8','𝟫'=>'9','𝟬'=>'0','𝟭'=>'1','𝟮'=>'2','𝟯'=>'3','𝟰'=>'4','𝟱'=>'5','𝟲'=>'6','𝟳'=>'7','𝟴'=>'8','𝟵'=>'9','𝟶'=>'0','𝟷'=>'1','𝟸'=>'2','𝟹'=>'3','𝟺'=>'4','𝟻'=>'5','𝟼'=>'6','𝟽'=>'7','𝟾'=>'8','𝟿'=>'9');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/search_indexer_6.php b/phpBB/includes/utf/data/search_indexer_6.php
deleted file mode 100644
index f6d2ac0665..0000000000
--- a/phpBB/includes/utf/data/search_indexer_6.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('々'=>'々','〆'=>'〆','〇'=>'0','〡'=>'1','〢'=>'2','〣'=>'3','〤'=>'4','〥'=>'5','〦'=>'6','〧'=>'7','〨'=>'8','〩'=>'9','〪'=>'〪','〫'=>'〫','〬'=>'〬','〭'=>'〭','〮'=>'〮','〯'=>'〯','〱'=>'〱','〲'=>'〲','〳'=>'〳','〴'=>'〴','〵'=>'〵','〸'=>'10','〹'=>'20','〺'=>'30','〻'=>'〻','〼'=>'〼','ぁ'=>'ぁ','あ'=>'あ','ぃ'=>'ぃ','い'=>'い','ぅ'=>'ぅ','う'=>'う','ぇ'=>'ぇ','え'=>'え','ぉ'=>'ぉ','お'=>'お','か'=>'か','が'=>'が','き'=>'き','ぎ'=>'ぎ','く'=>'く','ぐ'=>'ぐ','け'=>'け','げ'=>'げ','こ'=>'こ','ご'=>'ご','さ'=>'さ','ざ'=>'ざ','し'=>'し','じ'=>'じ','す'=>'す','ず'=>'ず','せ'=>'せ','ぜ'=>'ぜ','そ'=>'そ','ぞ'=>'ぞ','た'=>'た','だ'=>'だ','ち'=>'ち','ぢ'=>'ぢ','っ'=>'っ','つ'=>'つ','づ'=>'づ','て'=>'て','で'=>'で','と'=>'と','ど'=>'ど','な'=>'な','に'=>'に','ぬ'=>'ぬ','ね'=>'ね','の'=>'の','は'=>'は','ば'=>'ば','ぱ'=>'ぱ','ひ'=>'ひ','び'=>'び','ぴ'=>'ぴ','ふ'=>'ふ','ぶ'=>'ぶ','ぷ'=>'ぷ','へ'=>'へ','べ'=>'べ','ぺ'=>'ぺ','ほ'=>'ほ','ぼ'=>'ぼ','ぽ'=>'ぽ','ま'=>'ま','み'=>'み','む'=>'む','め'=>'め','も'=>'も','ゃ'=>'ゃ','や'=>'や','ゅ'=>'ゅ','ゆ'=>'ゆ','ょ'=>'ょ','よ'=>'よ','ら'=>'ら','り'=>'り','る'=>'る','れ'=>'れ','ろ'=>'ろ','ゎ'=>'ゎ','わ'=>'わ','ゐ'=>'ゐ','ゑ'=>'ゑ','を'=>'を','ん'=>'ん','ゔ'=>'ゔ','ゕ'=>'ゕ','ゖ'=>'ゖ','゙'=>'゙','゚'=>'゚','ゝ'=>'ゝ','ゞ'=>'ゞ','ゟ'=>'ゟ','ァ'=>'ァ','ア'=>'ア','ィ'=>'ィ','イ'=>'イ','ゥ'=>'ゥ','ウ'=>'ウ','ェ'=>'ェ','エ'=>'エ','ォ'=>'ォ','オ'=>'オ','カ'=>'カ','ガ'=>'ガ','キ'=>'キ','ギ'=>'ギ','ク'=>'ク','グ'=>'グ','ケ'=>'ケ','ゲ'=>'ゲ','コ'=>'コ','ゴ'=>'ゴ','サ'=>'サ','ザ'=>'ザ','シ'=>'シ','ジ'=>'ジ','ス'=>'ス','ズ'=>'ズ','セ'=>'セ','ゼ'=>'ゼ','ソ'=>'ソ','ゾ'=>'ゾ','タ'=>'タ','ダ'=>'ダ','チ'=>'チ','ヂ'=>'ヂ','ッ'=>'ッ','ツ'=>'ツ','ヅ'=>'ヅ','テ'=>'テ','デ'=>'デ','ト'=>'ト','ド'=>'ド','ナ'=>'ナ','ニ'=>'ニ','ヌ'=>'ヌ','ネ'=>'ネ','ノ'=>'ノ','ハ'=>'ハ','バ'=>'バ','パ'=>'パ','ヒ'=>'ヒ','ビ'=>'ビ','ピ'=>'ピ','フ'=>'フ','ブ'=>'ブ','プ'=>'プ','ヘ'=>'ヘ','ベ'=>'ベ','ペ'=>'ペ','ホ'=>'ホ','ボ'=>'ボ','ポ'=>'ポ','マ'=>'マ','ミ'=>'ミ','ム'=>'ム','メ'=>'メ','モ'=>'モ','ャ'=>'ャ','ヤ'=>'ヤ','ュ'=>'ュ','ユ'=>'ユ','ョ'=>'ョ','ヨ'=>'ヨ','ラ'=>'ラ','リ'=>'リ','ル'=>'ル','レ'=>'レ','ロ'=>'ロ','ヮ'=>'ヮ','ワ'=>'ワ','ヰ'=>'ヰ','ヱ'=>'ヱ','ヲ'=>'ヲ','ン'=>'ン','ヴ'=>'ヴ','ヵ'=>'ヵ','ヶ'=>'ヶ','ヷ'=>'ヷ','ヸ'=>'ヸ','ヹ'=>'ヹ','ヺ'=>'ヺ','ー'=>'ー','ヽ'=>'ヽ','ヾ'=>'ヾ','ヿ'=>'ヿ','ㄅ'=>'ㄅ','ㄆ'=>'ㄆ','ㄇ'=>'ㄇ','ㄈ'=>'ㄈ','ㄉ'=>'ㄉ','ㄊ'=>'ㄊ','ㄋ'=>'ㄋ','ㄌ'=>'ㄌ','ㄍ'=>'ㄍ','ㄎ'=>'ㄎ','ㄏ'=>'ㄏ','ㄐ'=>'ㄐ','ㄑ'=>'ㄑ','ㄒ'=>'ㄒ','ㄓ'=>'ㄓ','ㄔ'=>'ㄔ','ㄕ'=>'ㄕ','ㄖ'=>'ㄖ','ㄗ'=>'ㄗ','ㄘ'=>'ㄘ','ㄙ'=>'ㄙ','ㄚ'=>'ㄚ','ㄛ'=>'ㄛ','ㄜ'=>'ㄜ','ㄝ'=>'ㄝ','ㄞ'=>'ㄞ','ㄟ'=>'ㄟ','ㄠ'=>'ㄠ','ㄡ'=>'ㄡ','ㄢ'=>'ㄢ','ㄣ'=>'ㄣ','ㄤ'=>'ㄤ','ㄥ'=>'ㄥ','ㄦ'=>'ㄦ','ㄧ'=>'ㄧ','ㄨ'=>'ㄨ','ㄩ'=>'ㄩ','ㄪ'=>'ㄪ','ㄫ'=>'ㄫ','ㄬ'=>'ㄬ','ㄱ'=>'ㄱ','ㄲ'=>'ㄲ','ㄳ'=>'ㄳ','ㄴ'=>'ㄴ','ㄵ'=>'ㄵ','ㄶ'=>'ㄶ','ㄷ'=>'ㄷ','ㄸ'=>'ㄸ','ㄹ'=>'ㄹ','ㄺ'=>'ㄺ','ㄻ'=>'ㄻ','ㄼ'=>'ㄼ','ㄽ'=>'ㄽ','ㄾ'=>'ㄾ','ㄿ'=>'ㄿ','ㅀ'=>'ㅀ','ㅁ'=>'ㅁ','ㅂ'=>'ㅂ','ㅃ'=>'ㅃ','ㅄ'=>'ㅄ','ㅅ'=>'ㅅ','ㅆ'=>'ㅆ','ㅇ'=>'ㅇ','ㅈ'=>'ㅈ','ㅉ'=>'ㅉ','ㅊ'=>'ㅊ','ㅋ'=>'ㅋ','ㅌ'=>'ㅌ','ㅍ'=>'ㅍ','ㅎ'=>'ㅎ','ㅏ'=>'ㅏ','ㅐ'=>'ㅐ','ㅑ'=>'ㅑ','ㅒ'=>'ㅒ','ㅓ'=>'ㅓ','ㅔ'=>'ㅔ','ㅕ'=>'ㅕ','ㅖ'=>'ㅖ','ㅗ'=>'ㅗ','ㅘ'=>'ㅘ','ㅙ'=>'ㅙ','ㅚ'=>'ㅚ','ㅛ'=>'ㅛ','ㅜ'=>'ㅜ','ㅝ'=>'ㅝ','ㅞ'=>'ㅞ','ㅟ'=>'ㅟ','ㅠ'=>'ㅠ','ㅡ'=>'ㅡ','ㅢ'=>'ㅢ','ㅣ'=>'ㅣ','ㅤ'=>'ㅤ','ㅥ'=>'ㅥ','ㅦ'=>'ㅦ','ㅧ'=>'ㅧ','ㅨ'=>'ㅨ','ㅩ'=>'ㅩ','ㅪ'=>'ㅪ','ㅫ'=>'ㅫ','ㅬ'=>'ㅬ','ㅭ'=>'ㅭ','ㅮ'=>'ㅮ','ㅯ'=>'ㅯ','ㅰ'=>'ㅰ','ㅱ'=>'ㅱ','ㅲ'=>'ㅲ','ㅳ'=>'ㅳ','ㅴ'=>'ㅴ','ㅵ'=>'ㅵ','ㅶ'=>'ㅶ','ㅷ'=>'ㅷ','ㅸ'=>'ㅸ','ㅹ'=>'ㅹ','ㅺ'=>'ㅺ','ㅻ'=>'ㅻ','ㅼ'=>'ㅼ','ㅽ'=>'ㅽ','ㅾ'=>'ㅾ','ㅿ'=>'ㅿ','ㆀ'=>'ㆀ','ㆁ'=>'ㆁ','ㆂ'=>'ㆂ','ㆃ'=>'ㆃ','ㆄ'=>'ㆄ','ㆅ'=>'ㆅ','ㆆ'=>'ㆆ','ㆇ'=>'ㆇ','ㆈ'=>'ㆈ','ㆉ'=>'ㆉ','ㆊ'=>'ㆊ','ㆋ'=>'ㆋ','ㆌ'=>'ㆌ','ㆍ'=>'ㆍ','ㆎ'=>'ㆎ','㆒'=>'1','㆓'=>'2','㆔'=>'3','㆕'=>'4','ㆠ'=>'ㆠ','ㆡ'=>'ㆡ','ㆢ'=>'ㆢ','ㆣ'=>'ㆣ','ㆤ'=>'ㆤ','ㆥ'=>'ㆥ','ㆦ'=>'ㆦ','ㆧ'=>'ㆧ','ㆨ'=>'ㆨ','ㆩ'=>'ㆩ','ㆪ'=>'ㆪ','ㆫ'=>'ㆫ','ㆬ'=>'ㆬ','ㆭ'=>'ㆭ','ㆮ'=>'ㆮ','ㆯ'=>'ㆯ','ㆰ'=>'ㆰ','ㆱ'=>'ㆱ','ㆲ'=>'ㆲ','ㆳ'=>'ㆳ','ㆴ'=>'ㆴ','ㆵ'=>'ㆵ','ㆶ'=>'ㆶ','ㆷ'=>'ㆷ','ㇰ'=>'ㇰ','ㇱ'=>'ㇱ','ㇲ'=>'ㇲ','ㇳ'=>'ㇳ','ㇴ'=>'ㇴ','ㇵ'=>'ㇵ','ㇶ'=>'ㇶ','ㇷ'=>'ㇷ','ㇸ'=>'ㇸ','ㇹ'=>'ㇹ','ㇺ'=>'ㇺ','ㇻ'=>'ㇻ','ㇼ'=>'ㇼ','ㇽ'=>'ㇽ','ㇾ'=>'ㇾ','ㇿ'=>'ㇿ','㈠'=>'1','㈡'=>'2','㈢'=>'3','㈣'=>'4','㈤'=>'5','㈥'=>'6','㈦'=>'7','㈧'=>'8','㈨'=>'9','㈩'=>'10','㉑'=>'21','㉒'=>'22','㉓'=>'23','㉔'=>'24','㉕'=>'25','㉖'=>'26','㉗'=>'27','㉘'=>'28','㉙'=>'29','㉚'=>'30','㉛'=>'31','㉜'=>'32','㉝'=>'33','㉞'=>'34','㉟'=>'35','㊀'=>'1','㊁'=>'2','㊂'=>'3','㊃'=>'4','㊄'=>'5','㊅'=>'6','㊆'=>'7','㊇'=>'8','㊈'=>'9','㊉'=>'10','㊱'=>'36','㊲'=>'37','㊳'=>'38','㊴'=>'39','㊵'=>'40','㊶'=>'41','㊷'=>'42','㊸'=>'43','㊹'=>'44','㊺'=>'45','㊻'=>'46','㊼'=>'47','㊽'=>'48','㊾'=>'49','㊿'=>'50','㐀'=>'㐀');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/search_indexer_64.php b/phpBB/includes/utf/data/search_indexer_64.php
deleted file mode 100644
index 44d0beb624..0000000000
--- a/phpBB/includes/utf/data/search_indexer_64.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('𠀀'=>'𠀀');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/search_indexer_84.php b/phpBB/includes/utf/data/search_indexer_84.php
deleted file mode 100644
index 5c3f1d54b8..0000000000
--- a/phpBB/includes/utf/data/search_indexer_84.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('𪛖'=>'𪛖');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/search_indexer_9.php b/phpBB/includes/utf/data/search_indexer_9.php
deleted file mode 100644
index bdf188291f..0000000000
--- a/phpBB/includes/utf/data/search_indexer_9.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('䶵'=>'䶵','一'=>'一');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/search_indexer_95.php b/phpBB/includes/utf/data/search_indexer_95.php
deleted file mode 100644
index b0f8eed3aa..0000000000
--- a/phpBB/includes/utf/data/search_indexer_95.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php return array('丽'=>'丽','丸'=>'丸','乁'=>'乁','𠄢'=>'𠄢','你'=>'你','侮'=>'侮','侻'=>'侻','倂'=>'倂','偺'=>'偺','備'=>'備','僧'=>'僧','像'=>'像','㒞'=>'㒞','𠘺'=>'𠘺','免'=>'免','兔'=>'兔','兤'=>'兤','具'=>'具','𠔜'=>'𠔜','㒹'=>'㒹','內'=>'內','再'=>'再','𠕋'=>'𠕋','冗'=>'冗','冤'=>'冤','仌'=>'仌','冬'=>'冬','况'=>'况','𩇟'=>'𩇟','凵'=>'凵','刃'=>'刃','㓟'=>'㓟','刻'=>'刻','剆'=>'剆','割'=>'割','剷'=>'剷','㔕'=>'㔕','勇'=>'勇','勉'=>'勉','勤'=>'勤','勺'=>'勺','包'=>'包','匆'=>'匆','北'=>'北','卉'=>'卉','卑'=>'卑','博'=>'博','即'=>'即','卽'=>'卽','卿'=>'卿','卿'=>'卿','卿'=>'卿','𠨬'=>'𠨬','灰'=>'灰','及'=>'及','叟'=>'叟','𠭣'=>'𠭣','叫'=>'叫','叱'=>'叱','吆'=>'吆','咞'=>'咞','吸'=>'吸','呈'=>'呈','周'=>'周','咢'=>'咢','哶'=>'哶','唐'=>'唐','啓'=>'啓','啣'=>'啣','善'=>'善','善'=>'善','喙'=>'喙','喫'=>'喫','喳'=>'喳','嗂'=>'嗂','圖'=>'圖','嘆'=>'嘆','圗'=>'圗','噑'=>'噑','噴'=>'噴','切'=>'切','壮'=>'壮','城'=>'城','埴'=>'埴','堍'=>'堍','型'=>'型','堲'=>'堲','報'=>'報','墬'=>'墬','𡓤'=>'𡓤','売'=>'売','壷'=>'壷','夆'=>'夆','多'=>'多','夢'=>'夢','奢'=>'奢','𡚨'=>'𡚨','𡛪'=>'𡛪','姬'=>'姬','娛'=>'娛','娧'=>'娧','姘'=>'姘','婦'=>'婦','㛮'=>'㛮','㛼'=>'㛼','嬈'=>'嬈','嬾'=>'嬾','嬾'=>'嬾','𡧈'=>'𡧈','寃'=>'寃','寘'=>'寘','寧'=>'寧','寳'=>'寳','𡬘'=>'𡬘','寿'=>'寿','将'=>'将','当'=>'当','尢'=>'尢','㞁'=>'㞁','屠'=>'屠','屮'=>'屮','峀'=>'峀','岍'=>'岍','𡷤'=>'𡷤','嵃'=>'嵃','𡷦'=>'𡷦','嵮'=>'嵮','嵫'=>'嵫','嵼'=>'嵼','巡'=>'巡','巢'=>'巢','㠯'=>'㠯','巽'=>'巽','帨'=>'帨','帽'=>'帽','幩'=>'幩','㡢'=>'㡢','𢆃'=>'𢆃','㡼'=>'㡼','庰'=>'庰','庳'=>'庳','庶'=>'庶','廊'=>'廊','𪎒'=>'𪎒','廾'=>'廾','𢌱'=>'𢌱','𢌱'=>'𢌱','舁'=>'舁','弢'=>'弢','弢'=>'弢','㣇'=>'㣇','𣊸'=>'𣊸','𦇚'=>'𦇚','形'=>'形','彫'=>'彫','㣣'=>'㣣','徚'=>'徚','忍'=>'忍','志'=>'志','忹'=>'忹','悁'=>'悁','㤺'=>'㤺','㤜'=>'㤜','悔'=>'悔','𢛔'=>'𢛔','惇'=>'惇','慈'=>'慈','慌'=>'慌','慎'=>'慎','慌'=>'慌','慺'=>'慺','憎'=>'憎','憲'=>'憲','憤'=>'憤','憯'=>'憯','懞'=>'懞','懲'=>'懲','懶'=>'懶','成'=>'成','戛'=>'戛','扝'=>'扝','抱'=>'抱','拔'=>'拔','捐'=>'捐','𢬌'=>'𢬌','挽'=>'挽','拼'=>'拼','捨'=>'捨','掃'=>'掃','揤'=>'揤','𢯱'=>'𢯱','搢'=>'搢','揅'=>'揅','掩'=>'掩','㨮'=>'㨮','摩'=>'摩','摾'=>'摾','撝'=>'撝','摷'=>'摷','㩬'=>'㩬','敏'=>'敏','敬'=>'敬','𣀊'=>'𣀊','旣'=>'旣','書'=>'書','晉'=>'晉','㬙'=>'㬙','暑'=>'暑','㬈'=>'㬈','㫤'=>'㫤','冒'=>'冒','冕'=>'冕','最'=>'最','暜'=>'暜','肭'=>'肭','䏙'=>'䏙','朗'=>'朗','望'=>'望','朡'=>'朡','杞'=>'杞','杓'=>'杓','𣏃'=>'𣏃','㭉'=>'㭉','柺'=>'柺','枅'=>'枅','桒'=>'桒','梅'=>'梅','𣑭'=>'𣑭','梎'=>'梎','栟'=>'栟','椔'=>'椔','㮝'=>'㮝','楂'=>'楂','榣'=>'榣','槪'=>'槪','檨'=>'檨','𣚣'=>'𣚣','櫛'=>'櫛','㰘'=>'㰘','次'=>'次','𣢧'=>'𣢧','歔'=>'歔','㱎'=>'㱎','歲'=>'歲','殟'=>'殟','殺'=>'殺','殻'=>'殻','𣪍'=>'𣪍','𡴋'=>'𡴋','𣫺'=>'𣫺','汎'=>'汎','𣲼'=>'𣲼','沿'=>'沿','泍'=>'泍','汧'=>'汧','洖'=>'洖','派'=>'派','海'=>'海','流'=>'流','浩'=>'浩','浸'=>'浸','涅'=>'涅','𣴞'=>'𣴞','洴'=>'洴','港'=>'港','湮'=>'湮','㴳'=>'㴳','滋'=>'滋','滇'=>'滇','𣻑'=>'𣻑','淹'=>'淹','潮'=>'潮','𣽞'=>'𣽞','𣾎'=>'𣾎','濆'=>'濆','瀹'=>'瀹','瀞'=>'瀞','瀛'=>'瀛','㶖'=>'㶖','灊'=>'灊','災'=>'災','灷'=>'灷','炭'=>'炭','𠔥'=>'𠔥','煅'=>'煅','𤉣'=>'𤉣','熜'=>'熜','𤎫'=>'𤎫','爨'=>'爨','爵'=>'爵','牐'=>'牐','𤘈'=>'𤘈','犀'=>'犀','犕'=>'犕','𤜵'=>'𤜵','𤠔'=>'𤠔','獺'=>'獺','王'=>'王','㺬'=>'㺬','玥'=>'玥','㺸'=>'㺸','㺸'=>'㺸','瑇'=>'瑇','瑜'=>'瑜','瑱'=>'瑱','璅'=>'璅','瓊'=>'瓊','㼛'=>'㼛','甤'=>'甤','𤰶'=>'𤰶','甾'=>'甾','𤲒'=>'𤲒','異'=>'異','𢆟'=>'𢆟','瘐'=>'瘐','𤾡'=>'𤾡','𤾸'=>'𤾸','𥁄'=>'𥁄','㿼'=>'㿼','䀈'=>'䀈','直'=>'直','𥃳'=>'𥃳','𥃲'=>'𥃲','𥄙'=>'𥄙','𥄳'=>'𥄳','眞'=>'眞','真'=>'真','真'=>'真','睊'=>'睊','䀹'=>'䀹','瞋'=>'瞋','䁆'=>'䁆','䂖'=>'䂖','𥐝'=>'𥐝','硎'=>'硎','碌'=>'碌','磌'=>'磌','䃣'=>'䃣','𥘦'=>'𥘦','祖'=>'祖','𥚚'=>'𥚚','𥛅'=>'𥛅','福'=>'福','秫'=>'秫','䄯'=>'䄯','穀'=>'穀','穊'=>'穊','穏'=>'穏','𥥼'=>'𥥼','𥪧'=>'𥪧','𥪧'=>'𥪧','竮'=>'竮','䈂'=>'䈂','𥮫'=>'𥮫','篆'=>'篆','築'=>'築','䈧'=>'䈧','𥲀'=>'𥲀','糒'=>'糒','䊠'=>'䊠','糨'=>'糨','糣'=>'糣','紀'=>'紀','𥾆'=>'𥾆','絣'=>'絣','䌁'=>'䌁','緇'=>'緇','縂'=>'縂','繅'=>'繅','䌴'=>'䌴','𦈨'=>'𦈨','𦉇'=>'𦉇','䍙'=>'䍙','𦋙'=>'𦋙','罺'=>'罺','𦌾'=>'𦌾','羕'=>'羕','翺'=>'翺','者'=>'者','𦓚'=>'𦓚','𦔣'=>'𦔣','聠'=>'聠','𦖨'=>'𦖨','聰'=>'聰','𣍟'=>'𣍟','䏕'=>'䏕','育'=>'育','脃'=>'脃','䐋'=>'䐋','脾'=>'脾','媵'=>'媵','𦞧'=>'𦞧','𦞵'=>'𦞵','𣎓'=>'𣎓','𣎜'=>'𣎜','舁'=>'舁','舄'=>'舄','辞'=>'辞','䑫'=>'䑫','芑'=>'芑','芋'=>'芋','芝'=>'芝','劳'=>'劳','花'=>'花','芳'=>'芳','芽'=>'芽','苦'=>'苦','𦬼'=>'𦬼','若'=>'若','茝'=>'茝','荣'=>'荣','莭'=>'莭','茣'=>'茣','莽'=>'莽','菧'=>'菧','著'=>'著','荓'=>'荓','菊'=>'菊','菌'=>'菌','菜'=>'菜','𦰶'=>'𦰶','𦵫'=>'𦵫','𦳕'=>'𦳕','䔫'=>'䔫','蓱'=>'蓱','蓳'=>'蓳','蔖'=>'蔖','𧏊'=>'𧏊','蕤'=>'蕤','𦼬'=>'𦼬','䕝'=>'䕝','䕡'=>'䕡','𦾱'=>'𦾱','𧃒'=>'𧃒','䕫'=>'䕫','虐'=>'虐','虜'=>'虜','虧'=>'虧','虩'=>'虩','蚩'=>'蚩','蚈'=>'蚈','蜎'=>'蜎','蛢'=>'蛢','蝹'=>'蝹','蜨'=>'蜨','蝫'=>'蝫','螆'=>'螆','䗗'=>'䗗','蟡'=>'蟡','蠁'=>'蠁','䗹'=>'䗹','衠'=>'衠','衣'=>'衣','𧙧'=>'𧙧','裗'=>'裗','裞'=>'裞','䘵'=>'䘵','裺'=>'裺','㒻'=>'㒻','𧢮'=>'𧢮','𧥦'=>'𧥦','䚾'=>'䚾','䛇'=>'䛇','誠'=>'誠','諭'=>'諭','變'=>'變','豕'=>'豕','𧲨'=>'𧲨','貫'=>'貫','賁'=>'賁','贛'=>'贛','起'=>'起','𧼯'=>'𧼯','𠠄'=>'𠠄','跋'=>'跋','趼'=>'趼','跰'=>'跰','𠣞'=>'𠣞','軔'=>'軔','輸'=>'輸','𨗒'=>'𨗒','𨗭'=>'𨗭','邔'=>'邔','郱'=>'郱','鄑'=>'鄑','𨜮'=>'𨜮','鄛'=>'鄛','鈸'=>'鈸','鋗'=>'鋗','鋘'=>'鋘','鉼'=>'鉼','鏹'=>'鏹','鐕'=>'鐕','𨯺'=>'𨯺','開'=>'開','䦕'=>'䦕','閷'=>'閷','𨵷'=>'𨵷','䧦'=>'䧦','雃'=>'雃','嶲'=>'嶲','霣'=>'霣','𩅅'=>'𩅅','𩈚'=>'𩈚','䩮'=>'䩮','䩶'=>'䩶','韠'=>'韠','𩐊'=>'𩐊','䪲'=>'䪲','𩒖'=>'𩒖','頋'=>'頋','頋'=>'頋','頩'=>'頩','𩖶'=>'𩖶','飢'=>'飢','䬳'=>'䬳','餩'=>'餩','馧'=>'馧','駂'=>'駂','駾'=>'駾','䯎'=>'䯎','𩬰'=>'𩬰','鬒'=>'鬒','鱀'=>'鱀','鳽'=>'鳽','䳎'=>'䳎','䳭'=>'䳭','鵧'=>'鵧','𪃎'=>'𪃎','䳸'=>'䳸','𪄅'=>'𪄅','𪈎'=>'𪈎','𪊑'=>'𪊑','麻'=>'麻','䵖'=>'䵖','黹'=>'黹','黾'=>'黾','鼅'=>'鼅','鼏'=>'鼏','鼖'=>'鼖','鼻'=>'鼻','𪘀'=>'𪘀');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/utf_canonical_comp.php b/phpBB/includes/utf/data/utf_canonical_comp.php
deleted file mode 100644
index a3ed3ee602..0000000000
--- a/phpBB/includes/utf/data/utf_canonical_comp.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-$GLOBALS['utf_canonical_comp']=array('À'=>'À','Á'=>'Á','Â'=>'Â','Ã'=>'Ã','Ä'=>'Ä','Å'=>'Å','Ç'=>'Ç','È'=>'È','É'=>'É','Ê'=>'Ê','Ë'=>'Ë','Ì'=>'Ì','Í'=>'Í','Î'=>'Î','Ï'=>'Ï','Ñ'=>'Ñ','Ò'=>'Ò','Ó'=>'Ó','Ô'=>'Ô','Õ'=>'Õ','Ö'=>'Ö','Ù'=>'Ù','Ú'=>'Ú','Û'=>'Û','Ü'=>'Ü','Ý'=>'Ý','à'=>'à','á'=>'á','â'=>'â','ã'=>'ã','ä'=>'ä','å'=>'å','ç'=>'ç','è'=>'è','é'=>'é','ê'=>'ê','ë'=>'ë','ì'=>'ì','í'=>'í','î'=>'î','ï'=>'ï','ñ'=>'ñ','ò'=>'ò','ó'=>'ó','ô'=>'ô','õ'=>'õ','ö'=>'ö','ù'=>'ù','ú'=>'ú','û'=>'û','ü'=>'ü','ý'=>'ý','ÿ'=>'ÿ','Ā'=>'Ā','ā'=>'ā','Ă'=>'Ă','ă'=>'ă','Ą'=>'Ą','ą'=>'ą','Ć'=>'Ć','ć'=>'ć','Ĉ'=>'Ĉ','ĉ'=>'ĉ','Ċ'=>'Ċ','ċ'=>'ċ','Č'=>'Č','č'=>'č','Ď'=>'Ď','ď'=>'ď','Ē'=>'Ē','ē'=>'ē','Ĕ'=>'Ĕ','ĕ'=>'ĕ','Ė'=>'Ė','ė'=>'ė','Ę'=>'Ę','ę'=>'ę','Ě'=>'Ě','ě'=>'ě','Ĝ'=>'Ĝ','ĝ'=>'ĝ','Ğ'=>'Ğ','ğ'=>'ğ','Ġ'=>'Ġ','ġ'=>'ġ','Ģ'=>'Ģ','ģ'=>'ģ','Ĥ'=>'Ĥ','ĥ'=>'ĥ','Ĩ'=>'Ĩ','ĩ'=>'ĩ','Ī'=>'Ī','ī'=>'ī','Ĭ'=>'Ĭ','ĭ'=>'ĭ','Į'=>'Į','į'=>'į','İ'=>'İ','Ĵ'=>'Ĵ','ĵ'=>'ĵ','Ķ'=>'Ķ','ķ'=>'ķ','Ĺ'=>'Ĺ','ĺ'=>'ĺ','Ļ'=>'Ļ','ļ'=>'ļ','Ľ'=>'Ľ','ľ'=>'ľ','Ń'=>'Ń','ń'=>'ń','Ņ'=>'Ņ','ņ'=>'ņ','Ň'=>'Ň','ň'=>'ň','Ō'=>'Ō','ō'=>'ō','Ŏ'=>'Ŏ','ŏ'=>'ŏ','Ő'=>'Ő','ő'=>'ő','Ŕ'=>'Ŕ','ŕ'=>'ŕ','Ŗ'=>'Ŗ','ŗ'=>'ŗ','Ř'=>'Ř','ř'=>'ř','Ś'=>'Ś','ś'=>'ś','Ŝ'=>'Ŝ','ŝ'=>'ŝ','Ş'=>'Ş','ş'=>'ş','Š'=>'Š','š'=>'š','Ţ'=>'Ţ','ţ'=>'ţ','Ť'=>'Ť','ť'=>'ť','Ũ'=>'Ũ','ũ'=>'ũ','Ū'=>'Ū','ū'=>'ū','Ŭ'=>'Ŭ','ŭ'=>'ŭ','Ů'=>'Ů','ů'=>'ů','Ű'=>'Ű','ű'=>'ű','Ų'=>'Ų','ų'=>'ų','Ŵ'=>'Ŵ','ŵ'=>'ŵ','Ŷ'=>'Ŷ','ŷ'=>'ŷ','Ÿ'=>'Ÿ','Ź'=>'Ź','ź'=>'ź','Ż'=>'Ż','ż'=>'ż','Ž'=>'Ž','ž'=>'ž','Ơ'=>'Ơ','ơ'=>'ơ','Ư'=>'Ư','ư'=>'ư','Ǎ'=>'Ǎ','ǎ'=>'ǎ','Ǐ'=>'Ǐ','ǐ'=>'ǐ','Ǒ'=>'Ǒ','ǒ'=>'ǒ','Ǔ'=>'Ǔ','ǔ'=>'ǔ','Ǖ'=>'Ǖ','ǖ'=>'ǖ','Ǘ'=>'Ǘ','ǘ'=>'ǘ','Ǚ'=>'Ǚ','ǚ'=>'ǚ','Ǜ'=>'Ǜ','ǜ'=>'ǜ','Ǟ'=>'Ǟ','ǟ'=>'ǟ','Ǡ'=>'Ǡ','ǡ'=>'ǡ','Ǣ'=>'Ǣ','ǣ'=>'ǣ','Ǧ'=>'Ǧ','ǧ'=>'ǧ','Ǩ'=>'Ǩ','ǩ'=>'ǩ','Ǫ'=>'Ǫ','ǫ'=>'ǫ','Ǭ'=>'Ǭ','ǭ'=>'ǭ','Ǯ'=>'Ǯ','ǯ'=>'ǯ','ǰ'=>'ǰ','Ǵ'=>'Ǵ','ǵ'=>'ǵ','Ǹ'=>'Ǹ','ǹ'=>'ǹ','Ǻ'=>'Ǻ','ǻ'=>'ǻ','Ǽ'=>'Ǽ','ǽ'=>'ǽ','Ǿ'=>'Ǿ','ǿ'=>'ǿ','Ȁ'=>'Ȁ','ȁ'=>'ȁ','Ȃ'=>'Ȃ','ȃ'=>'ȃ','Ȅ'=>'Ȅ','ȅ'=>'ȅ','Ȇ'=>'Ȇ','ȇ'=>'ȇ','Ȉ'=>'Ȉ','ȉ'=>'ȉ','Ȋ'=>'Ȋ','ȋ'=>'ȋ','Ȍ'=>'Ȍ','ȍ'=>'ȍ','Ȏ'=>'Ȏ','ȏ'=>'ȏ','Ȑ'=>'Ȑ','ȑ'=>'ȑ','Ȓ'=>'Ȓ','ȓ'=>'ȓ','Ȕ'=>'Ȕ','ȕ'=>'ȕ','Ȗ'=>'Ȗ','ȗ'=>'ȗ','Ș'=>'Ș','ș'=>'ș','Ț'=>'Ț','ț'=>'ț','Ȟ'=>'Ȟ','ȟ'=>'ȟ','Ȧ'=>'Ȧ','ȧ'=>'ȧ','Ȩ'=>'Ȩ','ȩ'=>'ȩ','Ȫ'=>'Ȫ','ȫ'=>'ȫ','Ȭ'=>'Ȭ','ȭ'=>'ȭ','Ȯ'=>'Ȯ','ȯ'=>'ȯ','Ȱ'=>'Ȱ','ȱ'=>'ȱ','Ȳ'=>'Ȳ','ȳ'=>'ȳ','̈́'=>'̈́','΅'=>'΅','Ά'=>'Ά','Έ'=>'Έ','Ή'=>'Ή','Ί'=>'Ί','Ό'=>'Ό','Ύ'=>'Ύ','Ώ'=>'Ώ','ΐ'=>'ΐ','Ϊ'=>'Ϊ','Ϋ'=>'Ϋ','ά'=>'ά','έ'=>'έ','ή'=>'ή','ί'=>'ί','ΰ'=>'ΰ','ϊ'=>'ϊ','ϋ'=>'ϋ','ό'=>'ό','ύ'=>'ύ','ώ'=>'ώ','ϓ'=>'ϓ','ϔ'=>'ϔ','Ѐ'=>'Ѐ','Ё'=>'Ё','Ѓ'=>'Ѓ','Ї'=>'Ї','Ќ'=>'Ќ','Ѝ'=>'Ѝ','Ў'=>'Ў','Й'=>'Й','й'=>'й','ѐ'=>'ѐ','ё'=>'ё','ѓ'=>'ѓ','ї'=>'ї','ќ'=>'ќ','ѝ'=>'ѝ','ў'=>'ў','Ѷ'=>'Ѷ','ѷ'=>'ѷ','Ӂ'=>'Ӂ','ӂ'=>'ӂ','Ӑ'=>'Ӑ','ӑ'=>'ӑ','Ӓ'=>'Ӓ','ӓ'=>'ӓ','Ӗ'=>'Ӗ','ӗ'=>'ӗ','Ӛ'=>'Ӛ','ӛ'=>'ӛ','Ӝ'=>'Ӝ','ӝ'=>'ӝ','Ӟ'=>'Ӟ','ӟ'=>'ӟ','Ӣ'=>'Ӣ','ӣ'=>'ӣ','Ӥ'=>'Ӥ','ӥ'=>'ӥ','Ӧ'=>'Ӧ','ӧ'=>'ӧ','Ӫ'=>'Ӫ','ӫ'=>'ӫ','Ӭ'=>'Ӭ','ӭ'=>'ӭ','Ӯ'=>'Ӯ','ӯ'=>'ӯ','Ӱ'=>'Ӱ','ӱ'=>'ӱ','Ӳ'=>'Ӳ','ӳ'=>'ӳ','Ӵ'=>'Ӵ','ӵ'=>'ӵ','Ӹ'=>'Ӹ','ӹ'=>'ӹ','آ'=>'آ','أ'=>'أ','ؤ'=>'ؤ','إ'=>'إ','ئ'=>'ئ','ۀ'=>'ۀ','ۂ'=>'ۂ','ۓ'=>'ۓ','ऩ'=>'ऩ','ऱ'=>'ऱ','ऴ'=>'ऴ','ো'=>'ো','ৌ'=>'ৌ','ୈ'=>'ୈ','ୋ'=>'ୋ','ୌ'=>'ୌ','ஔ'=>'ஔ','ொ'=>'ொ','ோ'=>'ோ','ௌ'=>'ௌ','ై'=>'ై','ೀ'=>'ೀ','ೇ'=>'ೇ','ೈ'=>'ೈ','ೊ'=>'ೊ','ೋ'=>'ೋ','ൊ'=>'ൊ','ോ'=>'ോ','ൌ'=>'ൌ','ේ'=>'ේ','ො'=>'ො','ෝ'=>'ෝ','ෞ'=>'ෞ','ཱི'=>'ཱི','ཱུ'=>'ཱུ','ཱྀ'=>'ཱྀ','ဦ'=>'ဦ','ᬆ'=>'ᬆ','ᬈ'=>'ᬈ','ᬊ'=>'ᬊ','ᬌ'=>'ᬌ','ᬎ'=>'ᬎ','ᬒ'=>'ᬒ','ᬻ'=>'ᬻ','ᬽ'=>'ᬽ','ᭀ'=>'ᭀ','ᭁ'=>'ᭁ','ᭃ'=>'ᭃ','Ḁ'=>'Ḁ','ḁ'=>'ḁ','Ḃ'=>'Ḃ','ḃ'=>'ḃ','Ḅ'=>'Ḅ','ḅ'=>'ḅ','Ḇ'=>'Ḇ','ḇ'=>'ḇ','Ḉ'=>'Ḉ','ḉ'=>'ḉ','Ḋ'=>'Ḋ','ḋ'=>'ḋ','Ḍ'=>'Ḍ','ḍ'=>'ḍ','Ḏ'=>'Ḏ','ḏ'=>'ḏ','Ḑ'=>'Ḑ','ḑ'=>'ḑ','Ḓ'=>'Ḓ','ḓ'=>'ḓ','Ḕ'=>'Ḕ','ḕ'=>'ḕ','Ḗ'=>'Ḗ','ḗ'=>'ḗ','Ḙ'=>'Ḙ','ḙ'=>'ḙ','Ḛ'=>'Ḛ','ḛ'=>'ḛ','Ḝ'=>'Ḝ','ḝ'=>'ḝ','Ḟ'=>'Ḟ','ḟ'=>'ḟ','Ḡ'=>'Ḡ','ḡ'=>'ḡ','Ḣ'=>'Ḣ','ḣ'=>'ḣ','Ḥ'=>'Ḥ','ḥ'=>'ḥ','Ḧ'=>'Ḧ','ḧ'=>'ḧ','Ḩ'=>'Ḩ','ḩ'=>'ḩ','Ḫ'=>'Ḫ','ḫ'=>'ḫ','Ḭ'=>'Ḭ','ḭ'=>'ḭ','Ḯ'=>'Ḯ','ḯ'=>'ḯ','Ḱ'=>'Ḱ','ḱ'=>'ḱ','Ḳ'=>'Ḳ','ḳ'=>'ḳ','Ḵ'=>'Ḵ','ḵ'=>'ḵ','Ḷ'=>'Ḷ','ḷ'=>'ḷ','Ḹ'=>'Ḹ','ḹ'=>'ḹ','Ḻ'=>'Ḻ','ḻ'=>'ḻ','Ḽ'=>'Ḽ','ḽ'=>'ḽ','Ḿ'=>'Ḿ','ḿ'=>'ḿ','Ṁ'=>'Ṁ','ṁ'=>'ṁ','Ṃ'=>'Ṃ','ṃ'=>'ṃ','Ṅ'=>'Ṅ','ṅ'=>'ṅ','Ṇ'=>'Ṇ','ṇ'=>'ṇ','Ṉ'=>'Ṉ','ṉ'=>'ṉ','Ṋ'=>'Ṋ','ṋ'=>'ṋ','Ṍ'=>'Ṍ','ṍ'=>'ṍ','Ṏ'=>'Ṏ','ṏ'=>'ṏ','Ṑ'=>'Ṑ','ṑ'=>'ṑ','Ṓ'=>'Ṓ','ṓ'=>'ṓ','Ṕ'=>'Ṕ','ṕ'=>'ṕ','Ṗ'=>'Ṗ','ṗ'=>'ṗ','Ṙ'=>'Ṙ','ṙ'=>'ṙ','Ṛ'=>'Ṛ','ṛ'=>'ṛ','Ṝ'=>'Ṝ','ṝ'=>'ṝ','Ṟ'=>'Ṟ','ṟ'=>'ṟ','Ṡ'=>'Ṡ','ṡ'=>'ṡ','Ṣ'=>'Ṣ','ṣ'=>'ṣ','Ṥ'=>'Ṥ','ṥ'=>'ṥ','Ṧ'=>'Ṧ','ṧ'=>'ṧ','Ṩ'=>'Ṩ','ṩ'=>'ṩ','Ṫ'=>'Ṫ','ṫ'=>'ṫ','Ṭ'=>'Ṭ','ṭ'=>'ṭ','Ṯ'=>'Ṯ','ṯ'=>'ṯ','Ṱ'=>'Ṱ','ṱ'=>'ṱ','Ṳ'=>'Ṳ','ṳ'=>'ṳ','Ṵ'=>'Ṵ','ṵ'=>'ṵ','Ṷ'=>'Ṷ','ṷ'=>'ṷ','Ṹ'=>'Ṹ','ṹ'=>'ṹ','Ṻ'=>'Ṻ','ṻ'=>'ṻ','Ṽ'=>'Ṽ','ṽ'=>'ṽ','Ṿ'=>'Ṿ','ṿ'=>'ṿ','Ẁ'=>'Ẁ','ẁ'=>'ẁ','Ẃ'=>'Ẃ','ẃ'=>'ẃ','Ẅ'=>'Ẅ','ẅ'=>'ẅ','Ẇ'=>'Ẇ','ẇ'=>'ẇ','Ẉ'=>'Ẉ','ẉ'=>'ẉ','Ẋ'=>'Ẋ','ẋ'=>'ẋ','Ẍ'=>'Ẍ','ẍ'=>'ẍ','Ẏ'=>'Ẏ','ẏ'=>'ẏ','Ẑ'=>'Ẑ','ẑ'=>'ẑ','Ẓ'=>'Ẓ','ẓ'=>'ẓ','Ẕ'=>'Ẕ','ẕ'=>'ẕ','ẖ'=>'ẖ','ẗ'=>'ẗ','ẘ'=>'ẘ','ẙ'=>'ẙ','ẛ'=>'ẛ','Ạ'=>'Ạ','ạ'=>'ạ','Ả'=>'Ả','ả'=>'ả','Ấ'=>'Ấ','ấ'=>'ấ','Ầ'=>'Ầ','ầ'=>'ầ','Ẩ'=>'Ẩ','ẩ'=>'ẩ','Ẫ'=>'Ẫ','ẫ'=>'ẫ','Ậ'=>'Ậ','ậ'=>'ậ','Ắ'=>'Ắ','ắ'=>'ắ','Ằ'=>'Ằ','ằ'=>'ằ','Ẳ'=>'Ẳ','ẳ'=>'ẳ','Ẵ'=>'Ẵ','ẵ'=>'ẵ','Ặ'=>'Ặ','ặ'=>'ặ','Ẹ'=>'Ẹ','ẹ'=>'ẹ','Ẻ'=>'Ẻ','ẻ'=>'ẻ','Ẽ'=>'Ẽ','ẽ'=>'ẽ','Ế'=>'Ế','ế'=>'ế','Ề'=>'Ề','ề'=>'ề','Ể'=>'Ể','ể'=>'ể','Ễ'=>'Ễ','ễ'=>'ễ','Ệ'=>'Ệ','ệ'=>'ệ','Ỉ'=>'Ỉ','ỉ'=>'ỉ','Ị'=>'Ị','ị'=>'ị','Ọ'=>'Ọ','ọ'=>'ọ','Ỏ'=>'Ỏ','ỏ'=>'ỏ','Ố'=>'Ố','ố'=>'ố','Ồ'=>'Ồ','ồ'=>'ồ','Ổ'=>'Ổ','ổ'=>'ổ','Ỗ'=>'Ỗ','ỗ'=>'ỗ','Ộ'=>'Ộ','ộ'=>'ộ','Ớ'=>'Ớ','ớ'=>'ớ','Ờ'=>'Ờ','ờ'=>'ờ','Ở'=>'Ở','ở'=>'ở','Ỡ'=>'Ỡ','ỡ'=>'ỡ','Ợ'=>'Ợ','ợ'=>'ợ','Ụ'=>'Ụ','ụ'=>'ụ','Ủ'=>'Ủ','ủ'=>'ủ','Ứ'=>'Ứ','ứ'=>'ứ','Ừ'=>'Ừ','ừ'=>'ừ','Ử'=>'Ử','ử'=>'ử','Ữ'=>'Ữ','ữ'=>'ữ','Ự'=>'Ự','ự'=>'ự','Ỳ'=>'Ỳ','ỳ'=>'ỳ','Ỵ'=>'Ỵ','ỵ'=>'ỵ','Ỷ'=>'Ỷ','ỷ'=>'ỷ','Ỹ'=>'Ỹ','ỹ'=>'ỹ','ἀ'=>'ἀ','ἁ'=>'ἁ','ἂ'=>'ἂ','ἃ'=>'ἃ','ἄ'=>'ἄ','ἅ'=>'ἅ','ἆ'=>'ἆ','ἇ'=>'ἇ','Ἀ'=>'Ἀ','Ἁ'=>'Ἁ','Ἂ'=>'Ἂ','Ἃ'=>'Ἃ','Ἄ'=>'Ἄ','Ἅ'=>'Ἅ','Ἆ'=>'Ἆ','Ἇ'=>'Ἇ','ἐ'=>'ἐ','ἑ'=>'ἑ','ἒ'=>'ἒ','ἓ'=>'ἓ','ἔ'=>'ἔ','ἕ'=>'ἕ','Ἐ'=>'Ἐ','Ἑ'=>'Ἑ','Ἒ'=>'Ἒ','Ἓ'=>'Ἓ','Ἔ'=>'Ἔ','Ἕ'=>'Ἕ','ἠ'=>'ἠ','ἡ'=>'ἡ','ἢ'=>'ἢ','ἣ'=>'ἣ','ἤ'=>'ἤ','ἥ'=>'ἥ','ἦ'=>'ἦ','ἧ'=>'ἧ','Ἠ'=>'Ἠ','Ἡ'=>'Ἡ','Ἢ'=>'Ἢ','Ἣ'=>'Ἣ','Ἤ'=>'Ἤ','Ἥ'=>'Ἥ','Ἦ'=>'Ἦ','Ἧ'=>'Ἧ','ἰ'=>'ἰ','ἱ'=>'ἱ','ἲ'=>'ἲ','ἳ'=>'ἳ','ἴ'=>'ἴ','ἵ'=>'ἵ','ἶ'=>'ἶ','ἷ'=>'ἷ','Ἰ'=>'Ἰ','Ἱ'=>'Ἱ','Ἲ'=>'Ἲ','Ἳ'=>'Ἳ','Ἴ'=>'Ἴ','Ἵ'=>'Ἵ','Ἶ'=>'Ἶ','Ἷ'=>'Ἷ','ὀ'=>'ὀ','ὁ'=>'ὁ','ὂ'=>'ὂ','ὃ'=>'ὃ','ὄ'=>'ὄ','ὅ'=>'ὅ','Ὀ'=>'Ὀ','Ὁ'=>'Ὁ','Ὂ'=>'Ὂ','Ὃ'=>'Ὃ','Ὄ'=>'Ὄ','Ὅ'=>'Ὅ','ὐ'=>'ὐ','ὑ'=>'ὑ','ὒ'=>'ὒ','ὓ'=>'ὓ','ὔ'=>'ὔ','ὕ'=>'ὕ','ὖ'=>'ὖ','ὗ'=>'ὗ','Ὑ'=>'Ὑ','Ὓ'=>'Ὓ','Ὕ'=>'Ὕ','Ὗ'=>'Ὗ','ὠ'=>'ὠ','ὡ'=>'ὡ','ὢ'=>'ὢ','ὣ'=>'ὣ','ὤ'=>'ὤ','ὥ'=>'ὥ','ὦ'=>'ὦ','ὧ'=>'ὧ','Ὠ'=>'Ὠ','Ὡ'=>'Ὡ','Ὢ'=>'Ὢ','Ὣ'=>'Ὣ','Ὤ'=>'Ὤ','Ὥ'=>'Ὥ','Ὦ'=>'Ὦ','Ὧ'=>'Ὧ','ὰ'=>'ὰ','ὲ'=>'ὲ','ὴ'=>'ὴ','ὶ'=>'ὶ','ὸ'=>'ὸ','ὺ'=>'ὺ','ὼ'=>'ὼ','ᾀ'=>'ᾀ','ᾁ'=>'ᾁ','ᾂ'=>'ᾂ','ᾃ'=>'ᾃ','ᾄ'=>'ᾄ','ᾅ'=>'ᾅ','ᾆ'=>'ᾆ','ᾇ'=>'ᾇ','ᾈ'=>'ᾈ','ᾉ'=>'ᾉ','ᾊ'=>'ᾊ','ᾋ'=>'ᾋ','ᾌ'=>'ᾌ','ᾍ'=>'ᾍ','ᾎ'=>'ᾎ','ᾏ'=>'ᾏ','ᾐ'=>'ᾐ','ᾑ'=>'ᾑ','ᾒ'=>'ᾒ','ᾓ'=>'ᾓ','ᾔ'=>'ᾔ','ᾕ'=>'ᾕ','ᾖ'=>'ᾖ','ᾗ'=>'ᾗ','ᾘ'=>'ᾘ','ᾙ'=>'ᾙ','ᾚ'=>'ᾚ','ᾛ'=>'ᾛ','ᾜ'=>'ᾜ','ᾝ'=>'ᾝ','ᾞ'=>'ᾞ','ᾟ'=>'ᾟ','ᾠ'=>'ᾠ','ᾡ'=>'ᾡ','ᾢ'=>'ᾢ','ᾣ'=>'ᾣ','ᾤ'=>'ᾤ','ᾥ'=>'ᾥ','ᾦ'=>'ᾦ','ᾧ'=>'ᾧ','ᾨ'=>'ᾨ','ᾩ'=>'ᾩ','ᾪ'=>'ᾪ','ᾫ'=>'ᾫ','ᾬ'=>'ᾬ','ᾭ'=>'ᾭ','ᾮ'=>'ᾮ','ᾯ'=>'ᾯ','ᾰ'=>'ᾰ','ᾱ'=>'ᾱ','ᾲ'=>'ᾲ','ᾳ'=>'ᾳ','ᾴ'=>'ᾴ','ᾶ'=>'ᾶ','ᾷ'=>'ᾷ','Ᾰ'=>'Ᾰ','Ᾱ'=>'Ᾱ','Ὰ'=>'Ὰ','ᾼ'=>'ᾼ','῁'=>'῁','ῂ'=>'ῂ','ῃ'=>'ῃ','ῄ'=>'ῄ','ῆ'=>'ῆ','ῇ'=>'ῇ','Ὲ'=>'Ὲ','Ὴ'=>'Ὴ','ῌ'=>'ῌ','῍'=>'῍','῎'=>'῎','῏'=>'῏','ῐ'=>'ῐ','ῑ'=>'ῑ','ῒ'=>'ῒ','ῖ'=>'ῖ','ῗ'=>'ῗ','Ῐ'=>'Ῐ','Ῑ'=>'Ῑ','Ὶ'=>'Ὶ','῝'=>'῝','῞'=>'῞','῟'=>'῟','ῠ'=>'ῠ','ῡ'=>'ῡ','ῢ'=>'ῢ','ῤ'=>'ῤ','ῥ'=>'ῥ','ῦ'=>'ῦ','ῧ'=>'ῧ','Ῠ'=>'Ῠ','Ῡ'=>'Ῡ','Ὺ'=>'Ὺ','Ῥ'=>'Ῥ','῭'=>'῭','ῲ'=>'ῲ','ῳ'=>'ῳ','ῴ'=>'ῴ','ῶ'=>'ῶ','ῷ'=>'ῷ','Ὸ'=>'Ὸ','Ὼ'=>'Ὼ','ῼ'=>'ῼ','↚'=>'↚','↛'=>'↛','↮'=>'↮','⇍'=>'⇍','⇎'=>'⇎','⇏'=>'⇏','∄'=>'∄','∉'=>'∉','∌'=>'∌','∤'=>'∤','∦'=>'∦','≁'=>'≁','≄'=>'≄','≇'=>'≇','≉'=>'≉','≠'=>'≠','≢'=>'≢','≭'=>'≭','≮'=>'≮','≯'=>'≯','≰'=>'≰','≱'=>'≱','≴'=>'≴','≵'=>'≵','≸'=>'≸','≹'=>'≹','⊀'=>'⊀','⊁'=>'⊁','⊄'=>'⊄','⊅'=>'⊅','⊈'=>'⊈','⊉'=>'⊉','⊬'=>'⊬','⊭'=>'⊭','⊮'=>'⊮','⊯'=>'⊯','⋠'=>'⋠','⋡'=>'⋡','⋢'=>'⋢','⋣'=>'⋣','⋪'=>'⋪','⋫'=>'⋫','⋬'=>'⋬','⋭'=>'⋭','が'=>'が','ぎ'=>'ぎ','ぐ'=>'ぐ','げ'=>'げ','ご'=>'ご','ざ'=>'ざ','じ'=>'じ','ず'=>'ず','ぜ'=>'ぜ','ぞ'=>'ぞ','だ'=>'だ','ぢ'=>'ぢ','づ'=>'づ','で'=>'で','ど'=>'ど','ば'=>'ば','ぱ'=>'ぱ','び'=>'び','ぴ'=>'ぴ','ぶ'=>'ぶ','ぷ'=>'ぷ','べ'=>'べ','ぺ'=>'ぺ','ぼ'=>'ぼ','ぽ'=>'ぽ','ゔ'=>'ゔ','ゞ'=>'ゞ','ガ'=>'ガ','ギ'=>'ギ','グ'=>'グ','ゲ'=>'ゲ','ゴ'=>'ゴ','ザ'=>'ザ','ジ'=>'ジ','ズ'=>'ズ','ゼ'=>'ゼ','ゾ'=>'ゾ','ダ'=>'ダ','ヂ'=>'ヂ','ヅ'=>'ヅ','デ'=>'デ','ド'=>'ド','バ'=>'バ','パ'=>'パ','ビ'=>'ビ','ピ'=>'ピ','ブ'=>'ブ','プ'=>'プ','ベ'=>'ベ','ペ'=>'ペ','ボ'=>'ボ','ポ'=>'ポ','ヴ'=>'ヴ','ヷ'=>'ヷ','ヸ'=>'ヸ','ヹ'=>'ヹ','ヺ'=>'ヺ','ヾ'=>'ヾ');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/utf_canonical_decomp.php b/phpBB/includes/utf/data/utf_canonical_decomp.php
deleted file mode 100644
index 460a0cf323..0000000000
--- a/phpBB/includes/utf/data/utf_canonical_decomp.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-$GLOBALS['utf_canonical_decomp']=array('À'=>'À','Á'=>'Á','Â'=>'Â','Ã'=>'Ã','Ä'=>'Ä','Å'=>'Å','Ç'=>'Ç','È'=>'È','É'=>'É','Ê'=>'Ê','Ë'=>'Ë','Ì'=>'Ì','Í'=>'Í','Î'=>'Î','Ï'=>'Ï','Ñ'=>'Ñ','Ò'=>'Ò','Ó'=>'Ó','Ô'=>'Ô','Õ'=>'Õ','Ö'=>'Ö','Ù'=>'Ù','Ú'=>'Ú','Û'=>'Û','Ü'=>'Ü','Ý'=>'Ý','à'=>'à','á'=>'á','â'=>'â','ã'=>'ã','ä'=>'ä','å'=>'å','ç'=>'ç','è'=>'è','é'=>'é','ê'=>'ê','ë'=>'ë','ì'=>'ì','í'=>'í','î'=>'î','ï'=>'ï','ñ'=>'ñ','ò'=>'ò','ó'=>'ó','ô'=>'ô','õ'=>'õ','ö'=>'ö','ù'=>'ù','ú'=>'ú','û'=>'û','ü'=>'ü','ý'=>'ý','ÿ'=>'ÿ','Ā'=>'Ā','ā'=>'ā','Ă'=>'Ă','ă'=>'ă','Ą'=>'Ą','ą'=>'ą','Ć'=>'Ć','ć'=>'ć','Ĉ'=>'Ĉ','ĉ'=>'ĉ','Ċ'=>'Ċ','ċ'=>'ċ','Č'=>'Č','č'=>'č','Ď'=>'Ď','ď'=>'ď','Ē'=>'Ē','ē'=>'ē','Ĕ'=>'Ĕ','ĕ'=>'ĕ','Ė'=>'Ė','ė'=>'ė','Ę'=>'Ę','ę'=>'ę','Ě'=>'Ě','ě'=>'ě','Ĝ'=>'Ĝ','ĝ'=>'ĝ','Ğ'=>'Ğ','ğ'=>'ğ','Ġ'=>'Ġ','ġ'=>'ġ','Ģ'=>'Ģ','ģ'=>'ģ','Ĥ'=>'Ĥ','ĥ'=>'ĥ','Ĩ'=>'Ĩ','ĩ'=>'ĩ','Ī'=>'Ī','ī'=>'ī','Ĭ'=>'Ĭ','ĭ'=>'ĭ','Į'=>'Į','į'=>'į','İ'=>'İ','Ĵ'=>'Ĵ','ĵ'=>'ĵ','Ķ'=>'Ķ','ķ'=>'ķ','Ĺ'=>'Ĺ','ĺ'=>'ĺ','Ļ'=>'Ļ','ļ'=>'ļ','Ľ'=>'Ľ','ľ'=>'ľ','Ń'=>'Ń','ń'=>'ń','Ņ'=>'Ņ','ņ'=>'ņ','Ň'=>'Ň','ň'=>'ň','Ō'=>'Ō','ō'=>'ō','Ŏ'=>'Ŏ','ŏ'=>'ŏ','Ő'=>'Ő','ő'=>'ő','Ŕ'=>'Ŕ','ŕ'=>'ŕ','Ŗ'=>'Ŗ','ŗ'=>'ŗ','Ř'=>'Ř','ř'=>'ř','Ś'=>'Ś','ś'=>'ś','Ŝ'=>'Ŝ','ŝ'=>'ŝ','Ş'=>'Ş','ş'=>'ş','Š'=>'Š','š'=>'š','Ţ'=>'Ţ','ţ'=>'ţ','Ť'=>'Ť','ť'=>'ť','Ũ'=>'Ũ','ũ'=>'ũ','Ū'=>'Ū','ū'=>'ū','Ŭ'=>'Ŭ','ŭ'=>'ŭ','Ů'=>'Ů','ů'=>'ů','Ű'=>'Ű','ű'=>'ű','Ų'=>'Ų','ų'=>'ų','Ŵ'=>'Ŵ','ŵ'=>'ŵ','Ŷ'=>'Ŷ','ŷ'=>'ŷ','Ÿ'=>'Ÿ','Ź'=>'Ź','ź'=>'ź','Ż'=>'Ż','ż'=>'ż','Ž'=>'Ž','ž'=>'ž','Ơ'=>'Ơ','ơ'=>'ơ','Ư'=>'Ư','ư'=>'ư','Ǎ'=>'Ǎ','ǎ'=>'ǎ','Ǐ'=>'Ǐ','ǐ'=>'ǐ','Ǒ'=>'Ǒ','ǒ'=>'ǒ','Ǔ'=>'Ǔ','ǔ'=>'ǔ','Ǖ'=>'Ǖ','ǖ'=>'ǖ','Ǘ'=>'Ǘ','ǘ'=>'ǘ','Ǚ'=>'Ǚ','ǚ'=>'ǚ','Ǜ'=>'Ǜ','ǜ'=>'ǜ','Ǟ'=>'Ǟ','ǟ'=>'ǟ','Ǡ'=>'Ǡ','ǡ'=>'ǡ','Ǣ'=>'Ǣ','ǣ'=>'ǣ','Ǧ'=>'Ǧ','ǧ'=>'ǧ','Ǩ'=>'Ǩ','ǩ'=>'ǩ','Ǫ'=>'Ǫ','ǫ'=>'ǫ','Ǭ'=>'Ǭ','ǭ'=>'ǭ','Ǯ'=>'Ǯ','ǯ'=>'ǯ','ǰ'=>'ǰ','Ǵ'=>'Ǵ','ǵ'=>'ǵ','Ǹ'=>'Ǹ','ǹ'=>'ǹ','Ǻ'=>'Ǻ','ǻ'=>'ǻ','Ǽ'=>'Ǽ','ǽ'=>'ǽ','Ǿ'=>'Ǿ','ǿ'=>'ǿ','Ȁ'=>'Ȁ','ȁ'=>'ȁ','Ȃ'=>'Ȃ','ȃ'=>'ȃ','Ȅ'=>'Ȅ','ȅ'=>'ȅ','Ȇ'=>'Ȇ','ȇ'=>'ȇ','Ȉ'=>'Ȉ','ȉ'=>'ȉ','Ȋ'=>'Ȋ','ȋ'=>'ȋ','Ȍ'=>'Ȍ','ȍ'=>'ȍ','Ȏ'=>'Ȏ','ȏ'=>'ȏ','Ȑ'=>'Ȑ','ȑ'=>'ȑ','Ȓ'=>'Ȓ','ȓ'=>'ȓ','Ȕ'=>'Ȕ','ȕ'=>'ȕ','Ȗ'=>'Ȗ','ȗ'=>'ȗ','Ș'=>'Ș','ș'=>'ș','Ț'=>'Ț','ț'=>'ț','Ȟ'=>'Ȟ','ȟ'=>'ȟ','Ȧ'=>'Ȧ','ȧ'=>'ȧ','Ȩ'=>'Ȩ','ȩ'=>'ȩ','Ȫ'=>'Ȫ','ȫ'=>'ȫ','Ȭ'=>'Ȭ','ȭ'=>'ȭ','Ȯ'=>'Ȯ','ȯ'=>'ȯ','Ȱ'=>'Ȱ','ȱ'=>'ȱ','Ȳ'=>'Ȳ','ȳ'=>'ȳ','̀'=>'̀','́'=>'́','̓'=>'̓','̈́'=>'̈́','ʹ'=>'ʹ',';'=>';','΅'=>'΅','Ά'=>'Ά','·'=>'·','Έ'=>'Έ','Ή'=>'Ή','Ί'=>'Ί','Ό'=>'Ό','Ύ'=>'Ύ','Ώ'=>'Ώ','ΐ'=>'ΐ','Ϊ'=>'Ϊ','Ϋ'=>'Ϋ','ά'=>'ά','έ'=>'έ','ή'=>'ή','ί'=>'ί','ΰ'=>'ΰ','ϊ'=>'ϊ','ϋ'=>'ϋ','ό'=>'ό','ύ'=>'ύ','ώ'=>'ώ','ϓ'=>'ϓ','ϔ'=>'ϔ','Ѐ'=>'Ѐ','Ё'=>'Ё','Ѓ'=>'Ѓ','Ї'=>'Ї','Ќ'=>'Ќ','Ѝ'=>'Ѝ','Ў'=>'Ў','Й'=>'Й','й'=>'й','ѐ'=>'ѐ','ё'=>'ё','ѓ'=>'ѓ','ї'=>'ї','ќ'=>'ќ','ѝ'=>'ѝ','ў'=>'ў','Ѷ'=>'Ѷ','ѷ'=>'ѷ','Ӂ'=>'Ӂ','ӂ'=>'ӂ','Ӑ'=>'Ӑ','ӑ'=>'ӑ','Ӓ'=>'Ӓ','ӓ'=>'ӓ','Ӗ'=>'Ӗ','ӗ'=>'ӗ','Ӛ'=>'Ӛ','ӛ'=>'ӛ','Ӝ'=>'Ӝ','ӝ'=>'ӝ','Ӟ'=>'Ӟ','ӟ'=>'ӟ','Ӣ'=>'Ӣ','ӣ'=>'ӣ','Ӥ'=>'Ӥ','ӥ'=>'ӥ','Ӧ'=>'Ӧ','ӧ'=>'ӧ','Ӫ'=>'Ӫ','ӫ'=>'ӫ','Ӭ'=>'Ӭ','ӭ'=>'ӭ','Ӯ'=>'Ӯ','ӯ'=>'ӯ','Ӱ'=>'Ӱ','ӱ'=>'ӱ','Ӳ'=>'Ӳ','ӳ'=>'ӳ','Ӵ'=>'Ӵ','ӵ'=>'ӵ','Ӹ'=>'Ӹ','ӹ'=>'ӹ','آ'=>'آ','أ'=>'أ','ؤ'=>'ؤ','إ'=>'إ','ئ'=>'ئ','ۀ'=>'ۀ','ۂ'=>'ۂ','ۓ'=>'ۓ','ऩ'=>'ऩ','ऱ'=>'ऱ','ऴ'=>'ऴ','क़'=>'क़','ख़'=>'ख़','ग़'=>'ग़','ज़'=>'ज़','ड़'=>'ड़','ढ़'=>'ढ़','फ़'=>'फ़','य़'=>'य़','ো'=>'ো','ৌ'=>'ৌ','ড়'=>'ড়','ঢ়'=>'ঢ়','য়'=>'য়','ਲ਼'=>'ਲ਼','ਸ਼'=>'ਸ਼','ਖ਼'=>'ਖ਼','ਗ਼'=>'ਗ਼','ਜ਼'=>'ਜ਼','ਫ਼'=>'ਫ਼','ୈ'=>'ୈ','ୋ'=>'ୋ','ୌ'=>'ୌ','ଡ଼'=>'ଡ଼','ଢ଼'=>'ଢ଼','ஔ'=>'ஔ','ொ'=>'ொ','ோ'=>'ோ','ௌ'=>'ௌ','ై'=>'ై','ೀ'=>'ೀ','ೇ'=>'ೇ','ೈ'=>'ೈ','ೊ'=>'ೊ','ೋ'=>'ೋ','ൊ'=>'ൊ','ോ'=>'ോ','ൌ'=>'ൌ','ේ'=>'ේ','ො'=>'ො','ෝ'=>'ෝ','ෞ'=>'ෞ','གྷ'=>'གྷ','ཌྷ'=>'ཌྷ','དྷ'=>'དྷ','བྷ'=>'བྷ','ཛྷ'=>'ཛྷ','ཀྵ'=>'ཀྵ','ཱི'=>'ཱི','ཱུ'=>'ཱུ','ྲྀ'=>'ྲྀ','ླྀ'=>'ླྀ','ཱྀ'=>'ཱྀ','ྒྷ'=>'ྒྷ','ྜྷ'=>'ྜྷ','ྡྷ'=>'ྡྷ','ྦྷ'=>'ྦྷ','ྫྷ'=>'ྫྷ','ྐྵ'=>'ྐྵ','ဦ'=>'ဦ','ᬆ'=>'ᬆ','ᬈ'=>'ᬈ','ᬊ'=>'ᬊ','ᬌ'=>'ᬌ','ᬎ'=>'ᬎ','ᬒ'=>'ᬒ','ᬻ'=>'ᬻ','ᬽ'=>'ᬽ','ᭀ'=>'ᭀ','ᭁ'=>'ᭁ','ᭃ'=>'ᭃ','Ḁ'=>'Ḁ','ḁ'=>'ḁ','Ḃ'=>'Ḃ','ḃ'=>'ḃ','Ḅ'=>'Ḅ','ḅ'=>'ḅ','Ḇ'=>'Ḇ','ḇ'=>'ḇ','Ḉ'=>'Ḉ','ḉ'=>'ḉ','Ḋ'=>'Ḋ','ḋ'=>'ḋ','Ḍ'=>'Ḍ','ḍ'=>'ḍ','Ḏ'=>'Ḏ','ḏ'=>'ḏ','Ḑ'=>'Ḑ','ḑ'=>'ḑ','Ḓ'=>'Ḓ','ḓ'=>'ḓ','Ḕ'=>'Ḕ','ḕ'=>'ḕ','Ḗ'=>'Ḗ','ḗ'=>'ḗ','Ḙ'=>'Ḙ','ḙ'=>'ḙ','Ḛ'=>'Ḛ','ḛ'=>'ḛ','Ḝ'=>'Ḝ','ḝ'=>'ḝ','Ḟ'=>'Ḟ','ḟ'=>'ḟ','Ḡ'=>'Ḡ','ḡ'=>'ḡ','Ḣ'=>'Ḣ','ḣ'=>'ḣ','Ḥ'=>'Ḥ','ḥ'=>'ḥ','Ḧ'=>'Ḧ','ḧ'=>'ḧ','Ḩ'=>'Ḩ','ḩ'=>'ḩ','Ḫ'=>'Ḫ','ḫ'=>'ḫ','Ḭ'=>'Ḭ','ḭ'=>'ḭ','Ḯ'=>'Ḯ','ḯ'=>'ḯ','Ḱ'=>'Ḱ','ḱ'=>'ḱ','Ḳ'=>'Ḳ','ḳ'=>'ḳ','Ḵ'=>'Ḵ','ḵ'=>'ḵ','Ḷ'=>'Ḷ','ḷ'=>'ḷ','Ḹ'=>'Ḹ','ḹ'=>'ḹ','Ḻ'=>'Ḻ','ḻ'=>'ḻ','Ḽ'=>'Ḽ','ḽ'=>'ḽ','Ḿ'=>'Ḿ','ḿ'=>'ḿ','Ṁ'=>'Ṁ','ṁ'=>'ṁ','Ṃ'=>'Ṃ','ṃ'=>'ṃ','Ṅ'=>'Ṅ','ṅ'=>'ṅ','Ṇ'=>'Ṇ','ṇ'=>'ṇ','Ṉ'=>'Ṉ','ṉ'=>'ṉ','Ṋ'=>'Ṋ','ṋ'=>'ṋ','Ṍ'=>'Ṍ','ṍ'=>'ṍ','Ṏ'=>'Ṏ','ṏ'=>'ṏ','Ṑ'=>'Ṑ','ṑ'=>'ṑ','Ṓ'=>'Ṓ','ṓ'=>'ṓ','Ṕ'=>'Ṕ','ṕ'=>'ṕ','Ṗ'=>'Ṗ','ṗ'=>'ṗ','Ṙ'=>'Ṙ','ṙ'=>'ṙ','Ṛ'=>'Ṛ','ṛ'=>'ṛ','Ṝ'=>'Ṝ','ṝ'=>'ṝ','Ṟ'=>'Ṟ','ṟ'=>'ṟ','Ṡ'=>'Ṡ','ṡ'=>'ṡ','Ṣ'=>'Ṣ','ṣ'=>'ṣ','Ṥ'=>'Ṥ','ṥ'=>'ṥ','Ṧ'=>'Ṧ','ṧ'=>'ṧ','Ṩ'=>'Ṩ','ṩ'=>'ṩ','Ṫ'=>'Ṫ','ṫ'=>'ṫ','Ṭ'=>'Ṭ','ṭ'=>'ṭ','Ṯ'=>'Ṯ','ṯ'=>'ṯ','Ṱ'=>'Ṱ','ṱ'=>'ṱ','Ṳ'=>'Ṳ','ṳ'=>'ṳ','Ṵ'=>'Ṵ','ṵ'=>'ṵ','Ṷ'=>'Ṷ','ṷ'=>'ṷ','Ṹ'=>'Ṹ','ṹ'=>'ṹ','Ṻ'=>'Ṻ','ṻ'=>'ṻ','Ṽ'=>'Ṽ','ṽ'=>'ṽ','Ṿ'=>'Ṿ','ṿ'=>'ṿ','Ẁ'=>'Ẁ','ẁ'=>'ẁ','Ẃ'=>'Ẃ','ẃ'=>'ẃ','Ẅ'=>'Ẅ','ẅ'=>'ẅ','Ẇ'=>'Ẇ','ẇ'=>'ẇ','Ẉ'=>'Ẉ','ẉ'=>'ẉ','Ẋ'=>'Ẋ','ẋ'=>'ẋ','Ẍ'=>'Ẍ','ẍ'=>'ẍ','Ẏ'=>'Ẏ','ẏ'=>'ẏ','Ẑ'=>'Ẑ','ẑ'=>'ẑ','Ẓ'=>'Ẓ','ẓ'=>'ẓ','Ẕ'=>'Ẕ','ẕ'=>'ẕ','ẖ'=>'ẖ','ẗ'=>'ẗ','ẘ'=>'ẘ','ẙ'=>'ẙ','ẛ'=>'ẛ','Ạ'=>'Ạ','ạ'=>'ạ','Ả'=>'Ả','ả'=>'ả','Ấ'=>'Ấ','ấ'=>'ấ','Ầ'=>'Ầ','ầ'=>'ầ','Ẩ'=>'Ẩ','ẩ'=>'ẩ','Ẫ'=>'Ẫ','ẫ'=>'ẫ','Ậ'=>'Ậ','ậ'=>'ậ','Ắ'=>'Ắ','ắ'=>'ắ','Ằ'=>'Ằ','ằ'=>'ằ','Ẳ'=>'Ẳ','ẳ'=>'ẳ','Ẵ'=>'Ẵ','ẵ'=>'ẵ','Ặ'=>'Ặ','ặ'=>'ặ','Ẹ'=>'Ẹ','ẹ'=>'ẹ','Ẻ'=>'Ẻ','ẻ'=>'ẻ','Ẽ'=>'Ẽ','ẽ'=>'ẽ','Ế'=>'Ế','ế'=>'ế','Ề'=>'Ề','ề'=>'ề','Ể'=>'Ể','ể'=>'ể','Ễ'=>'Ễ','ễ'=>'ễ','Ệ'=>'Ệ','ệ'=>'ệ','Ỉ'=>'Ỉ','ỉ'=>'ỉ','Ị'=>'Ị','ị'=>'ị','Ọ'=>'Ọ','ọ'=>'ọ','Ỏ'=>'Ỏ','ỏ'=>'ỏ','Ố'=>'Ố','ố'=>'ố','Ồ'=>'Ồ','ồ'=>'ồ','Ổ'=>'Ổ','ổ'=>'ổ','Ỗ'=>'Ỗ','ỗ'=>'ỗ','Ộ'=>'Ộ','ộ'=>'ộ','Ớ'=>'Ớ','ớ'=>'ớ','Ờ'=>'Ờ','ờ'=>'ờ','Ở'=>'Ở','ở'=>'ở','Ỡ'=>'Ỡ','ỡ'=>'ỡ','Ợ'=>'Ợ','ợ'=>'ợ','Ụ'=>'Ụ','ụ'=>'ụ','Ủ'=>'Ủ','ủ'=>'ủ','Ứ'=>'Ứ','ứ'=>'ứ','Ừ'=>'Ừ','ừ'=>'ừ','Ử'=>'Ử','ử'=>'ử','Ữ'=>'Ữ','ữ'=>'ữ','Ự'=>'Ự','ự'=>'ự','Ỳ'=>'Ỳ','ỳ'=>'ỳ','Ỵ'=>'Ỵ','ỵ'=>'ỵ','Ỷ'=>'Ỷ','ỷ'=>'ỷ','Ỹ'=>'Ỹ','ỹ'=>'ỹ','ἀ'=>'ἀ','ἁ'=>'ἁ','ἂ'=>'ἂ','ἃ'=>'ἃ','ἄ'=>'ἄ','ἅ'=>'ἅ','ἆ'=>'ἆ','ἇ'=>'ἇ','Ἀ'=>'Ἀ','Ἁ'=>'Ἁ','Ἂ'=>'Ἂ','Ἃ'=>'Ἃ','Ἄ'=>'Ἄ','Ἅ'=>'Ἅ','Ἆ'=>'Ἆ','Ἇ'=>'Ἇ','ἐ'=>'ἐ','ἑ'=>'ἑ','ἒ'=>'ἒ','ἓ'=>'ἓ','ἔ'=>'ἔ','ἕ'=>'ἕ','Ἐ'=>'Ἐ','Ἑ'=>'Ἑ','Ἒ'=>'Ἒ','Ἓ'=>'Ἓ','Ἔ'=>'Ἔ','Ἕ'=>'Ἕ','ἠ'=>'ἠ','ἡ'=>'ἡ','ἢ'=>'ἢ','ἣ'=>'ἣ','ἤ'=>'ἤ','ἥ'=>'ἥ','ἦ'=>'ἦ','ἧ'=>'ἧ','Ἠ'=>'Ἠ','Ἡ'=>'Ἡ','Ἢ'=>'Ἢ','Ἣ'=>'Ἣ','Ἤ'=>'Ἤ','Ἥ'=>'Ἥ','Ἦ'=>'Ἦ','Ἧ'=>'Ἧ','ἰ'=>'ἰ','ἱ'=>'ἱ','ἲ'=>'ἲ','ἳ'=>'ἳ','ἴ'=>'ἴ','ἵ'=>'ἵ','ἶ'=>'ἶ','ἷ'=>'ἷ','Ἰ'=>'Ἰ','Ἱ'=>'Ἱ','Ἲ'=>'Ἲ','Ἳ'=>'Ἳ','Ἴ'=>'Ἴ','Ἵ'=>'Ἵ','Ἶ'=>'Ἶ','Ἷ'=>'Ἷ','ὀ'=>'ὀ','ὁ'=>'ὁ','ὂ'=>'ὂ','ὃ'=>'ὃ','ὄ'=>'ὄ','ὅ'=>'ὅ','Ὀ'=>'Ὀ','Ὁ'=>'Ὁ','Ὂ'=>'Ὂ','Ὃ'=>'Ὃ','Ὄ'=>'Ὄ','Ὅ'=>'Ὅ','ὐ'=>'ὐ','ὑ'=>'ὑ','ὒ'=>'ὒ','ὓ'=>'ὓ','ὔ'=>'ὔ','ὕ'=>'ὕ','ὖ'=>'ὖ','ὗ'=>'ὗ','Ὑ'=>'Ὑ','Ὓ'=>'Ὓ','Ὕ'=>'Ὕ','Ὗ'=>'Ὗ','ὠ'=>'ὠ','ὡ'=>'ὡ','ὢ'=>'ὢ','ὣ'=>'ὣ','ὤ'=>'ὤ','ὥ'=>'ὥ','ὦ'=>'ὦ','ὧ'=>'ὧ','Ὠ'=>'Ὠ','Ὡ'=>'Ὡ','Ὢ'=>'Ὢ','Ὣ'=>'Ὣ','Ὤ'=>'Ὤ','Ὥ'=>'Ὥ','Ὦ'=>'Ὦ','Ὧ'=>'Ὧ','ὰ'=>'ὰ','ά'=>'ά','ὲ'=>'ὲ','έ'=>'έ','ὴ'=>'ὴ','ή'=>'ή','ὶ'=>'ὶ','ί'=>'ί','ὸ'=>'ὸ','ό'=>'ό','ὺ'=>'ὺ','ύ'=>'ύ','ὼ'=>'ὼ','ώ'=>'ώ','ᾀ'=>'ᾀ','ᾁ'=>'ᾁ','ᾂ'=>'ᾂ','ᾃ'=>'ᾃ','ᾄ'=>'ᾄ','ᾅ'=>'ᾅ','ᾆ'=>'ᾆ','ᾇ'=>'ᾇ','ᾈ'=>'ᾈ','ᾉ'=>'ᾉ','ᾊ'=>'ᾊ','ᾋ'=>'ᾋ','ᾌ'=>'ᾌ','ᾍ'=>'ᾍ','ᾎ'=>'ᾎ','ᾏ'=>'ᾏ','ᾐ'=>'ᾐ','ᾑ'=>'ᾑ','ᾒ'=>'ᾒ','ᾓ'=>'ᾓ','ᾔ'=>'ᾔ','ᾕ'=>'ᾕ','ᾖ'=>'ᾖ','ᾗ'=>'ᾗ','ᾘ'=>'ᾘ','ᾙ'=>'ᾙ','ᾚ'=>'ᾚ','ᾛ'=>'ᾛ','ᾜ'=>'ᾜ','ᾝ'=>'ᾝ','ᾞ'=>'ᾞ','ᾟ'=>'ᾟ','ᾠ'=>'ᾠ','ᾡ'=>'ᾡ','ᾢ'=>'ᾢ','ᾣ'=>'ᾣ','ᾤ'=>'ᾤ','ᾥ'=>'ᾥ','ᾦ'=>'ᾦ','ᾧ'=>'ᾧ','ᾨ'=>'ᾨ','ᾩ'=>'ᾩ','ᾪ'=>'ᾪ','ᾫ'=>'ᾫ','ᾬ'=>'ᾬ','ᾭ'=>'ᾭ','ᾮ'=>'ᾮ','ᾯ'=>'ᾯ','ᾰ'=>'ᾰ','ᾱ'=>'ᾱ','ᾲ'=>'ᾲ','ᾳ'=>'ᾳ','ᾴ'=>'ᾴ','ᾶ'=>'ᾶ','ᾷ'=>'ᾷ','Ᾰ'=>'Ᾰ','Ᾱ'=>'Ᾱ','Ὰ'=>'Ὰ','Ά'=>'Ά','ᾼ'=>'ᾼ','ι'=>'ι','῁'=>'῁','ῂ'=>'ῂ','ῃ'=>'ῃ','ῄ'=>'ῄ','ῆ'=>'ῆ','ῇ'=>'ῇ','Ὲ'=>'Ὲ','Έ'=>'Έ','Ὴ'=>'Ὴ','Ή'=>'Ή','ῌ'=>'ῌ','῍'=>'῍','῎'=>'῎','῏'=>'῏','ῐ'=>'ῐ','ῑ'=>'ῑ','ῒ'=>'ῒ','ΐ'=>'ΐ','ῖ'=>'ῖ','ῗ'=>'ῗ','Ῐ'=>'Ῐ','Ῑ'=>'Ῑ','Ὶ'=>'Ὶ','Ί'=>'Ί','῝'=>'῝','῞'=>'῞','῟'=>'῟','ῠ'=>'ῠ','ῡ'=>'ῡ','ῢ'=>'ῢ','ΰ'=>'ΰ','ῤ'=>'ῤ','ῥ'=>'ῥ','ῦ'=>'ῦ','ῧ'=>'ῧ','Ῠ'=>'Ῠ','Ῡ'=>'Ῡ','Ὺ'=>'Ὺ','Ύ'=>'Ύ','Ῥ'=>'Ῥ','῭'=>'῭','΅'=>'΅','`'=>'`','ῲ'=>'ῲ','ῳ'=>'ῳ','ῴ'=>'ῴ','ῶ'=>'ῶ','ῷ'=>'ῷ','Ὸ'=>'Ὸ','Ό'=>'Ό','Ὼ'=>'Ὼ','Ώ'=>'Ώ','ῼ'=>'ῼ','´'=>'´',' '=>' ',' '=>' ','Ω'=>'Ω','K'=>'K','Å'=>'Å','↚'=>'↚','↛'=>'↛','↮'=>'↮','⇍'=>'⇍','⇎'=>'⇎','⇏'=>'⇏','∄'=>'∄','∉'=>'∉','∌'=>'∌','∤'=>'∤','∦'=>'∦','≁'=>'≁','≄'=>'≄','≇'=>'≇','≉'=>'≉','≠'=>'≠','≢'=>'≢','≭'=>'≭','≮'=>'≮','≯'=>'≯','≰'=>'≰','≱'=>'≱','≴'=>'≴','≵'=>'≵','≸'=>'≸','≹'=>'≹','⊀'=>'⊀','⊁'=>'⊁','⊄'=>'⊄','⊅'=>'⊅','⊈'=>'⊈','⊉'=>'⊉','⊬'=>'⊬','⊭'=>'⊭','⊮'=>'⊮','⊯'=>'⊯','⋠'=>'⋠','⋡'=>'⋡','⋢'=>'⋢','⋣'=>'⋣','⋪'=>'⋪','⋫'=>'⋫','⋬'=>'⋬','⋭'=>'⋭','〈'=>'〈','〉'=>'〉','⫝̸'=>'⫝̸','が'=>'が','ぎ'=>'ぎ','ぐ'=>'ぐ','げ'=>'げ','ご'=>'ご','ざ'=>'ざ','じ'=>'じ','ず'=>'ず','ぜ'=>'ぜ','ぞ'=>'ぞ','だ'=>'だ','ぢ'=>'ぢ','づ'=>'づ','で'=>'で','ど'=>'ど','ば'=>'ば','ぱ'=>'ぱ','び'=>'び','ぴ'=>'ぴ','ぶ'=>'ぶ','ぷ'=>'ぷ','べ'=>'べ','ぺ'=>'ぺ','ぼ'=>'ぼ','ぽ'=>'ぽ','ゔ'=>'ゔ','ゞ'=>'ゞ','ガ'=>'ガ','ギ'=>'ギ','グ'=>'グ','ゲ'=>'ゲ','ゴ'=>'ゴ','ザ'=>'ザ','ジ'=>'ジ','ズ'=>'ズ','ゼ'=>'ゼ','ゾ'=>'ゾ','ダ'=>'ダ','ヂ'=>'ヂ','ヅ'=>'ヅ','デ'=>'デ','ド'=>'ド','バ'=>'バ','パ'=>'パ','ビ'=>'ビ','ピ'=>'ピ','ブ'=>'ブ','プ'=>'プ','ベ'=>'ベ','ペ'=>'ペ','ボ'=>'ボ','ポ'=>'ポ','ヴ'=>'ヴ','ヷ'=>'ヷ','ヸ'=>'ヸ','ヹ'=>'ヹ','ヺ'=>'ヺ','ヾ'=>'ヾ','豈'=>'豈','更'=>'更','車'=>'車','賈'=>'賈','滑'=>'滑','串'=>'串','句'=>'句','龜'=>'龜','龜'=>'龜','契'=>'契','金'=>'金','喇'=>'喇','奈'=>'奈','懶'=>'懶','癩'=>'癩','羅'=>'羅','蘿'=>'蘿','螺'=>'螺','裸'=>'裸','邏'=>'邏','樂'=>'樂','洛'=>'洛','烙'=>'烙','珞'=>'珞','落'=>'落','酪'=>'酪','駱'=>'駱','亂'=>'亂','卵'=>'卵','欄'=>'欄','爛'=>'爛','蘭'=>'蘭','鸞'=>'鸞','嵐'=>'嵐','濫'=>'濫','藍'=>'藍','襤'=>'襤','拉'=>'拉','臘'=>'臘','蠟'=>'蠟','廊'=>'廊','朗'=>'朗','浪'=>'浪','狼'=>'狼','郎'=>'郎','來'=>'來','冷'=>'冷','勞'=>'勞','擄'=>'擄','櫓'=>'櫓','爐'=>'爐','盧'=>'盧','老'=>'老','蘆'=>'蘆','虜'=>'虜','路'=>'路','露'=>'露','魯'=>'魯','鷺'=>'鷺','碌'=>'碌','祿'=>'祿','綠'=>'綠','菉'=>'菉','錄'=>'錄','鹿'=>'鹿','論'=>'論','壟'=>'壟','弄'=>'弄','籠'=>'籠','聾'=>'聾','牢'=>'牢','磊'=>'磊','賂'=>'賂','雷'=>'雷','壘'=>'壘','屢'=>'屢','樓'=>'樓','淚'=>'淚','漏'=>'漏','累'=>'累','縷'=>'縷','陋'=>'陋','勒'=>'勒','肋'=>'肋','凜'=>'凜','凌'=>'凌','稜'=>'稜','綾'=>'綾','菱'=>'菱','陵'=>'陵','讀'=>'讀','拏'=>'拏','樂'=>'樂','諾'=>'諾','丹'=>'丹','寧'=>'寧','怒'=>'怒','率'=>'率','異'=>'異','北'=>'北','磻'=>'磻','便'=>'便','復'=>'復','不'=>'不','泌'=>'泌','數'=>'數','索'=>'索','參'=>'參','塞'=>'塞','省'=>'省','葉'=>'葉','說'=>'說','殺'=>'殺','辰'=>'辰','沈'=>'沈','拾'=>'拾','若'=>'若','掠'=>'掠','略'=>'略','亮'=>'亮','兩'=>'兩','凉'=>'凉','梁'=>'梁','糧'=>'糧','良'=>'良','諒'=>'諒','量'=>'量','勵'=>'勵','呂'=>'呂','女'=>'女','廬'=>'廬','旅'=>'旅','濾'=>'濾','礪'=>'礪','閭'=>'閭','驪'=>'驪','麗'=>'麗','黎'=>'黎','力'=>'力','曆'=>'曆','歷'=>'歷','轢'=>'轢','年'=>'年','憐'=>'憐','戀'=>'戀','撚'=>'撚','漣'=>'漣','煉'=>'煉','璉'=>'璉','秊'=>'秊','練'=>'練','聯'=>'聯','輦'=>'輦','蓮'=>'蓮','連'=>'連','鍊'=>'鍊','列'=>'列','劣'=>'劣','咽'=>'咽','烈'=>'烈','裂'=>'裂','說'=>'說','廉'=>'廉','念'=>'念','捻'=>'捻','殮'=>'殮','簾'=>'簾','獵'=>'獵','令'=>'令','囹'=>'囹','寧'=>'寧','嶺'=>'嶺','怜'=>'怜','玲'=>'玲','瑩'=>'瑩','羚'=>'羚','聆'=>'聆','鈴'=>'鈴','零'=>'零','靈'=>'靈','領'=>'領','例'=>'例','禮'=>'禮','醴'=>'醴','隸'=>'隸','惡'=>'惡','了'=>'了','僚'=>'僚','寮'=>'寮','尿'=>'尿','料'=>'料','樂'=>'樂','燎'=>'燎','療'=>'療','蓼'=>'蓼','遼'=>'遼','龍'=>'龍','暈'=>'暈','阮'=>'阮','劉'=>'劉','杻'=>'杻','柳'=>'柳','流'=>'流','溜'=>'溜','琉'=>'琉','留'=>'留','硫'=>'硫','紐'=>'紐','類'=>'類','六'=>'六','戮'=>'戮','陸'=>'陸','倫'=>'倫','崙'=>'崙','淪'=>'淪','輪'=>'輪','律'=>'律','慄'=>'慄','栗'=>'栗','率'=>'率','隆'=>'隆','利'=>'利','吏'=>'吏','履'=>'履','易'=>'易','李'=>'李','梨'=>'梨','泥'=>'泥','理'=>'理','痢'=>'痢','罹'=>'罹','裏'=>'裏','裡'=>'裡','里'=>'里','離'=>'離','匿'=>'匿','溺'=>'溺','吝'=>'吝','燐'=>'燐','璘'=>'璘','藺'=>'藺','隣'=>'隣','鱗'=>'鱗','麟'=>'麟','林'=>'林','淋'=>'淋','臨'=>'臨','立'=>'立','笠'=>'笠','粒'=>'粒','狀'=>'狀','炙'=>'炙','識'=>'識','什'=>'什','茶'=>'茶','刺'=>'刺','切'=>'切','度'=>'度','拓'=>'拓','糖'=>'糖','宅'=>'宅','洞'=>'洞','暴'=>'暴','輻'=>'輻','行'=>'行','降'=>'降','見'=>'見','廓'=>'廓','兀'=>'兀','嗀'=>'嗀','塚'=>'塚','晴'=>'晴','凞'=>'凞','猪'=>'猪','益'=>'益','礼'=>'礼','神'=>'神','祥'=>'祥','福'=>'福','靖'=>'靖','精'=>'精','羽'=>'羽','蘒'=>'蘒','諸'=>'諸','逸'=>'逸','都'=>'都','飯'=>'飯','飼'=>'飼','館'=>'館','鶴'=>'鶴','侮'=>'侮','僧'=>'僧','免'=>'免','勉'=>'勉','勤'=>'勤','卑'=>'卑','喝'=>'喝','嘆'=>'嘆','器'=>'器','塀'=>'塀','墨'=>'墨','層'=>'層','屮'=>'屮','悔'=>'悔','慨'=>'慨','憎'=>'憎','懲'=>'懲','敏'=>'敏','既'=>'既','暑'=>'暑','梅'=>'梅','海'=>'海','渚'=>'渚','漢'=>'漢','煮'=>'煮','爫'=>'爫','琢'=>'琢','碑'=>'碑','社'=>'社','祉'=>'祉','祈'=>'祈','祐'=>'祐','祖'=>'祖','祝'=>'祝','禍'=>'禍','禎'=>'禎','穀'=>'穀','突'=>'突','節'=>'節','練'=>'練','縉'=>'縉','繁'=>'繁','署'=>'署','者'=>'者','臭'=>'臭','艹'=>'艹','艹'=>'艹','著'=>'著','褐'=>'褐','視'=>'視','謁'=>'謁','謹'=>'謹','賓'=>'賓','贈'=>'贈','辶'=>'辶','逸'=>'逸','難'=>'難','響'=>'響','頻'=>'頻','並'=>'並','况'=>'况','全'=>'全','侀'=>'侀','充'=>'充','冀'=>'冀','勇'=>'勇','勺'=>'勺','喝'=>'喝','啕'=>'啕','喙'=>'喙','嗢'=>'嗢','塚'=>'塚','墳'=>'墳','奄'=>'奄','奔'=>'奔','婢'=>'婢','嬨'=>'嬨','廒'=>'廒','廙'=>'廙','彩'=>'彩','徭'=>'徭','惘'=>'惘','慎'=>'慎','愈'=>'愈','憎'=>'憎','慠'=>'慠','懲'=>'懲','戴'=>'戴','揄'=>'揄','搜'=>'搜','摒'=>'摒','敖'=>'敖','晴'=>'晴','朗'=>'朗','望'=>'望','杖'=>'杖','歹'=>'歹','殺'=>'殺','流'=>'流','滛'=>'滛','滋'=>'滋','漢'=>'漢','瀞'=>'瀞','煮'=>'煮','瞧'=>'瞧','爵'=>'爵','犯'=>'犯','猪'=>'猪','瑱'=>'瑱','甆'=>'甆','画'=>'画','瘝'=>'瘝','瘟'=>'瘟','益'=>'益','盛'=>'盛','直'=>'直','睊'=>'睊','着'=>'着','磌'=>'磌','窱'=>'窱','節'=>'節','类'=>'类','絛'=>'絛','練'=>'練','缾'=>'缾','者'=>'者','荒'=>'荒','華'=>'華','蝹'=>'蝹','襁'=>'襁','覆'=>'覆','視'=>'視','調'=>'調','諸'=>'諸','請'=>'請','謁'=>'謁','諾'=>'諾','諭'=>'諭','謹'=>'謹','變'=>'變','贈'=>'贈','輸'=>'輸','遲'=>'遲','醙'=>'醙','鉶'=>'鉶','陼'=>'陼','難'=>'難','靖'=>'靖','韛'=>'韛','響'=>'響','頋'=>'頋','頻'=>'頻','鬒'=>'鬒','龜'=>'龜','𢡊'=>'𢡊','𢡄'=>'𢡄','𣏕'=>'𣏕','㮝'=>'㮝','䀘'=>'䀘','䀹'=>'䀹','𥉉'=>'𥉉','𥳐'=>'𥳐','𧻓'=>'𧻓','齃'=>'齃','龎'=>'龎','יִ'=>'יִ','ײַ'=>'ײַ','שׁ'=>'שׁ','שׂ'=>'שׂ','שּׁ'=>'שּׁ','שּׂ'=>'שּׂ','אַ'=>'אַ','אָ'=>'אָ','אּ'=>'אּ','בּ'=>'בּ','גּ'=>'גּ','דּ'=>'דּ','הּ'=>'הּ','וּ'=>'וּ','זּ'=>'זּ','טּ'=>'טּ','יּ'=>'יּ','ךּ'=>'ךּ','כּ'=>'כּ','לּ'=>'לּ','מּ'=>'מּ','נּ'=>'נּ','סּ'=>'סּ','ףּ'=>'ףּ','פּ'=>'פּ','צּ'=>'צּ','קּ'=>'קּ','רּ'=>'רּ','שּ'=>'שּ','תּ'=>'תּ','וֹ'=>'וֹ','בֿ'=>'בֿ','כֿ'=>'כֿ','פֿ'=>'פֿ','𝅗𝅥'=>'𝅗𝅥','𝅘𝅥'=>'𝅘𝅥','𝅘𝅥𝅮'=>'𝅘𝅥𝅮','𝅘𝅥𝅯'=>'𝅘𝅥𝅯','𝅘𝅥𝅰'=>'𝅘𝅥𝅰','𝅘𝅥𝅱'=>'𝅘𝅥𝅱','𝅘𝅥𝅲'=>'𝅘𝅥𝅲','𝆹𝅥'=>'𝆹𝅥','𝆺𝅥'=>'𝆺𝅥','𝆹𝅥𝅮'=>'𝆹𝅥𝅮','𝆺𝅥𝅮'=>'𝆺𝅥𝅮','𝆹𝅥𝅯'=>'𝆹𝅥𝅯','𝆺𝅥𝅯'=>'𝆺𝅥𝅯','丽'=>'丽','丸'=>'丸','乁'=>'乁','𠄢'=>'𠄢','你'=>'你','侮'=>'侮','侻'=>'侻','倂'=>'倂','偺'=>'偺','備'=>'備','僧'=>'僧','像'=>'像','㒞'=>'㒞','𠘺'=>'𠘺','免'=>'免','兔'=>'兔','兤'=>'兤','具'=>'具','𠔜'=>'𠔜','㒹'=>'㒹','內'=>'內','再'=>'再','𠕋'=>'𠕋','冗'=>'冗','冤'=>'冤','仌'=>'仌','冬'=>'冬','况'=>'况','𩇟'=>'𩇟','凵'=>'凵','刃'=>'刃','㓟'=>'㓟','刻'=>'刻','剆'=>'剆','割'=>'割','剷'=>'剷','㔕'=>'㔕','勇'=>'勇','勉'=>'勉','勤'=>'勤','勺'=>'勺','包'=>'包','匆'=>'匆','北'=>'北','卉'=>'卉','卑'=>'卑','博'=>'博','即'=>'即','卽'=>'卽','卿'=>'卿','卿'=>'卿','卿'=>'卿','𠨬'=>'𠨬','灰'=>'灰','及'=>'及','叟'=>'叟','𠭣'=>'𠭣','叫'=>'叫','叱'=>'叱','吆'=>'吆','咞'=>'咞','吸'=>'吸','呈'=>'呈','周'=>'周','咢'=>'咢','哶'=>'哶','唐'=>'唐','啓'=>'啓','啣'=>'啣','善'=>'善','善'=>'善','喙'=>'喙','喫'=>'喫','喳'=>'喳','嗂'=>'嗂','圖'=>'圖','嘆'=>'嘆','圗'=>'圗','噑'=>'噑','噴'=>'噴','切'=>'切','壮'=>'壮','城'=>'城','埴'=>'埴','堍'=>'堍','型'=>'型','堲'=>'堲','報'=>'報','墬'=>'墬','𡓤'=>'𡓤','売'=>'売','壷'=>'壷','夆'=>'夆','多'=>'多','夢'=>'夢','奢'=>'奢','𡚨'=>'𡚨','𡛪'=>'𡛪','姬'=>'姬','娛'=>'娛','娧'=>'娧','姘'=>'姘','婦'=>'婦','㛮'=>'㛮','㛼'=>'㛼','嬈'=>'嬈','嬾'=>'嬾','嬾'=>'嬾','𡧈'=>'𡧈','寃'=>'寃','寘'=>'寘','寧'=>'寧','寳'=>'寳','𡬘'=>'𡬘','寿'=>'寿','将'=>'将','当'=>'当','尢'=>'尢','㞁'=>'㞁','屠'=>'屠','屮'=>'屮','峀'=>'峀','岍'=>'岍','𡷤'=>'𡷤','嵃'=>'嵃','𡷦'=>'𡷦','嵮'=>'嵮','嵫'=>'嵫','嵼'=>'嵼','巡'=>'巡','巢'=>'巢','㠯'=>'㠯','巽'=>'巽','帨'=>'帨','帽'=>'帽','幩'=>'幩','㡢'=>'㡢','𢆃'=>'𢆃','㡼'=>'㡼','庰'=>'庰','庳'=>'庳','庶'=>'庶','廊'=>'廊','𪎒'=>'𪎒','廾'=>'廾','𢌱'=>'𢌱','𢌱'=>'𢌱','舁'=>'舁','弢'=>'弢','弢'=>'弢','㣇'=>'㣇','𣊸'=>'𣊸','𦇚'=>'𦇚','形'=>'形','彫'=>'彫','㣣'=>'㣣','徚'=>'徚','忍'=>'忍','志'=>'志','忹'=>'忹','悁'=>'悁','㤺'=>'㤺','㤜'=>'㤜','悔'=>'悔','𢛔'=>'𢛔','惇'=>'惇','慈'=>'慈','慌'=>'慌','慎'=>'慎','慌'=>'慌','慺'=>'慺','憎'=>'憎','憲'=>'憲','憤'=>'憤','憯'=>'憯','懞'=>'懞','懲'=>'懲','懶'=>'懶','成'=>'成','戛'=>'戛','扝'=>'扝','抱'=>'抱','拔'=>'拔','捐'=>'捐','𢬌'=>'𢬌','挽'=>'挽','拼'=>'拼','捨'=>'捨','掃'=>'掃','揤'=>'揤','𢯱'=>'𢯱','搢'=>'搢','揅'=>'揅','掩'=>'掩','㨮'=>'㨮','摩'=>'摩','摾'=>'摾','撝'=>'撝','摷'=>'摷','㩬'=>'㩬','敏'=>'敏','敬'=>'敬','𣀊'=>'𣀊','旣'=>'旣','書'=>'書','晉'=>'晉','㬙'=>'㬙','暑'=>'暑','㬈'=>'㬈','㫤'=>'㫤','冒'=>'冒','冕'=>'冕','最'=>'最','暜'=>'暜','肭'=>'肭','䏙'=>'䏙','朗'=>'朗','望'=>'望','朡'=>'朡','杞'=>'杞','杓'=>'杓','𣏃'=>'𣏃','㭉'=>'㭉','柺'=>'柺','枅'=>'枅','桒'=>'桒','梅'=>'梅','𣑭'=>'𣑭','梎'=>'梎','栟'=>'栟','椔'=>'椔','㮝'=>'㮝','楂'=>'楂','榣'=>'榣','槪'=>'槪','檨'=>'檨','𣚣'=>'𣚣','櫛'=>'櫛','㰘'=>'㰘','次'=>'次','𣢧'=>'𣢧','歔'=>'歔','㱎'=>'㱎','歲'=>'歲','殟'=>'殟','殺'=>'殺','殻'=>'殻','𣪍'=>'𣪍','𡴋'=>'𡴋','𣫺'=>'𣫺','汎'=>'汎','𣲼'=>'𣲼','沿'=>'沿','泍'=>'泍','汧'=>'汧','洖'=>'洖','派'=>'派','海'=>'海','流'=>'流','浩'=>'浩','浸'=>'浸','涅'=>'涅','𣴞'=>'𣴞','洴'=>'洴','港'=>'港','湮'=>'湮','㴳'=>'㴳','滋'=>'滋','滇'=>'滇','𣻑'=>'𣻑','淹'=>'淹','潮'=>'潮','𣽞'=>'𣽞','𣾎'=>'𣾎','濆'=>'濆','瀹'=>'瀹','瀞'=>'瀞','瀛'=>'瀛','㶖'=>'㶖','灊'=>'灊','災'=>'災','灷'=>'灷','炭'=>'炭','𠔥'=>'𠔥','煅'=>'煅','𤉣'=>'𤉣','熜'=>'熜','𤎫'=>'𤎫','爨'=>'爨','爵'=>'爵','牐'=>'牐','𤘈'=>'𤘈','犀'=>'犀','犕'=>'犕','𤜵'=>'𤜵','𤠔'=>'𤠔','獺'=>'獺','王'=>'王','㺬'=>'㺬','玥'=>'玥','㺸'=>'㺸','㺸'=>'㺸','瑇'=>'瑇','瑜'=>'瑜','瑱'=>'瑱','璅'=>'璅','瓊'=>'瓊','㼛'=>'㼛','甤'=>'甤','𤰶'=>'𤰶','甾'=>'甾','𤲒'=>'𤲒','異'=>'異','𢆟'=>'𢆟','瘐'=>'瘐','𤾡'=>'𤾡','𤾸'=>'𤾸','𥁄'=>'𥁄','㿼'=>'㿼','䀈'=>'䀈','直'=>'直','𥃳'=>'𥃳','𥃲'=>'𥃲','𥄙'=>'𥄙','𥄳'=>'𥄳','眞'=>'眞','真'=>'真','真'=>'真','睊'=>'睊','䀹'=>'䀹','瞋'=>'瞋','䁆'=>'䁆','䂖'=>'䂖','𥐝'=>'𥐝','硎'=>'硎','碌'=>'碌','磌'=>'磌','䃣'=>'䃣','𥘦'=>'𥘦','祖'=>'祖','𥚚'=>'𥚚','𥛅'=>'𥛅','福'=>'福','秫'=>'秫','䄯'=>'䄯','穀'=>'穀','穊'=>'穊','穏'=>'穏','𥥼'=>'𥥼','𥪧'=>'𥪧','𥪧'=>'𥪧','竮'=>'竮','䈂'=>'䈂','𥮫'=>'𥮫','篆'=>'篆','築'=>'築','䈧'=>'䈧','𥲀'=>'𥲀','糒'=>'糒','䊠'=>'䊠','糨'=>'糨','糣'=>'糣','紀'=>'紀','𥾆'=>'𥾆','絣'=>'絣','䌁'=>'䌁','緇'=>'緇','縂'=>'縂','繅'=>'繅','䌴'=>'䌴','𦈨'=>'𦈨','𦉇'=>'𦉇','䍙'=>'䍙','𦋙'=>'𦋙','罺'=>'罺','𦌾'=>'𦌾','羕'=>'羕','翺'=>'翺','者'=>'者','𦓚'=>'𦓚','𦔣'=>'𦔣','聠'=>'聠','𦖨'=>'𦖨','聰'=>'聰','𣍟'=>'𣍟','䏕'=>'䏕','育'=>'育','脃'=>'脃','䐋'=>'䐋','脾'=>'脾','媵'=>'媵','𦞧'=>'𦞧','𦞵'=>'𦞵','𣎓'=>'𣎓','𣎜'=>'𣎜','舁'=>'舁','舄'=>'舄','辞'=>'辞','䑫'=>'䑫','芑'=>'芑','芋'=>'芋','芝'=>'芝','劳'=>'劳','花'=>'花','芳'=>'芳','芽'=>'芽','苦'=>'苦','𦬼'=>'𦬼','若'=>'若','茝'=>'茝','荣'=>'荣','莭'=>'莭','茣'=>'茣','莽'=>'莽','菧'=>'菧','著'=>'著','荓'=>'荓','菊'=>'菊','菌'=>'菌','菜'=>'菜','𦰶'=>'𦰶','𦵫'=>'𦵫','𦳕'=>'𦳕','䔫'=>'䔫','蓱'=>'蓱','蓳'=>'蓳','蔖'=>'蔖','𧏊'=>'𧏊','蕤'=>'蕤','𦼬'=>'𦼬','䕝'=>'䕝','䕡'=>'䕡','𦾱'=>'𦾱','𧃒'=>'𧃒','䕫'=>'䕫','虐'=>'虐','虜'=>'虜','虧'=>'虧','虩'=>'虩','蚩'=>'蚩','蚈'=>'蚈','蜎'=>'蜎','蛢'=>'蛢','蝹'=>'蝹','蜨'=>'蜨','蝫'=>'蝫','螆'=>'螆','䗗'=>'䗗','蟡'=>'蟡','蠁'=>'蠁','䗹'=>'䗹','衠'=>'衠','衣'=>'衣','𧙧'=>'𧙧','裗'=>'裗','裞'=>'裞','䘵'=>'䘵','裺'=>'裺','㒻'=>'㒻','𧢮'=>'𧢮','𧥦'=>'𧥦','䚾'=>'䚾','䛇'=>'䛇','誠'=>'誠','諭'=>'諭','變'=>'變','豕'=>'豕','𧲨'=>'𧲨','貫'=>'貫','賁'=>'賁','贛'=>'贛','起'=>'起','𧼯'=>'𧼯','𠠄'=>'𠠄','跋'=>'跋','趼'=>'趼','跰'=>'跰','𠣞'=>'𠣞','軔'=>'軔','輸'=>'輸','𨗒'=>'𨗒','𨗭'=>'𨗭','邔'=>'邔','郱'=>'郱','鄑'=>'鄑','𨜮'=>'𨜮','鄛'=>'鄛','鈸'=>'鈸','鋗'=>'鋗','鋘'=>'鋘','鉼'=>'鉼','鏹'=>'鏹','鐕'=>'鐕','𨯺'=>'𨯺','開'=>'開','䦕'=>'䦕','閷'=>'閷','𨵷'=>'𨵷','䧦'=>'䧦','雃'=>'雃','嶲'=>'嶲','霣'=>'霣','𩅅'=>'𩅅','𩈚'=>'𩈚','䩮'=>'䩮','䩶'=>'䩶','韠'=>'韠','𩐊'=>'𩐊','䪲'=>'䪲','𩒖'=>'𩒖','頋'=>'頋','頋'=>'頋','頩'=>'頩','𩖶'=>'𩖶','飢'=>'飢','䬳'=>'䬳','餩'=>'餩','馧'=>'馧','駂'=>'駂','駾'=>'駾','䯎'=>'䯎','𩬰'=>'𩬰','鬒'=>'鬒','鱀'=>'鱀','鳽'=>'鳽','䳎'=>'䳎','䳭'=>'䳭','鵧'=>'鵧','𪃎'=>'𪃎','䳸'=>'䳸','𪄅'=>'𪄅','𪈎'=>'𪈎','𪊑'=>'𪊑','麻'=>'麻','䵖'=>'䵖','黹'=>'黹','黾'=>'黾','鼅'=>'鼅','鼏'=>'鼏','鼖'=>'鼖','鼻'=>'鼻','𪘀'=>'𪘀');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/utf_compatibility_decomp.php b/phpBB/includes/utf/data/utf_compatibility_decomp.php
deleted file mode 100644
index 08a7a047a4..0000000000
--- a/phpBB/includes/utf/data/utf_compatibility_decomp.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-$GLOBALS['utf_compatibility_decomp']=array(' '=>' ','¨'=>' ̈','ª'=>'a','¯'=>' ̄','²'=>'2','³'=>'3','´'=>' ́','µ'=>'μ','¸'=>' ̧','¹'=>'1','º'=>'o','¼'=>'1⁄4','½'=>'1⁄2','¾'=>'3⁄4','À'=>'À','Á'=>'Á','Â'=>'Â','Ã'=>'Ã','Ä'=>'Ä','Å'=>'Å','Ç'=>'Ç','È'=>'È','É'=>'É','Ê'=>'Ê','Ë'=>'Ë','Ì'=>'Ì','Í'=>'Í','Î'=>'Î','Ï'=>'Ï','Ñ'=>'Ñ','Ò'=>'Ò','Ó'=>'Ó','Ô'=>'Ô','Õ'=>'Õ','Ö'=>'Ö','Ù'=>'Ù','Ú'=>'Ú','Û'=>'Û','Ü'=>'Ü','Ý'=>'Ý','à'=>'à','á'=>'á','â'=>'â','ã'=>'ã','ä'=>'ä','å'=>'å','ç'=>'ç','è'=>'è','é'=>'é','ê'=>'ê','ë'=>'ë','ì'=>'ì','í'=>'í','î'=>'î','ï'=>'ï','ñ'=>'ñ','ò'=>'ò','ó'=>'ó','ô'=>'ô','õ'=>'õ','ö'=>'ö','ù'=>'ù','ú'=>'ú','û'=>'û','ü'=>'ü','ý'=>'ý','ÿ'=>'ÿ','Ā'=>'Ā','ā'=>'ā','Ă'=>'Ă','ă'=>'ă','Ą'=>'Ą','ą'=>'ą','Ć'=>'Ć','ć'=>'ć','Ĉ'=>'Ĉ','ĉ'=>'ĉ','Ċ'=>'Ċ','ċ'=>'ċ','Č'=>'Č','č'=>'č','Ď'=>'Ď','ď'=>'ď','Ē'=>'Ē','ē'=>'ē','Ĕ'=>'Ĕ','ĕ'=>'ĕ','Ė'=>'Ė','ė'=>'ė','Ę'=>'Ę','ę'=>'ę','Ě'=>'Ě','ě'=>'ě','Ĝ'=>'Ĝ','ĝ'=>'ĝ','Ğ'=>'Ğ','ğ'=>'ğ','Ġ'=>'Ġ','ġ'=>'ġ','Ģ'=>'Ģ','ģ'=>'ģ','Ĥ'=>'Ĥ','ĥ'=>'ĥ','Ĩ'=>'Ĩ','ĩ'=>'ĩ','Ī'=>'Ī','ī'=>'ī','Ĭ'=>'Ĭ','ĭ'=>'ĭ','Į'=>'Į','į'=>'į','İ'=>'İ','Ĳ'=>'IJ','ĳ'=>'ij','Ĵ'=>'Ĵ','ĵ'=>'ĵ','Ķ'=>'Ķ','ķ'=>'ķ','Ĺ'=>'Ĺ','ĺ'=>'ĺ','Ļ'=>'Ļ','ļ'=>'ļ','Ľ'=>'Ľ','ľ'=>'ľ','Ŀ'=>'L·','ŀ'=>'l·','Ń'=>'Ń','ń'=>'ń','Ņ'=>'Ņ','ņ'=>'ņ','Ň'=>'Ň','ň'=>'ň','ŉ'=>'ʼn','Ō'=>'Ō','ō'=>'ō','Ŏ'=>'Ŏ','ŏ'=>'ŏ','Ő'=>'Ő','ő'=>'ő','Ŕ'=>'Ŕ','ŕ'=>'ŕ','Ŗ'=>'Ŗ','ŗ'=>'ŗ','Ř'=>'Ř','ř'=>'ř','Ś'=>'Ś','ś'=>'ś','Ŝ'=>'Ŝ','ŝ'=>'ŝ','Ş'=>'Ş','ş'=>'ş','Š'=>'Š','š'=>'š','Ţ'=>'Ţ','ţ'=>'ţ','Ť'=>'Ť','ť'=>'ť','Ũ'=>'Ũ','ũ'=>'ũ','Ū'=>'Ū','ū'=>'ū','Ŭ'=>'Ŭ','ŭ'=>'ŭ','Ů'=>'Ů','ů'=>'ů','Ű'=>'Ű','ű'=>'ű','Ų'=>'Ų','ų'=>'ų','Ŵ'=>'Ŵ','ŵ'=>'ŵ','Ŷ'=>'Ŷ','ŷ'=>'ŷ','Ÿ'=>'Ÿ','Ź'=>'Ź','ź'=>'ź','Ż'=>'Ż','ż'=>'ż','Ž'=>'Ž','ž'=>'ž','ſ'=>'s','Ơ'=>'Ơ','ơ'=>'ơ','Ư'=>'Ư','ư'=>'ư','Ǆ'=>'DŽ','ǅ'=>'Dž','ǆ'=>'dž','Ǉ'=>'LJ','ǈ'=>'Lj','ǉ'=>'lj','Ǌ'=>'NJ','ǋ'=>'Nj','ǌ'=>'nj','Ǎ'=>'Ǎ','ǎ'=>'ǎ','Ǐ'=>'Ǐ','ǐ'=>'ǐ','Ǒ'=>'Ǒ','ǒ'=>'ǒ','Ǔ'=>'Ǔ','ǔ'=>'ǔ','Ǖ'=>'Ǖ','ǖ'=>'ǖ','Ǘ'=>'Ǘ','ǘ'=>'ǘ','Ǚ'=>'Ǚ','ǚ'=>'ǚ','Ǜ'=>'Ǜ','ǜ'=>'ǜ','Ǟ'=>'Ǟ','ǟ'=>'ǟ','Ǡ'=>'Ǡ','ǡ'=>'ǡ','Ǣ'=>'Ǣ','ǣ'=>'ǣ','Ǧ'=>'Ǧ','ǧ'=>'ǧ','Ǩ'=>'Ǩ','ǩ'=>'ǩ','Ǫ'=>'Ǫ','ǫ'=>'ǫ','Ǭ'=>'Ǭ','ǭ'=>'ǭ','Ǯ'=>'Ǯ','ǯ'=>'ǯ','ǰ'=>'ǰ','Ǳ'=>'DZ','ǲ'=>'Dz','ǳ'=>'dz','Ǵ'=>'Ǵ','ǵ'=>'ǵ','Ǹ'=>'Ǹ','ǹ'=>'ǹ','Ǻ'=>'Ǻ','ǻ'=>'ǻ','Ǽ'=>'Ǽ','ǽ'=>'ǽ','Ǿ'=>'Ǿ','ǿ'=>'ǿ','Ȁ'=>'Ȁ','ȁ'=>'ȁ','Ȃ'=>'Ȃ','ȃ'=>'ȃ','Ȅ'=>'Ȅ','ȅ'=>'ȅ','Ȇ'=>'Ȇ','ȇ'=>'ȇ','Ȉ'=>'Ȉ','ȉ'=>'ȉ','Ȋ'=>'Ȋ','ȋ'=>'ȋ','Ȍ'=>'Ȍ','ȍ'=>'ȍ','Ȏ'=>'Ȏ','ȏ'=>'ȏ','Ȑ'=>'Ȑ','ȑ'=>'ȑ','Ȓ'=>'Ȓ','ȓ'=>'ȓ','Ȕ'=>'Ȕ','ȕ'=>'ȕ','Ȗ'=>'Ȗ','ȗ'=>'ȗ','Ș'=>'Ș','ș'=>'ș','Ț'=>'Ț','ț'=>'ț','Ȟ'=>'Ȟ','ȟ'=>'ȟ','Ȧ'=>'Ȧ','ȧ'=>'ȧ','Ȩ'=>'Ȩ','ȩ'=>'ȩ','Ȫ'=>'Ȫ','ȫ'=>'ȫ','Ȭ'=>'Ȭ','ȭ'=>'ȭ','Ȯ'=>'Ȯ','ȯ'=>'ȯ','Ȱ'=>'Ȱ','ȱ'=>'ȱ','Ȳ'=>'Ȳ','ȳ'=>'ȳ','ʰ'=>'h','ʱ'=>'ɦ','ʲ'=>'j','ʳ'=>'r','ʴ'=>'ɹ','ʵ'=>'ɻ','ʶ'=>'ʁ','ʷ'=>'w','ʸ'=>'y','˘'=>' ̆','˙'=>' ̇','˚'=>' ̊','˛'=>' ̨','˜'=>' ̃','˝'=>' ̋','ˠ'=>'ɣ','ˡ'=>'l','ˢ'=>'s','ˣ'=>'x','ˤ'=>'ʕ','̀'=>'̀','́'=>'́','̓'=>'̓','̈́'=>'̈́','ʹ'=>'ʹ','ͺ'=>' ͅ',';'=>';','΄'=>' ́','΅'=>' ̈́','Ά'=>'Ά','·'=>'·','Έ'=>'Έ','Ή'=>'Ή','Ί'=>'Ί','Ό'=>'Ό','Ύ'=>'Ύ','Ώ'=>'Ώ','ΐ'=>'ΐ','Ϊ'=>'Ϊ','Ϋ'=>'Ϋ','ά'=>'ά','έ'=>'έ','ή'=>'ή','ί'=>'ί','ΰ'=>'ΰ','ϊ'=>'ϊ','ϋ'=>'ϋ','ό'=>'ό','ύ'=>'ύ','ώ'=>'ώ','ϐ'=>'β','ϑ'=>'θ','ϒ'=>'Υ','ϓ'=>'Ύ','ϔ'=>'Ϋ','ϕ'=>'φ','ϖ'=>'π','ϰ'=>'κ','ϱ'=>'ρ','ϲ'=>'ς','ϴ'=>'Θ','ϵ'=>'ε','Ϲ'=>'Σ','Ѐ'=>'Ѐ','Ё'=>'Ё','Ѓ'=>'Ѓ','Ї'=>'Ї','Ќ'=>'Ќ','Ѝ'=>'Ѝ','Ў'=>'Ў','Й'=>'Й','й'=>'й','ѐ'=>'ѐ','ё'=>'ё','ѓ'=>'ѓ','ї'=>'ї','ќ'=>'ќ','ѝ'=>'ѝ','ў'=>'ў','Ѷ'=>'Ѷ','ѷ'=>'ѷ','Ӂ'=>'Ӂ','ӂ'=>'ӂ','Ӑ'=>'Ӑ','ӑ'=>'ӑ','Ӓ'=>'Ӓ','ӓ'=>'ӓ','Ӗ'=>'Ӗ','ӗ'=>'ӗ','Ӛ'=>'Ӛ','ӛ'=>'ӛ','Ӝ'=>'Ӝ','ӝ'=>'ӝ','Ӟ'=>'Ӟ','ӟ'=>'ӟ','Ӣ'=>'Ӣ','ӣ'=>'ӣ','Ӥ'=>'Ӥ','ӥ'=>'ӥ','Ӧ'=>'Ӧ','ӧ'=>'ӧ','Ӫ'=>'Ӫ','ӫ'=>'ӫ','Ӭ'=>'Ӭ','ӭ'=>'ӭ','Ӯ'=>'Ӯ','ӯ'=>'ӯ','Ӱ'=>'Ӱ','ӱ'=>'ӱ','Ӳ'=>'Ӳ','ӳ'=>'ӳ','Ӵ'=>'Ӵ','ӵ'=>'ӵ','Ӹ'=>'Ӹ','ӹ'=>'ӹ','և'=>'եւ','آ'=>'آ','أ'=>'أ','ؤ'=>'ؤ','إ'=>'إ','ئ'=>'ئ','ٵ'=>'اٴ','ٶ'=>'وٴ','ٷ'=>'ۇٴ','ٸ'=>'يٴ','ۀ'=>'ۀ','ۂ'=>'ۂ','ۓ'=>'ۓ','ऩ'=>'ऩ','ऱ'=>'ऱ','ऴ'=>'ऴ','क़'=>'क़','ख़'=>'ख़','ग़'=>'ग़','ज़'=>'ज़','ड़'=>'ड़','ढ़'=>'ढ़','फ़'=>'फ़','य़'=>'य़','ো'=>'ো','ৌ'=>'ৌ','ড়'=>'ড়','ঢ়'=>'ঢ়','য়'=>'য়','ਲ਼'=>'ਲ਼','ਸ਼'=>'ਸ਼','ਖ਼'=>'ਖ਼','ਗ਼'=>'ਗ਼','ਜ਼'=>'ਜ਼','ਫ਼'=>'ਫ਼','ୈ'=>'ୈ','ୋ'=>'ୋ','ୌ'=>'ୌ','ଡ଼'=>'ଡ଼','ଢ଼'=>'ଢ଼','ஔ'=>'ஔ','ொ'=>'ொ','ோ'=>'ோ','ௌ'=>'ௌ','ై'=>'ై','ೀ'=>'ೀ','ೇ'=>'ೇ','ೈ'=>'ೈ','ೊ'=>'ೊ','ೋ'=>'ೋ','ൊ'=>'ൊ','ോ'=>'ോ','ൌ'=>'ൌ','ේ'=>'ේ','ො'=>'ො','ෝ'=>'ෝ','ෞ'=>'ෞ','ำ'=>'ํา','ຳ'=>'ໍາ','ໜ'=>'ຫນ','ໝ'=>'ຫມ','༌'=>'་','གྷ'=>'གྷ','ཌྷ'=>'ཌྷ','དྷ'=>'དྷ','བྷ'=>'བྷ','ཛྷ'=>'ཛྷ','ཀྵ'=>'ཀྵ','ཱི'=>'ཱི','ཱུ'=>'ཱུ','ྲྀ'=>'ྲྀ','ཷ'=>'ྲཱྀ','ླྀ'=>'ླྀ','ཹ'=>'ླཱྀ','ཱྀ'=>'ཱྀ','ྒྷ'=>'ྒྷ','ྜྷ'=>'ྜྷ','ྡྷ'=>'ྡྷ','ྦྷ'=>'ྦྷ','ྫྷ'=>'ྫྷ','ྐྵ'=>'ྐྵ','ဦ'=>'ဦ','ჼ'=>'ნ','ᬆ'=>'ᬆ','ᬈ'=>'ᬈ','ᬊ'=>'ᬊ','ᬌ'=>'ᬌ','ᬎ'=>'ᬎ','ᬒ'=>'ᬒ','ᬻ'=>'ᬻ','ᬽ'=>'ᬽ','ᭀ'=>'ᭀ','ᭁ'=>'ᭁ','ᭃ'=>'ᭃ','ᴬ'=>'A','ᴭ'=>'Æ','ᴮ'=>'B','ᴰ'=>'D','ᴱ'=>'E','ᴲ'=>'Ǝ','ᴳ'=>'G','ᴴ'=>'H','ᴵ'=>'I','ᴶ'=>'J','ᴷ'=>'K','ᴸ'=>'L','ᴹ'=>'M','ᴺ'=>'N','ᴼ'=>'O','ᴽ'=>'Ȣ','ᴾ'=>'P','ᴿ'=>'R','ᵀ'=>'T','ᵁ'=>'U','ᵂ'=>'W','ᵃ'=>'a','ᵄ'=>'ɐ','ᵅ'=>'ɑ','ᵆ'=>'ᴂ','ᵇ'=>'b','ᵈ'=>'d','ᵉ'=>'e','ᵊ'=>'ə','ᵋ'=>'ɛ','ᵌ'=>'ɜ','ᵍ'=>'g','ᵏ'=>'k','ᵐ'=>'m','ᵑ'=>'ŋ','ᵒ'=>'o','ᵓ'=>'ɔ','ᵔ'=>'ᴖ','ᵕ'=>'ᴗ','ᵖ'=>'p','ᵗ'=>'t','ᵘ'=>'u','ᵙ'=>'ᴝ','ᵚ'=>'ɯ','ᵛ'=>'v','ᵜ'=>'ᴥ','ᵝ'=>'β','ᵞ'=>'γ','ᵟ'=>'δ','ᵠ'=>'φ','ᵡ'=>'χ','ᵢ'=>'i','ᵣ'=>'r','ᵤ'=>'u','ᵥ'=>'v','ᵦ'=>'β','ᵧ'=>'γ','ᵨ'=>'ρ','ᵩ'=>'φ','ᵪ'=>'χ','ᵸ'=>'н','ᶛ'=>'ɒ','ᶜ'=>'c','ᶝ'=>'ɕ','ᶞ'=>'ð','ᶟ'=>'ɜ','ᶠ'=>'f','ᶡ'=>'ɟ','ᶢ'=>'ɡ','ᶣ'=>'ɥ','ᶤ'=>'ɨ','ᶥ'=>'ɩ','ᶦ'=>'ɪ','ᶧ'=>'ᵻ','ᶨ'=>'ʝ','ᶩ'=>'ɭ','ᶪ'=>'ᶅ','ᶫ'=>'ʟ','ᶬ'=>'ɱ','ᶭ'=>'ɰ','ᶮ'=>'ɲ','ᶯ'=>'ɳ','ᶰ'=>'ɴ','ᶱ'=>'ɵ','ᶲ'=>'ɸ','ᶳ'=>'ʂ','ᶴ'=>'ʃ','ᶵ'=>'ƫ','ᶶ'=>'ʉ','ᶷ'=>'ʊ','ᶸ'=>'ᴜ','ᶹ'=>'ʋ','ᶺ'=>'ʌ','ᶻ'=>'z','ᶼ'=>'ʐ','ᶽ'=>'ʑ','ᶾ'=>'ʒ','ᶿ'=>'θ','Ḁ'=>'Ḁ','ḁ'=>'ḁ','Ḃ'=>'Ḃ','ḃ'=>'ḃ','Ḅ'=>'Ḅ','ḅ'=>'ḅ','Ḇ'=>'Ḇ','ḇ'=>'ḇ','Ḉ'=>'Ḉ','ḉ'=>'ḉ','Ḋ'=>'Ḋ','ḋ'=>'ḋ','Ḍ'=>'Ḍ','ḍ'=>'ḍ','Ḏ'=>'Ḏ','ḏ'=>'ḏ','Ḑ'=>'Ḑ','ḑ'=>'ḑ','Ḓ'=>'Ḓ','ḓ'=>'ḓ','Ḕ'=>'Ḕ','ḕ'=>'ḕ','Ḗ'=>'Ḗ','ḗ'=>'ḗ','Ḙ'=>'Ḙ','ḙ'=>'ḙ','Ḛ'=>'Ḛ','ḛ'=>'ḛ','Ḝ'=>'Ḝ','ḝ'=>'ḝ','Ḟ'=>'Ḟ','ḟ'=>'ḟ','Ḡ'=>'Ḡ','ḡ'=>'ḡ','Ḣ'=>'Ḣ','ḣ'=>'ḣ','Ḥ'=>'Ḥ','ḥ'=>'ḥ','Ḧ'=>'Ḧ','ḧ'=>'ḧ','Ḩ'=>'Ḩ','ḩ'=>'ḩ','Ḫ'=>'Ḫ','ḫ'=>'ḫ','Ḭ'=>'Ḭ','ḭ'=>'ḭ','Ḯ'=>'Ḯ','ḯ'=>'ḯ','Ḱ'=>'Ḱ','ḱ'=>'ḱ','Ḳ'=>'Ḳ','ḳ'=>'ḳ','Ḵ'=>'Ḵ','ḵ'=>'ḵ','Ḷ'=>'Ḷ','ḷ'=>'ḷ','Ḹ'=>'Ḹ','ḹ'=>'ḹ','Ḻ'=>'Ḻ','ḻ'=>'ḻ','Ḽ'=>'Ḽ','ḽ'=>'ḽ','Ḿ'=>'Ḿ','ḿ'=>'ḿ','Ṁ'=>'Ṁ','ṁ'=>'ṁ','Ṃ'=>'Ṃ','ṃ'=>'ṃ','Ṅ'=>'Ṅ','ṅ'=>'ṅ','Ṇ'=>'Ṇ','ṇ'=>'ṇ','Ṉ'=>'Ṉ','ṉ'=>'ṉ','Ṋ'=>'Ṋ','ṋ'=>'ṋ','Ṍ'=>'Ṍ','ṍ'=>'ṍ','Ṏ'=>'Ṏ','ṏ'=>'ṏ','Ṑ'=>'Ṑ','ṑ'=>'ṑ','Ṓ'=>'Ṓ','ṓ'=>'ṓ','Ṕ'=>'Ṕ','ṕ'=>'ṕ','Ṗ'=>'Ṗ','ṗ'=>'ṗ','Ṙ'=>'Ṙ','ṙ'=>'ṙ','Ṛ'=>'Ṛ','ṛ'=>'ṛ','Ṝ'=>'Ṝ','ṝ'=>'ṝ','Ṟ'=>'Ṟ','ṟ'=>'ṟ','Ṡ'=>'Ṡ','ṡ'=>'ṡ','Ṣ'=>'Ṣ','ṣ'=>'ṣ','Ṥ'=>'Ṥ','ṥ'=>'ṥ','Ṧ'=>'Ṧ','ṧ'=>'ṧ','Ṩ'=>'Ṩ','ṩ'=>'ṩ','Ṫ'=>'Ṫ','ṫ'=>'ṫ','Ṭ'=>'Ṭ','ṭ'=>'ṭ','Ṯ'=>'Ṯ','ṯ'=>'ṯ','Ṱ'=>'Ṱ','ṱ'=>'ṱ','Ṳ'=>'Ṳ','ṳ'=>'ṳ','Ṵ'=>'Ṵ','ṵ'=>'ṵ','Ṷ'=>'Ṷ','ṷ'=>'ṷ','Ṹ'=>'Ṹ','ṹ'=>'ṹ','Ṻ'=>'Ṻ','ṻ'=>'ṻ','Ṽ'=>'Ṽ','ṽ'=>'ṽ','Ṿ'=>'Ṿ','ṿ'=>'ṿ','Ẁ'=>'Ẁ','ẁ'=>'ẁ','Ẃ'=>'Ẃ','ẃ'=>'ẃ','Ẅ'=>'Ẅ','ẅ'=>'ẅ','Ẇ'=>'Ẇ','ẇ'=>'ẇ','Ẉ'=>'Ẉ','ẉ'=>'ẉ','Ẋ'=>'Ẋ','ẋ'=>'ẋ','Ẍ'=>'Ẍ','ẍ'=>'ẍ','Ẏ'=>'Ẏ','ẏ'=>'ẏ','Ẑ'=>'Ẑ','ẑ'=>'ẑ','Ẓ'=>'Ẓ','ẓ'=>'ẓ','Ẕ'=>'Ẕ','ẕ'=>'ẕ','ẖ'=>'ẖ','ẗ'=>'ẗ','ẘ'=>'ẘ','ẙ'=>'ẙ','ẚ'=>'aʾ','ẛ'=>'ṡ','Ạ'=>'Ạ','ạ'=>'ạ','Ả'=>'Ả','ả'=>'ả','Ấ'=>'Ấ','ấ'=>'ấ','Ầ'=>'Ầ','ầ'=>'ầ','Ẩ'=>'Ẩ','ẩ'=>'ẩ','Ẫ'=>'Ẫ','ẫ'=>'ẫ','Ậ'=>'Ậ','ậ'=>'ậ','Ắ'=>'Ắ','ắ'=>'ắ','Ằ'=>'Ằ','ằ'=>'ằ','Ẳ'=>'Ẳ','ẳ'=>'ẳ','Ẵ'=>'Ẵ','ẵ'=>'ẵ','Ặ'=>'Ặ','ặ'=>'ặ','Ẹ'=>'Ẹ','ẹ'=>'ẹ','Ẻ'=>'Ẻ','ẻ'=>'ẻ','Ẽ'=>'Ẽ','ẽ'=>'ẽ','Ế'=>'Ế','ế'=>'ế','Ề'=>'Ề','ề'=>'ề','Ể'=>'Ể','ể'=>'ể','Ễ'=>'Ễ','ễ'=>'ễ','Ệ'=>'Ệ','ệ'=>'ệ','Ỉ'=>'Ỉ','ỉ'=>'ỉ','Ị'=>'Ị','ị'=>'ị','Ọ'=>'Ọ','ọ'=>'ọ','Ỏ'=>'Ỏ','ỏ'=>'ỏ','Ố'=>'Ố','ố'=>'ố','Ồ'=>'Ồ','ồ'=>'ồ','Ổ'=>'Ổ','ổ'=>'ổ','Ỗ'=>'Ỗ','ỗ'=>'ỗ','Ộ'=>'Ộ','ộ'=>'ộ','Ớ'=>'Ớ','ớ'=>'ớ','Ờ'=>'Ờ','ờ'=>'ờ','Ở'=>'Ở','ở'=>'ở','Ỡ'=>'Ỡ','ỡ'=>'ỡ','Ợ'=>'Ợ','ợ'=>'ợ','Ụ'=>'Ụ','ụ'=>'ụ','Ủ'=>'Ủ','ủ'=>'ủ','Ứ'=>'Ứ','ứ'=>'ứ','Ừ'=>'Ừ','ừ'=>'ừ','Ử'=>'Ử','ử'=>'ử','Ữ'=>'Ữ','ữ'=>'ữ','Ự'=>'Ự','ự'=>'ự','Ỳ'=>'Ỳ','ỳ'=>'ỳ','Ỵ'=>'Ỵ','ỵ'=>'ỵ','Ỷ'=>'Ỷ','ỷ'=>'ỷ','Ỹ'=>'Ỹ','ỹ'=>'ỹ','ἀ'=>'ἀ','ἁ'=>'ἁ','ἂ'=>'ἂ','ἃ'=>'ἃ','ἄ'=>'ἄ','ἅ'=>'ἅ','ἆ'=>'ἆ','ἇ'=>'ἇ','Ἀ'=>'Ἀ','Ἁ'=>'Ἁ','Ἂ'=>'Ἂ','Ἃ'=>'Ἃ','Ἄ'=>'Ἄ','Ἅ'=>'Ἅ','Ἆ'=>'Ἆ','Ἇ'=>'Ἇ','ἐ'=>'ἐ','ἑ'=>'ἑ','ἒ'=>'ἒ','ἓ'=>'ἓ','ἔ'=>'ἔ','ἕ'=>'ἕ','Ἐ'=>'Ἐ','Ἑ'=>'Ἑ','Ἒ'=>'Ἒ','Ἓ'=>'Ἓ','Ἔ'=>'Ἔ','Ἕ'=>'Ἕ','ἠ'=>'ἠ','ἡ'=>'ἡ','ἢ'=>'ἢ','ἣ'=>'ἣ','ἤ'=>'ἤ','ἥ'=>'ἥ','ἦ'=>'ἦ','ἧ'=>'ἧ','Ἠ'=>'Ἠ','Ἡ'=>'Ἡ','Ἢ'=>'Ἢ','Ἣ'=>'Ἣ','Ἤ'=>'Ἤ','Ἥ'=>'Ἥ','Ἦ'=>'Ἦ','Ἧ'=>'Ἧ','ἰ'=>'ἰ','ἱ'=>'ἱ','ἲ'=>'ἲ','ἳ'=>'ἳ','ἴ'=>'ἴ','ἵ'=>'ἵ','ἶ'=>'ἶ','ἷ'=>'ἷ','Ἰ'=>'Ἰ','Ἱ'=>'Ἱ','Ἲ'=>'Ἲ','Ἳ'=>'Ἳ','Ἴ'=>'Ἴ','Ἵ'=>'Ἵ','Ἶ'=>'Ἶ','Ἷ'=>'Ἷ','ὀ'=>'ὀ','ὁ'=>'ὁ','ὂ'=>'ὂ','ὃ'=>'ὃ','ὄ'=>'ὄ','ὅ'=>'ὅ','Ὀ'=>'Ὀ','Ὁ'=>'Ὁ','Ὂ'=>'Ὂ','Ὃ'=>'Ὃ','Ὄ'=>'Ὄ','Ὅ'=>'Ὅ','ὐ'=>'ὐ','ὑ'=>'ὑ','ὒ'=>'ὒ','ὓ'=>'ὓ','ὔ'=>'ὔ','ὕ'=>'ὕ','ὖ'=>'ὖ','ὗ'=>'ὗ','Ὑ'=>'Ὑ','Ὓ'=>'Ὓ','Ὕ'=>'Ὕ','Ὗ'=>'Ὗ','ὠ'=>'ὠ','ὡ'=>'ὡ','ὢ'=>'ὢ','ὣ'=>'ὣ','ὤ'=>'ὤ','ὥ'=>'ὥ','ὦ'=>'ὦ','ὧ'=>'ὧ','Ὠ'=>'Ὠ','Ὡ'=>'Ὡ','Ὢ'=>'Ὢ','Ὣ'=>'Ὣ','Ὤ'=>'Ὤ','Ὥ'=>'Ὥ','Ὦ'=>'Ὦ','Ὧ'=>'Ὧ','ὰ'=>'ὰ','ά'=>'ά','ὲ'=>'ὲ','έ'=>'έ','ὴ'=>'ὴ','ή'=>'ή','ὶ'=>'ὶ','ί'=>'ί','ὸ'=>'ὸ','ό'=>'ό','ὺ'=>'ὺ','ύ'=>'ύ','ὼ'=>'ὼ','ώ'=>'ώ','ᾀ'=>'ᾀ','ᾁ'=>'ᾁ','ᾂ'=>'ᾂ','ᾃ'=>'ᾃ','ᾄ'=>'ᾄ','ᾅ'=>'ᾅ','ᾆ'=>'ᾆ','ᾇ'=>'ᾇ','ᾈ'=>'ᾈ','ᾉ'=>'ᾉ','ᾊ'=>'ᾊ','ᾋ'=>'ᾋ','ᾌ'=>'ᾌ','ᾍ'=>'ᾍ','ᾎ'=>'ᾎ','ᾏ'=>'ᾏ','ᾐ'=>'ᾐ','ᾑ'=>'ᾑ','ᾒ'=>'ᾒ','ᾓ'=>'ᾓ','ᾔ'=>'ᾔ','ᾕ'=>'ᾕ','ᾖ'=>'ᾖ','ᾗ'=>'ᾗ','ᾘ'=>'ᾘ','ᾙ'=>'ᾙ','ᾚ'=>'ᾚ','ᾛ'=>'ᾛ','ᾜ'=>'ᾜ','ᾝ'=>'ᾝ','ᾞ'=>'ᾞ','ᾟ'=>'ᾟ','ᾠ'=>'ᾠ','ᾡ'=>'ᾡ','ᾢ'=>'ᾢ','ᾣ'=>'ᾣ','ᾤ'=>'ᾤ','ᾥ'=>'ᾥ','ᾦ'=>'ᾦ','ᾧ'=>'ᾧ','ᾨ'=>'ᾨ','ᾩ'=>'ᾩ','ᾪ'=>'ᾪ','ᾫ'=>'ᾫ','ᾬ'=>'ᾬ','ᾭ'=>'ᾭ','ᾮ'=>'ᾮ','ᾯ'=>'ᾯ','ᾰ'=>'ᾰ','ᾱ'=>'ᾱ','ᾲ'=>'ᾲ','ᾳ'=>'ᾳ','ᾴ'=>'ᾴ','ᾶ'=>'ᾶ','ᾷ'=>'ᾷ','Ᾰ'=>'Ᾰ','Ᾱ'=>'Ᾱ','Ὰ'=>'Ὰ','Ά'=>'Ά','ᾼ'=>'ᾼ','᾽'=>' ̓','ι'=>'ι','᾿'=>' ̓','῀'=>' ͂','῁'=>' ̈͂','ῂ'=>'ῂ','ῃ'=>'ῃ','ῄ'=>'ῄ','ῆ'=>'ῆ','ῇ'=>'ῇ','Ὲ'=>'Ὲ','Έ'=>'Έ','Ὴ'=>'Ὴ','Ή'=>'Ή','ῌ'=>'ῌ','῍'=>' ̓̀','῎'=>' ̓́','῏'=>' ̓͂','ῐ'=>'ῐ','ῑ'=>'ῑ','ῒ'=>'ῒ','ΐ'=>'ΐ','ῖ'=>'ῖ','ῗ'=>'ῗ','Ῐ'=>'Ῐ','Ῑ'=>'Ῑ','Ὶ'=>'Ὶ','Ί'=>'Ί','῝'=>' ̔̀','῞'=>' ̔́','῟'=>' ̔͂','ῠ'=>'ῠ','ῡ'=>'ῡ','ῢ'=>'ῢ','ΰ'=>'ΰ','ῤ'=>'ῤ','ῥ'=>'ῥ','ῦ'=>'ῦ','ῧ'=>'ῧ','Ῠ'=>'Ῠ','Ῡ'=>'Ῡ','Ὺ'=>'Ὺ','Ύ'=>'Ύ','Ῥ'=>'Ῥ','῭'=>' ̈̀','΅'=>' ̈́','`'=>'`','ῲ'=>'ῲ','ῳ'=>'ῳ','ῴ'=>'ῴ','ῶ'=>'ῶ','ῷ'=>'ῷ','Ὸ'=>'Ὸ','Ό'=>'Ό','Ὼ'=>'Ὼ','Ώ'=>'Ώ','ῼ'=>'ῼ','´'=>' ́','῾'=>' ̔',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ','‑'=>'‐','‗'=>' ̳','․'=>'.','‥'=>'..','…'=>'...',' '=>' ','″'=>'′′','‴'=>'′′′','‶'=>'‵‵','‷'=>'‵‵‵','‼'=>'!!','‾'=>' ̅','⁇'=>'??','⁈'=>'?!','⁉'=>'!?','⁗'=>'′′′′',' '=>' ','⁰'=>'0','ⁱ'=>'i','⁴'=>'4','⁵'=>'5','⁶'=>'6','⁷'=>'7','⁸'=>'8','⁹'=>'9','⁺'=>'+','⁻'=>'−','⁼'=>'=','⁽'=>'(','⁾'=>')','ⁿ'=>'n','₀'=>'0','₁'=>'1','₂'=>'2','₃'=>'3','₄'=>'4','₅'=>'5','₆'=>'6','₇'=>'7','₈'=>'8','₉'=>'9','₊'=>'+','₋'=>'−','₌'=>'=','₍'=>'(','₎'=>')','ₐ'=>'a','ₑ'=>'e','ₒ'=>'o','ₓ'=>'x','ₔ'=>'ə','₨'=>'Rs','℀'=>'a/c','℁'=>'a/s','ℂ'=>'C','℃'=>'°C','℅'=>'c/o','℆'=>'c/u','ℇ'=>'Ɛ','℉'=>'°F','ℊ'=>'g','ℋ'=>'H','ℌ'=>'H','ℍ'=>'H','ℎ'=>'h','ℏ'=>'ħ','ℐ'=>'I','ℑ'=>'I','ℒ'=>'L','ℓ'=>'l','ℕ'=>'N','№'=>'No','ℙ'=>'P','ℚ'=>'Q','ℛ'=>'R','ℜ'=>'R','ℝ'=>'R','℠'=>'SM','℡'=>'TEL','™'=>'TM','ℤ'=>'Z','Ω'=>'Ω','ℨ'=>'Z','K'=>'K','Å'=>'Å','ℬ'=>'B','ℭ'=>'C','ℯ'=>'e','ℰ'=>'E','ℱ'=>'F','ℳ'=>'M','ℴ'=>'o','ℵ'=>'א','ℶ'=>'ב','ℷ'=>'ג','ℸ'=>'ד','ℹ'=>'i','℻'=>'FAX','ℼ'=>'π','ℽ'=>'γ','ℾ'=>'Γ','ℿ'=>'Π','⅀'=>'∑','ⅅ'=>'D','ⅆ'=>'d','ⅇ'=>'e','ⅈ'=>'i','ⅉ'=>'j','⅓'=>'1⁄3','⅔'=>'2⁄3','⅕'=>'1⁄5','⅖'=>'2⁄5','⅗'=>'3⁄5','⅘'=>'4⁄5','⅙'=>'1⁄6','⅚'=>'5⁄6','⅛'=>'1⁄8','⅜'=>'3⁄8','⅝'=>'5⁄8','⅞'=>'7⁄8','⅟'=>'1⁄','Ⅰ'=>'I','Ⅱ'=>'II','Ⅲ'=>'III','Ⅳ'=>'IV','Ⅴ'=>'V','Ⅵ'=>'VI','Ⅶ'=>'VII','Ⅷ'=>'VIII','Ⅸ'=>'IX','Ⅹ'=>'X','Ⅺ'=>'XI','Ⅻ'=>'XII','Ⅼ'=>'L','Ⅽ'=>'C','Ⅾ'=>'D','Ⅿ'=>'M','ⅰ'=>'i','ⅱ'=>'ii','ⅲ'=>'iii','ⅳ'=>'iv','ⅴ'=>'v','ⅵ'=>'vi','ⅶ'=>'vii','ⅷ'=>'viii','ⅸ'=>'ix','ⅹ'=>'x','ⅺ'=>'xi','ⅻ'=>'xii','ⅼ'=>'l','ⅽ'=>'c','ⅾ'=>'d','ⅿ'=>'m','↚'=>'↚','↛'=>'↛','↮'=>'↮','⇍'=>'⇍','⇎'=>'⇎','⇏'=>'⇏','∄'=>'∄','∉'=>'∉','∌'=>'∌','∤'=>'∤','∦'=>'∦','∬'=>'∫∫','∭'=>'∫∫∫','∯'=>'∮∮','∰'=>'∮∮∮','≁'=>'≁','≄'=>'≄','≇'=>'≇','≉'=>'≉','≠'=>'≠','≢'=>'≢','≭'=>'≭','≮'=>'≮','≯'=>'≯','≰'=>'≰','≱'=>'≱','≴'=>'≴','≵'=>'≵','≸'=>'≸','≹'=>'≹','⊀'=>'⊀','⊁'=>'⊁','⊄'=>'⊄','⊅'=>'⊅','⊈'=>'⊈','⊉'=>'⊉','⊬'=>'⊬','⊭'=>'⊭','⊮'=>'⊮','⊯'=>'⊯','⋠'=>'⋠','⋡'=>'⋡','⋢'=>'⋢','⋣'=>'⋣','⋪'=>'⋪','⋫'=>'⋫','⋬'=>'⋬','⋭'=>'⋭','〈'=>'〈','〉'=>'〉','①'=>'1','②'=>'2','③'=>'3','④'=>'4','⑤'=>'5','⑥'=>'6','⑦'=>'7','⑧'=>'8','⑨'=>'9','⑩'=>'10','⑪'=>'11','⑫'=>'12','⑬'=>'13','⑭'=>'14','⑮'=>'15','⑯'=>'16','⑰'=>'17','⑱'=>'18','⑲'=>'19','⑳'=>'20','⑴'=>'(1)','⑵'=>'(2)','⑶'=>'(3)','⑷'=>'(4)','⑸'=>'(5)','⑹'=>'(6)','⑺'=>'(7)','⑻'=>'(8)','⑼'=>'(9)','⑽'=>'(10)','⑾'=>'(11)','⑿'=>'(12)','⒀'=>'(13)','⒁'=>'(14)','⒂'=>'(15)','⒃'=>'(16)','⒄'=>'(17)','⒅'=>'(18)','⒆'=>'(19)','⒇'=>'(20)','⒈'=>'1.','⒉'=>'2.','⒊'=>'3.','⒋'=>'4.','⒌'=>'5.','⒍'=>'6.','⒎'=>'7.','⒏'=>'8.','⒐'=>'9.','⒑'=>'10.','⒒'=>'11.','⒓'=>'12.','⒔'=>'13.','⒕'=>'14.','⒖'=>'15.','⒗'=>'16.','⒘'=>'17.','⒙'=>'18.','⒚'=>'19.','⒛'=>'20.','⒜'=>'(a)','⒝'=>'(b)','⒞'=>'(c)','⒟'=>'(d)','⒠'=>'(e)','⒡'=>'(f)','⒢'=>'(g)','⒣'=>'(h)','⒤'=>'(i)','⒥'=>'(j)','⒦'=>'(k)','⒧'=>'(l)','⒨'=>'(m)','⒩'=>'(n)','⒪'=>'(o)','⒫'=>'(p)','⒬'=>'(q)','⒭'=>'(r)','⒮'=>'(s)','⒯'=>'(t)','⒰'=>'(u)','⒱'=>'(v)','⒲'=>'(w)','⒳'=>'(x)','⒴'=>'(y)','⒵'=>'(z)','Ⓐ'=>'A','Ⓑ'=>'B','Ⓒ'=>'C','Ⓓ'=>'D','Ⓔ'=>'E','Ⓕ'=>'F','Ⓖ'=>'G','Ⓗ'=>'H','Ⓘ'=>'I','Ⓙ'=>'J','Ⓚ'=>'K','Ⓛ'=>'L','Ⓜ'=>'M','Ⓝ'=>'N','Ⓞ'=>'O','Ⓟ'=>'P','Ⓠ'=>'Q','Ⓡ'=>'R','Ⓢ'=>'S','Ⓣ'=>'T','Ⓤ'=>'U','Ⓥ'=>'V','Ⓦ'=>'W','Ⓧ'=>'X','Ⓨ'=>'Y','Ⓩ'=>'Z','ⓐ'=>'a','ⓑ'=>'b','ⓒ'=>'c','ⓓ'=>'d','ⓔ'=>'e','ⓕ'=>'f','ⓖ'=>'g','ⓗ'=>'h','ⓘ'=>'i','ⓙ'=>'j','ⓚ'=>'k','ⓛ'=>'l','ⓜ'=>'m','ⓝ'=>'n','ⓞ'=>'o','ⓟ'=>'p','ⓠ'=>'q','ⓡ'=>'r','ⓢ'=>'s','ⓣ'=>'t','ⓤ'=>'u','ⓥ'=>'v','ⓦ'=>'w','ⓧ'=>'x','ⓨ'=>'y','ⓩ'=>'z','⓪'=>'0','⨌'=>'∫∫∫∫','⩴'=>'::=','⩵'=>'==','⩶'=>'===','⫝̸'=>'⫝̸','ⵯ'=>'ⵡ','⺟'=>'母','⻳'=>'龟','⼀'=>'一','⼁'=>'丨','⼂'=>'丶','⼃'=>'丿','⼄'=>'乙','⼅'=>'亅','⼆'=>'二','⼇'=>'亠','⼈'=>'人','⼉'=>'儿','⼊'=>'入','⼋'=>'八','⼌'=>'冂','⼍'=>'冖','⼎'=>'冫','⼏'=>'几','⼐'=>'凵','⼑'=>'刀','⼒'=>'力','⼓'=>'勹','⼔'=>'匕','⼕'=>'匚','⼖'=>'匸','⼗'=>'十','⼘'=>'卜','⼙'=>'卩','⼚'=>'厂','⼛'=>'厶','⼜'=>'又','⼝'=>'口','⼞'=>'囗','⼟'=>'土','⼠'=>'士','⼡'=>'夂','⼢'=>'夊','⼣'=>'夕','⼤'=>'大','⼥'=>'女','⼦'=>'子','⼧'=>'宀','⼨'=>'寸','⼩'=>'小','⼪'=>'尢','⼫'=>'尸','⼬'=>'屮','⼭'=>'山','⼮'=>'巛','⼯'=>'工','⼰'=>'己','⼱'=>'巾','⼲'=>'干','⼳'=>'幺','⼴'=>'广','⼵'=>'廴','⼶'=>'廾','⼷'=>'弋','⼸'=>'弓','⼹'=>'彐','⼺'=>'彡','⼻'=>'彳','⼼'=>'心','⼽'=>'戈','⼾'=>'戶','⼿'=>'手','⽀'=>'支','⽁'=>'攴','⽂'=>'文','⽃'=>'斗','⽄'=>'斤','⽅'=>'方','⽆'=>'无','⽇'=>'日','⽈'=>'曰','⽉'=>'月','⽊'=>'木','⽋'=>'欠','⽌'=>'止','⽍'=>'歹','⽎'=>'殳','⽏'=>'毋','⽐'=>'比','⽑'=>'毛','⽒'=>'氏','⽓'=>'气','⽔'=>'水','⽕'=>'火','⽖'=>'爪','⽗'=>'父','⽘'=>'爻','⽙'=>'爿','⽚'=>'片','⽛'=>'牙','⽜'=>'牛','⽝'=>'犬','⽞'=>'玄','⽟'=>'玉','⽠'=>'瓜','⽡'=>'瓦','⽢'=>'甘','⽣'=>'生','⽤'=>'用','⽥'=>'田','⽦'=>'疋','⽧'=>'疒','⽨'=>'癶','⽩'=>'白','⽪'=>'皮','⽫'=>'皿','⽬'=>'目','⽭'=>'矛','⽮'=>'矢','⽯'=>'石','⽰'=>'示','⽱'=>'禸','⽲'=>'禾','⽳'=>'穴','⽴'=>'立','⽵'=>'竹','⽶'=>'米','⽷'=>'糸','⽸'=>'缶','⽹'=>'网','⽺'=>'羊','⽻'=>'羽','⽼'=>'老','⽽'=>'而','⽾'=>'耒','⽿'=>'耳','⾀'=>'聿','⾁'=>'肉','⾂'=>'臣','⾃'=>'自','⾄'=>'至','⾅'=>'臼','⾆'=>'舌','⾇'=>'舛','⾈'=>'舟','⾉'=>'艮','⾊'=>'色','⾋'=>'艸','⾌'=>'虍','⾍'=>'虫','⾎'=>'血','⾏'=>'行','⾐'=>'衣','⾑'=>'襾','⾒'=>'見','⾓'=>'角','⾔'=>'言','⾕'=>'谷','⾖'=>'豆','⾗'=>'豕','⾘'=>'豸','⾙'=>'貝','⾚'=>'赤','⾛'=>'走','⾜'=>'足','⾝'=>'身','⾞'=>'車','⾟'=>'辛','⾠'=>'辰','⾡'=>'辵','⾢'=>'邑','⾣'=>'酉','⾤'=>'釆','⾥'=>'里','⾦'=>'金','⾧'=>'長','⾨'=>'門','⾩'=>'阜','⾪'=>'隶','⾫'=>'隹','⾬'=>'雨','⾭'=>'靑','⾮'=>'非','⾯'=>'面','⾰'=>'革','⾱'=>'韋','⾲'=>'韭','⾳'=>'音','⾴'=>'頁','⾵'=>'風','⾶'=>'飛','⾷'=>'食','⾸'=>'首','⾹'=>'香','⾺'=>'馬','⾻'=>'骨','⾼'=>'高','⾽'=>'髟','⾾'=>'鬥','⾿'=>'鬯','⿀'=>'鬲','⿁'=>'鬼','⿂'=>'魚','⿃'=>'鳥','⿄'=>'鹵','⿅'=>'鹿','⿆'=>'麥','⿇'=>'麻','⿈'=>'黃','⿉'=>'黍','⿊'=>'黑','⿋'=>'黹','⿌'=>'黽','⿍'=>'鼎','⿎'=>'鼓','⿏'=>'鼠','⿐'=>'鼻','⿑'=>'齊','⿒'=>'齒','⿓'=>'龍','⿔'=>'龜','⿕'=>'龠','　'=>' ','〶'=>'〒','〸'=>'十','〹'=>'卄','〺'=>'卅','が'=>'が','ぎ'=>'ぎ','ぐ'=>'ぐ','げ'=>'げ','ご'=>'ご','ざ'=>'ざ','じ'=>'じ','ず'=>'ず','ぜ'=>'ぜ','ぞ'=>'ぞ','だ'=>'だ','ぢ'=>'ぢ','づ'=>'づ','で'=>'で','ど'=>'ど','ば'=>'ば','ぱ'=>'ぱ','び'=>'び','ぴ'=>'ぴ','ぶ'=>'ぶ','ぷ'=>'ぷ','べ'=>'べ','ぺ'=>'ぺ','ぼ'=>'ぼ','ぽ'=>'ぽ','ゔ'=>'ゔ','゛'=>' ゙','゜'=>' ゚','ゞ'=>'ゞ','ゟ'=>'より','ガ'=>'ガ','ギ'=>'ギ','グ'=>'グ','ゲ'=>'ゲ','ゴ'=>'ゴ','ザ'=>'ザ','ジ'=>'ジ','ズ'=>'ズ','ゼ'=>'ゼ','ゾ'=>'ゾ','ダ'=>'ダ','ヂ'=>'ヂ','ヅ'=>'ヅ','デ'=>'デ','ド'=>'ド','バ'=>'バ','パ'=>'パ','ビ'=>'ビ','ピ'=>'ピ','ブ'=>'ブ','プ'=>'プ','ベ'=>'ベ','ペ'=>'ペ','ボ'=>'ボ','ポ'=>'ポ','ヴ'=>'ヴ','ヷ'=>'ヷ','ヸ'=>'ヸ','ヹ'=>'ヹ','ヺ'=>'ヺ','ヾ'=>'ヾ','ヿ'=>'コト','ㄱ'=>'ᄀ','ㄲ'=>'ᄁ','ㄳ'=>'ᆪ','ㄴ'=>'ᄂ','ㄵ'=>'ᆬ','ㄶ'=>'ᆭ','ㄷ'=>'ᄃ','ㄸ'=>'ᄄ','ㄹ'=>'ᄅ','ㄺ'=>'ᆰ','ㄻ'=>'ᆱ','ㄼ'=>'ᆲ','ㄽ'=>'ᆳ','ㄾ'=>'ᆴ','ㄿ'=>'ᆵ','ㅀ'=>'ᄚ','ㅁ'=>'ᄆ','ㅂ'=>'ᄇ','ㅃ'=>'ᄈ','ㅄ'=>'ᄡ','ㅅ'=>'ᄉ','ㅆ'=>'ᄊ','ㅇ'=>'ᄋ','ㅈ'=>'ᄌ','ㅉ'=>'ᄍ','ㅊ'=>'ᄎ','ㅋ'=>'ᄏ','ㅌ'=>'ᄐ','ㅍ'=>'ᄑ','ㅎ'=>'ᄒ','ㅏ'=>'ᅡ','ㅐ'=>'ᅢ','ㅑ'=>'ᅣ','ㅒ'=>'ᅤ','ㅓ'=>'ᅥ','ㅔ'=>'ᅦ','ㅕ'=>'ᅧ','ㅖ'=>'ᅨ','ㅗ'=>'ᅩ','ㅘ'=>'ᅪ','ㅙ'=>'ᅫ','ㅚ'=>'ᅬ','ㅛ'=>'ᅭ','ㅜ'=>'ᅮ','ㅝ'=>'ᅯ','ㅞ'=>'ᅰ','ㅟ'=>'ᅱ','ㅠ'=>'ᅲ','ㅡ'=>'ᅳ','ㅢ'=>'ᅴ','ㅣ'=>'ᅵ','ㅤ'=>'ᅠ','ㅥ'=>'ᄔ','ㅦ'=>'ᄕ','ㅧ'=>'ᇇ','ㅨ'=>'ᇈ','ㅩ'=>'ᇌ','ㅪ'=>'ᇎ','ㅫ'=>'ᇓ','ㅬ'=>'ᇗ','ㅭ'=>'ᇙ','ㅮ'=>'ᄜ','ㅯ'=>'ᇝ','ㅰ'=>'ᇟ','ㅱ'=>'ᄝ','ㅲ'=>'ᄞ','ㅳ'=>'ᄠ','ㅴ'=>'ᄢ','ㅵ'=>'ᄣ','ㅶ'=>'ᄧ','ㅷ'=>'ᄩ','ㅸ'=>'ᄫ','ㅹ'=>'ᄬ','ㅺ'=>'ᄭ','ㅻ'=>'ᄮ','ㅼ'=>'ᄯ','ㅽ'=>'ᄲ','ㅾ'=>'ᄶ','ㅿ'=>'ᅀ','ㆀ'=>'ᅇ','ㆁ'=>'ᅌ','ㆂ'=>'ᇱ','ㆃ'=>'ᇲ','ㆄ'=>'ᅗ','ㆅ'=>'ᅘ','ㆆ'=>'ᅙ','ㆇ'=>'ᆄ','ㆈ'=>'ᆅ','ㆉ'=>'ᆈ','ㆊ'=>'ᆑ','ㆋ'=>'ᆒ','ㆌ'=>'ᆔ','ㆍ'=>'ᆞ','ㆎ'=>'ᆡ','㆒'=>'一','㆓'=>'二','㆔'=>'三','㆕'=>'四','㆖'=>'上','㆗'=>'中','㆘'=>'下','㆙'=>'甲','㆚'=>'乙','㆛'=>'丙','㆜'=>'丁','㆝'=>'天','㆞'=>'地','㆟'=>'人','㈀'=>'(ᄀ)','㈁'=>'(ᄂ)','㈂'=>'(ᄃ)','㈃'=>'(ᄅ)','㈄'=>'(ᄆ)','㈅'=>'(ᄇ)','㈆'=>'(ᄉ)','㈇'=>'(ᄋ)','㈈'=>'(ᄌ)','㈉'=>'(ᄎ)','㈊'=>'(ᄏ)','㈋'=>'(ᄐ)','㈌'=>'(ᄑ)','㈍'=>'(ᄒ)','㈎'=>'(가)','㈏'=>'(나)','㈐'=>'(다)','㈑'=>'(라)','㈒'=>'(마)','㈓'=>'(바)','㈔'=>'(사)','㈕'=>'(아)','㈖'=>'(자)','㈗'=>'(차)','㈘'=>'(카)','㈙'=>'(타)','㈚'=>'(파)','㈛'=>'(하)','㈜'=>'(주)','㈝'=>'(오전)','㈞'=>'(오후)','㈠'=>'(一)','㈡'=>'(二)','㈢'=>'(三)','㈣'=>'(四)','㈤'=>'(五)','㈥'=>'(六)','㈦'=>'(七)','㈧'=>'(八)','㈨'=>'(九)','㈩'=>'(十)','㈪'=>'(月)','㈫'=>'(火)','㈬'=>'(水)','㈭'=>'(木)','㈮'=>'(金)','㈯'=>'(土)','㈰'=>'(日)','㈱'=>'(株)','㈲'=>'(有)','㈳'=>'(社)','㈴'=>'(名)','㈵'=>'(特)','㈶'=>'(財)','㈷'=>'(祝)','㈸'=>'(労)','㈹'=>'(代)','㈺'=>'(呼)','㈻'=>'(学)','㈼'=>'(監)','㈽'=>'(企)','㈾'=>'(資)','㈿'=>'(協)','㉀'=>'(祭)','㉁'=>'(休)','㉂'=>'(自)','㉃'=>'(至)','㉐'=>'PTE','㉑'=>'21','㉒'=>'22','㉓'=>'23','㉔'=>'24','㉕'=>'25','㉖'=>'26','㉗'=>'27','㉘'=>'28','㉙'=>'29','㉚'=>'30','㉛'=>'31','㉜'=>'32','㉝'=>'33','㉞'=>'34','㉟'=>'35','㉠'=>'ᄀ','㉡'=>'ᄂ','㉢'=>'ᄃ','㉣'=>'ᄅ','㉤'=>'ᄆ','㉥'=>'ᄇ','㉦'=>'ᄉ','㉧'=>'ᄋ','㉨'=>'ᄌ','㉩'=>'ᄎ','㉪'=>'ᄏ','㉫'=>'ᄐ','㉬'=>'ᄑ','㉭'=>'ᄒ','㉮'=>'가','㉯'=>'나','㉰'=>'다','㉱'=>'라','㉲'=>'마','㉳'=>'바','㉴'=>'사','㉵'=>'아','㉶'=>'자','㉷'=>'차','㉸'=>'카','㉹'=>'타','㉺'=>'파','㉻'=>'하','㉼'=>'참고','㉽'=>'주의','㉾'=>'우','㊀'=>'一','㊁'=>'二','㊂'=>'三','㊃'=>'四','㊄'=>'五','㊅'=>'六','㊆'=>'七','㊇'=>'八','㊈'=>'九','㊉'=>'十','㊊'=>'月','㊋'=>'火','㊌'=>'水','㊍'=>'木','㊎'=>'金','㊏'=>'土','㊐'=>'日','㊑'=>'株','㊒'=>'有','㊓'=>'社','㊔'=>'名','㊕'=>'特','㊖'=>'財','㊗'=>'祝','㊘'=>'労','㊙'=>'秘','㊚'=>'男','㊛'=>'女','㊜'=>'適','㊝'=>'優','㊞'=>'印','㊟'=>'注','㊠'=>'項','㊡'=>'休','㊢'=>'写','㊣'=>'正','㊤'=>'上','㊥'=>'中','㊦'=>'下','㊧'=>'左','㊨'=>'右','㊩'=>'医','㊪'=>'宗','㊫'=>'学','㊬'=>'監','㊭'=>'企','㊮'=>'資','㊯'=>'協','㊰'=>'夜','㊱'=>'36','㊲'=>'37','㊳'=>'38','㊴'=>'39','㊵'=>'40','㊶'=>'41','㊷'=>'42','㊸'=>'43','㊹'=>'44','㊺'=>'45','㊻'=>'46','㊼'=>'47','㊽'=>'48','㊾'=>'49','㊿'=>'50','㋀'=>'1月','㋁'=>'2月','㋂'=>'3月','㋃'=>'4月','㋄'=>'5月','㋅'=>'6月','㋆'=>'7月','㋇'=>'8月','㋈'=>'9月','㋉'=>'10月','㋊'=>'11月','㋋'=>'12月','㋌'=>'Hg','㋍'=>'erg','㋎'=>'eV','㋏'=>'LTD','㋐'=>'ア','㋑'=>'イ','㋒'=>'ウ','㋓'=>'エ','㋔'=>'オ','㋕'=>'カ','㋖'=>'キ','㋗'=>'ク','㋘'=>'ケ','㋙'=>'コ','㋚'=>'サ','㋛'=>'シ','㋜'=>'ス','㋝'=>'セ','㋞'=>'ソ','㋟'=>'タ','㋠'=>'チ','㋡'=>'ツ','㋢'=>'テ','㋣'=>'ト','㋤'=>'ナ','㋥'=>'ニ','㋦'=>'ヌ','㋧'=>'ネ','㋨'=>'ノ','㋩'=>'ハ','㋪'=>'ヒ','㋫'=>'フ','㋬'=>'ヘ','㋭'=>'ホ','㋮'=>'マ','㋯'=>'ミ','㋰'=>'ム','㋱'=>'メ','㋲'=>'モ','㋳'=>'ヤ','㋴'=>'ユ','㋵'=>'ヨ','㋶'=>'ラ','㋷'=>'リ','㋸'=>'ル','㋹'=>'レ','㋺'=>'ロ','㋻'=>'ワ','㋼'=>'ヰ','㋽'=>'ヱ','㋾'=>'ヲ','㌀'=>'アパート','㌁'=>'アルファ','㌂'=>'アンペア','㌃'=>'アール','㌄'=>'イニング','㌅'=>'インチ','㌆'=>'ウォン','㌇'=>'エスクード','㌈'=>'エーカー','㌉'=>'オンス','㌊'=>'オーム','㌋'=>'カイリ','㌌'=>'カラット','㌍'=>'カロリー','㌎'=>'ガロン','㌏'=>'ガンマ','㌐'=>'ギガ','㌑'=>'ギニー','㌒'=>'キュリー','㌓'=>'ギルダー','㌔'=>'キロ','㌕'=>'キログラム','㌖'=>'キロメートル','㌗'=>'キロワット','㌘'=>'グラム','㌙'=>'グラムトン','㌚'=>'クルゼイロ','㌛'=>'クローネ','㌜'=>'ケース','㌝'=>'コルナ','㌞'=>'コーポ','㌟'=>'サイクル','㌠'=>'サンチーム','㌡'=>'シリング','㌢'=>'センチ','㌣'=>'セント','㌤'=>'ダース','㌥'=>'デシ','㌦'=>'ドル','㌧'=>'トン','㌨'=>'ナノ','㌩'=>'ノット','㌪'=>'ハイツ','㌫'=>'パーセント','㌬'=>'パーツ','㌭'=>'バーレル','㌮'=>'ピアストル','㌯'=>'ピクル','㌰'=>'ピコ','㌱'=>'ビル','㌲'=>'ファラッド','㌳'=>'フィート','㌴'=>'ブッシェル','㌵'=>'フラン','㌶'=>'ヘクタール','㌷'=>'ペソ','㌸'=>'ペニヒ','㌹'=>'ヘルツ','㌺'=>'ペンス','㌻'=>'ページ','㌼'=>'ベータ','㌽'=>'ポイント','㌾'=>'ボルト','㌿'=>'ホン','㍀'=>'ポンド','㍁'=>'ホール','㍂'=>'ホーン','㍃'=>'マイクロ','㍄'=>'マイル','㍅'=>'マッハ','㍆'=>'マルク','㍇'=>'マンション','㍈'=>'ミクロン','㍉'=>'ミリ','㍊'=>'ミリバール','㍋'=>'メガ','㍌'=>'メガトン','㍍'=>'メートル','㍎'=>'ヤード','㍏'=>'ヤール','㍐'=>'ユアン','㍑'=>'リットル','㍒'=>'リラ','㍓'=>'ルピー','㍔'=>'ルーブル','㍕'=>'レム','㍖'=>'レントゲン','㍗'=>'ワット','㍘'=>'0点','㍙'=>'1点','㍚'=>'2点','㍛'=>'3点','㍜'=>'4点','㍝'=>'5点','㍞'=>'6点','㍟'=>'7点','㍠'=>'8点','㍡'=>'9点','㍢'=>'10点','㍣'=>'11点','㍤'=>'12点','㍥'=>'13点','㍦'=>'14点','㍧'=>'15点','㍨'=>'16点','㍩'=>'17点','㍪'=>'18点','㍫'=>'19点','㍬'=>'20点','㍭'=>'21点','㍮'=>'22点','㍯'=>'23点','㍰'=>'24点','㍱'=>'hPa','㍲'=>'da','㍳'=>'AU','㍴'=>'bar','㍵'=>'oV','㍶'=>'pc','㍷'=>'dm','㍸'=>'dm2','㍹'=>'dm3','㍺'=>'IU','㍻'=>'平成','㍼'=>'昭和','㍽'=>'大正','㍾'=>'明治','㍿'=>'株式会社','㎀'=>'pA','㎁'=>'nA','㎂'=>'μA','㎃'=>'mA','㎄'=>'kA','㎅'=>'KB','㎆'=>'MB','㎇'=>'GB','㎈'=>'cal','㎉'=>'kcal','㎊'=>'pF','㎋'=>'nF','㎌'=>'μF','㎍'=>'μg','㎎'=>'mg','㎏'=>'kg','㎐'=>'Hz','㎑'=>'kHz','㎒'=>'MHz','㎓'=>'GHz','㎔'=>'THz','㎕'=>'μl','㎖'=>'ml','㎗'=>'dl','㎘'=>'kl','㎙'=>'fm','㎚'=>'nm','㎛'=>'μm','㎜'=>'mm','㎝'=>'cm','㎞'=>'km','㎟'=>'mm2','㎠'=>'cm2','㎡'=>'m2','㎢'=>'km2','㎣'=>'mm3','㎤'=>'cm3','㎥'=>'m3','㎦'=>'km3','㎧'=>'m∕s','㎨'=>'m∕s2','㎩'=>'Pa','㎪'=>'kPa','㎫'=>'MPa','㎬'=>'GPa','㎭'=>'rad','㎮'=>'rad∕s','㎯'=>'rad∕s2','㎰'=>'ps','㎱'=>'ns','㎲'=>'μs','㎳'=>'ms','㎴'=>'pV','㎵'=>'nV','㎶'=>'μV','㎷'=>'mV','㎸'=>'kV','㎹'=>'MV','㎺'=>'pW','㎻'=>'nW','㎼'=>'μW','㎽'=>'mW','㎾'=>'kW','㎿'=>'MW','㏀'=>'kΩ','㏁'=>'MΩ','㏂'=>'a.m.','㏃'=>'Bq','㏄'=>'cc','㏅'=>'cd','㏆'=>'C∕kg','㏇'=>'Co.','㏈'=>'dB','㏉'=>'Gy','㏊'=>'ha','㏋'=>'HP','㏌'=>'in','㏍'=>'KK','㏎'=>'KM','㏏'=>'kt','㏐'=>'lm','㏑'=>'ln','㏒'=>'log','㏓'=>'lx','㏔'=>'mb','㏕'=>'mil','㏖'=>'mol','㏗'=>'PH','㏘'=>'p.m.','㏙'=>'PPM','㏚'=>'PR','㏛'=>'sr','㏜'=>'Sv','㏝'=>'Wb','㏞'=>'V∕m','㏟'=>'A∕m','㏠'=>'1日','㏡'=>'2日','㏢'=>'3日','㏣'=>'4日','㏤'=>'5日','㏥'=>'6日','㏦'=>'7日','㏧'=>'8日','㏨'=>'9日','㏩'=>'10日','㏪'=>'11日','㏫'=>'12日','㏬'=>'13日','㏭'=>'14日','㏮'=>'15日','㏯'=>'16日','㏰'=>'17日','㏱'=>'18日','㏲'=>'19日','㏳'=>'20日','㏴'=>'21日','㏵'=>'22日','㏶'=>'23日','㏷'=>'24日','㏸'=>'25日','㏹'=>'26日','㏺'=>'27日','㏻'=>'28日','㏼'=>'29日','㏽'=>'30日','㏾'=>'31日','㏿'=>'gal','豈'=>'豈','更'=>'更','車'=>'車','賈'=>'賈','滑'=>'滑','串'=>'串','句'=>'句','龜'=>'龜','龜'=>'龜','契'=>'契','金'=>'金','喇'=>'喇','奈'=>'奈','懶'=>'懶','癩'=>'癩','羅'=>'羅','蘿'=>'蘿','螺'=>'螺','裸'=>'裸','邏'=>'邏','樂'=>'樂','洛'=>'洛','烙'=>'烙','珞'=>'珞','落'=>'落','酪'=>'酪','駱'=>'駱','亂'=>'亂','卵'=>'卵','欄'=>'欄','爛'=>'爛','蘭'=>'蘭','鸞'=>'鸞','嵐'=>'嵐','濫'=>'濫','藍'=>'藍','襤'=>'襤','拉'=>'拉','臘'=>'臘','蠟'=>'蠟','廊'=>'廊','朗'=>'朗','浪'=>'浪','狼'=>'狼','郎'=>'郎','來'=>'來','冷'=>'冷','勞'=>'勞','擄'=>'擄','櫓'=>'櫓','爐'=>'爐','盧'=>'盧','老'=>'老','蘆'=>'蘆','虜'=>'虜','路'=>'路','露'=>'露','魯'=>'魯','鷺'=>'鷺','碌'=>'碌','祿'=>'祿','綠'=>'綠','菉'=>'菉','錄'=>'錄','鹿'=>'鹿','論'=>'論','壟'=>'壟','弄'=>'弄','籠'=>'籠','聾'=>'聾','牢'=>'牢','磊'=>'磊','賂'=>'賂','雷'=>'雷','壘'=>'壘','屢'=>'屢','樓'=>'樓','淚'=>'淚','漏'=>'漏','累'=>'累','縷'=>'縷','陋'=>'陋','勒'=>'勒','肋'=>'肋','凜'=>'凜','凌'=>'凌','稜'=>'稜','綾'=>'綾','菱'=>'菱','陵'=>'陵','讀'=>'讀','拏'=>'拏','樂'=>'樂','諾'=>'諾','丹'=>'丹','寧'=>'寧','怒'=>'怒','率'=>'率','異'=>'異','北'=>'北','磻'=>'磻','便'=>'便','復'=>'復','不'=>'不','泌'=>'泌','數'=>'數','索'=>'索','參'=>'參','塞'=>'塞','省'=>'省','葉'=>'葉','說'=>'說','殺'=>'殺','辰'=>'辰','沈'=>'沈','拾'=>'拾','若'=>'若','掠'=>'掠','略'=>'略','亮'=>'亮','兩'=>'兩','凉'=>'凉','梁'=>'梁','糧'=>'糧','良'=>'良','諒'=>'諒','量'=>'量','勵'=>'勵','呂'=>'呂','女'=>'女','廬'=>'廬','旅'=>'旅','濾'=>'濾','礪'=>'礪','閭'=>'閭','驪'=>'驪','麗'=>'麗','黎'=>'黎','力'=>'力','曆'=>'曆','歷'=>'歷','轢'=>'轢','年'=>'年','憐'=>'憐','戀'=>'戀','撚'=>'撚','漣'=>'漣','煉'=>'煉','璉'=>'璉','秊'=>'秊','練'=>'練','聯'=>'聯','輦'=>'輦','蓮'=>'蓮','連'=>'連','鍊'=>'鍊','列'=>'列','劣'=>'劣','咽'=>'咽','烈'=>'烈','裂'=>'裂','說'=>'說','廉'=>'廉','念'=>'念','捻'=>'捻','殮'=>'殮','簾'=>'簾','獵'=>'獵','令'=>'令','囹'=>'囹','寧'=>'寧','嶺'=>'嶺','怜'=>'怜','玲'=>'玲','瑩'=>'瑩','羚'=>'羚','聆'=>'聆','鈴'=>'鈴','零'=>'零','靈'=>'靈','領'=>'領','例'=>'例','禮'=>'禮','醴'=>'醴','隸'=>'隸','惡'=>'惡','了'=>'了','僚'=>'僚','寮'=>'寮','尿'=>'尿','料'=>'料','樂'=>'樂','燎'=>'燎','療'=>'療','蓼'=>'蓼','遼'=>'遼','龍'=>'龍','暈'=>'暈','阮'=>'阮','劉'=>'劉','杻'=>'杻','柳'=>'柳','流'=>'流','溜'=>'溜','琉'=>'琉','留'=>'留','硫'=>'硫','紐'=>'紐','類'=>'類','六'=>'六','戮'=>'戮','陸'=>'陸','倫'=>'倫','崙'=>'崙','淪'=>'淪','輪'=>'輪','律'=>'律','慄'=>'慄','栗'=>'栗','率'=>'率','隆'=>'隆','利'=>'利','吏'=>'吏','履'=>'履','易'=>'易','李'=>'李','梨'=>'梨','泥'=>'泥','理'=>'理','痢'=>'痢','罹'=>'罹','裏'=>'裏','裡'=>'裡','里'=>'里','離'=>'離','匿'=>'匿','溺'=>'溺','吝'=>'吝','燐'=>'燐','璘'=>'璘','藺'=>'藺','隣'=>'隣','鱗'=>'鱗','麟'=>'麟','林'=>'林','淋'=>'淋','臨'=>'臨','立'=>'立','笠'=>'笠','粒'=>'粒','狀'=>'狀','炙'=>'炙','識'=>'識','什'=>'什','茶'=>'茶','刺'=>'刺','切'=>'切','度'=>'度','拓'=>'拓','糖'=>'糖','宅'=>'宅','洞'=>'洞','暴'=>'暴','輻'=>'輻','行'=>'行','降'=>'降','見'=>'見','廓'=>'廓','兀'=>'兀','嗀'=>'嗀','塚'=>'塚','晴'=>'晴','凞'=>'凞','猪'=>'猪','益'=>'益','礼'=>'礼','神'=>'神','祥'=>'祥','福'=>'福','靖'=>'靖','精'=>'精','羽'=>'羽','蘒'=>'蘒','諸'=>'諸','逸'=>'逸','都'=>'都','飯'=>'飯','飼'=>'飼','館'=>'館','鶴'=>'鶴','侮'=>'侮','僧'=>'僧','免'=>'免','勉'=>'勉','勤'=>'勤','卑'=>'卑','喝'=>'喝','嘆'=>'嘆','器'=>'器','塀'=>'塀','墨'=>'墨','層'=>'層','屮'=>'屮','悔'=>'悔','慨'=>'慨','憎'=>'憎','懲'=>'懲','敏'=>'敏','既'=>'既','暑'=>'暑','梅'=>'梅','海'=>'海','渚'=>'渚','漢'=>'漢','煮'=>'煮','爫'=>'爫','琢'=>'琢','碑'=>'碑','社'=>'社','祉'=>'祉','祈'=>'祈','祐'=>'祐','祖'=>'祖','祝'=>'祝','禍'=>'禍','禎'=>'禎','穀'=>'穀','突'=>'突','節'=>'節','練'=>'練','縉'=>'縉','繁'=>'繁','署'=>'署','者'=>'者','臭'=>'臭','艹'=>'艹','艹'=>'艹','著'=>'著','褐'=>'褐','視'=>'視','謁'=>'謁','謹'=>'謹','賓'=>'賓','贈'=>'贈','辶'=>'辶','逸'=>'逸','難'=>'難','響'=>'響','頻'=>'頻','並'=>'並','况'=>'况','全'=>'全','侀'=>'侀','充'=>'充','冀'=>'冀','勇'=>'勇','勺'=>'勺','喝'=>'喝','啕'=>'啕','喙'=>'喙','嗢'=>'嗢','塚'=>'塚','墳'=>'墳','奄'=>'奄','奔'=>'奔','婢'=>'婢','嬨'=>'嬨','廒'=>'廒','廙'=>'廙','彩'=>'彩','徭'=>'徭','惘'=>'惘','慎'=>'慎','愈'=>'愈','憎'=>'憎','慠'=>'慠','懲'=>'懲','戴'=>'戴','揄'=>'揄','搜'=>'搜','摒'=>'摒','敖'=>'敖','晴'=>'晴','朗'=>'朗','望'=>'望','杖'=>'杖','歹'=>'歹','殺'=>'殺','流'=>'流','滛'=>'滛','滋'=>'滋','漢'=>'漢','瀞'=>'瀞','煮'=>'煮','瞧'=>'瞧','爵'=>'爵','犯'=>'犯','猪'=>'猪','瑱'=>'瑱','甆'=>'甆','画'=>'画','瘝'=>'瘝','瘟'=>'瘟','益'=>'益','盛'=>'盛','直'=>'直','睊'=>'睊','着'=>'着','磌'=>'磌','窱'=>'窱','節'=>'節','类'=>'类','絛'=>'絛','練'=>'練','缾'=>'缾','者'=>'者','荒'=>'荒','華'=>'華','蝹'=>'蝹','襁'=>'襁','覆'=>'覆','視'=>'視','調'=>'調','諸'=>'諸','請'=>'請','謁'=>'謁','諾'=>'諾','諭'=>'諭','謹'=>'謹','變'=>'變','贈'=>'贈','輸'=>'輸','遲'=>'遲','醙'=>'醙','鉶'=>'鉶','陼'=>'陼','難'=>'難','靖'=>'靖','韛'=>'韛','響'=>'響','頋'=>'頋','頻'=>'頻','鬒'=>'鬒','龜'=>'龜','𢡊'=>'𢡊','𢡄'=>'𢡄','𣏕'=>'𣏕','㮝'=>'㮝','䀘'=>'䀘','䀹'=>'䀹','𥉉'=>'𥉉','𥳐'=>'𥳐','𧻓'=>'𧻓','齃'=>'齃','龎'=>'龎','ﬀ'=>'ff','ﬁ'=>'fi','ﬂ'=>'fl','ﬃ'=>'ffi','ﬄ'=>'ffl','ﬅ'=>'st','ﬆ'=>'st','ﬓ'=>'մն','ﬔ'=>'մե','ﬕ'=>'մի','ﬖ'=>'վն','ﬗ'=>'մխ','יִ'=>'יִ','ײַ'=>'ײַ','ﬠ'=>'ע','ﬡ'=>'א','ﬢ'=>'ד','ﬣ'=>'ה','ﬤ'=>'כ','ﬥ'=>'ל','ﬦ'=>'ם','ﬧ'=>'ר','ﬨ'=>'ת','﬩'=>'+','שׁ'=>'שׁ','שׂ'=>'שׂ','שּׁ'=>'שּׁ','שּׂ'=>'שּׂ','אַ'=>'אַ','אָ'=>'אָ','אּ'=>'אּ','בּ'=>'בּ','גּ'=>'גּ','דּ'=>'דּ','הּ'=>'הּ','וּ'=>'וּ','זּ'=>'זּ','טּ'=>'טּ','יּ'=>'יּ','ךּ'=>'ךּ','כּ'=>'כּ','לּ'=>'לּ','מּ'=>'מּ','נּ'=>'נּ','סּ'=>'סּ','ףּ'=>'ףּ','פּ'=>'פּ','צּ'=>'צּ','קּ'=>'קּ','רּ'=>'רּ','שּ'=>'שּ','תּ'=>'תּ','וֹ'=>'וֹ','בֿ'=>'בֿ','כֿ'=>'כֿ','פֿ'=>'פֿ','ﭏ'=>'אל','ﭐ'=>'ٱ','ﭑ'=>'ٱ','ﭒ'=>'ٻ','ﭓ'=>'ٻ','ﭔ'=>'ٻ','ﭕ'=>'ٻ','ﭖ'=>'پ','ﭗ'=>'پ','ﭘ'=>'پ','ﭙ'=>'پ','ﭚ'=>'ڀ','ﭛ'=>'ڀ','ﭜ'=>'ڀ','ﭝ'=>'ڀ','ﭞ'=>'ٺ','ﭟ'=>'ٺ','ﭠ'=>'ٺ','ﭡ'=>'ٺ','ﭢ'=>'ٿ','ﭣ'=>'ٿ','ﭤ'=>'ٿ','ﭥ'=>'ٿ','ﭦ'=>'ٹ','ﭧ'=>'ٹ','ﭨ'=>'ٹ','ﭩ'=>'ٹ','ﭪ'=>'ڤ','ﭫ'=>'ڤ','ﭬ'=>'ڤ','ﭭ'=>'ڤ','ﭮ'=>'ڦ','ﭯ'=>'ڦ','ﭰ'=>'ڦ','ﭱ'=>'ڦ','ﭲ'=>'ڄ','ﭳ'=>'ڄ','ﭴ'=>'ڄ','ﭵ'=>'ڄ','ﭶ'=>'ڃ','ﭷ'=>'ڃ','ﭸ'=>'ڃ','ﭹ'=>'ڃ','ﭺ'=>'چ','ﭻ'=>'چ','ﭼ'=>'چ','ﭽ'=>'چ','ﭾ'=>'ڇ','ﭿ'=>'ڇ','ﮀ'=>'ڇ','ﮁ'=>'ڇ','ﮂ'=>'ڍ','ﮃ'=>'ڍ','ﮄ'=>'ڌ','ﮅ'=>'ڌ','ﮆ'=>'ڎ','ﮇ'=>'ڎ','ﮈ'=>'ڈ','ﮉ'=>'ڈ','ﮊ'=>'ژ','ﮋ'=>'ژ','ﮌ'=>'ڑ','ﮍ'=>'ڑ','ﮎ'=>'ک','ﮏ'=>'ک','ﮐ'=>'ک','ﮑ'=>'ک','ﮒ'=>'گ','ﮓ'=>'گ','ﮔ'=>'گ','ﮕ'=>'گ','ﮖ'=>'ڳ','ﮗ'=>'ڳ','ﮘ'=>'ڳ','ﮙ'=>'ڳ','ﮚ'=>'ڱ','ﮛ'=>'ڱ','ﮜ'=>'ڱ','ﮝ'=>'ڱ','ﮞ'=>'ں','ﮟ'=>'ں','ﮠ'=>'ڻ','ﮡ'=>'ڻ','ﮢ'=>'ڻ','ﮣ'=>'ڻ','ﮤ'=>'ۀ','ﮥ'=>'ۀ','ﮦ'=>'ہ','ﮧ'=>'ہ','ﮨ'=>'ہ','ﮩ'=>'ہ','ﮪ'=>'ھ','ﮫ'=>'ھ','ﮬ'=>'ھ','ﮭ'=>'ھ','ﮮ'=>'ے','ﮯ'=>'ے','ﮰ'=>'ۓ','ﮱ'=>'ۓ','ﯓ'=>'ڭ','ﯔ'=>'ڭ','ﯕ'=>'ڭ','ﯖ'=>'ڭ','ﯗ'=>'ۇ','ﯘ'=>'ۇ','ﯙ'=>'ۆ','ﯚ'=>'ۆ','ﯛ'=>'ۈ','ﯜ'=>'ۈ','ﯝ'=>'ۇٴ','ﯞ'=>'ۋ','ﯟ'=>'ۋ','ﯠ'=>'ۅ','ﯡ'=>'ۅ','ﯢ'=>'ۉ','ﯣ'=>'ۉ','ﯤ'=>'ې','ﯥ'=>'ې','ﯦ'=>'ې','ﯧ'=>'ې','ﯨ'=>'ى','ﯩ'=>'ى','ﯪ'=>'ئا','ﯫ'=>'ئا','ﯬ'=>'ئە','ﯭ'=>'ئە','ﯮ'=>'ئو','ﯯ'=>'ئو','ﯰ'=>'ئۇ','ﯱ'=>'ئۇ','ﯲ'=>'ئۆ','ﯳ'=>'ئۆ','ﯴ'=>'ئۈ','ﯵ'=>'ئۈ','ﯶ'=>'ئې','ﯷ'=>'ئې','ﯸ'=>'ئې','ﯹ'=>'ئى','ﯺ'=>'ئى','ﯻ'=>'ئى','ﯼ'=>'ی','ﯽ'=>'ی','ﯾ'=>'ی','ﯿ'=>'ی','ﰀ'=>'ئج','ﰁ'=>'ئح','ﰂ'=>'ئم','ﰃ'=>'ئى','ﰄ'=>'ئي','ﰅ'=>'بج','ﰆ'=>'بح','ﰇ'=>'بخ','ﰈ'=>'بم','ﰉ'=>'بى','ﰊ'=>'بي','ﰋ'=>'تج','ﰌ'=>'تح','ﰍ'=>'تخ','ﰎ'=>'تم','ﰏ'=>'تى','ﰐ'=>'تي','ﰑ'=>'ثج','ﰒ'=>'ثم','ﰓ'=>'ثى','ﰔ'=>'ثي','ﰕ'=>'جح','ﰖ'=>'جم','ﰗ'=>'حج','ﰘ'=>'حم','ﰙ'=>'خج','ﰚ'=>'خح','ﰛ'=>'خم','ﰜ'=>'سج','ﰝ'=>'سح','ﰞ'=>'سخ','ﰟ'=>'سم','ﰠ'=>'صح','ﰡ'=>'صم','ﰢ'=>'ضج','ﰣ'=>'ضح','ﰤ'=>'ضخ','ﰥ'=>'ضم','ﰦ'=>'طح','ﰧ'=>'طم','ﰨ'=>'ظم','ﰩ'=>'عج','ﰪ'=>'عم','ﰫ'=>'غج','ﰬ'=>'غم','ﰭ'=>'فج','ﰮ'=>'فح','ﰯ'=>'فخ','ﰰ'=>'فم','ﰱ'=>'فى','ﰲ'=>'في','ﰳ'=>'قح','ﰴ'=>'قم','ﰵ'=>'قى','ﰶ'=>'قي','ﰷ'=>'كا','ﰸ'=>'كج','ﰹ'=>'كح','ﰺ'=>'كخ','ﰻ'=>'كل','ﰼ'=>'كم','ﰽ'=>'كى','ﰾ'=>'كي','ﰿ'=>'لج','ﱀ'=>'لح','ﱁ'=>'لخ','ﱂ'=>'لم','ﱃ'=>'لى','ﱄ'=>'لي','ﱅ'=>'مج','ﱆ'=>'مح','ﱇ'=>'مخ','ﱈ'=>'مم','ﱉ'=>'مى','ﱊ'=>'مي','ﱋ'=>'نج','ﱌ'=>'نح','ﱍ'=>'نخ','ﱎ'=>'نم','ﱏ'=>'نى','ﱐ'=>'ني','ﱑ'=>'هج','ﱒ'=>'هم','ﱓ'=>'هى','ﱔ'=>'هي','ﱕ'=>'يج','ﱖ'=>'يح','ﱗ'=>'يخ','ﱘ'=>'يم','ﱙ'=>'يى','ﱚ'=>'يي','ﱛ'=>'ذٰ','ﱜ'=>'رٰ','ﱝ'=>'ىٰ','ﱞ'=>' ٌّ','ﱟ'=>' ٍّ','ﱠ'=>' َّ','ﱡ'=>' ُّ','ﱢ'=>' ِّ','ﱣ'=>' ّٰ','ﱤ'=>'ئر','ﱥ'=>'ئز','ﱦ'=>'ئم','ﱧ'=>'ئن','ﱨ'=>'ئى','ﱩ'=>'ئي','ﱪ'=>'بر','ﱫ'=>'بز','ﱬ'=>'بم','ﱭ'=>'بن','ﱮ'=>'بى','ﱯ'=>'بي','ﱰ'=>'تر','ﱱ'=>'تز','ﱲ'=>'تم','ﱳ'=>'تن','ﱴ'=>'تى','ﱵ'=>'تي','ﱶ'=>'ثر','ﱷ'=>'ثز','ﱸ'=>'ثم','ﱹ'=>'ثن','ﱺ'=>'ثى','ﱻ'=>'ثي','ﱼ'=>'فى','ﱽ'=>'في','ﱾ'=>'قى','ﱿ'=>'قي','ﲀ'=>'كا','ﲁ'=>'كل','ﲂ'=>'كم','ﲃ'=>'كى','ﲄ'=>'كي','ﲅ'=>'لم','ﲆ'=>'لى','ﲇ'=>'لي','ﲈ'=>'ما','ﲉ'=>'مم','ﲊ'=>'نر','ﲋ'=>'نز','ﲌ'=>'نم','ﲍ'=>'نن','ﲎ'=>'نى','ﲏ'=>'ني','ﲐ'=>'ىٰ','ﲑ'=>'ير','ﲒ'=>'يز','ﲓ'=>'يم','ﲔ'=>'ين','ﲕ'=>'يى','ﲖ'=>'يي','ﲗ'=>'ئج','ﲘ'=>'ئح','ﲙ'=>'ئخ','ﲚ'=>'ئم','ﲛ'=>'ئه','ﲜ'=>'بج','ﲝ'=>'بح','ﲞ'=>'بخ','ﲟ'=>'بم','ﲠ'=>'به','ﲡ'=>'تج','ﲢ'=>'تح','ﲣ'=>'تخ','ﲤ'=>'تم','ﲥ'=>'ته','ﲦ'=>'ثم','ﲧ'=>'جح','ﲨ'=>'جم','ﲩ'=>'حج','ﲪ'=>'حم','ﲫ'=>'خج','ﲬ'=>'خم','ﲭ'=>'سج','ﲮ'=>'سح','ﲯ'=>'سخ','ﲰ'=>'سم','ﲱ'=>'صح','ﲲ'=>'صخ','ﲳ'=>'صم','ﲴ'=>'ضج','ﲵ'=>'ضح','ﲶ'=>'ضخ','ﲷ'=>'ضم','ﲸ'=>'طح','ﲹ'=>'ظم','ﲺ'=>'عج','ﲻ'=>'عم','ﲼ'=>'غج','ﲽ'=>'غم','ﲾ'=>'فج','ﲿ'=>'فح','ﳀ'=>'فخ','ﳁ'=>'فم','ﳂ'=>'قح','ﳃ'=>'قم','ﳄ'=>'كج','ﳅ'=>'كح','ﳆ'=>'كخ','ﳇ'=>'كل','ﳈ'=>'كم','ﳉ'=>'لج','ﳊ'=>'لح','ﳋ'=>'لخ','ﳌ'=>'لم','ﳍ'=>'له','ﳎ'=>'مج','ﳏ'=>'مح','ﳐ'=>'مخ','ﳑ'=>'مم','ﳒ'=>'نج','ﳓ'=>'نح','ﳔ'=>'نخ','ﳕ'=>'نم','ﳖ'=>'نه','ﳗ'=>'هج','ﳘ'=>'هم','ﳙ'=>'هٰ','ﳚ'=>'يج','ﳛ'=>'يح','ﳜ'=>'يخ','ﳝ'=>'يم','ﳞ'=>'يه','ﳟ'=>'ئم','ﳠ'=>'ئه','ﳡ'=>'بم','ﳢ'=>'به','ﳣ'=>'تم','ﳤ'=>'ته','ﳥ'=>'ثم','ﳦ'=>'ثه','ﳧ'=>'سم','ﳨ'=>'سه','ﳩ'=>'شم','ﳪ'=>'شه','ﳫ'=>'كل','ﳬ'=>'كم','ﳭ'=>'لم','ﳮ'=>'نم','ﳯ'=>'نه','ﳰ'=>'يم','ﳱ'=>'يه','ﳲ'=>'ـَّ','ﳳ'=>'ـُّ','ﳴ'=>'ـِّ','ﳵ'=>'طى','ﳶ'=>'طي','ﳷ'=>'عى','ﳸ'=>'عي','ﳹ'=>'غى','ﳺ'=>'غي','ﳻ'=>'سى','ﳼ'=>'سي','ﳽ'=>'شى','ﳾ'=>'شي','ﳿ'=>'حى','ﴀ'=>'حي','ﴁ'=>'جى','ﴂ'=>'جي','ﴃ'=>'خى','ﴄ'=>'خي','ﴅ'=>'صى','ﴆ'=>'صي','ﴇ'=>'ضى','ﴈ'=>'ضي','ﴉ'=>'شج','ﴊ'=>'شح','ﴋ'=>'شخ','ﴌ'=>'شم','ﴍ'=>'شر','ﴎ'=>'سر','ﴏ'=>'صر','ﴐ'=>'ضر','ﴑ'=>'طى','ﴒ'=>'طي','ﴓ'=>'عى','ﴔ'=>'عي','ﴕ'=>'غى','ﴖ'=>'غي','ﴗ'=>'سى','ﴘ'=>'سي','ﴙ'=>'شى','ﴚ'=>'شي','ﴛ'=>'حى','ﴜ'=>'حي','ﴝ'=>'جى','ﴞ'=>'جي','ﴟ'=>'خى','ﴠ'=>'خي','ﴡ'=>'صى','ﴢ'=>'صي','ﴣ'=>'ضى','ﴤ'=>'ضي','ﴥ'=>'شج','ﴦ'=>'شح','ﴧ'=>'شخ','ﴨ'=>'شم','ﴩ'=>'شر','ﴪ'=>'سر','ﴫ'=>'صر','ﴬ'=>'ضر','ﴭ'=>'شج','ﴮ'=>'شح','ﴯ'=>'شخ','ﴰ'=>'شم','ﴱ'=>'سه','ﴲ'=>'شه','ﴳ'=>'طم','ﴴ'=>'سج','ﴵ'=>'سح','ﴶ'=>'سخ','ﴷ'=>'شج','ﴸ'=>'شح','ﴹ'=>'شخ','ﴺ'=>'طم','ﴻ'=>'ظم','ﴼ'=>'اً','ﴽ'=>'اً','ﵐ'=>'تجم','ﵑ'=>'تحج','ﵒ'=>'تحج','ﵓ'=>'تحم','ﵔ'=>'تخم','ﵕ'=>'تمج','ﵖ'=>'تمح','ﵗ'=>'تمخ','ﵘ'=>'جمح','ﵙ'=>'جمح','ﵚ'=>'حمي','ﵛ'=>'حمى','ﵜ'=>'سحج','ﵝ'=>'سجح','ﵞ'=>'سجى','ﵟ'=>'سمح','ﵠ'=>'سمح','ﵡ'=>'سمج','ﵢ'=>'سمم','ﵣ'=>'سمم','ﵤ'=>'صحح','ﵥ'=>'صحح','ﵦ'=>'صمم','ﵧ'=>'شحم','ﵨ'=>'شحم','ﵩ'=>'شجي','ﵪ'=>'شمخ','ﵫ'=>'شمخ','ﵬ'=>'شمم','ﵭ'=>'شمم','ﵮ'=>'ضحى','ﵯ'=>'ضخم','ﵰ'=>'ضخم','ﵱ'=>'طمح','ﵲ'=>'طمح','ﵳ'=>'طمم','ﵴ'=>'طمي','ﵵ'=>'عجم','ﵶ'=>'عمم','ﵷ'=>'عمم','ﵸ'=>'عمى','ﵹ'=>'غمم','ﵺ'=>'غمي','ﵻ'=>'غمى','ﵼ'=>'فخم','ﵽ'=>'فخم','ﵾ'=>'قمح','ﵿ'=>'قمم','ﶀ'=>'لحم','ﶁ'=>'لحي','ﶂ'=>'لحى','ﶃ'=>'لجج','ﶄ'=>'لجج','ﶅ'=>'لخم','ﶆ'=>'لخم','ﶇ'=>'لمح','ﶈ'=>'لمح','ﶉ'=>'محج','ﶊ'=>'محم','ﶋ'=>'محي','ﶌ'=>'مجح','ﶍ'=>'مجم','ﶎ'=>'مخج','ﶏ'=>'مخم','ﶒ'=>'مجخ','ﶓ'=>'همج','ﶔ'=>'همم','ﶕ'=>'نحم','ﶖ'=>'نحى','ﶗ'=>'نجم','ﶘ'=>'نجم','ﶙ'=>'نجى','ﶚ'=>'نمي','ﶛ'=>'نمى','ﶜ'=>'يمم','ﶝ'=>'يمم','ﶞ'=>'بخي','ﶟ'=>'تجي','ﶠ'=>'تجى','ﶡ'=>'تخي','ﶢ'=>'تخى','ﶣ'=>'تمي','ﶤ'=>'تمى','ﶥ'=>'جمي','ﶦ'=>'جحى','ﶧ'=>'جمى','ﶨ'=>'سخى','ﶩ'=>'صحي','ﶪ'=>'شحي','ﶫ'=>'ضحي','ﶬ'=>'لجي','ﶭ'=>'لمي','ﶮ'=>'يحي','ﶯ'=>'يجي','ﶰ'=>'يمي','ﶱ'=>'ممي','ﶲ'=>'قمي','ﶳ'=>'نحي','ﶴ'=>'قمح','ﶵ'=>'لحم','ﶶ'=>'عمي','ﶷ'=>'كمي','ﶸ'=>'نجح','ﶹ'=>'مخي','ﶺ'=>'لجم','ﶻ'=>'كمم','ﶼ'=>'لجم','ﶽ'=>'نجح','ﶾ'=>'جحي','ﶿ'=>'حجي','ﷀ'=>'مجي','ﷁ'=>'فمي','ﷂ'=>'بحي','ﷃ'=>'كمم','ﷄ'=>'عجم','ﷅ'=>'صمم','ﷆ'=>'سخي','ﷇ'=>'نجي','ﷰ'=>'صلے','ﷱ'=>'قلے','ﷲ'=>'الله','ﷳ'=>'اكبر','ﷴ'=>'محمد','ﷵ'=>'صلعم','ﷶ'=>'رسول','ﷷ'=>'عليه','ﷸ'=>'وسلم','ﷹ'=>'صلى','ﷺ'=>'صلى الله عليه وسلم','ﷻ'=>'جل جلاله','﷼'=>'ریال','︐'=>',','︑'=>'、','︒'=>'。','︓'=>':','︔'=>';','︕'=>'!','︖'=>'?','︗'=>'〖','︘'=>'〗','︙'=>'...','︰'=>'..','︱'=>'—','︲'=>'–','︳'=>'_','︴'=>'_','︵'=>'(','︶'=>')','︷'=>'{','︸'=>'}','︹'=>'〔','︺'=>'〕','︻'=>'【','︼'=>'】','︽'=>'《','︾'=>'》','︿'=>'〈','﹀'=>'〉','﹁'=>'「','﹂'=>'」','﹃'=>'『','﹄'=>'』','﹇'=>'[','﹈'=>']','﹉'=>' ̅','﹊'=>' ̅','﹋'=>' ̅','﹌'=>' ̅','﹍'=>'_','﹎'=>'_','﹏'=>'_','﹐'=>',','﹑'=>'、','﹒'=>'.','﹔'=>';','﹕'=>':','﹖'=>'?','﹗'=>'!','﹘'=>'—','﹙'=>'(','﹚'=>')','﹛'=>'{','﹜'=>'}','﹝'=>'〔','﹞'=>'〕','﹟'=>'#','﹠'=>'&','﹡'=>'*','﹢'=>'+','﹣'=>'-','﹤'=>'<','﹥'=>'>','﹦'=>'=','﹨'=>'\\','﹩'=>'$','﹪'=>'%','﹫'=>'@','ﹰ'=>' ً','ﹱ'=>'ـً','ﹲ'=>' ٌ','ﹴ'=>' ٍ','ﹶ'=>' َ','ﹷ'=>'ـَ','ﹸ'=>' ُ','ﹹ'=>'ـُ','ﹺ'=>' ِ','ﹻ'=>'ـِ','ﹼ'=>' ّ','ﹽ'=>'ـّ','ﹾ'=>' ْ','ﹿ'=>'ـْ','ﺀ'=>'ء','ﺁ'=>'آ','ﺂ'=>'آ','ﺃ'=>'أ','ﺄ'=>'أ','ﺅ'=>'ؤ','ﺆ'=>'ؤ','ﺇ'=>'إ','ﺈ'=>'إ','ﺉ'=>'ئ','ﺊ'=>'ئ','ﺋ'=>'ئ','ﺌ'=>'ئ','ﺍ'=>'ا','ﺎ'=>'ا','ﺏ'=>'ب','ﺐ'=>'ب','ﺑ'=>'ب','ﺒ'=>'ب','ﺓ'=>'ة','ﺔ'=>'ة','ﺕ'=>'ت','ﺖ'=>'ت','ﺗ'=>'ت','ﺘ'=>'ت','ﺙ'=>'ث','ﺚ'=>'ث','ﺛ'=>'ث','ﺜ'=>'ث','ﺝ'=>'ج','ﺞ'=>'ج','ﺟ'=>'ج','ﺠ'=>'ج','ﺡ'=>'ح','ﺢ'=>'ح','ﺣ'=>'ح','ﺤ'=>'ح','ﺥ'=>'خ','ﺦ'=>'خ','ﺧ'=>'خ','ﺨ'=>'خ','ﺩ'=>'د','ﺪ'=>'د','ﺫ'=>'ذ','ﺬ'=>'ذ','ﺭ'=>'ر','ﺮ'=>'ر','ﺯ'=>'ز','ﺰ'=>'ز','ﺱ'=>'س','ﺲ'=>'س','ﺳ'=>'س','ﺴ'=>'س','ﺵ'=>'ش','ﺶ'=>'ش','ﺷ'=>'ش','ﺸ'=>'ش','ﺹ'=>'ص','ﺺ'=>'ص','ﺻ'=>'ص','ﺼ'=>'ص','ﺽ'=>'ض','ﺾ'=>'ض','ﺿ'=>'ض','ﻀ'=>'ض','ﻁ'=>'ط','ﻂ'=>'ط','ﻃ'=>'ط','ﻄ'=>'ط','ﻅ'=>'ظ','ﻆ'=>'ظ','ﻇ'=>'ظ','ﻈ'=>'ظ','ﻉ'=>'ع','ﻊ'=>'ع','ﻋ'=>'ع','ﻌ'=>'ع','ﻍ'=>'غ','ﻎ'=>'غ','ﻏ'=>'غ','ﻐ'=>'غ','ﻑ'=>'ف','ﻒ'=>'ف','ﻓ'=>'ف','ﻔ'=>'ف','ﻕ'=>'ق','ﻖ'=>'ق','ﻗ'=>'ق','ﻘ'=>'ق','ﻙ'=>'ك','ﻚ'=>'ك','ﻛ'=>'ك','ﻜ'=>'ك','ﻝ'=>'ل','ﻞ'=>'ل','ﻟ'=>'ل','ﻠ'=>'ل','ﻡ'=>'م','ﻢ'=>'م','ﻣ'=>'م','ﻤ'=>'م','ﻥ'=>'ن','ﻦ'=>'ن','ﻧ'=>'ن','ﻨ'=>'ن','ﻩ'=>'ه','ﻪ'=>'ه','ﻫ'=>'ه','ﻬ'=>'ه','ﻭ'=>'و','ﻮ'=>'و','ﻯ'=>'ى','ﻰ'=>'ى','ﻱ'=>'ي','ﻲ'=>'ي','ﻳ'=>'ي','ﻴ'=>'ي','ﻵ'=>'لآ','ﻶ'=>'لآ','ﻷ'=>'لأ','ﻸ'=>'لأ','ﻹ'=>'لإ','ﻺ'=>'لإ','ﻻ'=>'لا','ﻼ'=>'لا','！'=>'!','＂'=>'"','＃'=>'#','＄'=>'$','％'=>'%','＆'=>'&','＇'=>'\'','（'=>'(','）'=>')','＊'=>'*','＋'=>'+','，'=>',','－'=>'-','．'=>'.','／'=>'/','０'=>'0','１'=>'1','２'=>'2','３'=>'3','４'=>'4','５'=>'5','６'=>'6','７'=>'7','８'=>'8','９'=>'9','：'=>':','；'=>';','＜'=>'<','＝'=>'=','＞'=>'>','？'=>'?','＠'=>'@','Ａ'=>'A','Ｂ'=>'B','Ｃ'=>'C','Ｄ'=>'D','Ｅ'=>'E','Ｆ'=>'F','Ｇ'=>'G','Ｈ'=>'H','Ｉ'=>'I','Ｊ'=>'J','Ｋ'=>'K','Ｌ'=>'L','Ｍ'=>'M','Ｎ'=>'N','Ｏ'=>'O','Ｐ'=>'P','Ｑ'=>'Q','Ｒ'=>'R','Ｓ'=>'S','Ｔ'=>'T','Ｕ'=>'U','Ｖ'=>'V','Ｗ'=>'W','Ｘ'=>'X','Ｙ'=>'Y','Ｚ'=>'Z','［'=>'[','＼'=>'\\','］'=>']','＾'=>'^','＿'=>'_','｀'=>'`','ａ'=>'a','ｂ'=>'b','ｃ'=>'c','ｄ'=>'d','ｅ'=>'e','ｆ'=>'f','ｇ'=>'g','ｈ'=>'h','ｉ'=>'i','ｊ'=>'j','ｋ'=>'k','ｌ'=>'l','ｍ'=>'m','ｎ'=>'n','ｏ'=>'o','ｐ'=>'p','ｑ'=>'q','ｒ'=>'r','ｓ'=>'s','ｔ'=>'t','ｕ'=>'u','ｖ'=>'v','ｗ'=>'w','ｘ'=>'x','ｙ'=>'y','ｚ'=>'z','｛'=>'{','｜'=>'|','｝'=>'}','～'=>'~','｟'=>'⦅','｠'=>'⦆','｡'=>'。','｢'=>'「','｣'=>'」','､'=>'、','･'=>'・','ｦ'=>'ヲ','ｧ'=>'ァ','ｨ'=>'ィ','ｩ'=>'ゥ','ｪ'=>'ェ','ｫ'=>'ォ','ｬ'=>'ャ','ｭ'=>'ュ','ｮ'=>'ョ','ｯ'=>'ッ','ｰ'=>'ー','ｱ'=>'ア','ｲ'=>'イ','ｳ'=>'ウ','ｴ'=>'エ','ｵ'=>'オ','ｶ'=>'カ','ｷ'=>'キ','ｸ'=>'ク','ｹ'=>'ケ','ｺ'=>'コ','ｻ'=>'サ','ｼ'=>'シ','ｽ'=>'ス','ｾ'=>'セ','ｿ'=>'ソ','ﾀ'=>'タ','ﾁ'=>'チ','ﾂ'=>'ツ','ﾃ'=>'テ','ﾄ'=>'ト','ﾅ'=>'ナ','ﾆ'=>'ニ','ﾇ'=>'ヌ','ﾈ'=>'ネ','ﾉ'=>'ノ','ﾊ'=>'ハ','ﾋ'=>'ヒ','ﾌ'=>'フ','ﾍ'=>'ヘ','ﾎ'=>'ホ','ﾏ'=>'マ','ﾐ'=>'ミ','ﾑ'=>'ム','ﾒ'=>'メ','ﾓ'=>'モ','ﾔ'=>'ヤ','ﾕ'=>'ユ','ﾖ'=>'ヨ','ﾗ'=>'ラ','ﾘ'=>'リ','ﾙ'=>'ル','ﾚ'=>'レ','ﾛ'=>'ロ','ﾜ'=>'ワ','ﾝ'=>'ン','ﾞ'=>'゙','ﾟ'=>'゚','ﾠ'=>'ᅠ','ﾡ'=>'ᄀ','ﾢ'=>'ᄁ','ﾣ'=>'ᆪ','ﾤ'=>'ᄂ','ﾥ'=>'ᆬ','ﾦ'=>'ᆭ','ﾧ'=>'ᄃ','ﾨ'=>'ᄄ','ﾩ'=>'ᄅ','ﾪ'=>'ᆰ','ﾫ'=>'ᆱ','ﾬ'=>'ᆲ','ﾭ'=>'ᆳ','ﾮ'=>'ᆴ','ﾯ'=>'ᆵ','ﾰ'=>'ᄚ','ﾱ'=>'ᄆ','ﾲ'=>'ᄇ','ﾳ'=>'ᄈ','ﾴ'=>'ᄡ','ﾵ'=>'ᄉ','ﾶ'=>'ᄊ','ﾷ'=>'ᄋ','ﾸ'=>'ᄌ','ﾹ'=>'ᄍ','ﾺ'=>'ᄎ','ﾻ'=>'ᄏ','ﾼ'=>'ᄐ','ﾽ'=>'ᄑ','ﾾ'=>'ᄒ','ￂ'=>'ᅡ','ￃ'=>'ᅢ','ￄ'=>'ᅣ','ￅ'=>'ᅤ','ￆ'=>'ᅥ','ￇ'=>'ᅦ','ￊ'=>'ᅧ','ￋ'=>'ᅨ','ￌ'=>'ᅩ','ￍ'=>'ᅪ','ￎ'=>'ᅫ','ￏ'=>'ᅬ','ￒ'=>'ᅭ','ￓ'=>'ᅮ','ￔ'=>'ᅯ','ￕ'=>'ᅰ','ￖ'=>'ᅱ','ￗ'=>'ᅲ','ￚ'=>'ᅳ','ￛ'=>'ᅴ','ￜ'=>'ᅵ','￠'=>'¢','￡'=>'£','￢'=>'¬','￣'=>' ̄','￤'=>'¦','￥'=>'¥','￦'=>'₩','￨'=>'│','￩'=>'←','￪'=>'↑','￫'=>'→','￬'=>'↓','￭'=>'■','￮'=>'○','𝅗𝅥'=>'𝅗𝅥','𝅘𝅥'=>'𝅘𝅥','𝅘𝅥𝅮'=>'𝅘𝅥𝅮','𝅘𝅥𝅯'=>'𝅘𝅥𝅯','𝅘𝅥𝅰'=>'𝅘𝅥𝅰','𝅘𝅥𝅱'=>'𝅘𝅥𝅱','𝅘𝅥𝅲'=>'𝅘𝅥𝅲','𝆹𝅥'=>'𝆹𝅥','𝆺𝅥'=>'𝆺𝅥','𝆹𝅥𝅮'=>'𝆹𝅥𝅮','𝆺𝅥𝅮'=>'𝆺𝅥𝅮','𝆹𝅥𝅯'=>'𝆹𝅥𝅯','𝆺𝅥𝅯'=>'𝆺𝅥𝅯','𝐀'=>'A','𝐁'=>'B','𝐂'=>'C','𝐃'=>'D','𝐄'=>'E','𝐅'=>'F','𝐆'=>'G','𝐇'=>'H','𝐈'=>'I','𝐉'=>'J','𝐊'=>'K','𝐋'=>'L','𝐌'=>'M','𝐍'=>'N','𝐎'=>'O','𝐏'=>'P','𝐐'=>'Q','𝐑'=>'R','𝐒'=>'S','𝐓'=>'T','𝐔'=>'U','𝐕'=>'V','𝐖'=>'W','𝐗'=>'X','𝐘'=>'Y','𝐙'=>'Z','𝐚'=>'a','𝐛'=>'b','𝐜'=>'c','𝐝'=>'d','𝐞'=>'e','𝐟'=>'f','𝐠'=>'g','𝐡'=>'h','𝐢'=>'i','𝐣'=>'j','𝐤'=>'k','𝐥'=>'l','𝐦'=>'m','𝐧'=>'n','𝐨'=>'o','𝐩'=>'p','𝐪'=>'q','𝐫'=>'r','𝐬'=>'s','𝐭'=>'t','𝐮'=>'u','𝐯'=>'v','𝐰'=>'w','𝐱'=>'x','𝐲'=>'y','𝐳'=>'z','𝐴'=>'A','𝐵'=>'B','𝐶'=>'C','𝐷'=>'D','𝐸'=>'E','𝐹'=>'F','𝐺'=>'G','𝐻'=>'H','𝐼'=>'I','𝐽'=>'J','𝐾'=>'K','𝐿'=>'L','𝑀'=>'M','𝑁'=>'N','𝑂'=>'O','𝑃'=>'P','𝑄'=>'Q','𝑅'=>'R','𝑆'=>'S','𝑇'=>'T','𝑈'=>'U','𝑉'=>'V','𝑊'=>'W','𝑋'=>'X','𝑌'=>'Y','𝑍'=>'Z','𝑎'=>'a','𝑏'=>'b','𝑐'=>'c','𝑑'=>'d','𝑒'=>'e','𝑓'=>'f','𝑔'=>'g','𝑖'=>'i','𝑗'=>'j','𝑘'=>'k','𝑙'=>'l','𝑚'=>'m','𝑛'=>'n','𝑜'=>'o','𝑝'=>'p','𝑞'=>'q','𝑟'=>'r','𝑠'=>'s','𝑡'=>'t','𝑢'=>'u','𝑣'=>'v','𝑤'=>'w','𝑥'=>'x','𝑦'=>'y','𝑧'=>'z','𝑨'=>'A','𝑩'=>'B','𝑪'=>'C','𝑫'=>'D','𝑬'=>'E','𝑭'=>'F','𝑮'=>'G','𝑯'=>'H','𝑰'=>'I','𝑱'=>'J','𝑲'=>'K','𝑳'=>'L','𝑴'=>'M','𝑵'=>'N','𝑶'=>'O','𝑷'=>'P','𝑸'=>'Q','𝑹'=>'R','𝑺'=>'S','𝑻'=>'T','𝑼'=>'U','𝑽'=>'V','𝑾'=>'W','𝑿'=>'X','𝒀'=>'Y','𝒁'=>'Z','𝒂'=>'a','𝒃'=>'b','𝒄'=>'c','𝒅'=>'d','𝒆'=>'e','𝒇'=>'f','𝒈'=>'g','𝒉'=>'h','𝒊'=>'i','𝒋'=>'j','𝒌'=>'k','𝒍'=>'l','𝒎'=>'m','𝒏'=>'n','𝒐'=>'o','𝒑'=>'p','𝒒'=>'q','𝒓'=>'r','𝒔'=>'s','𝒕'=>'t','𝒖'=>'u','𝒗'=>'v','𝒘'=>'w','𝒙'=>'x','𝒚'=>'y','𝒛'=>'z','𝒜'=>'A','𝒞'=>'C','𝒟'=>'D','𝒢'=>'G','𝒥'=>'J','𝒦'=>'K','𝒩'=>'N','𝒪'=>'O','𝒫'=>'P','𝒬'=>'Q','𝒮'=>'S','𝒯'=>'T','𝒰'=>'U','𝒱'=>'V','𝒲'=>'W','𝒳'=>'X','𝒴'=>'Y','𝒵'=>'Z','𝒶'=>'a','𝒷'=>'b','𝒸'=>'c','𝒹'=>'d','𝒻'=>'f','𝒽'=>'h','𝒾'=>'i','𝒿'=>'j','𝓀'=>'k','𝓁'=>'l','𝓂'=>'m','𝓃'=>'n','𝓅'=>'p','𝓆'=>'q','𝓇'=>'r','𝓈'=>'s','𝓉'=>'t','𝓊'=>'u','𝓋'=>'v','𝓌'=>'w','𝓍'=>'x','𝓎'=>'y','𝓏'=>'z','𝓐'=>'A','𝓑'=>'B','𝓒'=>'C','𝓓'=>'D','𝓔'=>'E','𝓕'=>'F','𝓖'=>'G','𝓗'=>'H','𝓘'=>'I','𝓙'=>'J','𝓚'=>'K','𝓛'=>'L','𝓜'=>'M','𝓝'=>'N','𝓞'=>'O','𝓟'=>'P','𝓠'=>'Q','𝓡'=>'R','𝓢'=>'S','𝓣'=>'T','𝓤'=>'U','𝓥'=>'V','𝓦'=>'W','𝓧'=>'X','𝓨'=>'Y','𝓩'=>'Z','𝓪'=>'a','𝓫'=>'b','𝓬'=>'c','𝓭'=>'d','𝓮'=>'e','𝓯'=>'f','𝓰'=>'g','𝓱'=>'h','𝓲'=>'i','𝓳'=>'j','𝓴'=>'k','𝓵'=>'l','𝓶'=>'m','𝓷'=>'n','𝓸'=>'o','𝓹'=>'p','𝓺'=>'q','𝓻'=>'r','𝓼'=>'s','𝓽'=>'t','𝓾'=>'u','𝓿'=>'v','𝔀'=>'w','𝔁'=>'x','𝔂'=>'y','𝔃'=>'z','𝔄'=>'A','𝔅'=>'B','𝔇'=>'D','𝔈'=>'E','𝔉'=>'F','𝔊'=>'G','𝔍'=>'J','𝔎'=>'K','𝔏'=>'L','𝔐'=>'M','𝔑'=>'N','𝔒'=>'O','𝔓'=>'P','𝔔'=>'Q','𝔖'=>'S','𝔗'=>'T','𝔘'=>'U','𝔙'=>'V','𝔚'=>'W','𝔛'=>'X','𝔜'=>'Y','𝔞'=>'a','𝔟'=>'b','𝔠'=>'c','𝔡'=>'d','𝔢'=>'e','𝔣'=>'f','𝔤'=>'g','𝔥'=>'h','𝔦'=>'i','𝔧'=>'j','𝔨'=>'k','𝔩'=>'l','𝔪'=>'m','𝔫'=>'n','𝔬'=>'o','𝔭'=>'p','𝔮'=>'q','𝔯'=>'r','𝔰'=>'s','𝔱'=>'t','𝔲'=>'u','𝔳'=>'v','𝔴'=>'w','𝔵'=>'x','𝔶'=>'y','𝔷'=>'z','𝔸'=>'A','𝔹'=>'B','𝔻'=>'D','𝔼'=>'E','𝔽'=>'F','𝔾'=>'G','𝕀'=>'I','𝕁'=>'J','𝕂'=>'K','𝕃'=>'L','𝕄'=>'M','𝕆'=>'O','𝕊'=>'S','𝕋'=>'T','𝕌'=>'U','𝕍'=>'V','𝕎'=>'W','𝕏'=>'X','𝕐'=>'Y','𝕒'=>'a','𝕓'=>'b','𝕔'=>'c','𝕕'=>'d','𝕖'=>'e','𝕗'=>'f','𝕘'=>'g','𝕙'=>'h','𝕚'=>'i','𝕛'=>'j','𝕜'=>'k','𝕝'=>'l','𝕞'=>'m','𝕟'=>'n','𝕠'=>'o','𝕡'=>'p','𝕢'=>'q','𝕣'=>'r','𝕤'=>'s','𝕥'=>'t','𝕦'=>'u','𝕧'=>'v','𝕨'=>'w','𝕩'=>'x','𝕪'=>'y','𝕫'=>'z','𝕬'=>'A','𝕭'=>'B','𝕮'=>'C','𝕯'=>'D','𝕰'=>'E','𝕱'=>'F','𝕲'=>'G','𝕳'=>'H','𝕴'=>'I','𝕵'=>'J','𝕶'=>'K','𝕷'=>'L','𝕸'=>'M','𝕹'=>'N','𝕺'=>'O','𝕻'=>'P','𝕼'=>'Q','𝕽'=>'R','𝕾'=>'S','𝕿'=>'T','𝖀'=>'U','𝖁'=>'V','𝖂'=>'W','𝖃'=>'X','𝖄'=>'Y','𝖅'=>'Z','𝖆'=>'a','𝖇'=>'b','𝖈'=>'c','𝖉'=>'d','𝖊'=>'e','𝖋'=>'f','𝖌'=>'g','𝖍'=>'h','𝖎'=>'i','𝖏'=>'j','𝖐'=>'k','𝖑'=>'l','𝖒'=>'m','𝖓'=>'n','𝖔'=>'o','𝖕'=>'p','𝖖'=>'q','𝖗'=>'r','𝖘'=>'s','𝖙'=>'t','𝖚'=>'u','𝖛'=>'v','𝖜'=>'w','𝖝'=>'x','𝖞'=>'y','𝖟'=>'z','𝖠'=>'A','𝖡'=>'B','𝖢'=>'C','𝖣'=>'D','𝖤'=>'E','𝖥'=>'F','𝖦'=>'G','𝖧'=>'H','𝖨'=>'I','𝖩'=>'J','𝖪'=>'K','𝖫'=>'L','𝖬'=>'M','𝖭'=>'N','𝖮'=>'O','𝖯'=>'P','𝖰'=>'Q','𝖱'=>'R','𝖲'=>'S','𝖳'=>'T','𝖴'=>'U','𝖵'=>'V','𝖶'=>'W','𝖷'=>'X','𝖸'=>'Y','𝖹'=>'Z','𝖺'=>'a','𝖻'=>'b','𝖼'=>'c','𝖽'=>'d','𝖾'=>'e','𝖿'=>'f','𝗀'=>'g','𝗁'=>'h','𝗂'=>'i','𝗃'=>'j','𝗄'=>'k','𝗅'=>'l','𝗆'=>'m','𝗇'=>'n','𝗈'=>'o','𝗉'=>'p','𝗊'=>'q','𝗋'=>'r','𝗌'=>'s','𝗍'=>'t','𝗎'=>'u','𝗏'=>'v','𝗐'=>'w','𝗑'=>'x','𝗒'=>'y','𝗓'=>'z','𝗔'=>'A','𝗕'=>'B','𝗖'=>'C','𝗗'=>'D','𝗘'=>'E','𝗙'=>'F','𝗚'=>'G','𝗛'=>'H','𝗜'=>'I','𝗝'=>'J','𝗞'=>'K','𝗟'=>'L','𝗠'=>'M','𝗡'=>'N','𝗢'=>'O','𝗣'=>'P','𝗤'=>'Q','𝗥'=>'R','𝗦'=>'S','𝗧'=>'T','𝗨'=>'U','𝗩'=>'V','𝗪'=>'W','𝗫'=>'X','𝗬'=>'Y','𝗭'=>'Z','𝗮'=>'a','𝗯'=>'b','𝗰'=>'c','𝗱'=>'d','𝗲'=>'e','𝗳'=>'f','𝗴'=>'g','𝗵'=>'h','𝗶'=>'i','𝗷'=>'j','𝗸'=>'k','𝗹'=>'l','𝗺'=>'m','𝗻'=>'n','𝗼'=>'o','𝗽'=>'p','𝗾'=>'q','𝗿'=>'r','𝘀'=>'s','𝘁'=>'t','𝘂'=>'u','𝘃'=>'v','𝘄'=>'w','𝘅'=>'x','𝘆'=>'y','𝘇'=>'z','𝘈'=>'A','𝘉'=>'B','𝘊'=>'C','𝘋'=>'D','𝘌'=>'E','𝘍'=>'F','𝘎'=>'G','𝘏'=>'H','𝘐'=>'I','𝘑'=>'J','𝘒'=>'K','𝘓'=>'L','𝘔'=>'M','𝘕'=>'N','𝘖'=>'O','𝘗'=>'P','𝘘'=>'Q','𝘙'=>'R','𝘚'=>'S','𝘛'=>'T','𝘜'=>'U','𝘝'=>'V','𝘞'=>'W','𝘟'=>'X','𝘠'=>'Y','𝘡'=>'Z','𝘢'=>'a','𝘣'=>'b','𝘤'=>'c','𝘥'=>'d','𝘦'=>'e','𝘧'=>'f','𝘨'=>'g','𝘩'=>'h','𝘪'=>'i','𝘫'=>'j','𝘬'=>'k','𝘭'=>'l','𝘮'=>'m','𝘯'=>'n','𝘰'=>'o','𝘱'=>'p','𝘲'=>'q','𝘳'=>'r','𝘴'=>'s','𝘵'=>'t','𝘶'=>'u','𝘷'=>'v','𝘸'=>'w','𝘹'=>'x','𝘺'=>'y','𝘻'=>'z','𝘼'=>'A','𝘽'=>'B','𝘾'=>'C','𝘿'=>'D','𝙀'=>'E','𝙁'=>'F','𝙂'=>'G','𝙃'=>'H','𝙄'=>'I','𝙅'=>'J','𝙆'=>'K','𝙇'=>'L','𝙈'=>'M','𝙉'=>'N','𝙊'=>'O','𝙋'=>'P','𝙌'=>'Q','𝙍'=>'R','𝙎'=>'S','𝙏'=>'T','𝙐'=>'U','𝙑'=>'V','𝙒'=>'W','𝙓'=>'X','𝙔'=>'Y','𝙕'=>'Z','𝙖'=>'a','𝙗'=>'b','𝙘'=>'c','𝙙'=>'d','𝙚'=>'e','𝙛'=>'f','𝙜'=>'g','𝙝'=>'h','𝙞'=>'i','𝙟'=>'j','𝙠'=>'k','𝙡'=>'l','𝙢'=>'m','𝙣'=>'n','𝙤'=>'o','𝙥'=>'p','𝙦'=>'q','𝙧'=>'r','𝙨'=>'s','𝙩'=>'t','𝙪'=>'u','𝙫'=>'v','𝙬'=>'w','𝙭'=>'x','𝙮'=>'y','𝙯'=>'z','𝙰'=>'A','𝙱'=>'B','𝙲'=>'C','𝙳'=>'D','𝙴'=>'E','𝙵'=>'F','𝙶'=>'G','𝙷'=>'H','𝙸'=>'I','𝙹'=>'J','𝙺'=>'K','𝙻'=>'L','𝙼'=>'M','𝙽'=>'N','𝙾'=>'O','𝙿'=>'P','𝚀'=>'Q','𝚁'=>'R','𝚂'=>'S','𝚃'=>'T','𝚄'=>'U','𝚅'=>'V','𝚆'=>'W','𝚇'=>'X','𝚈'=>'Y','𝚉'=>'Z','𝚊'=>'a','𝚋'=>'b','𝚌'=>'c','𝚍'=>'d','𝚎'=>'e','𝚏'=>'f','𝚐'=>'g','𝚑'=>'h','𝚒'=>'i','𝚓'=>'j','𝚔'=>'k','𝚕'=>'l','𝚖'=>'m','𝚗'=>'n','𝚘'=>'o','𝚙'=>'p','𝚚'=>'q','𝚛'=>'r','𝚜'=>'s','𝚝'=>'t','𝚞'=>'u','𝚟'=>'v','𝚠'=>'w','𝚡'=>'x','𝚢'=>'y','𝚣'=>'z','𝚤'=>'ı','𝚥'=>'ȷ','𝚨'=>'Α','𝚩'=>'Β','𝚪'=>'Γ','𝚫'=>'Δ','𝚬'=>'Ε','𝚭'=>'Ζ','𝚮'=>'Η','𝚯'=>'Θ','𝚰'=>'Ι','𝚱'=>'Κ','𝚲'=>'Λ','𝚳'=>'Μ','𝚴'=>'Ν','𝚵'=>'Ξ','𝚶'=>'Ο','𝚷'=>'Π','𝚸'=>'Ρ','𝚹'=>'Θ','𝚺'=>'Σ','𝚻'=>'Τ','𝚼'=>'Υ','𝚽'=>'Φ','𝚾'=>'Χ','𝚿'=>'Ψ','𝛀'=>'Ω','𝛁'=>'∇','𝛂'=>'α','𝛃'=>'β','𝛄'=>'γ','𝛅'=>'δ','𝛆'=>'ε','𝛇'=>'ζ','𝛈'=>'η','𝛉'=>'θ','𝛊'=>'ι','𝛋'=>'κ','𝛌'=>'λ','𝛍'=>'μ','𝛎'=>'ν','𝛏'=>'ξ','𝛐'=>'ο','𝛑'=>'π','𝛒'=>'ρ','𝛓'=>'ς','𝛔'=>'σ','𝛕'=>'τ','𝛖'=>'υ','𝛗'=>'φ','𝛘'=>'χ','𝛙'=>'ψ','𝛚'=>'ω','𝛛'=>'∂','𝛜'=>'ε','𝛝'=>'θ','𝛞'=>'κ','𝛟'=>'φ','𝛠'=>'ρ','𝛡'=>'π','𝛢'=>'Α','𝛣'=>'Β','𝛤'=>'Γ','𝛥'=>'Δ','𝛦'=>'Ε','𝛧'=>'Ζ','𝛨'=>'Η','𝛩'=>'Θ','𝛪'=>'Ι','𝛫'=>'Κ','𝛬'=>'Λ','𝛭'=>'Μ','𝛮'=>'Ν','𝛯'=>'Ξ','𝛰'=>'Ο','𝛱'=>'Π','𝛲'=>'Ρ','𝛳'=>'Θ','𝛴'=>'Σ','𝛵'=>'Τ','𝛶'=>'Υ','𝛷'=>'Φ','𝛸'=>'Χ','𝛹'=>'Ψ','𝛺'=>'Ω','𝛻'=>'∇','𝛼'=>'α','𝛽'=>'β','𝛾'=>'γ','𝛿'=>'δ','𝜀'=>'ε','𝜁'=>'ζ','𝜂'=>'η','𝜃'=>'θ','𝜄'=>'ι','𝜅'=>'κ','𝜆'=>'λ','𝜇'=>'μ','𝜈'=>'ν','𝜉'=>'ξ','𝜊'=>'ο','𝜋'=>'π','𝜌'=>'ρ','𝜍'=>'ς','𝜎'=>'σ','𝜏'=>'τ','𝜐'=>'υ','𝜑'=>'φ','𝜒'=>'χ','𝜓'=>'ψ','𝜔'=>'ω','𝜕'=>'∂','𝜖'=>'ε','𝜗'=>'θ','𝜘'=>'κ','𝜙'=>'φ','𝜚'=>'ρ','𝜛'=>'π','𝜜'=>'Α','𝜝'=>'Β','𝜞'=>'Γ','𝜟'=>'Δ','𝜠'=>'Ε','𝜡'=>'Ζ','𝜢'=>'Η','𝜣'=>'Θ','𝜤'=>'Ι','𝜥'=>'Κ','𝜦'=>'Λ','𝜧'=>'Μ','𝜨'=>'Ν','𝜩'=>'Ξ','𝜪'=>'Ο','𝜫'=>'Π','𝜬'=>'Ρ','𝜭'=>'Θ','𝜮'=>'Σ','𝜯'=>'Τ','𝜰'=>'Υ','𝜱'=>'Φ','𝜲'=>'Χ','𝜳'=>'Ψ','𝜴'=>'Ω','𝜵'=>'∇','𝜶'=>'α','𝜷'=>'β','𝜸'=>'γ','𝜹'=>'δ','𝜺'=>'ε','𝜻'=>'ζ','𝜼'=>'η','𝜽'=>'θ','𝜾'=>'ι','𝜿'=>'κ','𝝀'=>'λ','𝝁'=>'μ','𝝂'=>'ν','𝝃'=>'ξ','𝝄'=>'ο','𝝅'=>'π','𝝆'=>'ρ','𝝇'=>'ς','𝝈'=>'σ','𝝉'=>'τ','𝝊'=>'υ','𝝋'=>'φ','𝝌'=>'χ','𝝍'=>'ψ','𝝎'=>'ω','𝝏'=>'∂','𝝐'=>'ε','𝝑'=>'θ','𝝒'=>'κ','𝝓'=>'φ','𝝔'=>'ρ','𝝕'=>'π','𝝖'=>'Α','𝝗'=>'Β','𝝘'=>'Γ','𝝙'=>'Δ','𝝚'=>'Ε','𝝛'=>'Ζ','𝝜'=>'Η','𝝝'=>'Θ','𝝞'=>'Ι','𝝟'=>'Κ','𝝠'=>'Λ','𝝡'=>'Μ','𝝢'=>'Ν','𝝣'=>'Ξ','𝝤'=>'Ο','𝝥'=>'Π','𝝦'=>'Ρ','𝝧'=>'Θ','𝝨'=>'Σ','𝝩'=>'Τ','𝝪'=>'Υ','𝝫'=>'Φ','𝝬'=>'Χ','𝝭'=>'Ψ','𝝮'=>'Ω','𝝯'=>'∇','𝝰'=>'α','𝝱'=>'β','𝝲'=>'γ','𝝳'=>'δ','𝝴'=>'ε','𝝵'=>'ζ','𝝶'=>'η','𝝷'=>'θ','𝝸'=>'ι','𝝹'=>'κ','𝝺'=>'λ','𝝻'=>'μ','𝝼'=>'ν','𝝽'=>'ξ','𝝾'=>'ο','𝝿'=>'π','𝞀'=>'ρ','𝞁'=>'ς','𝞂'=>'σ','𝞃'=>'τ','𝞄'=>'υ','𝞅'=>'φ','𝞆'=>'χ','𝞇'=>'ψ','𝞈'=>'ω','𝞉'=>'∂','𝞊'=>'ε','𝞋'=>'θ','𝞌'=>'κ','𝞍'=>'φ','𝞎'=>'ρ','𝞏'=>'π','𝞐'=>'Α','𝞑'=>'Β','𝞒'=>'Γ','𝞓'=>'Δ','𝞔'=>'Ε','𝞕'=>'Ζ','𝞖'=>'Η','𝞗'=>'Θ','𝞘'=>'Ι','𝞙'=>'Κ','𝞚'=>'Λ','𝞛'=>'Μ','𝞜'=>'Ν','𝞝'=>'Ξ','𝞞'=>'Ο','𝞟'=>'Π','𝞠'=>'Ρ','𝞡'=>'Θ','𝞢'=>'Σ','𝞣'=>'Τ','𝞤'=>'Υ','𝞥'=>'Φ','𝞦'=>'Χ','𝞧'=>'Ψ','𝞨'=>'Ω','𝞩'=>'∇','𝞪'=>'α','𝞫'=>'β','𝞬'=>'γ','𝞭'=>'δ','𝞮'=>'ε','𝞯'=>'ζ','𝞰'=>'η','𝞱'=>'θ','𝞲'=>'ι','𝞳'=>'κ','𝞴'=>'λ','𝞵'=>'μ','𝞶'=>'ν','𝞷'=>'ξ','𝞸'=>'ο','𝞹'=>'π','𝞺'=>'ρ','𝞻'=>'ς','𝞼'=>'σ','𝞽'=>'τ','𝞾'=>'υ','𝞿'=>'φ','𝟀'=>'χ','𝟁'=>'ψ','𝟂'=>'ω','𝟃'=>'∂','𝟄'=>'ε','𝟅'=>'θ','𝟆'=>'κ','𝟇'=>'φ','𝟈'=>'ρ','𝟉'=>'π','𝟊'=>'Ϝ','𝟋'=>'ϝ','𝟎'=>'0','𝟏'=>'1','𝟐'=>'2','𝟑'=>'3','𝟒'=>'4','𝟓'=>'5','𝟔'=>'6','𝟕'=>'7','𝟖'=>'8','𝟗'=>'9','𝟘'=>'0','𝟙'=>'1','𝟚'=>'2','𝟛'=>'3','𝟜'=>'4','𝟝'=>'5','𝟞'=>'6','𝟟'=>'7','𝟠'=>'8','𝟡'=>'9','𝟢'=>'0','𝟣'=>'1','𝟤'=>'2','𝟥'=>'3','𝟦'=>'4','𝟧'=>'5','𝟨'=>'6','𝟩'=>'7','𝟪'=>'8','𝟫'=>'9','𝟬'=>'0','𝟭'=>'1','𝟮'=>'2','𝟯'=>'3','𝟰'=>'4','𝟱'=>'5','𝟲'=>'6','𝟳'=>'7','𝟴'=>'8','𝟵'=>'9','𝟶'=>'0','𝟷'=>'1','𝟸'=>'2','𝟹'=>'3','𝟺'=>'4','𝟻'=>'5','𝟼'=>'6','𝟽'=>'7','𝟾'=>'8','𝟿'=>'9','丽'=>'丽','丸'=>'丸','乁'=>'乁','𠄢'=>'𠄢','你'=>'你','侮'=>'侮','侻'=>'侻','倂'=>'倂','偺'=>'偺','備'=>'備','僧'=>'僧','像'=>'像','㒞'=>'㒞','𠘺'=>'𠘺','免'=>'免','兔'=>'兔','兤'=>'兤','具'=>'具','𠔜'=>'𠔜','㒹'=>'㒹','內'=>'內','再'=>'再','𠕋'=>'𠕋','冗'=>'冗','冤'=>'冤','仌'=>'仌','冬'=>'冬','况'=>'况','𩇟'=>'𩇟','凵'=>'凵','刃'=>'刃','㓟'=>'㓟','刻'=>'刻','剆'=>'剆','割'=>'割','剷'=>'剷','㔕'=>'㔕','勇'=>'勇','勉'=>'勉','勤'=>'勤','勺'=>'勺','包'=>'包','匆'=>'匆','北'=>'北','卉'=>'卉','卑'=>'卑','博'=>'博','即'=>'即','卽'=>'卽','卿'=>'卿','卿'=>'卿','卿'=>'卿','𠨬'=>'𠨬','灰'=>'灰','及'=>'及','叟'=>'叟','𠭣'=>'𠭣','叫'=>'叫','叱'=>'叱','吆'=>'吆','咞'=>'咞','吸'=>'吸','呈'=>'呈','周'=>'周','咢'=>'咢','哶'=>'哶','唐'=>'唐','啓'=>'啓','啣'=>'啣','善'=>'善','善'=>'善','喙'=>'喙','喫'=>'喫','喳'=>'喳','嗂'=>'嗂','圖'=>'圖','嘆'=>'嘆','圗'=>'圗','噑'=>'噑','噴'=>'噴','切'=>'切','壮'=>'壮','城'=>'城','埴'=>'埴','堍'=>'堍','型'=>'型','堲'=>'堲','報'=>'報','墬'=>'墬','𡓤'=>'𡓤','売'=>'売','壷'=>'壷','夆'=>'夆','多'=>'多','夢'=>'夢','奢'=>'奢','𡚨'=>'𡚨','𡛪'=>'𡛪','姬'=>'姬','娛'=>'娛','娧'=>'娧','姘'=>'姘','婦'=>'婦','㛮'=>'㛮','㛼'=>'㛼','嬈'=>'嬈','嬾'=>'嬾','嬾'=>'嬾','𡧈'=>'𡧈','寃'=>'寃','寘'=>'寘','寧'=>'寧','寳'=>'寳','𡬘'=>'𡬘','寿'=>'寿','将'=>'将','当'=>'当','尢'=>'尢','㞁'=>'㞁','屠'=>'屠','屮'=>'屮','峀'=>'峀','岍'=>'岍','𡷤'=>'𡷤','嵃'=>'嵃','𡷦'=>'𡷦','嵮'=>'嵮','嵫'=>'嵫','嵼'=>'嵼','巡'=>'巡','巢'=>'巢','㠯'=>'㠯','巽'=>'巽','帨'=>'帨','帽'=>'帽','幩'=>'幩','㡢'=>'㡢','𢆃'=>'𢆃','㡼'=>'㡼','庰'=>'庰','庳'=>'庳','庶'=>'庶','廊'=>'廊','𪎒'=>'𪎒','廾'=>'廾','𢌱'=>'𢌱','𢌱'=>'𢌱','舁'=>'舁','弢'=>'弢','弢'=>'弢','㣇'=>'㣇','𣊸'=>'𣊸','𦇚'=>'𦇚','形'=>'形','彫'=>'彫','㣣'=>'㣣','徚'=>'徚','忍'=>'忍','志'=>'志','忹'=>'忹','悁'=>'悁','㤺'=>'㤺','㤜'=>'㤜','悔'=>'悔','𢛔'=>'𢛔','惇'=>'惇','慈'=>'慈','慌'=>'慌','慎'=>'慎','慌'=>'慌','慺'=>'慺','憎'=>'憎','憲'=>'憲','憤'=>'憤','憯'=>'憯','懞'=>'懞','懲'=>'懲','懶'=>'懶','成'=>'成','戛'=>'戛','扝'=>'扝','抱'=>'抱','拔'=>'拔','捐'=>'捐','𢬌'=>'𢬌','挽'=>'挽','拼'=>'拼','捨'=>'捨','掃'=>'掃','揤'=>'揤','𢯱'=>'𢯱','搢'=>'搢','揅'=>'揅','掩'=>'掩','㨮'=>'㨮','摩'=>'摩','摾'=>'摾','撝'=>'撝','摷'=>'摷','㩬'=>'㩬','敏'=>'敏','敬'=>'敬','𣀊'=>'𣀊','旣'=>'旣','書'=>'書','晉'=>'晉','㬙'=>'㬙','暑'=>'暑','㬈'=>'㬈','㫤'=>'㫤','冒'=>'冒','冕'=>'冕','最'=>'最','暜'=>'暜','肭'=>'肭','䏙'=>'䏙','朗'=>'朗','望'=>'望','朡'=>'朡','杞'=>'杞','杓'=>'杓','𣏃'=>'𣏃','㭉'=>'㭉','柺'=>'柺','枅'=>'枅','桒'=>'桒','梅'=>'梅','𣑭'=>'𣑭','梎'=>'梎','栟'=>'栟','椔'=>'椔','㮝'=>'㮝','楂'=>'楂','榣'=>'榣','槪'=>'槪','檨'=>'檨','𣚣'=>'𣚣','櫛'=>'櫛','㰘'=>'㰘','次'=>'次','𣢧'=>'𣢧','歔'=>'歔','㱎'=>'㱎','歲'=>'歲','殟'=>'殟','殺'=>'殺','殻'=>'殻','𣪍'=>'𣪍','𡴋'=>'𡴋','𣫺'=>'𣫺','汎'=>'汎','𣲼'=>'𣲼','沿'=>'沿','泍'=>'泍','汧'=>'汧','洖'=>'洖','派'=>'派','海'=>'海','流'=>'流','浩'=>'浩','浸'=>'浸','涅'=>'涅','𣴞'=>'𣴞','洴'=>'洴','港'=>'港','湮'=>'湮','㴳'=>'㴳','滋'=>'滋','滇'=>'滇','𣻑'=>'𣻑','淹'=>'淹','潮'=>'潮','𣽞'=>'𣽞','𣾎'=>'𣾎','濆'=>'濆','瀹'=>'瀹','瀞'=>'瀞','瀛'=>'瀛','㶖'=>'㶖','灊'=>'灊','災'=>'災','灷'=>'灷','炭'=>'炭','𠔥'=>'𠔥','煅'=>'煅','𤉣'=>'𤉣','熜'=>'熜','𤎫'=>'𤎫','爨'=>'爨','爵'=>'爵','牐'=>'牐','𤘈'=>'𤘈','犀'=>'犀','犕'=>'犕','𤜵'=>'𤜵','𤠔'=>'𤠔','獺'=>'獺','王'=>'王','㺬'=>'㺬','玥'=>'玥','㺸'=>'㺸','㺸'=>'㺸','瑇'=>'瑇','瑜'=>'瑜','瑱'=>'瑱','璅'=>'璅','瓊'=>'瓊','㼛'=>'㼛','甤'=>'甤','𤰶'=>'𤰶','甾'=>'甾','𤲒'=>'𤲒','異'=>'異','𢆟'=>'𢆟','瘐'=>'瘐','𤾡'=>'𤾡','𤾸'=>'𤾸','𥁄'=>'𥁄','㿼'=>'㿼','䀈'=>'䀈','直'=>'直','𥃳'=>'𥃳','𥃲'=>'𥃲','𥄙'=>'𥄙','𥄳'=>'𥄳','眞'=>'眞','真'=>'真','真'=>'真','睊'=>'睊','䀹'=>'䀹','瞋'=>'瞋','䁆'=>'䁆','䂖'=>'䂖','𥐝'=>'𥐝','硎'=>'硎','碌'=>'碌','磌'=>'磌','䃣'=>'䃣','𥘦'=>'𥘦','祖'=>'祖','𥚚'=>'𥚚','𥛅'=>'𥛅','福'=>'福','秫'=>'秫','䄯'=>'䄯','穀'=>'穀','穊'=>'穊','穏'=>'穏','𥥼'=>'𥥼','𥪧'=>'𥪧','𥪧'=>'𥪧','竮'=>'竮','䈂'=>'䈂','𥮫'=>'𥮫','篆'=>'篆','築'=>'築','䈧'=>'䈧','𥲀'=>'𥲀','糒'=>'糒','䊠'=>'䊠','糨'=>'糨','糣'=>'糣','紀'=>'紀','𥾆'=>'𥾆','絣'=>'絣','䌁'=>'䌁','緇'=>'緇','縂'=>'縂','繅'=>'繅','䌴'=>'䌴','𦈨'=>'𦈨','𦉇'=>'𦉇','䍙'=>'䍙','𦋙'=>'𦋙','罺'=>'罺','𦌾'=>'𦌾','羕'=>'羕','翺'=>'翺','者'=>'者','𦓚'=>'𦓚','𦔣'=>'𦔣','聠'=>'聠','𦖨'=>'𦖨','聰'=>'聰','𣍟'=>'𣍟','䏕'=>'䏕','育'=>'育','脃'=>'脃','䐋'=>'䐋','脾'=>'脾','媵'=>'媵','𦞧'=>'𦞧','𦞵'=>'𦞵','𣎓'=>'𣎓','𣎜'=>'𣎜','舁'=>'舁','舄'=>'舄','辞'=>'辞','䑫'=>'䑫','芑'=>'芑','芋'=>'芋','芝'=>'芝','劳'=>'劳','花'=>'花','芳'=>'芳','芽'=>'芽','苦'=>'苦','𦬼'=>'𦬼','若'=>'若','茝'=>'茝','荣'=>'荣','莭'=>'莭','茣'=>'茣','莽'=>'莽','菧'=>'菧','著'=>'著','荓'=>'荓','菊'=>'菊','菌'=>'菌','菜'=>'菜','𦰶'=>'𦰶','𦵫'=>'𦵫','𦳕'=>'𦳕','䔫'=>'䔫','蓱'=>'蓱','蓳'=>'蓳','蔖'=>'蔖','𧏊'=>'𧏊','蕤'=>'蕤','𦼬'=>'𦼬','䕝'=>'䕝','䕡'=>'䕡','𦾱'=>'𦾱','𧃒'=>'𧃒','䕫'=>'䕫','虐'=>'虐','虜'=>'虜','虧'=>'虧','虩'=>'虩','蚩'=>'蚩','蚈'=>'蚈','蜎'=>'蜎','蛢'=>'蛢','蝹'=>'蝹','蜨'=>'蜨','蝫'=>'蝫','螆'=>'螆','䗗'=>'䗗','蟡'=>'蟡','蠁'=>'蠁','䗹'=>'䗹','衠'=>'衠','衣'=>'衣','𧙧'=>'𧙧','裗'=>'裗','裞'=>'裞','䘵'=>'䘵','裺'=>'裺','㒻'=>'㒻','𧢮'=>'𧢮','𧥦'=>'𧥦','䚾'=>'䚾','䛇'=>'䛇','誠'=>'誠','諭'=>'諭','變'=>'變','豕'=>'豕','𧲨'=>'𧲨','貫'=>'貫','賁'=>'賁','贛'=>'贛','起'=>'起','𧼯'=>'𧼯','𠠄'=>'𠠄','跋'=>'跋','趼'=>'趼','跰'=>'跰','𠣞'=>'𠣞','軔'=>'軔','輸'=>'輸','𨗒'=>'𨗒','𨗭'=>'𨗭','邔'=>'邔','郱'=>'郱','鄑'=>'鄑','𨜮'=>'𨜮','鄛'=>'鄛','鈸'=>'鈸','鋗'=>'鋗','鋘'=>'鋘','鉼'=>'鉼','鏹'=>'鏹','鐕'=>'鐕','𨯺'=>'𨯺','開'=>'開','䦕'=>'䦕','閷'=>'閷','𨵷'=>'𨵷','䧦'=>'䧦','雃'=>'雃','嶲'=>'嶲','霣'=>'霣','𩅅'=>'𩅅','𩈚'=>'𩈚','䩮'=>'䩮','䩶'=>'䩶','韠'=>'韠','𩐊'=>'𩐊','䪲'=>'䪲','𩒖'=>'𩒖','頋'=>'頋','頋'=>'頋','頩'=>'頩','𩖶'=>'𩖶','飢'=>'飢','䬳'=>'䬳','餩'=>'餩','馧'=>'馧','駂'=>'駂','駾'=>'駾','䯎'=>'䯎','𩬰'=>'𩬰','鬒'=>'鬒','鱀'=>'鱀','鳽'=>'鳽','䳎'=>'䳎','䳭'=>'䳭','鵧'=>'鵧','𪃎'=>'𪃎','䳸'=>'䳸','𪄅'=>'𪄅','𪈎'=>'𪈎','𪊑'=>'𪊑','麻'=>'麻','䵖'=>'䵖','黹'=>'黹','黾'=>'黾','鼅'=>'鼅','鼏'=>'鼏','鼖'=>'鼖','鼻'=>'鼻','𪘀'=>'𪘀');
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/utf_nfc_qc.php b/phpBB/includes/utf/data/utf_nfc_qc.php
deleted file mode 100644
index 03031f8b6d..0000000000
--- a/phpBB/includes/utf/data/utf_nfc_qc.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-$GLOBALS['utf_nfc_qc']=array('̀'=>1,'́'=>1,'̓'=>1,'̈́'=>1,'ʹ'=>1,';'=>1,'·'=>1,'क़'=>1,'ख़'=>1,'ग़'=>1,'ज़'=>1,'ड़'=>1,'ढ़'=>1,'फ़'=>1,'य़'=>1,'ড়'=>1,'ঢ়'=>1,'য়'=>1,'ਲ਼'=>1,'ਸ਼'=>1,'ਖ਼'=>1,'ਗ਼'=>1,'ਜ਼'=>1,'ਫ਼'=>1,'ଡ଼'=>1,'ଢ଼'=>1,'གྷ'=>1,'ཌྷ'=>1,'དྷ'=>1,'བྷ'=>1,'ཛྷ'=>1,'ཀྵ'=>1,'ཱི'=>1,'ཱུ'=>1,'ྲྀ'=>1,'ླྀ'=>1,'ཱྀ'=>1,'ྒྷ'=>1,'ྜྷ'=>1,'ྡྷ'=>1,'ྦྷ'=>1,'ྫྷ'=>1,'ྐྵ'=>1,'ά'=>1,'έ'=>1,'ή'=>1,'ί'=>1,'ό'=>1,'ύ'=>1,'ώ'=>1,'Ά'=>1,'ι'=>1,'Έ'=>1,'Ή'=>1,'ΐ'=>1,'Ί'=>1,'ΰ'=>1,'Ύ'=>1,'΅'=>1,'`'=>1,'Ό'=>1,'Ώ'=>1,'´'=>1,' '=>1,' '=>1,'Ω'=>1,'K'=>1,'Å'=>1,'〈'=>1,'〉'=>1,'⫝̸'=>1,'豈'=>1,'更'=>1,'車'=>1,'賈'=>1,'滑'=>1,'串'=>1,'句'=>1,'龜'=>1,'龜'=>1,'契'=>1,'金'=>1,'喇'=>1,'奈'=>1,'懶'=>1,'癩'=>1,'羅'=>1,'蘿'=>1,'螺'=>1,'裸'=>1,'邏'=>1,'樂'=>1,'洛'=>1,'烙'=>1,'珞'=>1,'落'=>1,'酪'=>1,'駱'=>1,'亂'=>1,'卵'=>1,'欄'=>1,'爛'=>1,'蘭'=>1,'鸞'=>1,'嵐'=>1,'濫'=>1,'藍'=>1,'襤'=>1,'拉'=>1,'臘'=>1,'蠟'=>1,'廊'=>1,'朗'=>1,'浪'=>1,'狼'=>1,'郎'=>1,'來'=>1,'冷'=>1,'勞'=>1,'擄'=>1,'櫓'=>1,'爐'=>1,'盧'=>1,'老'=>1,'蘆'=>1,'虜'=>1,'路'=>1,'露'=>1,'魯'=>1,'鷺'=>1,'碌'=>1,'祿'=>1,'綠'=>1,'菉'=>1,'錄'=>1,'鹿'=>1,'論'=>1,'壟'=>1,'弄'=>1,'籠'=>1,'聾'=>1,'牢'=>1,'磊'=>1,'賂'=>1,'雷'=>1,'壘'=>1,'屢'=>1,'樓'=>1,'淚'=>1,'漏'=>1,'累'=>1,'縷'=>1,'陋'=>1,'勒'=>1,'肋'=>1,'凜'=>1,'凌'=>1,'稜'=>1,'綾'=>1,'菱'=>1,'陵'=>1,'讀'=>1,'拏'=>1,'樂'=>1,'諾'=>1,'丹'=>1,'寧'=>1,'怒'=>1,'率'=>1,'異'=>1,'北'=>1,'磻'=>1,'便'=>1,'復'=>1,'不'=>1,'泌'=>1,'數'=>1,'索'=>1,'參'=>1,'塞'=>1,'省'=>1,'葉'=>1,'說'=>1,'殺'=>1,'辰'=>1,'沈'=>1,'拾'=>1,'若'=>1,'掠'=>1,'略'=>1,'亮'=>1,'兩'=>1,'凉'=>1,'梁'=>1,'糧'=>1,'良'=>1,'諒'=>1,'量'=>1,'勵'=>1,'呂'=>1,'女'=>1,'廬'=>1,'旅'=>1,'濾'=>1,'礪'=>1,'閭'=>1,'驪'=>1,'麗'=>1,'黎'=>1,'力'=>1,'曆'=>1,'歷'=>1,'轢'=>1,'年'=>1,'憐'=>1,'戀'=>1,'撚'=>1,'漣'=>1,'煉'=>1,'璉'=>1,'秊'=>1,'練'=>1,'聯'=>1,'輦'=>1,'蓮'=>1,'連'=>1,'鍊'=>1,'列'=>1,'劣'=>1,'咽'=>1,'烈'=>1,'裂'=>1,'說'=>1,'廉'=>1,'念'=>1,'捻'=>1,'殮'=>1,'簾'=>1,'獵'=>1,'令'=>1,'囹'=>1,'寧'=>1,'嶺'=>1,'怜'=>1,'玲'=>1,'瑩'=>1,'羚'=>1,'聆'=>1,'鈴'=>1,'零'=>1,'靈'=>1,'領'=>1,'例'=>1,'禮'=>1,'醴'=>1,'隸'=>1,'惡'=>1,'了'=>1,'僚'=>1,'寮'=>1,'尿'=>1,'料'=>1,'樂'=>1,'燎'=>1,'療'=>1,'蓼'=>1,'遼'=>1,'龍'=>1,'暈'=>1,'阮'=>1,'劉'=>1,'杻'=>1,'柳'=>1,'流'=>1,'溜'=>1,'琉'=>1,'留'=>1,'硫'=>1,'紐'=>1,'類'=>1,'六'=>1,'戮'=>1,'陸'=>1,'倫'=>1,'崙'=>1,'淪'=>1,'輪'=>1,'律'=>1,'慄'=>1,'栗'=>1,'率'=>1,'隆'=>1,'利'=>1,'吏'=>1,'履'=>1,'易'=>1,'李'=>1,'梨'=>1,'泥'=>1,'理'=>1,'痢'=>1,'罹'=>1,'裏'=>1,'裡'=>1,'里'=>1,'離'=>1,'匿'=>1,'溺'=>1,'吝'=>1,'燐'=>1,'璘'=>1,'藺'=>1,'隣'=>1,'鱗'=>1,'麟'=>1,'林'=>1,'淋'=>1,'臨'=>1,'立'=>1,'笠'=>1,'粒'=>1,'狀'=>1,'炙'=>1,'識'=>1,'什'=>1,'茶'=>1,'刺'=>1,'切'=>1,'度'=>1,'拓'=>1,'糖'=>1,'宅'=>1,'洞'=>1,'暴'=>1,'輻'=>1,'行'=>1,'降'=>1,'見'=>1,'廓'=>1,'兀'=>1,'嗀'=>1,'塚'=>1,'晴'=>1,'凞'=>1,'猪'=>1,'益'=>1,'礼'=>1,'神'=>1,'祥'=>1,'福'=>1,'靖'=>1,'精'=>1,'羽'=>1,'蘒'=>1,'諸'=>1,'逸'=>1,'都'=>1,'飯'=>1,'飼'=>1,'館'=>1,'鶴'=>1,'侮'=>1,'僧'=>1,'免'=>1,'勉'=>1,'勤'=>1,'卑'=>1,'喝'=>1,'嘆'=>1,'器'=>1,'塀'=>1,'墨'=>1,'層'=>1,'屮'=>1,'悔'=>1,'慨'=>1,'憎'=>1,'懲'=>1,'敏'=>1,'既'=>1,'暑'=>1,'梅'=>1,'海'=>1,'渚'=>1,'漢'=>1,'煮'=>1,'爫'=>1,'琢'=>1,'碑'=>1,'社'=>1,'祉'=>1,'祈'=>1,'祐'=>1,'祖'=>1,'祝'=>1,'禍'=>1,'禎'=>1,'穀'=>1,'突'=>1,'節'=>1,'練'=>1,'縉'=>1,'繁'=>1,'署'=>1,'者'=>1,'臭'=>1,'艹'=>1,'艹'=>1,'著'=>1,'褐'=>1,'視'=>1,'謁'=>1,'謹'=>1,'賓'=>1,'贈'=>1,'辶'=>1,'逸'=>1,'難'=>1,'響'=>1,'頻'=>1,'並'=>1,'况'=>1,'全'=>1,'侀'=>1,'充'=>1,'冀'=>1,'勇'=>1,'勺'=>1,'喝'=>1,'啕'=>1,'喙'=>1,'嗢'=>1,'塚'=>1,'墳'=>1,'奄'=>1,'奔'=>1,'婢'=>1,'嬨'=>1,'廒'=>1,'廙'=>1,'彩'=>1,'徭'=>1,'惘'=>1,'慎'=>1,'愈'=>1,'憎'=>1,'慠'=>1,'懲'=>1,'戴'=>1,'揄'=>1,'搜'=>1,'摒'=>1,'敖'=>1,'晴'=>1,'朗'=>1,'望'=>1,'杖'=>1,'歹'=>1,'殺'=>1,'流'=>1,'滛'=>1,'滋'=>1,'漢'=>1,'瀞'=>1,'煮'=>1,'瞧'=>1,'爵'=>1,'犯'=>1,'猪'=>1,'瑱'=>1,'甆'=>1,'画'=>1,'瘝'=>1,'瘟'=>1,'益'=>1,'盛'=>1,'直'=>1,'睊'=>1,'着'=>1,'磌'=>1,'窱'=>1,'節'=>1,'类'=>1,'絛'=>1,'練'=>1,'缾'=>1,'者'=>1,'荒'=>1,'華'=>1,'蝹'=>1,'襁'=>1,'覆'=>1,'視'=>1,'調'=>1,'諸'=>1,'請'=>1,'謁'=>1,'諾'=>1,'諭'=>1,'謹'=>1,'變'=>1,'贈'=>1,'輸'=>1,'遲'=>1,'醙'=>1,'鉶'=>1,'陼'=>1,'難'=>1,'靖'=>1,'韛'=>1,'響'=>1,'頋'=>1,'頻'=>1,'鬒'=>1,'龜'=>1,'𢡊'=>1,'𢡄'=>1,'𣏕'=>1,'㮝'=>1,'䀘'=>1,'䀹'=>1,'𥉉'=>1,'𥳐'=>1,'𧻓'=>1,'齃'=>1,'龎'=>1,'יִ'=>1,'ײַ'=>1,'שׁ'=>1,'שׂ'=>1,'שּׁ'=>1,'שּׂ'=>1,'אַ'=>1,'אָ'=>1,'אּ'=>1,'בּ'=>1,'גּ'=>1,'דּ'=>1,'הּ'=>1,'וּ'=>1,'זּ'=>1,'טּ'=>1,'יּ'=>1,'ךּ'=>1,'כּ'=>1,'לּ'=>1,'מּ'=>1,'נּ'=>1,'סּ'=>1,'ףּ'=>1,'פּ'=>1,'צּ'=>1,'קּ'=>1,'רּ'=>1,'שּ'=>1,'תּ'=>1,'וֹ'=>1,'בֿ'=>1,'כֿ'=>1,'פֿ'=>1,'𝅗𝅥'=>1,'𝅘𝅥'=>1,'𝅘𝅥𝅮'=>1,'𝅘𝅥𝅯'=>1,'𝅘𝅥𝅰'=>1,'𝅘𝅥𝅱'=>1,'𝅘𝅥𝅲'=>1,'𝆹𝅥'=>1,'𝆺𝅥'=>1,'𝆹𝅥𝅮'=>1,'𝆺𝅥𝅮'=>1,'𝆹𝅥𝅯'=>1,'𝆺𝅥𝅯'=>1,'丽'=>1,'丸'=>1,'乁'=>1,'𠄢'=>1,'你'=>1,'侮'=>1,'侻'=>1,'倂'=>1,'偺'=>1,'備'=>1,'僧'=>1,'像'=>1,'㒞'=>1,'𠘺'=>1,'免'=>1,'兔'=>1,'兤'=>1,'具'=>1,'𠔜'=>1,'㒹'=>1,'內'=>1,'再'=>1,'𠕋'=>1,'冗'=>1,'冤'=>1,'仌'=>1,'冬'=>1,'况'=>1,'𩇟'=>1,'凵'=>1,'刃'=>1,'㓟'=>1,'刻'=>1,'剆'=>1,'割'=>1,'剷'=>1,'㔕'=>1,'勇'=>1,'勉'=>1,'勤'=>1,'勺'=>1,'包'=>1,'匆'=>1,'北'=>1,'卉'=>1,'卑'=>1,'博'=>1,'即'=>1,'卽'=>1,'卿'=>1,'卿'=>1,'卿'=>1,'𠨬'=>1,'灰'=>1,'及'=>1,'叟'=>1,'𠭣'=>1,'叫'=>1,'叱'=>1,'吆'=>1,'咞'=>1,'吸'=>1,'呈'=>1,'周'=>1,'咢'=>1,'哶'=>1,'唐'=>1,'啓'=>1,'啣'=>1,'善'=>1,'善'=>1,'喙'=>1,'喫'=>1,'喳'=>1,'嗂'=>1,'圖'=>1,'嘆'=>1,'圗'=>1,'噑'=>1,'噴'=>1,'切'=>1,'壮'=>1,'城'=>1,'埴'=>1,'堍'=>1,'型'=>1,'堲'=>1,'報'=>1,'墬'=>1,'𡓤'=>1,'売'=>1,'壷'=>1,'夆'=>1,'多'=>1,'夢'=>1,'奢'=>1,'𡚨'=>1,'𡛪'=>1,'姬'=>1,'娛'=>1,'娧'=>1,'姘'=>1,'婦'=>1,'㛮'=>1,'㛼'=>1,'嬈'=>1,'嬾'=>1,'嬾'=>1,'𡧈'=>1,'寃'=>1,'寘'=>1,'寧'=>1,'寳'=>1,'𡬘'=>1,'寿'=>1,'将'=>1,'当'=>1,'尢'=>1,'㞁'=>1,'屠'=>1,'屮'=>1,'峀'=>1,'岍'=>1,'𡷤'=>1,'嵃'=>1,'𡷦'=>1,'嵮'=>1,'嵫'=>1,'嵼'=>1,'巡'=>1,'巢'=>1,'㠯'=>1,'巽'=>1,'帨'=>1,'帽'=>1,'幩'=>1,'㡢'=>1,'𢆃'=>1,'㡼'=>1,'庰'=>1,'庳'=>1,'庶'=>1,'廊'=>1,'𪎒'=>1,'廾'=>1,'𢌱'=>1,'𢌱'=>1,'舁'=>1,'弢'=>1,'弢'=>1,'㣇'=>1,'𣊸'=>1,'𦇚'=>1,'形'=>1,'彫'=>1,'㣣'=>1,'徚'=>1,'忍'=>1,'志'=>1,'忹'=>1,'悁'=>1,'㤺'=>1,'㤜'=>1,'悔'=>1,'𢛔'=>1,'惇'=>1,'慈'=>1,'慌'=>1,'慎'=>1,'慌'=>1,'慺'=>1,'憎'=>1,'憲'=>1,'憤'=>1,'憯'=>1,'懞'=>1,'懲'=>1,'懶'=>1,'成'=>1,'戛'=>1,'扝'=>1,'抱'=>1,'拔'=>1,'捐'=>1,'𢬌'=>1,'挽'=>1,'拼'=>1,'捨'=>1,'掃'=>1,'揤'=>1,'𢯱'=>1,'搢'=>1,'揅'=>1,'掩'=>1,'㨮'=>1,'摩'=>1,'摾'=>1,'撝'=>1,'摷'=>1,'㩬'=>1,'敏'=>1,'敬'=>1,'𣀊'=>1,'旣'=>1,'書'=>1,'晉'=>1,'㬙'=>1,'暑'=>1,'㬈'=>1,'㫤'=>1,'冒'=>1,'冕'=>1,'最'=>1,'暜'=>1,'肭'=>1,'䏙'=>1,'朗'=>1,'望'=>1,'朡'=>1,'杞'=>1,'杓'=>1,'𣏃'=>1,'㭉'=>1,'柺'=>1,'枅'=>1,'桒'=>1,'梅'=>1,'𣑭'=>1,'梎'=>1,'栟'=>1,'椔'=>1,'㮝'=>1,'楂'=>1,'榣'=>1,'槪'=>1,'檨'=>1,'𣚣'=>1,'櫛'=>1,'㰘'=>1,'次'=>1,'𣢧'=>1,'歔'=>1,'㱎'=>1,'歲'=>1,'殟'=>1,'殺'=>1,'殻'=>1,'𣪍'=>1,'𡴋'=>1,'𣫺'=>1,'汎'=>1,'𣲼'=>1,'沿'=>1,'泍'=>1,'汧'=>1,'洖'=>1,'派'=>1,'海'=>1,'流'=>1,'浩'=>1,'浸'=>1,'涅'=>1,'𣴞'=>1,'洴'=>1,'港'=>1,'湮'=>1,'㴳'=>1,'滋'=>1,'滇'=>1,'𣻑'=>1,'淹'=>1,'潮'=>1,'𣽞'=>1,'𣾎'=>1,'濆'=>1,'瀹'=>1,'瀞'=>1,'瀛'=>1,'㶖'=>1,'灊'=>1,'災'=>1,'灷'=>1,'炭'=>1,'𠔥'=>1,'煅'=>1,'𤉣'=>1,'熜'=>1,'𤎫'=>1,'爨'=>1,'爵'=>1,'牐'=>1,'𤘈'=>1,'犀'=>1,'犕'=>1,'𤜵'=>1,'𤠔'=>1,'獺'=>1,'王'=>1,'㺬'=>1,'玥'=>1,'㺸'=>1,'㺸'=>1,'瑇'=>1,'瑜'=>1,'瑱'=>1,'璅'=>1,'瓊'=>1,'㼛'=>1,'甤'=>1,'𤰶'=>1,'甾'=>1,'𤲒'=>1,'異'=>1,'𢆟'=>1,'瘐'=>1,'𤾡'=>1,'𤾸'=>1,'𥁄'=>1,'㿼'=>1,'䀈'=>1,'直'=>1,'𥃳'=>1,'𥃲'=>1,'𥄙'=>1,'𥄳'=>1,'眞'=>1,'真'=>1,'真'=>1,'睊'=>1,'䀹'=>1,'瞋'=>1,'䁆'=>1,'䂖'=>1,'𥐝'=>1,'硎'=>1,'碌'=>1,'磌'=>1,'䃣'=>1,'𥘦'=>1,'祖'=>1,'𥚚'=>1,'𥛅'=>1,'福'=>1,'秫'=>1,'䄯'=>1,'穀'=>1,'穊'=>1,'穏'=>1,'𥥼'=>1,'𥪧'=>1,'𥪧'=>1,'竮'=>1,'䈂'=>1,'𥮫'=>1,'篆'=>1,'築'=>1,'䈧'=>1,'𥲀'=>1,'糒'=>1,'䊠'=>1,'糨'=>1,'糣'=>1,'紀'=>1,'𥾆'=>1,'絣'=>1,'䌁'=>1,'緇'=>1,'縂'=>1,'繅'=>1,'䌴'=>1,'𦈨'=>1,'𦉇'=>1,'䍙'=>1,'𦋙'=>1,'罺'=>1,'𦌾'=>1,'羕'=>1,'翺'=>1,'者'=>1,'𦓚'=>1,'𦔣'=>1,'聠'=>1,'𦖨'=>1,'聰'=>1,'𣍟'=>1,'䏕'=>1,'育'=>1,'脃'=>1,'䐋'=>1,'脾'=>1,'媵'=>1,'𦞧'=>1,'𦞵'=>1,'𣎓'=>1,'𣎜'=>1,'舁'=>1,'舄'=>1,'辞'=>1,'䑫'=>1,'芑'=>1,'芋'=>1,'芝'=>1,'劳'=>1,'花'=>1,'芳'=>1,'芽'=>1,'苦'=>1,'𦬼'=>1,'若'=>1,'茝'=>1,'荣'=>1,'莭'=>1,'茣'=>1,'莽'=>1,'菧'=>1,'著'=>1,'荓'=>1,'菊'=>1,'菌'=>1,'菜'=>1,'𦰶'=>1,'𦵫'=>1,'𦳕'=>1,'䔫'=>1,'蓱'=>1,'蓳'=>1,'蔖'=>1,'𧏊'=>1,'蕤'=>1,'𦼬'=>1,'䕝'=>1,'䕡'=>1,'𦾱'=>1,'𧃒'=>1,'䕫'=>1,'虐'=>1,'虜'=>1,'虧'=>1,'虩'=>1,'蚩'=>1,'蚈'=>1,'蜎'=>1,'蛢'=>1,'蝹'=>1,'蜨'=>1,'蝫'=>1,'螆'=>1,'䗗'=>1,'蟡'=>1,'蠁'=>1,'䗹'=>1,'衠'=>1,'衣'=>1,'𧙧'=>1,'裗'=>1,'裞'=>1,'䘵'=>1,'裺'=>1,'㒻'=>1,'𧢮'=>1,'𧥦'=>1,'䚾'=>1,'䛇'=>1,'誠'=>1,'諭'=>1,'變'=>1,'豕'=>1,'𧲨'=>1,'貫'=>1,'賁'=>1,'贛'=>1,'起'=>1,'𧼯'=>1,'𠠄'=>1,'跋'=>1,'趼'=>1,'跰'=>1,'𠣞'=>1,'軔'=>1,'輸'=>1,'𨗒'=>1,'𨗭'=>1,'邔'=>1,'郱'=>1,'鄑'=>1,'𨜮'=>1,'鄛'=>1,'鈸'=>1,'鋗'=>1,'鋘'=>1,'鉼'=>1,'鏹'=>1,'鐕'=>1,'𨯺'=>1,'開'=>1,'䦕'=>1,'閷'=>1,'𨵷'=>1,'䧦'=>1,'雃'=>1,'嶲'=>1,'霣'=>1,'𩅅'=>1,'𩈚'=>1,'䩮'=>1,'䩶'=>1,'韠'=>1,'𩐊'=>1,'䪲'=>1,'𩒖'=>1,'頋'=>1,'頋'=>1,'頩'=>1,'𩖶'=>1,'飢'=>1,'䬳'=>1,'餩'=>1,'馧'=>1,'駂'=>1,'駾'=>1,'䯎'=>1,'𩬰'=>1,'鬒'=>1,'鱀'=>1,'鳽'=>1,'䳎'=>1,'䳭'=>1,'鵧'=>1,'𪃎'=>1,'䳸'=>1,'𪄅'=>1,'𪈎'=>1,'𪊑'=>1,'麻'=>1,'䵖'=>1,'黹'=>1,'黾'=>1,'鼅'=>1,'鼏'=>1,'鼖'=>1,'鼻'=>1,'𪘀'=>1,'̀'=>0,'́'=>0,'̂'=>0,'̃'=>0,'̄'=>0,'̆'=>0,'̇'=>0,'̈'=>0,'̉'=>0,'̊'=>0,'̋'=>0,'̌'=>0,'̏'=>0,'̑'=>0,'̓'=>0,'̔'=>0,'̛'=>0,'̣'=>0,'̤'=>0,'̥'=>0,'̦'=>0,'̧'=>0,'̨'=>0,'̭'=>0,'̮'=>0,'̰'=>0,'̱'=>0,'̸'=>0,'͂'=>0,'ͅ'=>0,'ٓ'=>0,'ٔ'=>0,'ٕ'=>0,'़'=>0,'া'=>0,'ৗ'=>0,'ା'=>0,'ୖ'=>0,'ୗ'=>0,'ா'=>0,'ௗ'=>0,'ౖ'=>0,'ೂ'=>0,'ೕ'=>0,'ೖ'=>0,'ാ'=>0,'ൗ'=>0,'්'=>0,'ා'=>0,'ෟ'=>0,'ီ'=>0,'ᅡ'=>0,'ᅢ'=>0,'ᅣ'=>0,'ᅤ'=>0,'ᅥ'=>0,'ᅦ'=>0,'ᅧ'=>0,'ᅨ'=>0,'ᅩ'=>0,'ᅪ'=>0,'ᅫ'=>0,'ᅬ'=>0,'ᅭ'=>0,'ᅮ'=>0,'ᅯ'=>0,'ᅰ'=>0,'ᅱ'=>0,'ᅲ'=>0,'ᅳ'=>0,'ᅴ'=>0,'ᅵ'=>0,'ᆨ'=>0,'ᆩ'=>0,'ᆪ'=>0,'ᆫ'=>0,'ᆬ'=>0,'ᆭ'=>0,'ᆮ'=>0,'ᆯ'=>0,'ᆰ'=>0,'ᆱ'=>0,'ᆲ'=>0,'ᆳ'=>0,'ᆴ'=>0,'ᆵ'=>0,'ᆶ'=>0,'ᆷ'=>0,'ᆸ'=>0,'ᆹ'=>0,'ᆺ'=>0,'ᆻ'=>0,'ᆼ'=>0,'ᆽ'=>0,'ᆾ'=>0,'ᆿ'=>0,'ᇀ'=>0,'ᇁ'=>0,'ᇂ'=>0,'ᬵ'=>0,'゙'=>0,'゚'=>0);
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/utf_nfkc_qc.php b/phpBB/includes/utf/data/utf_nfkc_qc.php
deleted file mode 100644
index da9a8a0e89..0000000000
--- a/phpBB/includes/utf/data/utf_nfkc_qc.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-$GLOBALS['utf_nfkc_qc']=array(' '=>1,'¨'=>1,'ª'=>1,'¯'=>1,'²'=>1,'³'=>1,'´'=>1,'µ'=>1,'¸'=>1,'¹'=>1,'º'=>1,'¼'=>1,'½'=>1,'¾'=>1,'Ĳ'=>1,'ĳ'=>1,'Ŀ'=>1,'ŀ'=>1,'ŉ'=>1,'ſ'=>1,'Ǆ'=>1,'ǅ'=>1,'ǆ'=>1,'Ǉ'=>1,'ǈ'=>1,'ǉ'=>1,'Ǌ'=>1,'ǋ'=>1,'ǌ'=>1,'Ǳ'=>1,'ǲ'=>1,'ǳ'=>1,'ʰ'=>1,'ʱ'=>1,'ʲ'=>1,'ʳ'=>1,'ʴ'=>1,'ʵ'=>1,'ʶ'=>1,'ʷ'=>1,'ʸ'=>1,'˘'=>1,'˙'=>1,'˚'=>1,'˛'=>1,'˜'=>1,'˝'=>1,'ˠ'=>1,'ˡ'=>1,'ˢ'=>1,'ˣ'=>1,'ˤ'=>1,'̀'=>1,'́'=>1,'̓'=>1,'̈́'=>1,'ʹ'=>1,'ͺ'=>1,';'=>1,'΄'=>1,'΅'=>1,'·'=>1,'ϐ'=>1,'ϑ'=>1,'ϒ'=>1,'ϓ'=>1,'ϔ'=>1,'ϕ'=>1,'ϖ'=>1,'ϰ'=>1,'ϱ'=>1,'ϲ'=>1,'ϴ'=>1,'ϵ'=>1,'Ϲ'=>1,'և'=>1,'ٵ'=>1,'ٶ'=>1,'ٷ'=>1,'ٸ'=>1,'क़'=>1,'ख़'=>1,'ग़'=>1,'ज़'=>1,'ड़'=>1,'ढ़'=>1,'फ़'=>1,'य़'=>1,'ড়'=>1,'ঢ়'=>1,'য়'=>1,'ਲ਼'=>1,'ਸ਼'=>1,'ਖ਼'=>1,'ਗ਼'=>1,'ਜ਼'=>1,'ਫ਼'=>1,'ଡ଼'=>1,'ଢ଼'=>1,'ำ'=>1,'ຳ'=>1,'ໜ'=>1,'ໝ'=>1,'༌'=>1,'གྷ'=>1,'ཌྷ'=>1,'དྷ'=>1,'བྷ'=>1,'ཛྷ'=>1,'ཀྵ'=>1,'ཱི'=>1,'ཱུ'=>1,'ྲྀ'=>1,'ཷ'=>1,'ླྀ'=>1,'ཹ'=>1,'ཱྀ'=>1,'ྒྷ'=>1,'ྜྷ'=>1,'ྡྷ'=>1,'ྦྷ'=>1,'ྫྷ'=>1,'ྐྵ'=>1,'ჼ'=>1,'ᴬ'=>1,'ᴭ'=>1,'ᴮ'=>1,'ᴰ'=>1,'ᴱ'=>1,'ᴲ'=>1,'ᴳ'=>1,'ᴴ'=>1,'ᴵ'=>1,'ᴶ'=>1,'ᴷ'=>1,'ᴸ'=>1,'ᴹ'=>1,'ᴺ'=>1,'ᴼ'=>1,'ᴽ'=>1,'ᴾ'=>1,'ᴿ'=>1,'ᵀ'=>1,'ᵁ'=>1,'ᵂ'=>1,'ᵃ'=>1,'ᵄ'=>1,'ᵅ'=>1,'ᵆ'=>1,'ᵇ'=>1,'ᵈ'=>1,'ᵉ'=>1,'ᵊ'=>1,'ᵋ'=>1,'ᵌ'=>1,'ᵍ'=>1,'ᵏ'=>1,'ᵐ'=>1,'ᵑ'=>1,'ᵒ'=>1,'ᵓ'=>1,'ᵔ'=>1,'ᵕ'=>1,'ᵖ'=>1,'ᵗ'=>1,'ᵘ'=>1,'ᵙ'=>1,'ᵚ'=>1,'ᵛ'=>1,'ᵜ'=>1,'ᵝ'=>1,'ᵞ'=>1,'ᵟ'=>1,'ᵠ'=>1,'ᵡ'=>1,'ᵢ'=>1,'ᵣ'=>1,'ᵤ'=>1,'ᵥ'=>1,'ᵦ'=>1,'ᵧ'=>1,'ᵨ'=>1,'ᵩ'=>1,'ᵪ'=>1,'ᵸ'=>1,'ᶛ'=>1,'ᶜ'=>1,'ᶝ'=>1,'ᶞ'=>1,'ᶟ'=>1,'ᶠ'=>1,'ᶡ'=>1,'ᶢ'=>1,'ᶣ'=>1,'ᶤ'=>1,'ᶥ'=>1,'ᶦ'=>1,'ᶧ'=>1,'ᶨ'=>1,'ᶩ'=>1,'ᶪ'=>1,'ᶫ'=>1,'ᶬ'=>1,'ᶭ'=>1,'ᶮ'=>1,'ᶯ'=>1,'ᶰ'=>1,'ᶱ'=>1,'ᶲ'=>1,'ᶳ'=>1,'ᶴ'=>1,'ᶵ'=>1,'ᶶ'=>1,'ᶷ'=>1,'ᶸ'=>1,'ᶹ'=>1,'ᶺ'=>1,'ᶻ'=>1,'ᶼ'=>1,'ᶽ'=>1,'ᶾ'=>1,'ᶿ'=>1,'ẚ'=>1,'ẛ'=>1,'ά'=>1,'έ'=>1,'ή'=>1,'ί'=>1,'ό'=>1,'ύ'=>1,'ώ'=>1,'Ά'=>1,'᾽'=>1,'ι'=>1,'᾿'=>1,'῀'=>1,'῁'=>1,'Έ'=>1,'Ή'=>1,'῍'=>1,'῎'=>1,'῏'=>1,'ΐ'=>1,'Ί'=>1,'῝'=>1,'῞'=>1,'῟'=>1,'ΰ'=>1,'Ύ'=>1,'῭'=>1,'΅'=>1,'`'=>1,'Ό'=>1,'Ώ'=>1,'´'=>1,'῾'=>1,' '=>1,' '=>1,' '=>1,' '=>1,' '=>1,' '=>1,' '=>1,' '=>1,' '=>1,' '=>1,' '=>1,'‑'=>1,'‗'=>1,'․'=>1,'‥'=>1,'…'=>1,' '=>1,'″'=>1,'‴'=>1,'‶'=>1,'‷'=>1,'‼'=>1,'‾'=>1,'⁇'=>1,'⁈'=>1,'⁉'=>1,'⁗'=>1,' '=>1,'⁰'=>1,'ⁱ'=>1,'⁴'=>1,'⁵'=>1,'⁶'=>1,'⁷'=>1,'⁸'=>1,'⁹'=>1,'⁺'=>1,'⁻'=>1,'⁼'=>1,'⁽'=>1,'⁾'=>1,'ⁿ'=>1,'₀'=>1,'₁'=>1,'₂'=>1,'₃'=>1,'₄'=>1,'₅'=>1,'₆'=>1,'₇'=>1,'₈'=>1,'₉'=>1,'₊'=>1,'₋'=>1,'₌'=>1,'₍'=>1,'₎'=>1,'ₐ'=>1,'ₑ'=>1,'ₒ'=>1,'ₓ'=>1,'ₔ'=>1,'₨'=>1,'℀'=>1,'℁'=>1,'ℂ'=>1,'℃'=>1,'℅'=>1,'℆'=>1,'ℇ'=>1,'℉'=>1,'ℊ'=>1,'ℋ'=>1,'ℌ'=>1,'ℍ'=>1,'ℎ'=>1,'ℏ'=>1,'ℐ'=>1,'ℑ'=>1,'ℒ'=>1,'ℓ'=>1,'ℕ'=>1,'№'=>1,'ℙ'=>1,'ℚ'=>1,'ℛ'=>1,'ℜ'=>1,'ℝ'=>1,'℠'=>1,'℡'=>1,'™'=>1,'ℤ'=>1,'Ω'=>1,'ℨ'=>1,'K'=>1,'Å'=>1,'ℬ'=>1,'ℭ'=>1,'ℯ'=>1,'ℰ'=>1,'ℱ'=>1,'ℳ'=>1,'ℴ'=>1,'ℵ'=>1,'ℶ'=>1,'ℷ'=>1,'ℸ'=>1,'ℹ'=>1,'℻'=>1,'ℼ'=>1,'ℽ'=>1,'ℾ'=>1,'ℿ'=>1,'⅀'=>1,'ⅅ'=>1,'ⅆ'=>1,'ⅇ'=>1,'ⅈ'=>1,'ⅉ'=>1,'⅓'=>1,'⅔'=>1,'⅕'=>1,'⅖'=>1,'⅗'=>1,'⅘'=>1,'⅙'=>1,'⅚'=>1,'⅛'=>1,'⅜'=>1,'⅝'=>1,'⅞'=>1,'⅟'=>1,'Ⅰ'=>1,'Ⅱ'=>1,'Ⅲ'=>1,'Ⅳ'=>1,'Ⅴ'=>1,'Ⅵ'=>1,'Ⅶ'=>1,'Ⅷ'=>1,'Ⅸ'=>1,'Ⅹ'=>1,'Ⅺ'=>1,'Ⅻ'=>1,'Ⅼ'=>1,'Ⅽ'=>1,'Ⅾ'=>1,'Ⅿ'=>1,'ⅰ'=>1,'ⅱ'=>1,'ⅲ'=>1,'ⅳ'=>1,'ⅴ'=>1,'ⅵ'=>1,'ⅶ'=>1,'ⅷ'=>1,'ⅸ'=>1,'ⅹ'=>1,'ⅺ'=>1,'ⅻ'=>1,'ⅼ'=>1,'ⅽ'=>1,'ⅾ'=>1,'ⅿ'=>1,'∬'=>1,'∭'=>1,'∯'=>1,'∰'=>1,'〈'=>1,'〉'=>1,'①'=>1,'②'=>1,'③'=>1,'④'=>1,'⑤'=>1,'⑥'=>1,'⑦'=>1,'⑧'=>1,'⑨'=>1,'⑩'=>1,'⑪'=>1,'⑫'=>1,'⑬'=>1,'⑭'=>1,'⑮'=>1,'⑯'=>1,'⑰'=>1,'⑱'=>1,'⑲'=>1,'⑳'=>1,'⑴'=>1,'⑵'=>1,'⑶'=>1,'⑷'=>1,'⑸'=>1,'⑹'=>1,'⑺'=>1,'⑻'=>1,'⑼'=>1,'⑽'=>1,'⑾'=>1,'⑿'=>1,'⒀'=>1,'⒁'=>1,'⒂'=>1,'⒃'=>1,'⒄'=>1,'⒅'=>1,'⒆'=>1,'⒇'=>1,'⒈'=>1,'⒉'=>1,'⒊'=>1,'⒋'=>1,'⒌'=>1,'⒍'=>1,'⒎'=>1,'⒏'=>1,'⒐'=>1,'⒑'=>1,'⒒'=>1,'⒓'=>1,'⒔'=>1,'⒕'=>1,'⒖'=>1,'⒗'=>1,'⒘'=>1,'⒙'=>1,'⒚'=>1,'⒛'=>1,'⒜'=>1,'⒝'=>1,'⒞'=>1,'⒟'=>1,'⒠'=>1,'⒡'=>1,'⒢'=>1,'⒣'=>1,'⒤'=>1,'⒥'=>1,'⒦'=>1,'⒧'=>1,'⒨'=>1,'⒩'=>1,'⒪'=>1,'⒫'=>1,'⒬'=>1,'⒭'=>1,'⒮'=>1,'⒯'=>1,'⒰'=>1,'⒱'=>1,'⒲'=>1,'⒳'=>1,'⒴'=>1,'⒵'=>1,'Ⓐ'=>1,'Ⓑ'=>1,'Ⓒ'=>1,'Ⓓ'=>1,'Ⓔ'=>1,'Ⓕ'=>1,'Ⓖ'=>1,'Ⓗ'=>1,'Ⓘ'=>1,'Ⓙ'=>1,'Ⓚ'=>1,'Ⓛ'=>1,'Ⓜ'=>1,'Ⓝ'=>1,'Ⓞ'=>1,'Ⓟ'=>1,'Ⓠ'=>1,'Ⓡ'=>1,'Ⓢ'=>1,'Ⓣ'=>1,'Ⓤ'=>1,'Ⓥ'=>1,'Ⓦ'=>1,'Ⓧ'=>1,'Ⓨ'=>1,'Ⓩ'=>1,'ⓐ'=>1,'ⓑ'=>1,'ⓒ'=>1,'ⓓ'=>1,'ⓔ'=>1,'ⓕ'=>1,'ⓖ'=>1,'ⓗ'=>1,'ⓘ'=>1,'ⓙ'=>1,'ⓚ'=>1,'ⓛ'=>1,'ⓜ'=>1,'ⓝ'=>1,'ⓞ'=>1,'ⓟ'=>1,'ⓠ'=>1,'ⓡ'=>1,'ⓢ'=>1,'ⓣ'=>1,'ⓤ'=>1,'ⓥ'=>1,'ⓦ'=>1,'ⓧ'=>1,'ⓨ'=>1,'ⓩ'=>1,'⓪'=>1,'⨌'=>1,'⩴'=>1,'⩵'=>1,'⩶'=>1,'⫝̸'=>1,'ⵯ'=>1,'⺟'=>1,'⻳'=>1,'⼀'=>1,'⼁'=>1,'⼂'=>1,'⼃'=>1,'⼄'=>1,'⼅'=>1,'⼆'=>1,'⼇'=>1,'⼈'=>1,'⼉'=>1,'⼊'=>1,'⼋'=>1,'⼌'=>1,'⼍'=>1,'⼎'=>1,'⼏'=>1,'⼐'=>1,'⼑'=>1,'⼒'=>1,'⼓'=>1,'⼔'=>1,'⼕'=>1,'⼖'=>1,'⼗'=>1,'⼘'=>1,'⼙'=>1,'⼚'=>1,'⼛'=>1,'⼜'=>1,'⼝'=>1,'⼞'=>1,'⼟'=>1,'⼠'=>1,'⼡'=>1,'⼢'=>1,'⼣'=>1,'⼤'=>1,'⼥'=>1,'⼦'=>1,'⼧'=>1,'⼨'=>1,'⼩'=>1,'⼪'=>1,'⼫'=>1,'⼬'=>1,'⼭'=>1,'⼮'=>1,'⼯'=>1,'⼰'=>1,'⼱'=>1,'⼲'=>1,'⼳'=>1,'⼴'=>1,'⼵'=>1,'⼶'=>1,'⼷'=>1,'⼸'=>1,'⼹'=>1,'⼺'=>1,'⼻'=>1,'⼼'=>1,'⼽'=>1,'⼾'=>1,'⼿'=>1,'⽀'=>1,'⽁'=>1,'⽂'=>1,'⽃'=>1,'⽄'=>1,'⽅'=>1,'⽆'=>1,'⽇'=>1,'⽈'=>1,'⽉'=>1,'⽊'=>1,'⽋'=>1,'⽌'=>1,'⽍'=>1,'⽎'=>1,'⽏'=>1,'⽐'=>1,'⽑'=>1,'⽒'=>1,'⽓'=>1,'⽔'=>1,'⽕'=>1,'⽖'=>1,'⽗'=>1,'⽘'=>1,'⽙'=>1,'⽚'=>1,'⽛'=>1,'⽜'=>1,'⽝'=>1,'⽞'=>1,'⽟'=>1,'⽠'=>1,'⽡'=>1,'⽢'=>1,'⽣'=>1,'⽤'=>1,'⽥'=>1,'⽦'=>1,'⽧'=>1,'⽨'=>1,'⽩'=>1,'⽪'=>1,'⽫'=>1,'⽬'=>1,'⽭'=>1,'⽮'=>1,'⽯'=>1,'⽰'=>1,'⽱'=>1,'⽲'=>1,'⽳'=>1,'⽴'=>1,'⽵'=>1,'⽶'=>1,'⽷'=>1,'⽸'=>1,'⽹'=>1,'⽺'=>1,'⽻'=>1,'⽼'=>1,'⽽'=>1,'⽾'=>1,'⽿'=>1,'⾀'=>1,'⾁'=>1,'⾂'=>1,'⾃'=>1,'⾄'=>1,'⾅'=>1,'⾆'=>1,'⾇'=>1,'⾈'=>1,'⾉'=>1,'⾊'=>1,'⾋'=>1,'⾌'=>1,'⾍'=>1,'⾎'=>1,'⾏'=>1,'⾐'=>1,'⾑'=>1,'⾒'=>1,'⾓'=>1,'⾔'=>1,'⾕'=>1,'⾖'=>1,'⾗'=>1,'⾘'=>1,'⾙'=>1,'⾚'=>1,'⾛'=>1,'⾜'=>1,'⾝'=>1,'⾞'=>1,'⾟'=>1,'⾠'=>1,'⾡'=>1,'⾢'=>1,'⾣'=>1,'⾤'=>1,'⾥'=>1,'⾦'=>1,'⾧'=>1,'⾨'=>1,'⾩'=>1,'⾪'=>1,'⾫'=>1,'⾬'=>1,'⾭'=>1,'⾮'=>1,'⾯'=>1,'⾰'=>1,'⾱'=>1,'⾲'=>1,'⾳'=>1,'⾴'=>1,'⾵'=>1,'⾶'=>1,'⾷'=>1,'⾸'=>1,'⾹'=>1,'⾺'=>1,'⾻'=>1,'⾼'=>1,'⾽'=>1,'⾾'=>1,'⾿'=>1,'⿀'=>1,'⿁'=>1,'⿂'=>1,'⿃'=>1,'⿄'=>1,'⿅'=>1,'⿆'=>1,'⿇'=>1,'⿈'=>1,'⿉'=>1,'⿊'=>1,'⿋'=>1,'⿌'=>1,'⿍'=>1,'⿎'=>1,'⿏'=>1,'⿐'=>1,'⿑'=>1,'⿒'=>1,'⿓'=>1,'⿔'=>1,'⿕'=>1,'　'=>1,'〶'=>1,'〸'=>1,'〹'=>1,'〺'=>1,'゛'=>1,'゜'=>1,'ゟ'=>1,'ヿ'=>1,'ㄱ'=>1,'ㄲ'=>1,'ㄳ'=>1,'ㄴ'=>1,'ㄵ'=>1,'ㄶ'=>1,'ㄷ'=>1,'ㄸ'=>1,'ㄹ'=>1,'ㄺ'=>1,'ㄻ'=>1,'ㄼ'=>1,'ㄽ'=>1,'ㄾ'=>1,'ㄿ'=>1,'ㅀ'=>1,'ㅁ'=>1,'ㅂ'=>1,'ㅃ'=>1,'ㅄ'=>1,'ㅅ'=>1,'ㅆ'=>1,'ㅇ'=>1,'ㅈ'=>1,'ㅉ'=>1,'ㅊ'=>1,'ㅋ'=>1,'ㅌ'=>1,'ㅍ'=>1,'ㅎ'=>1,'ㅏ'=>1,'ㅐ'=>1,'ㅑ'=>1,'ㅒ'=>1,'ㅓ'=>1,'ㅔ'=>1,'ㅕ'=>1,'ㅖ'=>1,'ㅗ'=>1,'ㅘ'=>1,'ㅙ'=>1,'ㅚ'=>1,'ㅛ'=>1,'ㅜ'=>1,'ㅝ'=>1,'ㅞ'=>1,'ㅟ'=>1,'ㅠ'=>1,'ㅡ'=>1,'ㅢ'=>1,'ㅣ'=>1,'ㅤ'=>1,'ㅥ'=>1,'ㅦ'=>1,'ㅧ'=>1,'ㅨ'=>1,'ㅩ'=>1,'ㅪ'=>1,'ㅫ'=>1,'ㅬ'=>1,'ㅭ'=>1,'ㅮ'=>1,'ㅯ'=>1,'ㅰ'=>1,'ㅱ'=>1,'ㅲ'=>1,'ㅳ'=>1,'ㅴ'=>1,'ㅵ'=>1,'ㅶ'=>1,'ㅷ'=>1,'ㅸ'=>1,'ㅹ'=>1,'ㅺ'=>1,'ㅻ'=>1,'ㅼ'=>1,'ㅽ'=>1,'ㅾ'=>1,'ㅿ'=>1,'ㆀ'=>1,'ㆁ'=>1,'ㆂ'=>1,'ㆃ'=>1,'ㆄ'=>1,'ㆅ'=>1,'ㆆ'=>1,'ㆇ'=>1,'ㆈ'=>1,'ㆉ'=>1,'ㆊ'=>1,'ㆋ'=>1,'ㆌ'=>1,'ㆍ'=>1,'ㆎ'=>1,'㆒'=>1,'㆓'=>1,'㆔'=>1,'㆕'=>1,'㆖'=>1,'㆗'=>1,'㆘'=>1,'㆙'=>1,'㆚'=>1,'㆛'=>1,'㆜'=>1,'㆝'=>1,'㆞'=>1,'㆟'=>1,'㈀'=>1,'㈁'=>1,'㈂'=>1,'㈃'=>1,'㈄'=>1,'㈅'=>1,'㈆'=>1,'㈇'=>1,'㈈'=>1,'㈉'=>1,'㈊'=>1,'㈋'=>1,'㈌'=>1,'㈍'=>1,'㈎'=>1,'㈏'=>1,'㈐'=>1,'㈑'=>1,'㈒'=>1,'㈓'=>1,'㈔'=>1,'㈕'=>1,'㈖'=>1,'㈗'=>1,'㈘'=>1,'㈙'=>1,'㈚'=>1,'㈛'=>1,'㈜'=>1,'㈝'=>1,'㈞'=>1,'㈠'=>1,'㈡'=>1,'㈢'=>1,'㈣'=>1,'㈤'=>1,'㈥'=>1,'㈦'=>1,'㈧'=>1,'㈨'=>1,'㈩'=>1,'㈪'=>1,'㈫'=>1,'㈬'=>1,'㈭'=>1,'㈮'=>1,'㈯'=>1,'㈰'=>1,'㈱'=>1,'㈲'=>1,'㈳'=>1,'㈴'=>1,'㈵'=>1,'㈶'=>1,'㈷'=>1,'㈸'=>1,'㈹'=>1,'㈺'=>1,'㈻'=>1,'㈼'=>1,'㈽'=>1,'㈾'=>1,'㈿'=>1,'㉀'=>1,'㉁'=>1,'㉂'=>1,'㉃'=>1,'㉐'=>1,'㉑'=>1,'㉒'=>1,'㉓'=>1,'㉔'=>1,'㉕'=>1,'㉖'=>1,'㉗'=>1,'㉘'=>1,'㉙'=>1,'㉚'=>1,'㉛'=>1,'㉜'=>1,'㉝'=>1,'㉞'=>1,'㉟'=>1,'㉠'=>1,'㉡'=>1,'㉢'=>1,'㉣'=>1,'㉤'=>1,'㉥'=>1,'㉦'=>1,'㉧'=>1,'㉨'=>1,'㉩'=>1,'㉪'=>1,'㉫'=>1,'㉬'=>1,'㉭'=>1,'㉮'=>1,'㉯'=>1,'㉰'=>1,'㉱'=>1,'㉲'=>1,'㉳'=>1,'㉴'=>1,'㉵'=>1,'㉶'=>1,'㉷'=>1,'㉸'=>1,'㉹'=>1,'㉺'=>1,'㉻'=>1,'㉼'=>1,'㉽'=>1,'㉾'=>1,'㊀'=>1,'㊁'=>1,'㊂'=>1,'㊃'=>1,'㊄'=>1,'㊅'=>1,'㊆'=>1,'㊇'=>1,'㊈'=>1,'㊉'=>1,'㊊'=>1,'㊋'=>1,'㊌'=>1,'㊍'=>1,'㊎'=>1,'㊏'=>1,'㊐'=>1,'㊑'=>1,'㊒'=>1,'㊓'=>1,'㊔'=>1,'㊕'=>1,'㊖'=>1,'㊗'=>1,'㊘'=>1,'㊙'=>1,'㊚'=>1,'㊛'=>1,'㊜'=>1,'㊝'=>1,'㊞'=>1,'㊟'=>1,'㊠'=>1,'㊡'=>1,'㊢'=>1,'㊣'=>1,'㊤'=>1,'㊥'=>1,'㊦'=>1,'㊧'=>1,'㊨'=>1,'㊩'=>1,'㊪'=>1,'㊫'=>1,'㊬'=>1,'㊭'=>1,'㊮'=>1,'㊯'=>1,'㊰'=>1,'㊱'=>1,'㊲'=>1,'㊳'=>1,'㊴'=>1,'㊵'=>1,'㊶'=>1,'㊷'=>1,'㊸'=>1,'㊹'=>1,'㊺'=>1,'㊻'=>1,'㊼'=>1,'㊽'=>1,'㊾'=>1,'㊿'=>1,'㋀'=>1,'㋁'=>1,'㋂'=>1,'㋃'=>1,'㋄'=>1,'㋅'=>1,'㋆'=>1,'㋇'=>1,'㋈'=>1,'㋉'=>1,'㋊'=>1,'㋋'=>1,'㋌'=>1,'㋍'=>1,'㋎'=>1,'㋏'=>1,'㋐'=>1,'㋑'=>1,'㋒'=>1,'㋓'=>1,'㋔'=>1,'㋕'=>1,'㋖'=>1,'㋗'=>1,'㋘'=>1,'㋙'=>1,'㋚'=>1,'㋛'=>1,'㋜'=>1,'㋝'=>1,'㋞'=>1,'㋟'=>1,'㋠'=>1,'㋡'=>1,'㋢'=>1,'㋣'=>1,'㋤'=>1,'㋥'=>1,'㋦'=>1,'㋧'=>1,'㋨'=>1,'㋩'=>1,'㋪'=>1,'㋫'=>1,'㋬'=>1,'㋭'=>1,'㋮'=>1,'㋯'=>1,'㋰'=>1,'㋱'=>1,'㋲'=>1,'㋳'=>1,'㋴'=>1,'㋵'=>1,'㋶'=>1,'㋷'=>1,'㋸'=>1,'㋹'=>1,'㋺'=>1,'㋻'=>1,'㋼'=>1,'㋽'=>1,'㋾'=>1,'㌀'=>1,'㌁'=>1,'㌂'=>1,'㌃'=>1,'㌄'=>1,'㌅'=>1,'㌆'=>1,'㌇'=>1,'㌈'=>1,'㌉'=>1,'㌊'=>1,'㌋'=>1,'㌌'=>1,'㌍'=>1,'㌎'=>1,'㌏'=>1,'㌐'=>1,'㌑'=>1,'㌒'=>1,'㌓'=>1,'㌔'=>1,'㌕'=>1,'㌖'=>1,'㌗'=>1,'㌘'=>1,'㌙'=>1,'㌚'=>1,'㌛'=>1,'㌜'=>1,'㌝'=>1,'㌞'=>1,'㌟'=>1,'㌠'=>1,'㌡'=>1,'㌢'=>1,'㌣'=>1,'㌤'=>1,'㌥'=>1,'㌦'=>1,'㌧'=>1,'㌨'=>1,'㌩'=>1,'㌪'=>1,'㌫'=>1,'㌬'=>1,'㌭'=>1,'㌮'=>1,'㌯'=>1,'㌰'=>1,'㌱'=>1,'㌲'=>1,'㌳'=>1,'㌴'=>1,'㌵'=>1,'㌶'=>1,'㌷'=>1,'㌸'=>1,'㌹'=>1,'㌺'=>1,'㌻'=>1,'㌼'=>1,'㌽'=>1,'㌾'=>1,'㌿'=>1,'㍀'=>1,'㍁'=>1,'㍂'=>1,'㍃'=>1,'㍄'=>1,'㍅'=>1,'㍆'=>1,'㍇'=>1,'㍈'=>1,'㍉'=>1,'㍊'=>1,'㍋'=>1,'㍌'=>1,'㍍'=>1,'㍎'=>1,'㍏'=>1,'㍐'=>1,'㍑'=>1,'㍒'=>1,'㍓'=>1,'㍔'=>1,'㍕'=>1,'㍖'=>1,'㍗'=>1,'㍘'=>1,'㍙'=>1,'㍚'=>1,'㍛'=>1,'㍜'=>1,'㍝'=>1,'㍞'=>1,'㍟'=>1,'㍠'=>1,'㍡'=>1,'㍢'=>1,'㍣'=>1,'㍤'=>1,'㍥'=>1,'㍦'=>1,'㍧'=>1,'㍨'=>1,'㍩'=>1,'㍪'=>1,'㍫'=>1,'㍬'=>1,'㍭'=>1,'㍮'=>1,'㍯'=>1,'㍰'=>1,'㍱'=>1,'㍲'=>1,'㍳'=>1,'㍴'=>1,'㍵'=>1,'㍶'=>1,'㍷'=>1,'㍸'=>1,'㍹'=>1,'㍺'=>1,'㍻'=>1,'㍼'=>1,'㍽'=>1,'㍾'=>1,'㍿'=>1,'㎀'=>1,'㎁'=>1,'㎂'=>1,'㎃'=>1,'㎄'=>1,'㎅'=>1,'㎆'=>1,'㎇'=>1,'㎈'=>1,'㎉'=>1,'㎊'=>1,'㎋'=>1,'㎌'=>1,'㎍'=>1,'㎎'=>1,'㎏'=>1,'㎐'=>1,'㎑'=>1,'㎒'=>1,'㎓'=>1,'㎔'=>1,'㎕'=>1,'㎖'=>1,'㎗'=>1,'㎘'=>1,'㎙'=>1,'㎚'=>1,'㎛'=>1,'㎜'=>1,'㎝'=>1,'㎞'=>1,'㎟'=>1,'㎠'=>1,'㎡'=>1,'㎢'=>1,'㎣'=>1,'㎤'=>1,'㎥'=>1,'㎦'=>1,'㎧'=>1,'㎨'=>1,'㎩'=>1,'㎪'=>1,'㎫'=>1,'㎬'=>1,'㎭'=>1,'㎮'=>1,'㎯'=>1,'㎰'=>1,'㎱'=>1,'㎲'=>1,'㎳'=>1,'㎴'=>1,'㎵'=>1,'㎶'=>1,'㎷'=>1,'㎸'=>1,'㎹'=>1,'㎺'=>1,'㎻'=>1,'㎼'=>1,'㎽'=>1,'㎾'=>1,'㎿'=>1,'㏀'=>1,'㏁'=>1,'㏂'=>1,'㏃'=>1,'㏄'=>1,'㏅'=>1,'㏆'=>1,'㏇'=>1,'㏈'=>1,'㏉'=>1,'㏊'=>1,'㏋'=>1,'㏌'=>1,'㏍'=>1,'㏎'=>1,'㏏'=>1,'㏐'=>1,'㏑'=>1,'㏒'=>1,'㏓'=>1,'㏔'=>1,'㏕'=>1,'㏖'=>1,'㏗'=>1,'㏘'=>1,'㏙'=>1,'㏚'=>1,'㏛'=>1,'㏜'=>1,'㏝'=>1,'㏞'=>1,'㏟'=>1,'㏠'=>1,'㏡'=>1,'㏢'=>1,'㏣'=>1,'㏤'=>1,'㏥'=>1,'㏦'=>1,'㏧'=>1,'㏨'=>1,'㏩'=>1,'㏪'=>1,'㏫'=>1,'㏬'=>1,'㏭'=>1,'㏮'=>1,'㏯'=>1,'㏰'=>1,'㏱'=>1,'㏲'=>1,'㏳'=>1,'㏴'=>1,'㏵'=>1,'㏶'=>1,'㏷'=>1,'㏸'=>1,'㏹'=>1,'㏺'=>1,'㏻'=>1,'㏼'=>1,'㏽'=>1,'㏾'=>1,'㏿'=>1,'豈'=>1,'更'=>1,'車'=>1,'賈'=>1,'滑'=>1,'串'=>1,'句'=>1,'龜'=>1,'龜'=>1,'契'=>1,'金'=>1,'喇'=>1,'奈'=>1,'懶'=>1,'癩'=>1,'羅'=>1,'蘿'=>1,'螺'=>1,'裸'=>1,'邏'=>1,'樂'=>1,'洛'=>1,'烙'=>1,'珞'=>1,'落'=>1,'酪'=>1,'駱'=>1,'亂'=>1,'卵'=>1,'欄'=>1,'爛'=>1,'蘭'=>1,'鸞'=>1,'嵐'=>1,'濫'=>1,'藍'=>1,'襤'=>1,'拉'=>1,'臘'=>1,'蠟'=>1,'廊'=>1,'朗'=>1,'浪'=>1,'狼'=>1,'郎'=>1,'來'=>1,'冷'=>1,'勞'=>1,'擄'=>1,'櫓'=>1,'爐'=>1,'盧'=>1,'老'=>1,'蘆'=>1,'虜'=>1,'路'=>1,'露'=>1,'魯'=>1,'鷺'=>1,'碌'=>1,'祿'=>1,'綠'=>1,'菉'=>1,'錄'=>1,'鹿'=>1,'論'=>1,'壟'=>1,'弄'=>1,'籠'=>1,'聾'=>1,'牢'=>1,'磊'=>1,'賂'=>1,'雷'=>1,'壘'=>1,'屢'=>1,'樓'=>1,'淚'=>1,'漏'=>1,'累'=>1,'縷'=>1,'陋'=>1,'勒'=>1,'肋'=>1,'凜'=>1,'凌'=>1,'稜'=>1,'綾'=>1,'菱'=>1,'陵'=>1,'讀'=>1,'拏'=>1,'樂'=>1,'諾'=>1,'丹'=>1,'寧'=>1,'怒'=>1,'率'=>1,'異'=>1,'北'=>1,'磻'=>1,'便'=>1,'復'=>1,'不'=>1,'泌'=>1,'數'=>1,'索'=>1,'參'=>1,'塞'=>1,'省'=>1,'葉'=>1,'說'=>1,'殺'=>1,'辰'=>1,'沈'=>1,'拾'=>1,'若'=>1,'掠'=>1,'略'=>1,'亮'=>1,'兩'=>1,'凉'=>1,'梁'=>1,'糧'=>1,'良'=>1,'諒'=>1,'量'=>1,'勵'=>1,'呂'=>1,'女'=>1,'廬'=>1,'旅'=>1,'濾'=>1,'礪'=>1,'閭'=>1,'驪'=>1,'麗'=>1,'黎'=>1,'力'=>1,'曆'=>1,'歷'=>1,'轢'=>1,'年'=>1,'憐'=>1,'戀'=>1,'撚'=>1,'漣'=>1,'煉'=>1,'璉'=>1,'秊'=>1,'練'=>1,'聯'=>1,'輦'=>1,'蓮'=>1,'連'=>1,'鍊'=>1,'列'=>1,'劣'=>1,'咽'=>1,'烈'=>1,'裂'=>1,'說'=>1,'廉'=>1,'念'=>1,'捻'=>1,'殮'=>1,'簾'=>1,'獵'=>1,'令'=>1,'囹'=>1,'寧'=>1,'嶺'=>1,'怜'=>1,'玲'=>1,'瑩'=>1,'羚'=>1,'聆'=>1,'鈴'=>1,'零'=>1,'靈'=>1,'領'=>1,'例'=>1,'禮'=>1,'醴'=>1,'隸'=>1,'惡'=>1,'了'=>1,'僚'=>1,'寮'=>1,'尿'=>1,'料'=>1,'樂'=>1,'燎'=>1,'療'=>1,'蓼'=>1,'遼'=>1,'龍'=>1,'暈'=>1,'阮'=>1,'劉'=>1,'杻'=>1,'柳'=>1,'流'=>1,'溜'=>1,'琉'=>1,'留'=>1,'硫'=>1,'紐'=>1,'類'=>1,'六'=>1,'戮'=>1,'陸'=>1,'倫'=>1,'崙'=>1,'淪'=>1,'輪'=>1,'律'=>1,'慄'=>1,'栗'=>1,'率'=>1,'隆'=>1,'利'=>1,'吏'=>1,'履'=>1,'易'=>1,'李'=>1,'梨'=>1,'泥'=>1,'理'=>1,'痢'=>1,'罹'=>1,'裏'=>1,'裡'=>1,'里'=>1,'離'=>1,'匿'=>1,'溺'=>1,'吝'=>1,'燐'=>1,'璘'=>1,'藺'=>1,'隣'=>1,'鱗'=>1,'麟'=>1,'林'=>1,'淋'=>1,'臨'=>1,'立'=>1,'笠'=>1,'粒'=>1,'狀'=>1,'炙'=>1,'識'=>1,'什'=>1,'茶'=>1,'刺'=>1,'切'=>1,'度'=>1,'拓'=>1,'糖'=>1,'宅'=>1,'洞'=>1,'暴'=>1,'輻'=>1,'行'=>1,'降'=>1,'見'=>1,'廓'=>1,'兀'=>1,'嗀'=>1,'塚'=>1,'晴'=>1,'凞'=>1,'猪'=>1,'益'=>1,'礼'=>1,'神'=>1,'祥'=>1,'福'=>1,'靖'=>1,'精'=>1,'羽'=>1,'蘒'=>1,'諸'=>1,'逸'=>1,'都'=>1,'飯'=>1,'飼'=>1,'館'=>1,'鶴'=>1,'侮'=>1,'僧'=>1,'免'=>1,'勉'=>1,'勤'=>1,'卑'=>1,'喝'=>1,'嘆'=>1,'器'=>1,'塀'=>1,'墨'=>1,'層'=>1,'屮'=>1,'悔'=>1,'慨'=>1,'憎'=>1,'懲'=>1,'敏'=>1,'既'=>1,'暑'=>1,'梅'=>1,'海'=>1,'渚'=>1,'漢'=>1,'煮'=>1,'爫'=>1,'琢'=>1,'碑'=>1,'社'=>1,'祉'=>1,'祈'=>1,'祐'=>1,'祖'=>1,'祝'=>1,'禍'=>1,'禎'=>1,'穀'=>1,'突'=>1,'節'=>1,'練'=>1,'縉'=>1,'繁'=>1,'署'=>1,'者'=>1,'臭'=>1,'艹'=>1,'艹'=>1,'著'=>1,'褐'=>1,'視'=>1,'謁'=>1,'謹'=>1,'賓'=>1,'贈'=>1,'辶'=>1,'逸'=>1,'難'=>1,'響'=>1,'頻'=>1,'並'=>1,'况'=>1,'全'=>1,'侀'=>1,'充'=>1,'冀'=>1,'勇'=>1,'勺'=>1,'喝'=>1,'啕'=>1,'喙'=>1,'嗢'=>1,'塚'=>1,'墳'=>1,'奄'=>1,'奔'=>1,'婢'=>1,'嬨'=>1,'廒'=>1,'廙'=>1,'彩'=>1,'徭'=>1,'惘'=>1,'慎'=>1,'愈'=>1,'憎'=>1,'慠'=>1,'懲'=>1,'戴'=>1,'揄'=>1,'搜'=>1,'摒'=>1,'敖'=>1,'晴'=>1,'朗'=>1,'望'=>1,'杖'=>1,'歹'=>1,'殺'=>1,'流'=>1,'滛'=>1,'滋'=>1,'漢'=>1,'瀞'=>1,'煮'=>1,'瞧'=>1,'爵'=>1,'犯'=>1,'猪'=>1,'瑱'=>1,'甆'=>1,'画'=>1,'瘝'=>1,'瘟'=>1,'益'=>1,'盛'=>1,'直'=>1,'睊'=>1,'着'=>1,'磌'=>1,'窱'=>1,'節'=>1,'类'=>1,'絛'=>1,'練'=>1,'缾'=>1,'者'=>1,'荒'=>1,'華'=>1,'蝹'=>1,'襁'=>1,'覆'=>1,'視'=>1,'調'=>1,'諸'=>1,'請'=>1,'謁'=>1,'諾'=>1,'諭'=>1,'謹'=>1,'變'=>1,'贈'=>1,'輸'=>1,'遲'=>1,'醙'=>1,'鉶'=>1,'陼'=>1,'難'=>1,'靖'=>1,'韛'=>1,'響'=>1,'頋'=>1,'頻'=>1,'鬒'=>1,'龜'=>1,'𢡊'=>1,'𢡄'=>1,'𣏕'=>1,'㮝'=>1,'䀘'=>1,'䀹'=>1,'𥉉'=>1,'𥳐'=>1,'𧻓'=>1,'齃'=>1,'龎'=>1,'ﬀ'=>1,'ﬁ'=>1,'ﬂ'=>1,'ﬃ'=>1,'ﬄ'=>1,'ﬅ'=>1,'ﬆ'=>1,'ﬓ'=>1,'ﬔ'=>1,'ﬕ'=>1,'ﬖ'=>1,'ﬗ'=>1,'יִ'=>1,'ײַ'=>1,'ﬠ'=>1,'ﬡ'=>1,'ﬢ'=>1,'ﬣ'=>1,'ﬤ'=>1,'ﬥ'=>1,'ﬦ'=>1,'ﬧ'=>1,'ﬨ'=>1,'﬩'=>1,'שׁ'=>1,'שׂ'=>1,'שּׁ'=>1,'שּׂ'=>1,'אַ'=>1,'אָ'=>1,'אּ'=>1,'בּ'=>1,'גּ'=>1,'דּ'=>1,'הּ'=>1,'וּ'=>1,'זּ'=>1,'טּ'=>1,'יּ'=>1,'ךּ'=>1,'כּ'=>1,'לּ'=>1,'מּ'=>1,'נּ'=>1,'סּ'=>1,'ףּ'=>1,'פּ'=>1,'צּ'=>1,'קּ'=>1,'רּ'=>1,'שּ'=>1,'תּ'=>1,'וֹ'=>1,'בֿ'=>1,'כֿ'=>1,'פֿ'=>1,'ﭏ'=>1,'ﭐ'=>1,'ﭑ'=>1,'ﭒ'=>1,'ﭓ'=>1,'ﭔ'=>1,'ﭕ'=>1,'ﭖ'=>1,'ﭗ'=>1,'ﭘ'=>1,'ﭙ'=>1,'ﭚ'=>1,'ﭛ'=>1,'ﭜ'=>1,'ﭝ'=>1,'ﭞ'=>1,'ﭟ'=>1,'ﭠ'=>1,'ﭡ'=>1,'ﭢ'=>1,'ﭣ'=>1,'ﭤ'=>1,'ﭥ'=>1,'ﭦ'=>1,'ﭧ'=>1,'ﭨ'=>1,'ﭩ'=>1,'ﭪ'=>1,'ﭫ'=>1,'ﭬ'=>1,'ﭭ'=>1,'ﭮ'=>1,'ﭯ'=>1,'ﭰ'=>1,'ﭱ'=>1,'ﭲ'=>1,'ﭳ'=>1,'ﭴ'=>1,'ﭵ'=>1,'ﭶ'=>1,'ﭷ'=>1,'ﭸ'=>1,'ﭹ'=>1,'ﭺ'=>1,'ﭻ'=>1,'ﭼ'=>1,'ﭽ'=>1,'ﭾ'=>1,'ﭿ'=>1,'ﮀ'=>1,'ﮁ'=>1,'ﮂ'=>1,'ﮃ'=>1,'ﮄ'=>1,'ﮅ'=>1,'ﮆ'=>1,'ﮇ'=>1,'ﮈ'=>1,'ﮉ'=>1,'ﮊ'=>1,'ﮋ'=>1,'ﮌ'=>1,'ﮍ'=>1,'ﮎ'=>1,'ﮏ'=>1,'ﮐ'=>1,'ﮑ'=>1,'ﮒ'=>1,'ﮓ'=>1,'ﮔ'=>1,'ﮕ'=>1,'ﮖ'=>1,'ﮗ'=>1,'ﮘ'=>1,'ﮙ'=>1,'ﮚ'=>1,'ﮛ'=>1,'ﮜ'=>1,'ﮝ'=>1,'ﮞ'=>1,'ﮟ'=>1,'ﮠ'=>1,'ﮡ'=>1,'ﮢ'=>1,'ﮣ'=>1,'ﮤ'=>1,'ﮥ'=>1,'ﮦ'=>1,'ﮧ'=>1,'ﮨ'=>1,'ﮩ'=>1,'ﮪ'=>1,'ﮫ'=>1,'ﮬ'=>1,'ﮭ'=>1,'ﮮ'=>1,'ﮯ'=>1,'ﮰ'=>1,'ﮱ'=>1,'ﯓ'=>1,'ﯔ'=>1,'ﯕ'=>1,'ﯖ'=>1,'ﯗ'=>1,'ﯘ'=>1,'ﯙ'=>1,'ﯚ'=>1,'ﯛ'=>1,'ﯜ'=>1,'ﯝ'=>1,'ﯞ'=>1,'ﯟ'=>1,'ﯠ'=>1,'ﯡ'=>1,'ﯢ'=>1,'ﯣ'=>1,'ﯤ'=>1,'ﯥ'=>1,'ﯦ'=>1,'ﯧ'=>1,'ﯨ'=>1,'ﯩ'=>1,'ﯪ'=>1,'ﯫ'=>1,'ﯬ'=>1,'ﯭ'=>1,'ﯮ'=>1,'ﯯ'=>1,'ﯰ'=>1,'ﯱ'=>1,'ﯲ'=>1,'ﯳ'=>1,'ﯴ'=>1,'ﯵ'=>1,'ﯶ'=>1,'ﯷ'=>1,'ﯸ'=>1,'ﯹ'=>1,'ﯺ'=>1,'ﯻ'=>1,'ﯼ'=>1,'ﯽ'=>1,'ﯾ'=>1,'ﯿ'=>1,'ﰀ'=>1,'ﰁ'=>1,'ﰂ'=>1,'ﰃ'=>1,'ﰄ'=>1,'ﰅ'=>1,'ﰆ'=>1,'ﰇ'=>1,'ﰈ'=>1,'ﰉ'=>1,'ﰊ'=>1,'ﰋ'=>1,'ﰌ'=>1,'ﰍ'=>1,'ﰎ'=>1,'ﰏ'=>1,'ﰐ'=>1,'ﰑ'=>1,'ﰒ'=>1,'ﰓ'=>1,'ﰔ'=>1,'ﰕ'=>1,'ﰖ'=>1,'ﰗ'=>1,'ﰘ'=>1,'ﰙ'=>1,'ﰚ'=>1,'ﰛ'=>1,'ﰜ'=>1,'ﰝ'=>1,'ﰞ'=>1,'ﰟ'=>1,'ﰠ'=>1,'ﰡ'=>1,'ﰢ'=>1,'ﰣ'=>1,'ﰤ'=>1,'ﰥ'=>1,'ﰦ'=>1,'ﰧ'=>1,'ﰨ'=>1,'ﰩ'=>1,'ﰪ'=>1,'ﰫ'=>1,'ﰬ'=>1,'ﰭ'=>1,'ﰮ'=>1,'ﰯ'=>1,'ﰰ'=>1,'ﰱ'=>1,'ﰲ'=>1,'ﰳ'=>1,'ﰴ'=>1,'ﰵ'=>1,'ﰶ'=>1,'ﰷ'=>1,'ﰸ'=>1,'ﰹ'=>1,'ﰺ'=>1,'ﰻ'=>1,'ﰼ'=>1,'ﰽ'=>1,'ﰾ'=>1,'ﰿ'=>1,'ﱀ'=>1,'ﱁ'=>1,'ﱂ'=>1,'ﱃ'=>1,'ﱄ'=>1,'ﱅ'=>1,'ﱆ'=>1,'ﱇ'=>1,'ﱈ'=>1,'ﱉ'=>1,'ﱊ'=>1,'ﱋ'=>1,'ﱌ'=>1,'ﱍ'=>1,'ﱎ'=>1,'ﱏ'=>1,'ﱐ'=>1,'ﱑ'=>1,'ﱒ'=>1,'ﱓ'=>1,'ﱔ'=>1,'ﱕ'=>1,'ﱖ'=>1,'ﱗ'=>1,'ﱘ'=>1,'ﱙ'=>1,'ﱚ'=>1,'ﱛ'=>1,'ﱜ'=>1,'ﱝ'=>1,'ﱞ'=>1,'ﱟ'=>1,'ﱠ'=>1,'ﱡ'=>1,'ﱢ'=>1,'ﱣ'=>1,'ﱤ'=>1,'ﱥ'=>1,'ﱦ'=>1,'ﱧ'=>1,'ﱨ'=>1,'ﱩ'=>1,'ﱪ'=>1,'ﱫ'=>1,'ﱬ'=>1,'ﱭ'=>1,'ﱮ'=>1,'ﱯ'=>1,'ﱰ'=>1,'ﱱ'=>1,'ﱲ'=>1,'ﱳ'=>1,'ﱴ'=>1,'ﱵ'=>1,'ﱶ'=>1,'ﱷ'=>1,'ﱸ'=>1,'ﱹ'=>1,'ﱺ'=>1,'ﱻ'=>1,'ﱼ'=>1,'ﱽ'=>1,'ﱾ'=>1,'ﱿ'=>1,'ﲀ'=>1,'ﲁ'=>1,'ﲂ'=>1,'ﲃ'=>1,'ﲄ'=>1,'ﲅ'=>1,'ﲆ'=>1,'ﲇ'=>1,'ﲈ'=>1,'ﲉ'=>1,'ﲊ'=>1,'ﲋ'=>1,'ﲌ'=>1,'ﲍ'=>1,'ﲎ'=>1,'ﲏ'=>1,'ﲐ'=>1,'ﲑ'=>1,'ﲒ'=>1,'ﲓ'=>1,'ﲔ'=>1,'ﲕ'=>1,'ﲖ'=>1,'ﲗ'=>1,'ﲘ'=>1,'ﲙ'=>1,'ﲚ'=>1,'ﲛ'=>1,'ﲜ'=>1,'ﲝ'=>1,'ﲞ'=>1,'ﲟ'=>1,'ﲠ'=>1,'ﲡ'=>1,'ﲢ'=>1,'ﲣ'=>1,'ﲤ'=>1,'ﲥ'=>1,'ﲦ'=>1,'ﲧ'=>1,'ﲨ'=>1,'ﲩ'=>1,'ﲪ'=>1,'ﲫ'=>1,'ﲬ'=>1,'ﲭ'=>1,'ﲮ'=>1,'ﲯ'=>1,'ﲰ'=>1,'ﲱ'=>1,'ﲲ'=>1,'ﲳ'=>1,'ﲴ'=>1,'ﲵ'=>1,'ﲶ'=>1,'ﲷ'=>1,'ﲸ'=>1,'ﲹ'=>1,'ﲺ'=>1,'ﲻ'=>1,'ﲼ'=>1,'ﲽ'=>1,'ﲾ'=>1,'ﲿ'=>1,'ﳀ'=>1,'ﳁ'=>1,'ﳂ'=>1,'ﳃ'=>1,'ﳄ'=>1,'ﳅ'=>1,'ﳆ'=>1,'ﳇ'=>1,'ﳈ'=>1,'ﳉ'=>1,'ﳊ'=>1,'ﳋ'=>1,'ﳌ'=>1,'ﳍ'=>1,'ﳎ'=>1,'ﳏ'=>1,'ﳐ'=>1,'ﳑ'=>1,'ﳒ'=>1,'ﳓ'=>1,'ﳔ'=>1,'ﳕ'=>1,'ﳖ'=>1,'ﳗ'=>1,'ﳘ'=>1,'ﳙ'=>1,'ﳚ'=>1,'ﳛ'=>1,'ﳜ'=>1,'ﳝ'=>1,'ﳞ'=>1,'ﳟ'=>1,'ﳠ'=>1,'ﳡ'=>1,'ﳢ'=>1,'ﳣ'=>1,'ﳤ'=>1,'ﳥ'=>1,'ﳦ'=>1,'ﳧ'=>1,'ﳨ'=>1,'ﳩ'=>1,'ﳪ'=>1,'ﳫ'=>1,'ﳬ'=>1,'ﳭ'=>1,'ﳮ'=>1,'ﳯ'=>1,'ﳰ'=>1,'ﳱ'=>1,'ﳲ'=>1,'ﳳ'=>1,'ﳴ'=>1,'ﳵ'=>1,'ﳶ'=>1,'ﳷ'=>1,'ﳸ'=>1,'ﳹ'=>1,'ﳺ'=>1,'ﳻ'=>1,'ﳼ'=>1,'ﳽ'=>1,'ﳾ'=>1,'ﳿ'=>1,'ﴀ'=>1,'ﴁ'=>1,'ﴂ'=>1,'ﴃ'=>1,'ﴄ'=>1,'ﴅ'=>1,'ﴆ'=>1,'ﴇ'=>1,'ﴈ'=>1,'ﴉ'=>1,'ﴊ'=>1,'ﴋ'=>1,'ﴌ'=>1,'ﴍ'=>1,'ﴎ'=>1,'ﴏ'=>1,'ﴐ'=>1,'ﴑ'=>1,'ﴒ'=>1,'ﴓ'=>1,'ﴔ'=>1,'ﴕ'=>1,'ﴖ'=>1,'ﴗ'=>1,'ﴘ'=>1,'ﴙ'=>1,'ﴚ'=>1,'ﴛ'=>1,'ﴜ'=>1,'ﴝ'=>1,'ﴞ'=>1,'ﴟ'=>1,'ﴠ'=>1,'ﴡ'=>1,'ﴢ'=>1,'ﴣ'=>1,'ﴤ'=>1,'ﴥ'=>1,'ﴦ'=>1,'ﴧ'=>1,'ﴨ'=>1,'ﴩ'=>1,'ﴪ'=>1,'ﴫ'=>1,'ﴬ'=>1,'ﴭ'=>1,'ﴮ'=>1,'ﴯ'=>1,'ﴰ'=>1,'ﴱ'=>1,'ﴲ'=>1,'ﴳ'=>1,'ﴴ'=>1,'ﴵ'=>1,'ﴶ'=>1,'ﴷ'=>1,'ﴸ'=>1,'ﴹ'=>1,'ﴺ'=>1,'ﴻ'=>1,'ﴼ'=>1,'ﴽ'=>1,'ﵐ'=>1,'ﵑ'=>1,'ﵒ'=>1,'ﵓ'=>1,'ﵔ'=>1,'ﵕ'=>1,'ﵖ'=>1,'ﵗ'=>1,'ﵘ'=>1,'ﵙ'=>1,'ﵚ'=>1,'ﵛ'=>1,'ﵜ'=>1,'ﵝ'=>1,'ﵞ'=>1,'ﵟ'=>1,'ﵠ'=>1,'ﵡ'=>1,'ﵢ'=>1,'ﵣ'=>1,'ﵤ'=>1,'ﵥ'=>1,'ﵦ'=>1,'ﵧ'=>1,'ﵨ'=>1,'ﵩ'=>1,'ﵪ'=>1,'ﵫ'=>1,'ﵬ'=>1,'ﵭ'=>1,'ﵮ'=>1,'ﵯ'=>1,'ﵰ'=>1,'ﵱ'=>1,'ﵲ'=>1,'ﵳ'=>1,'ﵴ'=>1,'ﵵ'=>1,'ﵶ'=>1,'ﵷ'=>1,'ﵸ'=>1,'ﵹ'=>1,'ﵺ'=>1,'ﵻ'=>1,'ﵼ'=>1,'ﵽ'=>1,'ﵾ'=>1,'ﵿ'=>1,'ﶀ'=>1,'ﶁ'=>1,'ﶂ'=>1,'ﶃ'=>1,'ﶄ'=>1,'ﶅ'=>1,'ﶆ'=>1,'ﶇ'=>1,'ﶈ'=>1,'ﶉ'=>1,'ﶊ'=>1,'ﶋ'=>1,'ﶌ'=>1,'ﶍ'=>1,'ﶎ'=>1,'ﶏ'=>1,'ﶒ'=>1,'ﶓ'=>1,'ﶔ'=>1,'ﶕ'=>1,'ﶖ'=>1,'ﶗ'=>1,'ﶘ'=>1,'ﶙ'=>1,'ﶚ'=>1,'ﶛ'=>1,'ﶜ'=>1,'ﶝ'=>1,'ﶞ'=>1,'ﶟ'=>1,'ﶠ'=>1,'ﶡ'=>1,'ﶢ'=>1,'ﶣ'=>1,'ﶤ'=>1,'ﶥ'=>1,'ﶦ'=>1,'ﶧ'=>1,'ﶨ'=>1,'ﶩ'=>1,'ﶪ'=>1,'ﶫ'=>1,'ﶬ'=>1,'ﶭ'=>1,'ﶮ'=>1,'ﶯ'=>1,'ﶰ'=>1,'ﶱ'=>1,'ﶲ'=>1,'ﶳ'=>1,'ﶴ'=>1,'ﶵ'=>1,'ﶶ'=>1,'ﶷ'=>1,'ﶸ'=>1,'ﶹ'=>1,'ﶺ'=>1,'ﶻ'=>1,'ﶼ'=>1,'ﶽ'=>1,'ﶾ'=>1,'ﶿ'=>1,'ﷀ'=>1,'ﷁ'=>1,'ﷂ'=>1,'ﷃ'=>1,'ﷄ'=>1,'ﷅ'=>1,'ﷆ'=>1,'ﷇ'=>1,'ﷰ'=>1,'ﷱ'=>1,'ﷲ'=>1,'ﷳ'=>1,'ﷴ'=>1,'ﷵ'=>1,'ﷶ'=>1,'ﷷ'=>1,'ﷸ'=>1,'ﷹ'=>1,'ﷺ'=>1,'ﷻ'=>1,'﷼'=>1,'︐'=>1,'︑'=>1,'︒'=>1,'︓'=>1,'︔'=>1,'︕'=>1,'︖'=>1,'︗'=>1,'︘'=>1,'︙'=>1,'︰'=>1,'︱'=>1,'︲'=>1,'︳'=>1,'︴'=>1,'︵'=>1,'︶'=>1,'︷'=>1,'︸'=>1,'︹'=>1,'︺'=>1,'︻'=>1,'︼'=>1,'︽'=>1,'︾'=>1,'︿'=>1,'﹀'=>1,'﹁'=>1,'﹂'=>1,'﹃'=>1,'﹄'=>1,'﹇'=>1,'﹈'=>1,'﹉'=>1,'﹊'=>1,'﹋'=>1,'﹌'=>1,'﹍'=>1,'﹎'=>1,'﹏'=>1,'﹐'=>1,'﹑'=>1,'﹒'=>1,'﹔'=>1,'﹕'=>1,'﹖'=>1,'﹗'=>1,'﹘'=>1,'﹙'=>1,'﹚'=>1,'﹛'=>1,'﹜'=>1,'﹝'=>1,'﹞'=>1,'﹟'=>1,'﹠'=>1,'﹡'=>1,'﹢'=>1,'﹣'=>1,'﹤'=>1,'﹥'=>1,'﹦'=>1,'﹨'=>1,'﹩'=>1,'﹪'=>1,'﹫'=>1,'ﹰ'=>1,'ﹱ'=>1,'ﹲ'=>1,'ﹴ'=>1,'ﹶ'=>1,'ﹷ'=>1,'ﹸ'=>1,'ﹹ'=>1,'ﹺ'=>1,'ﹻ'=>1,'ﹼ'=>1,'ﹽ'=>1,'ﹾ'=>1,'ﹿ'=>1,'ﺀ'=>1,'ﺁ'=>1,'ﺂ'=>1,'ﺃ'=>1,'ﺄ'=>1,'ﺅ'=>1,'ﺆ'=>1,'ﺇ'=>1,'ﺈ'=>1,'ﺉ'=>1,'ﺊ'=>1,'ﺋ'=>1,'ﺌ'=>1,'ﺍ'=>1,'ﺎ'=>1,'ﺏ'=>1,'ﺐ'=>1,'ﺑ'=>1,'ﺒ'=>1,'ﺓ'=>1,'ﺔ'=>1,'ﺕ'=>1,'ﺖ'=>1,'ﺗ'=>1,'ﺘ'=>1,'ﺙ'=>1,'ﺚ'=>1,'ﺛ'=>1,'ﺜ'=>1,'ﺝ'=>1,'ﺞ'=>1,'ﺟ'=>1,'ﺠ'=>1,'ﺡ'=>1,'ﺢ'=>1,'ﺣ'=>1,'ﺤ'=>1,'ﺥ'=>1,'ﺦ'=>1,'ﺧ'=>1,'ﺨ'=>1,'ﺩ'=>1,'ﺪ'=>1,'ﺫ'=>1,'ﺬ'=>1,'ﺭ'=>1,'ﺮ'=>1,'ﺯ'=>1,'ﺰ'=>1,'ﺱ'=>1,'ﺲ'=>1,'ﺳ'=>1,'ﺴ'=>1,'ﺵ'=>1,'ﺶ'=>1,'ﺷ'=>1,'ﺸ'=>1,'ﺹ'=>1,'ﺺ'=>1,'ﺻ'=>1,'ﺼ'=>1,'ﺽ'=>1,'ﺾ'=>1,'ﺿ'=>1,'ﻀ'=>1,'ﻁ'=>1,'ﻂ'=>1,'ﻃ'=>1,'ﻄ'=>1,'ﻅ'=>1,'ﻆ'=>1,'ﻇ'=>1,'ﻈ'=>1,'ﻉ'=>1,'ﻊ'=>1,'ﻋ'=>1,'ﻌ'=>1,'ﻍ'=>1,'ﻎ'=>1,'ﻏ'=>1,'ﻐ'=>1,'ﻑ'=>1,'ﻒ'=>1,'ﻓ'=>1,'ﻔ'=>1,'ﻕ'=>1,'ﻖ'=>1,'ﻗ'=>1,'ﻘ'=>1,'ﻙ'=>1,'ﻚ'=>1,'ﻛ'=>1,'ﻜ'=>1,'ﻝ'=>1,'ﻞ'=>1,'ﻟ'=>1,'ﻠ'=>1,'ﻡ'=>1,'ﻢ'=>1,'ﻣ'=>1,'ﻤ'=>1,'ﻥ'=>1,'ﻦ'=>1,'ﻧ'=>1,'ﻨ'=>1,'ﻩ'=>1,'ﻪ'=>1,'ﻫ'=>1,'ﻬ'=>1,'ﻭ'=>1,'ﻮ'=>1,'ﻯ'=>1,'ﻰ'=>1,'ﻱ'=>1,'ﻲ'=>1,'ﻳ'=>1,'ﻴ'=>1,'ﻵ'=>1,'ﻶ'=>1,'ﻷ'=>1,'ﻸ'=>1,'ﻹ'=>1,'ﻺ'=>1,'ﻻ'=>1,'ﻼ'=>1,'！'=>1,'＂'=>1,'＃'=>1,'＄'=>1,'％'=>1,'＆'=>1,'＇'=>1,'（'=>1,'）'=>1,'＊'=>1,'＋'=>1,'，'=>1,'－'=>1,'．'=>1,'／'=>1,'０'=>1,'１'=>1,'２'=>1,'３'=>1,'４'=>1,'５'=>1,'６'=>1,'７'=>1,'８'=>1,'９'=>1,'：'=>1,'；'=>1,'＜'=>1,'＝'=>1,'＞'=>1,'？'=>1,'＠'=>1,'Ａ'=>1,'Ｂ'=>1,'Ｃ'=>1,'Ｄ'=>1,'Ｅ'=>1,'Ｆ'=>1,'Ｇ'=>1,'Ｈ'=>1,'Ｉ'=>1,'Ｊ'=>1,'Ｋ'=>1,'Ｌ'=>1,'Ｍ'=>1,'Ｎ'=>1,'Ｏ'=>1,'Ｐ'=>1,'Ｑ'=>1,'Ｒ'=>1,'Ｓ'=>1,'Ｔ'=>1,'Ｕ'=>1,'Ｖ'=>1,'Ｗ'=>1,'Ｘ'=>1,'Ｙ'=>1,'Ｚ'=>1,'［'=>1,'＼'=>1,'］'=>1,'＾'=>1,'＿'=>1,'｀'=>1,'ａ'=>1,'ｂ'=>1,'ｃ'=>1,'ｄ'=>1,'ｅ'=>1,'ｆ'=>1,'ｇ'=>1,'ｈ'=>1,'ｉ'=>1,'ｊ'=>1,'ｋ'=>1,'ｌ'=>1,'ｍ'=>1,'ｎ'=>1,'ｏ'=>1,'ｐ'=>1,'ｑ'=>1,'ｒ'=>1,'ｓ'=>1,'ｔ'=>1,'ｕ'=>1,'ｖ'=>1,'ｗ'=>1,'ｘ'=>1,'ｙ'=>1,'ｚ'=>1,'｛'=>1,'｜'=>1,'｝'=>1,'～'=>1,'｟'=>1,'｠'=>1,'｡'=>1,'｢'=>1,'｣'=>1,'､'=>1,'･'=>1,'ｦ'=>1,'ｧ'=>1,'ｨ'=>1,'ｩ'=>1,'ｪ'=>1,'ｫ'=>1,'ｬ'=>1,'ｭ'=>1,'ｮ'=>1,'ｯ'=>1,'ｰ'=>1,'ｱ'=>1,'ｲ'=>1,'ｳ'=>1,'ｴ'=>1,'ｵ'=>1,'ｶ'=>1,'ｷ'=>1,'ｸ'=>1,'ｹ'=>1,'ｺ'=>1,'ｻ'=>1,'ｼ'=>1,'ｽ'=>1,'ｾ'=>1,'ｿ'=>1,'ﾀ'=>1,'ﾁ'=>1,'ﾂ'=>1,'ﾃ'=>1,'ﾄ'=>1,'ﾅ'=>1,'ﾆ'=>1,'ﾇ'=>1,'ﾈ'=>1,'ﾉ'=>1,'ﾊ'=>1,'ﾋ'=>1,'ﾌ'=>1,'ﾍ'=>1,'ﾎ'=>1,'ﾏ'=>1,'ﾐ'=>1,'ﾑ'=>1,'ﾒ'=>1,'ﾓ'=>1,'ﾔ'=>1,'ﾕ'=>1,'ﾖ'=>1,'ﾗ'=>1,'ﾘ'=>1,'ﾙ'=>1,'ﾚ'=>1,'ﾛ'=>1,'ﾜ'=>1,'ﾝ'=>1,'ﾞ'=>1,'ﾟ'=>1,'ﾠ'=>1,'ﾡ'=>1,'ﾢ'=>1,'ﾣ'=>1,'ﾤ'=>1,'ﾥ'=>1,'ﾦ'=>1,'ﾧ'=>1,'ﾨ'=>1,'ﾩ'=>1,'ﾪ'=>1,'ﾫ'=>1,'ﾬ'=>1,'ﾭ'=>1,'ﾮ'=>1,'ﾯ'=>1,'ﾰ'=>1,'ﾱ'=>1,'ﾲ'=>1,'ﾳ'=>1,'ﾴ'=>1,'ﾵ'=>1,'ﾶ'=>1,'ﾷ'=>1,'ﾸ'=>1,'ﾹ'=>1,'ﾺ'=>1,'ﾻ'=>1,'ﾼ'=>1,'ﾽ'=>1,'ﾾ'=>1,'ￂ'=>1,'ￃ'=>1,'ￄ'=>1,'ￅ'=>1,'ￆ'=>1,'ￇ'=>1,'ￊ'=>1,'ￋ'=>1,'ￌ'=>1,'ￍ'=>1,'ￎ'=>1,'ￏ'=>1,'ￒ'=>1,'ￓ'=>1,'ￔ'=>1,'ￕ'=>1,'ￖ'=>1,'ￗ'=>1,'ￚ'=>1,'ￛ'=>1,'ￜ'=>1,'￠'=>1,'￡'=>1,'￢'=>1,'￣'=>1,'￤'=>1,'￥'=>1,'￦'=>1,'￨'=>1,'￩'=>1,'￪'=>1,'￫'=>1,'￬'=>1,'￭'=>1,'￮'=>1,'𝅗𝅥'=>1,'𝅘𝅥'=>1,'𝅘𝅥𝅮'=>1,'𝅘𝅥𝅯'=>1,'𝅘𝅥𝅰'=>1,'𝅘𝅥𝅱'=>1,'𝅘𝅥𝅲'=>1,'𝆹𝅥'=>1,'𝆺𝅥'=>1,'𝆹𝅥𝅮'=>1,'𝆺𝅥𝅮'=>1,'𝆹𝅥𝅯'=>1,'𝆺𝅥𝅯'=>1,'𝐀'=>1,'𝐁'=>1,'𝐂'=>1,'𝐃'=>1,'𝐄'=>1,'𝐅'=>1,'𝐆'=>1,'𝐇'=>1,'𝐈'=>1,'𝐉'=>1,'𝐊'=>1,'𝐋'=>1,'𝐌'=>1,'𝐍'=>1,'𝐎'=>1,'𝐏'=>1,'𝐐'=>1,'𝐑'=>1,'𝐒'=>1,'𝐓'=>1,'𝐔'=>1,'𝐕'=>1,'𝐖'=>1,'𝐗'=>1,'𝐘'=>1,'𝐙'=>1,'𝐚'=>1,'𝐛'=>1,'𝐜'=>1,'𝐝'=>1,'𝐞'=>1,'𝐟'=>1,'𝐠'=>1,'𝐡'=>1,'𝐢'=>1,'𝐣'=>1,'𝐤'=>1,'𝐥'=>1,'𝐦'=>1,'𝐧'=>1,'𝐨'=>1,'𝐩'=>1,'𝐪'=>1,'𝐫'=>1,'𝐬'=>1,'𝐭'=>1,'𝐮'=>1,'𝐯'=>1,'𝐰'=>1,'𝐱'=>1,'𝐲'=>1,'𝐳'=>1,'𝐴'=>1,'𝐵'=>1,'𝐶'=>1,'𝐷'=>1,'𝐸'=>1,'𝐹'=>1,'𝐺'=>1,'𝐻'=>1,'𝐼'=>1,'𝐽'=>1,'𝐾'=>1,'𝐿'=>1,'𝑀'=>1,'𝑁'=>1,'𝑂'=>1,'𝑃'=>1,'𝑄'=>1,'𝑅'=>1,'𝑆'=>1,'𝑇'=>1,'𝑈'=>1,'𝑉'=>1,'𝑊'=>1,'𝑋'=>1,'𝑌'=>1,'𝑍'=>1,'𝑎'=>1,'𝑏'=>1,'𝑐'=>1,'𝑑'=>1,'𝑒'=>1,'𝑓'=>1,'𝑔'=>1,'𝑖'=>1,'𝑗'=>1,'𝑘'=>1,'𝑙'=>1,'𝑚'=>1,'𝑛'=>1,'𝑜'=>1,'𝑝'=>1,'𝑞'=>1,'𝑟'=>1,'𝑠'=>1,'𝑡'=>1,'𝑢'=>1,'𝑣'=>1,'𝑤'=>1,'𝑥'=>1,'𝑦'=>1,'𝑧'=>1,'𝑨'=>1,'𝑩'=>1,'𝑪'=>1,'𝑫'=>1,'𝑬'=>1,'𝑭'=>1,'𝑮'=>1,'𝑯'=>1,'𝑰'=>1,'𝑱'=>1,'𝑲'=>1,'𝑳'=>1,'𝑴'=>1,'𝑵'=>1,'𝑶'=>1,'𝑷'=>1,'𝑸'=>1,'𝑹'=>1,'𝑺'=>1,'𝑻'=>1,'𝑼'=>1,'𝑽'=>1,'𝑾'=>1,'𝑿'=>1,'𝒀'=>1,'𝒁'=>1,'𝒂'=>1,'𝒃'=>1,'𝒄'=>1,'𝒅'=>1,'𝒆'=>1,'𝒇'=>1,'𝒈'=>1,'𝒉'=>1,'𝒊'=>1,'𝒋'=>1,'𝒌'=>1,'𝒍'=>1,'𝒎'=>1,'𝒏'=>1,'𝒐'=>1,'𝒑'=>1,'𝒒'=>1,'𝒓'=>1,'𝒔'=>1,'𝒕'=>1,'𝒖'=>1,'𝒗'=>1,'𝒘'=>1,'𝒙'=>1,'𝒚'=>1,'𝒛'=>1,'𝒜'=>1,'𝒞'=>1,'𝒟'=>1,'𝒢'=>1,'𝒥'=>1,'𝒦'=>1,'𝒩'=>1,'𝒪'=>1,'𝒫'=>1,'𝒬'=>1,'𝒮'=>1,'𝒯'=>1,'𝒰'=>1,'𝒱'=>1,'𝒲'=>1,'𝒳'=>1,'𝒴'=>1,'𝒵'=>1,'𝒶'=>1,'𝒷'=>1,'𝒸'=>1,'𝒹'=>1,'𝒻'=>1,'𝒽'=>1,'𝒾'=>1,'𝒿'=>1,'𝓀'=>1,'𝓁'=>1,'𝓂'=>1,'𝓃'=>1,'𝓅'=>1,'𝓆'=>1,'𝓇'=>1,'𝓈'=>1,'𝓉'=>1,'𝓊'=>1,'𝓋'=>1,'𝓌'=>1,'𝓍'=>1,'𝓎'=>1,'𝓏'=>1,'𝓐'=>1,'𝓑'=>1,'𝓒'=>1,'𝓓'=>1,'𝓔'=>1,'𝓕'=>1,'𝓖'=>1,'𝓗'=>1,'𝓘'=>1,'𝓙'=>1,'𝓚'=>1,'𝓛'=>1,'𝓜'=>1,'𝓝'=>1,'𝓞'=>1,'𝓟'=>1,'𝓠'=>1,'𝓡'=>1,'𝓢'=>1,'𝓣'=>1,'𝓤'=>1,'𝓥'=>1,'𝓦'=>1,'𝓧'=>1,'𝓨'=>1,'𝓩'=>1,'𝓪'=>1,'𝓫'=>1,'𝓬'=>1,'𝓭'=>1,'𝓮'=>1,'𝓯'=>1,'𝓰'=>1,'𝓱'=>1,'𝓲'=>1,'𝓳'=>1,'𝓴'=>1,'𝓵'=>1,'𝓶'=>1,'𝓷'=>1,'𝓸'=>1,'𝓹'=>1,'𝓺'=>1,'𝓻'=>1,'𝓼'=>1,'𝓽'=>1,'𝓾'=>1,'𝓿'=>1,'𝔀'=>1,'𝔁'=>1,'𝔂'=>1,'𝔃'=>1,'𝔄'=>1,'𝔅'=>1,'𝔇'=>1,'𝔈'=>1,'𝔉'=>1,'𝔊'=>1,'𝔍'=>1,'𝔎'=>1,'𝔏'=>1,'𝔐'=>1,'𝔑'=>1,'𝔒'=>1,'𝔓'=>1,'𝔔'=>1,'𝔖'=>1,'𝔗'=>1,'𝔘'=>1,'𝔙'=>1,'𝔚'=>1,'𝔛'=>1,'𝔜'=>1,'𝔞'=>1,'𝔟'=>1,'𝔠'=>1,'𝔡'=>1,'𝔢'=>1,'𝔣'=>1,'𝔤'=>1,'𝔥'=>1,'𝔦'=>1,'𝔧'=>1,'𝔨'=>1,'𝔩'=>1,'𝔪'=>1,'𝔫'=>1,'𝔬'=>1,'𝔭'=>1,'𝔮'=>1,'𝔯'=>1,'𝔰'=>1,'𝔱'=>1,'𝔲'=>1,'𝔳'=>1,'𝔴'=>1,'𝔵'=>1,'𝔶'=>1,'𝔷'=>1,'𝔸'=>1,'𝔹'=>1,'𝔻'=>1,'𝔼'=>1,'𝔽'=>1,'𝔾'=>1,'𝕀'=>1,'𝕁'=>1,'𝕂'=>1,'𝕃'=>1,'𝕄'=>1,'𝕆'=>1,'𝕊'=>1,'𝕋'=>1,'𝕌'=>1,'𝕍'=>1,'𝕎'=>1,'𝕏'=>1,'𝕐'=>1,'𝕒'=>1,'𝕓'=>1,'𝕔'=>1,'𝕕'=>1,'𝕖'=>1,'𝕗'=>1,'𝕘'=>1,'𝕙'=>1,'𝕚'=>1,'𝕛'=>1,'𝕜'=>1,'𝕝'=>1,'𝕞'=>1,'𝕟'=>1,'𝕠'=>1,'𝕡'=>1,'𝕢'=>1,'𝕣'=>1,'𝕤'=>1,'𝕥'=>1,'𝕦'=>1,'𝕧'=>1,'𝕨'=>1,'𝕩'=>1,'𝕪'=>1,'𝕫'=>1,'𝕬'=>1,'𝕭'=>1,'𝕮'=>1,'𝕯'=>1,'𝕰'=>1,'𝕱'=>1,'𝕲'=>1,'𝕳'=>1,'𝕴'=>1,'𝕵'=>1,'𝕶'=>1,'𝕷'=>1,'𝕸'=>1,'𝕹'=>1,'𝕺'=>1,'𝕻'=>1,'𝕼'=>1,'𝕽'=>1,'𝕾'=>1,'𝕿'=>1,'𝖀'=>1,'𝖁'=>1,'𝖂'=>1,'𝖃'=>1,'𝖄'=>1,'𝖅'=>1,'𝖆'=>1,'𝖇'=>1,'𝖈'=>1,'𝖉'=>1,'𝖊'=>1,'𝖋'=>1,'𝖌'=>1,'𝖍'=>1,'𝖎'=>1,'𝖏'=>1,'𝖐'=>1,'𝖑'=>1,'𝖒'=>1,'𝖓'=>1,'𝖔'=>1,'𝖕'=>1,'𝖖'=>1,'𝖗'=>1,'𝖘'=>1,'𝖙'=>1,'𝖚'=>1,'𝖛'=>1,'𝖜'=>1,'𝖝'=>1,'𝖞'=>1,'𝖟'=>1,'𝖠'=>1,'𝖡'=>1,'𝖢'=>1,'𝖣'=>1,'𝖤'=>1,'𝖥'=>1,'𝖦'=>1,'𝖧'=>1,'𝖨'=>1,'𝖩'=>1,'𝖪'=>1,'𝖫'=>1,'𝖬'=>1,'𝖭'=>1,'𝖮'=>1,'𝖯'=>1,'𝖰'=>1,'𝖱'=>1,'𝖲'=>1,'𝖳'=>1,'𝖴'=>1,'𝖵'=>1,'𝖶'=>1,'𝖷'=>1,'𝖸'=>1,'𝖹'=>1,'𝖺'=>1,'𝖻'=>1,'𝖼'=>1,'𝖽'=>1,'𝖾'=>1,'𝖿'=>1,'𝗀'=>1,'𝗁'=>1,'𝗂'=>1,'𝗃'=>1,'𝗄'=>1,'𝗅'=>1,'𝗆'=>1,'𝗇'=>1,'𝗈'=>1,'𝗉'=>1,'𝗊'=>1,'𝗋'=>1,'𝗌'=>1,'𝗍'=>1,'𝗎'=>1,'𝗏'=>1,'𝗐'=>1,'𝗑'=>1,'𝗒'=>1,'𝗓'=>1,'𝗔'=>1,'𝗕'=>1,'𝗖'=>1,'𝗗'=>1,'𝗘'=>1,'𝗙'=>1,'𝗚'=>1,'𝗛'=>1,'𝗜'=>1,'𝗝'=>1,'𝗞'=>1,'𝗟'=>1,'𝗠'=>1,'𝗡'=>1,'𝗢'=>1,'𝗣'=>1,'𝗤'=>1,'𝗥'=>1,'𝗦'=>1,'𝗧'=>1,'𝗨'=>1,'𝗩'=>1,'𝗪'=>1,'𝗫'=>1,'𝗬'=>1,'𝗭'=>1,'𝗮'=>1,'𝗯'=>1,'𝗰'=>1,'𝗱'=>1,'𝗲'=>1,'𝗳'=>1,'𝗴'=>1,'𝗵'=>1,'𝗶'=>1,'𝗷'=>1,'𝗸'=>1,'𝗹'=>1,'𝗺'=>1,'𝗻'=>1,'𝗼'=>1,'𝗽'=>1,'𝗾'=>1,'𝗿'=>1,'𝘀'=>1,'𝘁'=>1,'𝘂'=>1,'𝘃'=>1,'𝘄'=>1,'𝘅'=>1,'𝘆'=>1,'𝘇'=>1,'𝘈'=>1,'𝘉'=>1,'𝘊'=>1,'𝘋'=>1,'𝘌'=>1,'𝘍'=>1,'𝘎'=>1,'𝘏'=>1,'𝘐'=>1,'𝘑'=>1,'𝘒'=>1,'𝘓'=>1,'𝘔'=>1,'𝘕'=>1,'𝘖'=>1,'𝘗'=>1,'𝘘'=>1,'𝘙'=>1,'𝘚'=>1,'𝘛'=>1,'𝘜'=>1,'𝘝'=>1,'𝘞'=>1,'𝘟'=>1,'𝘠'=>1,'𝘡'=>1,'𝘢'=>1,'𝘣'=>1,'𝘤'=>1,'𝘥'=>1,'𝘦'=>1,'𝘧'=>1,'𝘨'=>1,'𝘩'=>1,'𝘪'=>1,'𝘫'=>1,'𝘬'=>1,'𝘭'=>1,'𝘮'=>1,'𝘯'=>1,'𝘰'=>1,'𝘱'=>1,'𝘲'=>1,'𝘳'=>1,'𝘴'=>1,'𝘵'=>1,'𝘶'=>1,'𝘷'=>1,'𝘸'=>1,'𝘹'=>1,'𝘺'=>1,'𝘻'=>1,'𝘼'=>1,'𝘽'=>1,'𝘾'=>1,'𝘿'=>1,'𝙀'=>1,'𝙁'=>1,'𝙂'=>1,'𝙃'=>1,'𝙄'=>1,'𝙅'=>1,'𝙆'=>1,'𝙇'=>1,'𝙈'=>1,'𝙉'=>1,'𝙊'=>1,'𝙋'=>1,'𝙌'=>1,'𝙍'=>1,'𝙎'=>1,'𝙏'=>1,'𝙐'=>1,'𝙑'=>1,'𝙒'=>1,'𝙓'=>1,'𝙔'=>1,'𝙕'=>1,'𝙖'=>1,'𝙗'=>1,'𝙘'=>1,'𝙙'=>1,'𝙚'=>1,'𝙛'=>1,'𝙜'=>1,'𝙝'=>1,'𝙞'=>1,'𝙟'=>1,'𝙠'=>1,'𝙡'=>1,'𝙢'=>1,'𝙣'=>1,'𝙤'=>1,'𝙥'=>1,'𝙦'=>1,'𝙧'=>1,'𝙨'=>1,'𝙩'=>1,'𝙪'=>1,'𝙫'=>1,'𝙬'=>1,'𝙭'=>1,'𝙮'=>1,'𝙯'=>1,'𝙰'=>1,'𝙱'=>1,'𝙲'=>1,'𝙳'=>1,'𝙴'=>1,'𝙵'=>1,'𝙶'=>1,'𝙷'=>1,'𝙸'=>1,'𝙹'=>1,'𝙺'=>1,'𝙻'=>1,'𝙼'=>1,'𝙽'=>1,'𝙾'=>1,'𝙿'=>1,'𝚀'=>1,'𝚁'=>1,'𝚂'=>1,'𝚃'=>1,'𝚄'=>1,'𝚅'=>1,'𝚆'=>1,'𝚇'=>1,'𝚈'=>1,'𝚉'=>1,'𝚊'=>1,'𝚋'=>1,'𝚌'=>1,'𝚍'=>1,'𝚎'=>1,'𝚏'=>1,'𝚐'=>1,'𝚑'=>1,'𝚒'=>1,'𝚓'=>1,'𝚔'=>1,'𝚕'=>1,'𝚖'=>1,'𝚗'=>1,'𝚘'=>1,'𝚙'=>1,'𝚚'=>1,'𝚛'=>1,'𝚜'=>1,'𝚝'=>1,'𝚞'=>1,'𝚟'=>1,'𝚠'=>1,'𝚡'=>1,'𝚢'=>1,'𝚣'=>1,'𝚤'=>1,'𝚥'=>1,'𝚨'=>1,'𝚩'=>1,'𝚪'=>1,'𝚫'=>1,'𝚬'=>1,'𝚭'=>1,'𝚮'=>1,'𝚯'=>1,'𝚰'=>1,'𝚱'=>1,'𝚲'=>1,'𝚳'=>1,'𝚴'=>1,'𝚵'=>1,'𝚶'=>1,'𝚷'=>1,'𝚸'=>1,'𝚹'=>1,'𝚺'=>1,'𝚻'=>1,'𝚼'=>1,'𝚽'=>1,'𝚾'=>1,'𝚿'=>1,'𝛀'=>1,'𝛁'=>1,'𝛂'=>1,'𝛃'=>1,'𝛄'=>1,'𝛅'=>1,'𝛆'=>1,'𝛇'=>1,'𝛈'=>1,'𝛉'=>1,'𝛊'=>1,'𝛋'=>1,'𝛌'=>1,'𝛍'=>1,'𝛎'=>1,'𝛏'=>1,'𝛐'=>1,'𝛑'=>1,'𝛒'=>1,'𝛓'=>1,'𝛔'=>1,'𝛕'=>1,'𝛖'=>1,'𝛗'=>1,'𝛘'=>1,'𝛙'=>1,'𝛚'=>1,'𝛛'=>1,'𝛜'=>1,'𝛝'=>1,'𝛞'=>1,'𝛟'=>1,'𝛠'=>1,'𝛡'=>1,'𝛢'=>1,'𝛣'=>1,'𝛤'=>1,'𝛥'=>1,'𝛦'=>1,'𝛧'=>1,'𝛨'=>1,'𝛩'=>1,'𝛪'=>1,'𝛫'=>1,'𝛬'=>1,'𝛭'=>1,'𝛮'=>1,'𝛯'=>1,'𝛰'=>1,'𝛱'=>1,'𝛲'=>1,'𝛳'=>1,'𝛴'=>1,'𝛵'=>1,'𝛶'=>1,'𝛷'=>1,'𝛸'=>1,'𝛹'=>1,'𝛺'=>1,'𝛻'=>1,'𝛼'=>1,'𝛽'=>1,'𝛾'=>1,'𝛿'=>1,'𝜀'=>1,'𝜁'=>1,'𝜂'=>1,'𝜃'=>1,'𝜄'=>1,'𝜅'=>1,'𝜆'=>1,'𝜇'=>1,'𝜈'=>1,'𝜉'=>1,'𝜊'=>1,'𝜋'=>1,'𝜌'=>1,'𝜍'=>1,'𝜎'=>1,'𝜏'=>1,'𝜐'=>1,'𝜑'=>1,'𝜒'=>1,'𝜓'=>1,'𝜔'=>1,'𝜕'=>1,'𝜖'=>1,'𝜗'=>1,'𝜘'=>1,'𝜙'=>1,'𝜚'=>1,'𝜛'=>1,'𝜜'=>1,'𝜝'=>1,'𝜞'=>1,'𝜟'=>1,'𝜠'=>1,'𝜡'=>1,'𝜢'=>1,'𝜣'=>1,'𝜤'=>1,'𝜥'=>1,'𝜦'=>1,'𝜧'=>1,'𝜨'=>1,'𝜩'=>1,'𝜪'=>1,'𝜫'=>1,'𝜬'=>1,'𝜭'=>1,'𝜮'=>1,'𝜯'=>1,'𝜰'=>1,'𝜱'=>1,'𝜲'=>1,'𝜳'=>1,'𝜴'=>1,'𝜵'=>1,'𝜶'=>1,'𝜷'=>1,'𝜸'=>1,'𝜹'=>1,'𝜺'=>1,'𝜻'=>1,'𝜼'=>1,'𝜽'=>1,'𝜾'=>1,'𝜿'=>1,'𝝀'=>1,'𝝁'=>1,'𝝂'=>1,'𝝃'=>1,'𝝄'=>1,'𝝅'=>1,'𝝆'=>1,'𝝇'=>1,'𝝈'=>1,'𝝉'=>1,'𝝊'=>1,'𝝋'=>1,'𝝌'=>1,'𝝍'=>1,'𝝎'=>1,'𝝏'=>1,'𝝐'=>1,'𝝑'=>1,'𝝒'=>1,'𝝓'=>1,'𝝔'=>1,'𝝕'=>1,'𝝖'=>1,'𝝗'=>1,'𝝘'=>1,'𝝙'=>1,'𝝚'=>1,'𝝛'=>1,'𝝜'=>1,'𝝝'=>1,'𝝞'=>1,'𝝟'=>1,'𝝠'=>1,'𝝡'=>1,'𝝢'=>1,'𝝣'=>1,'𝝤'=>1,'𝝥'=>1,'𝝦'=>1,'𝝧'=>1,'𝝨'=>1,'𝝩'=>1,'𝝪'=>1,'𝝫'=>1,'𝝬'=>1,'𝝭'=>1,'𝝮'=>1,'𝝯'=>1,'𝝰'=>1,'𝝱'=>1,'𝝲'=>1,'𝝳'=>1,'𝝴'=>1,'𝝵'=>1,'𝝶'=>1,'𝝷'=>1,'𝝸'=>1,'𝝹'=>1,'𝝺'=>1,'𝝻'=>1,'𝝼'=>1,'𝝽'=>1,'𝝾'=>1,'𝝿'=>1,'𝞀'=>1,'𝞁'=>1,'𝞂'=>1,'𝞃'=>1,'𝞄'=>1,'𝞅'=>1,'𝞆'=>1,'𝞇'=>1,'𝞈'=>1,'𝞉'=>1,'𝞊'=>1,'𝞋'=>1,'𝞌'=>1,'𝞍'=>1,'𝞎'=>1,'𝞏'=>1,'𝞐'=>1,'𝞑'=>1,'𝞒'=>1,'𝞓'=>1,'𝞔'=>1,'𝞕'=>1,'𝞖'=>1,'𝞗'=>1,'𝞘'=>1,'𝞙'=>1,'𝞚'=>1,'𝞛'=>1,'𝞜'=>1,'𝞝'=>1,'𝞞'=>1,'𝞟'=>1,'𝞠'=>1,'𝞡'=>1,'𝞢'=>1,'𝞣'=>1,'𝞤'=>1,'𝞥'=>1,'𝞦'=>1,'𝞧'=>1,'𝞨'=>1,'𝞩'=>1,'𝞪'=>1,'𝞫'=>1,'𝞬'=>1,'𝞭'=>1,'𝞮'=>1,'𝞯'=>1,'𝞰'=>1,'𝞱'=>1,'𝞲'=>1,'𝞳'=>1,'𝞴'=>1,'𝞵'=>1,'𝞶'=>1,'𝞷'=>1,'𝞸'=>1,'𝞹'=>1,'𝞺'=>1,'𝞻'=>1,'𝞼'=>1,'𝞽'=>1,'𝞾'=>1,'𝞿'=>1,'𝟀'=>1,'𝟁'=>1,'𝟂'=>1,'𝟃'=>1,'𝟄'=>1,'𝟅'=>1,'𝟆'=>1,'𝟇'=>1,'𝟈'=>1,'𝟉'=>1,'𝟊'=>1,'𝟋'=>1,'𝟎'=>1,'𝟏'=>1,'𝟐'=>1,'𝟑'=>1,'𝟒'=>1,'𝟓'=>1,'𝟔'=>1,'𝟕'=>1,'𝟖'=>1,'𝟗'=>1,'𝟘'=>1,'𝟙'=>1,'𝟚'=>1,'𝟛'=>1,'𝟜'=>1,'𝟝'=>1,'𝟞'=>1,'𝟟'=>1,'𝟠'=>1,'𝟡'=>1,'𝟢'=>1,'𝟣'=>1,'𝟤'=>1,'𝟥'=>1,'𝟦'=>1,'𝟧'=>1,'𝟨'=>1,'𝟩'=>1,'𝟪'=>1,'𝟫'=>1,'𝟬'=>1,'𝟭'=>1,'𝟮'=>1,'𝟯'=>1,'𝟰'=>1,'𝟱'=>1,'𝟲'=>1,'𝟳'=>1,'𝟴'=>1,'𝟵'=>1,'𝟶'=>1,'𝟷'=>1,'𝟸'=>1,'𝟹'=>1,'𝟺'=>1,'𝟻'=>1,'𝟼'=>1,'𝟽'=>1,'𝟾'=>1,'𝟿'=>1,'丽'=>1,'丸'=>1,'乁'=>1,'𠄢'=>1,'你'=>1,'侮'=>1,'侻'=>1,'倂'=>1,'偺'=>1,'備'=>1,'僧'=>1,'像'=>1,'㒞'=>1,'𠘺'=>1,'免'=>1,'兔'=>1,'兤'=>1,'具'=>1,'𠔜'=>1,'㒹'=>1,'內'=>1,'再'=>1,'𠕋'=>1,'冗'=>1,'冤'=>1,'仌'=>1,'冬'=>1,'况'=>1,'𩇟'=>1,'凵'=>1,'刃'=>1,'㓟'=>1,'刻'=>1,'剆'=>1,'割'=>1,'剷'=>1,'㔕'=>1,'勇'=>1,'勉'=>1,'勤'=>1,'勺'=>1,'包'=>1,'匆'=>1,'北'=>1,'卉'=>1,'卑'=>1,'博'=>1,'即'=>1,'卽'=>1,'卿'=>1,'卿'=>1,'卿'=>1,'𠨬'=>1,'灰'=>1,'及'=>1,'叟'=>1,'𠭣'=>1,'叫'=>1,'叱'=>1,'吆'=>1,'咞'=>1,'吸'=>1,'呈'=>1,'周'=>1,'咢'=>1,'哶'=>1,'唐'=>1,'啓'=>1,'啣'=>1,'善'=>1,'善'=>1,'喙'=>1,'喫'=>1,'喳'=>1,'嗂'=>1,'圖'=>1,'嘆'=>1,'圗'=>1,'噑'=>1,'噴'=>1,'切'=>1,'壮'=>1,'城'=>1,'埴'=>1,'堍'=>1,'型'=>1,'堲'=>1,'報'=>1,'墬'=>1,'𡓤'=>1,'売'=>1,'壷'=>1,'夆'=>1,'多'=>1,'夢'=>1,'奢'=>1,'𡚨'=>1,'𡛪'=>1,'姬'=>1,'娛'=>1,'娧'=>1,'姘'=>1,'婦'=>1,'㛮'=>1,'㛼'=>1,'嬈'=>1,'嬾'=>1,'嬾'=>1,'𡧈'=>1,'寃'=>1,'寘'=>1,'寧'=>1,'寳'=>1,'𡬘'=>1,'寿'=>1,'将'=>1,'当'=>1,'尢'=>1,'㞁'=>1,'屠'=>1,'屮'=>1,'峀'=>1,'岍'=>1,'𡷤'=>1,'嵃'=>1,'𡷦'=>1,'嵮'=>1,'嵫'=>1,'嵼'=>1,'巡'=>1,'巢'=>1,'㠯'=>1,'巽'=>1,'帨'=>1,'帽'=>1,'幩'=>1,'㡢'=>1,'𢆃'=>1,'㡼'=>1,'庰'=>1,'庳'=>1,'庶'=>1,'廊'=>1,'𪎒'=>1,'廾'=>1,'𢌱'=>1,'𢌱'=>1,'舁'=>1,'弢'=>1,'弢'=>1,'㣇'=>1,'𣊸'=>1,'𦇚'=>1,'形'=>1,'彫'=>1,'㣣'=>1,'徚'=>1,'忍'=>1,'志'=>1,'忹'=>1,'悁'=>1,'㤺'=>1,'㤜'=>1,'悔'=>1,'𢛔'=>1,'惇'=>1,'慈'=>1,'慌'=>1,'慎'=>1,'慌'=>1,'慺'=>1,'憎'=>1,'憲'=>1,'憤'=>1,'憯'=>1,'懞'=>1,'懲'=>1,'懶'=>1,'成'=>1,'戛'=>1,'扝'=>1,'抱'=>1,'拔'=>1,'捐'=>1,'𢬌'=>1,'挽'=>1,'拼'=>1,'捨'=>1,'掃'=>1,'揤'=>1,'𢯱'=>1,'搢'=>1,'揅'=>1,'掩'=>1,'㨮'=>1,'摩'=>1,'摾'=>1,'撝'=>1,'摷'=>1,'㩬'=>1,'敏'=>1,'敬'=>1,'𣀊'=>1,'旣'=>1,'書'=>1,'晉'=>1,'㬙'=>1,'暑'=>1,'㬈'=>1,'㫤'=>1,'冒'=>1,'冕'=>1,'最'=>1,'暜'=>1,'肭'=>1,'䏙'=>1,'朗'=>1,'望'=>1,'朡'=>1,'杞'=>1,'杓'=>1,'𣏃'=>1,'㭉'=>1,'柺'=>1,'枅'=>1,'桒'=>1,'梅'=>1,'𣑭'=>1,'梎'=>1,'栟'=>1,'椔'=>1,'㮝'=>1,'楂'=>1,'榣'=>1,'槪'=>1,'檨'=>1,'𣚣'=>1,'櫛'=>1,'㰘'=>1,'次'=>1,'𣢧'=>1,'歔'=>1,'㱎'=>1,'歲'=>1,'殟'=>1,'殺'=>1,'殻'=>1,'𣪍'=>1,'𡴋'=>1,'𣫺'=>1,'汎'=>1,'𣲼'=>1,'沿'=>1,'泍'=>1,'汧'=>1,'洖'=>1,'派'=>1,'海'=>1,'流'=>1,'浩'=>1,'浸'=>1,'涅'=>1,'𣴞'=>1,'洴'=>1,'港'=>1,'湮'=>1,'㴳'=>1,'滋'=>1,'滇'=>1,'𣻑'=>1,'淹'=>1,'潮'=>1,'𣽞'=>1,'𣾎'=>1,'濆'=>1,'瀹'=>1,'瀞'=>1,'瀛'=>1,'㶖'=>1,'灊'=>1,'災'=>1,'灷'=>1,'炭'=>1,'𠔥'=>1,'煅'=>1,'𤉣'=>1,'熜'=>1,'𤎫'=>1,'爨'=>1,'爵'=>1,'牐'=>1,'𤘈'=>1,'犀'=>1,'犕'=>1,'𤜵'=>1,'𤠔'=>1,'獺'=>1,'王'=>1,'㺬'=>1,'玥'=>1,'㺸'=>1,'㺸'=>1,'瑇'=>1,'瑜'=>1,'瑱'=>1,'璅'=>1,'瓊'=>1,'㼛'=>1,'甤'=>1,'𤰶'=>1,'甾'=>1,'𤲒'=>1,'異'=>1,'𢆟'=>1,'瘐'=>1,'𤾡'=>1,'𤾸'=>1,'𥁄'=>1,'㿼'=>1,'䀈'=>1,'直'=>1,'𥃳'=>1,'𥃲'=>1,'𥄙'=>1,'𥄳'=>1,'眞'=>1,'真'=>1,'真'=>1,'睊'=>1,'䀹'=>1,'瞋'=>1,'䁆'=>1,'䂖'=>1,'𥐝'=>1,'硎'=>1,'碌'=>1,'磌'=>1,'䃣'=>1,'𥘦'=>1,'祖'=>1,'𥚚'=>1,'𥛅'=>1,'福'=>1,'秫'=>1,'䄯'=>1,'穀'=>1,'穊'=>1,'穏'=>1,'𥥼'=>1,'𥪧'=>1,'𥪧'=>1,'竮'=>1,'䈂'=>1,'𥮫'=>1,'篆'=>1,'築'=>1,'䈧'=>1,'𥲀'=>1,'糒'=>1,'䊠'=>1,'糨'=>1,'糣'=>1,'紀'=>1,'𥾆'=>1,'絣'=>1,'䌁'=>1,'緇'=>1,'縂'=>1,'繅'=>1,'䌴'=>1,'𦈨'=>1,'𦉇'=>1,'䍙'=>1,'𦋙'=>1,'罺'=>1,'𦌾'=>1,'羕'=>1,'翺'=>1,'者'=>1,'𦓚'=>1,'𦔣'=>1,'聠'=>1,'𦖨'=>1,'聰'=>1,'𣍟'=>1,'䏕'=>1,'育'=>1,'脃'=>1,'䐋'=>1,'脾'=>1,'媵'=>1,'𦞧'=>1,'𦞵'=>1,'𣎓'=>1,'𣎜'=>1,'舁'=>1,'舄'=>1,'辞'=>1,'䑫'=>1,'芑'=>1,'芋'=>1,'芝'=>1,'劳'=>1,'花'=>1,'芳'=>1,'芽'=>1,'苦'=>1,'𦬼'=>1,'若'=>1,'茝'=>1,'荣'=>1,'莭'=>1,'茣'=>1,'莽'=>1,'菧'=>1,'著'=>1,'荓'=>1,'菊'=>1,'菌'=>1,'菜'=>1,'𦰶'=>1,'𦵫'=>1,'𦳕'=>1,'䔫'=>1,'蓱'=>1,'蓳'=>1,'蔖'=>1,'𧏊'=>1,'蕤'=>1,'𦼬'=>1,'䕝'=>1,'䕡'=>1,'𦾱'=>1,'𧃒'=>1,'䕫'=>1,'虐'=>1,'虜'=>1,'虧'=>1,'虩'=>1,'蚩'=>1,'蚈'=>1,'蜎'=>1,'蛢'=>1,'蝹'=>1,'蜨'=>1,'蝫'=>1,'螆'=>1,'䗗'=>1,'蟡'=>1,'蠁'=>1,'䗹'=>1,'衠'=>1,'衣'=>1,'𧙧'=>1,'裗'=>1,'裞'=>1,'䘵'=>1,'裺'=>1,'㒻'=>1,'𧢮'=>1,'𧥦'=>1,'䚾'=>1,'䛇'=>1,'誠'=>1,'諭'=>1,'變'=>1,'豕'=>1,'𧲨'=>1,'貫'=>1,'賁'=>1,'贛'=>1,'起'=>1,'𧼯'=>1,'𠠄'=>1,'跋'=>1,'趼'=>1,'跰'=>1,'𠣞'=>1,'軔'=>1,'輸'=>1,'𨗒'=>1,'𨗭'=>1,'邔'=>1,'郱'=>1,'鄑'=>1,'𨜮'=>1,'鄛'=>1,'鈸'=>1,'鋗'=>1,'鋘'=>1,'鉼'=>1,'鏹'=>1,'鐕'=>1,'𨯺'=>1,'開'=>1,'䦕'=>1,'閷'=>1,'𨵷'=>1,'䧦'=>1,'雃'=>1,'嶲'=>1,'霣'=>1,'𩅅'=>1,'𩈚'=>1,'䩮'=>1,'䩶'=>1,'韠'=>1,'𩐊'=>1,'䪲'=>1,'𩒖'=>1,'頋'=>1,'頋'=>1,'頩'=>1,'𩖶'=>1,'飢'=>1,'䬳'=>1,'餩'=>1,'馧'=>1,'駂'=>1,'駾'=>1,'䯎'=>1,'𩬰'=>1,'鬒'=>1,'鱀'=>1,'鳽'=>1,'䳎'=>1,'䳭'=>1,'鵧'=>1,'𪃎'=>1,'䳸'=>1,'𪄅'=>1,'𪈎'=>1,'𪊑'=>1,'麻'=>1,'䵖'=>1,'黹'=>1,'黾'=>1,'鼅'=>1,'鼏'=>1,'鼖'=>1,'鼻'=>1,'𪘀'=>1,'̀'=>0,'́'=>0,'̂'=>0,'̃'=>0,'̄'=>0,'̆'=>0,'̇'=>0,'̈'=>0,'̉'=>0,'̊'=>0,'̋'=>0,'̌'=>0,'̏'=>0,'̑'=>0,'̓'=>0,'̔'=>0,'̛'=>0,'̣'=>0,'̤'=>0,'̥'=>0,'̦'=>0,'̧'=>0,'̨'=>0,'̭'=>0,'̮'=>0,'̰'=>0,'̱'=>0,'̸'=>0,'͂'=>0,'ͅ'=>0,'ٓ'=>0,'ٔ'=>0,'ٕ'=>0,'़'=>0,'া'=>0,'ৗ'=>0,'ା'=>0,'ୖ'=>0,'ୗ'=>0,'ா'=>0,'ௗ'=>0,'ౖ'=>0,'ೂ'=>0,'ೕ'=>0,'ೖ'=>0,'ാ'=>0,'ൗ'=>0,'්'=>0,'ා'=>0,'ෟ'=>0,'ီ'=>0,'ᅡ'=>0,'ᅢ'=>0,'ᅣ'=>0,'ᅤ'=>0,'ᅥ'=>0,'ᅦ'=>0,'ᅧ'=>0,'ᅨ'=>0,'ᅩ'=>0,'ᅪ'=>0,'ᅫ'=>0,'ᅬ'=>0,'ᅭ'=>0,'ᅮ'=>0,'ᅯ'=>0,'ᅰ'=>0,'ᅱ'=>0,'ᅲ'=>0,'ᅳ'=>0,'ᅴ'=>0,'ᅵ'=>0,'ᆨ'=>0,'ᆩ'=>0,'ᆪ'=>0,'ᆫ'=>0,'ᆬ'=>0,'ᆭ'=>0,'ᆮ'=>0,'ᆯ'=>0,'ᆰ'=>0,'ᆱ'=>0,'ᆲ'=>0,'ᆳ'=>0,'ᆴ'=>0,'ᆵ'=>0,'ᆶ'=>0,'ᆷ'=>0,'ᆸ'=>0,'ᆹ'=>0,'ᆺ'=>0,'ᆻ'=>0,'ᆼ'=>0,'ᆽ'=>0,'ᆾ'=>0,'ᆿ'=>0,'ᇀ'=>0,'ᇁ'=>0,'ᇂ'=>0,'ᬵ'=>0,'゙'=>0,'゚'=>0);
-\ No newline at end of file
diff --git a/phpBB/includes/utf/data/utf_normalizer_common.php b/phpBB/includes/utf/data/utf_normalizer_common.php
deleted file mode 100644
index befc17d410..0000000000
--- a/phpBB/includes/utf/data/utf_normalizer_common.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$GLOBALS['utf_jamo_index']=array('ᄀ'=>44032,'ᄁ'=>44620,'ᄂ'=>45208,'ᄃ'=>45796,'ᄄ'=>46384,'ᄅ'=>46972,'ᄆ'=>47560,'ᄇ'=>48148,'ᄈ'=>48736,'ᄉ'=>49324,'ᄊ'=>49912,'ᄋ'=>50500,'ᄌ'=>51088,'ᄍ'=>51676,'ᄎ'=>52264,'ᄏ'=>52852,'ᄐ'=>53440,'ᄑ'=>54028,'ᄒ'=>54616,'ᅡ'=>0,'ᅢ'=>28,'ᅣ'=>56,'ᅤ'=>84,'ᅥ'=>112,'ᅦ'=>140,'ᅧ'=>168,'ᅨ'=>196,'ᅩ'=>224,'ᅪ'=>252,'ᅫ'=>280,'ᅬ'=>308,'ᅭ'=>336,'ᅮ'=>364,'ᅯ'=>392,'ᅰ'=>420,'ᅱ'=>448,'ᅲ'=>476,'ᅳ'=>504,'ᅴ'=>532,'ᅵ'=>560,'ᆧ'=>0,'ᆨ'=>1,'ᆩ'=>2,'ᆪ'=>3,'ᆫ'=>4,'ᆬ'=>5,'ᆭ'=>6,'ᆮ'=>7,'ᆯ'=>8,'ᆰ'=>9,'ᆱ'=>10,'ᆲ'=>11,'ᆳ'=>12,'ᆴ'=>13,'ᆵ'=>14,'ᆶ'=>15,'ᆷ'=>16,'ᆸ'=>17,'ᆹ'=>18,'ᆺ'=>19,'ᆻ'=>20,'ᆼ'=>21,'ᆽ'=>22,'ᆾ'=>23,'ᆿ'=>24,'ᇀ'=>25,'ᇁ'=>26,'ᇂ'=>27);
-$GLOBALS['utf_jamo_type']=array('ᄀ'=>0,'ᄁ'=>0,'ᄂ'=>0,'ᄃ'=>0,'ᄄ'=>0,'ᄅ'=>0,'ᄆ'=>0,'ᄇ'=>0,'ᄈ'=>0,'ᄉ'=>0,'ᄊ'=>0,'ᄋ'=>0,'ᄌ'=>0,'ᄍ'=>0,'ᄎ'=>0,'ᄏ'=>0,'ᄐ'=>0,'ᄑ'=>0,'ᄒ'=>0,'ᅡ'=>1,'ᅢ'=>1,'ᅣ'=>1,'ᅤ'=>1,'ᅥ'=>1,'ᅦ'=>1,'ᅧ'=>1,'ᅨ'=>1,'ᅩ'=>1,'ᅪ'=>1,'ᅫ'=>1,'ᅬ'=>1,'ᅭ'=>1,'ᅮ'=>1,'ᅯ'=>1,'ᅰ'=>1,'ᅱ'=>1,'ᅲ'=>1,'ᅳ'=>1,'ᅴ'=>1,'ᅵ'=>1,'ᆧ'=>2,'ᆨ'=>2,'ᆩ'=>2,'ᆪ'=>2,'ᆫ'=>2,'ᆬ'=>2,'ᆭ'=>2,'ᆮ'=>2,'ᆯ'=>2,'ᆰ'=>2,'ᆱ'=>2,'ᆲ'=>2,'ᆳ'=>2,'ᆴ'=>2,'ᆵ'=>2,'ᆶ'=>2,'ᆷ'=>2,'ᆸ'=>2,'ᆹ'=>2,'ᆺ'=>2,'ᆻ'=>2,'ᆼ'=>2,'ᆽ'=>2,'ᆾ'=>2,'ᆿ'=>2,'ᇀ'=>2,'ᇁ'=>2,'ᇂ'=>2);
-$GLOBALS['utf_combining_class']=array('̀'=>230,'́'=>230,'̂'=>230,'̃'=>230,'̄'=>230,'̅'=>230,'̆'=>230,'̇'=>230,'̈'=>230,'̉'=>230,'̊'=>230,'̋'=>230,'̌'=>230,'̍'=>230,'̎'=>230,'̏'=>230,'̐'=>230,'̑'=>230,'̒'=>230,'̓'=>230,'̔'=>230,'̕'=>232,'̖'=>220,'̗'=>220,'̘'=>220,'̙'=>220,'̚'=>232,'̛'=>216,'̜'=>220,'̝'=>220,'̞'=>220,'̟'=>220,'̠'=>220,'̡'=>202,'̢'=>202,'̣'=>220,'̤'=>220,'̥'=>220,'̦'=>220,'̧'=>202,'̨'=>202,'̩'=>220,'̪'=>220,'̫'=>220,'̬'=>220,'̭'=>220,'̮'=>220,'̯'=>220,'̰'=>220,'̱'=>220,'̲'=>220,'̳'=>220,'̴'=>1,'̵'=>1,'̶'=>1,'̷'=>1,'̸'=>1,'̹'=>220,'̺'=>220,'̻'=>220,'̼'=>220,'̽'=>230,'̾'=>230,'̿'=>230,'̀'=>230,'́'=>230,'͂'=>230,'̓'=>230,'̈́'=>230,'ͅ'=>240,'͆'=>230,'͇'=>220,'͈'=>220,'͉'=>220,'͊'=>230,'͋'=>230,'͌'=>230,'͍'=>220,'͎'=>220,'͐'=>230,'͑'=>230,'͒'=>230,'͓'=>220,'͔'=>220,'͕'=>220,'͖'=>220,'͗'=>230,'͘'=>232,'͙'=>220,'͚'=>220,'͛'=>230,'͜'=>233,'͝'=>234,'͞'=>234,'͟'=>233,'͠'=>234,'͡'=>234,'͢'=>233,'ͣ'=>230,'ͤ'=>230,'ͥ'=>230,'ͦ'=>230,'ͧ'=>230,'ͨ'=>230,'ͩ'=>230,'ͪ'=>230,'ͫ'=>230,'ͬ'=>230,'ͭ'=>230,'ͮ'=>230,'ͯ'=>230,'҃'=>230,'҄'=>230,'҅'=>230,'҆'=>230,'֑'=>220,'֒'=>230,'֓'=>230,'֔'=>230,'֕'=>230,'֖'=>220,'֗'=>230,'֘'=>230,'֙'=>230,'֚'=>222,'֛'=>220,'֜'=>230,'֝'=>230,'֞'=>230,'֟'=>230,'֠'=>230,'֡'=>230,'֢'=>220,'֣'=>220,'֤'=>220,'֥'=>220,'֦'=>220,'֧'=>220,'֨'=>230,'֩'=>230,'֪'=>220,'֫'=>230,'֬'=>230,'֭'=>222,'֮'=>228,'֯'=>230,'ְ'=>10,'ֱ'=>11,'ֲ'=>12,'ֳ'=>13,'ִ'=>14,'ֵ'=>15,'ֶ'=>16,'ַ'=>17,'ָ'=>18,'ֹ'=>19,'ֺ'=>19,'ֻ'=>20,'ּ'=>21,'ֽ'=>22,'ֿ'=>23,'ׁ'=>24,'ׂ'=>25,'ׄ'=>230,'ׅ'=>220,'ׇ'=>18,'ؐ'=>230,'ؑ'=>230,'ؒ'=>230,'ؓ'=>230,'ؔ'=>230,'ؕ'=>230,'ً'=>27,'ٌ'=>28,'ٍ'=>29,'َ'=>30,'ُ'=>31,'ِ'=>32,'ّ'=>33,'ْ'=>34,'ٓ'=>230,'ٔ'=>230,'ٕ'=>220,'ٖ'=>220,'ٗ'=>230,'٘'=>230,'ٙ'=>230,'ٚ'=>230,'ٛ'=>230,'ٜ'=>220,'ٝ'=>230,'ٞ'=>230,'ٰ'=>35,'ۖ'=>230,'ۗ'=>230,'ۘ'=>230,'ۙ'=>230,'ۚ'=>230,'ۛ'=>230,'ۜ'=>230,'۟'=>230,'۠'=>230,'ۡ'=>230,'ۢ'=>230,'ۣ'=>220,'ۤ'=>230,'ۧ'=>230,'ۨ'=>230,'۪'=>220,'۫'=>230,'۬'=>230,'ۭ'=>220,'ܑ'=>36,'ܰ'=>230,'ܱ'=>220,'ܲ'=>230,'ܳ'=>230,'ܴ'=>220,'ܵ'=>230,'ܶ'=>230,'ܷ'=>220,'ܸ'=>220,'ܹ'=>220,'ܺ'=>230,'ܻ'=>220,'ܼ'=>220,'ܽ'=>230,'ܾ'=>220,'ܿ'=>230,'݀'=>230,'݁'=>230,'݂'=>220,'݃'=>230,'݄'=>220,'݅'=>230,'݆'=>220,'݇'=>230,'݈'=>220,'݉'=>230,'݊'=>230,'߫'=>230,'߬'=>230,'߭'=>230,'߮'=>230,'߯'=>230,'߰'=>230,'߱'=>230,'߲'=>220,'߳'=>230,'़'=>7,'्'=>9,'॑'=>230,'॒'=>220,'॓'=>230,'॔'=>230,'়'=>7,'্'=>9,'਼'=>7,'੍'=>9,'઼'=>7,'્'=>9,'଼'=>7,'୍'=>9,'்'=>9,'్'=>9,'ౕ'=>84,'ౖ'=>91,'಼'=>7,'್'=>9,'്'=>9,'්'=>9,'ุ'=>103,'ู'=>103,'ฺ'=>9,'่'=>107,'้'=>107,'๊'=>107,'๋'=>107,'ຸ'=>118,'ູ'=>118,'່'=>122,'້'=>122,'໊'=>122,'໋'=>122,'༘'=>220,'༙'=>220,'༵'=>220,'༷'=>220,'༹'=>216,'ཱ'=>129,'ི'=>130,'ུ'=>132,'ེ'=>130,'ཻ'=>130,'ོ'=>130,'ཽ'=>130,'ྀ'=>130,'ྂ'=>230,'ྃ'=>230,'྄'=>9,'྆'=>230,'྇'=>230,'࿆'=>220,'့'=>7,'္'=>9,'፟'=>230,'᜔'=>9,'᜴'=>9,'្'=>9,'៝'=>230,'ᢩ'=>228,'᤹'=>222,'᤺'=>230,'᤻'=>220,'ᨗ'=>230,'ᨘ'=>220,'᬴'=>7,'᭄'=>9,'᭫'=>230,'᭬'=>220,'᭭'=>230,'᭮'=>230,'᭯'=>230,'᭰'=>230,'᭱'=>230,'᭲'=>230,'᭳'=>230,'᷀'=>230,'᷁'=>230,'᷂'=>220,'᷃'=>230,'᷄'=>230,'᷅'=>230,'᷆'=>230,'᷇'=>230,'᷈'=>230,'᷉'=>230,'᷊'=>220,'᷾'=>230,'᷿'=>220,'⃐'=>230,'⃑'=>230,'⃒'=>1,'⃓'=>1,'⃔'=>230,'⃕'=>230,'⃖'=>230,'⃗'=>230,'⃘'=>1,'⃙'=>1,'⃚'=>1,'⃛'=>230,'⃜'=>230,'⃡'=>230,'⃥'=>1,'⃦'=>1,'⃧'=>230,'⃨'=>220,'⃩'=>230,'⃪'=>1,'⃫'=>1,'⃬'=>220,'⃭'=>220,'⃮'=>220,'⃯'=>220,'〪'=>218,'〫'=>228,'〬'=>232,'〭'=>222,'〮'=>224,'〯'=>224,'゙'=>8,'゚'=>8,'꠆'=>9,'ﬞ'=>26,'︠'=>230,'︡'=>230,'︢'=>230,'︣'=>230,'𐨍'=>220,'𐨏'=>230,'𐨸'=>230,'𐨹'=>1,'𐨺'=>220,'𐨿'=>9,'𝅥'=>216,'𝅦'=>216,'𝅧'=>1,'𝅨'=>1,'𝅩'=>1,'𝅭'=>226,'𝅮'=>216,'𝅯'=>216,'𝅰'=>216,'𝅱'=>216,'𝅲'=>216,'𝅻'=>220,'𝅼'=>220,'𝅽'=>220,'𝅾'=>220,'𝅿'=>220,'𝆀'=>220,'𝆁'=>220,'𝆂'=>220,'𝆅'=>230,'𝆆'=>230,'𝆇'=>230,'𝆈'=>230,'𝆉'=>230,'𝆊'=>220,'𝆋'=>220,'𝆪'=>230,'𝆫'=>230,'𝆬'=>230,'𝆭'=>230,'𝉂'=>230,'𝉃'=>230,'𝉄'=>230);
-\ No newline at end of file
diff --git a/phpBB/includes/utf/utf_normalizer.php b/phpBB/includes/utf/utf_normalizer.php
deleted file mode 100644
index 5f88adaa4c..0000000000
--- a/phpBB/includes/utf/utf_normalizer.php
+++ /dev/null
@@ -1,1505 +0,0 @@
-<?php
-/**
-*
-* @package utf
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-// 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']);
-
-/**
-* Unicode normalization routines
-*
-* @package utf
-*/
-class utf_normalizer
-{
-	/**
-	* Some Unicode characters encoded in UTF-8
-	*
-	* Preserved for compatibility
-	*/
-
-	const UTF8_REPLACEMENT = "\xEF\xBF\xBD";
-	const UTF8_MAX = "\xF4\x8F\xBF\xBF";
-	const UTF8_FFFE = "\xEF\xBF\xBE";
-	const UTF8_FFFF = "\xEF\xBF\xBF";
-	const UTF8_SURROGATE_FIRST = "\xED\xA0\x80";
-	const UTF8_SURROGATE_LAST = "\xED\xBF\xBF";
-	const UTF8_HANGUL_FIRST = "\xEA\xB0\x80";
-	const UTF8_HANGUL_LAST = "\xED\x9E\xA3";
-
-	const UTF8_CJK_FIRST = "\xE4\xB8\x80";
-	const UTF8_CJK_LAST = "\xE9\xBE\xBB";
-	const UTF8_CJK_B_FIRST = "\xF0\xA0\x80\x80";
-	const UTF8_CJK_B_LAST = "\xF0\xAA\x9B\x96";
-
-	// NFC_QC and NFKC_QC values
-	const UNICODE_QC_MAYBE = 0;
-	const UNICODE_QC_NO = 1;
-
-	// Contains all the ASCII characters appearing in UTF-8, sorted by frequency
-	const 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
-	const 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
-	const UNICODE_HANGUL_SBASE = 0xAC00;
-	const UNICODE_HANGUL_LBASE = 0x1100;
-	const UNICODE_HANGUL_VBASE = 0x1161;
-	const UNICODE_HANGUL_TBASE = 0x11A7;
-	const UNICODE_HANGUL_SCOUNT = 11172;
-	const UNICODE_HANGUL_LCOUNT = 19;
-	const UNICODE_HANGUL_VCOUNT = 21;
-	const UNICODE_HANGUL_TCOUNT = 28;
-	const UNICODE_HANGUL_NCOUNT = 588;
-	const UNICODE_JAMO_L = 0;
-	const UNICODE_JAMO_V = 1;
-	const UNICODE_JAMO_T = 2;
-
-	/**
-	* 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
-	*/
-	public static function cleanup(&$str)
-	{
-		// The string below is the list of all authorized 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);
-
-		if ($pos == $len)
-		{
-			// ASCII strings with no special chars return immediately
-			return;
-		}
-
-		// Note: we do not check for $GLOBALS['utf_canonical_decomp']. It is assumed they are always loaded together
-		if (!isset($GLOBALS['utf_nfc_qc']))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/utf/data/utf_nfc_qc.' . PHP_EXT);
-		}
-
-		if (!isset($GLOBALS['utf_canonical_decomp']))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/utf/data/utf_canonical_decomp.' . PHP_EXT);
-		}
-
-		// 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
-		$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"
-		);
-
-		$str = self::recompose($str, $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
-	*/
-	public static function nfc(&$str)
-	{
-		$pos = strspn($str, self::UTF8_ASCII_RANGE);
-		$len = strlen($str);
-
-		if ($pos == $len)
-		{
-			// ASCII strings return immediately
-			return;
-		}
-
-		if (!isset($GLOBALS['utf_nfc_qc']))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/utf/data/utf_nfc_qc.' . PHP_EXT);
-		}
-
-		if (!isset($GLOBALS['utf_canonical_decomp']))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/utf/data/utf_canonical_decomp.' . PHP_EXT);
-		}
-
-		$str = self::recompose($str, $pos, $len, $GLOBALS['utf_nfc_qc'], $GLOBALS['utf_canonical_decomp']);
-	}
-
-	/**
-	* Validate and normalize a UTF string to NFKC
-	*
-	* @param	string	&$str	Unchecked UTF string
-	* @return	string			The string, validated and in normal form
-	*/
-	public static function nfkc(&$str)
-	{
-		$pos = strspn($str, self::UTF8_ASCII_RANGE);
-		$len = strlen($str);
-
-		if ($pos == $len)
-		{
-			// ASCII strings return immediately
-			return;
-		}
-
-		if (!isset($GLOBALS['utf_nfkc_qc']))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/utf/data/utf_nfkc_qc.' . PHP_EXT);
-		}
-
-		if (!isset($GLOBALS['utf_compatibility_decomp']))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/utf/data/utf_compatibility_decomp.' . PHP_EXT);
-		}
-
-		$str = self::recompose($str, $pos, $len, $GLOBALS['utf_nfkc_qc'], $GLOBALS['utf_compatibility_decomp']);
-	}
-
-	/**
-	* Validate and normalize a UTF string to NFD
-	*
-	* @param	string	&$str	Unchecked UTF string
-	* @return	string			The string, validated and in normal form
-	*/
-	public static function nfd(&$str)
-	{
-		$pos = strspn($str, self::UTF8_ASCII_RANGE);
-		$len = strlen($str);
-
-		if ($pos == $len)
-		{
-			// ASCII strings return immediately
-			return;
-		}
-
-		if (!isset($GLOBALS['utf_canonical_decomp']))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/utf/data/utf_canonical_decomp.' . PHP_EXT);
-		}
-
-		$str = self::decompose($str, $pos, $len, $GLOBALS['utf_canonical_decomp']);
-	}
-
-	/**
-	* Validate and normalize a UTF string to NFKD
-	*
-	* @param	string	&$str	Unchecked UTF string
-	* @return	string			The string, validated and in normal form
-	*/
-	public static function nfkd(&$str)
-	{
-		$pos = strspn($str, self::UTF8_ASCII_RANGE);
-		$len = strlen($str);
-
-		if ($pos == $len)
-		{
-			// ASCII strings return immediately
-			return;
-		}
-
-		if (!isset($GLOBALS['utf_compatibility_decomp']))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/utf/data/utf_compatibility_decomp.' . PHP_EXT);
-		}
-
-		$str = self::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
-	*/
-	private static 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
-		if (!isset($utf_jamo_index, $utf_jamo_type, $utf_combining_class))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/utf/data/utf_normalizer_common.' . PHP_EXT);
-		}
-
-		// Load the canonical composition table
-		if (!isset($utf_canonical_comp))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/utf/data/utf_canonical_comp.' . PHP_EXT);
-		}
-
-		// Buffer the last ASCII char before the UTF-8 stuff if applicable
-		$tmp = '';
-		$i = $tmp_pos = $last_cc = 0;
-
-		$buffer = ($pos) ? array(++$i => $str[$pos - 1]) : array();
-
-		// 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"
-		);
-
-		$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
-			$c = $str[$pos];
-			$c_mask = $c & "\xF0";
-
-			if (isset($utf_len_mask[$c_mask]))
-			{
-				// Byte at $pos is either a leading byte or a missplaced trailing byte
-				if ($utf_len = $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
-					}
-					else if (isset($utf_combining_class[$utf_char]))
-					{
-						if ($utf_combining_class[$utf_char] < $last_cc)
-						{
-							// A combining character that is NOT canonically ordered
-						}
-						else
-						{
-							// 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_char[0] < "\xFC")
-								{
-									$trailing_bytes = 4;
-								}
-								else if ($utf_char[0] > "\xFD")
-								{
-									$trailing_bytes = 0;
-								}
-								else
-								{
-									$trailing_bytes = 5;
-								}
-							}
-							else
-							{
-								$trailing_bytes = $utf_len - 1;
-							}
-
-							$tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . self::UTF8_REPLACEMENT;
-							$pos += strspn($str, self::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) . self::UTF8_REPLACEMENT;
-										$pos += $utf_len;
-										$tmp_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, $pos - $tmp_pos) . self::UTF8_REPLACEMENT;
-										$pos += $utf_len;
-										$tmp_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, $pos - $tmp_pos) . self::UTF8_REPLACEMENT;
-										$pos += $utf_len;
-										$tmp_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, $pos - $tmp_pos) . self::UTF8_REPLACEMENT;
-										$pos += $utf_len;
-										$tmp_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, $pos - $tmp_pos) . self::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 > self::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) . self::UTF8_REPLACEMENT;
-										$pos += strspn($str, self::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, self::UTF8_TRAILING_BYTES, $pos);
-					$tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . str_repeat(self::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
-					{
-						$_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);
-				}
-
-
-				// 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] == self::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)
-					{
-						$utf_char = $buffer[$j & 7];
-						$lpos -= strlen($utf_char);
-
-						if (isset($decomp_map[$utf_char]))
-						{
-							// The char is a composite, decompose for storage
-							$decomp_seq = array();
-							$_pos = 0;
-							$_len = strlen($decomp_map[$utf_char]);
-
-							do
-							{
-								$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;
-								}
-							}
-							while ($_pos < $_len);
-
-							// Prepend the UTF sequence with our decomposed sequence
-							if (isset($decomp_seq[1]))
-							{
-								// The char expanded into several chars
-								$decomp_cnt = sizeof($decomp_seq);
-
-								foreach ($decomp_seq as $decomp_i => $decomp_char)
-								{
-									$utf_seq[$k + $decomp_i - $decomp_cnt] = $decomp_char;
-								}
-								$k -= $decomp_cnt;
-							}
-							else
-							{
-								// Decomposed to a single char, easier to prepend
-								$utf_seq[--$k] = $decomp_seq[0];
-							}
-						}
-						else
-						{
-							$utf_seq[--$k] = $utf_char;
-						}
-
-						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
-						{
-							// $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]))
-							{
-								// UTF byte
-								if ($utf_len = $utf_len_mask[$c_mask])
-								{
-									// UTF *leading* byte
-									$utf_char = substr($str, $lpos, $utf_len);
-
-									if (isset($decomp_map[$utf_char]))
-									{
-										// Decompose the character
-										$decomp_seq = array();
-										$_pos = 0;
-										$_len = strlen($decomp_map[$utf_char]);
-
-										do
-										{
-											$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;
-											}
-										}
-										while ($_pos < $_len);
-
-										// Prepend the UTF sequence with our decomposed sequence
-										if (isset($decomp_seq[1]))
-										{
-											// 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;
-										}
-										else
-										{
-											// Decomposed to a single char, easier to prepend
-											$utf_seq[--$k] = $decomp_seq[0];
-										}
-									}
-									else
-									{
-										$utf_seq[--$k] = $utf_char;
-									}
-								}
-							}
-							else
-							{
-								// ASCII char
-								$utf_seq[--$k] = $c;
-							}
-						}
-						while ($lpos > $tmp_pos);
-					}
-				}
-
-
-				// STEP 3: Capture following combining modifiers
-
-				while ($pos < $len)
-				{
-					$c_mask = $str[$pos] & "\xF0";
-
-					if (isset($utf_len_mask[$c_mask]))
-					{
-						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;
-						}
-
-						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]))
-							{
-								// Decompose the character
-								$_pos = 0;
-								$_len = strlen($decomp_map[$utf_char]);
-
-								do
-								{
-									$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);
-							}
-							else
-							{
-								$utf_seq[] = $utf_char;
-							}
-
-							$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
-							break;
-						}
-					}
-					else
-					{
-						// ASCII chars are starters
-						break;
-					}
-				}
-
-
-				// STEP 4: Sort and combine
-
-				// Here we sort...
-				$k_max = $k + sizeof($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
-					if (substr_compare($str, $utf_seq[0], $lpos, $pos - $lpos))
-					{
-						$tmp .= substr($str, $tmp_pos, $lpos - $tmp_pos) . $utf_seq[0];
-						$tmp_pos = $pos;
-					}
-
-					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[] = '';
-
-				do
-				{
-					$utf_char = $utf_seq[$k++];
-
-					if (isset($utf_combining_class[$utf_char]))
-					{
-						$utf_sort[$utf_combining_class[$utf_char]][] = $utf_char;
-					}
-					else
-					{
-						if (empty($utf_sort))
-						{
-							// 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];
-							}
-							else if (isset($utf_jamo_type[$utf_char]))
-							{
-								// Current char is a composable jamo
-								if (isset($utf_jamo_type[$starter]) && $utf_jamo_type[$starter] == self::UNICODE_JAMO_L && $utf_jamo_type[$utf_char] == self::UNICODE_JAMO_V)
-								{
-									// 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]] == self::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];
-									}
-
-									$starter = chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
-								}
-								else
-								{
-									// Non-composable jamo, just add it to the sequence
-									$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;
-
-								do
-								{
-									// 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]));
-							}
-
-							// 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))
-								{
-									$nf_seq .= implode('', $utf_chars);
-								}
-							}
-
-							// Reset the array and go on
-							$utf_sort = array();
-							$starter = $utf_char;
-						}
-					}
-				}
-				while ($k <= $k_max);
-
-				$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, self::UTF8_ASCII_RANGE, ++$pos);
-						$buffer[++$i & 7] = $str[$pos - 1];
-					}
-					else
-					{
-						$buffer[++$i & 7] = $c;
-					}
-				}
-			}
-		}
-		while ($pos < $len);
-
-		// Now is time to return the string
-		if ($tmp_pos)
-		{
-			// 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
-			{
-				// 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;
-	}
-
-	/**
-	* 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
-	*/
-	private static function decompose($str, $pos, $len, &$decomp_map)
-	{
-		global $utf_combining_class;
-
-		// Load some commonly-used tables
-		if (!isset($utf_combining_class))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/utf/data/utf_normalizer_common.' . PHP_EXT);
-		}
-
-		// 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
-		);
-
-		// 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
-		);
-
-		// 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]))
-			{
-				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, self::UTF8_TRAILING_BYTES, $pos);
-
-					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 .= str_repeat(self::UTF8_REPLACEMENT, $spn);
-						$dump = $sort = 0;
-					}
-					else
-					{
-						$tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . str_repeat(self::UTF8_REPLACEMENT, $spn);
-					}
-
-					$pos += $spn;
-					$tmp_pos = $starter_pos = $pos;
-
-					$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]);
-
-					do
-					{
-						$c = $decomp_map[$utf_char][$_pos];
-						$_utf_len =& $utf_len_mask[$c & "\xF0"];
-
-						if (isset($_utf_len))
-						{
-							$_utf_char = substr($decomp_map[$utf_char], $_pos, $_utf_len);
-							$_pos += $_utf_len;
-
-							if (isset($utf_combining_class[$_utf_char]))
-							{
-								// 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
-							{
-								// 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 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
-								if (!empty($utf_sort))
-								{
-									if ($sort)
-									{
-										ksort($utf_sort);
-									}
-
-									foreach ($utf_sort as $utf_chars)
-									{
-										$tmp .= implode('', $utf_chars);
-									}
-								}
-
-								$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);
-				}
-				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
-					{
-						$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 < self::UTF8_HANGUL_FIRST || $utf_char > self::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);
-
-							if (!empty($utf_sort))
-							{
-								ksort($utf_sort);
-
-								foreach ($utf_sort as $utf_chars)
-								{
-									$tmp .= implode('', $utf_chars);
-								}
-								$utf_sort = array();
-							}
-
-							// 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, self::UTF8_TRAILING_BYTES, ++$pos);
-							$tmp .= str_repeat(self::UTF8_REPLACEMENT, $spn + 1);
-
-							$dump = $sort = 0;
-
-							$pos += $spn;
-							$tmp_pos = $pos;
-							continue;
-						}
-
-						if (isset($extra_check[$utf_char[0]]))
-						{
-							switch ($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))
-										{
-											ksort($utf_sort);
-
-											foreach ($utf_sort as $utf_chars)
-											{
-												$tmp .= implode('', $utf_chars);
-											}
-											$utf_sort = array();
-										}
-
-										$tmp .= self::UTF8_REPLACEMENT;
-										$dump = $sort = 0;
-
-										$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))
-										{
-											ksort($utf_sort);
-
-											foreach ($utf_sort as $utf_chars)
-											{
-												$tmp .= implode('', $utf_chars);
-											}
-											$utf_sort = array();
-										}
-
-										$tmp .= self::UTF8_REPLACEMENT;
-										$dump = $sort = 0;
-
-										$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))
-										{
-											ksort($utf_sort);
-
-											foreach ($utf_sort as $utf_chars)
-											{
-												$tmp .= implode('', $utf_chars);
-											}
-											$utf_sort = array();
-										}
-
-										$tmp .= self::UTF8_REPLACEMENT;
-										$dump = $sort = 0;
-
-										$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))
-										{
-											ksort($utf_sort);
-
-											foreach ($utf_sort as $utf_chars)
-											{
-												$tmp .= implode('', $utf_chars);
-											}
-											$utf_sort = array();
-										}
-
-										$tmp .= self::UTF8_REPLACEMENT;
-										$dump = $sort = 0;
-
-										$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))
-										{
-											ksort($utf_sort);
-
-											foreach ($utf_sort as $utf_chars)
-											{
-												$tmp .= implode('', $utf_chars);
-											}
-											$utf_sort = array();
-										}
-
-										$tmp .= self::UTF8_REPLACEMENT;
-										$dump = $sort = 0;
-
-										$tmp_pos = $starter_pos = $pos;
-										continue 2;
-									}
-								break;
-
-								default:
-									if ($utf_char > self::UTF8_MAX)
-									{
-										// Out of the Unicode range
-										$tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
-
-										if (!empty($utf_sort))
-										{
-											ksort($utf_sort);
-
-											foreach ($utf_sort as $utf_chars)
-											{
-												$tmp .= implode('', $utf_chars);
-											}
-											$utf_sort = array();
-										}
-
-										$tmp .= self::UTF8_REPLACEMENT;
-										$dump = $sort = 0;
-
-										$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)) - self::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 ($t_index = $idx % self::UNICODE_HANGUL_TCOUNT)
-						{
-							if ($t_index < 25)
-							{
-								$utf_char = "\xE1\x84\x00\xE1\x85\x00\xE1\x86\x00";
-								$utf_char[8] = chr(0xA7 + $t_index);
-							}
-							else
-							{
-								$utf_char = "\xE1\x84\x00\xE1\x85\x00\xE1\x87\x00";
-								$utf_char[8] = chr(0x67 + $t_index);
-							}
-						}
-						else
-						{
-							$utf_char = "\xE1\x84\x00\xE1\x85\x00";
-						}
-
-						$utf_char[2] = chr(0x80 + (int) ($idx / self::UNICODE_HANGUL_NCOUNT));
-						$utf_char[5] = chr(0xA1 + (int) (($idx % self::UNICODE_HANGUL_NCOUNT) / self::UNICODE_HANGUL_TCOUNT));
-
-						// Just like other decompositions, the resulting Jamos must be dumped to the tmp string
-						$dump = 1;
-					}
-
-					// Do we need to dump stuff to the tmp string?
-					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;
-						$tmp_pos = $pos;
-					}
-
-					$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
-					if (!empty($utf_sort))
-					{
-						if ($sort)
-						{
-							ksort($utf_sort);
-						}
-
-						foreach ($utf_sort as $utf_chars)
-						{
-							$tmp .= implode('', $utf_chars);
-						}
-					}
-
-					$tmp .= $str[$pos];
-					$dump = $sort = 0;
-					$tmp_pos = ++$pos;
-
-					$pos += strspn($str, self::UTF8_ASCII_RANGE, $pos);
-				}
-				else
-				{
-					$pos += strspn($str, self::UTF8_ASCII_RANGE, ++$pos);
-				}
-
-				$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);
-
-			// Dump combiners
-			if (!empty($utf_sort))
-			{
-				if ($sort)
-				{
-					ksort($utf_sort);
-				}
-
-				foreach ($utf_sort as $utf_chars)
-				{
-					$tmp .= implode('', $utf_chars);
-				}
-			}
-
-			return $tmp;
-		}
-		else if ($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;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php
deleted file mode 100644
index b946f16466..0000000000
--- a/phpBB/includes/utf/utf_tools.php
+++ /dev/null
@@ -1,1516 +0,0 @@
-<?php
-/**
-*
-* @package utf
-* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-// Enforce ASCII only string handling
-setlocale(LC_CTYPE, 'C');
-
-/**
-* UTF-8 tools
-*
-* Whenever possible, these functions will try to use PHP's built-in functions or
-* extensions, otherwise they will default to custom routines.
-*
-* @package utf
-*/
-
-if (!extension_loaded('xml'))
-{
-	/**
-	* Implementation of PHP's native utf8_encode for people without XML support
-	* This function exploits some nice things that ISO-8859-1 and UTF-8 have in common
-	*
-	* @param string $str ISO-8859-1 encoded data
-	* @return string UTF-8 encoded data
-	*/
-	function utf8_encode($str)
-	{
-		$out = '';
-		for ($i = 0, $len = strlen($str); $i < $len; $i++)
-		{
-			$letter = $str[$i];
-			$num = ord($letter);
-			if ($num < 0x80)
-			{
-				$out .= $letter;
-			}
-			else if ($num < 0xC0)
-			{
-				$out .= "\xC2" . $letter;
-			}
-			else
-			{
-				$out .= "\xC3" . chr($num - 64);
-			}
-		}
-		return $out;
-	}
-
-	/**
-	* Implementation of PHP's native utf8_decode for people without XML support
-	*
-	* @param string $str UTF-8 encoded data
-	* @return string ISO-8859-1 encoded data
-	*/
-	function utf8_decode($str)
-	{
-		$pos = 0;
-		$len = strlen($str);
-		$ret = '';
-	
-		while ($pos < $len)
-		{
-			$ord = ord($str[$pos]) & 0xF0;
-			if ($ord === 0xC0 || $ord === 0xD0)
-			{
-				$charval = ((ord($str[$pos]) & 0x1F) << 6) | (ord($str[$pos + 1]) & 0x3F);
-				$pos += 2;
-				$ret .= (($charval < 256) ? chr($charval) : '?');
-			}
-			else if ($ord === 0xE0)
-			{
-				$ret .= '?';
-				$pos += 3;
-			}
-			else if ($ord === 0xF0)
-			{
-				$ret .= '?';
-				$pos += 4;
-			}
-			else
-			{
-				$ret .= $str[$pos];
-				++$pos;
-			}
-		}
-		return $ret;
-	}
-}
-
-// mbstring is old and has it's functions around for older versions of PHP.
-// if mbstring is not loaded, we go into native mode.
-if (extension_loaded('mbstring'))
-{
-	mb_internal_encoding('UTF-8');
-
-	/**
-	* UTF-8 aware alternative to strrpos
-	* Find position of last occurrence of a char in a string
-	*
-	* Notes:
-	* - offset for mb_strrpos was added in 5.2.0, we emulate if it is lower
-	*/
-	if (version_compare(PHP_VERSION, '5.2.0', '>='))
-	{
-		/**
-		* UTF-8 aware alternative to strrpos
-		* @ignore
-		*/
-		function utf8_strrpos($str,	$needle, $offset = null)
-		{
-			// Emulate behaviour of strrpos rather than raising warning
-			if (empty($str))
-			{
-				return false;
-			}
-
-			if (is_null($offset))
-			{
-				return mb_strrpos($str, $needle);
-			}
-			else
-			{
-				return mb_strrpos($str, $needle, $offset);
-			}
-		}
-	}
-	else
-	{
-		/**
-		* UTF-8 aware alternative to strrpos
-		* @ignore
-		*/
-		function utf8_strrpos($str,	$needle, $offset = null)
-		{
-			// offset for mb_strrpos was added in 5.2.0
-			if (is_null($offset))
-			{
-				// Emulate behaviour of strrpos rather than raising warning
-				if (empty($str))
-				{
-					return false;
-				}
-
-				return mb_strrpos($str, $needle);
-			}
-			else
-			{
-				if (!is_int($offset))
-				{
-					trigger_error('utf8_strrpos expects parameter 3 to be long', E_USER_ERROR);
-					return false;
-				}
-
-				$str = mb_substr($str, $offset);
-
-				if (false !== ($pos = mb_strrpos($str, $needle)))
-				{
-					return $pos + $offset;
-				}
-
-				return false;
-			}
-		}
-	}
-
-	/**
-	* UTF-8 aware alternative to strpos
-	* @ignore
-	*/
-	function utf8_strpos($str, $needle, $offset = null)
-	{
-		if (is_null($offset))
-		{
-			return mb_strpos($str, $needle);
-		}
-		else
-		{
-			return mb_strpos($str, $needle, $offset);
-		}
-	}
-
-	/**
-	* UTF-8 aware alternative to substr
-	* @ignore
-	*/
-	function utf8_substr($str, $offset, $length = null)
-	{
-		if (is_null($length))
-		{
-			return mb_substr($str, $offset);
-		}
-		else
-		{
-			return mb_substr($str, $offset, $length);
-		}
-	}
-
-	/**
-	* Return the length (in characters) of a UTF-8 string
-	* @ignore
-	*/
-	function utf8_strlen($text)
-	{
-		return mb_strlen($text, 'utf-8');
-	}
-}
-else
-{
-	/**
-	* UTF-8 aware alternative to strrpos
-	* Find position of last occurrence of a char in a string
-	*
-	* @author Harry Fuecks
-	* @param string $str haystack
-	* @param string $needle needle
-	* @param integer $offset (optional) offset (from left)
-	* @return mixed integer position or FALSE on failure
-	*/
-	function utf8_strrpos($str,	$needle, $offset = null)
-	{
-		if (is_null($offset))
-		{
-			$ar	= explode($needle, $str);
-			
-			if (sizeof($ar) > 1)
-			{
-				// Pop off the end of the string where the last	match was made
-				array_pop($ar);
-				$str = join($needle, $ar);
-
-				return utf8_strlen($str);
-			}
-			return false;
-		}
-		else
-		{
-			if (!is_int($offset))
-			{
-				trigger_error('utf8_strrpos	expects	parameter 3	to be long', E_USER_ERROR);
-				return false;
-			}
-
-			$str = utf8_substr($str, $offset);
-
-			if (false !== ($pos = utf8_strrpos($str, $needle)))
-			{
-				return $pos	+ $offset;
-			}
-
-			return false;
-		}
-	}
-
-	/**
-	* UTF-8 aware alternative to strpos
-	* Find position of first occurrence of a string
-	*
-	* @author Harry Fuecks
-	* @param string $str haystack
-	* @param string $needle needle
-	* @param integer $offset offset in characters (from left)
-	* @return mixed integer position or FALSE on failure
-	*/
-	function utf8_strpos($str, $needle, $offset = null)
-	{
-		if (is_null($offset))
-		{
-			$ar = explode($needle, $str);
-			if (sizeof($ar) > 1)
-			{
-				return utf8_strlen($ar[0]);
-			}
-			return false;
-		}
-		else
-		{
-			if (!is_int($offset))
-			{
-				trigger_error('utf8_strpos:  Offset must  be an integer', E_USER_ERROR);
-				return false;
-			}
-
-			$str = utf8_substr($str, $offset);
-
-			if (false !== ($pos = utf8_strpos($str, $needle)))
-			{
-				return $pos + $offset;
-			}
-
-			return false;
-		}
-	}
-
-	/**
-	* UTF-8 aware alternative to substr
-	* Return part of a string given character offset (and optionally length)
-	*
-	* Note arguments: comparied to substr - if offset or length are
-	* not integers, this version will not complain but rather massages them
-	* into an integer.
-	*
-	* Note on returned values: substr documentation states false can be
-	* returned in some cases (e.g. offset > string length)
-	* mb_substr never returns false, it will return an empty string instead.
-	* This adopts the mb_substr approach
-	*
-	* Note on implementation: PCRE only supports repetitions of less than
-	* 65536, in order to accept up to MAXINT values for offset and length,
-	* we'll repeat a group of 65535 characters when needed.
-	*
-	* Note on implementation: calculating the number of characters in the
-	* string is a relatively expensive operation, so we only carry it out when
-	* necessary. It isn't necessary for +ve offsets and no specified length
-	*
-	* @author Chris Smith<chris@jalakai.co.uk>
-	* @param string $str
-	* @param integer $offset number of UTF-8 characters offset (from left)
-	* @param integer $length (optional) length in UTF-8 characters from offset
-	* @return mixed string or FALSE if failure
-	*/
-	function utf8_substr($str, $offset, $length = NULL)
-	{
-		// generates E_NOTICE
-		// for PHP4 objects, but not PHP5 objects
-		$str = (string) $str;
-		$offset = (int) $offset;
-		if (!is_null($length))
-		{
-			$length = (int) $length;
-		}
-
-		// handle trivial cases
-		if ($length === 0 || ($offset < 0 && $length < 0 && $length < $offset))
-		{
-			return '';
-		}
-
-		// normalise negative offsets (we could use a tail
-		// anchored pattern, but they are horribly slow!)
-		if ($offset < 0)
-		{
-			// see notes
-			$strlen = utf8_strlen($str);
-			$offset = $strlen + $offset;
-			if ($offset < 0)
-			{
-				$offset = 0;
-			}
-		}
-
-		$op = '';
-		$lp = '';
-
-		// establish a pattern for offset, a
-		// non-captured group equal in length to offset
-		if ($offset > 0)
-		{
-			$ox = (int) ($offset / 65535);
-			$oy = $offset % 65535;
-
-			if ($ox)
-			{
-				$op = '(?:.{65535}){' . $ox . '}';
-			}
-
-			$op = '^(?:' . $op . '.{' . $oy . '})';
-		}
-		else
-		{	
-			// offset == 0; just anchor the pattern
-			$op = '^';
-		}
-
-		// establish a pattern for length
-		if (is_null($length))
-		{
-			// the rest of the string
-			$lp = '(.*)$';
-		}
-		else
-		{
-			if (!isset($strlen))
-			{
-				// see notes
-				$strlen = utf8_strlen($str);
-			}
-
-			// another trivial case
-			if ($offset > $strlen)
-			{
-				return '';
-			}
-
-			if ($length > 0)
-			{
-				// reduce any length that would
-				// go passed the end of the string
-				$length = min($strlen - $offset, $length);
-
-				$lx = (int) ($length / 65535);
-				$ly = $length % 65535;
-				
-				// negative length requires a captured group
-				// of length characters
-				if ($lx)
-				{
-					$lp = '(?:.{65535}){' . $lx . '}';
-				}
-				$lp = '(' . $lp . '.{'. $ly . '})';
-			}
-			else if ($length < 0)
-			{
-				if ($length < ($offset - $strlen))
-				{
-					return '';
-				}
-
-				$lx = (int)((-$length) / 65535);
-				$ly = (-$length) % 65535;
-
-				// negative length requires ... capture everything
-				// except a group of  -length characters
-				// anchored at the tail-end of the string
-				if ($lx)
-				{
-					$lp = '(?:.{65535}){' . $lx . '}';
-				}
-				$lp = '(.*)(?:' . $lp . '.{' . $ly . '})$';
-			}
-		}
-
-		if (!preg_match('#' . $op . $lp . '#us', $str, $match))
-		{
-			return '';
-		}
-
-		return $match[1];
-	}
-
-	/**
-	* Return the length (in characters) of a UTF-8 string
-	*
-	* @param	string	$text		UTF-8 string
-	* @return	integer				Length (in chars) of given string
-	*/
-	function utf8_strlen($text)
-	{
-		// Since utf8_decode is replacing multibyte characters to ? strlen works fine
-		return strlen(utf8_decode($text));
-	}
-}
-
-/**
-* UTF-8 aware alternative to str_split
-* Convert a string to an array
-*
-* @author Harry Fuecks
-* @param string $str UTF-8 encoded
-* @param int $split_len number to characters to split string by
-* @return array characters in string reverses
-*/
-function utf8_str_split($str, $split_len = 1)
-{
-	if (!is_int($split_len) || $split_len < 1)
-	{
-		return false;
-	}
-
-	$len = utf8_strlen($str);
-	if ($len <= $split_len)
-	{
-		return array($str);
-	}
-	
-	preg_match_all('/.{' . $split_len . '}|[^\x00]{1,' . $split_len . '}$/us', $str, $ar);
-	return $ar[0];
-}
-
-/**
-* UTF-8 aware alternative to strspn
-* Find length of initial segment matching the mask
-*
-* @author Harry Fuecks
-*/
-function utf8_strspn($str, $mask, $start = null, $length = null)
-{
-	if ($start !== null || $length !== null)
-	{
-		$str = utf8_substr($str, $start, $length);
-	}
-
-	preg_match('/^[' . $mask . ']+/u', $str, $matches);
-
-	if (isset($matches[0]))
-	{
-		return utf8_strlen($matches[0]);
-	}
-
-	return 0;
-}
-
-/**
-* Replace all UTF-8 chars that are not in ASCII with their NCR
-*
-* @param	string	$text		UTF-8 string in NFC
-* @return	string				ASCII string using NCRs for non-ASCII chars
-*/
-function utf8_encode_ncr($text)
-{
-	return preg_replace_callback('#[\\xC2-\\xF4][\\x80-\\xBF]{1,3}#', 'utf8_encode_ncr_callback', $text);
-}
-
-/**
-* Callback used in encode_ncr()
-*
-* Takes a UTF-8 char and replaces it with its NCR. Attention, $m is an array
-*
-* @param	array	$m			0-based numerically indexed array passed by preg_replace_callback()
-* @return	string				A HTML NCR if the character is valid, or the original string otherwise
-*/
-function utf8_encode_ncr_callback($m)
-{
-	return '&#' . utf8_ord($m[0]) . ';';
-}
-
-/**
-* Converts a UTF-8 char to an NCR
-*
-* @param string $chr UTF-8 char
-* @return integer UNICODE code point
-*/
-function utf8_ord($chr)
-{
-	switch (strlen($chr))
-	{
-		case 1:
-			return ord($chr);
-		break;
-
-		case 2:
-			return ((ord($chr[0]) & 0x1F) << 6) | (ord($chr[1]) & 0x3F);
-		break;
-
-		case 3:
-			return ((ord($chr[0]) & 0x0F) << 12) | ((ord($chr[1]) & 0x3F) << 6) | (ord($chr[2]) & 0x3F);
-		break;
-
-		case 4:
-			return ((ord($chr[0]) & 0x07) << 18) | ((ord($chr[1]) & 0x3F) << 12) | ((ord($chr[2]) & 0x3F) << 6) | (ord($chr[3]) & 0x3F);
-		break;
-
-		default:
-			return $chr;
-	}
-}
-
-/**
-* Converts an NCR to a UTF-8 char
-*
-* @param	int		$cp	UNICODE code point
-* @return	string		UTF-8 char
-*/
-function utf8_chr($cp)
-{
-	if ($cp > 0xFFFF)
-	{
-		return chr(0xF0 | ($cp >> 18)) . chr(0x80 | (($cp >> 12) & 0x3F)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
-	}
-	else if ($cp > 0x7FF)
-	{
-		return chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
-	}
-	else if ($cp > 0x7F)
-	{
-		return chr(0xC0 | ($cp >> 6)) . chr(0x80 | ($cp & 0x3F));
-	}
-	else
-	{
-		return chr($cp);
-	}
-}
-
-/**
-* Convert Numeric Character References to UTF-8 chars
-*
-* Notes:
-*	- we do not convert NCRs recursively, if you pass &#38;#38; it will return &#38;
-*	- we DO NOT check for the existence of the Unicode characters, therefore an entity may be converted to an inexistent codepoint
-*
-* @param	string	$text		String to convert, encoded in UTF-8 (no normal form required)
-* @return	string				UTF-8 string where NCRs have been replaced with the actual chars
-*/
-function utf8_decode_ncr($text)
-{
-	return preg_replace_callback('/&#([0-9]{1,6}|x[0-9A-F]{1,5});/i', 'utf8_decode_ncr_callback', $text);
-}
-
-/**
-* Callback used in decode_ncr()
-*
-* Takes a NCR (in decimal or hexadecimal) and returns a UTF-8 char. Attention, $m is an array.
-* It will ignore most of invalid NCRs, but not all!
-*
-* @param	array	$m			0-based numerically indexed array passed by preg_replace_callback()
-* @return	string				UTF-8 char
-*/
-function utf8_decode_ncr_callback($m)
-{
-	$cp = (strncasecmp($m[1], 'x', 1)) ? $m[1] : hexdec(substr($m[1], 1));
-
-	return utf8_chr($cp);
-}
-
-/**
-* Case folds a unicode string as per Unicode 5.0, section 3.13
-*
-* @param	string	$text	text to be case folded
-* @param	string	$option	determines how we will fold the cases
-* @return	string			case folded text
-*/
-function utf8_case_fold($text, $option = 'full')
-{
-	static $uniarray = array();
-
-	// common is always set
-	if (!isset($uniarray['c']))
-	{
-		$uniarray['c'] = include(PHPBB_ROOT_PATH . 'includes/utf/data/case_fold_c.' . PHP_EXT);
-	}
-
-	// only set full if we need to
-	if ($option === 'full' && !isset($uniarray['f']))
-	{
-		$uniarray['f'] = include(PHPBB_ROOT_PATH . 'includes/utf/data/case_fold_f.' . PHP_EXT);
-	}
-
-	// only set simple if we need to
-	if ($option !== 'full' && !isset($uniarray['s']))
-	{
-		$uniarray['s'] = include(PHPBB_ROOT_PATH . 'includes/utf/data/case_fold_s.' . PHP_EXT);
-	}
-
-	// common is always replaced
-	$text = strtr($text, $uniarray['c']);
-
-	if ($option === 'full')
-	{
-		// full replaces a character with multiple characters
-		$text = strtr($text, $uniarray['f']);
-	}
-	else
-	{
-		// simple replaces a character with another character
-		$text = strtr($text, $uniarray['s']);
-	}
-
-	return $text;
-}
-
-/**
-* Takes the input and does a "special" case fold. It does minor normalization
-* and returns NFKC compatable text
-*
-* @param	string	$text	text to be case folded
-* @param	string	$option	determines how we will fold the cases
-* @return	string			case folded text
-*/
-function utf8_case_fold_nfkc($text, $option = 'full')
-{
-	static $fc_nfkc_closure = array(
-		"\xCD\xBA"	=> "\x20\xCE\xB9",
-		"\xCF\x92"	=> "\xCF\x85",
-		"\xCF\x93"	=> "\xCF\x8D",
-		"\xCF\x94"	=> "\xCF\x8B",
-		"\xCF\xB2"	=> "\xCF\x83",
-		"\xCF\xB9"	=> "\xCF\x83",
-		"\xE1\xB4\xAC"	=> "\x61",
-		"\xE1\xB4\xAD"	=> "\xC3\xA6",
-		"\xE1\xB4\xAE"	=> "\x62",
-		"\xE1\xB4\xB0"	=> "\x64",
-		"\xE1\xB4\xB1"	=> "\x65",
-		"\xE1\xB4\xB2"	=> "\xC7\x9D",
-		"\xE1\xB4\xB3"	=> "\x67",
-		"\xE1\xB4\xB4"	=> "\x68",
-		"\xE1\xB4\xB5"	=> "\x69",
-		"\xE1\xB4\xB6"	=> "\x6A",
-		"\xE1\xB4\xB7"	=> "\x6B",
-		"\xE1\xB4\xB8"	=> "\x6C",
-		"\xE1\xB4\xB9"	=> "\x6D",
-		"\xE1\xB4\xBA"	=> "\x6E",
-		"\xE1\xB4\xBC"	=> "\x6F",
-		"\xE1\xB4\xBD"	=> "\xC8\xA3",
-		"\xE1\xB4\xBE"	=> "\x70",
-		"\xE1\xB4\xBF"	=> "\x72",
-		"\xE1\xB5\x80"	=> "\x74",
-		"\xE1\xB5\x81"	=> "\x75",
-		"\xE1\xB5\x82"	=> "\x77",
-		"\xE2\x82\xA8"	=> "\x72\x73",
-		"\xE2\x84\x82"	=> "\x63",
-		"\xE2\x84\x83"	=> "\xC2\xB0\x63",
-		"\xE2\x84\x87"	=> "\xC9\x9B",
-		"\xE2\x84\x89"	=> "\xC2\xB0\x66",
-		"\xE2\x84\x8B"	=> "\x68",
-		"\xE2\x84\x8C"	=> "\x68",
-		"\xE2\x84\x8D"	=> "\x68",
-		"\xE2\x84\x90"	=> "\x69",
-		"\xE2\x84\x91"	=> "\x69",
-		"\xE2\x84\x92"	=> "\x6C",
-		"\xE2\x84\x95"	=> "\x6E",
-		"\xE2\x84\x96"	=> "\x6E\x6F",
-		"\xE2\x84\x99"	=> "\x70",
-		"\xE2\x84\x9A"	=> "\x71",
-		"\xE2\x84\x9B"	=> "\x72",
-		"\xE2\x84\x9C"	=> "\x72",
-		"\xE2\x84\x9D"	=> "\x72",
-		"\xE2\x84\xA0"	=> "\x73\x6D",
-		"\xE2\x84\xA1"	=> "\x74\x65\x6C",
-		"\xE2\x84\xA2"	=> "\x74\x6D",
-		"\xE2\x84\xA4"	=> "\x7A",
-		"\xE2\x84\xA8"	=> "\x7A",
-		"\xE2\x84\xAC"	=> "\x62",
-		"\xE2\x84\xAD"	=> "\x63",
-		"\xE2\x84\xB0"	=> "\x65",
-		"\xE2\x84\xB1"	=> "\x66",
-		"\xE2\x84\xB3"	=> "\x6D",
-		"\xE2\x84\xBB"	=> "\x66\x61\x78",
-		"\xE2\x84\xBE"	=> "\xCE\xB3",
-		"\xE2\x84\xBF"	=> "\xCF\x80",
-		"\xE2\x85\x85"	=> "\x64",
-		"\xE3\x89\x90"	=> "\x70\x74\x65",
-		"\xE3\x8B\x8C"	=> "\x68\x67",
-		"\xE3\x8B\x8E"	=> "\x65\x76",
-		"\xE3\x8B\x8F"	=> "\x6C\x74\x64",
-		"\xE3\x8D\xB1"	=> "\x68\x70\x61",
-		"\xE3\x8D\xB3"	=> "\x61\x75",
-		"\xE3\x8D\xB5"	=> "\x6F\x76",
-		"\xE3\x8D\xBA"	=> "\x69\x75",
-		"\xE3\x8E\x80"	=> "\x70\x61",
-		"\xE3\x8E\x81"	=> "\x6E\x61",
-		"\xE3\x8E\x82"	=> "\xCE\xBC\x61",
-		"\xE3\x8E\x83"	=> "\x6D\x61",
-		"\xE3\x8E\x84"	=> "\x6B\x61",
-		"\xE3\x8E\x85"	=> "\x6B\x62",
-		"\xE3\x8E\x86"	=> "\x6D\x62",
-		"\xE3\x8E\x87"	=> "\x67\x62",
-		"\xE3\x8E\x8A"	=> "\x70\x66",
-		"\xE3\x8E\x8B"	=> "\x6E\x66",
-		"\xE3\x8E\x8C"	=> "\xCE\xBC\x66",
-		"\xE3\x8E\x90"	=> "\x68\x7A",
-		"\xE3\x8E\x91"	=> "\x6B\x68\x7A",
-		"\xE3\x8E\x92"	=> "\x6D\x68\x7A",
-		"\xE3\x8E\x93"	=> "\x67\x68\x7A",
-		"\xE3\x8E\x94"	=> "\x74\x68\x7A",
-		"\xE3\x8E\xA9"	=> "\x70\x61",
-		"\xE3\x8E\xAA"	=> "\x6B\x70\x61",
-		"\xE3\x8E\xAB"	=> "\x6D\x70\x61",
-		"\xE3\x8E\xAC"	=> "\x67\x70\x61",
-		"\xE3\x8E\xB4"	=> "\x70\x76",
-		"\xE3\x8E\xB5"	=> "\x6E\x76",
-		"\xE3\x8E\xB6"	=> "\xCE\xBC\x76",
-		"\xE3\x8E\xB7"	=> "\x6D\x76",
-		"\xE3\x8E\xB8"	=> "\x6B\x76",
-		"\xE3\x8E\xB9"	=> "\x6D\x76",
-		"\xE3\x8E\xBA"	=> "\x70\x77",
-		"\xE3\x8E\xBB"	=> "\x6E\x77",
-		"\xE3\x8E\xBC"	=> "\xCE\xBC\x77",
-		"\xE3\x8E\xBD"	=> "\x6D\x77",
-		"\xE3\x8E\xBE"	=> "\x6B\x77",
-		"\xE3\x8E\xBF"	=> "\x6D\x77",
-		"\xE3\x8F\x80"	=> "\x6B\xCF\x89",
-		"\xE3\x8F\x81"	=> "\x6D\xCF\x89",
-		"\xE3\x8F\x83"	=> "\x62\x71",
-		"\xE3\x8F\x86"	=> "\x63\xE2\x88\x95\x6B\x67",
-		"\xE3\x8F\x87"	=> "\x63\x6F\x2E",
-		"\xE3\x8F\x88"	=> "\x64\x62",
-		"\xE3\x8F\x89"	=> "\x67\x79",
-		"\xE3\x8F\x8B"	=> "\x68\x70",
-		"\xE3\x8F\x8D"	=> "\x6B\x6B",
-		"\xE3\x8F\x8E"	=> "\x6B\x6D",
-		"\xE3\x8F\x97"	=> "\x70\x68",
-		"\xE3\x8F\x99"	=> "\x70\x70\x6D",
-		"\xE3\x8F\x9A"	=> "\x70\x72",
-		"\xE3\x8F\x9C"	=> "\x73\x76",
-		"\xE3\x8F\x9D"	=> "\x77\x62",
-		"\xE3\x8F\x9E"	=> "\x76\xE2\x88\x95\x6D",
-		"\xE3\x8F\x9F"	=> "\x61\xE2\x88\x95\x6D",
-		"\xF0\x9D\x90\x80"	=> "\x61",
-		"\xF0\x9D\x90\x81"	=> "\x62",
-		"\xF0\x9D\x90\x82"	=> "\x63",
-		"\xF0\x9D\x90\x83"	=> "\x64",
-		"\xF0\x9D\x90\x84"	=> "\x65",
-		"\xF0\x9D\x90\x85"	=> "\x66",
-		"\xF0\x9D\x90\x86"	=> "\x67",
-		"\xF0\x9D\x90\x87"	=> "\x68",
-		"\xF0\x9D\x90\x88"	=> "\x69",
-		"\xF0\x9D\x90\x89"	=> "\x6A",
-		"\xF0\x9D\x90\x8A"	=> "\x6B",
-		"\xF0\x9D\x90\x8B"	=> "\x6C",
-		"\xF0\x9D\x90\x8C"	=> "\x6D",
-		"\xF0\x9D\x90\x8D"	=> "\x6E",
-		"\xF0\x9D\x90\x8E"	=> "\x6F",
-		"\xF0\x9D\x90\x8F"	=> "\x70",
-		"\xF0\x9D\x90\x90"	=> "\x71",
-		"\xF0\x9D\x90\x91"	=> "\x72",
-		"\xF0\x9D\x90\x92"	=> "\x73",
-		"\xF0\x9D\x90\x93"	=> "\x74",
-		"\xF0\x9D\x90\x94"	=> "\x75",
-		"\xF0\x9D\x90\x95"	=> "\x76",
-		"\xF0\x9D\x90\x96"	=> "\x77",
-		"\xF0\x9D\x90\x97"	=> "\x78",
-		"\xF0\x9D\x90\x98"	=> "\x79",
-		"\xF0\x9D\x90\x99"	=> "\x7A",
-		"\xF0\x9D\x90\xB4"	=> "\x61",
-		"\xF0\x9D\x90\xB5"	=> "\x62",
-		"\xF0\x9D\x90\xB6"	=> "\x63",
-		"\xF0\x9D\x90\xB7"	=> "\x64",
-		"\xF0\x9D\x90\xB8"	=> "\x65",
-		"\xF0\x9D\x90\xB9"	=> "\x66",
-		"\xF0\x9D\x90\xBA"	=> "\x67",
-		"\xF0\x9D\x90\xBB"	=> "\x68",
-		"\xF0\x9D\x90\xBC"	=> "\x69",
-		"\xF0\x9D\x90\xBD"	=> "\x6A",
-		"\xF0\x9D\x90\xBE"	=> "\x6B",
-		"\xF0\x9D\x90\xBF"	=> "\x6C",
-		"\xF0\x9D\x91\x80"	=> "\x6D",
-		"\xF0\x9D\x91\x81"	=> "\x6E",
-		"\xF0\x9D\x91\x82"	=> "\x6F",
-		"\xF0\x9D\x91\x83"	=> "\x70",
-		"\xF0\x9D\x91\x84"	=> "\x71",
-		"\xF0\x9D\x91\x85"	=> "\x72",
-		"\xF0\x9D\x91\x86"	=> "\x73",
-		"\xF0\x9D\x91\x87"	=> "\x74",
-		"\xF0\x9D\x91\x88"	=> "\x75",
-		"\xF0\x9D\x91\x89"	=> "\x76",
-		"\xF0\x9D\x91\x8A"	=> "\x77",
-		"\xF0\x9D\x91\x8B"	=> "\x78",
-		"\xF0\x9D\x91\x8C"	=> "\x79",
-		"\xF0\x9D\x91\x8D"	=> "\x7A",
-		"\xF0\x9D\x91\xA8"	=> "\x61",
-		"\xF0\x9D\x91\xA9"	=> "\x62",
-		"\xF0\x9D\x91\xAA"	=> "\x63",
-		"\xF0\x9D\x91\xAB"	=> "\x64",
-		"\xF0\x9D\x91\xAC"	=> "\x65",
-		"\xF0\x9D\x91\xAD"	=> "\x66",
-		"\xF0\x9D\x91\xAE"	=> "\x67",
-		"\xF0\x9D\x91\xAF"	=> "\x68",
-		"\xF0\x9D\x91\xB0"	=> "\x69",
-		"\xF0\x9D\x91\xB1"	=> "\x6A",
-		"\xF0\x9D\x91\xB2"	=> "\x6B",
-		"\xF0\x9D\x91\xB3"	=> "\x6C",
-		"\xF0\x9D\x91\xB4"	=> "\x6D",
-		"\xF0\x9D\x91\xB5"	=> "\x6E",
-		"\xF0\x9D\x91\xB6"	=> "\x6F",
-		"\xF0\x9D\x91\xB7"	=> "\x70",
-		"\xF0\x9D\x91\xB8"	=> "\x71",
-		"\xF0\x9D\x91\xB9"	=> "\x72",
-		"\xF0\x9D\x91\xBA"	=> "\x73",
-		"\xF0\x9D\x91\xBB"	=> "\x74",
-		"\xF0\x9D\x91\xBC"	=> "\x75",
-		"\xF0\x9D\x91\xBD"	=> "\x76",
-		"\xF0\x9D\x91\xBE"	=> "\x77",
-		"\xF0\x9D\x91\xBF"	=> "\x78",
-		"\xF0\x9D\x92\x80"	=> "\x79",
-		"\xF0\x9D\x92\x81"	=> "\x7A",
-		"\xF0\x9D\x92\x9C"	=> "\x61",
-		"\xF0\x9D\x92\x9E"	=> "\x63",
-		"\xF0\x9D\x92\x9F"	=> "\x64",
-		"\xF0\x9D\x92\xA2"	=> "\x67",
-		"\xF0\x9D\x92\xA5"	=> "\x6A",
-		"\xF0\x9D\x92\xA6"	=> "\x6B",
-		"\xF0\x9D\x92\xA9"	=> "\x6E",
-		"\xF0\x9D\x92\xAA"	=> "\x6F",
-		"\xF0\x9D\x92\xAB"	=> "\x70",
-		"\xF0\x9D\x92\xAC"	=> "\x71",
-		"\xF0\x9D\x92\xAE"	=> "\x73",
-		"\xF0\x9D\x92\xAF"	=> "\x74",
-		"\xF0\x9D\x92\xB0"	=> "\x75",
-		"\xF0\x9D\x92\xB1"	=> "\x76",
-		"\xF0\x9D\x92\xB2"	=> "\x77",
-		"\xF0\x9D\x92\xB3"	=> "\x78",
-		"\xF0\x9D\x92\xB4"	=> "\x79",
-		"\xF0\x9D\x92\xB5"	=> "\x7A",
-		"\xF0\x9D\x93\x90"	=> "\x61",
-		"\xF0\x9D\x93\x91"	=> "\x62",
-		"\xF0\x9D\x93\x92"	=> "\x63",
-		"\xF0\x9D\x93\x93"	=> "\x64",
-		"\xF0\x9D\x93\x94"	=> "\x65",
-		"\xF0\x9D\x93\x95"	=> "\x66",
-		"\xF0\x9D\x93\x96"	=> "\x67",
-		"\xF0\x9D\x93\x97"	=> "\x68",
-		"\xF0\x9D\x93\x98"	=> "\x69",
-		"\xF0\x9D\x93\x99"	=> "\x6A",
-		"\xF0\x9D\x93\x9A"	=> "\x6B",
-		"\xF0\x9D\x93\x9B"	=> "\x6C",
-		"\xF0\x9D\x93\x9C"	=> "\x6D",
-		"\xF0\x9D\x93\x9D"	=> "\x6E",
-		"\xF0\x9D\x93\x9E"	=> "\x6F",
-		"\xF0\x9D\x93\x9F"	=> "\x70",
-		"\xF0\x9D\x93\xA0"	=> "\x71",
-		"\xF0\x9D\x93\xA1"	=> "\x72",
-		"\xF0\x9D\x93\xA2"	=> "\x73",
-		"\xF0\x9D\x93\xA3"	=> "\x74",
-		"\xF0\x9D\x93\xA4"	=> "\x75",
-		"\xF0\x9D\x93\xA5"	=> "\x76",
-		"\xF0\x9D\x93\xA6"	=> "\x77",
-		"\xF0\x9D\x93\xA7"	=> "\x78",
-		"\xF0\x9D\x93\xA8"	=> "\x79",
-		"\xF0\x9D\x93\xA9"	=> "\x7A",
-		"\xF0\x9D\x94\x84"	=> "\x61",
-		"\xF0\x9D\x94\x85"	=> "\x62",
-		"\xF0\x9D\x94\x87"	=> "\x64",
-		"\xF0\x9D\x94\x88"	=> "\x65",
-		"\xF0\x9D\x94\x89"	=> "\x66",
-		"\xF0\x9D\x94\x8A"	=> "\x67",
-		"\xF0\x9D\x94\x8D"	=> "\x6A",
-		"\xF0\x9D\x94\x8E"	=> "\x6B",
-		"\xF0\x9D\x94\x8F"	=> "\x6C",
-		"\xF0\x9D\x94\x90"	=> "\x6D",
-		"\xF0\x9D\x94\x91"	=> "\x6E",
-		"\xF0\x9D\x94\x92"	=> "\x6F",
-		"\xF0\x9D\x94\x93"	=> "\x70",
-		"\xF0\x9D\x94\x94"	=> "\x71",
-		"\xF0\x9D\x94\x96"	=> "\x73",
-		"\xF0\x9D\x94\x97"	=> "\x74",
-		"\xF0\x9D\x94\x98"	=> "\x75",
-		"\xF0\x9D\x94\x99"	=> "\x76",
-		"\xF0\x9D\x94\x9A"	=> "\x77",
-		"\xF0\x9D\x94\x9B"	=> "\x78",
-		"\xF0\x9D\x94\x9C"	=> "\x79",
-		"\xF0\x9D\x94\xB8"	=> "\x61",
-		"\xF0\x9D\x94\xB9"	=> "\x62",
-		"\xF0\x9D\x94\xBB"	=> "\x64",
-		"\xF0\x9D\x94\xBC"	=> "\x65",
-		"\xF0\x9D\x94\xBD"	=> "\x66",
-		"\xF0\x9D\x94\xBE"	=> "\x67",
-		"\xF0\x9D\x95\x80"	=> "\x69",
-		"\xF0\x9D\x95\x81"	=> "\x6A",
-		"\xF0\x9D\x95\x82"	=> "\x6B",
-		"\xF0\x9D\x95\x83"	=> "\x6C",
-		"\xF0\x9D\x95\x84"	=> "\x6D",
-		"\xF0\x9D\x95\x86"	=> "\x6F",
-		"\xF0\x9D\x95\x8A"	=> "\x73",
-		"\xF0\x9D\x95\x8B"	=> "\x74",
-		"\xF0\x9D\x95\x8C"	=> "\x75",
-		"\xF0\x9D\x95\x8D"	=> "\x76",
-		"\xF0\x9D\x95\x8E"	=> "\x77",
-		"\xF0\x9D\x95\x8F"	=> "\x78",
-		"\xF0\x9D\x95\x90"	=> "\x79",
-		"\xF0\x9D\x95\xAC"	=> "\x61",
-		"\xF0\x9D\x95\xAD"	=> "\x62",
-		"\xF0\x9D\x95\xAE"	=> "\x63",
-		"\xF0\x9D\x95\xAF"	=> "\x64",
-		"\xF0\x9D\x95\xB0"	=> "\x65",
-		"\xF0\x9D\x95\xB1"	=> "\x66",
-		"\xF0\x9D\x95\xB2"	=> "\x67",
-		"\xF0\x9D\x95\xB3"	=> "\x68",
-		"\xF0\x9D\x95\xB4"	=> "\x69",
-		"\xF0\x9D\x95\xB5"	=> "\x6A",
-		"\xF0\x9D\x95\xB6"	=> "\x6B",
-		"\xF0\x9D\x95\xB7"	=> "\x6C",
-		"\xF0\x9D\x95\xB8"	=> "\x6D",
-		"\xF0\x9D\x95\xB9"	=> "\x6E",
-		"\xF0\x9D\x95\xBA"	=> "\x6F",
-		"\xF0\x9D\x95\xBB"	=> "\x70",
-		"\xF0\x9D\x95\xBC"	=> "\x71",
-		"\xF0\x9D\x95\xBD"	=> "\x72",
-		"\xF0\x9D\x95\xBE"	=> "\x73",
-		"\xF0\x9D\x95\xBF"	=> "\x74",
-		"\xF0\x9D\x96\x80"	=> "\x75",
-		"\xF0\x9D\x96\x81"	=> "\x76",
-		"\xF0\x9D\x96\x82"	=> "\x77",
-		"\xF0\x9D\x96\x83"	=> "\x78",
-		"\xF0\x9D\x96\x84"	=> "\x79",
-		"\xF0\x9D\x96\x85"	=> "\x7A",
-		"\xF0\x9D\x96\xA0"	=> "\x61",
-		"\xF0\x9D\x96\xA1"	=> "\x62",
-		"\xF0\x9D\x96\xA2"	=> "\x63",
-		"\xF0\x9D\x96\xA3"	=> "\x64",
-		"\xF0\x9D\x96\xA4"	=> "\x65",
-		"\xF0\x9D\x96\xA5"	=> "\x66",
-		"\xF0\x9D\x96\xA6"	=> "\x67",
-		"\xF0\x9D\x96\xA7"	=> "\x68",
-		"\xF0\x9D\x96\xA8"	=> "\x69",
-		"\xF0\x9D\x96\xA9"	=> "\x6A",
-		"\xF0\x9D\x96\xAA"	=> "\x6B",
-		"\xF0\x9D\x96\xAB"	=> "\x6C",
-		"\xF0\x9D\x96\xAC"	=> "\x6D",
-		"\xF0\x9D\x96\xAD"	=> "\x6E",
-		"\xF0\x9D\x96\xAE"	=> "\x6F",
-		"\xF0\x9D\x96\xAF"	=> "\x70",
-		"\xF0\x9D\x96\xB0"	=> "\x71",
-		"\xF0\x9D\x96\xB1"	=> "\x72",
-		"\xF0\x9D\x96\xB2"	=> "\x73",
-		"\xF0\x9D\x96\xB3"	=> "\x74",
-		"\xF0\x9D\x96\xB4"	=> "\x75",
-		"\xF0\x9D\x96\xB5"	=> "\x76",
-		"\xF0\x9D\x96\xB6"	=> "\x77",
-		"\xF0\x9D\x96\xB7"	=> "\x78",
-		"\xF0\x9D\x96\xB8"	=> "\x79",
-		"\xF0\x9D\x96\xB9"	=> "\x7A",
-		"\xF0\x9D\x97\x94"	=> "\x61",
-		"\xF0\x9D\x97\x95"	=> "\x62",
-		"\xF0\x9D\x97\x96"	=> "\x63",
-		"\xF0\x9D\x97\x97"	=> "\x64",
-		"\xF0\x9D\x97\x98"	=> "\x65",
-		"\xF0\x9D\x97\x99"	=> "\x66",
-		"\xF0\x9D\x97\x9A"	=> "\x67",
-		"\xF0\x9D\x97\x9B"	=> "\x68",
-		"\xF0\x9D\x97\x9C"	=> "\x69",
-		"\xF0\x9D\x97\x9D"	=> "\x6A",
-		"\xF0\x9D\x97\x9E"	=> "\x6B",
-		"\xF0\x9D\x97\x9F"	=> "\x6C",
-		"\xF0\x9D\x97\xA0"	=> "\x6D",
-		"\xF0\x9D\x97\xA1"	=> "\x6E",
-		"\xF0\x9D\x97\xA2"	=> "\x6F",
-		"\xF0\x9D\x97\xA3"	=> "\x70",
-		"\xF0\x9D\x97\xA4"	=> "\x71",
-		"\xF0\x9D\x97\xA5"	=> "\x72",
-		"\xF0\x9D\x97\xA6"	=> "\x73",
-		"\xF0\x9D\x97\xA7"	=> "\x74",
-		"\xF0\x9D\x97\xA8"	=> "\x75",
-		"\xF0\x9D\x97\xA9"	=> "\x76",
-		"\xF0\x9D\x97\xAA"	=> "\x77",
-		"\xF0\x9D\x97\xAB"	=> "\x78",
-		"\xF0\x9D\x97\xAC"	=> "\x79",
-		"\xF0\x9D\x97\xAD"	=> "\x7A",
-		"\xF0\x9D\x98\x88"	=> "\x61",
-		"\xF0\x9D\x98\x89"	=> "\x62",
-		"\xF0\x9D\x98\x8A"	=> "\x63",
-		"\xF0\x9D\x98\x8B"	=> "\x64",
-		"\xF0\x9D\x98\x8C"	=> "\x65",
-		"\xF0\x9D\x98\x8D"	=> "\x66",
-		"\xF0\x9D\x98\x8E"	=> "\x67",
-		"\xF0\x9D\x98\x8F"	=> "\x68",
-		"\xF0\x9D\x98\x90"	=> "\x69",
-		"\xF0\x9D\x98\x91"	=> "\x6A",
-		"\xF0\x9D\x98\x92"	=> "\x6B",
-		"\xF0\x9D\x98\x93"	=> "\x6C",
-		"\xF0\x9D\x98\x94"	=> "\x6D",
-		"\xF0\x9D\x98\x95"	=> "\x6E",
-		"\xF0\x9D\x98\x96"	=> "\x6F",
-		"\xF0\x9D\x98\x97"	=> "\x70",
-		"\xF0\x9D\x98\x98"	=> "\x71",
-		"\xF0\x9D\x98\x99"	=> "\x72",
-		"\xF0\x9D\x98\x9A"	=> "\x73",
-		"\xF0\x9D\x98\x9B"	=> "\x74",
-		"\xF0\x9D\x98\x9C"	=> "\x75",
-		"\xF0\x9D\x98\x9D"	=> "\x76",
-		"\xF0\x9D\x98\x9E"	=> "\x77",
-		"\xF0\x9D\x98\x9F"	=> "\x78",
-		"\xF0\x9D\x98\xA0"	=> "\x79",
-		"\xF0\x9D\x98\xA1"	=> "\x7A",
-		"\xF0\x9D\x98\xBC"	=> "\x61",
-		"\xF0\x9D\x98\xBD"	=> "\x62",
-		"\xF0\x9D\x98\xBE"	=> "\x63",
-		"\xF0\x9D\x98\xBF"	=> "\x64",
-		"\xF0\x9D\x99\x80"	=> "\x65",
-		"\xF0\x9D\x99\x81"	=> "\x66",
-		"\xF0\x9D\x99\x82"	=> "\x67",
-		"\xF0\x9D\x99\x83"	=> "\x68",
-		"\xF0\x9D\x99\x84"	=> "\x69",
-		"\xF0\x9D\x99\x85"	=> "\x6A",
-		"\xF0\x9D\x99\x86"	=> "\x6B",
-		"\xF0\x9D\x99\x87"	=> "\x6C",
-		"\xF0\x9D\x99\x88"	=> "\x6D",
-		"\xF0\x9D\x99\x89"	=> "\x6E",
-		"\xF0\x9D\x99\x8A"	=> "\x6F",
-		"\xF0\x9D\x99\x8B"	=> "\x70",
-		"\xF0\x9D\x99\x8C"	=> "\x71",
-		"\xF0\x9D\x99\x8D"	=> "\x72",
-		"\xF0\x9D\x99\x8E"	=> "\x73",
-		"\xF0\x9D\x99\x8F"	=> "\x74",
-		"\xF0\x9D\x99\x90"	=> "\x75",
-		"\xF0\x9D\x99\x91"	=> "\x76",
-		"\xF0\x9D\x99\x92"	=> "\x77",
-		"\xF0\x9D\x99\x93"	=> "\x78",
-		"\xF0\x9D\x99\x94"	=> "\x79",
-		"\xF0\x9D\x99\x95"	=> "\x7A",
-		"\xF0\x9D\x99\xB0"	=> "\x61",
-		"\xF0\x9D\x99\xB1"	=> "\x62",
-		"\xF0\x9D\x99\xB2"	=> "\x63",
-		"\xF0\x9D\x99\xB3"	=> "\x64",
-		"\xF0\x9D\x99\xB4"	=> "\x65",
-		"\xF0\x9D\x99\xB5"	=> "\x66",
-		"\xF0\x9D\x99\xB6"	=> "\x67",
-		"\xF0\x9D\x99\xB7"	=> "\x68",
-		"\xF0\x9D\x99\xB8"	=> "\x69",
-		"\xF0\x9D\x99\xB9"	=> "\x6A",
-		"\xF0\x9D\x99\xBA"	=> "\x6B",
-		"\xF0\x9D\x99\xBB"	=> "\x6C",
-		"\xF0\x9D\x99\xBC"	=> "\x6D",
-		"\xF0\x9D\x99\xBD"	=> "\x6E",
-		"\xF0\x9D\x99\xBE"	=> "\x6F",
-		"\xF0\x9D\x99\xBF"	=> "\x70",
-		"\xF0\x9D\x9A\x80"	=> "\x71",
-		"\xF0\x9D\x9A\x81"	=> "\x72",
-		"\xF0\x9D\x9A\x82"	=> "\x73",
-		"\xF0\x9D\x9A\x83"	=> "\x74",
-		"\xF0\x9D\x9A\x84"	=> "\x75",
-		"\xF0\x9D\x9A\x85"	=> "\x76",
-		"\xF0\x9D\x9A\x86"	=> "\x77",
-		"\xF0\x9D\x9A\x87"	=> "\x78",
-		"\xF0\x9D\x9A\x88"	=> "\x79",
-		"\xF0\x9D\x9A\x89"	=> "\x7A",
-		"\xF0\x9D\x9A\xA8"	=> "\xCE\xB1",
-		"\xF0\x9D\x9A\xA9"	=> "\xCE\xB2",
-		"\xF0\x9D\x9A\xAA"	=> "\xCE\xB3",
-		"\xF0\x9D\x9A\xAB"	=> "\xCE\xB4",
-		"\xF0\x9D\x9A\xAC"	=> "\xCE\xB5",
-		"\xF0\x9D\x9A\xAD"	=> "\xCE\xB6",
-		"\xF0\x9D\x9A\xAE"	=> "\xCE\xB7",
-		"\xF0\x9D\x9A\xAF"	=> "\xCE\xB8",
-		"\xF0\x9D\x9A\xB0"	=> "\xCE\xB9",
-		"\xF0\x9D\x9A\xB1"	=> "\xCE\xBA",
-		"\xF0\x9D\x9A\xB2"	=> "\xCE\xBB",
-		"\xF0\x9D\x9A\xB3"	=> "\xCE\xBC",
-		"\xF0\x9D\x9A\xB4"	=> "\xCE\xBD",
-		"\xF0\x9D\x9A\xB5"	=> "\xCE\xBE",
-		"\xF0\x9D\x9A\xB6"	=> "\xCE\xBF",
-		"\xF0\x9D\x9A\xB7"	=> "\xCF\x80",
-		"\xF0\x9D\x9A\xB8"	=> "\xCF\x81",
-		"\xF0\x9D\x9A\xB9"	=> "\xCE\xB8",
-		"\xF0\x9D\x9A\xBA"	=> "\xCF\x83",
-		"\xF0\x9D\x9A\xBB"	=> "\xCF\x84",
-		"\xF0\x9D\x9A\xBC"	=> "\xCF\x85",
-		"\xF0\x9D\x9A\xBD"	=> "\xCF\x86",
-		"\xF0\x9D\x9A\xBE"	=> "\xCF\x87",
-		"\xF0\x9D\x9A\xBF"	=> "\xCF\x88",
-		"\xF0\x9D\x9B\x80"	=> "\xCF\x89",
-		"\xF0\x9D\x9B\x93"	=> "\xCF\x83",
-		"\xF0\x9D\x9B\xA2"	=> "\xCE\xB1",
-		"\xF0\x9D\x9B\xA3"	=> "\xCE\xB2",
-		"\xF0\x9D\x9B\xA4"	=> "\xCE\xB3",
-		"\xF0\x9D\x9B\xA5"	=> "\xCE\xB4",
-		"\xF0\x9D\x9B\xA6"	=> "\xCE\xB5",
-		"\xF0\x9D\x9B\xA7"	=> "\xCE\xB6",
-		"\xF0\x9D\x9B\xA8"	=> "\xCE\xB7",
-		"\xF0\x9D\x9B\xA9"	=> "\xCE\xB8",
-		"\xF0\x9D\x9B\xAA"	=> "\xCE\xB9",
-		"\xF0\x9D\x9B\xAB"	=> "\xCE\xBA",
-		"\xF0\x9D\x9B\xAC"	=> "\xCE\xBB",
-		"\xF0\x9D\x9B\xAD"	=> "\xCE\xBC",
-		"\xF0\x9D\x9B\xAE"	=> "\xCE\xBD",
-		"\xF0\x9D\x9B\xAF"	=> "\xCE\xBE",
-		"\xF0\x9D\x9B\xB0"	=> "\xCE\xBF",
-		"\xF0\x9D\x9B\xB1"	=> "\xCF\x80",
-		"\xF0\x9D\x9B\xB2"	=> "\xCF\x81",
-		"\xF0\x9D\x9B\xB3"	=> "\xCE\xB8",
-		"\xF0\x9D\x9B\xB4"	=> "\xCF\x83",
-		"\xF0\x9D\x9B\xB5"	=> "\xCF\x84",
-		"\xF0\x9D\x9B\xB6"	=> "\xCF\x85",
-		"\xF0\x9D\x9B\xB7"	=> "\xCF\x86",
-		"\xF0\x9D\x9B\xB8"	=> "\xCF\x87",
-		"\xF0\x9D\x9B\xB9"	=> "\xCF\x88",
-		"\xF0\x9D\x9B\xBA"	=> "\xCF\x89",
-		"\xF0\x9D\x9C\x8D"	=> "\xCF\x83",
-		"\xF0\x9D\x9C\x9C"	=> "\xCE\xB1",
-		"\xF0\x9D\x9C\x9D"	=> "\xCE\xB2",
-		"\xF0\x9D\x9C\x9E"	=> "\xCE\xB3",
-		"\xF0\x9D\x9C\x9F"	=> "\xCE\xB4",
-		"\xF0\x9D\x9C\xA0"	=> "\xCE\xB5",
-		"\xF0\x9D\x9C\xA1"	=> "\xCE\xB6",
-		"\xF0\x9D\x9C\xA2"	=> "\xCE\xB7",
-		"\xF0\x9D\x9C\xA3"	=> "\xCE\xB8",
-		"\xF0\x9D\x9C\xA4"	=> "\xCE\xB9",
-		"\xF0\x9D\x9C\xA5"	=> "\xCE\xBA",
-		"\xF0\x9D\x9C\xA6"	=> "\xCE\xBB",
-		"\xF0\x9D\x9C\xA7"	=> "\xCE\xBC",
-		"\xF0\x9D\x9C\xA8"	=> "\xCE\xBD",
-		"\xF0\x9D\x9C\xA9"	=> "\xCE\xBE",
-		"\xF0\x9D\x9C\xAA"	=> "\xCE\xBF",
-		"\xF0\x9D\x9C\xAB"	=> "\xCF\x80",
-		"\xF0\x9D\x9C\xAC"	=> "\xCF\x81",
-		"\xF0\x9D\x9C\xAD"	=> "\xCE\xB8",
-		"\xF0\x9D\x9C\xAE"	=> "\xCF\x83",
-		"\xF0\x9D\x9C\xAF"	=> "\xCF\x84",
-		"\xF0\x9D\x9C\xB0"	=> "\xCF\x85",
-		"\xF0\x9D\x9C\xB1"	=> "\xCF\x86",
-		"\xF0\x9D\x9C\xB2"	=> "\xCF\x87",
-		"\xF0\x9D\x9C\xB3"	=> "\xCF\x88",
-		"\xF0\x9D\x9C\xB4"	=> "\xCF\x89",
-		"\xF0\x9D\x9D\x87"	=> "\xCF\x83",
-		"\xF0\x9D\x9D\x96"	=> "\xCE\xB1",
-		"\xF0\x9D\x9D\x97"	=> "\xCE\xB2",
-		"\xF0\x9D\x9D\x98"	=> "\xCE\xB3",
-		"\xF0\x9D\x9D\x99"	=> "\xCE\xB4",
-		"\xF0\x9D\x9D\x9A"	=> "\xCE\xB5",
-		"\xF0\x9D\x9D\x9B"	=> "\xCE\xB6",
-		"\xF0\x9D\x9D\x9C"	=> "\xCE\xB7",
-		"\xF0\x9D\x9D\x9D"	=> "\xCE\xB8",
-		"\xF0\x9D\x9D\x9E"	=> "\xCE\xB9",
-		"\xF0\x9D\x9D\x9F"	=> "\xCE\xBA",
-		"\xF0\x9D\x9D\xA0"	=> "\xCE\xBB",
-		"\xF0\x9D\x9D\xA1"	=> "\xCE\xBC",
-		"\xF0\x9D\x9D\xA2"	=> "\xCE\xBD",
-		"\xF0\x9D\x9D\xA3"	=> "\xCE\xBE",
-		"\xF0\x9D\x9D\xA4"	=> "\xCE\xBF",
-		"\xF0\x9D\x9D\xA5"	=> "\xCF\x80",
-		"\xF0\x9D\x9D\xA6"	=> "\xCF\x81",
-		"\xF0\x9D\x9D\xA7"	=> "\xCE\xB8",
-		"\xF0\x9D\x9D\xA8"	=> "\xCF\x83",
-		"\xF0\x9D\x9D\xA9"	=> "\xCF\x84",
-		"\xF0\x9D\x9D\xAA"	=> "\xCF\x85",
-		"\xF0\x9D\x9D\xAB"	=> "\xCF\x86",
-		"\xF0\x9D\x9D\xAC"	=> "\xCF\x87",
-		"\xF0\x9D\x9D\xAD"	=> "\xCF\x88",
-		"\xF0\x9D\x9D\xAE"	=> "\xCF\x89",
-		"\xF0\x9D\x9E\x81"	=> "\xCF\x83",
-		"\xF0\x9D\x9E\x90"	=> "\xCE\xB1",
-		"\xF0\x9D\x9E\x91"	=> "\xCE\xB2",
-		"\xF0\x9D\x9E\x92"	=> "\xCE\xB3",
-		"\xF0\x9D\x9E\x93"	=> "\xCE\xB4",
-		"\xF0\x9D\x9E\x94"	=> "\xCE\xB5",
-		"\xF0\x9D\x9E\x95"	=> "\xCE\xB6",
-		"\xF0\x9D\x9E\x96"	=> "\xCE\xB7",
-		"\xF0\x9D\x9E\x97"	=> "\xCE\xB8",
-		"\xF0\x9D\x9E\x98"	=> "\xCE\xB9",
-		"\xF0\x9D\x9E\x99"	=> "\xCE\xBA",
-		"\xF0\x9D\x9E\x9A"	=> "\xCE\xBB",
-		"\xF0\x9D\x9E\x9B"	=> "\xCE\xBC",
-		"\xF0\x9D\x9E\x9C"	=> "\xCE\xBD",
-		"\xF0\x9D\x9E\x9D"	=> "\xCE\xBE",
-		"\xF0\x9D\x9E\x9E"	=> "\xCE\xBF",
-		"\xF0\x9D\x9E\x9F"	=> "\xCF\x80",
-		"\xF0\x9D\x9E\xA0"	=> "\xCF\x81",
-		"\xF0\x9D\x9E\xA1"	=> "\xCE\xB8",
-		"\xF0\x9D\x9E\xA2"	=> "\xCF\x83",
-		"\xF0\x9D\x9E\xA3"	=> "\xCF\x84",
-		"\xF0\x9D\x9E\xA4"	=> "\xCF\x85",
-		"\xF0\x9D\x9E\xA5"	=> "\xCF\x86",
-		"\xF0\x9D\x9E\xA6"	=> "\xCF\x87",
-		"\xF0\x9D\x9E\xA7"	=> "\xCF\x88",
-		"\xF0\x9D\x9E\xA8"	=> "\xCF\x89",
-		"\xF0\x9D\x9E\xBB"	=> "\xCF\x83",
-		"\xF0\x9D\x9F\x8A"	=> "\xCF\x9D",
-	);
-
-	// do the case fold
-	$text = utf8_case_fold($text, $option);
-
-	if (!class_exists('utf_normalizer'))
-	{
-		include(PHPBB_ROOT_PATH . 'includes/utf/utf_normalizer.' . PHP_EXT);
-	}
-
-	// convert to NFKC
-	utf_normalizer::nfkc($text);
-
-	// FC_NFKC_Closure, http://www.unicode.org/Public/5.0.0/ucd/DerivedNormalizationProps.txt
-	$text = strtr($text, $fc_nfkc_closure);
-
-	return $text;
-}
-
-/**
-* Assume the input is NFC:
-* Takes the input and does a "special" case fold. It does minor normalization as well.
-*
-* @param	string	$text	text to be case folded
-* @param	string	$option	determines how we will fold the cases
-* @return	string			case folded text
-*/
-function utf8_case_fold_nfc($text, $option = 'full')
-{
-	static $uniarray = array();
-	static $ypogegrammeni = array(
-		"\xCD\xBA"		=> "\x20\xCD\x85",
-		"\xE1\xBE\x80"	=> "\xE1\xBC\x80\xCD\x85",
-		"\xE1\xBE\x81"	=> "\xE1\xBC\x81\xCD\x85",
-		"\xE1\xBE\x82"	=> "\xE1\xBC\x82\xCD\x85",
-		"\xE1\xBE\x83"	=> "\xE1\xBC\x83\xCD\x85",
-		"\xE1\xBE\x84"	=> "\xE1\xBC\x84\xCD\x85",
-		"\xE1\xBE\x85"	=> "\xE1\xBC\x85\xCD\x85",
-		"\xE1\xBE\x86"	=> "\xE1\xBC\x86\xCD\x85",
-		"\xE1\xBE\x87"	=> "\xE1\xBC\x87\xCD\x85",
-		"\xE1\xBE\x88"	=> "\xE1\xBC\x88\xCD\x85",
-		"\xE1\xBE\x89"	=> "\xE1\xBC\x89\xCD\x85",
-		"\xE1\xBE\x8A"	=> "\xE1\xBC\x8A\xCD\x85",
-		"\xE1\xBE\x8B"	=> "\xE1\xBC\x8B\xCD\x85",
-		"\xE1\xBE\x8C"	=> "\xE1\xBC\x8C\xCD\x85",
-		"\xE1\xBE\x8D"	=> "\xE1\xBC\x8D\xCD\x85",
-		"\xE1\xBE\x8E"	=> "\xE1\xBC\x8E\xCD\x85",
-		"\xE1\xBE\x8F"	=> "\xE1\xBC\x8F\xCD\x85",
-		"\xE1\xBE\x90"	=> "\xE1\xBC\xA0\xCD\x85",
-		"\xE1\xBE\x91"	=> "\xE1\xBC\xA1\xCD\x85",
-		"\xE1\xBE\x92"	=> "\xE1\xBC\xA2\xCD\x85",
-		"\xE1\xBE\x93"	=> "\xE1\xBC\xA3\xCD\x85",
-		"\xE1\xBE\x94"	=> "\xE1\xBC\xA4\xCD\x85",
-		"\xE1\xBE\x95"	=> "\xE1\xBC\xA5\xCD\x85",
-		"\xE1\xBE\x96"	=> "\xE1\xBC\xA6\xCD\x85",
-		"\xE1\xBE\x97"	=> "\xE1\xBC\xA7\xCD\x85",
-		"\xE1\xBE\x98"	=> "\xE1\xBC\xA8\xCD\x85",
-		"\xE1\xBE\x99"	=> "\xE1\xBC\xA9\xCD\x85",
-		"\xE1\xBE\x9A"	=> "\xE1\xBC\xAA\xCD\x85",
-		"\xE1\xBE\x9B"	=> "\xE1\xBC\xAB\xCD\x85",
-		"\xE1\xBE\x9C"	=> "\xE1\xBC\xAC\xCD\x85",
-		"\xE1\xBE\x9D"	=> "\xE1\xBC\xAD\xCD\x85",
-		"\xE1\xBE\x9E"	=> "\xE1\xBC\xAE\xCD\x85",
-		"\xE1\xBE\x9F"	=> "\xE1\xBC\xAF\xCD\x85",
-		"\xE1\xBE\xA0"	=> "\xE1\xBD\xA0\xCD\x85",
-		"\xE1\xBE\xA1"	=> "\xE1\xBD\xA1\xCD\x85",
-		"\xE1\xBE\xA2"	=> "\xE1\xBD\xA2\xCD\x85",
-		"\xE1\xBE\xA3"	=> "\xE1\xBD\xA3\xCD\x85",
-		"\xE1\xBE\xA4"	=> "\xE1\xBD\xA4\xCD\x85",
-		"\xE1\xBE\xA5"	=> "\xE1\xBD\xA5\xCD\x85",
-		"\xE1\xBE\xA6"	=> "\xE1\xBD\xA6\xCD\x85",
-		"\xE1\xBE\xA7"	=> "\xE1\xBD\xA7\xCD\x85",
-		"\xE1\xBE\xA8"	=> "\xE1\xBD\xA8\xCD\x85",
-		"\xE1\xBE\xA9"	=> "\xE1\xBD\xA9\xCD\x85",
-		"\xE1\xBE\xAA"	=> "\xE1\xBD\xAA\xCD\x85",
-		"\xE1\xBE\xAB"	=> "\xE1\xBD\xAB\xCD\x85",
-		"\xE1\xBE\xAC"	=> "\xE1\xBD\xAC\xCD\x85",
-		"\xE1\xBE\xAD"	=> "\xE1\xBD\xAD\xCD\x85",
-		"\xE1\xBE\xAE"	=> "\xE1\xBD\xAE\xCD\x85",
-		"\xE1\xBE\xAF"	=> "\xE1\xBD\xAF\xCD\x85",
-		"\xE1\xBE\xB2"	=> "\xE1\xBD\xB0\xCD\x85",
-		"\xE1\xBE\xB3"	=> "\xCE\xB1\xCD\x85",
-		"\xE1\xBE\xB4"	=> "\xCE\xAC\xCD\x85",
-		"\xE1\xBE\xB7"	=> "\xE1\xBE\xB6\xCD\x85",
-		"\xE1\xBE\xBC"	=> "\xCE\x91\xCD\x85",
-		"\xE1\xBF\x82"	=> "\xE1\xBD\xB4\xCD\x85",
-		"\xE1\xBF\x83"	=> "\xCE\xB7\xCD\x85",
-		"\xE1\xBF\x84"	=> "\xCE\xAE\xCD\x85",
-		"\xE1\xBF\x87"	=> "\xE1\xBF\x86\xCD\x85",
-		"\xE1\xBF\x8C"	=> "\xCE\x97\xCD\x85",
-		"\xE1\xBF\xB2"	=> "\xE1\xBD\xBC\xCD\x85",
-		"\xE1\xBF\xB3"	=> "\xCF\x89\xCD\x85",
-		"\xE1\xBF\xB4"	=> "\xCF\x8E\xCD\x85",
-		"\xE1\xBF\xB7"	=> "\xE1\xBF\xB6\xCD\x85",
-		"\xE1\xBF\xBC"	=> "\xCE\xA9\xCD\x85",
-	);
-
-	// perform a small trick, avoid further normalization on composed points that contain U+0345 in their decomposition
-	$text = strtr($text, $ypogegrammeni);
-
-	// do the case fold
-	$text = utf8_case_fold($text, $option);
-
-	return $text;
-}
-
-/**
-* A wrapper function for the normalizer which takes care of including the class if required and modifies the passed strings
-* to be in NFC (Normalization Form Composition).
-*
-* @todo allow arbitrary array depth
-*
-* @param	mixed	$strings	a string or an array of strings to normalize
-* @return	mixed				the normalized content, preserving array keys if array given.
-*/
-function utf8_normalize_nfc($strings)
-{
-	if (empty($strings))
-	{
-		return $strings;
-	}
-
-	if (!class_exists('utf_normalizer'))
-	{
-		include(PHPBB_ROOT_PATH . 'includes/utf/utf_normalizer.' . PHP_EXT);
-	}
-
-	if (!is_array($strings))
-	{
-		utf_normalizer::nfc($strings);
-	}
-	else if (is_array($strings))
-	{
-		foreach ($strings as $key => $string)
-		{
-			if (is_array($string))
-			{
-				foreach ($string as $_key => $_string)
-				{
-					utf_normalizer::nfc($strings[$key][$_key]);
-				}
-			}
-			else
-			{
-				utf_normalizer::nfc($strings[$key]);
-			}
-		}
-	}
-
-	return $strings;
-}
-
-/**
-* This function is used to generate a "clean" version of a string.
-* Clean means that it is a case insensitive form (case folding) and that it is normalized (NFC).
-* Additionally a homographs of one character are transformed into one specific character (preferably ASCII
-* if it is an ASCII character).
-*
-* Please be aware that if you change something within this function or within
-* functions used here you need to rebuild/update the username_clean column in the users table. And all other
-* columns that store a clean string otherwise you will break this functionality.
-*
-* @param	string	$text	An unclean string, mabye user input (has to be valid UTF-8!)
-* @return	string			Cleaned up version of the input string
-*/
-function utf8_clean_string($text)
-{
-	static $homographs = array();
-
-	if (empty($homographs))
-	{
-		$homographs = include(PHPBB_ROOT_PATH . 'includes/utf/data/confusables.' . PHP_EXT);
-	}
-
-	$text = utf8_case_fold_nfkc($text);
-	$text = strtr($text, $homographs);
-	// Other control characters
-	$text = preg_replace('#[\x00-\x1F\x7F]+|(?:\xC2[\x80-\x9F])+#', '', $text);
-
-	// we need to reduce multiple spaces to a single one
-	$text = preg_replace('# {2,}#', ' ', $text);
-
-	// we can use trim here as all the other space characters should have been turned
-	// into normal ASCII spaces by now
-	return trim($text);
-}
-
-/**
-* A wrapper for htmlspecialchars($value, ENT_COMPAT, 'UTF-8')
-*/
-function utf8_htmlspecialchars($value)
-{
-	return htmlspecialchars($value, ENT_COMPAT, 'UTF-8');
-}
-
-/**
-* Trying to convert returned system message to utf8
-*
-* PHP assumes such messages are ISO-8859-1 so we'll do that too
-* and if it breaks messages we'll blame it on them ;-)
-*/
-function utf8_convert_message($message)
-{
-	// First of all check if conversion is neded at all, as there is no point
-	// in converting ASCII messages from ISO-8859-1 to UTF-8
-	if (!preg_match('/[\x80-\xFF]/', $message))
-	{
-		return utf8_htmlspecialchars($message);
-	}
-
-	// else we need to convert some part of the message
-	return utf8_htmlspecialchars(utf8_encode($message));
-}
-
-/**
-* UTF8-compatible wordwrap replacement
-*
-* @param	string	$string	The input string
-* @param	int		$width	The column width. Defaults to 75.
-* @param	string	$break	The line is broken using the optional break parameter. Defaults to '\n'.
-* @param	bool	$cut	If the cut is set to TRUE, the string is always wrapped at the specified width. So if you have a word that is larger than the given width, it is broken apart.
-*
-* @return	string			the given string wrapped at the specified column.
-*
-*/
-function utf8_wordwrap($string, $width = 75, $break = "\n", $cut = false)
-{
-	// We first need to explode on $break, not destroying existing (intended) breaks
-	$lines = explode($break, $string);
-	$new_lines = array(0 => '');
-	$index = 0;
-
-	foreach ($lines as $line)
-	{
-		$words = explode(' ', $line);
-
-		for ($i = 0, $size = sizeof($words); $i < $size; $i++)
-		{
-			$word = $words[$i];
-
-			// If cut is true we need to cut the word if it is > width chars
-			if ($cut && utf8_strlen($word) > $width)
-			{
-				$words[$i] = utf8_substr($word, $width);
-				$word = utf8_substr($word, 0, $width);
-				$i--;
-			}
-
-			if (utf8_strlen($new_lines[$index] . $word) > $width)
-			{
-				$new_lines[$index] = substr($new_lines[$index], 0, -1);
-				$index++;
-				$new_lines[$index] = '';
-			}
-
-			$new_lines[$index] .= $word . ' ';
-		}
-
-		$new_lines[$index] = substr($new_lines[$index], 0, -1);
-		$index++;
-		$new_lines[$index] = '';
-	}
-
-	unset($new_lines[$index]);
-	return implode($break, $new_lines);
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/index.php b/phpBB/index.php
deleted file mode 100644
index 0b687f6802..0000000000
--- a/phpBB/index.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-*/
-
-/**
-* @ignore
-*/
-define('IN_PHPBB', true);
-if (!defined('PHPBB_ROOT_PATH')) define('PHPBB_ROOT_PATH', './');
-if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-include(PHPBB_ROOT_PATH . 'common.' . PHP_EXT);
-include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-
-// Start session management
-phpbb::$user->session_begin();
-phpbb::$acl->init(phpbb::$user->data);
-phpbb::$user->setup('viewforum');
-
-display_forums('', phpbb::$config['load_moderators']);
-
-// Set some stats, get posts count from forums data if we... hum... retrieve all forums data
-$total_posts	= phpbb::$config['num_posts'];
-$total_topics	= phpbb::$config['num_topics'];
-$total_users	= phpbb::$config['num_users'];
-
-// Grab group details for legend display
-if (phpbb::$acl->acl_gets('a_group', 'a_groupadd', 'a_groupdel'))
-{
-	$sql = 'SELECT group_id, group_name, group_colour, group_type
-		FROM ' . GROUPS_TABLE . '
-		WHERE group_legend = 1
-		ORDER BY group_name ASC';
-}
-else
-{
-	$sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_type
-		FROM ' . GROUPS_TABLE . ' g
-		LEFT JOIN ' . USER_GROUP_TABLE . ' ug
-			ON (
-				g.group_id = ug.group_id
-				AND ug.user_id = ' . phpbb::$user->data['user_id'] . '
-				AND ug.user_pending = 0
-			)
-		WHERE g.group_legend = 1
-			AND (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . phpbb::$user->data['user_id'] . ')
-		ORDER BY g.group_name ASC';
-}
-$result = phpbb::$db->sql_query($sql);
-
-$legend = array();
-while ($row = phpbb::$db->sql_fetchrow($result))
-{
-	$colour_text = ($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . '"' : '';
-	$group_name = ($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name'];
-
-	if ($row['group_name'] == 'BOTS' || (!phpbb::$user->is_guest && !phpbb::$acl->acl_get('u_viewprofile')))
-	{
-		$legend[] = '<span' . $colour_text . '>' . $group_name . '</span>';
-	}
-	else
-	{
-		$legend[] = '<a' . $colour_text . ' href="' . phpbb::$url->append_sid('memberlist', 'mode=group&amp;g=' . $row['group_id']) . '">' . $group_name . '</a>';
-	}
-}
-phpbb::$db->sql_freeresult($result);
-
-$legend = implode(', ', $legend);
-
-// Generate birthday list if required ...
-$birthday_list = '';
-if (phpbb::$config['load_birthdays'] && phpbb::$config['allow_birthdays'])
-{
-	$now = getdate(time() + phpbb::$user->timezone + phpbb::$user->dst - date('Z'));
-	$sql = 'SELECT user_id, username, user_colour, user_birthday
-		FROM ' . USERS_TABLE . "
-		WHERE user_birthday LIKE '" . phpbb::$db->sql_escape(sprintf('%2d-%2d-', $now['mday'], $now['mon'])) . "%'
-			AND user_type IN (" . phpbb::USER_NORMAL . ', ' . phpbb::USER_FOUNDER . ')';
-	$result = phpbb::$db->sql_query($sql);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$birthday_list .= (($birthday_list != '') ? ', ' : '') . get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']);
-
-		if ($age = (int) substr($row['user_birthday'], -4))
-		{
-			$birthday_list .= ' (' . ($now['year'] - $age) . ')';
-		}
-	}
-	phpbb::$db->sql_freeresult($result);
-}
-
-// Assign index specific vars
-phpbb::$template->assign_vars(array(
-	'TOTAL_POSTS'	=> phpbb::$user->lang('TOTAL_POSTS_COUNT', $total_posts),
-	'TOTAL_TOPICS'	=> phpbb::$user->lang('TOTAL_TOPICS_COUNT', $total_topics),
-	'TOTAL_USERS'	=> phpbb::$user->lang('TOTAL_USERS_COUNT', $total_users),
-	'NEWEST_USER'	=> phpbb::$user->lang('NEWEST_USER', get_username_string('full', phpbb::$config['newest_user_id'], phpbb::$config['newest_username'], phpbb::$config['newest_user_colour'])),
-
-	'LEGEND'		=> $legend,
-	'BIRTHDAY_LIST'	=> $birthday_list,
-
-	'FORUM_IMG'				=> phpbb::$user->img('forum_read', 'NO_NEW_POSTS'),
-	'FORUM_NEW_IMG'			=> phpbb::$user->img('forum_unread', 'NEW_POSTS'),
-	'FORUM_LOCKED_IMG'		=> phpbb::$user->img('forum_read_locked', 'NO_NEW_POSTS_LOCKED'),
-	'FORUM_NEW_LOCKED_IMG'	=> phpbb::$user->img('forum_unread_locked', 'NO_NEW_POSTS_LOCKED'),
-
-	'S_LOGIN_ACTION'			=> phpbb::$url->append_sid('ucp', 'mode=login'),
-	'S_DISPLAY_BIRTHDAY_LIST'	=> (phpbb::$config['load_birthdays']) ? true : false,
-
-	'U_MARK_FORUMS'		=> (phpbb::$user->is_registered || phpbb::$config['load_anon_lastread']) ? phpbb::$url->append_sid('index', 'hash=' . generate_link_hash('global') . '&amp;mark=forums') : '',
-	'U_MCP'				=> (phpbb::$acl->acl_get('m_') || phpbb::$acl->acl_getf_global('m_')) ? phpbb::$url->append_sid('mcp', 'i=main&amp;mode=front', true, phpbb::$user->session_id) : '')
-);
-
-// Output page
-page_header(phpbb::$user->lang['INDEX']);
-
-phpbb::$template->set_filenames(array(
-	'body' => 'index_body.html')
-);
-
-page_footer();
-
-?>
-\ No newline at end of file
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
deleted file mode 100644
index f9cc9ed194..0000000000
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ /dev/null
@@ -1,934 +0,0 @@
-<?php
-/**
-*
-* @package install
-* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* NOTE to potential convertor authors. Please use this file to get
-* familiar with the structure since we added some bare explanations here.
-*
-* Since this file gets included more than once on one page you are not able to add functions to it.
-* Instead use a functions_ file.
-*
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-include(PHPBB_ROOT_PATH . 'config.' . PHP_EXT);
-unset($dbpasswd);
-
-/**
-* $convertor_data provides some basic information about this convertor which is
-* used on the initial list of convertors and to populate the default settings
-*/
-$convertor_data = array(
-	'forum_name'	=> 'phpBB 2.0.x',
-	'version'		=> '1.0.2',
-	'phpbb_version'	=> '3.0.3',
-	'author'		=> '<a href="http://www.phpbb.com/">phpBB Group</a>',
-	'dbms'			=> $dbms,
-	'dbhost'		=> $dbhost,
-	'dbport'		=> $dbport,
-	'dbuser'		=> $dbuser,
-	'dbpasswd'		=> '',
-	'dbname'		=> $dbname,
-	'table_prefix'	=> 'phpbb_',
-	'forum_path'	=> '../forums',
-	'author_notes'	=> '',
-);
-
-/**
-* $tables is a list of the tables (minus prefix) which we expect to find in the
-* source forum. It is used to guess the prefix if the specified prefix is incorrect
-*/
-$tables = array(
-	'auth_access',
-	'banlist',
-	'categories',
-	'disallow',
-	'forum_prune',
-	'forums',
-	'groups',
-	'posts',
-	'posts_text',
-	'privmsgs',
-	'privmsgs_text',
-	'ranks',
-	'smilies',
-	'topics',
-	'topics_watch',
-	'user_group',
-	'users',
-	'vote_desc',
-	'vote_results',
-	'vote_voters',
-	'words'
-);
-
-/**
-* $config_schema details how the board configuration information is stored in the source forum.
-*
-* 'table_format' can take the value 'file' to indicate a config file. In this case array_name
-* is set to indicate the name of the array the config values are stored in
-* 'table_format' can be an array if the values are stored in a table which is an assosciative array
-* (as per phpBB 2.0.x)
-* If left empty, values are assumed to be stored in a table where each config setting is
-* a column (as per phpBB 1.x)
-*
-* In either of the latter cases 'table_name' indicates the name of the table in the database
-*
-* 'settings' is an array which maps the name of the config directive in the source forum
-* to the config directive in phpBB3. It can either be a direct mapping or use a function.
-* Please note that the contents of the old config value are passed to the function, therefore
-* an in-built function requiring the variable passed by reference is not able to be used. Since
-* empty() is such a function we created the function is_empty() to be used instead.
-*/
-$config_schema = array(
-	'table_name'	=>	'config',
-	'table_format'	=>	array('config_name' => 'config_value'),
-	'settings'		=>	array(
-		'allow_bbcode'			=> 'allow_bbcode',
-		'allow_smilies'			=> 'allow_smilies',
-		'allow_sig'				=> 'allow_sig',
-		'allow_namechange'		=> 'allow_namechange',
-		'allow_avatar_local'	=> 'allow_avatar_local',
-		'allow_avatar_remote'	=> 'allow_avatar_remote',
-		'allow_avatar_upload'	=> 'allow_avatar_upload',
-		'board_disable'			=> 'board_disable',
-		'sitename'				=> 'phpbb_set_encoding(sitename)',
-		'site_desc'				=> 'phpbb_set_encoding(site_desc)',
-		'session_length'		=> 'session_length',
-		'board_email_sig'		=> 'phpbb_set_encoding(board_email_sig)',
-		'posts_per_page'		=> 'posts_per_page',
-		'topics_per_page'		=> 'topics_per_page',
-		'enable_confirm'		=> 'enable_confirm',
-		'board_email_form'		=> 'board_email_form',
-		'override_user_style'	=> 'override_user_style',
-		'hot_threshold'			=> 'hot_threshold',
-		'max_poll_options'		=> 'max_poll_options',
-		'max_sig_chars'			=> 'max_sig_chars',
-		'pm_max_msgs'			=> 'max_inbox_privmsgs',
-		'smtp_delivery'			=> 'smtp_delivery',
-		'smtp_host'				=> 'smtp_host',
-		'smtp_username'			=> 'smtp_username',
-		'smtp_password'			=> 'smtp_password',
-		'require_activation'	=> 'require_activation',
-		'flood_interval'		=> 'flood_interval',
-		'avatar_filesize'		=> 'avatar_filesize',
-		'avatar_max_width'		=> 'avatar_max_width',
-		'avatar_max_height'		=> 'avatar_max_height',
-		'default_dateformat'	=> 'default_dateformat',
-		'board_timezone'		=> 'board_timezone',
-		'allow_privmsg'			=> 'not(privmsg_disable)',
-		'gzip_compress'			=> 'gzip_compress',
-		'coppa_enable'			=> 'is_empty(coppa_mail)',
-		'coppa_fax'				=> 'coppa_fax',
-		'coppa_mail'			=> 'coppa_mail',
-		'record_online_users'	=> 'record_online_users',
-		'record_online_date'	=> 'record_online_date',
-		'board_startdate'		=> 'board_startdate',
-	)
-);
-
-/**
-* $test_file is the name of a file which is present on the source
-* forum which can be used to check that the path specified by the
-* user was correct
-*/
-$test_file = 'modcp.php';
-
-/**
-* If this is set then we are not generating the first page of information but getting the conversion information.
-*/
-if (!$get_info)
-{
-	// Test to see if the birthday MOD is installed on the source forum
-	// Niels' birthday mod
-	if (get_config_value('birthday_required') !== false || get_config_value('bday_require') !== false)
-	{
-		define('MOD_BIRTHDAY', true);
-	}
-
-	// TerraFrost's validated birthday mod
-	if (get_config_value('bday_require') !== false)
-	{
-		define('MOD_BIRTHDAY_TERRA', true);
-	}
-
-	// Test to see if the attachment MOD is installed on the source forum
-	// If it is, we will convert this data as well
-	$src_db->sql_return_on_error(true);
-
-	$sql = "SELECT config_value
-		FROM {$convert->src_table_prefix}attachments_config
-		WHERE config_name = 'upload_dir'";
-	$result = $src_db->sql_query($sql);
-
-	if ($result && $row = $src_db->sql_fetchrow($result))
-	{
-		// Here the constant is defined
-		define('MOD_ATTACHMENT', true);
-
-		// Here i add more tables to be checked in the old forum
-		$tables += array(
-			'attachments',
-			'attachments_desc',
-			'extensions',
-			'extension_groups'
-		);
-
-		$src_db->sql_freeresult($result);
-	}
-	else if ($result)
-	{
-		$src_db->sql_freeresult($result);
-	}
-
-
-	/**
-	* Tests for further MODs can be included here.
-	* Please use constants for this, prefixing them with MOD_
-	*/
-
-	$src_db->sql_return_on_error(false);
-
-	// Now let us set a temporary config variable for user id incrementing
-	$sql = "SELECT user_id
-		FROM {$convert->src_table_prefix}users
-		WHERE user_id = 1";
-	$result = $src_db->sql_query($sql);
-	$user_id = (int) $src_db->sql_fetchfield('user_id');
-	$src_db->sql_freeresult($result);
-
-	// If there is a user id 1, we need to increment user ids. :/
-	if ($user_id === 1)
-	{
-		// Try to get the maximum user id possible...
-		$sql = "SELECT MAX(user_id) AS max_user_id
-			FROM {$convert->src_table_prefix}users";
-		$result = $src_db->sql_query($sql);
-		$user_id = (int) $src_db->sql_fetchfield('max_user_id');
-		$src_db->sql_freeresult($result);
-
-		set_config('increment_user_id', ($user_id + 1), true);
-	}
-	else
-	{
-		set_config('increment_user_id', 0, true);
-	}
-
-	// Overwrite maximum avatar width/height
-	@define('DEFAULT_AVATAR_X_CUSTOM', get_config_value('avatar_max_width'));
-	@define('DEFAULT_AVATAR_Y_CUSTOM', get_config_value('avatar_max_height'));
-
-	// additional table used only during conversion
-	@define('USERCONV_TABLE', $table_prefix . 'userconv');
-
-/**
-*	Description on how to use the convertor framework.
-*
-*	'schema' Syntax Description
-*		-> 'target'			=> Target Table. If not specified the next table will be handled
-*		-> 'primary'		=> Primary Key. If this is specified then this table is processed in batches
-*		-> 'query_first'	=> array('target' or 'src', Query to execute before beginning the process
-*								(if more than one then specified as array))
-*		-> 'function_first'	=> Function to execute before beginning the process (if more than one then specified as array)
-*								(This is mostly useful if variables need to be given to the converting process)
-*		-> 'test_file'		=> This is not used at the moment but should be filled with a file from the old installation
-*
-*		// DB Functions
-*		'distinct'	=> Add DISTINCT to the select query
-*		'where'		=> Add WHERE to the select query
-*		'group_by'	=> Add GROUP BY to the select query
-*		'left_join'	=> Add LEFT JOIN to the select query (if more than one joins specified as array)
-*		'having'	=> Add HAVING to the select query
-*
-*		// DB INSERT array
-*		This one consist of three parameters
-*		First Parameter:
-*							The key need to be filled within the target table
-*							If this is empty, the target table gets not assigned the source value
-*		Second Parameter:
-*							Source value. If the first parameter is specified, it will be assigned this value.
-*							If the first parameter is empty, this only gets added to the select query
-*		Third Parameter:
-*							Custom Function. Function to execute while storing source value into target table.
-*							The functions return value get stored.
-*							The function parameter consist of the value of the second parameter.
-*
-*							types:
-*								- empty string == execute nothing
-*								- string == function to execute
-*								- array == complex execution instructions
-*
-*		Complex execution instructions:
-*		@todo test complex execution instructions - in theory they will work fine
-*
-*							By defining an array as the third parameter you are able to define some statements to be executed. The key
-*							is defining what to execute, numbers can be appended...
-*
-*							'function' => execute function
-*							'execute' => run code, whereby all occurrences of {VALUE} get replaced by the last returned value.
-*										The result *must* be assigned/stored to {RESULT}.
-*							'typecast'	=> typecast value
-*
-*							The returned variables will be made always available to the next function to continue to work with.
-*
-*							example (variable inputted is an integer of 1):
-*
-*							array(
-*								'function1'		=> 'increment_by_one',		// returned variable is 2
-*								'typecast'		=> 'string',				// typecast variable to be a string
-*								'execute'		=> '{RESULT} = {VALUE} . ' is good';', // returned variable is '2 is good'
-*								'function2'		=> 'replace_good_with_bad',				// returned variable is '2 is bad'
-*							),
-*
-*/
-
-	$convertor = array(
-		'test_file'				=> 'viewtopic.php',
-
-		'avatar_path'			=> get_config_value('avatar_path') . '/',
-		'avatar_gallery_path'	=> get_config_value('avatar_gallery_path') . '/',
-		'smilies_path'			=> get_config_value('smilies_path') . '/',
-		'upload_path'			=> (defined('MOD_ATTACHMENT')) ? phpbb_get_files_dir() . '/' : '',
-		'thumbnails'			=> (defined('MOD_ATTACHMENT')) ? array('thumbs/', 't_') : '',
-		'ranks_path'			=> false, // phpBB 2.0.x had no config value for a ranks path
-
-		// We empty some tables to have clean data available
-		'query_first'			=> array(
-			array('target', $convert->truncate_statement . SEARCH_RESULTS_TABLE),
-			array('target', $convert->truncate_statement . SEARCH_WORDLIST_TABLE),
-			array('target', $convert->truncate_statement . SEARCH_WORDMATCH_TABLE),
-			array('target', $convert->truncate_statement . LOG_TABLE),
-		),
-
-//	with this you are able to import all attachment files on the fly. For large boards this is not an option, therefore commented out by default.
-//	Instead every file gets copied while processing the corresponding attachment entry.
-//		if (defined("MOD_ATTACHMENT")) { import_attachment_files(); phpbb_copy_thumbnails(); }
-
-		// phpBB2 allowed some similar usernames to coexist which would have the same
-		// username_clean in phpBB3 which is not possible, so we'll give the admin a list
-		// of user ids and usernames and let him deicde what he wants to do with them
-		'execute_first'	=> '
-			phpbb_create_userconv_table();
-			import_avatar_gallery();
-			if (defined("MOD_ATTACHMENT")) phpbb_import_attach_config();
-			phpbb_insert_forums();
-		',
-
-		'execute_last'	=> array('
-			add_bots();
-		', '
-			update_folder_pm_count();
-		', '
-			update_unread_count();
-		', '
-			phpbb_convert_authentication(\'start\');
-		', '
-			phpbb_convert_authentication(\'first\');
-		', '
-			phpbb_convert_authentication(\'second\');
-		', '
-			phpbb_convert_authentication(\'third\');
-		'),
-
-		'schema' => array(
-			array(
-				'target'	=> USERCONV_TABLE,
-				'query_first'   => array('target', $convert->truncate_statement . USERCONV_TABLE),
-
-
-				array('user_id',			'users.user_id', 	''),
-				array('username_clean',		'users.username',	array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_clean_string')),
-			),
-
-			array(
-				'target'		=> (defined('MOD_ATTACHMENT')) ? ATTACHMENTS_TABLE : '',
-				'primary'		=> 'attachments.attach_id',
-				'query_first'	=> (defined('MOD_ATTACHMENT')) ? array('target', $convert->truncate_statement . ATTACHMENTS_TABLE) : '',
-				'autoincrement'	=> 'attach_id',
-
-				array('attach_id',				'attachments.attach_id',				''),
-				array('post_msg_id',			'attachments.post_id',					''),
-				array('topic_id',				'posts.topic_id',						''),
-				array('in_message',				0,										''),
-				array('is_orphan',				0,										''),
-				array('poster_id',				'attachments.user_id_1 AS poster_id',	'phpbb_user_id'),
-				array('physical_filename',		'attachments_desc.physical_filename',	'import_attachment'),
-				array('real_filename',			'attachments_desc.real_filename',		'phpbb_set_encoding'),
-				array('download_count',			'attachments_desc.download_count',		''),
-				array('attach_comment',			'attachments_desc.comment',				array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_htmlspecialchars')),
-				array('extension',				'attachments_desc.extension',			''),
-				array('mimetype',				'attachments_desc.mimetype',			''),
-				array('filesize',				'attachments_desc.filesize',			''),
-				array('filetime',				'attachments_desc.filetime',			''),
-				array('thumbnail',				'attachments_desc.thumbnail',			''),
-
-				'where'			=> 'attachments_desc.attach_id = attachments.attach_id AND attachments.privmsgs_id = 0 AND posts.post_id = attachments.post_id',
-				'group_by'		=> 'attachments.attach_id'
-			),
-
-			array(
-				'target'		=> (defined('MOD_ATTACHMENT')) ? ATTACHMENTS_TABLE : '',
-				'primary'		=> 'attachments.attach_id',
-				'autoincrement'	=> 'attach_id',
-
-				array('attach_id',				'attachments.attach_id',				''),
-				array('post_msg_id',			'attachments.privmsgs_id',				''),
-				array('topic_id',				0,										''),
-				array('in_message',				1,										''),
-				array('is_orphan',				0,										''),
-				array('poster_id',				'attachments.user_id_1 AS poster_id',	'phpbb_user_id'),
-				array('physical_filename',		'attachments_desc.physical_filename',	'import_attachment'),
-				array('real_filename',			'attachments_desc.real_filename',		''),
-				array('download_count',			'attachments_desc.download_count',		''),
-				array('attach_comment',			'attachments_desc.comment',				array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_htmlspecialchars')),
-				array('extension',				'attachments_desc.extension',			''),
-				array('mimetype',				'attachments_desc.mimetype',			''),
-				array('filesize',				'attachments_desc.filesize',			''),
-				array('filetime',				'attachments_desc.filetime',			''),
-				array('thumbnail',				'attachments_desc.thumbnail',			''),
-
-				'where'			=> 'attachments_desc.attach_id = attachments.attach_id AND attachments.post_id = 0',
-				'group_by'		=> 'attachments.attach_id'
-			),
-
-			array(
-				'target'		=> (defined('MOD_ATTACHMENT')) ? EXTENSIONS_TABLE : '',
-				'query_first'	=> (defined('MOD_ATTACHMENT')) ? array('target', $convert->truncate_statement . EXTENSIONS_TABLE) : '',
-				'autoincrement'	=> 'extension_id',
-
-				array('extension_id',			'extensions.ext_id',				''),
-				array('group_id',				'extensions.group_id',				''),
-				array('extension',				'extensions.extension',				''),
-			),
-
-			array(
-				'target'		=> (defined('MOD_ATTACHMENT')) ? EXTENSION_GROUPS_TABLE : '',
-				'query_first'	=> (defined('MOD_ATTACHMENT')) ? array('target', $convert->truncate_statement . EXTENSION_GROUPS_TABLE) : '',
-				'autoincrement'	=> 'group_id',
-
-				array('group_id',				'extension_groups.group_id',			''),
-				array('group_name',				'extension_groups.group_name',			array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_htmlspecialchars')),
-				array('cat_id',					'extension_groups.cat_id',				'phpbb_attachment_category'),
-				array('allow_group',			'extension_groups.allow_group',			''),
-				array('download_mode',			1,										''),
-				array('upload_icon',			'',										''),
-				array('max_filesize',			'extension_groups.max_filesize',		''),
-				array('allowed_forums',			'extension_groups.forum_permissions',	'phpbb_attachment_forum_perms'),
-				array('allow_in_pm',			1,										''),
-			),
-
-			array(
-				'target'		=> BANLIST_TABLE,
-				'execute_first'	=> 'phpbb_check_username_collisions();',
-				'query_first'	=> array('target', $convert->truncate_statement . BANLIST_TABLE),
-
-				array('ban_ip',					'banlist.ban_ip',					'decode_ban_ip'),
-				array('ban_userid',				'banlist.ban_userid',				'phpbb_user_id'),
-				array('ban_email',				'banlist.ban_email',				''),
-				array('ban_reason',				'',									''),
-				array('ban_give_reason',		'',									''),
-
-				'where'			=> "banlist.ban_ip NOT LIKE '%.%'",
-			),
-
-			array(
-				'target'		=> BANLIST_TABLE,
-
-				array('ban_ip',					'banlist.ban_ip',	''),
-				array('ban_userid',				0,					''),
-				array('ban_email',				'',					''),
-				array('ban_reason',				'',					''),
-				array('ban_give_reason',		'',					''),
-
-				'where'			=> "banlist.ban_ip LIKE '%.%'",
-			),
-
-			array(
-				'target'		=> DISALLOW_TABLE,
-				'query_first'	=> array('target', $convert->truncate_statement . DISALLOW_TABLE),
-
-				array('disallow_username',		'disallow.disallow_username',				'phpbb_disallowed_username'),
-			),
-
-			array(
-				'target'		=> RANKS_TABLE,
-				'query_first'	=> array('target', $convert->truncate_statement . RANKS_TABLE),
-				'autoincrement'	=> 'rank_id',
-
-				array('rank_id',					'ranks.rank_id',				''),
-				array('rank_title',					'ranks.rank_title',				array('function1' => 'phpbb_set_default_encoding', 'function2' => 'utf8_htmlspecialchars')),
-				array('rank_min',					'ranks.rank_min',				array('typecast' => 'int', 'execute' => '{RESULT} = ({VALUE}[0] < 0) ? 0 : {VALUE}[0];')),
-				array('rank_special',				'ranks.rank_special',			''),
-				array('rank_image',					'ranks.rank_image',				'import_rank'),
-			),
-
-			array(
-				'target'		=> TOPICS_TABLE,
-				'query_first'	=> array('target', $convert->truncate_statement . TOPICS_TABLE),
-				'primary'		=> 'topics.topic_id',
-				'autoincrement'	=> 'topic_id',
-
-				array('topic_id',				'topics.topic_id',					''),
-				array('forum_id',				'topics.forum_id',					''),
-				array('icon_id',				0,									''),
-				array('topic_poster',			'topics.topic_poster AS poster_id',	'phpbb_user_id'),
-				array('topic_attachment',		((defined('MOD_ATTACHMENT')) ? 'topics.topic_attachment' : 0), ''),
-				array('topic_title',			'topics.topic_title',				'phpbb_set_encoding'),
-				array('topic_time',				'topics.topic_time',				''),
-				array('topic_views',			'topics.topic_views',				''),
-				array('topic_replies',			'topics.topic_replies',				''),
-				array('topic_replies_real',		'topics.topic_replies',				''),
-				array('topic_last_post_id',		'topics.topic_last_post_id',		''),
-				array('topic_status',			'topics.topic_status',				'is_topic_locked'),
-				array('topic_moved_id',			0,									''),
-				array('topic_type',				'topics.topic_type',				'phpbb_convert_topic_type'),
-				array('topic_first_post_id',	'topics.topic_first_post_id',		''),
-				array('topic_last_view_time',	'posts.post_time',					'intval'),
-				array('poll_title',				'vote_desc.vote_text',				array('function1' => 'null_to_str', 'function2' => 'phpbb_set_encoding', 'function3' => 'utf8_htmlspecialchars')),
-				array('poll_start',				'vote_desc.vote_start',				'null_to_zero'),
-				array('poll_length',			'vote_desc.vote_length',			'null_to_zero'),
-				array('poll_max_options',		1,									''),
-				array('poll_vote_change',		0,									''),
-
-				'left_join'		=>	array (	'topics LEFT JOIN vote_desc ON topics.topic_id = vote_desc.topic_id AND topics.topic_vote = 1',
-											'topics LEFT JOIN posts ON topics.topic_last_post_id = posts.post_id',
-									),
-				'where'			=> 'topics.topic_moved_id = 0',
-			),
-
-			array(
-				'target'		=> TOPICS_TABLE,
-				'primary'		=> 'topics.topic_id',
-				'autoincrement'	=> 'topic_id',
-
-				array('topic_id',				'topics.topic_id',					''),
-				array('forum_id',				'topics.forum_id',					''),
-				array('icon_id',				0,									''),
-				array('topic_poster',			'topics.topic_poster AS poster_id',	'phpbb_user_id'),
-				array('topic_attachment',		((defined('MOD_ATTACHMENT')) ? 'topics.topic_attachment' : 0), ''),
-				array('topic_title',			'topics.topic_title',				'phpbb_set_encoding'),
-				array('topic_time',				'topics.topic_time',				''),
-				array('topic_views',			'topics.topic_views',				''),
-				array('topic_replies',			'topics.topic_replies',				''),
-				array('topic_replies_real',		'topics.topic_replies',				''),
-				array('topic_last_post_id',		'topics.topic_last_post_id',		''),
-				array('topic_status',			ITEM_MOVED,							''),
-				array('topic_moved_id',			'topics.topic_moved_id',			''),
-				array('topic_type',				'topics.topic_type',				'phpbb_convert_topic_type'),
-				array('topic_first_post_id',	'topics.topic_first_post_id',		''),
-
-				array('poll_title',				'vote_desc.vote_text',				array('function1' => 'null_to_str', 'function2' => 'phpbb_set_encoding', 'function3' => 'utf8_htmlspecialchars')),
-				array('poll_start',				'vote_desc.vote_start',				'null_to_zero'),
-				array('poll_length',			'vote_desc.vote_length',			'null_to_zero'),
-				array('poll_max_options',		1,									''),
-				array('poll_vote_change',		0,									''),
-
-				'left_join'		=> 'topics LEFT JOIN vote_desc ON topics.topic_id = vote_desc.topic_id AND topics.topic_vote = 1',
-				'where'			=> 'topics.topic_moved_id <> 0',
-			),
-
-			array(
-				'target'		=> TOPICS_WATCH_TABLE,
-				'primary'		=> 'topics_watch.topic_id',
-				'query_first'	=> array('target', $convert->truncate_statement . TOPICS_WATCH_TABLE),
-
-				array('topic_id',				'topics_watch.topic_id',			''),
-				array('user_id',				'topics_watch.user_id',				'phpbb_user_id'),
-				array('notify_status',			'topics_watch.notify_status',		''),
-			),
-
-			array(
-				'target'		=> SMILIES_TABLE,
-				'query_first'	=> array('target', $convert->truncate_statement . SMILIES_TABLE),
-				'autoincrement'	=> 'smiley_id',
-
-				array('smiley_id',				'smilies.smilies_id',				''),
-				array('code',					'smilies.code',						array('function1' => 'phpbb_smilie_html_decode', 'function2' => 'phpbb_set_encoding', 'function3' => 'utf8_htmlspecialchars')),
-				array('emotion',				'smilies.emoticon',					'phpbb_set_encoding'),
-				array('smiley_url',				'smilies.smile_url',				'import_smiley'),
-				array('smiley_width',			'smilies.smile_url',				'get_smiley_width'),
-				array('smiley_height',			'smilies.smile_url',				'get_smiley_height'),
-				array('smiley_order',			'smilies.smilies_id',				''),
-				array('display_on_posting',		'smilies.smilies_id',				'get_smiley_display'),
-
-				'order_by'		=> 'smilies.smilies_id ASC',
-			),
-
-			array(
-				'target'		=> POLL_OPTIONS_TABLE,
-				'primary'		=> 'vote_results.vote_option_id',
-				'query_first'	=> array('target', $convert->truncate_statement . POLL_OPTIONS_TABLE),
-
-				array('poll_option_id',			'vote_results.vote_option_id',		''),
-				array('topic_id',				'vote_desc.topic_id',				''),
-				array('',						'topics.topic_poster AS poster_id',	'phpbb_user_id'),
-				array('poll_option_text',		'vote_results.vote_option_text',	array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_htmlspecialchars')),
-				array('poll_option_total',		'vote_results.vote_result',			''),
-
-				'where'			=> 'vote_results.vote_id = vote_desc.vote_id',
-				'left_join'		=> 'vote_desc LEFT JOIN topics ON topics.topic_id = vote_desc.topic_id',
-			),
-
-			array(
-				'target'		=> POLL_VOTES_TABLE,
-				'primary'		=> 'vote_desc.topic_id',
-				'query_first'	=> array('target', $convert->truncate_statement . POLL_VOTES_TABLE),
-
-				array('poll_option_id',			VOTE_CONVERTED,						''),
-				array('topic_id',				'vote_desc.topic_id',				''),
-				array('vote_user_id',			'vote_voters.vote_user_id',			'phpbb_user_id'),
-				array('vote_user_ip',			'vote_voters.vote_user_ip',			'decode_ip'),
-
-				'where'			=> 'vote_voters.vote_id = vote_desc.vote_id',
-			),
-
-			array(
-				'target'		=> WORDS_TABLE,
-				'primary'		=> 'words.word_id',
-				'query_first'	=> array('target', $convert->truncate_statement . WORDS_TABLE),
-				'autoincrement'	=> 'word_id',
-
-				array('word_id',				'words.word_id',					''),
-				array('word',					'words.word',						'phpbb_set_encoding'),
-				array('replacement',			'words.replacement',				'phpbb_set_encoding'),
-			),
-
-			array(
-				'target'		=> POSTS_TABLE,
-				'primary'		=> 'posts.post_id',
-				'autoincrement'	=> 'post_id',
-				'query_first'	=> array('target', $convert->truncate_statement . POSTS_TABLE),
-				'execute_first'	=> '
-					$config["max_post_chars"] = 0;
-					$config["max_quote_depth"] = 0;
-				',
-
-				array('post_id',				'posts.post_id',					''),
-				array('topic_id',				'posts.topic_id',					''),
-				array('forum_id',				'posts.forum_id',					''),
-				array('poster_id',				'posts.poster_id',					'phpbb_user_id'),
-				array('icon_id',				0,									''),
-				array('poster_ip',				'posts.poster_ip',					'decode_ip'),
-				array('post_time',				'posts.post_time',					''),
-				array('enable_bbcode',			'posts.enable_bbcode',				''),
-				array('',						'posts.enable_html',				''),
-				array('enable_smilies',			'posts.enable_smilies',				''),
-				array('enable_sig',				'posts.enable_sig',					''),
-				array('enable_magic_url',		1,									''),
-				array('post_username',			'posts.post_username',				'phpbb_set_encoding'),
-				array('post_subject',			'posts_text.post_subject',			'phpbb_set_encoding'),
-				array('post_attachment',		((defined('MOD_ATTACHMENT')) ? 'posts.post_attachment' : 0), ''),
-				array('post_edit_time',			'posts.post_edit_time',				array('typecast' => 'int')),
-				array('post_edit_count',		'posts.post_edit_count',			''),
-				array('post_edit_reason',		'',									''),
-				array('post_edit_user',			'',									'phpbb_post_edit_user'),
-
-				array('bbcode_uid',				'posts.post_time',					'make_uid'),
-				array('post_text',				'posts_text.post_text',				'phpbb_prepare_message'),
-				array('',						'posts_text.bbcode_uid AS old_bbcode_uid',			''),
-				array('bbcode_bitfield',		'',									'get_bbcode_bitfield'),
-				array('post_checksum',			'',									''),
-
-				// Commented out inline search indexing, this takes up a LOT of time. :D
-				// @todo We either need to enable this or call the rebuild search functionality post convert
-/*				array('',						'',									'search_indexing'),
-				array('',						'posts_text.post_text AS message',	''),
-				array('',						'posts_text.post_subject AS title',	''),*/
-
-				'where'			=>	'posts.post_id = posts_text.post_id'
-			),
-
-			array(
-				'target'		=> PRIVMSGS_TABLE,
-				'primary'		=> 'privmsgs.privmsgs_id',
-				'autoincrement'	=> 'msg_id',
-				'query_first'	=> array(
-					array('target', $convert->truncate_statement . PRIVMSGS_TABLE),
-					array('target', $convert->truncate_statement . PRIVMSGS_RULES_TABLE),
-				),
-
-				'execute_first'	=> '
-					$config["max_post_chars"] = 0;
-					$config["max_quote_depth"] = 0;
-				',
-
-				array('msg_id',					'privmsgs.privmsgs_id',				''),
-				array('root_level',				0,									''),
-				array('author_id',				'privmsgs.privmsgs_from_userid AS poster_id',	'phpbb_user_id'),
-				array('icon_id',				0,									''),
-				array('author_ip',				'privmsgs.privmsgs_ip',				'decode_ip'),
-				array('message_time',			'privmsgs.privmsgs_date',			''),
-				array('enable_bbcode',			'privmsgs.privmsgs_enable_bbcode AS enable_bbcode',	''),
-				array('',						'privmsgs.privmsgs_enable_html AS enable_html',	''),
-				array('enable_smilies',			'privmsgs.privmsgs_enable_smilies AS enable_smilies',	''),
-				array('enable_magic_url',		1,									''),
-				array('enable_sig',				'privmsgs.privmsgs_attach_sig',		''),
-				array('message_subject',		'privmsgs.privmsgs_subject',		'phpbb_set_encoding'), // Already specialchared in 2.0.x
-				array('message_attachment',		((defined('MOD_ATTACHMENT')) ? 'privmsgs.privmsgs_attachment' : 0), ''),
-				array('message_edit_reason',	'',									''),
-				array('message_edit_user',		0,									''),
-				array('message_edit_time',		0,									''),
-				array('message_edit_count',		0,									''),
-
-				array('bbcode_uid',				'privmsgs.privmsgs_date AS post_time',	'make_uid'),
-				array('message_text',			'privmsgs_text.privmsgs_text',			'phpbb_prepare_message'),
-				array('',						'privmsgs_text.privmsgs_bbcode_uid AS old_bbcode_uid',			''),
-				array('bbcode_bitfield',		'',										'get_bbcode_bitfield'),
-				array('to_address',				'privmsgs.privmsgs_to_userid',			'phpbb_privmsgs_to_userid'),
-				array('bcc_address',			'',										''),
-
-				'where'			=>	'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id'
-			),
-
-			array(
-				'target'		=> PRIVMSGS_FOLDER_TABLE,
-				'primary'		=> 'users.user_id',
-				'query_first'	=> array('target', $convert->truncate_statement . PRIVMSGS_FOLDER_TABLE),
-
-				array('user_id',				'users.user_id',						'phpbb_user_id'),
-				array('folder_name',			$user->lang['CONV_SAVED_MESSAGES'],		''),
-				array('pm_count',				0,										''),
-
-				'where'			=> 'users.user_id <> -1',
-			),
-
-			// Inbox
-			array(
-				'target'		=> PRIVMSGS_TO_TABLE,
-				'primary'		=> 'privmsgs.privmsgs_id',
-				'query_first'	=> array('target', $convert->truncate_statement . PRIVMSGS_TO_TABLE),
-
-				array('msg_id',					'privmsgs.privmsgs_id',					''),
-				array('user_id',				'privmsgs.privmsgs_to_userid',			'phpbb_user_id'),
-				array('author_id',				'privmsgs.privmsgs_from_userid',		'phpbb_user_id'),
-				array('pm_deleted',				0,										''),
-				array('pm_new',					'privmsgs.privmsgs_type',				'phpbb_new_pm'),
-				array('pm_unread',				'privmsgs.privmsgs_type',				'phpbb_unread_pm'),
-				array('pm_replied',				0,										''),
-				array('pm_marked',				0,										''),
-				array('pm_forwarded',			0,										''),
-				array('folder_id',				PRIVMSGS_INBOX,							''),
-
-				'where'			=> 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id
-										AND (privmsgs.privmsgs_type = 0 OR privmsgs.privmsgs_type = 1 OR privmsgs.privmsgs_type = 5)',
-			),
-
-			// Outbox
-			array(
-				'target'		=> PRIVMSGS_TO_TABLE,
-				'primary'		=> 'privmsgs.privmsgs_id',
-
-				array('msg_id',					'privmsgs.privmsgs_id',					''),
-				array('user_id',				'privmsgs.privmsgs_from_userid',		'phpbb_user_id'),
-				array('author_id',				'privmsgs.privmsgs_from_userid',		'phpbb_user_id'),
-				array('pm_deleted',				0,										''),
-				array('pm_new',					0,										''),
-				array('pm_unread',				0,										''),
-				array('pm_replied',				0,										''),
-				array('pm_marked',				0,										''),
-				array('pm_forwarded',			0,										''),
-				array('folder_id',				PRIVMSGS_OUTBOX,						''),
-
-				'where'			=> 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id
-										AND (privmsgs.privmsgs_type = 1 OR privmsgs.privmsgs_type = 5)',
-			),
-
-			// Sentbox
-			array(
-				'target'		=> PRIVMSGS_TO_TABLE,
-				'primary'		=> 'privmsgs.privmsgs_id',
-
-				array('msg_id',					'privmsgs.privmsgs_id',					''),
-				array('user_id',				'privmsgs.privmsgs_from_userid',		'phpbb_user_id'),
-				array('author_id',				'privmsgs.privmsgs_from_userid',		'phpbb_user_id'),
-				array('pm_deleted',				0,										''),
-				array('pm_new',					'privmsgs.privmsgs_type',				'phpbb_new_pm'),
-				array('pm_unread',				'privmsgs.privmsgs_type',				'phpbb_unread_pm'),
-				array('pm_replied',				0,										''),
-				array('pm_marked',				0,										''),
-				array('pm_forwarded',			0,										''),
-				array('folder_id',				PRIVMSGS_SENTBOX,						''),
-
-				'where'			=> 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id
-										AND privmsgs.privmsgs_type = 2',
-			),
-
-			// Savebox (SAVED IN)
-			array(
-				'target'		=> PRIVMSGS_TO_TABLE,
-				'primary'		=> 'privmsgs.privmsgs_id',
-
-				array('msg_id',					'privmsgs.privmsgs_id',					''),
-				array('user_id',				'privmsgs.privmsgs_to_userid',			'phpbb_user_id'),
-				array('author_id',				'privmsgs.privmsgs_from_userid',		'phpbb_user_id'),
-				array('pm_deleted',				0,										''),
-				array('pm_new',					'privmsgs.privmsgs_type',				'phpbb_new_pm'),
-				array('pm_unread',				'privmsgs.privmsgs_type',				'phpbb_unread_pm'),
-				array('pm_replied',				0,										''),
-				array('pm_marked',				0,										''),
-				array('pm_forwarded',			0,										''),
-				array('folder_id',				'privmsgs.privmsgs_to_userid',			'phpbb_get_savebox_id'),
-
-				'where'			=> 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id
-										AND privmsgs.privmsgs_type = 3',
-			),
-
-			// Savebox (SAVED OUT)
-			array(
-				'target'		=> PRIVMSGS_TO_TABLE,
-				'primary'		=> 'privmsgs.privmsgs_id',
-
-				array('msg_id',					'privmsgs.privmsgs_id',					''),
-				array('user_id',				'privmsgs.privmsgs_from_userid',		'phpbb_user_id'),
-				array('author_id',				'privmsgs.privmsgs_from_userid',		'phpbb_user_id'),
-				array('pm_deleted',				0,										''),
-				array('pm_new',					'privmsgs.privmsgs_type',				'phpbb_new_pm'),
-				array('pm_unread',				'privmsgs.privmsgs_type',				'phpbb_unread_pm'),
-				array('pm_replied',				0,										''),
-				array('pm_marked',				0,										''),
-				array('pm_forwarded',			0,										''),
-				array('folder_id',				'privmsgs.privmsgs_from_userid',		'phpbb_get_savebox_id'),
-
-				'where'			=> 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id
-										AND privmsgs.privmsgs_type = 4',
-			),
-
-			array(
-				'target'		=> GROUPS_TABLE,
-				'autoincrement'	=> 'group_id',
-				'query_first'	=> array('target', $convert->truncate_statement . GROUPS_TABLE),
-
-				array('group_id',				'groups.group_id',					''),
-				array('group_type',				'groups.group_type',				'phpbb_convert_group_type'),
-				array('group_display',			0,									''),
-				array('group_legend',			0,									''),
-				array('group_name',				'groups.group_name',				'phpbb_convert_group_name'), // phpbb_set_encoding called in phpbb_convert_group_name
-				array('group_name_clean',		'groups.group_name',				'phpbb_convert_group_name_clean'), // phpbb_set_encoding called in phpbb_convert_group_name
-				array('group_desc',				'groups.group_description',			'phpbb_set_encoding'),
-
-				'where'			=> 'groups.group_single_user = 0',
-			),
-
-			array(
-				'target'		=> USER_GROUP_TABLE,
-				'query_first'	=> array('target', $convert->truncate_statement . USER_GROUP_TABLE),
-				'execute_first'	=> '
-					add_default_groups();
-				',
-
-				array('group_id',		'groups.group_id',					''),
-				array('user_id',		'groups.group_moderator',			'phpbb_user_id'),
-				array('group_leader',	1,									''),
-				array('user_pending',	0,									''),
-
-				'where'			=> 'groups.group_single_user = 0 AND groups.group_moderator <> 0',
-			),
-
-			array(
-				'target'		=> USER_GROUP_TABLE,
-
-				array('group_id',		'user_group.group_id',				''),
-				array('user_id',		'user_group.user_id',				'phpbb_user_id'),
-				array('group_leader',	0,									''),
-				array('user_pending',	'user_group.user_pending',			''),
-
-				'where'			=> 'user_group.group_id = groups.group_id AND groups.group_single_user = 0 AND groups.group_moderator <> user_group.user_id',
-			),
-
-			array(
-				'target'		=> USERS_TABLE,
-				'primary'		=> 'users.user_id',
-				'autoincrement'	=> 'user_id',
-				'query_first'	=> array(
-					array('target', 'DELETE FROM ' . USERS_TABLE . ' WHERE user_id <> ' . ANONYMOUS),
-					array('target', $convert->truncate_statement . BOTS_TABLE)
-				),
-
-				'execute_last'	=> '
-					remove_invalid_users();
-				',
-
-				array('user_id',				'users.user_id',					'phpbb_user_id'),
-				array('',						'users.user_id AS poster_id',		'phpbb_user_id'),
-				array('user_type',				'users.user_active',				'set_user_type'),
-				array('group_id',				'users.user_level',					'phpbb_set_primary_group'),
-				array('user_regdate',			'users.user_regdate',				''),
-				array('username',				'users.username',					'phpbb_set_default_encoding'), // recode to utf8 with default lang
-				array('username_clean',			'users.username',					array('function1' => 'phpbb_set_default_encoding', 'function2' => 'utf8_clean_string')),
-				array('user_password',			'users.user_password',				'phpbb_hash'),
-				array('user_pass_convert',		1,									''),
-				array('user_posts',				'users.user_posts',					'intval'),
-				array('user_email',				'users.user_email',					'strtolower'),
-				array('user_email_hash',		'users.user_email',					'gen_email_hash'),
-				array('user_birthday',			((defined('MOD_BIRTHDAY')) ? 'users.user_birthday' : ''),	'phpbb_get_birthday'),
-				array('user_lastvisit',			'users.user_lastvisit',				'intval'),
-				array('user_lastmark',			'users.user_lastvisit',				'intval'),
-				array('user_lang',				$config['default_lang'],			''),
-				array('',						'users.user_lang',					''),
-				array('user_timezone',			'users.user_timezone',				'floatval'),
-				array('user_dateformat',		'users.user_dateformat',			array('function1' => 'phpbb_set_encoding', 'function2' => 'fill_dateformat')),
-				array('user_inactive_reason',	'',									'phpbb_inactive_reason'),
-				array('user_inactive_time',		'',									'phpbb_inactive_time'),
-
-				array('user_interests',			'users.user_interests',				array('function1' => 'phpbb_set_encoding')),
-				array('user_occ',				'users.user_occ',					array('function1' => 'phpbb_set_encoding')),
-				array('user_website',			'users.user_website',				'validate_website'),
-				array('user_jabber',			'',									''),
-				array('user_msnm',				'users.user_msnm',					array('function1' => 'phpbb_set_encoding')),
-				array('user_yim',				'users.user_yim',					array('function1' => 'phpbb_set_encoding')),
-				array('user_aim',				'users.user_aim',					array('function1' => 'phpbb_set_encoding')),
-				array('user_icq',				'users.user_icq',					array('function1' => 'phpbb_set_encoding')),
-				array('user_from',				'users.user_from',					array('function1' => 'phpbb_set_encoding')),
-				array('user_rank',				'users.user_rank',					'intval'),
-				array('user_permissions',		'',									''),
-
-				array('user_avatar',			'users.user_avatar',				'phpbb_import_avatar'),
-				array('user_avatar_type',		'users.user_avatar_type',			'phpbb_avatar_type'),
-				array('user_avatar_width',		'users.user_avatar',				'phpbb_get_avatar_width'),
-				array('user_avatar_height',		'users.user_avatar',				'phpbb_get_avatar_height'),
-
-				array('user_new_privmsg',		'users.user_new_privmsg',			''),
-				array('user_unread_privmsg',	0,									''), //'users.user_unread_privmsg'
-				array('user_last_privmsg',		'users.user_last_privmsg',			'intval'),
-				array('user_emailtime',			'users.user_emailtime',				'null_to_zero'),
-				array('user_notify',			'users.user_notify',				'intval'),
-				array('user_notify_pm',			'users.user_notify_pm',				'intval'),
-				array('user_notify_type',		NOTIFY_EMAIL,						''),
-				array('user_allow_pm',			'users.user_allow_pm',				'intval'),
-				array('user_allow_viewonline',	'users.user_allow_viewonline',		'intval'),
-				array('user_allow_viewemail',	'users.user_viewemail',				'intval'),
-				array('user_actkey',			'users.user_actkey',				''),
-				array('user_newpasswd',			'',									''), // Users need to re-request their password...
-				array('user_style',				$config['default_style'],			''),
-
-				array('user_options',			'',									'set_user_options'),
-				array('',						'users.user_popup_pm AS popuppm',	''),
-				array('',						'users.user_allowhtml AS html',		''),
-				array('',						'users.user_allowbbcode AS bbcode',	''),
-				array('',						'users.user_allowsmile AS smile',	''),
-				array('',						'users.user_attachsig AS attachsig',''),
-
-				array('user_sig_bbcode_uid',		'users.user_regdate',							'make_uid'),
-				array('user_sig',					'users.user_sig',								'phpbb_prepare_message'),
-				array('',							'users.user_sig_bbcode_uid AS old_bbcode_uid',	''),
-				array('user_sig_bbcode_bitfield',	'',												'get_bbcode_bitfield'),
-				array('',							'users.user_regdate AS post_time',				''),
-
-				'where'			=> 'users.user_id <> -1',
-			),
-		),
-	);
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php
deleted file mode 100644
index 4b04f85ba7..0000000000
--- a/phpBB/install/convertors/functions_phpbb20.php
+++ /dev/null
@@ -1,1845 +0,0 @@
-<?php
-/**
-*
-* @package install
-* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Helper functions for phpBB 2.0.x to phpBB 3.0.x conversion
-*/
-
-/**
-* Set forum flags - only prune old polls by default
-*/
-function phpbb_forum_flags()
-{
-	// Set forum flags
-	$forum_flags = 0;
-
-	// FORUM_FLAG_LINK_TRACK
-	$forum_flags += 0;
-
-	// FORUM_FLAG_PRUNE_POLL
-	$forum_flags += FORUM_FLAG_PRUNE_POLL;
-
-	// FORUM_FLAG_PRUNE_ANNOUNCE
-	$forum_flags += 0;
-
-	// FORUM_FLAG_PRUNE_STICKY
-	$forum_flags += 0;
-
-	// FORUM_FLAG_ACTIVE_TOPICS
-	$forum_flags += 0;
-
-	// FORUM_FLAG_POST_REVIEW
-	$forum_flags += FORUM_FLAG_POST_REVIEW;
-
-	return $forum_flags;
-}
-
-/**
-* Insert/Convert forums
-*/
-function phpbb_insert_forums()
-{
-	global $db, $src_db, $same_db, $convert, $user, $config;
-
-	$db->sql_query($convert->truncate_statement . FORUMS_TABLE);
-
-	// Determine the highest id used within the old forums table (we add the categories after the forum ids)
-	$sql = 'SELECT MAX(forum_id) AS max_forum_id
-		FROM ' . $convert->src_table_prefix . 'forums';
-	$result = $src_db->sql_query($sql);
-	$max_forum_id = (int) $src_db->sql_fetchfield('max_forum_id');
-	$src_db->sql_freeresult($result);
-
-	$max_forum_id++;
-
-	// pruning disabled globally?
-	$sql = "SELECT config_value
-		FROM {$convert->src_table_prefix}config
-		WHERE config_name = 'prune_enable'";
-	$result = $src_db->sql_query($sql);
-	$prune_enabled = (int) $src_db->sql_fetchfield('config_value');
-	$src_db->sql_freeresult($result);
-
-
-	// Insert categories
-	$sql = 'SELECT cat_id, cat_title
-		FROM ' . $convert->src_table_prefix . 'categories
-		ORDER BY cat_order';
-
-	if ($convert->mysql_convert && $same_db)
-	{
-		$src_db->sql_query("SET NAMES 'binary'");
-	}
-
-	$result = $src_db->sql_query($sql);
-
-	if ($convert->mysql_convert && $same_db)
-	{
-		$src_db->sql_query("SET NAMES 'utf8'");
-	}
-
-	if ($db->dbms_type == 'mssql')
-	{
-		$db->sql_query('SET IDENTITY_INSERT ' . FORUMS_TABLE . ' ON');
-	}
-
-	$cats_added = array();
-	while ($row = $src_db->sql_fetchrow($result))
-	{
-		$sql_ary = array(
-			'forum_id'		=> (int) $max_forum_id,
-			'forum_name'	=> ($row['cat_title']) ? htmlspecialchars(phpbb_set_default_encoding($row['cat_title']), ENT_COMPAT, 'UTF-8') : $user->lang['CATEGORY'],
-			'parent_id'		=> 0,
-			'forum_parents'	=> '',
-			'forum_desc'	=> '',
-			'forum_type'	=> FORUM_CAT,
-			'forum_status'	=> ITEM_UNLOCKED,
-			'forum_rules'	=> '',
-		);
-
-		$sql = 'SELECT MAX(right_id) AS right_id
-			FROM ' . FORUMS_TABLE;
-		$_result = $db->sql_query($sql);
-		$cat_row = $db->sql_fetchrow($_result);
-		$db->sql_freeresult($_result);
-
-		$sql_ary['left_id'] = (int) ($cat_row['right_id'] + 1);
-		$sql_ary['right_id'] = (int) ($cat_row['right_id'] + 2);
-
-		$sql = 'INSERT INTO ' . FORUMS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
-		$db->sql_query($sql);
-
-		$cats_added[$row['cat_id']] = $max_forum_id;
-		$max_forum_id++;
-	}
-	$src_db->sql_freeresult($result);
-
-	// There may be installations having forums with non-existant category ids.
-	// We try to catch them and add them to an "unknown" category instead of leaving them out.
-	$sql = 'SELECT cat_id
-		FROM ' . $convert->src_table_prefix . 'forums
-		GROUP BY cat_id';
-	$result = $src_db->sql_query($sql);
-
-	$unknown_cat_id = false;
-	while ($row = $src_db->sql_fetchrow($result))
-	{
-		// Catch those categories not been added before
-		if (!isset($cats_added[$row['cat_id']]))
-		{
-			$unknown_cat_id = true;
-		}
-	}
-	$src_db->sql_freeresult($result);
-
-	// Is there at least one category not known?
-	if ($unknown_cat_id === true)
-	{
-		$unknown_cat_id = 'ghost';
-
-		$sql_ary = array(
-			'forum_id'		=> (int) $max_forum_id,
-			'forum_name'	=> (string) $user->lang['CATEGORY'],
-			'parent_id'		=> 0,
-			'forum_parents'	=> '',
-			'forum_desc'	=> '',
-			'forum_type'	=> FORUM_CAT,
-			'forum_status'	=> ITEM_UNLOCKED,
-			'forum_rules'	=> '',
-		);
-
-		$sql = 'SELECT MAX(right_id) AS right_id
-			FROM ' . FORUMS_TABLE;
-		$_result = $db->sql_query($sql);
-		$cat_row = $db->sql_fetchrow($_result);
-		$db->sql_freeresult($_result);
-
-		$sql_ary['left_id'] = (int) ($cat_row['right_id'] + 1);
-		$sql_ary['right_id'] = (int) ($cat_row['right_id'] + 2);
-
-		$sql = 'INSERT INTO ' . FORUMS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
-		$db->sql_query($sql);
-
-		$cats_added[$unknown_cat_id] = $max_forum_id;
-		$max_forum_id++;
-	}
-
-	// Now insert the forums
-	$sql = 'SELECT f.forum_id, f.forum_name, f.cat_id, f.forum_desc, f.forum_status, f.prune_enable, f.prune_next, fp.prune_days, fp.prune_freq FROM ' . $convert->src_table_prefix . 'forums f
-		LEFT JOIN ' . $convert->src_table_prefix . 'forum_prune fp ON f.forum_id = fp.forum_id
-		GROUP BY f.forum_id, f.forum_name, f.cat_id, f.forum_desc, f.forum_status, f.prune_enable, f.prune_next, f.forum_order, fp.prune_days, fp.prune_freq
-		ORDER BY f.cat_id, f.forum_order';
-
-	if ($convert->mysql_convert && $same_db)
-	{
-		$src_db->sql_query("SET NAMES 'binary'");
-	}
-
-	$result = $src_db->sql_query($sql);
-
-	if ($convert->mysql_convert && $same_db)
-	{
-		$src_db->sql_query("SET NAMES 'utf8'");
-	}
-
-	while ($row = $src_db->sql_fetchrow($result))
-	{
-		// Some might have forums here with an id not being "possible"...
-		// To be somewhat friendly we "change" the category id for those to a previously created ghost category
-		if (!isset($cats_added[$row['cat_id']]) && $unknown_cat_id !== false)
-		{
-			$row['cat_id'] = $unknown_cat_id;
-		}
-
-		if (!isset($cats_added[$row['cat_id']]))
-		{
-			continue;
-		}
-
-		// Define the new forums sql ary
-		$sql_ary = array(
-			'forum_id'			=> (int) $row['forum_id'],
-			'forum_name'		=> htmlspecialchars(phpbb_set_default_encoding($row['forum_name']), ENT_COMPAT, 'UTF-8'),
-			'parent_id'			=> (int) $cats_added[$row['cat_id']],
-			'forum_parents'		=> '',
-			'forum_desc'		=> htmlspecialchars(phpbb_set_default_encoding($row['forum_desc']), ENT_COMPAT, 'UTF-8'),
-			'forum_type'		=> FORUM_POST,
-			'forum_status'		=> is_item_locked($row['forum_status']),
-			'enable_prune'		=> ($prune_enabled) ? (int)$row['prune_enable'] : 0,
-			'prune_next'		=> (int) null_to_zero($row['prune_next']),
-			'prune_days'		=> (int) null_to_zero($row['prune_days']),
-			'prune_viewed'		=> 0,
-			'prune_freq'		=> (int) null_to_zero($row['prune_freq']),
-
-			'forum_flags'		=> phpbb_forum_flags(),
-
-			// Default values
-			'forum_desc_bitfield'		=> '',
-			'forum_desc_options'		=> 7,
-			'forum_desc_uid'			=> '',
-			'forum_link'				=> '',
-			'forum_password'			=> '',
-			'forum_style'				=> 0,
-			'forum_image'				=> '',
-			'forum_rules'				=> '',
-			'forum_rules_link'			=> '',
-			'forum_rules_bitfield'		=> '',
-			'forum_rules_options'		=> 7,
-			'forum_rules_uid'			=> '',
-			'forum_topics_per_page'		=> 0,
-			'forum_posts'				=> 0,
-			'forum_topics'				=> 0,
-			'forum_topics_real'			=> 0,
-			'forum_last_post_id'		=> 0,
-			'forum_last_poster_id'		=> 0,
-			'forum_last_post_subject'	=> '',
-			'forum_last_post_time'		=> 0,
-			'forum_last_poster_name'	=> '',
-			'forum_last_poster_colour'	=> '',
-			'display_on_index'			=> 1,
-			'enable_indexing'			=> 1,
-			'enable_icons'				=> 0,
-		);
-
-		// Now add the forums with proper left/right ids
-		$sql = 'SELECT left_id, right_id
-			FROM ' . FORUMS_TABLE . '
-			WHERE forum_id = ' . $cats_added[$row['cat_id']];
-		$_result = $db->sql_query($sql);
-		$cat_row = $db->sql_fetchrow($_result);
-		$db->sql_freeresult($_result);
-
-		$sql = 'UPDATE ' . FORUMS_TABLE . '
-			SET left_id = left_id + 2, right_id = right_id + 2
-			WHERE left_id > ' . $cat_row['right_id'];
-		$db->sql_query($sql);
-
-		$sql = 'UPDATE ' . FORUMS_TABLE . '
-			SET right_id = right_id + 2
-			WHERE ' . $cat_row['left_id'] . ' BETWEEN left_id AND right_id';
-		$db->sql_query($sql);
-
-		$sql_ary['left_id'] = (int) $cat_row['right_id'];
-		$sql_ary['right_id'] = (int) ($cat_row['right_id'] + 1);
-
-		$sql = 'INSERT INTO ' . FORUMS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
-		$db->sql_query($sql);
-	}
-	$src_db->sql_freeresult($result);
-
-	switch ($db->dbms_type)
-	{
-		case 'postgres':
-			$db->sql_query("SELECT SETVAL('" . FORUMS_TABLE . "_seq',(select case when max(forum_id)>0 then max(forum_id)+1 else 1 end from " . FORUMS_TABLE . '));');
-		break;
-
-		case 'mssql':
-			$db->sql_query('SET IDENTITY_INSERT ' . FORUMS_TABLE . ' OFF');
-		break;
-
-		case 'oracle':
-			$result = $db->sql_query('SELECT MAX(forum_id) as max_id FROM ' . FORUMS_TABLE);
-			$row = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-
-			$largest_id = (int) $row['max_id'];
-
-			if ($largest_id)
-			{
-				$db->sql_query('DROP SEQUENCE ' . FORUMS_TABLE . '_seq');
-				$db->sql_query('CREATE SEQUENCE ' . FORUMS_TABLE . '_seq START WITH ' . ($largest_id + 1));
-			}
-		break;
-	}
-}
-
-/**
-* Function for recoding text with the default language
-*
-* @param string $text text to recode to utf8
-* @param bool $grab_user_lang if set to true the function tries to use $convert_row['user_lang'] (and falls back to $convert_row['poster_id']) instead of the boards default language
-*/
-function phpbb_set_encoding($text, $grab_user_lang = true)
-{
-	global $lang_enc_array, $convert_row;
-	global $convert;
-
-	/*static $lang_enc_array = array(
-		'korean'						=> 'euc-kr',
-		'serbian'						=> 'windows-1250',
-		'polish'						=> 'iso-8859-2',
-		'kurdish'						=> 'windows-1254',
-		'slovak'						=> 'Windows-1250',
-		'russian'						=> 'windows-1251',
-		'estonian'						=> 'iso-8859-4',
-		'chinese_simplified'			=> 'gb2312',
-		'macedonian'					=> 'windows-1251',
-		'azerbaijani'					=> 'UTF-8',
-		'romanian'						=> 'iso-8859-2',
-		'romanian_diacritice'			=> 'iso-8859-2',
-		'lithuanian'					=> 'windows-1257',
-		'turkish'						=> 'iso-8859-9',
-		'ukrainian'						=> 'windows-1251',
-		'japanese'						=> 'shift_jis',
-		'hungarian'						=> 'ISO-8859-2',
-		'romanian_no_diacritics'		=> 'iso-8859-2',
-		'mongolian'						=> 'UTF-8',
-		'slovenian'						=> 'windows-1250',
-		'bosnian'						=> 'windows-1250',
-		'czech'							=> 'Windows-1250',
-		'farsi'							=> 'Windows-1256',
-		'croatian'						=> 'windows-1250',
-		'greek'							=> 'iso-8859-7',
-		'russian_tu'					=> 'windows-1251',
-		'sakha'							=> 'UTF-8',
-		'serbian_cyrillic'				=> 'windows-1251',
-		'bulgarian'						=> 'windows-1251',
-		'chinese_traditional_taiwan'	=> 'big5',
-		'chinese_traditional'			=> 'big5',
-		'arabic'						=> 'windows-1256',
-		'hebrew'						=> 'WINDOWS-1255',
-		'thai'							=> 'windows-874',
-		//'chinese_traditional_taiwan'	=> 'utf-8' // custom modified, we may have to do an include :-(
-	);*/
-
-	if (empty($lang_enc_array))
-	{
-		$lang_enc_array = array();
-	}
-
-	$get_lang = trim(get_config_value('default_lang'));
-
-	// Do we need the users language encoding?
-	if ($grab_user_lang && !empty($convert_row))
-	{
-		if (!empty($convert_row['user_lang']))
-		{
-			$get_lang = trim($convert_row['user_lang']);
-		}
-		else if (!empty($convert_row['poster_id']))
-		{
-			global $src_db, $same_db;
-
-			if ($convert->mysql_convert && $same_db)
-			{
-				$src_db->sql_query("SET NAMES 'binary'");
-			}
-
-			$sql = 'SELECT user_lang
-				FROM ' . $convert->src_table_prefix . 'users
-				WHERE user_id = ' . (int) $convert_row['poster_id'];
-			$result = $src_db->sql_query($sql);
-			$get_lang = (string) $src_db->sql_fetchfield('user_lang');
-			$src_db->sql_freeresult($result);
-
-			if ($convert->mysql_convert && $same_db)
-			{
-				$src_db->sql_query("SET NAMES 'utf8'");
-			}
-
-			$get_lang = (!trim($get_lang)) ? trim(get_config_value('default_lang')) : trim($get_lang);
-		}
-	}
-
-	if (!isset($lang_enc_array[$get_lang]))
-	{
-		$filename = $convert->options['forum_path'] . '/language/lang_' . $get_lang . '/lang_main.' . PHP_EXT;
-
-		if (!file_exists($filename))
-		{
-			$get_lang = trim(get_config_value('default_lang'));
-		}
-
-		if (!isset($lang_enc_array[$get_lang]))
-		{
-			include($convert->options['forum_path'] . '/language/lang_' . $get_lang . '/lang_main.' . PHP_EXT);
-			$lang_enc_array[$get_lang] = $lang['ENCODING'];
-			unset($lang);
-		}
-	}
-
-	$encoding = $lang_enc_array[$get_lang];
-
-	return utf8_recode($text, $lang_enc_array[$get_lang]);
-}
-
-/**
-* Same as phpbb_set_encoding, but forcing boards default language
-*/
-function phpbb_set_default_encoding($text)
-{
-	return phpbb_set_encoding($text, false);
-}
-
-/**
-* Convert Birthday from Birthday MOD to phpBB Format
-*/
-function phpbb_get_birthday($birthday = '')
-{
-	if (defined('MOD_BIRTHDAY_TERRA'))
-	{
-		$birthday = (string) $birthday;
-
-		// stored as month, day, year
-		if (!$birthday)
-		{
-			return ' 0- 0-   0';
-		}
-
-		// We use the original mod code to retrieve the birthday (not ideal)
-		preg_match('/(..)(..)(....)/', sprintf('%08d', $birthday), $birthday_parts);
-
-		$month = $birthday_parts[1];
-		$day = $birthday_parts[2];
-		$year =  $birthday_parts[3];
-
-		return sprintf('%2d-%2d-%4d', $day, $month, $year);
-	}
-	else
-	{
-		$birthday = (int) $birthday;
-
-		if (!$birthday || $birthday == 999999 || $birthday < 0)
-		{
-			return ' 0- 0-   0';
-		}
-
-		// The birthday mod from niels is using this code to transform to day/month/year
-		return sprintf('%2d-%2d-%4d', gmdate('j', $birthday * 86400 + 1), gmdate('n', $birthday * 86400 + 1), gmdate('Y', $birthday * 86400 + 1));
-	}
-}
-
-/**
-* Return correct user id value
-* Everyone's id will be one higher to allow the guest/anonymous user to have a positive id as well
-*/
-function phpbb_user_id($user_id)
-{
-	global $config;
-
-	// Increment user id if the old forum is having a user with the id 1
-	if (!isset($config['increment_user_id']))
-	{
-		global $src_db, $same_db, $convert;
-
-		if ($convert->mysql_convert && $same_db)
-		{
-			$src_db->sql_query("SET NAMES 'binary'");
-		}
-
-		// Now let us set a temporary config variable for user id incrementing
-		$sql = "SELECT user_id
-			FROM {$convert->src_table_prefix}users
-			WHERE user_id = 1";
-		$result = $src_db->sql_query($sql);
-		$id = (int) $src_db->sql_fetchfield('user_id');
-		$src_db->sql_freeresult($result);
-
-		// Try to get the maximum user id possible...
-		$sql = "SELECT MAX(user_id) AS max_user_id
-			FROM {$convert->src_table_prefix}users";
-		$result = $src_db->sql_query($sql);
-		$max_id = (int) $src_db->sql_fetchfield('max_user_id');
-		$src_db->sql_freeresult($result);
-
-		if ($convert->mysql_convert && $same_db)
-		{
-			$src_db->sql_query("SET NAMES 'utf8'");
-		}
-
-		// If there is a user id 1, we need to increment user ids. :/
-		if ($id === 1)
-		{
-			set_config('increment_user_id', ($max_id + 1), true);
-			$config['increment_user_id'] = $max_id + 1;
-		}
-		else
-		{
-			set_config('increment_user_id', 0, true);
-			$config['increment_user_id'] = 0;
-		}
-	}
-
-	// If the old user id is -1 in 2.0.x it is the anonymous user...
-	if ($user_id == -1)
-	{
-		return ANONYMOUS;
-	}
-
-	if (!empty($config['increment_user_id']) && $user_id == 1)
-	{
-		return $config['increment_user_id'];
-	}
-
-	// A user id of 0 can happen, for example within the ban table if no user is banned...
-	// Within the posts and topics table this can be "dangerous" but is the fault of the user
-	// having mods installed (a poster id of 0 is not possible in 2.0.x).
-	// Therefore, we return the user id "as is".
-
-	return (int) $user_id;
-}
-
-/* Copy additional table fields from old forum to new forum if user wants this (for Mod compatibility for example)
-function phpbb_copy_table_fields()
-{
-}
-*/
-
-/**
-* Convert authentication
-* user, group and forum table has to be filled in order to work
-*/
-function phpbb_convert_authentication($mode)
-{
-	global $db, $src_db, $same_db, $convert, $user, $config;
-
-	if ($mode == 'start')
-	{
-		$db->sql_query($convert->truncate_statement . ACL_USERS_TABLE);
-		$db->sql_query($convert->truncate_statement . ACL_GROUPS_TABLE);
-
-		// What we will do is handling all 2.0.x admins as founder to replicate what is common in 2.0.x.
-		// After conversion the main admin need to make sure he is removing permissions and the founder status if wanted.
-
-
-		// Grab user ids of users with user_level of ADMIN
-		$sql = "SELECT user_id
-			FROM {$convert->src_table_prefix}users
-			WHERE user_level = 1
-			ORDER BY user_regdate ASC";
-		$result = $src_db->sql_query($sql);
-
-		while ($row = $src_db->sql_fetchrow($result))
-		{
-			$user_id = (int) phpbb_user_id($row['user_id']);
-			// Set founder admin...
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_type = ' . USER_FOUNDER . "
-				WHERE user_id = $user_id";
-			$db->sql_query($sql);
-		}
-		$src_db->sql_freeresult($result);
-
-		$sql = 'SELECT group_id
-			FROM ' . GROUPS_TABLE . "
-			WHERE group_name_clean = '" . $db->sql_escape('bots') . "'";
-		$result = $db->sql_query($sql);
-		$bot_group_id = (int) $db->sql_fetchfield('group_id');
-		$db->sql_freeresult($result);
-	}
-
-	// Grab forum auth information
-	$sql = "SELECT *
-		FROM {$convert->src_table_prefix}forums";
-	$result = $src_db->sql_query($sql);
-
-	$forum_access = array();
-	while ($row = $src_db->sql_fetchrow($result))
-	{
-		$forum_access[$row['forum_id']] = $row;
-	}
-	$src_db->sql_freeresult($result);
-
-	if ($convert->mysql_convert && $same_db)
-	{
-		$src_db->sql_query("SET NAMES 'binary'");
-	}
-	// Grab user auth information from 2.0.x board
-	$sql = "SELECT ug.user_id, aa.*
-		FROM {$convert->src_table_prefix}auth_access aa, {$convert->src_table_prefix}user_group ug, {$convert->src_table_prefix}groups g, {$convert->src_table_prefix}forums f
-		WHERE g.group_id = aa.group_id
-			AND g.group_single_user = 1
-			AND ug.group_id = g.group_id
-			AND f.forum_id = aa.forum_id";
-	$result = $src_db->sql_query($sql);
-
-	$user_access = array();
-	while ($row = $src_db->sql_fetchrow($result))
-	{
-		$user_access[$row['forum_id']][] = $row;
-	}
-	$src_db->sql_freeresult($result);
-
-	// Grab group auth information
-	$sql = "SELECT g.group_id, aa.*
-		FROM {$convert->src_table_prefix}auth_access aa, {$convert->src_table_prefix}groups g
-		WHERE g.group_id = aa.group_id
-			AND g.group_single_user <> 1";
-	$result = $src_db->sql_query($sql);
-
-	$group_access = array();
-	while ($row = $src_db->sql_fetchrow($result))
-	{
-		$group_access[$row['forum_id']][] = $row;
-	}
-	$src_db->sql_freeresult($result);
-
-	if ($convert->mysql_convert && $same_db)
-	{
-		$src_db->sql_query("SET NAMES 'utf8'");
-	}
-
-	// Add Forum Access List
-	$auth_map = array(
-		'auth_view'			=> array('f_', 'f_list'),
-		'auth_read'			=> array('f_read', 'f_search'),
-		'auth_post'			=> array('f_post', 'f_bbcode', 'f_smilies', 'f_img', 'f_sigs', 'f_postcount', 'f_report', 'f_subscribe', 'f_print', 'f_email'),
-		'auth_reply'		=> 'f_reply',
-		'auth_edit'			=> 'f_edit',
-		'auth_delete'		=> 'f_delete',
-		'auth_pollcreate'	=> 'f_poll',
-		'auth_vote'			=> 'f_vote',
-		'auth_announce'		=> 'f_announce',
-		'auth_sticky'		=> 'f_sticky',
-		'auth_attachments'	=> array('f_attach', 'f_download'),
-		'auth_download'		=> 'f_download',
-	);
-
-	// Define the ACL constants used in 2.0 to make the code slightly more readable
-	define('AUTH_ALL', 0);
-	define('AUTH_REG', 1);
-	define('AUTH_ACL', 2);
-	define('AUTH_MOD', 3);
-	define('AUTH_ADMIN', 5);
-
-	// A mapping of the simple permissions used by 2.0
-	$simple_auth_ary = array(
-		'public'			=> array(
-			'auth_view'			=> AUTH_ALL,
-			'auth_read'			=> AUTH_ALL,
-			'auth_post'			=> AUTH_ALL,
-			'auth_reply'		=> AUTH_ALL,
-			'auth_edit'			=> AUTH_REG,
-			'auth_delete'		=> AUTH_REG,
-			'auth_sticky'		=> AUTH_MOD,
-			'auth_announce'		=> AUTH_MOD,
-			'auth_vote'			=> AUTH_REG,
-			'auth_pollcreate'	=> AUTH_REG,
-		),
-		'registered'		=> array(
-			'auth_view'			=> AUTH_ALL,
-			'auth_read'			=> AUTH_ALL,
-			'auth_post'			=> AUTH_REG,
-			'auth_reply'		=> AUTH_REG,
-			'auth_edit'			=> AUTH_REG,
-			'auth_delete'		=> AUTH_REG,
-			'auth_sticky'		=> AUTH_MOD,
-			'auth_announce'		=> AUTH_MOD,
-			'auth_vote'			=> AUTH_REG,
-			'auth_pollcreate'	=> AUTH_REG,
-		),
-		'registered_hidden'	=> array(
-			'auth_view'			=> AUTH_REG,
-			'auth_read'			=> AUTH_REG,
-			'auth_post'			=> AUTH_REG,
-			'auth_reply'		=> AUTH_REG,
-			'auth_edit'			=> AUTH_REG,
-			'auth_delete'		=> AUTH_REG,
-			'auth_sticky'		=> AUTH_MOD,
-			'auth_announce'		=> AUTH_MOD,
-			'auth_vote'			=> AUTH_REG,
-			'auth_pollcreate'	=> AUTH_REG,
-		),
-		'private'			=> array(
-			'auth_view'			=> AUTH_ALL,
-			'auth_read'			=> AUTH_ACL,
-			'auth_post'			=> AUTH_ACL,
-			'auth_reply'		=> AUTH_ACL,
-			'auth_edit'			=> AUTH_ACL,
-			'auth_delete'		=> AUTH_ACL,
-			'auth_sticky'		=> AUTH_ACL,
-			'auth_announce'		=> AUTH_MOD,
-			'auth_vote'			=> AUTH_ACL,
-			'auth_pollcreate'	=> AUTH_ACL,
-		),
-		'private_hidden'	=> array(
-			'auth_view'			=> AUTH_ACL,
-			'auth_read'			=> AUTH_ACL,
-			'auth_post'			=> AUTH_ACL,
-			'auth_reply'		=> AUTH_ACL,
-			'auth_edit'			=> AUTH_ACL,
-			'auth_delete'		=> AUTH_ACL,
-			'auth_sticky'		=> AUTH_ACL,
-			'auth_announce'		=> AUTH_MOD,
-			'auth_vote'			=> AUTH_ACL,
-			'auth_pollcreate'	=> AUTH_ACL,
-		),
-		'moderator'			=> array(
-			'auth_view'			=> AUTH_ALL,
-			'auth_read'			=> AUTH_MOD,
-			'auth_post'			=> AUTH_MOD,
-			'auth_reply'		=> AUTH_MOD,
-			'auth_edit'			=> AUTH_MOD,
-			'auth_delete'		=> AUTH_MOD,
-			'auth_sticky'		=> AUTH_MOD,
-			'auth_announce'		=> AUTH_MOD,
-			'auth_vote'			=> AUTH_MOD,
-			'auth_pollcreate'	=> AUTH_MOD,
-		),
-		'moderator_hidden'	=> array(
-			'auth_view'			=> AUTH_MOD,
-			'auth_read'			=> AUTH_MOD,
-			'auth_post'			=> AUTH_MOD,
-			'auth_reply'		=> AUTH_MOD,
-			'auth_edit'			=> AUTH_MOD,
-			'auth_delete'		=> AUTH_MOD,
-			'auth_sticky'		=> AUTH_MOD,
-			'auth_announce'		=> AUTH_MOD,
-			'auth_vote'			=> AUTH_MOD,
-			'auth_pollcreate'	=> AUTH_MOD,
-		),
-	);
-
-	if ($mode == 'start')
-	{
-		user_group_auth('guests', 'SELECT user_id, {GUESTS} FROM ' . USERS_TABLE . ' WHERE user_id = ' . ANONYMOUS, false);
-		user_group_auth('registered', 'SELECT user_id, {REGISTERED} FROM ' . USERS_TABLE . ' WHERE user_id <> ' . ANONYMOUS . " AND group_id <> $bot_group_id", false);
-
-		// Selecting from old table
-		if (!empty($config['increment_user_id']))
-		{
-			$auth_sql = 'SELECT user_id, {ADMINISTRATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1 AND user_id <> 1';
-			user_group_auth('administrators', $auth_sql, true);
-
-			$auth_sql = 'SELECT ' . $config['increment_user_id'] . ' as user_id, {ADMINISTRATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1 AND user_id = 1';
-			user_group_auth('administrators', $auth_sql, true);
-		}
-		else
-		{
-			$auth_sql = 'SELECT user_id, {ADMINISTRATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1';
-			user_group_auth('administrators', $auth_sql, true);
-		}
-
-		if (!empty($config['increment_user_id']))
-		{
-			$auth_sql = 'SELECT user_id, {GLOBAL_MODERATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1 AND user_id <> 1';
-			user_group_auth('global_moderators', $auth_sql, true);
-
-			$auth_sql = 'SELECT ' . $config['increment_user_id'] . ' as user_id, {GLOBAL_MODERATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1 AND user_id = 1';
-			user_group_auth('global_moderators', $auth_sql, true);
-		}
-		else
-		{
-			$auth_sql = 'SELECT user_id, {GLOBAL_MODERATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1';
-			user_group_auth('global_moderators', $auth_sql, true);
-		}
-	}
-	else if ($mode == 'first')
-	{
-		// Go through all 2.0.x forums
-		foreach ($forum_access as $forum)
-		{
-			$new_forum_id = (int) $forum['forum_id'];
-
-			// Administrators have full access to all forums whatever happens
-			mass_auth('group_role', $new_forum_id, 'administrators', 'FORUM_FULL');
-
-			$matched_type = '';
-			foreach ($simple_auth_ary as $key => $auth_levels)
-			{
-				$matched = 1;
-				foreach ($auth_levels as $k => $level)
-				{
-					if ($forum[$k] != $auth_levels[$k])
-					{
-						$matched = 0;
-					}
-				}
-
-				if ($matched)
-				{
-					$matched_type = $key;
-					break;
-				}
-			}
-
-			switch ($matched_type)
-			{
-				case 'public':
-					mass_auth('group_role', $new_forum_id, 'guests', 'FORUM_LIMITED');
-					mass_auth('group_role', $new_forum_id, 'registered', 'FORUM_LIMITED_POLLS');
-					mass_auth('group_role', $new_forum_id, 'bots', 'FORUM_BOT');
-				break;
-
-				case 'registered':
-					mass_auth('group_role', $new_forum_id, 'guests', 'FORUM_READONLY');
-					mass_auth('group_role', $new_forum_id, 'bots', 'FORUM_BOT');
-
-				// no break;
-
-				case 'registered_hidden':
-					mass_auth('group_role', $new_forum_id, 'registered', 'FORUM_POLLS');
-				break;
-
-				case 'private':
-				case 'private_hidden':
-				case 'moderator':
-				case 'moderator_hidden':
-				default:
-					// The permissions don't match a simple set, so we're going to have to map them directly
-
-					// No post approval for all, in 2.0.x this feature does not exist
-					mass_auth('group', $new_forum_id, 'guests', 'f_noapprove', ACL_YES);
-					mass_auth('group', $new_forum_id, 'registered', 'f_noapprove', ACL_YES);
-
-					// Go through authentication map
-					foreach ($auth_map as $old_auth_key => $new_acl)
-					{
-						// If old authentication key does not exist we continue
-						// This is helpful for mods adding additional authentication fields, we need to add them to the auth_map array
-						if (!isset($forum[$old_auth_key]))
-						{
-							continue;
-						}
-
-						// Now set the new ACL correctly
-						switch ($forum[$old_auth_key])
-						{
-							// AUTH_ALL
-							case AUTH_ALL:
-								mass_auth('group', $new_forum_id, 'guests', $new_acl, ACL_YES);
-								mass_auth('group', $new_forum_id, 'bots', $new_acl, ACL_YES);
-								mass_auth('group', $new_forum_id, 'registered', $new_acl, ACL_YES);
-							break;
-
-							// AUTH_REG
-							case AUTH_REG:
-								mass_auth('group', $new_forum_id, 'registered', $new_acl, ACL_YES);
-							break;
-
-							// AUTH_ACL
-							case AUTH_ACL:
-								// Go through the old group access list for this forum
-								if (isset($group_access[$forum['forum_id']]))
-								{
-									foreach ($group_access[$forum['forum_id']] as $index => $access)
-									{
-										// We only check for ACL_YES equivalence entry
-										if (isset($access[$old_auth_key]) && $access[$old_auth_key] == 1)
-										{
-											mass_auth('group', $new_forum_id, (int) $access['group_id'], $new_acl, ACL_YES);
-										}
-									}
-								}
-
-								if (isset($user_access[$forum['forum_id']]))
-								{
-									foreach ($user_access[$forum['forum_id']] as $index => $access)
-									{
-										// We only check for ACL_YES equivalence entry
-										if (isset($access[$old_auth_key]) && $access[$old_auth_key] == 1)
-										{
-											mass_auth('user', $new_forum_id, (int) phpbb_user_id($access['user_id']), $new_acl, ACL_YES);
-										}
-									}
-								}
-							break;
-
-							// AUTH_MOD
-							case AUTH_MOD:
-								if (isset($group_access[$forum['forum_id']]))
-								{
-									foreach ($group_access[$forum['forum_id']] as $index => $access)
-									{
-										// We only check for ACL_YES equivalence entry
-										if (isset($access[$old_auth_key]) && $access[$old_auth_key] == 1)
-										{
-											mass_auth('group', $new_forum_id, (int) $access['group_id'], $new_acl, ACL_YES);
-										}
-									}
-								}
-
-								if (isset($user_access[$forum['forum_id']]))
-								{
-									foreach ($user_access[$forum['forum_id']] as $index => $access)
-									{
-										// We only check for ACL_YES equivalence entry
-										if (isset($access[$old_auth_key]) && $access[$old_auth_key] == 1)
-										{
-											mass_auth('user', $new_forum_id, (int) phpbb_user_id($access['user_id']), $new_acl, ACL_YES);
-										}
-									}
-								}
-							break;
-						}
-					}
-				break;
-			}
-		}
-	}
-	else if ($mode == 'second')
-	{
-		// Assign permission roles and other default permissions
-
-		// guests having u_download and u_search ability
-		$db->sql_query('INSERT INTO ' . ACL_GROUPS_TABLE . ' (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) SELECT ' . get_group_id('guests') . ', 0, auth_option_id, 0, 1 FROM ' . ACL_OPTIONS_TABLE . " WHERE auth_option IN ('u_', 'u_download', 'u_search')");
-
-		// administrators/global mods having full user features
-		mass_auth('group_role', 0, 'administrators', 'USER_FULL');
-		mass_auth('group_role', 0, 'global_moderators', 'USER_FULL');
-
-		// By default all converted administrators are given full access
-		mass_auth('group_role', 0, 'administrators', 'ADMIN_FULL');
-
-		// All registered users are assigned the standard user role
-		mass_auth('group_role', 0, 'registered', 'USER_STANDARD');
-		mass_auth('group_role', 0, 'registered_coppa', 'USER_STANDARD');
-
-		// Instead of administrators being global moderators we give the MOD_FULL role to global mods (admins already assigned to this group)
-		mass_auth('group_role', 0, 'global_moderators', 'MOD_FULL');
-
-		// And now those who have had their avatar rights removed get assigned a more restrictive role
-		$sql = 'SELECT user_id FROM ' . $convert->src_table_prefix . 'users
-			WHERE user_allowavatar = 0
-				AND user_id > 0';
-		$result = $src_db->sql_query($sql);
-
-		while ($row = $src_db->sql_fetchrow($result))
-		{
-			mass_auth('user_role', 0, (int) phpbb_user_id($row['user_id']), 'USER_NOAVATAR');
-		}
-		$src_db->sql_freeresult($result);
-
-		// And the same for those who have had their PM rights removed
-		$sql = 'SELECT user_id FROM ' . $convert->src_table_prefix . 'users
-			WHERE user_allow_pm = 0
-				AND user_id > 0';
-		$result = $src_db->sql_query($sql);
-
-		while ($row = $src_db->sql_fetchrow($result))
-		{
-			mass_auth('user_role', 0, (int) phpbb_user_id($row['user_id']), 'USER_NOPM');
-		}
-		$src_db->sql_freeresult($result);
-	}
-	else if ($mode == 'third')
-	{
-		// And now the moderators
-		// We make sure that they have at least standard access to the forums they moderate in addition to the moderating permissions
-
-		$mod_post_map = array(
-			'auth_announce'		=> 'f_announce',
-			'auth_sticky'		=> 'f_sticky'
-		);
-
-		foreach ($user_access as $forum_id => $access_map)
-		{
-			$forum_id = (int) $forum_id;
-
-			foreach ($access_map as $access)
-			{
-				if (isset($access['auth_mod']) && $access['auth_mod'] == 1)
-				{
-					mass_auth('user_role', $forum_id, (int) phpbb_user_id($access['user_id']), 'MOD_STANDARD');
-					mass_auth('user_role', $forum_id, (int) phpbb_user_id($access['user_id']), 'FORUM_STANDARD');
-					foreach ($mod_post_map as $old => $new)
-					{
-						if (isset($forum_access[$forum_id]) && isset($forum_access[$forum_id][$old]) && $forum_access[$forum_id][$old] == AUTH_MOD)
-						{
-							mass_auth('user', $forum_id, (int) phpbb_user_id($access['user_id']), $new, ACL_YES);
-						}
-					}
-				}
-			}
-		}
-
-		foreach ($group_access as $forum_id => $access_map)
-		{
-			$forum_id = (int) $forum_id;
-
-			foreach ($access_map as $access)
-			{
-				if (isset($access['auth_mod']) && $access['auth_mod'] == 1)
-				{
-					mass_auth('group_role', $forum_id, (int) $access['group_id'], 'MOD_STANDARD');
-					mass_auth('group_role', $forum_id, (int) $access['group_id'], 'FORUM_STANDARD');
-					foreach ($mod_post_map as $old => $new)
-					{
-						if (isset($forum_access[$forum_id]) && isset($forum_access[$forum_id][$old]) && $forum_access[$forum_id][$old] == AUTH_MOD)
-						{
-							mass_auth('group', $forum_id, (int) $access['group_id'], $new, ACL_YES);
-						}
-					}
-				}
-			}
-		}
-
-		// We grant everyone readonly access to the categories to ensure that the forums are visible
-		$sql = 'SELECT forum_id, forum_name, parent_id, left_id, right_id
-			FROM ' . FORUMS_TABLE . '
-			ORDER BY left_id ASC';
-		$result = $db->sql_query($sql);
-
-		$parent_forums = $forums = array();
-		while ($row = $db->sql_fetchrow($result))
-		{
-			if ($row['parent_id'] == 0)
-			{
-				mass_auth('group_role', $row['forum_id'], 'administrators', 'FORUM_FULL');
-				mass_auth('group_role', $row['forum_id'], 'global_moderators', 'FORUM_FULL');
-				$parent_forums[] = $row;
-			}
-			else
-			{
-				$forums[] = $row;
-			}
-		}
-		$db->sql_freeresult($result);
-
-		global $auth;
-
-		// Let us see which groups have access to these forums...
-		foreach ($parent_forums as $row)
-		{
-			// Get the children
-			$branch = $forum_ids = array();
-
-			foreach ($forums as $key => $_row)
-			{
-				if ($_row['left_id'] > $row['left_id'] && $_row['left_id'] < $row['right_id'])
-				{
-					$branch[] = $_row;
-					$forum_ids[] = $_row['forum_id'];
-					continue;
-				}
-			}
-
-			if (sizeof($forum_ids))
-			{
-				// Now make sure the user is able to read these forums
-				$hold_ary = $auth->acl_group_raw_data(false, 'f_list', $forum_ids);
-
-				if (empty($hold_ary))
-				{
-					continue;
-				}
-
-				foreach ($hold_ary as $g_id => $f_id_ary)
-				{
-					$set_group = false;
-
-					foreach ($f_id_ary as $f_id => $auth_ary)
-					{
-						foreach ($auth_ary as $auth_option => $setting)
-						{
-							if ($setting == ACL_YES)
-							{
-								$set_group = true;
-								break 2;
-							}
-						}
-					}
-
-					if ($set_group)
-					{
-						mass_auth('group', $row['forum_id'], $g_id, 'f_list', ACL_YES);
-					}
-				}
-			}
-		}
-	}
-}
-
-/**
-* Set primary group.
-* Really simple and only based on user_level (remaining groups will be assigned later)
-*/
-function phpbb_set_primary_group($user_level)
-{
-	global $convert_row;
-
-	if ($user_level == 1)
-	{
-		return get_group_id('administrators');
-	}
-/*	else if ($user_level == 2)
-	{
-		return get_group_id('global_moderators');
-	}
-	else if ($user_level == 0 && $convert_row['user_active'])*/
-	else if ($convert_row['user_active'])
-	{
-		return get_group_id('registered');
-	}
-
-	return 0;
-}
-
-/**
-* Convert the group name, making sure to avoid conflicts with 3.0 special groups
-*/
-function phpbb_convert_group_name($group_name)
-{
-	$default_groups = array(
-		'GUESTS',
-		'REGISTERED',
-		'REGISTERED_COPPA',
-		'GLOBAL_MODERATORS',
-		'ADMINISTRATORS',
-		'BOTS',
-	);
-
-	if (in_array(strtoupper($group_name), $default_groups))
-	{
-		return 'phpBB2 - ' . $group_name;
-	}
-
-	return phpbb_set_default_encoding($group_name);
-}
-
-/**
-* Convert the group name, making sure to avoid conflicts with 3.0 special groups
-*/
-function phpbb_convert_group_name_clean($group_name)
-{
-	$default_groups = array(
-		'GUESTS',
-		'REGISTERED',
-		'REGISTERED_COPPA',
-		'GLOBAL_MODERATORS',
-		'ADMINISTRATORS',
-		'BOTS',
-	);
-
-	if (in_array(strtoupper($group_name), $default_groups))
-	{
-		return utf8_clean_string('phpBB2 - ' . $group_name);
-	}
-
-	return utf8_clean_string(phpbb_set_default_encoding($group_name));
-}
-
-/**
-* Convert the group type constants
-*/
-function phpbb_convert_group_type($group_type)
-{
-	switch ($group_type)
-	{
-		case 0:
-			return GROUP_OPEN;
-		break;
-
-		case 1:
-			return GROUP_CLOSED;
-		break;
-
-		case 2:
-			return GROUP_HIDDEN;
-		break;
-	}
-
-	// Never return GROUP_SPECIAL here, because only phpBB3's default groups are allowed to have this type set.
-	return GROUP_HIDDEN;
-}
-
-/**
-* Convert the topic type constants
-*/
-function phpbb_convert_topic_type($topic_type)
-{
-	switch ($topic_type)
-	{
-		case 0:
-			return POST_NORMAL;
-		break;
-
-		case 1:
-			return POST_STICKY;
-		break;
-
-		case 2:
-			return POST_ANNOUNCE;
-		break;
-
-		case 3:
-			return POST_GLOBAL;
-		break;
-	}
-
-	return POST_NORMAL;
-}
-
-function phpbb_replace_size($matches)
-{
-	return '[size=' . min(200, ceil(100.0 * (((double) $matches[1])/12.0))) . ':' . $matches[2] . ']';
-}
-
-/**
-* Reparse the message stripping out the bbcode_uid values and adding new ones and setting the bitfield
-* @todo What do we want to do about HTML in messages - currently it gets converted to the entities, but there may be some objections to this
-*/
-function phpbb_prepare_message($message)
-{
-	global $db, $convert, $user, $config, $convert_row, $message_parser;
-
-	if (!$message)
-	{
-		$convert->row['mp_bbcode_bitfield'] = $convert_row['mp_bbcode_bitfield'] = 0;
-		return '';
-	}
-
-	// Decode phpBB 2.0.x Message
-	if (isset($convert->row['old_bbcode_uid']) && $convert->row['old_bbcode_uid'] != '')
-	{
-		// Adjust size...
-		if (strpos($message, '[size=') !== false)
-		{
-			$message = preg_replace_callback('/\[size=(\d*):(' . $convert->row['old_bbcode_uid'] . ')\]/', 'phpbb_replace_size', $message);
-		}
-
-		$message = preg_replace('/\:(([a-z0-9]:)?)' . $convert->row['old_bbcode_uid'] . '/s', '', $message);
-	}
-
-	if (strpos($message, '[quote=') !== false)
-	{
-		$message = preg_replace('/\[quote="(.*?)"\]/s', '[quote=&quot;\1&quot;]', $message);
-		$message = preg_replace('/\[quote=\\\"(.*?)\\\"\]/s', '[quote=&quot;\1&quot;]', $message);
-
-		// let's hope that this solves more problems than it causes. Deal with escaped quotes.
-		$message = str_replace('\"', '&quot;', $message);
-		$message = str_replace('\&quot;', '&quot;', $message);
-	}
-
-	// Already the new user id ;)
-	$user_id = $convert->row['poster_id'];
-
-	$message = str_replace('<', '&lt;', $message);
-	$message = str_replace('>', '&gt;', $message);
-	$message = str_replace('<br />', "\n", $message);
-
-	// make the post UTF-8
-	$message = phpbb_set_encoding($message);
-
-	$message_parser->warn_msg = array(); // Reset the errors from the previous message
-	$message_parser->bbcode_uid = make_uid($convert->row['post_time']);
-	$message_parser->message = $message;
-	unset($message);
-
-	// Make sure options are set.
-//	$enable_html = (!isset($row['enable_html'])) ? false : $row['enable_html'];
-	$enable_bbcode = (!isset($convert->row['enable_bbcode'])) ? true : $convert->row['enable_bbcode'];
-	$enable_smilies = (!isset($convert->row['enable_smilies'])) ? true : $convert->row['enable_smilies'];
-	$enable_magic_url = (!isset($convert->row['enable_magic_url'])) ? true : $convert->row['enable_magic_url'];
-
-	// parse($allow_bbcode, $allow_magic_url, $allow_smilies, $allow_img_bbcode = true, $allow_flash_bbcode = true, $allow_quote_bbcode = true, $allow_url_bbcode = true, $update_this_message = true, $mode = 'post')
-	$message_parser->parse($enable_bbcode, $enable_magic_url, $enable_smilies);
-
-	if (sizeof($message_parser->warn_msg))
-	{
-		$msg_id = isset($convert->row['post_id']) ? $convert->row['post_id'] : $convert->row['privmsgs_id'];
-		$convert->p_master->error('<span style="color:red">' . $user->lang['POST_ID'] . ': ' . $msg_id . ' ' . $user->lang['CONV_ERROR_MESSAGE_PARSER'] . ': <br /><br />' . implode('<br />', $message_parser->warn_msg), __LINE__, __FILE__, true);
-	}
-
-	$convert->row['mp_bbcode_bitfield'] = $convert_row['mp_bbcode_bitfield'] = $message_parser->bbcode_bitfield;
-
-	$message = $message_parser->message;
-	unset($message_parser->message);
-
-	return $message;
-}
-
-/**
-* Return the bitfield calculated by the previous function
-*/
-function get_bbcode_bitfield()
-{
-	global $convert_row;
-
-	return $convert_row['mp_bbcode_bitfield'];
-}
-
-/**
-* Determine the last user to edit a post
-* In practice we only tracked edits by the original poster in 2.0.x so this will only be set if they had edited their own post
-*/
-function phpbb_post_edit_user()
-{
-	global $convert_row, $config;
-
-	if (isset($convert_row['post_edit_count']))
-	{
-		return phpbb_user_id($convert_row['poster_id']);
-	}
-
-	return 0;
-}
-
-/**
-* Obtain the path to uploaded files on the 2.0.x forum
-* This is only used if the Attachment MOD was installed
-*/
-function phpbb_get_files_dir()
-{
-	if (!defined('MOD_ATTACHMENT'))
-	{
-		return;
-	}
-
-	global $src_db, $same_db, $convert, $user, $config;
-
-	if ($convert->mysql_convert && $same_db)
-	{
-		$src_db->sql_query("SET NAMES 'binary'");
-	}
-	$sql = 'SELECT config_value AS upload_dir
-		FROM ' . $convert->src_table_prefix . "attachments_config
-		WHERE config_name = 'upload_dir'";
-	$result = $src_db->sql_query($sql);
-	$upload_path = $src_db->sql_fetchfield('upload_dir');
-	$src_db->sql_freeresult($result);
-
-	$sql = 'SELECT config_value AS ftp_upload
-		FROM ' . $convert->src_table_prefix . "attachments_config
-		WHERE config_name = 'allow_ftp_upload'";
-	$result = $src_db->sql_query($sql);
-	$ftp_upload = (int) $src_db->sql_fetchfield('ftp_upload');
-	$src_db->sql_freeresult($result);
-
-	if ($convert->mysql_convert && $same_db)
-	{
-		$src_db->sql_query("SET NAMES 'utf8'");
-	}
-
-	if ($ftp_upload)
-	{
-		$convert->p_master->error($user->lang['CONV_ERROR_ATTACH_FTP_DIR'], __LINE__, __FILE__);
-	}
-
-	return $upload_path;
-}
-
-/**
-* Copy thumbnails of uploaded images from the 2.0.x forum
-* This is only used if the Attachment MOD was installed
-*/
-function phpbb_copy_thumbnails()
-{
-	global $db, $convert, $user, $config;
-
-	$src_path = $convert->options['forum_path'] . '/' . phpbb_get_files_dir() . '/thumbs/';
-
-	if ($handle = @opendir($src_path))
-	{
-		while ($entry = readdir($handle))
-		{
-			if ($entry[0] == '.')
-			{
-				continue;
-			}
-
-			if (is_dir($src_path . $entry))
-			{
-				continue;
-			}
-			else
-			{
-				copy_file($src_path . $entry, $config['upload_path'] . '/' . preg_replace('/^t_/', 'thumb_', $entry));
-				@unlink(PHPBB_ROOT_PATH . $config['upload_path'] . '/thumbs/' . $entry);
-			}
-		}
-		closedir($handle);
-	}
-}
-
-/**
-* Convert the attachment category constants
-* This is only used if the Attachment MOD was installed
-*/
-function phpbb_attachment_category($cat_id)
-{
-	switch ($cat_id)
-	{
-		case 1:
-			return ATTACHMENT_CATEGORY_IMAGE;
-		break;
-
-		case 2:
-			return ATTACHMENT_CATEGORY_WM;
-		break;
-
-		case 3:
-			return ATTACHMENT_CATEGORY_FLASH;
-		break;
-	}
-
-	return ATTACHMENT_CATEGORY_NONE;
-}
-
-/**
-* Obtain list of forums in which different attachment categories can be used
-*/
-function phpbb_attachment_forum_perms($forum_permissions)
-{
-	if (empty($forum_permissions))
-	{
-		return '';
-	}
-
-	// Decode forum permissions
-	$forum_ids = array();
-
-	$one_char_encoding = '#';
-	$two_char_encoding = '.';
-
-	$auth_len = 1;
-	for ($pos = 0; $pos < strlen($forum_permissions); $pos += $auth_len)
-	{
-		$forum_auth = substr($forum_permissions, $pos, 1);
-		if ($forum_auth == $one_char_encoding)
-		{
-			$auth_len = 1;
-			continue;
-		}
-		else if ($forum_auth == $two_char_encoding)
-		{
-			$auth_len = 2;
-			$pos--;
-			continue;
-		}
-
-		$forum_auth = substr($forum_permissions, $pos, $auth_len);
-		$forum_id = base64_unpack($forum_auth);
-
-		$forum_ids[] = (int) $forum_id;
-	}
-
-	if (sizeof($forum_ids))
-	{
-		return attachment_forum_perms($forum_ids);
-	}
-
-	return '';
-}
-
-/**
-* Convert the avatar type constants
-*/
-function phpbb_avatar_type($type)
-{
-	switch ($type)
-	{
-		case 1:
-			return AVATAR_UPLOAD;
-		break;
-
-		case 2:
-			return AVATAR_REMOTE;
-		break;
-
-		case 3:
-			return AVATAR_GALLERY;
-		break;
-	}
-
-	return 0;
-}
-
-
-/**
-* Just undos the replacing of '<' and '>'
-*/
-function  phpbb_smilie_html_decode($code)
-{
-	$code = str_replace('&lt;', '<', $code);
-	return str_replace('&gt;', '>', $code);
-}
-
-/**
-* Transfer avatars, copying the image if it was uploaded
-*/
-function phpbb_import_avatar($user_avatar)
-{
-	global $convert_row;
-
-	if (!$convert_row['user_avatar_type'])
-	{
-		return '';
-	}
-	else if ($convert_row['user_avatar_type'] == 1)
-	{
-		// Uploaded avatar
-		return import_avatar($user_avatar, false, $convert_row['user_id']);
-	}
-	else if ($convert_row['user_avatar_type'] == 2)
-	{
-		// Remote avatar
-		return $user_avatar;
-	}
-	else if ($convert_row['user_avatar_type'] == 3)
-	{
-		// Gallery avatar
-		return $user_avatar;
-	}
-
-	return '';
-}
-
-
-/**
-* Find out about the avatar's dimensions
-*/
-function phpbb_get_avatar_height($user_avatar)
-{
-	global $convert_row;
-
-	if (empty($convert_row['user_avatar_type']))
-	{
-		return 0;
-	}
-	return get_avatar_height($user_avatar, 'phpbb_avatar_type', $convert_row['user_avatar_type']);
-}
-
-
-/**
-* Find out about the avatar's dimensions
-*/
-function phpbb_get_avatar_width($user_avatar)
-{
-	global $convert_row;
-
-	if (empty($convert_row['user_avatar_type']))
-	{
-		return 0;
-	}
-
-	return get_avatar_width($user_avatar, 'phpbb_avatar_type', $convert_row['user_avatar_type']);
-}
-
-
-/**
-* Calculate the correct to_address field for private messages
-*/
-function phpbb_privmsgs_to_userid($to_userid)
-{
-	global $config;
-
-	return 'u_' . phpbb_user_id($to_userid);
-}
-
-/**
-* Calculate whether a private message was unread using the bitfield
-*/
-function phpbb_unread_pm($pm_type)
-{
-	return ($pm_type == 5) ? 1 : 0;
-}
-
-/**
-* Calculate whether a private message was new using the bitfield
-*/
-function phpbb_new_pm($pm_type)
-{
-	return ($pm_type == 1) ? 1 : 0;
-}
-
-/**
-* Obtain the folder_id for the custom folder created to replace the savebox from 2.0.x (used to store saved private messages)
-*/
-function phpbb_get_savebox_id($user_id)
-{
-	global $db;
-
-	$user_id = phpbb_user_id($user_id);
-
-	// Only one custom folder, check only one
-	$sql = 'SELECT folder_id
-		FROM ' . PRIVMSGS_FOLDER_TABLE . '
-		WHERE user_id = ' . $user_id;
-	$result = $db->sql_query_limit($sql, 1);
-	$folder_id = (int) $db->sql_fetchfield('folder_id');
-	$db->sql_freeresult($result);
-
-	return $folder_id;
-}
-
-/**
-* Transfer attachment specific configuration options
-* These were not stored in the main config table on 2.0.x
-* This is only used if the Attachment MOD was installed
-*/
-function phpbb_import_attach_config()
-{
-	global $db, $src_db, $same_db, $convert, $config;
-
-	if ($convert->mysql_convert && $same_db)
-	{
-		$src_db->sql_query("SET NAMES 'binary'");
-	}
-
-	$sql = 'SELECT *
-		FROM ' . $convert->src_table_prefix . 'attachments_config';
-	$result = $src_db->sql_query($sql);
-
-	if ($convert->mysql_convert && $same_db)
-	{
-		$src_db->sql_query("SET NAMES 'utf8'");
-	}
-
-	$attach_config = array();
-	while ($row = $src_db->sql_fetchrow($result))
-	{
-		$attach_config[$row['config_name']] = $row['config_value'];
-	}
-	$src_db->sql_freeresult($result);
-
-	set_config('allow_attachments', 1);
-
-	// old attachment mod? Must be very old if this entry do not exist...
-	if (!empty($attach_config['display_order']))
-	{
-		set_config('display_order', $attach_config['display_order']);
-	}
-	set_config('max_filesize', $attach_config['max_filesize']);
-	set_config('max_filesize_pm', $attach_config['max_filesize_pm']);
-	set_config('attachment_quota', $attach_config['attachment_quota']);
-	set_config('max_attachments', $attach_config['max_attachments']);
-	set_config('max_attachments_pm', $attach_config['max_attachments_pm']);
-	set_config('allow_pm_attach', $attach_config['allow_pm_attach']);
-
-	set_config('img_display_inlined', $attach_config['img_display_inlined']);
-	set_config('img_max_width', $attach_config['img_max_width']);
-	set_config('img_max_height', $attach_config['img_max_height']);
-	set_config('img_link_width', $attach_config['img_link_width']);
-	set_config('img_link_height', $attach_config['img_link_height']);
-	set_config('img_create_thumbnail', $attach_config['img_create_thumbnail']);
-	set_config('img_max_thumb_width', 400);
-	set_config('img_min_thumb_filesize', $attach_config['img_min_thumb_filesize']);
-	set_config('img_imagick', $attach_config['img_imagick']);
-}
-
-/**
-* Calculate the date a user became inactive
-*/
-function phpbb_inactive_time()
-{
-	global $convert_row;
-
-	if ($convert_row['user_active'])
-	{
-		return 0;
-	}
-
-	if ($convert_row['user_lastvisit'])
-	{
-		return $convert_row['user_lastvisit'];
-	}
-
-	return $convert_row['user_regdate'];
-}
-
-/**
-* Calculate the reason a user became inactive
-* We can't actually tell the difference between a manual deactivation and one for profile changes
-* from the data available to assume the latter
-*/
-function phpbb_inactive_reason()
-{
-	global $convert_row;
-
-	if ($convert_row['user_active'])
-	{
-		return 0;
-	}
-
-	if ($convert_row['user_lastvisit'])
-	{
-		return INACTIVE_PROFILE;
-	}
-
-	return INACTIVE_REGISTER;
-}
-
-/**
-* Adjust 2.0.x disallowed names to 3.0.x format
-*/
-function phpbb_disallowed_username($username)
-{
-	// Replace * with %
-	$username = phpbb_set_default_encoding(str_replace('*', '%', $username));
-	return utf8_htmlspecialchars($username);
-}
-
-/**
-* Checks whether there are any usernames on the old board that would map to the same
-* username_clean on phpBB3. Prints out a list if any exist and exits.
-*/
-function phpbb_create_userconv_table()
-{
-	global $db, $src_db, $convert, $table_prefix, $user, $lang;
-
-	// create a temporary table in which we store the clean usernames
-	$drop_sql = 'DROP TABLE ' . USERCONV_TABLE;
-	switch ($db->dbms_type)
-	{
-		case 'firebird':
-			$create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' (
-				user_id INTEGER NOT NULL,
-				username_clean VARCHAR(255) CHARACTER SET UTF8 DEFAULT \'\' NOT NULL COLLATE UNICODE
-			)';
-		break;
-
-		case 'mssql':
-			$create_sql = 'CREATE TABLE [' . USERCONV_TABLE . '] (
-				[user_id] [int] NOT NULL ,
-				[username_clean] [varchar] (255) DEFAULT (\'\') NOT NULL
-			)';
-		break;
-
-		case 'mysql':
-			$create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' (
-				user_id mediumint(8) NOT NULL,
-				username_clean varchar(255) DEFAULT \'\' NOT NULL
-			) CHARACTER SET `utf8` COLLATE `utf8_bin`';
-		break;
-
-		case 'oracle':
-			$create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' (
-				user_id number(8) NOT NULL,
-				username_clean varchar2(255) DEFAULT \'\'
-			)';
-		break;
-
-		case 'postgres':
-			$create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' (
-				user_id INT4 DEFAULT \'0\',
-				username_clean varchar_ci DEFAULT \'\' NOT NULL
-			)';
-		break;
-
-		case 'sqlite':
-			$create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' (
-				user_id INTEGER NOT NULL DEFAULT \'0\',
-				username_clean varchar(255) NOT NULL DEFAULT \'\'
-			)';
-		break;
-	}
-
-	$db->sql_return_on_error(true);
-	$db->sql_query($drop_sql);
-	$db->sql_return_on_error(false);
-	$db->sql_query($create_sql);
-}
-
-function phpbb_check_username_collisions()
-{
-	global $db, $src_db, $convert, $table_prefix, $user, $lang;
-
-	// now find the clean version of the usernames that collide
-	$sql = 'SELECT username_clean
-		FROM ' . USERCONV_TABLE .'
-		GROUP BY username_clean
-		HAVING COUNT(user_id) > 1';
-	$result = $db->sql_query($sql);
-
-	$colliding_names = array();
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$colliding_names[] = $row['username_clean'];
-	}
-	$db->sql_freeresult($result);
-
-	// there was at least one collision, the admin will have to solve it before conversion can continue
-	if (sizeof($colliding_names))
-	{
-		$sql = 'SELECT user_id, username_clean
-			FROM ' . USERCONV_TABLE . '
-			WHERE ' . $db->sql_in_set('username_clean', $colliding_names);
-		$result = $db->sql_query($sql);
-		unset($colliding_names);
-
-		$colliding_user_ids = array();
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$colliding_user_ids[(int) $row['user_id']] = $row['username_clean'];
-		}
-		$db->sql_freeresult($result);
-
-		$sql = 'SELECT username, user_id, user_posts
-			FROM ' . $convert->src_table_prefix . 'users
-			WHERE ' . $src_db->sql_in_set('user_id', array_keys($colliding_user_ids));
-		$result = $src_db->sql_query($sql);
-
-		$colliding_users = array();
-		while ($row = $src_db->sql_fetchrow($result))
-		{
-			$row['user_id'] = (int) $row['user_id'];
-			if (isset($colliding_user_ids[$row['user_id']]))
-			{
-				$colliding_users[$colliding_user_ids[$row['user_id']]][] = $row;
-			}
-		}
-		$src_db->sql_freeresult($result);
-		unset($colliding_user_ids);
-
-		$list = '';
-		foreach ($colliding_users as $username_clean => $users)
-		{
-			$list .= sprintf($user->lang['COLLIDING_CLEAN_USERNAME'], $username_clean) . "<br />\n";
-			foreach ($users as $i => $row)
-			{
-				$list .= sprintf($user->lang['COLLIDING_USER'], $row['user_id'], phpbb_set_default_encoding($row['username']), $row['user_posts']) . "<br />\n";
-			}
-		}
-
-		$lang['INST_ERR_FATAL'] = $user->lang['CONV_ERR_FATAL'];
-		$convert->p_master->error('<span style="color:red">' . $user->lang['COLLIDING_USERNAMES_FOUND'] . '</span></b><br /><br />' . $list . '<b>', __LINE__, __FILE__);
-	}
-
-	$drop_sql = 'DROP TABLE ' . USERCONV_TABLE;
-	$db->sql_query($drop_sql);
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
deleted file mode 100644
index 0be2e0f5b8..0000000000
--- a/phpBB/install/database_update.php
+++ /dev/null
@@ -1,410 +0,0 @@
-<?php
-/**
-*
-* @package install
-* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-$updates_to_version = '3.1.0-dev1';
-
-// Enter any version to update from to test updates. The version within the db will not be updated.
-$debug_from_version = false;
-
-// Return if we "just include it" to find out for which version the database update is responsible for
-if (defined('IN_PHPBB') && defined('IN_INSTALL'))
-{
-	return;
-}
-
-/**
-*/
-define('IN_PHPBB', true);
-define('IN_INSTALL', true);
-
-if (!defined('PHPBB_ROOT_PATH')) define('PHPBB_ROOT_PATH', './../');
-if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-include PHPBB_ROOT_PATH . 'common.' . PHP_EXT;
-
-@set_time_limit(0);
-
-// Start session management
-phpbb::$user->session_begin();
-phpbb::$acl->init(phpbb::$user->data);
-phpbb::$user->setup('install');
-
-if (!phpbb::$user->is_registered)
-{
-	login_box();
-}
-
-if (!phpbb::$acl->acl_get('a_board'))
-{
-	trigger_error('NO_AUTH');
-}
-
-include PHPBB_ROOT_PATH . 'includes/db/db_tools.' . PHP_EXT;
-
-$db_tools = new phpbb_db_tools(phpbb::$db, true);
-
-// Define some variables for the database update
-$inline_update = (request_var('type', 0)) ? true : false;
-
-// Only an example, but also commented out
-$database_update_info = array(
-
-	// Changes from 3.0.5 to 3.1.0-dev1
-	'3.0.5'		=> array(),
-);
-
-$error_ary = array();
-$errored = false;
-
-header('Content-type: text/html; charset=UTF-8');
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="<?php echo phpbb::$user->lang['DIRECTION']; ?>" lang="<?php echo phpbb::$user->lang['USER_LANG']; ?>" xml:lang="<?php echo phpbb::$user->lang['USER_LANG']; ?>">
-<head>
-
-<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-<meta http-equiv="content-language" content="<?php echo phpbb::$user->lang['USER_LANG']; ?>" />
-<meta http-equiv="content-style-type" content="text/css" />
-<meta http-equiv="imagetoolbar" content="no" />
-
-<title><?php echo phpbb::$user->lang['UPDATING_TO_LATEST_STABLE']; ?></title>
-
-<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
-
-</head>
-
-<body>
-<div id="wrap">
-	<div id="page-header">&nbsp;</div>
-
-	<div id="page-body">
-		<div id="acp">
-		<div class="panel">
-			<span class="corners-top"><span></span></span>
-				<div id="content">
-					<div id="main" class="install-body">
-
-	<h1><?php echo phpbb::$user->lang['UPDATING_TO_LATEST_STABLE']; ?></h1>
-
-	<br />
-
-	<p><?php echo phpbb::$user->lang['DATABASE_TYPE']; ?> :: <strong><?php echo phpbb::$db->sql_layer; ?></strong><br />
-<?php
-
-// To let set_config() calls succeed, we need to make the config array available globally
-phpbb::$acm->destroy('#config');
-$config = phpbb_cache::obtain_config();
-
-echo phpbb::$user->lang['PREVIOUS_VERSION'] . ' :: <strong>' . phpbb::$config['version'] . '</strong><br />';
-echo phpbb::$user->lang['UPDATED_VERSION'] . ' :: <strong>' . $updates_to_version . '</strong></p>';
-
-$current_version = str_replace('rc', 'RC', strtolower(phpbb::$config['version']));
-$latest_version = str_replace('rc', 'RC', strtolower($updates_to_version));
-$orig_version = phpbb::$config['version'];
-
-// Fill DB version
-if (empty(phpbb::$config['dbms_version']))
-{
-	set_config('dbms_version', phpbb::$db->sql_server_info(true));
-}
-
-// If the latest version and the current version are 'unequal', we will update the version_update_from, else we do not update anything.
-if ($inline_update)
-{
-	if ($current_version !== $latest_version)
-	{
-		set_config('version_update_from', $orig_version);
-	}
-}
-else
-{
-	// If not called from the update script, we will actually remove the traces
-	phpbb::$db->sql_query('DELETE FROM ' . CONFIG_TABLE . " WHERE config_name = 'version_update_from'");
-}
-
-// Schema updates
-?>
-	<br /><br />
-
-	<h1><?php echo phpbb::$user->lang['UPDATE_DATABASE_SCHEMA']; ?></h1>
-
-	<br />
-	<p><?php echo phpbb::$user->lang['PROGRESS']; ?> :: <strong>
-
-<?php
-
-flush();
-
-// We go through the schema changes from the lowest to the highest version
-// We try to also include versions 'in-between'...
-// We go through the schema changes from the lowest to the highest version
-// We try to also include versions 'in-between'...
-$no_updates = true;
-$versions = array_keys($database_update_info);
-for ($i = 0; $i < sizeof($versions); $i++)
-{
-	$version = $versions[$i];
-	$schema_changes = $database_update_info[$version];
-
-	$next_version = (isset($versions[$i + 1])) ? $versions[$i + 1] : $updates_to_version;
-
-	// If the installed version to be updated to is < than the current version, and if the current version is >= as the version to be updated to next, we will skip the process
-	if (version_compare($version, $current_version, '<') && version_compare($current_version, $next_version, '>='))
-	{
-		continue;
-	}
-
-	if (!sizeof($schema_changes))
-	{
-		continue;
-	}
-
-	// Get statements for schema updates
-	$statements = $db_tools->sql_schema_changes($schema_changes);
-
-	if (sizeof($statements))
-	{
-		$no_updates = false;
-
-		foreach ($statements as $sql)
-		{
-			_sql($sql, $errored, $error_ary);
-		}
-	}
-}
-
-_write_result($no_updates, $errored, $error_ary);
-
-// Data updates
-$error_ary = array();
-$errored = $no_updates = false;
-
-?>
-
-<br /><br />
-<h1><?php echo phpbb::$user->lang['UPDATING_DATA']; ?></h1>
-<br />
-<p><?php echo phpbb::$user->lang['PROGRESS']; ?> :: <strong>
-
-<?php
-
-flush();
-
-$no_updates = true;
-
-$no_updates = true;
-$versions = array_keys($database_update_info);
-
-// some code magic
-for ($i = 0; $i < sizeof($versions); $i++)
-{
-	$version = $versions[$i];
-	$next_version = (isset($versions[$i + 1])) ? $versions[$i + 1] : $updates_to_version;
-
-	// If the installed version to be updated to is < than the current version, and if the current version is >= as the version to be updated to next, we will skip the process
-	if (version_compare($version, $current_version, '<') && version_compare($current_version, $next_version, '>='))
-	{
-		continue;
-	}
-
-	change_database_data($no_updates, $version);
-}
-
-_write_result($no_updates, $errored, $error_ary);
-
-$error_ary = array();
-$errored = $no_updates = false;
-
-?>
-
-<br /><br />
-<h1><?php echo phpbb::$user->lang['UPDATE_VERSION_OPTIMIZE']; ?></h1>
-<br />
-<p><?php echo phpbb::$user->lang['PROGRESS']; ?> :: <strong>
-
-<?php
-
-flush();
-
-if ($debug_from_version === false)
-{
-	// update the version
-	$sql = "UPDATE " . CONFIG_TABLE . "
-		SET config_value = '$updates_to_version'
-		WHERE config_name = 'version'";
-	_sql($sql, $errored, $error_ary);
-}
-
-// Reset permissions
-$sql = 'UPDATE ' . USERS_TABLE . "
-	SET user_permissions = '',
-		user_perm_from = 0";
-_sql($sql, $errored, $error_ary);
-
-/* Optimize/vacuum analyze the tables where appropriate
-// this should be done for each version in future along with
-// the version number update
-switch (phpbb::$db->dbms_type)
-{
-	case 'mysql':
-		$sql = 'OPTIMIZE TABLE ' . $table_prefix . 'auth_access, ' . $table_prefix . 'banlist, ' . $table_prefix . 'categories, ' . $table_prefix . 'config, ' . $table_prefix . 'disallow, ' . $table_prefix . 'forum_prune, ' . $table_prefix . 'forums, ' . $table_prefix . 'groups, ' . $table_prefix . 'posts, ' . $table_prefix . 'posts_text, ' . $table_prefix . 'privmsgs, ' . $table_prefix . 'privmsgs_text, ' . $table_prefix . 'ranks, ' . $table_prefix . 'search_results, ' . $table_prefix . 'search_wordlist, ' . $table_prefix . 'search_wordmatch, ' . $table_prefix . 'sessions_keys' . $table_prefix . 'smilies, ' . $table_prefix . 'themes, ' . $table_prefix . 'themes_name, ' . $table_prefix . 'topics, ' . $table_prefix . 'topics_watch, ' . $table_prefix . 'user_group, ' . $table_prefix . 'users, ' . $table_prefix . 'vote_desc, ' . $table_prefix . 'vote_results, ' . $table_prefix . 'vote_voters, ' . $table_prefix . 'words';
-		_sql($sql, $errored, $error_ary);
-	break;
-
-	case 'postgresql':
-		_sql("VACUUM ANALYZE", $errored, $error_ary);
-	break;
-}
-*/
-
-_write_result($no_updates, $errored, $error_ary);
-
-?>
-
-<br />
-<h1><?php echo phpbb::$user->lang['UPDATE_COMPLETED']; ?></h1>
-
-<br />
-
-<?php
-
-if (!$inline_update)
-{
-	// Purge the cache...
-	phpbb::$acm->purge();
-?>
-
-	<p style="color:red"><?php echo phpbb::$user->lang['UPDATE_FILES_NOTICE']; ?></p>
-
-	<p><?php echo phpbb::$user->lang['COMPLETE_LOGIN_TO_BOARD']; ?></p>
-
-<?php
-}
-else
-{
-?>
-
-	<p><?php echo ((isset(phpbb::$user->lang['INLINE_UPDATE_SUCCESSFUL'])) ? phpbb::$user->lang['INLINE_UPDATE_SUCCESSFUL'] : 'The database update was successful. Now you need to continue the update process.'); ?></p>
-
-	<p><a href="<?php echo append_sid('install/index', "mode=update&amp;sub=file_check&amp;lang=$language"); ?>" class="button1"><?php echo (isset(phpbb::$user->lang['CONTINUE_UPDATE_NOW'])) ? phpbb::$user->lang['CONTINUE_UPDATE_NOW'] : 'Continue the update process now'; ?></a></p>
-
-<?php
-}
-
-// Add database update to log
-add_log('admin', 'LOG_UPDATE_DATABASE', $orig_version, $updates_to_version);
-
-// Now we purge the session table as well as all cache files
-phpbb::$acm->purge();
-
-?>
-
-					</div>
-				</div>
-			<span class="corners-bottom"><span></span></span>
-		</div>
-		</div>
-	</div>
-
-	<div id="page-footer">
-		Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
-	</div>
-</div>
-
-</body>
-</html>
-
-<?php
-
-garbage_collection();
-
-if (function_exists('exit_handler'))
-{
-	exit_handler();
-}
-
-/**
-* Function where all data changes are executed
-*/
-function change_database_data($version)
-{
-	global $errored, $error_ary;
-
-	switch ($version)
-	{
-		default:
-			// Changes from 3.0.5 to 3.1.0-dev1
-			case '3.0.5':
-			break;
-		break;
-	}
-}
-
-/**
-* Function for triggering an sql statement
-*/
-function _sql($sql, &$errored, &$error_ary, $echo_dot = true)
-{
-	if (phpbb::$base_config['debug_extra'])
-	{
-		echo "<br />\n{$sql}\n<br />";
-	}
-
-	phpbb::$db->sql_return_on_error(true);
-
-	$result = phpbb::$db->sql_query($sql);
-	if (phpbb::$db->sql_error_triggered)
-	{
-		$errored = true;
-		$error_ary['sql'][] = phpbb::$db->sql_error_sql;
-		$error_ary['error_code'][] = phpbb::$db->_sql_error();
-	}
-
-	phpbb::$db->sql_return_on_error(false);
-
-	if ($echo_dot)
-	{
-		echo ". \n";
-		flush();
-	}
-
-	return $result;
-}
-
-function _write_result($no_updates, $errored, $error_ary)
-{
-	if ($no_updates)
-	{
-		echo ' ' . phpbb::$user->lang['NO_UPDATES_REQUIRED'] . '</strong></p>';
-	}
-	else
-	{
-		echo ' <span class="success">' . phpbb::$user->lang['DONE'] . '</span></strong><br />' . phpbb::$user->lang['RESULT'] . ' :: ';
-
-		if ($errored)
-		{
-			echo ' <strong>' . phpbb::$user->lang['SOME_QUERIES_FAILED'] . '</strong> <ul>';
-
-			for ($i = 0; $i < sizeof($error_ary['sql']); $i++)
-			{
-				echo '<li>' . phpbb::$user->lang['ERROR'] . ' :: <strong>' . htmlspecialchars($error_ary['error_code'][$i]['message']) . '</strong><br />';
-				echo phpbb::$user->lang['SQL'] . ' :: <strong>' . htmlspecialchars($error_ary['sql'][$i]) . '</strong><br /><br /></li>';
-			}
-
-			echo '</ul> <br /><br />' . phpbb::$user->lang['SQL_FAILURE_EXPLAIN'] . '</p>';
-		}
-		else
-		{
-			echo '<strong>' . phpbb::$user->lang['NO_ERRORS'] . '</strong></p>';
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
deleted file mode 100644
index bb22ebaf36..0000000000
--- a/phpBB/install/index.php
+++ /dev/null
@@ -1,498 +0,0 @@
-<?php
-/**
-*
-* @package install
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**#@+
-* @ignore
-*/
-define('IN_PHPBB', true);
-define('IN_INSTALL', true);
-/**#@-*/
-
-if (!defined('PHPBB_ROOT_PATH')) define('PHPBB_ROOT_PATH', './../');
-if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-
-// Include bootstrap
-include PHPBB_ROOT_PATH . 'includes/core/bootstrap.' . PHP_EXT;
-
-// Includes functions for the installer
-require PHPBB_ROOT_PATH . 'includes/functions_install.' . PHP_EXT;
-
-// Set time limit to 0
-@set_time_limit(0);
-
-/**
-* @todo get memory limit and display notice if it is too low for a conversion (only within conversion)
-$mem_limit = @ini_get('memory_limit');
-if (!empty($mem_limit))
-{
-	$unit = strtolower(substr($mem_limit, -1, 1));
-	$mem_limit = (int) $mem_limit;
-
-	if ($unit == 'k')
-	{
-		$mem_limit = floor($mem_limit / 1024);
-	}
-	else if ($unit == 'g')
-	{
-		$mem_limit *= 1024;
-	}
-	else if (is_numeric($unit))
-	{
-		$mem_limit = floor((int) ($mem_limit . $unit) / 1048576);
-	}
-	$mem_limit = max(128, $mem_limit) . 'M';
-}
-else
-{
-	$mem_limit = '128M';
-}
-@ini_set('memory_limit', $mem_limit);
-*/
-
-// Initialize some common config variables
-phpbb::$config += array(
-	'load_tplcompile'	=> true,
-	'cookie_name'		=> '',
-);
-
-// Register the template and the user object
-phpbb::register('template');
-phpbb::register('user', false, false, 'db', PHPBB_ROOT_PATH . 'language/');
-
-// Init "loose" user session
-phpbb::$user->session_begin();
-
-// Now set users language
-phpbb::$user->set_language(request_var('language', ''));
-
-// And also add the install language file
-phpbb::$user->add_lang('install');
-
-$mode = request_var('mode', 'overview');
-$sub = request_var('sub', '');
-
-// Set PHP error handler to ours
-set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
-
-phpbb::$template->set_custom_template('../adm/style', 'admin');
-phpbb::$template->assign_var('T_TEMPLATE_PATH', '../adm/style');
-
-$install = new module();
-
-$install->create('install', 'index.' . PHP_EXT, $mode, $sub);
-$install->load();
-
-// Generate the page
-$install->page_header();
-$install->generate_navigation();
-
-phpbb::$template->set_filenames(array(
-	'body' => $install->get_tpl_name())
-);
-
-$install->page_footer();
-
-/**
-* @package install
-*/
-class module
-{
-	var $id = 0;
-	var $type = 'install';
-	var $module_ary = array();
-	var $filename;
-	var $module_url = '';
-	var $tpl_name = '';
-	var $mode;
-	var $sub;
-
-	/**
-	* Private methods, should not be overwritten
-	*/
-	function create($module_type, $module_url, $selected_mod = false, $selected_submod = false)
-	{
-		$module = array();
-
-		// Grab module information using Bart's "neat-o-module" system (tm)
-		$dir = @opendir('.');
-
-		if (!$dir)
-		{
-			$this->error('Unable to access the installation directory', __LINE__, __FILE__);
-		}
-
-		$setmodules = 1;
-		while (($file = readdir($dir)) !== false)
-		{
-			if (preg_match('#^install_(.*?)\.' . PHP_EXT . '$#', $file))
-			{
-				include($file);
-			}
-		}
-		closedir($dir);
-
-		unset($setmodules);
-
-		if (!sizeof($module))
-		{
-			$this->error('No installation modules found', __LINE__, __FILE__);
-		}
-
-		// Order to use and count further if modules get assigned to the same position or not having an order
-		$max_module_order = 1000;
-
-		foreach ($module as $row)
-		{
-			// Check any module pre-reqs
-			if ($row['module_reqs'] != '')
-			{
-			}
-
-			// Module order not specified or module already assigned at this position?
-			if (!isset($row['module_order']) || isset($this->module_ary[$row['module_order']]))
-			{
-				$row['module_order'] = $max_module_order;
-				$max_module_order++;
-			}
-
-			$this->module_ary[$row['module_order']]['name'] = $row['module_title'];
-			$this->module_ary[$row['module_order']]['filename'] = $row['module_filename'];
-			$this->module_ary[$row['module_order']]['subs'] = $row['module_subs'];
-			$this->module_ary[$row['module_order']]['stages'] = $row['module_stages'];
-
-			if (strtolower($selected_mod) == strtolower($row['module_title']))
-			{
-				$this->id = (int) $row['module_order'];
-				$this->filename = (string) $row['module_filename'];
-				$this->module_url = (string) $module_url;
-				$this->mode = (string) $selected_mod;
-				// Check that the sub-mode specified is valid or set a default if not
-				if (is_array($row['module_subs']))
-				{
-					$this->sub = strtolower((in_array(strtoupper($selected_submod), $row['module_subs'])) ? $selected_submod : $row['module_subs'][0]);
-				}
-				else if (is_array($row['module_stages']))
-				{
-					$this->sub = strtolower((in_array(strtoupper($selected_submod), $row['module_stages'])) ? $selected_submod : $row['module_stages'][0]);
-				}
-				else
-				{
-					$this->sub = '';
-				}
-			}
-		} // END foreach
-	} // END create
-
-	/**
-	* Load and run the relevant module if applicable
-	*/
-	function load($mode = false, $run = true)
-	{
-		if ($run)
-		{
-			if (!empty($mode))
-			{
-				$this->mode = $mode;
-			}
-
-			$module = $this->filename;
-			if (!class_exists($module))
-			{
-				$this->error('Module "' . htmlspecialchars($module) . '" not accessible.', __LINE__, __FILE__);
-			}
-			$this->module = new $module($this);
-
-			if (method_exists($this->module, 'main'))
-			{
-				$this->module->main($this->mode, $this->sub);
-			}
-		}
-	}
-
-	/**
-	* Output the standard page header
-	*/
-	function page_header()
-	{
-		if (defined('HEADER_INC'))
-		{
-			return;
-		}
-
-		define('HEADER_INC', true);
-		global $stage;
-
-		phpbb::$template->assign_vars(array(
-			'PAGE_TITLE'			=> $this->get_page_title(),
-			'T_IMAGE_PATH'			=> PHPBB_ROOT_PATH . 'adm/images/',
-
-			'S_CONTENT_DIRECTION' 	=> phpbb::$user->lang['DIRECTION'],
-			'S_CONTENT_FLOW_BEGIN'	=> (phpbb::$user->lang['DIRECTION'] == 'ltr') ? 'left' : 'right',
-			'S_CONTENT_FLOW_END'	=> (phpbb::$user->lang['DIRECTION'] == 'ltr') ? 'right' : 'left',
-			'S_CONTENT_ENCODING' 	=> 'UTF-8',
-
-			'S_USER_LANG'			=> phpbb::$user->lang['USER_LANG'],
-			)
-		);
-
-		header('Content-type: text/html; charset=UTF-8');
-		header('Cache-Control: private, no-cache="set-cookie"');
-		header('Expires: 0');
-		header('Pragma: no-cache');
-
-		return;
-	}
-
-	/**
-	* Output the standard page footer
-	*/
-	function page_footer()
-	{
-		phpbb::$template->display('body');
-
-		// Close our DB connection.
-		if (phpbb::registered('db'))
-		{
-			phpbb::$db->sql_close();
-		}
-
-		if (function_exists('exit_handler'))
-		{
-			exit_handler();
-		}
-	}
-
-	/**
-	* Returns desired template name
-	*/
-	function get_tpl_name()
-	{
-		return $this->module->tpl_name . '.html';
-	}
-
-	/**
-	* Returns the desired page title
-	*/
-	function get_page_title()
-	{
-		if (!isset($this->module->page_title))
-		{
-			return '';
-		}
-
-		return (isset(phpbb::$user->lang[$this->module->page_title])) ? phpbb::$user->lang[$this->module->page_title] : $this->module->page_title;
-	}
-
-	/**
-	* Generate the navigation tabs
-	*/
-	function generate_navigation()
-	{
-		if (is_array($this->module_ary))
-		{
-			@ksort($this->module_ary);
-			foreach ($this->module_ary as $cat_ary)
-			{
-				$cat = $cat_ary['name'];
-				$l_cat = (!empty($lang['CAT_' . $cat])) ? $lang['CAT_' . $cat] : preg_replace('#_#', ' ', $cat);
-				$cat = strtolower($cat);
-				$url = $this->module_url . "?mode=$cat&amp;language=" . phpbb::$user->lang_name;
-
-				if ($this->mode == $cat)
-				{
-					phpbb::$template->assign_block_vars('t_block1', array(
-						'L_TITLE'		=> $l_cat,
-						'S_SELECTED'	=> true,
-						'U_TITLE'		=> $url,
-					));
-
-					if (is_array($this->module_ary[$this->id]['subs']))
-					{
-						$subs = $this->module_ary[$this->id]['subs'];
-						foreach ($subs as $option)
-						{
-							$l_option = (!empty(phpbb::$user->lang['SUB_' . $option])) ? phpbb::$user->lang['SUB_' . $option] : preg_replace('#_#', ' ', $option);
-							$option = strtolower($option);
-							$url = $this->module_url . '?mode=' . $this->mode . "&amp;sub=$option&amp;language=" . phpbb::$user->lang_name;
-
-							phpbb::$template->assign_block_vars('l_block1', array(
-								'L_TITLE'		=> $l_option,
-								'S_SELECTED'	=> ($this->sub == $option),
-								'U_TITLE'		=> $url,
-							));
-						}
-					}
-
-					if (is_array($this->module_ary[$this->id]['stages']))
-					{
-						$subs = $this->module_ary[$this->id]['stages'];
-						$matched = false;
-						foreach ($subs as $option)
-						{
-							$l_option = (!empty(phpbb::$user->lang['STAGE_' . $option])) ? phpbb::$user->lang['STAGE_' . $option] : preg_replace('#_#', ' ', $option);
-							$option = strtolower($option);
-							$matched = ($this->sub == $option) ? true : $matched;
-
-							phpbb::$template->assign_block_vars('l_block2', array(
-								'L_TITLE'		=> $l_option,
-								'S_SELECTED'	=> ($this->sub == $option),
-								'S_COMPLETE'	=> !$matched,
-							));
-						}
-					}
-				}
-				else
-				{
-					phpbb::$template->assign_block_vars('t_block1', array(
-						'L_TITLE'		=> $l_cat,
-						'S_SELECTED'	=> false,
-						'U_TITLE'		=> $url,
-					));
-				}
-			}
-		}
-	}
-
-	/**
-	* Output an error message
-	* If skip is true, return and continue execution, else exit
-	*/
-	function error($error, $line, $file)
-	{
-		phpbb::$template->assign_block_vars('checks', array(
-			'S_LEGEND'	=> true,
-			'LEGEND'	=> phpbb::$user->lang['INST_ERR'],
-		));
-
-		phpbb::$template->assign_block_vars('checks', array(
-			'TITLE'		=> basename($file) . ' [ ' . $line . ' ]',
-			'RESULT'	=> '<b style="color:red">' . $error . '</b>',
-		));
-
-		return;
-	}
-
-	/**
-	* Output an error message for a database related problem
-	* If skip is true, return and continue execution, else exit
-	*/
-	function db_error($error, $sql, $line, $file)
-	{
-		phpbb::$template->assign_block_vars('checks', array(
-			'S_LEGEND'	=> true,
-			'LEGEND'	=> phpbb::$user->lang['INST_ERR_FATAL'],
-		));
-
-		phpbb::$template->assign_block_vars('checks', array(
-			'TITLE'		=> basename($file) . ' [ ' . $line . ' ]',
-			'RESULT'	=> '<b style="color:red">' . $error . '</b><br />&#187; SQL:' . $sql,
-		));
-
-		return;
-	}
-
-	/**
-	* Generate the relevant HTML for an input field and the associated label and explanatory text
-	*/
-	function input_field($name, $type, $value='', $options='')
-	{
-		$tpl_type = explode(':', $type);
-		$tpl = '';
-
-		switch ($tpl_type[0])
-		{
-			case 'text':
-			case 'password':
-				$size = (int) $tpl_type[1];
-				$maxlength = (int) $tpl_type[2];
-
-				$tpl = '<input id="' . $name . '" type="' . $tpl_type[0] . '"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="' . $name . '" value="' . $value . '" />';
-			break;
-
-			case 'textarea':
-				$rows = (int) $tpl_type[1];
-				$cols = (int) $tpl_type[2];
-
-				$tpl = '<textarea id="' . $name . '" name="' . $name . '" rows="' . $rows . '" cols="' . $cols . '">' . $value . '</textarea>';
-			break;
-
-			case 'radio':
-				$key_yes	= ($value) ? ' checked="checked" id="' . $name . '"' : '';
-				$key_no		= (!$value) ? ' checked="checked" id="' . $name . '"' : '';
-
-				$tpl_type_cond = explode('_', $tpl_type[1]);
-				$type_no = ($tpl_type_cond[0] == 'disabled' || $tpl_type_cond[0] == 'enabled') ? false : true;
-
-				$tpl_no = '<label><input type="radio" name="' . $name . '" value="0"' . $key_no . ' class="radio" /> ' . (($type_no) ? phpbb::$user->lang['NO'] : phpbb::$user->lang['DISABLED']) . '</label>';
-				$tpl_yes = '<label><input type="radio" name="' . $name . '" value="1"' . $key_yes . ' class="radio" /> ' . (($type_no) ? phpbb::$user->lang['YES'] : phpbb::$user->lang['ENABLED']) . '</label>';
-
-				$tpl = ($tpl_type_cond[0] == 'yes' || $tpl_type_cond[0] == 'enabled') ? $tpl_yes . '&nbsp;&nbsp;' . $tpl_no : $tpl_no . '&nbsp;&nbsp;' . $tpl_yes;
-			break;
-
-			case 'select':
-				eval('$s_options = ' . str_replace('{VALUE}', $value, $options) . ';');
-				$tpl = '<select id="' . $name . '" name="' . $name . '">' . $s_options . '</select>';
-			break;
-
-			case 'custom':
-				eval('$tpl = ' . str_replace('{VALUE}', $value, $options) . ';');
-			break;
-
-			default:
-			break;
-		}
-
-		return $tpl;
-	}
-
-	/**
-	* Generate the drop down of available language packs
-	*/
-	function inst_language_select($default = '')
-	{
-		$dir = @opendir(PHPBB_ROOT_PATH . 'language');
-
-		if (!$dir)
-		{
-			$this->error('Unable to access the language directory', __LINE__, __FILE__);
-		}
-
-		while ($file = readdir($dir))
-		{
-			$path = PHPBB_ROOT_PATH . 'language/' . $file;
-
-			if ($file == '.' || $file == '..' || is_link($path) || is_file($path) || $file == 'CVS')
-			{
-				continue;
-			}
-
-			if (file_exists($path . '/iso.txt'))
-			{
-				list($displayname, $localname) = @file($path . '/iso.txt');
-				$lang[$localname] = $file;
-			}
-		}
-		closedir($dir);
-
-		@asort($lang);
-		@reset($lang);
-
-		$user_select = '';
-		foreach ($lang as $displayname => $filename)
-		{
-			$selected = (strtolower($default) == strtolower($filename)) ? ' selected="selected"' : '';
-			$user_select .= '<option value="' . $filename . '"' . $selected . '>' . ucwords($displayname) . '</option>';
-		}
-
-		return $user_select;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
deleted file mode 100644
index 110472a499..0000000000
--- a/phpBB/install/install_convert.php
+++ /dev/null
@@ -1,2103 +0,0 @@
-<?php
-/**
-*
-* @package install
-* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-*/
-
-if (!defined('IN_INSTALL'))
-{
-	// Someone has tried to access the file direct. This is not a good idea, so exit
-	exit;
-}
-
-if (!empty($setmodules))
-{
-	$module[] = array(
-		'module_type'		=> 'install',
-		'module_title'		=> 'CONVERT',
-		'module_filename'	=> substr(basename(__FILE__), 0, -strlen(PHP_EXT)-1),
-		'module_order'		=> 20,
-		'module_subs'		=> '',
-		'module_stages'		=> array('INTRO', 'SETTINGS', 'IN_PROGRESS', 'FINAL'),
-		'module_reqs'		=> ''
-	);
-}
-
-/**
-* Class holding all convertor-specific details.
-* @package install
-*/
-class convert
-{
-	var $options = array();
-
-	var $convertor_tag = '';
-	var $src_dbms = '';
-	var $src_dbhost = '';
-	var $src_dbport = '';
-	var $src_dbuser = '';
-	var $src_dbpasswd = '';
-	var $src_dbname = '';
-	var $src_table_prefix = '';
-
-	var $convertor_data = array();
-	var $tables = array();
-	var $config_schema = array();
-	var $convertor = array();
-	var $src_truncate_statement = 'DELETE FROM ';
-	var $truncate_statement = 'DELETE FROM ';
-
-	var $fulltext_search;
-
-	// Batch size, can be adjusted by the conversion file
-	// For big boards a value of 6000 seems to be optimal
-	var $batch_size = 2000;
-	// Number of rows to be inserted at once (extended insert) if supported
-	// For installations having enough memory a value of 60 may be good.
-	var $num_wait_rows = 20;
-
-	// Mysqls internal recoding engine messing up with our (better) functions? We at least support more encodings than mysql so should use it in favor.
-	var $mysql_convert = false;
-
-	var $p_master;
-
-	function __construct(&$p_master)
-	{
-		$this->p_master = &$p_master;
-	}
-}
-
-/**
-* Convert class for conversions
-* @package install
-*/
-class install_convert extends module
-{
-	/**
-	* Variables used while converting, they are accessible from the global variable $convert
-	*/
-	function install_convert(&$p_master)
-	{
-		$this->p_master = &$p_master;
-	}
-
-	function main($mode, $sub)
-	{
-		global $lang, $template, $config, $language, $table_prefix;
-		global $convert;
-
-		$this->tpl_name = 'install_convert';
-		$this->mode = $mode;
-
-		$convert = new convert($this->p_master);
-
-		switch ($sub)
-		{
-			case 'intro':
-				// Try opening config file
-				// @todo If phpBB is not installed, we need to do a cut-down installation here
-				// For now, we redirect to the installation script instead
-				if (@file_exists(PHPBB_ROOT_PATH . 'config.' . PHP_EXT))
-				{
-					include(PHPBB_ROOT_PATH . 'config.' . PHP_EXT);
-				}
-
-				if (!defined('PHPBB_INSTALLED'))
-				{
-					$template->assign_vars(array(
-						'S_NOT_INSTALLED'		=> true,
-						'TITLE'					=> $lang['BOARD_NOT_INSTALLED'],
-						'BODY'					=> sprintf($lang['BOARD_NOT_INSTALLED_EXPLAIN'], append_sid('install/index', 'mode=install&amp;language=' . $language)),
-					));
-
-					return;
-				}
-
-				require(PHPBB_ROOT_PATH . 'config.' . PHP_EXT);
-				require(PHPBB_ROOT_PATH . 'includes/constants.' . PHP_EXT);
-				require(PHPBB_ROOT_PATH . 'includes/db/' . $dbms . '.' . PHP_EXT);
-				require(PHPBB_ROOT_PATH . 'includes/functions_convert.' . PHP_EXT);
-
-				$db = new $sql_db();
-				$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true);
-				unset($dbpasswd);
-
-				// We need to fill the config to let internal functions correctly work
-				$sql = 'SELECT *
-					FROM ' . CONFIG_TABLE;
-				$result = $db->sql_query($sql);
-
-				$config = array();
-				while ($row = $db->sql_fetchrow($result))
-				{
-					$config[$row['config_name']] = $row['config_value'];
-				}
-				$db->sql_freeresult($result);
-
-				// Detect if there is already a conversion in progress at this point and offer to resume
-				// It's quite possible that the user will get disconnected during a large conversion so they need to be able to resume it
-				$new_conversion = request_var('new_conv', 0);
-
-				if ($new_conversion)
-				{
-					$config['convert_progress'] = '';
-					$config['convert_db_server'] = '';
-					$config['convert_db_user'] = '';
-					$db->sql_query('DELETE FROM ' . CONFIG_TABLE . "
-						WHERE config_name = 'convert_progress'
-							OR config_name = 'convert_db_server'
-							OR config_name = 'convert_db_user'"
-					);
-				}
-
-				// Let's see if there is a conversion in the works...
-				$options = array();
-				if (!empty($config['convert_progress']) && !empty($config['convert_db_server']) && !empty($config['convert_db_user']) && !empty($config['convert_options']))
-				{
-					$options = unserialize($config['convert_progress']);
-					$options = array_merge($options, unserialize($config['convert_db_server']), unserialize($config['convert_db_user']), unserialize($config['convert_options']));
-				}
-
-				// This information should have already been checked once, but do it again for safety
-				if (!empty($options) && !empty($options['tag']) &&
-					isset($options['dbms']) &&
-					isset($options['dbhost']) &&
-					isset($options['dbport']) &&
-					isset($options['dbuser']) &&
-					isset($options['dbpasswd']) &&
-					isset($options['dbname']) &&
-					isset($options['table_prefix']))
-				{
-					$this->page_title = $lang['CONTINUE_CONVERT'];
-
-					$template->assign_vars(array(
-						'TITLE'			=> $lang['CONTINUE_CONVERT'],
-						'BODY'			=> $lang['CONTINUE_CONVERT_BODY'],
-						'L_NEW'			=> $lang['CONVERT_NEW_CONVERSION'],
-						'L_CONTINUE'	=> $lang['CONTINUE_OLD_CONVERSION'],
-						'S_CONTINUE'	=> true,
-
-						'U_NEW_ACTION'		=> $this->p_master->module_url . "?mode={$this->mode}&amp;sub=intro&amp;new_conv=1&amp;language=$language",
-						'U_CONTINUE_ACTION'	=> $this->p_master->module_url . "?mode={$this->mode}&amp;sub=in_progress&amp;tag={$options['tag']}{$options['step']}&amp;language=$language",
-					));
-
-					return;
-				}
-
-				$this->list_convertors($sub);
-
-			break;
-
-			case 'settings':
-				$this->get_convert_settings($sub);
-			break;
-
-			case 'in_progress':
-				$this->convert_data($sub);
-			break;
-
-			case 'final':
-				$this->page_title = $lang['CONVERT_COMPLETE'];
-
-				$template->assign_vars(array(
-					'TITLE'		=> $lang['CONVERT_COMPLETE'],
-					'BODY'		=> $lang['CONVERT_COMPLETE_EXPLAIN'],
-				));
-
-				// If we reached this step (conversion completed) we want to purge the cache and log the user out.
-				// This is for making sure the session get not screwed due to the 3.0.x users table being completely new.
-				phpbb::$acm->purge();
-
-				require(PHPBB_ROOT_PATH . 'config.' . PHP_EXT);
-				require(PHPBB_ROOT_PATH . 'includes/constants.' . PHP_EXT);
-				require(PHPBB_ROOT_PATH . 'includes/db/' . $dbms . '.' . PHP_EXT);
-				require(PHPBB_ROOT_PATH . 'includes/functions_convert.' . PHP_EXT);
-
-				$db = new $sql_db();
-				$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true);
-				unset($dbpasswd);
-
-				$sql = 'SELECT config_value
-					FROM ' . CONFIG_TABLE . '
-					WHERE config_name = \'search_type\'';
-				$result = $db->sql_query($sql);
-
-				if ($db->sql_fetchfield('config_value') != 'fulltext_mysql')
-				{
-					$template->assign_vars(array(
-						'S_ERROR_BOX'	=> true,
-						'ERROR_TITLE'	=> $lang['SEARCH_INDEX_UNCONVERTED'],
-						'ERROR_MSG'		=> $lang['SEARCH_INDEX_UNCONVERTED_EXPLAIN'],
-					));
-				}
-
-				if ($db->truncate)
-				{
-					$db->sql_query('TRUNCATE TABLE ' . SESSIONS_KEYS_TABLE);
-					$db->sql_query('TRUNCATE TABLE ' . SESSIONS_TABLE);
-				}
-				else
-				{
-					$db->sql_query('DELETE FROM ' . SESSIONS_KEYS_TABLE);
-					$db->sql_query('DELETE FROM ' . SESSIONS_TABLE);
-				}
-
-			break;
-		}
-	}
-
-	/**
-	* Generate a list of all available conversion modules
-	*/
-	function list_convertors($sub)
-	{
-		global $lang, $language, $template;
-
-		$this->page_title = $lang['SUB_INTRO'];
-
-		$template->assign_vars(array(
-			'TITLE'		=> $lang['CONVERT_INTRO'],
-			'BODY'		=> $lang['CONVERT_INTRO_BODY'],
-
-			'L_AUTHOR'					=> $lang['AUTHOR'],
-			'L_AVAILABLE_CONVERTORS'	=> $lang['AVAILABLE_CONVERTORS'],
-			'L_CONVERT'					=> $lang['CONVERT'],
-			'L_NO_CONVERTORS'			=> $lang['NO_CONVERTORS'],
-			'L_OPTIONS'					=> $lang['CONVERT_OPTIONS'],
-			'L_SOFTWARE'				=> $lang['SOFTWARE'],
-			'L_VERSION'					=> $lang['VERSION'],
-
-			'S_LIST'	=> true,
-		));
-
-		$convertors = $sort = array();
-		$get_info = true;
-
-		$handle = @opendir('./convertors/');
-
-		if (!$handle)
-		{
-			$this->error('Unable to access the convertors directory', __LINE__, __FILE__);
-		}
-
-		while ($entry = readdir($handle))
-		{
-			if (preg_match('/^convert_([a-z0-9_]+).' . PHP_EXT . '$/i', $entry, $m))
-			{
-				include('./convertors/' . $entry);
-				if (isset($convertor_data))
-				{
-					$sort[strtolower($convertor_data['forum_name'])] = sizeof($convertors);
-
-					$convertors[] = array(
-						'tag'			=>	$m[1],
-						'forum_name'	=>	$convertor_data['forum_name'],
-						'version'		=>	$convertor_data['version'],
-						'dbms'			=>	$convertor_data['dbms'],
-						'dbhost'		=>	$convertor_data['dbhost'],
-						'dbport'		=>	$convertor_data['dbport'],
-						'dbuser'		=>	$convertor_data['dbuser'],
-						'dbpasswd'		=>	$convertor_data['dbpasswd'],
-						'dbname'		=>	$convertor_data['dbname'],
-						'table_prefix'	=>	$convertor_data['table_prefix'],
-						'author'		=>	$convertor_data['author']
-					);
-				}
-				unset($convertor_data);
-			}
-		}
-		closedir($handle);
-
-		@ksort($sort);
-
-		foreach ($sort as $void => $index)
-		{
-			$template->assign_block_vars('convertors', array(
-				'AUTHOR'	=> $convertors[$index]['author'],
-				'SOFTWARE'	=> $convertors[$index]['forum_name'],
-				'VERSION'	=> $convertors[$index]['version'],
-
-				'U_CONVERT'	=> $this->p_master->module_url . "?mode={$this->mode}&amp;language=$language&amp;sub=settings&amp;tag=" . $convertors[$index]['tag'],
-			));
-		}
-	}
-
-	/**
-	*/
-	function get_convert_settings($sub)
-	{
-		global $lang, $language, $template, $db, $config;
-
-		require(PHPBB_ROOT_PATH . 'config.' . PHP_EXT);
-		require(PHPBB_ROOT_PATH . 'includes/constants.' . PHP_EXT);
-		require(PHPBB_ROOT_PATH . 'includes/db/' . $dbms . '.' . PHP_EXT);
-		require(PHPBB_ROOT_PATH . 'includes/functions_convert.' . PHP_EXT);
-
-		$db = new $sql_db();
-		$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true);
-		unset($dbpasswd);
-
-		$this->page_title = $lang['STAGE_SETTINGS'];
-
-		// We need to fill the config to let internal functions correctly work
-		$sql = 'SELECT *
-			FROM ' . CONFIG_TABLE;
-		$result = $db->sql_query($sql);
-
-		$config = array();
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$config[$row['config_name']] = $row['config_value'];
-		}
-		$db->sql_freeresult($result);
-
-		$convertor_tag = request_var('tag', '');
-
-		if (empty($convertor_tag))
-		{
-			$this->p_master->error($lang['NO_CONVERT_SPECIFIED'], __LINE__, __FILE__);
-		}
-		$get_info = true;
-
-		// check security implications of direct inclusion
-		$convertor_tag = basename($convertor_tag);
-		if (!file_exists('./convertors/convert_' . $convertor_tag . '.' . PHP_EXT))
-		{
-			$this->p_master->error($lang['CONVERT_NOT_EXIST'], __LINE__, __FILE__);
-		}
-
-		include('./convertors/convert_' . $convertor_tag . '.' . PHP_EXT);
-
-		// The test_file is a file that should be present in the location of the old board.
-		if (!isset($test_file))
-		{
-			$this->p_master->error($lang['DEV_NO_TEST_FILE'], __LINE__, __FILE__);
-		}
-
-		$submit = phpbb_request::is_set_post('submit');
-
-		$src_dbms			= request_var('src_dbms', $convertor_data['dbms']);
-		$src_dbhost			= request_var('src_dbhost', $convertor_data['dbhost']);
-		$src_dbport			= request_var('src_dbport', $convertor_data['dbport']);
-		$src_dbuser			= request_var('src_dbuser', $convertor_data['dbuser']);
-		$src_dbpasswd		= request_var('src_dbpasswd', $convertor_data['dbpasswd']);
-		$src_dbname			= request_var('src_dbname', $convertor_data['dbname']);
-		$src_table_prefix	= request_var('src_table_prefix', $convertor_data['table_prefix']);
-		$forum_path			= request_var('forum_path', $convertor_data['forum_path']);
-		$refresh			= request_var('refresh', 1);
-
-		// Default URL of the old board
-		// @todo Are we going to use this for attempting to convert URL references in posts, or should we remove it?
-		//		-> We should convert old urls to the new relative urls format
-		// $src_url = request_var('src_url', 'Not in use at the moment');
-
-		// strip trailing slash from old forum path
-		$forum_path = (strlen($forum_path) && $forum_path[strlen($forum_path) - 1] == '/') ? substr($forum_path, 0, -1) : $forum_path;
-
-		$error = array();
-		if ($submit)
-		{
-			if (!@file_exists('./../' . $forum_path . '/' . $test_file))
-			{
-				$error[] = sprintf($lang['COULD_NOT_FIND_PATH'], $forum_path);
-			}
-
-			$connect_test = false;
-			$available_dbms = get_available_dbms(false, true, true);
-
-			if (!isset($available_dbms[$src_dbms]) || !$available_dbms[$src_dbms]['AVAILABLE'])
-			{
-				$error['db'][] = $lang['INST_ERR_NO_DB'];
-				$connect_test = false;
-			}
-			else
-			{
-				$connect_test = connect_check_db($available_dbms[$src_dbms], $src_table_prefix, $src_dbhost, $src_dbuser, htmlspecialchars_decode($src_dbpasswd), $src_dbname, $src_dbport, $error, ($src_dbms == $dbms) ? false : true);
-			}
-
-			// The forum prefix of the old and the new forum can only be the same if two different databases are used.
-			if ($src_table_prefix == $table_prefix && $src_dbms == $dbms && $src_dbhost == $dbhost && $src_dbport == $dbport && $src_dbname == $dbname)
-			{
-				$error[] = sprintf($lang['TABLE_PREFIX_SAME'], $src_table_prefix);
-			}
-
-			// Check table prefix
-			if (!sizeof($error))
-			{
-				// initiate database connection to old db if old and new db differ
-				global $src_db, $same_db;
-				$src_db = $same_db = false;
-
-				if ($src_dbms != $dbms || $src_dbhost != $dbhost || $src_dbport != $dbport || $src_dbname != $dbname || $src_dbuser != $dbuser)
-				{
-					$sql_db = 'dbal_' . $src_dbms;
-					$src_db = new $sql_db();
-					$src_db->sql_connect($src_dbhost, $src_dbuser, htmlspecialchars_decode($src_dbpasswd), $src_dbname, $src_dbport, false, true);
-					$same_db = false;
-				}
-				else
-				{
-					$src_db = $db;
-					$same_db = true;
-				}
-
-				$src_db->sql_return_on_error(true);
-				$db->sql_return_on_error(true);
-
-				// Try to select one row from the first table to see if the prefix is OK
-				$result = $src_db->sql_query_limit('SELECT * FROM ' . $src_table_prefix . $tables[0], 1);
-
-				if (!$result)
-				{
-					$prefixes = array();
-
-					$tables_existing = get_tables($src_db);
-					$tables_existing = array_map('strtolower', $tables_existing);
-					foreach ($tables_existing as $table_name)
-					{
-						compare_table($tables, $table_name, $prefixes);
-					}
-					unset($tables_existing);
-
-					foreach ($prefixes as $prefix => $count)
-					{
-						if ($count >= sizeof($tables))
-						{
-							$possible_prefix = $prefix;
-							break;
-						}
-					}
-
-					$msg = '';
-					if (!empty($convertor_data['table_prefix']))
-					{
-						$msg .= sprintf($lang['DEFAULT_PREFIX_IS'], $convertor_data['forum_name'], $convertor_data['table_prefix']);
-					}
-
-					if (!empty($possible_prefix))
-					{
-						$msg .= '<br />';
-						$msg .= ($possible_prefix == '*') ? $lang['BLANK_PREFIX_FOUND'] : sprintf($lang['PREFIX_FOUND'], $possible_prefix);
-						$src_table_prefix = ($possible_prefix == '*') ? '' : $possible_prefix;
-					}
-
-					$error[] = $msg;
-				}
-				$src_db->sql_freeresult($result);
-				$src_db->sql_return_on_error(false);
-			}
-
-			if (!sizeof($error))
-			{
-				// Save convertor Status
-				set_config('convert_progress', serialize(array(
-					'step'			=> '',
-					'table_prefix'	=> $src_table_prefix,
-					'tag'			=> $convertor_tag,
-				)), true);
-				set_config('convert_db_server', serialize(array(
-					'dbms'			=> $src_dbms,
-					'dbhost'		=> $src_dbhost,
-					'dbport'		=> $src_dbport,
-					'dbname'		=> $src_dbname,
-				)), true);
-				set_config('convert_db_user', serialize(array(
-					'dbuser'		=> $src_dbuser,
-					'dbpasswd'		=> $src_dbpasswd,
-				)), true);
-
-				// Save options
-				set_config('convert_options', serialize(array('forum_path' => './../' . $forum_path, 'refresh' => $refresh)), true);
-
-				$template->assign_block_vars('checks', array(
-					'TITLE'		=> $lang['VERIFY_OPTIONS'],
-					'RESULT'	=> $lang['CONVERT_SETTINGS_VERIFIED'],
-				));
-
-				$template->assign_vars(array(
-					'L_SUBMIT'	=> $lang['BEGIN_CONVERT'],
-//					'S_HIDDEN'	=> $s_hidden_fields,
-					'U_ACTION'	=> $this->p_master->module_url . "?mode={$this->mode}&amp;sub=in_progress&amp;tag=$convertor_tag&amp;language=$language",
-				));
-
-				return;
-			}
-			else
-			{
-				$template->assign_block_vars('checks', array(
-					'TITLE'		=> $lang['VERIFY_OPTIONS'],
-					'RESULT'	=> '<b style="color:red">' . implode('<br />', $error) . '</b>',
-				));
-			}
-		} // end submit
-
-		foreach ($this->convert_options as $config_key => $vars)
-		{
-			if (!is_array($vars) && strpos($config_key, 'legend') === false)
-			{
-				continue;
-			}
-
-			if (strpos($config_key, 'legend') !== false)
-			{
-				$template->assign_block_vars('options', array(
-					'S_LEGEND'		=> true,
-					'LEGEND'		=> $lang[$vars])
-				);
-
-				continue;
-			}
-
-			$options = isset($vars['options']) ? $vars['options'] : '';
-
-			$template->assign_block_vars('options', array(
-				'KEY'			=> $config_key,
-				'TITLE'			=> $lang[$vars['lang']],
-				'S_EXPLAIN'		=> $vars['explain'],
-				'S_LEGEND'		=> false,
-				'TITLE_EXPLAIN'	=> ($vars['explain']) ? $lang[$vars['lang'] . '_EXPLAIN'] : '',
-				'CONTENT'		=> $this->p_master->input_field($config_key, $vars['type'], $$config_key, $options),
-				)
-			);
-		}
-
-		$template->assign_vars(array(
-			'TITLE'		=> $lang['STAGE_SETTINGS'],
-			'BODY'		=> $lang['CONV_OPTIONS_BODY'],
-			'L_SUBMIT'	=> $lang['BEGIN_CONVERT'],
-			'U_ACTION'	=> $this->p_master->module_url . "?mode={$this->mode}&amp;sub=settings&amp;tag=$convertor_tag&amp;language=$language",
-		));
-	}
-
-	/**
-	* The function which does the actual work (or dispatches it to the relevant places)
-	*/
-	function convert_data($sub)
-	{
-		global $template, $user, $db, $lang, $config;
-		global $convert, $convert_row, $message_parser, $skip_rows, $language;
-
-		require(PHPBB_ROOT_PATH . 'config.' . PHP_EXT);
-		require(PHPBB_ROOT_PATH . 'includes/constants.' . PHP_EXT);
-		require(PHPBB_ROOT_PATH . 'includes/db/' . $dbms . '.' . PHP_EXT);
-		require(PHPBB_ROOT_PATH . 'includes/functions_convert.' . PHP_EXT);
-
-		$db = new $sql_db();
-		$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true);
-		unset($dbpasswd);
-
-		$sql = 'SELECT *
-			FROM ' . CONFIG_TABLE;
-		$result = $db->sql_query($sql);
-
-		$config = array();
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$config[$row['config_name']] = $row['config_value'];
-		}
-		$db->sql_freeresult($result);
-
-		// Override a couple of config variables for the duration
-		$config['max_quote_depth'] = 0;
-
-		// @todo Need to confirm that max post length in source is <= max post length in destination or there may be interesting formatting issues
-		$config['max_post_chars'] = 0;
-
-		// Set up a user as well. We _should_ have enough of a database here at this point to do this
-		// and it helps for any core code we call
-		$user->session_begin();
-		$user->page = session::extract_current_page(PHPBB_ROOT_PATH);
-
-		// This is a little bit of a fudge, but it allows the language entries to be available to the
-		// core code without us loading them again
-		$user->lang = &$lang;
-
-		$this->page_title = $user->lang['STAGE_IN_PROGRESS'];
-
-		$convert->options = array();
-		if (isset($config['convert_progress']))
-		{
-			$convert->options = unserialize($config['convert_progress']);
-			$convert->options = array_merge($convert->options, unserialize($config['convert_db_server']), unserialize($config['convert_db_user']), unserialize($config['convert_options']));
-		}
-
-		// This information should have already been checked once, but do it again for safety
-		if (empty($convert->options) || empty($convert->options['tag']) ||
-			!isset($convert->options['dbms']) ||
-			!isset($convert->options['dbhost']) ||
-			!isset($convert->options['dbport']) ||
-			!isset($convert->options['dbuser']) ||
-			!isset($convert->options['dbpasswd']) ||
-			!isset($convert->options['dbname']) ||
-			!isset($convert->options['table_prefix']))
-		{
-			$this->p_master->error($user->lang['NO_CONVERT_SPECIFIED'], __LINE__, __FILE__);
-		}
-
-		// Make some short variables accessible, for easier referencing
-		$convert->convertor_tag = basename($convert->options['tag']);
-		$convert->src_dbms = $convert->options['dbms'];
-		$convert->src_dbhost = $convert->options['dbhost'];
-		$convert->src_dbport = $convert->options['dbport'];
-		$convert->src_dbuser = $convert->options['dbuser'];
-		$convert->src_dbpasswd = $convert->options['dbpasswd'];
-		$convert->src_dbname = $convert->options['dbname'];
-		$convert->src_table_prefix = $convert->options['table_prefix'];
-
-		// initiate database connection to old db if old and new db differ
-		global $src_db, $same_db;
-		$src_db = $same_db = null;
-		if ($convert->src_dbms != $dbms || $convert->src_dbhost != $dbhost || $convert->src_dbport != $dbport || $convert->src_dbname != $dbname || $convert->src_dbuser != $dbuser)
-		{
-			if ($convert->src_dbms != $dbms)
-			{
-				require(PHPBB_ROOT_PATH . 'includes/db/' . $convert->src_dbms . '.' . PHP_EXT);
-			}
-			$sql_db = 'dbal_' . $convert->src_dbms;
-			$src_db = new $sql_db();
-			$src_db->sql_connect($convert->src_dbhost, $convert->src_dbuser, htmlspecialchars_decode($convert->src_dbpasswd), $convert->src_dbname, $convert->src_dbport, false, true);
-			$same_db = false;
-		}
-		else
-		{
-			$src_db = $db;
-			$same_db = true;
-		}
-
-		$convert->mysql_convert = false;
-		switch ($src_db->sql_layer)
-		{
-			case 'sqlite':
-			case 'firebird':
-				$convert->src_truncate_statement = 'DELETE FROM ';
-			break;
-
-			// Thanks MySQL, for silently converting...
-			case 'mysql':
-				if (version_compare($src_db->sql_server_info(true), '4.1.3', '>='))
-				{
-					$convert->mysql_convert = true;
-				}
-				$convert->src_truncate_statement = 'TRUNCATE TABLE ';
-			break;
-
-			case 'mysqli':
-				$convert->mysql_convert = true;
-				$convert->src_truncate_statement = 'TRUNCATE TABLE ';
-			break;
-
-			default:
-				$convert->src_truncate_statement = 'TRUNCATE TABLE ';
-			break;
-		}
-
-		if ($convert->mysql_convert && !$same_db)
-		{
-			$src_db->sql_query("SET NAMES 'binary'");
-		}
-
-		if ($db->truncate)
-		{
-			$convert->truncate_statement = 'TRUNCATE TABLE ';
-		}
-		else
-		{
-			$convert->truncate_statement = 'DELETE FROM ';
-		}
-
-		$get_info = false;
-
-		// check security implications of direct inclusion
-		if (!file_exists('./convertors/convert_' . $convert->convertor_tag . '.' . PHP_EXT))
-		{
-			$this->p_master->error($user->lang['CONVERT_NOT_EXIST'], __LINE__, __FILE__);
-		}
-
-		if (file_exists('./convertors/functions_' . $convert->convertor_tag . '.' . PHP_EXT))
-		{
-			include('./convertors/functions_' . $convert->convertor_tag . '.' . PHP_EXT);
-		}
-
-		$get_info = true;
-		include('./convertors/convert_' . $convert->convertor_tag . '.' . PHP_EXT);
-
-		// Map some variables...
-		$convert->convertor_data = $convertor_data;
-		$convert->tables = $tables;
-		$convert->config_schema = $config_schema;
-
-		// Now include the real data
-		$get_info = false;
-		include('./convertors/convert_' . $convert->convertor_tag . '.' . PHP_EXT);
-
-		$convert->convertor_data = $convertor_data;
-		$convert->tables = $tables;
-		$convert->config_schema = $config_schema;
-		$convert->convertor = $convertor;
-
-		// The test_file is a file that should be present in the location of the old board.
-		if (!file_exists($convert->options['forum_path'] . '/' . $test_file))
-		{
-			$this->p_master->error(sprintf($user->lang['COULD_NOT_FIND_PATH'], $convert->options['forum_path']), __LINE__, __FILE__);
-		}
-
-		$search_type = basename(trim($config['search_type']));
-
-		// For conversions we are a bit less strict and set to a search backend we know exist...
-		if (!file_exists(PHPBB_ROOT_PATH . 'includes/search/' . $search_type . '.' . PHP_EXT))
-		{
-			$search_type = 'fulltext_native';
-			set_config('search_type', $search_type);
-		}
-
-		if (!file_exists(PHPBB_ROOT_PATH . 'includes/search/' . $search_type . '.' . PHP_EXT))
-		{
-			trigger_error('NO_SUCH_SEARCH_MODULE');
-		}
-
-		require(PHPBB_ROOT_PATH . 'includes/search/' . $search_type . '.' . PHP_EXT);
-
-		$error = false;
-		$convert->fulltext_search = new $search_type($error);
-
-		if ($error)
-		{
-			trigger_error($error);
-		}
-
-		include(PHPBB_ROOT_PATH . 'includes/message_parser.' . PHP_EXT);
-		$message_parser = new parse_message();
-
-		$jump = request_var('jump', 0);
-		$final_jump = request_var('final_jump', 0);
-		$sync_batch = request_var('sync_batch', -1);
-		$last_statement = request_var('last', 0);
-
-		// We are running sync...
-		if ($sync_batch >= 0)
-		{
-			$this->sync_forums($sync_batch);
-			return;
-		}
-
-		if ($jump)
-		{
-			$this->jump($jump, $last_statement);
-			return;
-		}
-
-		if ($final_jump)
-		{
-			$this->final_jump($final_jump);
-			return;
-		}
-
-		$current_table = request_var('current_table', 0);
-		$old_current_table = min(-1, $current_table - 1);
-		$skip_rows = request_var('skip_rows', 0);
-
-		if (!$current_table && !$skip_rows)
-		{
-			if (!phpbb_request::variable('confirm', false))
-			{
-				// If avatars / ranks / smilies folders are specified make sure they are writable
-				$bad_folders = array();
-
-				$local_paths = array(
-					'avatar_path'			=> path($config['avatar_path']),
-					'avatar_gallery_path'	=> path($config['avatar_gallery_path']),
-					'icons_path'			=> path($config['icons_path']),
-					'ranks_path'			=> path($config['ranks_path']),
-					'smilies_path'			=> path($config['smilies_path'])
-				);
-
-				foreach ($local_paths as $folder => $local_path)
-				{
-					if (isset($convert->convertor[$folder]))
-					{
-						if (empty($convert->convertor['test_file']))
-						{
-							// test_file is mandantory at the moment so this should never be reached, but just in case...
-							$this->p_master->error($user->lang['DEV_NO_TEST_FILE'], __LINE__, __FILE__);
-						}
-
-						if (!$local_path || !@is_writable(PHPBB_ROOT_PATH . $local_path))
-						{
-							if (!$local_path)
-							{
-								$bad_folders[] = sprintf($user->lang['CONFIG_PHPBB_EMPTY'], $folder);
-							}
-							else
-							{
-								$bad_folders[] = $local_path;
-							}
-						}
-					}
-				}
-
-				if (sizeof($bad_folders))
-				{
-					$msg = (sizeof($bad_folders) == 1) ? $user->lang['MAKE_FOLDER_WRITABLE'] : $user->lang['MAKE_FOLDERS_WRITABLE'];
-					sort($bad_folders);
-					$this->p_master->error(sprintf($msg, implode('<br />', $bad_folders)), __LINE__, __FILE__, true);
-
-					$template->assign_vars(array(
-						'L_SUBMIT'	=> $user->lang['INSTALL_TEST'],
-						'U_ACTION'	=> $this->p_master->module_url . "?mode={$this->mode}&amp;sub=in_progress&amp;tag={$convert->convertor_tag}&amp;language=$language",
-					));
-					return;
-				}
-
-				// Grab all the tables used in convertor
-				$missing_tables = $tables_list = $aliases = array();
-
-				foreach ($convert->convertor['schema'] as $schema)
-				{
-					// Skip those not used (because of addons/plugins not detected)
-					if (!$schema['target'])
-					{
-						continue;
-					}
-
-					foreach ($schema as $key => $val)
-					{
-						// we're dealing with an array like:
-						// array('forum_status',			'forums.forum_status',				'is_item_locked')
-						if (is_int($key) && !empty($val[1]))
-						{
-							$temp_data = $val[1];
-							if (!is_array($temp_data))
-							{
-								$temp_data = array($temp_data);
-							}
-
-							foreach ($temp_data as $val)
-							{
-								if (preg_match('/([a-z0-9_]+)\.([a-z0-9_]+)\)* ?A?S? ?([a-z0-9_]*?)\.?([a-z0-9_]*)$/i', $val, $m))
-								{
-									$table = $convert->src_table_prefix . $m[1];
-									$tables_list[$table] = $table;
-
-									if (!empty($m[3]))
-									{
-										$aliases[] = $convert->src_table_prefix . $m[3];
-									}
-								}
-							}
-						}
-						// 'left_join'		=> 'topics LEFT JOIN vote_desc ON topics.topic_id = vote_desc.topic_id AND topics.topic_vote = 1'
-						else if ($key == 'left_join')
-						{
-							// Convert the value if it wasn't an array already.
-							if (!is_array($val))
-							{
-								$val = array($val);
-							}
-
-							for ($j = 0; $j < sizeof($val); ++$j)
-							{
-								if (preg_match('/LEFT JOIN ([a-z0-9_]+) AS ([a-z0-9_]+)/i', $val[$j], $m))
-								{
-									$table = $convert->src_table_prefix . $m[1];
-									$tables_list[$table] = $table;
-
-									if (!empty($m[2]))
-									{
-										$aliases[] = $convert->src_table_prefix . $m[2];
-									}
-								}
-							}
-						}
-					}
-				}
-
-				// Remove aliased tables from $tables_list
-				foreach ($aliases as $alias)
-				{
-					unset($tables_list[$alias]);
-				}
-
-				// Check if the tables that we need exist
-				$src_db->sql_return_on_error(true);
-				foreach ($tables_list as $table => $null)
-				{
-					$sql = 'SELECT 1 FROM ' . $table;
-					$_result = $src_db->sql_query_limit($sql, 1);
-
-					if (!$_result)
-					{
-						$missing_tables[] = $table;
-					}
-					$src_db->sql_freeresult($_result);
-				}
-				$src_db->sql_return_on_error(false);
-
-				// Throw an error if some tables are missing
-				// We used to do some guessing here, but since we have a suggestion of possible values earlier, I don't see it adding anything here to do it again
-
-				if (sizeof($missing_tables) == sizeof($tables_list))
-				{
-					$this->p_master->error($user->lang['NO_TABLES_FOUND'] . ' ' . $user->lang['CHECK_TABLE_PREFIX'], __LINE__, __FILE__);
-				}
-				else if (sizeof($missing_tables))
-				{
-					$this->p_master->error(sprintf($user->lang['TABLES_MISSING'], implode(', ', $missing_tables)) . '<br /><br />' . $user->lang['CHECK_TABLE_PREFIX'], __LINE__, __FILE__);
-				}
-
-				$url = $this->save_convert_progress('&amp;confirm=1');
-				$msg = $user->lang['PRE_CONVERT_COMPLETE'];
-
-				if ($convert->convertor_data['author_notes'])
-				{
-					$msg .= '</p><p>' . sprintf($user->lang['AUTHOR_NOTES'], $convert->convertor_data['author_notes']);
-				}
-
-				$template->assign_vars(array(
-					'L_SUBMIT'		=> $user->lang['CONTINUE_CONVERT'],
-					'L_MESSAGE'		=> $msg,
-					'U_ACTION'		=> $url,
-				));
-
-				return;
-			} // if (!phpbb_request::variable('confirm', false))
-
-			$template->assign_block_vars('checks', array(
-				'S_LEGEND'		=> true,
-				'LEGEND'		=> $user->lang['STARTING_CONVERT'],
-			));
-
-			// Convert the config table and load the settings of the old board
-			if (!empty($convert->config_schema))
-			{
-				restore_config($convert->config_schema);
-
-				// Override a couple of config variables for the duration
-				$config['max_quote_depth'] = 0;
-
-				// @todo Need to confirm that max post length in source is <= max post length in destination or there may be interesting formatting issues
-				$config['max_post_chars'] = 0;
-			}
-
-			$template->assign_block_vars('checks', array(
-				'TITLE'		=> $user->lang['CONFIG_CONVERT'],
-				'RESULT'	=> $user->lang['DONE'],
-			));
-
-			// Now process queries and execute functions that have to be executed prior to the conversion
-			if (!empty($convert->convertor['execute_first']))
-			{
-				eval($convert->convertor['execute_first']);
-			}
-
-			if (!empty($convert->convertor['query_first']))
-			{
-				if (!is_array($convert->convertor['query_first']))
-				{
-					$convert->convertor['query_first'] = array('target', array($convert->convertor['query_first']));
-				}
-				else if (!is_array($convert->convertor['query_first'][0]))
-				{
-					$convert->convertor['query_first'] = array(array($convert->convertor['query_first'][0], $convert->convertor['query_first'][1]));
-				}
-
-				foreach ($convert->convertor['query_first'] as $query_first)
-				{
-					if ($query_first[0] == 'src')
-					{
-						if ($convert->mysql_convert && $same_db)
-						{
-							$src_db->sql_query("SET NAMES 'binary'");
-						}
-
-						$src_db->sql_query($query_first[1]);
-
-						if ($convert->mysql_convert && $same_db)
-						{
-							$src_db->sql_query("SET NAMES 'utf8'");
-						}
-					}
-					else
-					{
-						$db->sql_query($query_first[1]);
-					}
-				}
-			}
-
-			$template->assign_block_vars('checks', array(
-				'TITLE'		=> $user->lang['PREPROCESS_STEP'],
-				'RESULT'	=> $user->lang['DONE'],
-			));
-		} // if (!$current_table && !$skip_rows)
-
-		$template->assign_block_vars('checks', array(
-			'S_LEGEND'		=> true,
-			'LEGEND'		=> $user->lang['FILLING_TABLES'],
-		));
-
-		// This loop takes one target table and processes it
-		while ($current_table < sizeof($convert->convertor['schema']))
-		{
-			$schema = $convert->convertor['schema'][$current_table];
-
-			// The target table isn't set, this can be because a module (for example the attachement mod) is taking care of this.
-			if (empty($schema['target']))
-			{
-				$current_table++;
-				continue;
-			}
-
-			$template->assign_block_vars('checks', array(
-				'TITLE'	=> sprintf($user->lang['FILLING_TABLE'], $schema['target']),
-			));
-
-			// This is only the case when we first start working on the tables.
-			if (!$skip_rows)
-			{
-				// process execute_first and query_first for this table...
-				if (!empty($schema['execute_first']))
-				{
-					eval($schema['execute_first']);
-				}
-
-				if (!empty($schema['query_first']))
-				{
-					if (!is_array($schema['query_first']))
-					{
-						$schema['query_first'] = array('target', array($schema['query_first']));
-					}
-					else if (!is_array($schema['query_first'][0]))
-					{
-						$schema['query_first'] = array(array($schema['query_first'][0], $schema['query_first'][1]));
-					}
-
-					foreach ($schema['query_first'] as $query_first)
-					{
-						if ($query_first[0] == 'src')
-						{
-							if ($convert->mysql_convert && $same_db)
-							{
-								$src_db->sql_query("SET NAMES 'binary'");
-							}
-							$src_db->sql_query($query_first[1]);
-							if ($convert->mysql_convert && $same_db)
-							{
-								$src_db->sql_query("SET NAMES 'utf8'");
-							}
-						}
-						else
-						{
-							$db->sql_query($query_first[1]);
-						}
-					}
-				}
-
-				if (!empty($schema['autoincrement']))
-				{
-					switch ($db->dbms_type)
-					{
-						case 'postgres':
-							$db->sql_query("SELECT SETVAL('" . $schema['target'] . "_seq',(select case when max(" . $schema['autoincrement'] . ")>0 then max(" . $schema['autoincrement'] . ")+1 else 1 end from " . $schema['target'] . '));');
-						break;
-
-						case 'oracle':
-							$result = $db->sql_query('SELECT MAX(' . $schema['autoincrement'] . ') as max_id FROM ' . $schema['target']);
-							$row = $db->sql_fetchrow($result);
-							$db->sql_freeresult($result);
-
-							$largest_id = (int) $row['max_id'];
-
-							if ($largest_id)
-							{
-								$db->sql_query('DROP SEQUENCE ' . $schema['target'] . '_seq');
-								$db->sql_query('CREATE SEQUENCE ' . $schema['target'] . '_seq START WITH ' . ($largest_id + 1));
-							}
-						break;
-					}
-				}
-			}
-
-			// Process execute_always for this table
-			// This is for code which needs to be executed on every pass of this table if
-			// it gets split because of time restrictions
-			if (!empty($schema['execute_always']))
-			{
-				eval($schema['execute_always']);
-			}
-
-			//
-			// Set up some variables
-			//
-			// $waiting_rows	holds rows for multirows insertion (MySQL only)
-			// $src_tables		holds unique tables with aliases to select from
-			// $src_fields		will quickly refer source fields (or aliases) corresponding to the current index
-			// $select_fields	holds the names of the fields to retrieve
-			//
-
-			$sql_data = array(
-				'source_fields'		=> array(),
-				'target_fields'		=> array(),
-				'source_tables'		=> array(),
-				'select_fields'		=> array(),
-			);
-
-			// This statement is building the keys for later insertion.
-			$insert_query = $this->build_insert_query($schema, $sql_data, $current_table);
-
-			// If no source table is affected, we skip the table
-			if (empty($sql_data['source_tables']))
-			{
-				$skip_rows = 0;
-				$current_table++;
-				continue;
-			}
-
-			$distinct = (!empty($schema['distinct'])) ? 'DISTINCT ' : '';
-
-			$sql = 'SELECT ' . $distinct . implode(', ', $sql_data['select_fields']) . " \nFROM " . implode(', ', $sql_data['source_tables']);
-
-			// Where
-			$sql .= (!empty($schema['where'])) ? "\nWHERE (" . $schema['where'] . ')' : '';
-
-			// Group By
-			if (!empty($schema['group_by']))
-			{
-				$schema['group_by'] = array($schema['group_by']);
-				foreach ($sql_data['select_fields'] as $select)
-				{
-					$alias = strpos(strtolower($select), ' as ');
-					$select = ($alias) ? substr($select, 0, $alias) : $select;
-					if (!in_array($select, $schema['group_by']))
-					{
-						$schema['group_by'][] = $select;
-					}
-				}
-			}
-			$sql .= (!empty($schema['group_by'])) ? "\nGROUP BY " . implode(', ', $schema['group_by']) : '';
-
-			// Having
-			$sql .= (!empty($schema['having'])) ? "\nHAVING " . $schema['having'] : '';
-
-			// Order By
-			if (empty($schema['order_by']) && !empty($schema['primary']))
-			{
-				$schema['order_by'] = $schema['primary'];
-			}
-			$sql .= (!empty($schema['order_by'])) ? "\nORDER BY " . $schema['order_by'] : '';
-
-			// Counting basically holds the amount of rows processed.
-			$counting = -1;
-			$batch_time = 0;
-
-			while ($counting === -1 || ($counting >= $convert->batch_size && still_on_time()))
-			{
-				$old_current_table = $current_table;
-
-				$rows = '';
-				$waiting_rows = array();
-
-				if (!empty($batch_time))
-				{
-					$mtime = explode(' ', microtime());
-					$mtime = $mtime[0] + $mtime[1];
-					$rows = ceil($counting/($mtime - $batch_time)) . " rows/s ($counting rows) | ";
-				}
-
-				$template->assign_block_vars('checks', array(
-					'TITLE'		=> "skip_rows = $skip_rows",
-					'RESULT'	=> $rows . ((defined('DEBUG_EXTRA') && function_exists('memory_get_usage')) ? ceil(memory_get_usage()/1024) . ' ' . $user->lang['KIB'] : ''),
-				));
-
-				$mtime = explode(' ', microtime());
-				$batch_time = $mtime[0] + $mtime[1];
-
-				if ($convert->mysql_convert && $same_db)
-				{
-					$src_db->sql_query("SET NAMES 'binary'");
-				}
-
-				// Take skip rows into account and only fetch batch_size amount of rows
-				$___result = $src_db->sql_query_limit($sql, $convert->batch_size, $skip_rows);
-
-				if ($convert->mysql_convert && $same_db)
-				{
-					$src_db->sql_query("SET NAMES 'utf8'");
-				}
-
-				// This loop processes each row
-				$counting = 0;
-
-				$convert->row = $convert_row = array();
-
-				if (!empty($schema['autoincrement']))
-				{
-					switch ($db->dbms_type)
-					{
-						case 'mssql':
-							$db->sql_query('SET IDENTITY_INSERT ' . $schema['target'] . ' ON');
-						break;
-					}
-				}
-
-				// Now handle the rows until time is over or no more rows to process...
-				while ($counting === 0 || still_on_time())
-				{
-					$convert_row = $src_db->sql_fetchrow($___result);
-
-					if (!$convert_row)
-					{
-						// move to the next batch or table
-						break;
-					}
-
-					// With this we are able to always save the last state
-					$convert->row = $convert_row;
-
-					// Increment the counting variable, it stores the number of rows we have processed
-					$counting++;
-
-					$insert_values = array();
-
-					$sql_flag = $this->process_row($schema, $sql_data, $insert_values);
-
-					if ($sql_flag === true)
-					{
-						switch ($db->dbms_type)
-						{
-							// If MySQL, we'll wait to have num_wait_rows rows to submit at once
-							case 'mysql':
-								$waiting_rows[] = '(' . implode(', ', $insert_values) . ')';
-
-								if (sizeof($waiting_rows) >= $convert->num_wait_rows)
-								{
-									$errored = false;
-
-									$db->sql_return_on_error(true);
-
-									if (!$db->sql_query($insert_query . implode(', ', $waiting_rows)))
-									{
-										$errored = true;
-									}
-									$db->sql_return_on_error(false);
-
-									if ($errored)
-									{
-										$db->sql_return_on_error(true);
-
-										// Because it errored out we will try to insert the rows one by one... most of the time this
-										// is caused by duplicate entries - but we also do not want to miss one...
-										foreach ($waiting_rows as $waiting_sql)
-										{
-											if (!$db->sql_query($insert_query . $waiting_sql))
-											{
-												$this->p_master->db_error($user->lang['DB_ERR_INSERT'], htmlspecialchars($insert_query . $waiting_sql) . '<br /><br />' . htmlspecialchars(print_r($db->_sql_error(), true)), __LINE__, __FILE__, true);
-											}
-										}
-
-										$db->sql_return_on_error(false);
-									}
-
-									$waiting_rows = array();
-								}
-
-							break;
-
-							default:
-								$insert_sql = $insert_query . '(' . implode(', ', $insert_values) . ')';
-
-								$db->sql_return_on_error(true);
-
-								if (!$db->sql_query($insert_sql))
-								{
-									$this->p_master->db_error($user->lang['DB_ERR_INSERT'], htmlspecialchars($insert_sql) . '<br /><br />' . htmlspecialchars(print_r($db->_sql_error(), true)), __LINE__, __FILE__, true);
-								}
-								$db->sql_return_on_error(false);
-
-								$waiting_rows = array();
-
-							break;
-						}
-					}
-
-					$skip_rows++;
-				}
-				$src_db->sql_freeresult($___result);
-
-				// We might still have some rows waiting
-				if (sizeof($waiting_rows))
-				{
-					$errored = false;
-					$db->sql_return_on_error(true);
-
-					if (!$db->sql_query($insert_query . implode(', ', $waiting_rows)))
-					{
-						$errored = true;
-					}
-					$db->sql_return_on_error(false);
-
-					if ($errored)
-					{
-						$db->sql_return_on_error(true);
-
-						// Because it errored out we will try to insert the rows one by one... most of the time this
-						// is caused by duplicate entries - but we also do not want to miss one...
-						foreach ($waiting_rows as $waiting_sql)
-						{
-							$db->sql_query($insert_query . $waiting_sql);
-							$this->p_master->db_error($user->lang['DB_ERR_INSERT'], htmlspecialchars($insert_query . $waiting_sql) . '<br /><br />' . htmlspecialchars(print_r($db->_sql_error(), true)), __LINE__, __FILE__, true);
-						}
-
-						$db->sql_return_on_error(false);
-					}
-
-					$waiting_rows = array();
-				}
-
-				if (!empty($schema['autoincrement']))
-				{
-					switch ($db->dbms_type)
-					{
-						case 'mssql':
-							$db->sql_query('SET IDENTITY_INSERT ' . $schema['target'] . ' OFF');
-						break;
-
-						case 'postgres':
-							$db->sql_query("SELECT SETVAL('" . $schema['target'] . "_seq',(select case when max(" . $schema['autoincrement'] . ")>0 then max(" . $schema['autoincrement'] . ")+1 else 1 end from " . $schema['target'] . '));');
-						break;
-
-						case 'oracle':
-							$result = $db->sql_query('SELECT MAX(' . $schema['autoincrement'] . ') as max_id FROM ' . $schema['target']);
-							$row = $db->sql_fetchrow($result);
-							$db->sql_freeresult($result);
-
-							$largest_id = (int) $row['max_id'];
-
-							if ($largest_id)
-							{
-								$db->sql_query('DROP SEQUENCE ' . $schema['target'] . '_seq');
-								$db->sql_query('CREATE SEQUENCE ' . $schema['target'] . '_seq START WITH ' . ($largest_id + 1));
-							}
-						break;
-					}
-				}
-			}
-
-			// When we reach this point, either the current table has been processed or we're running out of time.
-			if (still_on_time() && $counting < $convert->batch_size/* && !defined('DEBUG_EXTRA')*/)
-			{
-				$skip_rows = 0;
-				$current_table++;
-			}
-			else
-			{/*
-				if (still_on_time() && $counting < $convert->batch_size)
-				{
-					$skip_rows = 0;
-					$current_table++;
-				}*/
-
-				// Looks like we ran out of time.
-				$url = $this->save_convert_progress('&amp;current_table=' . $current_table . '&amp;skip_rows=' . $skip_rows);
-
-				$current_table++;
-//				$percentage = ($skip_rows == 0) ? 0 : floor(100 / ($total_rows / $skip_rows));
-
-				$msg = sprintf($user->lang['STEP_PERCENT_COMPLETED'], $current_table, sizeof($convert->convertor['schema']));
-
-				$template->assign_vars(array(
-					'L_MESSAGE'		=> $msg,
-					'L_SUBMIT'		=> $user->lang['CONTINUE_CONVERT'],
-					'U_ACTION'		=> $url,
-				));
-
-				$this->meta_refresh($url);
-				return;
-			}
-		}
-
-		// Process execute_last then we'll be done
-		$url = $this->save_convert_progress('&amp;jump=1');
-
-		$template->assign_vars(array(
-			'L_SUBMIT'		=> $user->lang['FINAL_STEP'],
-			'U_ACTION'		=> $url,
-		));
-
-		$this->meta_refresh($url);
-		return;
-	}
-
-	/**
-	* Sync function being executed at the middle, some functions need to be executed after a successful sync.
-	*/
-	function sync_forums($sync_batch)
-	{
-		global $template, $user, $db, $config;
-		global $convert;
-
-		$template->assign_block_vars('checks', array(
-			'S_LEGEND'	=> true,
-			'LEGEND'	=> $user->lang['SYNC_TOPICS'],
-		));
-
-		$batch_size = $convert->batch_size;
-
-		$sql = 'SELECT MIN(topic_id) as min_value, MAX(topic_id) AS max_value
-			FROM ' . TOPICS_TABLE;
-		$result = $db->sql_query($sql);
-		$row = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
-
-		// Set values of minimum/maximum primary value for this table.
-		$primary_min = $row['min_value'];
-		$primary_max = $row['max_value'];
-
-		if ($sync_batch == 0)
-		{
-			$sync_batch = (int) $primary_min;
-		}
-
-		if ($sync_batch == 0)
-		{
-			$sync_batch = 1;
-		}
-
-		// Fetch a batch of rows, process and insert them.
-		while ($sync_batch <= $primary_max && still_on_time())
-		{
-			$end = ($sync_batch + $batch_size - 1);
-
-			// Sync all topics in batch mode...
-			sync('topic_approved', 'range', 'topic_id BETWEEN ' . $sync_batch . ' AND ' . $end, true, false);
-			sync('topic', 'range', 'topic_id BETWEEN ' . $sync_batch . ' AND ' . $end, true, true);
-
-			$template->assign_block_vars('checks', array(
-				'TITLE'		=> sprintf($user->lang['SYNC_TOPIC_ID'], $sync_batch, ($sync_batch + $batch_size)) . ((defined('DEBUG_EXTRA') && function_exists('memory_get_usage')) ? ' [' . ceil(memory_get_usage()/1024) . ' ' . $user->lang['KIB'] . ']' : ''),
-				'RESULT'	=> $user->lang['DONE'],
-			));
-
-			$sync_batch += $batch_size;
-		}
-
-		if ($sync_batch >= $primary_max)
-		{
-			$url = $this->save_convert_progress('&amp;final_jump=1');
-
-			$template->assign_vars(array(
-				'L_SUBMIT'		=> $user->lang['CONTINUE_CONVERT'],
-				'U_ACTION'		=> $url,
-			));
-
-			$this->meta_refresh($url);
-			return;
-		}
-		else
-		{
-			$sync_batch--;
-		}
-
-		$url = $this->save_convert_progress('&amp;sync_batch=' . $sync_batch);
-
-		$template->assign_vars(array(
-			'L_SUBMIT'		=> $user->lang['CONTINUE_CONVERT'],
-			'U_ACTION'		=> $url,
-		));
-
-		$this->meta_refresh($url);
-		return;
-	}
-
-	/**
-	* Save the convertor status
-	*/
-	function save_convert_progress($step)
-	{
-		global $convert, $language;
-
-		// Save convertor Status
-		set_config('convert_progress', serialize(array(
-			'step'			=> $step,
-			'table_prefix'	=> $convert->src_table_prefix,
-			'tag'			=> $convert->convertor_tag,
-		)), true);
-
-		set_config('convert_db_server', serialize(array(
-			'dbms'			=> $convert->src_dbms,
-			'dbhost'		=> $convert->src_dbhost,
-			'dbport'		=> $convert->src_dbport,
-			'dbname'		=> $convert->src_dbname,
-		)), true);
-
-		set_config('convert_db_user', serialize(array(
-			'dbuser'		=> $convert->src_dbuser,
-			'dbpasswd'		=> $convert->src_dbpasswd,
-		)), true);
-
-		return $this->p_master->module_url . "?mode={$this->mode}&amp;sub=in_progress&amp;tag={$convert->convertor_tag}$step&amp;language=$language";
-	}
-
-	/**
-	* Finish conversion, the last function to be called.
-	*/
-	function finish_conversion()
-	{
-		global $db, $convert, $config, $language, $user, $template;
-
-		$db->sql_query('DELETE FROM ' . CONFIG_TABLE . "
-			WHERE config_name = 'convert_progress'
-				OR config_name = 'convert_options'
-				OR config_name = 'convert_db_server'
-				OR config_name = 'convert_db_user'");
-		$db->sql_query('DELETE FROM ' . SESSIONS_TABLE);
-
-		@unlink(PHPBB_ROOT_PATH . 'cache/data_global.php');
-		cache_moderators();
-
-		// And finally, add a note to the log
-		add_log('admin', 'LOG_INSTALL_CONVERTED', $convert->convertor_data['forum_name'], $config['version']);
-
-		$url = $this->p_master->module_url . "?mode={$this->mode}&amp;sub=final&amp;language=$language";
-
-		$template->assign_vars(array(
-			'L_SUBMIT'		=> $user->lang['FINAL_STEP'],
-			'U_ACTION'		=> $url,
-		));
-
-		$this->meta_refresh($url);
-		return;
-	}
-
-	/**
-	* This function marks the steps after syncing
-	*/
-	function final_jump($final_jump)
-	{
-		global $template, $user, $src_db, $same_db, $db, $config;
-		global $convert;
-
-		$template->assign_block_vars('checks', array(
-			'S_LEGEND'	=> true,
-			'LEGEND'	=> $user->lang['PROCESS_LAST'],
-		));
-
-		if ($final_jump == 1)
-		{
-			$db->sql_return_on_error(true);
-
-			update_topics_posted();
-
-			$template->assign_block_vars('checks', array(
-				'TITLE'		=> $user->lang['UPDATE_TOPICS_POSTED'],
-				'RESULT'	=> $user->lang['DONE'],
-			));
-
-			if ($db->sql_error_triggered)
-			{
-				$template->assign_vars(array(
-					'S_ERROR_BOX'	=> true,
-					'ERROR_TITLE'	=> $user->lang['UPDATE_TOPICS_POSTED'],
-					'ERROR_MSG'		=> $user->lang['UPDATE_TOPICS_POSTED_ERR'],
-				));
-			}
-			$db->sql_return_on_error(false);
-
-			$this->finish_conversion();
-			return;
-		}
-	}
-
-	/**
-	* This function marks the steps before syncing (jump=1)
-	*/
-	function jump($jump, $last_statement)
-	{
-		global $template, $user, $src_db, $same_db, $db, $config;
-		global $convert;
-
-		$template->assign_block_vars('checks', array(
-			'S_LEGEND'	=> true,
-			'LEGEND'	=> $user->lang['PROCESS_LAST'],
-		));
-
-		if ($jump == 1)
-		{
-			// Execute 'last' statements/queries
-			if (!empty($convert->convertor['execute_last']))
-			{
-				if (!is_array($convert->convertor['execute_last']))
-				{
-					eval($convert->convertor['execute_last']);
-				}
-				else
-				{
-					while ($last_statement < sizeof($convert->convertor['execute_last']))
-					{
-						eval($convert->convertor['execute_last'][$last_statement]);
-
-						$template->assign_block_vars('checks', array(
-							'TITLE'		=> $convert->convertor['execute_last'][$last_statement],
-							'RESULT'	=> $user->lang['DONE'],
-						));
-
-						$last_statement++;
-						$url = $this->save_convert_progress('&amp;jump=1&amp;last=' . $last_statement);
-
-						$percentage = ($last_statement == 0) ? 0 : floor(100 / (sizeof($convert->convertor['execute_last']) / $last_statement));
-						$msg = sprintf($user->lang['STEP_PERCENT_COMPLETED'], $last_statement, sizeof($convert->convertor['execute_last']), $percentage);
-
-						$template->assign_vars(array(
-							'L_SUBMIT'		=> $user->lang['CONTINUE_LAST'],
-							'L_MESSAGE'		=> $msg,
-							'U_ACTION'		=> $url,
-						));
-
-						$this->meta_refresh($url);
-						return;
-					}
-				}
-			}
-
-			if (!empty($convert->convertor['query_last']))
-			{
-				if (!is_array($convert->convertor['query_last']))
-				{
-					$convert->convertor['query_last'] = array('target', array($convert->convertor['query_last']));
-				}
-				else if (!is_array($convert->convertor['query_last'][0]))
-				{
-					$convert->convertor['query_last'] = array(array($convert->convertor['query_last'][0], $convert->convertor['query_last'][1]));
-				}
-
-				foreach ($convert->convertor['query_last'] as $query_last)
-				{
-					if ($query_last[0] == 'src')
-					{
-						if ($convert->mysql_convert && $same_db)
-						{
-							$src_db->sql_query("SET NAMES 'binary'");
-						}
-
-						$src_db->sql_query($query_last[1]);
-
-						if ($convert->mysql_convert && $same_db)
-						{
-							$src_db->sql_query("SET NAMES 'utf8'");
-						}
-					}
-					else
-					{
-						$db->sql_query($query_last[1]);
-					}
-				}
-			}
-
-			// Sanity check
-			$db->sql_return_on_error(false);
-			$src_db->sql_return_on_error(false);
-
-			fix_empty_primary_groups();
-
-			if (!isset($config['board_startdate']))
-			{
-				$sql = 'SELECT MIN(user_regdate) AS board_startdate
-					FROM ' . USERS_TABLE;
-				$result = $db->sql_query($sql);
-				$row = $db->sql_fetchrow($result);
-				$db->sql_freeresult($result);
-
-				if (($row['board_startdate'] < $config['board_startdate'] && $row['board_startdate'] > 0) || !isset($config['board_startdate']))
-				{
-					set_config('board_startdate', $row['board_startdate']);
-					$db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_regdate = ' . $row['board_startdate'] . ' WHERE user_id = ' . ANONYMOUS);
-				}
-			}
-
-			update_dynamic_config();
-
-			$template->assign_block_vars('checks', array(
-				'TITLE'		=> $user->lang['CLEAN_VERIFY'],
-				'RESULT'	=> $user->lang['DONE'],
-			));
-
-			$url = $this->save_convert_progress('&amp;jump=2');
-
-			$template->assign_vars(array(
-				'L_SUBMIT'		=> $user->lang['CONTINUE_CONVERT'],
-				'U_ACTION'		=> $url,
-			));
-
-			$this->meta_refresh($url);
-			return;
-		}
-
-		if ($jump == 2)
-		{
-			$db->sql_query('UPDATE ' . USERS_TABLE . " SET user_permissions = ''");
-
-			// TODO: sync() is likely going to bomb out on forums with a considerable amount of topics.
-			// TODO: the sync function is able to handle FROM-TO values, we should use them here (batch processing)
-			sync('forum', '', '', false, true);
-			phpbb::$acm->destroy_sql(FORUMS_TABLE);
-
-			$template->assign_block_vars('checks', array(
-				'TITLE'		=> $user->lang['SYNC_FORUMS'],
-				'RESULT'	=> $user->lang['DONE'],
-			));
-
-			// Continue with synchronizing the forums...
-			$url = $this->save_convert_progress('&amp;sync_batch=0');
-
-			$template->assign_vars(array(
-				'L_SUBMIT'		=> $user->lang['CONTINUE_CONVERT'],
-				'U_ACTION'		=> $url,
-			));
-
-			$this->meta_refresh($url);
-			return;
-		}
-	}
-
-	function build_insert_query(&$schema, &$sql_data, $current_table)
-	{
-		global $db, $user;
-		global $convert;
-
-		// Can we use IGNORE with this DBMS?
-		$sql_ignore = ($db->dbms_type === 'mysql' && !defined('DEBUG_EXTRA')) ? 'IGNORE ' : '';
-		$insert_query = 'INSERT ' . $sql_ignore . 'INTO ' . $schema['target'] . ' (';
-
-		$aliases = array();
-
-		$sql_data = array(
-			'source_fields'		=> array(),
-			'target_fields'		=> array(),
-			'source_tables'		=> array(),
-			'select_fields'		=> array(),
-		);
-
-		foreach ($schema as $key => $val)
-		{
-			// Example: array('group_name',				'extension_groups.group_name',		'htmlspecialchars'),
-			if (is_int($key))
-			{
-				if (!empty($val[0]))
-				{
-					// Target fields
-					$sql_data['target_fields'][$val[0]] = $key;
-					$insert_query .= $val[0] . ', ';
-				}
-
-				if (!is_array($val[1]))
-				{
-					$val[1] = array($val[1]);
-				}
-
-				foreach ($val[1] as $valkey => $value_1)
-				{
-					// This should cover about any case:
-					//
-					// table.field					=> SELECT table.field				FROM table
-					// table.field AS alias			=> SELECT table.field	AS alias	FROM table
-					// table.field AS table2.alias	=> SELECT table2.field	AS alias	FROM table table2
-					// table.field AS table2.field	=> SELECT table2.field				FROM table table2
-					//
-					if (preg_match('/^([a-z0-9_]+)\.([a-z0-9_]+)( +AS +(([a-z0-9_]+?)\.)?([a-z0-9_]+))?$/i', $value_1, $m))
-					{
-						// There is 'AS ...' in the field names
-						if (!empty($m[3]))
-						{
-							$value_1 = ($m[2] == $m[6]) ? $m[1] . '.' . $m[2] : $m[1] . '.' . $m[2] . ' AS ' . $m[6];
-
-							// Table alias: store it then replace the source table with it
-							if (!empty($m[5]) && $m[5] != $m[1])
-							{
-								$aliases[$m[5]] = $m[1];
-								$value_1 = str_replace($m[1] . '.' . $m[2], $m[5] . '.' . $m[2], $value_1);
-							}
-						}
-						else
-						{
-							// No table alias
-							$sql_data['source_tables'][$m[1]] = (empty($convert->src_table_prefix)) ? $m[1] : $convert->src_table_prefix . $m[1] . ' ' . $m[1];
-						}
-
-						$sql_data['select_fields'][$value_1] = $value_1;
-						$sql_data['source_fields'][$key][$valkey] = (!empty($m[6])) ? $m[6] : $m[2];
-					}
-				}
-			}
-			else if ($key == 'where' || $key == 'group_by' || $key == 'order_by' || $key == 'having')
-			{
-				if (@preg_match_all('/([a-z0-9_]+)\.([a-z0-9_]+)/i', $val, $m))
-				{
-					foreach ($m[1] as $value)
-					{
-						$sql_data['source_tables'][$value] = (empty($convert->src_table_prefix)) ? $value : $convert->src_table_prefix . $value . ' ' . $value;
-					}
-				}
-			}
-		}
-
-		// Add the aliases to the list of tables
-		foreach ($aliases as $alias => $table)
-		{
-			$sql_data['source_tables'][$alias] = $convert->src_table_prefix . $table . ' ' . $alias;
-		}
-
-		// 'left_join'		=> 'forums LEFT JOIN forum_prune ON forums.forum_id = forum_prune.forum_id',
-		if (!empty($schema['left_join']))
-		{
-			if (!is_array($schema['left_join']))
-			{
-				$schema['left_join'] = array($schema['left_join']);
-			}
-
-			foreach ($schema['left_join'] as $left_join)
-			{
-				// This won't handle concatened LEFT JOINs
-				if (!preg_match('/([a-z0-9_]+) LEFT JOIN ([a-z0-9_]+) A?S? ?([a-z0-9_]*?) ?(ON|USING)(.*)/i', $left_join, $m))
-				{
-					$this->p_master->error(sprintf($user->lang['NOT_UNDERSTAND'], 'LEFT JOIN', $left_join, $current_table, $schema['target']), __LINE__, __FILE__);
-				}
-
-				if (!empty($aliases[$m[2]]))
-				{
-					if (!empty($m[3]))
-					{
-						$this->p_master->error(sprintf($user->lang['NAMING_CONFLICT'], $m[2], $m[3], $schema['left_join']), __LINE__, __FILE__);
-					}
-
-					$m[2] = $aliases[$m[2]];
-					$m[3] = $m[2];
-				}
-
-				$right_table = $convert->src_table_prefix . $m[2];
-				if (!empty($m[3]))
-				{
-					unset($sql_data['source_tables'][$m[3]]);
-				}
-				else if ($m[2] != $m[1])
-				{
-					unset($sql_data['source_tables'][$m[2]]);
-				}
-
-				if (strpos($sql_data['source_tables'][$m[1]], "\nLEFT JOIN") !== false)
-				{
-					$sql_data['source_tables'][$m[1]] = '(' . $sql_data['source_tables'][$m[1]] . ")\nLEFT JOIN $right_table";
-				}
-				else
-				{
-					$sql_data['source_tables'][$m[1]] .= "\nLEFT JOIN $right_table";
-				}
-
-				if (!empty($m[3]))
-				{
-					unset($sql_data['source_tables'][$m[3]]);
-					$sql_data['source_tables'][$m[1]] .= ' AS ' . $m[3];
-				}
-				else if (!empty($convert->src_table_prefix))
-				{
-					$sql_data['source_tables'][$m[1]] .= ' AS ' . $m[2];
-				}
-				$sql_data['source_tables'][$m[1]] .= ' ' . $m[4] . $m[5];
-			}
-		}
-
-		// Remove ", " from the end of the insert query
-		$insert_query = substr($insert_query, 0, -2) . ') VALUES ';
-
-		return $insert_query;
-	}
-
-	/**
-	* Function for processing the currently handled row
-	*/
-	function process_row(&$schema, &$sql_data, &$insert_values)
-	{
-		global $template, $user, $db, $lang, $config;
-		global $convert, $convert_row;
-
-		$sql_flag = false;
-
-		foreach ($schema as $key => $fields)
-		{
-			// We are only interested in the lines with:
-			// array('comment', 'attachments_desc.comment', 'htmlspecialchars'),
-			if (is_int($key))
-			{
-				if (!is_array($fields[1]))
-				{
-					$fields[1] = array($fields[1]);
-				}
-
-				$firstkey_set = false;
-				$firstkey = 0;
-
-				foreach ($fields[1] as $inner_key => $inner_value)
-				{
-					if (!$firstkey_set)
-					{
-						$firstkey = $inner_key;
-						$firstkey_set = true;
-					}
-
-					$src_field = isset($sql_data['source_fields'][$key][$inner_key]) ? $sql_data['source_fields'][$key][$inner_key] : '';
-
-					if (!empty($src_field))
-					{
-						$fields[1][$inner_key] = $convert->row[$src_field];
-					}
-				}
-
-				if (!empty($fields[0]))
-				{
-					// We have a target field, if we haven't set $sql_flag yet it will be set to TRUE.
-					// If a function has already set it to FALSE it won't change it.
-					if ($sql_flag === false)
-					{
-						$sql_flag = true;
-					}
-
-					// No function assigned?
-					if (empty($fields[2]))
-					{
-						$value = $fields[1][$firstkey];
-					}
-					else if (is_array($fields[2]))
-					{
-						// Execute complex function/eval/typecast
-						$value = $fields[1];
-
-						foreach ($fields[2] as $type => $execution)
-						{
-							if (strpos($type, 'typecast') === 0)
-							{
-								if (!is_array($value))
-								{
-									$value = array($value);
-								}
-								$value = $value[0];
-								settype($value, $execution);
-							}
-							else if (strpos($type, 'function') === 0)
-							{
-								if (!is_array($value))
-								{
-									$value = array($value);
-								}
-
-								$value = call_user_func_array($execution, $value);
-							}
-							else if (strpos($type, 'execute') === 0)
-							{
-								if (!is_array($value))
-								{
-									$value = array($value);
-								}
-
-								$execution = str_replace('{RESULT}', '$value', $execution);
-								$execution = str_replace('{VALUE}', '$value', $execution);
-								eval($execution);
-							}
-						}
-					}
-					else
-					{
-						$value = call_user_func_array($fields[2], $fields[1]);
-					}
-
-					if (is_null($value))
-					{
-						$value = '';
-					}
-
-					$insert_values[] = $db->_sql_validate_value($value);
-				}
-				else if (!empty($fields[2]))
-				{
-					if (is_array($fields[2]))
-					{
-						// Execute complex function/eval/typecast
-						$value = '';
-
-						foreach ($fields[2] as $type => $execution)
-						{
-							if (strpos($type, 'typecast') === 0)
-							{
-								$value = settype($value, $execution);
-							}
-							else if (strpos($type, 'function') === 0)
-							{
-								if (!is_array($value))
-								{
-									$value = array($value);
-								}
-
-								$value = call_user_func_array($execution, $value);
-							}
-							else if (strpos($type, 'execute') === 0)
-							{
-								if (!is_array($value))
-								{
-									$value = array($value);
-								}
-
-								$execution = str_replace('{RESULT}', '$value', $execution);
-								$execution = str_replace('{VALUE}', '$value', $execution);
-								eval($execution);
-							}
-						}
-					}
-					else
-					{
-						call_user_func_array($fields[2], $fields[1]);
-					}
-				}
-			}
-		}
-
-		return $sql_flag;
-	}
-
-	/**
-	* Own meta refresh function to be able to change the global time used
-	*/
-	function meta_refresh($url)
-	{
-		global $convert, $template;
-
-		if ($convert->options['refresh'])
-		{
-			// Because we should not rely on correct settings, we simply use the relative path here directly.
-			$template->assign_vars(array(
-				'S_REFRESH'	=> true,
-				'META'		=> '<meta http-equiv="refresh" content="5;url=' . $url . '" />')
-			);
-		}
-	}
-
-	/**
-	* The information below will be used to build the input fields presented to the user
-	*/
-	var $convert_options = array(
-		'legend1'			=> 'SPECIFY_OPTIONS',
-		'src_dbms'			=> array('lang' => 'DBMS',			'type' => 'select', 'options' => 'dbms_select(\'{VALUE}\', true)', 'explain' => false),
-		'src_dbhost'		=> array('lang' => 'DB_HOST',		'type' => 'text:25:100', 'explain' => true),
-		'src_dbport'		=> array('lang' => 'DB_PORT',		'type' => 'text:25:100', 'explain' => true),
-		'src_dbname'		=> array('lang' => 'DB_NAME',		'type' => 'text:25:100', 'explain' => false),
-		'src_dbuser'		=> array('lang' => 'DB_USERNAME',	'type' => 'text:25:100', 'explain' => false),
-		'src_dbpasswd'		=> array('lang' => 'DB_PASSWORD',	'type' => 'password:25:100', 'explain' => false),
-		'src_table_prefix'	=> array('lang' => 'TABLE_PREFIX',	'type' => 'text:25:100', 'explain' => false),
-		//'src_url'			=> array('lang' => 'FORUM_ADDRESS',	'type' => 'text:50:100', 'explain' => true),
-		'forum_path'		=> array('lang' => 'FORUM_PATH',	'type' => 'text:25:100', 'explain' => true),
-		'refresh'			=> array('lang' => 'REFRESH_PAGE',	'type' => 'radio:yes_no', 'explain' => true),
-	);
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
deleted file mode 100644
index 6f05a222cf..0000000000
--- a/phpBB/install/install_install.php
+++ /dev/null
@@ -1,1886 +0,0 @@
-<?php
-/**
-*
-* @package install
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-*/
-if (!defined('IN_INSTALL'))
-{
-	// Someone has tried to access the file direct. This is not a good idea, so exit
-	exit;
-}
-
-if (!empty($setmodules))
-{
-	// If phpBB is already installed we do not include this module
-	if (@file_exists(PHPBB_ROOT_PATH . 'config.' . PHP_EXT) && !file_exists(PHPBB_ROOT_PATH . 'cache/install_lock'))
-	{
-		include PHPBB_ROOT_PATH . 'config.' . PHP_EXT;
-
-		if (phpbb::$base_config['installed'])
-		{
-			return;
-		}
-	}
-
-	$module[] = array(
-		'module_type'		=> 'install',
-		'module_title'		=> 'INSTALL',
-		'module_filename'	=> substr(basename(__FILE__), 0, -strlen(PHP_EXT)-1),
-		'module_order'		=> 10,
-		'module_subs'		=> '',
-		'module_stages'		=> array('INTRO', 'REQUIREMENTS', 'DATABASE', 'ADMINISTRATOR', 'CONFIG_FILE', 'ADVANCED', 'CREATE_TABLE', 'FINAL'),
-		'module_reqs'		=> ''
-	);
-}
-
-/**
-* Installation
-* @package install
-*/
-class install_install extends module
-{
-	function install_install(&$p_master)
-	{
-		$this->p_master = &$p_master;
-	}
-
-	function main($mode, $sub)
-	{
-		phpbb::$template->assign_vars(array(
-			'S_SUB'			=> $sub,
-			'S_LANG_SELECT'	=> '<select id="language" name="language">' . $this->p_master->inst_language_select(phpbb::$user->lang_name) . '</select>',
-		));
-
-		switch ($sub)
-		{
-			case 'intro':
-				$this->page_title = 'SUB_INTRO';
-
-				phpbb::$template->assign_vars(array(
-					'U_ACTION'		=> phpbb::$url->append_sid($this->p_master->module_url, "mode=$mode&amp;sub=requirements&amp;language=" . phpbb::$user->lang_name),
-				));
-
-			break;
-
-			case 'requirements':
-				$this->page_title = 'STAGE_REQUIREMENTS';
-				$this->check_server_requirements($mode, $sub);
-			break;
-
-			case 'database':
-				$this->page_title = 'STAGE_DATABASE';
-
-				// Obtain any submitted data
-				$data = $this->get_submitted_data();
-
-				$this->obtain_database_settings($mode, $sub, $data);
-			break;
-
-			case 'administrator':
-				$this->page_title = 'STAGE_ADMINISTRATOR';
-
-				phpbb::$user->add_lang('acp/board');
-
-				// Obtain any submitted data
-				$data = $this->get_submitted_data();
-
-				$this->obtain_admin_settings($mode, $sub, $data);
-
-			break;
-
-			case 'config_file':
-				$this->page_title = 'STAGE_CONFIG_FILE';
-
-				// Obtain any submitted data
-				$data = $this->get_submitted_data();
-
-				$this->create_config_file($mode, $sub, $data);
-			break;
-
-			case 'advanced':
-				$this->page_title = 'STAGE_ADVANCED';
-
-				phpbb::$user->add_lang('acp/common');
-				phpbb::$user->add_lang('acp/board');
-
-				// Obtain any submitted data
-				$data = $this->get_submitted_data();
-
-				$this->obtain_advanced_settings($mode, $sub, $data);
-			break;
-
-			case 'create_table':
-				$this->page_title = 'STAGE_CREATE_TABLE';
-
-				// Obtain any submitted data
-				$data = $this->get_submitted_data();
-
-				$this->load_schema($mode, $sub, $data);
-			break;
-
-			case 'final':
-				$this->page_title = 'STAGE_FINAL';
-
-				include PHPBB_ROOT_PATH . 'common.' . PHP_EXT;
-
-				phpbb::$acm->purge();
-
-				$this->build_search_index($mode, $sub);
-				$this->add_modules($mode, $sub);
-				$this->add_language($mode, $sub);
-				$this->add_bots($mode, $sub);
-				$this->email_admin($mode, $sub);
-
-				// Remove the lock file
-				@unlink(PHPBB_ROOT_PATH . 'cache/install_lock');
-
-			break;
-		}
-
-		$this->tpl_name = 'install/install';
-	}
-
-	function build_form($data, $form_array)
-	{
-		foreach ($form_array as $config_key => $vars)
-		{
-			if (!is_array($vars) && strpos($config_key, 'legend') === false)
-			{
-				continue;
-			}
-
-			if (strpos($config_key, 'legend') !== false)
-			{
-				phpbb::$template->assign_block_vars('options', array(
-					'S_LEGEND'		=> true,
-					'LEGEND'		=> phpbb::$user->lang[$vars],
-				));
-
-				continue;
-			}
-
-			$options = isset($vars['options']) ? $vars['options'] : '';
-
-			phpbb::$template->assign_block_vars('options', array(
-				'KEY'			=> $config_key,
-				'TITLE'			=> phpbb::$user->lang[$vars['lang']],
-				'S_EXPLAIN'		=> $vars['explain'],
-				'TITLE_EXPLAIN'	=> ($vars['explain']) ? phpbb::$user->lang[$vars['lang'] . '_EXPLAIN'] : '',
-				'CONTENT'		=> $this->p_master->input_field($config_key, $vars['type'], $data[$config_key], $options),
-			));
-		}
-	}
-
-	function return_hidden_fields()
-	{
-		$args = func_get_args();
-		$data = array_shift($args);
-
-		$s_hidden_fields = '';
-
-		foreach ($args as $argument)
-		{
-			if (!is_array($argument))
-			{
-				continue;
-			}
-
-			foreach ($argument as $config_key => $vars)
-			{
-				if (!is_array($vars))
-				{
-					continue;
-				}
-
-				$s_hidden_fields .= '<input type="hidden" name="' . $config_key . '" value="' . $data[$config_key] . '" />';
-			}
-		}
-
-		return $s_hidden_fields;
-	}
-
-	/**
-	* Checks that the server we are installing on meets the requirements for running phpBB
-	*/
-	function check_server_requirements($mode, $sub)
-	{
-		$passed = array('php' => false, 'db' => false, 'files' => false, 'pcre' => false, 'imagesize' => false,);
-
-		// Test for basic PHP settings
-		phpbb::$template->assign_block_vars('checks', array(
-			'S_LEGEND'			=> true,
-			'LEGEND'			=> phpbb::$user->lang['PHP_SETTINGS'],
-			'LEGEND_EXPLAIN'	=> phpbb::$user->lang['PHP_SETTINGS_EXPLAIN'],
-		));
-
-		// Test the minimum PHP version
-		if (version_compare(PHP_VERSION, '5.2.0') < 0)
-		{
-			$result = '<strong style="color:red">' . phpbb::$user->lang['NO'] . '</strong>';
-		}
-		else
-		{
-			$passed['php'] = true;
-
-			// We also give feedback on whether we're running in safe mode
-			$result = '<strong style="color:green">' . phpbb::$user->lang['YES'];
-			if (@ini_get('safe_mode') == '1' || strtolower(@ini_get('safe_mode')) == 'on')
-			{
-				$result .= ', ' . phpbb::$user->lang['PHP_SAFE_MODE'];
-			}
-			$result .= '</strong>';
-		}
-
-		phpbb::$template->assign_block_vars('checks', array(
-			'TITLE'			=> phpbb::$user->lang['PHP_VERSION_REQD'],
-			'RESULT'		=> $result,
-		));
-
-		// Check for register_globals being enabled
-		if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
-		{
-			$result = '<strong style="color:red">' . phpbb::$user->lang['NO'] . '</strong>';
-		}
-		else
-		{
-			$result = '<strong style="color:green">' . phpbb::$user->lang['YES'] . '</strong>';
-		}
-
-		phpbb::$template->assign_block_vars('checks', array(
-			'TITLE'			=> phpbb::$user->lang['PHP_REGISTER_GLOBALS'],
-			'TITLE_EXPLAIN'	=> phpbb::$user->lang['PHP_REGISTER_GLOBALS_EXPLAIN'],
-			'RESULT'		=> $result,
-
-			'S_EXPLAIN'		=> true,
-		));
-
-		// Check for url_fopen
-		if (@ini_get('allow_url_fopen') == '1' || strtolower(@ini_get('allow_url_fopen')) == 'on')
-		{
-			$result = '<strong style="color:green">' . phpbb::$user->lang['YES'] . '</strong>';
-		}
-		else
-		{
-			$result = '<strong style="color:red">' . phpbb::$user->lang['NO'] . '</strong>';
-		}
-
-		phpbb::$template->assign_block_vars('checks', array(
-			'TITLE'			=> phpbb::$user->lang['PHP_URL_FOPEN_SUPPORT'],
-			'TITLE_EXPLAIN'	=> phpbb::$user->lang['PHP_URL_FOPEN_SUPPORT_EXPLAIN'],
-			'RESULT'		=> $result,
-
-			'S_EXPLAIN'		=> true,
-		));
-
-		// Check for getimagesize
-		if (@function_exists('getimagesize'))
-		{
-			$passed['imagesize'] = true;
-			$result = '<strong style="color:green">' . phpbb::$user->lang['YES'] . '</strong>';
-		}
-		else
-		{
-			$result = '<strong style="color:red">' . phpbb::$user->lang['NO'] . '</strong>';
-		}
-
-		phpbb::$template->assign_block_vars('checks', array(
-			'TITLE'			=> phpbb::$user->lang['PHP_GETIMAGESIZE_SUPPORT'],
-			'TITLE_EXPLAIN'	=> phpbb::$user->lang['PHP_GETIMAGESIZE_SUPPORT_EXPLAIN'],
-			'RESULT'		=> $result,
-
-			'S_EXPLAIN'		=> true,
-		));
-
-		// Check for PCRE UTF-8 support
-		if (@preg_match('//u', ''))
-		{
-			$passed['pcre'] = true;
-			$result = '<strong style="color:green">' . phpbb::$user->lang['YES'] . '</strong>';
-		}
-		else
-		{
-			$result = '<strong style="color:red">' . phpbb::$user->lang['NO'] . '</strong>';
-		}
-
-		phpbb::$template->assign_block_vars('checks', array(
-			'TITLE'			=> phpbb::$user->lang['PCRE_UTF_SUPPORT'],
-			'TITLE_EXPLAIN'	=> phpbb::$user->lang['PCRE_UTF_SUPPORT_EXPLAIN'],
-			'RESULT'		=> $result,
-
-			'S_EXPLAIN'		=> true,
-		));
-
-		// Check for PCRE unicode property support
-		if (@preg_match('/\p{Ll}/u', 'a'))
-		{
-			$passed['pcre'] = true;
-			$result = '<strong style="color:green">' . phpbb::$user->lang['YES'] . '</strong>';
-		}
-		else
-		{
-			$result = '<strong style="color:red">' . phpbb::$user->lang['NO'] . '</strong>';
-		}
-
-		phpbb::$template->assign_block_vars('checks', array(
-			'TITLE'			=> phpbb::$user->lang['PCRE_UNI_PROP_SUPPORT'],
-			'TITLE_EXPLAIN'	=> phpbb::$user->lang['PCRE_UNI_PROP_SUPPORT_EXPLAIN'],
-			'RESULT'		=> $result,
-
-			'S_EXPLAIN'		=> true,
-		));
-
-		// MBString passes always. If the extension is loaded it only can interfere with our functions, set to false then
-		$passed['mbstring'] = true;
-		if (@extension_loaded('mbstring'))
-		{
-			// Test for available database modules
-			phpbb::$template->assign_block_vars('checks', array(
-				'S_LEGEND'			=> true,
-				'LEGEND'			=> phpbb::$user->lang['MBSTRING_CHECK'],
-				'LEGEND_EXPLAIN'	=> phpbb::$user->lang['MBSTRING_CHECK_EXPLAIN'],
-			));
-
-			$checks = array(
-				array('func_overload', '&', MB_OVERLOAD_MAIL|MB_OVERLOAD_STRING),
-				array('encoding_translation', '!=', 0),
-				array('http_input', '!=', 'pass'),
-				array('http_output', '!=', 'pass')
-			);
-
-			foreach ($checks as $mb_checks)
-			{
-				$ini_val = @ini_get('mbstring.' . $mb_checks[0]);
-				switch ($mb_checks[1])
-				{
-					case '&':
-						if (intval($ini_val) & $mb_checks[2])
-						{
-							$result = '<strong style="color:red">' . phpbb::$user->lang['NO'] . '</strong>';
-							$passed['mbstring'] = false;
-						}
-						else
-						{
-							$result = '<strong style="color:green">' . phpbb::$user->lang['YES'] . '</strong>';
-						}
-					break;
-
-					case '!=':
-						if ($ini_val != $mb_checks[2])
-						{
-							$result = '<strong style="color:red">' . phpbb::$user->lang['NO'] . '</strong>';
-							$passed['mbstring'] = false;
-						}
-						else
-						{
-							$result = '<strong style="color:green">' . phpbb::$user->lang['YES'] . '</strong>';
-						}
-					break;
-				}
-
-				phpbb::$template->assign_block_vars('checks', array(
-					'TITLE'			=> phpbb::$user->lang['MBSTRING_' . strtoupper($mb_checks[0])],
-					'TITLE_EXPLAIN'	=> phpbb::$user->lang['MBSTRING_' . strtoupper($mb_checks[0]) . '_EXPLAIN'],
-					'RESULT'		=> $result,
-
-					'S_EXPLAIN'		=> true,
-				));
-			}
-		}
-
-		// Test for available database modules
-		phpbb::$template->assign_block_vars('checks', array(
-			'S_LEGEND'			=> true,
-			'LEGEND'			=> phpbb::$user->lang['PHP_SUPPORTED_DB'],
-			'LEGEND_EXPLAIN'	=> phpbb::$user->lang['PHP_SUPPORTED_DB_EXPLAIN'],
-		));
-
-		$available_dbms = get_available_dbms(false, true);
-		$passed['db'] = $available_dbms['ANY_DB_SUPPORT'];
-		unset($available_dbms['ANY_DB_SUPPORT']);
-
-		foreach ($available_dbms as $db_name => $db_ary)
-		{
-			if (!$db_ary['AVAILABLE'])
-			{
-				phpbb::$template->assign_block_vars('checks', array(
-					'TITLE'		=> phpbb::$user->lang['DLL_' . strtoupper($db_name)],
-					'RESULT'	=> '<span style="color:red">' . phpbb::$user->lang['UNAVAILABLE'] . '</span>',
-				));
-			}
-			else
-			{
-				phpbb::$template->assign_block_vars('checks', array(
-					'TITLE'		=> phpbb::$user->lang['DLL_' . strtoupper($db_name)],
-					'RESULT'	=> '<strong style="color:green">' . phpbb::$user->lang['AVAILABLE'] . '</strong>',
-				));
-			}
-		}
-
-		// Test for other modules
-		phpbb::$template->assign_block_vars('checks', array(
-			'S_LEGEND'			=> true,
-			'LEGEND'			=> phpbb::$user->lang['PHP_OPTIONAL_MODULE'],
-			'LEGEND_EXPLAIN'	=> phpbb::$user->lang['PHP_OPTIONAL_MODULE_EXPLAIN'],
-		));
-
-		foreach ($this->php_dlls_other as $dll)
-		{
-			if (!@extension_loaded($dll))
-			{
-				if (!can_load_dll($dll))
-				{
-					phpbb::$template->assign_block_vars('checks', array(
-						'TITLE'		=> phpbb::$user->lang['DLL_' . strtoupper($dll)],
-						'RESULT'	=> '<strong style="color:red">' . phpbb::$user->lang['UNAVAILABLE'] . '</strong>',
-					));
-					continue;
-				}
-			}
-
-			phpbb::$template->assign_block_vars('checks', array(
-				'TITLE'		=> phpbb::$user->lang['DLL_' . strtoupper($dll)],
-				'RESULT'	=> '<strong style="color:green">' . phpbb::$user->lang['AVAILABLE'] . '</strong>',
-			));
-		}
-
-		// Can we find Imagemagick anywhere on the system?
-		$exe = (DIRECTORY_SEPARATOR == '\\') ? '.exe' : '';
-
-		$magic_home = getenv('MAGICK_HOME');
-		$img_imagick = '';
-		if (empty($magic_home))
-		{
-			$locations = array('C:/WINDOWS/', 'C:/WINNT/', 'C:/WINDOWS/SYSTEM/', 'C:/WINNT/SYSTEM/', 'C:/WINDOWS/SYSTEM32/', 'C:/WINNT/SYSTEM32/', '/usr/bin/', '/usr/sbin/', '/usr/local/bin/', '/usr/local/sbin/', '/opt/', '/usr/imagemagick/', '/usr/bin/imagemagick/');
-			$path_locations = str_replace('\\', '/', (explode(($exe) ? ';' : ':', getenv('PATH'))));
-
-			$locations = array_merge($path_locations, $locations);
-			foreach ($locations as $location)
-			{
-				// The path might not end properly, fudge it
-				if (substr($location, -1, 1) !== '/')
-				{
-					$location .= '/';
-				}
-
-				if (@file_exists($location) && @is_readable($location . 'mogrify' . $exe) && @filesize($location . 'mogrify' . $exe) > 3000)
-				{
-					$img_imagick = str_replace('\\', '/', $location);
-					continue;
-				}
-			}
-		}
-		else
-		{
-			$img_imagick = str_replace('\\', '/', $magic_home);
-		}
-
-		phpbb::$template->assign_block_vars('checks', array(
-			'TITLE'		=> phpbb::$user->lang['APP_MAGICK'],
-			'RESULT'	=> ($img_imagick) ? '<strong style="color:green">' . phpbb::$user->lang['AVAILABLE'] . ', ' . htmlspecialchars($img_imagick) . '</strong>' : '<strong style="color:blue">' . phpbb::$user->lang['NO_LOCATION'] . '</strong>',
-		));
-
-		// Check permissions on files/directories we need access to
-		phpbb::$template->assign_block_vars('checks', array(
-			'S_LEGEND'			=> true,
-			'LEGEND'			=> phpbb::$user->lang['FILES_REQUIRED'],
-			'LEGEND_EXPLAIN'	=> phpbb::$user->lang['FILES_REQUIRED_EXPLAIN'],
-		));
-
-		$directories = array('cache/', 'files/', 'store/');
-
-		umask(0);
-
-		$passed['files'] = true;
-		foreach ($directories as $dir)
-		{
-			$exists = $write = false;
-
-			// Try to create the directory if it does not exist
-			if (!file_exists(PHPBB_ROOT_PATH . $dir))
-			{
-				@mkdir(PHPBB_ROOT_PATH . $dir, 0777);
-				phpbb::$system->chmod(PHPBB_ROOT_PATH . $dir, phpbb::CHMOD_READ | phpbb::CHMOD_WRITE);
-			}
-
-			// Now really check
-			if (file_exists(PHPBB_ROOT_PATH . $dir) && is_dir(PHPBB_ROOT_PATH . $dir))
-			{
-				phpbb::$system->chmod(PHPBB_ROOT_PATH . $dir, phpbb::CHMOD_READ | phpbb::CHMOD_WRITE);
-				$exists = true;
-			}
-
-			// Now check if it is writable by storing a simple file
-			$fp = @fopen(PHPBB_ROOT_PATH . $dir . 'test_lock', 'wb');
-			if ($fp !== false)
-			{
-				$write = true;
-			}
-			@fclose($fp);
-
-			@unlink(PHPBB_ROOT_PATH . $dir . 'test_lock');
-
-			$passed['files'] = ($exists && $write && $passed['files']) ? true : false;
-
-			$exists = ($exists) ? '<strong style="color:green">' . phpbb::$user->lang['FOUND'] . '</strong>' : '<strong style="color:red">' . phpbb::$user->lang['NOT_FOUND'] . '</strong>';
-			$write = ($write) ? ', <strong style="color:green">' . phpbb::$user->lang['WRITABLE'] . '</strong>' : (($exists) ? ', <strong style="color:red">' . phpbb::$user->lang['UNWRITABLE'] . '</strong>' : '');
-
-			phpbb::$template->assign_block_vars('checks', array(
-				'TITLE'		=> $dir,
-				'RESULT'	=> $exists . $write,
-			));
-		}
-
-		// Check permissions on files/directories it would be useful access to
-		phpbb::$template->assign_block_vars('checks', array(
-			'S_LEGEND'			=> true,
-			'LEGEND'			=> phpbb::$user->lang['FILES_OPTIONAL'],
-			'LEGEND_EXPLAIN'	=> phpbb::$user->lang['FILES_OPTIONAL_EXPLAIN'],
-		));
-
-		$directories = array('config.' . PHP_EXT, 'images/avatars/upload/');
-
-		foreach ($directories as $dir)
-		{
-			$write = $exists = true;
-			if (file_exists(PHPBB_ROOT_PATH . $dir))
-			{
-				if (!@is_writable(PHPBB_ROOT_PATH . $dir))
-				{
-					$write = false;
-				}
-			}
-			else
-			{
-				$write = $exists = false;
-			}
-
-			$exists_str = ($exists) ? '<strong style="color:green">' . phpbb::$user->lang['FOUND'] . '</strong>' : '<strong style="color:red">' . phpbb::$user->lang['NOT_FOUND'] . '</strong>';
-			$write_str = ($write) ? ', <strong style="color:green">' . phpbb::$user->lang['WRITABLE'] . '</strong>' : (($exists) ? ', <strong style="color:red">' . phpbb::$user->lang['UNWRITABLE'] . '</strong>' : '');
-
-			phpbb::$template->assign_block_vars('checks', array(
-				'TITLE'		=> $dir,
-				'RESULT'	=> $exists_str . $write_str,
-			));
-		}
-
-		// And finally where do we want to go next (well today is taken isn't it :P)
-		$s_hidden_fields = ($img_imagick) ? '<input type="hidden" name="img_imagick" value="' . htmlspecialchars($img_imagick) . '" />' : '';
-
-		$url = (!in_array(false, $passed)) ? phpbb::$url->append_sid($this->p_master->module_url, "mode=$mode&amp;sub=database&amp;language=" . phpbb::$user->lang_name) : phpbb::$url->build_url();
-
-		phpbb::$template->assign_vars(array(
-			'S_FAILED'		=> in_array(false, $passed),
-			'S_HIDDEN'		=> $s_hidden_fields,
-			'U_ACTION_TEST'	=> phpbb::$url->build_url(),
-			'U_ACTION'		=> $url,
-		));
-	}
-
-	/**
-	* Obtain the information required to connect to the database
-	*/
-	function obtain_database_settings($mode, $sub, &$data)
-	{
-		$connect_test = false;
-		$error = array();
-
-		$available_dbms = get_available_dbms();
-
-		// Has the user opted to test the connection?
-		if (phpbb_request::is_set_post('testdb'))
-		{
-			if (!isset($available_dbms[$data['dbms']]))
-			{
-				$error[] = phpbb::$user->lang['INST_ERR_NO_DB'];
-				$connect_test = false;
-			}
-			else
-			{
-				$connect_test = connect_check_db($available_dbms[$data['dbms']], $data['table_prefix'], $data['dbhost'], $data['dbuser'], htmlspecialchars_decode($data['dbpasswd']), $data['dbname'], $data['dbport'], $error);
-			}
-
-			if ($connect_test)
-			{
-				phpbb::$template->assign_vars(array(
-					'S_CONNECT_TEST'	=> true,
-					'S_SUCCESS'			=> true,
-				));
-			}
-			else
-			{
-				phpbb::$template->assign_vars(array(
-					'S_CONNECT_TEST'	=> true,
-					'ERROR'				=> implode('<br />', $error),
-				));
-			}
-		}
-
-		if (!$connect_test)
-		{
-			// And now for the main part of this page
-			$data['table_prefix'] = (!empty($data['table_prefix']) ? $data['table_prefix'] : 'phpbb_');
-			$this->build_form($data, $this->db_config_options);
-		}
-
-		// And finally where do we want to go next (well today is taken isn't it :P)
-		$s_hidden_fields = $this->return_hidden_fields($data, $this->common_config_options);
-
-		if ($connect_test)
-		{
-			$s_hidden_fields .= $this->return_hidden_fields($data, $this->db_config_options);
-		}
-
-		$url = ($connect_test) ? phpbb::$url->append_sid($this->p_master->module_url, "mode=$mode&amp;sub=administrator") : phpbb::$url->build_url();
-		$s_hidden_fields .= ($connect_test) ? '' : '<input type="hidden" name="testdb" value="true" />';
-
-		phpbb::$template->assign_vars(array(
-			'S_HIDDEN'	=> $s_hidden_fields,
-			'U_ACTION'	=> $url,
-		));
-	}
-
-	/**
-	* Obtain the administrator's name, password and email address
-	*/
-	function obtain_admin_settings($mode, $sub, &$data)
-	{
-		if ($data['dbms'] == '')
-		{
-			// Someone's been silly and tried calling this page direct
-			// So we send them back to the start to do it again properly
-			$this->p_master->redirect('index.' . PHP_EXT . '?mode=install');
-		}
-
-		$passed = false;
-		$data['default_lang'] = ($data['default_lang'] !== '') ? $data['default_lang'] : $data['language'];
-
-		if (phpbb_request::is_set_post('check'))
-		{
-			$error = array();
-
-			// Check the entered email address and password
-			if ($data['admin_name'] == '' || $data['admin_pass1'] == '' || $data['admin_pass2'] == '' || $data['board_email'] == '' || $data['board_contact'] == '')
-			{
-				$error[] = phpbb::$user->lang['INST_ERR_MISSING_DATA'];
-			}
-
-			if ($data['admin_pass1'] != $data['admin_pass2'] && $data['admin_pass1'] != '')
-			{
-				$error[] = phpbb::$user->lang['INST_ERR_PASSWORD_MISMATCH'];
-			}
-
-			// Test against the default username rules
-			if ($data['admin_name'] != '' && utf8_strlen($data['admin_name']) < 3)
-			{
-				$error[] = phpbb::$user->lang['INST_ERR_USER_TOO_SHORT'];
-			}
-
-			if ($data['admin_name'] != '' && utf8_strlen($data['admin_name']) > 20)
-			{
-				$error[] = phpbb::$user->lang['INST_ERR_USER_TOO_LONG'];
-			}
-
-			// Test against the default password rules
-			if ($data['admin_pass1'] != '' && utf8_strlen($data['admin_pass1']) < 6)
-			{
-				$error[] = phpbb::$user->lang['INST_ERR_PASSWORD_TOO_SHORT'];
-			}
-
-			if ($data['admin_pass1'] != '' && utf8_strlen($data['admin_pass1']) > 30)
-			{
-				$error[] = phpbb::$user->lang['INST_ERR_PASSWORD_TOO_LONG'];
-			}
-
-			if ($data['board_email'] != '' && !preg_match('/^' . get_preg_expression('email') . '$/i', $data['board_email']))
-			{
-				$error[] = phpbb::$user->lang['INST_ERR_EMAIL_INVALID'];
-			}
-
-			if ($data['board_contact'] != '' && !preg_match('/^' . get_preg_expression('email') . '$/i', $data['board_contact']))
-			{
-				$error[] = phpbb::$user->lang['INST_ERR_EMAIL_INVALID'];
-			}
-
-			phpbb::$template->assign_block_vars('checks', array(
-				'S_LEGEND'			=> true,
-				'LEGEND'			=> phpbb::$user->lang['STAGE_ADMINISTRATOR'],
-			));
-
-			if (!sizeof($error))
-			{
-				$passed = true;
-
-				phpbb::$template->assign_block_vars('checks', array(
-					'TITLE'		=> phpbb::$user->lang['ADMIN_TEST'],
-					'RESULT'	=> '<strong style="color:green">' . phpbb::$user->lang['TESTS_PASSED'] . '</strong>',
-				));
-			}
-			else
-			{
-				phpbb::$template->assign_block_vars('checks', array(
-					'TITLE'		=> phpbb::$user->lang['ADMIN_TEST'],
-					'RESULT'	=> '<strong style="color:red">' . implode('<br />', $error) . '</strong>',
-				));
-			}
-		}
-
-		$s_hidden_fields = '';
-
-		if (!$passed)
-		{
-			$this->build_form($data, $this->admin_config_options);
-		}
-		else
-		{
-			$s_hidden_fields .= $this->return_hidden_fields($data, $this->admin_config_options);
-		}
-
-		$s_hidden_fields .= $this->return_hidden_fields($data, $this->common_config_options, $this->db_config_options);
-
-		$url = ($passed) ? phpbb::$url->append_sid($this->p_master->module_url, "mode=$mode&amp;sub=config_file") : phpbb::$url->build_url();
-		$s_hidden_fields .= ($passed) ? '' : '<input type="hidden" name="check" value="true" />';
-
-		phpbb::$template->assign_vars(array(
-			'S_HIDDEN'	=> $s_hidden_fields,
-			'U_ACTION'	=> $url,
-		));
-	}
-
-	/**
-	* Writes the config file to disk, or if unable to do so offers alternative methods
-	*/
-	function create_config_file($mode, $sub, &$data)
-	{
-		if ($data['dbms'] == '')
-		{
-			// Someone's been silly and tried calling this page direct
-			// So we send them back to the start to do it again properly
-			$this->p_master->redirect('index.' . PHP_EXT . '?mode=install');
-		}
-
-		$s_hidden_fields = $this->return_hidden_fields($data, $this->common_config_options);
-		$written = false;
-
-		// Create a list of any PHP modules we wish to have loaded
-		$load_extensions = array();
-		$available_dbms = get_available_dbms($data['dbms']);
-
-		$check_exts = array_merge($this->php_dlls_other);
-
-		foreach ($check_exts as $dll)
-		{
-			if (!@extension_loaded($dll))
-			{
-				if (!can_load_dll($dll))
-				{
-					continue;
-				}
-
-				$load_extensions[] = $dll . '.' . PHP_SHLIB_SUFFIX;
-			}
-		}
-
-		$db_module = $available_dbms[$data['dbms']]['MODULE'];
-
-		if (!is_array($db_module))
-		{
-			$db_module = array($db_module);
-		}
-
-		$load_dll = true;
-		foreach ($db_module as $dll)
-		{
-			if (@extension_loaded($dll))
-			{
-				$load_dll = false;
-				break;
-			}
-
-			if (!can_load_dll($dll))
-			{
-				$load_dll = false;
-				break;
-			}
-
-			$load_dll = true;
-		}
-
-		if ($load_dll)
-		{
-			$dll = current($db_module);
-			$load_extensions[] = $dll . '.' . PHP_SHLIB_SUFFIX;
-		}
-
-		// Create a lock file to indicate that there is an install in progress
-		$fp = @fopen(PHPBB_ROOT_PATH . 'cache/install_lock', 'wb');
-		if ($fp === false)
-		{
-			// We were unable to create the lock file - abort
-			trigger_error(phpbb::$user->lang['UNABLE_WRITE_LOCK'], E_USER_ERROR);
-		}
-		@fclose($fp);
-
-		phpbb::$system->chmod(PHPBB_ROOT_PATH . 'cache/install_lock', phpbb::CHMOD_READ | phpbb::CHMOD_WRITE);
-
-		$load_extensions = implode(',', $load_extensions);
-
-		// Time to convert the data provided into a config file
-		$config_data = "<?php\n";
-		$config_data .= "// phpBB 3.0.x auto-generated configuration file\n// Do not change anything in this file!\n";
-		$config_data .= "if (class_exists('phpbb') && defined('IN_PHPBB'))\n{\n\tphpbb::set_config(array(\n";
-
-		$config_data_array = array(
-			'dbms'			=> $available_dbms[$data['dbms']]['DRIVER'],
-			'dbhost'		=> $data['dbhost'],
-			'dbport'		=> $data['dbport'],
-			'dbname'		=> $data['dbname'],
-			'dbuser'		=> $data['dbuser'],
-			'dbpasswd'		=> htmlspecialchars_decode($data['dbpasswd']),
-			'table_prefix'	=> $data['table_prefix'],
-			'admin_folder'	=> 'adm',
-			'acm_type'		=> 'file',
-			'extensions'	=> $load_extensions,
-		);
-
-		foreach ($config_data_array as $key => $value)
-		{
-			$config_data .= "\t\t'{$key}' => '" . str_replace("'", "\\'", str_replace('\\', '\\\\', $value)) . "',\n";
-		}
-		unset($config_data_array);
-
-		$config_data .= "\n\t\t'debug' => true,\n\t\t'debug_extra' => true,\n\n\t\t// DO NOT CHANGE\n\t\t'installed' => true,\n\t));\n}\n\n";
-
-		// Attempt to write out the config file directly. If it works, this is the easiest way to do it ...
-		if ((file_exists(PHPBB_ROOT_PATH . 'config.' . PHP_EXT) && is_writable(PHPBB_ROOT_PATH . 'config.' . PHP_EXT)) || is_writable(PHPBB_ROOT_PATH))
-		{
-			// Assume it will work ... if nothing goes wrong below
-			$written = true;
-
-			if (!($fp = @fopen(PHPBB_ROOT_PATH . 'config.' . PHP_EXT, 'w')))
-			{
-				// Something went wrong ... so let's try another method
-				$written = false;
-			}
-
-			if (!(@fwrite($fp, $config_data)))
-			{
-				// Something went wrong ... so let's try another method
-				$written = false;
-			}
-
-			@fclose($fp);
-
-			if ($written)
-			{
-				@chmod(PHPBB_ROOT_PATH . 'config.' . PHP_EXT, 0644);
-			}
-		}
-
-		if (phpbb_request::is_set_post('dldone'))
-		{
-			// Do a basic check to make sure that the file has been uploaded
-			// Note that all we check is that the file has _something_ in it
-			// We don't compare the contents exactly - if they can't upload
-			// a single file correctly, it's likely they will have other problems....
-			if (filesize(PHPBB_ROOT_PATH . 'config.' . PHP_EXT) > 10)
-			{
-				$written = true;
-			}
-		}
-
-		$s_hidden_fields .= $this->return_hidden_fields($data, $this->db_config_options, $this->admin_config_options);
-
-		if (!$written)
-		{
-			// OK, so it didn't work let's try the alternatives
-			if (phpbb_request::is_set_post('dlconfig'))
-			{
-				// They want a copy of the file to download, so send the relevant headers and dump out the data
-				header('Content-Type: text/x-delimtext; name="config.' . PHP_EXT . '"');
-				header('Content-disposition: attachment; filename=config.' . PHP_EXT);
-				echo $config_data;
-				exit;
-			}
-
-			// The option to download the config file is always available, so output it here
-			phpbb::$template->assign_vars(array(
-				'S_HIDDEN'				=> $s_hidden_fields,
-				'U_ACTION'				=> phpbb::$url->build_url(),
-			));
-		}
-		else
-		{
-			phpbb::$template->assign_vars(array(
-				'S_WRITTEN'	=> true,
-				'S_HIDDEN'	=> $s_hidden_fields,
-				'U_ACTION'	=> phpbb::$url->append_sid($this->p_master->module_url, "mode=$mode&amp;sub=advanced"),
-			));
-		}
-	}
-
-	/**
-	* Provide an opportunity to customise some advanced settings during the install
-	* in case it is necessary for them to be set to access later
-	*/
-	function obtain_advanced_settings($mode, $sub, &$data)
-	{
-		if ($data['dbms'] == '')
-		{
-			// Someone's been silly and tried calling this page direct
-			// So we send them back to the start to do it again properly
-			$this->p_master->redirect('index.' . PHP_EXT . '?mode=install');
-		}
-
-		$s_hidden_fields = $this->return_hidden_fields($data, $this->common_config_options);
-
-		$data['email_enable'] = ($data['email_enable'] !== '') ? $data['email_enable'] : true;
-		$data['server_name'] = ($data['server_name'] !== '') ? $data['server_name'] : phpbb::$user->system['host'];
-		$data['server_port'] = ($data['server_port'] !== '') ? $data['server_port'] : phpbb::$user->system['port'];
-		$data['server_protocol'] = ($data['server_protocol'] !== '') ? $data['server_protocol'] : ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https://' : 'http://');
-		$data['cookie_secure'] = ($data['cookie_secure'] !== '') ? $data['cookie_secure'] : ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? true : false);
-
-		if ($data['script_path'] === '')
-		{
-			// Replace backslashes and doubled slashes (could happen on some proxy setups)
-			$data['script_path'] = trim(str_replace(array('/install/', '\\install\\'), '', phpbb::$user->page['script_path']));
-		}
-
-		$this->build_form($data, $this->advanced_config_options);
-		$s_hidden_fields .= $this->return_hidden_fields($data, $this->db_config_options, $this->admin_config_options);
-
-		phpbb::$template->assign_vars(array(
-			'S_HIDDEN'	=> $s_hidden_fields,
-			'U_ACTION'	=> phpbb::$url->append_sid($this->p_master->module_url, "mode=$mode&amp;sub=create_table"),
-		));
-	}
-
-	/**
-	* Load the contents of the schema into the database and then alter it based on what has been input during the installation
-	*/
-	function load_schema($mode, $sub, &$data)
-	{
-		$s_hidden_fields = '';
-
-		if ($data['dbms'] == '')
-		{
-			// Someone's been silly and tried calling this page direct
-			// So we send them back to the start to do it again properly
-			$this->p_master->redirect('index.' . PHP_EXT . '?mode=install');
-		}
-
-		// If we get here and the extension isn't loaded it should be safe to just go ahead and load it
-		$available_dbms = get_available_dbms($data['dbms']);
-
-		if (!isset($available_dbms[$data['dbms']]))
-		{
-			// Someone's been silly and tried providing a non-existant dbms
-			$this->p_master->redirect('index.' . PHP_EXT . '?mode=install');
-		}
-
-		phpbb::assign('db', phpbb_db_dbal::connect($data['dbms'], $data['dbhost'], $data['dbuser'], htmlspecialchars_decode($data['dbpasswd']), $data['dbname'], $data['dbport'], false, false));
-
-		// Include the db tools - we work with them to create the tables
-		include PHPBB_ROOT_PATH . 'includes/db/db_tools.' . PHP_EXT;
-
-		// Load the Schema data (Fill $schema_data)
-		include PHPBB_ROOT_PATH . 'install/schemas/schema_structure.' . PHP_EXT;
-
-		// we do not return statements, we simply let them execute
-		$db_tools = new phpbb_db_tools(phpbb::$db);
-
-		foreach ($schema_data as $table_name => $table_data)
-		{
-			// Change prefix, we always have phpbb_, therefore we can do a substr() here
-			$table_name = $data['table_prefix'] . substr($table_name, 6);
-
-			// Now create the table
-			$db_tools->sql_create_table($table_name, $table_data);
-		}
-
-		// Now get the schema data
-		include PHPBB_ROOT_PATH . 'install/schemas/schema_data.' . PHP_EXT;
-
-		// Build data array for substituted content ;)
-
-		$cookie_domain = ($data['server_name'] != '') ? $data['server_name'] : phpbb::$user->system['host'];
-
-		// Try to come up with the best solution for cookie domain...
-		if (strpos($cookie_domain, 'www.') === 0)
-		{
-			$cookie_domain = str_replace('www.', '.', $cookie_domain);
-		}
-
-		if ($data['script_path'] !== '/')
-		{
-			// Adjust destination path (no trailing slash)
-			if (substr($data['script_path'], -1) == '/')
-			{
-				$data['script_path'] = substr($data['script_path'], 0, -1);
-			}
-
-			$data['script_path'] = str_replace(array('../', './'), '', $data['script_path']);
-
-			if ($data['script_path'][0] != '/')
-			{
-				$data['script_path'] = '/' . $data['script_path'];
-			}
-		}
-
-		$ref = substr(phpbb::$user->system['referer'], strpos(phpbb::$user->system['referer'], '://') + 3);
-
-		$template_data = array(
-			'BOARD_STARTDATE'	=> time(),
-			'CURRENT_TIME'		=> time(),
-			'DEFAULT_LANG'		=> $data['default_lang'],
-			'DBMS_VERSION'		=> phpbb::$db->sql_server_info(true),
-			'IMG_IMAGICK'		=> $data['img_imagick'],
-			'SERVER_NAME'		=> $data['server_name'],
-			'SERVER_PORT'		=> $data['server_port'],
-			'BOARD_EMAIL'		=> $data['board_email'],
-			'BOARD_CONTACT'		=> $data['board_contact'],
-			'COOKIE_DOMAIN'		=> $cookie_domain,
-			'DEFAULT_DATEFORMAT'=> phpbb::$user->lang['default_dateformat'],
-			'EMAIL_ENABLE'		=> $data['email_enable'],
-			'SMTP_DELIVERY'		=> $data['smtp_delivery'],
-			'SMTP_HOST'			=> $data['smtp_host'],
-			'SMTP_AUTH_METHOD'	=> $data['smtp_auth'],
-			'SMTP_USERNAME'		=> $data['smtp_user'],
-			'SMTP_PASSWORD'		=> $data['smtp_pass'],
-			'COOKIE_SECURE'		=> $data['cookie_secure'],
-			'COOKIE_NAME'		=> 'phpbb3_' . phpbb::$security->gen_rand_string(4),
-			'FORCE_SERVER_VARS'	=> $data['force_server_vars'],
-			'SCRIPT_PATH'		=> $data['script_path'],
-			'SERVER_PROTOCOL'	=> $data['server_protocol'],
-			'NEWEST_USERNAME'	=> $data['admin_name'],
-			'AVATAR_SALT'		=> md5(phpbb::$security->gen_rand_string()),
-			'CAPTCHA_PLUGIN'	=> (@extension_loaded('gd') || can_load_dll('gd')) ? 'phpbb_captcha_gd' : 'phpbb_captcha_nogd',
-			'REFERER_VALIDATION'=> (!(stripos($ref, phpbb::$user->system['host']) === 0)) ? '0' : '1',
-			'ADMIN_NAME'		=> $data['admin_name'],
-			'ADMIN_NAME_CLEAN'	=> utf8_clean_string($data['admin_name']),
-			'ADMIN_PASSWORD'	=> phpbb::$security->hash_password($data['admin_pass1']),
-			'ADMIN_EMAIL'		=> $data['board_contact'],
-			'ADMIN_EMAIL_HASH'	=> hexdec(crc32($data['board_contact']) . strlen($data['board_contact'])),
-			'USER_IP'			=> phpbb::$user->ip,
-		);
-
-		// Apply Schema changes
-		$db_tools->db->sql_transaction('begin');
-
-		foreach ($schema_data as $schema_array)
-		{
-			$schema_array['table'] = $data['table_prefix'] . substr($schema_array['table'], 6);
-			$db_tools->sql_insert_data($schema_array, $template_data);
-		}
-
-		$db_tools->db->sql_transaction('commit');
-
-		// Update data
-		$db_tools->db->sql_transaction('begin');
-
-		foreach ($schema_updates as $schema_array)
-		{
-			$schema_array['table'] = $data['table_prefix'] . substr($schema_array['table'], 6);
-			$db_tools->sql_update_data($schema_array, $template_data);
-		}
-
-		$db_tools->db->sql_transaction('commit');
-
-		// We need to insert the role data manually... else the schema array is quite large...
-		$sql = 'SELECT role_id, role_name
-			FROM ' . $data['table_prefix'] . 'acl_roles';
-		$result = phpbb::$db->sql_query($sql);
-
-		$role_ids = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$role_ids[$row['role_name']] = $row['role_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		foreach ($this->role_definitions as $role_ary)
-		{
-			$role_name		= $role_ary[0];
-			$auth_setting	= $role_ary[1];
-			$permission		= $role_ary[2];
-			$condition		= $role_ary[3];
-			$options		= $role_ary[4];
-
-			$sql = '';
-			$sql .= 'INSERT INTO ' . $data['table_prefix'] . 'acl_roles_data (role_id, auth_option_id, auth_setting) ';
-			$sql .= 'SELECT ' . $role_ids[$role_name] . ', auth_option_id, ' . $auth_setting . ' ';
-			$sql .= 'FROM ' . $data['table_prefix'] . 'acl_options ';
-			$sql .= "WHERE auth_option LIKE '{$permission}%'";
-
-			if ($options !== false)
-			{
-				$sql .= ' AND auth_option ' . $condition . ' (\'' . implode("', '", $options) . "')";
-			}
-
-			phpbb::$db->sql_query($sql);
-		}
-
-		phpbb::$template->assign_vars(array(
-			'S_HIDDEN'	=> build_hidden_fields($data),
-			'U_ACTION'	=> phpbb::$url->append_sid($this->p_master->module_url, "mode=$mode&amp;sub=final"),
-		));
-	}
-
-	/**
-	* Build the search index...
-	*/
-	function build_search_index($mode, $sub)
-	{
-		include_once PHPBB_ROOT_PATH . 'includes/search/fulltext_native.' . PHP_EXT;
-
-		$error = false;
-		$search = new fulltext_native($error);
-
-		$sql = 'SELECT post_id, post_subject, post_text, poster_id, forum_id
-			FROM ' . POSTS_TABLE;
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$search->index('post', $row['post_id'], $row['post_text'], $row['post_subject'], $row['poster_id'], $row['forum_id']);
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	/**
-	* Populate the module tables
-	*/
-	function add_modules($mode, $sub)
-	{
-		include_once PHPBB_ROOT_PATH . 'modules/acp/acp_modules.' . PHP_EXT;
-
-		$_module = new acp_modules();
-		$module_classes = array('acp', 'mcp', 'ucp');
-
-		// Add categories
-		foreach ($module_classes as $module_class)
-		{
-			$categories = array();
-
-			// Set the module class
-			$_module->module_class = $module_class;
-
-			foreach ($this->module_categories[$module_class] as $cat_name => $subs)
-			{
-				$module_data = array(
-					'module_basename'	=> '',
-					'module_enabled'	=> 1,
-					'module_display'	=> 1,
-					'parent_id'			=> 0,
-					'module_class'		=> $module_class,
-					'module_langname'	=> $cat_name,
-					'module_mode'		=> '',
-					'module_auth'		=> '',
-				);
-
-				// Add category
-				$_module->update_module_data($module_data, true);
-
-				$categories[$cat_name]['id'] = (int) $module_data['module_id'];
-				$categories[$cat_name]['parent_id'] = 0;
-
-				// Create sub-categories...
-				if (is_array($subs))
-				{
-					foreach ($subs as $level2_name)
-					{
-						$module_data = array(
-							'module_basename'	=> '',
-							'module_enabled'	=> 1,
-							'module_display'	=> 1,
-							'parent_id'			=> (int) $categories[$cat_name]['id'],
-							'module_class'		=> $module_class,
-							'module_langname'	=> $level2_name,
-							'module_mode'		=> '',
-							'module_auth'		=> '',
-						);
-
-						$_module->update_module_data($module_data, true);
-
-						$categories[$level2_name]['id'] = (int) $module_data['module_id'];
-						$categories[$level2_name]['parent_id'] = (int) $categories[$cat_name]['id'];
-					}
-				}
-			}
-
-			// Get the modules we want to add... returned sorted by name
-			$module_info = $_module->get_module_infos('', $module_class);
-
-			foreach ($module_info as $module_basename => $fileinfo)
-			{
-				foreach ($fileinfo['modes'] as $module_mode => $row)
-				{
-					foreach ($row['cat'] as $cat_name)
-					{
-						if (!isset($categories[$cat_name]))
-						{
-							continue;
-						}
-
-						$module_data = array(
-							'module_basename'	=> $module_basename,
-							'module_enabled'	=> 1,
-							'module_display'	=> (isset($row['display'])) ? (int) $row['display'] : 1,
-							'parent_id'			=> (int) $categories[$cat_name]['id'],
-							'module_class'		=> $module_class,
-							'module_langname'	=> $row['title'],
-							'module_mode'		=> $module_mode,
-							'module_auth'		=> $row['auth'],
-						);
-
-						$_module->update_module_data($module_data, true);
-					}
-				}
-			}
-
-			// Move some of the modules around since the code above will put them in the wrong place
-			if ($module_class == 'acp')
-			{
-				// Move main module 4 up...
-				$sql = 'SELECT *
-					FROM ' . MODULES_TABLE . "
-					WHERE module_basename = 'main'
-						AND module_class = 'acp'
-						AND module_mode = 'main'";
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				$_module->move_module_by($row, 'move_up', 4);
-
-				// Move permissions intro screen module 4 up...
-				$sql = 'SELECT *
-					FROM ' . MODULES_TABLE . "
-					WHERE module_basename = 'permissions'
-						AND module_class = 'acp'
-						AND module_mode = 'intro'";
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				$_module->move_module_by($row, 'move_up', 4);
-
-				// Move manage users screen module 5 up...
-				$sql = 'SELECT *
-					FROM ' . MODULES_TABLE . "
-					WHERE module_basename = 'users'
-						AND module_class = 'acp'
-						AND module_mode = 'overview'";
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				$_module->move_module_by($row, 'move_up', 5);
-			}
-
-			if ($module_class == 'ucp')
-			{
-				// Move attachment module 4 down...
-				$sql = 'SELECT *
-					FROM ' . MODULES_TABLE . "
-					WHERE module_basename = 'attachments'
-						AND module_class = 'ucp'
-						AND module_mode = 'attachments'";
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				$_module->move_module_by($row, 'move_down', 4);
-			}
-
-			// And now for the special ones
-			// (these are modules which appear in multiple categories and thus get added manually to some for more control)
-			if (isset($this->module_extras[$module_class]))
-			{
-				foreach ($this->module_extras[$module_class] as $cat_name => $mods)
-				{
-					$sql = 'SELECT module_id, left_id, right_id
-						FROM ' . MODULES_TABLE . "
-						WHERE module_langname = '" . phpbb::$db->sql_escape($cat_name) . "'
-							AND module_class = '" . phpbb::$db->sql_escape($module_class) . "'";
-					$result = phpbb::$db->sql_query_limit($sql, 1);
-					$row2 = phpbb::$db->sql_fetchrow($result);
-					phpbb::$db->sql_freeresult($result);
-
-					foreach ($mods as $mod_name)
-					{
-						$sql = 'SELECT *
-							FROM ' . MODULES_TABLE . "
-							WHERE module_langname = '" . phpbb::$db->sql_escape($mod_name) . "'
-								AND module_class = '" . phpbb::$db->sql_escape($module_class) . "'
-								AND module_basename <> ''";
-						$result = phpbb::$db->sql_query_limit($sql, 1);
-						$row = phpbb::$db->sql_fetchrow($result);
-						phpbb::$db->sql_freeresult($result);
-
-						$module_data = array(
-							'module_basename'	=> $row['module_basename'],
-							'module_enabled'	=> (int) $row['module_enabled'],
-							'module_display'	=> (int) $row['module_display'],
-							'parent_id'			=> (int) $row2['module_id'],
-							'module_class'		=> $row['module_class'],
-							'module_langname'	=> $row['module_langname'],
-							'module_mode'		=> $row['module_mode'],
-							'module_auth'		=> $row['module_auth'],
-						);
-
-						$_module->update_module_data($module_data, true);
-					}
-				}
-			}
-
-			$_module->remove_cache_file();
-		}
-	}
-
-	/**
-	* Populate the language tables
-	*/
-	function add_language($mode, $sub)
-	{
-		$dir = @opendir(PHPBB_ROOT_PATH . 'language');
-
-		if (!$dir)
-		{
-			trigger_error('Unable to access the language directory', E_USER_ERROR);
-		}
-
-		while (($file = readdir($dir)) !== false)
-		{
-			$path = PHPBB_ROOT_PATH . 'language/' . $file;
-
-			if ($file == '.' || $file == '..' || is_link($path) || is_file($path) || $file == 'CVS')
-			{
-				continue;
-			}
-
-			if (is_dir($path) && file_exists($path . '/iso.txt'))
-			{
-				$lang_file = file("$path/iso.txt");
-
-				$lang_pack = array(
-					'lang_iso'			=> basename($path),
-					'lang_dir'			=> basename($path),
-					'lang_english_name'	=> trim(htmlspecialchars($lang_file[0])),
-					'lang_local_name'	=> trim(htmlspecialchars($lang_file[1], ENT_COMPAT, 'UTF-8')),
-					'lang_author'		=> trim(htmlspecialchars($lang_file[2], ENT_COMPAT, 'UTF-8')),
-				);
-
-				phpbb::$db->sql_query('INSERT INTO ' . LANG_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $lang_pack));
-
-				$valid_localized = array(
-					'icon_back_top', 'icon_contact_aim', 'icon_contact_email', 'icon_contact_icq', 'icon_contact_jabber', 'icon_contact_msnm', 'icon_contact_pm', 'icon_contact_yahoo', 'icon_contact_www', 'icon_post_delete', 'icon_post_edit', 'icon_post_info', 'icon_post_quote', 'icon_post_report', 'icon_user_online', 'icon_user_offline', 'icon_user_profile', 'icon_user_search', 'icon_user_warn', 'button_pm_forward', 'button_pm_new', 'button_pm_reply', 'button_topic_locked', 'button_topic_new', 'button_topic_reply',
-				);
-
-				$sql_ary = array();
-
-				$sql = 'SELECT *
-					FROM ' . STYLES_IMAGESET_TABLE;
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($imageset_row = phpbb::$db->sql_fetchrow($result))
-				{
-					if (@file_exists(PHPBB_ROOT_PATH . "styles/{$imageset_row['imageset_path']}/imageset/{$lang_pack['lang_iso']}/imageset.cfg"))
-					{
-						$cfg_data_imageset_data = parse_cfg_file(PHPBB_ROOT_PATH . "styles/{$imageset_row['imageset_path']}/imageset/{$lang_pack['lang_iso']}/imageset.cfg");
-						foreach ($cfg_data_imageset_data as $image_name => $value)
-						{
-							if (strpos($value, '*') !== false)
-							{
-								if (substr($value, -1, 1) === '*')
-								{
-									list($image_filename, $image_height) = explode('*', $value);
-									$image_width = 0;
-								}
-								else
-								{
-									list($image_filename, $image_height, $image_width) = explode('*', $value);
-								}
-							}
-							else
-							{
-								$image_filename = $value;
-								$image_height = $image_width = 0;
-							}
-
-							if (strpos($image_name, 'img_') === 0 && $image_filename)
-							{
-								$image_name = substr($image_name, 4);
-								if (in_array($image_name, $valid_localized))
-								{
-									$sql_ary[] = array(
-										'image_name'		=> (string) $image_name,
-										'image_filename'	=> (string) $image_filename,
-										'image_height'		=> (int) $image_height,
-										'image_width'		=> (int) $image_width,
-										'imageset_id'		=> (int) $imageset_row['imageset_id'],
-										'image_lang'		=> (string) $lang_pack['lang_iso'],
-									);
-								}
-							}
-						}
-					}
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				if (sizeof($sql_ary))
-				{
-					phpbb::$db->sql_multi_insert(STYLES_IMAGESET_DATA_TABLE, $sql_ary);
-				}
-			}
-		}
-		closedir($dir);
-	}
-
-	/**
-	* Add search robots to the database
-	*/
-	function add_bots($mode, $sub)
-	{
-		$sql = 'SELECT group_id
-			FROM ' . GROUPS_TABLE . "
-			WHERE group_name_clean = 'bots'";
-		$result = phpbb::$db->sql_query($sql);
-		$group_id = (int) phpbb::$db->sql_fetchfield('group_id');
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$group_id)
-		{
-			// If we reach this point then something has gone very wrong
-			trigger_error('NO_GROUP', E_USER_ERROR);
-		}
-
-		if (!function_exists('user_add'))
-		{
-			include PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT;
-		}
-
-		foreach ($this->bot_list as $bot_name => $bot_ary)
-		{
-			$user_row = array(
-				'user_type'				=> phpbb::USER_IGNORE,
-				'group_id'				=> $group_id,
-				'username'				=> $bot_name,
-				'user_regdate'			=> time(),
-				'user_password'			=> '',
-				'user_colour'			=> '9E8DA7',
-				'user_email'			=> '',
-				'user_lang'				=> phpbb::$config['default_lang'],
-				'user_style'			=> 1,
-				'user_timezone'			=> 0,
-				'user_dateformat'		=> phpbb::$user->lang['default_dateformat'],
-				'user_allow_massemail'	=> 0,
-			);
-
-			$user_id = user_add($user_row);
-
-			if (!$user_id)
-			{
-				// If we can't insert this user then continue to the next one to avoid inconsistant data
-				$this->p_master->db_error('Unable to insert bot into users table', phpbb::$db->sql_error_sql, __LINE__, __FILE__);
-				continue;
-			}
-
-			$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', array(
-				'bot_active'	=> 1,
-				'bot_name'		=> (string) $bot_name,
-				'user_id'		=> (int) $user_id,
-				'bot_agent'		=> (string) $bot_ary[0],
-				'bot_ip'		=> (string) $bot_ary[1],
-			));
-
-			$result = phpbb::$db->sql_query($sql);
-		}
-	}
-
-	/**
-	* Sends an email to the board administrator with their password and some useful links
-	*/
-	function email_admin($mode, $sub)
-	{
-		// Obtain any submitted data
-		$data = $this->get_submitted_data();
-
-		// Normal Login
-		phpbb::$user->login($data['admin_name'], $data['admin_pass1'], false, true, false);
-
-		// Admin Login
-		phpbb::$user->login($data['admin_name'], $data['admin_pass1'], false, true, true);
-
-		phpbb::$acl->init(phpbb::$user->data);
-
-		// OK, Now that we've reached this point we can be confident that everything is installed and working......I hope :)
-		/* So it's time to send an email to the administrator confirming the details they entered
-		if (phpbb::$config['email_enable'])
-		{
-			include_once(PHPBB_ROOT_PATH . 'includes/functions_messenger.' . PHP_EXT);
-
-			$messenger = new messenger(false);
-
-			$messenger->template('installed', $data['language']);
-
-			$messenger->to($data['board_contact'], $data['admin_name']);
-
-			$messenger->headers('X-AntiAbuse: Board servername - ' . phpbb::$config['server_name']);
-			$messenger->headers('X-AntiAbuse: User_id - ' . phpbb::$user->data['user_id']);
-			$messenger->headers('X-AntiAbuse: Username - ' . phpbb::$user->data['username']);
-			$messenger->headers('X-AntiAbuse: User IP - ' . phpbb::$user->ip);
-
-			$messenger->assign_vars(array(
-				'USERNAME'		=> htmlspecialchars_decode($data['admin_name']),
-				'PASSWORD'		=> htmlspecialchars_decode($data['admin_pass1']))
-			);
-
-			$messenger->send(NOTIFY_EMAIL);
-		}
-*/
-		// And finally, add a note to the log
-		add_log('admin', 'LOG_INSTALL_INSTALLED', phpbb::$config['version']);
-
-		phpbb::$template->assign_vars(array(
-			'L_BODY'		=> phpbb::$user->lang('INSTALL_CONGRATS_EXPLAIN', phpbb::$config['version'], phpbb::$url->append_sid('install/index', 'mode=convert&amp;language=' . $data['language']), '../docs/README.html'),
-			'U_ACTION'	=> phpbb::$url->append_sid('adm/index'),
-		));
-	}
-
-	/**
-	* Generate a list of available mail server authentication methods
-	*/
-	function mail_auth_select($selected_method)
-	{
-		$auth_methods = array('PLAIN', 'LOGIN', 'CRAM-MD5', 'DIGEST-MD5', 'POP-BEFORE-SMTP');
-		$s_smtp_auth_options = '';
-
-		foreach ($auth_methods as $method)
-		{
-			$s_smtp_auth_options .= '<option value="' . $method . '"' . (($selected_method == $method) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang['SMTP_' . str_replace('-', '_', $method)] . '</option>';
-		}
-
-		return $s_smtp_auth_options;
-	}
-
-	/**
-	* Get submitted data
-	*/
-	function get_submitted_data()
-	{
-		return array(
-			'language'		=> basename(request_var('language', '')),
-			'dbms'			=> request_var('dbms', ''),
-			'dbhost'		=> request_var('dbhost', ''),
-			'dbport'		=> request_var('dbport', ''),
-			'dbuser'		=> request_var('dbuser', ''),
-			'dbpasswd'		=> request_var('dbpasswd', '', true),
-			'dbname'		=> request_var('dbname', ''),
-			'table_prefix'	=> request_var('table_prefix', ''),
-			'default_lang'	=> basename(request_var('default_lang', '')),
-			'admin_name'	=> utf8_normalize_nfc(request_var('admin_name', '', true)),
-			'admin_pass1'	=> request_var('admin_pass1', '', true),
-			'admin_pass2'	=> request_var('admin_pass2', '', true),
-			'board_email'	=> strtolower(request_var('board_email', '')),
-			'board_contact'	=> strtolower(request_var('board_contact', '')),
-			'img_imagick'	=> request_var('img_imagick', ''),
-			'ftp_path'		=> request_var('ftp_path', ''),
-			'ftp_user'		=> request_var('ftp_user', ''),
-			'ftp_pass'		=> request_var('ftp_pass', ''),
-			'email_enable'	=> request_var('email_enable', ''),
-			'smtp_delivery'	=> request_var('smtp_delivery', ''),
-			'smtp_host'		=> request_var('smtp_host', ''),
-			'smtp_auth'		=> request_var('smtp_auth', ''),
-			'smtp_user'		=> request_var('smtp_user', ''),
-			'smtp_pass'		=> request_var('smtp_pass', ''),
-			'cookie_secure'	=> request_var('cookie_secure', ''),
-			'force_server_vars'	=> request_var('force_server_vars', ''),
-			'server_protocol'	=> request_var('server_protocol', ''),
-			'server_name'	=> request_var('server_name', ''),
-			'server_port'	=> request_var('server_port', ''),
-			'script_path'	=> request_var('script_path', ''),
-		);
-	}
-
-	var $common_config_options = array('language' => array(), 'img_imagick' => array());
-
-	/**
-	* The information below will be used to build the input fields presented to the user
-	*/
-	var $db_config_options = array(
-		'legend1'				=> 'DB_CONFIG',
-		'dbms'					=> array('lang' => 'DBMS',			'type' => 'select', 'options' => 'dbms_select(\'{VALUE}\')', 'explain' => false),
-		'dbhost'				=> array('lang' => 'DB_HOST',		'type' => 'text:25:100', 'explain' => true),
-		'dbport'				=> array('lang' => 'DB_PORT',		'type' => 'text:25:100', 'explain' => true),
-		'dbname'				=> array('lang' => 'DB_NAME',		'type' => 'text:25:100', 'explain' => false),
-		'dbuser'				=> array('lang' => 'DB_USERNAME',	'type' => 'text:25:100', 'explain' => false),
-		'dbpasswd'				=> array('lang' => 'DB_PASSWORD',	'type' => 'password:25:100', 'explain' => false),
-		'table_prefix'			=> array('lang' => 'TABLE_PREFIX',	'type' => 'text:25:100', 'explain' => false),
-	);
-	var $admin_config_options = array(
-		'legend1'				=> 'ADMIN_CONFIG',
-		'default_lang'			=> array('lang' => 'DEFAULT_LANG',				'type' => 'select', 'options' => '$this->module->inst_language_select(\'{VALUE}\')', 'explain' => false),
-		'admin_name'			=> array('lang' => 'ADMIN_USERNAME',			'type' => 'text:25:100', 'explain' => true),
-		'admin_pass1'			=> array('lang' => 'ADMIN_PASSWORD',			'type' => 'password:25:100', 'explain' => true),
-		'admin_pass2'			=> array('lang' => 'ADMIN_PASSWORD_CONFIRM',	'type' => 'password:25:100', 'explain' => false),
-		'board_contact'			=> array('lang' => 'CONTACT_EMAIL',				'type' => 'text:25:100', 'explain' => true),
-		'board_email'			=> array('lang' => 'ADMIN_EMAIL',				'type' => 'text:25:100', 'explain' => true),
-	);
-	var $advanced_config_options = array(
-		'legend1'				=> 'ACP_EMAIL_SETTINGS',
-		'email_enable'			=> array('lang' => 'ENABLE_EMAIL',		'type' => 'radio:enabled_disabled', 'explain' => true),
-		'smtp_delivery'			=> array('lang' => 'USE_SMTP',			'type' => 'radio:yes_no', 'explain' => true),
-		'smtp_host'				=> array('lang' => 'SMTP_SERVER',		'type' => 'text:25:50', 'explain' => false),
-		'smtp_auth'				=> array('lang' => 'SMTP_AUTH_METHOD',	'type' => 'select', 'options' => '$this->module->mail_auth_select(\'{VALUE}\')', 'explain' => true),
-		'smtp_user'				=> array('lang' => 'SMTP_USERNAME',		'type' => 'text:25:255', 'explain' => true),
-		'smtp_pass'				=> array('lang' => 'SMTP_PASSWORD',		'type' => 'password:25:255', 'explain' => true),
-
-		'legend2'				=> 'SERVER_URL_SETTINGS',
-		'cookie_secure'			=> array('lang' => 'COOKIE_SECURE',		'type' => 'radio:enabled_disabled', 'explain' => true),
-		'force_server_vars'		=> array('lang' => 'FORCE_SERVER_VARS',	'type' => 'radio:yes_no', 'explain' => true),
-		'server_protocol'		=> array('lang' => 'SERVER_PROTOCOL',	'type' => 'text:10:10', 'explain' => true),
-		'server_name'			=> array('lang' => 'SERVER_NAME',		'type' => 'text:40:255', 'explain' => true),
-		'server_port'			=> array('lang' => 'SERVER_PORT',		'type' => 'text:5:5', 'explain' => true),
-		'script_path'			=> array('lang' => 'SCRIPT_PATH',		'type' => 'text::255', 'explain' => true),
-	);
-
-	/**
-	* Specific PHP modules we may require for certain optional or extended features
-	*/
-	var $php_dlls_other = array('zlib', 'ftp', 'gd', 'xml');
-
-	/**
-	* A list of the web-crawlers/bots we recognise by default
-	*
-	* Candidates but not included:
-	* 'Accoona [Bot]'				'Accoona-AI-Agent/'
-	* 'ASPseek [Crawler]'			'ASPseek/'
-	* 'Boitho [Crawler]'			'boitho.com-dc/'
-	* 'Bunnybot [Bot]'				'powered by www.buncat.de'
-	* 'Cosmix [Bot]'				'cfetch/'
-	* 'Crawler Search [Crawler]'	'.Crawler-Search.de'
-	* 'Findexa [Crawler]'			'Findexa Crawler ('
-	* 'GBSpider [Spider]'			'GBSpider v'
-	* 'genie [Bot]'					'genieBot ('
-	* 'Hogsearch [Bot]'				'oegp v. 1.3.0'
-	* 'Insuranco [Bot]'				'InsurancoBot'
-	* 'IRLbot [Bot]'				'http://irl.cs.tamu.edu/crawler'
-	* 'ISC Systems [Bot]'			'ISC Systems iRc Search'
-	* 'Jyxobot [Bot]'				'Jyxobot/'
-	* 'Kraehe [Metasuche]'			'-DIE-KRAEHE- META-SEARCH-ENGINE/'
-	* 'LinkWalker'					'LinkWalker'
-	* 'MMSBot [Bot]'				'http://www.mmsweb.at/bot.html'
-	* 'Naver [Bot]'					'nhnbot@naver.com)'
-	* 'NetResearchServer'			'NetResearchServer/'
-	* 'Nimble [Crawler]'			'NimbleCrawler'
-	* 'Ocelli [Bot]'				'Ocelli/'
-	* 'Onsearch [Bot]'				'onCHECK-Robot'
-	* 'Orange [Spider]'				'OrangeSpider'
-	* 'Sproose [Bot]'				'http://www.sproose.com/bot'
-	* 'Susie [Sync]'				'!Susie (http://www.sync2it.com/susie)'
-	* 'Tbot [Bot]'					'Tbot/'
-	* 'Thumbshots [Capture]'		'thumbshots-de-Bot'
-	* 'Vagabondo [Crawler]'			'http://webagent.wise-guys.nl/'
-	* 'Walhello [Bot]'				'appie 1.1 (www.walhello.com)'
-	* 'WissenOnline [Bot]'			'WissenOnline-Bot'
-	* 'WWWeasel [Bot]'				'WWWeasel Robot v'
-	* 'Xaldon [Spider]'				'Xaldon WebSpider'
-	*/
-	var $bot_list = array(
-		'AdsBot [Google]'			=> array('AdsBot-Google', ''),
-		'Alexa [Bot]'				=> array('ia_archiver', ''),
-		'Alta Vista [Bot]'			=> array('Scooter/', ''),
-		'Ask Jeeves [Bot]'			=> array('Ask Jeeves', ''),
-		'Baidu [Spider]'			=> array('Baiduspider+(', ''),
-		'Exabot [Bot]'				=> array('Exabot/', ''),
-		'FAST Enterprise [Crawler]'	=> array('FAST Enterprise Crawler', ''),
-		'FAST WebCrawler [Crawler]'	=> array('FAST-WebCrawler/', ''),
-		'Francis [Bot]'				=> array('http://www.neomo.de/', ''),
-		'Gigabot [Bot]'				=> array('Gigabot/', ''),
-		'Google Adsense [Bot]'		=> array('Mediapartners-Google', ''),
-		'Google Desktop'			=> array('Google Desktop', ''),
-		'Google Feedfetcher'		=> array('Feedfetcher-Google', ''),
-		'Google [Bot]'				=> array('Googlebot', ''),
-		'Heise IT-Markt [Crawler]'	=> array('heise-IT-Markt-Crawler', ''),
-		'Heritrix [Crawler]'		=> array('heritrix/1.', ''),
-		'IBM Research [Bot]'		=> array('ibm.com/cs/crawler', ''),
-		'ICCrawler - ICjobs'		=> array('ICCrawler - ICjobs', ''),
-		'ichiro [Crawler]'			=> array('ichiro/', ''),
-		'Majestic-12 [Bot]'			=> array('MJ12bot/', ''),
-		'Metager [Bot]'				=> array('MetagerBot/', ''),
-		'MSN NewsBlogs'				=> array('msnbot-NewsBlogs/', ''),
-		'MSN [Bot]'					=> array('msnbot/', ''),
-		'MSNbot Media'				=> array('msnbot-media/', ''),
-		'NG-Search [Bot]'			=> array('NG-Search/', ''),
-		'Nutch [Bot]'				=> array('http://lucene.apache.org/nutch/', ''),
-		'Nutch/CVS [Bot]'			=> array('NutchCVS/', ''),
-		'OmniExplorer [Bot]'		=> array('OmniExplorer_Bot/', ''),
-		'Online link [Validator]'	=> array('online link validator', ''),
-		'psbot [Picsearch]'			=> array('psbot/0', ''),
-		'Seekport [Bot]'			=> array('Seekbot/', ''),
-		'Sensis [Crawler]'			=> array('Sensis Web Crawler', ''),
-		'SEO Crawler'				=> array('SEO search Crawler/', ''),
-		'Seoma [Crawler]'			=> array('Seoma [SEO Crawler]', ''),
-		'SEOSearch [Crawler]'		=> array('SEOsearch/', ''),
-		'Snappy [Bot]'				=> array('Snappy/1.1 ( http://www.urltrends.com/ )', ''),
-		'Steeler [Crawler]'			=> array('http://www.tkl.iis.u-tokyo.ac.jp/~crawler/', ''),
-		'Synoo [Bot]'				=> array('SynooBot/', ''),
-		'Telekom [Bot]'				=> array('crawleradmin.t-info@telekom.de', ''),
-		'TurnitinBot [Bot]'			=> array('TurnitinBot/', ''),
-		'Voyager [Bot]'				=> array('voyager/1.0', ''),
-		'W3 [Sitesearch]'			=> array('W3 SiteSearch Crawler', ''),
-		'W3C [Linkcheck]'			=> array('W3C-checklink/', ''),
-		'W3C [Validator]'			=> array('W3C_*Validator', ''),
-		'WiseNut [Bot]'				=> array('http://www.WISEnutbot.com', ''),
-		'YaCy [Bot]'				=> array('yacybot', ''),
-		'Yahoo MMCrawler [Bot]'		=> array('Yahoo-MMCrawler/', ''),
-		'Yahoo Slurp [Bot]'			=> array('Yahoo! DE Slurp', ''),
-		'Yahoo [Bot]'				=> array('Yahoo! Slurp', ''),
-		'YahooSeeker [Bot]'			=> array('YahooSeeker/', ''),
-	);
-
-	/**
-	* Define the module structure so that we can populate the database without
-	* needing to hard-code module_id values
-	*/
-	var $module_categories = array(
-		'acp'	=> array(
-			'ACP_CAT_GENERAL'		=> array(
-				'ACP_QUICK_ACCESS',
-				'ACP_BOARD_CONFIGURATION',
-				'ACP_CLIENT_COMMUNICATION',
-				'ACP_SERVER_CONFIGURATION',
-			),
-			'ACP_CAT_FORUMS'		=> array(
-				'ACP_MANAGE_FORUMS',
-				'ACP_FORUM_BASED_PERMISSIONS',
-			),
-			'ACP_CAT_POSTING'		=> array(
-				'ACP_MESSAGES',
-				'ACP_ATTACHMENTS',
-			),
-			'ACP_CAT_USERGROUP'		=> array(
-				'ACP_CAT_USERS',
-				'ACP_GROUPS',
-				'ACP_USER_SECURITY',
-			),
-			'ACP_CAT_PERMISSIONS'	=> array(
-				'ACP_GLOBAL_PERMISSIONS',
-				'ACP_FORUM_BASED_PERMISSIONS',
-				'ACP_PERMISSION_ROLES',
-				'ACP_PERMISSION_MASKS',
-			),
-			'ACP_CAT_STYLES'		=> array(
-				'ACP_STYLE_MANAGEMENT',
-				'ACP_STYLE_COMPONENTS',
-			),
-			'ACP_CAT_MAINTENANCE'	=> array(
-				'ACP_FORUM_LOGS',
-				'ACP_CAT_DATABASE',
-			),
-			'ACP_CAT_SYSTEM'		=> array(
-				'ACP_AUTOMATION',
-				'ACP_GENERAL_TASKS',
-				'ACP_MODULE_MANAGEMENT',
-			),
-			'ACP_CAT_DOT_MODS'		=> null,
-		),
-		'mcp'	=> array(
-			'MCP_MAIN'		=> null,
-			'MCP_QUEUE'		=> null,
-			'MCP_REPORTS'	=> null,
-			'MCP_NOTES'		=> null,
-			'MCP_WARN'		=> null,
-			'MCP_LOGS'		=> null,
-			'MCP_BAN'		=> null,
-		),
-		'ucp'	=> array(
-			'UCP_MAIN'			=> null,
-			'UCP_PROFILE'		=> null,
-			'UCP_PREFS'			=> null,
-			'UCP_PM'			=> null,
-			'UCP_USERGROUPS'	=> null,
-			'UCP_ZEBRA'			=> null,
-		),
-	);
-
-	var $module_extras = array(
-		'acp'	=> array(
-			'ACP_QUICK_ACCESS' => array(
-				'ACP_MANAGE_USERS',
-				'ACP_GROUPS_MANAGE',
-				'ACP_MANAGE_FORUMS',
-				'ACP_MOD_LOGS',
-				'ACP_BOTS',
-				'ACP_PHP_INFO',
-			),
-			'ACP_FORUM_BASED_PERMISSIONS' => array(
-				'ACP_FORUM_PERMISSIONS',
-				'ACP_FORUM_MODERATORS',
-				'ACP_USERS_FORUM_PERMISSIONS',
-				'ACP_GROUPS_FORUM_PERMISSIONS',
-			),
-		),
-	);
-
-	var $role_definitions = array(
-		// Standard Admin (a_)
-		array('ROLE_ADMIN_STANDARD', 1, 'a_', 'NOT IN', array('a_switchperm', 'a_jabber', 'a_phpinfo', 'a_server', 'a_backup', 'a_styles', 'a_clearlogs', 'a_modules', 'a_language', 'a_email', 'a_bots', 'a_search', 'a_aauth', 'a_roles')),
-		// Forum Admin (a_)
-		array('ROLE_ADMIN_FORUM', 1, 'a_', 'IN', array('a_', 'a_authgroups', 'a_authusers', 'a_fauth', 'a_forum', 'a_forumadd', 'a_forumdel', 'a_mauth', 'a_prune', 'a_uauth', 'a_viewauth', 'a_viewlogs')),
-		// User and Groups Admin (a_)
-		array('ROLE_ADMIN_USERGROUP', 1, 'a_', 'IN', array('a_', 'a_authgroups', 'a_authusers', 'a_ban', 'a_group', 'a_groupadd', 'a_groupdel', 'a_ranks', 'a_uauth', 'a_user', 'a_viewauth', 'a_viewlogs')),
-		// Full Admin (a_)
-		array('ROLE_ADMIN_FULL', 1, 'a_', false, false),
-		// All Features (u_)
-		array('ROLE_USER_FULL', 1, 'u_', false, false),
-		// Standard Features (u_)
-		array('ROLE_USER_STANDARD', 1, 'u_', 'NOT IN', array('u_viewonline', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_flash', 'u_pm_forward')),
-		// Limited Features (u_)
-		array('ROLE_USER_LIMITED', 1, 'u_', 'NOT IN', array('u_attach', 'u_viewonline', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_pm_flash', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_sendim', 'u_masspm', 'u_masspm_group')),
-		// No Private Messages (u_)
-		array('ROLE_USER_NOPM', 1, 'u_', 'IN', array('u_', 'u_chgavatar', 'u_chgcensors', 'u_chgemail', 'u_chgpasswd', 'u_download', 'u_hideonline', 'u_sig', 'u_viewprofile')),
-		array('ROLE_USER_NOPM', 0, 'u_', 'IN', array('u_readpm', 'u_sendpm', 'u_masspm', 'u_masspm_group')),
-		// No Avatar (u_)
-		array('ROLE_USER_NOAVATAR', 1, 'u_', 'NOT IN', array('u_attach', 'u_chgavatar', 'u_viewonline', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_pm_flash', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_sendim', 'u_masspm', 'u_masspm_group')),
-		array('ROLE_USER_NOAVATAR', 0, 'u_', 'IN', array('u_chgavatar', 'u_masspm', 'u_masspm_group')),
-		// Download and search for guests (u_)
-		array('ROLE_USER_GUESTS', 1, 'u_', 'IN', array('u_', 'u_download', 'u_search')),
-		// Full Moderator (m_)
-		array('ROLE_MOD_FULL', 1, 'm_', false, false),
-		// Standard Moderator (m_)
-		array('ROLE_MOD_STANDARD', 1, 'm_', 'NOT IN', array('m_ban', 'm_chgposter')),
-		// Simple Moderator (m_)
-		array('ROLE_MOD_SIMPLE', 1, 'm_', 'IN', array('m_', 'm_delete', 'm_edit', 'm_info', 'm_report')),
-		// Queue Moderator (m_)
-		array('ROLE_MOD_QUEUE', 1, 'm_', 'IN', array('m_', 'm_approve', 'm_edit')),
-		// Full Access (f_)
-		array('ROLE_FORUM_FULL', 1, 'f_', false, false),
-		// Standard Access (f_)
-		array('ROLE_FORUM_STANDARD', 1, 'f_', 'NOT IN', array('f_announce', 'f_flash', 'f_ignoreflood', 'f_poll', 'f_sticky', 'f_user_lock')),
-		// No Access (f_)
-		array('ROLE_FORUM_NOACCESS', 0, 'f_', 'IN', array('f_')),
-		// Read Only Access (f_)
-		array('ROLE_FORUM_READONLY', 1, 'f_', 'IN', array('f_', 'f_download', 'f_list', 'f_read', 'f_search', 'f_subscribe', 'f_print')),
-		// Limited Access (f_)
-		array('ROLE_FORUM_LIMITED', 1, 'f_', 'NOT IN', array('f_announce', 'f_attach', 'f_bump', 'f_delete', 'f_flash', 'f_icons', 'f_ignoreflood', 'f_poll', 'f_sticky', 'f_user_lock', 'f_votechg')),
-		// Bot Access (f_)
-		array('ROLE_FORUM_BOT', 1, 'f_', 'IN', array('f_', 'f_download', 'f_list', 'f_read', 'f_print')),
-		// On Moderation Queue (f_)
-		array('ROLE_FORUM_ONQUEUE', 1, 'f_', 'NOT IN', array('f_announce', 'f_bump', 'f_delete', 'f_flash', 'f_icons', 'f_ignoreflood', 'f_poll', 'f_sticky', 'f_user_lock', 'f_votechg', 'f_noapprove')),
-		array('ROLE_FORUM_ONQUEUE', 0, 'f_', 'IN', array('f_noapprove')),
-		// Standard Access + Polls (f_)
-		array('ROLE_FORUM_POLLS', 1, 'f_', 'NOT IN', array('f_announce', 'f_flash', 'f_ignoreflood', 'f_sticky', 'f_user_lock')),
-		// Limited Access + Polls (f_)
-		array('ROLE_FORUM_LIMITED_POLLS', 1, 'f_', 'NOT IN', array('f_announce', 'f_attach', 'f_bump', 'f_delete', 'f_flash', 'f_icons', 'f_ignoreflood', 'f_sticky', 'f_user_lock', 'f_votechg')),
-	);
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/install/install_main.php b/phpBB/install/install_main.php
deleted file mode 100644
index 48cd600249..0000000000
--- a/phpBB/install/install_main.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
-*
-* @package install
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-*/
-
-if ( !defined('IN_INSTALL') )
-{
-	// Someone has tried to access the file direct. This is not a good idea, so exit
-	exit;
-}
-
-if (!empty($setmodules))
-{
-	$module[] = array(
-		'module_type'		=> 'install',
-		'module_title'		=> 'OVERVIEW',
-		'module_filename'	=> substr(basename(__FILE__), 0, -strlen(PHP_EXT)-1),
-		'module_order'		=> 0,
-		'module_subs'		=> array('INTRO', 'LICENSE', 'SUPPORT'),
-		'module_stages'		=> '',
-		'module_reqs'		=> ''
-	);
-}
-
-/**
-* Main Tab - Installation
-* @package install
-*/
-class install_main extends module
-{
-	function install_main(&$p_master)
-	{
-		$this->p_master = &$p_master;
-	}
-
-	function main($mode, $sub)
-	{
-		switch ($sub)
-		{
-			case 'intro' :
-				$title = phpbb::$user->lang['SUB_INTRO'];
-				$body = phpbb::$user->lang['OVERVIEW_BODY'];
-			break;
-
-			case 'license' :
-				$title = phpbb::$user->lang['GPL'];
-				$body = implode("<br />\n", file('../docs/COPYING'));
-			break;
-
-			case 'support' :
-				$title = phpbb::$user->lang['SUB_SUPPORT'];
-				$body = phpbb::$user->lang['SUPPORT_BODY'];
-			break;
-		}
-
-		$this->tpl_name = 'install/main';
-		$this->page_title = $title;
-
-		phpbb::$template->assign_vars(array(
-			'TITLE'		=> $title,
-			'BODY'		=> $body,
-
-			'S_LANG_SELECT'	=> '<select id="language" name="language">' . $this->p_master->inst_language_select(phpbb::$user->lang_name) . '</select>',
-		));
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
deleted file mode 100644
index 1cc38c5a94..0000000000
--- a/phpBB/install/install_update.php
+++ /dev/null
@@ -1,1386 +0,0 @@
-<?php
-/**
-*
-* @package install
-* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-* @todo check for writable cache/store/files directory
-*/
-
-/**
-*/
-if (!defined('IN_INSTALL'))
-{
-	// Someone has tried to access the file directly. This is not a good idea, so exit
-	exit;
-}
-
-if (!empty($setmodules))
-{
-	// If phpBB is not installed we do not include this module
-	if (@file_exists(PHPBB_ROOT_PATH . 'config.' . PHP_EXT) && !@file_exists(PHPBB_ROOT_PATH . 'cache/install_lock'))
-	{
-		include_once(PHPBB_ROOT_PATH . 'config.' . PHP_EXT);
-
-		if (!phpbb::$base_config['installed'])
-		{
-			return;
-		}
-	}
-	else
-	{
-		return;
-	}
-
-	$module[] = array(
-		'module_type'		=> 'update',
-		'module_title'		=> 'UPDATE',
-		'module_filename'	=> substr(basename(__FILE__), 0, -strlen(PHP_EXT)-1),
-		'module_order'		=> 30,
-		'module_subs'		=> '',
-		'module_stages'		=> array('INTRO', 'VERSION_CHECK', 'UPDATE_DB', 'FILE_CHECK', 'UPDATE_FILES'),
-		'module_reqs'		=> ''
-	);
-}
-
-/**
-* Update Installation
-* @package install
-*/
-class install_update extends module
-{
-	var $p_master;
-	var $update_info;
-
-	var $old_location;
-	var $new_location;
-	var $latest_version;
-	var $current_version;
-	var $unequal_version;
-
-	// Set to false
-	var $test_update = false;
-
-	function install_update(&$p_master)
-	{
-		$this->p_master = &$p_master;
-	}
-
-	function main($mode, $sub)
-	{
-		require PHPBB_ROOT_PATH . 'common.' . PHP_EXT;
-
-		$this->tpl_name = 'install_update';
-		$this->page_title = 'UPDATE_INSTALLATION';
-		$this->unequal_version = false;
-
-		$this->old_location = PHPBB_ROOT_PATH . 'install/update/old/';
-		$this->new_location = PHPBB_ROOT_PATH . 'install/update/new/';
-
-		// Force template recompile
-		phpbb::$config['load_tplcompile'] = 1;
-
-		// Start session management
-		phpbb::$user->session_begin();
-		phpbb::$acl->init(phpbb::$user->data);
-		phpbb::$user->setup('viewforum');
-
-		// If we are within the intro page we need to make sure we get up-to-date version info
-		if ($sub == 'intro')
-		{
-			phpbb::$acm->destroy('version_info');
-		}
-
-		// Set custom template again. ;)
-		phpbb::$template->set_custom_template('../adm/style', 'admin');
-
-		// Get current and latest version
-		if (($latest_version = phpbb::$acm->get('version_info')) === false)
-		{
-			$this->latest_version = $this->get_file('version_info');
-			phpbb::$acm->put('version_info', $this->latest_version);
-		}
-		else
-		{
-			$this->latest_version = $latest_version;
-		}
-
-		// For the current version we trick a bit. ;)
-		$this->current_version = (!empty(phpbb::$config['version_update_from'])) ? phpbb::$config['version_update_from'] : phpbb::$config['version'];
-
-		$up_to_date = (version_compare(str_replace('rc', 'RC', strtolower($this->current_version)), str_replace('rc', 'RC', strtolower($this->latest_version)), '<')) ? false : true;
-
-		// Check for a valid update directory, else point the user to the phpbb.com website
-		if (!file_exists(PHPBB_ROOT_PATH . 'install/update') || !file_exists(PHPBB_ROOT_PATH . 'install/update/index.php') || !file_exists($this->old_location) || !file_exists($this->new_location))
-		{
-			phpbb::$template->assign_vars(array(
-				'S_ERROR'		=> true,
-				'ERROR_MSG'		=> ($up_to_date) ? phpbb::$user->lang['NO_UPDATE_FILES_UP_TO_DATE'] : sprintf(phpbb::$user->lang['NO_UPDATE_FILES_OUTDATED'], phpbb::$config['version'], $this->current_version, $this->latest_version),
-			));
-
-			return;
-		}
-
-		$this->update_info = $this->get_file('update_info');
-
-		// Make sure the update directory holds the correct information
-		// Since admins are able to run the update/checks more than once we only check if the current version is lower or equal than the version to which we update to.
-		if (version_compare(str_replace('rc', 'RC', strtolower($this->current_version)), str_replace('rc', 'RC', strtolower($this->update_info['version']['to'])), '>'))
-		{
-			phpbb::$template->assign_vars(array(
-				'S_ERROR'		=> true,
-				'ERROR_MSG'		=> sprintf(phpbb::$user->lang['INCOMPATIBLE_UPDATE_FILES'], phpbb::$config['version'], $this->update_info['version']['from'], $this->update_info['version']['to']),
-			));
-
-			return;
-		}
-
-		// Check if the update files stored are for the latest version...
-		if ($this->latest_version != $this->update_info['version']['to'])
-		{
-			$this->unequal_version = true;
-
-			phpbb::$template->assign_vars(array(
-				'S_WARNING'		=> true,
-				'WARNING_MSG'	=> sprintf(phpbb::$user->lang['OLD_UPDATE_FILES'], $this->update_info['version']['from'], $this->update_info['version']['to'], $this->latest_version),
-			));
-		}
-
-		// Fill DB version
-		if (empty(phpbb::$config['dbms_version']))
-		{
-			set_config('dbms_version', phpbb::$db->sql_server_info(true));
-		}
-
-		if ($this->test_update === false)
-		{
-			// Got the updater template itself updated? If so, we are able to directly use it - but only if all three files are present
-			if (in_array('adm/style/install_update.html', $this->update_info['files']))
-			{
-				$this->tpl_name = '../../install/update/new/adm/style/install_update';
-			}
-
-			// What about the language file? Got it updated?
-			if (in_array('language/en/install.php', $this->update_info['files']))
-			{
-				$lang = array();
-				include($this->new_location . 'language/en/install.php');
-				// only add new keys to user's language in english
-				$new_keys = array_diff(array_keys($lang), array_keys(phpbb::$user->lang));
-				foreach ($new_keys as $i => $new_key)
-				{
-					phpbb::$user->lang[$new_key] = $lang[$new_key];
-				}
-			}
-		}
-
-		// Include renderer and engine
-		$this->include_file('includes/diff/diff.' . PHP_EXT);
-		$this->include_file('includes/diff/engine.' . PHP_EXT);
-		$this->include_file('includes/diff/renderer.' . PHP_EXT);
-
-		// Make sure we stay at the file check if checking the files again
-		if (phpbb_request::variable('clean_up', false, false, phpbb_request::POST))
-		{
-			$sub = $this->p_master->sub = 'file_check';
-		}
-
-		switch ($sub)
-		{
-			case 'intro':
-				$this->page_title = 'UPDATE_INSTALLATION';
-
-				phpbb::$template->assign_vars(array(
-					'S_INTRO'		=> true,
-					'U_ACTION'		=> append_sid($this->p_master->module_url, "mode=$mode&amp;sub=version_check"),
-				));
-
-				// Make sure the update list is destroyed.
-				phpbb::$acm->destroy('update_list');
-				phpbb::$acm->destroy('diff_files');
-			break;
-
-			case 'version_check':
-				$this->page_title = 'STAGE_VERSION_CHECK';
-
-				phpbb::$template->assign_vars(array(
-					'S_UP_TO_DATE'		=> $up_to_date,
-					'S_VERSION_CHECK'	=> true,
-
-					'U_ACTION'				=> append_sid($this->p_master->module_url, "mode=$mode&amp;sub=file_check"),
-					'U_DB_UPDATE_ACTION'	=> append_sid($this->p_master->module_url, "mode=$mode&amp;sub=update_db"),
-
-					'LATEST_VERSION'	=> $this->latest_version,
-					'CURRENT_VERSION'	=> $this->current_version,
-				));
-
-				// Print out version the update package updates to
-				if ($this->unequal_version)
-				{
-					phpbb::$template->assign_var('PACKAGE_VERSION', $this->update_info['version']['to']);
-				}
-
-			break;
-
-			case 'update_db':
-
-				// Make sure the database update is valid for the latest version
-				$valid = false;
-				$updates_to_version = '';
-
-				if (file_exists(PHPBB_ROOT_PATH . 'install/database_update.' . PHP_EXT))
-				{
-					include_once(PHPBB_ROOT_PATH . 'install/database_update.' . PHP_EXT);
-
-					if ($updates_to_version === $this->update_info['version']['to'])
-					{
-						$valid = true;
-					}
-				}
-
-				// Should not happen at all
-				if (!$valid)
-				{
-					trigger_error(phpbb::$user->lang['DATABASE_UPDATE_INFO_OLD'], E_USER_ERROR);
-				}
-
-				// Just a precaution
-				phpbb::$acm->purge();
-
-				// Redirect the user to the database update script with some explanations...
-				phpbb::$template->assign_vars(array(
-					'S_DB_UPDATE'			=> true,
-					'S_DB_UPDATE_FINISHED'	=> (phpbb::$config['version'] == $this->update_info['version']['to']) ? true : false,
-					'U_DB_UPDATE'			=> append_sid('install/database_update', 'type=1&amp;language=' . phpbb::$user->data['user_lang']),
-					'U_DB_UPDATE_ACTION'	=> append_sid($this->p_master->module_url, "mode=$mode&amp;sub=update_db"),
-					'U_ACTION'				=> append_sid($this->p_master->module_url, "mode=$mode&amp;sub=file_check"),
-				));
-
-			break;
-
-			case 'file_check':
-
-				// Make sure the previous file collection is no longer valid...
-				phpbb::$acm->destroy('diff_files');
-
-				$this->page_title = 'STAGE_FILE_CHECK';
-
-				// Now make sure our update list is correct if the admin refreshes
-				$action = request_var('action', '');
-
-				// We are directly within an update. To make sure our update list is correct we check its status.
-				$update_list = (phpbb_request::variable('clean_up', false, false, phpbb_request::POST)) ? false : phpbb::$acm->get('update_list');
-				$modified = ($update_list !== false) ? phpbb::$acm->get_modified_date('data', 'update_list') : 0;
-
-				// Make sure the list is up-to-date
-				if ($update_list !== false)
-				{
-					$get_new_list = false;
-					foreach ($this->update_info['files'] as $file)
-					{
-						if (file_exists(PHPBB_ROOT_PATH . $file) && filemtime(PHPBB_ROOT_PATH . $file) > $modified)
-						{
-							$get_new_list = true;
-							break;
-						}
-					}
-				}
-				else
-				{
-					$get_new_list = true;
-				}
-
-				if (!$get_new_list && $update_list['status'] != -1)
-				{
-					$get_new_list = true;
-				}
-
-				if ($get_new_list)
-				{
-					$this->get_update_structure($update_list);
-					phpbb::$acm->put('update_list', $update_list);
-
-					// Refresh the page if we are still not finished...
-					if ($update_list['status'] != -1)
-					{
-						$refresh_url = append_sid($this->p_master->module_url, "mode=$mode&amp;sub=file_check");
-						meta_refresh(2, $refresh_url);
-
-						phpbb::$template->assign_vars(array(
-							'S_IN_PROGRESS'		=> true,
-							'S_COLLECTED'		=> (int) $update_list['status'],
-							'S_TO_COLLECT'		=> sizeof($this->update_info['files']),
-							'L_IN_PROGRESS'				=> phpbb::$user->lang['COLLECTING_FILE_DIFFS'],
-							'L_IN_PROGRESS_EXPLAIN'		=> sprintf(phpbb::$user->lang['NUMBER_OF_FILES_COLLECTED'], (int) $update_list['status'], sizeof($this->update_info['files'])),
-						));
-
-						return;
-					}
-				}
-
-				if ($action == 'diff')
-				{
-					$this->show_diff($update_list);
-					return;
-				}
-
-				if (sizeof($update_list['no_update']))
-				{
-					phpbb::$template->assign_vars(array(
-						'S_NO_UPDATE_FILES'		=> true,
-						'NO_UPDATE_FILES'		=> implode(', ', array_map('htmlspecialchars', $update_list['no_update'])),
-					));
-				}
-
-				// Now assign the list to the template
-				foreach ($update_list as $status => $filelist)
-				{
-					if ($status == 'no_update' || !sizeof($filelist) || $status == 'status')
-					{
-						continue;
-					}
-
-/*					phpbb::$template->assign_block_vars('files', array(
-						'S_STATUS'		=> true,
-						'STATUS'		=> $status,
-						'L_STATUS'		=> phpbb::$user->lang['STATUS_' . strtoupper($status)],
-						'TITLE'			=> phpbb::$user->lang['FILES_' . strtoupper($status)],
-						'EXPLAIN'		=> phpbb::$user->lang['FILES_' . strtoupper($status) . '_EXPLAIN'],
-						)
-					);*/
-
-					foreach ($filelist as $file_struct)
-					{
-						$s_binary = (!empty($this->update_info['binary']) && in_array($file_struct['filename'], $this->update_info['binary'])) ? true : false;
-
-						$filename = htmlspecialchars($file_struct['filename']);
-						if (strrpos($filename, '/') !== false)
-						{
-							$dir_part = substr($filename, 0, strrpos($filename, '/') + 1);
-							$file_part = substr($filename, strrpos($filename, '/') + 1);
-						}
-						else
-						{
-							$dir_part = '';
-							$file_part = $filename;
-						}
-
-						$diff_url = append_sid($this->p_master->module_url, "mode=$mode&amp;sub=file_check&amp;action=diff&amp;status=$status&amp;file=" . urlencode($file_struct['filename']));
-
-						phpbb::$template->assign_block_vars($status, array(
-							'STATUS'			=> $status,
-
-							'FILENAME'			=> $filename,
-							'DIR_PART'			=> $dir_part,
-							'FILE_PART'			=> $file_part,
-							'NUM_CONFLICTS'		=> (isset($file_struct['conflicts'])) ? $file_struct['conflicts'] : 0,
-
-							'S_CUSTOM'			=> ($file_struct['custom']) ? true : false,
-							'S_BINARY'			=> $s_binary,
-							'CUSTOM_ORIGINAL'	=> ($file_struct['custom']) ? $file_struct['original'] : '',
-
-							'U_SHOW_DIFF'		=> $diff_url,
-							'L_SHOW_DIFF'		=> ($status != 'up_to_date') ? phpbb::$user->lang['SHOW_DIFF_' . strtoupper($status)] : '',
-
-							'U_VIEW_MOD_FILE'		=> $diff_url . '&amp;op=' . MERGE_MOD_FILE,
-							'U_VIEW_NEW_FILE'		=> $diff_url . '&amp;op=' . MERGE_NEW_FILE,
-							'U_VIEW_NO_MERGE_MOD'	=> $diff_url . '&amp;op=' . MERGE_NO_MERGE_MOD,
-							'U_VIEW_NO_MERGE_NEW'	=> $diff_url . '&amp;op=' . MERGE_NO_MERGE_NEW,
-						));
-					}
-				}
-
-				$all_up_to_date = true;
-				foreach ($update_list as $status => $filelist)
-				{
-					if ($status != 'up_to_date' && $status != 'custom' && $status != 'status' && sizeof($filelist))
-					{
-						$all_up_to_date = false;
-						break;
-					}
-				}
-
-				phpbb::$template->assign_vars(array(
-					'S_FILE_CHECK'			=> true,
-					'S_ALL_UP_TO_DATE'		=> $all_up_to_date,
-					'S_VERSION_UP_TO_DATE'	=> $up_to_date,
-					'U_ACTION'				=> append_sid($this->p_master->module_url, "mode=$mode&amp;sub=file_check"),
-					'U_UPDATE_ACTION'		=> append_sid($this->p_master->module_url, "mode=$mode&amp;sub=update_files"),
-					'U_DB_UPDATE_ACTION'	=> append_sid($this->p_master->module_url, "mode=$mode&amp;sub=update_db"),
-				));
-
-				if ($all_up_to_date)
-				{
-					// Add database update to log
-					add_log('admin', 'LOG_UPDATE_PHPBB', $this->current_version, $this->latest_version);
-
-					// Refresh prosilver css data - this may cause some unhappy users, but
-					$sql = 'SELECT *
-						FROM ' . STYLES_THEME_TABLE . "
-						WHERE theme_name = 'prosilver'";
-					$result = phpbb::$db->sql_query($sql);
-					$theme = phpbb::$db->sql_fetchrow($result);
-					phpbb::$db->sql_freeresult($result);
-
-					if ($theme)
-					{
-						$recache = (empty($theme['theme_data'])) ? true : false;
-						$update_time = time();
-
-						// We test for stylesheet.css because it is faster and most likely the only file changed on common themes
-						if (!$recache && $theme['theme_mtime'] < @filemtime(PHPBB_ROOT_PATH . 'styles/' . $theme['theme_path'] . '/theme/stylesheet.css'))
-						{
-							$recache = true;
-							$update_time = @filemtime(PHPBB_ROOT_PATH . 'styles/' . $theme['theme_path'] . '/theme/stylesheet.css');
-						}
-						else if (!$recache)
-						{
-							$last_change = $theme['theme_mtime'];
-							$dir = @opendir(PHPBB_ROOT_PATH . "styles/{$theme['theme_path']}/theme");
-
-							if ($dir)
-							{
-								while (($entry = readdir($dir)) !== false)
-								{
-									if (substr(strrchr($entry, '.'), 1) == 'css' && $last_change < @filemtime(PHPBB_ROOT_PATH . "styles/{$theme['theme_path']}/theme/{$entry}"))
-									{
-										$recache = true;
-										break;
-									}
-								}
-								closedir($dir);
-							}
-						}
-
-						if ($recache)
-						{
-							include_once(PHPBB_ROOT_PATH . 'includes/acp/acp_styles.' . PHP_EXT);
-
-							$theme['theme_data'] = acp_styles::db_theme_data($theme);
-							$theme['theme_mtime'] = $update_time;
-
-							// Save CSS contents
-							$sql_ary = array(
-								'theme_mtime'	=> $theme['theme_mtime'],
-								'theme_data'	=> $theme['theme_data']
-							);
-
-							$sql = 'UPDATE ' . STYLES_THEME_TABLE . ' SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-								WHERE theme_id = ' . $theme['theme_id'];
-							phpbb::$db->sql_query($sql);
-
-							phpbb::$acm->destroy_sql(STYLES_THEME_TABLE);
-						}
-					}
-
-					phpbb::$db->sql_return_on_error(true);
-					phpbb::$db->sql_query('DELETE FROM ' . CONFIG_TABLE . " WHERE config_name = 'version_update_from'");
-					phpbb::$db->sql_return_on_error(false);
-
-					phpbb::$acm->purge();
-				}
-
-			break;
-
-			case 'update_files':
-
-				$this->page_title = 'STAGE_UPDATE_FILES';
-
-				$s_hidden_fields = '';
-				$params = array();
-				$conflicts = request_var('conflict', array('' => 0));
-				$modified = request_var('modified', array('' => 0));
-
-				foreach ($conflicts as $filename => $merge_option)
-				{
-					$s_hidden_fields .= '<input type="hidden" name="conflict[' . htmlspecialchars($filename) . ']" value="' . $merge_option . '" />';
-					$params[] = 'conflict[' . urlencode($filename) . ']=' . urlencode($merge_option);
-				}
-
-				foreach ($modified as $filename => $merge_option)
-				{
-					if (!$merge_option)
-					{
-						continue;
-					}
-					$s_hidden_fields .= '<input type="hidden" name="modified[' . htmlspecialchars($filename) . ']" value="' . $merge_option . '" />';
-					$params[] = 'modified[' . urlencode($filename) . ']=' . urlencode($merge_option);
-				}
-
-				$no_update = request_var('no_update', array(0 => ''));
-
-				foreach ($no_update as $index => $filename)
-				{
-					$s_hidden_fields .= '<input type="hidden" name="no_update[]" value="' . htmlspecialchars($filename) . '" />';
-					$params[] = 'no_update[]=' . urlencode($filename);
-				}
-
-				// Before the user is choosing his preferred method, let's create the content list...
-				$update_list = phpbb::$acm->get('update_list');
-
-				if ($update_list === false)
-				{
-					trigger_error(phpbb::$user->lang['NO_UPDATE_INFO'], E_USER_ERROR);
-				}
-
-				// Check if the conflicts data is valid
-				if (sizeof($conflicts))
-				{
-					$conflict_filenames = array();
-					foreach ($update_list['conflict'] as $files)
-					{
-						$conflict_filenames[] = $files['filename'];
-					}
-
-					$new_conflicts = array();
-					foreach ($conflicts as $filename => $diff_method)
-					{
-						if (in_array($filename, $conflict_filenames))
-						{
-							$new_conflicts[$filename] = $diff_method;
-						}
-					}
-
-					$conflicts = $new_conflicts;
-				}
-
-				// Build list for modifications
-				if (sizeof($modified))
-				{
-					$modified_filenames = array();
-					foreach ($update_list['modified'] as $files)
-					{
-						$modified_filenames[] = $files['filename'];
-					}
-
-					$new_modified = array();
-					foreach ($modified as $filename => $diff_method)
-					{
-						if (in_array($filename, $modified_filenames))
-						{
-							$new_modified[$filename] = $diff_method;
-						}
-					}
-
-					$modified = $new_modified;
-				}
-
-				// Check number of conflicting files, they need to be equal. For modified files the number can differ
-				if (sizeof($update_list['conflict']) != sizeof($conflicts))
-				{
-					trigger_error(phpbb::$user->lang['MERGE_SELECT_ERROR'], E_USER_ERROR);
-				}
-
-				// Before we do anything, let us diff the files and store the raw file information "somewhere"
-				$get_files = false;
-				$file_list = phpbb::$acm->get('diff_files');
-
-				if ($file_list === false || $file_list['status'] != -1)
-				{
-					$get_files = true;
-				}
-
-				if ($get_files)
-				{
-					if ($file_list === false)
-					{
-						$file_list = array(
-							'status'	=> 0,
-						);
-					}
-
-					$processed = 0;
-					foreach ($update_list as $status => $files)
-					{
-						if (!is_array($files))
-						{
-							continue;
-						}
-
-						foreach ($files as $file_struct)
-						{
-							// Skip this file if the user selected to not update it
-							if (in_array($file_struct['filename'], $no_update))
-							{
-								continue;
-							}
-
-							// Already handled... then skip of course...
-							if (isset($file_list[$file_struct['filename']]))
-							{
-								continue;
-							}
-
-							// Refresh if we reach 5 diffs...
-							if ($processed >= 5)
-							{
-								phpbb::$acm->put('diff_files', $file_list);
-
-								if (request_var('download', false))
-								{
-									$params[] = 'download=1';
-								}
-
-								$redirect_url = append_sid($this->p_master->module_url, "mode=$mode&amp;sub=update_files&amp;" . implode('&amp;', $params));
-								meta_refresh(3, $redirect_url);
-
-								phpbb::$template->assign_vars(array(
-									'S_IN_PROGRESS'			=> true,
-									'L_IN_PROGRESS'			=> phpbb::$user->lang['MERGING_FILES'],
-									'L_IN_PROGRESS_EXPLAIN'	=> phpbb::$user->lang['MERGING_FILES_EXPLAIN'],
-								));
-
-								return;
-							}
-
-							$original_filename = ($file_struct['custom']) ? $file_struct['original'] : $file_struct['filename'];
-
-							switch ($status)
-							{
-								case 'modified':
-
-									$option = (isset($modified[$file_struct['filename']])) ? $modified[$file_struct['filename']] : 0;
-
-									switch ($option)
-									{
-										case MERGE_NO_MERGE_NEW:
-											$contents = file_get_contents($this->new_location . $original_filename);
-										break;
-
-										case MERGE_NO_MERGE_MOD:
-											$contents = file_get_contents(PHPBB_ROOT_PATH . $file_struct['filename']);
-										break;
-
-										default:
-											$diff = $this->return_diff($this->old_location . $original_filename, PHPBB_ROOT_PATH . $file_struct['filename'], $this->new_location . $original_filename);
-
-											$contents = implode("\n", $diff->merged_new_output());
-											unset($diff);
-										break;
-									}
-
-									$file_list[$file_struct['filename']] = 'file_' . md5($file_struct['filename']);
-									phpbb::$acm->put($file_list[$file_struct['filename']], base64_encode($contents));
-
-									$file_list['status']++;
-									$processed++;
-
-								break;
-
-								case 'conflict':
-
-									$option = $conflicts[$file_struct['filename']];
-									$contents = '';
-
-									switch ($option)
-									{
-										case MERGE_NO_MERGE_NEW:
-											$contents = file_get_contents($this->new_location . $original_filename);
-										break;
-
-										case MERGE_NO_MERGE_MOD:
-											$contents = file_get_contents(PHPBB_ROOT_PATH . $file_struct['filename']);
-										break;
-
-										default:
-
-											$diff = $this->return_diff($this->old_location . $original_filename, PHPBB_ROOT_PATH . $file_struct['filename'], $this->new_location . $original_filename);
-
-											if ($option == MERGE_NEW_FILE)
-											{
-												$contents = implode("\n", $diff->merged_new_output());
-											}
-											else if ($option == MERGE_MOD_FILE)
-											{
-												$contents = implode("\n", $diff->merged_orig_output());
-											}
-											else
-											{
-												unset($diff);
-												break 2;
-											}
-
-											unset($diff);
-										break;
-									}
-
-									$file_list[$file_struct['filename']] = 'file_' . md5($file_struct['filename']);
-									phpbb::$acm->put($file_list[$file_struct['filename']], base64_encode($contents));
-
-									$file_list['status']++;
-									$processed++;
-
-								break;
-							}
-						}
-					}
-				}
-
-				$file_list['status'] = -1;
-				phpbb::$acm->put('diff_files', $file_list);
-
-				$this->include_file('includes/functions_compress.' . $phpEx);
-				$this->include_file('includes/functions_transfer.' . $phpEx);
-
-				$module_url = append_sid($this->p_master->module_url, "mode=$mode&amp;sub=update_files");
-				foreach ($update_list as &$files)
-				{
-					if (!is_array($files))
-					{
-						continue;
-					}
-					for ($i = 0, $size = sizeof($files); $i < $size; $i++)
-					{
-						// Skip this file if the user selected to not update it
-						if (in_array($files[$i]['filename'], $no_update))
-						{
-							unset($files[$i]['filename']);
-						}
-					}
-					$files = array_values($files);
-				}
-				unset($files);
-				$new_location = $this->new_location;
-				$download_filename = 'update_' . $this->update_info['version']['from'] . '_to_' . $this->update_info['version']['to'];
-				$check_params = "mode=$mode&amp;sub=file_check";
-
-				$temp = process_transfer($module_url, $update_list, $new_location, $download_filename);
-				if (is_string($temp))
-				{
-					$this->page_title = $temp;
-				}
-
-				phpbb::$template->assign_vars(array(
-					'S_UPDATE_OPTIONS' => true,
-					'S_CHECK_AGAIN' => true,
-					// 'U_INITIAL_ACTION' isn't set because it's taken care of in the S_FILE_CHECK block of install_update.html
-					'U_FINAL_ACTION' => append_sid($this->p_master->module_url, "mode=$mode&amp;sub=update_files"))
-				);
-
-			break;
-
-		}
-	}
-
-	/**
-	* Show file diff
-	*/
-	function show_diff(&$update_list)
-	{
-		$this->tpl_name = 'install_update_diff';
-
-		// Got the diff template itself updated? If so, we are able to directly use it
-		if (in_array('adm/style/install_update_diff.html', $this->update_info['files']))
-		{
-			$this->tpl_name = '../../install/update/new/adm/style/install_update_diff';
-		}
-
-		$this->page_title = 'VIEWING_FILE_DIFF';
-
-		$status = request_var('status', '');
-		$file = request_var('file', '');
-		$diff_mode = request_var('diff_mode', 'inline');
-
-		// First of all make sure the file is within our file update list with the correct status
-		$found_entry = array();
-		foreach ($update_list[$status] as $index => $file_struct)
-		{
-			if ($file_struct['filename'] === $file)
-			{
-				$found_entry = $update_list[$status][$index];
-			}
-		}
-
-		if (empty($found_entry))
-		{
-			trigger_error(phpbb::$user->lang['FILE_DIFF_NOT_ALLOWED'], E_USER_ERROR);
-		}
-
-		// If the status is 'up_to_date' then we do not need to show a diff
-		if ($status == 'up_to_date')
-		{
-			trigger_error(phpbb::$user->lang['FILE_ALREADY_UP_TO_DATE'], E_USER_ERROR);
-		}
-
-		$original_file = ($found_entry['custom']) ? $found_entry['original'] : $file;
-
-		// Get the correct diff
-		switch ($status)
-		{
-			case 'conflict':
-				$option = request_var('op', 0);
-
-				switch ($option)
-				{
-					case MERGE_NO_MERGE_NEW:
-					case MERGE_NO_MERGE_MOD:
-
-						$diff = $this->return_diff(array(), ($option == MERGE_NO_MERGE_NEW) ? $this->new_location . $original_file : PHPBB_ROOT_PATH . $file);
-
-						phpbb::$template->assign_var('S_DIFF_NEW_FILE', true);
-						$diff_mode = 'inline';
-						$this->page_title = 'VIEWING_FILE_CONTENTS';
-
-					break;
-
-/*
-						$diff = $this->return_diff($this->old_location . $original_file, PHPBB_ROOT_PATH . $file, $this->new_location . $original_file);
-
-						$tmp = array(
-							'file1'		=> array(),
-							'file2'		=> ($option == MERGE_NEW_FILE) ? implode("\n", $diff->merged_new_output()) : implode("\n", $diff->merged_orig_output()),
-						);
-
-						$diff = new diff($tmp['file1'], $tmp['file2']);
-
-						unset($tmp);
-
-						phpbb::$template->assign_var('S_DIFF_NEW_FILE', true);
-						$diff_mode = 'inline';
-						$this->page_title = 'VIEWING_FILE_CONTENTS';
-
-					break;
-*/
-					// Merge differences and use new phpBB code for conflicted blocks
-					case MERGE_NEW_FILE:
-					case MERGE_MOD_FILE:
-
-						$diff = $this->return_diff($this->old_location . $original_file, PHPBB_ROOT_PATH . $file, $this->new_location . $original_file);
-
-						phpbb::$template->assign_vars(array(
-							'S_DIFF_CONFLICT_FILE'	=> true,
-							'NUM_CONFLICTS'			=> $diff->get_num_conflicts(),
-						));
-
-						$diff = $this->return_diff(PHPBB_ROOT_PATH . $file, ($option == MERGE_NEW_FILE) ? $diff->merged_new_output() : $diff->merged_orig_output());
-					break;
-
-					// Download conflict file
-					default:
-
-						$diff = $this->return_diff($this->old_location . $original_file, $phpbb_root_path . $file, $this->new_location . $original_file);
-
-						header('Pragma: no-cache');
-						header("Content-Type: application/octetstream; name=\"$file\"");
-						header("Content-disposition: attachment; filename=$file");
-
-						@set_time_limit(0);
-
-						echo implode("\n", $diff->get_conflicts_content());
-
-						flush();
-						exit;
-
-					break;
-				}
-
-			break;
-
-			case 'modified':
-				$option = request_var('op', 0);
-
-				switch ($option)
-				{
-					case MERGE_NO_MERGE_NEW:
-					case MERGE_NO_MERGE_MOD:
-
-						$diff = $this->return_diff(array(), ($option == MERGE_NO_MERGE_NEW) ? $this->new_location . $original_file : PHPBB_ROOT_PATH . $file);
-
-						phpbb::$template->assign_var('S_DIFF_NEW_FILE', true);
-						$diff_mode = 'inline';
-						$this->page_title = 'VIEWING_FILE_CONTENTS';
-
-					break;
-
-					default:
-						$diff = $this->return_diff($this->old_location . $original_file, PHPBB_ROOT_PATH . $original_file, $this->new_location . $file);
-					break;
-				}
-			break;
-
-			case 'not_modified':
-			case 'new_conflict':
-				$diff = $this->return_diff(PHPBB_ROOT_PATH . $file, $this->new_location . $original_file);
-			break;
-
-			case 'new':
-
-				$diff = $this->return_diff(array(), $this->new_location . $original_file);
-
-				phpbb::$template->assign_var('S_DIFF_NEW_FILE', true);
-				$diff_mode = 'inline';
-				$this->page_title = 'VIEWING_FILE_CONTENTS';
-
-			break;
-		}
-
-		$diff_mode_options = '';
-		foreach (array('side_by_side', 'inline', 'unified', 'raw') as $option)
-		{
-			$diff_mode_options .= '<option value="' . $option . '"' . (($diff_mode == $option) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang['DIFF_' . strtoupper($option)] . '</option>';
-		}
-
-		// Now the correct renderer
-		$render_class = 'diff_renderer_' . $diff_mode;
-
-		if (!class_exists($render_class))
-		{
-			trigger_error('Chosen diff mode is not supported', E_USER_ERROR);
-		}
-
-		$renderer = new $render_class();
-
-		phpbb::$template->assign_vars(array(
-			'DIFF_CONTENT'			=> $renderer->get_diff_content($diff),
-			'DIFF_MODE'				=> $diff_mode,
-			'S_DIFF_MODE_OPTIONS'	=> $diff_mode_options,
-			'S_SHOW_DIFF'			=> true,
-		));
-
-		unset($diff, $renderer);
-	}
-
-	/**
-	* Collect all file status infos we need for the update by diffing all files
-	*/
-	function get_update_structure(&$update_list)
-	{
-		if ($update_list === false)
-		{
-			$update_list = array(
-				'up_to_date'	=> array(),
-				'new'			=> array(),
-				'not_modified'	=> array(),
-				'modified'		=> array(),
-				'new_conflict'	=> array(),
-				'conflict'		=> array(),
-				'no_update'		=> array(),
-				'status'		=> 0,
-			);
-		}
-
-		/* if (!empty($this->update_info['custom']))
-		{
-			foreach ($this->update_info['custom'] as $original_file => $file_ary)
-			{
-				foreach ($file_ary as $index => $file)
-				{
-					$this->make_update_diff($update_list, $original_file, $file, true);
-				}
-			}
-		} */
-
-		// Get a list of those files which are completely new by checking with file_exists...
-		$num_bytes_processed = 0;
-
-		foreach ($this->update_info['files'] as $index => $file)
-		{
-			if (is_int($update_list['status']) && $index < $update_list['status'])
-			{
-				continue;
-			}
-
-			if ($num_bytes_processed >= 500 * 1024)
-			{
-				return;
-			}
-
-			if (!file_exists(PHPBB_ROOT_PATH . $file))
-			{
-				// Make sure the update files are consistent by checking if the file is in new_files...
-				if (!file_exists($this->new_location . $file))
-				{
-					trigger_error(phpbb::$user->lang['INCOMPLETE_UPDATE_FILES'], E_USER_ERROR);
-				}
-
-				// If the file exists within the old directory the file got removed and we will write it back
-				// not a biggie, but we might want to state this circumstance separately later.
-				//	if (file_exists($this->old_location . $file))
-				//	{
-				//		$update_list['removed'][] = $file;
-				//	}
-
-				/* Only include a new file as new if the underlying path exist
-				// The path normally do not exist if the original style or language has been removed
-				if (file_exists(PHPBB_ROOT_PATH . dirname($file)))
-				{
-					$this->get_custom_info($update_list['new'], $file);
-					$update_list['new'][] = array('filename' => $file, 'custom' => false);
-				}
-				else
-				{
-					// Do not include style-related or language-related content
-					if (strpos($file, 'styles/') !== 0 && strpos($file, 'language/') !== 0)
-					{
-						$update_list['no_update'][] = $file;
-					}
-				}*/
-
-				if (file_exists(PHPBB_ROOT_PATH . dirname($file)) || (strpos($file, 'styles/') !== 0 && strpos($file, 'language/') !== 0))
-				{
-					$this->get_custom_info($update_list['new'], $file);
-					$update_list['new'][] = array('filename' => $file, 'custom' => false);
-				}
-
-				// unset($this->update_info['files'][$index]);
-			}
-			else
-			{
-				// not modified?
-				$this->make_update_diff($update_list, $file, $file);
-			}
-
-			$num_bytes_processed += (file_exists($this->new_location . $file)) ? filesize($this->new_location . $file) : 100 * 1024;
-			$update_list['status']++;
-		}
-
-		$update_list['status'] = -1;
-/*		if (!sizeof($this->update_info['files']))
-		{
-			return $update_list;
-		}
-
-		// Now diff the remaining files to get information about their status (not modified/modified/up-to-date)
-
-		// not modified?
-		foreach ($this->update_info['files'] as $index => $file)
-		{
-			$this->make_update_diff($update_list, $file, $file);
-		}
-
-		// Now to the styles...
-		if (empty($this->update_info['custom']))
-		{
-			return $update_list;
-		}
-
-		foreach ($this->update_info['custom'] as $original_file => $file_ary)
-		{
-			foreach ($file_ary as $index => $file)
-			{
-				$this->make_update_diff($update_list, $original_file, $file, true);
-			}
-		}
-
-		return $update_list;*/
-	}
-
-	/**
-	* Compare files for storage in update_list
-	*/
-	function make_update_diff(&$update_list, $original_file, $file, $custom = false)
-	{
-		$update_ary = array('filename' => $file, 'custom' => $custom);
-
-		if ($custom)
-		{
-			$update_ary['original'] = $original_file;
-		}
-
-		// On a successfull update the new location file exists but the old one does not exist.
-		// Check for this circumstance, the new file need to be up-to-date with the current file then...
-		if (!file_exists($this->old_location . $original_file) && file_exists($this->new_location . $original_file) && file_exists(PHPBB_ROOT_PATH . $file))
-		{
-			$tmp = array(
-				'file1'		=> file_get_contents($this->new_location . $original_file),
-				'file2'		=> file_get_contents(PHPBB_ROOT_PATH . $file),
-			);
-
-			// We need to diff the contents here to make sure the file is really the one we expect
-			$diff = new diff($tmp['file1'], $tmp['file2'], false);
-			$empty = $diff->is_empty();
-
-			unset($tmp, $diff);
-
-			// if there are no differences we have an up-to-date file...
-			if ($empty)
-			{
-				$update_list['up_to_date'][] = $update_ary;
-				return;
-			}
-
-			// If no other status matches we have another file in the way...
-			$update_list['new_conflict'][] = $update_ary;
-			return;
-		}
-
-		// Old file removed?
-		if (file_exists($this->old_location . $original_file) && !file_exists($this->new_location . $original_file))
-		{
-			return;
-		}
-
-		// Check for existance, else abort immediately
-		if (!file_exists($this->old_location . $original_file) || !file_exists($this->new_location . $original_file))
-		{
-			trigger_error(phpbb::$user->lang['INCOMPLETE_UPDATE_FILES'], E_USER_ERROR);
-		}
-
-		$tmp = array(
-			'file1'		=> file_get_contents($this->old_location . $original_file),
-			'file2'		=> file_get_contents(PHPBB_ROOT_PATH . $file),
-		);
-
-		// We need to diff the contents here to make sure the file is really the one we expect
-		$diff = new diff($tmp['file1'], $tmp['file2'], false);
-		$empty_1 = $diff->is_empty();
-
-		unset($tmp, $diff);
-
-		$tmp = array(
-			'file1'		=> file_get_contents($this->new_location . $original_file),
-			'file2'		=> file_get_contents(PHPBB_ROOT_PATH . $file),
-		);
-
-		// We need to diff the contents here to make sure the file is really the one we expect
-		$diff = new diff($tmp['file1'], $tmp['file2'], false);
-		$empty_2 = $diff->is_empty();
-
-		unset($tmp, $diff);
-
-		// If the file is not modified we are finished here...
-		if ($empty_1)
-		{
-			// Further check if it is already up to date - it could happen that non-modified files
-			// slip through
-			if ($empty_2)
-			{
-				$update_list['up_to_date'][] = $update_ary;
-				return;
-			}
-
-			$update_list['not_modified'][] = $update_ary;
-			return;
-		}
-
-		// If the file had been modified then we need to check if it is already up to date
-
-		// if there are no differences we have an up-to-date file...
-		if ($empty_2)
-		{
-			$update_list['up_to_date'][] = $update_ary;
-			return;
-		}
-
-		// if the file is modified we try to make sure a merge succeed
-		$tmp = array(
-			'file1'		=> file_get_contents($this->old_location . $original_file),
-			'file2'		=> file_get_contents(PHPBB_ROOT_PATH . $file),
-			'file3'		=> file_get_contents($this->new_location . $original_file),
-		);
-
-		$diff = new diff3($tmp['file1'], $tmp['file2'], $tmp['file3'], false);
-
-		unset($tmp);
-
-		if ($diff->get_num_conflicts())
-		{
-			$update_ary['conflicts'] = $diff->get_num_conflicts();
-
-			// There is one special case... users having merged with a conflicting file... we need to check this
-			$tmp = array(
-				'file1'		=> file_get_contents(PHPBB_ROOT_PATH . $file),
-				'file2'		=> implode("\n", $diff->merged_orig_output()),
-			);
-
-			$diff = new diff($tmp['file1'], $tmp['file2'], false);
-			$empty = $diff->is_empty();
-
-			if ($empty)
-			{
-				unset($update_ary['conflicts']);
-				unset($diff);
-				$update_list['up_to_date'][] = $update_ary;
-				return;
-			}
-
-			$update_list['conflict'][] = $update_ary;
-			unset($diff);
-
-			return;
-		}
-
-		$tmp = array(
-			'file1'		=> file_get_contents(PHPBB_ROOT_PATH . $file),
-			'file2'		=> implode("\n", $diff->merged_new_output()),
-		);
-
-		// now compare the merged output with the original file to see if the modified file is up to date
-		$diff = new diff($tmp['file1'], $tmp['file2'], false);
-		$empty = $diff->is_empty();
-
-		if ($empty)
-		{
-			unset($diff);
-
-			$update_list['up_to_date'][] = $update_ary;
-			return;
-		}
-
-		// If no other status matches we have a modified file...
-		$update_list['modified'][] = $update_ary;
-	}
-
-	/**
-	* Update update_list with custom new files
-	*/
-	function get_custom_info(&$update_list, $file)
-	{
-		if (empty($this->update_info['custom']))
-		{
-			return;
-		}
-
-		if (isset($this->update_info['custom'][$file]))
-		{
-			foreach ($this->update_info['custom'][$file] as $_file)
-			{
-				$update_list[] = array('filename' => $_file, 'custom' => true, 'original' => $file);
-			}
-		}
-	}
-
-	/**
-	* Get remote file
-	*/
-	function get_file($mode)
-	{
-		$errstr = '';
-		$errno = 0;
-
-		switch ($mode)
-		{
-			case 'version_info':
-				$info = get_remote_file('www.phpbb.com', '/updatecheck', ((defined('PHPBB_QA')) ? '30x_qa.txt' : '30x.txt'), $errstr, $errno);
-
-				if ($info !== false)
-				{
-					$info = explode("\n", $info);
-					$info = trim($info[0]);
-				}
-
-				if ($this->test_update !== false)
-				{
-					$info = $this->test_update;
-				}
-
-				// If info is false the fsockopen function may not be working. Instead get the latest version from our update file (and pray it is up-to-date)
-				if ($info === false)
-				{
-					$update_info = array();
-					include(PHPBB_ROOT_PATH . 'install/update/index.php');
-					$info = (empty($update_info) || !is_array($update_info)) ? false : $update_info;
-
-					if ($info !== false)
-					{
-						$info = (!empty($info['version']['to'])) ? trim($info['version']['to']) : false;
-					}
-				}
-			break;
-
-			case 'update_info':
-				$update_info = array();
-				include(PHPBB_ROOT_PATH . 'install/update/index.php');
-
-				$info = (empty($update_info) || !is_array($update_info)) ? false : $update_info;
-				$errstr = ($info === false) ? phpbb::$user->lang['WRONG_INFO_FILE_FORMAT'] : '';
-
-				if ($info !== false)
-				{
-					// Adjust the update info file to hold some specific style-related information
-					$info['custom'] = array();
-/*
-					// Get custom installed styles...
-					$sql = 'SELECT template_name, template_path
-						FROM ' . STYLES_TEMPLATE_TABLE . "
-						WHERE LOWER(template_name) NOT IN ('subsilver2', 'prosilver')";
-					$result = phpbb::$db->sql_query($sql);
-
-					$templates = array();
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$templates[] = $row;
-					}
-					phpbb::$db->sql_freeresult($result);
-
-					if (sizeof($templates))
-					{
-						foreach ($info['files'] as $filename)
-						{
-							// Template update?
-							if (strpos(strtolower($filename), 'styles/prosilver/template/') === 0)
-							{
-								foreach ($templates as $row)
-								{
-									$info['custom'][$filename][] = str_replace('/prosilver/', '/' . $row['template_path'] . '/', $filename);
-								}
-							}
-						}
-					}
-*/
-				}
-			break;
-
-			default:
-				trigger_error('Mode for getting remote file not specified', E_USER_ERROR);
-			break;
-		}
-
-		if ($info === false)
-		{
-			trigger_error($errstr, E_USER_ERROR);
-		}
-
-		return $info;
-	}
-
-	/**
-	* Function for including files...
-	*/
-	function include_file($filename)
-	{
-		if (!empty($this->update_info['files']) && in_array($filename, $this->update_info['files']))
-		{
-			include_once($this->new_location . $filename);
-		}
-		else
-		{
-			include_once(PHPBB_ROOT_PATH . $filename);
-		}
-	}
-
-	/**
-	* Wrapper for returning a diff object
-	*/
-	function &return_diff()
-	{
-		$args = func_get_args();
-		$three_way_diff = (func_num_args() > 2) ? true : false;
-
-		$file1 = array_shift($args);
-		$file2 = array_shift($args);
-
-		$tmp['file1'] = (!empty($file1) && is_string($file1)) ? file_get_contents($file1) : $file1;
-		$tmp['file2'] = (!empty($file2) && is_string($file2)) ? file_get_contents($file2) : $file2;
-
-		if ($three_way_diff)
-		{
-			$file3 = array_shift($args);
-			$tmp['file3'] = (!empty($file3) && is_string($file3)) ? file_get_contents($file3) : $file3;
-
-			$diff = new diff3($tmp['file1'], $tmp['file2'], $tmp['file3']);
-		}
-		else
-		{
-			$diff = new diff($tmp['file1'], $tmp['file2']);
-		}
-
-		unset($tmp);
-
-		return $diff;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/install/phpinfo.php b/phpBB/install/phpinfo.php
deleted file mode 100644
index 6480abf34a..0000000000
--- a/phpBB/install/phpinfo.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-phpinfo();
-
-?>
-\ No newline at end of file
diff --git a/phpBB/install/schemas/schema_data.php b/phpBB/install/schemas/schema_data.php
deleted file mode 100644
index 766a918340..0000000000
--- a/phpBB/install/schemas/schema_data.php
+++ /dev/null
@@ -1,877 +0,0 @@
-<?php
-
-$schema_data = $schema_updates = array();
-
-// We need some default increments first, so add them first
-
-// phpbb_styles_imageset
-$schema_data[] = array(
-	'table'		=> 'phpbb_styles_imageset',
-	'columns'	=> array('imageset_name', 'imageset_copyright', 'imageset_path'),
-	'data'		=> array(
-		array('prosilver', '&copy; phpBB Group', 'prosilver'),
-	),
-	'store_auto_increment'	=> 'IMAGESET_ID',
-);
-
-// phpbb_styles_template
-$schema_data[] = array(
-	'table'		=> 'phpbb_styles_template',
-	'columns'	=> array('template_name', 'template_copyright', 'template_path', 'bbcode_bitfield'),
-	'data'		=> array(
-		array('prosilver', '&copy; phpBB Group', 'prosilver', 'lNg='),
-	),
-	'store_auto_increment'	=> 'TEMPLATE_ID',
-);
-
-// phpbb_styles_theme
-$schema_data[] = array(
-	'table'		=> 'phpbb_styles_theme',
-	'columns'	=> array('theme_name', 'theme_copyright', 'theme_path', 'theme_storedb', 'theme_data'),
-	'data'		=> array(
-		array('prosilver', '&copy; phpBB Group', 'prosilver', 1, ''),
-	),
-	'store_auto_increment'	=> 'THEME_ID',
-);
-
-// phpbb_styles
-$schema_data[] = array(
-	'table'		=> 'phpbb_styles',
-	'columns'	=> array('style_name', 'style_copyright', 'style_active', 'template_id', 'theme_id', 'imageset_id'),
-	'data'		=> array(
-		array('prosilver', '&copy; phpBB Group', 1, array('auto_increment' => 'TEMPLATE_ID:0'), array('auto_increment' => 'THEME_ID:0'), array('auto_increment' => 'IMAGESET_ID:0')),
-	),
-	'store_auto_increment'	=> 'STYLE_ID',
-);
-
-// phpbb_config
-$schema_data[] = array(
-	'table'		=> 'phpbb_config',
-	'columns'	=> array('string:config_name', 'string:config_value'),
-	'data'		=> array(
-		array('active_sessions', '0'),
-		array('allow_attachments', '1'),
-		array('allow_autologin', '1'),
-		array('allow_avatar_local', '0'),
-		array('allow_avatar_remote', '0'),
-		array('allow_avatar_upload', '0'),
-		array('allow_bbcode', '1'),
-		array('allow_birthdays', '1'),
-		array('allow_bookmarks', '1'),
-		array('allow_emailreuse', '0'),
-		array('allow_forum_notify', '1'),
-		array('allow_mass_pm', '1'),
-		array('allow_name_chars', 'USERNAME_CHARS_ANY'),
-		array('allow_namechange', '0'),
-		array('allow_nocensors', '0'),
-		array('allow_pm_attach', '0'),
-		array('allow_post_flash', '1'),
-		array('allow_post_links', '1'),
-		array('allow_privmsg', '1'),
-		array('allow_sig', '1'),
-		array('allow_sig_bbcode', '1'),
-		array('allow_sig_flash', '0'),
-		array('allow_sig_img', '1'),
-		array('allow_sig_links', '1'),
-		array('allow_sig_pm', '1'),
-		array('allow_sig_smilies', '1'),
-		array('allow_smilies', '1'),
-		array('allow_topic_notify', '1'),
-		array('attachment_quota', '52428800'),
-		array('auth_bbcode_pm', '1'),
-		array('auth_flash_pm', '0'),
-		array('auth_img_pm', '1'),
-		array('auth_method', 'db'),
-		array('auth_smilies_pm', '1'),
-		array('avatar_filesize', '6144'),
-		array('avatar_gallery_path', 'images/avatars/gallery'),
-		array('avatar_max_height', '90'),
-		array('avatar_max_width', '90'),
-		array('avatar_min_height', '20'),
-		array('avatar_min_width', '20'),
-		array('avatar_path', 'images/avatars/upload'),
-		array('avatar_salt', '{AVATAR_SALT}'),
-		array('board_contact', '{BOARD_CONTACT}'),
-		array('board_disable', '0'),
-		array('board_disable_msg', ''),
-		array('board_dst', '0'),
-		array('board_email', '{BOARD_EMAIL}'),
-		array('board_email_from', '0'),
-		array('board_email_sig', '{L_CONFIG_BOARD_EMAIL_SIG}'),
-		array('board_hide_emails', '1'),
-		array('board_startdate', '{BOARD_STARTDATE}'),
-		array('board_timezone', '0'),
-		array('browser_check', '1'),
-		array('bump_interval', '10'),
-		array('bump_type', 'd'),
-		array('cache_gc', '7200'),
-		array('captcha_plugin', '{CAPTCHA_PLUGIN}'),
-		array('captcha_gd_foreground_noise', '0'),
-		array('captcha_gd_x_grid', '25'),
-		array('captcha_gd_y_grid', '25'),
-		array('captcha_gd_wave', '0'),
-		array('captcha_gd_3d_noise', '1'),
-		array('captcha_gd_fonts', '1'),
-		array('confirm_refresh', '1'),
-		array('check_attachment_content', '1'),
-		array('check_dnsbl', '0'),
-		array('chg_passforce', '0'),
-		array('cookie_domain', '{COOKIE_DOMAIN}'),
-		array('cookie_name', '{COOKIE_NAME}'),
-		array('cookie_path', '/'),
-		array('cookie_secure', '{COOKIE_SECURE}'),
-		array('coppa_enable', '0'),
-		array('coppa_fax', ''),
-		array('coppa_mail', ''),
-		array('database_gc', '604800'),
-		array('dbms_version', '{DBMS_VERSION}'),
-		array('default_dateformat', '{DEFAULT_DATEFORMAT}'),
-		array('default_lang', '{DEFAULT_LANG}'),
-		array('default_style', array('auto_increment' => 'STYLE_ID:0')),
-		array('display_last_edited', '1'),
-		array('display_order', '0'),
-		array('edit_time', '0'),
-		array('email_check_mx', '0'),
-		array('email_enable', '{EMAIL_ENABLE}'),
-		array('email_function_name', 'mail'),
-		array('email_package_size', '50'),
-		array('enable_confirm', '1'),
-		array('enable_pm_icons', '1'),
-		array('enable_post_confirm', '1'),
-		array('enable_queue_trigger', '0'),
-		array('flood_interval', '15'),
-		array('force_server_vars', '{FORCE_SERVER_VARS}'),
-		array('form_token_lifetime', '7200'),
-		array('form_token_mintime', '0'),
-		array('form_token_sid_guests', '1'),
-		array('forward_pm', '1'),
-		array('forwarded_for_check', '0'),
-		array('full_folder_action', '2'),
-		array('fulltext_mysql_max_word_len', '254'),
-		array('fulltext_mysql_min_word_len', '4'),
-		array('fulltext_native_common_thres', '5'),
-		array('fulltext_native_load_upd', '1'),
-		array('fulltext_native_max_chars', '14'),
-		array('fulltext_native_min_chars', '3'),
-		array('gzip_compress', '0'),
-		array('hot_threshold', '25'),
-		array('icons_path', 'images/icons'),
-		array('img_create_thumbnail', '0'),
-		array('img_display_inlined', '1'),
-		array('img_imagick', '{IMG_IMAGICK}'),
-		array('img_link_height', '0'),
-		array('img_link_width', '0'),
-		array('img_max_height', '0'),
-		array('img_max_thumb_width', '400'),
-		array('img_max_width', '0'),
-		array('img_min_thumb_filesize', '12000'),
-		array('ip_check', '3'),
-		array('jab_enable', '0'),
-		array('jab_host', ''),
-		array('jab_password', ''),
-		array('jab_package_size', '20'),
-		array('jab_port', '5222'),
-		array('jab_use_ssl', '0'),
-		array('jab_username', ''),
-		array('ldap_base_dn', ''),
-		array('ldap_email', ''),
-		array('ldap_password', ''),
-		array('ldap_port', ''),
-		array('ldap_server', ''),
-		array('ldap_uid', ''),
-		array('ldap_user', ''),
-		array('ldap_user_filter', ''),
-		array('limit_load', '0'),
-		array('limit_search_load', '0'),
-		array('load_anon_lastread', '0'),
-		array('load_birthdays', '1'),
-		array('load_cpf_memberlist', '0'),
-		array('load_cpf_viewprofile', '1'),
-		array('load_cpf_viewtopic', '0'),
-		array('load_db_lastread', '1'),
-		array('load_db_track', '1'),
-		array('load_jumpbox', '1'),
-		array('load_moderators', '1'),
-		array('load_online', '1'),
-		array('load_online_guests', '1'),
-		array('load_online_time', '5'),
-		array('load_online_track', '1'),
-		array('load_search', '1'),
-		array('load_tplcompile', '0'),
-		array('load_user_activity', '1'),
-		array('max_attachments', '3'),
-		array('max_attachments_pm', '1'),
-		array('max_autologin_time', '0'),
-		array('max_filesize', '262144'),
-		array('max_filesize_pm', '262144'),
-		array('max_login_attempts', '3'),
-		array('max_name_chars', '20'),
-		array('max_num_search_keywords', '10'),
-		array('max_pass_chars', '30'),
-		array('max_poll_options', '10'),
-		array('max_poll_chars', '60000'),
-		array('max_post_font_size', '200'),
-		array('max_post_img_height', '0'),
-		array('max_post_img_width', '0'),
-		array('max_post_smilies', '0'),
-		array('max_post_urls', '0'),
-		array('max_quote_depth', '3'),
-		array('max_reg_attempts', '5'),
-		array('max_sig_chars', '255'),
-		array('max_sig_font_size', '200'),
-		array('max_sig_img_height', '0'),
-		array('max_sig_img_width', '0'),
-		array('max_sig_smilies', '0'),
-		array('max_sig_urls', '5'),
-		array('min_name_chars', '3'),
-		array('min_pass_chars', '6'),
-		array('min_search_author_chars', '3'),
-		array('mime_triggers', 'body|head|html|img|plaintext|a href|pre|script|table|title'),
-		array('override_user_style', '0'),
-		array('pass_complex', 'PASS_TYPE_ANY'),
-		array('pm_edit_time', '0'),
-		array('pm_max_boxes', '4'),
-		array('pm_max_msgs', '50'),
-		array('pm_max_recipients', '0'),
-		array('posts_per_page', '10'),
-		array('print_pm', '1'),
-		array('queue_interval', '600'),
-		array('queue_trigger_posts', '3'),
-		array('ranks_path', 'images/ranks'),
-		array('require_activation', '0'),
-		array('referer_validation', '{REFERER_VALIDATION}'),
-		array('script_path', '{SCRIPT_PATH}'),
-		array('search_block_size', '250'),
-		array('search_gc', '7200'),
-		array('search_indexing_state', ''),
-		array('search_interval', '0'),
-		array('search_anonymous_interval', '0'),
-		array('search_type', 'fulltext_native'),
-		array('search_store_results', '1800'),
-		array('secure_allow_deny', '1'),
-		array('secure_allow_empty_referer', '1'),
-		array('secure_downloads', '0'),
-		array('server_name', '{SERVER_NAME}'),
-		array('server_port', '{SERVER_PORT}'),
-		array('server_protocol', '{SERVER_PROTOCOL}'),
-		array('session_gc', '3600'),
-		array('session_length', '3600'),
-		array('site_desc', '{L_CONFIG_SITE_DESC}'),
-		array('sitename', '{L_CONFIG_SITENAME}'),
-		array('smilies_path', 'images/smilies'),
-		array('smtp_auth_method', '{SMTP_AUTH_METHOD}'),
-		array('smtp_delivery', '{SMTP_DELIVERY}'),
-		array('smtp_host', '{SMTP_HOST}'),
-		array('smtp_password', '{SMTP_PASSWORD}'),
-		array('smtp_port', '25'),
-		array('smtp_username', '{SMTP_USERNAME}'),
-		array('topics_per_page', '25'),
-		array('tpl_allow_php', '0'),
-		array('upload_icons_path', 'images/upload_icons'),
-		array('upload_path', 'files'),
-		array('version', '3.1.0-dev1'),
-		array('warnings_expire_days', '90'),
-		array('warnings_gc', '14400'),
-	),
-);
-
-// Ranks
-$schema_data[] = array(
-	'table'		=> 'phpbb_ranks',
-	'columns'	=> array('rank_title', 'rank_min', 'rank_special', 'rank_image'),
-	'data'		=> array(
-		array('{L_RANKS_SITE_ADMIN_TITLE}', 0, 1, ''),
-	),
-	'store_auto_increment'	=> 'RANK_ID',
-);
-
-// Groups
-$schema_data[] = array(
-	'table'		=> 'phpbb_groups',
-	'columns'	=> array('group_name', 'group_name_clean', 'group_type', 'group_founder_manage', 'group_colour', 'group_legend', 'group_avatar', 'group_desc', 'group_desc_uid', 'group_max_recipients'),
-	'data'		=> array(
-		array('GUESTS', 'guests', 3, 0, '', 0, '', '', '', 0),
-		array('REGISTERED', 'registered', 3, 0, '', 0, '', '', '', 5),
-		array('REGISTERED_COPPA', 'registered_coppa', 3, 0, '', 0, '', '', '', 5),
-		array('GLOBAL_MODERATORS', 'global_moderators', 3, 0, '00AA00', 1, '', '', '', 50),
-		array('ADMINISTRATORS', 'administrators', 3, 1, 'AA0000', 1, '', '', '', 50),
-		array('BOTS', 'bots', 3, 0, '9E8DA7', 0, '', '', '', 5),
-	),
-	'store_auto_increment'	=> 'GROUP_ID',
-);
-
-// Users
-$schema_data[] = array(
-	'table'		=> 'phpbb_users',
-	'columns'	=> array('user_type', 'group_id', 'username', 'username_clean', 'user_regdate', 'user_password', 'user_email', 'user_lang', 'user_style', 'user_rank', 'user_colour', 'user_posts', 'user_permissions', 'user_ip', 'user_birthday', 'user_lastpage', 'user_last_confirm_key', 'user_post_sortby_type', 'user_post_sortby_dir', 'user_topic_sortby_type', 'user_topic_sortby_dir', 'user_avatar', 'user_sig', 'user_sig_bbcode_uid', 'user_from', 'user_icq', 'user_aim', 'user_yim', 'user_msnm', 'user_jabber', 'user_website', 'user_occ', 'user_interests', 'user_actkey', 'user_newpasswd', 'user_allow_massemail', 'user_email_hash', 'user_dateformat'),
-	'data'		=> array(
-		// Anonymous
-		array(2, array('auto_increment' => 'GROUP_ID:0'), 'Anonymous', 'anonymous', '{CURRENT_TIME}', '', '', '{DEFAULT_LANG}', array('auto_increment' => 'STYLE_ID:0'), 0, '', 0, '', '{USER_IP}', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 0, 0, '{DEFAULT_DATEFORMAT}'),
-		// Admin
-		array(3, array('auto_increment' => 'GROUP_ID:4'), '{ADMIN_NAME}', '{ADMIN_NAME_CLEAN}', '{CURRENT_TIME}', '{ADMIN_PASSWORD}', '{ADMIN_EMAIL}', '{DEFAULT_LANG}', array('auto_increment' => 'STYLE_ID:0'), array('auto_increment' => 'RANK_ID:0'), 'AA0000', 1, '', '{USER_IP}', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 1, '{ADMIN_EMAIL_HASH}', '{DEFAULT_DATEFORMAT}'),
-	),
-	'store_auto_increment'	=> 'USER_ID',
-);
-
-// Dynamic config values
-$schema_data[] = array(
-	'table'		=> 'phpbb_config',
-	'columns'	=> array('string:config_name', 'string:config_value', 'is_dynamic'),
-	'data'		=> array(
-		array('cache_last_gc', '0', 1),
-		array('cron_lock', '0', 1),
-		array('database_last_gc', '0', 1),
-		array('last_queue_run', '0', 1),
-		array('newest_user_colour', 'AA0000', 1),
-		array('newest_user_id', array('auto_increment' => 'USER_ID:1'), 1),
-		array('newest_username', '{NEWEST_USERNAME}', 1),
-		array('num_files', '0', 1),
-		array('num_posts', '1', 1),
-		array('num_topics', '1', 1),
-		array('num_users', '1', 1),
-		array('rand_seed', '0', 1),
-		array('rand_seed_last_update', '0', 1),
-		array('record_online_date', '0', 1),
-		array('record_online_users', '0', 1),
-		array('search_last_gc', '0', 1),
-		array('session_last_gc', '0', 1),
-		array('upload_dir_size', '0', 1),
-		array('warnings_last_gc', '0', 1),
-	),
-);
-
-// Forums
-$schema_data[] = array(
-	'table'		=> 'phpbb_forums',
-	'columns'	=> array('forum_name', 'forum_desc', 'left_id', 'right_id', 'parent_id', 'forum_type', 'forum_posts', 'forum_topics', 'forum_topics_real', 'forum_last_post_id', 'forum_last_poster_id', 'forum_last_poster_name', 'forum_last_poster_colour', 'forum_last_post_subject', 'forum_last_post_time', 'forum_link', 'forum_password', 'forum_image', 'forum_rules', 'forum_rules_link', 'forum_rules_uid', 'forum_desc_uid', 'prune_days', 'prune_viewed', 'forum_parents'),
-	'data'		=> array(
-		array('{L_FORUMS_FIRST_CATEGORY}', '', 1, 4, 0, 0, 1, 1, 1, 0, array('auto_increment' => 'USER_ID:1'), '{ADMIN_NAME}', 'AA0000', '{L_TOPICS_TOPIC_TITLE}', '{CURRENT_TIME}', '', '', '', '', '', '', '', 0, 0, ''),
-		array('{L_FORUMS_TEST_FORUM_TITLE}', '{L_FORUMS_TEST_FORUM_DESC}', 2, 3, array('auto_increment' => 'FORUM_ID:0'), 1, 1, 1, 1, 0, array('auto_increment' => 'USER_ID:1'), '{ADMIN_NAME}', 'AA0000', '{L_TOPICS_TOPIC_TITLE}', '{CURRENT_TIME}', '', '', '', '', '', '', '', 0, 0, ''),
-	),
-	'store_auto_increment' => 'FORUM_ID',
-);
-
-// Demo Topic
-$schema_data[] = array(
-	'table'		=> 'phpbb_topics',
-	'columns'	=> array('topic_title', 'topic_poster', 'topic_time', 'topic_views', 'topic_replies', 'topic_replies_real', 'forum_id', 'topic_status', 'topic_type', 'topic_first_post_id', 'topic_first_poster_name', 'topic_first_poster_colour', 'topic_last_post_id', 'topic_last_poster_id', 'topic_last_poster_name', 'topic_last_poster_colour', 'topic_last_post_subject', 'topic_last_post_time', 'topic_last_view_time', 'poll_title'),
-	'data'		=> array(
-		array('{L_TOPICS_TOPIC_TITLE}', array('auto_increment' => 'USER_ID:1'), '{CURRENT_TIME}', 0, 0, 0, array('auto_increment' => 'FORUM_ID:1'), 0, 0, 0, '{ADMIN_NAME}', 'AA0000', 0, array('auto_increment' => 'USER_ID:1'), '{ADMIN_NAME}', 'AA0000', '{L_TOPICS_TOPIC_TITLE}', '{CURRENT_TIME}', 0, ''),
-	),
-	'store_auto_increment' => 'TOPIC_ID',
-);
-
-// Demo Post
-$schema_data[] = array(
-	'table'		=> 'phpbb_posts',
-	'columns'	=> array('topic_id', 'forum_id', 'poster_id', 'icon_id', 'post_time', 'post_username', 'poster_ip', 'post_subject', 'post_text', 'post_checksum', 'bbcode_uid'),
-	'data'		=> array(
-		array(array('auto_increment' => 'TOPIC_ID:0'), array('auto_increment' => 'FORUM_ID:1'), array('auto_increment' => 'USER_ID:1'), 0, '{CURRENT_TIME}', '', '{USER_IP}', '{L_TOPICS_TOPIC_TITLE}', '{L_DEFAULT_INSTALL_POST}', '', ''),
-	),
-	'store_auto_increment' => 'POST_ID',
-);
-
-// Admin posted to the demo topic
-$schema_data[] = array(
-	'table'		=> 'phpbb_topics_posted',
-	'columns'	=> array('user_id', 'topic_id', 'topic_posted'),
-	'data'		=> array(
-		array(array('auto_increment' => 'USER_ID:1'), array('auto_increment' => 'TOPIC_ID:0'), 1),
-	),
-);
-
-// Update forums table
-$schema_updates[] = array(
-	'table'		=> 'phpbb_forums',
-	'columns'	=> array('forum_last_post_id'),
-	'data'		=> array(array('auto_increment' => 'POST_ID:0')),
-);
-
-// Update topics table
-$schema_updates[] = array(
-	'table'		=> 'phpbb_topics',
-	'columns'	=> array('topic_first_post_id', 'topic_last_post_id'),
-	'data'		=> array(array('auto_increment' => 'POST_ID:0'), array('auto_increment' => 'POST_ID:0')),
-	'where'		=> array(
-		array('topic_id' => array('auto_increment' => 'TOPIC_ID:0')),
-	),
-);
-
-// User -> Group
-$schema_data[] = array(
-	'table'		=> 'phpbb_user_group',
-	'columns'	=> array('group_id', 'user_id', 'user_pending', 'group_leader'),
-	'data'		=> array(
-		array(array('auto_increment' => 'GROUP_ID:0'), array('auto_increment' => 'USER_ID:0'), 0, 0),
-		array(array('auto_increment' => 'GROUP_ID:1'), array('auto_increment' => 'USER_ID:1'), 0, 0),
-		array(array('auto_increment' => 'GROUP_ID:3'), array('auto_increment' => 'USER_ID:1'), 0, 0),
-		array(array('auto_increment' => 'GROUP_ID:4'), array('auto_increment' => 'USER_ID:1'), 0, 1),
-	),
-);
-
-// Forum related auth options
-$schema_data[] = array(
-	'table'		=> 'phpbb_acl_options',
-	'columns'	=> array('auth_option', 'is_local', 'is_global'),
-	'data'		=> array(
-		array('f_', 1, 0),
-		array('f_announce', 1, 0),
-		array('f_attach', 1, 0),
-		array('f_bbcode', 1, 0),
-		array('f_bump', 1, 0),
-		array('f_delete', 1, 0),
-		array('f_download', 1, 0),
-		array('f_edit', 1, 0),
-		array('f_email', 1, 0),
-		array('f_flash', 1, 0),
-		array('f_icons', 1, 0),
-		array('f_ignoreflood', 1, 0),
-		array('f_img', 1, 0),
-		array('f_list', 1, 0),
-		array('f_noapprove', 1, 0),
-		array('f_poll', 1, 0),
-		array('f_post', 1, 0),
-		array('f_postcount', 1, 0),
-		array('f_print', 1, 0),
-		array('f_read', 1, 0),
-		array('f_reply', 1, 0),
-		array('f_report', 1, 0),
-		array('f_search', 1, 0),
-		array('f_sigs', 1, 0),
-		array('f_smilies', 1, 0),
-		array('f_sticky', 1, 0),
-		array('f_subscribe', 1, 0),
-		array('f_user_lock', 1, 0),
-		array('f_vote', 1, 0),
-		array('f_votechg', 1, 0),
-
-		// Moderator related auth options
-		array('m_', 1, 1),
-		array('m_approve', 1, 1),
-		array('m_chgposter', 1, 1),
-		array('m_delete', 1, 1),
-		array('m_edit', 1, 1),
-		array('m_info', 1, 1),
-		array('m_lock', 1, 1),
-		array('m_merge', 1, 1),
-		array('m_move', 1, 1),
-		array('m_report', 1, 1),
-		array('m_split', 1, 1),
-
-		// Global moderator auth option (not a local option)
-		array('m_ban', 0, 1),
-		array('m_warn', 0, 1),
-
-		// Admin related auth options
-		array('a_', 0, 1),
-		array('a_aauth', 0, 1),
-		array('a_attach', 0, 1),
-		array('a_authgroups', 0, 1),
-		array('a_authusers', 0, 1),
-		array('a_backup', 0, 1),
-		array('a_ban', 0, 1),
-		array('a_bbcode', 0, 1),
-		array('a_board', 0, 1),
-		array('a_bots', 0, 1),
-		array('a_clearlogs', 0, 1),
-		array('a_email', 0, 1),
-		array('a_fauth', 0, 1),
-		array('a_forum', 0, 1),
-		array('a_forumadd', 0, 1),
-		array('a_forumdel', 0, 1),
-		array('a_group', 0, 1),
-		array('a_groupadd', 0, 1),
-		array('a_groupdel', 0, 1),
-		array('a_icons', 0, 1),
-		array('a_jabber', 0, 1),
-		array('a_language', 0, 1),
-		array('a_mauth', 0, 1),
-		array('a_modules', 0, 1),
-		array('a_names', 0, 1),
-		array('a_phpinfo', 0, 1),
-		array('a_profile', 0, 1),
-		array('a_prune', 0, 1),
-		array('a_ranks', 0, 1),
-		array('a_reasons', 0, 1),
-		array('a_roles', 0, 1),
-		array('a_search', 0, 1),
-		array('a_server', 0, 1),
-		array('a_styles', 0, 1),
-		array('a_switchperm', 0, 1),
-		array('a_uauth', 0, 1),
-		array('a_user', 0, 1),
-		array('a_userdel', 0, 1),
-		array('a_viewauth', 0, 1),
-		array('a_viewlogs', 0, 1),
-		array('a_words', 0, 1),
-
-		// User related auth options
-		array('u_', 0, 1),
-		array('u_attach', 0, 1),
-		array('u_chgavatar', 0, 1),
-		array('u_chgcensors', 0, 1),
-		array('u_chgemail', 0, 1),
-		array('u_chggrp', 0, 1),
-		array('u_chgname', 0, 1),
-		array('u_chgpasswd', 0, 1),
-		array('u_download', 0, 1),
-		array('u_hideonline', 0, 1),
-		array('u_ignoreflood', 0, 1),
-		array('u_masspm', 0, 1),
-		array('u_masspm_group', 0, 1),
-		array('u_pm_attach', 0, 1),
-		array('u_pm_bbcode', 0, 1),
-		array('u_pm_delete', 0, 1),
-		array('u_pm_download', 0, 1),
-		array('u_pm_edit', 0, 1),
-		array('u_pm_emailpm', 0, 1),
-		array('u_pm_flash', 0, 1),
-		array('u_pm_forward', 0, 1),
-		array('u_pm_img', 0, 1),
-		array('u_pm_printpm', 0, 1),
-		array('u_pm_smilies', 0, 1),
-		array('u_readpm', 0, 1),
-		array('u_savedrafts', 0, 1),
-		array('u_search', 0, 1),
-		array('u_sendemail', 0, 1),
-		array('u_sendim', 0, 1),
-		array('u_sendpm', 0, 1),
-		array('u_sig', 0, 1),
-		array('u_viewonline', 0, 1),
-		array('u_viewprofile', 0, 1),
-	),
-	'store_auto_increment'	=> 'AUTH_OPTION_ID',
-);
-
-// standard auth roles
-$schema_data[] = array(
-	'table'		=> 'phpbb_acl_roles',
-	'columns'	=> array('role_name', 'role_description', 'role_type', 'role_order'),
-	'data'		=> array(
-		array('ROLE_ADMIN_STANDARD', 'ROLE_DESCRIPTION_ADMIN_STANDARD', 'a_', 1),
-		array('ROLE_ADMIN_FORUM', 'ROLE_DESCRIPTION_ADMIN_FORUM', 'a_', 3),
-		array('ROLE_ADMIN_USERGROUP', 'ROLE_DESCRIPTION_ADMIN_USERGROUP', 'a_', 4),
-		array('ROLE_ADMIN_FULL', 'ROLE_DESCRIPTION_ADMIN_FULL', 'a_', 2),
-		array('ROLE_USER_FULL', 'ROLE_DESCRIPTION_USER_FULL', 'u_', 3),
-		array('ROLE_USER_STANDARD', 'ROLE_DESCRIPTION_USER_STANDARD', 'u_', 1),
-		array('ROLE_USER_LIMITED', 'ROLE_DESCRIPTION_USER_LIMITED', 'u_', 2),
-		array('ROLE_USER_NOPM', 'ROLE_DESCRIPTION_USER_NOPM', 'u_', 4),
-		array('ROLE_USER_NOAVATAR', 'ROLE_DESCRIPTION_USER_NOAVATAR', 'u_', 5),
-		array('ROLE_MOD_FULL', 'ROLE_DESCRIPTION_MOD_FULL', 'm_', 3),
-		array('ROLE_MOD_STANDARD', 'ROLE_DESCRIPTION_MOD_STANDARD', 'm_', 1),
-		array('ROLE_MOD_SIMPLE', 'ROLE_DESCRIPTION_MOD_SIMPLE', 'm_', 2),
-		array('ROLE_MOD_QUEUE', 'ROLE_DESCRIPTION_MOD_QUEUE', 'm_', 4),
-		array('ROLE_FORUM_FULL', 'ROLE_DESCRIPTION_FORUM_FULL', 'f_', 7),
-		array('ROLE_FORUM_STANDARD', 'ROLE_DESCRIPTION_FORUM_STANDARD', 'f_', 5),
-		array('ROLE_FORUM_NOACCESS', 'ROLE_DESCRIPTION_FORUM_NOACCESS', 'f_', 1),
-		array('ROLE_FORUM_READONLY', 'ROLE_DESCRIPTION_FORUM_READONLY', 'f_', 2),
-		array('ROLE_FORUM_LIMITED', 'ROLE_DESCRIPTION_FORUM_LIMITED', 'f_', 3),
-		array('ROLE_FORUM_BOT', 'ROLE_DESCRIPTION_FORUM_BOT', 'f_', 9),
-		array('ROLE_FORUM_ONQUEUE', 'ROLE_DESCRIPTION_FORUM_ONQUEUE', 'f_', 8),
-		array('ROLE_FORUM_POLLS', 'ROLE_DESCRIPTION_FORUM_POLLS', 'f_', 6),
-		array('ROLE_FORUM_LIMITED_POLLS', 'ROLE_DESCRIPTION_FORUM_LIMITED_POLLS', 'f_', 4),
-		array('ROLE_USER_GUESTS', 'ROLE_DESCRIPTION_USER_GUESTS', 'u_', 6),
-	),
-	'store_auto_increment'	=> 'ROLE_ID',
-);
-
-// Permissions
-
-$schema_data[] = array(
-	'table'		=> 'phpbb_acl_groups',
-	'columns'	=> array('group_id', 'forum_id', 'auth_option_id', 'auth_role_id', 'auth_setting'),
-	'data'		=> array(
-		// GUESTS - u_download and u_search ability
-		array(array('auto_increment' => 'GROUP_ID:0'), 0, 0, array('auto_increment' => 'ROLE_ID:22'), 0),
-		// ADMINISTRATOR Group - full user features
-		array(array('auto_increment' => 'GROUP_ID:4'), 0, 0, array('auto_increment' => 'ROLE_ID:4'), 0),
-		// ADMINISTRATOR Group - standard admin
-		array(array('auto_increment' => 'GROUP_ID:4'), 0, 0, array('auto_increment' => 'ROLE_ID:0'), 0),
-		// REGISTERED and REGISTERED_COPPA having standard user features
-		array(array('auto_increment' => 'GROUP_ID:1'), 0, 0, array('auto_increment' => 'ROLE_ID:5'), 0),
-		array(array('auto_increment' => 'GROUP_ID:2'), 0, 0, array('auto_increment' => 'ROLE_ID:5'), 0),
-		// GLOBAL_MODERATORS having full user features
-		array(array('auto_increment' => 'GROUP_ID:3'), 0, 0, array('auto_increment' => 'ROLE_ID:4'), 0),
-		// GLOBAL_MODERATORS having full global moderator access
-		array(array('auto_increment' => 'GROUP_ID:3'), 0, 0, array('auto_increment' => 'ROLE_ID:9'), 0),
-
-		// Giving all groups read only access to the first category
-		// since administrators and moderators are already within the registered users group we do not need to set them here
-		array(array('auto_increment' => 'GROUP_ID:0'), array('auto_increment' => 'FORUM_ID:0'), 0, array('auto_increment' => 'ROLE_ID:16'), 0),
-		array(array('auto_increment' => 'GROUP_ID:1'), array('auto_increment' => 'FORUM_ID:0'), 0, array('auto_increment' => 'ROLE_ID:16'), 0),
-		array(array('auto_increment' => 'GROUP_ID:2'), array('auto_increment' => 'FORUM_ID:0'), 0, array('auto_increment' => 'ROLE_ID:16'), 0),
-		array(array('auto_increment' => 'GROUP_ID:5'), array('auto_increment' => 'FORUM_ID:0'), 0, array('auto_increment' => 'ROLE_ID:16'), 0),
-
-		// Giving access to the first forum
-		// guests having read only access
-		array(array('auto_increment' => 'GROUP_ID:0'), array('auto_increment' => 'FORUM_ID:1'), 0, array('auto_increment' => 'ROLE_ID:16'), 0),
-		// registered and registered_coppa having standard access
-		array(array('auto_increment' => 'GROUP_ID:1'), array('auto_increment' => 'FORUM_ID:1'), 0, array('auto_increment' => 'ROLE_ID:14'), 0),
-		array(array('auto_increment' => 'GROUP_ID:2'), array('auto_increment' => 'FORUM_ID:1'), 0, array('auto_increment' => 'ROLE_ID:14'), 0),
-		// global moderators having standard access + polls
-		array(array('auto_increment' => 'GROUP_ID:3'), array('auto_increment' => 'FORUM_ID:1'), 0, array('auto_increment' => 'ROLE_ID:20'), 0),
-		// administrators having full forum and full moderator access
-		array(array('auto_increment' => 'GROUP_ID:4'), array('auto_increment' => 'FORUM_ID:1'), 0, array('auto_increment' => 'ROLE_ID:13'), 0),
-		array(array('auto_increment' => 'GROUP_ID:4'), array('auto_increment' => 'FORUM_ID:1'), 0, array('auto_increment' => 'ROLE_ID:9'), 0),
-		// Bots having bot access
-		array(array('auto_increment' => 'GROUP_ID:5'), array('auto_increment' => 'FORUM_ID:1'), 0, array('auto_increment' => 'ROLE_ID:18'), 0),
-	),
-);
-
-// phpbb_styles_imageset_data
-$schema_data[] = array(
-	'table'		=> 'phpbb_styles_imageset_data',
-	'columns'	=> array('image_name', 'image_filename', 'image_lang', 'image_height', 'image_width', 'imageset_id'),
-	'data'		=> array(
-		array('site_logo', 'site_logo.gif', '', 52, 139, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('forum_link', 'forum_link.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('forum_read', 'forum_read.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('forum_read_locked', 'forum_read_locked.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('forum_read_subforum', 'forum_read_subforum.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('forum_unread', 'forum_unread.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('forum_unread_locked', 'forum_unread_locked.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('forum_unread_subforum', 'forum_unread_subforum.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('topic_moved', 'topic_moved.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('topic_read', 'topic_read.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('topic_read_mine', 'topic_read_mine.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('topic_read_hot', 'topic_read_hot.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('topic_read_hot_mine', 'topic_read_hot_mine.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('topic_read_locked', 'topic_read_locked.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('topic_read_locked_mine', 'topic_read_locked_mine.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('topic_unread', 'topic_unread.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('topic_unread_mine', 'topic_unread_mine.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('topic_unread_hot', 'topic_unread_hot.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('topic_unread_hot_mine', 'topic_unread_hot_mine.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('topic_unread_locked', 'topic_unread_locked.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('topic_unread_locked_mine', 'topic_unread_locked_mine.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('sticky_read', 'sticky_read.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('sticky_read_mine', 'sticky_read_mine.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('sticky_read_locked', 'sticky_read_locked.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('sticky_read_locked_mine', 'sticky_read_locked_mine.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('sticky_unread', 'sticky_unread.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('sticky_unread_mine', 'sticky_unread_mine.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('sticky_unread_locked', 'sticky_unread_locked.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('sticky_unread_locked_mine', 'sticky_unread_locked_mine.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('announce_read', 'announce_read.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('announce_read_mine', 'announce_read_mine.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('announce_read_locked', 'announce_read_locked.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('announce_read_locked_mine', 'announce_read_locked_mine.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('announce_unread', 'announce_unread.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('announce_unread_mine', 'announce_unread_mine.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('announce_unread_locked', 'announce_unread_locked.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('announce_unread_locked_mine', 'announce_unread_locked_mine.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('global_read', 'announce_read.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('global_read_mine', 'announce_read_mine.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('global_read_locked', 'announce_read_locked.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('global_read_locked_mine', 'announce_read_locked_mine.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('global_unread', 'announce_unread.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('global_unread_mine', 'announce_unread_mine.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('global_unread_locked', 'announce_unread_locked.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('global_unread_locked_mine', 'announce_unread_locked_mine.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('pm_read', 'topic_read.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('pm_unread', 'topic_unread.gif', '', 27, 27, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('icon_back_top', 'icon_back_top.gif', '', 11, 11, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('icon_contact_aim', 'icon_contact_aim.gif', '', 20, 20, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('icon_contact_email', 'icon_contact_email.gif', '', 20, 20, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('icon_contact_icq', 'icon_contact_icq.gif', '', 20, 20, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('icon_contact_jabber', 'icon_contact_jabber.gif', '', 20, 20, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('icon_contact_msnm', 'icon_contact_msnm.gif', '', 20, 20, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('icon_contact_www', 'icon_contact_www.gif', '', 20, 20, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('icon_contact_yahoo', 'icon_contact_yahoo.gif', '', 20, 20, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('icon_post_delete', 'icon_post_delete.gif', '', 20, 20, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('icon_post_info', 'icon_post_info.gif', '', 20, 20, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('icon_post_report', 'icon_post_report.gif', '', 20, 20, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('icon_post_target', 'icon_post_target.gif', '', 9, 11, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('icon_post_target_unread', 'icon_post_target_unread.gif', '', 9, 11, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('icon_topic_attach', 'icon_topic_attach.gif', '', 10, 7, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('icon_topic_latest', 'icon_topic_latest.gif', '', 9, 11, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('icon_topic_newest', 'icon_topic_newest.gif', '', 9, 11, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('icon_topic_reported', 'icon_topic_reported.gif', '', 14, 16, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('icon_topic_unapproved', 'icon_topic_unapproved.gif', '', 14, 16, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('icon_user_warn', 'icon_user_warn.gif', '', 20, 20, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('subforum_read', 'subforum_read.gif', '', 9, 11, array('auto_increment' => 'IMAGESET_ID:0')),
-		array('subforum_unread', 'subforum_unread.gif', '', 9, 11, array('auto_increment' => 'IMAGESET_ID:0')),
-	),
-);
-
-// Smilies
-$schema_data[] = array(
-	'table'		=> 'phpbb_smilies',
-	'columns'	=> array('code', 'smiley_url', 'emotion', 'smiley_width', 'smiley_height', 'smiley_order'),
-	'data'		=> array(
-		array(':D', 'icon_e_biggrin.gif', '{L_SMILIES_VERY_HAPPY}', 15, 17, 1),
-		array(':-D', 'icon_e_biggrin.gif', '{L_SMILIES_VERY_HAPPY}', 15, 17, 2),
-		array(':grin:', 'icon_e_biggrin.gif', '{L_SMILIES_VERY_HAPPY}', 15, 17, 3),
-		array(':)', 'icon_e_smile.gif', '{L_SMILIES_SMILE}', 15, 17, 4),
-		array(':-)', 'icon_e_smile.gif', '{L_SMILIES_SMILE}', 15, 17, 5),
-		array(':smile:', 'icon_e_smile.gif', '{L_SMILIES_SMILE}', 15, 17, 6),
-		array(';)', 'icon_e_wink.gif', '{L_SMILIES_WINK}', 15, 17, 7),
-		array(';-)', 'icon_e_wink.gif', '{L_SMILIES_WINK}', 15, 17, 8),
-		array(':wink:', 'icon_e_wink.gif', '{L_SMILIES_WINK}', 15, 17, 9),
-		array(':(', 'icon_e_sad.gif', '{L_SMILIES_SAD}', 15, 17, 10),
-		array(':-(', 'icon_e_sad.gif', '{L_SMILIES_SAD}', 15, 17, 11),
-		array(':sad:', 'icon_e_sad.gif', '{L_SMILIES_SAD}', 15, 17, 12),
-		array(':o', 'icon_e_surprised.gif', '{L_SMILIES_SURPRISED}', 15, 17, 13),
-		array(':-o', 'icon_e_surprised.gif', '{L_SMILIES_SURPRISED}', 15, 17, 14),
-		array(':eek:', 'icon_e_surprised.gif', '{L_SMILIES_SURPRISED}', 15, 17, 15),
-		array(':shock:', 'icon_eek.gif', '{L_SMILIES_SHOCKED}', 15, 17, 16),
-		array(':?', 'icon_e_confused.gif', '{L_SMILIES_CONFUSED}', 15, 17, 17),
-		array(':-?', 'icon_e_confused.gif', '{L_SMILIES_CONFUSED}', 15, 17, 18),
-		array(':???:', 'icon_e_confused.gif', '{L_SMILIES_CONFUSED}', 15, 17, 19),
-		array('8-)', 'icon_cool.gif', '{L_SMILIES_COOL}', 15, 17, 20),
-		array(':cool:', 'icon_cool.gif', '{L_SMILIES_COOL}', 15, 17, 21),
-		array(':lol:', 'icon_lol.gif', '{L_SMILIES_LAUGHING}', 15, 17, 22),
-		array(':x', 'icon_mad.gif', '{L_SMILIES_MAD}', 15, 17, 23),
-		array(':-x', 'icon_mad.gif', '{L_SMILIES_MAD}', 15, 17, 24),
-		array(':mad:', 'icon_mad.gif', '{L_SMILIES_MAD}', 15, 17, 25),
-		array(':P', 'icon_razz.gif', '{L_SMILIES_RAZZ}', 15, 17, 26),
-		array(':-P', 'icon_razz.gif', '{L_SMILIES_RAZZ}', 15, 17, 27),
-		array(':razz:', 'icon_razz.gif', '{L_SMILIES_RAZZ}', 15, 17, 28),
-		array(':oops:', 'icon_redface.gif', '{L_SMILIES_EMARRASSED}', 15, 17, 29),
-		array(':cry:', 'icon_cry.gif', '{L_SMILIES_CRYING}', 15, 17, 30),
-		array(':evil:', 'icon_evil.gif', '{L_SMILIES_EVIL}', 15, 17, 31),
-		array(':twisted:', 'icon_twisted.gif', '{L_SMILIES_TWISTED_EVIL}', 15, 17, 32),
-		array(':roll:', 'icon_rolleyes.gif', '{L_SMILIES_ROLLING_EYES}', 15, 17, 33),
-		array(':!:', 'icon_exclaim.gif', '{L_SMILIES_EXCLAMATION}', 15, 17, 34),
-		array(':?:', 'icon_question.gif', '{L_SMILIES_QUESTION}', 15, 17, 35),
-		array(':idea:', 'icon_idea.gif', '{L_SMILIES_IDEA}', 15, 17, 36),
-		array(':arrow:', 'icon_arrow.gif', '{L_SMILIES_ARROW}', 15, 17, 37),
-		array(':|', 'icon_neutral.gif', '{L_SMILIES_NEUTRAL}', 15, 17, 38),
-		array(':-|', 'icon_neutral.gif', '{L_SMILIES_NEUTRAL}', 15, 17, 39),
-		array(':mrgreen:', 'icon_mrgreen.gif', '{L_SMILIES_MR_GREEN}', 15, 17, 40),
-		array(':geek:', 'icon_e_geek.gif', '{L_SMILIES_GEEK}', 17, 17, 41),
-		array(':ugeek:', 'icon_e_ugeek.gif', '{L_SMILIES_UBER_GEEK}', 17, 18, 42),
-	),
-);
-
-// icons
-$schema_data[] = array(
-	'table'		=> 'phpbb_icons',
-	'columns'	=> array('icons_url', 'icons_width', 'icons_height', 'icons_order', 'display_on_posting'),
-	'data'		=> array(
-		array('misc/fire.gif', 16, 16, 1, 1),
-		array('smile/redface.gif', 16, 16, 9, 1),
-		array('smile/mrgreen.gif', 16, 16, 10, 1),
-		array('misc/heart.gif', 16, 16, 4, 1),
-		array('misc/star.gif', 16, 16, 2, 1),
-		array('misc/radioactive.gif', 16, 16, 3, 1),
-		array('misc/thinking.gif', 16, 16, 5, 1),
-		array('smile/info.gif', 16, 16, 8, 1),
-		array('smile/question.gif', 16, 16, 6, 1),
-		array('smile/alert.gif', 16, 16, 7, 1),
-	),
-);
-
-// reasons
-$schema_data[] = array(
-	'table'		=> 'phpbb_reports_reasons',
-	'columns'	=> array('reason_title', 'reason_description', 'reason_order'),
-	'data'		=> array(
-		array('warez', '{L_REPORT_WAREZ}', 1),
-		array('spam', '{L_REPORT_SPAM}', 2),
-		array('off_topic', '{L_REPORT_OFF_TOPIC}', 3),
-		array('other', '{L_REPORT_OTHER}', 4),
-	),
-);
-
-// extension_groups
-$schema_data[] = array(
-	'table'		=> 'phpbb_extension_groups',
-	'columns'	=> array('group_name', 'cat_id', 'allow_group', 'download_mode', 'upload_icon', 'max_filesize', 'allowed_forums'),
-	'data'		=> array(
-		array('{L_EXT_GROUP_IMAGES}', 1, 1, 1, '', 0, ''),
-		array('{L_EXT_GROUP_ARCHIVES}', 0, 1, 1, '', 0, ''),
-		array('{L_EXT_GROUP_PLAIN_TEXT}', 0, 0, 1, '', 0, ''),
-		array('{L_EXT_GROUP_DOCUMENTS}', 0, 0, 1, '', 0, ''),
-		array('{L_EXT_GROUP_REAL_MEDIA}', 3, 0, 1, '', 0, ''),
-		array('{L_EXT_GROUP_WINDOWS_MEDIA}', 2, 0, 1, '', 0, ''),
-		array('{L_EXT_GROUP_FLASH_FILES}', 5, 0, 1, '', 0, ''),
-		array('{L_EXT_GROUP_QUICKTIME_MEDIA}', 6, 0, 1, '', 0, ''),
-		array('{L_EXT_GROUP_DOWNLOADABLE_FILES}', 0, 0, 1, '', 0, ''),
-	),
-	'store_auto_increment'	=> 'EXT_GROUP_ID',
-);
-
-// extensions
-$schema_data[] = array(
-	'table'		=> 'phpbb_extensions',
-	'columns'	=> array('group_id', 'extension'),
-	'data'		=> array(
-		array(array('auto_increment' => 'EXT_GROUP_ID:0'), 'gif'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:0'), 'png'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:0'), 'jpeg'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:0'), 'jpg'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:0'), 'tif'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:0'), 'tiff'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:0'), 'tga'),
-
-		array(array('auto_increment' => 'EXT_GROUP_ID:1'), 'gtar'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:1'), 'gz'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:1'), 'tar'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:1'), 'zip'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:1'), 'rar'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:1'), 'ace'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:1'), 'torrent'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:1'), 'tgz'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:1'), 'bz2'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:1'), '7z'),
-
-		array(array('auto_increment' => 'EXT_GROUP_ID:2'), 'txt'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:2'), 'c'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:2'), 'h'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:2'), 'cpp'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:2'), 'hpp'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:2'), 'diz'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:2'), 'csv'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:2'), 'ini'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:2'), 'log'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:2'), 'js'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:2'), 'xml'),
-
-		array(array('auto_increment' => 'EXT_GROUP_ID:3'), 'xls'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:3'), 'xlsx'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:3'), 'xlsm'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:3'), 'xlsb'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:3'), 'doc'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:3'), 'docx'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:3'), 'docm'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:3'), 'dot'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:3'), 'dotx'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:3'), 'dotm'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:3'), 'pdf'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:3'), 'ai'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:3'), 'ps'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:3'), 'ppt'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:3'), 'pptx'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:3'), 'pptm'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:3'), 'odg'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:3'), 'odp'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:3'), 'ods'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:3'), 'odt'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:3'), 'rtf'),
-
-		array(array('auto_increment' => 'EXT_GROUP_ID:4'), 'rm'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:4'), 'ram'),
-
-		array(array('auto_increment' => 'EXT_GROUP_ID:5'), 'wma'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:5'), 'wmv'),
-
-		array(array('auto_increment' => 'EXT_GROUP_ID:6'), 'swf'),
-
-		array(array('auto_increment' => 'EXT_GROUP_ID:7'), 'mov'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:7'), 'm4v'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:7'), 'm4a'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:7'), 'mp4'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:7'), '3gp'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:7'), '3g2'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:7'), 'qt'),
-
-		array(array('auto_increment' => 'EXT_GROUP_ID:8'), 'mpeg'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:8'), 'mpg'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:8'), 'mp3'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:8'), 'ogg'),
-		array(array('auto_increment' => 'EXT_GROUP_ID:8'), 'ogm'),
-	),
-);
-
-?>
-\ No newline at end of file
diff --git a/phpBB/install/schemas/schema_structure.php b/phpBB/install/schemas/schema_structure.php
deleted file mode 100644
index 641fafc4ac..0000000000
--- a/phpBB/install/schemas/schema_structure.php
+++ /dev/null
@@ -1,1081 +0,0 @@
-<?php
-
-$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),
-		'is_orphan'			=> array('BOOL', 1),
-		'physical_filename'	=> array('VCHAR', ''),
-		'real_filename'		=> array('VCHAR', ''),
-		'download_count'	=> array('UINT', 0),
-		'attach_comment'	=> array('TEXT_UNI', ''),
-		'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'),
-		'is_orphan'			=> array('INDEX', 'is_orphan'),
-	),
-);
-
-$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'),
-		'auth_role_id'	=> array('INDEX', 'auth_role_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('UNIQUE', 'auth_option'),
-	),
-);
-
-$schema_data['phpbb_acl_roles'] = array(
-	'COLUMNS'		=> array(
-		'role_id'			=> array('UINT', NULL, 'auto_increment'),
-		'role_name'			=> array('VCHAR_UNI', ''),
-		'role_description'	=> array('TEXT_UNI', ''),
-		'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'),
-	'KEYS'			=> array(
-		'ath_op_id'			=> array('INDEX', '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'),
-		'auth_role_id'		=> array('INDEX', 'auth_role_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_UNI:100', ''),
-		'ban_start'			=> array('TIMESTAMP', 0),
-		'ban_end'			=> array('TIMESTAMP', 0),
-		'ban_exclude'		=> array('BOOL', 0),
-		'ban_reason'		=> array('VCHAR_UNI', ''),
-		'ban_give_reason'	=> array('VCHAR_UNI', ''),
-	),
-	'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_UNI', ''),
-		'display_on_posting'	=> array('BOOL', 0),
-		'bbcode_match'			=> array('TEXT_UNI', ''),
-		'bbcode_tpl'			=> array('MTEXT_UNI', ''),
-		'first_pass_match'		=> array('MTEXT_UNI', ''),
-		'first_pass_replace'	=> array('MTEXT_UNI', ''),
-		'second_pass_match'		=> array('MTEXT_UNI', ''),
-		'second_pass_replace'	=> array('MTEXT_UNI', ''),
-	),
-	'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),
-	),
-	'PRIMARY_KEY'			=> 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_UNI', ''),
-		'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', ''),
-		'config_value'		=> array('VCHAR_UNI', ''),
-		'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', ''),
-		'seed'				=> array('UINT:10', 0),
-	),
-	'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_UNI:255', ''),
-	),
-	'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('STEXT_UNI', ''),
-		'draft_message'		=> array('MTEXT_UNI', ''),
-	),
-	'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_UNI', ''),
-		'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_UNI', ''),
-		'forum_desc'			=> array('TEXT_UNI', ''),
-		'forum_desc_bitfield'	=> array('VCHAR:255', ''),
-		'forum_desc_options'	=> array('UINT:11', 7),
-		'forum_desc_uid'		=> array('VCHAR:8', ''),
-		'forum_link'			=> array('VCHAR_UNI', ''),
-		'forum_password'		=> array('VCHAR_UNI:40', ''),
-		'forum_style'			=> array('UINT', 0),
-		'forum_image'			=> array('VCHAR', ''),
-		'forum_rules'			=> array('TEXT_UNI', ''),
-		'forum_rules_link'		=> array('VCHAR_UNI', ''),
-		'forum_rules_bitfield'	=> array('VCHAR:255', ''),
-		'forum_rules_options'	=> array('UINT:11', 7),
-		'forum_rules_uid'		=> array('VCHAR:8', ''),
-		'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_subject' => array('STEXT_UNI', ''),
-		'forum_last_post_time'	=> array('TIMESTAMP', 0),
-		'forum_last_poster_name'=> array('VCHAR_UNI', ''),
-		'forum_last_poster_colour'=> array('VCHAR:6', ''),
-		'forum_flags'			=> array('TINT:4', 32),
-		'display_subforum_list'	=> array('BOOL', 1),
-		'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('UINT', 0),
-		'prune_viewed'			=> array('UINT', 0),
-		'prune_freq'			=> array('UINT', 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_founder_manage'	=> array('BOOL', 0),
-		'group_name'			=> array('VCHAR_UNI', ''),
-		'group_name_clean'		=> array('VCHAR_UNI', ''),
-		'group_desc'			=> array('TEXT_UNI', ''),
-		'group_desc_bitfield'	=> array('VCHAR:255', ''),
-		'group_desc_options'	=> array('UINT:11', 7),
-		'group_desc_uid'		=> array('VCHAR:8', ''),
-		'group_display'			=> array('BOOL', 0),
-		'group_avatar'			=> array('VCHAR', ''),
-		'group_avatar_type'		=> array('TINT:2', 0),
-		'group_avatar_width'	=> array('USINT', 0),
-		'group_avatar_height'	=> array('USINT', 0),
-		'group_rank'			=> array('UINT', 0),
-		'group_colour'			=> array('VCHAR:6', ''),
-		'group_sig_chars'		=> array('UINT', 0),
-		'group_receive_pm'		=> array('BOOL', 0),
-		'group_message_limit'	=> array('UINT', 0),
-		'group_max_recipients'	=> array('UINT', 0),
-		'group_legend'			=> array('BOOL', 1),
-	),
-	'PRIMARY_KEY'	=> 'group_id',
-	'KEYS'			=> array(
-		'group_legend_name'		=> array('INDEX', array('group_legend', 'group_name')),
-	),
-);
-
-$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_UNI:100', ''),
-		'lang_local_name'		=> array('VCHAR_UNI:255', ''),
-		'lang_author'			=> array('VCHAR_UNI: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_UNI', ''),
-		'log_data'				=> array('MTEXT_UNI', ''),
-	),
-	'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_UNI:255', ''),
-		'group_id'				=> array('UINT', 0),
-		'group_name'			=> array('VCHAR_UNI', ''),
-		'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_UNI', ''),
-		'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_UNI:255', ''),
-		'post_subject'			=> array('STEXT_UNI', '', 'true_sort'),
-		'post_text'				=> array('MTEXT_UNI', ''),
-		'post_checksum'			=> array('VCHAR:32', ''),
-		'post_attachment'		=> array('BOOL', 0),
-		'bbcode_bitfield'		=> array('VCHAR:255', ''),
-		'bbcode_uid'			=> array('VCHAR:8', ''),
-		'post_postcount'		=> array('BOOL', 1),
-		'post_edit_time'		=> array('TIMESTAMP', 0),
-		'post_edit_reason'		=> array('STEXT_UNI', ''),
-		'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'),
-		'tid_post_time'			=> array('INDEX', array('topic_id', '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('STEXT_UNI', ''),
-		'message_text'			=> array('MTEXT_UNI', ''),
-		'message_edit_reason'	=> array('STEXT_UNI', ''),
-		'message_edit_user'		=> array('UINT', 0),
-		'message_attachment'	=> array('BOOL', 0),
-		'bbcode_bitfield'		=> array('VCHAR:255', ''),
-		'bbcode_uid'			=> array('VCHAR:8', ''),
-		'message_edit_time'		=> array('TIMESTAMP', 0),
-		'message_edit_count'	=> array('USINT', 0),
-		'to_address'			=> array('TEXT_UNI', ''),
-		'bcc_address'			=> array('TEXT_UNI', ''),
-	),
-	'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_UNI', ''),
-		'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_UNI', ''),
-		'rule_user_id'			=> array('UINT', 0),
-		'rule_group_id'			=> array('UINT', 0),
-		'rule_action'			=> array('UINT', 0),
-		'rule_folder_id'		=> array('INT:11', 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:11', 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_UNI', ''),
-		'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_UNI', ''),
-		'field_default_value'	=> array('VCHAR_UNI', ''),
-		'field_validation'		=> array('VCHAR_UNI:20', ''),
-		'field_required'		=> array('BOOL', 0),
-		'field_show_on_reg'		=> array('BOOL', 0),
-		'field_show_profile'	=> 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_UNI', ''),
-	),
-	'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_UNI', ''),
-		'lang_explain'			=> array('TEXT_UNI', ''),
-		'lang_default_value'	=> array('VCHAR_UNI', ''),
-	),
-	'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_UNI', ''),
-		'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_UNI', ''),
-	),
-	'PRIMARY_KEY'	=> 'report_id',
-);
-
-$schema_data['phpbb_reports_reasons'] = array(
-	'COLUMNS'		=> array(
-		'reason_id'				=> array('USINT', NULL, 'auto_increment'),
-		'reason_title'			=> array('VCHAR_UNI', ''),
-		'reason_description'	=> array('MTEXT_UNI', ''),
-		'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_UNI', ''),
-		'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_UNI', ''),
-		'word_common'		=> array('BOOL', 0),
-		'word_count'		=> array('UINT', 0),
-	),
-	'PRIMARY_KEY'	=> 'word_id',
-	'KEYS'			=> array(
-		'wrd_txt'			=> array('UNIQUE', 'word_text'),
-		'wrd_cnt'			=> array('INDEX', 'word_count'),
-	),
-);
-
-$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(
-		'unq_mtch'			=> array('UNIQUE', array('word_id', 'post_id', 'title_match')),
-		'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_forum_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_forwarded_for'	=> array('VCHAR:255', ''),
-		'session_page'			=> array('VCHAR_UNI', ''),
-		'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'),
-		'session_fid'		=> array('INDEX', 'session_forum_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'),
-		// We may want to set 'code' to VCHAR:50 or check if unicode support is possible... at the moment only ASCII characters are allowed.
-		'code'				=> array('VCHAR_UNI:50', ''),
-		'emotion'			=> array('VCHAR_UNI:50', ''),
-		'smiley_url'		=> array('VCHAR:50', ''),
-		'smiley_width'		=> array('USINT', 0),
-		'smiley_height'		=> array('USINT', 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('UINT', NULL, 'auto_increment'),
-		'style_name'			=> array('VCHAR_UNI:255', ''),
-		'style_copyright'		=> array('VCHAR_UNI', ''),
-		'style_active'			=> array('BOOL', 1),
-		'template_id'			=> array('UINT', 0),
-		'theme_id'				=> array('UINT', 0),
-		'imageset_id'			=> array('UINT', 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('UINT', NULL, 'auto_increment'),
-		'template_name'			=> array('VCHAR_UNI:255', ''),
-		'template_copyright'	=> array('VCHAR_UNI', ''),
-		'template_path'			=> array('VCHAR:100', ''),
-		'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
-		'template_storedb'		=> array('BOOL', 0),
-		'template_inherits_id'		=> array('UINT:4', 0),
-		'template_inherit_path'		=> array('VCHAR', ''),
-	),
-	'PRIMARY_KEY'	=> 'template_id',
-	'KEYS'			=> array(
-		'tmplte_nm'				=> array('UNIQUE', 'template_name'),
-	),
-);
-
-$schema_data['phpbb_styles_theme'] = array(
-	'COLUMNS'		=> array(
-		'theme_id'				=> array('UINT', NULL, 'auto_increment'),
-		'theme_name'			=> array('VCHAR_UNI:255', ''),
-		'theme_copyright'		=> array('VCHAR_UNI', ''),
-		'theme_path'			=> array('VCHAR:100', ''),
-		'theme_storedb'			=> array('BOOL', 0),
-		'theme_mtime'			=> array('TIMESTAMP', 0),
-		'theme_data'			=> array('MTEXT_UNI', ''),
-	),
-	'PRIMARY_KEY'	=> 'theme_id',
-	'KEYS'			=> array(
-		'theme_name'		=> array('UNIQUE', 'theme_name'),
-	),
-);
-
-$schema_data['phpbb_styles_imageset'] = array(
-	'COLUMNS'		=> array(
-		'imageset_id'				=> array('UINT', NULL, 'auto_increment'),
-		'imageset_name'				=> array('VCHAR_UNI:255', ''),
-		'imageset_copyright'		=> array('VCHAR_UNI', ''),
-		'imageset_path'				=> array('VCHAR:100', ''),
-	),
-	'PRIMARY_KEY'		=> 'imageset_id',
-	'KEYS'				=> array(
-		'imgset_nm'			=> array('UNIQUE', 'imageset_name'),
-	),
-);
-
-$schema_data['phpbb_styles_imageset_data'] = array(
-	'COLUMNS'		=> array(
-		'image_id'				=> array('UINT', NULL, 'auto_increment'),
-		'image_name'			=> array('VCHAR:200', ''),
-		'image_filename'		=> array('VCHAR:200', ''),
-		'image_lang'			=> array('VCHAR:30', ''),
-		'image_height'			=> array('USINT', 0),
-		'image_width'			=> array('USINT', 0),
-		'imageset_id'			=> array('UINT', 0),
-	),
-	'PRIMARY_KEY'		=> 'image_id',
-	'KEYS'				=> array(
-		'i_d'			=> array('INDEX', 'imageset_id'),
-	),
-);
-
-$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('STEXT_UNI', '', 'true_sort'),
-		'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_UNI', ''),
-		'topic_first_poster_colour'	=> array('VCHAR:6', ''),
-		'topic_last_post_id'		=> array('UINT', 0),
-		'topic_last_poster_id'		=> array('UINT', 0),
-		'topic_last_poster_name'	=> array('VCHAR_UNI', ''),
-		'topic_last_poster_colour'	=> array('VCHAR:6', ''),
-		'topic_last_post_subject'	=> array('STEXT_UNI', ''),
-		'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('STEXT_UNI', ''),
-		'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'),
-		'topic_approved'	=> array('INDEX', 'topic_approved'),
-		'forum_appr_last'	=> array('INDEX', array('forum_id', 'topic_approved', 'topic_last_post_id')),
-		'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_UNI', ''),
-		'username_clean'			=> array('VCHAR_UNI', ''),
-		'user_password'				=> array('VCHAR_UNI:40', ''),
-		'user_passchg'				=> array('TIMESTAMP', 0),
-		'user_pass_convert'			=> array('BOOL', 0),
-		'user_email'				=> array('VCHAR_UNI: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_UNI: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_inactive_reason'		=> array('TINT:2', 0),
-		'user_inactive_time'		=> array('TIMESTAMP', 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_UNI:30', 'd M Y H:i'),
-		'user_style'				=> array('UINT', 0),
-		'user_rank'					=> array('UINT', 0),
-		'user_colour'				=> array('VCHAR:6', ''),
-		'user_new_privmsg'			=> array('INT:4', 0),
-		'user_unread_privmsg'		=> array('INT: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_viewonline'		=> array('BOOL', 1),
-		'user_allow_viewemail'		=> array('BOOL', 1),
-		'user_allow_massemail'		=> array('BOOL', 1),
-		'user_options'				=> array('UINT:11', 895),
-		'user_avatar'				=> array('VCHAR', ''),
-		'user_avatar_type'			=> array('TINT:2', 0),
-		'user_avatar_width'			=> array('USINT', 0),
-		'user_avatar_height'		=> array('USINT', 0),
-		'user_sig'					=> array('MTEXT_UNI', ''),
-		'user_sig_bbcode_uid'		=> array('VCHAR:8', ''),
-		'user_sig_bbcode_bitfield'	=> array('VCHAR:255', ''),
-		'user_from'					=> array('VCHAR_UNI:100', ''),
-		'user_icq'					=> array('VCHAR:15', ''),
-		'user_aim'					=> array('VCHAR_UNI', ''),
-		'user_yim'					=> array('VCHAR_UNI', ''),
-		'user_msnm'					=> array('VCHAR_UNI', ''),
-		'user_jabber'				=> array('VCHAR_UNI', ''),
-		'user_website'				=> array('VCHAR_UNI:200', ''),
-		'user_occ'					=> array('TEXT_UNI', ''),
-		'user_interests'			=> array('TEXT_UNI', ''),
-		'user_actkey'				=> array('VCHAR:32', ''),
-		'user_newpasswd'			=> array('VCHAR_UNI:40', ''),
-		'user_form_salt'			=> array('VCHAR_UNI: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_clean'			=> array('UNIQUE', 'username_clean'),
-	),
-);
-
-$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_UNI', ''),
-		'replacement'			=> array('VCHAR_UNI', ''),
-	),
-	'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),
-	),
-	'PRIMARY_KEY'	=> array('user_id', 'zebra_id'),
-);
-
-?>
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
deleted file mode 100644
index f6369b6739..0000000000
--- a/phpBB/language/en/acp/attachments.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/**
-*
-* acp_attachments [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-$lang = array_merge($lang, array(
-	'ACP_ATTACHMENT_SETTINGS_EXPLAIN'	=> 'Here you can configure the main settings for attachments and the associated special categories.',
-	'ACP_EXTENSION_GROUPS_EXPLAIN'		=> 'Here you can add, delete, modify or disable your extension groups. Further options include the assignment of a special category to them, changing the download mechanism and defining an upload icon which will be displayed in front of the attachment which belongs to the group.',
-	'ACP_MANAGE_EXTENSIONS_EXPLAIN'		=> 'Here you can manage your allowed extensions. To activate your extensions, please refer to the extension groups management panel. We strongly recommend not to allow scripting extensions (such as <code>php</code>, <code>php3</code>, <code>php4</code>, <code>phtml</code>, <code>pl</code>, <code>cgi</code>, <code>py</code>, <code>rb</code>, <code>asp</code>, <code>aspx</code>, and so forth…).',
-	'ACP_ORPHAN_ATTACHMENTS_EXPLAIN'	=> 'Here you are able to see orphaned files. This happens mostly if users are attaching files but not submitting the post. You are able to delete the files or attach them to existing posts. Attaching to posts requires a valid post ID, you have to determine this ID by yourself. This will assign the already uploaded attachment to the post you entered.',
-	'ADD_EXTENSION'						=> 'Add extension',
-	'ADD_EXTENSION_GROUP'				=> 'Add extension group',
-	'ADMIN_UPLOAD_ERROR'				=> 'Errors while trying to attach file: “%s”.',
-	'ALLOWED_FORUMS'					=> 'Allowed forums',
-	'ALLOWED_FORUMS_EXPLAIN'			=> 'Able to post the assigned extensions at the selected (or all if selected) forums.',
-	'ALLOWED_IN_PM_POST'				=> 'Allowed',
-	'ALLOW_ATTACHMENTS'					=> 'Allow attachments',
-	'ALLOW_ALL_FORUMS'					=> 'Allow all forums',
-	'ALLOW_IN_PM'						=> 'Allowed in private messaging',
-	'ALLOW_PM_ATTACHMENTS'				=> 'Allow attachments in private messages',
-	'ALLOW_SELECTED_FORUMS'				=> 'Only forums selected below',
-	'ASSIGNED_EXTENSIONS'				=> 'Assigned extensions',
-	'ASSIGNED_GROUP'					=> 'Assigned extension group',
-	'ATTACH_EXTENSIONS_URL'				=> 'Extensions',
-	'ATTACH_EXT_GROUPS_URL'				=> 'Extension groups',
-	'ATTACH_ID'							=> 'ID',
-	'ATTACH_MAX_FILESIZE'				=> 'Maximum file size',
-	'ATTACH_MAX_FILESIZE_EXPLAIN'		=> 'Maximum size of each file, with 0 being unlimited.',
-	'ATTACH_MAX_PM_FILESIZE'			=> 'Maximum file size messaging',
-	'ATTACH_MAX_PM_FILESIZE_EXPLAIN'	=> 'Maximum size of each file, with 0 being unlimited, attached to a private message.',
-	'ATTACH_ORPHAN_URL'					=> 'Orphan attachments',
-	'ATTACH_POST_ID'					=> 'Post ID',
-	'ATTACH_QUOTA'						=> 'Total attachment quota',
-	'ATTACH_QUOTA_EXPLAIN'				=> 'Maximum drive space available for attachments for the whole board, with 0 being unlimited.',
-	'ATTACH_TO_POST'					=> 'Attach file to post',
-
-	'CAT_FLASH_FILES'			=> 'Flash files',
-	'CAT_IMAGES'				=> 'Images',
-	'CAT_QUICKTIME_FILES'		=> 'Quicktime media files',
-	'CAT_RM_FILES'				=> 'RealMedia media files',
-	'CAT_WM_FILES'				=> 'Windows Media media files',
-	'CHECK_CONTENT'				=> 'Check attachment files',
-	'CHECK_CONTENT_EXPLAIN'		=> 'Some browsers can be tricked to assume an incorrect mimetype for uploaded files. This option ensures that such files likely to cause this are rejected.',
-	'CREATE_GROUP'				=> 'Create new group',
-	'CREATE_THUMBNAIL'			=> 'Create thumbnail',
-	'CREATE_THUMBNAIL_EXPLAIN'	=> 'Create a thumbnail in all possible situations.',
-
-	'DEFINE_ALLOWED_IPS'			=> 'Define allowed IPs/hostnames',
-	'DEFINE_DISALLOWED_IPS'			=> 'Define disallowed IPs/hostnames',
-	'DOWNLOAD_ADD_IPS_EXPLAIN'		=> 'To specify several different IPs or hostnames enter each on a new line. To specify a range of IP addresses separate the start and end with a hyphen (-), to specify a wildcard use “*”.',
-	'DOWNLOAD_REMOVE_IPS_EXPLAIN'	=> 'You can remove (or un-exclude) multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded IPs have a blue background.',
-	'DISPLAY_INLINED'				=> 'Display images inline',
-	'DISPLAY_INLINED_EXPLAIN'		=> 'If set to No image attachments will show as a link.',
-	'DISPLAY_ORDER'					=> 'Attachment display order',
-	'DISPLAY_ORDER_EXPLAIN'			=> 'Display attachments ordered by time.',
-	
-	'EDIT_EXTENSION_GROUP'			=> 'Edit extension group',
-	'EXCLUDE_ENTERED_IP'			=> 'Enable this to exclude the entered IP/hostname.',
-	'EXCLUDE_FROM_ALLOWED_IP'		=> 'Exclude IP from allowed IPs/hostnames',
-	'EXCLUDE_FROM_DISALLOWED_IP'	=> 'Exclude IP from disallowed IPs/hostnames',
-	'EXTENSIONS_UPDATED'			=> 'Extensions successfully updated.',
-	'EXTENSION_EXIST'				=> 'The extension %s already exists.',
-	'EXTENSION_GROUP'				=> 'Extension group',
-	'EXTENSION_GROUPS'				=> 'Extension groups',
-	'EXTENSION_GROUP_DELETED'		=> 'Extension group successfully deleted.',
-	'EXTENSION_GROUP_EXIST'			=> 'The extension group %s already exists.',
-
-	'GO_TO_EXTENSIONS'		=> 'Go to extension management screen',
-	'GROUP_NAME'			=> 'Group name',
-
-	'IMAGE_LINK_SIZE'			=> 'Image link dimensions',
-	'IMAGE_LINK_SIZE_EXPLAIN'	=> 'Display image attachment as an inline text link if image is larger than this. To disable this behaviour, set the values to 0px by 0px.',
-	'IMAGICK_PATH'				=> 'Imagemagick path',
-	'IMAGICK_PATH_EXPLAIN'		=> 'Full path to the imagemagick convert application, e.g. <samp>/usr/bin/</samp>.',
-
-	'MAX_ATTACHMENTS'				=> 'Maximum number of attachments per post',
-	'MAX_ATTACHMENTS_PM'			=> 'Maximum number of attachments per private message',
-	'MAX_EXTGROUP_FILESIZE'			=> 'Maximum file size',
-	'MAX_IMAGE_SIZE'				=> 'Maximum image dimensions',
-	'MAX_IMAGE_SIZE_EXPLAIN'		=> 'Maximum size of image attachments. Set both values to 0px by 0px to disable dimension checking.',
-	'MAX_THUMB_WIDTH'				=> 'Maximum thumbnail width in pixel',
-	'MAX_THUMB_WIDTH_EXPLAIN'		=> 'A generated thumbnail will not exceed the width set here.',
-	'MIN_THUMB_FILESIZE'			=> 'Minimum thumbnail file size',
-	'MIN_THUMB_FILESIZE_EXPLAIN'	=> 'Do not create a thumbnail for images smaller than this.',
-	'MODE_INLINE'					=> 'Inline',
-	'MODE_PHYSICAL'					=> 'Physical',
-
-	'NOT_ALLOWED_IN_PM'			=> 'Only allowed in posts',
-	'NOT_ALLOWED_IN_PM_POST'	=> 'Not allowed',
-	'NOT_ASSIGNED'				=> 'Not assigned',
-	'NO_EXT_GROUP'				=> 'None',
-	'NO_EXT_GROUP_NAME'			=> 'No group name entered',
-	'NO_EXT_GROUP_SPECIFIED'	=> 'No extension group specified.',
-	'NO_FILE_CAT'				=> 'None',
-	'NO_IMAGE'					=> 'No image',
-	'NO_THUMBNAIL_SUPPORT'		=> 'Thumbnail support has been disabled. For proper functionality either the GD extension need to be available or imagemagick being installed. Both were not found.',
-	'NO_UPLOAD_DIR'				=> 'The upload directory you specified does not exist.',
-	'NO_WRITE_UPLOAD'			=> 'The upload directory you specified cannot be written to. Please alter the permissions to allow the webserver to write to it.',
-
-	'ONLY_ALLOWED_IN_PM'	=> 'Only allowed in private messages',
-	'ORDER_ALLOW_DENY'		=> 'Allow',
-	'ORDER_DENY_ALLOW'		=> 'Deny',
-
-	'REMOVE_ALLOWED_IPS'		=> 'Remove or un-exclude <em>allowed</em> IPs/hostnames',
-	'REMOVE_DISALLOWED_IPS'		=> 'Remove or un-exclude <em>disallowed</em> IPs/hostnames',
-
-	'SEARCH_IMAGICK'				=> 'Search for Imagemagick',
-	'SECURE_ALLOW_DENY'				=> 'Allow/Deny list',
-	'SECURE_ALLOW_DENY_EXPLAIN'		=> 'Change the default behaviour when secure downloads are enabled of the Allow/Deny list to that of a <strong>whitelist</strong> (Allow) or a <strong>blacklist</strong> (Deny).',
-	'SECURE_DOWNLOADS'				=> 'Enable secure downloads',
-	'SECURE_DOWNLOADS_EXPLAIN'		=> 'With this option enabled, downloads are limited to IP’s/hostnames you define.',
-	'SECURE_DOWNLOAD_NOTICE'		=> 'Secure Downloads are not enabled. The settings below will be applied after enabling secure downloads.',
-	'SECURE_DOWNLOAD_UPDATE_SUCCESS'=> 'The IP list has been updated successfully.',
-	'SECURE_EMPTY_REFERRER'			=> 'Allow empty referrer',
-	'SECURE_EMPTY_REFERRER_EXPLAIN'	=> 'Secure downloads are based on referrers. Do you want to allow downloads for those omitting the referrer?',
-	'SETTINGS_CAT_IMAGES'			=> 'Image category settings',
-	'SPECIAL_CATEGORY'				=> 'Special category',
-	'SPECIAL_CATEGORY_EXPLAIN'		=> 'Special categories differ between the way presented within posts.',
-	'SUCCESSFULLY_UPLOADED'			=> 'Successfully uploaded.',
-	'SUCCESS_EXTENSION_GROUP_ADD'	=> 'Extension group successfully added.',
-	'SUCCESS_EXTENSION_GROUP_EDIT'	=> 'Extension group successfully updated.',
-
-	'UPLOADING_FILES'				=> 'Uploading files',
-	'UPLOADING_FILE_TO'				=> 'Uploading file “%1$s” to post number %2$d…',
-	'UPLOAD_DENIED_FORUM'			=> 'You do not have the permission to upload files to forum “%s”.',
-	'UPLOAD_DIR'					=> 'Upload directory',
-	'UPLOAD_DIR_EXPLAIN'			=> 'Storage path for attachments. Please note that if you change this directory while already having uploaded attachments you need to manually copy the files to their new location.',
-	'UPLOAD_ICON'					=> 'Upload icon',
-	'UPLOAD_NOT_DIR'				=> 'The upload location you specified does not appear to be a directory.',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php
deleted file mode 100644
index 5fcbb1fa69..0000000000
--- a/phpBB/language/en/acp/ban.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
-*
-* acp_ban [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-// Banning
-$lang = array_merge($lang, array(
-	'1_HOUR'		=> '1 hour',
-	'30_MINS'		=> '30 minutes',
-	'6_HOURS'		=> '6 hours',
-
-	'ACP_BAN_EXPLAIN'	=> 'Here you can control the banning of users by name, IP or e-mail address. These methods prevent a user reaching any part of the board. You can give a short (maximum 3000 characters) reason for the ban if you wish. This will be displayed in the admin log. The duration of a ban can also be specified. If you want the ban to end on a specific date rather than after a set time period select <span style="text-decoration: underline;">Until -&gt;</span> for the ban length and enter a date in <kbd>YYYY-MM-DD</kbd> format.',
-
-	'BAN_EXCLUDE'			=> 'Exclude from banning',
-	'BAN_LENGTH'			=> 'Length of ban',
-	'BAN_REASON'			=> 'Reason for ban',
-	'BAN_GIVE_REASON'		=> 'Reason shown to the banned',
-	'BAN_UPDATE_SUCCESSFUL'	=> 'The banlist has been updated successfully.',
-
-	'EMAIL_BAN'					=> 'Ban one or more e-mail addresses',
-	'EMAIL_BAN_EXCLUDE_EXPLAIN'	=> 'Enable this to exclude the entered e-mail address from all current bans.',
-	'EMAIL_BAN_EXPLAIN'			=> 'To specify more than one e-mail address enter each on a new line. To match partial addresses use * as the wildcard, e.g. <samp>*@hotmail.com</samp>, <samp>*@*.domain.tld</samp>, etc.',
-	'EMAIL_NO_BANNED'			=> 'No banned e-mail addresses',
-	'EMAIL_UNBAN'				=> 'Un-ban or un-exclude e-mails',
-	'EMAIL_UNBAN_EXPLAIN'		=> 'You can unban (or un-exclude) multiple e-mail addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded e-mail addresses are emphasised.',
-
-	'IP_BAN'					=> 'Ban one or more IPs',
-	'IP_BAN_EXCLUDE_EXPLAIN'	=> 'Enable this to exclude the entered IP from all current bans.',
-	'IP_BAN_EXPLAIN'			=> 'To specify several different IPs or hostnames enter each on a new line. To specify a range of IP addresses separate the start and end with a hyphen (-), to specify a wildcard use “*”.',
-	'IP_HOSTNAME'				=> 'IP addresses or hostnames',
-	'IP_NO_BANNED'				=> 'No banned IP addresses',
-	'IP_UNBAN'					=> 'Un-ban or un-exclude IPs',
-	'IP_UNBAN_EXPLAIN'			=> 'You can unban (or un-exclude) multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded IPs are emphasised.',
-
-	'LENGTH_BAN_INVALID'		=> 'The date has to be formatted <kbd>YYYY-MM-DD</kbd>.',
-
-	'PERMANENT'		=> 'Permanent',
-	
-	'UNTIL'						=> 'Until',
-	'USER_BAN'					=> 'Ban one or more usernames',
-	'USER_BAN_EXCLUDE_EXPLAIN'	=> 'Enable this to exclude the entered users from all current bans.',
-	'USER_BAN_EXPLAIN'			=> 'You can ban multiple users in one go by entering each name on a new line. Use the <span style="text-decoration: underline;">Find a member</span> facility to look up and add one or more users automatically.',
-	'USER_NO_BANNED'			=> 'No banned usernames',
-	'USER_UNBAN'				=> 'Un-ban or un-exclude usernames',
-	'USER_UNBAN_EXPLAIN'		=> 'You can unban (or un-exclude) multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded users are emphasised.',
-	
-
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
deleted file mode 100644
index 3c96f239e8..0000000000
--- a/phpBB/language/en/acp/board.php
+++ /dev/null
@@ -1,487 +0,0 @@
-<?php
-/**
-*
-* acp_board [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-// Board Settings
-$lang = array_merge($lang, array(
-	'ACP_BOARD_SETTINGS_EXPLAIN'	=> 'Here you can determine the basic operation of your board, give it a fitting name and description, and among other settings adjust the default values for timezone and language.',
-	'CUSTOM_DATEFORMAT'				=> 'Custom…',
-	'DEFAULT_DATE_FORMAT'			=> 'Date format',
-	'DEFAULT_DATE_FORMAT_EXPLAIN'	=> 'The date format is the same as the PHP <code>date</code> function.',
-	'DEFAULT_LANGUAGE'				=> 'Default language',
-	'DEFAULT_STYLE'					=> 'Default style',
-	'DISABLE_BOARD'					=> 'Disable board',
-	'DISABLE_BOARD_EXPLAIN'			=> 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.',
-	'OVERRIDE_STYLE'				=> 'Override user style',
-	'OVERRIDE_STYLE_EXPLAIN'		=> 'Replaces user’s style with the default.',
-	'SITE_DESC'						=> 'Site description',
-	'SITE_NAME'						=> 'Site name',
-	'SYSTEM_DST'					=> 'Enable Summer Time/<abbr title="Daylight Saving Time">DST</abbr>',
-	'SYSTEM_TIMEZONE'				=> 'System timezone',
-	'WARNINGS_EXPIRE'				=> 'Warning duration',
-	'WARNINGS_EXPIRE_EXPLAIN'		=> 'Number of days that will elapse before the warning will automatically expire from a user’s record.',
-));
-
-// Board Features
-$lang = array_merge($lang, array(
-	'ACP_BOARD_FEATURES_EXPLAIN'	=> 'Here you can enable/disable several board features.',
-
-	'ALLOW_ATTACHMENTS'			=> 'Allow attachments',
-	'ALLOW_BIRTHDAYS'			=> 'Allow birthdays',
-	'ALLOW_BIRTHDAYS_EXPLAIN'	=> 'Allow birthdays to be entered and age being displayed in profiles. Please note the birthday list within the board index is controlled by a separate load setting.',
-	'ALLOW_BOOKMARKS'			=> 'Allow bookmarking topics',
-	'ALLOW_BOOKMARKS_EXPLAIN'	=> 'User is able to store personal bookmarks.',
-	'ALLOW_BBCODE'				=> 'Allow BBCode',
-	'ALLOW_FORUM_NOTIFY'		=> 'Allow subscribing to forums',
-	'ALLOW_NAME_CHANGE'			=> 'Allow username changes',
-	'ALLOW_NO_CENSORS'			=> 'Allow disabling of word censoring',
-	'ALLOW_NO_CENSORS_EXPLAIN'	=> 'Users can choose to disable the automatic word censoring of posts and private messages.',
-	'ALLOW_PM_ATTACHMENTS'		=> 'Allow attachments in private messages',
-	'ALLOW_SIG'					=> 'Allow signatures',
-	'ALLOW_SIG_BBCODE'			=> 'Allow BBCode in user signatures',
-	'ALLOW_SIG_FLASH'			=> 'Allow use of <code>[FLASH]</code> BBCode tag in user signatures',
-	'ALLOW_SIG_IMG'				=> 'Allow use of <code>[IMG]</code> BBCode tag in user signatures',
-	'ALLOW_SIG_LINKS'			=> 'Allow use of links in user signatures',
-	'ALLOW_SIG_LINKS_EXPLAIN'	=> 'If disallowed the <code>[URL]</code> BBCode tag and automatic/magic URLs are disabled.',
-	'ALLOW_SIG_SMILIES'			=> 'Allow use of smilies in user signatures',
-	'ALLOW_SMILIES'				=> 'Allow smilies',
-	'ALLOW_TOPIC_NOTIFY'		=> 'Allow subscribing to topics',
-	'BOARD_PM'					=> 'Private messaging',
-	'BOARD_PM_EXPLAIN'			=> 'Enable or disable private messaging for all users.',
-));
-
-// Avatar Settings
-$lang = array_merge($lang, array(
-	'ACP_AVATAR_SETTINGS_EXPLAIN'	=> 'Avatars are generally small, unique images a user can associate with themselves. Depending on the style they are usually displayed below the username when viewing topics. Here you can determine how users can define their avatars. Please note that in order to upload avatars you need to have created the directory you name below and ensure it can be written to by the web server. Please also note that file size limits are only imposed on uploaded avatars, they do not apply to remotely linked images.',
-
-	'ALLOW_LOCAL'					=> 'Enable gallery avatars',
-	'ALLOW_REMOTE'					=> 'Enable remote avatars',
-	'ALLOW_REMOTE_EXPLAIN'			=> 'Avatars linked to from another website.',
-	'ALLOW_UPLOAD'					=> 'Enable avatar uploading',
-	'AVATAR_GALLERY_PATH'			=> 'Avatar gallery path',
-	'AVATAR_GALLERY_PATH_EXPLAIN'	=> 'Path under your phpBB root directory for pre-loaded images, e.g. <samp>images/avatars/gallery</samp>.',
-	'AVATAR_STORAGE_PATH'			=> 'Avatar storage path',
-	'AVATAR_STORAGE_PATH_EXPLAIN'	=> 'Path under your phpBB root directory, e.g. <samp>images/avatars/upload</samp>.',
-	'MAX_AVATAR_SIZE'				=> 'Maximum avatar dimensions',
-	'MAX_AVATAR_SIZE_EXPLAIN'		=> 'Width x Height in pixels.',
-	'MAX_FILESIZE'					=> 'Maximum avatar file size',
-	'MAX_FILESIZE_EXPLAIN'			=> 'For uploaded avatar files.',
-	'MIN_AVATAR_SIZE'				=> 'Minimum avatar dimensions',
-	'MIN_AVATAR_SIZE_EXPLAIN'		=> 'Width x Height in pixels.',
-));
-
-// Message Settings
-$lang = array_merge($lang, array(
-	'ACP_MESSAGE_SETTINGS_EXPLAIN'		=> 'Here you can set all default settings for private messaging.',
-
-	'ALLOW_BBCODE_PM'			=> 'Allow BBCode in private messages',
-	'ALLOW_FLASH_PM'			=> 'Allow use of <code>[FLASH]</code> BBCode tag',
-	'ALLOW_FLASH_PM_EXPLAIN'	=> 'Note that the ability to use flash in private messages, if enabled here, also depends on the permissions.',
-	'ALLOW_FORWARD_PM'			=> 'Allow forwarding of private messages',
-	'ALLOW_IMG_PM'				=> 'Allow use of <code>[IMG]</code> BBCode tag',
-	'ALLOW_MASS_PM'				=> 'Allow sending of private messages to multiple users and groups',
-	'ALLOW_MASS_PM_EXPLAIN'		=> 'Sending to groups can be adjusted per group within the group settings page.',
-	'ALLOW_PRINT_PM'			=> 'Allow print view in private messaging',
-	'ALLOW_QUOTE_PM'			=> 'Allow quotes in private messages',
-	'ALLOW_SIG_PM'				=> 'Allow signature in private messages',
-	'ALLOW_SMILIES_PM'			=> 'Allow smilies in private messages',
-	'BOXES_LIMIT'				=> 'Maximum private messages per box',
-	'BOXES_LIMIT_EXPLAIN'		=> 'Users may receive no more than this many messages in each of their private message boxes. Set this value to 0 to allow unlimited messages.',
-	'BOXES_MAX'					=> 'Maximum private message folders',
-	'BOXES_MAX_EXPLAIN'			=> 'By default users may create this many personal folders for private messages.',
-	'ENABLE_PM_ICONS'			=> 'Enable use of topic icons in private messages',
-	'FULL_FOLDER_ACTION'		=> 'Full folder default action',
-	'FULL_FOLDER_ACTION_EXPLAIN'=> 'Default action to take if a user’s folder is full assuming the user’s folder action, if set at all, is not applicable. The only exception is for the “Sent messages” folder where the default action is always to delete old messages.',
-	'HOLD_NEW_MESSAGES'			=> 'Hold new messages',
-	'PM_EDIT_TIME'				=> 'Limit editing time',
-	'PM_EDIT_TIME_EXPLAIN'		=> 'Limits the time available to edit a private message not already delivered. Setting the value to 0 disables this behaviour.',
-	'PM_MAX_RECIPIENTS'			=> 'Maximum number of allowed recipients',
-	'PM_MAX_RECIPIENTS_EXPLAIN'	=> 'The maximum number of allowed recipients in a private message. If 0 is entered, an unlimited number is allowed. This setting can be adjusted for every group within the group settings page.',
-));
-
-// Post Settings
-$lang = array_merge($lang, array(
-	'ACP_POST_SETTINGS_EXPLAIN'			=> 'Here you can set all default settings for posting.',
-	'ALLOW_POST_LINKS'					=> 'Allow links in posts/private messages',
-	'ALLOW_POST_LINKS_EXPLAIN'			=> 'If disallowed the <code>[URL]</code> BBCode tag and automatic/magic URLs are disabled.',
-	'ALLOW_POST_FLASH'					=> 'Allow use of <code>[FLASH]</code> BBCode tag in posts',
-	'ALLOW_POST_FLASH_EXPLAIN'			=> 'If disallowed the <code>[FLASH]</code> BBCode tag is disabled in posts. Otherwise the permission system controls which users can use the <code>[FLASH]</code> BBCode tag.',
-
-	'ENABLE_QUEUE_TRIGGER'			=> 'Enable queued posts',
-	'ENABLE_QUEUE_TRIGGER_EXPLAIN'	=> 'Ability to put registered users posts to post approval if their post count is lower than the specified value below. This setting has no effect on the permission setting for post/topic approval.',
-	'QUEUE_TRIGGER_POSTS'			=> 'Maximum post count for queued posts',
-	'QUEUE_TRIGGER_POSTS_EXPLAIN'	=> 'If queued posts is enabled, this is the post count the user need to reach in order to post without post approval. If the users post count is below this number, the post is stored in the queue automatically.',
-
-	'BUMP_INTERVAL'					=> 'Bump interval',
-	'BUMP_INTERVAL_EXPLAIN'			=> 'Number of minutes, hours or days between the last post to a topic and the ability to bump this topic.',
-	'CHAR_LIMIT'					=> 'Maximum characters per post',
-	'CHAR_LIMIT_EXPLAIN'			=> 'The number of characters allowed within a post. Set to 0 for unlimited characters.',
-	'DISPLAY_LAST_EDITED'			=> 'Display last edited time information',
-	'DISPLAY_LAST_EDITED_EXPLAIN'	=> 'Choose if the last edited by information to be displayed on posts.',
-	'EDIT_TIME'						=> 'Limit editing time',
-	'EDIT_TIME_EXPLAIN'				=> 'Limits the time available to edit a new post. Setting the value to 0 disables this behaviour.',
-	'FLOOD_INTERVAL'				=> 'Flood interval',
-	'FLOOD_INTERVAL_EXPLAIN'		=> 'Number of seconds a user must wait between posting new messages. To enable users to ignore this alter their permissions.',
-	'HOT_THRESHOLD'					=> 'Popular topic threshold',
-	'HOT_THRESHOLD_EXPLAIN'			=> 'Posts per topic threshold required for the popular topic annotation. Set to 0 to disable popular topics.',
-	'MAX_POLL_OPTIONS'				=> 'Maximum number of poll options',
-	'MAX_POST_FONT_SIZE'			=> 'Maximum font size per post',
-	'MAX_POST_FONT_SIZE_EXPLAIN'	=> 'Maximum font size allowed in a post. Set to 0 for unlimited font size.',
-	'MAX_POST_IMG_HEIGHT'			=> 'Maximum image height per post',
-	'MAX_POST_IMG_HEIGHT_EXPLAIN'	=> 'Maximum height of an image/flash file in postings. Set to 0 for unlimited size.',
-	'MAX_POST_IMG_WIDTH'			=> 'Maximum image width per post',
-	'MAX_POST_IMG_WIDTH_EXPLAIN'	=> 'Maximum width of an image/flash file in postings. Set to 0 for unlimited size.',
-	'MAX_POST_URLS'					=> 'Maximum links per post',
-	'MAX_POST_URLS_EXPLAIN'			=> 'Maximum number of URLs in a post. Set to 0 for unlimited links.',
-	'POSTING'						=> 'Posting',
-	'POSTS_PER_PAGE'				=> 'Posts per page',
-	'QUOTE_DEPTH_LIMIT'				=> 'Maximum nested quotes per post',
-	'QUOTE_DEPTH_LIMIT_EXPLAIN'		=> 'Maximum number of nested quotes in a post. Set to 0 for unlimited depth.',
-	'SMILIES_LIMIT'					=> 'Maximum smilies per post',
-	'SMILIES_LIMIT_EXPLAIN'			=> 'Maximum number of smilies in a post. Set to 0 for unlimited smilies.',
-	'TOPICS_PER_PAGE'				=> 'Topics per page',
-));
-
-// Signature Settings
-$lang = array_merge($lang, array(
-	'ACP_SIGNATURE_SETTINGS_EXPLAIN'	=> 'Here you can set all default settings for signatures.',
-
-	'MAX_SIG_FONT_SIZE'				=> 'Maximum signature font size',
-	'MAX_SIG_FONT_SIZE_EXPLAIN'		=> 'Maximum font size allowed in user signatures. Set to 0 for unlimited size.',
-	'MAX_SIG_IMG_HEIGHT'			=> 'Maximum signature image height',
-	'MAX_SIG_IMG_HEIGHT_EXPLAIN'	=> 'Maximum height of an image/flash file in user signatures. Set to 0 for unlimited height.',
-	'MAX_SIG_IMG_WIDTH'				=> 'Maximum signature image width',
-	'MAX_SIG_IMG_WIDTH_EXPLAIN'		=> 'Maximum width of an image/flash file in user signatures. Set to 0 for unlimited width.',
-	'MAX_SIG_LENGTH'				=> 'Maximum signature length',
-	'MAX_SIG_LENGTH_EXPLAIN'		=> 'Maximum number of characters in user signatures.',
-	'MAX_SIG_SMILIES'				=> 'Maximum smilies per signature',
-	'MAX_SIG_SMILIES_EXPLAIN'		=> 'Maximum smilies allowed in user signatures. Set to 0 for unlimited smilies.',
-	'MAX_SIG_URLS'					=> 'Maximum signature links',
-	'MAX_SIG_URLS_EXPLAIN'			=> 'Maximum number of links in user signatures. Set to 0 for unlimited links.',
-));
-
-// Registration Settings
-$lang = array_merge($lang, array(
-	'ACP_REGISTER_SETTINGS_EXPLAIN'		=> 'Here you are able to define registration and profile related settings.',
-
-	'ACC_ACTIVATION'			=> 'Account activation',
-	'ACC_ACTIVATION_EXPLAIN'	=> 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations.',
-	'ACC_ADMIN'					=> 'By Admin',
-	'ACC_DISABLE'				=> 'Disable',
-	'ACC_NONE'					=> 'None',
-	'ACC_USER'					=> 'By User',
-//	'ACC_USER_ADMIN'			=> 'User + Admin',
-	'ALLOW_EMAIL_REUSE'			=> 'Allow e-mail address re-use',
-	'ALLOW_EMAIL_REUSE_EXPLAIN'	=> 'Different users can register with the same e-mail address.',
-	'COPPA'						=> 'COPPA',
-	'COPPA_FAX'					=> 'COPPA fax number',
-	'COPPA_MAIL'				=> 'COPPA mailing address',
-	'COPPA_MAIL_EXPLAIN'		=> 'This is the mailing address where parents will send COPPA registration forms.',
-	'ENABLE_COPPA'				=> 'Enable COPPA',
-	'ENABLE_COPPA_EXPLAIN'		=> 'This requires users to declare whether they are 13 or over for compliance with the U.S. COPPA. If this is disabled the COPPA specific groups will no longer be displayed.',
-	'MAX_CHARS'					=> 'Max',
-	'MIN_CHARS'					=> 'Min',
-	'NO_AUTH_PLUGIN'			=> 'No suitable auth plugin found.',
-	'PASSWORD_LENGTH'			=> 'Password length',
-	'PASSWORD_LENGTH_EXPLAIN'	=> 'Minimum and maximum number of characters in passwords.',
-	'REG_LIMIT'					=> 'Registration attempts',
-	'REG_LIMIT_EXPLAIN'			=> 'Number of attempts users can make at the confirmation code before being locked out that session.',
-	'USERNAME_ALPHA_ONLY'		=> 'Alphanumeric only',
-	'USERNAME_ALPHA_SPACERS'	=> 'Alphanumeric and spacers',
-	'USERNAME_ASCII'			=> 'ASCII (no international unicode)',
-	'USERNAME_LETTER_NUM'		=> 'Any letter and number',
-	'USERNAME_LETTER_NUM_SPACERS'	=> 'Any letter, number, and spacer',
-	'USERNAME_CHARS'			=> 'Limit username chars',
-	'USERNAME_CHARS_ANY'		=> 'Any character',
-	'USERNAME_CHARS_EXPLAIN'	=> 'Restrict type of characters that may be used in usernames, spacers are: space, -, +, _, [ and ].',
-	'USERNAME_LENGTH'			=> 'Username length',
-	'USERNAME_LENGTH_EXPLAIN'	=> 'Minimum and maximum number of characters in usernames.',
-));
-
-// Visual Confirmation Settings
-$lang = array_merge($lang, array(
-	'ACP_VC_SETTINGS_EXPLAIN'				=> 'Here you are able to define visual confirmation defaults and CAPTCHA settings.',
-	'AVAILABLE_CAPTCHAS'					=> 'Available plugins',
-	'CAPTCHA_UNAVAILABLE'					=> 'The CAPTCHA cannot be selected as its requirements are not met.',
-	'CAPTCHA_GD'							=> 'GD CAPTCHA',
-	'CAPTCHA_GD_WAVE'						=> 'GD Wave Captcha',
-	'CAPTCHA_GD_FOREGROUND_NOISE'			=> 'GD CAPTCHA foreground noise',
-	'CAPTCHA_GD_EXPLAIN'					=> 'Use GD to make a more advanced CAPTCHA.',
-	'CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN'	=> 'Use foreground noise to make the GD based CAPTCHA harder.',
-	'CAPTCHA_GD_X_GRID'						=> 'GD CAPTCHA background noise x-axis',
-	'CAPTCHA_GD_X_GRID_EXPLAIN'				=> 'Use lower settings of this to make the GD based CAPTCHA harder. 0 will disable x-axis background noise.',
-	'CAPTCHA_GD_Y_GRID'						=> 'GD CAPTCHA background noise y-axis',
-	'CAPTCHA_GD_Y_GRID_EXPLAIN'				=> 'Use lower settings of this to make the GD based CAPTCHA harder. 0 will disable y-axis background noise.',
-	'CAPTCHA_GD_WAVE'						=> 'GD CAPTCHA wave distortion',
-	'CAPTCHA_GD_WAVE_EXPLAIN'				=> 'This applies a wave distortion to the CAPTCHA.',
- 	'CAPTCHA_GD_3D_NOISE'					=> 'Add 3D-noise objects',
-	'CAPTCHA_GD_3D_NOISE_EXPLAIN'			=> 'This adds additional objects to the CAPTCHA, over the letters.',
-  	'CAPTCHA_GD_FONTS'						=> 'Use different fonts',
-	'CAPTCHA_GD_FONTS_EXPLAIN'				=> 'This setting controls how many different letter shapes are used. You can just use the default shapes or introduce altered letters. Adding lowercase letters is also possible.',
-	'CAPTCHA_FONT_DEFAULT'					=> 'Default',
-	'CAPTCHA_FONT_NEW'						=> 'New Shapes',
-	'CAPTCHA_FONT_LOWER'					=> 'Also use lowercase',
-
-
-	'CAPTCHA_PREVIEW_MSG'					=> 'Your changes to the visual confirmation setting were not saved. This is just a preview.',
-	'CAPTCHA_PREVIEW_EXPLAIN'				=> 'The CAPTCHA as it would look like using the current selection.',
-
-	'CAPTCHA_SELECT'						=> 'Installed CAPTCHA plugins',
-	'CAPTCHA_SELECT_EXPLAIN'				=> 'The dropdown holds the CAPTCHA plugins recognized by the board. Gray entries are not available right now and might need configuration prior to use.',
-	'CAPTCHA_CONFIGURE'						=> 'Configure CAPTCHAs',
-	'CAPTCHA_CONFIGURE_EXPLAIN'				=> 'Change the settings for the selected CAPTCHA.',
-	'CONFIGURE'								=> 'Configure',
-	'CAPTCHA_NO_OPTIONS'					=> 'This CAPTCHA has no configuration options.',
-	'VISUAL_CONFIRM_POST'					=> 'Enable visual confirmation for guest postings',
-	'VISUAL_CONFIRM_POST_EXPLAIN'			=> 'Requires anonymous users to enter a random code matching an image to help prevent mass postings.',
-	'VISUAL_CONFIRM_REG'					=> 'Enable visual confirmation for registrations',
-	'VISUAL_CONFIRM_REG_EXPLAIN'			=> 'Requires new users to enter a random code matching an image to help prevent mass registrations.',
-	'VISUAL_CONFIRM_REFRESH'				=> 'Enable users to refresh the confirmation image',
-	'VISUAL_CONFIRM_REFRESH_EXPLAIN'		=> 'Allows users to request new confirmation codes, if they are unable to solve the VC during registration.',
-));
-
-// Cookie Settings
-$lang = array_merge($lang, array(
-	'ACP_COOKIE_SETTINGS_EXPLAIN'		=> 'These details define the data used to send cookies to your users browsers. In most cases the default values for the cookie settings should be sufficient. If you do need to change any do so with care, incorrect settings can prevent users logging in.',
-
-	'COOKIE_DOMAIN'				=> 'Cookie domain',
-	'COOKIE_NAME'				=> 'Cookie name',
-	'COOKIE_PATH'				=> 'Cookie path',
-	'COOKIE_SECURE'				=> 'Cookie secure',
-	'COOKIE_SECURE_EXPLAIN'		=> 'If your server is running via SSL set this to enabled else leave as disabled. Having this enabled and not running via SSL will result in server errors during redirects.',
-	'ONLINE_LENGTH'				=> 'View online time span',
-	'ONLINE_LENGTH_EXPLAIN'		=> 'Number of minutes after which inactive users will not appear in “Who is online” listings. The higher this value the greater is the processing required to generate the listing.',
-	'SESSION_LENGTH'			=> 'Session length',
-	'SESSION_LENGTH_EXPLAIN'	=> 'Sessions will expire after this time, in seconds.',
-));
-
-// Load Settings
-$lang = array_merge($lang, array(
-	'ACP_LOAD_SETTINGS_EXPLAIN'	=> 'Here you can enable and disable certain board functions to reduce the amount of processing required. On most servers there is no need to disable any functions. However on certain systems or in shared hosting environments it may be beneficial to disable capabilities you do not really need. You can also specify limits for system load and active sessions beyond which the board will go offline.',
-
-	'CUSTOM_PROFILE_FIELDS'			=> 'Custom profile fields',
-	'LIMIT_LOAD'					=> 'Limit system load',
-	'LIMIT_LOAD_EXPLAIN'			=> 'If the system’s 1-minute load average exceeds this value the board will automatically go offline. A value of 1.0 equals ~100% utilisation of one processor. This only functions on UNIX based servers and where this information is accessible. The value here resets itself to 0 if phpBB was unable to get the load limit.',
-	'LIMIT_SESSIONS'				=> 'Limit sessions',
-	'LIMIT_SESSIONS_EXPLAIN'		=> 'If the number of sessions exceeds this value within a one minute period the board will go offline. Set to 0 for unlimited sessions.',
-	'LOAD_CPF_MEMBERLIST'			=> 'Allow styles to display custom profile fields in memberlist',
-	'LOAD_CPF_VIEWPROFILE'			=> 'Display custom profile fields in user profiles',
-	'LOAD_CPF_VIEWTOPIC'			=> 'Display custom profile fields on topic pages',
-	'LOAD_USER_ACTIVITY'			=> 'Show user’s activity',
-	'LOAD_USER_ACTIVITY_EXPLAIN'	=> 'Displays active topic/forum in user profiles and user control panel. It is recommended to disable this on boards with more than one million posts.',
-	'RECOMPILE_STYLES'				=> 'Recompile stale style components',
-	'RECOMPILE_STYLES_EXPLAIN'		=> 'Check for updated style components on filesystem and recompile.',
-	'YES_ANON_READ_MARKING'			=> 'Enable topic marking for guests',
-	'YES_ANON_READ_MARKING_EXPLAIN'	=> 'Stores read/unread status information for guests. If disabled posts are always read for guests.',
-	'YES_BIRTHDAYS'					=> 'Enable birthday listing',
-	'YES_BIRTHDAYS_EXPLAIN'			=> 'If disabled the birthday listing is no longer displayed. To let this setting take effect the birthday feature needs to be enabled too.',
-	'YES_JUMPBOX'					=> 'Enable display of jumpbox',
-	'YES_MODERATORS'				=> 'Enable display of moderators',
-	'YES_ONLINE'					=> 'Enable online user listings',
-	'YES_ONLINE_EXPLAIN'			=> 'Display online user information on index, forum and topic pages.',
-	'YES_ONLINE_GUESTS'				=> 'Enable online guest listings in viewonline',
-	'YES_ONLINE_GUESTS_EXPLAIN'		=> 'Allow display of guest user information in viewonline.',
-	'YES_ONLINE_TRACK'				=> 'Enable display of user online/offline information',
-	'YES_ONLINE_TRACK_EXPLAIN'		=> 'Display online information for user in profiles and topic pages.',
-	'YES_POST_MARKING'				=> 'Enable dotted topics',
-	'YES_POST_MARKING_EXPLAIN'		=> 'Indicates whether user has posted to a topic.',
-	'YES_READ_MARKING'				=> 'Enable server-side topic marking',
-	'YES_READ_MARKING_EXPLAIN'		=> 'Stores read/unread status information in the database rather than a cookie.',
-));
-
-// Auth settings
-$lang = array_merge($lang, array(
-	'ACP_AUTH_SETTINGS_EXPLAIN'	=> 'phpBB supports authentication plug-ins, or modules. These allow you determine how users are authenticated when they log into the board. By default three plug-ins are provided; DB, LDAP and Apache. Not all methods require additional information so only fill out fields if they are relevant to the selected method.',
-
-	'AUTH_METHOD'				=> 'Select an authentication method',
-
-	'APACHE_SETUP_BEFORE_USE'	=> 'You have to setup apache authentication before you switch phpBB to this authentication method. Keep in mind that the username you use for apache authentication has to be the same as your phpBB username. Apache authentication can only be used with mod_php (not with a CGI version) and safe_mode disabled.',
-
-	'LDAP_DN'						=> 'LDAP base <var>dn</var>',
-	'LDAP_DN_EXPLAIN'				=> 'This is the Distinguished Name, locating the user information, e.g. <samp>o=My Company,c=US</samp>.',
-	'LDAP_EMAIL'					=> 'LDAP e-mail attribute',
-	'LDAP_EMAIL_EXPLAIN'			=> 'Set this to the name of your user entry e-mail attribute (if one exists) in order to automatically set the e-mail address for new users. Leaving this empty results in empty e-mail address for users who log in for the first time.',
-	'LDAP_INCORRECT_USER_PASSWORD'	=> 'Binding to LDAP server failed with specified user/password.',
-	'LDAP_NO_EMAIL'					=> 'The specified e-mail attribute does not exist.',
-	'LDAP_NO_IDENTITY'				=> 'Could not find a login identity for %s.',
-	'LDAP_PASSWORD'					=> 'LDAP password',
-	'LDAP_PASSWORD_EXPLAIN'			=> 'Leave blank to use anonymous binding. Else fill in the password for the above user.  Required for Active Directory Servers. <strong>WARNING:</strong> This password will be stored as plain text in the database visible to everybody who can access your database or who can view this configuration page.',
-	'LDAP_PORT'						=> 'LDAP server port',
-	'LDAP_PORT_EXPLAIN'				=> 'Optionally you can specify a port which should be used to connect to the LDAP server instead of the default port 389.',
-	'LDAP_SERVER'					=> 'LDAP server name',
-	'LDAP_SERVER_EXPLAIN'			=> 'If using LDAP this is the hostname or IP address of the LDAP server. Alternatively you can specify an URL like ldap://hostname:port/',
-	'LDAP_UID'						=> 'LDAP <var>uid</var>',
-	'LDAP_UID_EXPLAIN'				=> 'This is the key under which to search for a given login identity, e.g. <var>uid</var>, <var>sn</var>, etc.',
-	'LDAP_USER'						=> 'LDAP user <var>dn</var>',
-	'LDAP_USER_EXPLAIN'				=> 'Leave blank to use anonymous binding. If filled in phpBB uses the specified distinguished name on login attempts to find the correct user, e.g. <samp>uid=Username,ou=MyUnit,o=MyCompany,c=US</samp>. Required for Active Directory Servers.',
-	'LDAP_USER_FILTER'				=> 'LDAP user filter',
-	'LDAP_USER_FILTER_EXPLAIN'		=> 'Optionally you can further limit the searched objects with additional filters. For example <samp>objectClass=posixGroup</samp> would result in the use of <samp>(&amp;(uid=$username)(objectClass=posixGroup))</samp>',
-));
-
-// Server Settings
-$lang = array_merge($lang, array(
-	'ACP_SERVER_SETTINGS_EXPLAIN'	=> 'Here you define server and domain dependant settings. Please ensure the data you enter is accurate, errors will result in e-mails containing incorrect information. When entering the domain name remember it does include http:// or other protocol term. Only alter the port number if you know your server uses a different value, port 80 is correct in most cases.',
-
-	'ENABLE_GZIP'				=> 'Enable GZip compression',
-	'ENABLE_GZIP_EXPLAIN'		=> 'Generated content will be compressed prior to sending it to the user. This can reduce network traffic but will also increase CPU usage on both server and client side.',
-	'FORCE_SERVER_VARS'			=> 'Force server URL settings',
-	'FORCE_SERVER_VARS_EXPLAIN'	=> 'If set to yes the server settings defined here will be used in favour of the automatically determined values.',
-	'ICONS_PATH'				=> 'Post icons storage path',
-	'ICONS_PATH_EXPLAIN'		=> 'Path under your phpBB root directory, e.g. <samp>images/icons</samp>.',
-	'PATH_SETTINGS'				=> 'Path settings',
-	'RANKS_PATH'				=> 'Rank image storage path',
-	'RANKS_PATH_EXPLAIN'		=> 'Path under your phpBB root directory, e.g. <samp>images/ranks</samp>.',
-	'SCRIPT_PATH'				=> 'Script path',
-	'SCRIPT_PATH_EXPLAIN'		=> 'The path where phpBB is located relative to the domain name, e.g. <samp>/phpBB3</samp>.',
-	'SERVER_NAME'				=> 'Domain name',
-	'SERVER_NAME_EXPLAIN'		=> 'The domain name this board runs from (for example: <samp>www.example.com</samp>).',
-	'SERVER_PORT'				=> 'Server port',
-	'SERVER_PORT_EXPLAIN'		=> 'The port your server is running on, usually 80, only change if different.',
-	'SERVER_PROTOCOL'			=> 'Server protocol',
-	'SERVER_PROTOCOL_EXPLAIN'	=> 'This is used as the server protocol if these settings are forced. If empty or not forced the protocol is determined by the cookie secure settings (<samp>http://</samp> or <samp>https://</samp>).',
-	'SERVER_URL_SETTINGS'		=> 'Server URL settings',
-	'SMILIES_PATH'				=> 'Smilies storage path',
-	'SMILIES_PATH_EXPLAIN'		=> 'Path under your phpBB root directory, e.g. <samp>images/smilies</samp>.',
-	'UPLOAD_ICONS_PATH'			=> 'Extension group icons storage path',
-	'UPLOAD_ICONS_PATH_EXPLAIN'	=> 'Path under your phpBB root directory, e.g. <samp>images/upload_icons</samp>.',
-));
-
-// Security Settings
-$lang = array_merge($lang, array(
-	'ACP_SECURITY_SETTINGS_EXPLAIN'		=> 'Here you are able to define session and login related settings.',
-
-	'ALL'							=> 'All',
-	'ALLOW_AUTOLOGIN'				=> 'Allow persistent logins',
-	'ALLOW_AUTOLOGIN_EXPLAIN'		=> 'Determines whether users can autologin when they visit the board.',
-	'AUTOLOGIN_LENGTH'				=> 'Persistent login key expiration length (in days)',
-	'AUTOLOGIN_LENGTH_EXPLAIN'		=> 'Number of days after which persistent login keys are removed or zero to disable.',
-	'BROWSER_VALID'					=> 'Validate browser',
-	'BROWSER_VALID_EXPLAIN'			=> 'Enables browser validation for each session improving security.',
-	'CHECK_DNSBL'					=> 'Check IP against DNS Blackhole List',
-	'CHECK_DNSBL_EXPLAIN'			=> 'If enabled the user’s IP address is checked against the following DNSBL services on registration and posting: <a href="http://spamcop.net">spamcop.net</a> and <a href="http://www.spamhaus.org">www.spamhaus.org</a>. This lookup may take a while, depending on the server’s configuration. If slowdowns are experienced or too many false positives reported it is recommended to disable this check.',
-	'CLASS_B'						=> 'A.B',
-	'CLASS_C'						=> 'A.B.C',
-	'EMAIL_CHECK_MX'				=> 'Check e-mail domain for valid MX record',
-	'EMAIL_CHECK_MX_EXPLAIN'		=> 'If enabled, the e-mail domain provided on registration and profile changes is checked for a valid MX record.',
-	'FORCE_PASS_CHANGE'				=> 'Force password change',
-	'FORCE_PASS_CHANGE_EXPLAIN'		=> 'Require user to change their password after a set number of days. Setting this value to 0 disables this behaviour.',
-	'FORM_TIME_MAX'					=> 'Maximum time to submit forms',
-	'FORM_TIME_MAX_EXPLAIN'			=> 'The time a user has to submit a form. Use -1 to disable. Note that a form might become invalid if the session expires, regardless of this setting.',
-	'FORM_SID_GUESTS'				=> 'Tie forms to guest sessions',
-	'FORM_SID_GUESTS_EXPLAIN'		=> 'If enabled, the form token issued to guests will be session-exclusive. This can cause problems with some ISPs.',
-	'FORWARDED_FOR_VALID'			=> 'Validated <var>X_FORWARDED_FOR</var> header',
-	'FORWARDED_FOR_VALID_EXPLAIN'	=> 'Sessions will only be continued if the sent <var>X_FORWARDED_FOR</var> header equals the one sent with the previous request. Bans will be checked against IPs in <var>X_FORWARDED_FOR</var> too.',
-	'IP_VALID'						=> 'Session IP validation',
-	'IP_VALID_EXPLAIN'				=> 'Determines how much of the users IP is used to validate a session; <samp>All</samp> compares the complete address, <samp>A.B.C</samp> the first x.x.x, <samp>A.B</samp> the first x.x, <samp>None</samp> disables checking. On IPv6 addresses <samp>A.B.C</samp> compares the first 4 blocks and <samp>A.B</samp> the first 3 blocks.',
-	'MAX_LOGIN_ATTEMPTS'			=> 'Maximum number of login attempts',
-	'MAX_LOGIN_ATTEMPTS_EXPLAIN'	=> 'After this number of failed logins the user needs to additionally confirm his login visually (visual confirmation).',
-	'NO_IP_VALIDATION'				=> 'None',
-	'NO_REF_VALIDATION'				=> 'None',
-	'PASSWORD_TYPE'					=> 'Password complexity',
-	'PASSWORD_TYPE_EXPLAIN'			=> 'Determines how complex a password needs to be when set or altered, subsequent options include the previous ones.',
-	'PASS_TYPE_ALPHA'				=> 'Must contain letters and numbers',
-	'PASS_TYPE_ANY'					=> 'No requirements',
-	'PASS_TYPE_CASE'				=> 'Must be mixed case',
-	'PASS_TYPE_SYMBOL'				=> 'Must contain symbols',
-	'REF_HOST'						=> 'Only validate host',
-	'REF_PATH'						=> 'Also validate path',
-	'REFERER_VALID'					=> 'Validate Referer',
-	'REFERER_VALID_EXPLAIN'			=> 'If enabled, the referer of POST requests will be checked against the host/script path settings. This may cause issues with boards using several domains and or external logins.',
-	'TPL_ALLOW_PHP'					=> 'Allow php in templates',
-	'TPL_ALLOW_PHP_EXPLAIN'			=> 'If this option is enabled, <code>PHP</code> and <code>INCLUDEPHP</code> statements will be recognised and parsed in templates.',
-));
-
-// Email Settings
-$lang = array_merge($lang, array(
-	'ACP_EMAIL_SETTINGS_EXPLAIN'	=> 'This information is used when the board sends e-mails to your users. Please ensure the e-mail address you specify is valid, any bounced or undeliverable messages will likely be sent to that address. If your host does not provide a native (PHP based) e-mail service you can instead send messages directly using SMTP. This requires the address of an appropriate server (ask your provider if necessary). If the server requires authentication (and only if it does) enter the necessary username, password and authentication method.',
-
-	'ADMIN_EMAIL'					=> 'Return e-mail address',
-	'ADMIN_EMAIL_EXPLAIN'			=> 'This will be used as the return address on all e-mails, the technical contact e-mail address. It will always be used as the <samp>Return-Path</samp> and <samp>Sender</samp> address in e-mails.',
-	'BOARD_EMAIL_FORM'				=> 'Users send e-mail via board',
-	'BOARD_EMAIL_FORM_EXPLAIN'		=> 'Instead of showing the users e-mail address users are able to send e-mails via the board.',
-	'BOARD_HIDE_EMAILS'				=> 'Hide e-mail addresses',
-	'BOARD_HIDE_EMAILS_EXPLAIN'		=> 'This function keeps e-mail addresses completely private.',
-	'CONTACT_EMAIL'					=> 'Contact e-mail address',
-	'CONTACT_EMAIL_EXPLAIN'			=> 'This address will be used whenever a specific contact point is needed, e.g. spam, error output, etc. It will always be used as the <samp>From</samp> and <samp>Reply-To</samp> address in e-mails.',
-	'EMAIL_FUNCTION_NAME'			=> 'E-mail function name',
-	'EMAIL_FUNCTION_NAME_EXPLAIN'	=> 'The e-mail function used to send mails through PHP.',
-	'EMAIL_PACKAGE_SIZE'			=> 'E-mail package size',
-	'EMAIL_PACKAGE_SIZE_EXPLAIN'	=> 'This is the number of maximum e-mails sent out in one package. This setting is applied to the internal message queue; set this value to 0 if you have problems with non-delivered notification e-mails.',
-	'EMAIL_SIG'						=> 'E-mail signature',
-	'EMAIL_SIG_EXPLAIN'				=> 'This text will be attached to all e-mails the board sends.',
-	'ENABLE_EMAIL'					=> 'Enable board-wide e-mails',
-	'ENABLE_EMAIL_EXPLAIN'			=> 'If this is set to disabled no e-mails will be sent by the board at all.',
-	'SMTP_AUTH_METHOD'				=> 'Authentication method for SMTP',
-	'SMTP_AUTH_METHOD_EXPLAIN'		=> 'Only used if a username/password is set, ask your provider if you are unsure which method to use.',
-	'SMTP_CRAM_MD5'					=> 'CRAM-MD5',
-	'SMTP_DIGEST_MD5'				=> 'DIGEST-MD5',
-	'SMTP_LOGIN'					=> 'LOGIN',
-	'SMTP_PASSWORD'					=> 'SMTP password',
-	'SMTP_PASSWORD_EXPLAIN'			=> 'Only enter a password if your SMTP server requires it.',
-	'SMTP_PLAIN'					=> 'PLAIN',
-	'SMTP_POP_BEFORE_SMTP'			=> 'POP-BEFORE-SMTP',
-	'SMTP_PORT'						=> 'SMTP server port',
-	'SMTP_PORT_EXPLAIN'				=> 'Only change this if you know your SMTP server is on a different port.',
-	'SMTP_SERVER'					=> 'SMTP server address',
-	'SMTP_SETTINGS'					=> 'SMTP settings',
-	'SMTP_USERNAME'					=> 'SMTP username',
-	'SMTP_USERNAME_EXPLAIN'			=> 'Only enter a username if your SMTP server requires it.',
-	'USE_SMTP'						=> 'Use SMTP server for e-mail',
-	'USE_SMTP_EXPLAIN'				=> 'Select “Yes” if you want or have to send e-mail via a named server instead of the local mail function.',
-));
-
-// Jabber settings
-$lang = array_merge($lang, array(
-	'ACP_JABBER_SETTINGS_EXPLAIN'	=> 'Here you can enable and control the use of Jabber for instant messaging and board notifications. Jabber is an open source protocol and therefore available for use by anyone. Some Jabber servers include gateways or transports which allow you to contact users on other networks. Not all servers offer all transports and changes in protocols can prevent transports from operating. Please be sure to enter already registered account details - phpBB will use the details you enter here as is.',
-
-	'JAB_ENABLE'				=> 'Enable Jabber',
-	'JAB_ENABLE_EXPLAIN'		=> 'Enables use of Jabber messaging and notifications.',
-	'JAB_GTALK_NOTE'			=> 'Please note that GTalk will not work because the <samp>dns_get_record</samp> function could not be found. This function is not available in PHP4, and is not implemented on Windows platforms. It currently does not work on BSD-based systems, including Mac OS.',
-	'JAB_PACKAGE_SIZE'			=> 'Jabber package size',
-	'JAB_PACKAGE_SIZE_EXPLAIN'	=> 'This is the number of messages sent in one package. If set to 0 the message is sent immediately and will not be queued for later sending.',
-	'JAB_PASSWORD'				=> 'Jabber password',
-	'JAB_PORT'					=> 'Jabber port',
-	'JAB_PORT_EXPLAIN'			=> 'Leave blank unless you know it is not port 5222.',
-	'JAB_SERVER'				=> 'Jabber server',
-	'JAB_SERVER_EXPLAIN'		=> 'See %sjabber.org%s for a list of servers.',
-	'JAB_SETTINGS_CHANGED'		=> 'Jabber settings changed successfully.',
-	'JAB_USE_SSL'				=> 'Use SSL to connect',
-	'JAB_USE_SSL_EXPLAIN'		=> 'If enabled a secure connection is tried to be established. The Jabber port will be modified to 5223 if port 5222 is specified.',
-	'JAB_USERNAME'				=> 'Jabber username or JID',
-	'JAB_USERNAME_EXPLAIN'		=> 'Specify a registered username or a valid JID. The username will not be checked for validity. If you only specify a username, then your JID will be the username and the server you specified above. Else, specify a valid JID, for example user@jabber.org.',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/acp/bots.php b/phpBB/language/en/acp/bots.php
deleted file mode 100644
index 3b63f2ea2e..0000000000
--- a/phpBB/language/en/acp/bots.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
-*
-* acp_bots [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-// Bot settings
-$lang = array_merge($lang, array(
-	'BOTS'				=> 'Manage bots',
-	'BOTS_EXPLAIN'		=> '“Bots”, “spiders” or “crawlers” are automated agents most commonly used by search engines to update their databases. Since they rarely make proper use of sessions they can distort visitor counts, increase load and sometimes fail to index sites correctly. Here you can define a special type of user to overcome these problems.',
-	'BOT_ACTIVATE'		=> 'Activate',
-	'BOT_ACTIVE'		=> 'Bot active',
-	'BOT_ADD'			=> 'Add bot',
-	'BOT_ADDED'			=> 'New bot successfully added.',
-	'BOT_AGENT'			=> 'Agent match',
-	'BOT_AGENT_EXPLAIN'	=> 'A string matching the bots browser agent, partial matches are allowed.',
-	'BOT_DEACTIVATE'	=> 'Deactivate',
-	'BOT_DELETED'		=> 'Bot deleted successfully.',
-	'BOT_EDIT'			=> 'Edit bots',
-	'BOT_EDIT_EXPLAIN'	=> 'Here you can add or edit an existing bot entry. You may define an agent string and/or one or more IP addresses (or range of addresses) to match. Be careful when defining matching agent strings or addresses. You may also specify a style and language that the bot will view the board using. This may allow you to reduce bandwidth use by setting a simple style for bots. Remember to set appropriate permissions for the special Bot usergroup.',
-	'BOT_LANG'			=> 'Bot language',
-	'BOT_LANG_EXPLAIN'	=> 'The language presented to the bot as it browses.',
-	'BOT_LAST_VISIT'	=> 'Last visit',
-	'BOT_IP'			=> 'Bot IP address',
-	'BOT_IP_EXPLAIN'	=> 'Partial matches are allowed, separate addresses with a comma.',
-	'BOT_NAME'			=> 'Bot name',
-	'BOT_NAME_EXPLAIN'	=> 'Used only for your own information.',
-	'BOT_NAME_TAKEN'	=> 'The name is already in use on your board and can’t be used for the Bot.',
-	'BOT_NEVER'			=> 'Never',
-	'BOT_STYLE'			=> 'Bot style',
-	'BOT_STYLE_EXPLAIN'	=> 'The style used for the board by the bot.',
-	'BOT_UPDATED'		=> 'Existing bot updated successfully.',
-
-	'ERR_BOT_AGENT_MATCHES_UA'	=> 'The bot agent you supplied is similar to the one you are currently using. Please adjust the agent for this bot.',
-	'ERR_BOT_NO_IP'				=> 'The IP addresses you supplied were invalid or the hostname could not be resolved.',
-	'ERR_BOT_NO_MATCHES'		=> 'You must supply at least one of an agent or IP for this bot match.',
-
-	'NO_BOT'		=> 'Found no bot with the specified ID.',
-	'NO_BOT_GROUP'	=> 'Unable to find special bot group.',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
deleted file mode 100644
index d1157b4dc4..0000000000
--- a/phpBB/language/en/acp/common.php
+++ /dev/null
@@ -1,692 +0,0 @@
-<?php
-/**
-*
-* acp_common [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-// Common
-$lang = array_merge($lang, array(
-	'ACP_ADMINISTRATORS'		=> 'Administrators',
-	'ACP_ADMIN_LOGS'			=> 'Admin log',
-	'ACP_ADMIN_ROLES'			=> 'Admin roles',
-	'ACP_ATTACHMENTS'			=> 'Attachments',
-	'ACP_ATTACHMENT_SETTINGS'	=> 'Attachment settings',
-	'ACP_AUTH_SETTINGS'			=> 'Authentication',
-	'ACP_AUTOMATION'			=> 'Automation',
-	'ACP_AVATAR_SETTINGS'		=> 'Avatar settings',
-
-	'ACP_BACKUP'				=> 'Backup',
-	'ACP_BAN'					=> 'Banning',
-	'ACP_BAN_EMAILS'			=> 'Ban e-mails',
-	'ACP_BAN_IPS'				=> 'Ban IPs',
-	'ACP_BAN_USERNAMES'			=> 'Ban usernames',
-	'ACP_BBCODES'				=> 'BBCodes',
-	'ACP_BOARD_CONFIGURATION'	=> 'Board configuration',
-	'ACP_BOARD_FEATURES'		=> 'Board features',
-	'ACP_BOARD_MANAGEMENT'		=> 'Board management',
-	'ACP_BOARD_SETTINGS'		=> 'Board settings',
-	'ACP_BOTS'					=> 'Spiders/Robots',
-
-	'ACP_CAPTCHA'				=> 'CAPTCHA',
-
-	'ACP_CAT_DATABASE'			=> 'Database',
-	'ACP_CAT_DOT_MODS'			=> '.MODs',
-	'ACP_CAT_FORUMS'			=> 'Forums',
-	'ACP_CAT_GENERAL'			=> 'General',
-	'ACP_CAT_MAINTENANCE'		=> 'Maintenance',
-	'ACP_CAT_PERMISSIONS'		=> 'Permissions',
-	'ACP_CAT_POSTING'			=> 'Posting',
-	'ACP_CAT_STYLES'			=> 'Styles',
-	'ACP_CAT_SYSTEM'			=> 'System',
-	'ACP_CAT_USERGROUP'			=> 'Users and Groups',
-	'ACP_CAT_USERS'				=> 'Users',
-	'ACP_CLIENT_COMMUNICATION'	=> 'Client communication',
-	'ACP_COOKIE_SETTINGS'		=> 'Cookie settings',
-	'ACP_CRITICAL_LOGS'			=> 'Error log',
-	'ACP_CUSTOM_PROFILE_FIELDS'	=> 'Custom profile fields',
-
-	'ACP_DATABASE'				=> 'Database management',
-	'ACP_DISALLOW'				=> 'Disallow',
-	'ACP_DISALLOW_USERNAMES'	=> 'Disallow usernames',
-
-	'ACP_EMAIL_SETTINGS'		=> 'E-mail settings',
-	'ACP_EXTENSION_GROUPS'		=> 'Manage extension groups',
-
-	'ACP_FORUM_BASED_PERMISSIONS'	=> 'Forum based permissions',
-	'ACP_FORUM_LOGS'				=> 'Forum logs',
-	'ACP_FORUM_MANAGEMENT'			=> 'Forum management',
-	'ACP_FORUM_MODERATORS'			=> 'Forum moderators',
-	'ACP_FORUM_PERMISSIONS'			=> 'Forum permissions',
-	'ACP_FORUM_ROLES'				=> 'Forum roles',
-
-	'ACP_GENERAL_CONFIGURATION'		=> 'General configuration',
-	'ACP_GENERAL_TASKS'				=> 'General tasks',
-	'ACP_GLOBAL_MODERATORS'			=> 'Global moderators',
-	'ACP_GLOBAL_PERMISSIONS'		=> 'Global permissions',
-	'ACP_GROUPS'					=> 'Groups',
-	'ACP_GROUPS_FORUM_PERMISSIONS'	=> 'Groups’ forum permissions',
-	'ACP_GROUPS_MANAGE'				=> 'Manage groups',
-	'ACP_GROUPS_MANAGEMENT'			=> 'Group management',
-	'ACP_GROUPS_PERMISSIONS'		=> 'Groups’ permissions',
-
-	'ACP_ICONS'					=> 'Topic icons',
-	'ACP_ICONS_SMILIES'			=> 'Topic icons/smilies',
-	'ACP_IMAGESETS'				=> 'Imagesets',
-	'ACP_INACTIVE_USERS'		=> 'Inactive users',
-	'ACP_INDEX'					=> 'ACP index',
-
-	'ACP_JABBER_SETTINGS'		=> 'Jabber settings',
-
-	'ACP_LANGUAGE'				=> 'Language management',
-	'ACP_LANGUAGE_PACKS'		=> 'Language packs',
-	'ACP_LOAD_SETTINGS'			=> 'Load settings',
-	'ACP_LOGGING'				=> 'Logging',
-
-	'ACP_MAIN'					=> 'ACP index',
-	'ACP_MANAGE_EXTENSIONS'		=> 'Manage extensions',
-	'ACP_MANAGE_FORUMS'			=> 'Manage forums',
-	'ACP_MANAGE_RANKS'			=> 'Manage ranks',
-	'ACP_MANAGE_REASONS'		=> 'Manage report/denial reasons',
-	'ACP_MANAGE_USERS'			=> 'Manage users',
-	'ACP_MASS_EMAIL'			=> 'Mass e-mail',
-	'ACP_MESSAGES'				=> 'Messages',
-	'ACP_MESSAGE_SETTINGS'		=> 'Private message settings',
-	'ACP_MODULE_MANAGEMENT'		=> 'Module management',
-	'ACP_MOD_LOGS'				=> 'Moderator log',
-	'ACP_MOD_ROLES'				=> 'Moderator roles',
-
-	'ACP_NO_ITEMS'				=> 'There are no items yet.',
-
-	'ACP_ORPHAN_ATTACHMENTS'	=> 'Orphaned attachments',
-
-	'ACP_PERMISSIONS'			=> 'Permissions',
-	'ACP_PERMISSION_MASKS'		=> 'Permission masks',
-	'ACP_PERMISSION_ROLES'		=> 'Permission roles',
-	'ACP_PERMISSION_TRACE'		=> 'Permission trace',
-	'ACP_PHP_INFO'				=> 'PHP information',
-	'ACP_POST_SETTINGS'			=> 'Post settings',
-	'ACP_PRUNE_FORUMS'			=> 'Prune forums',
-	'ACP_PRUNE_USERS'			=> 'Prune users',
-	'ACP_PRUNING'				=> 'Pruning',
-
-	'ACP_QUICK_ACCESS'			=> 'Quick access',
-
-	'ACP_RANKS'					=> 'Ranks',
-	'ACP_REASONS'				=> 'Report/denial reasons',
-	'ACP_REGISTER_SETTINGS'		=> 'User registration settings',
-
-	'ACP_RESTORE'				=> 'Restore',
-
-	'ACP_SEARCH'				=> 'Search configuration',
-	'ACP_SEARCH_INDEX'			=> 'Search index',
-	'ACP_SEARCH_SETTINGS'		=> 'Search settings',
-
-	'ACP_SECURITY_SETTINGS'		=> 'Security settings',
-	'ACP_SERVER_CONFIGURATION'	=> 'Server configuration',
-	'ACP_SERVER_SETTINGS'		=> 'Server settings',
-	'ACP_SIGNATURE_SETTINGS'	=> 'Signature settings',
-	'ACP_SMILIES'				=> 'Smilies',
-	'ACP_STYLE_COMPONENTS'		=> 'Style components',
-	'ACP_STYLE_MANAGEMENT'		=> 'Style management',
-	'ACP_STYLES'				=> 'Styles',
-
-	'ACP_TEMPLATES'				=> 'Templates',
-	'ACP_THEMES'				=> 'Themes',
-
-	'ACP_UPDATE'					=> 'Updating',
-	'ACP_USERS_FORUM_PERMISSIONS'	=> 'Users’ forum permissions',
-	'ACP_USERS_LOGS'				=> 'User logs',
-	'ACP_USERS_PERMISSIONS'			=> 'Users’ permissions',
-	'ACP_USER_ATTACH'				=> 'Attachments',
-	'ACP_USER_AVATAR'				=> 'Avatar',
-	'ACP_USER_FEEDBACK'				=> 'Feedback',
-	'ACP_USER_GROUPS'				=> 'Groups',
-	'ACP_USER_MANAGEMENT'			=> 'User management',
-	'ACP_USER_OVERVIEW'				=> 'Overview',
-	'ACP_USER_PERM'					=> 'Permissions',
-	'ACP_USER_PREFS'				=> 'Preferences',
-	'ACP_USER_PROFILE'				=> 'Profile',
-	'ACP_USER_RANK'					=> 'Rank',
-	'ACP_USER_ROLES'				=> 'User roles',
-	'ACP_USER_SECURITY'				=> 'User security',
-	'ACP_USER_SIG'					=> 'Signature',
-
-	'ACP_VC_SETTINGS'					=> 'Visual confirmation settings',
-	'ACP_VC_CAPTCHA_DISPLAY'			=> 'CAPTCHA image preview',
-	'ACP_VERSION_CHECK'					=> 'Check for updates',
-	'ACP_VIEW_ADMIN_PERMISSIONS'		=> 'View administrative permissions',
-	'ACP_VIEW_FORUM_MOD_PERMISSIONS'	=> 'View forum moderation permissions',
-	'ACP_VIEW_FORUM_PERMISSIONS'		=> 'View forum-based permissions',
-	'ACP_VIEW_GLOBAL_MOD_PERMISSIONS'	=> 'View global moderation permissions',
-	'ACP_VIEW_USER_PERMISSIONS'			=> 'View user-based permissions',
-
-	'ACP_WORDS'					=> 'Word censoring',
-
-	'ACTION'				=> 'Action',
-	'ACTIONS'				=> 'Actions',
-	'ACTIVATE'				=> 'Activate',
-	'ADD'					=> 'Add',
-	'ADMIN'					=> 'Administration',
-	'ADMIN_INDEX'			=> 'Admin index',
-	'ADMIN_PANEL'			=> 'Administration Control Panel',
-
-	'ADM_LOGOUT'			=> 'ACP&nbsp;Logout',
-	'ADM_LOGGED_OUT'		=> 'Successfully logged out from Administration Control Panel',
-
-	'BACK'					=> 'Back',
-
-	'COLOUR_SWATCH'			=> 'Web-safe colour swatch',
-	'CONFIG_UPDATED'		=> 'Configuration updated successfully.',
-
-	'DEACTIVATE'				=> 'Deactivate',
-	'DIRECTORY_DOES_NOT_EXIST'	=> 'The entered path “%s” does not exist.',
-	'DIRECTORY_NOT_DIR'			=> 'The entered path “%s” is not a directory.',
-	'DIRECTORY_NOT_WRITABLE'	=> 'The entered path “%s” is not writable.',
-	'DISABLE'					=> 'Disable',
-	'DOWNLOAD'					=> 'Download',
-	'DOWNLOAD_AS'				=> 'Download as',
-	'DOWNLOAD_STORE'			=> 'Download or store file',
-	'DOWNLOAD_STORE_EXPLAIN'	=> 'You may directly download the file or save it in your <samp>store/</samp> folder.',
-
-	'EDIT'					=> 'Edit',
-	'ENABLE'				=> 'Enable',
-	'EXPORT_DOWNLOAD'		=> 'Download',
-	'EXPORT_STORE'			=> 'Store',
-
-	'GENERAL_OPTIONS'		=> 'General options',
-	'GENERAL_SETTINGS'		=> 'General settings',
-	'GLOBAL_MASK'			=> 'Global permission mask',
-
-	'INSTALL'				=> 'Install',
-	'IP'					=> 'User IP',
-	'IP_HOSTNAME'			=> 'IP addresses or hostnames',
-
-	'LOGGED_IN_AS'			=> 'You are logged in as:',
-	'LOGIN_ADMIN'			=> 'To administer the board you must be an authenticated user.',
-	'LOGIN_ADMIN_CONFIRM'	=> 'To administer the board you must re-authenticate yourself.',
-	'LOGIN_ADMIN_SUCCESS'	=> 'You have successfully authenticated and will now be redirected to the Administration Control Panel.',
-	'LOOK_UP_FORUM'			=> 'Select a forum',
-	'LOOK_UP_FORUMS_EXPLAIN'=> 'You are able to select more than one forum.',
-
-	'LOGIN_REDIRECT'		=> 'You have been successfully logged in.',
-	'MANAGE'				=> 'Manage',
-	'MENU_TOGGLE'			=> 'Hide or display the side menu',
-	'MOVE_DOWN'				=> 'Move down',
-	'MOVE_UP'				=> 'Move up',
-
-	'NOTIFY'				=> 'Notification',
-	'NO_ADMIN'				=> 'You are not authorised to administrate this board.',
-	'NO_EMAILS_DEFINED'		=> 'No valid e-mail addresses found.',
-	'NO_PASSWORD_SUPPLIED'	=> 'You need to enter your password to access the Administration Control Panel.',
-
-	'OFF'					=> 'Off',
-	'ON'					=> 'On',
-
-	'PARSE_BBCODE'						=> 'Parse BBCode',
-	'PARSE_SMILIES'						=> 'Parse smilies',
-	'PARSE_URLS'						=> 'Parse links',
-	'PERMISSIONS_TRANSFERRED'			=> 'Permissions transferred',
-	'PERMISSIONS_TRANSFERRED_EXPLAIN'	=> 'You currently have the permissions from %1$s. You are able to browse the board with this user’s permissions, but not access the administration control panel since admin permissions were not transferred. You can <a href="%2$s"><strong>revert to your permission set</strong></a> at any time.',
-	'PIXEL'								=> 'px',
-	'PROCEED_TO_ACP'					=> '%sProceed to the ACP%s',
-
-	'REMIND'							=> 'Remind',
-	'RESYNC'							=> 'Resynchronise',
-	'RETURN_TO'							=> 'Return to…',
-
-	'SELECT_ANONYMOUS'		=> 'Select anonymous user',
-	'SELECT_OPTION'			=> 'Select option',
-
-	'SETTING_TOO_LOW'		=> 'The entered value for the setting “%1$s” is too low. The minimal allowed value is %2$d.',
-	'SETTING_TOO_BIG'		=> 'The entered value for the setting “%1$s” is too big. The maximal allowed value is %2$d.',
-	'SETTING_TOO_LONG'		=> 'The entered value for the setting “%1$s” is too long. The maximal allowed length is %2$d.',
-	'SETTING_TOO_SHORT'		=> 'The entered value for the setting “%1$s” is not long enough. The minimal allowed length is %2$d.',
-
-	'UCP'					=> 'User Control Panel',
-	'USERNAMES_EXPLAIN'		=> 'Place each username on a separate line.',
-	'USER_CONTROL_PANEL'	=> 'User Control Panel',
-
-	'WARNING'				=> 'Warning',
-));
-
-// PHP info
-$lang = array_merge($lang, array(
-	'ACP_PHP_INFO_EXPLAIN'	=> 'This page lists information on the version of PHP installed on this server. It includes details of loaded modules, available variables and default settings. This information may be useful when diagnosing problems. Please be aware that some hosting companies will limit what information is displayed here for security reasons. You are advised to not give out any details on this page except when asked by <a href="http://www.phpbb.com/about/team/">official team members</a> on the support forums.',
-
-	'NO_PHPINFO_AVAILABLE'	=> 'Information about your PHP configuration is unable to be determined. Phpinfo() has been disabled for security reasons.',
-));
-
-// Logs
-$lang = array_merge($lang, array(
-	'ACP_ADMIN_LOGS_EXPLAIN'	=> 'This lists all the actions carried out by board administrators. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
-	'ACP_CRITICAL_LOGS_EXPLAIN'	=> 'This lists the actions carried out by the board itself. This log provides you with information you are able to use for solving specific problems, for example non-delivery of e-mails. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
-	'ACP_MOD_LOGS_EXPLAIN'		=> 'This lists all actions done on forums, topics and posts as well as actions carried out on users by moderators, including banning. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
-	'ACP_USERS_LOGS_EXPLAIN'	=> 'This lists all actions carried out by users or on users (reports, warnings and user notes).',
-	'ALL_ENTRIES'				=> 'All entries',
-
-	'DISPLAY_LOG'	=> 'Display entries from previous',
-
-	'NO_ENTRIES'	=> 'No log entries for this period.',
-
-	'SORT_IP'		=> 'IP address',
-	'SORT_DATE'		=> 'Date',
-	'SORT_ACTION'	=> 'Log action',
-));
-
-// Index page
-$lang = array_merge($lang, array(
-	'ADMIN_INTRO'				=> 'Thank you for choosing phpBB as your board solution. This screen will give you a quick overview of all the various statistics of your board. The links on the left hand side of this screen allow you to control every aspect of your board experience. Each page will have instructions on how to use the tools.',
-	'ADMIN_LOG'					=> 'Logged administrator actions',
-	'ADMIN_LOG_INDEX_EXPLAIN'	=> 'This gives an overview of the last five actions carried out by board administrators. A full copy of the log can be viewed from the appropriate menu item or following the link below.',
-	'AVATAR_DIR_SIZE'			=> 'Avatar directory size',
-
-	'BOARD_STARTED'		=> 'Board started',
-	'BOARD_VERSION'		=> 'Board version',
-
-	'DATABASE_SERVER_INFO'	=> 'Database server',
-	'DATABASE_SIZE'			=> 'Database size',
-
-	'FILES_PER_DAY'		=> 'Attachments per day',
-	'FORUM_STATS'		=> 'Board statistics',
-
-	'GZIP_COMPRESSION'	=> 'GZip compression',
-
-	'NOT_AVAILABLE'		=> 'Not available',
-	'NUMBER_FILES'		=> 'Number of attachments',
-	'NUMBER_POSTS'		=> 'Number of posts',
-	'NUMBER_TOPICS'		=> 'Number of topics',
-	'NUMBER_USERS'		=> 'Number of users',
-	'NUMBER_ORPHAN'		=> 'Orphan attachments',
-
-	'POSTS_PER_DAY'		=> 'Posts per day',
-
-	'PURGE_CACHE'			=> 'Purge the cache',
-	'PURGE_CACHE_CONFIRM'	=> 'Are you sure you wish to purge the cache?',
-	'PURGE_CACHE_EXPLAIN'	=> 'Purge all cache related items, this includes any cached template files or queries.',
-
-	'RESET_DATE'					=> 'Reset board’s start date',
-	'RESET_DATE_CONFIRM'			=> 'Are you sure you wish to reset the board’s start date?',
-	'RESET_ONLINE'					=> 'Reset most users ever online',
-	'RESET_ONLINE_CONFIRM'			=> 'Are you sure you wish to reset the most users ever online counter?',
-	'RESYNC_POSTCOUNTS'				=> 'Resynchronise post counts',
-	'RESYNC_POSTCOUNTS_EXPLAIN'		=> 'Only existing posts will be taken into consideration. Pruned posts will not be counted.',
-	'RESYNC_POSTCOUNTS_CONFIRM'		=> 'Are you sure you wish to resynchronise post counts?',
-	'RESYNC_POST_MARKING'			=> 'Resynchronise dotted topics',
-	'RESYNC_POST_MARKING_CONFIRM'	=> 'Are you sure you wish to resynchronise dotted topics?',
-	'RESYNC_POST_MARKING_EXPLAIN'	=> 'First unmarks all topics and then correctly marks topics that have seen any activity during the past six months.',
-	'RESYNC_STATS'					=> 'Resynchronise statistics',
-	'RESYNC_STATS_CONFIRM'			=> 'Are you sure you wish to resynchronise statistics?',
-	'RESYNC_STATS_EXPLAIN'			=> 'Recalculates the total number of posts, topics, users and files.',
-	'RUN'							=> 'Run now',
-
-	'STATISTIC'					=> 'Statistic',
-	'STATISTIC_RESYNC_OPTIONS'	=> 'Resynchronise or reset statistics',
-
-	'TOPICS_PER_DAY'	=> 'Topics per day',
-
-	'UPLOAD_DIR_SIZE'	=> 'Size of posted attachments',
-	'USERS_PER_DAY'		=> 'Users per day',
-
-	'VALUE'					=> 'Value',
-	'VIEW_ADMIN_LOG'		=> 'View administrator log',
-	'VIEW_INACTIVE_USERS'	=> 'View inactive users',
-
-	'WELCOME_PHPBB'			=> 'Welcome to phpBB',
-	'WRITABLE_CONFIG'		=> 'Your config file (config.php) is currently world-writable. We strongly encourage you to change the permissions to 640 or at least to 644 (for example: <a href="http://en.wikipedia.org/wiki/Chmod" rel="external">chmod</a> 640 config.php).',
-));
-
-// Inactive Users
-$lang = array_merge($lang, array(
-	'INACTIVE_DATE'					=> 'Inactive date',
-	'INACTIVE_REASON'				=> 'Reason',
-	'INACTIVE_REASON_MANUAL'		=> 'Account deactivated by administrator',
-	'INACTIVE_REASON_PROFILE'		=> 'Profile details changed',
-	'INACTIVE_REASON_REGISTER'		=> 'Newly registered account',
-	'INACTIVE_REASON_REMIND'		=> 'Forced user account reactivation',
-	'INACTIVE_REASON_UNKNOWN'		=> 'Unknown',
-	'INACTIVE_USERS'				=> 'Inactive users',
-	'INACTIVE_USERS_EXPLAIN'		=> 'This is a list of users who have registered but whose accounts are inactive. You can activate, delete or remind (by sending an e-mail) these users if you wish.',
-	'INACTIVE_USERS_EXPLAIN_INDEX'	=> 'This is a list of the last 10 registered users who have inactive accounts. A full list is available from the appropriate menu item or by following the link below from where you can activate, delete or remind (by sending an e-mail) these users if you wish.',
-
-	'NO_INACTIVE_USERS'	=> 'No inactive users',
-
-	'SORT_INACTIVE'		=> 'Inactive date',
-	'SORT_LAST_VISIT'	=> 'Last visit',
-	'SORT_REASON'		=> 'Reason',
-	'SORT_REG_DATE'		=> 'Registration date',
-
-	'USER_IS_INACTIVE'		=> 'User is inactive',
-));
-
-// Log Entries
-$lang = array_merge($lang, array(
-	'LOG_ACL_ADD_USER_GLOBAL_U_'		=> '<strong>Added or edited users’ user permissions</strong><br />» %s',
-	'LOG_ACL_ADD_GROUP_GLOBAL_U_'		=> '<strong>Added or edited groups’ user permissions</strong><br />» %s',
-	'LOG_ACL_ADD_USER_GLOBAL_M_'		=> '<strong>Added or edited users’ global moderator permissions</strong><br />» %s',
-	'LOG_ACL_ADD_GROUP_GLOBAL_M_'		=> '<strong>Added or edited groups’ global moderator permissions</strong><br />» %s',
-	'LOG_ACL_ADD_USER_GLOBAL_A_'		=> '<strong>Added or edited users’ administrator permissions</strong><br />» %s',
-	'LOG_ACL_ADD_GROUP_GLOBAL_A_'		=> '<strong>Added or edited groups’ administrator permissions</strong><br />» %s',
-
-	'LOG_ACL_ADD_ADMIN_GLOBAL_A_'		=> '<strong>Added or edited Administrators</strong><br />» %s',
-	'LOG_ACL_ADD_MOD_GLOBAL_M_'			=> '<strong>Added or edited Global Moderators</strong><br />» %s',
-
-	'LOG_ACL_ADD_USER_LOCAL_F_'			=> '<strong>Added or edited users’ forum access</strong> from %1$s<br />» %2$s',
-	'LOG_ACL_ADD_USER_LOCAL_M_'			=> '<strong>Added or edited users’ forum moderator access</strong> from %1$s<br />» %2$s',
-	'LOG_ACL_ADD_GROUP_LOCAL_F_'		=> '<strong>Added or edited groups’ forum access</strong> from %1$s<br />» %2$s',
-	'LOG_ACL_ADD_GROUP_LOCAL_M_'		=> '<strong>Added or edited groups’ forum moderator access</strong> from %1$s<br />» %2$s',
-
-	'LOG_ACL_ADD_MOD_LOCAL_M_'			=> '<strong>Added or edited Moderators</strong> from %1$s<br />» %2$s',
-	'LOG_ACL_ADD_FORUM_LOCAL_F_'		=> '<strong>Added or edited forum permissions</strong> from %1$s<br />» %2$s',
-
-	'LOG_ACL_DEL_ADMIN_GLOBAL_A_'		=> '<strong>Removed Administrators</strong><br />» %s',
-	'LOG_ACL_DEL_MOD_GLOBAL_M_'			=> '<strong>Removed Global Moderators</strong><br />» %s',
-	'LOG_ACL_DEL_MOD_LOCAL_M_'			=> '<strong>Removed Moderators</strong> from %1$s<br />» %2$s',
-	'LOG_ACL_DEL_FORUM_LOCAL_F_'		=> '<strong>Removed User/Group forum permissions</strong> from %1$s<br />» %2$s',
-
-	'LOG_ACL_TRANSFER_PERMISSIONS'		=> '<strong>Permissions transferred from</strong><br />» %s',
-	'LOG_ACL_RESTORE_PERMISSIONS'		=> '<strong>Own permissions restored after using permissions from</strong><br />» %s',
-
-	'LOG_ADMIN_AUTH_FAIL'		=> '<strong>Failed administration login attempt</strong>',
-	'LOG_ADMIN_AUTH_SUCCESS'	=> '<strong>Successful administration login</strong>',
-
-	'LOG_ATTACHMENTS_DELETED'	=> '<strong>Removed user attachments</strong><br />» %s',
-
-	'LOG_ATTACH_EXT_ADD'		=> '<strong>Added or edited attachment extension</strong><br />» %s',
-	'LOG_ATTACH_EXT_DEL'		=> '<strong>Removed attachment extension</strong><br />» %s',
-	'LOG_ATTACH_EXT_UPDATE'		=> '<strong>Updated attachment extension</strong><br />» %s',
-	'LOG_ATTACH_EXTGROUP_ADD'	=> '<strong>Added extension group</strong><br />» %s',
-	'LOG_ATTACH_EXTGROUP_EDIT'	=> '<strong>Edited extension group</strong><br />» %s',
-	'LOG_ATTACH_EXTGROUP_DEL'	=> '<strong>Removed extension group</strong><br />» %s',
-	'LOG_ATTACH_FILEUPLOAD'		=> '<strong>Orphan File uploaded to Post</strong><br />» ID %1$d - %2$s',
-	'LOG_ATTACH_ORPHAN_DEL'		=> '<strong>Orphan Files deleted</strong><br />» %s',
-
-	'LOG_BAN_EXCLUDE_USER'	=> '<strong>Excluded user from ban</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_BAN_EXCLUDE_IP'	=> '<strong>Excluded IP from ban</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_BAN_EXCLUDE_EMAIL' => '<strong>Excluded e-mail from ban</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_BAN_USER'			=> '<strong>Banned user</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_BAN_IP'			=> '<strong>Banned IP</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_BAN_EMAIL'			=> '<strong>Banned e-mail</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_UNBAN_USER'		=> '<strong>Unbanned user</strong><br />» %s',
-	'LOG_UNBAN_IP'			=> '<strong>Unbanned IP</strong><br />» %s',
-	'LOG_UNBAN_EMAIL'		=> '<strong>Unbanned e-mail</strong><br />» %s',
-
-	'LOG_BBCODE_ADD'		=> '<strong>Added new BBCode</strong><br />» %s',
-	'LOG_BBCODE_EDIT'		=> '<strong>Edited BBCode</strong><br />» %s',
-	'LOG_BBCODE_DELETE'		=> '<strong>Deleted BBCode</strong><br />» %s',
-
-	'LOG_BOT_ADDED'		=> '<strong>New bot added</strong><br />» %s',
-	'LOG_BOT_DELETE'	=> '<strong>Deleted bot</strong><br />» %s',
-	'LOG_BOT_UPDATED'	=> '<strong>Existing bot updated</strong><br />» %s',
-
-	'LOG_CLEAR_ADMIN'		=> '<strong>Cleared admin log</strong>',
-	'LOG_CLEAR_CRITICAL'	=> '<strong>Cleared error log</strong>',
-	'LOG_CLEAR_MOD'			=> '<strong>Cleared moderator log</strong>',
-	'LOG_CLEAR_USER'		=> '<strong>Cleared user log</strong><br />» %s',
-	'LOG_CLEAR_USERS'		=> '<strong>Cleared user logs</strong>',
-
-	'LOG_CONFIG_ATTACH'			=> '<strong>Altered attachment settings</strong>',
-	'LOG_CONFIG_AUTH'			=> '<strong>Altered authentication settings</strong>',
-	'LOG_CONFIG_AVATAR'			=> '<strong>Altered avatar settings</strong>',
-	'LOG_CONFIG_COOKIE'			=> '<strong>Altered cookie settings</strong>',
-	'LOG_CONFIG_EMAIL'			=> '<strong>Altered e-mail settings</strong>',
-	'LOG_CONFIG_FEATURES'		=> '<strong>Altered board features</strong>',
-	'LOG_CONFIG_LOAD'			=> '<strong>Altered load settings</strong>',
-	'LOG_CONFIG_MESSAGE'		=> '<strong>Altered private message settings</strong>',
-	'LOG_CONFIG_POST'			=> '<strong>Altered post settings</strong>',
-	'LOG_CONFIG_REGISTRATION'	=> '<strong>Altered user registration settings</strong>',
-	'LOG_CONFIG_SEARCH'			=> '<strong>Altered search settings</strong>',
-	'LOG_CONFIG_SECURITY'		=> '<strong>Altered security settings</strong>',
-	'LOG_CONFIG_SERVER'			=> '<strong>Altered server settings</strong>',
-	'LOG_CONFIG_SETTINGS'		=> '<strong>Altered board settings</strong>',
-	'LOG_CONFIG_SIGNATURE'		=> '<strong>Altered signature settings</strong>',
-	'LOG_CONFIG_VISUAL'			=> '<strong>Altered visual confirmation settings</strong>',
-
-	'LOG_APPROVE_TOPIC'			=> '<strong>Approved topic</strong><br />» %s',
-	'LOG_BUMP_TOPIC'			=> '<strong>User bumped topic</strong><br />» %s',
-	'LOG_DELETE_POST'			=> '<strong>Deleted post</strong><br />» %s',
-	'LOG_DELETE_SHADOW_TOPIC'	=> '<strong>Deleted shadow topic</strong><br />» %s',
-	'LOG_DELETE_TOPIC'			=> '<strong>Deleted topic</strong><br />» %s',
-	'LOG_FORK'					=> '<strong>Copied topic</strong><br />» from %s',
-	'LOG_LOCK'					=> '<strong>Locked topic</strong><br />» %s',
-	'LOG_LOCK_POST'				=> '<strong>Locked post</strong><br />» %s',
-	'LOG_MERGE'					=> '<strong>Merged posts</strong> into topic<br />» %s',
-	'LOG_MOVE'					=> '<strong>Moved topic</strong><br />» from %1$s to %2$s',
-	'LOG_POST_APPROVED'			=> '<strong>Approved post</strong><br />» %s',
-	'LOG_POST_DISAPPROVED'		=> '<strong>Disapproved post “%1$s” with the following reason</strong><br />» %2$s',
-	'LOG_POST_EDITED'			=> '<strong>Edited post “%1$s” written by</strong><br />» %2$s',
-	'LOG_REPORT_CLOSED'			=> '<strong>Closed report</strong><br />» %s',
-	'LOG_REPORT_DELETED'		=> '<strong>Deleted report</strong><br />» %s',
-	'LOG_SPLIT_DESTINATION'		=> '<strong>Moved split posts</strong><br />» to %s',
-	'LOG_SPLIT_SOURCE'			=> '<strong>Split posts</strong><br />» from %s',
-
-	'LOG_TOPIC_APPROVED'		=> '<strong>Approved topic</strong><br />» %s',
-	'LOG_TOPIC_DISAPPROVED'		=> '<strong>Disapproved topic “%1$s” with the following reason</strong><br />%2$s',
-	'LOG_TOPIC_RESYNC'			=> '<strong>Resynchronised topic counters</strong><br />» %s',
-	'LOG_TOPIC_TYPE_CHANGED'	=> '<strong>Changed topic type</strong><br />» %s',
-	'LOG_UNLOCK'				=> '<strong>Unlocked topic</strong><br />» %s',
-	'LOG_UNLOCK_POST'			=> '<strong>Unlocked post</strong><br />» %s',
-
-	'LOG_DISALLOW_ADD'		=> '<strong>Added disallowed username</strong><br />» %s',
-	'LOG_DISALLOW_DELETE'	=> '<strong>Deleted disallowed username</strong>',
-
-	'LOG_DB_BACKUP'			=> '<strong>Database backup</strong>',
-	'LOG_DB_DELETE'			=> '<strong>Deleted database backup</strong>',
-	'LOG_DB_RESTORE'		=> '<strong>Restored database backup</strong>',
-
-	'LOG_DOWNLOAD_EXCLUDE_IP'	=> '<strong>Excluded IP/hostname from download list</strong><br />» %s',
-	'LOG_DOWNLOAD_IP'			=> '<strong>Added IP/hostname to download list</strong><br />» %s',
-	'LOG_DOWNLOAD_REMOVE_IP'	=> '<strong>Removed IP/hostname from download list</strong><br />» %s',
-
-	'LOG_ERROR_JABBER'		=> '<strong>Jabber error</strong><br />» %s',
-	'LOG_ERROR_EMAIL'		=> '<strong>E-mail error</strong><br />» %s',
-
-	'LOG_FORUM_ADD'							=> '<strong>Created new forum</strong><br />» %s',
-	'LOG_FORUM_DEL_FORUM'					=> '<strong>Deleted forum</strong><br />» %s',
-	'LOG_FORUM_DEL_FORUMS'					=> '<strong>Deleted forum and its subforums</strong><br />» %s',
-	'LOG_FORUM_DEL_MOVE_FORUMS'				=> '<strong>Deleted forum and moved subforums</strong> to %1$s<br />» %2$s',
-	'LOG_FORUM_DEL_MOVE_POSTS'				=> '<strong>Deleted forum and moved posts </strong> to %1$s<br />» %2$s',
-	'LOG_FORUM_DEL_MOVE_POSTS_FORUMS'		=> '<strong>Deleted forum and its subforums, moved posts</strong> to %1$s<br />» %2$s',
-	'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS'	=> '<strong>Deleted forum, moved posts</strong> to %1$s <strong>and subforums</strong> to %2$s<br />» %3$s',
-	'LOG_FORUM_DEL_POSTS'					=> '<strong>Deleted forum and its posts</strong><br />» %s',
-	'LOG_FORUM_DEL_POSTS_FORUMS'			=> '<strong>Deleted forum, its posts and subforums</strong><br />» %s',
-	'LOG_FORUM_DEL_POSTS_MOVE_FORUMS'		=> '<strong>Deleted forum and its posts, moved subforums</strong> to %1$s<br />» %2$s',
-	'LOG_FORUM_EDIT'						=> '<strong>Edited forum details</strong><br />» %s',
-	'LOG_FORUM_MOVE_DOWN'					=> '<strong>Moved forum</strong> %1$s <strong>below</strong> %2$s',
-	'LOG_FORUM_MOVE_UP'						=> '<strong>Moved forum</strong> %1$s <strong>above</strong> %2$s',
-	'LOG_FORUM_SYNC'						=> '<strong>Re-synchronised forum</strong><br />» %s',
-
-	'LOG_GROUP_CREATED'		=> '<strong>New usergroup created</strong><br />» %s',
-	'LOG_GROUP_DEFAULTS'	=> '<strong>Group “%1$s” made default for members</strong><br />» %2$s',
-	'LOG_GROUP_DELETE'		=> '<strong>Usergroup deleted</strong><br />» %s',
-	'LOG_GROUP_DEMOTED'		=> '<strong>Leaders demoted in usergroup</strong> %1$s<br />» %2$s',
-	'LOG_GROUP_PROMOTED'	=> '<strong>Members promoted to leader in usergroup</strong> %1$s<br />» %2$s',
-	'LOG_GROUP_REMOVE'		=> '<strong>Members removed from usergroup</strong> %1$s<br />» %2$s',
-	'LOG_GROUP_UPDATED'		=> '<strong>Usergroup details updated</strong><br />» %s',
-	'LOG_MODS_ADDED'		=> '<strong>Added new leaders to usergroup</strong> %1$s<br />» %2$s',
-	'LOG_USERS_APPROVED'	=> '<strong>Users approved in usergroup</strong> %1$s<br />» %2$s',
-	'LOG_USERS_ADDED'		=> '<strong>Added new members to usergroup</strong> %1$s<br />» %2$s',
-
-	'LOG_IMAGESET_ADD_DB'			=> '<strong>Added new imageset to database</strong><br />» %s',
-	'LOG_IMAGESET_ADD_FS'			=> '<strong>Add new imageset on filesystem</strong><br />» %s',
-	'LOG_IMAGESET_DELETE'			=> '<strong>Deleted imageset</strong><br />» %s',
-	'LOG_IMAGESET_EDIT_DETAILS'		=> '<strong>Edited imageset details</strong><br />» %s',
-	'LOG_IMAGESET_EDIT'				=> '<strong>Edited imageset</strong><br />» %s',
-	'LOG_IMAGESET_EXPORT'			=> '<strong>Exported imageset</strong><br />» %s',
-	'LOG_IMAGESET_LANG_MISSING'		=> '<strong>Imageset misses “%2$s” localisation</strong><br />» %1$s',
-	'LOG_IMAGESET_LANG_REFRESHED'	=> '<strong>Refreshed “%2$s” localisation of imageset</strong><br />» %1$s',
-	'LOG_IMAGESET_REFRESHED'		=> '<strong>Refreshed imageset</strong><br />» %s',
-
-	'LOG_INACTIVE_ACTIVATE'	=> '<strong>Activated inactive users</strong><br />» %s',
-	'LOG_INACTIVE_DELETE'	=> '<strong>Deleted inactive users</strong><br />» %s',
-	'LOG_INACTIVE_REMIND'	=> '<strong>Sent reminder e-mails to inactive users</strong><br />» %s',
-	'LOG_INSTALL_CONVERTED'	=> '<strong>Converted from %1$s to phpBB %2$s</strong>',
-	'LOG_INSTALL_INSTALLED'	=> '<strong>Installed phpBB %s</strong>',
-
-	'LOG_IP_BROWSER_FORWARDED_CHECK'	=> '<strong>Session IP/browser/X_FORWARDED_FOR check failed</strong><br />»User IP “<em>%1$s</em>” checked against session IP “<em>%2$s</em>”, user browser string “<em>%3$s</em>” checked against session browser string “<em>%4$s</em>” and user X_FORWARDED_FOR string “<em>%5$s</em>” checked against session X_FORWARDED_FOR string “<em>%6$s</em>”.',
-
-	'LOG_JAB_CHANGED'			=> '<strong>Jabber account changed</strong>',
-	'LOG_JAB_PASSCHG'			=> '<strong>Jabber password changed</strong>',
-	'LOG_JAB_REGISTER'			=> '<strong>Jabber account registered</strong>',
-	'LOG_JAB_SETTINGS_CHANGED'	=> '<strong>Jabber settings changed</strong>',
-
-	'LOG_LANGUAGE_PACK_DELETED'		=> '<strong>Deleted language pack</strong><br />» %s',
-	'LOG_LANGUAGE_PACK_INSTALLED'	=> '<strong>Installed language pack</strong><br />» %s',
-	'LOG_LANGUAGE_PACK_UPDATED'		=> '<strong>Updated language pack details</strong><br />» %s',
-	'LOG_LANGUAGE_FILE_REPLACED'	=> '<strong>Replaced language file</strong><br />» %s',
-	'LOG_LANGUAGE_FILE_SUBMITTED'	=> '<strong>Submitted language file and placed in store folder</strong><br />» %s',
-
-	'LOG_MASS_EMAIL'		=> '<strong>Sent mass e-mail</strong><br />» %s',
-
-	'LOG_MCP_CHANGE_POSTER'	=> '<strong>Changed poster in topic “%1$s”</strong><br />» from %2$s to %3$s',
-
-	'LOG_MODULE_DISABLE'	=> '<strong>Module disabled</strong><br />» %s',
-	'LOG_MODULE_ENABLE'		=> '<strong>Module enabled</strong><br />» %s',
-	'LOG_MODULE_MOVE_DOWN'	=> '<strong>Module moved down</strong><br />» %1$s below %2$s',
-	'LOG_MODULE_MOVE_UP'	=> '<strong>Module moved up</strong><br />» %1$s above %2$s',
-	'LOG_MODULE_REMOVED'	=> '<strong>Module removed</strong><br />» %s',
-	'LOG_MODULE_ADD'		=> '<strong>Module added</strong><br />» %s',
-	'LOG_MODULE_EDIT'		=> '<strong>Module edited</strong><br />» %s',
-
-	'LOG_A_ROLE_ADD'		=> '<strong>Admin role added</strong><br />» %s',
-	'LOG_A_ROLE_EDIT'		=> '<strong>Admin role edited</strong><br />» %s',
-	'LOG_A_ROLE_REMOVED'	=> '<strong>Admin role removed</strong><br />» %s',
-	'LOG_F_ROLE_ADD'		=> '<strong>Forum role added</strong><br />» %s',
-	'LOG_F_ROLE_EDIT'		=> '<strong>Forum role edited</strong><br />» %s',
-	'LOG_F_ROLE_REMOVED'	=> '<strong>Forum role removed</strong><br />» %s',
-	'LOG_M_ROLE_ADD'		=> '<strong>Moderator role added</strong><br />» %s',
-	'LOG_M_ROLE_EDIT'		=> '<strong>Moderator role edited</strong><br />» %s',
-	'LOG_M_ROLE_REMOVED'	=> '<strong>Moderator role removed</strong><br />» %s',
-	'LOG_U_ROLE_ADD'		=> '<strong>User role added</strong><br />» %s',
-	'LOG_U_ROLE_EDIT'		=> '<strong>User role edited</strong><br />» %s',
-	'LOG_U_ROLE_REMOVED'	=> '<strong>User role removed</strong><br />» %s',
-
-	'LOG_PROFILE_FIELD_ACTIVATE'	=> '<strong>Profile field activated</strong><br />» %s',
-	'LOG_PROFILE_FIELD_CREATE'		=> '<strong>Profile field added</strong><br />» %s',
-	'LOG_PROFILE_FIELD_DEACTIVATE'	=> '<strong>Profile field deactivated</strong><br />» %s',
-	'LOG_PROFILE_FIELD_EDIT'		=> '<strong>Profile field changed</strong><br />» %s',
-	'LOG_PROFILE_FIELD_REMOVED'		=> '<strong>Profile field removed</strong><br />» %s',
-
-	'LOG_PRUNE'					=> '<strong>Pruned forums</strong><br />» %s',
-	'LOG_AUTO_PRUNE'			=> '<strong>Auto-pruned forums</strong><br />» %s',
-	'LOG_PRUNE_USER_DEAC'		=> '<strong>Users deactivated</strong><br />» %s',
-	'LOG_PRUNE_USER_DEL_DEL'	=> '<strong>Users pruned and posts deleted</strong><br />» %s',
-	'LOG_PRUNE_USER_DEL_ANON'	=> '<strong>Users pruned and posts retained</strong><br />» %s',
-
-	'LOG_PURGE_CACHE'			=> '<strong>Purged cache</strong>',
-
-	'LOG_RANK_ADDED'		=> '<strong>Added new rank</strong><br />» %s',
-	'LOG_RANK_REMOVED'		=> '<strong>Removed rank</strong><br />» %s',
-	'LOG_RANK_UPDATED'		=> '<strong>Updated rank</strong><br />» %s',
-
-	'LOG_REASON_ADDED'		=> '<strong>Added report/denial reason</strong><br />» %s',
-	'LOG_REASON_REMOVED'	=> '<strong>Removed report/denial reason</strong><br />» %s',
-	'LOG_REASON_UPDATED'	=> '<strong>Updated report/denial reason</strong><br />» %s',
-
-	'LOG_REFERER_INVALID'		=> '<strong>Referer validation failed</strong><br />»Referer was “<em>%1$s</em>”. The request was rejected and the session killed.',
-	'LOG_RESET_DATE'			=> '<strong>Board start date reset</strong>',
-	'LOG_RESET_ONLINE'			=> '<strong>Most users online reset</strong>',
-	'LOG_RESYNC_POSTCOUNTS'		=> '<strong>User post counts resynchronised</strong>',
-	'LOG_RESYNC_POST_MARKING'	=> '<strong>Dotted topics resynchronised</strong>',
-	'LOG_RESYNC_STATS'			=> '<strong>Post, topic and user statistics resynchronised</strong>',
-
-	'LOG_SEARCH_INDEX_CREATED'	=> '<strong>Created search index for</strong><br />» %s',
-	'LOG_SEARCH_INDEX_REMOVED'	=> '<strong>Removed search index for</strong><br />» %s',
-	'LOG_STYLE_ADD'				=> '<strong>Added new style</strong><br />» %s',
-	'LOG_STYLE_DELETE'			=> '<strong>Deleted style</strong><br />» %s',
-	'LOG_STYLE_EDIT_DETAILS'	=> '<strong>Edited style</strong><br />» %s',
-	'LOG_STYLE_EXPORT'			=> '<strong>Exported style</strong><br />» %s',
-
-	'LOG_TEMPLATE_ADD_DB'			=> '<strong>Added new template set to database</strong><br />» %s',
-	'LOG_TEMPLATE_ADD_FS'			=> '<strong>Add new template set on filesystem</strong><br />» %s',
-	'LOG_TEMPLATE_CACHE_CLEARED'	=> '<strong>Deleted cached versions of template files in template set <em>%1$s</em></strong><br />» %2$s',
-	'LOG_TEMPLATE_DELETE'			=> '<strong>Deleted template set</strong><br />» %s',
-	'LOG_TEMPLATE_EDIT'				=> '<strong>Edited template set <em>%1$s</em></strong><br />» %2$s',
-	'LOG_TEMPLATE_EDIT_DETAILS'		=> '<strong>Edited template details</strong><br />» %s',
-	'LOG_TEMPLATE_EXPORT'			=> '<strong>Exported template set</strong><br />» %s',
-	'LOG_TEMPLATE_REFRESHED'		=> '<strong>Refreshed template set</strong><br />» %s',
-
-	'LOG_THEME_ADD_DB'			=> '<strong>Added new theme to database</strong><br />» %s',
-	'LOG_THEME_ADD_FS'			=> '<strong>Add new theme on filesystem</strong><br />» %s',
-	'LOG_THEME_DELETE'			=> '<strong>Theme deleted</strong><br />» %s',
-	'LOG_THEME_EDIT_DETAILS'	=> '<strong>Edited theme details</strong><br />» %s',
-	'LOG_THEME_EDIT'			=> '<strong>Edited theme <em>%1$s</em></strong>',
-	'LOG_THEME_EDIT_FILE'		=> '<strong>Edited theme <em>%1$s</em></strong><br />» Modified file <em>%2$s</em>',
-	'LOG_THEME_EXPORT'			=> '<strong>Exported theme</strong><br />» %s',
-	'LOG_THEME_REFRESHED'		=> '<strong>Refreshed theme</strong><br />» %s',
-
-	'LOG_UPDATE_DATABASE'	=> '<strong>Updated Database from version %1$s to version %2$s</strong>',
-	'LOG_UPDATE_PHPBB'		=> '<strong>Updated phpBB from version %1$s to version %2$s</strong>',
-
-	'LOG_USER_ACTIVE'		=> '<strong>User activated</strong><br />» %s',
-	'LOG_USER_BAN_USER'		=> '<strong>Banned User via user management</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_USER_BAN_IP'		=> '<strong>Banned IP via user management</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_USER_BAN_EMAIL'	=> '<strong>Banned e-mail via user management</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_USER_DELETED'		=> '<strong>Deleted user</strong><br />» %s',
-	'LOG_USER_DEL_ATTACH'	=> '<strong>Removed all attachments made by the user</strong><br />» %s',
-	'LOG_USER_DEL_AVATAR'	=> '<strong>Removed user avatar</strong><br />» %s',
-	'LOG_USER_DEL_POSTS'	=> '<strong>Removed all posts made by the user</strong><br />» %s',
-	'LOG_USER_DEL_SIG'		=> '<strong>Removed user signature</strong><br />» %s',
-	'LOG_USER_INACTIVE'		=> '<strong>User deactivated</strong><br />» %s',
-	'LOG_USER_MOVE_POSTS'	=> '<strong>Moved user posts</strong><br />» posts by “%1$s” to forum “%2$s”',
-	'LOG_USER_NEW_PASSWORD'	=> '<strong>Changed user password</strong><br />» %s',
-	'LOG_USER_REACTIVATE'	=> '<strong>Forced user account reactivation</strong><br />» %s',
-	'LOG_USER_UPDATE_EMAIL'	=> '<strong>User “%1$s” changed e-mail</strong><br />» from “%2$s” to “%3$s”',
-	'LOG_USER_UPDATE_NAME'	=> '<strong>Changed username</strong><br />» from “%1$s” to “%2$s”',
-	'LOG_USER_USER_UPDATE'	=> '<strong>Updated user details</strong><br />» %s',
-
-	'LOG_USER_ACTIVE_USER'		=> '<strong>User account activated</strong>',
-	'LOG_USER_DEL_AVATAR_USER'	=> '<strong>User avatar removed</strong>',
-	'LOG_USER_DEL_SIG_USER'		=> '<strong>User signature removed</strong>',
-	'LOG_USER_FEEDBACK'			=> '<strong>Added user feedback</strong><br />» %s',
-	'LOG_USER_GENERAL'			=> '<strong>Entry added:</strong><br />» %s',
-	'LOG_USER_INACTIVE_USER'	=> '<strong>User account de-activated</strong>',
-	'LOG_USER_LOCK'				=> '<strong>User locked own topic</strong><br />» %s',
-	'LOG_USER_MOVE_POSTS_USER'	=> '<strong>Moved all posts to forum</strong>» %s',
-	'LOG_USER_REACTIVATE_USER'	=> '<strong>Forced user account reactivation</strong>',
-	'LOG_USER_UNLOCK'			=> '<strong>User unlocked own topic</strong><br />» %s',
-	'LOG_USER_WARNING'			=> '<strong>Added user warning</strong><br />» %s',
-	'LOG_USER_WARNING_BODY'		=> '<strong>The following warning was issued to this user</strong><br />» %s',
-
-	'LOG_USER_GROUP_CHANGE'			=> '<strong>User changed default group</strong><br />» %s',
-	'LOG_USER_GROUP_DEMOTE'			=> '<strong>User demoted as leaders from usergroup</strong><br />» %s',
-	'LOG_USER_GROUP_JOIN'			=> '<strong>User joined group</strong><br />» %s',
-	'LOG_USER_GROUP_JOIN_PENDING'	=> '<strong>User joined group and needs to be approved</strong><br />» %s',
-	'LOG_USER_GROUP_RESIGN'			=> '<strong>User resigned membership from group</strong><br />» %s',
-
-	'LOG_WORD_ADD'			=> '<strong>Added word censor</strong><br />» %s',
-	'LOG_WORD_DELETE'		=> '<strong>Deleted word censor</strong><br />» %s',
-	'LOG_WORD_EDIT'			=> '<strong>Edited word censor</strong><br />» %s',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/acp/database.php b/phpBB/language/en/acp/database.php
deleted file mode 100644
index 7100fcb1e3..0000000000
--- a/phpBB/language/en/acp/database.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
-*
-* acp_database [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-// Database Backup/Restore
-$lang = array_merge($lang, array(
-	'ACP_BACKUP_EXPLAIN'	=> 'Here you can backup all your phpBB related data. You may store the resulting archive in your <samp>store/</samp> folder or download it directly. Depending on your server configuration you may be able to compress the file in a number of formats.',
-	'ACP_RESTORE_EXPLAIN'	=> 'This will perform a full restore of all phpBB tables from a saved file. If your server supports it you may use a gzip or bzip2 compressed text file and it will automatically be decompressed. <strong>WARNING</strong> This will overwrite any existing data. The restore may take a long time to process please do not move from this page till it is complete. Backups are stored in the <samp>store/</samp> folder and are assumed to be generated by phpBB’s backup functionality. Restoring backups that were not created by the built in system may or may not work.',
-
-	'BACKUP_DELETE'		=> 'The backup file has been deleted successfully.',
-	'BACKUP_INVALID'	=> 'The selected file to backup is invalid.',
-	'BACKUP_OPTIONS'	=> 'Backup options',
-	'BACKUP_SUCCESS'	=> 'The backup file has been created successfully.',
-	'BACKUP_TYPE'		=> 'Backup type',
-
-	'DATABASE'			=> 'Database utilities',
-	'DATA_ONLY'			=> 'Data only',
-	'DELETE_BACKUP'		=> 'Delete backup',
-	'DELETE_SELECTED_BACKUP'	=> 'Are you sure you want to delete the selected backup?',
-	'DESELECT_ALL'		=> 'Deselect all',
-	'DOWNLOAD_BACKUP'	=> 'Download backup',
-
-	'FILE_TYPE'			=> 'File type',
-	'FULL_BACKUP'		=> 'Full',
-
-	'RESTORE_FAILURE'		=> 'The backup file may be corrupt.',
-	'RESTORE_OPTIONS'		=> 'Restore options',
-	'RESTORE_SUCCESS'		=> 'The database has been successfully restored.<br /><br />Your board should be back to the state it was when the backup was made.',
-
-	'SELECT_ALL'			=> 'Select all',
-	'SELECT_FILE'			=> 'Select a file',
-	'START_BACKUP'			=> 'Start backup',
-	'START_RESTORE'			=> 'Start restore',
-	'STORE_AND_DOWNLOAD'	=> 'Store and download',
-	'STORE_LOCAL'			=> 'Store file locally',
-	'STRUCTURE_ONLY'		=> 'Structure only',
-
-	'TABLE_SELECT'		=> 'Table select',
-	'TABLE_SELECT_ERROR'=> 'You must select at least one table.',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php
deleted file mode 100644
index 4427bfff01..0000000000
--- a/phpBB/language/en/acp/email.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
-*
-* acp_email [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-// Email settings
-$lang = array_merge($lang, array(
-	'ACP_MASS_EMAIL_EXPLAIN'		=> 'Here you can e-mail a message to either all of your users or all users of a specific group <strong>having the option to receive mass e-mails enabled</strong>. To achieve this an e-mail will be sent out to the administrative e-mail address supplied, with a blind carbon copy sent to all recipients. The default setting is to only include 50 recipients in such an e-mail, for more recipients more e-mails will be sent. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time, you will be notified when the script has completed.',
-	'ALL_USERS'						=> 'All users',
-
-	'COMPOSE'				=> 'Compose',
-
-	'EMAIL_SEND_ERROR'		=> 'There were one or more errors while sending the e-mail. Please check the %sError log%s for detailed error messages.',
-	'EMAIL_SENT'			=> 'This message has been sent.',
-	'EMAIL_SENT_QUEUE'		=> 'This message has been queued for sending.',
-
-	'LOG_SESSION'			=> 'Log mail session to critical log',
-
-	'SEND_IMMEDIATELY'		=> 'Send immediately',
-	'SEND_TO_GROUP'			=> 'Send to group',
-	'SEND_TO_USERS'			=> 'Send to users',
-	'SEND_TO_USERS_EXPLAIN'	=> 'Entering names here will override any group selected above. Enter each username on a new line.',
-	
-	'MAIL_HIGH_PRIORITY'	=> 'High',
-	'MAIL_LOW_PRIORITY'		=> 'Low',
-	'MAIL_NORMAL_PRIORITY'	=> 'Normal',
-	'MAIL_PRIORITY'			=> 'Mail priority',
-	'MASS_MESSAGE'			=> 'Your message',
-	'MASS_MESSAGE_EXPLAIN'	=> 'Please note that you may enter only plain text. All markup will be removed before sending.',
-	
-	'NO_EMAIL_MESSAGE'		=> 'You must enter a message.',
-	'NO_EMAIL_SUBJECT'		=> 'You must specify a subject for your message.',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
deleted file mode 100644
index 52919f4f40..0000000000
--- a/phpBB/language/en/acp/forums.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/**
-*
-* acp_forums [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-// Forum Admin
-$lang = array_merge($lang, array(
-	'AUTO_PRUNE_DAYS'			=> 'Auto-prune post age',
-	'AUTO_PRUNE_DAYS_EXPLAIN'	=> 'Number of days since last post after which topic is removed.',
-	'AUTO_PRUNE_FREQ'			=> 'Auto-prune frequency',
-	'AUTO_PRUNE_FREQ_EXPLAIN'	=> 'Time in days between pruning events.',
-	'AUTO_PRUNE_VIEWED'			=> 'Auto-prune post viewed age',
-	'AUTO_PRUNE_VIEWED_EXPLAIN'	=> 'Number of days since topic was viewed after which topic is removed.',
-
-	'COPY_PERMISSIONS'				=> 'Copy permissions from',
-	'COPY_PERMISSIONS_ADD_EXPLAIN'	=> 'Once created, the forum will have the same permissions as the one you select here. If no forum is selected the newly created forum will not be visible until permissions had been set.',
-	'COPY_PERMISSIONS_EDIT_EXPLAIN'	=> 'If you select to copy permissions, the forum will have the same permissions as the one you select here. This will overwrite any permissions you have previously set for this forum with the permissions of the forum you select here. If no forum is selected the current permissions will be kept.',
-	'CREATE_FORUM'					=> 'Create new forum',
-
-	'DECIDE_MOVE_DELETE_CONTENT'		=> 'Delete content or move to forum',
-	'DECIDE_MOVE_DELETE_SUBFORUMS'		=> 'Delete subforums or move to forum',
-	'DEFAULT_STYLE'						=> 'Default style',
-	'DELETE_ALL_POSTS'					=> 'Delete posts',
-	'DELETE_SUBFORUMS'					=> 'Delete subforums and posts',
-	'DISPLAY_ACTIVE_TOPICS'				=> 'Enable active topics',
-	'DISPLAY_ACTIVE_TOPICS_EXPLAIN'		=> 'If set to yes active topics in selected subforums will be displayed under this category.',
-
-	'EDIT_FORUM'					=> 'Edit forum',
-	'ENABLE_INDEXING'				=> 'Enable search indexing',
-	'ENABLE_INDEXING_EXPLAIN'		=> 'If set to yes posts made to this forum will be indexed for searching.',
-	'ENABLE_POST_REVIEW'			=> 'Enable post review',
-	'ENABLE_POST_REVIEW_EXPLAIN'	=> 'If set to yes users are able to review their post if new posts were made to the topic while users wrote theirs. This should be disabled for chat forums.',
-	'ENABLE_RECENT'					=> 'Display active topics',
-	'ENABLE_RECENT_EXPLAIN'			=> 'If set to yes topics made to this forum will be shown in the active topics list.',
-	'ENABLE_TOPIC_ICONS'			=> 'Enable topic icons',
-
-	'FORUM_ADMIN'						=> 'Forum administration',
-	'FORUM_ADMIN_EXPLAIN'				=> 'In phpBB3 there are no categories, everything is forum based. Each forum can have an unlimited number of sub-forums and you can determine whether each may be posted to or not (i.e. whether it acts like an old category). Here you can add, edit, delete, lock, unlock individual forums as well as set certain additional controls. If your posts and topics have got out of sync you can also resynchronise a forum. <strong>You need to copy or set appropriate permissions for newly created forums to have them displayed.</strong>',
-	'FORUM_AUTO_PRUNE'					=> 'Enable auto-pruning',
-	'FORUM_AUTO_PRUNE_EXPLAIN'			=> 'Prunes the forum of topics, set the frequency/age parameters below.',
-	'FORUM_CREATED'						=> 'Forum created successfully.',
-	'FORUM_DATA_NEGATIVE'				=> 'Pruning parameters cannot be negative.',
-	'FORUM_DESC_TOO_LONG'				=> 'The forum description is too long, it must be less than 4000 characters.',
-	'FORUM_DELETE'						=> 'Delete forum',
-	'FORUM_DELETE_EXPLAIN'				=> 'The form below will allow you to delete a forum. If the forum is postable you are able to decide where you want to put all topics (or forums) it contained.',
-	'FORUM_DELETED'						=> 'Forum successfully deleted.',
-	'FORUM_DESC'						=> 'Description',
-	'FORUM_DESC_EXPLAIN'				=> 'Any HTML markup entered here will be displayed as is.',
-	'FORUM_EDIT_EXPLAIN'				=> 'The form below will allow you to customise this forum. Please note that moderation and post count controls are set via forum permissions for each user or usergroup.',
-	'FORUM_IMAGE'						=> 'Forum image',
-	'FORUM_IMAGE_EXPLAIN'				=> 'Location, relative to the phpBB root directory, of an additional image to associate with this forum.',
-	'FORUM_IMAGE_NO_EXIST'				=> 'The specified forum image does not exist',
-	'FORUM_LINK_EXPLAIN'				=> 'Full URL (including the protocol, i.e.: <samp>http://</samp>) to the destination location that clicking this forum will take the user, e.g.: <samp>http://www.phpbb.com/</samp>.',
-	'FORUM_LINK_TRACK'					=> 'Track link redirects',
-	'FORUM_LINK_TRACK_EXPLAIN'			=> 'Records the number of times a forum link was clicked.',
-	'FORUM_NAME'						=> 'Forum name',
-	'FORUM_NAME_EMPTY'					=> 'You must enter a name for this forum.',
-	'FORUM_PARENT'						=> 'Parent forum',
-	'FORUM_PASSWORD'					=> 'Forum password',
-	'FORUM_PASSWORD_CONFIRM'			=> 'Confirm forum password',
-	'FORUM_PASSWORD_CONFIRM_EXPLAIN'	=> 'Only needs to be set if a forum password is entered.',
-	'FORUM_PASSWORD_EXPLAIN'			=> 'Defines a password for this forum, use the permission system in preference.',
-	'FORUM_PASSWORD_UNSET'				=> 'Remove forum password',
-	'FORUM_PASSWORD_UNSET_EXPLAIN'		=> 'Check here if you want to remove the forum password.',
-	'FORUM_PASSWORD_OLD'				=> 'The forum password is using an old encryption and should be changed.',
-	'FORUM_PASSWORD_MISMATCH'			=> 'The passwords you entered did not match.',
-	'FORUM_PRUNE_SETTINGS'				=> 'Forum prune settings',
-	'FORUM_RESYNCED'					=> 'Forum “%s” successfully resynced',
-	'FORUM_RULES_EXPLAIN'				=> 'Forum rules are displayed at any page within the given forum.',
-	'FORUM_RULES_LINK'					=> 'Link to forum rules',
-	'FORUM_RULES_LINK_EXPLAIN'			=> 'You are able to enter the URL of the page/post containing your forum rules here. This setting will override the forum rules text you specified.',
-	'FORUM_RULES_PREVIEW'				=> 'Forum rules preview',
-	'FORUM_RULES_TOO_LONG'				=> 'The forum rules must be less than 4000 characters.',
-	'FORUM_SETTINGS'					=> 'Forum settings',
-	'FORUM_STATUS'						=> 'Forum status',
-	'FORUM_STYLE'						=> 'Forum style',
-	'FORUM_TOPICS_PAGE'					=> 'Topics per page',
-	'FORUM_TOPICS_PAGE_EXPLAIN'			=> 'If non-zero this value will override the default topics per page setting.',
-	'FORUM_TYPE'						=> 'Forum type',
-	'FORUM_UPDATED'						=> 'Forum information updated successfully.',
-
-	'FORUM_WITH_SUBFORUMS_NOT_TO_LINK'		=> 'You want to change a postable forum having subforums to a link. Please move all subforums out of this forum before you proceed, because after changing to a link you are no longer able to see the subforums currently connected to this forum.',
-
-	'GENERAL_FORUM_SETTINGS'	=> 'General forum settings',
-
-	'LINK'						=> 'Link',
-	'LIST_INDEX'				=> 'List subforum in parent-forum’s legend',
-	'LIST_INDEX_EXPLAIN'		=> 'Displays this forum on the index and elsewhere as a link within the legend of its parent-forum if the parent-forum’s “List subforums in legend” option is enabled.',
-	'LIST_SUBFORUMS'			=> 'List subforums in legend',
-	'LIST_SUBFORUMS_EXPLAIN'	=> 'Displays this forum’s subforums on the index and elsewhere as a link within the legend if their “List subforum in parent-forum’s legend” option is enabled.',
-	'LOCKED'					=> 'Locked',
-
-	'MOVE_POSTS_NO_POSTABLE_FORUM'	=> 'The forum you selected for moving the posts to is not postable. Please select a postable forum.',
-	'MOVE_POSTS_TO'					=> 'Move posts to',
-	'MOVE_SUBFORUMS_TO'				=> 'Move subforums to',
-
-	'NO_DESTINATION_FORUM'			=> 'You have not specified a forum to move content to.',
-	'NO_FORUM_ACTION'				=> 'No action defined for what happens with the forum content.',
-	'NO_PARENT'						=> 'No parent',
-	'NO_PERMISSIONS'				=> 'Do not copy permissions',
-	'NO_PERMISSION_FORUM_ADD'		=> 'You do not have the necessary permissions to add forums.',
-	'NO_PERMISSION_FORUM_DELETE'	=> 'You do not have the necessary permissions to delete forums.',
-
-	'PARENT_IS_LINK_FORUM'		=> 'The parent you specified is a forum link. Link forums are not able to hold other forums, please specify a category or forum as the parent forum.',
-	'PARENT_NOT_EXIST'			=> 'Parent does not exist.',
-	'PRUNE_ANNOUNCEMENTS'		=> 'Prune announcements',
-	'PRUNE_STICKY'				=> 'Prune stickies',
-	'PRUNE_OLD_POLLS'			=> 'Prune old polls',
-	'PRUNE_OLD_POLLS_EXPLAIN'	=> 'Removes topics with polls not voted in for post age days.',
-
-	'REDIRECT_ACL'	=> 'Now you are able to %sset permissions%s for this forum.',
-
-	'SYNC_IN_PROGRESS'			=> 'Synchronizing forum',
-	'SYNC_IN_PROGRESS_EXPLAIN'	=> 'Currently resyncing topic range %1$d/%2$d.',
-
-	'TYPE_CAT'			=> 'Category',
-	'TYPE_FORUM'		=> 'Forum',
-	'TYPE_LINK'			=> 'Link',
-
-	'UNLOCKED'			=> 'Unlocked',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
deleted file mode 100644
index db6f334540..0000000000
--- a/phpBB/language/en/acp/groups.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
-*
-* acp_groups [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-$lang = array_merge($lang, array(
-	'ACP_GROUPS_MANAGE_EXPLAIN'		=> 'From this panel you can administrate all your usergroups. You can delete, create and edit existing groups. Furthermore, you may choose group leaders, toggle open/hidden/closed group status and set the group name and description.',
-	'ADD_USERS'						=> 'Add users',
-	'ADD_USERS_EXPLAIN'				=> 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Additionally you can define them as group leaders. Please enter each username on a separate line.',
-
-	'COPY_PERMISSIONS'				=> 'Copy permissions from',
-	'COPY_PERMISSIONS_EXPLAIN'		=> 'Once created, the group will have the same permissions as the one you select here.',
-	'CREATE_GROUP'					=> 'Create new group',
-
-	'GROUPS_NO_MEMBERS'				=> 'This group has no members',
-	'GROUPS_NO_MODS'				=> 'No group leaders defined',
-
-	'GROUP_APPROVE'					=> 'Approve member',
-	'GROUP_APPROVED'				=> 'Approved members',
-	'GROUP_AVATAR'					=> 'Group avatar',
-	'GROUP_AVATAR_EXPLAIN'			=> 'This image will be displayed in the Group Control Panel.',
-	'GROUP_CLOSED'					=> 'Closed',
-	'GROUP_COLOR'					=> 'Group colour',
-	'GROUP_COLOR_EXPLAIN'			=> 'Defines the colour members’ usernames will appear in, leave blank for user default.',
-	'GROUP_CONFIRM_ADD_USER'		=> 'Are you sure that you want to add the user %1$s to the group?',
-	'GROUP_CONFIRM_ADD_USERS'		=> 'Are you sure that you want to add the users %1$s to the group?',
-	'GROUP_CREATED'					=> 'Group has been created successfully.',
-	'GROUP_DEFAULT'					=> 'Make group default for member',
-	'GROUP_DEFS_UPDATED'			=> 'Default group set for all selected members.',
-	'GROUP_DELETE'					=> 'Remove member from group',
-	'GROUP_DELETED'					=> 'Group deleted and user default groups set successfully.',
-	'GROUP_DEMOTE'					=> 'Demote group leader',
-	'GROUP_DESC'					=> 'Group description',
-	'GROUP_DETAILS'					=> 'Group details',
-	'GROUP_EDIT_EXPLAIN'			=> 'Here you can edit an existing group. You can change its name, description and type (open, closed, etc.). You can also set certain group wide options such as colouration, rank, etc. Changes made here override users’ current settings. Please note that group members can override group-avatar settings, unless you set appropriate user permissions.',
-	'GROUP_ERR_USERS_EXIST'			=> 'The specified users are already members of this group.',
-	'GROUP_FOUNDER_MANAGE'			=> 'Founder manage only',
-	'GROUP_FOUNDER_MANAGE_EXPLAIN'	=> 'Restrict management of this group to founders only. Users having group permissions are still able to see this group as well as this group’s members.',
-	'GROUP_HIDDEN'					=> 'Hidden',
-	'GROUP_LANG'					=> 'Group language',
-	'GROUP_LEAD'					=> 'Group leaders',
-	'GROUP_LEADERS_ADDED'			=> 'New leaders added to group successfully.',
-	'GROUP_LEGEND'					=> 'Display group in legend',
-	'GROUP_LIST'					=> 'Current members',
-	'GROUP_LIST_EXPLAIN'			=> 'This is a complete list of all the current users with membership of this group. You can delete members (except in certain special groups) or add new ones as you see fit.',
-	'GROUP_MEMBERS'					=> 'Group members',
-	'GROUP_MEMBERS_EXPLAIN'			=> 'This is a complete listing of all the members of this usergroup. It includes separate sections for leaders, pending and existing members. From here you can manage all aspects of who has membership of this group and what their role is. To remove a leader but keep them in the group use Demote rather than delete. Similarly use Promote to make an existing member a leader.',
-	'GROUP_MESSAGE_LIMIT'			=> 'Group private message limit per folder',
-	'GROUP_MESSAGE_LIMIT_EXPLAIN'	=> 'This setting overrides the per-user folder message limit. A value of 0 means the user default limit will be used.',
-	'GROUP_MODS_ADDED'				=> 'New group leaders added successfully.',
-	'GROUP_MODS_DEMOTED'			=> 'Group leaders demoted successfully.',
-	'GROUP_MODS_PROMOTED'			=> 'Group members promoted successfully.',
-	'GROUP_NAME'					=> 'Group name',
-	'GROUP_NAME_TAKEN'				=> 'The group name you entered is already in use, please select an alternative.',
-	'GROUP_OPEN'					=> 'Open',
-	'GROUP_PENDING'					=> 'Pending members',
-	'GROUP_MAX_RECIPIENTS'			=> 'Maximum number of allowed recipients per private message',
-	'GROUP_MAX_RECIPIENTS_EXPLAIN'	=> 'The maximum number of allowed recipients in a private message. If 0 is entered, the board-wide setting is used.',
-	'GROUP_PROMOTE'					=> 'Promote to group leader',
-	'GROUP_RANK'					=> 'Group rank',
-	'GROUP_RECEIVE_PM'				=> 'Group able to receive private messages',
-	'GROUP_RECEIVE_PM_EXPLAIN'		=> 'Please note that hidden groups are not able to be messaged, regardless of this setting.',
-	'GROUP_REQUEST'					=> 'Request',
-	'GROUP_SETTINGS_SAVE'			=> 'Group wide settings',
-	'GROUP_TYPE'					=> 'Group type',
-	'GROUP_TYPE_EXPLAIN'			=> 'This determines which users can join or view this group.',
-	'GROUP_UPDATED'					=> 'Group preferences updated successfully.',
-	
-	'GROUP_USERS_ADDED'				=> 'New users added to group successfully.',
-	'GROUP_USERS_EXIST'				=> 'The selected users are already members.',
-	'GROUP_USERS_REMOVE'			=> 'Users removed from group and new defaults set successfully.',
-
-	'MAKE_DEFAULT_FOR_ALL'	=> 'Make default group for every member',
-	'MEMBERS'				=> 'Members',
-
-	'NO_GROUP'					=> 'No group specified.',
-	'NO_GROUPS_CREATED'			=> 'No groups created yet.',
-	'NO_PERMISSIONS'			=> 'Do not copy permissions',
-	'NO_USERS'					=> 'You haven’t entered any users.',
-	'NO_USERS_ADDED'			=> 'No users were added to the group.',
-	'NO_VALID_USERS'			=> 'You haven’t entered any users eligible for that action.',
-
-	'SPECIAL_GROUPS'			=> 'Pre-defined groups',
-	'SPECIAL_GROUPS_EXPLAIN'	=> 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings.',
-
-	'TOTAL_MEMBERS'				=> 'Members',
-
-	'USERS_APPROVED'				=> 'Users approved successfully.',
-	'USER_DEFAULT'					=> 'User default',
-	'USER_DEF_GROUPS'				=> 'User defined groups',
-	'USER_DEF_GROUPS_EXPLAIN'		=> 'These are groups created by you or another admin on this board. You can manage memberships as well as edit group properties or even delete the group.',
-	'USER_GROUP_DEFAULT'			=> 'Set as default group',
-	'USER_GROUP_DEFAULT_EXPLAIN'	=> 'Saying yes here will set this group as the default group for the added users.',
-	'USER_GROUP_LEADER'				=> 'Set as group leader',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
deleted file mode 100644
index a10148942b..0000000000
--- a/phpBB/language/en/acp/language.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
-*
-* acp_language [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-$lang = array_merge($lang, array(
-	'ACP_FILES'						=> 'Admin language files',
-	'ACP_LANGUAGE_PACKS_EXPLAIN'	=> 'Here you are able to install/remove language packs.',
-
-	'EMAIL_FILES'			=> 'E-mail templates',
-
-	'FILE_CONTENTS'				=> 'File contents',
-	'FILE_FROM_STORAGE'			=> 'File from storage folder',
-
-	'HELP_FILES'				=> 'Help files',
-
-	'INSTALLED_LANGUAGE_PACKS'	=> 'Installed language packs',
-	'INVALID_LANGUAGE_PACK'		=> 'The selected language pack seems to be not valid. Please verify the language pack and upload it again if necessary.',
-	'INVALID_UPLOAD_METHOD'		=> 'The selected upload method is not valid, please choose a different method.',
-
-	'LANGUAGE_DETAILS_UPDATED'			=> 'Language details successfully updated.',
-	'LANGUAGE_ENTRIES'					=> 'Language entries',
-	'LANGUAGE_ENTRIES_EXPLAIN'			=> 'Here you are able to change existing language pack entries or not already translated ones.<br /><strong>Note:</strong> Once you changed a language file, the changes will be stored within a separate folder for you to download. The changes will not be seen by your users until you replace the original language files at your webspace (by uploading them).',
-	'LANGUAGE_FILES'					=> 'Language files',
-	'LANGUAGE_KEY'						=> 'Language key',
-	'LANGUAGE_PACK_ALREADY_INSTALLED'	=> 'This language pack is already installed.',
-	'LANGUAGE_PACK_DELETED'				=> 'The language pack <strong>%s</strong> has been removed successfully. All users using this language have been reset to the boards default language.',
-	'LANGUAGE_PACK_DETAILS'				=> 'Language pack details',
-	'LANGUAGE_PACK_INSTALLED'			=> 'The language pack <strong>%s</strong> has been successfully installed.',
-	'LANGUAGE_PACK_ISO'					=> 'ISO',
-	'LANGUAGE_PACK_LOCALNAME'			=> 'Local name',
-	'LANGUAGE_PACK_NAME'				=> 'Name',
-	'LANGUAGE_PACK_NOT_EXIST'			=> 'The selected language pack does not exist.',
-	'LANGUAGE_PACK_USED_BY'				=> 'Used by (including robots)',
-	'LANGUAGE_VARIABLE'					=> 'Language variable',
-	'LANG_AUTHOR'						=> 'Language pack author',
-	'LANG_ENGLISH_NAME'					=> 'English name',
-	'LANG_ISO_CODE'						=> 'ISO code',
-	'LANG_LOCAL_NAME'					=> 'Local name',
-
-	'MISSING_LANGUAGE_FILE'		=> 'Missing language file: <strong style="color:red">%s</strong>',
-	'MISSING_LANG_VARIABLES'	=> 'Missing language variables',
-	'MODS_FILES'				=> 'MODs language files',
-
-	'NO_FILE_SELECTED'				=> 'You haven’t specified a language file.',
-	'NO_LANG_ID'					=> 'You haven’t specified a language pack.',
-	'NO_REMOVE_DEFAULT_LANG'		=> 'You are not able to remove the default language pack.<br />If you want to remove this language pack, change your boards default language first.',
-	'NO_UNINSTALLED_LANGUAGE_PACKS'	=> 'No uninstalled language packs',
-
-	'REMOVE_FROM_STORAGE_FOLDER'		=> 'Remove from storage folder',
-
-	'SELECT_DOWNLOAD_FORMAT'	=> 'Select download format',
-	'SUBMIT_AND_DOWNLOAD'		=> 'Submit and download file',
-	'SUBMIT_AND_UPLOAD'			=> 'Submit and upload file',
-
-	'THOSE_MISSING_LANG_FILES'			=> 'The following language files are missing from the %s language folder',
-	'THOSE_MISSING_LANG_VARIABLES'		=> 'The following language variables are missing from the <strong>%s</strong> language pack',
-
-	'UNINSTALLED_LANGUAGE_PACKS'	=> 'Uninstalled language packs',
-
-	'UNABLE_TO_WRITE_FILE'		=> 'The file could not be written to %s.',
-	'UPLOAD_COMPLETED'			=> 'The upload was completed successfully.',
-	'UPLOAD_FAILED'				=> 'The upload failed for unknown reasons. You may need to replace the relevant file manually.',
-	'UPLOAD_METHOD'				=> 'Upload method',
-	'UPLOAD_SETTINGS'			=> 'Upload settings',
-
-	'WRONG_LANGUAGE_FILE'		=> 'Selected language file is invalid.',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/acp/modules.php b/phpBB/language/en/acp/modules.php
deleted file mode 100644
index 875b24a94b..0000000000
--- a/phpBB/language/en/acp/modules.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
-*
-* acp_modules [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-$lang = array_merge($lang, array(
-	'ACP_MODULE_MANAGEMENT_EXPLAIN'	=> 'Here you are able to manage all kind of modules. Please note that the ACP has a three-level menu structure (Category -> Category -> Module) whereby the others having a two-level menu structure (Category -> Module) which must be kept. Please also be aware that you may lock out yourself if you disable or delete the modules responsible for the module management itself.',
-	'ADD_MODULE'					=> 'Add module',
-	'ADD_MODULE_CONFIRM'			=> 'Are you sure you want to add the selected module with the selected mode?',
-	'ADD_MODULE_TITLE'				=> 'Add module',
-
-	'CANNOT_REMOVE_MODULE'	=> 'Unable to remove module, it has assigned children. Please remove or move all children before performing this action.',
-	'CATEGORY'				=> 'Category',
-	'CHOOSE_MODE'			=> 'Choose module mode',
-	'CHOOSE_MODE_EXPLAIN'	=> 'Choose the modules mode being used.',
-	'CHOOSE_MODULE'			=> 'Choose module',
-	'CHOOSE_MODULE_EXPLAIN'	=> 'Choose the file being called by this module.',
-	'CREATE_MODULE'			=> 'Create new module',
-
-	'DEACTIVATED_MODULE'	=> 'Deactivated module',
-	'DELETE_MODULE'			=> 'Delete module',
-	'DELETE_MODULE_CONFIRM'	=> 'Are you sure you want to remove this module?',
-
-	'EDIT_MODULE'			=> 'Edit module',
-	'EDIT_MODULE_EXPLAIN'	=> 'Here you are able to enter module specific settings.',
-
-	'HIDDEN_MODULE'			=> 'Hidden module',
-
-	'MODULE'					=> 'Module',
-	'MODULE_ADDED'				=> 'Module successfully added.',
-	'MODULE_DELETED'			=> 'Module successfully removed.',
-	'MODULE_DISPLAYED'			=> 'Module displayed',
-	'MODULE_DISPLAYED_EXPLAIN'	=> 'If you do not wish to display this module, but want to use it, set this to no.',
-	'MODULE_EDITED'				=> 'Module successfully edited.',
-	'MODULE_ENABLED'			=> 'Module enabled',
-	'MODULE_LANGNAME'			=> 'Module language name',
-	'MODULE_LANGNAME_EXPLAIN'	=> 'Enter the displayed module name. Use language constant if name is served from language file.',
-	'MODULE_TYPE'				=> 'Module type',
-
-	'NO_CATEGORY_TO_MODULE'	=> 'Unable to turn category into module. Please remove/move all children before performing this action.',
-	'NO_MODULE'				=> 'No module found.',
-	'NO_MODULE_ID'			=> 'No module id specified.',
-	'NO_MODULE_LANGNAME'	=> 'No module language name specified.',
-	'NO_PARENT'				=> 'No Parent',
-
-	'PARENT'				=> 'Parent',
-	'PARENT_NO_EXIST'		=> 'Parent does not exist.',
-
-	'SELECT_MODULE'			=> 'Select a module',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
deleted file mode 100644
index 920643d927..0000000000
--- a/phpBB/language/en/acp/permissions.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/**
-*
-* acp_permissions [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-$lang = array_merge($lang, array(
-	'ACP_PERMISSIONS_EXPLAIN'	=> '
-		<p>Permissions are highly granular and grouped into four major sections, which are:</p>
-
-		<h2>Global Permissions</h2>
-		<p>These are used to control access on a global level and apply to the entire bulletin board. They are further divided into Users’ Permissions, Groups’ Permissions, Administrators and Global Moderators.</p>
-
-		<h2>Forum Based Permissions</h2>
-		<p>These are used to control access on a per forum basis. They are further divided into Forum Permissions, Forum Moderators, Users’ Forum Permissions and Groups’ Forum Permissions.</p>
-
-		<h2>Permission Roles</h2>
-		<p>These are used to create different sets of permissions for the different permission types later being able to be assigned on a role-based basis. The default roles should cover the administration of bulletin boards large and small, though within each of the four divisions, you can add/edit/delete roles as you see fit.</p>
-
-		<h2>Permission Masks</h2>
-		<p>These are used to view the effective permissions assigned to Users, Moderators (Local and Global), Administrators or Forums.</p>
-
-		<br />
-
-		<p>For further information on setting up and managing permissions on your phpBB3 board, please see <a href="http://www.phpbb.com/support/documentation/3.0/quickstart/quick_permissions.html">Chapter 1.5 of our Quick Start Guide</a>.</p>
-	',
-
-	'ACL_NEVER'				=> 'Never',
-	'ACL_SET'				=> 'Setting permissions',
-	'ACL_SET_EXPLAIN'		=> 'Permissions are based on a simple <samp>YES</samp>/<samp>NO</samp> system. Setting an option to <samp>NEVER</samp> for a user or usergroup overrides any other value assigned to it. If you do not wish to assign a value for an option for this user or group select <samp>NO</samp>. If values are assigned for this option elsewhere they will be used in preference, else <samp>NEVER</samp> is assumed. All objects marked (with the checkbox in front of them) will copy the permission set you defined.',
-	'ACL_SETTING'			=> 'Setting',
-
-	'ACL_TYPE_A_'			=> 'Administrative permissions',
-	'ACL_TYPE_F_'			=> 'Forum permissions',
-	'ACL_TYPE_M_'			=> 'Moderative permissions',
-	'ACL_TYPE_U_'			=> 'User permissions',
-
-	'ACL_TYPE_GLOBAL_A_'	=> 'Administrative permissions',
-	'ACL_TYPE_GLOBAL_U_'	=> 'User permissions',
-	'ACL_TYPE_GLOBAL_M_'	=> 'Global Moderator permissions',
-	'ACL_TYPE_LOCAL_M_'		=> 'Forum Moderator permissions',
-	'ACL_TYPE_LOCAL_F_'		=> 'Forum permissions',
-
-	'ACL_NO'				=> 'No',
-	'ACL_VIEW'				=> 'Viewing permissions',
-	'ACL_VIEW_EXPLAIN'		=> 'Here you can see the effective permissions the user/group is having. A red square indicates that the user/group does not have the permission, a green square indicates that the user/group does have the permission.',
-	'ACL_YES'				=> 'Yes',
-
-	'ACP_ADMINISTRATORS_EXPLAIN'				=> 'Here you can assign administrator permissions to users or groups. All users with administrator permissions can view the administration control panel.',
-	'ACP_FORUM_MODERATORS_EXPLAIN'				=> 'Here you can assign users and groups as forum moderators. To assign users access to forums, to define global moderative permissions or administrators please use the appropriate page.',
-	'ACP_FORUM_PERMISSIONS_EXPLAIN'				=> 'Here you can alter which users and groups can access which forums. To assign moderators or define administrators please use the appropriate page.',
-	'ACP_GLOBAL_MODERATORS_EXPLAIN'				=> 'Here you can assign global moderator permissions to users or groups. These moderators are like ordinary moderators except they have access to every forum on your board.',
-	'ACP_GROUPS_FORUM_PERMISSIONS_EXPLAIN'		=> 'Here you can assign forum permissions to groups.',
-	'ACP_GROUPS_PERMISSIONS_EXPLAIN'			=> 'Here you can assign global permissions to groups - user permissions, global moderator permissions and administrator permissions. User permissions include capabilities such as the use of avatars, sending private messages, et cetera; global moderator permissions such as approving posts, manage topics, manage bans, et cetera and lastly administrator permissions such as altering permissions, define custom BBCodes, manage forums, et cetera. Individual users permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the group’s permissions.',
-	'ACP_ADMIN_ROLES_EXPLAIN'					=> 'Here you are able to manage the roles for administrative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
-	'ACP_FORUM_ROLES_EXPLAIN'					=> 'Here you are able to manage the roles for forum permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
-	'ACP_MOD_ROLES_EXPLAIN'						=> 'Here you are able to manage the roles for moderative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
-	'ACP_USER_ROLES_EXPLAIN'					=> 'Here you are able to manage the roles for user permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
-	'ACP_USERS_FORUM_PERMISSIONS_EXPLAIN'		=> 'Here you can assign forum permissions to users.',
-	'ACP_USERS_PERMISSIONS_EXPLAIN'				=> 'Here you can assign global permissions to users - user permissions, global moderator permissions and administrator permissions. User permissions include capabilities such as the use of avatars, sending private messages, et cetera; global moderator permissions such as approving posts, manage topics, manage bans, et cetera and lastly administrator permissions such as altering permissions, define custom BBCodes, manage forums, et cetera. To alter these settings for large numbers of users the Group permissions system is the preferred method. User’s permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the group’s permissions.',
-	'ACP_VIEW_ADMIN_PERMISSIONS_EXPLAIN'		=> 'Here you can view the effective administrative permissions assigned to the selected users/groups.',
-	'ACP_VIEW_GLOBAL_MOD_PERMISSIONS_EXPLAIN'	=> 'Here you can view the global moderative permissions assigned to the selected users/groups.',
-	'ACP_VIEW_FORUM_PERMISSIONS_EXPLAIN'		=> 'Here you can view the forum permissions assigned to the selected users/groups and forums.',
-	'ACP_VIEW_FORUM_MOD_PERMISSIONS_EXPLAIN'	=> 'Here you can view the forum moderator permissions assigned to the selected users/groups and forums.',
-	'ACP_VIEW_USER_PERMISSIONS_EXPLAIN'			=> 'Here you can view the effective user permissions assigned to the selected users/groups.',
-
-	'ADD_GROUPS'				=> 'Add groups',
-	'ADD_PERMISSIONS'			=> 'Add permissions',
-	'ADD_USERS'					=> 'Add users',
-	'ADVANCED_PERMISSIONS'		=> 'Advanced Permissions',
-	'ALL_GROUPS'				=> 'Select all groups',
-	'ALL_NEVER'					=> 'All <samp>NEVER</samp>',
-	'ALL_NO'					=> 'All <samp>NO</samp>',
-	'ALL_USERS'					=> 'Select all users',
-	'ALL_YES'					=> 'All <samp>YES</samp>',
-	'APPLY_ALL_PERMISSIONS'		=> 'Apply all permissions',
-	'APPLY_PERMISSIONS'			=> 'Apply permissions',
-	'APPLY_PERMISSIONS_EXPLAIN'	=> 'The permissions and role defined for this item will only be applied to this item and all checked items.',
-	'AUTH_UPDATED'				=> 'Permissions have been updated.',
-
-	'CREATE_ROLE'				=> 'Create role',
-	'CREATE_ROLE_FROM'			=> 'Use settings from…',
-	'CUSTOM'					=> 'Custom…',
-
-	'DEFAULT'					=> 'Default',
-	'DELETE_ROLE'				=> 'Delete role',
-	'DELETE_ROLE_CONFIRM'		=> 'Are you sure you want to remove this role? Items having this role assigned will <strong>not</strong> lose their permission settings.',
-	'DISPLAY_ROLE_ITEMS'		=> 'View items using this role',
-
-	'EDIT_PERMISSIONS'			=> 'Edit permissions',
-	'EDIT_ROLE'					=> 'Edit role',
-
-	'GROUPS_NOT_ASSIGNED'		=> 'No group assigned to this role',
-
-	'LOOK_UP_GROUP'				=> 'Look up usergroup',
-	'LOOK_UP_USER'				=> 'Look up user',
-
-	'MANAGE_GROUPS'		=> 'Manage groups',
-	'MANAGE_USERS'		=> 'Manage users',
-
-	'NO_AUTH_SETTING_FOUND'		=> 'Permission settings not defined.',
-	'NO_ROLE_ASSIGNED'			=> 'No role assigned…',
-	'NO_ROLE_ASSIGNED_EXPLAIN'	=> 'Setting to this role does not change permissions on the right. If you want to unset/remove all permissions you should use the “All <samp>NO</samp>” link.',
-	'NO_ROLE_AVAILABLE'			=> 'No role available',
-	'NO_ROLE_NAME_SPECIFIED'	=> 'Please give the role a name.',
-	'NO_ROLE_SELECTED'			=> 'Role could not be found.',
-	'NO_USER_GROUP_SELECTED'	=> 'You haven’t selected any user or group.',
-
-	'ONLY_FORUM_DEFINED'	=> 'You only defined forums in your selection. Please also select at least one user or one group.',
-
-	'PERMISSION_APPLIED_TO_ALL'		=> 'Permissions and role will also be applied to all checked objects',
-	'PLUS_SUBFORUMS'				=> '+Subforums',
-
-	'REMOVE_PERMISSIONS'			=> 'Remove permissions',
-	'REMOVE_ROLE'					=> 'Remove role',
-	'RESULTING_PERMISSION'			=> 'Resulting permission',
-	'ROLE'							=> 'Role',
-	'ROLE_ADD_SUCCESS'				=> 'Role successfully added.',
-	'ROLE_ASSIGNED_TO'				=> 'Users/Groups assigned to %s',
-	'ROLE_DELETED'					=> 'Role successfully removed.',
-	'ROLE_DESCRIPTION'				=> 'Role description',
-
-	'ROLE_ADMIN_FORUM'			=> 'Forum Admin',
-	'ROLE_ADMIN_FULL'			=> 'Full Admin',
-	'ROLE_ADMIN_STANDARD'		=> 'Standard Admin',
-	'ROLE_ADMIN_USERGROUP'		=> 'User and Groups Admin',
-	'ROLE_FORUM_BOT'			=> 'Bot Access',
-	'ROLE_FORUM_FULL'			=> 'Full Access',
-	'ROLE_FORUM_LIMITED'		=> 'Limited Access',
-	'ROLE_FORUM_LIMITED_POLLS'	=> 'Limited Access + Polls',
-	'ROLE_FORUM_NOACCESS'		=> 'No Access',
-	'ROLE_FORUM_ONQUEUE'		=> 'On Moderation Queue',
-	'ROLE_FORUM_POLLS'			=> 'Standard Access + Polls',
-	'ROLE_FORUM_READONLY'		=> 'Read Only Access',
-	'ROLE_FORUM_STANDARD'		=> 'Standard Access',
-	'ROLE_MOD_FULL'				=> 'Full Moderator',
-	'ROLE_MOD_QUEUE'			=> 'Queue Moderator',
-	'ROLE_MOD_SIMPLE'			=> 'Simple Moderator',
-	'ROLE_MOD_STANDARD'			=> 'Standard Moderator',
-	'ROLE_USER_FULL'			=> 'All Features',
-	'ROLE_USER_LIMITED'			=> 'Limited Features',
-	'ROLE_USER_NOAVATAR'		=> 'No Avatar',
-	'ROLE_USER_NOPM'			=> 'No Private Messages',
-	'ROLE_USER_STANDARD'		=> 'Standard Features',
-
-	'ROLE_DESCRIPTION_ADMIN_FORUM'			=> 'Can access the forum management and forum permission settings.',
-	'ROLE_DESCRIPTION_ADMIN_FULL'			=> 'Has access to all administrative functions of this board.<br />Not recommended.',
-	'ROLE_DESCRIPTION_ADMIN_STANDARD'		=> 'Has access to most administrative features but is not allowed to use server or system related tools.',
-	'ROLE_DESCRIPTION_ADMIN_USERGROUP'		=> 'Can manage groups and users: Able to change permissions, settings, manage bans, and manage ranks.',
-	'ROLE_DESCRIPTION_FORUM_BOT'			=> 'This role is recommended for bots and search spiders.',
-	'ROLE_DESCRIPTION_FORUM_FULL'			=> 'Can use all forum features, including posting of announcements and stickies. Can also ignore the flood limit.<br />Not recommended for normal users.',
-	'ROLE_DESCRIPTION_FORUM_LIMITED'		=> 'Can use some forum features, but cannot attach files or use post icons.',
-	'ROLE_DESCRIPTION_FORUM_LIMITED_POLLS'	=> 'As per Limited Access but can also create polls.',
-	'ROLE_DESCRIPTION_FORUM_NOACCESS'		=> 'Can neither see nor access the forum.',
-	'ROLE_DESCRIPTION_FORUM_ONQUEUE'		=> 'Can use most forum features including attachments, but posts and topics need to be approved by a moderator.',
-	'ROLE_DESCRIPTION_FORUM_POLLS'			=> 'Like Standard Access but can also create polls.',
-	'ROLE_DESCRIPTION_FORUM_READONLY'		=> 'Can read the forum, but cannot create new topics or reply to posts.',
-	'ROLE_DESCRIPTION_FORUM_STANDARD'		=> 'Can use most forum features including attachments and deleting own topics, but cannot lock own topics, and cannot create polls.',
-	'ROLE_DESCRIPTION_MOD_FULL'				=> 'Can use all moderating features, including banning.',
-	'ROLE_DESCRIPTION_MOD_QUEUE'			=> 'Can use the Moderation Queue to validate and edit posts, but nothing else.',
-	'ROLE_DESCRIPTION_MOD_SIMPLE'			=> 'Can only use basic topic actions. Cannot send warnings or use moderation queue.',
-	'ROLE_DESCRIPTION_MOD_STANDARD'			=> 'Can use most moderating tools, but cannot ban users or change the post author.',
-	'ROLE_DESCRIPTION_USER_FULL'			=> 'Can use all available forum features for users, including changing the user name or ignoring the flood limit.<br />Not recommended.',
-	'ROLE_DESCRIPTION_USER_LIMITED'			=> 'Can access some of the user features. Attachments, e-mails, or instant messages are not allowed.',
-	'ROLE_DESCRIPTION_USER_NOAVATAR'		=> 'Has a limited feature set and is not allowed to use the Avatar feature.',
-	'ROLE_DESCRIPTION_USER_NOPM'			=> 'Has a limited feature set, and is not allowed to use Private Messages.',
-	'ROLE_DESCRIPTION_USER_STANDARD'		=> 'Can access most but not all user features. Cannot change user name or ignore the flood limit, for instance.',
-
-	'ROLE_DESCRIPTION_EXPLAIN'		=> 'You are able to enter a short explanation of what the role is doing or for what it is meant for. The text you enter here will be displayed within the permissions screens too.',
-	'ROLE_DESCRIPTION_LONG'			=> 'The role description is too long, please limit it to 4000 characters.',
-	'ROLE_DETAILS'					=> 'Role details',
-	'ROLE_EDIT_SUCCESS'				=> 'Role successfully edited.',
-	'ROLE_NAME'						=> 'Role name',
-	'ROLE_NAME_ALREADY_EXIST'		=> 'A role named <strong>%s</strong> already exist for the specified permission type.',
-	'ROLE_NOT_ASSIGNED'				=> 'Role has not been assigned yet.',
-
-	'SELECTED_FORUM_NOT_EXIST'		=> 'The selected forum(s) do not exist.',
-	'SELECTED_GROUP_NOT_EXIST'		=> 'The selected group(s) do not exist.',
-	'SELECTED_USER_NOT_EXIST'		=> 'The selected user(s) do not exist.',
-	'SELECT_FORUM_SUBFORUM_EXPLAIN'	=> 'The forum you select here will include all subforums into the selection.',
-	'SELECT_ROLE'					=> 'Select role…',
-	'SELECT_TYPE'					=> 'Select type',
-	'SET_PERMISSIONS'				=> 'Set permissions',
-	'SET_ROLE_PERMISSIONS'			=> 'Set role permissions',
-	'SET_USERS_PERMISSIONS'			=> 'Set users permissions',
-	'SET_USERS_FORUM_PERMISSIONS'	=> 'Set users forum permissions',
-
-	'TRACE_DEFAULT'					=> 'By default every permission is <samp>NO</samp> (unset). So the permission can be overwritten by other settings.',
-	'TRACE_FOR'						=> 'Trace for',
-	'TRACE_GLOBAL_SETTING'			=> '%s (global)',
-	'TRACE_GROUP_NEVER_TOTAL_NEVER'	=> 'This group’s permission is set to <samp>NEVER</samp> like the total result so the old result is kept.',
-	'TRACE_GROUP_NEVER_TOTAL_NEVER_LOCAL'	=> 'This group’s permission for this forum is set to <samp>NEVER</samp> like the total result so the old result is kept.',
-	'TRACE_GROUP_NEVER_TOTAL_NO'	=> 'This group’s permission is set to <samp>NEVER</samp> which becomes the new total value because it wasn’t set yet (set to <samp>NO</samp>).',
-	'TRACE_GROUP_NEVER_TOTAL_NO_LOCAL'	=> 'This group’s permission for this forum is set to <samp>NEVER</samp> which becomes the new total value because it wasn’t set yet (set to <samp>NO</samp>).',
-	'TRACE_GROUP_NEVER_TOTAL_YES'	=> 'This group’s permission is set to <samp>NEVER</samp> which overwrites the total <samp>YES</samp> to a <samp>NEVER</samp> for this user.',
-	'TRACE_GROUP_NEVER_TOTAL_YES_LOCAL'	=> 'This group’s permission for this forum is set to <samp>NEVER</samp> which overwrites the total <samp>YES</samp> to a <samp>NEVER</samp> for this user.',
-	'TRACE_GROUP_NO'				=> 'The permission is <samp>NO</samp> for this group so the old total value is kept.',
-	'TRACE_GROUP_NO_LOCAL'			=> 'The permission is <samp>NO</samp> for this group within this forum so the old total value is kept.',
-	'TRACE_GROUP_YES_TOTAL_NEVER'	=> 'This group’s permission is set to <samp>YES</samp> but the total <samp>NEVER</samp> cannot be overwritten.',
-	'TRACE_GROUP_YES_TOTAL_NEVER_LOCAL'	=> 'This group’s permission for this forum is set to <samp>YES</samp> but the total <samp>NEVER</samp> cannot be overwritten.',
-	'TRACE_GROUP_YES_TOTAL_NO'		=> 'This group’s permission is set to <samp>YES</samp> which becomes the new total value because it wasn’t set yet (set to <samp>NO</samp>).',
-	'TRACE_GROUP_YES_TOTAL_NO_LOCAL'	=> 'This group’s permission for this forum is set to <samp>YES</samp> which becomes the new total value because it wasn’t set yet (set to <samp>NO</samp>).',
-	'TRACE_GROUP_YES_TOTAL_YES'		=> 'This group’s permission is set to <samp>YES</samp> and the total permission is already set to <samp>YES</samp>, so the total result is kept.',
-	'TRACE_GROUP_YES_TOTAL_YES_LOCAL'	=> 'This group’s permission for this forum is set to <samp>YES</samp> and the total permission is already set to <samp>YES</samp>, so the total result is kept.',
-	'TRACE_PERMISSION'				=> 'Trace permission - %s',
-	'TRACE_RESULT'					=> 'Trace result',
-	'TRACE_SETTING'					=> 'Trace setting',
-
-	'TRACE_USER_GLOBAL_YES_TOTAL_YES'		=> 'The forum independent user permission evaluates to <samp>YES</samp> but the total permission is already set to <samp>YES</samp>, so the total result is kept. %sTrace global permission%s',
-	'TRACE_USER_GLOBAL_YES_TOTAL_NEVER'		=> 'The forum independent user permission evaluates to <samp>YES</samp> which overwrites the current local result <samp>NEVER</samp>. %sTrace global permission%s',
-	'TRACE_USER_GLOBAL_NEVER_TOTAL_KEPT'	=> 'The forum independent user permission evaluates to <samp>NEVER</samp> which doesn’t influence the local permission. %sTrace global permission%s',
-
-	'TRACE_USER_FOUNDER'					=> 'The user has the founder type set, therefore admin permissions are set to <samp>YES</samp> by default.',
-	'TRACE_USER_KEPT'						=> 'The user’s permission is <samp>NO</samp> so the old total value is kept.',
-	'TRACE_USER_KEPT_LOCAL'					=> 'The user’s permission for this forum is <samp>NO</samp> so the old total value is kept.',
-	'TRACE_USER_NEVER_TOTAL_NEVER'			=> 'The user’s permission is set to <samp>NEVER</samp> and the total value is set to <samp>NEVER</samp>, so nothing is changed.',
-	'TRACE_USER_NEVER_TOTAL_NEVER_LOCAL'	=> 'The user’s permission for this forum is set to <samp>NEVER</samp> and the total value is set to <samp>NEVER</samp>, so nothing is changed.',
-	'TRACE_USER_NEVER_TOTAL_NO'				=> 'The user’s permission is set to <samp>NEVER</samp> which becomes the total value because it was set to NO.',
-	'TRACE_USER_NEVER_TOTAL_NO_LOCAL'		=> 'The user’s permission for this forum is set to <samp>NEVER</samp> which becomes the total value because it was set to NO.',
-	'TRACE_USER_NEVER_TOTAL_YES'			=> 'The user’s permission is set to <samp>NEVER</samp> and overwrites the previous <samp>YES</samp>.',
-	'TRACE_USER_NEVER_TOTAL_YES_LOCAL'		=> 'The user’s permission for this forum is set to <samp>NEVER</samp> and overwrites the previous <samp>YES</samp>.',
-	'TRACE_USER_NO_TOTAL_NO'				=> 'The user’s permission is <samp>NO</samp> and the total value was set to NO so it defaults to <samp>NEVER</samp>.',
-	'TRACE_USER_NO_TOTAL_NO_LOCAL'			=> 'The user’s permission for this forum is <samp>NO</samp> and the total value was set to NO so it defaults to <samp>NEVER</samp>.',
-	'TRACE_USER_YES_TOTAL_NEVER'			=> 'The user’s permission is set to <samp>YES</samp> but the total <samp>NEVER</samp> cannot be overwritten.',
-	'TRACE_USER_YES_TOTAL_NEVER_LOCAL'		=> 'The user’s permission for this forum is set to <samp>YES</samp> but the total <samp>NEVER</samp> cannot be overwritten.',
-	'TRACE_USER_YES_TOTAL_NO'				=> 'The user’s permission is set to <samp>YES</samp> which becomes the total value because it was set to <samp>NO</samp>.',
-	'TRACE_USER_YES_TOTAL_NO_LOCAL'			=> 'The user’s permission for this forum is set to <samp>YES</samp> which becomes the total value because it was set to <samp>NO</samp>.',
-	'TRACE_USER_YES_TOTAL_YES'				=> 'The user’s permission is set to <samp>YES</samp> and the total value is set to <samp>YES</samp>, so nothing is changed.',
-	'TRACE_USER_YES_TOTAL_YES_LOCAL'		=> 'The user’s permission for this forum is set to <samp>YES</samp> and the total value is set to <samp>YES</samp>, so nothing is changed.',
-	'TRACE_WHO'								=> 'Who',
-	'TRACE_TOTAL'							=> 'Total',
-
-	'USERS_NOT_ASSIGNED'			=> 'No user assigned to this role',
-	'USER_IS_MEMBER_OF_DEFAULT'		=> 'is a member of the following pre-defined groups',
-	'USER_IS_MEMBER_OF_CUSTOM'		=> 'is a member of the following user defined groups',
-
-	'VIEW_ASSIGNED_ITEMS'	=> 'View assigned items',
-	'VIEW_LOCAL_PERMS'		=> 'Local permissions',
-	'VIEW_GLOBAL_PERMS'		=> 'Global permissions',
-	'VIEW_PERMISSIONS'		=> 'View permissions',
-
-	'WRONG_PERMISSION_TYPE'				=> 'Wrong permission type selected.',
-	'WRONG_PERMISSION_SETTING_FORMAT'	=> 'The permission settings are in a wrong format, phpBB is not able to process them correctly.',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
deleted file mode 100644
index c8ccc0e56a..0000000000
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-/**
-* acp_permissions_phpbb (phpBB Permission Set) [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-/**
-*	MODDERS PLEASE NOTE
-*
-*	You are able to put your permission sets into a separate file too by
-*	prefixing the new file with permissions_ and putting it into the acp
-*	language folder.
-*
-*	An example of how the file could look like:
-*
-*	<code>
-*
-*	if (empty($lang) || !is_array($lang))
-*	{
-*		$lang = array();
-*	}
-*
-*	// Adding new category
-*	$lang['permission_cat']['bugs'] = 'Bugs';
-*
-*	// Adding new permission set
-*	$lang['permission_type']['bug_'] = 'Bug Permissions';
-*
-*	// Adding the permissions
-*	$lang = array_merge($lang, array(
-*		'acl_bug_view'		=> array('lang' => 'Can view bug reports', 'cat' => 'bugs'),
-*		'acl_bug_post'		=> array('lang' => 'Can post bugs', 'cat' => 'post'), // Using a phpBB category here
-*	));
-*
-*	</code>
-*/
-
-// Define categories and permission types
-$lang = array_merge($lang, array(
-	'permission_cat'	=> array(
-		'actions'		=> 'Actions',
-		'content'		=> 'Content',
-		'forums'		=> 'Forums',
-		'misc'			=> 'Misc',
-		'permissions'	=> 'Permissions',
-		'pm'			=> 'Private messages',
-		'polls'			=> 'Polls',
-		'post'			=> 'Post',
-		'post_actions'	=> 'Post actions',
-		'posting'		=> 'Posting',
-		'profile'		=> 'Profile',
-		'settings'		=> 'Settings',
-		'topic_actions'	=> 'Topic actions',
-		'user_group'	=> 'Users &amp; Groups',
-	),
-
-	// With defining 'global' here we are able to specify what is printed out if the permission is within the global scope.
-	'permission_type'	=> array(
-		'u_'			=> 'User permissions',
-		'a_'			=> 'Admin permissions',
-		'm_'			=> 'Moderator permissions',
-		'f_'			=> 'Forum permissions',
-		'global'		=> array(
-			'm_'			=> 'Global moderator permissions',
-		),
-	),
-));
-
-// User Permissions
-$lang = array_merge($lang, array(
-	'acl_u_viewprofile'	=> array('lang' => 'Can view profiles, memberlist and online list', 'cat' => 'profile'),
-	'acl_u_chgname'		=> array('lang' => 'Can change username', 'cat' => 'profile'),
-	'acl_u_chgpasswd'	=> array('lang' => 'Can change password', 'cat' => 'profile'),
-	'acl_u_chgemail'	=> array('lang' => 'Can change e-mail address', 'cat' => 'profile'),
-	'acl_u_chgavatar'	=> array('lang' => 'Can change avatar', 'cat' => 'profile'),
-	'acl_u_chggrp'		=> array('lang' => 'Can change default usergroup', 'cat' => 'profile'),
-
-	'acl_u_attach'		=> array('lang' => 'Can attach files', 'cat' => 'post'),
-	'acl_u_download'	=> array('lang' => 'Can download files', 'cat' => 'post'),
-	'acl_u_savedrafts'	=> array('lang' => 'Can save drafts', 'cat' => 'post'),
-	'acl_u_chgcensors'	=> array('lang' => 'Can disable word censors', 'cat' => 'post'),
-	'acl_u_sig'			=> array('lang' => 'Can use signature', 'cat' => 'post'),
-
-	'acl_u_sendpm'		=> array('lang' => 'Can send private messages', 'cat' => 'pm'),
-	'acl_u_masspm'		=> array('lang' => 'Can send messages to multiple users', 'cat' => 'pm'),
-	'acl_u_masspm_group'=> array('lang' => 'Can send messages to groups', 'cat' => 'pm'),
-	'acl_u_readpm'		=> array('lang' => 'Can read private messages', 'cat' => 'pm'),
-	'acl_u_pm_edit'		=> array('lang' => 'Can edit own private messages', 'cat' => 'pm'),
-	'acl_u_pm_delete'	=> array('lang' => 'Can remove private messages from own folder', 'cat' => 'pm'),
-	'acl_u_pm_forward'	=> array('lang' => 'Can forward private messages', 'cat' => 'pm'),
-	'acl_u_pm_emailpm'	=> array('lang' => 'Can e-mail private messages', 'cat' => 'pm'),
-	'acl_u_pm_printpm'	=> array('lang' => 'Can print private messages', 'cat' => 'pm'),
-	'acl_u_pm_attach'	=> array('lang' => 'Can attach files in private messages', 'cat' => 'pm'),
-	'acl_u_pm_download'	=> array('lang' => 'Can download files in private messages', 'cat' => 'pm'),
-	'acl_u_pm_bbcode'	=> array('lang' => 'Can post BBCode in private messages', 'cat' => 'pm'),
-	'acl_u_pm_smilies'	=> array('lang' => 'Can post smilies in private messages', 'cat' => 'pm'),
-	'acl_u_pm_img'		=> array('lang' => 'Can post images in private messages', 'cat' => 'pm'),
-	'acl_u_pm_flash'	=> array('lang' => 'Can post Flash in private messages', 'cat' => 'pm'),
-
-	'acl_u_sendemail'	=> array('lang' => 'Can send e-mails', 'cat' => 'misc'),
-	'acl_u_sendim'		=> array('lang' => 'Can send instant messages', 'cat' => 'misc'),
-	'acl_u_ignoreflood'	=> array('lang' => 'Can ignore flood limit', 'cat' => 'misc'),
-	'acl_u_hideonline'	=> array('lang' => 'Can hide online status', 'cat' => 'misc'),
-	'acl_u_viewonline'	=> array('lang' => 'Can view hidden online users', 'cat' => 'misc'),
-	'acl_u_search'		=> array('lang' => 'Can search board', 'cat' => 'misc'),
-));
-
-// Forum Permissions
-$lang = array_merge($lang, array(
-	'acl_f_list'		=> array('lang' => 'Can see forum', 'cat' => 'post'),
-	'acl_f_read'		=> array('lang' => 'Can read forum', 'cat' => 'post'),
-	'acl_f_post'		=> array('lang' => 'Can start new topics', 'cat' => 'post'),
-	'acl_f_reply'		=> array('lang' => 'Can reply to topics', 'cat' => 'post'),
-	'acl_f_icons'		=> array('lang' => 'Can use topic/post icons', 'cat' => 'post'),
-	'acl_f_announce'	=> array('lang' => 'Can post announcements', 'cat' => 'post'),
-	'acl_f_sticky'		=> array('lang' => 'Can post stickies', 'cat' => 'post'),
-
-	'acl_f_poll'		=> array('lang' => 'Can create polls', 'cat' => 'polls'),
-	'acl_f_vote'		=> array('lang' => 'Can vote in polls', 'cat' => 'polls'),
-	'acl_f_votechg'		=> array('lang' => 'Can change existing vote', 'cat' => 'polls'),
-
-	'acl_f_attach'		=> array('lang' => 'Can attach files', 'cat' => 'content'),
-	'acl_f_download'	=> array('lang' => 'Can download files', 'cat' => 'content'),
-	'acl_f_sigs'		=> array('lang' => 'Can use signatures', 'cat' => 'content'),
-	'acl_f_bbcode'		=> array('lang' => 'Can post BBCode', 'cat' => 'content'),
-	'acl_f_smilies'		=> array('lang' => 'Can post smilies', 'cat' => 'content'),
-	'acl_f_img'			=> array('lang' => 'Can post images', 'cat' => 'content'),
-	'acl_f_flash'		=> array('lang' => 'Can post Flash', 'cat' => 'content'),
-
-	'acl_f_edit'		=> array('lang' => 'Can edit own posts', 'cat' => 'actions'),
-	'acl_f_delete'		=> array('lang' => 'Can delete own posts', 'cat' => 'actions'),
-	'acl_f_user_lock'	=> array('lang' => 'Can lock own topics', 'cat' => 'actions'),
-	'acl_f_bump'		=> array('lang' => 'Can bump topics', 'cat' => 'actions'),
-	'acl_f_report'		=> array('lang' => 'Can report posts', 'cat' => 'actions'),
-	'acl_f_subscribe'	=> array('lang' => 'Can subscribe forum', 'cat' => 'actions'),
-	'acl_f_print'		=> array('lang' => 'Can print topics', 'cat' => 'actions'),
-	'acl_f_email'		=> array('lang' => 'Can e-mail topics', 'cat' => 'actions'),
-
-	'acl_f_search'		=> array('lang' => 'Can search the forum', 'cat' => 'misc'),
-	'acl_f_ignoreflood' => array('lang' => 'Can ignore flood limit', 'cat' => 'misc'),
-	'acl_f_postcount'	=> array('lang' => 'Increment post counter<br /><em>Please note that this setting only affects new posts.</em>', 'cat' => 'misc'),
-	'acl_f_noapprove'	=> array('lang' => 'Can post without approval', 'cat' => 'misc'),
-));
-
-// Moderator Permissions
-$lang = array_merge($lang, array(
-	'acl_m_edit'		=> array('lang' => 'Can edit posts', 'cat' => 'post_actions'),
-	'acl_m_delete'		=> array('lang' => 'Can delete posts', 'cat' => 'post_actions'),
-	'acl_m_approve'		=> array('lang' => 'Can approve posts', 'cat' => 'post_actions'),
-	'acl_m_report'		=> array('lang' => 'Can close and delete reports', 'cat' => 'post_actions'),
-	'acl_m_chgposter'	=> array('lang' => 'Can change post author', 'cat' => 'post_actions'),
-
-	'acl_m_move'	=> array('lang' => 'Can move topics', 'cat' => 'topic_actions'),
-	'acl_m_lock'	=> array('lang' => 'Can lock topics', 'cat' => 'topic_actions'),
-	'acl_m_split'	=> array('lang' => 'Can split topics', 'cat' => 'topic_actions'),
-	'acl_m_merge'	=> array('lang' => 'Can merge topics', 'cat' => 'topic_actions'),
-
-	'acl_m_info'	=> array('lang' => 'Can view post details', 'cat' => 'misc'),
-	'acl_m_warn'	=> array('lang' => 'Can issue warnings<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local)
-	'acl_m_ban'		=> array('lang' => 'Can manage bans<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local)
-));
-
-// Admin Permissions
-$lang = array_merge($lang, array(
-	'acl_a_board'		=> array('lang' => 'Can alter board settings/check for updates', 'cat' => 'settings'),
-	'acl_a_server'		=> array('lang' => 'Can alter server/communication settings', 'cat' => 'settings'),
-	'acl_a_jabber'		=> array('lang' => 'Can alter Jabber settings', 'cat' => 'settings'),
-	'acl_a_phpinfo'		=> array('lang' => 'Can view php settings', 'cat' => 'settings'),
-
-	'acl_a_forum'		=> array('lang' => 'Can manage forums', 'cat' => 'forums'),
-	'acl_a_forumadd'	=> array('lang' => 'Can add new forums', 'cat' => 'forums'),
-	'acl_a_forumdel'	=> array('lang' => 'Can delete forums', 'cat' => 'forums'),
-	'acl_a_prune'		=> array('lang' => 'Can prune forums', 'cat' => 'forums'),
-
-	'acl_a_icons'		=> array('lang' => 'Can alter topic/post icons and smilies', 'cat' => 'posting'),
-	'acl_a_words'		=> array('lang' => 'Can alter word censors', 'cat' => 'posting'),
-	'acl_a_bbcode'		=> array('lang' => 'Can define BBCode tags', 'cat' => 'posting'),
-	'acl_a_attach'		=> array('lang' => 'Can alter attachment related settings', 'cat' => 'posting'),
-
-	'acl_a_user'		=> array('lang' => 'Can manage users<br /><em>This also includes seeing the users browser agent within the viewonline list.</em>', 'cat' => 'user_group'),
-	'acl_a_userdel'		=> array('lang' => 'Can delete/prune users', 'cat' => 'user_group'),
-	'acl_a_group'		=> array('lang' => 'Can manage groups', 'cat' => 'user_group'),
-	'acl_a_groupadd'	=> array('lang' => 'Can add new groups', 'cat' => 'user_group'),
-	'acl_a_groupdel'	=> array('lang' => 'Can delete groups', 'cat' => 'user_group'),
-	'acl_a_ranks'		=> array('lang' => 'Can manage ranks', 'cat' => 'user_group'),
-	'acl_a_profile'		=> array('lang' => 'Can manage custom profile fields', 'cat' => 'user_group'),
-	'acl_a_names'		=> array('lang' => 'Can manage disallowed names', 'cat' => 'user_group'),
-	'acl_a_ban'			=> array('lang' => 'Can manage bans', 'cat' => 'user_group'),
-
-	'acl_a_viewauth'	=> array('lang' => 'Can view permission masks', 'cat' => 'permissions'),
-	'acl_a_authgroups'	=> array('lang' => 'Can alter permissions for individual groups', 'cat' => 'permissions'),
-	'acl_a_authusers'	=> array('lang' => 'Can alter permissions for individual users', 'cat' => 'permissions'),
-	'acl_a_fauth'		=> array('lang' => 'Can alter forum permission class', 'cat' => 'permissions'),
-	'acl_a_mauth'		=> array('lang' => 'Can alter moderator permission class', 'cat' => 'permissions'),
-	'acl_a_aauth'		=> array('lang' => 'Can alter admin permission class', 'cat' => 'permissions'),
-	'acl_a_uauth'		=> array('lang' => 'Can alter user permission class', 'cat' => 'permissions'),
-	'acl_a_roles'		=> array('lang' => 'Can manage roles', 'cat' => 'permissions'),
-	'acl_a_switchperm'	=> array('lang' => 'Can use others permissions', 'cat' => 'permissions'),
-
-	'acl_a_styles'		=> array('lang' => 'Can manage styles', 'cat' => 'misc'),
-	'acl_a_viewlogs'	=> array('lang' => 'Can view logs', 'cat' => 'misc'),
-	'acl_a_clearlogs'	=> array('lang' => 'Can clear logs', 'cat' => 'misc'),
-	'acl_a_modules'		=> array('lang' => 'Can manage modules', 'cat' => 'misc'),
-	'acl_a_language'	=> array('lang' => 'Can manage language packs', 'cat' => 'misc'),
-	'acl_a_email'		=> array('lang' => 'Can send mass e-mail', 'cat' => 'misc'),
-	'acl_a_bots'		=> array('lang' => 'Can manage bots', 'cat' => 'misc'),
-	'acl_a_reasons'		=> array('lang' => 'Can manage report/denial reasons', 'cat' => 'misc'),
-	'acl_a_backup'		=> array('lang' => 'Can backup/restore database', 'cat' => 'misc'),
-	'acl_a_search'		=> array('lang' => 'Can manage search backends and settings', 'cat' => 'misc'),
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
deleted file mode 100644
index 01453b85ef..0000000000
--- a/phpBB/language/en/acp/posting.php
+++ /dev/null
@@ -1,273 +0,0 @@
-<?php
-/**
-*
-* acp_posting [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-// BBCodes
-// Note to translators: you can translate everything but what's between { and }
-$lang = array_merge($lang, array(
-	'ACP_BBCODES_EXPLAIN'		=> 'BBCode is a special implementation of HTML offering greater control over what and how something is displayed. From this page you can add, remove and edit custom BBCodes.',
-	'ADD_BBCODE'				=> 'Add a new BBCode',
-
-	'BBCODE_ADDED'				=> 'BBCode added successfully.',
-	'BBCODE_EDITED'				=> 'BBCode edited successfully.',
-	'BBCODE_NOT_EXIST'			=> 'The BBCode you selected does not exist.',
-	'BBCODE_HELPLINE'			=> 'Help line',
-	'BBCODE_HELPLINE_EXPLAIN'	=> 'This field contains the mouse over text of the BBCode.',
-	'BBCODE_HELPLINE_TEXT'		=> 'Help line text',
-	'BBCODE_HELPLINE_TOO_LONG'	=> 'The help line you entered is too long.',
-
-	'BBCODE_INVALID_TAG_NAME'	=> 'The BBCode tag name that you selected already exists.',
-	'BBCODE_INVALID'			=> 'Your BBCode is constructed in an invalid form.',
-	'BBCODE_OPEN_ENDED_TAG'		=> 'Your custom BBCode must contain both an opening and a closing tag.',
-	'BBCODE_TAG'				=> 'Tag',
-	'BBCODE_TAG_TOO_LONG'		=> 'The tag name you selected is too long.',
-	'BBCODE_TAG_DEF_TOO_LONG'	=> 'The tag definition that you have entered is too long, please shorten your tag definition.',
-	'BBCODE_USAGE'				=> 'BBCode usage',
-	'BBCODE_USAGE_EXAMPLE'		=> '[highlight={COLOR}]{TEXT}[/highlight]<br /><br />[font={SIMPLETEXT1}]{SIMPLETEXT2}[/font]',
-	'BBCODE_USAGE_EXPLAIN'		=> 'Here you define how to use the BBCode. Replace any variable input by the corresponding token (%ssee below%s).',
-
-	'EXAMPLE'						=> 'Example:',
-	'EXAMPLES'						=> 'Examples:',
-
-	'HTML_REPLACEMENT'				=> 'HTML replacement',
-	'HTML_REPLACEMENT_EXAMPLE'		=> '&lt;span style="background-color: {COLOR};"&gt;{TEXT}&lt;/span&gt;<br /><br />&lt;span style="font-family: {SIMPLETEXT1};"&gt;{SIMPLETEXT2}&lt;/span&gt;',
-	'HTML_REPLACEMENT_EXPLAIN'		=> 'Here you define the default HTML replacement. Do not forget to put back tokens you used above!',
-
-	'TOKEN'					=> 'Token',
-	'TOKENS'				=> 'Tokens',
-	'TOKENS_EXPLAIN'		=> 'Tokens are placeholders for user input. The input will be validated only if it matches the corresponding definition. If needed, you can number them by adding a number as the last character between the braces, e.g. {TEXT1}, {TEXT2}.<br /><br />Within the HTML replacement you can also use any language string present in your language/ directory like this: {L_<em>&lt;STRINGNAME&gt;</em>} where <em>&lt;STRINGNAME&gt;</em> is the name of the translated string you want to add. For example, {L_WROTE} will be displayed as &quot;wrote&quot; or its translation according to user’s locale.<br /><br /><strong>Please note that only tokens listed below are able to be used within custom BBCodes.</strong>',
-	'TOKEN_DEFINITION'		=> 'What can it be?',
-	'TOO_MANY_BBCODES'		=> 'You cannot create any more BBCodes. Please remove one or more BBCodes then try again.',
-
-	'tokens'	=>	array(
-		'TEXT'			=> 'Any text, including foreign characters, numbers, etc… You should not use this token in HTML tags. Instead try to use IDENTIFIER or SIMPLETEXT.',
-		'SIMPLETEXT'	=> 'Characters from the latin alphabet (A-Z), numbers, spaces, commas, dots, minus, plus, hyphen and underscore',
-		'IDENTIFIER'	=> 'Characters from the latin alphabet (A-Z), numbers, hyphen and underscore',
-		'NUMBER'		=> 'Any series of digits',
-		'EMAIL'			=> 'A valid e-mail address',
-		'URL'			=> 'A valid URL using any protocol (http, ftp, etc… cannot be used for javascript exploits). If none is given, &quot;http://&quot; is prefixed to the string.',
-		'LOCAL_URL'		=> 'A local URL. The URL must be relative to the topic page and cannot contain a server name or protocol.',
-		'COLOR'			=> 'A HTML colour, can be either in the numeric form <samp>#FF1234</samp> or a <a href="http://www.w3.org/TR/CSS21/syndata.html#value-def-color">CSS colour keyword</a> such as <samp>fuchsia</samp> or <samp>InactiveBorder</samp>'
-	)
-));
-
-// Smilies and topic icons
-$lang = array_merge($lang, array(
-	'ACP_ICONS_EXPLAIN'		=> 'From this page you can add, remove and edit the icons users may add to their topics or posts. These icons are generally displayed next to topic titles on the forum listing, or the post subjects in topic listings. You can also install and create new packages of icons.',
-	'ACP_SMILIES_EXPLAIN'	=> 'Smilies or emoticons are typically small, sometimes animated images used to convey an emotion or feeling. From this page you can add, remove and edit the emoticons users can use in their posts and private messages. You can also install and create new packages of smilies.',
-	'ADD_SMILIES'			=> 'Add multiple smilies',
-	'ADD_SMILEY_CODE'		=> 'Add additional smiley code',
-	'ADD_ICONS'				=> 'Add multiple icons',
-	'AFTER_ICONS'			=> 'After %s',
-	'AFTER_SMILIES'			=> 'After %s',
-
-	'CODE'						=> 'Code',
-	'CURRENT_ICONS'				=> 'Current icons',
-	'CURRENT_ICONS_EXPLAIN'		=> 'Choose what to do with the currently installed icons.',
-	'CURRENT_SMILIES'			=> 'Current smilies',
-	'CURRENT_SMILIES_EXPLAIN'	=> 'Choose what to do with the currently installed smilies.',
-
-	'DISPLAY_ON_POSTING'		=> 'Display on posting page',
-	'DISPLAY_POSTING'			=> 'On posting page',
-	'DISPLAY_POSTING_NO'		=> 'Not on posting page',
-
-
-
-	'EDIT_ICONS'				=> 'Edit icons',
-	'EDIT_SMILIES'				=> 'Edit smilies',
-	'EMOTION'					=> 'Emotion',
-	'EXPORT_ICONS'				=> 'Export and download icons.pak',
-	'EXPORT_ICONS_EXPLAIN'		=> '%sOn clicking this link, the configuration for your installed icons will be packaged into <samp>icons.pak</samp> which once downloaded can be used to create a <samp>.zip</samp> or <samp>.tgz</samp> file containing all of your icons plus this <samp>icons.pak</samp> configuration file%s.',
-	'EXPORT_SMILIES'			=> 'Export and download smilies.pak',
-	'EXPORT_SMILIES_EXPLAIN'	=> '%sOn clicking this link, the configuration for your installed smilies will be packaged into <samp>smilies.pak</samp> which once downloaded can be used to create a <samp>.zip</samp> or <samp>.tgz</samp> file containing all of your smilies plus this <samp>smilies.pak</samp> configuration file%s.',
-
-	'FIRST'			=> 'First',
-
-	'ICONS_ADD'				=> 'Add a new icon',
-	'ICONS_NONE_ADDED'		=> 'No icons were added.',
-	'ICONS_ONE_ADDED'		=> 'The icon has been added successfully.',
-	'ICONS_ADDED'			=> 'The icons have been added successfully.',
-	'ICONS_CONFIG'			=> 'Icon configuration',
-	'ICONS_DELETED'			=> 'The icon has been removed successfully.',
-	'ICONS_EDIT'			=> 'Edit icon',
-	'ICONS_ONE_EDITED'		=> 'The icon has been updated successfully.',
-	'ICONS_NONE_EDITED'		=> 'No icons were updated.',
-	'ICONS_EDITED'			=> 'The icons have been updated successfully.',
-	'ICONS_HEIGHT'			=> 'Icon height',
-	'ICONS_IMAGE'			=> 'Icon image',
-	'ICONS_IMPORTED'		=> 'The icons pack has been installed successfully.',
-	'ICONS_IMPORT_SUCCESS'	=> 'The icons pack was imported successfully.',
-	'ICONS_LOCATION'		=> 'Icon location',
-	'ICONS_NOT_DISPLAYED'	=> 'The following icons are not displayed on the posting page',
-	'ICONS_ORDER'			=> 'Icon order',
-	'ICONS_URL'				=> 'Icon image file',
-	'ICONS_WIDTH'			=> 'Icon width',
-	'IMPORT_ICONS'			=> 'Install icons package',
-	'IMPORT_SMILIES'		=> 'Install smilies package',
-
-	'KEEP_ALL'			=> 'Keep all',
-
-	'MASS_ADD_SMILIES'	=> 'Add multiple smilies',
-
-	'NO_ICONS_ADD'		=> 'There are no icons available for adding.',
-	'NO_ICONS_EDIT'		=> 'There are no icons available for modifying.',
-	'NO_ICONS_EXPORT'	=> 'You have no icons with which to create a package.',
-	'NO_ICONS_PAK'		=> 'No icon packages found.',
-	'NO_SMILIES_ADD'	=> 'There are no smilies available for adding.',
-	'NO_SMILIES_EDIT'	=> 'There are no smilies available for modifying.',
-	'NO_SMILIES_EXPORT'	=> 'You have no smilies with which to create a package.',
-	'NO_SMILIES_PAK'	=> 'No smiley packages found.',
-
-	'PAK_FILE_NOT_READABLE'		=> 'Could not read <samp>.pak</samp> file.',
-
-	'REPLACE_MATCHES'	=> 'Replace matches',
-
-	'SELECT_PACKAGE'			=> 'Select a package file',
-	'SMILIES_ADD'				=> 'Add a new smiley',
-	'SMILIES_NONE_ADDED'		=> 'No smilies were added.',
-	'SMILIES_ONE_ADDED'			=> 'The smiley has been added successfully.',
-	'SMILIES_ADDED'				=> 'The smilies have been added successfully.',
-	'SMILIES_CODE'				=> 'Smiley code',
-	'SMILIES_CONFIG'			=> 'Smiley configuration',
-	'SMILIES_DELETED'			=> 'The smiley has been removed successfully.',
-	'SMILIES_EDIT'				=> 'Edit smiley',
-	'SMILIE_NO_CODE'			=> 'The smilie “%s”  was ignored, as there was no code entered.',
-	'SMILIE_NO_EMOTION'			=> 'The smilie “%s” was ignored, as there was no emotion entered.',
-	'SMILIES_NONE_EDITED'		=> 'No smilies were updated.',
-	'SMILIES_ONE_EDITED'		=> 'The smiley has been updated successfully.',
-	'SMILIES_EDITED'			=> 'The smilies have been updated successfully.',
-	'SMILIES_EMOTION'			=> 'Emotion',
-	'SMILIES_HEIGHT'			=> 'Smiley height',
-	'SMILIES_IMAGE'				=> 'Smiley image',
-	'SMILIES_IMPORTED'			=> 'The smilies pack has been installed successfully.',
-	'SMILIES_IMPORT_SUCCESS'	=> 'The smilies pack was imported successfully.',
-	'SMILIES_LOCATION'			=> 'Smiley location',
-	'SMILIES_NOT_DISPLAYED'		=> 'The following smilies are not displayed on the posting page',
-	'SMILIES_ORDER'				=> 'Smiley order',
-	'SMILIES_URL'				=> 'Smiley image file',
-	'SMILIES_WIDTH'				=> 'Smiley width',
-
-	'WRONG_PAK_TYPE'	=> 'The specified package does not contain the appropriate data.',
-));
-
-// Word censors
-$lang = array_merge($lang, array(
-	'ACP_WORDS_EXPLAIN'		=> 'From this control panel you can add, edit, and remove words that will be automatically censored on your forums. People are still allowed to register with usernames containing these words. Wildcards (*) are accepted in the word field, e.g. *test* will match detestable, test* would match testing, *test would match detest.',
-	'ADD_WORD'				=> 'Add new word',
-
-	'EDIT_WORD'		=> 'Edit word censor',
-	'ENTER_WORD'	=> 'You must enter a word and its replacement.',
-
-	'NO_WORD'	=> 'No word selected for editing.',
-
-	'REPLACEMENT'	=> 'Replacement',
-
-	'UPDATE_WORD'	=> 'Update word censor',
-
-	'WORD'				=> 'Word',
-	'WORD_ADDED'		=> 'The word censor has been successfully added.',
-	'WORD_REMOVED'		=> 'The selected word censor has been successfully removed.',
-	'WORD_UPDATED'		=> 'The selected word censor has been successfully updated.',
-));
-
-// Ranks
-$lang = array_merge($lang, array(
-	'ACP_RANKS_EXPLAIN'		=> 'Using this form you can add, edit, view and delete ranks. You can also create special ranks which can be applied to a user via the user management facility.',
-	'ADD_RANK'				=> 'Add new rank',
-
-	'MUST_SELECT_RANK'		=> 'You must select a rank.',
-
-	'NO_ASSIGNED_RANK'		=> 'No special rank assigned.',
-	'NO_RANK_TITLE'			=> 'You haven’t specified a title for the rank.',
-	'NO_UPDATE_RANKS'		=> 'The rank was successfully deleted. However user accounts using this rank were not updated. You will need to manually reset the rank on these accounts.',
-
-	'RANK_ADDED'			=> 'The rank was successfully added.',
-	'RANK_IMAGE'			=> 'Rank image',
-	'RANK_IMAGE_EXPLAIN'	=> 'Use this to define a small image associated with the rank. The path is relative to the root phpBB directory.',
-	'RANK_MINIMUM'			=> 'Minimum posts',
-	'RANK_REMOVED'			=> 'The rank was successfully deleted.',
-	'RANK_SPECIAL'			=> 'Set as special rank',
-	'RANK_TITLE'			=> 'Rank title',
-	'RANK_UPDATED'			=> 'The rank was successfully updated.',
-));
-
-// Disallow Usernames
-$lang = array_merge($lang, array(
-	'ACP_DISALLOW_EXPLAIN'	=> 'Here you can control usernames which will not be allowed to be used. Disallowed usernames are allowed to contain a wildcard character of *. Please note that you will not be allowed to specify any username that has already been registered, you must first delete that name then disallow it.',
-	'ADD_DISALLOW_EXPLAIN'	=> 'You can disallow a username using the wildcard character * to match any character.',
-	'ADD_DISALLOW_TITLE'	=> 'Add a disallowed username',
-
-	'DELETE_DISALLOW_EXPLAIN'	=> 'You can remove a disallowed username by selecting the username from this list and clicking submit.',
-	'DELETE_DISALLOW_TITLE'		=> 'Remove a disallowed username',
-	'DISALLOWED_ALREADY'		=> 'The name you entered could not be disallowed. It either already exists in the list, exists in the word censor list, or a matching username is present.',
-	'DISALLOWED_DELETED'		=> 'The disallowed username has been successfully removed.',
-	'DISALLOW_SUCCESSFUL'		=> 'The disallowed username has been successfully added.',
-
-	'NO_DISALLOWED'				=> 'No disallowed usernames',
-	'NO_USERNAME_SPECIFIED'		=> 'You haven’t selected or entered a username to operate with.',
-));
-
-// Reasons
-$lang = array_merge($lang, array(
-	'ACP_REASONS_EXPLAIN'	=> 'Here you can manage the reasons used in reports and denial messages when disapproving posts. There is one default reason (marked with a *) you are not able to remove, this reason is normally used for custom messages if no reason fits.',
-	'ADD_NEW_REASON'		=> 'Add new reason',
-	'AVAILABLE_TITLES'		=> 'Available localised reason titles',
-
-	'IS_NOT_TRANSLATED'			=> 'Reason has <strong>not</strong> been localised.',
-	'IS_NOT_TRANSLATED_EXPLAIN'	=> 'Reason has <strong>not</strong> been localised. If you want to provide the localised form, specify the correct key from the language files report reasons section.',
-	'IS_TRANSLATED'				=> 'Reason has been localised.',
-	'IS_TRANSLATED_EXPLAIN'		=> 'Reason has been localised. If the title you enter here is specified within the language files report reasons section, the localised form of the title and description will be used.',
-
-	'NO_REASON'					=> 'Reason could not be found.',
-	'NO_REASON_INFO'			=> 'You have to specify a title and a description for this reason.',
-	'NO_REMOVE_DEFAULT_REASON'	=> 'You are not able to remove the default reason “Other”.',
-
-	'REASON_ADD'				=> 'Add report/denial reason',
-	'REASON_ADDED'				=> 'Report/denial reason successfully added.',
-	'REASON_ALREADY_EXIST'		=> 'A reason with this title already exist, please enter another title for this reason.',
-	'REASON_DESCRIPTION'		=> 'Reason description',
-	'REASON_DESC_TRANSLATED'	=> 'Displayed reason description',
-	'REASON_EDIT'				=> 'Edit report/denial reason',
-	'REASON_EDIT_EXPLAIN'		=> 'Here you are able to add or edit a reason. If the reason is translated the localised version is used instead of the description entered here.',
-	'REASON_REMOVED'			=> 'Report/denial reason successfully removed.',
-	'REASON_TITLE'				=> 'Reason title',
-	'REASON_TITLE_TRANSLATED'	=> 'Displayed reason title',
-	'REASON_UPDATED'			=> 'Report/denial reason successfully updated.',
-
-	'USED_IN_REPORTS'		=> 'Used in reports',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
deleted file mode 100644
index 295571226e..0000000000
--- a/phpBB/language/en/acp/profile.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
-*
-* acp_profile [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-// Custom profile fields
-$lang = array_merge($lang, array(
-	'ADDED_PROFILE_FIELD'	=> 'Successfully added custom profile field.',
-	'ALPHA_ONLY'			=> 'Alphanumeric only',
-	'ALPHA_SPACERS'			=> 'Alphanumeric and spacers',
-	'ALWAYS_TODAY'			=> 'Always the current date',
-
-	'BOOL_ENTRIES_EXPLAIN'	=> 'Enter your options now',
-	'BOOL_TYPE_EXPLAIN'		=> 'Define the type, either a checkbox or radio buttons. A checkbox will only be displayed if it is checked for a given user. In that case the <strong>second</strong> language option will be used. Radio buttons will display regardless of their value.',
-
-	'CHANGED_PROFILE_FIELD'		=> 'Successfully changed profile field.',
-	'CHARS_ANY'					=> 'Any character',
-	'CHECKBOX'					=> 'Checkbox',
-	'COLUMNS'					=> 'Columns',
-	'CP_LANG_DEFAULT_VALUE'		=> 'Default value',
-	'CP_LANG_EXPLAIN'			=> 'Field description',
-	'CP_LANG_EXPLAIN_EXPLAIN'	=> 'The explanation for this field presented to the user.',
-	'CP_LANG_NAME'				=> 'Field name/title presented to the user',
-	'CP_LANG_OPTIONS'			=> 'Options',
-	'CREATE_NEW_FIELD'			=> 'Create new field',
-	'CUSTOM_FIELDS_NOT_TRANSLATED'	=> 'At least one custom profile field has not yet been translated. Please enter the required information by clicking on the “Translate” link.',
-
-	'DEFAULT_ISO_LANGUAGE'			=> 'Default language [%s]',
-	'DEFAULT_LANGUAGE_NOT_FILLED'	=> 'The language entries for the default language are not filled for this profile field.',
-	'DEFAULT_VALUE'					=> 'Default value',
-	'DELETE_PROFILE_FIELD'			=> 'Remove profile field',
-	'DELETE_PROFILE_FIELD_CONFIRM'	=> 'Are you sure you want to delete this profile field?',
-	'DISPLAY_AT_PROFILE'			=> 'Display in user control panel',
-	'DISPLAY_AT_PROFILE_EXPLAIN'	=> 'The user is able to change this profile field within the user control panel.',
-	'DISPLAY_AT_REGISTER'			=> 'Display at registration screen',
-	'DISPLAY_AT_REGISTER_EXPLAIN'	=> 'If this option is enabled, the field will be displayed on registration and able to be changed within the user control panel.',
-	'DISPLAY_PROFILE_FIELD'			=> 'Publicly display profile field',
-	'DISPLAY_PROFILE_FIELD_EXPLAIN'	=> 'The profile field will be shown in all places allowed within the load settings. Setting this to “no” will hide the field from topic pages, profiles and the memberlist.',
-	'DROPDOWN_ENTRIES_EXPLAIN'		=> 'Enter your options now, every option in one line.',
-
-	'EDIT_DROPDOWN_LANG_EXPLAIN'	=> 'Please note that you are able to change your options text and also able to add new options to the end. It is not advised to add new options between existing options - this could result in wrong options assigned to your users. This can also happen if you remove options in-between. Removing options from the end result in users having assigned this item now reverting back to the default one.',
-	'EMPTY_FIELD_IDENT'				=> 'Empty field identification',
-	'EMPTY_USER_FIELD_NAME'			=> 'Please enter a field name/title',
-	'ENTRIES'						=> 'Entries',
-	'EVERYTHING_OK'					=> 'Everything OK',
-
-	'FIELD_BOOL'				=> 'Boolean (Yes/No)',
-	'FIELD_DATE'				=> 'Date',
-	'FIELD_DESCRIPTION'			=> 'Field description',
-	'FIELD_DESCRIPTION_EXPLAIN'	=> 'The explanation for this field presented to the user.',
-	'FIELD_DROPDOWN'			=> 'Dropdown box',
-	'FIELD_IDENT'				=> 'Field identification',
-	'FIELD_IDENT_ALREADY_EXIST'	=> 'The chosen field identification already exist. Please choose another name.',
-	'FIELD_IDENT_EXPLAIN'		=> 'The field identification is a name to identify the profile field within the database and the templates.',
-	'FIELD_INT'					=> 'Numbers',
-	'FIELD_LENGTH'				=> 'Length of input box',
-	'FIELD_NOT_FOUND'			=> 'Profile field not found.',
-	'FIELD_STRING'				=> 'Single text field',
-	'FIELD_TEXT'				=> 'Textarea',
-	'FIELD_TYPE'				=> 'Field type',
-	'FIELD_TYPE_EXPLAIN'		=> 'You are not able to change the field type later.',
-	'FIELD_VALIDATION'			=> 'Field validation',
-	'FIRST_OPTION'				=> 'First option',
-
-	'HIDE_PROFILE_FIELD'			=> 'Hide profile field',
-	'HIDE_PROFILE_FIELD_EXPLAIN'	=> 'Only administrators and moderators are able to see/fill out this profile field. If this option is enabled, the profile field will be only displayed in users’ profiles.',
-
-	'INVALID_CHARS_FIELD_IDENT'	=> 'Field identification can only contain lowercase a-z and _',
-	'INVALID_FIELD_IDENT_LEN'	=> 'Field identification can only be 17 characters long',
-	'ISO_LANGUAGE'				=> 'Language [%s]',
-
-	'LANG_SPECIFIC_OPTIONS'		=> 'Language specific options [<strong>%s</strong>]',
-
-	'MAX_FIELD_CHARS'		=> 'Maximum number of characters',
-	'MAX_FIELD_NUMBER'		=> 'Highest allowed number',
-	'MIN_FIELD_CHARS'		=> 'Minimum number of characters',
-	'MIN_FIELD_NUMBER'		=> 'Lowest allowed number',
-
-	'NO_FIELD_ENTRIES'			=> 'No entries defined',
-	'NO_FIELD_ID'				=> 'No field id specified.',
-	'NO_FIELD_TYPE'				=> 'No Field type specified.',
-	'NO_VALUE_OPTION'			=> 'Option equal to non entered value',
-	'NO_VALUE_OPTION_EXPLAIN'	=> 'Value for a non-entry. If the field is required, the user gets an error if he choose the option selected here.',
-	'NUMBERS_ONLY'				=> 'Only numbers (0-9)',
-
-	'PROFILE_BASIC_OPTIONS'		=> 'Basic options',
-	'PROFILE_FIELD_ACTIVATED'	=> 'Profile field successfully activated.',
-	'PROFILE_FIELD_DEACTIVATED'	=> 'Profile field successfully deactivated.',
-	'PROFILE_LANG_OPTIONS'		=> 'Language specific options',
-	'PROFILE_TYPE_OPTIONS'		=> 'Profile type specific options',
-
-	'RADIO_BUTTONS'				=> 'Radio buttons',
-	'REMOVED_PROFILE_FIELD'		=> 'Successfully removed profile field.',
-	'REQUIRED_FIELD'			=> 'Required field',
-	'REQUIRED_FIELD_EXPLAIN'	=> 'Force profile field to be filled out or specified by user. This will display the profile field at registration and within the user control panel.',
-	'ROWS'						=> 'Rows',
-
-	'SAVE'							=> 'Save',
-	'SECOND_OPTION'					=> 'Second option',
-	'STEP_1_EXPLAIN_CREATE'			=> 'Here you can enter the first basic parameters of your new profile field. This information is needed for the second step where you’ll be able to set remaining options and tweak your profile field further.',
-	'STEP_1_EXPLAIN_EDIT'			=> 'Here you can change the basic parameters of your profile field. The relevant options are re-calculated within the second step.',
-	'STEP_1_TITLE_CREATE'			=> 'Add profile field',
-	'STEP_1_TITLE_EDIT'				=> 'Edit profile field',
-	'STEP_2_EXPLAIN_CREATE'			=> 'Here you are able to define some common options you may want to adjust.',
-	'STEP_2_EXPLAIN_EDIT'			=> 'Here you are able to change some common options.<br /><strong>Please note that changes to profile fields will not affect existing profile fields entered by your users.</strong>',
-	'STEP_2_TITLE_CREATE'			=> 'Profile type specific options',
-	'STEP_2_TITLE_EDIT'				=> 'Profile type specific options',
-	'STEP_3_EXPLAIN_CREATE'			=> 'Since you have more than one board language installed, you have to fill out the remaining language items too. The profile field will work with the default language enabled, you are able to fill out the remaining language items later too.',
-	'STEP_3_EXPLAIN_EDIT'			=> 'Since you have more than one board language installed, you now can change or add the remaining language items too. The profile field will work with the default language enabled.',
-	'STEP_3_TITLE_CREATE'			=> 'Remaining language definitions',
-	'STEP_3_TITLE_EDIT'				=> 'Language definitions',
-	'STRING_DEFAULT_VALUE_EXPLAIN'	=> 'Enter a default phrase to be displayed, a default value. Leave empty if you want to show it empty at the first place.',
-
-	'TEXT_DEFAULT_VALUE_EXPLAIN'	=> 'Enter a default text to be displayed, a default value. Leave empty if you want to show it empty at the first place.',
-	'TRANSLATE'						=> 'Translate',
-
-	'USER_FIELD_NAME'	=> 'Field name/title presented to the user',
-
-	'VISIBILITY_OPTION'				=> 'Visibility option',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php
deleted file mode 100644
index 31e14d62a1..0000000000
--- a/phpBB/language/en/acp/prune.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
-*
-* acp_prune [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-// User pruning
-$lang = array_merge($lang, array(
-	'ACP_PRUNE_USERS_EXPLAIN'	=> 'Here you can delete (or deactivate) users from your board. This can be done in a variety of ways; by post count, last activity, etc. Each of these criteria can be combined, i.e. you can prune users last active before 2002-01-01 with fewer than 10 posts. Alternatively you can enter a list of users directly into the text box, any criteria entered will be ignored. Take care with this facility! Once a user is deleted there is no way back.',
-
-	'DEACTIVATE_DELETE'			=> 'Deactivate or delete',
-	'DEACTIVATE_DELETE_EXPLAIN'	=> 'Choose whether to deactivate users or delete them entirely, note there is no undo!',
-	'DELETE_USERS'				=> 'Delete',
-	'DELETE_USER_POSTS'			=> 'Delete pruned user posts',
-	'DELETE_USER_POSTS_EXPLAIN' => 'Removes posts made by deleted users, has no effect if users are deactivated.',
-
-	'JOINED_EXPLAIN'			=> 'Enter a date in <kbd>YYYY-MM-DD</kbd> format.',
-
-	'LAST_ACTIVE_EXPLAIN'		=> 'Enter a date in <kbd>YYYY-MM-DD</kbd> format.',
-
-	'PRUNE_USERS_LIST'				=> 'Users to be pruned',
-	'PRUNE_USERS_LIST_DELETE'		=> 'With the selected critera for pruning users the following accounts will be removed.',
-	'PRUNE_USERS_LIST_DEACTIVATE'	=> 'With the selected critera for pruning users the following accounts will be deactivated.',
-
-	'SELECT_USERS_EXPLAIN'		=> 'Enter specific usernames here, they will be used in preference to the criteria above.',
-
-	'USER_DEACTIVATE_SUCCESS'	=> 'The selected users have been deactivated successfully.',
-	'USER_DELETE_SUCCESS'		=> 'The selected users have been deleted successfully.',
-	'USER_PRUNE_FAILURE'		=> 'No users fit the selected criteria.',
-
-	'WRONG_ACTIVE_JOINED_DATE'	=> 'The date entered is wrong, it is expected in <kbd>YYYY-MM-DD</kbd> format.',
-));
-
-// Forum Pruning
-$lang = array_merge($lang, array(
-	'ACP_PRUNE_FORUMS_EXPLAIN'	=> 'This will delete any topic which has not been posted to or viewed within the number of days you select. If you do not enter a number then all topics will be deleted. By default, it will not remove topics in which polls are still running nor will it remove stickies and announcements.',
-
-	'FORUM_PRUNE'		=> 'Forum prune',
-
-	'NO_PRUNE'			=> 'No forums pruned.',
-
-	'SELECTED_FORUM'	=> 'Selected forum',
-	'SELECTED_FORUMS'	=> 'Selected forums',
-
-	'POSTS_PRUNED'					=> 'Posts pruned',
-	'PRUNE_ANNOUNCEMENTS'			=> 'Prune announcements',
-	'PRUNE_FINISHED_POLLS'			=> 'Prune closed polls',
-	'PRUNE_FINISHED_POLLS_EXPLAIN'	=> 'Removes topics with polls which have ended.',
-	'PRUNE_FORUM_CONFIRM'			=> 'Are you sure you want to prune the selected forums with the settings specified? Once removed, there is no way to recover the pruned posts and topics.',
-	'PRUNE_NOT_POSTED'				=> 'Days since last posted',
-	'PRUNE_NOT_VIEWED'				=> 'Days since last viewed',
-	'PRUNE_OLD_POLLS'				=> 'Prune old polls',
-	'PRUNE_OLD_POLLS_EXPLAIN'		=> 'Removes topics with polls not voted in for post age days.',
-	'PRUNE_STICKY'					=> 'Prune stickies',
-	'PRUNE_SUCCESS'					=> 'Pruning of forums was successful.',
-
-	'TOPICS_PRUNED'		=> 'Topics pruned',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
deleted file mode 100644
index 11e6723c75..0000000000
--- a/phpBB/language/en/acp/search.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
-*
-* acp_search [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-$lang = array_merge($lang, array(
-	'ACP_SEARCH_INDEX_EXPLAIN'				=> 'Here you can manage the search backend’s indexes. Since you normally use only one backend you should delete all indexes that you do not make use of. After altering some of the search settings (e.g. the number of minimum/maximum chars) it might be worth recreating the index so it reflects those changes.',
-	'ACP_SEARCH_SETTINGS_EXPLAIN'			=> 'Here you can define what search backend will be used for indexing posts and performing searches. You can set various options that can influence how much processing these actions require. Some of these settings are the same for all search engine backends.',
-
-	'COMMON_WORD_THRESHOLD'					=> 'Common word threshold',
-	'COMMON_WORD_THRESHOLD_EXPLAIN'			=> 'Words which are contained in a greater percentage of all posts will be regarded as common. Common words are ignored in search queries. Set to zero to disable. Only takes effect if there are more than 100 posts.',
-	'CONFIRM_SEARCH_BACKEND'				=> 'Are you sure you wish to switch to a different search backend? After changing the search backend you will have to create an index for the new search backend. If you don’t plan on switching back to the old search backend you can also delete the old backend’s index in order to free system resources.',
-	'CONTINUE_DELETING_INDEX'				=> 'Continue previous index removal process',
-	'CONTINUE_DELETING_INDEX_EXPLAIN'		=> 'An index removal process has been started. In order to access the search index page you will have to complete it or cancel it.',
-	'CONTINUE_INDEXING'						=> 'Continue previous indexing process',
-	'CONTINUE_INDEXING_EXPLAIN'				=> 'An indexing process has been started. In order to access the search index page you will have to complete it or cancel it.',
-	'CREATE_INDEX'							=> 'Create index',
-
-	'DELETE_INDEX'							=> 'Delete index',
-	'DELETING_INDEX_IN_PROGRESS'			=> 'Deleting the index in progress',
-	'DELETING_INDEX_IN_PROGRESS_EXPLAIN'	=> 'The search backend is currently cleaning its index. This can take a few minutes.',
-
-	'FULLTEXT_MYSQL_INCOMPATIBLE_VERSION'	=> 'The MySQL fulltext backend can only be used with MySQL4 and above.',
-	'FULLTEXT_MYSQL_NOT_MYISAM'				=> 'MySQL fulltext indexes can only be used with MyISAM tables.',
-	'FULLTEXT_MYSQL_TOTAL_POSTS'			=> 'Total number of indexed posts',
-
-	'GENERAL_SEARCH_SETTINGS'				=> 'General search settings',
-	'GO_TO_SEARCH_INDEX'					=> 'Go to search index page',
-
-	'INDEX_STATS'							=> 'Index statistics',
-	'INDEXING_IN_PROGRESS'					=> 'Indexing in progress',
-	'INDEXING_IN_PROGRESS_EXPLAIN'			=> 'The search backend is currently indexing all posts on the board. This can take from a few minutes to a few hours depending on your board’s size.',
-
-	'LIMIT_SEARCH_LOAD'						=> 'Search page system load limit',
-	'LIMIT_SEARCH_LOAD_EXPLAIN'				=> 'If the 1 minute system load exceeds this value the search page will go offline, 1.0 equals ~100% utilisation of one processor. This only functions on UNIX based servers.',
-
-	'MAX_SEARCH_CHARS'						=> 'Max characters indexed by search',
-	'MAX_SEARCH_CHARS_EXPLAIN'				=> 'Words with no more than this many characters will be indexed for searching.',
-	'MAX_NUM_SEARCH_KEYWORDS'				=> 'Maximum number of allowed keywords',
-	'MAX_NUM_SEARCH_KEYWORDS_EXPLAIN'		=> 'Maximum number of words the user is able to search for. A value of 0 allows an unlimited number of words.',
-	'MIN_SEARCH_CHARS'						=> 'Min characters indexed by search',
-	'MIN_SEARCH_CHARS_EXPLAIN'				=> 'Words with at least this many characters will be indexed for searching.',
-	'MIN_SEARCH_AUTHOR_CHARS'				=> 'Min author name characters',
-	'MIN_SEARCH_AUTHOR_CHARS_EXPLAIN'		=> 'Users have to enter at least this many characters of the name when performing a wildcard author search. If the author’s username is shorter than this number you can still search for the author’s posts by entering the complete username.',
-
-	'PROGRESS_BAR'							=> 'Progress bar',
-
-	'SEARCH_GUEST_INTERVAL'					=> 'Guest search flood interval',
-	'SEARCH_GUEST_INTERVAL_EXPLAIN'			=> 'Number of seconds guests must wait between searches. If one guest searches all others have to wait until the time interval passed.',
-	'SEARCH_INDEX_CREATE_REDIRECT'			=> 'All posts up to post id %1$d have now been indexed, of which %2$d posts were within this step.<br />The current rate of indexing is approximately %3$.1f posts per second.<br />Indexing in progress…',
-	'SEARCH_INDEX_DELETE_REDIRECT'			=> 'All posts up to post id %1$d have been removed from the search index.<br />Deleting in progress…',
-	'SEARCH_INDEX_CREATED'					=> 'Successfully indexed all posts in the board database.',
-	'SEARCH_INDEX_REMOVED'					=> 'Successfully deleted the search index for this backend.',
-	'SEARCH_INTERVAL'						=> 'User search flood interval',
-	'SEARCH_INTERVAL_EXPLAIN'				=> 'Number of seconds users must wait between searches. This interval is checked independently for each user.',
-	'SEARCH_STORE_RESULTS'					=> 'Search result cache length',
-	'SEARCH_STORE_RESULTS_EXPLAIN'			=> 'Cached search results will expire after this time, in seconds. Set to 0 if you want to disable search cache.',
-	'SEARCH_TYPE'							=> 'Search backend',
-	'SEARCH_TYPE_EXPLAIN'					=> 'phpBB allows you to choose the backend that is used for searching text in post contents. By default the search will use phpBB’s own fulltext search.',
-	'SWITCHED_SEARCH_BACKEND'				=> 'You switched the search backend. In order to use the new search backend you should make sure that there is an index for the backend you chose.',
-
-	'TOTAL_WORDS'							=> 'Total number of indexed words',
-	'TOTAL_MATCHES'							=> 'Total number of word to post relations indexed',
-
-	'YES_SEARCH'							=> 'Enable search facilities',
-	'YES_SEARCH_EXPLAIN'					=> 'Enables user facing search functionality including member search.',
-	'YES_SEARCH_UPDATE'						=> 'Enable fulltext updating',
-	'YES_SEARCH_UPDATE_EXPLAIN'				=> 'Updating of fulltext indexes when posting, overridden if search is disabled.',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
deleted file mode 100644
index 2d28b4fb2a..0000000000
--- a/phpBB/language/en/acp/styles.php
+++ /dev/null
@@ -1,421 +0,0 @@
-<?php
-/**
-*
-* acp_styles [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-$lang = array_merge($lang, array(
-	'ACP_IMAGESETS_EXPLAIN'	=> 'Imagesets comprise all the button, forum, folder, etc. and other non-style specific images used by the board. Here you can edit, export or delete existing imagesets and import or activate new sets.',
-	'ACP_STYLES_EXPLAIN'	=> 'Here you can manage the available styles on your board. A style consists of a template, theme and imageset. You may alter existing styles, delete, deactivate, reactivate, create or import new ones. You can also see what a style will look like using the preview function. The current default style is noted by the presence of an asterisk (*). Also listed is the total user count for each style, note that overriding user styles will not be reflected here.',
-	'ACP_TEMPLATES_EXPLAIN'	=> 'A template set comprises all the markup used to generate the layout of your board. Here you can edit existing template sets, delete, export, import and preview sets. You can also modify the templating code used to generate BBCode.',
-	'ACP_THEMES_EXPLAIN'	=> 'From here you can create, install, edit, delete and export themes. A theme is the combination of colours and images that are applied to your templates to define the basic look of your board. The range of options open to you depends on the configuration of your server and phpBB installation, see the manual for further details. Please note that when creating new themes the use of an existing theme as a basis is optional.',
-	'ADD_IMAGESET'			=> 'Create imageset',
-	'ADD_IMAGESET_EXPLAIN'	=> 'Here you can create a new imageset. Depending on your server configuration and file permissions you may have additional options here. For example you may be able to base this imageset on an existing one. You may also be able to upload or import (from the store directory) a imageset archive. If you upload or import an archive the imageset name can be optionally taken from the archive name (to do this leave the imageset name blank).',
-	'ADD_STYLE'				=> 'Create style',
-	'ADD_STYLE_EXPLAIN'		=> 'Here you can create a new style. Depending on your server configuration and file permissions you may have additional options. For example you may be able to base this style on an existing one. You may also be able to upload or import (from the store directory) a style archive. If you upload or import an archive the style name will be determined automatically.',
-	'ADD_TEMPLATE'			=> 'Create template',
-	'ADD_TEMPLATE_EXPLAIN'	=> 'Here you can add a new template. Depending on your server configuration and file permissions you may have additional options here. For example you may be able to base this template set on an existing one. You may also be able to upload or import (from the store directory) a template archive. If you upload or import an archive the template name can be optionally taken from the archive name (to do this leave the template name blank).',
-	'ADD_THEME'				=> 'Create theme',
-	'ADD_THEME_EXPLAIN'		=> 'Here you can add a new theme. Depending on your server configuration and file permissions you may have additional options here. For example you may be able to base this theme on an existing one. You may also be able to upload or import (from the store directory) a theme archive. If you upload or import an archive the theme name can be optionally taken from the archive name (to do this leave the theme name blank).',
-	'ARCHIVE_FORMAT'		=> 'Archive file type',
-	'AUTOMATIC_EXPLAIN'		=> 'Leave blank to attempt automatic detection.',
-
-	'BACKGROUND'			=> 'Background',
-	'BACKGROUND_COLOUR'		=> 'Background colour',
-	'BACKGROUND_IMAGE'		=> 'Background image',
-	'BACKGROUND_REPEAT'		=> 'Background repeat',
-	'BOLD'					=> 'Bold',
-
-	'CACHE'							=> 'Cache',
-	'CACHE_CACHED'					=> 'Cached',
-	'CACHE_FILENAME'				=> 'Template file',
-	'CACHE_FILESIZE'				=> 'File size',
-	'CACHE_MODIFIED'				=> 'Modified',
-	'CONFIRM_IMAGESET_REFRESH'		=> 'Are you sure you wish to refresh all imageset data? The settings from the imageset configuration file will overwrite all modifications to the imageset which have been carried out with the imageset editor.',
-	'CONFIRM_TEMPLATE_CLEAR_CACHE'	=> 'Are you sure you wish to clear all cached versions of your template files?',
-	'CONFIRM_THEME_REFRESH'			=> 'Are you sure you wish to refresh the theme data stored in the database with the contents of the theme on the filesystem? This will overwrite all modifications which have been carried out with the theme editor while the theme was stored in the database.',
-	'COPYRIGHT'						=> 'Copyright',
-	'CREATE_IMAGESET'				=> 'Create new imageset',
-	'CREATE_STYLE'					=> 'Create new style',
-	'CREATE_TEMPLATE'				=> 'Create new template set',
-	'CREATE_THEME'					=> 'Create new theme',
-	'CURRENT_IMAGE'					=> 'Current image',
-
-	'DEACTIVATE_DEFAULT'		=> 'You cannot deactivate the default style.',
-	'DELETE_FROM_FS'			=> 'Delete from filesystem',
-	'DELETE_IMAGESET'			=> 'Delete imageset',
-	'DELETE_IMAGESET_EXPLAIN'	=> 'Here you can remove the selected imageset from the database. Additionally, if you have permission you can elect to remove the set from the filesystem. Please note that there is no undo capability. When the imageset is deleted it is gone for good. It is recommended that you first export your set for possible future use.',
-	'DELETE_STYLE'				=> 'Delete style',
-	'DELETE_STYLE_EXPLAIN'		=> 'Here you can remove the selected style. You cannot remove all the style elements from here. These must be deleted individually via their respective forms. Take care in deleting styles there is no undo facility.',
-	'DELETE_TEMPLATE'			=> 'Delete template',
-	'DELETE_TEMPLATE_EXPLAIN'	=> 'Here you can remove the selected template set from the database. Additionally, if you have permission you can elect to remove the set from the filesystem. Please note that there is no undo capability. When the templates are deleted they are gone for good. It is recommended that you first export your set for possible future use.',
-	'DELETE_THEME'				=> 'Delete theme',
-	'DELETE_THEME_EXPLAIN'		=> 'Here you can remove the selected theme from the database. Additionally, if you have permission you can elect to remove the theme from the filesystem. Please note that there is no undo capability. When the theme is deleted it is gone for good. It is recommended that you first export your theme for possible future use.',
-	'DETAILS'					=> 'Details',
-	'DIMENSIONS_EXPLAIN'		=> 'Selecting yes here will include width/height parameters.',
-
-	'EDIT_DETAILS_IMAGESET'				=> 'Edit imageset details',
-	'EDIT_DETAILS_IMAGESET_EXPLAIN'		=> 'Here you can edit certain imageset details such as its name.',
-	'EDIT_DETAILS_STYLE'				=> 'Edit style',
-	'EDIT_DETAILS_STYLE_EXPLAIN'		=> 'Using the form below you can modify this existing style. You may alter the combination of template, theme and imageset which define the style itself. You may also make the style the default one.',
-	'EDIT_DETAILS_TEMPLATE'				=> 'Edit template details',
-	'EDIT_DETAILS_TEMPLATE_EXPLAIN'		=> 'Here you can edit certain template details such as its name. You may also have the option to switch storage of the stylesheet from the filesystem to the database and vice versa. This option depends on your PHP configuration and whether your template set can be written to by the web server.',
-	'EDIT_DETAILS_THEME'				=> 'Edit theme details',
-	'EDIT_DETAILS_THEME_EXPLAIN'		=> 'Here you can edit certain theme details such as its name. You may also have the option to switch storage of the stylesheet from the filesystem to the database and vice versa. This option depends on your PHP configuration and whether your stylesheet can be written to by the web server.',
-	'EDIT_IMAGESET'						=> 'Edit imageset',
-	'EDIT_IMAGESET_EXPLAIN'				=> 'Here you can edit the individual images which define the imageset. You can also specify dimensions for the image. Dimensions are optional, specifying them can overcome certain rendering issues with some browsers. By not specifying them you reduce the size of the database record a little.',
-	'EDIT_TEMPLATE'						=> 'Edit template',
-	'EDIT_TEMPLATE_EXPLAIN'				=> 'Here you can edit your template set directly. Please remember that these edits are permanent and cannot be undone once submitted. If PHP can write to the template files in your styles directory any changes here will be written directly to those files. If PHP cannot write to those files they will be copied into the database and all changes will only be reflected there. Please take care when editing your template set, remember to close all replacement variable terms {XXXX} and conditional statements.',
-	'EDIT_THEME'						=> 'Edit theme',
-	'EDIT_THEME_EXPLAIN'				=> 'Here you can edit the selected theme, changing colours, images, etc.',
-	'EDIT_THEME_STORED_DB'				=> 'The stylesheet file was unwritable so the stylesheet is now stored in the database containing your modification.',
-	'EDIT_THEME_STORE_PARSED'			=> 'The theme requires that its stylesheet is parsed. This is only possible if it’s stored in the database.',
-	'EXPORT'							=> 'Export',
-
-	'FOREGROUND'			=> 'Foreground',
-	'FONT_COLOUR'			=> 'Font colour',
-	'FONT_FACE'				=> 'Font face',
-	'FONT_FACE_EXPLAIN'		=> 'You can specify multiple fonts separated by commas. If a user doesn’t have the first font installed the first other working font will be chosen.',
-	'FONT_SIZE'				=> 'Font size',
-
-	'GLOBAL_IMAGES'			=> 'Global',
-
-	'HIDE_CSS'				=> 'Hide raw CSS',
-
-	'IMAGE_WIDTH'				=> 'Image width',
-	'IMAGE_HEIGHT'				=> 'Image height',
-	'IMAGE'						=> 'Image',
-	'IMAGE_NAME'				=> 'Image name',
-	'IMAGE_PARAMETER'			=> 'Parameter',
-	'IMAGE_VALUE'				=> 'Value',
-	'IMAGESET_ADDED'			=> 'New imageset added on filesystem.',
-	'IMAGESET_ADDED_DB'			=> 'New imageset added to database.',
-	'IMAGESET_DELETED'			=> 'Imageset deleted successfully.',
-	'IMAGESET_DELETED_FS'		=> 'Imageset removed from database but some files may remain on the filesystem.',
-	'IMAGESET_DETAILS_UPDATED'	=> 'Imageset details successfully updated.',
-	'IMAGESET_ERR_ARCHIVE'		=> 'Please select an archive method.',
-	'IMAGESET_ERR_COPY_LONG'	=> 'The copyright can be no longer than 60 characters.',
-	'IMAGESET_ERR_NAME_CHARS'	=> 'The imageset name can only contain alphanumeric characters, -, +, _ and space.',
-	'IMAGESET_ERR_NAME_EXIST'	=> 'A imageset with that name already exists.',
-	'IMAGESET_ERR_NAME_LONG'	=> 'The imageset name can be no longer than 30 characters.',
-	'IMAGESET_ERR_NOT_IMAGESET'	=> 'The archive you specified does not contain a valid imageset.',
-	'IMAGESET_ERR_STYLE_NAME'	=> 'You must supply a name for this imageset.',
-	'IMAGESET_EXPORT'			=> 'Export imageset',
-	'IMAGESET_EXPORT_EXPLAIN'	=> 'Here you can export an imageset in the form of an archive. This archive will contain all the data necessary to install the set of images on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
-	'IMAGESET_EXPORTED'			=> 'Imageset exported successfully and stored in %s.',
-	'IMAGESET_NAME'				=> 'Imageset name',
-	'IMAGESET_REFRESHED'		=> 'Imageset refreshed successfully.',
-	'IMAGESET_UPDATED'			=> 'Imageset updated successfully.',
-	'ITALIC'					=> 'Italic',
-
-	'IMG_CAT_BUTTONS'		=> 'Localised buttons',
-	'IMG_CAT_CUSTOM'		=> 'Custom images',
-	'IMG_CAT_FOLDERS'		=> 'Topic icons',
-	'IMG_CAT_FORUMS'		=> 'Forum icons',
-	'IMG_CAT_ICONS'			=> 'General icons',
-	'IMG_CAT_LOGOS'			=> 'Logos',
-	'IMG_CAT_POLLS'			=> 'Polling images',
-	'IMG_CAT_UI'			=> 'General user interface elements',
-	'IMG_CAT_USER'			=> 'Additional images',
-
-	'IMG_SITE_LOGO'			=> 'Main logo',
-	'IMG_UPLOAD_BAR'		=> 'Upload progress bar',
-	'IMG_POLL_LEFT'			=> 'Poll left end',
-	'IMG_POLL_CENTER'		=> 'Poll centre',
-	'IMG_POLL_RIGHT'		=> 'Poll right end',
-	'IMG_ICON_FRIEND'		=> 'Add as friend',
-	'IMG_ICON_FOE'			=> 'Add as foe',
-
-	'IMG_FORUM_LINK'			=> 'Forum link',
-	'IMG_FORUM_READ'			=> 'Forum',
-	'IMG_FORUM_READ_LOCKED'		=> 'Forum locked',
-	'IMG_FORUM_READ_SUBFORUM'	=> 'Subforum',
-	'IMG_FORUM_UNREAD'			=> 'Forum new posts',
-	'IMG_FORUM_UNREAD_LOCKED'	=> 'Forum new posts locked',
-	'IMG_FORUM_UNREAD_SUBFORUM'	=> 'Subforum new posts',
-	'IMG_SUBFORUM_READ'			=> 'Legend subforum',
-	'IMG_SUBFORUM_UNREAD'		=> 'Legend subforum new posts',
-
-	'IMG_TOPIC_MOVED'			=> 'Topic moved',
-
-	'IMG_TOPIC_READ'				=> 'Topic',
-	'IMG_TOPIC_READ_MINE'			=> 'Topic posted to',
-	'IMG_TOPIC_READ_HOT'			=> 'Topic popular',
-	'IMG_TOPIC_READ_HOT_MINE'		=> 'Topic popular posted to',
-	'IMG_TOPIC_READ_LOCKED'			=> 'Topic locked',
-	'IMG_TOPIC_READ_LOCKED_MINE'	=> 'Topic locked posted to',
-
-	'IMG_TOPIC_UNREAD'				=> 'Topic new posts',
-	'IMG_TOPIC_UNREAD_MINE'			=> 'Topic posted to new',
-	'IMG_TOPIC_UNREAD_HOT'			=> 'Topic popular new posts',
-	'IMG_TOPIC_UNREAD_HOT_MINE'		=> 'Topic popular posted to new',
-	'IMG_TOPIC_UNREAD_LOCKED'		=> 'Topic locked new',
-	'IMG_TOPIC_UNREAD_LOCKED_MINE'	=> 'Topic locked posted to new',
-
-	'IMG_STICKY_READ'				=> 'Sticky topic',
-	'IMG_STICKY_READ_MINE'			=> 'Sticky topic posted to',
-	'IMG_STICKY_READ_LOCKED'		=> 'Sticky topic locked',
-	'IMG_STICKY_READ_LOCKED_MINE'	=> 'Sticky topic locked posted to',
-	'IMG_STICKY_UNREAD'				=> 'Sticky topic new posts',
-	'IMG_STICKY_UNREAD_MINE'		=> 'Sticky topic posted to new',
-	'IMG_STICKY_UNREAD_LOCKED'		=> 'Sticky topic locked new posts',
-	'IMG_STICKY_UNREAD_LOCKED_MINE'	=> 'Sticky topic locked posted to new',
-
-	'IMG_ANNOUNCE_READ'					=> 'Announcement',
-	'IMG_ANNOUNCE_READ_MINE'			=> 'Announcement posted to',
-	'IMG_ANNOUNCE_READ_LOCKED'			=> 'Announcement locked',
-	'IMG_ANNOUNCE_READ_LOCKED_MINE'		=> 'Announcement locked posted to',
-	'IMG_ANNOUNCE_UNREAD'				=> 'Announcement new posts',
-	'IMG_ANNOUNCE_UNREAD_MINE'			=> 'Announcement posted to new',
-	'IMG_ANNOUNCE_UNREAD_LOCKED'		=> 'Announcement locked new posts',
-	'IMG_ANNOUNCE_UNREAD_LOCKED_MINE'	=> 'Announcement locked posted to new',
-
-	'IMG_GLOBAL_READ'					=> 'Global',
-	'IMG_GLOBAL_READ_MINE'				=> 'Global posted to',
-	'IMG_GLOBAL_READ_LOCKED'			=> 'Global locked',
-	'IMG_GLOBAL_READ_LOCKED_MINE'		=> 'Global locked posted to',
-	'IMG_GLOBAL_UNREAD'					=> 'Global new posts',
-	'IMG_GLOBAL_UNREAD_MINE'			=> 'Global posted to new',
-	'IMG_GLOBAL_UNREAD_LOCKED'			=> 'Global locked new posts',
-	'IMG_GLOBAL_UNREAD_LOCKED_MINE'		=> 'Global locked posted to new',
-
-	'IMG_PM_READ'		=> 'Read private message',
-	'IMG_PM_UNREAD'		=> 'Unread private message',
-
-	'IMG_ICON_BACK_TOP'		=> 'Top',
-
-	'IMG_ICON_CONTACT_AIM'		=> 'AIM',
-	'IMG_ICON_CONTACT_EMAIL'	=> 'Send e-mail',
-	'IMG_ICON_CONTACT_ICQ'		=> 'ICQ',
-	'IMG_ICON_CONTACT_JABBER'	=> 'Jabber',
-	'IMG_ICON_CONTACT_MSNM'		=> 'MSNM',
-	'IMG_ICON_CONTACT_PM'		=> 'Send message',
-	'IMG_ICON_CONTACT_YAHOO'	=> 'YIM',
-	'IMG_ICON_CONTACT_WWW'		=> 'Website',
-
-	'IMG_ICON_POST_DELETE'			=> 'Delete post',
-	'IMG_ICON_POST_EDIT'			=> 'Edit post',
-	'IMG_ICON_POST_INFO'			=> 'Show post details',
-	'IMG_ICON_POST_QUOTE'			=> 'Quote post',
-	'IMG_ICON_POST_REPORT'			=> 'Report post',
-	'IMG_ICON_POST_TARGET'			=> 'Minipost',
-	'IMG_ICON_POST_TARGET_UNREAD'	=> 'New minipost',
-
-
-	'IMG_ICON_TOPIC_ATTACH'			=> 'Attachment',
-	'IMG_ICON_TOPIC_LATEST'			=> 'Last post',
-	'IMG_ICON_TOPIC_NEWEST'			=> 'Last unread post',
-	'IMG_ICON_TOPIC_REPORTED'		=> 'Post reported',
-	'IMG_ICON_TOPIC_UNAPPROVED'		=> 'Post unapproved',
-
-	'IMG_ICON_USER_ONLINE'		=> 'User online',
-	'IMG_ICON_USER_OFFLINE'		=> 'User offline',
-	'IMG_ICON_USER_PROFILE'		=> 'Show profile',
-	'IMG_ICON_USER_SEARCH'		=> 'Search posts',
-	'IMG_ICON_USER_WARN'		=> 'Warn user',
-
-	'IMG_BUTTON_PM_FORWARD'		=> 'Forward private message',
-	'IMG_BUTTON_PM_NEW'			=> 'New private message',
-	'IMG_BUTTON_PM_REPLY'		=> 'Reply private message',
-	'IMG_BUTTON_TOPIC_LOCKED'	=> 'Topic locked',
-	'IMG_BUTTON_TOPIC_NEW'		=> 'New topic',
-	'IMG_BUTTON_TOPIC_REPLY'	=> 'Reply topic',
-
-	'IMG_USER_ICON1'		=> 'User defined image 1',
-	'IMG_USER_ICON2'		=> 'User defined image 2',
-	'IMG_USER_ICON3'		=> 'User defined image 3',
-	'IMG_USER_ICON4'		=> 'User defined image 4',
-	'IMG_USER_ICON5'		=> 'User defined image 5',
-	'IMG_USER_ICON6'		=> 'User defined image 6',
-	'IMG_USER_ICON7'		=> 'User defined image 7',
-	'IMG_USER_ICON8'		=> 'User defined image 8',
-	'IMG_USER_ICON9'		=> 'User defined image 9',
-	'IMG_USER_ICON10'		=> 'User defined image 10',
-
-	'INCLUDE_DIMENSIONS'		=> 'Include dimensions',
-	'INCLUDE_IMAGESET'			=> 'Include imageset',
-	'INCLUDE_TEMPLATE'			=> 'Include template',
-	'INCLUDE_THEME'				=> 'Include theme',
-	'INSTALL_IMAGESET'			=> 'Install imageset',
-	'INSTALL_IMAGESET_EXPLAIN'	=> 'Here you can install your selected imageset. You can edit certain details if you wish or use the installation defaults.',
-	'INSTALL_STYLE'				=> 'Install style',
-	'INSTALL_STYLE_EXPLAIN'		=> 'Here you can install a new style and if appropriate the corresponding style elements. If you already have the relevant style elements installed they will not be overwritten. Some styles require existing style elements to already be installed. If you try installing such a style and do not have the required elements you will be notified.',
-	'INSTALL_TEMPLATE'			=> 'Install Template',
-	'INSTALL_TEMPLATE_EXPLAIN'	=> 'Here you can install a new template set. Depending on your server configuration you may have a number of options here.',
-	'INSTALL_THEME'				=> 'Install theme',
-	'INSTALL_THEME_EXPLAIN'		=> 'Here you can install your selected theme. You can edit certain details if you wish or use the installation defaults.',
-	'INSTALLED_IMAGESET'		=> 'Installed imagesets',
-	'INSTALLED_STYLE'			=> 'Installed styles',
-	'INSTALLED_TEMPLATE'		=> 'Installed templates',
-	'INSTALLED_THEME'			=> 'Installed themes',
-
-	'LINE_SPACING'				=> 'Line spacing',
-	'LOCALISED_IMAGES'			=> 'Localised',
-
-	'NO_CLASS'					=> 'Cannot find class in stylesheet.',
-	'NO_IMAGESET'				=> 'Cannot find imageset on filesystem.',
-	'NO_IMAGE'					=> 'No image',
-	'NO_IMAGE_ERROR'			=> 'Cannot find image on filesystem.',
-	'NO_STYLE'					=> 'Cannot find style on filesystem.',
-	'NO_TEMPLATE'				=> 'Cannot find template on filesystem.',
-	'NO_THEME'					=> 'Cannot find theme on filesystem.',
-	'NO_UNINSTALLED_IMAGESET'	=> 'No uninstalled imagesets detected.',
-	'NO_UNINSTALLED_STYLE'		=> 'No uninstalled styles detected.',
-	'NO_UNINSTALLED_TEMPLATE'	=> 'No uninstalled templates detected.',
-	'NO_UNINSTALLED_THEME'		=> 'No uninstalled themes detected.',
-	'NO_UNIT'					=> 'None',
-
-	'ONLY_IMAGESET'			=> 'This is the only remaining imageset, you cannot delete it.',
-	'ONLY_STYLE'			=> 'This is the only remaining style, you cannot delete it.',
-	'ONLY_TEMPLATE'			=> 'This is the only remaining template set, you cannot delete it.',
-	'ONLY_THEME'			=> 'This is the only remaining theme, you cannot delete it.',
-	'OPTIONAL_BASIS'		=> 'Optional basis',
-
-	'REFRESH'					=> 'Refresh',
-	'REPEAT_NO'					=> 'None',
-	'REPEAT_X'					=> 'Only horizontally',
-	'REPEAT_Y'					=> 'Only vertically',
-	'REPEAT_ALL'				=> 'Both directions',
-	'REPLACE_IMAGESET'			=> 'Replace imageset with',
-	'REPLACE_IMAGESET_EXPLAIN'	=> 'This imageset will replace the one you are deleting in any styles that use it.',
-	'REPLACE_STYLE'				=> 'Replace style with',
-	'REPLACE_STYLE_EXPLAIN'		=> 'This style will replace the one being deleted for members that use it.',
-	'REPLACE_TEMPLATE'			=> 'Replace template with',
-	'REPLACE_TEMPLATE_EXPLAIN'	=> 'This template set will replace the one you are deleting in any styles that use it.',
-	'REPLACE_THEME'				=> 'Replace theme with',
-	'REPLACE_THEME_EXPLAIN'		=> 'This theme will replace the one you are deleting in any styles that use it.',
-	'REQUIRES_IMAGESET'			=> 'This style requires the %s imageset to be installed.',
-	'REQUIRES_TEMPLATE'			=> 'This style requires the %s template set to be installed.',
-	'REQUIRES_THEME'			=> 'This style requires the %s theme to be installed.',
-
-	'SELECT_IMAGE'				=> 'Select image',
-	'SELECT_TEMPLATE'			=> 'Select template file',
-	'SELECT_THEME'				=> 'Select theme file',
-	'SELECTED_IMAGE'			=> 'Selected image',
-	'SELECTED_IMAGESET'			=> 'Selected imageset',
-	'SELECTED_TEMPLATE'			=> 'Selected template',
-	'SELECTED_TEMPLATE_FILE'	=> 'Selected template file',
-	'SELECTED_THEME'			=> 'Selected theme',
-	'SELECTED_THEME_FILE'		=> 'Selected theme file',
-	'STORE_DATABASE'			=> 'Database',
-	'STORE_FILESYSTEM'			=> 'Filesystem',
-	'STYLE_ACTIVATE'			=> 'Activate',
-	'STYLE_ACTIVE'				=> 'Active',
-	'STYLE_ADDED'				=> 'Style added successfully.',
-	'STYLE_DEACTIVATE'			=> 'Deactivate',
-	'STYLE_DEFAULT'				=> 'Make default style',
-	'STYLE_DELETED'				=> 'Style deleted successfully.',
-	'STYLE_DETAILS_UPDATED'		=> 'Style edited successfully.',
-	'STYLE_ERR_ARCHIVE'			=> 'Please select an archive method.',
-	'STYLE_ERR_COPY_LONG'		=> 'The copyright can be no longer than 60 characters.',
-	'STYLE_ERR_MORE_ELEMENTS'	=> 'You must select at least one style element.',
-	'STYLE_ERR_NAME_CHARS'		=> 'The style name can only contain alphanumeric characters, -, +, _ and space.',
-	'STYLE_ERR_NAME_EXIST'		=> 'A style with that name already exists.',
-	'STYLE_ERR_NAME_LONG'		=> 'The style name can be no longer than 30 characters.',
-	'STYLE_ERR_NO_IDS'			=> 'You must select a template, theme and imageset for this style.',
-	'STYLE_ERR_NOT_STYLE'		=> 'The imported or uploaded file did not contain a valid style archive.',
-	'STYLE_ERR_STYLE_NAME'		=> 'You must supply a name for this style.',
-	'STYLE_EXPORT'				=> 'Export style',
-	'STYLE_EXPORT_EXPLAIN'		=> 'Here you can export a style in the form of an archive. A style does not need to contain all elements but it must contain at least one. For example if you have created a new theme and imageset for a commonly used template you could simply export the theme and imageset and omit the template. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
-	'STYLE_EXPORTED'			=> 'Style exported successfully and stored in %s.',
-	'STYLE_IMAGESET'			=> 'Imageset',
-	'STYLE_NAME'				=> 'Style name',
-	'STYLE_TEMPLATE'			=> 'Template',
-	'STYLE_THEME'				=> 'Theme',
-	'STYLE_USED_BY'				=> 'Used by (including robots)',
-
-	'TEMPLATE_ADDED'			=> 'Template set added and stored on filesystem.',
-	'TEMPLATE_CACHE'			=> 'Template cache',
-	'TEMPLATE_CACHE_EXPLAIN'	=> 'By default phpBB caches the compiled version of its templates. This decreases the load on the server each time a page is viewed and thus may reduce the page generation time. Here you can view the cache status of each file and delete individual files or the entire cache.',
-	'TEMPLATE_CACHE_CLEARED'	=> 'Template cache cleared successfully.',
-	'TEMPLATE_CACHE_EMPTY'		=> 'There are no cached templates.',
-	'TEMPLATE_DELETED'			=> 'Template set deleted successfully.',
-	'TEMPLATE_DELETED_FS'		=> 'Template set removed from database but some files may remain on the filesystem.',
-	'TEMPLATE_DETAILS_UPDATED'	=> 'Template details successfully updated.',
-	'TEMPLATE_EDITOR'			=> 'Raw HTML template editor',
-	'TEMPLATE_EDITOR_HEIGHT'	=> 'Template editor height',
-	'TEMPLATE_ERR_ARCHIVE'		=> 'Please select an archive method.',
-	'TEMPLATE_ERR_CACHE_READ'	=> 'The cache directory used to store cached versions of template files could not be opened.',
-	'TEMPLATE_ERR_COPY_LONG'	=> 'The copyright can be no longer than 60 characters.',
-	'TEMPLATE_ERR_NAME_CHARS'	=> 'The template name can only contain alphanumeric characters, -, +, _ and space.',
-	'TEMPLATE_ERR_NAME_EXIST'	=> 'A template set with that name already exists.',
-	'TEMPLATE_ERR_NAME_LONG'	=> 'The template name can be no longer than 30 characters.',
-	'TEMPLATE_ERR_NOT_TEMPLATE'	=> 'The archive you specified does not contain a valid template set.',
-	'TEMPLATE_ERR_STYLE_NAME'	=> 'You must supply a name for this template.',
-	'TEMPLATE_EXPORT'			=> 'Export templates',
-	'TEMPLATE_EXPORT_EXPLAIN'	=> 'Here you can export a template set in the form of an archive. This archive will contain all the files necessary to install the templates on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
-	'TEMPLATE_EXPORTED'			=> 'Templates exported successfully and stored in %s.',
-	'TEMPLATE_FILE'				=> 'Template file',
-	'TEMPLATE_FILE_UPDATED'		=> 'Template file updated successfully.',
-	'TEMPLATE_LOCATION'			=> 'Store templates in',
-	'TEMPLATE_LOCATION_EXPLAIN'	=> 'Images are always stored on the filesystem.',
-	'TEMPLATE_NAME'				=> 'Template name',
-
-	'THEME_ADDED'				=> 'New theme added on filesystem.',
-	'THEME_ADDED_DB'			=> 'New theme added to database.',
-	'THEME_CLASS_ADDED'			=> 'Custom class added successfully.',
-	'THEME_DELETED'				=> 'Theme deleted successfully.',
-	'THEME_DELETED_FS'			=> 'Theme removed from database but files remain on the filesystem.',
-	'THEME_DETAILS_UPDATED'		=> 'Theme details successfully updated.',
-	'THEME_EDITOR'				=> 'Theme editor',
-	'THEME_EDITOR_HEIGHT'		=> 'Theme editor height',
-	'THEME_ERR_ARCHIVE'			=> 'Please select an archive method.',
-	'THEME_ERR_CLASS_CHARS'		=> 'Only alphanumeric characters plus ., :, -, _ and # are valid in class names.',
-	'THEME_ERR_COPY_LONG'		=> 'The copyright can be no longer than 60 characters.',
-	'THEME_ERR_NAME_CHARS'		=> 'The theme name can only contain alphanumeric characters, -, +, _ and space.',
-	'THEME_ERR_NAME_EXIST'		=> 'A theme with that name already exists.',
-	'THEME_ERR_NAME_LONG'		=> 'The theme name can be no longer than 30 characters.',
-	'THEME_ERR_NOT_THEME'		=> 'The archive you specified does not contain a valid theme.',
-	'THEME_ERR_REFRESH_FS'		=> 'This theme is stored on the filesystem so there is no need to refresh it.',
-	'THEME_ERR_STYLE_NAME'		=> 'You must supply a name for this theme.',
-	'THEME_FILE'				=> 'Theme file',
-	'THEME_EXPORT'				=> 'Export Theme',
-	'THEME_EXPORT_EXPLAIN'		=> 'Here you can export a theme in the form of an archive. This archive will contain all the data necessary to install the theme on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
-	'THEME_EXPORTED'			=> 'Theme exported successfully and stored in %s.',
-	'THEME_LOCATION'			=> 'Store stylesheet in',
-	'THEME_LOCATION_EXPLAIN'	=> 'Images are always stored on the filesystem.',
-	'THEME_NAME'				=> 'Theme name',
-	'THEME_REFRESHED'			=> 'Theme refreshed successfully.',
-	'THEME_UPDATED'				=> 'Theme updated successfully.',
-
-	'UNDERLINE'				=> 'Underline',
-	'UNINSTALLED_IMAGESET'	=> 'Uninstalled imagesets',
-	'UNINSTALLED_STYLE'		=> 'Uninstalled styles',
-	'UNINSTALLED_TEMPLATE'	=> 'Uninstalled templates',
-	'UNINSTALLED_THEME'		=> 'Uninstalled themes',
-	'UNSET'					=> 'Undefined',
-
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
deleted file mode 100644
index dc28032483..0000000000
--- a/phpBB/language/en/acp/users.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
-*
-* acp_users [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-$lang = array_merge($lang, array(
-	'ADMIN_SIG_PREVIEW'		=> 'Signature preview',
-	'AT_LEAST_ONE_FOUNDER'	=> 'You are not able to change this founder to a normal user. There needs to be at least one founder enabled for this board. If you want to change this users founder status, promote another user to be a founder first.',
-
-	'BAN_ALREADY_ENTERED'	=> 'The ban had been previously entered successfully. The ban list has not been updated.',
-	'BAN_SUCCESSFUL'		=> 'Ban entered successfully.',
-
-	'CANNOT_BAN_FOUNDER'			=> 'You are not allowed to ban founder accounts.',
-	'CANNOT_BAN_YOURSELF'			=> 'You are not allowed to ban yourself.',
-	'CANNOT_DEACTIVATE_BOT'			=> 'You are not allowed to deactivate bot accounts. Please deactivate the bot within the bots page instead.',
-	'CANNOT_DEACTIVATE_FOUNDER'		=> 'You are not allowed to deactivate founder accounts.',
-	'CANNOT_DEACTIVATE_YOURSELF'	=> 'You are not allowed to deactivate your own account.',
-	'CANNOT_FORCE_REACT_BOT'		=> 'You are not allowed to force reactivation on bot accounts. Please reactivate the bot within the bots page instead.',
-	'CANNOT_FORCE_REACT_FOUNDER'	=> 'You are not allowed to force reactivation on founder accounts.',
-	'CANNOT_FORCE_REACT_YOURSELF'	=> 'You are not allowed to force reactivation of your own account.',
-	'CANNOT_REMOVE_ANONYMOUS'		=> 'You are not able to remove the guest user account.',
-	'CANNOT_REMOVE_YOURSELF'		=> 'You are not allowed to remove your own user account.',
-	'CANNOT_SET_FOUNDER_IGNORED'	=> 'You are not able to promote ignored users to be founders.',
-	'CANNOT_SET_FOUNDER_INACTIVE'	=> 'You need to activate users before you promote them to founders, only activated users are able to be promoted.',
-	'CONFIRM_EMAIL_EXPLAIN'			=> 'You only need to specify this if you are changing the users e-mail address.',
-
-	'DELETE_POSTS'			=> 'Delete posts',
-	'DELETE_USER'			=> 'Delete user',
-	'DELETE_USER_EXPLAIN'	=> 'Please note that deleting a user is final, they cannot be recovered.',
-
-	'FORCE_REACTIVATION_SUCCESS'	=> 'Successfully forced reactivation.',
-	'FOUNDER'						=> 'Founder',
-	'FOUNDER_EXPLAIN'				=> 'Founders have all administrative permissions and can never be banned, deleted or altered by non-founder members.',
-
-	'GROUP_APPROVE'					=> 'Approve member',
-	'GROUP_DEFAULT'					=> 'Make group default for member',
-	'GROUP_DELETE'					=> 'Remove member from group',
-	'GROUP_DEMOTE'					=> 'Demote group leader',
-	'GROUP_PROMOTE'					=> 'Promote to group leader',
-
-	'IP_WHOIS_FOR'			=> 'IP whois for %s',
-
-	'LAST_ACTIVE'			=> 'Last active',
-
-	'MOVE_POSTS_EXPLAIN'	=> 'Please select the forum to which you wish to move all the posts this user has made.',
-
-	'NO_SPECIAL_RANK'		=> 'No special rank assigned',
-	'NOT_MANAGE_FOUNDER'	=> 'You tried to manage a user with founder status. Only founders are allowed to manage other founders.',
-
-	'QUICK_TOOLS'			=> 'Quick tools',
-
-	'REGISTERED'			=> 'Registered',
-	'REGISTERED_IP'			=> 'Registered from IP',
-	'RETAIN_POSTS'			=> 'Retain posts',
-
-	'SELECT_FORM'			=> 'Select form',
-	'SELECT_USER'			=> 'Select user',
-
-	'USER_ADMIN'					=> 'User administration',
-	'USER_ADMIN_ACTIVATE'			=> 'Activate account',
-	'USER_ADMIN_ACTIVATED'			=> 'User activated successfully.',
-	'USER_ADMIN_AVATAR_REMOVED'		=> 'Successfully removed avatar from user account.',
-	'USER_ADMIN_BAN_EMAIL'			=> 'Ban by e-mail',
-	'USER_ADMIN_BAN_EMAIL_REASON'	=> 'E-mail address banned via user management',
-	'USER_ADMIN_BAN_IP'				=> 'Ban by IP',
-	'USER_ADMIN_BAN_IP_REASON'		=> 'IP banned via user management',
-	'USER_ADMIN_BAN_NAME_REASON'	=> 'Username banned via user management',
-	'USER_ADMIN_BAN_USER'			=> 'Ban by username',
-	'USER_ADMIN_DEACTIVATE'			=> 'Deactivate account',
-	'USER_ADMIN_DEACTIVED'			=> 'User deactivated successfully.',
-	'USER_ADMIN_DEL_ATTACH'			=> 'Delete all attachments',
-	'USER_ADMIN_DEL_AVATAR'			=> 'Delete avatar',
-	'USER_ADMIN_DEL_POSTS'			=> 'Delete all posts',
-	'USER_ADMIN_DEL_SIG'			=> 'Delete signature',
-	'USER_ADMIN_EXPLAIN'			=> 'Here you can change your users information and certain specific options.',
-	'USER_ADMIN_FORCE'				=> 'Force reactivation',
-	'USER_ADMIN_MOVE_POSTS'			=> 'Move all posts',
-	'USER_ADMIN_SIG_REMOVED'		=> 'Successfully removed signature from user account.',
-	'USER_ATTACHMENTS_REMOVED'		=> 'Successfully removed all attachments made by this user.',
-	'USER_AVATAR_UPDATED'			=> 'Successfully updated user avatars details.',
-	'USER_CUSTOM_PROFILE_FIELDS'	=> 'Custom profile fields',
-	'USER_DELETED'					=> 'User deleted successfully.',
-	'USER_GROUP_ADD'				=> 'Add user to group',
-	'USER_GROUP_NORMAL'				=> 'User defined groups user is a member of',
-	'USER_GROUP_PENDING'			=> 'Groups user is in pending mode',
-	'USER_GROUP_SPECIAL'			=> 'Pre-defined groups user is a member of',
-	'USER_NO_ATTACHMENTS'			=> 'There are no attached files to display.',
-	'USER_OVERVIEW_UPDATED'			=> 'User details updated.',
-	'USER_POSTS_DELETED'			=> 'Successfully removed all posts made by this user.',
-	'USER_POSTS_MOVED'				=> 'Successfully moved users posts to target forum.',
-	'USER_PREFS_UPDATED'			=> 'User preferences updated.',
-	'USER_PROFILE'					=> 'User profile',
-	'USER_PROFILE_UPDATED'			=> 'User profile updated.',
-	'USER_RANK'						=> 'User rank',
-	'USER_RANK_UPDATED'				=> 'User rank updated.',
-	'USER_SIG_UPDATED'				=> 'User signature successfully updated.',
-	'USER_TOOLS'					=> 'Basic tools',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
deleted file mode 100644
index 657df9301b..0000000000
--- a/phpBB/language/en/common.php
+++ /dev/null
@@ -1,913 +0,0 @@
-<?php
-/**
-*
-* common [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-//
-// Some characters you may want to copy&paste:
-// ’ » “ ” …
-//
-
-$lang = array_merge($lang, array(
-	'TRANSLATION_INFO'	=> '',
-	'DIRECTION'			=> 'ltr',
-	'DATE_FORMAT'		=> '|d M Y|',	// 01 Jan 2007 (with Relative days enabled)
-	'USER_LANG'			=> 'en-gb',
-
-	'1_DAY'			=> '1 day',
-	'1_MONTH'		=> '1 month',
-	'1_YEAR'		=> '1 year',
-	'2_WEEKS'		=> '2 weeks',
-	'3_MONTHS'		=> '3 months',
-	'6_MONTHS'		=> '6 months',
-	'7_DAYS'		=> '7 days',
-
-	'ACCOUNT_ALREADY_ACTIVATED'		=> 'Your account has already been activated.',
-	'ACCOUNT_DEACTIVATED'			=> 'Your account has been manually deactivated and is only able to be reactivated by an administrator.',
-	'ACCOUNT_NOT_ACTIVATED'			=> 'Your account has not been activated yet.',
-	'ACP'							=> 'Administration Control Panel',
-	'ACTIVE'						=> 'active',
-	'ACTIVE_ERROR'					=> 'The specified username is currently inactive. If you have problems activating your account, please contact a board administrator.',
-	'ADMINISTRATOR'					=> 'Administrator',
-	'ADMINISTRATORS'				=> 'Administrators',
-	'AGE'							=> 'Age',
-	'AIM'							=> 'AIM',
-	'ALLOWED'						=> 'Allowed',
-	'ALL_FILES'						=> 'All files',
-	'ALL_FORUMS'					=> 'All forums',
-	'ALL_MESSAGES'					=> 'All messages',
-	'ALL_POSTS'						=> 'All posts',
-	'ALL_TIMES'						=> 'All times are %1$s %2$s',
-	'ALL_TOPICS'					=> 'All Topics',
-	'AND'							=> 'And',
-	'ARE_WATCHING_FORUM'			=> 'You have subscribed to be notified of new posts in this forum.',
-	'ARE_WATCHING_TOPIC'			=> 'You have subscribed to be notified of new posts in this topic.',
-	'ASCENDING'						=> 'Ascending',
-	'ATTACHMENTS'					=> 'Attachments',
-	'ATTACHED_IMAGE_NOT_IMAGE'		=> 'The image file you tried to attach is invalid.',
-	'AUTHOR'						=> 'Author',
-	'AUTH_NO_PROFILE_CREATED'		=> 'The creation of a user profile was unsuccessful.',
-	'AVATAR_DISALLOWED_CONTENT'		=> 'The upload was rejected because the uploaded file was identified as a possible attack vector.',
-	'AVATAR_DISALLOWED_EXTENSION'	=> 'This file cannot be displayed because the extension <strong>%s</strong> is not allowed.',
-	'AVATAR_EMPTY_REMOTE_DATA'		=> 'The specified avatar could not be uploaded because the remote data appears to be invalid or corrupted.',
-	'AVATAR_EMPTY_FILEUPLOAD'		=> 'The uploaded avatar file is empty.',
-	'AVATAR_INVALID_FILENAME'		=> '%s is an invalid filename.',
-	'AVATAR_NOT_UPLOADED'			=> 'Avatar could not be uploaded.',
-	'AVATAR_NO_SIZE'				=> 'The width or height of the linked avatar could not be determined. Please enter them manually.',
-	'AVATAR_PARTIAL_UPLOAD'			=> 'The specified file was only partially uploaded.',
-	'AVATAR_PHP_SIZE_NA'			=> 'The avatar’s filesize is too large.<br />The maximum allowed filesize set in php.ini could not be determined.',
-	'AVATAR_PHP_SIZE_OVERRUN'		=> 'The avatar’s filesize is too large. The maximum allowed upload size is %1$d %2$s.<br />Please note this is set in php.ini and cannot be overridden.',
-	'AVATAR_URL_INVALID'			=> 'The URL you specified is invalid.',
-	'AVATAR_URL_NOT_FOUND'			=> 'The file specified could not be found.',
-	'AVATAR_WRONG_FILESIZE'			=> 'The avatar’s filesize must be between 0 and %1d %2s.',
-	'AVATAR_WRONG_SIZE'				=> 'The submitted avatar is %5$d pixels wide and %6$d pixels high. Avatars must be at least %1$d pixels wide and %2$d pixels high, but no larger than %3$d pixels wide and %4$d pixels high.',
-
-	'BACK_TO_TOP'			=> 'Top',
-	'BACK_TO_PREV'			=> 'Back to previous page',
-	'BAN_TRIGGERED_BY_EMAIL'=> 'A ban has been issued on your e-mail address.',
-	'BAN_TRIGGERED_BY_IP'	=> 'A ban has been issued on your IP address.',
-	'BAN_TRIGGERED_BY_USER'	=> 'A ban has been issued on your username.',
-	'BBCODE_GUIDE'			=> 'BBCode guide',
-	'BCC'					=> 'BCC',
-	'BIRTHDAYS'				=> 'Birthdays',
-	'BOARD_BAN_PERM'		=> 'You have been <strong>permanently</strong> banned from this board.<br /><br />Please contact the %2$sBoard Administrator%3$s for more information.',
-	'BOARD_BAN_REASON'		=> 'Reason given for ban: <strong>%s</strong>',
-	'BOARD_BAN_TIME'		=> 'You have been banned from this board until <strong>%1$s</strong>.<br /><br />Please contact the %2$sBoard Administrator%3$s for more information.',
-	'BOARD_DISABLE'			=> 'Sorry but this board is currently unavailable.',
-	'BOARD_DISABLED'		=> 'This board is currently disabled.',
-	'BOARD_UNAVAILABLE'		=> 'Sorry but the board is temporarily unavailable, please try again in a few minutes.',
-	'BROWSING_FORUM_GUESTS'	=> array(
-		0		=> 'Users browsing this forum: %1$s and %2$d guest',
-		2		=> 'Users browsing this forum: %1$s and %2$d guests',
-	),
-	'BYTES'					=> 'Bytes',
-
-	'CANCEL'				=> 'Cancel',
-	'CHANGE'				=> 'Change',
-	'CHANGE_FONT_SIZE'		=> 'Change font size',
-	'CHANGING_PREFERENCES'	=> 'Changing board preferences',
-	'CHANGING_PROFILE'		=> 'Changing profile settings',
-	'CLICK_VIEW_PRIVMSG'	=> '%sGo to your inbox%s',
-	'COLLAPSE_VIEW'			=> 'Collapse view',
-	'CLOSE_WINDOW'			=> 'Close window',
-	'COLOUR_SWATCH'			=> 'Colour swatch',
-	'COMMA_SEPARATOR'		=> ', ',	// Used in pagination of ACP & prosilver, use localised comma if appropriate, eg: Ideographic or Arabic
-	'CONFIRM'				=> 'Confirm',
-	'CONFIRM_CODE'			=> 'Confirmation code',
-	'CONFIRM_CODE_EXPLAIN'	=> 'Enter the code exactly as it appears. All letters are case insensitive, there is no zero.',
-	'CONFIRM_CODE_WRONG'	=> 'The confirmation code you entered was incorrect.',
-	'CONFIRM_OPERATION'		=> 'Are you sure you wish to carry out this operation?',
-	'CONGRATULATIONS'		=> 'Congratulations to',
-	'CONNECTION_FAILED'		=> 'Connection failed.',
-	'CONNECTION_SUCCESS'	=> 'Connection was successful!',
-	'CONTINUE_UPDATE'			=> 'Back',
-	'COOKIES_DELETED'		=> 'All board cookies successfully deleted.',
-	'CURRENT_TIME'			=> 'It is currently %s',
-
-	'DAY'					=> 'Day',
-	'DAYS'					=> 'Days',
-	'DELETE'				=> 'Delete',
-	'DELETE_ALL'			=> 'Delete all',
-	'DELETE_COOKIES'		=> 'Delete all board cookies',
-	'DELETE_MARKED'			=> 'Delete marked',
-	'DELETE_POST'			=> 'Delete post',
-	'DELIMITER'				=> 'Delimiter',
-	'DESCENDING'			=> 'Descending',
-	'DISABLED'				=> 'Disabled',
-	'DISPLAY'				=> 'Display',
-	'DISPLAY_GUESTS'		=> 'Display guests',
-	'DISPLAY_MESSAGES'		=> 'Display messages from previous',
-	'DISPLAY_POSTS'			=> 'Display posts from previous',
-	'DISPLAY_TOPICS'		=> 'Display topics from previous',
-	'DOWNLOADED'			=> 'Downloaded',
-	'DOWNLOADING_FILE'		=> 'Downloading file',
-	'DOWNLOAD_COUNT'		=> array(
-		0		=> 'Not downloaded yet',
-		1		=> 'Downloaded %d time',
-		2		=> 'Downloaded %d times',
-	),
-	'VIEWED_COUNT'			=> array(
-		0		=> 'Not viewed yet',
-		1		=> 'Viewed %d time',
-		2		=> 'Viewed %d times',
-	),
-
-	'DOWNLOAD_UPDATE_METHOD'			=> 'Download modified files archive',
-	'DOWNLOAD_UPDATE_METHOD_BUTTON'		=> 'Download modified files archive (recommended)',
-	'DOWNLOAD_UPDATE_METHOD_EXPLAIN'	=> 'Once downloaded you should unpack the archive. You will find the modified files you need to upload to your phpBB root directory within it. Please upload the files to their respective locations then. After you have uploaded all files, please check the files again with the other button below.',
-
-	'EDIT_POST'							=> 'Edit post',
-	'EMAIL'								=> 'E-mail', // Short form for EMAIL_ADDRESS
-	'EMAIL_ADDRESS'						=> 'E-mail address',
-	'EMAIL_SMTP_ERROR_RESPONSE'			=> 'Ran into problems sending e-mail at <strong>Line %1$s</strong>. Response: %2$s.',
-	'EMPTY_SUBJECT'						=> 'You must specify a subject when posting a new topic.',
-	'EMPTY_MESSAGE_SUBJECT'				=> 'You must specify a subject when composing a new message.',
-	'ENABLED'							=> 'Enabled',
-	'ENCLOSURE'							=> 'Enclosure',
-	'ERR_CHANGING_DIRECTORY'			=> 'Unable to change directory.',
-	'ERR_CONNECTING_SERVER'				=> 'Error connecting to the server.',
-	'ERR_JAB_AUTH'						=> 'Could not authorise on Jabber server.',
-	'ERR_JAB_CONNECT'					=> 'Could not connect to Jabber server.',
-	'ERR_UNABLE_TO_LOGIN'				=> 'The specified username or password is incorrect.',
-	'ERR_UNWATCHING'					=> 'An error occured while trying to unsubscribe.',
-	'ERR_WATCHING'						=> 'An error occured while trying to subscribe.',
-	'ERR_WRONG_PATH_TO_PHPBB'			=> 'The phpBB path specified appears to be invalid.',
-	'EXPAND_VIEW'						=> 'Expand view',
-	'EXTENSION'							=> 'Extension',
-	'EXTENSION_DISABLED_AFTER_POSTING'	=> 'The extension <strong>%s</strong> has been deactivated and can no longer be displayed.',
-
-	'FAQ'					=> 'FAQ',
-	'FAQ_EXPLAIN'			=> 'Frequently Asked Questions',
-	'FILENAME'				=> 'Filename',
-	'FILESIZE'				=> 'File size',
-	'FILEDATE'				=> 'File date',
-	'FILE_COMMENT'			=> 'File comment',
-	'FILE_NOT_FOUND'		=> 'The requested file could not be found.',
-	'FIND_USERNAME'			=> 'Find a member',
-	'FOLDER'				=> 'Folder',
-	'FORGOT_PASS'			=> 'I forgot my password',
-	'FORM_INVALID'			=> 'The submitted form was invalid. Try submitting again.',
-	'FORUM'					=> 'Forum',
-	'FORUMS'				=> 'Forums',
-	'FORUMS_MARKED'			=> 'All forums have been marked read.',
-	'FORUM_CAT'				=> 'Forum category',
-	'FORUM_INDEX'			=> 'Board index',
-	'FORUM_LINK'			=> 'Forum link',
-	'FORUM_LOCATION'		=> 'Forum location',
-	'FORUM_LOCKED'			=> 'Forum locked',
-	'FORUM_RULES'			=> 'Forum rules',
-	'FORUM_RULES_LINK'		=> 'Please click here to view the forum rules',
-	'FROM'					=> 'from',
-	'FSOCK_DISABLED'		=> 'The operation could not be completed because the <var>fsockopen</var> function has been disabled or the server being queried could not be found.',
-
-	'FTP_SETTINGS'					=> 'FTP settings',
-	'FTP_UPDATE_METHOD'				=> 'FTP upload',
-
-	'FTP_FSOCK_HOST'				=> 'FTP host',
-	'FTP_FSOCK_HOST_EXPLAIN'		=> 'FTP server used to connect your site.',
-	'FTP_FSOCK_PASSWORD'			=> 'FTP password',
-	'FTP_FSOCK_PASSWORD_EXPLAIN'	=> 'Password for your FTP username.',
-	'FTP_FSOCK_PORT'				=> 'FTP port',
-	'FTP_FSOCK_PORT_EXPLAIN'		=> 'Port used to connect to your server.',
-	'FTP_FSOCK_ROOT_PATH'			=> 'Path to phpBB',
-	'FTP_FSOCK_ROOT_PATH_EXPLAIN'	=> 'Path from the root to your phpBB board.',
-	'FTP_FSOCK_TIMEOUT'				=> 'FTP timeout',
-	'FTP_FSOCK_TIMEOUT_EXPLAIN'		=> 'The amount of time, in seconds, that the system will wait for a reply from your server.',
-	'FTP_FSOCK_USERNAME'			=> 'FTP username',
-	'FTP_FSOCK_USERNAME_EXPLAIN'	=> 'Username used to connect to your server.',
-
-	'FTP_HOST'					=> 'FTP host',
-	'FTP_HOST_EXPLAIN'			=> 'FTP server used to connect your site.',
-	'FTP_PASSWORD'				=> 'FTP password',
-	'FTP_PASSWORD_EXPLAIN'		=> 'Password for your FTP username.',
-	'FTP_PORT'					=> 'FTP port',
-	'FTP_PORT_EXPLAIN'			=> 'Port used to connect to your server.',
-	'FTP_ROOT_PATH'				=> 'Path to phpBB',
-	'FTP_ROOT_PATH_EXPLAIN'		=> 'Path from the root to your phpBB board.',
-	'FTP_TIMEOUT'				=> 'FTP timeout',
-	'FTP_TIMEOUT_EXPLAIN'		=> 'The amount of time, in seconds, that the system will wait for a reply from your server.',
-	'FTP_USERNAME'				=> 'FTP username',
-	'FTP_USERNAME_EXPLAIN'		=> 'Username used to connect to your server.',
-
-	'SFTP_HOST'					=> 'SFTP host',
-	'SFTP_HOST_EXPLAIN'			=> 'SFTP server used to connect your site.',
-	'SFTP_PASSWORD'				=> 'SFTP password',
-	'SFTP_PASSWORD_EXPLAIN'		=> 'Password for your SFTP username.',
-	'SFTP_PORT'					=> 'SFTP port',
-	'SFTP_PORT_EXPLAIN'			=> 'Port used to connect to your server.',
-	'SFTP_ROOT_PATH'			=> 'Path to phpBB',
-	'SFTP_ROOT_PATH_EXPLAIN'	=> 'Path from the root to your phpBB board.',
-	'SFTP_TIMEOUT'				=> 'SFTP timeout',
-	'SFTP_TIMEOUT_EXPLAIN'		=> 'The amount of time, in seconds, that the system will wait for a reply from your server.',
-	'SFTP_USERNAME'				=> 'SFTP username',
-	'SFTP_USERNAME_EXPLAIN'		=> 'Username used to connect to your server.',
-
-	'GENERAL_ERROR'				=> 'General Error',
-	'GB'						=> 'GB',
-	'GIB'						=> 'GiB',
-	'GO'						=> 'Go',
-	'GOTO_PAGE'					=> 'Go to page',
-	'GROUP'						=> 'Group',
-	'GROUPS'					=> 'Groups',
-	'GROUP_ERR_TYPE'			=> 'Inappropriate group type specified.',
-	'GROUP_ERR_USERNAME'		=> 'No group name specified.',
-	'GROUP_ERR_USER_LONG'		=> 'Group names cannot exceed 60 characters. The specified group name is too long.',
-	'GUEST'						=> 'Guest',
-	'GUEST_USERS_ONLINE'		=> 'There are %d guest users online',
-	'GUEST_USERS_ZERO_ONLINE'	=> 'There are 0 guest users online',
-	'GUEST_USER_ONLINE'			=> 'There is %d guest user online',
-
-	'GUEST_USER_COUNT'			=> array(
-		0		=> '%d guests',
-		1		=> '%d guest',
-		2		=> '%d guests',
-	),
-
-	'G_ADMINISTRATORS'			=> 'Administrators',
-	'G_BOTS'					=> 'Bots',
-	'G_GUESTS'					=> 'Guests',
-	'G_REGISTERED'				=> 'Registered users',
-	'G_REGISTERED_COPPA'		=> 'Registered COPPA users',
-	'G_GLOBAL_MODERATORS'		=> 'Global moderators',
-
-	'HIDDEN_USERS_ONLINE'		=> '%d hidden users online',
-	'HIDDEN_USERS_ZERO_ONLINE'	=> '0 hidden users online',
-	'HIDDEN_USER_ONLINE'		=> '%d hidden user online',
-
-	'HIDDEN_USER_COUNT'			=> array(
-		0			=> '%d hidden and ',
-	),
-
-	'HIDE_GUESTS'				=> 'Hide guests',
-	'HIDE_ME'					=> 'Hide my online status this session',
-	'HOURS'						=> 'Hours',
-	'HOME'						=> 'Home',
-
-	'ICQ'						=> 'ICQ',
-	'ICQ_STATUS'				=> 'ICQ status',
-	'IF'						=> 'If',
-	'IMAGE'						=> 'Image',
-	'IMAGE_FILETYPE_INVALID'	=> 'Image file type %d for mimetype %s not supported.',
-	'IMAGE_FILETYPE_MISMATCH'	=> 'Image file type mismatch: expected extension %1$s but extension %2$s given.',
-	'IN'						=> 'in',
-	'INDEX'						=> 'Index page',
-	'INFORMATION'				=> 'Information',
-	'INTERESTS'					=> 'Interests',
-	'INVALID_DIGEST_CHALLENGE'	=> 'Invalid digest challenge.',
-	'INVALID_EMAIL_LOG'			=> '<strong>%s</strong> possibly an invalid e-mail address?',
-	'IP'						=> 'IP',
-	'IP_BLACKLISTED'			=> 'Your IP %1$s has been blocked because it is blacklisted. For details please see <a href="%2$s">%2$s</a>.',
-
-	'JABBER'				=> 'Jabber',
-	'JOINED'				=> 'Joined',
-	'JUMP_PAGE'				=> 'Enter the page number you wish to go to',
-	'JUMP_TO'				=> 'Jump to',
-	'JUMP_TO_PAGE'			=> 'Click to jump to page…',
-
-	'KB'					=> 'KB',
-	'KIB'					=> 'KiB',
-
-	'LAST_POST'							=> 'Last post',
-	'LAST_UPDATED'						=> 'Last updated',
-	'LAST_VISIT'						=> 'Last visit',
-	'LDAP_NO_LDAP_EXTENSION'			=> 'LDAP extension not available.',
-	'LDAP_NO_SERVER_CONNECTION'			=> 'Could not connect to LDAP server.',
-	'LEGEND'							=> 'Legend',
-	'LOCATION'							=> 'Location',
-	'LOCK_POST'							=> 'Lock post',
-	'LOCK_POST_EXPLAIN'					=> 'Prevent editing',
-	'LOCK_TOPIC'						=> 'Lock topic',
-	'LOGIN'								=> 'Login',
-	'LOGIN_CHECK_PM'					=> 'Log in to check your private messages.',
-	'LOGIN_CONFIRMATION'				=> 'Confirmation of login',
-	'LOGIN_CONFIRM_EXPLAIN'				=> 'To prevent brute forcing accounts the board requires you to enter a confirmation code after a maximum amount of failed logins. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
-	'LOGIN_ERROR_ATTEMPTS'				=> 'You exceeded the maximum allowed number of login attempts. In addition to your username and password you now also have to enter the confirm code from the image you see below.',
-	'LOGIN_ERROR_EXTERNAL_AUTH_APACHE'	=> 'You have not been authenticated by Apache.',
-	'LOGIN_ERROR_PASSWORD'				=> 'You have specified an incorrect password. Please check your password and try again. If you continue to have problems please contact the %sBoard Administrator%s.',
-	'LOGIN_ERROR_PASSWORD_CONVERT'		=> 'It was not possible to convert your password when updating this bulletin board’s software. Please %srequest a new password%s. If you continue to have problems please contact the %sBoard Administrator%s.',
-	'LOGIN_ERROR_USERNAME'				=> 'You have specified an incorrect username. Please check your username and try again. If you continue to have problems please contact the %sBoard Administrator%s.',
-	'LOGIN_FORUM'						=> 'To view or post in this forum you must enter its password.',
-	'LOGIN_INFO'						=> 'In order to login you must be registered. Registering takes only a few moments but gives you increased capabilities. The board administrator may also grant additional permissions to registered users. Before you register please ensure you are familiar with our terms of use and related policies. Please ensure you read any forum rules as you navigate around the board.',
-	'LOGIN_VIEWFORUM'					=> 'The board requires you to be registered and logged in to view this forum.',
-	'LOGIN_EXPLAIN_EDIT'				=> 'In order to edit posts in this forum you have to be registered and logged in.',
-	'LOGIN_EXPLAIN_VIEWONLINE'			=> 'In order to view the online list you have to be registered and logged in.',
-	'LOGOUT'							=> 'Logout',
-	'LOGOUT_USER'						=> 'Logout [ %s ]',
-	'LOG_ME_IN'							=> 'Log me on automatically each visit',
-
-	'MAPPING_FILE_STRUCTURE'	=> 'To ease the upload here are the file locations which map your phpBB installation.',
-	'MARK'					=> 'Mark',
-	'MARK_ALL'				=> 'Mark all',
-	'MARK_FORUMS_READ'		=> 'Mark forums read',
-	'MB'					=> 'MB',
-	'MIB'					=> 'MiB',
-	'MCP'					=> 'Moderator Control Panel',
-	'MEMBERLIST'			=> 'Members',
-	'MEMBERLIST_EXPLAIN'	=> 'View complete list of members',
-	'MERGE'					=> 'Merge',
-	'MERGE_POSTS'			=> 'Merge posts',
-	'MERGE_TOPIC'			=> 'Merge topic',
-	'MESSAGE'				=> 'Message',
-	'MESSAGES'				=> 'Messages',
-	'MESSAGE_BODY'			=> 'Message body',
-	'MINUTES'				=> 'Minutes',
-	'MODERATE'				=> 'Moderate',
-	'MODERATORS'			=> array(
-		0	=> 'Moderator',
-		2	=> 'Moderators',
-	),
-	'MONTH'					=> 'Month',
-	'MOVE'					=> 'Move',
-	'MSNM'					=> 'MSNM/WLM',
-
-	'NA'						=> 'N/A',
-	'NEWEST_USER'				=> 'Our newest member <strong>%s</strong>',
-	'NEW_MESSAGE'				=> 'New message',
-	'NEW_MESSAGES'				=> 'New messages',
-	'NEW_PM'					=> array(
-		0		=> '<strong>%d</strong> new messages',
-		1		=> '<strong>%d</strong> new message',
-		2		=> '<strong>%d</strong> new messages',
-	),
-	'NEW_POST'					=> 'New post',
-	'NEW_POSTS'					=> 'New posts',
-	'NEXT'						=> 'Next',		// Used in pagination
-	'NEXT_STEP'					=> 'Next',
-	'NEVER'						=> 'Never',
-	'NO'						=> 'No',
-	'NOT_ALLOWED_MANAGE_GROUP'	=> 'You are not allowed to manage this group.',
-	'NOT_AUTHORISED'			=> 'You are not authorised to access this area.',
-	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
-	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
-	'NOTIFY_ADMIN'				=> 'Please notify the board administrator or webmaster.',
-	'NOTIFY_ADMIN_EMAIL'		=> 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>',
-	'NO_ACCESS_ATTACHMENT'		=> 'You are not allowed to access this file.',
-	'NO_ACTION'					=> 'No action specified.',
-	'NO_ADMINISTRATORS'			=> 'No administrators assigned at this board.',
-	'NO_AUTH_ADMIN'				=> 'Access to the Administration Control Panel is not allowed as you do not have administrative permissions.',
-	'NO_AUTH_ADMIN_USER_DIFFER'	=> 'You are not able to re-authenticate as a different user.',
-	'NO_AUTH_OPERATION'			=> 'You do not have the necessary permissions to complete this operation.',
-	'NO_CONNECT_TO_SMTP_HOST'	=> 'Could not connect to smtp host : %1$s : %2$s',
-	'NO_BIRTHDAYS'				=> 'No birthdays today',
-	'NO_EMAIL_MESSAGE'			=> 'E-mail message was blank.',
-	'NO_EMAIL_RESPONSE_CODE'	=> 'Could not get mail server response codes.',
-	'NO_EMAIL_SUBJECT'			=> 'No e-mail subject specified.',
-	'NO_FORUM'					=> 'The forum you selected does not exist.',
-	'NO_FORUMS'					=> 'This board has no forums.',
-	'NO_GROUP'					=> 'The requested usergroup does not exist.',
-	'NO_GROUP_MEMBERS'			=> 'This group currently has no members.',
-	'NO_IPS_DEFINED'			=> 'No IP addresses or hostnames defined',
-	'NO_MEMBERS'				=> 'No members found for this search criterion.',
-	'NO_MESSAGES'				=> 'No messages',
-	'NO_MODE'					=> 'No mode specified.',
-	'NO_MODERATORS'				=> 'There are no moderators.',
-	'NO_NEW_MESSAGES'			=> 'No new messages',
-	'NO_NEW_PM'					=> '<strong>0</strong> new messages',
-	'NO_NEW_POSTS'				=> 'No new posts',
-	'NO_ONLINE_USERS'			=> 'No registered users',
-	'NO_POSTS'					=> 'No posts',
-	'NO_POSTS_TIME_FRAME'		=> 'No posts exist inside this topic for the selected time frame.',
-	'NO_SUBJECT'				=> 'No subject specified',								// Used for posts having no subject defined but displayed within management pages.
-	'NO_SUCH_SEARCH_MODULE'		=> 'The specified search backend doesn’t exist.',
-	'NO_SUPPORTED_AUTH_METHODS'	=> 'No supported authentication methods.',
-	'NO_TOPIC'					=> 'The requested topic does not exist.',
-	'NO_TOPIC_FORUM'			=> 'The topic or forum no longer exists.',
-	'NO_TOPICS'					=> 'There are no topics or posts in this forum.',
-	'NO_TOPICS_TIME_FRAME'		=> 'No topics exist inside this forum for the selected time frame.',
-	'NO_UNREAD_PM'				=> '<strong>0</strong> unread messages',
-	'NO_UPLOAD_FORM_FOUND'		=> 'Upload initiated but no valid file upload form found.',
-	'NO_USER'					=> 'The requested user does not exist.',
-	'NO_USERS'					=> 'The requested users do not exist.',
-	'NO_USER_SPECIFIED'			=> 'No username was specified.',
-
-	// Nullar/Singular/Plural language entry. The key numbers define the number range in which a certain grammatical expression is valid.
-	'NUM_POSTS_IN_QUEUE'		=> array(
-		0			=> 'No posts in queue',		// 0
-		1			=> '1 post in queue',		// 1
-		2			=> '%d posts in queue',		// 2+
-	),
-
-	'OCCUPATION'				=> 'Occupation',
-	'OFFLINE'					=> 'Offline',
-	'ONLINE'					=> 'Online',
-	'ONLINE_BUDDIES'			=> 'Online friends',
-
-	'ONLINE_USER_COUNT'			=> array(
-		0		=> 'In total there are <strong>0</strong> users online :: ',
-		1		=> 'In total there is <strong>%d</strong> user online :: ',
-		2		=> 'In total there are <strong>%d</strong> users online :: ',
-	),
-	'OPTIONS'					=> 'Options',
-
-	'PAGE_OF'				=> 'Page <strong>%1$d</strong> of <strong>%2$d</strong>',
-	'PASSWORD'				=> 'Password',
-	'PLAY_QUICKTIME_FILE'	=> 'Play Quicktime file',
-	'PM'					=> 'PM',
-	'POSTING_MESSAGE'		=> 'Posting message in %s',
-	'POSTING_PRIVATE_MESSAGE'	=> 'Composing private message',
-	'POST'					=> 'Post',
-	'POST_ANNOUNCEMENT'		=> 'Announce',
-	'POST_STICKY'			=> 'Sticky',
-	'POSTED'				=> 'Posted',
-	'POSTED_IN_FORUM'		=> 'in',
-	'POSTED_ON_DATE'		=> 'on',
-	'POSTS'					=> 'Posts',
-	'POSTS_UNAPPROVED'		=> 'At least one post in this topic has not been approved.',
-	'POST_BY_AUTHOR'		=> 'by',
-	'POST_BY_FOE'			=> 'This post was made by <strong>%1$s</strong> who is currently on your ignore list. %2$sDisplay this post%3$s.',
-	'POST_DAY'				=> '%.2f posts per day',
-	'POST_DETAILS'			=> 'Post details',
-	'POST_NEW_TOPIC'		=> 'Post new topic',
-	'POST_PCT'				=> '%.2f%% of all posts',
-	'POST_PCT_ACTIVE'		=> '%.2f%% of user’s posts',
-	'POST_PCT_ACTIVE_OWN'	=> '%.2f%% of your posts',
-	'POST_REPLY'			=> 'Post a reply',
-	'POST_REPORTED'			=> 'Click to view report',
-	'POST_SUBJECT'			=> 'Post subject',
-	'POST_TIME'				=> 'Post time',
-	'POST_TOPIC'			=> 'Post a new topic',
-	'POST_UNAPPROVED'		=> 'This post is waiting for approval',
-	'PREVIEW'				=> 'Preview',
-	'PREVIOUS'				=> 'Previous',		// Used in pagination
-	'PREVIOUS_STEP'			=> 'Previous',
-	'PRIVACY'				=> 'Privacy policy',
-	'PRIVATE_MESSAGE'		=> 'Private message',
-	'PRIVATE_MESSAGES'		=> 'Private messages',
-	'PRIVATE_MESSAGING'		=> 'Private messaging',
-	'PROFILE'				=> 'User Control Panel',
-
-	'READING_FORUM'				=> 'Viewing topics in %s',
-	'READING_GLOBAL_ANNOUNCE'	=> 'Reading global announcement',
-	'READING_LINK'				=> 'Following forum link %s',
-	'READING_TOPIC'				=> 'Reading topic in %s',
-	'READ_PROFILE'				=> 'Profile',
-	'REASON'					=> 'Reason',
-	'RECORD_ONLINE_USERS'		=> 'Most users ever online was <strong>%1$s</strong> on %2$s',
-	'REDIRECT'					=> 'Redirect',
-	'REDIRECTS'					=> 'Total redirects',
-	'REGISTER'					=> 'Register',
-	'REGISTERED_USERS'			=> 'Registered users:',
-	'REG_USERS_ONLINE'			=> 'There are %d registered users and ',
-	'REG_USERS_ZERO_ONLINE'		=> 'There are 0 registered users and ',
-
-	'REG_USER_COUNT'			=> array(
-		0			=> '%d registered, ',
-	),
-
-	'REG_USER_ONLINE'			=> 'There is %d registered user and ',
-	'REMOVE'					=> 'Remove',
-	'REMOVE_INSTALL'			=> 'Please delete, move or rename the install directory before you use your board. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.',
-	'REPLIES'					=> 'Replies',
-	'REPLY_WITH_QUOTE'			=> 'Reply with quote',
-	'REPLYING_GLOBAL_ANNOUNCE'	=> 'Replying to global announcement',
-	'REPLYING_MESSAGE'			=> 'Replying to message in %s',
-	'REPORT_BY'					=> 'Report by',
-	'REPORT_POST'				=> 'Report this post',
-	'REPORTING_POST'			=> 'Reporting post',
-	'RESEND_ACTIVATION'			=> 'Resend activation e-mail',
-	'RESET'						=> 'Reset',
-	'RESTORE_PERMISSIONS'		=> 'Restore permissions',
-	'RETURN_INDEX'				=> '%sReturn to the index page%s',
-	'RETURN_FORUM'				=> '%sReturn to the forum last visited%s',
-	'RETURN_PAGE'				=> '%sReturn to the previous page%s',
-	'RETURN_TOPIC'				=> '%sReturn to the topic last visited%s',
-	'RETURN_TO'					=> 'Return to',
-	'RULES_ATTACH_CAN'			=> 'You <strong>can</strong> post attachments in this forum',
-	'RULES_ATTACH_CANNOT'		=> 'You <strong>cannot</strong> post attachments in this forum',
-	'RULES_DELETE_CAN'			=> 'You <strong>can</strong> delete your posts in this forum',
-	'RULES_DELETE_CANNOT'		=> 'You <strong>cannot</strong> delete your posts in this forum',
-	'RULES_DOWNLOAD_CAN'		=> 'You <strong>can</strong> download attachments in this forum',
-	'RULES_DOWNLOAD_CANNOT'		=> 'You <strong>cannot</strong> download attachments in this forum',
-	'RULES_EDIT_CAN'			=> 'You <strong>can</strong> edit your posts in this forum',
-	'RULES_EDIT_CANNOT'			=> 'You <strong>cannot</strong> edit your posts in this forum',
-	'RULES_LOCK_CAN'			=> 'You <strong>can</strong> lock your topics in this forum',
-	'RULES_LOCK_CANNOT'			=> 'You <strong>cannot</strong> lock your topics in this forum',
-	'RULES_POST_CAN'			=> 'You <strong>can</strong> post new topics in this forum',
-	'RULES_POST_CANNOT'			=> 'You <strong>cannot</strong> post new topics in this forum',
-	'RULES_REPLY_CAN'			=> 'You <strong>can</strong> reply to topics in this forum',
-	'RULES_REPLY_CANNOT'		=> 'You <strong>cannot</strong> reply to topics in this forum',
-	'RULES_VOTE_CAN'			=> 'You <strong>can</strong> vote in polls in this forum',
-	'RULES_VOTE_CANNOT'			=> 'You <strong>cannot</strong> vote in polls in this forum',
-
-	'SEARCH'					=> 'Search',
-	'SEARCH_MINI'				=> 'Search…',
-	'SEARCH_ADV'				=> 'Advanced search',
-	'SEARCH_ADV_EXPLAIN'		=> 'View the advanced search options',
-	'SEARCH_KEYWORDS'			=> 'Search for keywords',
-	'SEARCHING_FORUMS'			=> 'Searching forums',
-	'SEARCH_ACTIVE_TOPICS'		=> 'View active topics',
-	'SEARCH_FOR'				=> 'Search for',
-	'SEARCH_FORUM'				=> 'Search this forum…',
-	'SEARCH_NEW'				=> 'View new posts',
-	'SEARCH_POSTS_BY'			=> 'Search posts by',
-	'SEARCH_SELF'				=> 'View your posts',
-	'SEARCH_TOPIC'				=> 'Search this topic…',
-	'SEARCH_UNANSWERED'			=> 'View unanswered posts',
-	'SECONDS'					=> 'Seconds',
-	'SELECT'					=> 'Select',
-	'SELECT_ALL_CODE'			=> 'Select all',
-	'SELECT_DESTINATION_FORUM'	=> 'Please select a destination forum',
-	'SELECT_FORUM'				=> 'Select a forum',
-	'SELECT_FTP_SETTINGS'		=> 'Select FTP settings',
-	'SEND_EMAIL'				=> 'E-mail',				// Used for submit buttons
-	'SEND_EMAIL_USER'			=> 'E-mail',				// Used as: {L_SEND_EMAIL_USER} {USERNAME} -> E-mail UserX
-	'SEND_PRIVATE_MESSAGE'		=> 'Send private message',
-	'SETTINGS'					=> 'Settings',
-
-	'SIGNATURE'					=> 'Signature',
-	'SKIP'						=> 'Skip to content',
-	'SMTP_NO_AUTH_SUPPORT'		=> 'SMTP server does not support authentication.',
-	'SORRY_AUTH_READ'			=> 'You are not authorised to read this forum.',
-	'SORRY_AUTH_VIEW_ATTACH'	=> 'You are not authorised to download this attachment.',
-	'SORT_BY'					=> 'Sort by',
-	'SORT_JOINED'				=> 'Joined date',
-	'SORT_LOCATION'				=> 'Location',
-	'SORT_RANK'					=> 'Rank',
-	'SORT_TOPIC_TITLE'			=> 'Topic title',
-	'SORT_USERNAME'				=> 'Username',
-	'SPLIT_TOPIC'				=> 'Split topic',
-	'SQL_ERROR_OCCURRED'		=> 'An SQL error occurred while fetching this page. Please contact the %sBoard Administrator%s if this problem persists.',
-	'STATISTICS'				=> 'Statistics',
-	'START_WATCHING_FORUM'		=> 'Subscribe forum',
-	'START_WATCHING_TOPIC'		=> 'Subscribe topic',
-	'STOP_WATCHING_FORUM'		=> 'Unsubscribe forum',
-	'STOP_WATCHING_TOPIC'		=> 'Unsubscribe topic',
-	'SUBFORUMS'					=> array(
-		0	=> 'Subforum',
-		2	=> 'Subforums',
-	),
-	'SUBJECT'					=> 'Subject',
-	'SUBMIT'					=> 'Submit',
-
-	'TERMS_USE'			=> 'Terms of use',
-	'TEST_CONNECTION'	=> 'Test connection',
-	'THE_TEAM'			=> 'The team',
-	'TIME'				=> 'Time',
-
-	'TOO_LONG'						=> 'The value you entered is too long',
-
-	'TOO_LONG_AIM'					=> 'The screenname you entered is too long.',
-	'TOO_LONG_CONFIRM_CODE'			=> 'The confirm code you entered is too long.',
-	'TOO_LONG_DATEFORMAT'			=> 'The date format you entered is too long.',
-	'TOO_LONG_ICQ'					=> 'The ICQ number you entered is too long.',
-	'TOO_LONG_INTERESTS'			=> 'The interests you entered is too long.',
-	'TOO_LONG_JABBER'				=> 'The Jabber account name you entered is too long.',
-	'TOO_LONG_LOCATION'				=> 'The location you entered is too long.',
-	'TOO_LONG_MSN'					=> 'The MSNM/WLM name you entered is too long.',
-	'TOO_LONG_NEW_PASSWORD'			=> 'The password you entered is too long.',
-	'TOO_LONG_OCCUPATION'			=> 'The occupation you entered is too long.',
-	'TOO_LONG_PASSWORD_CONFIRM'		=> 'The password confirmation you entered is too long.',
-	'TOO_LONG_USER_PASSWORD'		=> 'The password you entered is too long.',
-	'TOO_LONG_USERNAME'				=> 'The username you entered is too long.',
-	'TOO_LONG_EMAIL'				=> 'The e-mail address you entered is too long.',
-	'TOO_LONG_EMAIL_CONFIRM'		=> 'The e-mail address confirmation you entered is too long.',
-	'TOO_LONG_WEBSITE'				=> 'The website address you entered is too long.',
-	'TOO_LONG_YIM'					=> 'The Yahoo! Messenger name you entered is too long.',
-
-	'TOO_MANY_VOTE_OPTIONS'			=> 'You have tried to vote for too many options.',
-
-	'TOO_SHORT'						=> 'The value you entered is too short.',
-
-	'TOO_SHORT_AIM'					=> 'The screenname you entered is too short.',
-	'TOO_SHORT_CONFIRM_CODE'		=> 'The confirm code you entered is too short.',
-	'TOO_SHORT_DATEFORMAT'			=> 'The date format you entered is too short.',
-	'TOO_SHORT_ICQ'					=> 'The ICQ number you entered is too short.',
-	'TOO_SHORT_INTERESTS'			=> 'The interests you entered is too short.',
-	'TOO_SHORT_JABBER'				=> 'The Jabber account name you entered is too short.',
-	'TOO_SHORT_LOCATION'			=> 'The location you entered is too short.',
-	'TOO_SHORT_MSN'					=> 'The MSNM/WLM name you entered is too short.',
-	'TOO_SHORT_NEW_PASSWORD'		=> 'The password you entered is too short.',
-	'TOO_SHORT_OCCUPATION'			=> 'The occupation you entered is too short.',
-	'TOO_SHORT_PASSWORD_CONFIRM'	=> 'The password confirmation you entered is too short.',
-	'TOO_SHORT_USER_PASSWORD'		=> 'The password you entered is too short.',
-	'TOO_SHORT_USERNAME'			=> 'The username you entered is too short.',
-	'TOO_SHORT_EMAIL'				=> 'The e-mail address you entered is too short.',
-	'TOO_SHORT_EMAIL_CONFIRM'		=> 'The e-mail address confirmation you entered is too short.',
-	'TOO_SHORT_WEBSITE'				=> 'The website address you entered is too short.',
-	'TOO_SHORT_YIM'					=> 'The Yahoo! Messenger name you entered is too short.',
-
-	'TOPIC'				=> 'Topic',
-	'TOPICS'			=> 'Topics',
-	'TOPIC_ICON'		=> 'Topic icon',
-	'TOPIC_LOCKED'		=> 'This topic is locked, you cannot edit posts or make further replies.',
-	'TOPIC_LOCKED_SHORT'=> 'Topic locked',
-	'TOPIC_MOVED'		=> 'Moved topic',
-	'TOPIC_REVIEW'		=> 'Topic review',
-	'TOPIC_TITLE'		=> 'Topic title',
-	'TOPIC_UNAPPROVED'	=> 'This topic has not been approved',
-	'TOTAL_ATTACHMENTS'	=> 'Attachment(s)',
-	'TOTAL_LOG'			=> '1 log',
-	'TOTAL_LOGS'		=> '%d logs',
-	'TOTAL_NO_PM'		=> '0 private messages in total',
-	'TOTAL_PM'			=> '1 private message in total',
-	'TOTAL_PMS'			=> '%d private messages in total',
-	'TOPIC_REPORTED'	=> 'This topic has been reported',
-	'TOTAL_POSTS'		=> 'Total posts',
-
-	'TOTAL_POSTS_COUNT'	=> array(
-		0		=> 'Total posts <strong>%d</strong>',
-	),
-	'TOTAL_TOPICS_COUNT'=> array(
-		0		=> 'Total topics <strong>%d</strong>',
-	),
-	'TOTAL_USERS_COUNT'	=> array(
-		0		=> 'Total members <strong>%d</strong>',
-	),
-	'TRACKED_PHP_ERROR'	=> 'Tracked PHP errors: %s',
-
-	'TRY_DOWNLOAD_METHOD'		=> 'You may want to try the download modified files method.<br />This method always works and is also the recommended update path.',
-	'TRY_DOWNLOAD_METHOD_BUTTON'=> 'Try this method now',
-
-	'UNABLE_GET_IMAGE_SIZE'	=> 'It was not possible to determine the dimensions of the image.',
-	'UNABLE_TO_DELIVER_FILE'=> 'Unable to deliver file.',
-	'UNKNOWN_BROWSER'		=> 'Unknown browser',
-	'UNMARK_ALL'			=> 'Unmark all',
-	'UNREAD_MESSAGES'		=> 'Unread messages',
-	'UNREAD_PM'				=> array(
-		0		=> '<strong>%d</strong> unread messages',
-		1		=> '<strong>%d</strong> unread message',
-		2		=> '<strong>%d</strong> unread messages',
-	),
-	'UNWATCHED_FORUMS'			=> 'You are no longer subscribed to the selected forums.',
-	'UNWATCHED_TOPICS'			=> 'You are no longer subscribed to the selected topics.',
-	'UNWATCHED_FORUMS_TOPICS'	=> 'You are no longer subscribed to the selected entries.',
-	'UPDATE'				=> 'Update',
-	'UPDATE_FILES'					=> 'Update files',
-	'UPDATE_METHOD_EXPLAIN'			=> 'You are now able to choose your preferred update method. Using the FTP upload will present you with a form you need to enter your FTP account details into. With this method the files will be automatically moved to the new location and backups of the old files being created by appending .bak to the filename. If you choose to download the modified files you are able to unpack and upload them to their correct location manually later.',
-	'UPLOAD_IN_PROGRESS'	=> 'The upload is currently in progress.',
-	'UPDATE_SUCCESS'				=> 'Update was successful',
-	'UPDATE_SUCCESS_EXPLAIN'		=> 'Successfully updated all files. You should now check to see if everything is working fine.',
-	'URL_REDIRECT'			=> 'If your browser does not support meta redirection %splease click HERE to be redirected%s.',
-	'USERGROUPS'			=> 'Groups',
-	'USERNAME'				=> 'Username',
-	'USERNAMES'				=> 'Usernames',
-	'USER_AVATAR'			=> 'User avatar',
-	'USER_CANNOT_READ'		=> 'You cannot read posts in this forum.',
-	'USER_POST'				=> '%d Post',
-	'USER_POSTS'			=> '%d Posts',
-	'USERS'					=> 'Users',
-	'USE_PERMISSIONS'		=> 'Test out user’s permissions',
-
-	'VARIANT_DATE_SEPARATOR'	=> ' / ',	// Used in date format dropdown, eg: "Today, 13:37 / 01 Jan 2007, 13:37" ... to join a relative date with calendar date
-	'VIEWED'					=> 'Viewed',
-	'VIEWING_FAQ'				=> 'Viewing FAQ',
-	'VIEWING_MEMBERS'			=> 'Viewing member details',
-	'VIEWING_ONLINE'			=> 'Viewing who is online',
-	'VIEWING_MCP'				=> 'Viewing moderator control panel',
-	'VIEWING_MEMBER_PROFILE'	=> 'Viewing member profile',
-	'VIEWING_PRIVATE_MESSAGES'	=> 'Viewing private messages',
-	'VIEWING_REGISTER'			=> 'Registering account',
-	'VIEWING_UCP'				=> 'Viewing user control panel',
-	'VIEWS'						=> 'Views',
-	'VIEW_BOOKMARKS'			=> 'View bookmarks',
-	'VIEW_FORUM_LOGS'			=> 'View Logs',
-	'VIEW_LATEST_POST'			=> 'View the latest post',
-	'VIEW_NEWEST_POST'			=> 'View first unread post',
-	'VIEW_NOTES'				=> 'View user notes',
-	'VIEW_ONLINE_TIME'			=> array(
-		0		=> 'based on users active over the past %d minute',
-		2		=> 'based on users active over the past %d minutes',
-	),
-	'VIEW_TOPIC'				=> 'View topic',
-	'VIEW_TOPIC_ANNOUNCEMENT'	=> 'Announcement: ',
-	'VIEW_TOPIC_GLOBAL'			=> 'Global Announcement: ',
-	'VIEW_TOPIC_LOCKED'			=> 'Locked: ',
-	'VIEW_TOPIC_LOGS'			=> 'View logs',
-	'VIEW_TOPIC_MOVED'			=> 'Moved: ',
-	'VIEW_TOPIC_POLL'			=> 'Poll: ',
-	'VIEW_TOPIC_STICKY'			=> 'Sticky: ',
-	'VISIT_WEBSITE'				=> 'Visit website',
-
-	'WARNINGS'			=> 'Warnings',
-	'WARN_USER'			=> 'Warn user',
-	'WELCOME_SUBJECT'	=> 'Welcome to %s forums',
-	'WEBSITE'			=> 'Website',
-	'WHOIS'				=> 'Whois',
-	'WHO_IS_ONLINE'		=> 'Who is online',
-	'WRONG_PASSWORD'	=> 'You entered an incorrect password.',
-
-	'WRONG_DATA_ICQ'			=> 'The number you entered is not a valid ICQ number.',
-	'WRONG_DATA_JABBER'			=> 'The name you entered is not a valid Jabber account name.',
-	'WRONG_DATA_LANG'			=> 'The language you specified is not valid.',
-	'WRONG_DATA_WEBSITE'		=> 'The website address has to be a valid URL, including the protocol. For example http://www.example.com/.',
-	'WROTE'						=> 'wrote',
-
-	'YEAR'				=> 'Year',
-	'YEAR_MONTH_DAY'	=> '(YYYY-MM-DD)',
-	'YES'				=> 'Yes',
-	'YIM'				=> 'YIM',
-	'YOU_LAST_VISIT'	=> 'Last visit was: %s',
-	'YOU_NEW_PM'		=> 'A new private message is waiting for you in your Inbox.',
-	'YOU_NEW_PMS'		=> 'New private messages are waiting for you in your Inbox.',
-	'YOU_NO_NEW_PM'		=> 'No new private messages are waiting for you.',
-
-	'datetime'			=> array(
-		'TODAY'		=> 'Today',
-		'TOMORROW'	=> 'Tomorrow',
-		'YESTERDAY'	=> 'Yesterday',
-		'AGO'		=> array(
-			0		=> 'less than a minute ago',
-			1		=> '%d minute ago',
-			2		=> '%d minutes ago',
-			60		=> '1 hour ago',
-		),
-
-		'Sunday'	=> 'Sunday',
-		'Monday'	=> 'Monday',
-		'Tuesday'	=> 'Tuesday',
-		'Wednesday'	=> 'Wednesday',
-		'Thursday'	=> 'Thursday',
-		'Friday'	=> 'Friday',
-		'Saturday'	=> 'Saturday',
-
-		'Sun'		=> 'Sun',
-		'Mon'		=> 'Mon',
-		'Tue'		=> 'Tue',
-		'Wed'		=> 'Wed',
-		'Thu'		=> 'Thu',
-		'Fri'		=> 'Fri',
-		'Sat'		=> 'Sat',
-
-		'January'	=> 'January',
-		'February'	=> 'February',
-		'March'		=> 'March',
-		'April'		=> 'April',
-		'May'		=> 'May',
-		'June'		=> 'June',
-		'July'		=> 'July',
-		'August'	=> 'August',
-		'September' => 'September',
-		'October'	=> 'October',
-		'November'	=> 'November',
-		'December'	=> 'December',
-
-		'Jan'		=> 'Jan',
-		'Feb'		=> 'Feb',
-		'Mar'		=> 'Mar',
-		'Apr'		=> 'Apr',
-		'May_short'	=> 'May',	// Short representation of "May". May_short used because in English the short and long date are the same for May.
-		'Jun'		=> 'Jun',
-		'Jul'		=> 'Jul',
-		'Aug'		=> 'Aug',
-		'Sep'		=> 'Sep',
-		'Oct'		=> 'Oct',
-		'Nov'		=> 'Nov',
-		'Dec'		=> 'Dec',
-	),
-
-	'tz'				=> array(
-		'-12'	=> 'UTC - 12 hours',
-		'-11'	=> 'UTC - 11 hours',
-		'-10'	=> 'UTC - 10 hours',
-		'-9.5'	=> 'UTC - 9:30 hours',
-		'-9'	=> 'UTC - 9 hours',
-		'-8'	=> 'UTC - 8 hours',
-		'-7'	=> 'UTC - 7 hours',
-		'-6'	=> 'UTC - 6 hours',
-		'-5'	=> 'UTC - 5 hours',
-		'-4.5'	=> 'UTC - 4:30 hours',
-		'-4'	=> 'UTC - 4 hours',
-		'-3.5'	=> 'UTC - 3:30 hours',
-		'-3'	=> 'UTC - 3 hours',
-		'-2'	=> 'UTC - 2 hours',
-		'-1'	=> 'UTC - 1 hour',
-		'0'		=> 'UTC',
-		'1'		=> 'UTC + 1 hour',
-		'2'		=> 'UTC + 2 hours',
-		'3'		=> 'UTC + 3 hours',
-		'3.5'	=> 'UTC + 3:30 hours',
-		'4'		=> 'UTC + 4 hours',
-		'4.5'	=> 'UTC + 4:30 hours',
-		'5'		=> 'UTC + 5 hours',
-		'5.5'	=> 'UTC + 5:30 hours',
-		'5.75'	=> 'UTC + 5:45 hours',
-		'6'		=> 'UTC + 6 hours',
-		'6.5'	=> 'UTC + 6:30 hours',
-		'7'		=> 'UTC + 7 hours',
-		'8'		=> 'UTC + 8 hours',
-		'8.75'	=> 'UTC + 8:45 hours',
-		'9'		=> 'UTC + 9 hours',
-		'9.5'	=> 'UTC + 9:30 hours',
-		'10'	=> 'UTC + 10 hours',
-		'10.5'	=> 'UTC + 10:30 hours',
-		'11'	=> 'UTC + 11 hours',
-		'11.5'	=> 'UTC + 11:30 hours',
-		'12'	=> 'UTC + 12 hours',
-		'12.75'	=> 'UTC + 12:45 hours',
-		'13'	=> 'UTC + 13 hours',
-		'14'	=> 'UTC + 14 hours',
-		'dst'	=> '[ <abbr title="Daylight Saving Time">DST</abbr> ]',
-	),
-
-	'tz_zones'	=> array(
-		'-12'	=> '[UTC - 12] Baker Island Time',
-		'-11'	=> '[UTC - 11] Niue Time, Samoa Standard Time',
-		'-10'	=> '[UTC - 10] Hawaii-Aleutian Standard Time, Cook Island Time',
-		'-9.5'	=> '[UTC - 9:30] Marquesas Islands Time',
-		'-9'	=> '[UTC - 9] Alaska Standard Time, Gambier Island Time',
-		'-8'	=> '[UTC - 8] Pacific Standard Time',
-		'-7'	=> '[UTC - 7] Mountain Standard Time',
-		'-6'	=> '[UTC - 6] Central Standard Time',
-		'-5'	=> '[UTC - 5] Eastern Standard Time',
-		'-4.5'	=> '[UTC - 4:30] Venezuelan Standard Time',
-		'-4'	=> '[UTC - 4] Atlantic Standard Time',
-		'-3.5'	=> '[UTC - 3:30] Newfoundland Standard Time',
-		'-3'	=> '[UTC - 3] Amazon Standard Time, Central Greenland Time',
-		'-2'	=> '[UTC - 2] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time',
-		'-1'	=> '[UTC - 1] Azores Standard Time, Cape Verde Time, Eastern Greenland Time',
-		'0'		=> '[UTC] Western European Time, Greenwich Mean Time',
-		'1'		=> '[UTC + 1] Central European Time, West African Time',
-		'2'		=> '[UTC + 2] Eastern European Time, Central African Time',
-		'3'		=> '[UTC + 3] Moscow Standard Time, Eastern African Time',
-		'3.5'	=> '[UTC + 3:30] Iran Standard Time',
-		'4'		=> '[UTC + 4] Gulf Standard Time, Samara Standard Time',
-		'4.5'	=> '[UTC + 4:30] Afghanistan Time',
-		'5'		=> '[UTC + 5] Pakistan Standard Time, Yekaterinburg Standard Time',
-		'5.5'	=> '[UTC + 5:30] Indian Standard Time, Sri Lanka Time',
-		'5.75'	=> '[UTC + 5:45] Nepal Time',
-		'6'		=> '[UTC + 6] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time',
-		'6.5'	=> '[UTC + 6:30] Cocos Islands Time, Myanmar Time',
-		'7'		=> '[UTC + 7] Indochina Time, Krasnoyarsk Standard Time',
-		'8'		=> '[UTC + 8] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time',
-		'8.75'	=> '[UTC + 8:45] Southeastern Western Australia Standard Time',
-		'9'		=> '[UTC + 9] Japan Standard Time, Korea Standard Time, Chita Standard Time',
-		'9.5'	=> '[UTC + 9:30] Australian Central Standard Time',
-		'10'	=> '[UTC + 10] Australian Eastern Standard Time, Vladivostok Standard Time',
-		'10.5'	=> '[UTC + 10:30] Lord Howe Standard Time',
-		'11'	=> '[UTC + 11] Solomon Island Time, Magadan Standard Time',
-		'11.5'	=> '[UTC + 11:30] Norfolk Island Time',
-		'12'	=> '[UTC + 12] New Zealand Time, Fiji Time, Kamchatka Standard Time',
-		'12.75'	=> '[UTC + 12:45] Chatham Islands Time',
-		'13'	=> '[UTC + 13] Tonga Time, Phoenix Islands Time',
-		'14'	=> '[UTC + 14] Line Island Time',
-	),
-
-	// The value is only an example and will get replaced by the current time on view
-	'dateformats'	=> array(
-		'd M Y, H:i'			=> '01 Jan 2007, 13:37',
-		'd M Y H:i'				=> '01 Jan 2007 13:37',
-		'M jS, \'y, H:i'		=> 'Jan 1st, \'07, 13:37',
-		'D M d, Y g:i a'		=> 'Mon Jan 01, 2007 1:37 pm',
-		'F jS, Y, g:i a'		=> 'January 1st, 2007, 1:37 pm',
-		'|d M Y|, H:i'			=> 'Today, 13:37 / 01 Jan 2007, 13:37',
-		'|F jS, Y|, g:i a'		=> 'Today, 1:37 pm / January 1st, 2007, 1:37 pm'
-	),
-
-	// The default dateformat which will be used on new installs in this language
-	// Translators should change this if a the usual date format is different
-	'default_dateformat'	=> 'D M d, Y g:i a', // Mon Jan 01, 2007 1:37 pm
-
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/email/admin_activate.txt b/phpBB/language/en/email/admin_activate.txt
deleted file mode 100644
index 8b11f1b450..0000000000
--- a/phpBB/language/en/email/admin_activate.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Subject: Activate user account
-
-Hello,
-
-The account owned by "{USERNAME}" has been deactivated or newly created, you should check the details of this user (if required) and handle it appropriately.
-
-Use this link to view the user's profile:
-{U_USER_DETAILS}
-
-Use this link to activate the account:
-{U_ACTIVATE}
-
-
-{EMAIL_SIG}
-\ No newline at end of file
diff --git a/phpBB/language/en/email/admin_send_email.txt b/phpBB/language/en/email/admin_send_email.txt
deleted file mode 100644
index 6687404527..0000000000
--- a/phpBB/language/en/email/admin_send_email.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-The following is an e-mail sent to you by an administrator of "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
-
-{CONTACT_EMAIL}
-
-Include this full e-mail (particularly the headers). 
-
-Message sent to you follows:
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-{MESSAGE}
-
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/admin_welcome_activated.txt b/phpBB/language/en/email/admin_welcome_activated.txt
deleted file mode 100644
index c16a403f00..0000000000
--- a/phpBB/language/en/email/admin_welcome_activated.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Subject: Account activated
-
-Hello {USERNAME},
-
-Your account on "{SITENAME}" has now been activated, you may login using the username and password you received in a previous e-mail.
-
-{EMAIL_SIG}
-\ No newline at end of file
diff --git a/phpBB/language/en/email/admin_welcome_inactive.txt b/phpBB/language/en/email/admin_welcome_inactive.txt
deleted file mode 100644
index 746d13da7a..0000000000
--- a/phpBB/language/en/email/admin_welcome_inactive.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Subject: Welcome to "{SITENAME}"
-
-{WELCOME_MSG}
-
-Please keep this e-mail for your records. Your account information is as follows:
-
-----------------------------
-Username: {USERNAME}
-Password: {PASSWORD}
-
-Board URL: {U_BOARD}
-----------------------------
-
-Your account is currently inactive, the administrator of the board will need to activate it before you can log in. You will receive another e-mail when this has occurred.
-
-Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
-
-Thank you for registering.
-
-{EMAIL_SIG}
-\ No newline at end of file
diff --git a/phpBB/language/en/email/coppa_resend_inactive.txt b/phpBB/language/en/email/coppa_resend_inactive.txt
deleted file mode 100644
index 9d43ca4f85..0000000000
--- a/phpBB/language/en/email/coppa_resend_inactive.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-Subject: Welcome to "{SITENAME}"
-
-{WELCOME_MSG}
-
-In compliance with the COPPA your account is currently inactive.
-
-Please print this message out and have your parent or guardian sign and date it. Then fax it to:
-
-{FAX_INFO}
-
-OR mail it to:
-
-{MAIL_INFO}
-
------------------------------- CUT HERE ------------------------------
-Permission to participate at "{SITENAME}" - {U_BOARD}
-
-Username: {USERNAME}
-E-mail: {EMAIL_ADDRESS}
-
-I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO "{SITENAME}" TO STORE THIS INFORMATION. 
-I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD. 
-I UNDERSTAND THAT I MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM "{SITENAME}" AT ANY TIME.
-
-
-Parent or guardian 
-(print your name here): _____________________
-
-(sign here): __________________ 
-
-Date: _______________
-
------------------------------- CUT HERE ------------------------------
-
-
-Once the administrator has received the above form via fax or regular mail your account will be activated.
-
-Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
-
-Thank you for registering.
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/coppa_welcome_inactive.txt b/phpBB/language/en/email/coppa_welcome_inactive.txt
deleted file mode 100644
index f079ddb838..0000000000
--- a/phpBB/language/en/email/coppa_welcome_inactive.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-Subject: Welcome to "{SITENAME}"
-
-{WELCOME_MSG}
-
-In compliance with the COPPA your account is currently inactive.
-
-Please print this message out and have your parent or guardian sign and date it. Then fax it to:
-
-{FAX_INFO}
-
-OR mail it to:
-
-{MAIL_INFO}
-
------------------------------- CUT HERE ------------------------------
-Permission to participate at "{SITENAME}" - {U_BOARD}
-
-Username: {USERNAME}
-Password: {PASSWORD}
-E-mail: {EMAIL_ADDRESS}
-
-I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO "{SITENAME}" TO STORE THIS INFORMATION. 
-I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD. 
-I UNDERSTAND THAT I MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM "{SITENAME}" AT ANY TIME.
-
-
-Parent or guardian 
-(print your name here): _____________________
-
-(sign here): __________________ 
-
-Date: _______________
-
------------------------------- CUT HERE ------------------------------
-
-
-Once the administrator has received the above form via fax or regular mail your account will be activated.
-
-Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
-
-Thank you for registering.
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/email_notify.txt b/phpBB/language/en/email/email_notify.txt
deleted file mode 100644
index 0d0ac7fc28..0000000000
--- a/phpBB/language/en/email/email_notify.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Subject: "{SITENAME}" - E-mail a friend
-
-Hello {TO_USERNAME},
-
-This e-mail was sent from "{SITENAME}" by {FROM_USERNAME} who thought you may be interested in the following topic:
-
-{TOPIC_NAME}
-
-You can find it at:
-
-{U_TOPIC}
-
-A message from {FROM_USERNAME} may also be included below. Please note that this message has not been seen or approved by the board administrators. If you wish to complain about having received this e-mail please contact the board administrator at {BOARD_CONTACT}. Please quote the message headers when contacting this address.
-
-----------
-
-{MESSAGE}
-\ No newline at end of file
diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt
deleted file mode 100644
index fae5a83885..0000000000
--- a/phpBB/language/en/email/forum_notify.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Subject: Forum post notification - "{FORUM_NAME}"
-
-Hello {USERNAME},
-
-You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}" since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic.
-
-{U_NEWEST_POST}
-
-If you want to view the topic, click the following link:
-{U_TOPIC}
-
-If you want to view the forum, click the following link:
-{U_FORUM}
-
-If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link:
-
-{U_STOP_WATCHING_FORUM}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/group_added.txt b/phpBB/language/en/email/group_added.txt
deleted file mode 100644
index 9464aae094..0000000000
--- a/phpBB/language/en/email/group_added.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Subject: You have been added to this usergroup
-
-Congratulations,
-
-You have been added to the "{GROUP_NAME}" group on "{SITENAME}".
-This action was done by a group leader or the site administrator, contact them for more information.
-
-You can view your groups information here:
-{U_GROUP}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/group_approved.txt b/phpBB/language/en/email/group_approved.txt
deleted file mode 100644
index 24afefcd07..0000000000
--- a/phpBB/language/en/email/group_approved.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Subject: Your request has been approved
-
-Congratulations,
-
-Your request to join the "{GROUP_NAME}" group on "{SITENAME}" has been approved.
-Click on the following link to see your group membership.
-
-{U_GROUP}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/group_request.txt b/phpBB/language/en/email/group_request.txt
deleted file mode 100644
index 75840831fb..0000000000
--- a/phpBB/language/en/email/group_request.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Subject: A request to join your group has been made
-
-Dear {USERNAME},
-
-The user "{REQUEST_USERNAME}" has requested to join the group "{GROUP_NAME}" you moderate on "{SITENAME}".
-To approve or deny this request for group membership please visit the following link:
-
-{U_PENDING}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/installed.txt b/phpBB/language/en/email/installed.txt
deleted file mode 100644
index 4d9286bd65..0000000000
--- a/phpBB/language/en/email/installed.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Subject: phpBB installed
-
-Congratulations,
-
-You have successfully installed phpBB on your server.
-
-This e-mail contains important information on your installation that you should keep safe. The password has been encrypted in the database and cannot be recovered, although you can request a new password should you lose this one.
-
-----------------------------
-Username: {USERNAME}
-Password: {PASSWORD}
-
-Board URL: {U_BOARD}
-----------------------------
-
-Useful information on your phpBB installation can be found in the docs folder of your installation and on phpBB.com's support page - http://www.phpbb.com/support/
-
-In order to keep the board safe and secure, it is highly recommended that you keep current with software releases which can be easily done by subscribing to phpBB.com's mailing list, located at the above URL.
-
-{EMAIL_SIG}
-\ No newline at end of file
diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt
deleted file mode 100644
index 529bbf0f8f..0000000000
--- a/phpBB/language/en/email/newtopic_notify.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Subject: New topic notification - "{FORUM_NAME}"
-
-Hello {USERNAME},
-
-You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum.
-
-{U_FORUM}
-
-If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link:
-
-{U_STOP_WATCHING_FORUM}
-
-{EMAIL_SIG}
-\ No newline at end of file
diff --git a/phpBB/language/en/email/post_approved.txt b/phpBB/language/en/email/post_approved.txt
deleted file mode 100644
index e715b54026..0000000000
--- a/phpBB/language/en/email/post_approved.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Subject: Post approved - "{POST_SUBJECT}"
-
-Hello {USERNAME},
-
-You are receiving this notification because your post "{POST_SUBJECT}" at "{SITENAME}" was approved by a moderator or administrator.
-
-If you want to view the post, click the following link:
-{U_VIEW_POST}
-
-If you want to view the topic, click the following link:
-{U_VIEW_TOPIC}
-
-
-{EMAIL_SIG}
-\ No newline at end of file
diff --git a/phpBB/language/en/email/post_disapproved.txt b/phpBB/language/en/email/post_disapproved.txt
deleted file mode 100644
index 3bc64bb611..0000000000
--- a/phpBB/language/en/email/post_disapproved.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Subject: Post disapproved - "{POST_SUBJECT}"
-
-Hello {USERNAME},
-
-You are receiving this notification because your post "{POST_SUBJECT}" at "{SITENAME}" was disapproved by a moderator or administrator.
-
-The following reason was given for the disapproval:
-
-{REASON}
-
-
-{EMAIL_SIG}
-\ No newline at end of file
diff --git a/phpBB/language/en/email/privmsg_notify.txt b/phpBB/language/en/email/privmsg_notify.txt
deleted file mode 100644
index d363df7973..0000000000
--- a/phpBB/language/en/email/privmsg_notify.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Subject: New private message has arrived
-
-Hello {USERNAME},
-
-You have received a new private message from "{AUTHOR_NAME}" to your account on "{SITENAME}" with the following subject:
-
-{SUBJECT}
-
-You can view your new message by clicking on the following link:
-
-{U_INBOX}
-
-You have requested that you be notified on this event, remember that you can always choose not to be notified of new messages by changing the appropriate setting in your profile.
-
-{EMAIL_SIG}
-\ No newline at end of file
diff --git a/phpBB/language/en/email/profile_send_email.txt b/phpBB/language/en/email/profile_send_email.txt
deleted file mode 100644
index 9fb19e7eb1..0000000000
--- a/phpBB/language/en/email/profile_send_email.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-Hello {TO_USERNAME},
-
-The following is an e-mail sent to you by {FROM_USERNAME} via your account on "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
-
-{BOARD_CONTACT}
-
-Include this full e-mail (particularly the headers). Please note that the reply address to this e-mail has been set to that of {FROM_USERNAME}.
-
-Message sent to you follows
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-{MESSAGE}
diff --git a/phpBB/language/en/email/profile_send_im.txt b/phpBB/language/en/email/profile_send_im.txt
deleted file mode 100644
index 02c820c69d..0000000000
--- a/phpBB/language/en/email/profile_send_im.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-Hello {TO_USERNAME},
-
-The following is a message sent to you by {FROM_USERNAME} via your account on "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
-
-{BOARD_CONTACT}
-
-Include this full message. Please note that the sender address has been set to the boards IM account.
-
-Message sent to you follows
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-{MESSAGE}
diff --git a/phpBB/language/en/email/report_closed.txt b/phpBB/language/en/email/report_closed.txt
deleted file mode 100644
index eb7ef22b5e..0000000000
--- a/phpBB/language/en/email/report_closed.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Subject: Report closed - "{POST_SUBJECT}"
-
-Hello {USERNAME},
-
-You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at "{SITENAME}" was handled by a moderator or by an administrator. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message.
-
-
-{EMAIL_SIG}
-\ No newline at end of file
diff --git a/phpBB/language/en/email/report_deleted.txt b/phpBB/language/en/email/report_deleted.txt
deleted file mode 100644
index 4292ca2239..0000000000
--- a/phpBB/language/en/email/report_deleted.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Subject: Report deleted - "{POST_SUBJECT}"
-
-Hello {USERNAME},
-
-You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at "{SITENAME}" was deleted by a moderator or by an administrator.
-
-
-{EMAIL_SIG}
-\ No newline at end of file
diff --git a/phpBB/language/en/email/topic_approved.txt b/phpBB/language/en/email/topic_approved.txt
deleted file mode 100644
index ffda378d30..0000000000
--- a/phpBB/language/en/email/topic_approved.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Subject: Topic approved - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITENAME}" was approved by a moderator or administrator.
-
-If you want to view the topic, click the following link:
-{U_VIEW_TOPIC}
-
-
-{EMAIL_SIG}
-\ No newline at end of file
diff --git a/phpBB/language/en/email/topic_disapproved.txt b/phpBB/language/en/email/topic_disapproved.txt
deleted file mode 100644
index 49ef58bf39..0000000000
--- a/phpBB/language/en/email/topic_disapproved.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Subject: Topic disapproved - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITENAME}" was disapproved by a moderator or administrator.
-
-The following reason was given for the disapproval:
-
-{REASON}
-
-
-{EMAIL_SIG}
-\ No newline at end of file
diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt
deleted file mode 100644
index 99587b28e0..0000000000
--- a/phpBB/language/en/email/topic_notify.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-You are receiving this notification because you are watching the topic, "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
-
-If you want to view the newest post made since your last visit, click the following link:
-{U_NEWEST_POST}
-
-If you want to view the topic, click the following link:
-{U_TOPIC}
-
-If you want to view the forum, click the following link:
-{U_FORUM}
-
-If you no longer wish to watch this topic you can either click the "Unsubscribe topic" link found at the bottom of the topic above, or by clicking the following link:
-
-{U_STOP_WATCHING_TOPIC}
-
-{EMAIL_SIG}
-\ No newline at end of file
diff --git a/phpBB/language/en/email/user_activate.txt b/phpBB/language/en/email/user_activate.txt
deleted file mode 100644
index 7d7960c4c5..0000000000
--- a/phpBB/language/en/email/user_activate.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Subject: Reactivate your account
-
-Hello {USERNAME},
-
-Your account on "{SITENAME}" has been deactivated, most likely due to changes made to your profile. In order to reactivate your account you must click on the link below:
-
-{U_ACTIVATE}
-
-{EMAIL_SIG}
-\ No newline at end of file
diff --git a/phpBB/language/en/email/user_activate_inactive.txt b/phpBB/language/en/email/user_activate_inactive.txt
deleted file mode 100644
index a90773d48c..0000000000
--- a/phpBB/language/en/email/user_activate_inactive.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Subject: Your account has been deactivated
-
-Hello {USERNAME},
-
-Your account on "{SITENAME}" has been deactivated, most likely due to changes made to your profile. The administrator of the board will need to activate it before you can log in. You will receive another notification when this has occurred.
-
-{EMAIL_SIG}
-\ No newline at end of file
diff --git a/phpBB/language/en/email/user_activate_passwd.txt b/phpBB/language/en/email/user_activate_passwd.txt
deleted file mode 100644
index 695be115f8..0000000000
--- a/phpBB/language/en/email/user_activate_passwd.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Subject: New password activation
-
-Hello {USERNAME}
-
-You are receiving this notification because you have (or someone pretending to be you has) requested a new password be sent for your account on "{SITENAME}". If you did not request this notification then please ignore it, if you keep receiving it please contact the board administrator.
-
-To use the new password you need to activate it. To do this click the link provided below.
-
-{U_ACTIVATE}
-
-If successful you will be able to login using the following password:
-
-Password: {PASSWORD}
-
-You can of course change this password yourself via the profile page. If you have any difficulties please contact the board administrator.
-
-{EMAIL_SIG}
-\ No newline at end of file
diff --git a/phpBB/language/en/email/user_reactivate_account.txt b/phpBB/language/en/email/user_reactivate_account.txt
deleted file mode 100644
index b5639d0b7a..0000000000
--- a/phpBB/language/en/email/user_reactivate_account.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Subject: Reactivate your account on "{SITENAME}"
-
-A board administrator requested that your account be reactivated. Your account is currently inactive.
-Please follow the steps listed here to reactivate your account.
-
-Please keep this e-mail for your records. Your account information is as follows:
-
-----------------------------
-Username: {USERNAME}
-----------------------------
-
-Your password has been encrypted in our database. Should you forget your password you can request a new one which will be activated in the same way as this account.
-
-Please visit the following link to reactivate your account:
-
-{U_ACTIVATE}
-
-
-{EMAIL_SIG}
-\ No newline at end of file
diff --git a/phpBB/language/en/email/user_remind_inactive.txt b/phpBB/language/en/email/user_remind_inactive.txt
deleted file mode 100644
index 49dea02044..0000000000
--- a/phpBB/language/en/email/user_remind_inactive.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Subject: Inactive account reminder
-
-Hello {USERNAME},
-
-On {REGISTER_DATE} you registered a new account at "{SITENAME}". To date you have not activated this account which is a prerequisite for board login. For your convenience the activation link is repeated below.
-
-{U_ACTIVATE}
-
-Thank you for registering at "{SITENAME}", we look forward to your participation.
-
-{EMAIL_SIG}
-\ No newline at end of file
diff --git a/phpBB/language/en/email/user_resend_inactive.txt b/phpBB/language/en/email/user_resend_inactive.txt
deleted file mode 100644
index 5635801b80..0000000000
--- a/phpBB/language/en/email/user_resend_inactive.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Subject: Welcome to "{SITENAME}"
-
-{WELCOME_MSG}
-
-Please keep this e-mail for your records. Your account information is as follows:
-
-----------------------------
-Username: {USERNAME}
-----------------------------
-
-Your password has been encrypted in our database. Should you forget your password you can request a new one which will be activated in the same way as this account.
-
-Your account is currently inactive. You cannot use it until you visit the following link:
-
-{U_ACTIVATE}
-
-
-Thank you for registering.
-
-{EMAIL_SIG}
-\ No newline at end of file
diff --git a/phpBB/language/en/email/user_welcome.txt b/phpBB/language/en/email/user_welcome.txt
deleted file mode 100644
index 6c3cee0b50..0000000000
--- a/phpBB/language/en/email/user_welcome.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Subject: Welcome to "{SITENAME}"
-
-{WELCOME_MSG}
-
-Please keep this e-mail for your records. Your account information is as follows:
-
-----------------------------
-Username: {USERNAME}
-Password: {PASSWORD}
-
-Board URL: {U_BOARD}
-----------------------------
-
-Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
-
-Thank you for registering.
-
-{EMAIL_SIG}
-\ No newline at end of file
diff --git a/phpBB/language/en/email/user_welcome_inactive.txt b/phpBB/language/en/email/user_welcome_inactive.txt
deleted file mode 100644
index 4b6d96ddd8..0000000000
--- a/phpBB/language/en/email/user_welcome_inactive.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Subject: Welcome to "{SITENAME}"
-
-{WELCOME_MSG}
-
-Please keep this e-mail for your records. Your account information is as follows:
-
-----------------------------
-Username: {USERNAME}
-Password: {PASSWORD}
-
-Board URL: {U_BOARD}
-----------------------------
-
-Your account is currently inactive. You cannot use it until you visit the following link:
-
-{U_ACTIVATE}
-
-Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
-
-Thank you for registering.
-
-{EMAIL_SIG}
-\ No newline at end of file
diff --git a/phpBB/language/en/groups.php b/phpBB/language/en/groups.php
deleted file mode 100644
index 9f72d4070f..0000000000
--- a/phpBB/language/en/groups.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
-*
-* groups [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-$lang = array_merge($lang, array(
-	'ALREADY_DEFAULT_GROUP'		=> 'The selected group is already your default group.',
-	'ALREADY_IN_GROUP'			=> 'You are already a member of the selected group.',
-	'ALREADY_IN_GROUP_PENDING'	=> 'You already requested joining the selected group.',
-
-	'CANNOT_JOIN_GROUP'			=> 'You are not able to join this group. You are only able to join open and freely open groups.',
-	'CANNOT_RESIGN_GROUP'		=> 'You are not able to resign from this group. You are only able to resign from open and freely open groups.',
-	'CHANGED_DEFAULT_GROUP'		=> 'Successfully changed default group.',
-
-	'GROUP_AVATAR'						=> 'Group avatar',
-	'GROUP_CHANGE_DEFAULT'				=> 'Are you sure you want to change your default membership to the group “%s”?',
-	'GROUP_CLOSED'						=> 'Closed',
-	'GROUP_DESC'						=> 'Group description',
-	'GROUP_HIDDEN'						=> 'Hidden',
-	'GROUP_INFORMATION'					=> 'Usergroup information',
-	'GROUP_IS_CLOSED'					=> 'This is a closed group, new members can only join upon invitation of a group leader.',
-	'GROUP_IS_FREE'						=> 'This is a freely open group, all new members are welcome.',
-	'GROUP_IS_HIDDEN'					=> 'This is a hidden group, only members of this group can view its membership.',
-	'GROUP_IS_OPEN'						=> 'This is an open group, members can apply to join.',
-	'GROUP_IS_SPECIAL'					=> 'This is a special group, special groups are managed by the board administrators.',
-	'GROUP_JOIN'						=> 'Join group',
-	'GROUP_JOIN_CONFIRM'				=> 'Are you sure you want to join the selected group?',
-	'GROUP_JOIN_PENDING'				=> 'Request to join group',
-	'GROUP_JOIN_PENDING_CONFIRM'		=> 'Are you sure you want to request joining the selected group?',
-	'GROUP_JOINED'						=> 'Successfully joined selected group.',
-	'GROUP_JOINED_PENDING'				=> 'Successfully requested group membership. Please wait for a group leader to approve your membership.',
-	'GROUP_LIST'						=> 'Manage users',
-	'GROUP_MEMBERS'						=> 'Group members',
-	'GROUP_NAME'						=> 'Group name',
-	'GROUP_OPEN'						=> 'Open',
-	'GROUP_RANK'						=> 'Group rank',
-	'GROUP_RESIGN_MEMBERSHIP'			=> 'Resign group membership',
-	'GROUP_RESIGN_MEMBERSHIP_CONFIRM'	=> 'Are you sure you want to resign your membership from the selected group?',
-	'GROUP_RESIGN_PENDING'				=> 'Resign a pending group membership',
-	'GROUP_RESIGN_PENDING_CONFIRM'		=> 'Are you sure you want to resign your pending membership from the selected group?',
-	'GROUP_RESIGNED_MEMBERSHIP'			=> 'You were successfully removed from the selected group.',
-	'GROUP_RESIGNED_PENDING'			=> 'Your pending membership was successfully removed from the selected group.',
-	'GROUP_TYPE'						=> 'Group type',
-	'GROUP_UNDISCLOSED'					=> 'Hidden group',
-	'FORUM_UNDISCLOSED'					=> 'Moderating hidden forum(s)',
-
-	'LOGIN_EXPLAIN_GROUP'	=> 'You need to login to view group details.',
-
-	'NO_LEADERS'					=> 'You are not a leader of any group.',
-	'NOT_LEADER_OF_GROUP'			=> 'The requested operation cannot be taken because you are not a leader of the selected group.',
-	'NOT_MEMBER_OF_GROUP'			=> 'The requested operation cannot be taken because you are not a member of the selected group or your membership has not been approved yet.',
-	'NOT_RESIGN_FROM_DEFAULT_GROUP'	=> 'You are not allowed to resign from your default group.',
-	
-	'PRIMARY_GROUP'		=> 'Primary group',
-
-	'REMOVE_SELECTED'		=> 'Remove selected',
-
-	'USER_GROUP_CHANGE'			=> 'From “%1$s” group to “%2$s”',
-	'USER_GROUP_DEMOTE'			=> 'Demote leadership',
-	'USER_GROUP_DEMOTE_CONFIRM'	=> 'Are you sure you want to demote as group leader from the selected group?',
-	'USER_GROUP_DEMOTED'		=> 'Successfully demoted your leadership.',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php
deleted file mode 100644
index ed6fea96d3..0000000000
--- a/phpBB/language/en/help_bbcode.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
-*
-* help_bbcode [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-$help = array(
-	array(
-		0 => '--',
-		1 => 'Introduction'
-	),
-	array(
-		0 => 'What is BBCode?',
-		1 => 'BBCode is a special implementation of HTML. Whether you can actually use BBCode in your posts on the forum is determined by the administrator. In addition you can disable BBCode on a per post basis via the posting form. BBCode itself is similar in style to HTML, tags are enclosed in square brackets [ and ] rather than &lt; and &gt; and it offers greater control over what and how something is displayed. Depending on the template you are using you may find adding BBCode to your posts is made much easier through a clickable interface above the message area on the posting form. Even with this you may find the following guide useful.'
-	),
-	array(
-		0 => '--',
-		1 => 'Text Formatting'
-	),
-	array(
-		0 => 'How to create bold, italic and underlined text',
-		1 => 'BBCode includes tags to allow you to quickly change the basic style of your text. This is achieved in the following ways: <ul><li>To make a piece of text bold enclose it in <strong>[b][/b]</strong>, e.g. <br /><br /><strong>[b]</strong>Hello<strong>[/b]</strong><br /><br />will become <strong>Hello</strong></li><li>For underlining use <strong>[u][/u]</strong>, for example:<br /><br /><strong>[u]</strong>Good Morning<strong>[/u]</strong><br /><br />becomes <span style="text-decoration: underline">Good Morning</span></li><li>To italicise text use <strong>[i][/i]</strong>, e.g.<br /><br />This is <strong>[i]</strong>Great!<strong>[/i]</strong><br /><br />would give This is <i>Great!</i></li></ul>'
-	),
-	array(
-		0 => 'How to change the text colour or size',
-		1 => 'To alter the colour or size of your text the following tags can be used. Keep in mind that how the output appears will depend on the viewers browser and system: <ul><li>Changing the colour of text is achieved by wrapping it in <strong>[color=][/color]</strong>. You can specify either a recognised colour name (eg. red, blue, yellow, etc.) or the hexadecimal triplet alternative, e.g. #FFFFFF, #000000. For example, to create red text you could use:<br /><br /><strong>[color=red]</strong>Hello!<strong>[/color]</strong><br /><br />or<br /><br /><strong>[color=#FF0000]</strong>Hello!<strong>[/color]</strong><br /><br />Both will output <span style="color:red">Hello!</span></li><li>Changing the text size is achieved in a similar way using <strong>[size=][/size]</strong>. This tag is dependent on the template the user has selected but the recommended format is a numerical value representing the text size in percent, starting at 20 (very small) through to 200 (very large) by default. For example:<br /><br /><strong>[size=30]</strong>SMALL<strong>[/size]</strong><br /><br />will generally be <span style="font-size:30%;">SMALL</span><br /><br />whereas:<br /><br /><strong>[size=200]</strong>HUGE!<strong>[/size]</strong><br /><br />will be <span style="font-size:200%;">HUGE!</span></li></ul>'
-	),
-	array(
-		0 => 'Can I combine formatting tags?',
-		1 => 'Yes, of course you can, for example to get someones attention you may write:<br /><br /><strong>[size=200][color=red][b]</strong>LOOK AT ME!<strong>[/b][/color][/size]</strong><br /><br />this would output <span style="color:red;font-size:200%;"><strong>LOOK AT ME!</strong></span><br /><br />We don’t recommend you output lots of text that looks like this though! Remember it is up to you, the poster, to ensure tags are closed correctly. For example the following is incorrect:<br /><br /><strong>[b][u]</strong>This is wrong<strong>[/b][/u]</strong>'
-	),
-	array(
-		0 => '--',
-		1 => 'Quoting and outputting fixed-width text'
-	),
-	array(
-		0 => 'Quoting text in replies',
-		1 => 'There are two ways you can quote text, with a reference or without.<ul><li>When you utilise the Quote function to reply to a post on the board you should notice that the post text is added to the message window enclosed in a <strong>[quote=&quot;&quot;][/quote]</strong> block. This method allows you to quote with a reference to a person or whatever else you choose to put! For example to quote a piece of text Mr. Blobby wrote you would enter:<br /><br /><strong>[quote=&quot;Mr. Blobby&quot;]</strong>The text Mr. Blobby wrote would go here<strong>[/quote]</strong><br /><br />The resulting output will automatically add &quot;Mr. Blobby wrote:&quot; before the actual text. Remember you <strong>must</strong> include the quotation marks &quot;&quot; around the name you are quoting, they are not optional.</li><li>The second method allows you to blindly quote something. To utilise this enclose the text in <strong>[quote][/quote]</strong> tags. When you view the message it will simply show the text within a quotation block.</li></ul>'
-	),
-	array(
-		0 => 'Outputting code or fixed width data',
-		1 => 'If you want to output a piece of code or in fact anything that requires a fixed width, e.g. Courier type font you should enclose the text in <strong>[code][/code]</strong> tags, e.g.<br /><br /><strong>[code]</strong>echo &quot;This is some code&quot;;<strong>[/code]</strong><br /><br />All formatting used within <strong>[code][/code]</strong> tags is retained when you later view it. PHP syntax highlighting can be enabled using <strong>[code=php][/code]</strong> and is recommended when posting PHP code samples as it improves readability.'
-	),
-	array(
-		0 => '--',
-		1 => 'Generating lists'
-	),
-	array(
-		0 => 'Creating an Unordered list',
-		1 => 'BBCode supports two types of lists, unordered and ordered. They are essentially the same as their HTML equivalents. An unordered list outputs each item in your list sequentially one after the other indenting each with a bullet character. To create an unordered list you use <strong>[list][/list]</strong> and define each item within the list using <strong>[*]</strong>. For example to list your favourite colours you could use:<br /><br /><strong>[list]</strong><br /><strong>[*]</strong>Red<br /><strong>[*]</strong>Blue<br /><strong>[*]</strong>Yellow<br /><strong>[/list]</strong><br /><br />This would generate the following list:<ul><li>Red</li><li>Blue</li><li>Yellow</li></ul>'
-	),
-	array(
-		0 => 'Creating an Ordered list',
-		1 => 'The second type of list, an ordered list, gives you control over what is output before each item. To create an ordered list you use <strong>[list=1][/list]</strong> to create a numbered list or alternatively <strong>[list=a][/list]</strong> for an alphabetical list. As with the unordered list, items are specified using <strong>[*]</strong>. For example:<br /><br /><strong>[list=1]</strong><br /><strong>[*]</strong>Go to the shops<br /><strong>[*]</strong>Buy a new computer<br /><strong>[*]</strong>Swear at computer when it crashes<br /><strong>[/list]</strong><br /><br />will generate the following:<ol style="list-style-type: decimal;"><li>Go to the shops</li><li>Buy a new computer</li><li>Swear at computer when it crashes</li></ol>Whereas for an alphabetical list you would use:<br /><br /><strong>[list=a]</strong><br /><strong>[*]</strong>The first possible answer<br /><strong>[*]</strong>The second possible answer<br /><strong>[*]</strong>The third possible answer<br /><strong>[/list]</strong><br /><br />giving<ol style="list-style-type: lower-alpha"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol>'
-	),
-	array(
-		0 => '--',
-		1 => 'Creating Links'
-	),
-	array(
-		0 => 'Linking to another site',
-		1 => 'phpBB BBCode supports a number of ways of creating URIs (Uniform Resource Indicators) better known as URLs.<ul><li>The first of these uses the <strong>[url=][/url]</strong> tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use:<br /><br /><strong>[url=http://www.phpbb.com/]</strong>Visit phpBB!<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">Visit phpBB!</a> Please notice that the link opens in the same window or a new window depending on the users browser preferences.</li><li>If you want the URL itself displayed as the link you can do this by simply using:<br /><br /><strong>[url]</strong>http://www.phpbb.com/<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">http://www.phpbb.com/</a></li><li>Additionally, phpBB features something called <i>Magic Links</i>, this will turn any syntactically correct URL into a link without you needing to specify any tags or even the leading http://. For example typing www.phpbb.com into your message will automatically lead to <a href="http://www.phpbb.com/">www.phpbb.com</a> being output when you view the message.</li><li>The same thing applies equally to e-mail addresses, you can either specify an address explicitly for example:<br /><br /><strong>[email]</strong>no.one@domain.adr<strong>[/email]</strong><br /><br />which will output <a href="mailto:no.one@domain.adr">no.one@domain.adr</a> or you can just type no.one@domain.adr into your message and it will be automatically converted when you view.</li></ul>As with all the BBCode tags you can wrap URLs around any of the other tags such as <strong>[img][/img]</strong> (see next entry), <strong>[b][/b]</strong>, etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:<br /><br /><strong>[url=http://www.google.com/][img]</strong>http://www.google.com/intl/en_ALL/images/logo.gif<strong>[/url][/img]</strong><br /><br />is <span style="text-decoration: underline">not</span> correct which may lead to your post being deleted so take care.'
-	),
-	array(
-		0 => '--',
-		1 => 'Showing images in posts'
-	),
-	array(
-		0 => 'Adding an image to a post',
-		1 => 'phpBB BBCode incorporates a tag for including images in your posts. Two very important things to remember when using this tag are: many users do not appreciate lots of images being shown in posts and secondly the image you display must already be available on the internet (it cannot exist only on your computer for example, unless you run a webserver!). To display an image you must surround the URL pointing to the image with <strong>[img][/img]</strong> tags. For example:<br /><br /><strong>[img]</strong>http://www.google.com/intl/en_ALL/images/logo.gif<strong>[/img]</strong><br /><br />As noted in the URL section above you can wrap an image in a <strong>[url][/url]</strong> tag if you wish, e.g.<br /><br /><strong>[url=http://www.google.com/][img]</strong>http://www.google.com/intl/en_ALL/images/logo.gif<strong>[/img][/url]</strong><br /><br />would generate:<br /><br /><a href="http://www.google.com/"><img src="http://www.google.com/intl/en_ALL/images/logo.gif" alt="" /></a>'
-	),
-	array(
-		0 => 'Adding attachments into a post',
-		1 => 'Attachments can now be placed in any part of a post by using the new <strong>[attachment=][/attachment]</strong> BBCode, if the attachments functionality has been enabled by a board administrator and if you are given the appropriate permissions to create attachments. Within the posting screen is a drop-down box (respectively a button) for placing attachments inline.'
-	),
-	array(
-		0 => '--',
-		1 => 'Other matters'
-	),
-	array(
-		0 => 'Can I add my own tags?',
-		1 => 'If you are an administrator on this board and have the proper permissions, you can add further BBCodes through the Custom BBCodes section.'
-	)
-);
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
deleted file mode 100644
index 89ac845021..0000000000
--- a/phpBB/language/en/help_faq.php
+++ /dev/null
@@ -1,339 +0,0 @@
-<?php
-/**
-*
-* help_faq [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-$help = array(
-	array(
-		0 => '--',
-		1 => 'Login and Registration Issues'
-	),
-	array(
-		0 => 'Why can’t I login?',
-		1 => 'There are several reasons why this could occur. First, ensure your username and password are correct. If they are, contact the board owner to make sure you haven’t been banned. It is also possible the website owner has a configuration error on their end, and they would need to fix it.'
-	),
-	array(
-		0 => 'Why do I need to register at all?',
-		1 => 'You may not have to, it is up to the administrator of the board as to whether you need to register in order to post messages. However; registration will give you access to additional features not available to guest users such as definable avatar images, private messaging, emailing of fellow users, usergroup subscription, etc. It only takes a few moments to register so it is recommended you do so.'
-	),
-	array(
-		0 => 'Why do I get logged off automatically?',
-		1 => 'If you do not check the <em>Log me in automatically</em> box when you login, the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in, check the box during login. This is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university computer lab, etc. If you do not see this checkbox, it means the board administrator has disabled this feature.'
-	),
-	array(
-		0 => 'How do I prevent my username appearing in the online user listings?',
-		1 => 'Within your User Control Panel, under “Board preferences”, you will find the option <em>Hide your online status</em>. Enable this option with <samp>Yes</samp> and you will only appear to the administrators, moderators and yourself. You will be counted as a hidden user.'
-	),
-	array(
-		0 => 'I’ve lost my password!',
-		1 => 'Don’t panic! While your password cannot be retrieved, it can easily be reset. Visit the login page and click <em>I’ve forgotten my password</em>. Follow the instructions and you should be able to log in again shortly.'
-	),
-	array(
-		0 => 'I registered but cannot login!',
-		1 => 'First, check your username and password. If they are correct, then one of two things may have happened. If COPPA support is enabled and you specified being under 13 years old during registration, you will have to follow the instructions you received. Some boards will also require new registrations to be activated, either by yourself or by an administrator before you can logon; this information was present during registration. If you were sent an e-mail, follow the instructions. If you did not receive an e-mail, you may have provided an incorrect e-mail address or the e-mail may have been picked up by a spam filer. If you are sure the e-mail address you provided is correct, try contacting an administrator.'
-	),
-	array(
-		0 => 'I registered in the past but cannot login any more?!',
-		1 => 'Attempt to locate the e-mail sent to you when you first registered, check your username and password and try again. It is possible an administrator has deactivated or deleted your account for some reason. Also, many boards periodically remove users who have not posted for a long time to reduce the size of the database. If this has happened, try registering again and being more involved in discussions.'
-	),
-	array(
-		0 => 'What is COPPA?',
-		1 => 'COPPA, or the Child Online Privacy and Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that the phpBB Group cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined below.',
-	),
-	array(
-		0 => 'Why can’t I register?',
-		1 => 'It is possible the website owner has banned your IP address or disallowed the username you are attempting to register. The website owner could have also disabled registration to prevent new visitors from signing up. Contact a board administrator for assistance.',
-	),
-	array(
-		0 => 'What does the “Delete all board cookies” do?',
-		1 => '“Delete all board cookies” deletes the cookies created by phpBB which keep you authenticated and logged into the board. It also provides functions such as read tracking if they have been enabled by the board owner. If you are having login or logout problems, deleting board cookies may help.',
-	),
-	array(
-		0 => '--',
-		1 => 'User Preferences and settings'
-	),
-	array(
-		0 => 'How do I change my settings?',
-		1 => 'If you are a registered user, all your settings are stored in the board database. To alter them, visit your User Control Panel; a link can usually be found at the top of board pages. This system will allow you to change all your settings and preferences.'
-	),
-	array(
-		0 => 'The times are not correct!',
-		1 => 'It is possible the time displayed is from a timezone different from the one you are in. If this is the case, visit your User Control Panel and change your timezone to match your particular area, e.g. London, Paris, New York, Sydney, etc. Please note that changing the timezone, like most settings, can only be done by registered users. If you are not registered, this is a good time to do so.'
-	),
-	array(
-		0 => 'I changed the timezone and the time is still wrong!',
-		1 => 'If you are sure you have set the timezone and Summer Time/DST correctly and the time is still incorrect, then the time stored on the server clock is incorrect. Please notify an administrator to correct the problem.'
-	),
-	array(
-		0 => 'My language is not in the list!',
-		1 => 'Either the administrator has not installed your language or nobody has translated this board into your language. Try asking the board administrator if they can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the phpBB website (see link at the bottom of board pages).'
-	),
-	array(
-		0 => 'How do I show an image below my username?',
-		1 => 'There are two images that may appear below a username when viewing posts. Depending on the used style, the first may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. The second, usually a larger image, is known as an avatar and is generally unique or personal to each user. It is up to the board administrator to enable avatars and to choose the way in which avatars can be made available. If you are unable to use avatars, contact a board administrator and ask them for their reasons.'
-	),
-	array(
-		0 => 'What is my rank and how do I change it?',
-		1 => 'Ranks, which appear below your username, indicate the number of posts you have made or identify certain users, e.g. moderators and administrators. In general, you cannot directly change the wording of any board ranks as they are set by the board administrator. Please do not abuse the board by posting unnecessarily just to increase your rank. Most boards will not tolerate this and the moderator or administrator will simply lower your post count.'
-	),
-	array(
-		0 => 'When I click the e-mail link for a user it asks me to login?',
-		1 => 'Only registered users can send e-mail to other users via the built-in e-mail form, and only if the administrator has enabled this feature. This is to prevent malicious use of the e-mail system by anonymous users.'
-	),
-	array(
-		0 => '--',
-		1 => 'Posting Issues'
-	),
-	array(
-		0 => 'How do I post a topic in a forum?',
-		1 => 'To post a new topic in a forum, click the relevant button on either the forum or topic screens. You may need to register before you can post a message. A list of your permissions in each forum is available at the bottom of the forum and topic screens. Example: You can post new topics, You can vote in polls, etc.'
-	),
-	array(
-		0 => 'How do I edit or delete a post?',
-		1 => 'Unless you are a board administrator or moderator, you can only edit or delete your own posts. You can edit a post by clicking the edit button for the relevant post, sometimes for only a limited time after the post was made. If someone has already replied to the post, you will find a small piece of text output below the post when you return to the topic which lists the number of times you edited it along with the date and time. This will only appear if someone has made a reply; it will not appear if a moderator or administrator edited the post, though they may leave a note as to why they’ve edited the post at their own digression. Please note that normal users cannot delete a post once someone has replied.'
-	),
-	array(
-		0 => 'How do I add a signature to my post?',
-		1 => 'To add a signature to a post you must first create one via your User Control Panel. Once created, you can check the <em>Attach a signature</em> box on the posting form to add your signature. You can also add a signature by default to all your posts by checking the appropriate radio button in your profile. If you do so, you can still prevent a signature being added to individual posts by un-checking the add signature box within the posting form.'
-	),
-	array(
-		0 => 'How do I create a poll?',
-		1 => 'When posting a new topic or editing the first post of a topic, click the “Poll creation” tab below the main posting form; if you cannot see this, you do not have appropriate permissions to create polls. Enter a title and at least two options in the appropriate fields, making sure each option is on a separate line in the textarea. You can also set the number of options users may select during voting under “Options per user”, a time limit in days for the poll (0 for infinite duration) and lastly the option to allow users to amend their votes.'
-	),
-	array(
-		0 => 'Why can’t I add more poll options?',
-		1 => 'The limit for poll options is set by the board administrator. If you feel you need to add more options to your poll then the allowed amount, contact the board administrator.'
-	),
-	array(
-		0 => 'How do I edit or delete a poll?',
-		1 => 'As with posts, polls can only be edited by the original poster, a moderator or an administrator. To edit a poll, click to edit the first post in the topic; this always has the poll associated with it. If no one has cast a vote, users can delete the poll or edit any poll option. However, if members have already placed votes, only moderators or administrators can edit or delete it. This prevents the poll’s options from being changed mid-way through a poll.'
-	),
-	array(
-		0 => 'Why can’t I access a forum?',
-		1 => 'Some forums may be limited to certain users or groups. To view, read, post or perform another action you may need special permissions. Contact a moderator or board administrator to grant you access.'
-	),
-	array(
-		0 => 'Why can’t I add attachments?',
-		1 => 'Attachment permissions are granted on a per forum, per group, or per user basis. The board administrator may not have allowed attachments to be added for the specific forum you are posting in, or perhaps only certain groups can post attachments. Contact the board administrator if you are unsure about why you are unable to add attachments.'
-	),
-	array(
-		0 => 'Why did I receive a warning?',
-		1 => 'Each board administrator has their own set of rules for their site. If you have broken a rule, you may be issued a warning. Please note that this is the board administrator’s decision, and the phpBB Group has nothing to do with the warnings on the given site. Contact the board administrator if you are unsure about why you were issued a warning.'
-	),
-	array(
-		0 => 'How can I report posts to a moderator?',
-		1 => 'If the board administrator has allowed it, you should see a button for reporting posts next to the post you wish to report. Clicking this will walk you through the steps necessary to report the post.'
-	),
-	array(
-		0 => 'What is the “Save” button for in topic posting?',
-		1 => 'This allows you to save passages to be completed and submitted at a later date. To reload a saved passage, visit the User Control Panel.'
-	),
-	array(
-		0 => 'Why does my post need to be approved?',
-		1 => 'The board administrator may have decided that posts in the forum you are posting to require review before submission. It is also possible that the administrator has placed you in a group of users whose posts require review before submission. Please contact the board administrator for further details.'
-	),
-	array(
-		0 => 'How do I bump my topic?',
-		1 => 'By clicking the “Bump topic” link when you are viewing it, you can “bump” the topic to the top of the forum on the first page. However, if you do not see this, then topic bumping may be disabled or the time allowance between bumps has not yet been reached. It is also possible to bump the topic simply by replying to it, however, be sure to follow the board rules when doing so.'
-	),
-	array(
-		0 => '--',
-		1 => 'Formatting and Topic Types'
-	),
-	array(
-		0 => 'What is BBCode?',
-		1 => 'BBCode is a special implementation of HTML, offering great formatting control on particular objects in a post. The use of BBCode is granted by the administrator, but it can also be disabled on a per post basis from the posting form. BBCode itself is similar in style to HTML, but tags are enclosed in square brackets [ and ] rather than &lt; and &gt;. For more information on BBCode see the guide which can be accessed from the posting page.'
-	),
-	array(
-		0 => 'Can I use HTML?',
-		1 => 'No. It is not possible to post HTML on this board and have it rendered as HTML. Most formatting which can be carried out using HTML can be applied using BBCode instead.'
-	),
-	array(
-		0 => 'What are Smilies?',
-		1 => 'Smilies, or Emoticons, are small images which can be used to express a feeling using a short code, e.g. :) denotes happy, while :( denotes sad. The full list of emoticons can be seen in the posting form. Try not to overuse smilies, however, as they can quickly render a post unreadable and a moderator may edit them out or remove the post altogether. The board administrator may also have set a limit to the number of smilies you may use within a post.'
-	),
-	array(
-		0 => 'Can I post images?',
-		1 => 'Yes, images can be shown in your posts. If the administrator has allowed attachments, you may be able to upload the image to the board. Otherwise, you must link to an image stored on a publicly accessible web server, e.g. http://www.example.com/my-picture.gif. You cannot link to pictures stored on your own PC (unless it is a publicly accessible server) nor images stored behind authentication mechanisms, e.g. hotmail or yahoo mailboxes, password protected sites, etc. To display the image use the BBCode [img] tag.'
-	),
-	array(
-		0 => 'What are global announcements?',
-		1 => 'Global announcements contain important information and you should read them whenever possible. They will appear at the top of every forum and within your User Control Panel. Global announcement permissions are granted by the board administrator.'
-	),
-	array(
-		0 => 'What are announcements?',
-		1 => 'Announcements often contain important information for the forum you are currently reading and you should read them whenever possible. Announcements appear at the top of every page in the forum to which they are posted. As with global announcements, announcement permissions are granted by the board administrator.'
-	),
-	array(
-		0 => 'What are sticky topics?',
-		1 => 'Sticky topics within the forum appear below announcements and only on the first page. They are often quite important so you should read them whenever possible. As with announcements and global announcements, sticky topic permissions are granted by the board administrator.'
-	),
-	array(
-		0 => 'What are locked topics?',
-		1 => 'Locked topics are topics where users can no longer reply and any poll it contained was automatically ended. Topics may be locked for many reasons and were set this way by either the forum moderator or board administrator. You may also be able to lock your own topics depending on the permissions you are granted by the board administrator.'
-	),
-	array(
-		0 => 'What are topic icons?',
-		1 => 'Topic icons are author chosen images associated with posts to indicate their content. The ability to use topic icons depends on the permissions set by the board administrator.'
-	),
-	array(
-		0 => '--',
-		1 => 'User Levels and Groups'
-	),
-	array(
-		0 => 'What are Administrators?',
-		1 => 'Administrators are members assigned with the highest level of control over the entire board. These members can control all facets of board operation, including setting permissions, banning users, creating usergroups or moderators, etc., dependent upon the board founder and what permissions he or she has given the other administrators. They may also have full moderator capabilities in all forums, depending on the settings put forth by the board founder.'
-	),
-	array(
-		0 => 'What are Moderators?',
-		1 => 'Moderators are individuals (or groups of individuals) who look after the forums from day to day. They have the authority to edit or delete posts and lock, unlock, move, delete and split topics in the forum they moderate. Generally, moderators are present to prevent users from going off-topic or posting abusive or offensive material.'
-	),
-	array(
-		0 => 'What are usergroups?',
-		1 => 'Usergroups are groups of users that divide the community into manageable sections board administrators can work with. Each user can belong to several groups and each group can be assigned individual permissions. This provides an easy way for administrators to change permissions for many users at once, such as changing moderator permissions or granting users access to a private forum.'
-	),
-	array(
-		0 => 'Where are the usergroups and how do I join one?',
-		1 => 'You can view all usergroups via the “Usergroups” link within your User Control Panel. If you would like to join one, proceed by clicking the appropriate button. Not all groups have open access, however. Some may require approval to join, some may be closed and some may even have hidden memberships. If the group is open, you can join it by clicking the appropriate button. If a group requires approval to join you may request to join by clicking the appropriate button. The user group leader will need to approve your request and may ask why you want to join the group. Please do not harass a group leader if they reject your request; they will have their reasons.'
-	),
-	array(
-		0 => 'How do I become a usergroup leader?',
-		1 => 'A usergroup leader is usually assigned when usergroups are initially created by a board administrator. If you are interested in creating a usergroup, your first point of contact should be an administrator; try sending a private message.',
-	),
-	array(
-		0 => 'Why do some usergroups appear in a different colour?',
-		1 => 'It is possible for the board administrator to assign a colour to the members of a usergroup to make it easy to identify the members of this group.'
-	),
-	array(
-		0 => 'What is a “Default usergroup”?',
-		1 => 'If you are a member of more than one usergroup, your default is used to determine which group colour and group rank should be shown for you by default. The board administrator may grant you permission to change your default usergroup via your User Control Panel.'
-	),
-	array(
-		0 => 'What is “The team” link?',
-		1 => 'This page provides you with a list of board staff, including board administrators and moderators and other details such as the forums they moderate.'
-	),
-	array(
-		0 => '--',
-		1 => 'Private Messaging'
-	),
-	array(
-		0 => 'I cannot send private messages!',
-		1 => 'There are three reasons for this; you are not registered and/or not logged on, the board administrator has disabled private messaging for the entire board, or the board administrator has prevented you from sending messages. Contact a board administrator for more information.'
-	),
-	array(
-		0 => 'I keep getting unwanted private messages!',
-		1 => 'You can block a user from sending you private messages by using message rules within your User Control Panel. If you are receiving abusive private messages from a particular user, inform a board administrator; they have the power to prevent a user from sending private messages.'
-	),
-	array(
-		0 => 'I have received a spamming or abusive e-mail from someone on this board!',
-		1 => 'We are sorry to hear that. The e-mail form feature of this board includes safeguards to try and track users who send such posts, so e-mail the board administrator with a full copy of the e-mail you received. It is very important that this includes the headers that contain the details of the user that sent the e-mail. The board administrator can then take action.'
-	),
-	array(
-		0 => '--',
-		1 => 'Friends and Foes'
-	),
-	array(
-		0 => 'What are my Friends and Foes lists?',
-		1 => 'You can use these lists to organise other members of the board. Members added to your friends list will be listed within your User Control Panel for quick access to see their online status and to send them private messages. Subject to template support, posts from these users may also be highlighted. If you add a user to your foes list, any posts they make will be hidden by default.'
-	),
-	array(
-		0 => 'How can I add / remove users to my Friends or Foes list?',
-		1 => 'You can add users to your list in two ways. Within each user’s profile, there is a link to add them to either your Friend or Foe list. Alternatively, from your User Control Panel, you can directly add users by entering their member name. You may also remove users from your list using the same page.'
-	),
-	array(
-		0 => '--',
-		1 => 'Searching the Forums'
-	),
-	array(
-		0 => 'How can I search a forum or forums?',
-		1 => 'Enter a search term in the search box located on the index, forum or topic pages. Advanced search can be accessed by clicking the “Advance Search” link which is available on all pages on the forum. How to access the search may depend on the style used.'
-	),
-	array(
-		0 => 'Why does my search return no results?',
-		1 => 'Your search was probably too vague and included many common terms which are not indexed by phpBB3. Be more specific and use the options available within Advanced search.'
-	),
-	array(
-		0 => 'Why does my search return a blank page!?',
-		1 => 'Your search returned too many results for the webserver to handle. Use “Advanced search” and be more specific in the terms used and forums that are to be searched.'
-	),
-	array(
-		0 => 'How do I search for members?',
-		1 => 'Visit to the “Members” page and click the “Find a member” link.'
-	),
-	array(
-		0 => 'How can I find my own posts and topics?',
-		1 => 'Your own posts can be retrieved either by clicking the “Search user’s posts” within the User Control Panel or via your own profile page. To search for your topics, use the Advanced search page and fill in the various options appropriately.'
-	),
-	array(
-		0 => '--',
-		1 => 'Topic Subscriptions and Bookmarks'
-	),
-	array(
-		0 => 'What is the difference between bookmarking and subscribing?',
-		1 => 'Bookmarking in phpBB3 is much like bookmarking in your web browser. You aren’t alerted when there’s an update, but you can come back to the topic later. Subscribing, however, will notify you when there is an update to the topic or forum on the board via your preferred method or methods.'
-	),
-	array(
-		0 => 'How do I subscribe to specific forums or topics?',
-		1 => 'To subscribe to a specific forum, click the “Subscribe forum” link upon entering the forum. To subscribe to a topic, reply to the topic with the subscribe checkbox checked or click the “Subscribe topic” link within the topic itself.'
-	),
-	array(
-		0 => 'How do I remove my subscriptions?',
-		1 => 'To remove your subscriptions, go to your User Control Panel and follow the links to your subscriptions.'
-	),
-	array(
-		0 => '--',
-		1 => 'Attachments'
-	),
-	array(
-		0 => 'What attachments are allowed on this board?',
-		1 => 'Each board administrator can allow or disallow certain attachment types. If you are unsure what is allowed to be uploaded, contact the board administrator for assistance.'
-	),
-	array(
-		0 => 'How do I find all my attachments?',
-		1 => 'To find your list of attachments that you have uploaded, go to your User Control Panel and follow the links to the attachments section.'
-	),
-	array(
-		0 => '--',
-		1 => 'phpBB 3 Issues'
-	),
-	array(
-		0 => 'Who wrote this bulletin board?',
-		1 => 'This software (in its unmodified form) is produced, released and is copyright <a href="http://www.phpbb.com/">phpBB Group</a>. It is made available under the GNU General Public License and may be freely distributed. See the link for more details.'
-	),
-	array(
-		0 => 'Why isn’t X feature available?',
-		1 => 'This software was written by and licensed through phpBB Group. If you believe a feature needs to be added, please visit the phpbb.com website and see what phpBB Group have to say. Please do not post feature requests to the board at phpbb.com, the group uses SourceForge to handle tasking of new features. Please read through the forums and see what, if any, our position may already be for a feature and then follow the procedure given there.'
-	),
-	array(
-		0 => 'Who do I contact about abusive and/or legal matters related to this board?',
-		1 => 'Any of the administrators listed on the “The team” page should be an appropriate point of contact for your complaints. If this still gets no response then you should contact the owner of the domain (do a <a href="http://www.google.com/search?q=whois">whois lookup</a>) or, if this is running on a free service (e.g. Yahoo!, free.fr, f2s.com, etc.), the management or abuse department of that service. Please note that the phpBB Group has <strong>absolutely no jurisdiction</strong> and cannot in any way be held liable over how, where or by whom this board is used. Do not contact the phpBB Group in relation to any legal (cease and desist, liable, defamatory comment, etc.) matter <strong>not directly related</strong> to the phpBB.com website or the discrete software of phpBB itself. If you do e-mail phpBB Group <strong>about any third party</strong> use of this software then you should expect a terse response or no response at all.'
-	)
-);
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
deleted file mode 100644
index 9feed02da6..0000000000
--- a/phpBB/language/en/install.php
+++ /dev/null
@@ -1,627 +0,0 @@
-<?php
-/**
-*
-* install [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-$lang = array_merge($lang, array(
-	'ADMIN_CONFIG'				=> 'Administrator configuration',
-	'ADMIN_PASSWORD'			=> 'Administrator password',
-	'ADMIN_PASSWORD_CONFIRM'	=> 'Confirm administrator password',
-	'ADMIN_PASSWORD_EXPLAIN'	=> 'Please enter a password between 6 and 30 characters in length.',
-	'ADMIN_TEST'				=> 'Check administrator settings',
-	'ADMIN_USERNAME'			=> 'Administrator username',
-	'ADMIN_USERNAME_EXPLAIN'	=> 'Please enter a username between 3 and 20 characters in length.',
-	'APP_MAGICK'				=> 'Imagemagick support [ Attachments ]',
-	'AUTHOR_NOTES'				=> 'Author notes<br />» %s',
-	'AVAILABLE'					=> 'Available',
-	'AVAILABLE_CONVERTORS'		=> 'Available convertors',
-
-	'BEGIN_CONVERT'					=> 'Begin conversion',
-	'BLANK_PREFIX_FOUND'			=> 'A scan of your tables has shown a valid installation using no table prefix.',
-	'BOARD_NOT_INSTALLED'			=> 'No installation found',
-	'BOARD_NOT_INSTALLED_EXPLAIN'	=> 'The phpBB Unified Convertor Framework requires a default installation of phpBB3 to function, please <a href="%s">proceed by first installing phpBB3</a>.',
-
-	'CATEGORY'					=> 'Category',
-	'CACHE_STORE'				=> 'Cache type',
-	'CACHE_STORE_EXPLAIN'		=> 'The physical location where data is cached, filesystem is preferred.',
-	'CAT_CONVERT'				=> 'Convert',
-	'CAT_INSTALL'				=> 'Install',
-	'CAT_OVERVIEW'				=> 'Overview',
-	'CAT_UPDATE'				=> 'Update',
-	'CHANGE'					=> 'Change',
-	'CHECK_TABLE_PREFIX'		=> 'Please check your table prefix and try again.',
-	'CLEAN_VERIFY'				=> 'Cleaning up and verifying the final structure',
-	'CLEANING_USERNAMES'		=> 'Cleaning usernames',
-	'COLLIDING_CLEAN_USERNAME'	=> '<strong>%s</strong> is the clean username for:',
-	'COLLIDING_USERNAMES_FOUND'	=> 'Colliding usernames were found on your old board. In order to complete the conversion please delete or rename these users so that there is only one user on your old board for each clean username.',
-	'COLLIDING_USER'			=> '» user id: <strong>%d</strong> username: <strong>%s</strong> (%d posts)',
-	'CONFIG_CONVERT'			=> 'Converting the configuration',
-	'CONFIG_FILE_UNABLE_WRITE'	=> 'It was not possible to write the configuration file. Alternative methods for this file to be created are presented below.',
-	'CONFIG_FILE_WRITTEN'		=> 'The configuration file has been written. You may now proceed to the next step of the installation.',
-	'CONFIG_PHPBB_EMPTY'		=> 'The phpBB3 config variable for “%s” is empty.',
-	'CONFIG_RETRY'				=> 'Retry',
-	'CONTACT_EMAIL_CONFIRM'		=> 'Confirm contact e-mail',
-	'CONTINUE_CONVERT'			=> 'Continue conversion',
-	'CONTINUE_CONVERT_BODY'		=> 'A previous conversion attempt has been determined. You are now able to choose between starting a new conversion or continuing the conversion.',
-	'CONTINUE_LAST'				=> 'Continue last statements',
-	'CONTINUE_OLD_CONVERSION'	=> 'Continue previously started conversion',
-	'CONVERT'					=> 'Convert',
-	'CONVERT_COMPLETE'			=> 'Conversion completed',
-	'CONVERT_COMPLETE_EXPLAIN'	=> 'You have now successfully converted your board to phpBB 3.0. You can now login and <a href="../">access your board</a>. Please ensure that the settings were transferred correctly before enabling your board by deleting the install directory. Remember that help on using phpBB is available online via the <a href="http://www.phpbb.com/support/documentation/3.0/">Documentation</a> and the <a href="http://www.phpbb.com/community/viewforum.php?f=46">support forums</a>.',
-	'CONVERT_INTRO'				=> 'Welcome to the phpBB Unified Convertor Framework',
-	'CONVERT_INTRO_BODY'		=> 'From here, you are able to import data from other (installed) board systems. The list below shows all the conversion modules currently available. If there is no convertor shown in this list for the board software you wish to convert from, please check our website where further conversion modules may be available for download.',
-	'CONVERT_NEW_CONVERSION'	=> 'New conversion',
-	'CONVERT_NOT_EXIST'			=> 'The specified convertor does not exist.',
-	'CONVERT_OPTIONS'			=> 'Options',
-	'CONVERT_SETTINGS_VERIFIED'	=> 'The information you entered has been verified. To start the conversion process, please push the button below.',
-	'CONV_ERR_FATAL'			=> 'Fatal conversion error',
-
-	'CONV_ERROR_ATTACH_FTP_DIR'			=> 'FTP upload for attachments is enabled at the old board. Please disable the FTP upload option and make sure a valid upload directory is specified, then copy all attachment files to this new web accessible directory. Once you have done this, restart the convertor.',
-	'CONV_ERROR_CONFIG_EMPTY'			=> 'There is no configuration information available for the conversion.',
-	'CONV_ERROR_FORUM_ACCESS'			=> 'Unable to get forum access information.',
-	'CONV_ERROR_GET_CATEGORIES'			=> 'Unable to get categories.',
-	'CONV_ERROR_GET_CONFIG'				=> 'Could not retrieve your board configuration.',
-	'CONV_ERROR_COULD_NOT_READ'			=> 'Unable to access/read “%s”.',
-	'CONV_ERROR_GROUP_ACCESS'			=> 'Unable to get group authentication information.',
-	'CONV_ERROR_INCONSISTENT_GROUPS'	=> 'Inconsistency in groups table detected in add_bots() - you need to add all special groups if you do it manually.',
-	'CONV_ERROR_INSERT_BOT'				=> 'Unable to insert bot into users table.',
-	'CONV_ERROR_INSERT_BOTGROUP'		=> 'Unable to insert bot into bots table.',
-	'CONV_ERROR_INSERT_USER_GROUP'		=> 'Unable to insert user into user_group table.',
-	'CONV_ERROR_MESSAGE_PARSER'			=> 'Message parser error',
-	'CONV_ERROR_NO_AVATAR_PATH'			=> 'Note to developer: you must specify $convertor[\'avatar_path\'] to use %s.',
-	'CONV_ERROR_NO_FORUM_PATH'			=> 'The relative path to the source board has not been specified.',
-	'CONV_ERROR_NO_GALLERY_PATH'		=> 'Note to developer: you must specify $convertor[\'avatar_gallery_path\'] to use %s.',
-	'CONV_ERROR_NO_GROUP'				=> 'Group “%1$s” could not be found in %2$s.',
-	'CONV_ERROR_NO_RANKS_PATH'			=> 'Note to developer: you must specify $convertor[\'ranks_path\'] to use %s.',
-	'CONV_ERROR_NO_SMILIES_PATH'		=> 'Note to developer: you must specify $convertor[\'smilies_path\'] to use %s.',
-	'CONV_ERROR_NO_UPLOAD_DIR'			=> 'Note to developer: you must specify $convertor[\'upload_path\'] to use %s.',
-	'CONV_ERROR_PERM_SETTING'			=> 'Unable to insert/update permission setting.',
-	'CONV_ERROR_PM_COUNT'				=> 'Unable to select folder pm count.',
-	'CONV_ERROR_REPLACE_CATEGORY'		=> 'Unable to insert new forum replacing old category.',
-	'CONV_ERROR_REPLACE_FORUM'			=> 'Unable to insert new forum replacing old forum.',
-	'CONV_ERROR_USER_ACCESS'			=> 'Unable to get user authentication information.',
-	'CONV_ERROR_WRONG_GROUP'			=> 'Wrong group “%1$s” defined in %2$s.',
-	'CONV_OPTIONS_BODY'					=> 'This page collects the data required to access the source board. Enter the database details of your former board; the converter will not change anything in the database given below. The source board should be disabled to allow a consistent conversion.',
-	'CONV_SAVED_MESSAGES'				=> 'Saved messages',
-
-	'COULD_NOT_COPY'			=> 'Could not copy file <strong>%1$s</strong> to <strong>%2$s</strong><br /><br />Please check that the target directory exists and is writable by the webserver.',
-	'COULD_NOT_FIND_PATH'		=> 'Could not find path to your former board. Please check your settings and try again.<br />» %s was specified as the source path.',
-
-	'DBMS'						=> 'Database type',
-	'DB_CONFIG'					=> 'Database configuration',
-	'DB_CONNECTION'				=> 'Database connection',
-	'DB_ERR_INSERT'				=> 'Error while processing <code>INSERT</code> query.',
-	'DB_ERR_LAST'				=> 'Error while processing <var>query_last</var>.',
-	'DB_ERR_QUERY_FIRST'		=> 'Error while executing <var>query_first</var>.',
-	'DB_ERR_QUERY_FIRST_TABLE'	=> 'Error while executing <var>query_first</var>, %s (“%s”).',
-	'DB_ERR_SELECT'				=> 'Error while running <code>SELECT</code> query.',
-	'DB_HOST'					=> 'Database server hostname or DSN',
-	'DB_HOST_EXPLAIN'			=> 'DSN stands for Data Source Name and is relevant only for ODBC installs.',
-	'DB_NAME'					=> 'Database name',
-	'DB_PASSWORD'				=> 'Database password',
-	'DB_PORT'					=> 'Database server port',
-	'DB_PORT_EXPLAIN'			=> 'Leave this blank unless you know the server operates on a non-standard port.',
-	'DB_USERNAME'				=> 'Database username',
-	'DB_TEST'					=> 'Test connection',
-	'DEFAULT_LANG'				=> 'Default board language',
-	'DEFAULT_PREFIX_IS'			=> 'The convertor was not able to find tables with the specified prefix. Please make sure you have entered the correct details for the board you are converting from. The default table prefix for %1$s is <strong>%2$s</strong>.',
-	'DEV_NO_TEST_FILE'			=> 'No value has been specified for the test_file variable in the convertor. If you are a user of this convertor, you should not be seeing this error, please report this message to the convertor author. If you are a convertor author, you must specify the name of a file which exists in the source board to allow the path to it to be verified.',
-	'DIRECTORIES_AND_FILES'		=> 'Directory and file setup',
-	'DISABLE_KEYS'				=> 'Disabling keys',
-	'DLL_DB2'					=> 'DB2',
-	'DLL_FIREBIRD'				=> 'Firebird',
-	'DLL_FTP'					=> 'Remote FTP support [ Installation ]',
-	'DLL_GD'					=> 'GD graphics support [ Visual Confirmation ]',
-	'DLL_MBSTRING'				=> 'Multi-byte character support',
-	'DLL_MSSQL'					=> 'MSSQL Server 2000+',
-	'DLL_MSSQL_2005'			=> 'MSSQL Server 2005+',
-	'DLL_MSSQL_ODBC'			=> 'MSSQL Server 2000+ via ODBC',
-	'DLL_MYSQL'					=> 'MySQL',
-	'DLL_MYSQLI'				=> 'MySQL with MySQLi Extension',
-	'DLL_ORACLE'				=> 'Oracle',
-	'DLL_POSTGRES'				=> 'PostgreSQL 7.x/8.x',
-	'DLL_SQLITE'				=> 'SQLite',
-	'DLL_XML'					=> 'XML support [ Jabber ]',
-	'DLL_ZLIB'					=> 'zlib compression support [ gz, .tar.gz, .zip ]',
-	'DL_CONFIG'					=> 'Download config',
-	'DL_CONFIG_EXPLAIN'			=> 'You may download the complete config.php to your own PC. You will then need to upload the file manually, replacing any existing config.php in your phpBB 3.0 root directory. Please remember to upload the file in ASCII format (see your FTP application documentation if you are unsure how to achieve this). When you have uploaded the config.php please click “Done” to move to the next stage.',
-	'DL_DOWNLOAD'				=> 'Download',
-	'DONE'						=> 'Done',
-
-	'ENABLE_KEYS'				=> 'Re-enabling keys. This can take a while.',
-
-	'FILES_OPTIONAL'			=> 'Optional files and directories',
-	'FILES_OPTIONAL_EXPLAIN'	=> '<strong>Optional</strong> - These files, directories or permission settings are not required. The installation system will attempt to use various techniques to create them if they do not exist or cannot be written to. However, the presence of these will speed installation.',
-	'FILES_REQUIRED'			=> 'Files and Directories',
-	'FILES_REQUIRED_EXPLAIN'	=> '<strong>Required</strong> - In order to function correctly phpBB needs to be able to access or write to certain files or directories. If you see “Not Found” you need to create the relevant file or directory. If you see “Unwritable” you need to change the permissions on the file or directory to allow phpBB to write to it.',
-	'FILLING_TABLE'				=> 'Filling table <strong>%s</strong>',
-	'FILLING_TABLES'			=> 'Filling tables',
-	'FINAL_STEP'				=> 'Process final step',
-	'FORUM_ADDRESS'				=> 'Board address',
-	'FORUM_ADDRESS_EXPLAIN'		=> 'This is the URL of your former board, for example <samp>http://www.example.com/phpBB2/</samp>. If an address is entered here and not left empty every instance of this address will be replaced by your new board address within messages, private messages and signatures.',
-	'FORUM_PATH'				=> 'Board path',
-	'FORUM_PATH_EXPLAIN'		=> 'This is the <strong>relative</strong> path on disk to your former board from the <strong>root of this phpBB3 installation</strong>.',
-	'FOUND'						=> 'Found',
-	'FTP_CONFIG'				=> 'Transfer config by FTP',
-	'FTP_CONFIG_EXPLAIN'		=> 'phpBB has detected the presence of the FTP module on this server. You may attempt to install your config.php via this if you wish. You will need to supply the information listed below. Remember your username and password are those to your server! (ask your hosting provider for details if you are unsure what these are).',
-	'FTP_PATH'					=> 'FTP path',
-	'FTP_PATH_EXPLAIN'			=> 'This is the path from your root directory to that of phpBB, e.g. <samp>htdocs/phpBB3/</samp>.',
-	'FTP_UPLOAD'				=> 'Upload',
-
-	'GPL'						=> 'General Public License',
-
-	'INITIAL_CONFIG'			=> 'Basic configuration',
-	'INITIAL_CONFIG_EXPLAIN'	=> 'Now that install has determined your server can run phpBB you need to supply some specific information. If you do not know how to connect to your database please contact your hosting provider (in the first instance) or use the phpBB support forums. When entering data please ensure you check it thoroughly before continuing.',
-	'INSTALL_CONGRATS'			=> 'Congratulations!',
-	'INSTALL_CONGRATS_EXPLAIN'	=> '
-		<p>You have now successfully installed phpBB %1$s. From here, you have two options as to what to do with your newly installed phpBB3:</p>
-		<h2>Convert an existing board to phpBB3</h2>
-		<p>The phpBB Unified Convertor Framework supports the conversion of phpBB 2.0.x and other board systems to phpBB3. If you have an existing board that you wish to convert, please <a href="%2$s">proceed on to the convertor</a>.</p>
-		<h2>Go live with your phpBB3!</h2>
-		<p>Clicking the button below will take you to your Administration Control Panel (ACP). Take some time to examine the options available to you. Remember that help is available online via the <a href="http://www.phpbb.com/support/documentation/3.0/">Documentation</a> and the <a href="http://www.phpbb.com/community/viewforum.php?f=46">support forums</a>, see the <a href="%3$s">README</a> for further information.</p><p><strong>Please now delete, move or rename the install directory before you use your board. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.</strong></p>',
-	'INSTALL_INTRO'				=> 'Welcome to Installation',
-
-	'INSTALL_INTRO_BODY'		=> 'With this option, it is possible to install phpBB3 onto your server.</p><p>In order to proceed, you will need your database settings. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need:</p>
-
-	<ul>
-		<li>The Database Type - the database you will be using.</li>
-		<li>The Database server hostname or DSN - the address of the database server.</li>
-		<li>The Database server port - the port of the database server (most of the time this is not needed).</li>
-		<li>The Database name - the name of the database on the server.</li>
-		<li>The Database username and Database password - the login data to access the database.</li>
-	</ul>
-
-	<p><strong>Note:</strong> if you are installing using SQLite, you should enter the full path to your database file in the DSN field and leave the username and password fields blank. For security reasons, you should make sure that the database file is not stored in a location accessible from the web.</p>
-
-	<p>phpBB3 supports the following databases:</p>
-	<ul>
-		<li>MySQL 4.1 or above (MySQLi supported)</li>
-		<li>PostgreSQL 7.3+</li>
-		<li>SQLite 2.8.2+</li>
-		<li>Firebird 2.0+</li>
-		<li>MS SQL Server 2000 or above (directly or via ODBC)</li>
-		<li>Oracle</li>
-		<li>IBM DB2</li>
-	</ul>
-
-	<p>Only those databases supported on your server will be displayed.',
-	'INSTALL_INTRO_NEXT'		=> 'To commence the installation, please press the button below.',
-	'INSTALL_LOGIN'				=> 'Login',
-	'INSTALL_NEXT'				=> 'Next stage',
-	'INSTALL_NEXT_FAIL'			=> 'Some tests failed and you should correct these problems before proceeding to the next stage. Failure to do so may result in an incomplete installation.',
-	'INSTALL_NEXT_PASS'			=> 'All the basic tests have been passed and you may proceed to the next stage of installation. If you have changed any permissions, modules, etc. and wish to re-test you can do so if you wish.',
-	'INSTALL_PANEL'				=> 'Installation Panel',
-	'INSTALL_SEND_CONFIG'		=> 'Unfortunately phpBB could not write the configuration information directly to your config.php. This may be because the file does not exist or is not writable. A number of options will be listed below enabling you to complete installation of config.php.',
-	'INSTALL_START'				=> 'Start install',
-	'INSTALL_TEST'				=> 'Test again',
-	'INST_ERR'					=> 'Installation error',
-	'INST_ERR_DB_CONNECT'		=> 'Could not connect to the database, see error message below.',
-	'INST_ERR_DB_FORUM_PATH'	=> 'The database file specified is within your board directory tree. You should put this file in a non web-accessible location.',
-	'INST_ERR_DB_NO_ERROR'		=> 'No error message given.',
-
-	'INST_ERR_DB_MYSQL_VERSION'		=> 'The version of MySQL installed on the target server must be at least 4.1, phpBB 3.1 cannot be installed on an older version.',
-	'INST_ERR_DB_SQLITE_VERSION'	=> 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 2.8.2.',
-	'INST_ERR_DB_ORACLE_VERSION'	=> 'The version of Oracle installed on the target server must be at least 9.2, phpBB 3.1 cannot be installed on an older version.',
-	'INST_ERR_DB_FIREBIRD_VERSION'	=> 'The version of Firebird installed on this machine is older than 2.0, please upgrade to a newer version.',
-	'INST_ERR_DB_POSTGRES_VERSION'	=> 'The version of PostgreSQL installed on the target server is older than 8.2, please upgrade to a newer version.',
-	'INST_ERR_DB_DB2_VERSION'		=> 'The version of DB2 installed on the target server is older than 8.2.2, please upgrade to a newer version.',
-	'INST_ERR_DB_DB2_EXT_VERSION'	=> 'The version of the IBM_DB2 extension installed on this machine is older than 1.6.0, please install a newer version.',
-
-	'INST_ERR_DB_NO_ORACLE_NLS'		=> 'You must configure Oracle so that the <var>NLS_CHARACTERSET</var> parameter is set to <var>ALU32UTF8</var>.',
-	'INST_ERR_DB_NO_FIREBIRD_PS'	=> 'The database you selected for Firebird has a page size less than 8192, it must be at least 8192.',
-	'INST_ERR_DB_NO_POSTGRES_UTF8'	=> 'The database you have selected was not created in <var>UNICODE</var> or <var>UTF8</var> encoding. Try installing with a database in <var>UNICODE</var> or <var>UTF8</var> encoding.',
-	'INST_ERR_DB_NO_NAME'		=> 'No database name specified.',
-	'INST_ERR_EMAIL_INVALID'	=> 'The e-mail address you entered is invalid.',
-	'INST_ERR_EMAIL_MISMATCH'	=> 'The e-mails you entered did not match.',
-	'INST_ERR_FATAL'			=> 'Fatal installation error',
-	'INST_ERR_FATAL_DB'			=> 'A fatal and unrecoverable database error has occurred. This may be because the specified user does not have appropriate permissions to <code>CREATE TABLES</code> or <code>INSERT</code> data, etc. Further information may be given below. Please contact your hosting provider in the first instance or the support forums of phpBB for further assistance.',
-	'INST_ERR_FTP_PATH'			=> 'Could not change to the given directory, please check the path.',
-	'INST_ERR_FTP_LOGIN'		=> 'Could not login to FTP server, check your username and password.',
-	'INST_ERR_MISSING_DATA'		=> 'You must fill out all fields in this block.',
-	'INST_ERR_NO_DB'			=> 'Cannot load the PHP module for the selected database type.',
-	'INST_ERR_PASSWORD_MISMATCH'	=> 'The passwords you entered did not match.',
-	'INST_ERR_PASSWORD_TOO_LONG'	=> 'The password you entered is too long. The maximum length is 30 characters.',
-	'INST_ERR_PASSWORD_TOO_SHORT'	=> 'The password you entered is too short. The minimum length is 6 characters.',
-	'INST_ERR_PREFIX'			=> 'Tables with the specified prefix already exist, please choose an alternative.',
-	'INST_ERR_PREFIX_INVALID'	=> 'The table prefix you have specified is invalid for your database. Please try another, removing characters such as the hyphen.',
-	'INST_ERR_PREFIX_TOO_LONG'	=> 'The table prefix you have specified is too long. The maximum length is %d characters.',
-	'INST_ERR_USER_TOO_LONG'	=> 'The username you entered is too long. The maximum length is 20 characters.',
-	'INST_ERR_USER_TOO_SHORT'	=> 'The username you entered is too short. The minimum length is 3 characters.',
-	'INVALID_PRIMARY_KEY'		=> 'Invalid primary key : %s',
-
-	'LONG_SCRIPT_EXECUTION'		=> 'Please note that this can take a while... Please do not stop the script.',
-
-	// mbstring
-	'MBSTRING_CHECK'						=> '<samp>mbstring</samp> extension check',
-	'MBSTRING_CHECK_EXPLAIN'				=> '<strong>Required</strong> - <samp>mbstring</samp> is a PHP extension that provides multibyte string functions. Certain features of mbstring are not compatible with phpBB and must be disabled.',
-	'MBSTRING_FUNC_OVERLOAD'				=> 'Function overloading',
-	'MBSTRING_FUNC_OVERLOAD_EXPLAIN'		=> '<var>mbstring.func_overload</var> must be set to either 0 or 4.',
-	'MBSTRING_ENCODING_TRANSLATION'			=> 'Transparent character encoding',
-	'MBSTRING_ENCODING_TRANSLATION_EXPLAIN'	=> '<var>mbstring.encoding_translation</var> must be set to 0.',
-	'MBSTRING_HTTP_INPUT'					=> 'HTTP input character conversion',
-	'MBSTRING_HTTP_INPUT_EXPLAIN'			=> '<var>mbstring.http_input</var> must be set to <samp>pass</samp>.',
-	'MBSTRING_HTTP_OUTPUT'					=> 'HTTP output character conversion',
-	'MBSTRING_HTTP_OUTPUT_EXPLAIN'			=> '<var>mbstring.http_output</var> must be set to <samp>pass</samp>.',
-
-	'MAKE_FOLDER_WRITABLE'		=> 'Please make sure that this folder exists and is writable by the webserver then try again:<br />»<strong>%s</strong>.',
-	'MAKE_FOLDERS_WRITABLE'		=> 'Please make sure that these folders exist and are writable by the webserver then try again:<br />»<strong>%s</strong>.',
-
-	'MYSQL_SCHEMA_UPDATE_REQUIRED'	=> 'Your MySQL database schema for phpBB is outdated. phpBB detected a schema for MySQL 3.x/4.x, but the server runs on MySQL %2s.<br /><strong>Before you proceed the update, you need to upgrade the schema.</strong><br /><br />Please refer to the <a href="http://www.phpbb.com/kb/article/doesnt-have-a-default-value-errors/">Knowledge Base article about upgrading the MySQL schema</a>. If you encounter problems, please use <a href="http://www.phpbb.com/community/viewforum.php?f=46">our support forums</a>.',
-
-	'NAMING_CONFLICT'			=> 'Naming conflict: %s and %s are both aliases<br /><br />%s',
-	'NEXT_STEP'					=> 'Proceed to next step',
-	'NOT_FOUND'					=> 'Cannot find',
-	'NOT_UNDERSTAND'			=> 'Could not understand %s #%d, table %s (“%s”)',
-	'NO_CONVERTORS'				=> 'No convertors are available for use.',
-	'NO_CONVERT_SPECIFIED'		=> 'No convertor specified.',
-	'NO_LOCATION'				=> 'Cannot determine location. If you know Imagemagick is installed, you may specify the location later within your administration control panel',
-	'NO_TABLES_FOUND'			=> 'No tables found.',
-
-	'OVERVIEW_BODY'				=> 'Welcome to phpBB3!<br /><br />phpBB™ is the most widely used open source bulletin board solution in the world. phpBB3 is the latest installment in a package line started in 2000. Like its predecessors, phpBB3 is feature-rich, user-friendly, and fully supported by the phpBB Team. phpBB3 greatly improves on what made phpBB2 popular, and adds commonly requested features that were not present in previous versions. We hope it exceeds your expectations.<br /><br />This installation system will guide you through installing phpBB3, updating to the latest version of phpBB3 from past releases, as well as converting to phpBB3 from a different discussion board system (including phpBB2). For more information, we encourage you to read <a href="../docs/INSTALL.html">the installation guide</a>.<br /><br />To read the phpBB3 license or learn about obtaining support and our stance on it, please select the respective options from the side menu. To continue, please select the appropriate tab above.',
-
-	'PCRE_UTF_SUPPORT'				=> 'PCRE UTF-8 support',
-	'PCRE_UTF_SUPPORT_EXPLAIN'		=> 'phpBB will <strong>not</strong> run if your PHP installation is not compiled with UTF-8 support in the PCRE extension.',
-	'PCRE_UNI_PROP_SUPPORT'				=> 'PCRE Unicode Property support',
-	'PCRE_UNI_PROP_SUPPORT_EXPLAIN'		=> 'phpBB will <strong>not</strong> run if your PHP installation is not compiled with Unicode Property support in the PCRE extension.',
-	'PHP_GETIMAGESIZE_SUPPORT'			=> 'PHP function getimagesize() is available',
-	'PHP_GETIMAGESIZE_SUPPORT_EXPLAIN'	=> '<strong>Required</strong> - In order for phpBB to function correctly, the getimagesize function needs to be available.',
-	'PHP_OPTIONAL_MODULE'			=> 'Optional modules',
-	'PHP_OPTIONAL_MODULE_EXPLAIN'	=> '<strong>Optional</strong> - These modules or applications are optional. However, if they are available they will enable extra features.',
-	'PHP_SUPPORTED_DB'				=> 'Supported databases',
-	'PHP_SUPPORTED_DB_EXPLAIN'		=> '<strong>Required</strong> - You must have support for at least one compatible database within PHP. If no database modules are shown as available you should contact your hosting provider or review the relevant PHP installation documentation for advice.',
-	'PHP_REGISTER_GLOBALS'			=> 'PHP setting <var>register_globals</var> is disabled',
-	'PHP_REGISTER_GLOBALS_EXPLAIN'	=> 'phpBB will still run if this setting is enabled, but if possible, it is recommended that register_globals is disabled on your PHP install for security reasons.',
-	'PHP_SAFE_MODE'					=> 'Safe mode',
-	'PHP_SETTINGS'					=> 'PHP version and settings',
-	'PHP_SETTINGS_EXPLAIN'			=> '<strong>Required</strong> - You must be running at least version 5.2.0 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
-	'PHP_URL_FOPEN_SUPPORT'			=> 'PHP setting <var>allow_url_fopen</var> is enabled',
-	'PHP_URL_FOPEN_SUPPORT_EXPLAIN'	=> '<strong>Optional</strong> - This setting is optional, however certain phpBB functions like off-site avatars will not work properly without it. ',
-	'PHP_VERSION_REQD'				=> 'PHP version >= 5.2.0',
-	'POST_ID'						=> 'Post ID',
-	'PREFIX_FOUND'					=> 'A scan of your tables has shown a valid installation using <strong>%s</strong> as table prefix.',
-	'PREPROCESS_STEP'				=> 'Executing pre-processing functions/queries',
-	'PRE_CONVERT_COMPLETE'			=> 'All pre-conversion steps have successfully been completed. You may now begin the actual conversion process. Please note that you may have to manually do and adjust several things. After conversion, especially check the permissions assigned, rebuild your search index which is not converted and also make sure files got copied correctly, for example avatars and smilies.',
-	'PROCESS_LAST'					=> 'Processing last statements',
-
-	'REFRESH_PAGE'				=> 'Refresh page to continue conversion',
-	'REFRESH_PAGE_EXPLAIN'		=> 'If set to yes, the convertor will refresh the page to continue the conversion after having finished a step. If this is your first conversion for testing purposes and to determine any errors in advance, we suggest to set this to No.',
-	'REQUIREMENTS_TITLE'		=> 'Installation compatibility',
-	'REQUIREMENTS_EXPLAIN'		=> 'Before proceeding with the full installation phpBB will carry out some tests on your server configuration and files to ensure that you are able to install and run phpBB. Please ensure you read through the results thoroughly and do not proceed until all the required tests are passed. If you wish to use any of the features depending on the optional tests, you should ensure that these tests are passed also.',
-	'RETRY_WRITE'				=> 'Retry writing config',
-	'RETRY_WRITE_EXPLAIN'		=> 'If you wish you can change the permissions on config.php to allow phpBB to write to it. Should you wish to do that you can click Retry below to try again. Remember to return the permissions on config.php after phpBB has finished installation.',
-
-	'SCRIPT_PATH'				=> 'Script path',
-	'SCRIPT_PATH_EXPLAIN'		=> 'The path where phpBB is located relative to the domain name, e.g. <samp>/phpBB3</samp>.',
-	'SELECT_LANG'				=> 'Select language',
-	'SERVER_CONFIG'				=> 'Server configuration',
-	'SEARCH_INDEX_UNCONVERTED'	=> 'Search index was not converted',
-	'SEARCH_INDEX_UNCONVERTED_EXPLAIN'	=> 'Your old search index was not converted. Searching will always yield an empty result. To create a new search index go to the Administration Control Panel, select Maintenance and then choose Search index from the submenu.',
-	'SOFTWARE'					=> 'Board software',
-	'SPECIFY_OPTIONS'			=> 'Specify conversion options',
-	'STAGE_ADMINISTRATOR'		=> 'Administrator details',
-	'STAGE_ADVANCED'			=> 'Advanced settings',
-	'STAGE_ADVANCED_EXPLAIN'	=> 'The settings on this page are only necessary to set if you know that you require something different from the default. If you are unsure, just proceed to the next page, as these settings can be altered from the Administration Control Panel later.',
-	'STAGE_CONFIG_FILE'			=> 'Configuration file',
-	'STAGE_CREATE_TABLE'		=> 'Create database tables',
-	'STAGE_CREATE_TABLE_EXPLAIN'	=> 'The database tables used by phpBB 3.0 have been created and populated with some initial data. Proceed to the next screen to finish installing phpBB.',
-	'STAGE_DATABASE'			=> 'Database settings',
-	'STAGE_FINAL'				=> 'Final stage',
-	'STAGE_INTRO'				=> 'Introduction',
-	'STAGE_IN_PROGRESS'			=> 'Conversion in progress',
-	'STAGE_REQUIREMENTS'		=> 'Requirements',
-	'STAGE_SETTINGS'			=> 'Settings',
-	'STARTING_CONVERT'			=> 'Starting conversion process',
-	'STEP_PERCENT_COMPLETED'	=> 'Step <strong>%d</strong> of <strong>%d</strong>',
-	'SUB_INTRO'					=> 'Introduction',
-	'SUB_LICENSE'				=> 'License',
-	'SUB_SUPPORT'				=> 'Support',
-	'SUCCESSFUL_CONNECT'		=> 'Successful connection',
-	'SUPPORT_BODY'				=> 'Full support will be provided for the current stable release of phpBB3, free of charge. This includes:</p><ul><li>installation</li><li>configuration</li><li>technical questions</li><li>problems relating to potential bugs in the software</li><li>updating from Release Candidate (RC) versions to the latest stable version</li><li>converting from phpBB 2.0.x to phpBB3</li><li>converting from other discussion board software to phpBB3 (please see the <a href="http://www.phpbb.com/community/viewforum.php?f=65">Convertors Forum</a>)</li></ul><p>We encourage users still running beta versions of phpBB3 to replace their installation with a fresh copy of the latest version.</p><h2>MODs / Styles</h2><p>For issues relating to MODs, please post in the appropriate <a href="http://www.phpbb.com/community/viewforum.php?f=81">Modifications Forum</a>.<br />For issues relating to styles, templates and imagesets, please post in the appropriate <a href="http://www.phpbb.com/community/viewforum.php?f=80">Styles Forum</a>.<br /><br />If your question relates to a specific package, please post directly in the topic dedicated to the package.</p><h2>Obtaining Support</h2><p><a href="http://www.phpbb.com/community/viewtopic.php?f=14&amp;t=571070">The phpBB Welcome Package</a><br /><a href="http://www.phpbb.com/support/">Support Section</a><br /><a href="http://www.phpbb.com/support/documentation/3.0/quickstart/">Quick Start Guide</a><br /><br />To ensure you stay up to date with the latest news and releases, why not <a href="http://www.phpbb.com/support/">subscribe to our mailing list</a>?<br /><br />',
-	'SYNC_FORUMS'				=> 'Starting to synchronise forums',
-	'SYNC_POST_COUNT'			=> 'Synchronising post_counts',
-	'SYNC_POST_COUNT_ID'		=> 'Synchronising post_counts from <var>entry</var> %1$s to %2$s.',
-	'SYNC_TOPICS'				=> 'Starting to synchronise topics',
-	'SYNC_TOPIC_ID'				=> 'Synchronising topics from <var>topic_id</var> %1$s to %2$s.',
-
-	'TABLES_MISSING'			=> 'Could not find these tables<br />» <strong>%s</strong>.',
-	'TABLE_PREFIX'				=> 'Prefix for tables in database',
-	'TABLE_PREFIX_SAME'			=> 'The table prefix needs to be the one used by the software you are converting from.<br />» Specified table prefix was %s.',
-	'TESTS_PASSED'				=> 'Tests passed',
-	'TESTS_FAILED'				=> 'Tests failed',
-
-	'UNABLE_WRITE_LOCK'			=> 'Unable to write lock file.',
-	'UNAVAILABLE'				=> 'Unavailable',
-	'UNWRITABLE'				=> 'Unwritable',
-	'UPDATE_TOPICS_POSTED'		=> 'Generating topics posted information',
-	'UPDATE_TOPICS_POSTED_ERR'	=> 'An error occured while generating topics posted information. You can retry this step in the ACP after the conversion process is completed.',
-	'VERIFY_OPTIONS'			=> 'Verifying conversion options',
-	'VERSION'					=> 'Version',
-
-	'WELCOME_INSTALL'			=> 'Welcome to phpBB3 Installation',
-	'WRITABLE'					=> 'Writable',
-));
-
-// Updater
-$lang = array_merge($lang, array(
-	'ALL_FILES_UP_TO_DATE'		=> 'All files are up to date with the latest phpBB version. You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory!',
-	'ARCHIVE_FILE'				=> 'Source file within archive',
-
-	'BACK'				=> 'Back',
-	'BINARY_FILE'		=> 'Binary file',
-	'BOT'				=> 'Spider/Robot',
-
-	'CHANGE_CLEAN_NAMES'			=> 'The method used to make sure a username is not used by multiple users has been changed. There are some users which have the same name when compared with the new method. You have to delete or rename these users to make sure that each name is only used by one user before you can proceed.',
-	'CHECK_FILES'					=> 'Check files',
-	'CHECK_FILES_EXPLAIN'			=> 'Within the next step all files will be checked against the update files - this can take a while if this is the first file check.',
-	'CHECK_FILES_UP_TO_DATE'		=> 'According to your database your version is up to date. You may want to proceed with the file check to make sure all files are really up to date with the latest phpBB version.',
-	'CHECK_UPDATE_DATABASE'			=> 'Continue update process',
-	'COLLECTED_INFORMATION'			=> 'File information',
-	'COLLECTED_INFORMATION_EXPLAIN'	=> 'The list below shows information about the files needing an update. Please read the information in front of every status block to see what they mean and what you may need to do to perform a successful update.',
-	'COLLECTING_FILE_DIFFS'			=> 'Collecting file differences',
-	'COMPLETE_LOGIN_TO_BOARD'		=> 'You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory!',
-	'CONTINUE_UPDATE'				=> 'Check files again',
-	'CONTINUE_UPDATE_NOW'			=> 'Continue the update process now',
-	'CURRENT_FILE'					=> 'Begin of Conflict - Original File code before update',
-	'CURRENT_VERSION'				=> 'Current version',
-
-	'DATABASE_TYPE'						=> 'Database type',
-	'DATABASE_UPDATE_INFO_OLD'			=> 'The database update file within the install directory is outdated. Please make sure you uploaded the correct version of the file.',
-	'DELETE_USER_REMOVE'				=> 'Delete user and remove posts',
-	'DELETE_USER_RETAIN'				=> 'Delete user but keep posts',
-	'DESTINATION'						=> 'Destination file',
-	'DIFF_INLINE'						=> 'Inline',
-	'DIFF_RAW'							=> 'Raw unified diff',
-	'DIFF_SEP_EXPLAIN'					=> 'Code block used within the updated/new file',
-	'DIFF_SIDE_BY_SIDE'					=> 'Side by Side',
-	'DIFF_UNIFIED'						=> 'Unified diff',
-	'DO_NOT_UPDATE'						=> 'Do not update this file',
-	'DONE'								=> 'Done',
-	'DOWNLOAD'							=> 'Download',
-	'DOWNLOAD_AS'						=> 'Download as',
-	'DOWNLOAD_CONFLICTS'				=> 'Download conflicts for this file',
-	'DOWNLOAD_CONFLICTS_EXPLAIN'		=> 'Search for &lt;&lt;&lt; to spot conflicts',
-
-	'ERROR'			=> 'Error',
-	'EDIT_USERNAME'	=> 'Edit username',
-
-	'FILE_ALREADY_UP_TO_DATE'		=> 'File is already up to date.',
-	'FILE_DIFF_NOT_ALLOWED'			=> 'File not allowed to be diffed.',
-	'FILE_USED'						=> 'Information used from',			// Single file
-	'FILES_CONFLICT'				=> 'Conflict files',
-	'FILES_CONFLICT_EXPLAIN'		=> 'The following files are modified and do not represent the original files from the old version. phpBB determined that these files create conflicts if they are tried to be merged. Please investigate the conflicts and try to manually resolve them or continue the update choosing the preferred merging method. If you resolve the conflicts manually check the files again after you modified them. You are also able to choose between the preferred merge method for every file. The first one will result in a file where the conflicting lines from your old file will be lost, the other one will result in loosing the changes from the newer file.',
-	'FILES_MODIFIED'				=> 'Modified files',
-	'FILES_MODIFIED_EXPLAIN'		=> 'The following files are modified and do not represent the original files from the old version. The updated file will be a merge between your modifications and the new file.',
-	'FILES_NEW'						=> 'New files',
-	'FILES_NEW_EXPLAIN'				=> 'The following files currently do not exist within your installation. These files will be added to your installation.',
-	'FILES_NEW_CONFLICT'			=> 'New conflicting files',
-	'FILES_NEW_CONFLICT_EXPLAIN'	=> 'The following files are new within the latest version but it has been determined that there is already a file with the same name within the same position. This file will be overwritten by the new file.',
-	'FILES_NOT_MODIFIED'			=> 'Not modified files',
-	'FILES_NOT_MODIFIED_EXPLAIN'	=> 'The following files are not modified and represent the original phpBB files from the version you want to update from.',
-	'FILES_UP_TO_DATE'				=> 'Already updated files',
-	'FILES_UP_TO_DATE_EXPLAIN'		=> 'The following files are already up to date and do not need to be updated.',
-
-	'INCOMPATIBLE_UPDATE_FILES'		=> 'The update files found are incompatible with your installed version. Your installed version is %1$s and the update file is for updating phpBB %2$s to %3$s.',
-	'INCOMPLETE_UPDATE_FILES'		=> 'The update files are incomplete.',
-	'INLINE_UPDATE_SUCCESSFUL'		=> 'The database update was successful. Now you need to continue the update process.',
-
-	'KEEP_OLD_NAME'		=> 'Keep username',
-
-	'LATEST_VERSION'		=> 'Latest version',
-	'LINE'					=> 'Line',
-	'LINE_ADDED'			=> 'Added',
-	'LINE_MODIFIED'			=> 'Modified',
-	'LINE_REMOVED'			=> 'Removed',
-	'LINE_UNMODIFIED'		=> 'Unmodified',
-	'LOGIN_UPDATE_EXPLAIN'	=> 'In order to update your installation you need to login first.',
-
-	'MERGE_MODIFICATIONS_OPTION'	=> 'Merge modifications',
-
-	'MERGE_NO_MERGE_NEW_OPTION'	=> 'Do not merge - use new file',
-	'MERGE_NO_MERGE_MOD_OPTION'	=> 'Do not merge - use currently installed file',
-	'MERGE_MOD_FILE_OPTION'		=> 'Merge modifications (Loose new phpBB code within conflicting block)',
-	'MERGE_NEW_FILE_OPTION'		=> 'Merge modifications (Loose modified code within conflicting block)',
-	'MERGE_SELECT_ERROR'		=> 'Conflicting file merge modes are not correctly selected.',
-	'MERGING_FILES'				=> 'Merging differences',
-	'MERGING_FILES_EXPLAIN'		=> 'Currently collecting final file changes.<br /><br />Please wait until phpBB has completed all operations on changed files.',
-
-	'NEW_FILE'						=> 'End of Conflict',
-	'NEW_USERNAME'					=> 'New username',
-	'NO_AUTH_UPDATE'				=> 'Not authorised to update',
-	'NO_ERRORS'						=> 'No errors',
-	'NO_UPDATE_FILES'				=> 'Not updating the following files',
-	'NO_UPDATE_FILES_EXPLAIN'		=> 'The following files are new or modified but the directory they normally reside in could not be found on your installation. If this list contains files to other directories than language/ or styles/ than you may have modified your directory structure and the update may be incomplete.',
-	'NO_UPDATE_FILES_OUTDATED'		=> 'No valid update directory was found, please make sure you uploaded the relevant files.<br /><br />Your installation does <strong>not</strong> seem to be up to date. Updates are available for your version of phpBB %1$s, please visit <a href="http://www.phpbb.com/downloads/" rel="external">http://www.phpbb.com/downloads/</a> to obtain the correct package to update from Version %2$s to Version %3$s.',
-	'NO_UPDATE_FILES_UP_TO_DATE'	=> 'Your version is up to date. There is no need to run the update tool. If you want to make an integrity check on your files make sure you uploaded the correct update files.',
-	'NO_UPDATE_INFO'				=> 'Update file information could not be found.',
-	'NO_UPDATES_REQUIRED'			=> 'No updates required',
-	'NO_VISIBLE_CHANGES'			=> 'No visible changes',
-	'NOTICE'						=> 'Notice',
-	'NUM_CONFLICTS'					=> 'Number of conflicts',
-	'NUMBER_OF_FILES_COLLECTED'		=> 'Currently differences of %1$d of %2$d files have been checked.<br />Please wait until all files are checked.',
-
-	'OLD_UPDATE_FILES'		=> 'Update files are out of date. The update files found are for updating from phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.',
-
-	'PACKAGE_UPDATES_TO'				=> 'Current package updates to version',
-	'PERFORM_DATABASE_UPDATE'			=> 'Perform database update',
-	'PERFORM_DATABASE_UPDATE_EXPLAIN'	=> 'Below you will find a button to the database update script. The database update can take a while, so please do not stop the execution if it seems to hang. After the database update has been performed just follow the instructions to continue the update process.',
-	'PREVIOUS_VERSION'					=> 'Previous version',
-	'PROGRESS'							=> 'Progress',
-
-	'RESULT'					=> 'Result',
-	'RUN_DATABASE_SCRIPT'		=> 'Update my database now',
-
-	'SELECT_DIFF_MODE'			=> 'Select diff mode',
-	'SELECT_DOWNLOAD_FORMAT'	=> 'Select download archive format',
-	'SHOW_DIFF_CONFLICT'		=> 'Show differences/conflicts',
-	'SHOW_DIFF_FINAL'			=> 'Show resulting file',
-	'SHOW_DIFF_MODIFIED'		=> 'Show merged differences',
-	'SHOW_DIFF_NEW'				=> 'Show file contents',
-	'SHOW_DIFF_NEW_CONFLICT'	=> 'Show differences',
-	'SHOW_DIFF_NOT_MODIFIED'	=> 'Show differences',
-	'SOME_QUERIES_FAILED'		=> 'Some queries failed, the statements and errors are listing below.',
-	'SQL'						=> 'SQL',
-	'SQL_FAILURE_EXPLAIN'		=> 'This is probably nothing to worry about, update will continue. Should this fail to complete you may need to seek help at our support forums. See <a href="../docs/README.html">README</a> for details on how to obtain advice.',
-	'STAGE_FILE_CHECK'			=> 'Check files',
-	'STAGE_UPDATE_DB'			=> 'Update database',
-	'STAGE_UPDATE_FILES'		=> 'Update files',
-	'STAGE_VERSION_CHECK'		=> 'Version check',
-	'STATUS_CONFLICT'			=> 'Modified file producing conflicts',
-	'STATUS_MODIFIED'			=> 'Modified file',
-	'STATUS_NEW'				=> 'New file',
-	'STATUS_NEW_CONFLICT'		=> 'Conflicting new file',
-	'STATUS_NOT_MODIFIED'		=> 'Not modified file',
-	'STATUS_UP_TO_DATE'			=> 'Already updated file',
-
-	'TOGGLE_DISPLAY'			=> 'View/Hide file list',
-
-	'UPDATE_COMPLETED'				=> 'Update completed',
-	'UPDATE_DATABASE'				=> 'Update database',
-	'UPDATE_DATABASE_EXPLAIN'		=> 'Within the next step the database will be updated.',
-	'UPDATE_DATABASE_SCHEMA'		=> 'Updating database schema',
-	'UPDATE_FILES_NOTICE'			=> 'Please make sure you have updated your board files too, this file is only updating your database.',
-	'UPDATE_INSTALLATION'			=> 'Update phpBB installation',
-	'UPDATE_INSTALLATION_EXPLAIN'	=> 'With this option, it is possible to update your phpBB installation to the latest version.<br />During the process all of your files will be checked for their integrity. You are able to review all differences and files before the update.<br /><br />The file update itself can be done in two different ways.</p><h2>Manual Update</h2><p>With this update you only download your personal set of changed files to make sure you do not lose your file modifications you may have done. After you downloaded this package you need to manually upload the files to their correct position under your phpBB root directory. Once done, you are able to do the file check stage again to see if you moved the files to their correct location.</p><h2>Automatic Update with FTP</h2><p>This method is similar to the first one but without the need to download the changed files and uploading them on your own. This will be done for you. In order to use this method you need to know your FTP login details since you will be asked for them. Once finished you will be redirected to the file check again to make sure everything got updated correctly.<br /><br />',
-	'UPDATE_INSTRUCTIONS'			=> '
-
-		<h1>Release announcement</h1>
-
-		<p>Please read <a href="%1$s" title="%1$s"><strong>the release announcement for the latest version</strong></a> before you continue your update process, it may contain useful information. It also contains full download links as well as the change log.</p>
-
-		<br />
-
-		<h1>How to update your installation with the Automatic Update Package</h1>
-
-		<p>The recommended way of updating your installation listed here is only valid for the automatic update package. You are also able to update your installation using the methods listed within the INSTALL.html document. The steps for updating phpBB3 automatically are:</p>
-
-		<ul style="margin-left: 20px; font-size: 1.1em;">
-			<li>Go to the <a href="http://www.phpbb.com/downloads/" title="http://www.phpbb.com/downloads/">phpBB.com downloads page</a> and download the "Automatic Update Package" archive.<br /><br /></li>
-			<li>Unpack the archive.<br /><br /></li>
-			<li>Upload the complete uncompressed install folder to your phpBB root directory (where your config.php file is).<br /><br /></li>
-		</ul>
-
-		<p>Once uploaded your board will be offline for normal users due to the install directory you uploaded now present.<br /><br />
-		<strong><a href="%2$s" title="%2$s">Now start the update process by pointing your browser to the install folder</a>.</strong><br />
-		<br />
-		You will then be guided through the update process. You will be notified once the update is complete.
-		</p>
-	',
-	'UPDATE_INSTRUCTIONS_INCOMPLETE'	=> '
-
-		<h1>Incomplete update detected</h1>
-
-		<p>phpBB detected an incomplete automatic update. Please make sure you followed every step within the automatic update tool. Below you will find the link again, or go directly to your install directory.</p>
-	',
-	'UPDATE_METHOD'					=> 'Update method',
-	'UPDATE_REQUIRES_FILE'			=> 'The updater requires that the following file is present: %s',
-	'UPDATE_SUCCESS_EXPLAIN'		=> 'Successfully updated all files. The next step involves checking all files again to make sure the files got updated correctly.',
-	'UPDATE_VERSION_OPTIMIZE'		=> 'Updating version and optimising tables',
-	'UPDATING_DATA'					=> 'Updating data',
-	'UPDATING_TO_LATEST_STABLE'		=> 'Updating database to latest stable release',
-	'UPDATED_VERSION'				=> 'Updated version',
-	'UPLOAD_METHOD'					=> 'Upload method',
-
-	'UPDATE_DB_SUCCESS'				=> 'Database update was successful.',
-	'USER_ACTIVE'					=> 'Active user',
-	'USER_INACTIVE'					=> 'Inactive user',
-
-	'VERSION_CHECK'				=> 'Version check',
-	'VERSION_CHECK_EXPLAIN'		=> 'Checks to see if the version of phpBB you are currently running is up to date.',
-	'VERSION_NOT_UP_TO_DATE'	=> 'Your version of phpBB is not up to date. Please continue the update process.',
-	'VERSION_NOT_UP_TO_DATE_ACP'=> 'Your version of phpBB is not up to date.<br />Below you will find a link to the release announcement for the latest version as well as instructions on how to perform the update.',
-	'VERSION_UP_TO_DATE'		=> 'Your installation is up to date, no updates are available for your version of phpBB. You may want to continue anyway to perform a file validity check.',
-	'VERSION_UP_TO_DATE_ACP'	=> 'Your installation is up to date, no updates are available for your version of phpBB. You do not need to update your installation.',
-	'VIEWING_FILE_CONTENTS'		=> 'Viewing file contents',
-	'VIEWING_FILE_DIFF'			=> 'Viewing file differences',
-
-	'WRONG_INFO_FILE_FORMAT'	=> 'Wrong info file format',
-));
-
-// Default database schema entries...
-$lang = array_merge($lang, array(
-	'CONFIG_BOARD_EMAIL_SIG'		=> 'Thanks, The Management',
-	'CONFIG_SITE_DESC'				=> 'A short text to describe your forum',
-	'CONFIG_SITENAME'				=> 'yourdomain.com',
-
-	'DEFAULT_INSTALL_POST'			=> 'This is an example post in your phpBB3 installation. Everything seems to be working. You may delete this post if you like and continue to set up your board. During the installation process your first category and your first forum are assigned an appropriate set of permissions for the predefined usergroups administrators, bots, global moderators, guests, registered users and registered COPPA users. If you also choose to delete your first category and your first forum, do not forget to assign permissions for all these usergroups for all new categories and forums you create. It is recommended to rename your first category and your first forum and copy permissions from these while creating new categories and forums. Have fun!',
-
-	'EXT_GROUP_ARCHIVES'			=> 'Archives',
-	'EXT_GROUP_DOCUMENTS'			=> 'Documents',
-	'EXT_GROUP_DOWNLOADABLE_FILES'	=> 'Downloadable Files',
-	'EXT_GROUP_FLASH_FILES'			=> 'Flash Files',
-	'EXT_GROUP_IMAGES'				=> 'Images',
-	'EXT_GROUP_PLAIN_TEXT'			=> 'Plain Text',
-	'EXT_GROUP_QUICKTIME_MEDIA'		=> 'Quicktime Media',
-	'EXT_GROUP_REAL_MEDIA'			=> 'Real Media',
-	'EXT_GROUP_WINDOWS_MEDIA'		=> 'Windows Media',
-
-	'FORUMS_FIRST_CATEGORY'			=> 'Your first category',
-	'FORUMS_TEST_FORUM_DESC'		=> 'Description of your first forum.',
-	'FORUMS_TEST_FORUM_TITLE'		=> 'Your first forum',
-
-	'RANKS_SITE_ADMIN_TITLE'		=> 'Site Admin',
-	'REPORT_WAREZ'					=> 'The post contains links to illegal or pirated software.',
-	'REPORT_SPAM'					=> 'The reported post has the only purpose to advertise for a website or another product.',
-	'REPORT_OFF_TOPIC'				=> 'The reported post is off topic.',
-	'REPORT_OTHER'					=> 'The reported post does not fit into any other category, please use the further information field.',
-
-	'SMILIES_ARROW'					=> 'Arrow',
-	'SMILIES_CONFUSED'				=> 'Confused',
-	'SMILIES_COOL'					=> 'Cool',
-	'SMILIES_CRYING'				=> 'Crying or Very Sad',
-	'SMILIES_EMARRASSED'			=> 'Embarrassed',
-	'SMILIES_EVIL'					=> 'Evil or Very Mad',
-	'SMILIES_EXCLAMATION'			=> 'Exclamation',
-	'SMILIES_GEEK'					=> 'Geek',
-	'SMILIES_IDEA'					=> 'Idea',
-	'SMILIES_LAUGHING'				=> 'Laughing',
-	'SMILIES_MAD'					=> 'Mad',
-	'SMILIES_MR_GREEN'				=> 'Mr. Green',
-	'SMILIES_NEUTRAL'				=> 'Neutral',
-	'SMILIES_QUESTION'				=> 'Question',
-	'SMILIES_RAZZ'					=> 'Razz',
-	'SMILIES_ROLLING_EYES'			=> 'Rolling Eyes',
-	'SMILIES_SAD'					=> 'Sad',
-	'SMILIES_SHOCKED'				=> 'Shocked',
-	'SMILIES_SMILE'					=> 'Smile',
-	'SMILIES_SURPRISED'				=> 'Surprised',
-	'SMILIES_TWISTED_EVIL'			=> 'Twisted Evil',
-	'SMILIES_UBER_GEEK'				=> 'Uber Geek',
-	'SMILIES_VERY_HAPPY'			=> 'Very Happy',
-	'SMILIES_WINK'					=> 'Wink',
-
-	'TOPICS_TOPIC_TITLE'			=> 'Welcome to phpBB3',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/iso.txt b/phpBB/language/en/iso.txt
deleted file mode 100644
index c421dd4316..0000000000
--- a/phpBB/language/en/iso.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-British English
-British English
-phpBB Group
-\ No newline at end of file
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
deleted file mode 100644
index 93b694be77..0000000000
--- a/phpBB/language/en/mcp.php
+++ /dev/null
@@ -1,376 +0,0 @@
-<?php
-/**
-*
-* mcp [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-$lang = array_merge($lang, array(
-	'ACTION'				=> 'Action',
-	'ACTION_NOTE'			=> 'Action/Note',
-	'ADD_FEEDBACK'			=> 'Add feedback',
-	'ADD_FEEDBACK_EXPLAIN'	=> 'If you would like to add a report on this please fill out the following form. Only use plain text; HTML, BBCode, etc. are not permitted.',
-	'ADD_WARNING'			=> 'Add warning',
-	'ADD_WARNING_EXPLAIN'	=> 'To send a warning to this user please fill out the following form. Only use plain text; HTML, BBCode, etc. are not permitted.',
-	'ALL_ENTRIES'			=> 'All entries',
-	'ALL_NOTES_DELETED'		=> 'Successfully removed all user notes.',
-	'ALL_REPORTS'			=> 'All reports',
-	'ALREADY_REPORTED'		=> 'This post has already been reported.',
-	'ALREADY_WARNED'		=> 'A warning has already been issued for this post.',
-	'APPROVE'				=> 'Approve',
-	'APPROVE_POST'			=> 'Approve post',
-	'APPROVE_POST_CONFIRM'	=> 'Are you sure you want to approve this post?',
-	'APPROVE_POSTS'			=> 'Approve posts',
-	'APPROVE_POSTS_CONFIRM'	=> 'Are you sure you want to approve the selected posts?',
-
-	'CANNOT_MOVE_SAME_FORUM'=> 'You cannot move a topic to the forum it’s already in.',
-	'CANNOT_WARN_ANONYMOUS'	=> 'You cannot warn unregistered guest users.',
-	'CANNOT_WARN_SELF'		=> 'You cannot warn yourself.',
-	'CAN_LEAVE_BLANK'		=> 'This can be left blank.',
-	'CHANGE_POSTER'			=> 'Change poster',
-	'CLOSE_REPORT'			=> 'Close report',
-	'CLOSE_REPORT_CONFIRM'	=> 'Are you sure you want to close the selected report?',
-	'CLOSE_REPORTS'			=> 'Close reports',
-	'CLOSE_REPORTS_CONFIRM'	=> 'Are you sure you want to close the selected reports?',
-
-	'DELETE_POSTS'				=> 'Delete posts',
-	'DELETE_POSTS_CONFIRM'		=> 'Are you sure you want to delete these posts?',
-	'DELETE_POST_CONFIRM'		=> 'Are you sure you want to delete this post?',
-	'DELETE_REPORT'				=> 'Delete report',
-	'DELETE_REPORT_CONFIRM'		=> 'Are you sure you want to delete the selected report?',
-	'DELETE_REPORTS'			=> 'Delete reports',
-	'DELETE_REPORTS_CONFIRM'	=> 'Are you sure you want to delete the selected reports?',
-	'DELETE_SHADOW_TOPIC'		=> 'Delete shadow topic',
-	'DELETE_TOPICS'				=> 'Delete selected topics',
-	'DELETE_TOPICS_CONFIRM'		=> 'Are you sure you want to delete these topics?',
-	'DELETE_TOPIC_CONFIRM'		=> 'Are you sure you want to delete this topic?',
-	'DISAPPROVE'				=> 'Disapprove',
-	'DISAPPROVE_REASON'			=> 'Reason for disapproval',
-	'DISAPPROVE_POST'			=> 'Disapprove post',
-	'DISAPPROVE_POST_CONFIRM'	=> 'Are you sure you want to disapprove this post?',
-	'DISAPPROVE_POSTS'			=> 'Disapprove posts',
-	'DISAPPROVE_POSTS_CONFIRM'	=> 'Are you sure you want to disapprove the selected posts?',
-	'DISPLAY_LOG'				=> 'Display entries from previous',
-	'DISPLAY_OPTIONS'			=> 'Display options',
-
-	'EMPTY_REPORT'					=> 'You must enter a description when selecting this reason.',
-	'EMPTY_TOPICS_REMOVED_WARNING'	=> 'Please note that one or several topics have been removed from the database because they were or become empty.',
-
-	'FEEDBACK'				=> 'Feedback',
-	'FORK'					=> 'Copy',
-	'FORK_TOPIC'			=> 'Copy topic',
-	'FORK_TOPIC_CONFIRM'	=> 'Are you sure you want to copy this topic?',
-	'FORK_TOPICS'			=> 'Copy selected topics',
-	'FORK_TOPICS_CONFIRM'	=> 'Are you sure you want to copy the selected topics?',
-	'FORUM_DESC'			=> 'Description',
-	'FORUM_NAME'			=> 'Forum name',
-	'FORUM_NOT_EXIST'		=> 'The forum you selected does not exist.',
-	'FORUM_NOT_POSTABLE'	=> 'The forum you selected cannot be posted to.',
-	'FORUM_STATUS'			=> 'Forum status',
-	'FORUM_STYLE'			=> 'Forum style',
-
-	'GLOBAL_ANNOUNCEMENT'	=> 'Global announcement',
-
-	'IP_INFO'				=> 'IP address information',
-	'IPS_POSTED_FROM'		=> 'IP addresses this user has posted from',
-
-	'LATEST_LOGS'				=> 'Latest 5 logged actions',
-	'LATEST_REPORTED'			=> 'Latest 5 reports',
-	'LATEST_UNAPPROVED'			=> 'Latest 5 posts awaiting approval',
-	'LATEST_WARNING_TIME'		=> 'Latest warning issued',
-	'LATEST_WARNINGS'			=> 'Latest 5 warnings',
-	'LEAVE_SHADOW'				=> 'Leave shadow topic in place',
-	'LIST_REPORT'				=> '1 report',
-	'LIST_REPORTS'				=> '%d reports',
-	'LOCK'						=> 'Lock',
-	'LOCK_POST_POST'			=> 'Lock post',
-	'LOCK_POST_POST_CONFIRM'	=> 'Are you sure you want to prevent editing this post?',
-	'LOCK_POST_POSTS'			=> 'Lock selected posts',
-	'LOCK_POST_POSTS_CONFIRM'	=> 'Are you sure you want to prevent editing the selected posts?',
-	'LOCK_TOPIC_CONFIRM'		=> 'Are you sure you want to lock this topic?',
-	'LOCK_TOPICS'				=> 'Lock selected topics',
-	'LOCK_TOPICS_CONFIRM'		=> 'Are you sure you want to lock all selected topics?',
-	'LOGS_CURRENT_TOPIC'		=> 'Currently viewing logs of:',
-	'LOGIN_EXPLAIN_MCP'			=> 'To moderate this forum you must login.',
-	'LOGVIEW_VIEWTOPIC'			=> 'View topic',
-	'LOGVIEW_VIEWLOGS'			=> 'View topic log',
-	'LOGVIEW_VIEWFORUM'			=> 'View forum',
-	'LOOKUP_ALL'				=> 'Look up all IPs',
-	'LOOKUP_IP'					=> 'Look up IP',
-
-	'MARKED_NOTES_DELETED'		=> 'Successfully removed all marked user notes.',
-
-	'MCP_ADD'						=> 'Add a warning',
-
-	'MCP_BAN'					=> 'Banning',
-	'MCP_BAN_EMAILS'			=> 'Ban e-mails',
-	'MCP_BAN_IPS'				=> 'Ban IPs',
-	'MCP_BAN_USERNAMES'			=> 'Ban Usernames',
-
-	'MCP_LOGS'						=> 'Moderator logs',
-	'MCP_LOGS_FRONT'				=> 'Front page',
-	'MCP_LOGS_FORUM_VIEW'			=> 'Forum logs',
-	'MCP_LOGS_TOPIC_VIEW'			=> 'Topic logs',
-
-	'MCP_MAIN'						=> 'Main',
-	'MCP_MAIN_FORUM_VIEW'			=> 'View forum',
-	'MCP_MAIN_FRONT'				=> 'Front page',
-	'MCP_MAIN_POST_DETAILS'			=> 'Post details',
-	'MCP_MAIN_TOPIC_VIEW'			=> 'View topic',
-	'MCP_MAKE_ANNOUNCEMENT'			=> 'Modify to “Announcement”',
-	'MCP_MAKE_ANNOUNCEMENT_CONFIRM'	=> 'Are you sure you want to change this topic to an “Announcement”?',
-	'MCP_MAKE_ANNOUNCEMENTS'		=> 'Modify to “Announcements”',
-	'MCP_MAKE_ANNOUNCEMENTS_CONFIRM'=> 'Are you sure you want to change the selected topics to “Announcements”?',
-	'MCP_MAKE_GLOBAL'				=> 'Modify to “Global announcement”',
-	'MCP_MAKE_GLOBAL_CONFIRM'		=> 'Are you sure you want to change this topic to a “Global announcement”?',
-	'MCP_MAKE_GLOBALS'				=> 'Modify to “Global announcements”',
-	'MCP_MAKE_GLOBALS_CONFIRM'		=> 'Are you sure you want to change the selected topics to “Global announcements”?',
-	'MCP_MAKE_STICKY'				=> 'Modify to “Sticky”',
-	'MCP_MAKE_STICKY_CONFIRM'		=> 'Are you sure you want to change this topic to a “Sticky”?',
-	'MCP_MAKE_STICKIES'				=> 'Modify to “Stickies”',
-	'MCP_MAKE_STICKIES_CONFIRM'		=> 'Are you sure you want to change the selected topics to “Stickies”?',
-	'MCP_MAKE_NORMAL'				=> 'Modify to “Standard Topic”',
-	'MCP_MAKE_NORMAL_CONFIRM'		=> 'Are you sure you want to change this topic to a “Standard Topic”?',
-	'MCP_MAKE_NORMALS'				=> 'Modify to “Standard Topics”',
-	'MCP_MAKE_NORMALS_CONFIRM'		=> 'Are you sure you want to change the selected topics to “Standard Topics”?',
-
-	'MCP_NOTES'						=> 'User notes',
-	'MCP_NOTES_FRONT'				=> 'Front page',
-	'MCP_NOTES_USER'				=> 'User details',
-
-	'MCP_POST_REPORTS'				=> 'Reports issued on this post',
-
-	'MCP_REPORTS'					=> 'Reported posts',
-	'MCP_REPORT_DETAILS'			=> 'Report details',
-	'MCP_REPORTS_CLOSED'			=> 'Closed reports',
-	'MCP_REPORTS_CLOSED_EXPLAIN'	=> 'This is a list of all reports about posts which have previously been resolved.',
-	'MCP_REPORTS_OPEN'				=> 'Open reports',
-	'MCP_REPORTS_OPEN_EXPLAIN'		=> 'This is a list of all reported posts which are still to be handled.',
-
-	'MCP_QUEUE'								=> 'Moderation queue',
-	'MCP_QUEUE_APPROVE_DETAILS'				=> 'Approve details',
-	'MCP_QUEUE_UNAPPROVED_POSTS'			=> 'Posts awaiting approval',
-	'MCP_QUEUE_UNAPPROVED_POSTS_EXPLAIN'	=> 'This is a list of all posts which require approving before they will be visible to users.',
-	'MCP_QUEUE_UNAPPROVED_TOPICS'			=> 'Topics awaiting approval',
-	'MCP_QUEUE_UNAPPROVED_TOPICS_EXPLAIN'	=> 'This is a list of all topics which require approving before they will be visible to users.',
-
-	'MCP_VIEW_USER'			=> 'View warnings for a specific user',
-
-	'MCP_WARN'				=> 'Warnings',
-	'MCP_WARN_FRONT'		=> 'Front page',
-	'MCP_WARN_LIST'			=> 'List warnings',
-	'MCP_WARN_POST'			=> 'Warn for specific post',
-	'MCP_WARN_USER'			=> 'Warn user',
-
-	'MERGE_POSTS'			=> 'Merge posts',
-	'MERGE_POSTS_CONFIRM'	=> 'Are you sure you want to merge the selected posts?',
-	'MERGE_TOPIC_EXPLAIN'	=> 'Using the form below you can merge selected posts into another topic. These posts will not be reordered and will appear as if the users posted them to the new topic.<br />Please enter the destination topic id or click on “Select topic” to search for one.',
-	'MERGE_TOPIC_ID'		=> 'Destination topic identification number',
-	'MERGE_TOPICS'			=> 'Merge topics',
-	'MERGE_TOPICS_CONFIRM'	=> 'Are you sure you want to merge the selected topics?',
-	'MODERATE_FORUM'		=> 'Moderate forum',
-	'MODERATE_TOPIC'		=> 'Moderate topic',
-	'MODERATE_POST'			=> 'Moderate post',
-	'MOD_OPTIONS'			=> 'Moderator options',
-	'MORE_INFO'				=> 'Further information',
-	'MOST_WARNINGS'			=> 'Users with most warnings',
-	'MOVE_TOPIC_CONFIRM'	=> 'Are you sure you want to move the topic into a new forum?',
-	'MOVE_TOPICS'			=> 'Move selected topics',
-	'MOVE_TOPICS_CONFIRM'	=> 'Are you sure you want to move the selected topics into a new forum?',
-
-	'NOTIFY_POSTER_APPROVAL'		=> 'Notify poster about approval?',
-	'NOTIFY_POSTER_DISAPPROVAL'		=> 'Notify poster about disapproval?',
-	'NOTIFY_USER_WARN'				=> 'Notify user about warning?',
-	'NOT_MODERATOR'					=> 'You are not a moderator of this forum.',
-	'NO_DESTINATION_FORUM'			=> 'Please select a forum for destination.',
-	'NO_DESTINATION_FORUM_FOUND'	=> 'There is no destination forum available.',
-	'NO_ENTRIES'					=> 'No log entries for this period.',
-	'NO_FEEDBACK'					=> 'No feedback exists for this user.',
-	'NO_FINAL_TOPIC_SELECTED'		=> 'You have to select a destination topic for merging posts.',
-	'NO_MATCHES_FOUND'				=> 'No matches found.',
-	'NO_POST'						=> 'You have to select a post in order to warn the user for a post.',
-	'NO_POST_REPORT'				=> 'This post was not reported.',
-	'NO_POST_SELECTED'				=> 'You must select at least one post to perform this action.',
-	'NO_REASON_DISAPPROVAL'			=> 'Please give an appropriate reason for disapproval.',
-	'NO_REPORT'						=> 'No report found',
-	'NO_REPORTS'					=> 'No reports found',
-	'NO_REPORT_SELECTED'			=> 'You must select at least one report to perform this action.',
-	'NO_TOPIC_ICON'					=> 'None',
-	'NO_TOPIC_SELECTED'				=> 'You must select at least one topic to perform this action.',
-	'NO_TOPICS_QUEUE'				=> 'There are no topics waiting for approval.',
-
-	'ONLY_TOPIC'			=> 'Only topic “%s”',
-	'OTHER_USERS'			=> 'Other users posting from this IP',
-
-	'POSTER'					=> 'Poster',
-	'POSTS_APPROVED_SUCCESS'	=> 'The selected posts have been approved.',
-	'POSTS_DELETED_SUCCESS'		=> 'The selected posts have been successfully removed from the database.',
-	'POSTS_DISAPPROVED_SUCCESS'	=> 'The selected posts have been disapproved.',
-	'POSTS_LOCKED_SUCCESS'		=> 'The selected posts have been locked successfully.',
-	'POSTS_MERGED_SUCCESS'		=> 'The selected posts have been merged.',
-	'POSTS_UNLOCKED_SUCCESS'	=> 'The selected posts have been unlocked successfully.',
-	'POSTS_PER_PAGE'			=> 'Posts per page',
-	'POSTS_PER_PAGE_EXPLAIN'	=> '(Set to 0 to view all posts.)',
-	'POST_APPROVED_SUCCESS'		=> 'The selected post has been approved.',
-	'POST_DELETED_SUCCESS'		=> 'The selected post has been successfully removed from the database.',
-	'POST_DISAPPROVED_SUCCESS'	=> 'The selected post has been disapproved.',
-	'POST_LOCKED_SUCCESS'		=> 'Post locked successfully.',
-	'POST_NOT_EXIST'			=> 'The post you requested does not exist.',
-	'POST_REPORTED_SUCCESS'		=> 'This post has been successfully reported.',
-	'POST_UNLOCKED_SUCCESS'		=> 'Post unlocked successfully.',
-
-	'READ_USERNOTES'			=> 'User notes',
-	'READ_WARNINGS'				=> 'User warnings',
-	'REPORTER'					=> 'Reporter',
-	'REPORTED'					=> 'Reported',
-	'REPORTED_BY'				=> 'Reported by',
-	'REPORTED_ON_DATE'			=> 'on',
-	'REPORTS_CLOSED_SUCCESS'	=> 'The selected reports have been closed successfully.',
-	'REPORTS_DELETED_SUCCESS'	=> 'The selected reports have been deleted successfully.',
-	'REPORTS_TOTAL'				=> 'In total there are <strong>%d</strong> reports to review.',
-	'REPORTS_ZERO_TOTAL'		=> 'There are no reports to review.',
-	'REPORT_CLOSED'				=> 'This report has already been closed.',
-	'REPORT_CLOSED_SUCCESS'		=> 'The selected report has been closed successfully.',
-	'REPORT_DELETED_SUCCESS'	=> 'The selected report has been deleted successfully.',
-	'REPORT_DETAILS'			=> 'Report details',
-	'REPORT_MESSAGE'			=> 'Report this message',
-	'REPORT_MESSAGE_EXPLAIN'	=> 'Use this form to report the selected message. Reporting should generally be used only if the message breaks forum rules.',
-	'REPORT_NOTIFY'				=> 'Notify me',
-	'REPORT_NOTIFY_EXPLAIN'		=> 'Informs you when your report is dealt with.',
-	'REPORT_POST_EXPLAIN'		=> 'Use this form to report the selected post to the forum moderators and board administrators. Reporting should generally be used only if the post breaks forum rules.',
-	'REPORT_REASON'				=> 'Report reason',
-	'REPORT_TIME'				=> 'Report time',
-	'REPORT_TOTAL'				=> 'In total there is <strong>1</strong> report to review.',
-	'RESYNC'					=> 'Resync',
-	'RETURN_MESSAGE'			=> '%sReturn to the message%s',
-	'RETURN_NEW_FORUM'			=> '%sGo to the new forum%s',
-	'RETURN_NEW_TOPIC'			=> '%sGo to the new topic%s',
-	'RETURN_POST'				=> '%sReturn to the post%s',
-	'RETURN_QUEUE'				=> '%sReturn to the queue%s',
-	'RETURN_REPORTS'			=> '%sReturn to the reports%s',
-	'RETURN_TOPIC_SIMPLE'		=> '%sReturn to the topic%s',
-
-	'SEARCH_POSTS_BY_USER'				=> 'Search posts by',
-	'SELECT_ACTION'						=> 'Select desired action',
-	'SELECT_FORUM_GLOBAL_ANNOUNCEMENT'	=> 'Please select the forum you wish this global announcement to be displayed.',
-	'SELECT_FORUM_GLOBAL_ANNOUNCEMENTS'	=> 'One or more of the selected topics are global announcements. Please select the forum you wish these to be displayed.',
-	'SELECT_MERGE'						=> 'Select for merge',
-	'SELECT_TOPICS_FROM'				=> 'Select topics from',
-	'SELECT_TOPIC'						=> 'Select topic',
-	'SELECT_USER'						=> 'Select user',
-	'SORT_ACTION'						=> 'Log action',
-	'SORT_DATE'							=> 'Date',
-	'SORT_IP'							=> 'IP address',
-	'SORT_WARNINGS'						=> 'Warnings',
-	'SPLIT_AFTER'						=> 'Split topic from selected post onwards',
-	'SPLIT_FORUM'						=> 'Forum for new topic',
-	'SPLIT_POSTS'						=> 'Split selected posts',
-	'SPLIT_SUBJECT'						=> 'New topic title',
-	'SPLIT_TOPIC_ALL'					=> 'Split topic from selected posts',
-	'SPLIT_TOPIC_ALL_CONFIRM'			=> 'Are you sure you want to split this topic?',
-	'SPLIT_TOPIC_BEYOND'				=> 'Split topic at selected post',
-	'SPLIT_TOPIC_BEYOND_CONFIRM'		=> 'Are you sure you want to split this topic at the selected post?',
-	'SPLIT_TOPIC_EXPLAIN'				=> 'Using the form below you can split a topic in two, either by selecting the posts individually or by splitting at a selected post.',
-
-	'THIS_POST_IP'				=> 'IP for this post',
-	'TOPICS_APPROVED_SUCCESS'	=> 'The selected topics have been approved.',
-	'TOPICS_DELETED_SUCCESS'	=> 'The selected topics have been successfully removed from the database.',
-	'TOPICS_DISAPPROVED_SUCCESS'=> 'The selected topics have been disapproved.',
-	'TOPICS_FORKED_SUCCESS'		=> 'The selected topics have been copied successfully.',
-	'TOPICS_LOCKED_SUCCESS'		=> 'The selected topics have been locked.',
-	'TOPICS_MOVED_SUCCESS'		=> 'The selected topics have been moved successfully.',
-	'TOPICS_RESYNC_SUCCESS'		=> 'The selected topics have been resynchronised.',
-	'TOPICS_TYPE_CHANGED'		=> 'Topic types changed successfully.',
-	'TOPICS_UNLOCKED_SUCCESS'	=> 'The selected topics have been unlocked.',
-	'TOPIC_APPROVED_SUCCESS'	=> 'The selected topic has been approved.',
-	'TOPIC_DELETED_SUCCESS'		=> 'The selected topic has been successfully removed from the database.',
-	'TOPIC_DISAPPROVED_SUCCESS'	=> 'The selected topic has been disapproved.',
-	'TOPIC_FORKED_SUCCESS'		=> 'The selected topic has been copied successfully.',
-	'TOPIC_LOCKED_SUCCESS'		=> 'The selected topic has been locked.',
-	'TOPIC_MOVED_SUCCESS'		=> 'The selected topic has been moved successfully.',
-	'TOPIC_NOT_EXIST'			=> 'The topic you selected does not exist.',
-	'TOPIC_RESYNC_SUCCESS'		=> 'The selected topic has been resynchronised.',
-	'TOPIC_SPLIT_SUCCESS'		=> 'The selected topic has been split successfully.',
-	'TOPIC_TIME'				=> 'Topic time',
-	'TOPIC_TYPE_CHANGED'		=> 'Topic type changed successfully.',
-	'TOPIC_UNLOCKED_SUCCESS'	=> 'The selected topic has been unlocked.',
-	'TOTAL_WARNINGS'			=> 'Total Warnings',
-
-	'UNAPPROVED_POSTS_TOTAL'		=> 'In total there are <strong>%d</strong> posts waiting for approval.',
-	'UNAPPROVED_POSTS_ZERO_TOTAL'	=> 'There are no posts waiting for approval.',
-	'UNAPPROVED_POST_TOTAL'			=> 'In total there is <strong>1</strong> post waiting for approval.',
-	'UNLOCK'						=> 'Unlock',
-	'UNLOCK_POST'					=> 'Unlock post',
-	'UNLOCK_POST_EXPLAIN'			=> 'Allow editing',
-	'UNLOCK_POST_POST'				=> 'Unlock post',
-	'UNLOCK_POST_POST_CONFIRM'		=> 'Are you sure you want to allow editing this post?',
-	'UNLOCK_POST_POSTS'				=> 'Unlock selected posts',
-	'UNLOCK_POST_POSTS_CONFIRM'		=> 'Are you sure you want to allow editing the selected posts?',
-	'UNLOCK_TOPIC'					=> 'Unlock topic',
-	'UNLOCK_TOPIC_CONFIRM'			=> 'Are you sure you want to unlock this topic?',
-	'UNLOCK_TOPICS'					=> 'Unlock selected topics',
-	'UNLOCK_TOPICS_CONFIRM'			=> 'Are you sure you want to unlock all selected topics?',
-	'USER_CANNOT_POST'				=> 'You cannot post in this forum.',
-	'USER_CANNOT_REPORT'			=> 'You cannot report posts in this forum.',
-	'USER_FEEDBACK_ADDED'			=> 'User feedback added successfully.',
-	'USER_WARNING_ADDED'			=> 'User warned successfully.',
-
-	'VIEW_DETAILS'			=> 'View details',
-	'VIEW_POST'				=> 'View post',
-
-	'WARNED_USERS'			=> 'Warned users',
-	'WARNED_USERS_EXPLAIN'	=> 'This is a list of users with unexpired warnings issued to them.',
-	'WARNING_PM_BODY'		=> 'The following is a warning which has been issued to you by an administrator or moderator of this site.[quote]%s[/quote]',
-	'WARNING_PM_SUBJECT'	=> 'Board warning issued',
-	'WARNING_POST_DEFAULT'	=> 'This is a warning regarding the following post made by you: %s .',
-	'WARNINGS_ZERO_TOTAL'	=> 'No warnings exist.',
-
-	'YOU_SELECTED_TOPIC'	=> 'You selected topic number %d: %s.',
-
-	'report_reasons'		=> array(
-		'TITLE'	=> array(
-			'WAREZ'		=> 'Warez',
-			'SPAM'		=> 'Spam',
-			'OFF_TOPIC'	=> 'Off-topic',
-			'OTHER'		=> 'Other',
-		),
-		'DESCRIPTION' => array(
-			'WAREZ'		=> 'The post contains links to illegal or pirated software.',
-			'SPAM'		=> 'The reported post has the only purpose to advertise for a website or another product.',
-			'OFF_TOPIC'	=> 'The reported post is off topic.',
-			'OTHER'		=> 'The reported post does not fit into any other category, please use the further information field.',
-		)
-	),
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
deleted file mode 100644
index b5b8434776..0000000000
--- a/phpBB/language/en/memberlist.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/**
-*
-* memberlist [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-$lang = array_merge($lang, array(
-	'ABOUT_USER'			=> 'Profile',
-	'ACTIVE_IN_FORUM'		=> 'Most active forum',
-	'ACTIVE_IN_TOPIC'		=> 'Most active topic',
-	'ADD_FOE'				=> 'Add foe',
-	'ADD_FRIEND'			=> 'Add friend',
-	'AFTER'					=> 'After',
-
-	'ALL'					=> 'All',
-
-	'BEFORE'				=> 'Before',
-
-	'CC_EMAIL'				=> 'Send a copy of this e-mail to yourself.',
-	'CONTACT_USER'			=> 'Contact',
-
-	'DEST_LANG'				=> 'Language',
-	'DEST_LANG_EXPLAIN'		=> 'Select an appropriate language (if available) for the recipient of this message.',
-
-	'EMAIL_BODY_EXPLAIN'	=> 'This message will be sent as plain text, do not include any HTML or BBCode. The return address for this message will be set to your e-mail address.',
-	'EMAIL_DISABLED'		=> 'Sorry but all e-mail related functions have been disabled.',
-	'EMAIL_SENT'			=> 'The e-mail has been sent.',
-	'EMAIL_TOPIC_EXPLAIN'	=> 'This message will be sent as plain text, do not include any HTML or BBCode. Please note that the topic information is already included in the message. The return address for this message will be set to your e-mail address.',
-	'EMPTY_ADDRESS_EMAIL'	=> 'You must provide a valid e-mail address for the recipient.',
-	'EMPTY_MESSAGE_EMAIL'	=> 'You must enter a message to be emailed.',
-	'EMPTY_MESSAGE_IM'		=> 'You must enter a message to be send.',
-	'EMPTY_NAME_EMAIL'		=> 'You must enter the real name of the recipient.',
-	'EMPTY_SUBJECT_EMAIL'	=> 'You must specify a subject for the e-mail.',
-	'EQUAL_TO'				=> 'Equal to',
-
-	'FIND_USERNAME_EXPLAIN'	=> 'Use this form to search for specific members. You do not need to fill out all fields. To match partial data use * as a wildcard. When entering dates use the format <kbd>YYYY-MM-DD</kbd>, e.g. <samp>2004-02-29</samp>. Use the mark checkboxes to select one or more usernames (several usernames may be accepted depending on the form itself) and click the Select Marked button to return to the previous form.',
-	'FLOOD_EMAIL_LIMIT'		=> 'You cannot send another e-mail at this time. Please try again later.',
-
-	'GROUP_LEADER'			=> 'Group leader',
-
-	'HIDE_MEMBER_SEARCH'	=> 'Hide member search',
-
-	'IM_ADD_CONTACT'		=> 'Add Contact',
-	'IM_AIM'				=> 'Please note that you need AOL Instant Messenger installed to use this.',
-	'IM_AIM_EXPRESS'		=> 'AIM Express',
-	'IM_DOWNLOAD_APP'		=> 'Download application',
-	'IM_ICQ'				=> 'Please note that users may have selected to not receive unsolicited instant messages.',
-	'IM_JABBER'				=> 'Please note that users may have selected to not receive unsolicited instant messages.',
-	'IM_JABBER_SUBJECT'		=> 'This is an automated message please do not reply! Message from user %1$s at %2$s.',
-	'IM_MESSAGE'			=> 'Your message',
-	'IM_MSNM'				=> 'Please note that you need Windows Messenger installed to use this.',
-	'IM_MSNM_BROWSER'		=> 'Your browser does not support this.',
-	'IM_MSNM_CONNECT'		=> 'MSNM is not connected.\nYou have to connect to MSNM to continue.',		
-	'IM_NAME'				=> 'Your Name',
-	'IM_NO_DATA'			=> 'There is no suitable contact information for this user.',
-	'IM_NO_JABBER'			=> 'Sorry, direct messaging of Jabber users is not supported on this board. You will need a Jabber client installed on your system to contact the recipient above.',
-	'IM_RECIPIENT'			=> 'Recipient',
-	'IM_SEND'				=> 'Send message',
-	'IM_SEND_MESSAGE'		=> 'Send message',
-	'IM_SENT_JABBER'		=> 'Your message to %1$s has been sent successfully.',
-	'IM_USER'				=> 'Send an instant message',
-	
-	'LAST_ACTIVE'				=> 'Last active',
-	'LESS_THAN'					=> 'Less than',
-	'LIST_USER'					=> '1 user',
-	'LIST_USERS'				=> '%d users',
-	'LOGIN_EXPLAIN_LEADERS'		=> 'The board requires you to be registered and logged in to view the team listing.',
-	'LOGIN_EXPLAIN_MEMBERLIST'	=> 'The board requires you to be registered and logged in to access the memberlist.',
-	'LOGIN_EXPLAIN_SEARCHUSER'	=> 'The board requires you to be registered and logged in to search users.',
-	'LOGIN_EXPLAIN_VIEWPROFILE'	=> 'The board requires you to be registered and logged in to view profiles.',
-
-	'MORE_THAN'				=> 'More than',
-
-	'NO_EMAIL'				=> 'You are not permitted to send e-mail to this user.',
-	'NO_VIEW_USERS'			=> 'You are not authorised to view the member list or profiles.',
-
-	'ORDER'					=> 'Order',
-	'OTHER'					=> 'Other',
-
-	'POST_IP'				=> 'Posted from IP/domain',
-
-	'RANK'					=> 'Rank',
-	'REAL_NAME'				=> 'Recipient name',
-	'RECIPIENT'				=> 'Recipient',
-	'REMOVE_FOE'			=> 'Remove foe',
-	'REMOVE_FRIEND'			=> 'Remove friend',
-
-	'SEARCH_USER_POSTS'		=> 'Search user’s posts',
-	'SELECT_MARKED'			=> 'Select marked',
-	'SELECT_SORT_METHOD'	=> 'Select sort method',
-	'SEND_AIM_MESSAGE'		=> 'Send AIM message',
-	'SEND_ICQ_MESSAGE'		=> 'Send ICQ message',
-	'SEND_IM'				=> 'Instant messaging',
-	'SEND_JABBER_MESSAGE'	=> 'Send Jabber message',
-	'SEND_MESSAGE'			=> 'Message',
-	'SEND_MSNM_MESSAGE'		=> 'Send MSNM/WLM message',
-	'SEND_YIM_MESSAGE'		=> 'Send YIM message',
-	'SORT_EMAIL'			=> 'E-mail',
-	'SORT_LAST_ACTIVE'		=> 'Last active',
-	'SORT_POST_COUNT'		=> 'Post count',
-
-	'USERNAME_BEGINS_WITH'	=> 'Username begins with',
-	'USER_ADMIN'			=> 'Administrate user',
-	'USER_BAN'				=> 'Banning',
-	'USER_FORUM'			=> 'User statistics',
-	'USER_ONLINE'			=> 'Online',
-	'USER_PRESENCE'			=> 'Board presence',
-
-	'VIEWING_PROFILE'		=> 'Viewing profile - %s',
-	'VISITED'				=> 'Last visited',
-
-	'WWW'					=> 'Website',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
deleted file mode 100644
index b3acb7f290..0000000000
--- a/phpBB/language/en/posting.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-/**
-*
-* posting [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-$lang = array_merge($lang, array(
-	'ADD_ATTACHMENT'			=> 'Upload attachment',
-	'ADD_ATTACHMENT_EXPLAIN'	=> 'If you wish to attach one or more files enter the details below.',
-	'ADD_FILE'					=> 'Add the file',
-	'ADD_POLL'					=> 'Poll creation',
-	'ADD_POLL_EXPLAIN'			=> 'If you do not want to add a poll to your topic leave the fields blank.',
-	'ALREADY_DELETED'			=> 'Sorry but this message is already deleted.',
-	'ATTACH_QUOTA_REACHED'		=> 'Sorry, the board attachment quota has been reached.',
-	'ATTACH_SIG'				=> 'Attach a signature (signatures can be altered via the UCP)',
-
-	'BBCODE_A_HELP'				=> 'Inline uploaded attachment: [attachment=]filename.ext[/attachment]',
-	'BBCODE_B_HELP'				=> 'Bold text: [b]text[/b]',
-	'BBCODE_C_HELP'				=> 'Code display: [code]code[/code]',
-	'BBCODE_E_HELP'				=> 'List: Add list element',
-	'BBCODE_F_HELP'				=> 'Font size: [size=85]small text[/size]',
-	'BBCODE_IS_OFF'				=> '%sBBCode%s is <em>OFF</em>',
-	'BBCODE_IS_ON'				=> '%sBBCode%s is <em>ON</em>',
-	'BBCODE_I_HELP'				=> 'Italic text: [i]text[/i]',
-	'BBCODE_L_HELP'				=> 'List: [list]text[/list]',
-	'BBCODE_LISTITEM_HELP'		=> 'List item: [*]text[/*]',
-	'BBCODE_O_HELP'				=> 'Ordered list: [list=]text[/list]',
-	'BBCODE_P_HELP'				=> 'Insert image: [img]http://image_url[/img]',
-	'BBCODE_Q_HELP'				=> 'Quote text: [quote]text[/quote]',
-	'BBCODE_S_HELP'				=> 'Font colour: [color=red]text[/color]  Tip: you can also use color=#FF0000',
-	'BBCODE_U_HELP'				=> 'Underline text: [u]text[/u]',
-	'BBCODE_W_HELP'				=> 'Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]',
-	'BBCODE_D_HELP'				=> 'Flash: [flash=width,height]http://url[/flash]',
-	'BUMP_ERROR'				=> 'You cannot bump this topic so soon after the last post.',
-
-	'CANNOT_DELETE_REPLIED'		=> 'Sorry but you may only delete posts which have not been replied to.',
-	'CANNOT_EDIT_POST_LOCKED'	=> 'This post has been locked. You can no longer edit that post.',
-	'CANNOT_EDIT_TIME'			=> 'You can no longer edit or delete that post.',
-	'CANNOT_POST_ANNOUNCE'		=> 'Sorry but you cannot post announcements.',
-	'CANNOT_POST_STICKY'		=> 'Sorry but you cannot post sticky topics.',
-	'CHANGE_TOPIC_TO'			=> 'Change topic type to',
-	'CLOSE_TAGS'				=> 'Close tags',
-	'CURRENT_TOPIC'				=> 'Current topic',
-
-	'DELETE_FILE'				=> 'Delete file',
-	'DELETE_MESSAGE'			=> 'Delete message',
-	'DELETE_MESSAGE_CONFIRM'	=> 'Are you sure you want to delete this message?',
-	'DELETE_OWN_POSTS'			=> 'Sorry but you can only delete your own posts.',
-	'DELETE_POST_CONFIRM'		=> 'Are you sure you want to delete this post?',
-	'DELETE_POST_WARN'			=> 'Once deleted the post cannot be recovered',
-	'DISABLE_BBCODE'			=> 'Disable BBCode',
-	'DISABLE_MAGIC_URL'			=> 'Do not automatically parse URLs',
-	'DISABLE_SMILIES'			=> 'Disable smilies',
-	'DISALLOWED_CONTENT'		=> 'The upload was rejected because the uploaded file was identified as a possible attack vector.',
-	'DISALLOWED_EXTENSION'		=> 'The extension %s is not allowed.',
-	'DRAFT_LOADED'				=> 'Draft loaded into posting area, you may want to finish your post now.<br />Your draft will be deleted after submitting this post.',
-	'DRAFT_LOADED_PM'			=> 'Draft loaded into message area, you may want to finish your private message now.<br />Your draft will be deleted after submitting this private message.',
-	'DRAFT_SAVED'				=> 'Draft successfully saved.',
-	'DRAFT_TITLE'				=> 'Draft title',
-
-	'EDIT_REASON'				=> 'Reason for editing this post',
-	'EMPTY_FILEUPLOAD'			=> 'The uploaded file is empty.',
-	'EMPTY_MESSAGE'				=> 'You must enter a message when posting.',
-	'EMPTY_REMOTE_DATA'			=> 'File could not be uploaded, please try uploading the file manually.',
-
-	'FLASH_IS_OFF'				=> '[flash] is <em>OFF</em>',
-	'FLASH_IS_ON'				=> '[flash] is <em>ON</em>',
-	'FLOOD_ERROR'				=> 'You cannot make another post so soon after your last.',
-	'FONT_COLOR'				=> 'Font colour',
-	'FONT_COLOR_HIDE'			=> 'Hide font colour',
-	'FONT_HUGE'					=> 'Huge',
-	'FONT_LARGE'				=> 'Large',
-	'FONT_NORMAL'				=> 'Normal',
-	'FONT_SIZE'					=> 'Font size',
-	'FONT_SMALL'				=> 'Small',
-	'FONT_TINY'					=> 'Tiny',
-
-	'GENERAL_UPLOAD_ERROR'		=> 'Could not upload attachment to %s.',
-
-	'IMAGES_ARE_OFF'			=> '[img] is <em>OFF</em>',
-	'IMAGES_ARE_ON'				=> '[img] is <em>ON</em>',
-	'INVALID_FILENAME'			=> '%s is an invalid filename.',
-
-	'LOAD'						=> 'Load',
-	'LOAD_DRAFT'				=> 'Load draft',
-	'LOAD_DRAFT_EXPLAIN'		=> 'Here you are able to select the draft you want to continue writing. Your current post will be cancelled, all current post contents will be deleted. View, edit and delete drafts within your User Control Panel.',
-	'LOGIN_EXPLAIN_BUMP'		=> 'You need to login in order to bump topics within this forum.',
-	'LOGIN_EXPLAIN_DELETE'		=> 'You need to login in order to delete posts within this forum.',
-	'LOGIN_EXPLAIN_POST'		=> 'You need to login in order to post within this forum.',
-	'LOGIN_EXPLAIN_QUOTE'		=> 'You need to login in order to quote posts within this forum.',
-	'LOGIN_EXPLAIN_REPLY'		=> 'You need to login in order to reply to topics within this forum.',
-
-	'MAX_FONT_SIZE_EXCEEDED'	=> 'You may only use fonts up to size %1$d.',
-	'MAX_FLASH_HEIGHT_EXCEEDED'	=> 'Your flash files may only be up to %1$d pixels high.',
-	'MAX_FLASH_WIDTH_EXCEEDED'	=> 'Your flash files may only be up to %1$d pixels wide.',
-	'MAX_IMG_HEIGHT_EXCEEDED'	=> 'Your images may only be up to %1$d pixels high.',
-	'MAX_IMG_WIDTH_EXCEEDED'	=> 'Your images may only be up to %1$d pixels wide.',
-
-	'MESSAGE_BODY_EXPLAIN'		=> 'Enter your message here, it may contain no more than <strong>%d</strong> characters.',
-	'MESSAGE_DELETED'			=> 'This message has been deleted successfully.',
-	'MORE_SMILIES'				=> 'View more smilies',
-
-	'NOTIFY_REPLY'				=> 'Notify me when a reply is posted',
-	'NOT_UPLOADED'				=> 'File could not be uploaded.',
-	'NO_DELETE_POLL_OPTIONS'	=> 'You cannot delete existing poll options.',
-	'NO_PM_ICON'				=> 'No PM icon',
-	'NO_POLL_TITLE'				=> 'You have to enter a poll title.',
-	'NO_POST'					=> 'The requested post does not exist.',
-	'NO_POST_MODE'				=> 'No post mode specified.',
-
-	'PARTIAL_UPLOAD'			=> 'The uploaded file was only partially uploaded.',
-	'PHP_SIZE_NA'				=> 'The attachment’s file size is too large.<br />Could not determine the maximum size defined by PHP in php.ini.',
-	'PHP_SIZE_OVERRUN'			=> 'The attachment’s file size is too large, the maximum upload size is %1$d %2$s.<br />Please note this is set in php.ini and cannot be overridden.',
-	'PLACE_INLINE'				=> 'Place inline',
-	'POLL_DELETE'				=> 'Delete poll',
-	'POLL_FOR'					=> 'Run poll for',
-	'POLL_FOR_EXPLAIN'			=> 'Enter 0 or leave blank for a never ending poll.',
-	'POLL_MAX_OPTIONS'			=> 'Options per user',
-	'POLL_MAX_OPTIONS_EXPLAIN'	=> 'This is the number of options each user may select when voting.',
-	'POLL_OPTIONS'				=> 'Poll options',
-	'POLL_OPTIONS_EXPLAIN'		=> 'Place each option on a new line. You may enter up to <strong>%d</strong> options.',
-	'POLL_OPTIONS_EDIT_EXPLAIN'	=> 'Place each option on a new line. You may enter up to <strong>%d</strong> options. If you remove or add options all previous votes will be reset.',
-	'POLL_QUESTION'				=> 'Poll question',
-	'POLL_TITLE_TOO_LONG'		=> 'The poll title must contain fewer than 100 characters.',
-	'POLL_TITLE_COMP_TOO_LONG'	=> 'The parsed size of your poll title is too large, consider removing BBCodes or smilies.',
-	'POLL_VOTE_CHANGE'			=> 'Allow re-voting',
-	'POLL_VOTE_CHANGE_EXPLAIN'	=> 'If enabled users are able to change their vote.',
-	'POSTED_ATTACHMENTS'		=> 'Posted attachments',
-	'POST_APPROVAL_NOTIFY'		=> 'You will be notified when your post has been approved.',
-	'POST_CONFIRMATION'			=> 'Confirmation of post',
-	'POST_CONFIRM_EXPLAIN'		=> 'To prevent automated posts the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
-	'POST_DELETED'				=> 'This message has been deleted successfully.',
-	'POST_EDITED'				=> 'This message has been edited successfully.',
-	'POST_EDITED_MOD'			=> 'This message has been edited successfully, but it will need to be approved by a moderator before it is publicly viewable.',
-	'POST_GLOBAL'				=> 'Global',
-	'POST_ICON'					=> 'Post icon',
-	'POST_NORMAL'				=> 'Normal',
-	'POST_REVIEW'				=> 'Post review',
-	'POST_REVIEW_EXPLAIN'		=> 'At least one new post has been made to this topic. You may wish to review your post in light of this.',
-	'POST_STORED'				=> 'This message has been posted successfully.',
-	'POST_STORED_MOD'			=> 'This message has been submitted successfully, but it will need to be approved by a moderator before it is publicly viewable.',
-	'POST_TOPIC_AS'				=> 'Post topic as',
-	'PROGRESS_BAR'				=> 'Progress bar',
-
-	'QUOTE_DEPTH_EXCEEDED'		=> 'You may embed only %1$d quotes within each other.',
-
-	'SAVE'						=> 'Save',
-	'SAVE_DATE'					=> 'Saved at',
-	'SAVE_DRAFT'				=> 'Save draft',
-	'SAVE_DRAFT_CONFIRM'		=> 'Please note that saved drafts only include the subject and the message, any other element will be removed. Do you want to save your draft now?',
-	'SMILIES'					=> 'Smilies',
-	'SMILIES_ARE_OFF'			=> 'Smilies are <em>OFF</em>',
-	'SMILIES_ARE_ON'			=> 'Smilies are <em>ON</em>',
-	'STICKY_ANNOUNCE_TIME_LIMIT'=> 'Sticky/Announcement time limit',
-	'STICK_TOPIC_FOR'			=> 'Stick topic for',
-	'STICK_TOPIC_FOR_EXPLAIN'	=> 'Enter 0 or leave blank for a never ending Sticky/Announcement.',
-	'STYLES_TIP'				=> 'Tip: Styles can be applied quickly to selected text.',
-
-	'TOO_FEW_CHARS'				=> 'Your message contains too few characters.',
-	'TOO_FEW_POLL_OPTIONS'		=> 'You must enter at least two poll options.',
-	'TOO_MANY_ATTACHMENTS'		=> 'Cannot add another attachment, %d is the maximum.',
-	'TOO_MANY_CHARS'			=> 'Your message contains too many characters.',
-	'TOO_MANY_CHARS_POST'		=> 'Your message contains %1$d characters. The maximum number of allowed characters is %2$d.',
-	'TOO_MANY_CHARS_SIG'		=> 'Your signature contains %1$d characters. The maximum number of allowed characters is %2$d.',
-	'TOO_MANY_POLL_OPTIONS'		=> 'You have tried to enter too many poll options.',
-	'TOO_MANY_SMILIES'			=> 'Your message contains too many smilies. The maximum number of smilies allowed is %d.',
-	'TOO_MANY_URLS'				=> 'Your message contains too many URLs. The maximum number of URLs allowed is %d.',
-	'TOO_MANY_USER_OPTIONS'		=> 'You cannot specify more options per user than existing poll options.',
-	'TOPIC_BUMPED'				=> 'Topic has been bumped successfully.',
-
-	'UNAUTHORISED_BBCODE'		=> 'You cannot use certain BBCodes: %s.',
-	'UNGLOBALISE_EXPLAIN'		=> 'To switch this topic back from being global to a normal topic, you need to select the forum you wish this topic to be displayed.',
-	'UPDATE_COMMENT'			=> 'Update comment',
-	'URL_INVALID'				=> 'The URL you specified is invalid.',
-	'URL_NOT_FOUND'				=> 'The file specified could not be found.',
-	'URL_IS_OFF'				=> '[url] is <em>OFF</em>',
-	'URL_IS_ON'					=> '[url] is <em>ON</em>',
-	'USER_CANNOT_BUMP'			=> 'You cannot bump topics in this forum.',
-	'USER_CANNOT_DELETE'		=> 'You cannot delete posts in this forum.',
-	'USER_CANNOT_EDIT'			=> 'You cannot edit posts in this forum.',
-	'USER_CANNOT_REPLY'			=> 'You cannot reply in this forum.',
-	'USER_CANNOT_FORUM_POST'	=> 'You are not able to do posting operations on this forum due to the forum type not supporting it.',
-
-	'VIEW_MESSAGE'				=> '%sView your submitted message%s',
-	'VIEW_PRIVATE_MESSAGE'		=> '%sView your submitted private message%s',
-
-	'WRONG_FILESIZE'			=> 'The file is too big, maximum allowed size is %1d %2s.',
-	'WRONG_SIZE'				=> 'The image must be at least %1$d pixels wide, %2$d pixels high and at most %3$d pixels wide and %4$d pixels high. The submitted image is %5$d pixels wide and %6$d pixels high.',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/recaptcha.php b/phpBB/language/en/recaptcha.php
deleted file mode 100644
index 140e300b7b..0000000000
--- a/phpBB/language/en/recaptcha.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
-*
-* recaptcha [English]
-*
-* @package language
-* @version $Id: groups.php 8477 2008-03-29 00:08:34Z naderman $
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-$lang = array_merge($lang, array(
-	'RECAPTCHA_LANG'				=> 'en',
-	'RECAPTCHA_NOT_AVAILABLE'		=> 'You have to register for reCaptcha at <a href="http://recaptcha.net">reCaptcha.net</a>.',
-	'CAPTCHA_RECAPTCHA'				=> 'reCaptcha',
-	'RECAPTCHA_INCORRECT'			=> 'The entered visual confirmation was incorrect',
-
-	'RECAPTCHA_PUBLIC'				=> 'Public reCaptcha key',
-	'RECAPTCHA_PUBLIC_EXPLAIN'		=> 'Your public reCaptcha key. You can obtain keys from <a href="http://recaptcha.net">reCaptcha.net</a>.',
-	'RECAPTCHA_PRIVATE'				=> 'Private reCaptcha key',
-	'RECAPTCHA_PRIVATE_EXPLAIN'		=> 'Your private reCaptcha key. You can obtain keys from <a href="http://recaptcha.net">reCaptcha.net</a>.',
-
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
deleted file mode 100644
index 4618a585b3..0000000000
--- a/phpBB/language/en/search.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
-*
-* search [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-$lang = array_merge($lang, array(
-	'ALL_AVAILABLE'			=> 'All available',
-	'ALL_RESULTS'			=> 'All results',
-
-	'DISPLAY_RESULTS'		=> 'Display results as',
-
-	'FOUND_SEARCH_MATCH'		=> 'Search found %d match',
-	'FOUND_SEARCH_MATCHES'		=> 'Search found %d matches',
-	'FOUND_MORE_SEARCH_MATCHES'	=> 'Search found more than %d matches',
-
-	'GLOBAL'				=> 'Global announcement',
-
-	'IGNORED_TERMS'			=> 'ignored',
-	'IGNORED_TERMS_EXPLAIN'	=> 'The following words in your search query were ignored because they are too common words: <strong>%s</strong>.',
-
-	'JUMP_TO_POST'			=> 'Jump to post',
-
-	'LOGIN_EXPLAIN_EGOSEARCH'	=> 'The board requires you to be registered and logged in to view your own posts.',
-
-	'MAX_NUM_SEARCH_KEYWORDS_REFINE'	=> 'You specified too many words to search for. Please do not enter more than %1$d words.',
-
-	'NO_KEYWORDS'			=> 'You must specify at least one word to search for. Each word must consist of at least %d characters and must not contain more than %d characters excluding wildcards.',
-	'NO_RECENT_SEARCHES'	=> 'No searches have been carried out recently.',
-	'NO_SEARCH'				=> 'Sorry but you are not permitted to use the search system.',
-	'NO_SEARCH_RESULTS'		=> 'No suitable matches were found.',
-	'NO_SEARCH_TIME'		=> 'Sorry but you cannot use search at this time. Please try again in a few minutes.',
-	'WORD_IN_NO_POST'		=> 'No posts were found because the word <strong>%s</strong> is not contained in any post.',
-	'WORDS_IN_NO_POST'		=> 'No posts were found because the words <strong>%s</strong> are not contained in any post.',
-
-	'POST_CHARACTERS'		=> 'characters of posts',
-
-	'RECENT_SEARCHES'		=> 'Recent searches',
-	'RESULT_DAYS'			=> 'Limit results to previous',
-	'RESULT_SORT'			=> 'Sort results by',
-	'RETURN_FIRST'			=> 'Return first',
-	'RETURN_TO_SEARCH_ADV'	=> 'Return to advanced search',
-
-	'SEARCHED_FOR'				=> 'Search term used',
-	'SEARCHED_TOPIC'			=> 'Searched topic',
-	'SEARCH_ALL_TERMS'			=> 'Search for all terms or use query as entered',
-	'SEARCH_ANY_TERMS'			=> 'Search for any terms',
-	'SEARCH_AUTHOR'				=> 'Search for author',
-	'SEARCH_AUTHOR_EXPLAIN'		=> 'Use * as a wildcard for partial matches.',
-	'SEARCH_FIRST_POST'			=> 'First post of topics only',
-	'SEARCH_FORUMS'				=> 'Search in forums',
-	'SEARCH_FORUMS_EXPLAIN'		=> 'Select the forum or forums you wish to search in. Subforums are searched automatically if you do not disable “search subforums“ below.',
-	'SEARCH_IN_RESULTS'			=> 'Search these results',
-	'SEARCH_KEYWORDS_EXPLAIN'	=> 'Place <strong>+</strong> in front of a word which must be found and <strong>-</strong> in front of a word which must not be found. Put a list of words separated by <strong>|</strong> into brackets if only one of the words must be found. Use * as a wildcard for partial matches.',
-	'SEARCH_MSG_ONLY'			=> 'Message text only',
-	'SEARCH_OPTIONS'			=> 'Search options',
-	'SEARCH_QUERY'				=> 'Search query',
-	'SEARCH_SUBFORUMS'			=> 'Search subforums',
-	'SEARCH_TITLE_MSG'			=> 'Post subjects and message text',
-	'SEARCH_TITLE_ONLY'			=> 'Topic titles only',
-	'SEARCH_WITHIN'				=> 'Search within',
-	'SORT_ASCENDING'			=> 'Ascending',
-	'SORT_AUTHOR'				=> 'Author',
-	'SORT_DESCENDING'			=> 'Descending',
-	'SORT_FORUM'				=> 'Forum',
-	'SORT_POST_SUBJECT'			=> 'Post subject',
-	'SORT_TIME'					=> 'Post time',
-
-	'TOO_FEW_AUTHOR_CHARS'	=> 'You must specify at least %d characters of the authors name.',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/search_ignore_words.php b/phpBB/language/en/search_ignore_words.php
deleted file mode 100644
index 2dfdc0df13..0000000000
--- a/phpBB/language/en/search_ignore_words.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-/**
-*
-* search_ignore_words [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-$words = array(
-	'a',
-	'about',
-	'after',
-	'ago',
-	'all',
-	'almost',
-	'along',
-	'alot',
-	'also',
-	'am',
-	'an',
-	'and',
-	'answer',
-	'any',
-	'anybody',
-	'anybodys',
-	'anywhere',
-	'are',
-	'arent',
-	'around',
-	'as',
-	'ask',
-	'askd',
-	'at',
-	'bad',
-	'be',
-	'because',
-	'been',
-	'before',
-	'being',
-	'best',
-	'better',
-	'between',
-	'big',
-	'btw',
-	'but',
-	'by',
-	'can',
-	'cant',
-	'come',
-	'could',
-	'couldnt',
-	'day',
-	'days',
-	'days',
-	'did',
-	'didnt',
-	'do',
-	'does',
-	'doesnt',
-	'dont',
-	'down',
-	'each',
-	'etc',
-	'either',
-	'else',
-	'even',
-	'ever',
-	'every',
-	'everybody',
-	'everybodys',
-	'everyone',
-	'far',
-	'find',
-	'for',
-	'found',
-	'from',
-	'get',
-	'go',
-	'going',
-	'gone',
-	'good',
-	'got',
-	'gotten',
-	'had',
-	'has',
-	'have',
-	'havent',
-	'having',
-	'her',
-	'here',
-	'hers',
-	'him',
-	'his',
-	'home',
-	'how',
-	'hows',
-	'href',
-	'I',
-	'Ive',
-	'if',
-	'in',
-	'ini',
-	'into',
-	'is',
-	'isnt',
-	'it',
-	'its',
-	'its',
-	'just',
-	'know',
-	'large',
-	'less',
-	'like',
-	'liked',
-	'little',
-	'looking',
-	'look',
-	'looked',
-	'looking',
-	'lot',
-	'maybe',
-	'many',
-	'me',
-	'more',
-	'most',
-	'much',
-	'must',
-	'mustnt',
-	'my',
-	'near',
-	'need',
-	'never',
-	'new',
-	'news',
-	'no',
-	'none',
-	'not',
-	'nothing',
-	'now',
-	'of',
-	'off',
-	'often',
-	'old',
-	'on',
-	'once',
-	'only',
-	'oops',
-	'or',
-	'other',
-	'our',
-	'ours',
-	'out',
-	'over',
-	'page',
-	'please',
-	'put',
-	'question',
-	'questions',
-	'questioned',
-	'quote',
-	'rather',
-	'really',
-	'recent',
-	'said',
-	'saw',
-	'say',
-	'says',
-	'she',
-	'see',
-	'sees',
-	'should',
-	'sites',
-	'small',
-	'so',
-	'some',
-	'something',
-	'sometime',
-	'somewhere',
-	'soon',
-	'take',
-	'than',
-	'true',
-	'thank',
-	'that',
-	'thatd',
-	'thats',
-	'the',
-	'their',
-	'theirs',
-	'theres',
-	'theirs',
-	'them',
-	'then',
-	'there',
-	'these',
-	'they',
-	'theyll',
-	'theyd',
-	'theyre',
-	'this',
-	'those',
-	'though',
-	'through',
-	'thus',
-	'time',
-	'times',
-	'to',
-	'too',
-	'under',
-	'until',
-	'untrue',
-	'up',
-	'upon',
-	'use',
-	'users',
-	'version',
-	'very',
-	'via',
-	'want',
-	'was',
-	'way',
-	'we',
-	'well',
-	'went',
-	'were',
-	'werent',
-	'what',
-	'when',
-	'where',
-	'which',
-	'who',
-	'whom',
-	'whose',
-	'why',
-	'wide',
-	'will',
-	'with',
-	'within',
-	'without',
-	'wont',
-	'world',
-	'worse',
-	'worst',
-	'would',
-	'wrote',
-	'www',
-	'yes',
-	'yet',
-	'you',
-	'youd',
-	'youll',
-	'your',
-	'youre',
-	'yours',
-	'AFAIK',
-	'IIRC',
-	'LOL',
-	'ROTF',
-	'ROTFLMAO',
-	'YMMV',
-);
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/search_synonyms.php b/phpBB/language/en/search_synonyms.php
deleted file mode 100644
index b85c39e5d5..0000000000
--- a/phpBB/language/en/search_synonyms.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-/**
-*
-* search_synonyms [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-$synonyms = array(
-	'abcense'			=> 'absence',
-	'abridgement'		=> 'abridgment',
-	'accomodate'		=> 'accommodate',
-	'acknowledgment'	=> 'acknowledgement',
-	'airplane'			=> 'aeroplane',
-	'allright'			=> 'alright ',
-	'andy'				=> 'andrew',
-	'anemia'			=> 'anaemia',
-	'anemic'			=> 'anaemic',
-	'anesthesia'		=> 'anaesthesia',
-	'appologize'		=> 'appologise',
-	'archean'			=> 'archaean',
-	'archeology'		=> 'archaeology',
-	'archeozoic'		=> 'archaeozoic',
-	'armor'				=> 'armour',
-	'artic'				=> 'arctic',
-	'attachment'		=> 'attachement',
-	'attendence'		=> 'attendance',
-
-	'barbecue'	=> 'barbeque',
-	'behavior'	=> 'behaviour',
-	'biassed'	=> 'biased',
-	'biol'		=> 'biology',
-	'buletin'	=> 'bulletin',
-
-	'calender'	=> 'calendar',
-	'canceled'	=> 'cancelled',
-	'car'		=> 'automobile',
-	'catalog'	=> 'catalogue',
-	'cenozoic'	=> 'caenozoic',
-	'center'	=> 'centre',
-	'check'		=> 'cheque',
-	'color'		=> 'colour',
-	'comission'	=> 'commission',
-	'comittee'	=> 'committee',
-	'commitee'	=> 'committee',
-	'conceed'	=> 'concede',
-	'creating'	=> 'createing',
-	'curiculum'	=> 'curriculum',
-
-	'defense'		=> 'defence',
-	'develope'		=> 'develop',
-	'discription'	=> 'description',
-	'dulness'		=> 'dullness',
-
-	'encyclopedia'	=> 'encyclopaedia',
-	'enroll'		=> 'enrol',
-	'esthetic'		=> 'aesthetic',
-	'etiology'		=> 'aetiology',
-	'exhorbitant'	=> 'exorbitant',
-	'exhuberant'	=> 'exuberant',
-	'existance'		=> 'existence',
-
-	'favorite'		=> 'favourite',
-	'fetus'			=> 'foetus',
-	'ficticious'	=> 'fictitious',
-	'flavor'		=> 'flavour',
-	'flourescent'	=> 'fluorescent',
-	'foriegn'		=> 'foreign',
-	'fourty'		=> 'forty',
-
-	'gage'			=> 'guage',
-	'geneology'		=> 'genealogy',
-	'grammer'		=> 'grammar',
-	'gray'			=> 'grey',
-	'guerilla'		=> 'guerrilla',
-	'gynecology'	=> 'gynaecology',
-
-	'harbor'		=> 'harbour',
-	'heighth'		=> 'height',
-	'hemaglobin'	=> 'haemaglobin',
-	'hematin'		=> 'haematin',
-	'hematite'		=> 'haematite',
-	'hematology'	=> 'haematology',
-	'honor'			=> 'honour',
-
-	'innoculate'	=> 'inoculate',
-	'installment'	=> 'instalment',
-	'irrelevent'	=> 'irrelevant',
-	'irrevelant'	=> 'irrelevant',
-
-	'jeweler'	=> 'jeweller',
-	'judgement'	=> 'judgment',
-
-	'labeled'	=> 'labelled',
-	'labor'		=> 'labour',
-	'laborer'	=> 'labourer',
-	'laborers'	=> 'labourers',
-	'laboring'	=> 'labouring',
-	'licence'	=> 'license',
-	'liesure'	=> 'leisure',
-	'liquify'	=> 'liquefy',
-
-	'maintainance'	=> 'maintenance',
-	'maintenence'	=> 'maintenance',
-	'medieval'		=> 'mediaeval',
-	'meter'			=> 'metre',
-	'milage'		=> 'mileage',
-	'millipede'		=> 'millepede',
-	'miscelaneous'	=> 'miscellaneous',
-	'morgage'		=> 'mortgage',
-
-	'noticable'	=> 'noticeable',
-
-	'occurence'	=> 'occurrence',
-	'offense'	=> 'offence',
-	'ommision'	=> 'omission',
-	'ommission'	=> 'omission',
-	'optimize'	=> 'optimise',
-	'organize'	=> 'organise',
-
-	'pajamas'			=> 'pyjamas',
-	'paleography'		=> 'palaeography',
-	'paleolithic'		=> 'palaeolithic',
-	'paleontological'	=> 'palaeontological',
-	'paleontologist'	=> 'palaeontologist',
-	'paleontology'		=> 'palaeontology',
-	'paleozoic'			=> 'palaeozoic',
-	'pamplet'			=> 'pamphlet',
-	'paralell'			=> 'parallel',
-	'parl'				=> 'parliament',
-	'parlt'				=> 'parliament',
-	'pediatric'			=> 'paediatric',
-	'pediatrician'		=> 'paediatrician',
-	'pediatrics'		=> 'paediatrics',
-	'pedodontia'		=> 'paedodontia',
-	'pedodontics'		=> 'paedodontics',
-	'personel'			=> 'personnel',
-	'practise'			=> 'practice',
-	'program'			=> 'programme',
-	'psych'				=> 'psychology',
-
-	'questionaire'	=> 'questionnaire',
-
-	'rarify'		=> 'rarefy',
-	'reccomend'		=> 'recommend',
-	'recieve'		=> 'receive',
-	'resistence'	=> 'resistance',
-	'restaraunt'	=> 'restaurant',
-
-	'savior'			=> 'saviour',
-	'sep'				=> 'september',
-	'seperate'			=> 'separate',
-	'sept'				=> 'september',
-	'sieze'				=> 'seize',
-	'summarize'			=> 'summarise',
-	'summerize'			=> 'summarise',
-	'superceed'			=> 'supercede',
-	'superintendant'	=> 'superintendent',
-	'supersede'			=> 'supercede',
-	'suprise'			=> 'surprise',
-	'surprize'			=> 'surprise',
-	'synchronise'		=> 'synchronize',
-
-	'temperary'		=> 'temporary',
-	'theater'		=> 'theatre',
-	'threshhold'	=> 'threshold',
-	'transfered'	=> 'transferred',
-	'truely'		=> 'truly',
-	'truley'		=> 'truly',
-
-	'useable'	=> 'usable',
-
-	'valor'	=> 'valour',
-	'vigor'	=> 'vigour',
-	'vol'	=> 'volume',
-
-	'whack'		=> 'wack',
-	'withold'	=> 'withhold',
-
-	'yeild'	=> 'yield',
-);
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
deleted file mode 100644
index ccb6fbdbb4..0000000000
--- a/phpBB/language/en/ucp.php
+++ /dev/null
@@ -1,547 +0,0 @@
-<?php
-/**
-*
-* ucp [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-// Privacy policy and T&C
-$lang = array_merge($lang, array(
-	'TERMS_OF_USE_CONTENT'	=> 'By accessing “%1$s” (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”), you agree to be legally bound by the following terms. If you do not agree to be legally bound by all of the following terms then please do not access and/or use “%1$s”. We may change these at any time and we’ll do our utmost in informing you, though it would be prudent to review this regularly yourself as your continued usage of “%1$s” after changes mean you agree to be legally bound by these terms as they are updated and/or amended.<br />
-	<br />
-	Our forums are powered by phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Group”, “phpBB Teams”) which is a bulletin board solution released under the “<a href="http://opensource.org/licenses/gpl-license.php">General Public License</a>” (hereinafter “GPL”) and can be downloaded from <a href="http://www.phpbb.com/">www.phpbb.com</a>. The phpBB software only facilitates internet based discussions, the phpBB Group are not responsible for what we allow and/or disallow as permissible content and/or conduct. For further information about phpBB, please see: <a href="http://www.phpbb.com/">http://www.phpbb.com/</a>.<br />
-	<br />
-	You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-orientated or any other material that may violate any laws be it of your country, the country where “%1$s” is hosted or International Law. Doing so may lead to you being immediately and permanently banned, with notification of your Internet Service Provider if deemed required by us. The IP address of all posts are recorded to aid in enforcing these conditions. You agree that “%1$s” have the right to remove, edit, move or close any topic at any time should we see fit. As a user you agree to any information you have entered to being stored in a database. While this information will not be disclosed to any third party without your consent, neither “%1$s” nor phpBB shall be held responsible for any hacking attempt that may lead to the data being compromised.
-	',
-
-	'PRIVACY_POLICY'		=> 'This policy explains in detail how “%1$s” along with its affiliated companies (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”) and phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Group”, “phpBB Teams”) use any information collected during any session of usage by you (hereinafter “your information”).<br />
-	<br />
-	Your information is collected via two ways. Firstly, by browsing “%1$s” will cause the phpBB software to create a number of cookies, which are small text files that are downloaded on to your computer’s web browser temporary files. The first two cookies just contain a user identifier (hereinafter “user-id”) and an anonymous session identifier (hereinafter “session-id”), automatically assigned to you by the phpBB software. A third cookie will be created once you have browsed topics within “%1$s” and is used to store which topics have been read, thereby improving your user experience.<br />
-	<br />
-	We may also create cookies external to the phpBB software whilst browsing “%1$s”, though these are outside the scope of this document which is intended to only cover the pages created by the phpBB software. The second way in which we collect your information is by what you submit to us. This can be, and is not limited to: posting as an anonymous user (hereinafter “anonymous posts”), registering on “%1$s” (hereinafter “your account”) and posts submitted by you after registration and whilst logged in (hereinafter “your posts”).<br />
-	<br />
-	Your account will at a bare minimum contain a uniquely identifiable name (hereinafter “your user name”), a personal password used for logging into your account (hereinafter “your password”) and a personal, valid e-mail address (hereinafter “your e-mail”). Your information for your account at “%1$s” is protected by data-protection laws applicable in the country that hosts us. Any information beyond your user name, your password, and your e-mail address required by “%1$s” during the registration process is either mandatory or optional, at the discretion of “%1$s”. In all cases, you have the option of what information in your account is publicly displayed. Furthermore, within your account, you have the option to opt-in or opt-out of automatically generated e-mails from the phpBB software.<br />
-	<br />
-	Your password is ciphered (a one-way hash) so that it is secure. However, it is recommended that you do not reuse the same password across a number of different websites. Your password is the means of accessing your account at “%1$s”, so please guard it carefully and under no circumstance will anyone affiliated with “%1$s”, phpBB or another 3rd party, legitimately ask you for your password. Should you forget your password for your account, you can use the “I forgot my password” feature provided by the phpBB software. This process will ask you to submit your user name and your e-mail, then the phpBB software will generate a new password to reclaim your account.<br />
-	',
-));
-
-// Common language entries
-$lang = array_merge($lang, array(
-	'ACCOUNT_ACTIVE'				=> 'Your account has now been activated. Thank you for registering.',
-	'ACCOUNT_ACTIVE_ADMIN'			=> 'The account has now been activated.',
-	'ACCOUNT_ACTIVE_PROFILE'		=> 'Your account has now been successfully reactivated.',
-	'ACCOUNT_ADDED'					=> 'Thank you for registering, your account has been created. You may now login with your username and password.',
-	'ACCOUNT_COPPA'					=> 'Your account has been created but has to be approved, please check your e-mail for details.',
-	'ACCOUNT_EMAIL_CHANGED'			=> 'Your account has been updated. However, this board requires account reactivation on e-mail changes. An activation key has been sent to the new e-mail address you provided. Please check your e-mail for further information.',
-	'ACCOUNT_EMAIL_CHANGED_ADMIN'	=> 'Your account has been updated. However, this board requires account reactivation by the administrators on e-mail changes. An e-mail has been sent to them and you will be informed when your account has been reactivated.',
-	'ACCOUNT_INACTIVE'				=> 'Your account has been created. However, this board requires account activation, an activation key has been sent to the e-mail address you provided. Please check your e-mail for further information.',
-	'ACCOUNT_INACTIVE_ADMIN'		=> 'Your account has been created. However, this board requires account activation by the administrator group. An e-mail has been sent to them and you will be informed when your account has been activated.',
-	'ACTIVATION_EMAIL_SENT'			=> 'The activation e-mail has been sent to your e-mail address.',
-	'ACTIVATION_EMAIL_SENT_ADMIN'	=> 'The activation e-mail has been sent to the administrators e-mail addresses.',
-	'ADD'							=> 'Add',
-	'ADD_BCC'						=> 'Add [BCC]',
-	'ADD_FOES'						=> 'Add new foes',
-	'ADD_FOES_EXPLAIN'				=> 'You may enter several usernames each on a different line.',
-	'ADD_FOLDER'					=> 'Add folder',
-	'ADD_FRIENDS'					=> 'Add new friends',
-	'ADD_FRIENDS_EXPLAIN'			=> 'You may enter several usernames each on a different line.',
-	'ADD_NEW_RULE'					=> 'Add new rule',
-	'ADD_RULE'						=> 'Add rule',
-	'ADD_TO'						=> 'Add [To]',
-	'ADMIN_EMAIL'					=> 'Administrators can e-mail me information',
-	'AGREE'							=> 'I agree to these terms',
-	'ALLOW_PM'						=> 'Allow users to send you private messages',
-	'ALLOW_PM_EXPLAIN'				=> 'Note that administrators and moderators will always be able to send you messages.',
-	'ALREADY_ACTIVATED'				=> 'You have already activated your account.',
-	'ATTACHMENTS_EXPLAIN'			=> 'This is a list of attachments you have made in posts to this board.',
-	'ATTACHMENTS_DELETED'			=> 'Attachments successfully deleted.',
-	'ATTACHMENT_DELETED'			=> 'Attachment successfully deleted.',
-	'AVATAR_CATEGORY'				=> 'Category',
-	'AVATAR_EXPLAIN'				=> 'Maximum dimensions; width: %1$d pixels, height: %2$d pixels, file size: %3$.2f KiB.',
-	'AVATAR_FEATURES_DISABLED'		=> 'The avatar functionality is currently disabled.',
-	'AVATAR_GALLERY'				=> 'Local gallery',
-	'AVATAR_GENERAL_UPLOAD_ERROR'	=> 'Could not upload avatar to %s.',
-	'AVATAR_PAGE'					=> 'Page',
-
-	'BACK_TO_DRAFTS'			=> 'Back to saved drafts',
-	'BACK_TO_LOGIN'				=> 'Back to login screen',
-	'BIRTHDAY'					=> 'Birthday',
-	'BIRTHDAY_EXPLAIN'			=> 'Setting a year will list your age when it is your birthday.',
-	'BOARD_DATE_FORMAT'			=> 'My date format',
-	'BOARD_DATE_FORMAT_EXPLAIN'	=> 'The syntax used is identical to the PHP <a href="http://www.php.net/date">date()</a> function.',
-	'BOARD_DST'					=> 'Summer Time/<abbr title="Daylight Saving Time">DST</abbr> is in effect',
-	'BOARD_LANGUAGE'			=> 'My language',
-	'BOARD_STYLE'				=> 'My board style',
-	'BOARD_TIMEZONE'			=> 'My timezone',
-	'BOOKMARKS'					=> 'Bookmarks',
-	'BOOKMARKS_EXPLAIN'			=> 'You can bookmark topics for future reference. Select the checkbox for any bookmark you wish to delete, then press the <em>Remove marked bookmarks</em> button.',
-	'BOOKMARKS_DISABLED'		=> 'Bookmarks are disabled on this board.',
-	'BOOKMARKS_REMOVED'			=> 'Bookmarks removed successfully.',
-
-	'CANNOT_EDIT_MESSAGE_TIME'	=> 'You can no longer edit or delete that message.',
-	'CANNOT_MOVE_TO_SAME_FOLDER'=> 'Messages cannot be moved to the folder you want to remove.',
-	'CANNOT_MOVE_FROM_SPECIAL'	=> 'Messages cannot be moved from the outbox.',
-	'CANNOT_RENAME_FOLDER'		=> 'This folder cannot be renamed.',
-	'CANNOT_REMOVE_FOLDER'		=> 'This folder cannot be removed.',
-	'CHANGE_DEFAULT_GROUP'		=> 'Change default group',
-	'CHANGE_PASSWORD'			=> 'Change password',
-	'CLICK_RETURN_FOLDER'		=> '%1$sReturn to your “%3$s” folder%2$s',
-	'CONFIRMATION'				=> 'Confirmation of registration',
-	'CONFIRM_CHANGES'			=> 'Confirm changes',
-	'CONFIRM_EMAIL'				=> 'Confirm e-mail address',
-	'CONFIRM_EMAIL_EXPLAIN'		=> 'You only need to specify this if you are changing your e-mail address.',
-	'CONFIRM_EXPLAIN'			=> 'To prevent automated registrations the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
-	'VC_REFRESH'				=> 'Refresh confirmation code',
-	'VC_REFRESH_EXPLAIN'		=> 'If you cannot read the code you can request a new one by clicking the button.',
-
-	'CONFIRM_PASSWORD'			=> 'Confirm password',
-	'CONFIRM_PASSWORD_EXPLAIN'	=> 'You only need to confirm your password if you changed it above.',
-	'COPPA_BIRTHDAY'			=> 'To continue with the registration procedure please tell us when you were born.',
-	'COPPA_COMPLIANCE'			=> 'COPPA compliance',
-	'COPPA_EXPLAIN'				=> 'Please note that clicking submit will create your account. However it cannot be activated until a parent or guardian approves your registration. You will be emailed a copy of the necessary form with details of where to send it.',
-	'CREATE_FOLDER'				=> 'Add folder…',
-	'CURRENT_IMAGE'				=> 'Current image',
-	'CURRENT_PASSWORD'			=> 'Current password',
-	'CURRENT_PASSWORD_EXPLAIN'	=> 'You must confirm your current password if you wish to change it, alter your e-mail address or username.',
-	'CUR_PASSWORD_ERROR'		=> 'The current password you entered is incorrect.',
-	'CUSTOM_DATEFORMAT'			=> 'Custom…',
-
-	'DEFAULT_ACTION'			=> 'Default action',
-	'DEFAULT_ACTION_EXPLAIN'	=> 'This action will be triggered if none of the above is applicable.',
-	'DEFAULT_ADD_SIG'			=> 'Attach my signature by default',
-	'DEFAULT_BBCODE'			=> 'Enable BBCode by default',
-	'DEFAULT_NOTIFY'			=> 'Notify me upon replies by default',
-	'DEFAULT_SMILIES'			=> 'Enable smilies by default',
-	'DEFINED_RULES'				=> 'Defined rules',
-	'DELETED_TOPIC'				=> 'Topic has been removed.',
-	'DELETE_ATTACHMENT'			=> 'Delete attachment',
-	'DELETE_ATTACHMENTS'		=> 'Delete attachments',
-	'DELETE_ATTACHMENT_CONFIRM'	=> 'Are you sure you want to delete this attachment?',
-	'DELETE_ATTACHMENTS_CONFIRM'=> 'Are you sure you want to delete these attachments?',
-	'DELETE_AVATAR'				=> 'Delete image',
-	'DELETE_COOKIES_CONFIRM'	=> 'Are you sure you want to delete all cookies set by this board?',
-	'DELETE_MARKED_PM'			=> 'Delete marked messages',
-	'DELETE_MARKED_PM_CONFIRM'	=> 'Are you sure you want to delete all marked messages?',
-	'DELETE_OLDEST_MESSAGES'	=> 'Delete oldest messages',
-	'DELETE_MESSAGE'			=> 'Delete message',
-	'DELETE_MESSAGE_CONFIRM'	=> 'Are you sure you want to delete this private message?',
-	'DELETE_MESSAGES_IN_FOLDER'	=> 'Delete all messages within removed folder',
-	'DELETE_RULE'				=> 'Delete rule',
-	'DELETE_RULE_CONFIRM'		=> 'Are you sure you want to delete this rule?',
-	'DEMOTE_SELECTED'			=> 'Demote selected',
-	'DISABLE_CENSORS'			=> 'Enable word censoring',
-	'DISPLAY_GALLERY'			=> 'Display gallery',
-	'DOMAIN_NO_MX_RECORD_EMAIL'	=> 'The entered e-mail domain has no valid MX record.',
-	'DOWNLOADS'					=> 'Downloads',
-	'DRAFTS_DELETED'			=> 'All selected drafts were successfully deleted.',
-	'DRAFTS_EXPLAIN'			=> 'Here you can view, edit and delete your saved drafts.',
-	'DRAFT_UPDATED'				=> 'Draft successfully updated.',
-
-	'EDIT_DRAFT_EXPLAIN'		=> 'Here you are able to edit your draft. Drafts do not contain attachment and poll information.',
-	'EMAIL_BANNED_EMAIL'		=> 'The e-mail address you entered is not allowed to be used.',
-	'EMAIL_INVALID_EMAIL'		=> 'The e-mail address you entered is invalid.',
-	'EMAIL_REMIND'				=> 'This must be the e-mail address associated with your account. If you have not changed this via your user control panel then it is the e-mail address you registered your account with.',
-	'EMAIL_TAKEN_EMAIL'			=> 'The entered e-mail address is already in use.',
-	'EMPTY_DRAFT'				=> 'You must enter a message to submit your changes.',
-	'EMPTY_DRAFT_TITLE'			=> 'You must enter a draft title.',
-	'EXPORT_AS_XML'				=> 'Export as XML',
-	'EXPORT_AS_CSV'				=> 'Export as CSV',
-	'EXPORT_AS_CSV_EXCEL'		=> 'Export as CSV (Excel)',
-	'EXPORT_AS_TXT'				=> 'Export as TXT',
-	'EXPORT_AS_MSG'				=> 'Export as MSG',
-	'EXPORT_FOLDER'				=> 'Export this view',
-
-	'FIELD_REQUIRED'					=> 'The field “%s” must be completed.',
-	'FIELD_TOO_SHORT'					=> 'The field “%1$s” is too short, a minimum of %2$d characters is required.',
-	'FIELD_TOO_LONG'					=> 'The field “%1$s” is too long, a maximum of %2$d characters is allowed.',
-	'FIELD_TOO_SMALL'					=> 'The value of “%1$s” is too small, a minimum value of %2$d is required.',
-	'FIELD_TOO_LARGE'					=> 'The value of “%1$s” is too large, a maximum value of %2$d is allowed.',
-	'FIELD_INVALID_CHARS_NUMBERS_ONLY'	=> 'The field “%s” has invalid characters, only numbers are allowed.',
-	'FIELD_INVALID_CHARS_ALPHA_ONLY'	=> 'The field “%s” has invalid characters, only alphanumeric characters are allowed.',
-	'FIELD_INVALID_CHARS_SPACERS_ONLY'	=> 'The field “%s” has invalid characters, only alphanumeric, space or -+_[] characters are allowed.',
-	'FIELD_INVALID_DATE'				=> 'The field “%s” has an invalid date.',
-
-	'FOE_MESSAGE'				=> 'Message from foe',
-	'FOES_EXPLAIN'				=> 'Foes are users which will be ignored by default. Posts by these users will not be fully visible. Personal messages from foes are still permitted. Please note that you cannot ignore moderators or administrators.',
-	'FOES_UPDATED'				=> 'Your foes list has been updated successfully.',
-	'FOLDER_ADDED'				=> 'Folder successfully added.',
-	'FOLDER_MESSAGE_STATUS'		=> '%1$d from %2$d messages stored',
-	'FOLDER_NAME_EXIST'			=> 'Folder <strong>%s</strong> already exists.',
-	'FOLDER_OPTIONS'			=> 'Folder options',
-	'FOLDER_RENAMED'			=> 'Folder successfully renamed.',
-	'FOLDER_REMOVED'			=> 'Folder successfully removed.',
-	'FOLDER_STATUS_MSG'			=> 'Folder is %1$d%% full (%2$d from %3$d messages stored)',
-	'FORWARD_PM'				=> 'Forward PM',
-	'FORCE_PASSWORD_EXPLAIN'	=> 'Before you may continue browsing the board you are required to change your password.',
-	'FRIEND_MESSAGE'			=> 'Message from friend',
-	'FRIENDS'					=> 'Friends',
-	'FRIENDS_EXPLAIN'			=> 'Friends enable you quick access to members you communicate with frequently. If the template has relevant support any posts made by a friend may be highlighted.',
-	'FRIENDS_OFFLINE'			=> 'Offline',
-	'FRIENDS_ONLINE'			=> 'Online',
-	'FRIENDS_UPDATED'			=> 'Your friends list has been updated successfully.',
-	'FULL_FOLDER_OPTION_CHANGED'=> 'The action to take when a folder is full has been changed successfully.',
-	'FWD_ORIGINAL_MESSAGE'		=> '-------- Original Message --------',
-	'FWD_SUBJECT'				=> 'Subject: %s',
-	'FWD_DATE'					=> 'Date: %s',
-	'FWD_FROM'					=> 'From: %s',
-	'FWD_TO'					=> 'To: %s',
-
-	'GLOBAL_ANNOUNCEMENT'		=> 'Global announcement',
-
-	'HIDE_ONLINE'				=> 'Hide my online status',
-	'HIDE_ONLINE_EXPLAIN'		=> 'Changing this setting won’t become effective until your next visit to the board.',
-	'HOLD_NEW_MESSAGES'			=> 'Do not accept new messages (New messages will be held back until enough space is available)',
-	'HOLD_NEW_MESSAGES_SHORT'	=> 'New messages will be held back',
-
-	'IF_FOLDER_FULL'			=> 'If folder is full',
-	'IMPORTANT_NEWS'			=> 'Important announcements',
-	'INVALID_USER_BIRTHDAY'			=> 'The entered birthday is not a valid date.',
-	'INVALID_CHARS_USERNAME'	=> 'The username contains forbidden characters.',
-	'INVALID_CHARS_NEW_PASSWORD'=> 'The password does not contain the required characters.',
-	'ITEMS_REQUIRED'			=> 'The items marked with * are required profile fields and need to be filled out.',
-
-	'JOIN_SELECTED'				=> 'Join selected',
-
-	'LANGUAGE'					=> 'Language',
-	'LINK_REMOTE_AVATAR'		=> 'Link off-site',
-	'LINK_REMOTE_AVATAR_EXPLAIN'=> 'Enter the URL of the location containing the avatar image you wish to link to.',
-	'LINK_REMOTE_SIZE'			=> 'Avatar dimensions',
-	'LINK_REMOTE_SIZE_EXPLAIN'	=> 'Specify the width and height of the avatar, leave blank to attempt automatic verification.',
-	'LOGIN_EXPLAIN_UCP'			=> 'Please login in order to access the User Control Panel.',
-	'LOGIN_REDIRECT'			=> 'You have been successfully logged in.',
-	'LOGOUT_FAILED'				=> 'You were not logged out, as the request did not match your session. Please contact the board administrator if you continue to experience problems.',
-	'LOGOUT_REDIRECT'			=> 'You have been successfully logged out.',
-
-	'MARK_IMPORTANT'				=> 'Mark/Unmark as important',
-	'MARKED_MESSAGE'				=> 'Marked message',
-	'MAX_FOLDER_REACHED'			=> 'Maximum number of allowed user defined folders reached.',
-	'MESSAGE_BY_AUTHOR'				=> 'by',
-	'MESSAGE_COLOURS'				=> 'Message colours',
-	'MESSAGE_DELETED'				=> 'Message successfully deleted.',
-	'MESSAGE_HISTORY'				=> 'Message history',
-	'MESSAGE_REMOVED_FROM_OUTBOX'	=> 'This message has been removed by its author before it was delivered.',
-	'MESSAGE_SENT_ON'				=> 'on',
-	'MESSAGE_STORED'				=> 'This message has been sent successfully.',
-	'MESSAGE_TO'					=> 'To',
-	'MESSAGES_DELETED'				=> 'Messages successfully deleted',
-	'MOVE_DELETED_MESSAGES_TO'		=> 'Move messages from removed folder to',
-	'MOVE_DOWN'						=> 'Move down',
-	'MOVE_MARKED_TO_FOLDER'			=> 'Move marked to %s',
-	'MOVE_PM_ERROR'					=> 'An error occurred while moving the messages to the new folder, only %1d from %2d messages were moved.',
-	'MOVE_TO_FOLDER'				=> 'Move to folder',
-	'MOVE_UP'						=> 'Move up',
-
-	'NEW_EMAIL_ERROR'				=> 'The e-mail addresses you entered do not match.',
-	'NEW_FOLDER_NAME'				=> 'New folder name',
-	'NEW_PASSWORD'					=> 'New password',
-	'NEW_PASSWORD_ERROR'			=> 'The passwords you entered do not match.',
-	'NOTIFY_METHOD'					=> 'Notification method',
-	'NOTIFY_METHOD_BOTH'			=> 'Both',
-	'NOTIFY_METHOD_EMAIL'			=> 'E-mail only',
-	'NOTIFY_METHOD_EXPLAIN'			=> 'Method for sending messages sent via this board.',
-	'NOTIFY_METHOD_IM'				=> 'Jabber only',
-	'NOTIFY_ON_PM'					=> 'Notify me on new private messages',
-	'NOT_ADDED_FRIENDS_ANONYMOUS'	=> 'You cannot add the anonymous user to your friends list.',
-	'NOT_ADDED_FRIENDS_FOES'		=> 'You cannot add users to your friends list who are on your foes list.',
-	'NOT_ADDED_FRIENDS_SELF'		=> 'You cannot add yourself to the friends list.',
-	'NOT_ADDED_FOES_MOD_ADMIN'		=> 'You cannot add administrators and moderators to your foes list.',
-	'NOT_ADDED_FOES_ANONYMOUS'		=> 'You cannot add the anonymous user to your foes list.',
-	'NOT_ADDED_FOES_FRIENDS'		=> 'You cannot add users to your foes list who are on your friends list.',
-	'NOT_ADDED_FOES_SELF'			=> 'You cannot add yourself to the foes list.',
-	'NOT_AGREE'						=> 'I do not agree to these terms',
-	'NOT_ENOUGH_SPACE_FOLDER'		=> 'The destination folder “%s” seems to be full. The requested action has not been taken.',
-	'NOT_MOVED_MESSAGE'				=> 'You have 1 private message currently on hold because of full folder.',
-	'NOT_MOVED_MESSAGES'			=> 'You have %d private messages currently on hold because of full folder.',
-	'NO_ACTION_MODE'				=> 'No message action specified.',
-	'NO_AUTHOR'						=> 'No author defined for this message',
-	'NO_AVATAR_CATEGORY'			=> 'None',
-
-	'NO_AUTH_DELETE_MESSAGE'		=> 'You are not authorised to delete private messages.',
-	'NO_AUTH_EDIT_MESSAGE'			=> 'You are not authorised to edit private messages.',
-	'NO_AUTH_FORWARD_MESSAGE'		=> 'You are not authorised to forward private messages.',
-	'NO_AUTH_GROUP_MESSAGE'			=> 'You are not authorised to send private messages to groups.',
-	'NO_AUTH_PASSWORD_REMINDER'		=> 'You are not authorised to request a new password.',
-	'NO_AUTH_READ_HOLD_MESSAGE'		=> 'You are not authorised to read private messages that are on hold.',
-	'NO_AUTH_READ_MESSAGE'			=> 'You are not authorised to read private messages.',
-	'NO_AUTH_READ_REMOVED_MESSAGE'	=> 'You are not able to read this message because it was removed by the author.',
-	'NO_AUTH_SEND_MESSAGE'			=> 'You are not authorised to send private messages.',
-	'NO_AUTH_SIGNATURE'				=> 'You are not authorised to define a signature.',
-
-	'NO_BCC_RECIPIENT'			=> 'None',
-	'NO_BOOKMARKS'				=> 'You have no bookmarks.',
-	'NO_BOOKMARKS_SELECTED'		=> 'You have selected no bookmarks.',
-	'NO_EDIT_READ_MESSAGE'		=> 'Private message cannot be edited because it has already been read.',
-	'NO_EMAIL_USER'				=> 'The e-mail/username information submitted could not be found.',
-	'NO_FOES'					=> 'No foes currently defined',
-	'NO_FRIENDS'				=> 'No friends currently defined',
-	'NO_FRIENDS_OFFLINE'		=> 'No friends offline',
-	'NO_FRIENDS_ONLINE'			=> 'No friends online',
-	'NO_GROUP_SELECTED'			=> 'No group specified.',
-	'NO_IMPORTANT_NEWS'			=> 'No important announcements present.',
-	'NO_MESSAGE'				=> 'Private message could not be found.',
-	'NO_NEW_FOLDER_NAME'		=> 'You have to specify a new folder name.',
-	'NO_NEWER_PM'				=> 'No newer messages.',
-	'NO_OLDER_PM'				=> 'No older messages.',
-	'NO_PASSWORD_SUPPLIED'		=> 'You cannot login without a password.',
-	'NO_RECIPIENT'				=> 'No recipient defined.',
-	'NO_RULES_DEFINED'			=> 'No rules defined.',
-	'NO_SAVED_DRAFTS'			=> 'No drafts saved.',
-	'NO_TO_RECIPIENT'			=> 'None',
-	'NO_WATCHED_FORUMS'			=> 'You are not subscribed to any forums.',
-	'NO_WATCHED_SELECTED'		=> 'You have not selected any subscribed topics or forums.',
-	'NO_WATCHED_TOPICS'			=> 'You are not subscribed to any topics.',
-
-	'PASS_TYPE_ALPHA_EXPLAIN'	=> 'Password must be between %1$d and %2$d characters long, must contain letters in mixed case and must contain numbers.',
-	'PASS_TYPE_ANY_EXPLAIN'		=> 'Must be between %1$d and %2$d characters.',
-	'PASS_TYPE_CASE_EXPLAIN'	=> 'Password must be between %1$d and %2$d characters long and must contain letters in mixed case.',
-	'PASS_TYPE_SYMBOL_EXPLAIN'	=> 'Password must be between %1$d and %2$d characters long, must contain letters in mixed case, must contain numbers and must contain symbols.',
-	'PASSWORD'					=> 'Password',
-	'PASSWORD_ACTIVATED'		=> 'Your new password has been activated.',
-	'PASSWORD_UPDATED'			=> 'A new password was sent to your registered email address.',
-	'PERMISSIONS_RESTORED'		=> 'Successfully restored original permissions.',
-	'PERMISSIONS_TRANSFERRED'	=> 'Successfully transferred permissions from <strong>%s</strong>, you are now able to browse the board with this user’s permissions.<br />Please note that admin permissions were not transferred. You are able to revert to your permission set at any time.',
-	'PM_DISABLED'				=> 'Private messaging has been disabled on this board.',
-	'PM_FROM'					=> 'From',
-	'PM_FROM_REMOVED_AUTHOR'	=> 'This message was sent by a user no longer registered.',
-	'PM_ICON'					=> 'PM icon',
-	'PM_INBOX'					=> 'Inbox',
-	'PM_NO_USERS'				=> 'The requested users to be added do not exist.',
-	'PM_OUTBOX'					=> 'Outbox',
-	'PM_SENTBOX'				=> 'Sent messages',
-	'PM_SUBJECT'				=> 'Message subject',
-	'PM_TO'						=> 'Send to',
-	'PM_USERS_REMOVED_NO_PM'	=> 'Some users couldn’t be added as they have disabled private message receipt.',
-	'POPUP_ON_PM'				=> 'Pop up window on new private message',
-	'POST_EDIT_PM'				=> 'Edit message',
-	'POST_FORWARD_PM'			=> 'Forward message',
-	'POST_NEW_PM'				=> 'Compose message',
-	'POST_PM_LOCKED'			=> 'Private messaging is locked',
-	'POST_PM_POST'				=> 'Quote post',
-	'POST_QUOTE_PM'				=> 'Quote message',
-	'POST_REPLY_PM'				=> 'Reply to message',
-	'PRINT_PM'					=> 'Print view',
-	'PREFERENCES_UPDATED'		=> 'Your preferences have been updated.',
-	'PROFILE_INFO_NOTICE'		=> 'Please note that this information may be viewable to other members. Be careful when including any personal details. Any fields marked with a * must be completed.',
-	'PROFILE_UPDATED'			=> 'Your profile has been updated.',
-
-	'RECIPIENT'							=> 'Recipient',
-	'RECIPIENTS'						=> 'Recipients',
-	'REGISTRATION'						=> 'Registration',
-	'RELEASE_MESSAGES'					=> '%sRelease all on-hold messages%s… they will be re-sorted into the appropriate folder if enough space is made available.',
-	'REMOVE_ADDRESS'					=> 'Remove address',
-	'REMOVE_SELECTED_BOOKMARKS'			=> 'Remove selected bookmarks',
-	'REMOVE_SELECTED_BOOKMARKS_CONFIRM'	=> 'Are you sure you want to delete all selected bookmarks?',
-	'REMOVE_BOOKMARK_MARKED'			=> 'Remove marked bookmarks',
-	'REMOVE_FOLDER'						=> 'Remove folder',
-	'REMOVE_FOLDER_CONFIRM'				=> 'Are you sure you want to remove this folder?',
-	'RENAME'							=> 'Rename',
-	'RENAME_FOLDER'						=> 'Rename folder',
-	'REPLIED_MESSAGE'					=> 'Replied to message',
-	'RESIGN_SELECTED'					=> 'Resign selected',
-	'RETURN_FOLDER'						=> '%1$sReturn to previous folder%2$s',
-	'RETURN_UCP'						=> '%sReturn to the User Control Panel%s',
-	'RULE_ADDED'						=> 'Rule successfully added.',
-	'RULE_ALREADY_DEFINED'				=> 'This rule was defined previously.',
-	'RULE_DELETED'						=> 'Rule successfully removed.',
-	'RULE_NOT_DEFINED'					=> 'Rule not correctly specified.',
-	'RULE_REMOVED_MESSAGE'				=> 'One private message had been removed due to private message filters.',
-	'RULE_REMOVED_MESSAGES'				=> '%d private messages were removed due to private message filters.',
-
-	'SAME_PASSWORD_ERROR'		=> 'The new password you entered is the same as your current password.',
-	'SEARCH_YOUR_POSTS'			=> 'Show your posts',
-	'SEND_PASSWORD'				=> 'Send password',
-	'SENT_AT'					=> 'Sent',			// Used before dates in private messages
-	'SHOW_EMAIL'				=> 'Users can contact me by e-mail',
-	'SIGNATURE_EXPLAIN'			=> 'This is a block of text that can be added to posts you make. There is a %d character limit.',
-	'SIGNATURE_PREVIEW'			=> 'Your signature will appear like this in posts',
-	'SIGNATURE_TOO_LONG'		=> 'Your signature is too long.',
-	'SORT'						=> 'Sort',
-	'SORT_COMMENT'				=> 'File comment',
-	'SORT_DOWNLOADS'			=> 'Downloads',
-	'SORT_EXTENSION'			=> 'Extension',
-	'SORT_FILENAME'				=> 'Filename',
-	'SORT_POST_TIME'			=> 'Post time',
-	'SORT_SIZE'					=> 'File size',
-
-	'TIMEZONE'					=> 'Timezone',
-	'TO'						=> 'To',
-	'TOO_MANY_RECIPIENTS'		=> 'You tried to send a private message to too many recipients.',
-	'TOO_MANY_REGISTERS'		=> 'You have exceeded the maximum number of registration attempts for this session. Please try again later.',
-
-	'UCP'						=> 'User Control Panel',
-	'UCP_ACTIVATE'				=> 'Activate account',
-	'UCP_ADMIN_ACTIVATE'		=> 'Please note that you will need to enter a valid e-mail address before your account is activated. The administrator will review your account and if approved you will receive an e-mail at the address you specified.',
-	'UCP_AIM'					=> 'AOL Instant Messenger',
-	'UCP_ATTACHMENTS'			=> 'Attachments',
-	'UCP_COPPA_BEFORE'			=> 'Before %s',
-	'UCP_COPPA_ON_AFTER'		=> 'On or after %s',
-	'UCP_EMAIL_ACTIVATE'		=> 'Please note that you will need to enter a valid e-mail address before your account is activated. You will receive an e-mail at the address you provide that contains an account activation link.',
-	'UCP_ICQ'					=> 'ICQ number',
-	'UCP_JABBER'				=> 'Jabber address',
-
-	'UCP_MAIN'					=> 'Overview',
-	'UCP_MAIN_ATTACHMENTS'		=> 'Manage attachments',
-	'UCP_MAIN_BOOKMARKS'		=> 'Manage bookmarks',
-	'UCP_MAIN_DRAFTS'			=> 'Manage drafts',
-	'UCP_MAIN_FRONT'			=> 'Front page',
-	'UCP_MAIN_SUBSCRIBED'		=> 'Manage subscriptions',
-
-	'UCP_MSNM'					=> 'MSN Messenger',
-	'UCP_NO_ATTACHMENTS'		=> 'You have posted no files.',
-
-	'UCP_PREFS'					=> 'Board preferences',
-	'UCP_PREFS_PERSONAL'		=> 'Edit global settings',
-	'UCP_PREFS_POST'			=> 'Edit posting defaults',
-	'UCP_PREFS_VIEW'			=> 'Edit display options',
-
-	'UCP_PM'					=> 'Private messages',
-	'UCP_PM_COMPOSE'			=> 'Compose message',
-	'UCP_PM_DRAFTS'				=> 'Manage PM drafts',
-	'UCP_PM_OPTIONS'			=> 'Rules, folders &amp; settings',
-	'UCP_PM_POPUP'				=> 'Private messages',
-	'UCP_PM_POPUP_TITLE'		=> 'Private message popup',
-	'UCP_PM_UNREAD'				=> 'Unread messages',
-	'UCP_PM_VIEW'				=> 'View messages',
-
-	'UCP_PROFILE'				=> 'Profile',
-	'UCP_PROFILE_AVATAR'		=> 'Edit avatar',
-	'UCP_PROFILE_PROFILE_INFO'	=> 'Edit profile',
-	'UCP_PROFILE_REG_DETAILS'	=> 'Edit account settings',
-	'UCP_PROFILE_SIGNATURE'		=> 'Edit signature',
-
-	'UCP_USERGROUPS'			=> 'Usergroups',
-	'UCP_USERGROUPS_MEMBER'		=> 'Edit memberships',
-	'UCP_USERGROUPS_MANAGE'		=> 'Manage groups',
-
-	'UCP_REGISTER_DISABLE'			=> 'Creating a new account is currently not possible.',
-	'UCP_REMIND'					=> 'Send password',
-	'UCP_RESEND'					=> 'Send activation e-mail',
-	'UCP_WELCOME'					=> 'Welcome to the User Control Panel. From here you can monitor, view and update your profile, preferences, subscribed forums and topics. You can also send messages to other users (if permitted). Please ensure you read any announcements before continuing.',
-	'UCP_YIM'						=> 'Yahoo Messenger',
-	'UCP_ZEBRA'						=> 'Friends &amp; Foes',
-	'UCP_ZEBRA_FOES'				=> 'Manage foes',
-	'UCP_ZEBRA_FRIENDS'				=> 'Manage friends',
-	'UNKNOWN_FOLDER'				=> 'Unknown folder',
-	'UNWATCH_MARKED'				=> 'Unwatch marked',
-	'UPLOAD_AVATAR_FILE'			=> 'Upload from your machine',
-	'UPLOAD_AVATAR_URL'				=> 'Upload from a URL',
-	'UPLOAD_AVATAR_URL_EXPLAIN'		=> 'Enter the URL of the location containing the image. The image will be copied to this site.',
-	'USERNAME_ALPHA_ONLY_EXPLAIN'	=> 'Username must be between %1$d and %2$d chars long and use only alphanumeric characters.',
-	'USERNAME_ALPHA_SPACERS_EXPLAIN'=> 'Username must be between %1$d and %2$d chars long and use alphanumeric, space or -+_[] characters.',
-	'USERNAME_ASCII_EXPLAIN'		=> 'Username must be between %1$d and %2$d chars long and use only ASCII characters, so no special symbols.',
-	'USERNAME_LETTER_NUM_EXPLAIN'	=> 'Username must be between %1$d and %2$d chars long and use only letter or number characters.',
-	'USERNAME_LETTER_NUM_SPACERS_EXPLAIN'=> 'Username must be between %1$d and %2$d chars long and use letter, number, space or -+_[] characters.',
-	'USERNAME_CHARS_ANY_EXPLAIN'	=> 'Length must be between %1$d and %2$d characters.',
-	'USERNAME_TAKEN_USERNAME'		=> 'The username you entered is already in use, please select an alternative.',
-	'USERNAME_DISALLOWED_USERNAME'	=> 'The username you entered has been disallowed or contains a disallowed word. Please choose a different name.',
-	'USER_NOT_FOUND_OR_INACTIVE'	=> 'The usernames you specified could either not be found or are not activated users.',
-
-	'VIEW_AVATARS'				=> 'Display avatars',
-	'VIEW_EDIT'					=> 'View/Edit',
-	'VIEW_FLASH'				=> 'Display Flash animations',
-	'VIEW_IMAGES'				=> 'Display images within posts',
-	'VIEW_NEXT_HISTORY'			=> 'Next PM in history',
-	'VIEW_NEXT_PM'				=> 'Next PM',
-	'VIEW_PM'					=> 'View message',
-	'VIEW_PM_INFO'				=> 'Message details',
-	'VIEW_PM_MESSAGE'			=> '1 message',
-	'VIEW_PM_MESSAGES'			=> '%d messages',
-	'VIEW_PREVIOUS_HISTORY'		=> 'Previous PM in history',
-	'VIEW_PREVIOUS_PM'			=> 'Previous PM',
-	'VIEW_SIGS'					=> 'Display signatures',
-	'VIEW_SMILIES'				=> 'Display smilies as images',
-	'VIEW_TOPICS_DAYS'			=> 'Display topics from previous days',
-	'VIEW_TOPICS_DIR'			=> 'Display topic order direction',
-	'VIEW_TOPICS_KEY'			=> 'Display topics ordering by',
-	'VIEW_POSTS_DAYS'			=> 'Display posts from previous days',
-	'VIEW_POSTS_DIR'			=> 'Display post order direction',
-	'VIEW_POSTS_KEY'			=> 'Display posts ordering by',
-
-	'WATCHED_EXPLAIN'			=> 'Below is a list of forums and topics you are subscribed to. You will be notified of new posts in either. To unsubscribe mark the forum or topic and then press the <em>Unwatch marked</em> button.',
-	'WATCHED_FORUMS'			=> 'Watched forums',
-	'WATCHED_TOPICS'			=> 'Watched topics',
-	'WRONG_ACTIVATION'			=> 'The activation key you supplied does not match any in the database.',
-
-	'YOUR_DETAILS'				=> 'Your activity',
-	'YOUR_FOES'					=> 'Your foes',
-	'YOUR_FOES_EXPLAIN'			=> 'To remove usernames select them and click submit.',
-	'YOUR_FRIENDS'				=> 'Your friends',
-	'YOUR_FRIENDS_EXPLAIN'		=> 'To remove usernames select them and click submit.',
-	'YOUR_WARNINGS'				=> 'Your warning level',
-
-	'PM_ACTION' => array(
-		'PLACE_INTO_FOLDER'	=> 'Place into folder',
-		'MARK_AS_READ'		=> 'Mark as read',
-		'MARK_AS_IMPORTANT'	=> 'Mark message',
-		'DELETE_MESSAGE'	=> 'Delete message'
-	),
-	'PM_CHECK' => array(
-		'SUBJECT'	=> 'Subject',
-		'SENDER'	=> 'Sender',
-		'MESSAGE'	=> 'Message',
-		'STATUS'	=> 'Message status',
-		'TO'		=> 'Sent To'
-	),
-	'PM_RULE' => array(
-		'IS_LIKE'		=> 'is like',
-		'IS_NOT_LIKE'	=> 'is not like',
-		'IS'			=> 'is',
-		'IS_NOT'		=> 'is not',
-		'BEGINS_WITH'	=> 'begins with',
-		'ENDS_WITH'		=> 'ends with',
-		'IS_FRIEND'		=> 'is friend',
-		'IS_FOE'		=> 'is foe',
-		'IS_USER'		=> 'is user',
-		'IS_GROUP'		=> 'is in usergroup',
-		'ANSWERED'		=> 'answered',
-		'FORWARDED'		=> 'forwarded',
-		'TO_GROUP'		=> 'to my default usergroup',
-		'TO_ME'			=> 'to me'
-	),
-
-
-	'GROUPS_EXPLAIN'	=> 'Usergroups enable board admins to better administer users. By default you will be placed in a specific group, this is your default group. This group defines how you may appear to other users, for example your username colouration, avatar, rank, etc. Depending on whether the administrator allows it you may be allowed to change your default group. You may also be placed in or allowed to join other groups. Some groups may give you additional permissions to view content or increase your capabilities in other areas.',
-	'GROUP_LEADER'		=> 'Leaderships',
-	'GROUP_MEMBER'		=> 'Memberships',
-	'GROUP_PENDING'		=> 'Pending memberships',
-	'GROUP_NONMEMBER'	=> 'Non-memberships',
-	'GROUP_DETAILS'		=> 'Group details',
-
-	'NO_LEADER'		=> 'No group leaderships',
-	'NO_MEMBER'		=> 'No group memberships',
-	'NO_PENDING'	=> 'No pending memberships',
-	'NO_NONMEMBER'	=> 'No non-member groups',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php
deleted file mode 100644
index 546f91587d..0000000000
--- a/phpBB/language/en/viewforum.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
-*
-* viewforum [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-$lang = array_merge($lang, array(
-	'ACTIVE_TOPICS'			=> 'Active topics',
-	'ANNOUNCEMENTS'			=> 'Announcements',
-
-	'FORUM_PERMISSIONS'		=> 'Forum permissions',
-
-	'ICON_ANNOUNCEMENT'		=> 'Announcement',
-	'ICON_STICKY'			=> 'Sticky',
-
-	'LOGIN_NOTIFY_FORUM'	=> 'You have been notified about this forum, please login to view it.',
-
-	'MARK_TOPICS_READ'		=> 'Mark topics read',
-
-	'NEW_POSTS_HOT'			=> 'New posts [ Popular ]',
-	'NEW_POSTS_LOCKED'		=> 'New posts [ Locked ]',
-	'NO_NEW_POSTS_HOT'		=> 'No new posts [ Popular ]',
-	'NO_NEW_POSTS_LOCKED'	=> 'No new posts [ Locked ]',
-	'NO_READ_ACCESS'		=> 'You do not have the required permissions to read topics within this forum.',
-
-	'POST_FORUM_LOCKED'		=> 'Forum is locked',
-
-	'TOPICS_MARKED'			=> 'The topics for this forum have now been marked read.',
-
-	'VIEW_FORUM'			=> 'View forum',
-	'VIEW_FORUM_TOPIC'		=> '1 topic',
-	'VIEW_FORUM_TOPICS'		=> '%d topics',
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
deleted file mode 100644
index 4252fa7542..0000000000
--- a/phpBB/language/en/viewtopic.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
-*
-* viewtopic [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-$lang = array_merge($lang, array(
-	'ATTACHMENT'						=> 'Attachment',
-	'ATTACHMENT_FUNCTIONALITY_DISABLED'	=> 'The attachments feature has been disabled.',
-
-	'BOOKMARK_ADDED'		=> 'Bookmarked topic successfully.',
-	'BOOKMARK_ERR'			=> 'Bookmarking the topic failed. Please try again.',
-	'BOOKMARK_REMOVED'		=> 'Removed bookmarked topic successfully.',
-	'BOOKMARK_TOPIC'		=> 'Bookmark topic',
-	'BOOKMARK_TOPIC_REMOVE'	=> 'Remove from bookmarks',
-	'BUMPED_BY'				=> 'Last bumped by %1$s on %2$s.',
-	'BUMP_TOPIC'			=> 'Bump topic',
-
-	'CODE'					=> 'Code',
-
-	'DELETE_TOPIC'			=> 'Delete topic',
-	'DOWNLOAD_NOTICE'		=> 'You do not have the required permissions to view the files attached to this post.',
-
-	'EDITED_TIMES_TOTAL'	=> 'Last edited by %1$s on %2$s, edited %3$d times in total.',
-	'EDITED_TIME_TOTAL'		=> 'Last edited by %1$s on %2$s, edited %3$d time in total.',
-	'EMAIL_TOPIC'			=> 'E-mail friend',
-	'ERROR_NO_ATTACHMENT'	=> 'The selected attachment does not exist anymore.',
-
-	'FILE_NOT_FOUND_404'	=> 'The file <strong>%s</strong> does not exist.',
-	'FORK_TOPIC'			=> 'Copy topic',
-
-	'LINKAGE_FORBIDDEN'		=> 'You are not authorised to view, download or link from/to this site.',
-	'LOGIN_NOTIFY_TOPIC'	=> 'You have been notified about this topic, please login to view it.',
-	'LOGIN_VIEWTOPIC'		=> 'The board requires you to be registered and logged in to view this topic.',
-
-	'MAKE_ANNOUNCE'				=> 'Change to “Announcement”',
-	'MAKE_GLOBAL'				=> 'Change to “Global”',
-	'MAKE_NORMAL'				=> 'Change to “Standard Topic”',
-	'MAKE_STICKY'				=> 'Change to “Sticky”',
-	'MAX_OPTIONS_SELECT'		=> 'You may select up to <strong>%d</strong> options',
-	'MAX_OPTION_SELECT'			=> 'You may select <strong>1</strong> option',
-	'MISSING_INLINE_ATTACHMENT'	=> 'The attachment <strong>%s</strong> is no longer available',
-	'MOVE_TOPIC'				=> 'Move topic',
-
-	'NO_ATTACHMENT_SELECTED'=> 'You haven’t selected an attachment to download or view.',
-	'NO_NEWER_TOPICS'		=> 'There are no newer topics in this forum.',
-	'NO_OLDER_TOPICS'		=> 'There are no older topics in this forum.',
-	'NO_UNREAD_POSTS'		=> 'There are no new unread posts for this topic.',
-	'NO_VOTE_OPTION'		=> 'You must specify an option when voting.',
-	'NO_VOTES'				=> 'No votes',
-
-	'POLL_ENDED_AT'			=> 'Poll ended at %s',
-	'POLL_RUN_TILL'			=> 'Poll runs till %s',
-	'POLL_VOTED_OPTION'		=> 'You voted for this option',
-	'PRINT_TOPIC'			=> 'Print view',
-
-	'QUICK_MOD'				=> 'Quick-mod tools',
-	'QUOTE'					=> 'Quote',
-
-	'REPLY_TO_TOPIC'		=> 'Reply to topic',
-	'RETURN_POST'			=> '%sReturn to the post%s',
-
-	'SUBMIT_VOTE'			=> 'Submit vote',
-
-	'TOTAL_VOTES'			=> 'Total votes',
-
-	'UNLOCK_TOPIC'			=> 'Unlock topic',
-
-	'VIEW_INFO'				=> 'Post details',
-	'VIEW_NEXT_TOPIC'		=> 'Next topic',
-	'VIEW_PREVIOUS_TOPIC'	=> 'Previous topic',
-	'VIEW_RESULTS'			=> 'View results',
-	'VIEW_TOPIC_POST'		=> '1 post',
-	'VIEW_TOPIC_POSTS'		=> '%d posts',
-	'VIEW_UNREAD_POST'		=> 'First unread post',
-	'VISIT_WEBSITE'			=> 'WWW',
-	'VOTE_SUBMITTED'		=> 'Your vote has been cast.',
-	'VOTE_CONVERTED'		=> 'Changing votes is not supported for converted polls.',
-
-));
-
-?>
-\ No newline at end of file
diff --git a/phpBB/mcp.php b/phpBB/mcp.php
deleted file mode 100644
index df1bf291de..0000000000
--- a/phpBB/mcp.php
+++ /dev/null
@@ -1,834 +0,0 @@
-<?php
-/**
-*
-* @package mcp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-define('IN_PHPBB', true);
-if (!defined('PHPBB_ROOT_PATH')) define('PHPBB_ROOT_PATH', './');
-if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-include(PHPBB_ROOT_PATH . 'common.' . PHP_EXT);
-include(PHPBB_ROOT_PATH . 'includes/functions_admin.' . PHP_EXT);
-require(PHPBB_ROOT_PATH . 'includes/functions_module.' . PHP_EXT);
-
-// Start session management
-phpbb::$user->session_begin();
-phpbb::$acl->init(phpbb::$user->data);
-phpbb::$user->setup('mcp');
-
-$module = new p_master();
-
-// Setting a variable to let the style designer know where he is...
-phpbb::$template->assign_var('S_IN_MCP', true);
-
-// Basic parameter data
-$id = request_var('i', '');
-
-$mode = request_var('mode', array(''));
-if (!empty($mode))
-{
-	$mode = key($mode);
-}
-else
-{
-	$mode = request_var('mode', '');
-}
-
-// Only Moderators can go beyond this point
-if (!phpbb::$user->is_registered)
-{
-	if (phpbb::$user->is_bot)
-	{
-		redirect(append_sid(PHPBB_ROOT_PATH . 'index.' . PHP_EXT));
-	}
-
-	login_box('', phpbb::$user->lang['LOGIN_EXPLAIN_MCP']);
-}
-
-$quickmod		= phpbb_request::is_set('quickmod');
-$action			= request_var('action', '');
-$action_ary		= request_var('action', array('' => 0));
-$forum_action	= request_var('forum_action', '');
-
-if (sizeof($action_ary))
-{
-	$action = key($action_ary);
-}
-else if (!empty($forum_action) && phpbb_request::variable('sort', false, false, phpbb_request::POST))
-{
-	$action = $forum_action;
-}
-unset($action_ary);
-
-if ($mode == 'topic_logs')
-{
-	$id = 'logs';
-	$quickmod = false;
-}
-
-$post_id = request_var('p', 0);
-$topic_id = request_var('t', 0);
-$forum_id = request_var('f', 0);
-$user_id = request_var('u', 0);
-$username = utf8_normalize_nfc(request_var('username', '', true));
-
-if ($post_id)
-{
-	// We determine the topic and forum id here, to make sure the moderator really has moderative rights on this post
-	$sql = 'SELECT topic_id, forum_id
-		FROM ' . POSTS_TABLE . "
-		WHERE post_id = $post_id";
-	$result = phpbb::$db->sql_query($sql);
-	$row = phpbb::$db->sql_fetchrow($result);
-	phpbb::$db->sql_freeresult($result);
-
-	$topic_id = (int) $row['topic_id'];
-	$forum_id = (int) ($row['forum_id']) ? $row['forum_id'] : $forum_id;
-}
-else if ($topic_id)
-{
-	$sql = 'SELECT forum_id
-		FROM ' . TOPICS_TABLE . "
-		WHERE topic_id = $topic_id";
-	$result = phpbb::$db->sql_query($sql);
-	$row = phpbb::$db->sql_fetchrow($result);
-	phpbb::$db->sql_freeresult($result);
-
-	$forum_id = (int) $row['forum_id'];
-}
-
-// If the user doesn't have any moderator powers (globally or locally) he can't access the mcp
-if (!phpbb::$acl->acl_getf_global('m_'))
-{
-	// Except he is using one of the quickmod tools for users
-	$user_quickmod_actions = array(
-		'lock'			=> 'f_user_lock',
-		'make_sticky'	=> 'f_sticky',
-		'make_announce'	=> 'f_announce',
-		'make_global'	=> 'f_announce',
-		'make_normal'	=> array('f_announce', 'f_sticky')
-	);
-
-	$allow_user = false;
-	if ($quickmod && isset($user_quickmod_actions[$action]) && phpbb::$user->is_registered && phpbb::$acl->acl_gets($user_quickmod_actions[$action], $forum_id))
-	{
-		$topic_info = get_topic_data(array($topic_id));
-		if ($topic_info[$topic_id]['topic_poster'] == phpbb::$user->data['user_id'])
-		{
-			$allow_user = true;
-		}
-	}
-
-	if (!$allow_user)
-	{
-		trigger_error('NOT_AUTHORISED');
-	}
-}
-
-// if the user cannot read the forum he tries to access then we won't allow mcp access either
-if ($forum_id && !phpbb::$acl->acl_get('f_read', $forum_id))
-{
-	trigger_error('NOT_AUTHORISED');
-}
-
-if ($forum_id)
-{
-	$module->acl_forum_id = $forum_id;
-}
-
-// Instantiate module system and generate list of available modules
-$module->list_modules('mcp');
-
-if ($quickmod)
-{
-	$mode = 'quickmod';
-
-	switch ($action)
-	{
-		case 'lock':
-		case 'unlock':
-		case 'lock_post':
-		case 'unlock_post':
-		case 'make_sticky':
-		case 'make_announce':
-		case 'make_global':
-		case 'make_normal':
-		case 'fork':
-		case 'move':
-		case 'delete_post':
-		case 'delete_topic':
-			$module->load('mcp', 'main', 'quickmod');
-			return;
-		break;
-
-		case 'topic_logs':
-			// Reset start parameter if we jumped from the quickmod dropdown
-			if (request_var('start', 0))
-			{
-				phpbb_request::overwrite('start', 0, phpbb_request::GET);
-				phpbb_request::overwrite('start', 0, phpbb_request::REQUEST);
-			}
-
-			$module->set_active('logs', 'topic_logs');
-		break;
-
-		case 'merge_topic':
-			$module->set_active('main', 'forum_view');
-		break;
-
-		case 'split':
-		case 'merge':
-			$module->set_active('main', 'topic_view');
-		break;
-
-		default:
-			trigger_error("$action not allowed as quickmod", E_USER_ERROR);
-		break;
-	}
-}
-else
-{
-	// Select the active module
-	$module->set_active($id, $mode);
-}
-
-// Hide some of the options if we don't have the relevant information to use them
-if (!$post_id)
-{
-	$module->set_display('main', 'post_details', false);
-	$module->set_display('warn', 'warn_post', false);
-}
-
-if ($mode == '' || $mode == 'unapproved_topics' || $mode == 'unapproved_posts')
-{
-	$module->set_display('queue', 'approve_details', false);
-}
-
-if ($mode == '' || $mode == 'reports' || $mode == 'reports_closed')
-{
-	$module->set_display('reports', 'report_details', false);
-}
-
-if (!$topic_id)
-{
-	$module->set_display('main', 'topic_view', false);
-	$module->set_display('logs', 'topic_logs', false);
-}
-
-if (!$forum_id)
-{
-	$module->set_display('main', 'forum_view', false);
-	$module->set_display('logs', 'forum_logs', false);
-}
-
-if (!$user_id && $username == '')
-{
-	$module->set_display('notes', 'user_notes', false);
-	$module->set_display('warn', 'warn_user', false);
-}
-
-// Load and execute the relevant module
-$module->load_active();
-
-// Assign data to the template engine for the list of modules
-$module->assign_tpl_vars(append_sid(PHPBB_ROOT_PATH . 'mcp.' . PHP_EXT));
-
-// Generate urls for letting the moderation control panel being accessed in different modes
-phpbb::$template->assign_vars(array(
-	'U_MCP'			=> append_sid('mcp', 'i=main'),
-	'U_MCP_FORUM'	=> ($forum_id) ? append_sid('mcp', "i=main&amp;mode=forum_view&amp;f=$forum_id") : '',
-	'U_MCP_TOPIC'	=> ($forum_id && $topic_id) ? append_sid('mcp', "i=main&amp;mode=topic_view&amp;t=$topic_id") : '',
-	'U_MCP_POST'	=> ($forum_id && $topic_id && $post_id) ? append_sid('mcp', "i=main&amp;mode=post_details&amp;t=$topic_id&amp;p=$post_id") : '',
-));
-
-// Generate the page, do not display/query online list
-$module->display($module->get_page_title(), false);
-
-/**
-* Functions used to generate additional URL paramters
-*/
-function _module__url($mode, &$module_row)
-{
-	return extra_url();
-}
-
-function _module_notes_url($mode, &$module_row)
-{
-	if ($mode == 'front')
-	{
-		return '';
-	}
-
-	global $user_id;
-	return ($user_id) ? "&amp;u=$user_id" : '';
-}
-
-function _module_warn_url($mode, &$module_row)
-{
-	if ($mode == 'front' || $mode == 'list')
-	{
-		global $forum_id;
-
-		return ($forum_id) ? "&amp;f=$forum_id" : '';
-	}
-
-	if ($mode == 'warn_post')
-	{
-		global $forum_id, $post_id;
-
-		$url_extra = ($forum_id) ? "&amp;f=$forum_id" : '';
-		$url_extra .= ($post_id) ? "&amp;p=$post_id" : '';
-
-		return $url_extra;
-	}
-	else
-	{
-		global $user_id;
-
-		return ($user_id) ? "&amp;u=$user_id" : '';
-	}
-}
-
-function _module_main_url($mode, &$module_row)
-{
-	return extra_url();
-}
-
-function _module_logs_url($mode, &$module_row)
-{
-	return extra_url();
-}
-
-function _module_ban_url($mode, &$module_row)
-{
-	return extra_url();
-}
-
-function _module_queue_url($mode, &$module_row)
-{
-	return extra_url();
-}
-
-function _module_reports_url($mode, &$module_row)
-{
-	return extra_url();
-}
-
-function extra_url()
-{
-	global $forum_id, $topic_id, $post_id, $user_id;
-
-	$url_extra = '';
-	$url_extra .= ($forum_id) ? "&amp;f=$forum_id" : '';
-	$url_extra .= ($topic_id) ? "&amp;t=$topic_id" : '';
-	$url_extra .= ($post_id) ? "&amp;p=$post_id" : '';
-	$url_extra .= ($user_id) ? "&amp;u=$user_id" : '';
-
-	return $url_extra;
-}
-
-/**
-* Get simple topic data
-*/
-function get_topic_data($topic_ids, $acl_list = false, $read_tracking = false)
-{
-	static $rowset = array();
-
-	$topics = array();
-
-	if (!sizeof($topic_ids))
-	{
-		return array();
-	}
-
-	// cache might not contain read tracking info, so we can't use it if read
-	// tracking information is requested
-	if (!$read_tracking)
-	{
-		$cache_topic_ids = array_intersect($topic_ids, array_keys($rowset));
-		$topic_ids = array_diff($topic_ids, array_keys($rowset));
-	}
-	else
-	{
-		$cache_topic_ids = array();
-	}
-
-	if (sizeof($topic_ids))
-	{
-		$sql_array = array(
-			'SELECT'	=> 't.*, f.*',
-
-			'FROM'		=> array(
-				TOPICS_TABLE	=> 't',
-			),
-
-			'LEFT_JOIN'	=> array(
-				array(
-					'FROM'	=> array(FORUMS_TABLE => 'f'),
-					'ON'	=> 'f.forum_id = t.forum_id'
-				)
-			),
-
-			'WHERE'		=> phpbb::$db->sql_in_set('t.topic_id', $topic_ids)
-		);
-
-		if ($read_tracking && phpbb::$config['load_db_lastread'])
-		{
-			$sql_array['SELECT'] .= ', tt.mark_time, ft.mark_time as forum_mark_time';
-
-			$sql_array['LEFT_JOIN'][] = array(
-				'FROM'	=> array(TOPICS_TRACK_TABLE => 'tt'),
-				'ON'	=> 'tt.user_id = ' . phpbb::$user->data['user_id'] . ' AND t.topic_id = tt.topic_id'
-			);
-
-			$sql_array['LEFT_JOIN'][] = array(
-				'FROM'	=> array(FORUMS_TRACK_TABLE => 'ft'),
-				'ON'	=> 'ft.user_id = ' . phpbb::$user->data['user_id'] . ' AND t.forum_id = ft.forum_id'
-			);
-		}
-
-		$sql = phpbb::$db->sql_build_query('SELECT', $sql_array);
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			if (!$row['forum_id'])
-			{
-				// Global Announcement?
-				$row['forum_id'] = request_var('f', 0);
-			}
-
-			$rowset[$row['topic_id']] = $row;
-
-			if ($acl_list && !phpbb::$acl->acl_gets($acl_list, $row['forum_id']))
-			{
-				continue;
-			}
-
-			$topics[$row['topic_id']] = $row;
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	foreach ($cache_topic_ids as $id)
-	{
-		if (!$acl_list || phpbb::$acl->acl_gets($acl_list, $rowset[$id]['forum_id']))
-		{
-			$topics[$id] = $rowset[$id];
-		}
-	}
-
-	return $topics;
-}
-
-/**
-* Get simple post data
-*/
-function get_post_data($post_ids, $acl_list = false, $read_tracking = false)
-{
-	$rowset = array();
-
-	if (!sizeof($post_ids))
-	{
-		return array();
-	}
-
-	$sql_array = array(
-		'SELECT'	=> 'p.*, u.*, t.*, f.*',
-
-		'FROM'		=> array(
-			USERS_TABLE		=> 'u',
-			POSTS_TABLE		=> 'p',
-			TOPICS_TABLE	=> 't',
-		),
-
-		'LEFT_JOIN'	=> array(
-			array(
-				'FROM'	=> array(FORUMS_TABLE => 'f'),
-				'ON'	=> 'f.forum_id = t.forum_id'
-			)
-		),
-
-		'WHERE'		=> phpbb::$db->sql_in_set('p.post_id', $post_ids) . '
-			AND u.user_id = p.poster_id
-			AND t.topic_id = p.topic_id',
-	);
-
-	if ($read_tracking && phpbb::$config['load_db_lastread'])
-	{
-		$sql_array['SELECT'] .= ', tt.mark_time, ft.mark_time as forum_mark_time';
-
-		$sql_array['LEFT_JOIN'][] = array(
-			'FROM'	=> array(TOPICS_TRACK_TABLE => 'tt'),
-			'ON'	=> 'tt.user_id = ' . phpbb::$user->data['user_id'] . ' AND t.topic_id = tt.topic_id'
-		);
-
-		$sql_array['LEFT_JOIN'][] = array(
-			'FROM'	=> array(FORUMS_TRACK_TABLE => 'ft'),
-			'ON'	=> 'ft.user_id = ' . phpbb::$user->data['user_id'] . ' AND t.forum_id = ft.forum_id'
-		);
-	}
-
-	$sql = phpbb::$db->sql_build_query('SELECT', $sql_array);
-	$result = phpbb::$db->sql_query($sql);
-	unset($sql_array);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		if (!$row['forum_id'])
-		{
-			// Global Announcement?
-			$row['forum_id'] = request_var('f', 0);
-		}
-
-		if ($acl_list && !phpbb::$acl->acl_gets($acl_list, $row['forum_id']))
-		{
-			continue;
-		}
-
-		if (!$row['post_approved'] && !phpbb::$acl->acl_get('m_approve', $row['forum_id']))
-		{
-			// Moderators without the permission to approve post should at least not see them. ;)
-			continue;
-		}
-
-		$rowset[$row['post_id']] = $row;
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	return $rowset;
-}
-
-/**
-* Get simple forum data
-*/
-function get_forum_data($forum_id, $acl_list = 'f_list', $read_tracking = false)
-{
-	$rowset = array();
-
-	if (!is_array($forum_id))
-	{
-		$forum_id = array($forum_id);
-	}
-
-	if (!sizeof($forum_id))
-	{
-		return array();
-	}
-
-	if ($read_tracking && phpbb::$config['load_db_lastread'])
-	{
-		$read_tracking_join = ' LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.user_id = ' . phpbb::$user->data['user_id'] . '
-			AND ft.forum_id = f.forum_id)';
-		$read_tracking_select = ', ft.mark_time';
-	}
-	else
-	{
-		$read_tracking_join = $read_tracking_select = '';
-	}
-
-	$sql = "SELECT f.* $read_tracking_select
-		FROM " . FORUMS_TABLE . " f$read_tracking_join
-		WHERE " . phpbb::$db->sql_in_set('f.forum_id', $forum_id);
-	$result = phpbb::$db->sql_query($sql);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		if ($acl_list && !phpbb::$acl->acl_gets($acl_list, $row['forum_id']))
-		{
-			continue;
-		}
-
-		if (phpbb::$acl->acl_get('m_approve', $row['forum_id']))
-		{
-			$row['forum_topics'] = $row['forum_topics_real'];
-		}
-
-		$rowset[$row['forum_id']] = $row;
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	return $rowset;
-}
-
-/**
-* sorting in mcp
-*
-* @param string $where_sql should either be WHERE (default if ommited) or end with AND or OR
-*/
-function mcp_sorting($mode, &$sort_days, &$sort_key, &$sort_dir, &$sort_by_sql, &$sort_order_sql, &$total, $forum_id = 0, $topic_id = 0, $where_sql = 'WHERE')
-{
-	$sort_days = request_var('st', 0);
-	$min_time = ($sort_days) ? time() - ($sort_days * 86400) : 0;
-
-	switch ($mode)
-	{
-		case 'viewforum':
-			$type = 'topics';
-			$default_key = 't';
-			$default_dir = 'd';
-
-			$sql = 'SELECT COUNT(topic_id) AS total
-				FROM ' . TOPICS_TABLE . "
-				$where_sql forum_id = $forum_id
-					AND topic_type NOT IN (" . POST_ANNOUNCE . ', ' . POST_GLOBAL . ")
-					AND topic_last_post_time >= $min_time";
-
-			if (!phpbb::$acl->acl_get('m_approve', $forum_id))
-			{
-				$sql .= 'AND topic_approved = 1';
-			}
-		break;
-
-		case 'viewtopic':
-			$type = 'posts';
-			$default_key = 't';
-			$default_dir = 'a';
-
-			$sql = 'SELECT COUNT(post_id) AS total
-				FROM ' . POSTS_TABLE . "
-				$where_sql topic_id = $topic_id
-					AND post_time >= $min_time";
-
-			if (!phpbb::$acl->acl_get('m_approve', $forum_id))
-			{
-				$sql .= 'AND post_approved = 1';
-			}
-		break;
-
-		case 'unapproved_posts':
-			$type = 'posts';
-			$default_key = 't';
-			$default_dir = 'd';
-			$where_sql .= ($topic_id) ? ' topic_id = ' . $topic_id . ' AND' : '';
-
-			$sql = 'SELECT COUNT(post_id) AS total
-				FROM ' . POSTS_TABLE . "
-				$where_sql " . phpbb::$db->sql_in_set('forum_id', ($forum_id) ? array($forum_id) : array_intersect(get_forum_list('f_read'), get_forum_list('m_approve'))) . '
-					AND post_approved = 0';
-
-			if ($min_time)
-			{
-				$sql .= ' AND post_time >= ' . $min_time;
-			}
-		break;
-
-		case 'unapproved_topics':
-			$type = 'topics';
-			$default_key = 't';
-			$default_dir = 'd';
-
-			$sql = 'SELECT COUNT(topic_id) AS total
-				FROM ' . TOPICS_TABLE . "
-				$where_sql " . phpbb::$db->sql_in_set('forum_id', ($forum_id) ? array($forum_id) : array_intersect(get_forum_list('f_read'), get_forum_list('m_approve'))) . '
-					AND topic_approved = 0';
-
-			if ($min_time)
-			{
-				$sql .= ' AND topic_time >= ' . $min_time;
-			}
-		break;
-
-		case 'reports':
-		case 'reports_closed':
-			$type = 'reports';
-			$default_key = 't';
-			$default_dir = 'd';
-			$limit_time_sql = ($min_time) ? "AND r.report_time >= $min_time" : '';
-
-			if ($topic_id)
-			{
-				$where_sql .= ' p.topic_id = ' . $topic_id;
-			}
-			else if ($forum_id)
-			{
-				$where_sql .= ' p.forum_id = ' . $forum_id;
-			}
-			else
-			{
-				$where_sql .= ' ' . phpbb::$db->sql_in_set('p.forum_id', get_forum_list(array('!f_read', '!m_report')), true, true);
-			}
-
-			if ($mode == 'reports')
-			{
-				$where_sql .= ' AND r.report_closed = 0';
-			}
-			else
-			{
-				$where_sql .= ' AND r.report_closed = 1';
-			}
-
-			$sql = 'SELECT COUNT(r.report_id) AS total
-				FROM ' . REPORTS_TABLE . ' r, ' . POSTS_TABLE . " p
-				$where_sql
-					AND p.post_id = r.post_id
-					$limit_time_sql";
-		break;
-
-		case 'viewlogs':
-			$type = 'logs';
-			$default_key = 't';
-			$default_dir = 'd';
-
-			$sql = 'SELECT COUNT(log_id) AS total
-				FROM ' . LOG_TABLE . "
-				$where_sql " . phpbb::$db->sql_in_set('forum_id', ($forum_id) ? array($forum_id) : array_intersect(get_forum_list('f_read'), get_forum_list('m_'))) . '
-					AND log_time >= ' . $min_time . '
-					AND log_type = ' . LOG_MOD;
-		break;
-	}
-
-	$sort_key = request_var('sk', $default_key);
-	$sort_dir = request_var('sd', $default_dir);
-	$sort_dir_text = array('a' => phpbb::$user->lang['ASCENDING'], 'd' => phpbb::$user->lang['DESCENDING']);
-
-	switch ($type)
-	{
-		case 'topics':
-			$limit_days = array(0 => phpbb::$user->lang['ALL_TOPICS'], 1 => phpbb::$user->lang['1_DAY'], 7 => phpbb::$user->lang['7_DAYS'], 14 => phpbb::$user->lang['2_WEEKS'], 30 => phpbb::$user->lang['1_MONTH'], 90 => phpbb::$user->lang['3_MONTHS'], 180 => phpbb::$user->lang['6_MONTHS'], 365 => phpbb::$user->lang['1_YEAR']);
-			$sort_by_text = array('a' => phpbb::$user->lang['AUTHOR'], 't' => phpbb::$user->lang['POST_TIME'], 'tt' => phpbb::$user->lang['TOPIC_TIME'], 'r' => phpbb::$user->lang['REPLIES'], 's' => phpbb::$user->lang['SUBJECT'], 'v' => phpbb::$user->lang['VIEWS']);
-
-			$sort_by_sql = array('a' => 't.topic_first_poster_name', 't' => 't.topic_last_post_time', 'tt' => 't.topic_time', 'r' => ((phpbb::$acl->acl_get('m_approve', $forum_id)) ? 't.topic_replies_real' : 't.topic_replies'), 's' => 't.topic_title', 'v' => 't.topic_views');
-			$limit_time_sql = ($min_time) ? "AND t.topic_last_post_time >= $min_time" : '';
-		break;
-
-		case 'posts':
-			$limit_days = array(0 => phpbb::$user->lang['ALL_POSTS'], 1 => phpbb::$user->lang['1_DAY'], 7 => phpbb::$user->lang['7_DAYS'], 14 => phpbb::$user->lang['2_WEEKS'], 30 => phpbb::$user->lang['1_MONTH'], 90 => phpbb::$user->lang['3_MONTHS'], 180 => phpbb::$user->lang['6_MONTHS'], 365 => phpbb::$user->lang['1_YEAR']);
-			$sort_by_text = array('a' => phpbb::$user->lang['AUTHOR'], 't' => phpbb::$user->lang['POST_TIME'], 's' => phpbb::$user->lang['SUBJECT']);
-			$sort_by_sql = array('a' => 'u.username_clean', 't' => 'p.post_time', 's' => 'p.post_subject');
-			$limit_time_sql = ($min_time) ? "AND p.post_time >= $min_time" : '';
-		break;
-
-		case 'reports':
-			$limit_days = array(0 => phpbb::$user->lang['ALL_REPORTS'], 1 => phpbb::$user->lang['1_DAY'], 7 => phpbb::$user->lang['7_DAYS'], 14 => phpbb::$user->lang['2_WEEKS'], 30 => phpbb::$user->lang['1_MONTH'], 90 => phpbb::$user->lang['3_MONTHS'], 180 => phpbb::$user->lang['6_MONTHS'], 365 => phpbb::$user->lang['1_YEAR']);
-			$sort_by_text = array('a' => phpbb::$user->lang['AUTHOR'], 'r' => phpbb::$user->lang['REPORTER'], 'p' => phpbb::$user->lang['POST_TIME'], 't' => phpbb::$user->lang['REPORT_TIME'], 's' => phpbb::$user->lang['SUBJECT']);
-			$sort_by_sql = array('a' => 'u.username_clean', 'r' => 'ru.username', 'p' => 'p.post_time', 't' => 'r.report_time', 's' => 'p.post_subject');
-		break;
-
-		case 'logs':
-			$limit_days = array(0 => phpbb::$user->lang['ALL_ENTRIES'], 1 => phpbb::$user->lang['1_DAY'], 7 => phpbb::$user->lang['7_DAYS'], 14 => phpbb::$user->lang['2_WEEKS'], 30 => phpbb::$user->lang['1_MONTH'], 90 => phpbb::$user->lang['3_MONTHS'], 180 => phpbb::$user->lang['6_MONTHS'], 365 => phpbb::$user->lang['1_YEAR']);
-			$sort_by_text = array('u' => phpbb::$user->lang['SORT_USERNAME'], 't' => phpbb::$user->lang['SORT_DATE'], 'i' => phpbb::$user->lang['SORT_IP'], 'o' => phpbb::$user->lang['SORT_ACTION']);
-
-			$sort_by_sql = array('u' => 'u.username_clean', 't' => 'l.log_time', 'i' => 'l.log_ip', 'o' => 'l.log_operation');
-			$limit_time_sql = ($min_time) ? "AND l.log_time >= $min_time" : '';
-		break;
-	}
-
-	if (!isset($sort_by_sql[$sort_key]))
-	{
-		$sort_key = $default_key;
-	}
-
-	$sort_order_sql = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
-
-	$s_limit_days = $s_sort_key = $s_sort_dir = $sort_url = '';
-	gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $sort_url);
-
-	phpbb::$template->assign_vars(array(
-		'S_SELECT_SORT_DIR'		=> $s_sort_dir,
-		'S_SELECT_SORT_KEY'		=> $s_sort_key,
-		'S_SELECT_SORT_DAYS'	=> $s_limit_days,
-	));
-
-	if (($sort_days && $mode != 'viewlogs') || in_array($mode, array('reports', 'unapproved_topics', 'unapproved_posts')) || $where_sql != 'WHERE')
-	{
-		$result = phpbb::$db->sql_query($sql);
-		$total = (int) phpbb::$db->sql_fetchfield('total');
-		phpbb::$db->sql_freeresult($result);
-	}
-	else
-	{
-		$total = -1;
-	}
-}
-
-/**
-* Validate ids
-*
-* @param	array	&$ids			The relevant ids to check
-* @param	string	$table			The table to find the ids in
-* @param	string	$sql_id			The ids relevant column name
-* @param	array	$acl_list		A list of permissions the user need to have
-* @param	mixed	$singe_forum	Limit to one forum id (int) or the first forum found (true)
-*
-* @return	mixed	False if no ids were able to be retrieved, true if at least one id left.
-*					Additionally, this value can be the forum_id assigned if $single_forum was set.
-*					Therefore checking the result for with !== false is the best method.
-*/
-function check_ids(&$ids, $table, $sql_id, $acl_list = false, $single_forum = false)
-{
-	if (!is_array($ids) || empty($ids))
-	{
-		return false;
-	}
-
-	$sql = "SELECT $sql_id, forum_id FROM $table
-		WHERE " . phpbb::$db->sql_in_set($sql_id, $ids);
-	$result = phpbb::$db->sql_query($sql);
-
-	$ids = array();
-	$forum_id = false;
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		if ($acl_list && $row['forum_id'] && !phpbb::$acl->acl_gets($acl_list, $row['forum_id']))
-		{
-			continue;
-		}
-
-		if ($acl_list && !$row['forum_id'] && !phpbb::$acl->acl_getf_global($acl_list))
-		{
-			continue;
-		}
-
-		// Limit forum? If not, just assign the id.
-		if ($single_forum === false)
-		{
-			$ids[] = $row[$sql_id];
-			continue;
-		}
-
-		// Limit forum to a specific forum id?
-		// This can get really tricky, because we do not want to create a failure on global topics. :)
-		if ($row['forum_id'])
-		{
-			if ($single_forum !== true && $row['forum_id'] == (int) $single_forum)
-			{
-				$forum_id = (int) $single_forum;
-			}
-			else if ($forum_id === false)
-			{
-				$forum_id = $row['forum_id'];
-			}
-
-			if ($row['forum_id'] == $forum_id)
-			{
-				$ids[] = $row[$sql_id];
-			}
-		}
-		else
-		{
-			// Always add a global topic
-			$ids[] = $row[$sql_id];
-		}
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	if (!sizeof($ids))
-	{
-		return false;
-	}
-
-	// If forum id is false and ids populated we may have only global announcements selected (returning 0 because of (int) $forum_id)
-
-	return ($single_forum === false) ? true : (int) $forum_id;
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
deleted file mode 100644
index 1ba62f7f8f..0000000000
--- a/phpBB/memberlist.php
+++ /dev/null
@@ -1,1658 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-define('IN_PHPBB', true);
-if (!defined('PHPBB_ROOT_PATH')) define('PHPBB_ROOT_PATH', './');
-if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-include(PHPBB_ROOT_PATH . 'common.' . PHP_EXT);
-include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-
-// Start session management
-phpbb::$user->session_begin();
-phpbb::$acl->init(phpbb::$user->data);
-phpbb::$user->setup(array('memberlist', 'groups'));
-
-// Grab data
-$mode		= request_var('mode', '');
-$action		= request_var('action', '');
-$user_id	= request_var('u', ANONYMOUS);
-$username	= request_var('un', '', true);
-$group_id	= request_var('g', 0);
-$topic_id	= request_var('t', 0);
-
-// Check our mode...
-if (!in_array($mode, array('', 'group', 'viewprofile', 'email', 'contact', 'searchuser', 'leaders')))
-{
-	trigger_error('NO_MODE');
-}
-
-switch ($mode)
-{
-	case 'email':
-	break;
-
-	default:
-		// Can this user view profiles/memberlist?
-		if (!phpbb::$acl->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel'))
-		{
-			if (!phpbb::$user->is_guest)
-			{
-				trigger_error('NO_VIEW_USERS');
-			}
-
-			login_box('', ((isset(phpbb::$user->lang['LOGIN_EXPLAIN_' . strtoupper($mode)])) ? phpbb::$user->lang['LOGIN_EXPLAIN_' . strtoupper($mode)] : phpbb::$user->lang['LOGIN_EXPLAIN_MEMBERLIST']));
-		}
-	break;
-}
-
-$start	= request_var('start', 0);
-$submit = phpbb_request::is_set_post('submit');
-
-$default_key = 'c';
-$sort_key = request_var('sk', $default_key);
-$sort_dir = request_var('sd', 'a');
-
-
-// Grab rank information for later
-$ranks = phpbb_cache::obtain_ranks();
-
-
-// What do you want to do today? ... oops, I think that line is taken ...
-switch ($mode)
-{
-	case 'leaders':
-		// Display a listing of board admins, moderators
-		include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-
-		$page_title = phpbb::$user->lang['THE_TEAM'];
-		$template_html = 'memberlist_leaders.html';
-
-		$user_ary = phpbb::$acl->acl_get_list(false, array('a_', 'm_'), false);
-
-		$admin_id_ary = $global_mod_id_ary = $mod_id_ary = $forum_id_ary = array();
-		foreach ($user_ary as $forum_id => $forum_ary)
-		{
-			foreach ($forum_ary as $auth_option => $id_ary)
-			{
-				if (!$forum_id)
-				{
-					if ($auth_option == 'a_')
-					{
-						$admin_id_ary = array_merge($admin_id_ary, $id_ary);
-					}
-					else
-					{
-						$global_mod_id_ary = array_merge($global_mod_id_ary, $id_ary);
-					}
-					continue;
-				}
-				else
-				{
-					$mod_id_ary = array_merge($mod_id_ary, $id_ary);
-				}
-
-				if ($forum_id)
-				{
-					foreach ($id_ary as $id)
-					{
-						$forum_id_ary[$id][] = $forum_id;
-					}
-				}
-			}
-		}
-
-		$admin_id_ary = array_unique($admin_id_ary);
-		$global_mod_id_ary = array_unique($global_mod_id_ary);
-
-		$mod_id_ary = array_merge($mod_id_ary, $global_mod_id_ary);
-		$mod_id_ary = array_unique($mod_id_ary);
-
-		// Admin group id...
-		$sql = 'SELECT group_id
-			FROM ' . GROUPS_TABLE . "
-			WHERE group_name = 'ADMINISTRATORS'";
-		$result = phpbb::$db->sql_query($sql);
-		$admin_group_id = (int) phpbb::$db->sql_fetchfield('group_id');
-		phpbb::$db->sql_freeresult($result);
-
-		// Get group memberships for the admin id ary...
-		$admin_memberships = group_memberships($admin_group_id, $admin_id_ary);
-
-		$admin_user_ids = array();
-
-		if (!empty($admin_memberships))
-		{
-			// ok, we only need the user ids...
-			foreach ($admin_memberships as $row)
-			{
-				$admin_user_ids[$row['user_id']] = true;
-			}
-		}
-		unset($admin_memberships);
-
-		$sql = 'SELECT forum_id, forum_name
-			FROM ' . FORUMS_TABLE;
-		$result = phpbb::$db->sql_query($sql);
-
-		$forums = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$forums[$row['forum_id']] = $row['forum_name'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$sql = phpbb::$db->sql_build_query('SELECT', array(
-			'SELECT'	=> 'u.user_id, u.group_id as default_group, u.username, u.username_clean, u.user_colour, u.user_rank, u.user_posts, u.user_allow_pm, g.group_id, g.group_name, g.group_colour, g.group_type, ug.user_id as ug_user_id',
-
-			'FROM'		=> array(
-				USERS_TABLE		=> 'u',
-				GROUPS_TABLE	=> 'g'
-			),
-
-			'LEFT_JOIN'	=> array(
-				array(
-					'FROM'	=> array(USER_GROUP_TABLE => 'ug'),
-					'ON'	=> 'ug.group_id = g.group_id AND ug.user_pending = 0 AND ug.user_id = ' . phpbb::$user->data['user_id']
-				)
-			),
-
-			'WHERE'		=> phpbb::$db->sql_in_set('u.user_id', array_unique(array_merge($admin_id_ary, $mod_id_ary)), false, true) . '
-				AND u.group_id = g.group_id',
-
-			'ORDER_BY'	=> 'g.group_name ASC, u.username_clean ASC'
-		));
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$which_row = (in_array($row['user_id'], $admin_id_ary)) ? 'admin' : 'mod';
-
-			// We sort out admins not within the 'Administrators' group.
-			// Else, we will list those as admin only having the permission to view logs for example.
-			if ($which_row == 'admin' && empty($admin_user_ids[$row['user_id']]))
-			{
-				// Remove from admin_id_ary, because the user may be a mod instead
-				unset($admin_id_ary[array_search($row['user_id'], $admin_id_ary)]);
-
-				if (!in_array($row['user_id'], $mod_id_ary) && !in_array($row['user_id'], $global_mod_id_ary))
-				{
-					continue;
-				}
-				else
-				{
-					$which_row = 'mod';
-				}
-			}
-
-			$s_forum_select = '';
-			$undisclosed_forum = false;
-
-			if (isset($forum_id_ary[$row['user_id']]) && !in_array($row['user_id'], $global_mod_id_ary))
-			{
-				if ($which_row == 'mod' && sizeof(array_diff(array_keys($forums), $forum_id_ary[$row['user_id']])))
-				{
-					foreach ($forum_id_ary[$row['user_id']] as $forum_id)
-					{
-						if (isset($forums[$forum_id]))
-						{
-							if (phpbb::$acl->acl_get('f_list', $forum_id))
-							{
-								$s_forum_select .= '<option value="">' . $forums[$forum_id] . '</option>';
-							}
-							else
-							{
-								$undisclosed_forum = true;
-							}
-						}
-					}
-				}
-			}
-
-			// If the mod is only moderating non-viewable forums we skip the user. There is no gain in displaying the person then...
-			if (!$s_forum_select && $undisclosed_forum)
-			{
-//				$s_forum_select = '<option value="">' . phpbb::$user->lang['FORUM_UNDISCLOSED'] . '</option>';
-				continue;
-			}
-
-			// The person is moderating several "public" forums, therefore the person should be listed, but not giving the real group name if hidden.
-			if ($row['group_type'] == GROUP_HIDDEN && !phpbb::$acl->acl_gets('a_group', 'a_groupadd', 'a_groupdel') && $row['ug_user_id'] != phpbb::$user->data['user_id'])
-			{
-				$group_name = phpbb::$user->lang['GROUP_UNDISCLOSED'];
-				$u_group = '';
-			}
-			else
-			{
-				$group_name = ($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name'];
-				$u_group = append_sid('memberlist', 'mode=group&amp;g=' . $row['group_id']);
-			}
-
-			$rank_title = $rank_img = '';
-			get_user_rank($row['user_id'], $row['user_rank'], $row['user_posts'], $rank_title, $rank_img, $rank_img_src);
-
-			phpbb::$template->assign_block_vars($which_row, array(
-				'USER_ID'		=> $row['user_id'],
-				'FORUMS'		=> $s_forum_select,
-				'RANK_TITLE'	=> $rank_title,
-				'GROUP_NAME'	=> $group_name,
-				'GROUP_COLOR'	=> $row['group_colour'],
-
-				'RANK_IMG'		=> $rank_img,
-				'RANK_IMG_SRC'	=> $rank_img_src,
-
-				'U_GROUP'			=> $u_group,
-				'U_PM'				=> (phpbb::$config['allow_privmsg'] && phpbb::$acl->acl_get('u_sendpm') && ($row['user_allow_pm'] || phpbb::$acl->acl_gets('a_', 'm_') || phpbb::$acl->acl_getf_global('m_'))) ? append_sid('ucp', 'i=pm&amp;mode=compose&amp;u=' . $row['user_id']) : '',
-
-				'USERNAME_FULL'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
-				'USERNAME'			=> get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']),
-				'USER_COLOR'		=> get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']),
-				'U_VIEW_PROFILE'	=> get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']),
-			));
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		phpbb::$template->assign_vars(array(
-			'PM_IMG'		=> phpbb::$user->img('icon_contact_pm', phpbb::$user->lang['SEND_PRIVATE_MESSAGE']),
-		));
-	break;
-
-	case 'contact':
-
-		$page_title = phpbb::$user->lang['IM_USER'];
-		$template_html = 'memberlist_im.html';
-
-		if (!phpbb::$acl->acl_get('u_sendim'))
-		{
-			trigger_error('NOT_AUTHORISED');
-		}
-
-		$presence_img = '';
-		switch ($action)
-		{
-			case 'aim':
-				$lang = 'AIM';
-				$sql_field = 'user_aim';
-				$s_select = 'S_SEND_AIM';
-				$s_action = '';
-			break;
-
-			case 'msnm':
-				$lang = 'MSNM';
-				$sql_field = 'user_msnm';
-				$s_select = 'S_SEND_MSNM';
-				$s_action = '';
-			break;
-
-			case 'jabber':
-				$lang = 'JABBER';
-				$sql_field = 'user_jabber';
-				$s_select = (@extension_loaded('xml') && phpbb::$config['jab_enable']) ? 'S_SEND_JABBER' : 'S_NO_SEND_JABBER';
-				$s_action = append_sid('memberlist', "mode=contact&amp;action=$action&amp;u=$user_id");
-			break;
-
-			default:
-				trigger_error('NO_MODE', E_USER_ERROR);
-			break;
-		}
-
-		// Grab relevant data
-		$sql = "SELECT user_id, username, user_email, user_lang, $sql_field
-			FROM " . USERS_TABLE . "
-			WHERE user_id = $user_id
-				AND user_type IN (" . phpbb::USER_NORMAL . ', ' . phpbb::USER_FOUNDER . ')';
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$row)
-		{
-			trigger_error('NO_USER');
-		}
-		else if (empty($row[$sql_field]))
-		{
-			trigger_error('IM_NO_DATA');
-		}
-
-		// Post data grab actions
-		switch ($action)
-		{
-			case 'jabber':
-				add_form_key('memberlist_messaging');
-
-				if ($submit && @extension_loaded('xml') && phpbb::$config['jab_enable'])
-				{
-					if (check_form_key('memberlist_messaging'))
-					{
-
-						include_once(PHPBB_ROOT_PATH . 'includes/functions_messenger.' . PHP_EXT);
-
-						$subject = sprintf(phpbb::$user->lang['IM_JABBER_SUBJECT'], phpbb::$user->data['username'], phpbb::$config['server_name']);
-						$message = utf8_normalize_nfc(request_var('message', '', true));
-
-						if (empty($message))
-						{
-							trigger_error('EMPTY_MESSAGE_IM');
-						}
-
-						$messenger = new messenger(false);
-
-						$messenger->template('profile_send_im', $row['user_lang']);
-						$messenger->subject(htmlspecialchars_decode($subject));
-
-						$messenger->replyto(phpbb::$user->data['user_email']);
-						$messenger->im($row['user_jabber'], $row['username']);
-
-						$messenger->assign_vars(array(
-							'BOARD_CONTACT'	=> phpbb::$config['board_contact'],
-							'FROM_USERNAME'	=> htmlspecialchars_decode(phpbb::$user->data['username']),
-							'TO_USERNAME'	=> htmlspecialchars_decode($row['username']),
-							'MESSAGE'		=> htmlspecialchars_decode($message))
-						);
-
-						$messenger->send(NOTIFY_IM);
-
-						$s_select = 'S_SENT_JABBER';
-					}
-					else
-					{
-						trigger_error('FORM_INVALID');
-					}
-				}
-			break;
-		}
-
-		// Send vars to the template
-		phpbb::$template->assign_vars(array(
-			'IM_CONTACT'	=> $row[$sql_field],
-			'A_IM_CONTACT'	=> addslashes($row[$sql_field]),
-
-			'U_AIM_CONTACT'	=> ($action == 'aim') ? 'aim:addbuddy?screenname=' . urlencode($row[$sql_field]) : '',
-			'U_AIM_MESSAGE'	=> ($action == 'aim') ? 'aim:goim?screenname=' . urlencode($row[$sql_field]) . '&amp;message=' . urlencode(phpbb::$config['sitename']) : '',
-
-			'USERNAME'		=> $row['username'],
-			'CONTACT_NAME'	=> $row[$sql_field],
-			'SITENAME'		=> phpbb::$config['sitename'],
-
-			'PRESENCE_IMG'		=> $presence_img,
-
-			'L_SEND_IM_EXPLAIN'	=> phpbb::$user->lang['IM_' . $lang],
-			'L_IM_SENT_JABBER'	=> sprintf(phpbb::$user->lang['IM_SENT_JABBER'], $row['username']),
-
-			$s_select			=> true,
-			'S_IM_ACTION'		=> $s_action,
-		));
-
-	break;
-
-	case 'viewprofile':
-		// Display a profile
-		if ($user_id == ANONYMOUS && !$username)
-		{
-			trigger_error('NO_USER');
-		}
-
-		// Get user...
-		$sql = 'SELECT *
-			FROM ' . USERS_TABLE . '
-			WHERE ' . (($username) ? "username_clean = '" . phpbb::$db->sql_escape(utf8_clean_string($username)) . "'" : "user_id = $user_id");
-		$result = phpbb::$db->sql_query($sql);
-		$member = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$member)
-		{
-			trigger_error('NO_USER');
-		}
-
-		// a_user admins and founder are able to view inactive users and bots to be able to manage them more easily
-		// Normal users are able to see at least users having only changed their profile settings but not yet reactivated.
-		if (!phpbb::$acl->acl_get('a_user') && !phpbb::$user->is_founder)
-		{
-			if ($member['user_type'] == phpbb::USER_IGNORE)
-			{
-				trigger_error('NO_USER');
-			}
-			else if ($member['user_type'] == phpbb::USER_INACTIVE && $member['user_inactive_reason'] != INACTIVE_PROFILE)
-			{
-				trigger_error('NO_USER');
-			}
-		}
-
-		$user_id = (int) $member['user_id'];
-
-		// Do the SQL thang
-		$sql = 'SELECT g.group_id, g.group_name, g.group_type
-			FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . " ug
-			WHERE ug.user_id = $user_id
-				AND g.group_id = ug.group_id" . ((!phpbb::$acl->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? ' AND g.group_type <> ' . GROUP_HIDDEN : '') . '
-				AND ug.user_pending = 0
-			ORDER BY g.group_type, g.group_name';
-		$result = phpbb::$db->sql_query($sql);
-
-		$group_options = '';
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$group_options .= '<option value="' . $row['group_id'] . '"' . (($row['group_id'] == $member['group_id']) ? ' selected="selected"' : '') . '>' . (($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// What colour is the zebra
-		$sql = 'SELECT friend, foe
-			FROM ' . ZEBRA_TABLE . '
-			WHERE zebra_id = ' . $user_id . '
-				AND user_id = ' . phpbb::$user->data['user_id'];
-
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		$foe = ($row['foe']) ? true : false;
-		$friend = ($row['friend']) ? true : false;
-		phpbb::$db->sql_freeresult($result);
-
-		if (phpbb::$config['load_onlinetrack'])
-		{
-			$sql = 'SELECT MAX(session_time) AS session_time, MIN(session_viewonline) AS session_viewonline
-				FROM ' . SESSIONS_TABLE . "
-				WHERE session_user_id = $user_id";
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			$member['session_time'] = (isset($row['session_time'])) ? $row['session_time'] : 0;
-			$member['session_viewonline'] = (isset($row['session_viewonline'])) ? $row['session_viewonline'] :	0;
-			unset($row);
-		}
-
-		if (phpbb::$config['load_user_activity'])
-		{
-			display_user_activity($member);
-		}
-
-		// Do the relevant calculations
-		$memberdays = max(1, round((time() - $member['user_regdate']) / 86400));
-		$posts_per_day = $member['user_posts'] / $memberdays;
-		$percentage = (phpbb::$config['num_posts']) ? min(100, ($member['user_posts'] / phpbb::$config['num_posts']) * 100) : 0;
-
-
-		if ($member['user_sig'])
-		{
-			$member['user_sig'] = censor_text($member['user_sig']);
-
-			if ($member['user_sig_bbcode_bitfield'])
-			{
-				include_once(PHPBB_ROOT_PATH . 'includes/bbcode.' . PHP_EXT);
-				$bbcode = new bbcode();
-				$bbcode->bbcode_second_pass($member['user_sig'], $member['user_sig_bbcode_uid'], $member['user_sig_bbcode_bitfield']);
-			}
-
-			$member['user_sig'] = bbcode_nl2br($member['user_sig']);
-			$member['user_sig'] = smiley_text($member['user_sig']);
-		}
-
-		$poster_avatar = get_user_avatar($member['user_avatar'], $member['user_avatar_type'], $member['user_avatar_width'], $member['user_avatar_height']);
-
-		phpbb::$template->assign_vars(show_profile($member));
-
-		// Custom Profile Fields
-		$profile_fields = array();
-		if (phpbb::$config['load_cpf_viewprofile'])
-		{
-			include_once(PHPBB_ROOT_PATH . 'includes/functions_profile_fields.' . PHP_EXT);
-			$cp = new custom_profile();
-			$profile_fields = $cp->generate_profile_fields_template('grab', $user_id);
-			$profile_fields = (isset($profile_fields[$user_id])) ? $cp->generate_profile_fields_template('show', false, $profile_fields[$user_id]) : array();
-		}
-
-		// We need to check if the module 'zebra' is accessible
-		$zebra_enabled = false;
-
-		if (phpbb::$user->data['user_id'] != $user_id && phpbb::$user->is_registered)
-		{
-			include_once(PHPBB_ROOT_PATH . 'includes/functions_module.' . PHP_EXT);
-			$module = new p_master();
-			$module->list_modules('ucp');
-			$module->set_active('zebra');
-
-			$zebra_enabled = ($module->active_module === false) ? false : true;
-
-			unset($module);
-		}
-
-		// If the user has m_approve permission or a_user permission, then list then display unapproved posts
-		if (phpbb::$acl->acl_getf_global('m_approve') || phpbb::$acl->acl_get('a_user'))
-		{
-			$sql = 'SELECT COUNT(post_id) as posts_in_queue
-				FROM ' . POSTS_TABLE . '
-				WHERE poster_id = ' . $user_id . '
-					AND post_approved = 0';
-			$result = phpbb::$db->sql_query($sql);
-			$member['posts_in_queue'] = (int) phpbb::$db->sql_fetchfield('posts_in_queue');
-			phpbb::$db->sql_freeresult($result);
-		}
-		else
-		{
-			$member['posts_in_queue'] = 0;
-		}
-
-		phpbb::$template->assign_vars(array(
-			'L_POSTS_IN_QUEUE'	=> phpbb::$user->lang('NUM_POSTS_IN_QUEUE', $member['posts_in_queue']),
-
-			'POSTS_DAY'			=> sprintf(phpbb::$user->lang['POST_DAY'], $posts_per_day),
-			'POSTS_PCT'			=> sprintf(phpbb::$user->lang['POST_PCT'], $percentage),
-
-			'OCCUPATION'	=> (!empty($member['user_occ'])) ? censor_text($member['user_occ']) : '',
-			'INTERESTS'		=> (!empty($member['user_interests'])) ? censor_text($member['user_interests']) : '',
-			'SIGNATURE'		=> $member['user_sig'],
-			'POSTS_IN_QUEUE'=> $member['posts_in_queue'],
-
-			'AVATAR_IMG'	=> $poster_avatar,
-			'PM_IMG'		=> phpbb::$user->img('icon_contact_pm', 'SEND_PRIVATE_MESSAGE'),
-			'EMAIL_IMG'		=> phpbb::$user->img('icon_contact_email', 'EMAIL'),
-			'WWW_IMG'		=> phpbb::$user->img('icon_contact_www', 'WWW'),
-			'ICQ_IMG'		=> phpbb::$user->img('icon_contact_icq', 'ICQ'),
-			'AIM_IMG'		=> phpbb::$user->img('icon_contact_aim', 'AIM'),
-			'MSN_IMG'		=> phpbb::$user->img('icon_contact_msnm', 'MSNM'),
-			'YIM_IMG'		=> phpbb::$user->img('icon_contact_yahoo', 'YIM'),
-			'JABBER_IMG'	=> phpbb::$user->img('icon_contact_jabber', 'JABBER'),
-			'SEARCH_IMG'	=> phpbb::$user->img('icon_user_search', 'SEARCH'),
-
-			'S_PROFILE_ACTION'	=> append_sid('memberlist', 'mode=group'),
-			'S_GROUP_OPTIONS'	=> $group_options,
-			'S_CUSTOM_FIELDS'	=> (isset($profile_fields['row']) && sizeof($profile_fields['row'])) ? true : false,
-
-			'U_USER_ADMIN'			=> (phpbb::$acl->acl_get('a_user')) ? append_sid(phpbb::$base_config['admin_folder'] . '/index', 'i=users&amp;mode=overview&amp;u=' . $user_id, true, phpbb::$user->session_id) : '',
-			'U_USER_BAN'			=> (phpbb::$acl->acl_get('m_ban') && $user_id != phpbb::$user->data['user_id']) ? append_sid('mcp', 'i=ban&amp;mode=user&amp;u=' . $user_id, true, phpbb::$user->session_id) : '',
-			'U_SWITCH_PERMISSIONS'	=> (phpbb::$acl->acl_get('a_switchperm') && phpbb::$user->data['user_id'] != $user_id) ? append_sid('ucp', "mode=switch_perm&amp;u={$user_id}") : '',
-			'U_MCP_QUEUE'			=> (phpbb::$acl->acl_getf_global('m_approve')) ? append_sid('mcp', 'i=queue', true, phpbb::$user->session_id) : '',
-
-			'S_ZEBRA'			=> (phpbb::$user->data['user_id'] != $user_id && phpbb::$user->is_registered && $zebra_enabled) ? true : false,
-			'U_ADD_FRIEND'		=> (!$friend) ? append_sid('ucp', 'i=zebra&amp;add=' . urlencode(htmlspecialchars_decode($member['username']))) : '',
-			'U_ADD_FOE'			=> (!$foe) ? append_sid('ucp', 'i=zebra&amp;mode=foes&amp;add=' . urlencode(htmlspecialchars_decode($member['username']))) : '',
-			'U_REMOVE_FRIEND'	=> ($friend) ? append_sid('ucp', 'i=zebra&amp;remove=1&amp;usernames[]=' . $user_id) : '',
-			'U_REMOVE_FOE'		=> ($foe) ? append_sid('ucp', 'i=zebra&amp;remove=1&amp;mode=foes&amp;usernames[]=' . $user_id) : '',
-		));
-
-		if (!empty($profile_fields['row']))
-		{
-			phpbb::$template->assign_vars($profile_fields['row']);
-		}
-
-		if (!empty($profile_fields['blockrow']))
-		{
-			foreach ($profile_fields['blockrow'] as $field_data)
-			{
-				phpbb::$template->assign_block_vars('custom_fields', $field_data);
-			}
-		}
-
-		// Inactive reason/account?
-		if ($member['user_type'] == phpbb::USER_INACTIVE)
-		{
-			phpbb::$user->add_lang('acp/common');
-
-			$inactive_reason = phpbb::$user->lang['INACTIVE_REASON_UNKNOWN'];
-
-			switch ($member['user_inactive_reason'])
-			{
-				case INACTIVE_REGISTER:
-					$inactive_reason = phpbb::$user->lang['INACTIVE_REASON_REGISTER'];
-				break;
-
-				case INACTIVE_PROFILE:
-					$inactive_reason = phpbb::$user->lang['INACTIVE_REASON_PROFILE'];
-				break;
-
-				case INACTIVE_MANUAL:
-					$inactive_reason = phpbb::$user->lang['INACTIVE_REASON_MANUAL'];
-				break;
-
-				case INACTIVE_REMIND:
-					$inactive_reason = phpbb::$user->lang['INACTIVE_REASON_REMIND'];
-				break;
-			}
-
-			phpbb::$template->assign_vars(array(
-				'S_USER_INACTIVE'		=> true,
-				'USER_INACTIVE_REASON'	=> $inactive_reason,
-			));
-		}
-
-		// Now generate page title
-		$page_title = sprintf(phpbb::$user->lang['VIEWING_PROFILE'], $member['username']);
-		$template_html = 'memberlist_view.html';
-
-	break;
-
-	case 'email':
-
-		// Send an email
-		$page_title = phpbb::$user->lang['SEND_EMAIL'];
-		$template_html = 'memberlist_email.html';
-
-		add_form_key('memberlist_email');
-
-		if (!phpbb::$config['email_enable'])
-		{
-			trigger_error('EMAIL_DISABLED');
-		}
-
-		if (!phpbb::$acl->acl_get('u_sendemail'))
-		{
-			trigger_error('NO_EMAIL');
-		}
-
-		// Are we trying to abuse the facility?
-		if (time() - phpbb::$user->data['user_emailtime'] < phpbb::$config['flood_interval'])
-		{
-			trigger_error('FLOOD_EMAIL_LIMIT');
-		}
-
-		// Determine action...
-		$user_id = request_var('u', 0);
-		$topic_id = request_var('t', 0);
-
-		// Send email to user...
-		if ($user_id)
-		{
-			if ($user_id == ANONYMOUS || !phpbb::$config['board_email_form'])
-			{
-				trigger_error('NO_EMAIL');
-			}
-
-			// Get the appropriate username, etc.
-			$sql = 'SELECT username, user_email, user_allow_viewemail, user_lang, user_jabber, user_notify_type
-				FROM ' . USERS_TABLE . "
-				WHERE user_id = $user_id
-					AND user_type IN (" . phpbb::USER_NORMAL . ', ' . phpbb::USER_FOUNDER . ')';
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$row)
-			{
-				trigger_error('NO_USER');
-			}
-
-			// Can we send email to this user?
-			if (!$row['user_allow_viewemail'] && !phpbb::$acl->acl_get('a_user'))
-			{
-				trigger_error('NO_EMAIL');
-			}
-		}
-		else if ($topic_id)
-		{
-			// Send topic heads-up to email address
-			$sql = 'SELECT forum_id, topic_title
-				FROM ' . TOPICS_TABLE . "
-				WHERE topic_id = $topic_id";
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$row)
-			{
-				trigger_error('NO_TOPIC');
-			}
-
-			if ($row['forum_id'])
-			{
-				if (!phpbb::$acl->acl_get('f_read', $row['forum_id']))
-				{
-					trigger_error('SORRY_AUTH_READ');
-				}
-
-				if (!phpbb::$acl->acl_get('f_email', $row['forum_id']))
-				{
-					trigger_error('NO_EMAIL');
-				}
-			}
-			else
-			{
-				// If global announcement, we need to check if the user is able to at least read and email in one forum...
-				if (!phpbb::$acl->acl_getf_global('f_read'))
-				{
-					trigger_error('SORRY_AUTH_READ');
-				}
-
-				if (!phpbb::$acl->acl_getf_global('f_email'))
-				{
-					trigger_error('NO_EMAIL');
-				}
-			}
-		}
-		else
-		{
-			trigger_error('NO_EMAIL');
-		}
-
-		$error = array();
-
-		$name		= utf8_normalize_nfc(request_var('name', '', true));
-		$email		= request_var('email', '');
-		$email_lang = request_var('lang', phpbb::$config['default_lang']);
-		$subject	= utf8_normalize_nfc(request_var('subject', '', true));
-		$message	= utf8_normalize_nfc(request_var('message', '', true));
-		$cc			= phpbb_request::is_set_post('cc_email');
-		$submit		= phpbb_request::is_set_post('submit');
-
-		if ($submit)
-		{
-			if (!check_form_key('memberlist_email'))
-			{
-				$error[] = 'FORM_INVALID';
-			}
-			if ($user_id)
-			{
-				if (!$subject)
-				{
-					$error[] = phpbb::$user->lang['EMPTY_SUBJECT_EMAIL'];
-				}
-
-				if (!$message)
-				{
-					$error[] = phpbb::$user->lang['EMPTY_MESSAGE_EMAIL'];
-				}
-
-				$name = $row['username'];
-				$email_lang = $row['user_lang'];
-				$email = $row['user_email'];
-			}
-			else
-			{
-				if (!$email || !preg_match('/^' . get_preg_expression('email') . '$/i', $email))
-				{
-					$error[] = phpbb::$user->lang['EMPTY_ADDRESS_EMAIL'];
-				}
-
-				if (!$name)
-				{
-					$error[] = phpbb::$user->lang['EMPTY_NAME_EMAIL'];
-				}
-			}
-
-			if (!sizeof($error))
-			{
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_emailtime = ' . time() . '
-					WHERE user_id = ' . phpbb::$user->data['user_id'];
-				$result = phpbb::$db->sql_query($sql);
-
-				include_once(PHPBB_ROOT_PATH . 'includes/functions_messenger.' . PHP_EXT);
-				$messenger = new messenger(false);
-				$email_tpl = ($user_id) ? 'profile_send_email' : 'email_notify';
-
-				$mail_to_users = array();
-
-				$mail_to_users[] = array(
-					'email_lang'		=> $email_lang,
-					'email'				=> $email,
-					'name'				=> $name,
-					'username'			=> ($user_id) ? $row['username'] : '',
-					'to_name'			=> $name,
-					'user_jabber'		=> ($user_id) ? $row['user_jabber'] : '',
-					'user_notify_type'	=> ($user_id) ? $row['user_notify_type'] : NOTIFY_EMAIL,
-					'topic_title'		=> (!$user_id) ? $row['topic_title'] : '',
-					'forum_id'			=> (!$user_id) ? $row['forum_id'] : 0,
-				);
-
-				// Ok, now the same email if CC specified, but without exposing the users email address
-				if ($cc)
-				{
-					$mail_to_users[] = array(
-						'email_lang'		=> phpbb::$user->data['user_lang'],
-						'email'				=> phpbb::$user->data['user_email'],
-						'name'				=> phpbb::$user->data['username'],
-						'username'			=> phpbb::$user->data['username'],
-						'to_name'			=> $name,
-						'user_jabber'		=> phpbb::$user->data['user_jabber'],
-						'user_notify_type'	=> ($user_id) ? phpbb::$user->data['user_notify_type'] : NOTIFY_EMAIL,
-						'topic_title'		=> (!$user_id) ? $row['topic_title'] : '',
-						'forum_id'			=> (!$user_id) ? $row['forum_id'] : 0,
-					);
-				}
-
-				foreach ($mail_to_users as $row)
-				{
-					$messenger->template($email_tpl, $row['email_lang']);
-					$messenger->replyto(phpbb::$user->data['user_email']);
-					$messenger->to($row['email'], $row['name']);
-
-					if ($user_id)
-					{
-						$messenger->subject(htmlspecialchars_decode($subject));
-						$messenger->im($row['user_jabber'], $row['username']);
-						$notify_type = $row['user_notify_type'];
-					}
-					else
-					{
-						$notify_type = NOTIFY_EMAIL;
-					}
-
-					$messenger->headers('X-AntiAbuse: Board servername - ' . phpbb::$config['server_name']);
-					$messenger->headers('X-AntiAbuse: User_id - ' . phpbb::$user->data['user_id']);
-					$messenger->headers('X-AntiAbuse: Username - ' . phpbb::$user->data['username']);
-					$messenger->headers('X-AntiAbuse: User IP - ' . phpbb::$user->ip);
-
-					$messenger->assign_vars(array(
-						'BOARD_CONTACT'	=> phpbb::$config['board_contact'],
-						'TO_USERNAME'	=> htmlspecialchars_decode($row['to_name']),
-						'FROM_USERNAME'	=> htmlspecialchars_decode(phpbb::$user->data['username']),
-						'MESSAGE'		=> htmlspecialchars_decode($message))
-					);
-
-					if ($topic_id)
-					{
-						$messenger->assign_vars(array(
-							'TOPIC_NAME'	=> htmlspecialchars_decode($row['topic_title']),
-							'U_TOPIC'		=> generate_board_url() . '/viewtopic.' . PHP_EXT . '?f=' . $row['forum_id'] . "&t=$topic_id")
-						);
-					}
-
-					$messenger->send($notify_type);
-				}
-
-				meta_refresh(3, append_sid('index'));
-				$message = ($user_id) ? sprintf(phpbb::$user->lang['RETURN_INDEX'], '<a href="' . append_sid('index') . '">', '</a>') : sprintf(phpbb::$user->lang['RETURN_TOPIC'],  '<a href="' . append_sid('viewtopic', "f={$row['forum_id']}&amp;t=$topic_id") . '">', '</a>');
-				trigger_error(phpbb::$user->lang['EMAIL_SENT'] . '<br /><br />' . $message);
-			}
-		}
-
-		if ($user_id)
-		{
-			phpbb::$template->assign_vars(array(
-				'S_SEND_USER'	=> true,
-				'USERNAME'		=> $row['username'],
-
-				'L_EMAIL_BODY_EXPLAIN'	=> phpbb::$user->lang['EMAIL_BODY_EXPLAIN'],
-				'S_POST_ACTION'			=> append_sid('memberlist', 'mode=email&amp;u=' . $user_id),
-			));
-		}
-		else
-		{
-			phpbb::$template->assign_vars(array(
-				'EMAIL'				=> $email,
-				'NAME'				=> $name,
-				'S_LANG_OPTIONS'	=> language_select($email_lang),
-
-				'L_EMAIL_BODY_EXPLAIN'	=> phpbb::$user->lang['EMAIL_TOPIC_EXPLAIN'],
-				'S_POST_ACTION'			=> append_sid('memberlist', 'mode=email&amp;t=' . $topic_id),
-			));
-		}
-
-		phpbb::$template->assign_vars(array(
-			'ERROR_MESSAGE'		=> (sizeof($error)) ? implode('<br />', $error) : '',
-			'SUBJECT'			=> $subject,
-			'MESSAGE'			=> $message,
-		));
-
-	break;
-
-	case 'group':
-	default:
-		// The basic memberlist
-		$page_title = phpbb::$user->lang['MEMBERLIST'];
-		$template_html = 'memberlist_body.html';
-
-		// Sorting
-		$sort_key_text = array('a' => phpbb::$user->lang['SORT_USERNAME'], 'b' => phpbb::$user->lang['SORT_LOCATION'], 'c' => phpbb::$user->lang['SORT_JOINED'], 'd' => phpbb::$user->lang['SORT_POST_COUNT'], 'e' => phpbb::$user->lang['SORT_EMAIL'], 'f' => phpbb::$user->lang['WEBSITE'], 'g' => phpbb::$user->lang['ICQ'], 'h' => phpbb::$user->lang['AIM'], 'i' => phpbb::$user->lang['MSNM'], 'j' => phpbb::$user->lang['YIM'], 'k' => phpbb::$user->lang['JABBER']);
-
-		if (phpbb::$acl->acl_get('u_viewonline'))
-		{
-			$sort_key_text['l'] = phpbb::$user->lang['SORT_LAST_ACTIVE'];
-		}
-		$sort_key_text['m'] = phpbb::$user->lang['SORT_RANK'];
-
-		$sort_key_sql = array('a' => 'u.username_clean', 'b' => 'u.user_from', 'c' => 'u.user_regdate', 'd' => 'u.user_posts', 'e' => 'u.user_email', 'f' => 'u.user_website', 'g' => 'u.user_icq', 'h' => 'u.user_aim', 'i' => 'u.user_msnm', 'j' => 'u.user_yim', 'k' => 'u.user_jabber');
-
-		if (phpbb::$acl->acl_get('u_viewonline'))
-		{
-			$sort_key_sql['l'] = 'u.user_lastvisit';
-		}
-		$sort_key_sql['m'] = 'u.user_rank';
-
-		$sort_dir_text = array('a' => phpbb::$user->lang['ASCENDING'], 'd' => phpbb::$user->lang['DESCENDING']);
-
-		$s_sort_key = '';
-		foreach ($sort_key_text as $key => $value)
-		{
-			$selected = ($sort_key == $key) ? ' selected="selected"' : '';
-			$s_sort_key .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
-		}
-
-		$s_sort_dir = '';
-		foreach ($sort_dir_text as $key => $value)
-		{
-			$selected = ($sort_dir == $key) ? ' selected="selected"' : '';
-			$s_sort_dir .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
-		}
-
-		// Additional sorting options for user search ... if search is enabled, if not
-		// then only admins can make use of this (for ACP functionality)
-		$sql_select = $sql_where_data = $sql_from = $sql_where = $order_by = '';
-
-
-		$form			= request_var('form', '');
-		$field			= request_var('field', '');
-		$select_single 	= request_var('select_single', false);
-
-		// Search URL parameters, if any of these are in the URL we do a search
-		$search_params = array('username', 'email', 'icq', 'aim', 'yahoo', 'msn', 'jabber', 'search_group_id', 'joined_select', 'active_select', 'count_select', 'joined', 'active', 'count', 'ip');
-
-		// We validate form and field here, only id/class allowed
-		$form = (!preg_match('/^[a-z0-9_-]+$/i', $form)) ? '' : $form;
-		$field = (!preg_match('/^[a-z0-9_-]+$/i', $field)) ? '' : $field;
-		if (($mode == 'searchuser' || sizeof(array_intersect(phpbb_request::variable_names(phpbb_request::GET), $search_params)) > 0) && (phpbb::$config['load_search'] || phpbb::$acl->acl_get('a_')))
-		{
-			$username	= request_var('username', '', true);
-			$email		= strtolower(request_var('email', ''));
-			$icq		= request_var('icq', '');
-			$aim		= request_var('aim', '');
-			$yahoo		= request_var('yahoo', '');
-			$msn		= request_var('msn', '');
-			$jabber		= request_var('jabber', '');
-			$search_group_id	= request_var('search_group_id', 0);
-
-			$joined_select	= request_var('joined_select', 'lt');
-			$active_select	= request_var('active_select', 'lt');
-			$count_select	= request_var('count_select', 'eq');
-			$joined			= explode('-', request_var('joined', ''));
-			$active			= explode('-', request_var('active', ''));
-			$count			= (request_var('count', '') !== '') ? request_var('count', 0) : '';
-			$ipdomain		= request_var('ip', '');
-
-			$find_key_match = array('lt' => '<', 'gt' => '>', 'eq' => '=');
-
-			$find_count = array('lt' => phpbb::$user->lang['LESS_THAN'], 'eq' => phpbb::$user->lang['EQUAL_TO'], 'gt' => phpbb::$user->lang['MORE_THAN']);
-			$s_find_count = '';
-			foreach ($find_count as $key => $value)
-			{
-				$selected = ($count_select == $key) ? ' selected="selected"' : '';
-				$s_find_count .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
-			}
-
-			$find_time = array('lt' => phpbb::$user->lang['BEFORE'], 'gt' => phpbb::$user->lang['AFTER']);
-			$s_find_join_time = '';
-			foreach ($find_time as $key => $value)
-			{
-				$selected = ($joined_select == $key) ? ' selected="selected"' : '';
-				$s_find_join_time .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
-			}
-
-			$s_find_active_time = '';
-			foreach ($find_time as $key => $value)
-			{
-				$selected = ($active_select == $key) ? ' selected="selected"' : '';
-				$s_find_active_time .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
-			}
-
-			$sql_where .= ($username) ? ' AND u.username_clean ' . phpbb::$db->sql_like_expression(str_replace('*', phpbb::$db->any_char, utf8_clean_string($username))) : '';
-			$sql_where .= ($email) ? ' AND u.user_email ' . phpbb::$db->sql_like_expression(str_replace('*', phpbb::$db->any_char, $email)) . ' ' : '';
-			$sql_where .= ($icq) ? ' AND u.user_icq ' . phpbb::$db->sql_like_expression(str_replace('*', phpbb::$db->any_char, $icq)) . ' ' : '';
-			$sql_where .= ($aim) ? ' AND u.user_aim ' . phpbb::$db->sql_like_expression(str_replace('*', phpbb::$db->any_char, $aim)) . ' ' : '';
-			$sql_where .= ($yahoo) ? ' AND u.user_yim ' . phpbb::$db->sql_like_expression(str_replace('*', phpbb::$db->any_char, $yahoo)) . ' ' : '';
-			$sql_where .= ($msn) ? ' AND u.user_msnm ' . phpbb::$db->sql_like_expression(str_replace('*', phpbb::$db->any_char, $msn)) . ' ' : '';
-			$sql_where .= ($jabber) ? ' AND u.user_jabber ' . phpbb::$db->sql_like_expression(str_replace('*', phpbb::$db->any_char, $jabber)) . ' ' : '';
-			$sql_where .= (is_numeric($count)) ? ' AND u.user_posts ' . $find_key_match[$count_select] . ' ' . (int) $count . ' ' : '';
-			$sql_where .= (sizeof($joined) > 1) ? " AND u.user_regdate " . $find_key_match[$joined_select] . ' ' . gmmktime(0, 0, 0, intval($joined[1]), intval($joined[2]), intval($joined[0])) : '';
-			$sql_where .= (phpbb::$acl->acl_get('u_viewonline') && sizeof($active) > 1) ? " AND u.user_lastvisit " . $find_key_match[$active_select] . ' ' . gmmktime(0, 0, 0, $active[1], intval($active[2]), intval($active[0])) : '';
-			$sql_where .= ($search_group_id) ? " AND u.user_id = ug.user_id AND ug.group_id = $search_group_id AND ug.user_pending = 0 " : '';
-
-			if ($search_group_id)
-			{
-				$sql_from = ', ' . USER_GROUP_TABLE . ' ug ';
-			}
-
-			if ($ipdomain && phpbb::$acl->acl_getf_global('m_info'))
-			{
-				if (strspn($ipdomain, 'abcdefghijklmnopqrstuvwxyz'))
-				{
-					$hostnames = gethostbynamel($ipdomain);
-
-					if ($hostnames !== false)
-					{
-						$ips = "'" . implode('\', \'', array_map(array($db, 'sql_escape'), preg_replace('#([0-9]{1,3}\.[0-9]{1,3}[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})#', "\\1", gethostbynamel($ipdomain)))) . "'";
-					}
-					else
-					{
-						$ips = false;
-					}
-				}
-				else
-				{
-					$ips = "'" . str_replace('*', '%', phpbb::$db->sql_escape($ipdomain)) . "'";
-				}
-
-				if ($ips === false)
-				{
-					// A minor fudge but it does the job :D
-					$sql_where .= " AND u.user_id = 0";
-				}
-				else
-				{
-					$ip_forums = array_keys(phpbb::$acl->acl_getf('m_info', true));
-
-					$sql = 'SELECT DISTINCT poster_id
-						FROM ' . POSTS_TABLE . '
-						WHERE poster_ip ' . ((strpos($ips, '%') !== false) ? 'LIKE' : 'IN') . " ($ips)
-							AND forum_id IN (0, " . implode(', ', $ip_forums) . ')';
-					$result = phpbb::$db->sql_query($sql);
-
-					if ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$ip_sql = array();
-						do
-						{
-							$ip_sql[] = $row['poster_id'];
-						}
-						while ($row = phpbb::$db->sql_fetchrow($result));
-
-						$sql_where .= ' AND ' . phpbb::$db->sql_in_set('u.user_id', $ip_sql);
-					}
-					else
-					{
-						// A minor fudge but it does the job :D
-						$sql_where .= " AND u.user_id = 0";
-					}
-					unset($ip_forums);
-
-					phpbb::$db->sql_freeresult($result);
-				}
-			}
-		}
-
-		$first_char = request_var('first_char', '');
-
-		if ($first_char == 'other')
-		{
-			for ($i = 97; $i < 123; $i++)
-			{
-				$sql_where .= ' AND u.username_clean NOT ' . phpbb::$db->sql_like_expression(chr($i) . phpbb::$db->any_char);
-			}
-		}
-		else if ($first_char)
-		{
-			$sql_where .= ' AND u.username_clean ' . phpbb::$db->sql_like_expression(substr($first_char, 0, 1) . phpbb::$db->any_char);
-		}
-
-		// Are we looking at a usergroup? If so, fetch additional info
-		// and further restrict the user info query
-		if ($mode == 'group')
-		{
-			// We JOIN here to save a query for determining membership for hidden groups. ;)
-			$sql = 'SELECT g.*, ug.user_id
-				FROM ' . GROUPS_TABLE . ' g
-				LEFT JOIN ' . USER_GROUP_TABLE . ' ug ON (ug.user_pending = 0 AND ug.user_id = ' . phpbb::$user->data['user_id'] . " AND ug.group_id = $group_id)
-				WHERE g.group_id = $group_id";
-			$result = phpbb::$db->sql_query($sql);
-			$group_row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$group_row)
-			{
-				trigger_error('NO_GROUP');
-			}
-
-			switch ($group_row['group_type'])
-			{
-				case GROUP_OPEN:
-					$group_row['l_group_type'] = 'OPEN';
-				break;
-
-				case GROUP_CLOSED:
-					$group_row['l_group_type'] = 'CLOSED';
-				break;
-
-				case GROUP_HIDDEN:
-					$group_row['l_group_type'] = 'HIDDEN';
-
-					// Check for membership or special permissions
-					if (!phpbb::$acl->acl_gets('a_group', 'a_groupadd', 'a_groupdel') && $group_row['user_id'] != phpbb::$user->data['user_id'])
-					{
-						trigger_error('NO_GROUP');
-					}
-				break;
-
-				case GROUP_SPECIAL:
-					$group_row['l_group_type'] = 'SPECIAL';
-				break;
-
-				case GROUP_FREE:
-					$group_row['l_group_type'] = 'FREE';
-				break;
-			}
-
-			// Misusing the avatar function for displaying group avatars...
-			$avatar_img = get_user_avatar($group_row['group_avatar'], $group_row['group_avatar_type'], $group_row['group_avatar_width'], $group_row['group_avatar_height'], 'GROUP_AVATAR');
-
-			$rank_title = $rank_img = $rank_img_src = '';
-			if ($group_row['group_rank'])
-			{
-				if (isset($ranks['special'][$group_row['group_rank']]))
-				{
-					$rank_title = $ranks['special'][$group_row['group_rank']]['rank_title'];
-				}
-				$rank_img = (!empty($ranks['special'][$group_row['group_rank']]['rank_image'])) ? '<img src="' . phpbb::$config['ranks_path'] . '/' . $ranks['special'][$group_row['group_rank']]['rank_image'] . '" alt="' . $ranks['special'][$group_row['group_rank']]['rank_title'] . '" title="' . $ranks['special'][$group_row['group_rank']]['rank_title'] . '" /><br />' : '';
-				$rank_img_src = (!empty($ranks['special'][$group_row['group_rank']]['rank_image'])) ? phpbb::$config['ranks_path'] . '/' . $ranks['special'][$group_row['group_rank']]['rank_image'] : '';
-			}
-			else
-			{
-				$rank_title = '';
-				$rank_img = '';
-				$rank_img_src = '';
-			}
-
-			phpbb::$template->assign_vars(array(
-				'GROUP_DESC'	=> generate_text_for_display($group_row['group_desc'], $group_row['group_desc_uid'], $group_row['group_desc_bitfield'], $group_row['group_desc_options']),
-				'GROUP_NAME'	=> ($group_row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $group_row['group_name']] : $group_row['group_name'],
-				'GROUP_COLOR'	=> $group_row['group_colour'],
-				'GROUP_TYPE'	=> phpbb::$user->lang['GROUP_IS_' . $group_row['l_group_type']],
-				'GROUP_RANK'	=> $rank_title,
-
-				'AVATAR_IMG'	=> $avatar_img,
-				'RANK_IMG'		=> $rank_img,
-				'RANK_IMG_SRC'	=> $rank_img_src,
-
-				'U_PM'			=> (phpbb::$acl->acl_get('u_sendpm') && phpbb::$acl->acl_get('u_masspm_group') && $group_row['group_receive_pm'] && phpbb::$config['allow_privmsg'] && phpbb::$config['allow_mass_pm']) ? append_sid('ucp', 'i=pm&amp;mode=compose&amp;g=' . $group_id) : '',
-			));
-
-			$sql_select = ', ug.group_leader';
-			$sql_from = ', ' . USER_GROUP_TABLE . ' ug ';
-			$order_by = 'ug.group_leader DESC, ';
-
-			$sql_where .= " AND ug.user_pending = 0 AND u.user_id = ug.user_id AND ug.group_id = $group_id";
-			$sql_where_data = " AND u.user_id = ug.user_id AND ug.group_id = $group_id";
-		}
-
-		// Sorting and order
-		if (!isset($sort_key_sql[$sort_key]))
-		{
-			$sort_key = $default_key;
-		}
-
-		$order_by .= $sort_key_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC');
-
-		// Unfortunately we must do this here for sorting by rank, else the sort order is applied wrongly
-		if ($sort_key == 'm')
-		{
-			$order_by .= ', u.user_posts DESC';
-		}
-
-		// Count the users ...
-		if ($sql_where)
-		{
-			$sql = 'SELECT COUNT(u.user_id) AS total_users
-				FROM ' . USERS_TABLE . " u$sql_from
-				WHERE u.user_type IN (" . phpbb::USER_NORMAL . ', ' . phpbb::USER_FOUNDER . ")
-				$sql_where";
-			$result = phpbb::$db->sql_query($sql);
-			$total_users = (int) phpbb::$db->sql_fetchfield('total_users');
-			phpbb::$db->sql_freeresult($result);
-		}
-		else
-		{
-			$total_users = phpbb::$config['num_users'];
-		}
-
-		$s_char_options = '<option value=""' . ((!$first_char) ? ' selected="selected"' : '') . '>&nbsp; &nbsp;</option>';
-		for ($i = 97; $i < 123; $i++)
-		{
-			$s_char_options .= '<option value="' . chr($i) . '"' . (($first_char == chr($i)) ? ' selected="selected"' : '') . '>' . chr($i-32) . '</option>';
-		}
-		$s_char_options .= '<option value="other"' . (($first_char == 'other') ? ' selected="selected"' : '') . '>' . phpbb::$user->lang['OTHER'] . '</option>';
-
-		// Build a relevant pagination_url
-		$params = $sort_params = array();
-
-		// We do not use request_var() here directly to save some calls (not all variables are set)
-		$check_params = array(
-			'g'				=> array('g', 0),
-			'sk'			=> array('sk', $default_key),
-			'sd'			=> array('sd', 'a'),
-			'form'			=> array('form', ''),
-			'field'			=> array('field', ''),
-			'select_single'	=> array('select_single', $select_single),
-			'username'		=> array('username', '', true),
-			'email'			=> array('email', ''),
-			'icq'			=> array('icq', ''),
-			'aim'			=> array('aim', ''),
-			'yahoo'			=> array('yahoo', ''),
-			'msn'			=> array('msn', ''),
-			'jabber'		=> array('jabber', ''),
-			'search_group_id'	=> array('search_group_id', 0),
-			'joined_select'	=> array('joined_select', 'lt'),
-			'active_select'	=> array('active_select', 'lt'),
-			'count_select'	=> array('count_select', 'eq'),
-			'joined'		=> array('joined', ''),
-			'active'		=> array('active', ''),
-			'count'			=> (request_var('count', '') !== '') ? array('count', 0) : array('count', ''),
-			'ipdomain'		=> array('ip', ''),
-			'first_char'	=> array('first_char', ''),
-		);
-
-		foreach ($check_params as $key => $call)
-		{
-			if (!phpbb_request::is_set($key))
-			{
-				continue;
-			}
-
-			$param = call_user_func_array('request_var', $call);
-			$param = urlencode($key) . '=' . ((is_string($param)) ? urlencode($param) : $param);
-			$params[] = $param;
-
-			if ($key != 'sk' && $key != 'sd')
-			{
-				$sort_params[] = $param;
-			}
-		}
-		$u_hide_find_member = append_sid('memberlist', "start=$start" . (!empty($params) ? '&amp;' . implode('&amp;', $params) : ''));
-
-		if ($mode)
-		{
-			$params[] = "mode=$mode";
-		}
-		$sort_params[] = "mode=$mode";
-		$pagination_url = append_sid('memberlist', implode('&amp;', $params));
-		$sort_url = append_sid('memberlist', implode('&amp;', $sort_params));
-
-		unset($search_params, $sort_params);
-
-		// Some search user specific data
-		if ($mode == 'searchuser' && (phpbb::$config['load_search'] || phpbb::$acl->acl_get('a_')))
-		{
-			$group_selected = request_var('search_group_id', 0);
-			$s_group_select = '<option value="0"' . ((!$group_selected) ? ' selected="selected"' : '') . '>&nbsp;</option>';
-			$group_ids = array();
-
-			/**
-			* @todo add this to a separate function (function is responsible for returning the groups the user is able to see based on the users group membership)
-			*/
-
-			if (phpbb::$acl->acl_gets('a_group', 'a_groupadd', 'a_groupdel'))
-			{
-				$sql = 'SELECT group_id, group_name, group_type
-					FROM ' . GROUPS_TABLE;
-
-				if (!phpbb::$config['coppa_enable'])
-				{
-					$sql .= " WHERE group_name <> 'REGISTERED_COPPA'";
-				}
-
-				$sql .= ' ORDER BY group_name ASC';
-			}
-			else
-			{
-				$sql = 'SELECT g.group_id, g.group_name, g.group_type
-					FROM ' . GROUPS_TABLE . ' g
-					LEFT JOIN ' . USER_GROUP_TABLE . ' ug
-						ON (
-							g.group_id = ug.group_id
-							AND ug.user_id = ' . phpbb::$user->data['user_id'] . '
-							AND ug.user_pending = 0
-						)
-					WHERE (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . phpbb::$user->data['user_id'] . ')';
-
-				if (!phpbb::$config['coppa_enable'])
-				{
-					$sql .= " AND g.group_name <> 'REGISTERED_COPPA'";
-				}
-
-				$sql .= ' ORDER BY g.group_name ASC';
-			}
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$group_ids[] = $row['group_id'];
-				$s_group_select .= '<option value="' . $row['group_id'] . '"' . (($group_selected == $row['group_id']) ? ' selected="selected"' : '') . '>' . (($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			if ($group_selected !== 0 && !in_array($group_selected, $group_ids))
-			{
-				trigger_error('NO_GROUP');
-			}
-
-			phpbb::$template->assign_vars(array(
-				'USERNAME'	=> $username,
-				'EMAIL'		=> $email,
-				'ICQ'		=> $icq,
-				'AIM'		=> $aim,
-				'YAHOO'		=> $yahoo,
-				'MSNM'		=> $msn,
-				'JABBER'	=> $jabber,
-				'JOINED'	=> implode('-', $joined),
-				'ACTIVE'	=> implode('-', $active),
-				'COUNT'		=> $count,
-				'IP'		=> $ipdomain,
-
-				'S_IP_SEARCH_ALLOWED'	=> (phpbb::$acl->acl_getf_global('m_info')) ? true : false,
-				'S_IN_SEARCH_POPUP'		=> ($form && $field) ? true : false,
-				'S_SEARCH_USER'			=> true,
-				'S_FORM_NAME'			=> $form,
-				'S_FIELD_NAME'			=> $field,
-				'S_SELECT_SINGLE'		=> $select_single,
-				'S_COUNT_OPTIONS'		=> $s_find_count,
-				'S_SORT_OPTIONS'		=> $s_sort_key,
-				'S_JOINED_TIME_OPTIONS'	=> $s_find_join_time,
-				'S_ACTIVE_TIME_OPTIONS'	=> $s_find_active_time,
-				'S_GROUP_SELECT'		=> $s_group_select,
-				'S_USER_SEARCH_ACTION'	=> append_sid('memberlist', "mode=searchuser&amp;form=$form&amp;field=$field"),
-			));
-		}
-
-		// Get us some users :D
-		$sql = "SELECT u.user_id
-			FROM " . USERS_TABLE . " u
-				$sql_from
-			WHERE u.user_type IN (" . phpbb::USER_NORMAL . ', ' . phpbb::USER_FOUNDER . ")
-				$sql_where
-			ORDER BY $order_by";
-		$result = phpbb::$db->sql_query_limit($sql, phpbb::$config['topics_per_page'], $start);
-
-		$user_list = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$user_list[] = (int) $row['user_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-		$leaders_set = false;
-		// So, did we get any users?
-		if (sizeof($user_list))
-		{
-			// Session time?! Session time...
-			$sql = 'SELECT session_user_id, MAX(session_time) AS session_time
-				FROM ' . SESSIONS_TABLE . '
-				WHERE session_time >= ' . (time() - phpbb::$config['session_length']) . '
-					AND ' . phpbb::$db->sql_in_set('session_user_id', $user_list) . '
-				GROUP BY session_user_id';
-			$result = phpbb::$db->sql_query($sql);
-
-			$session_times = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$session_times[$row['session_user_id']] = $row['session_time'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			// Do the SQL thang
-			if ($mode == 'group')
-			{
-				$sql = "SELECT u.*
-						$sql_select
-					FROM " . USERS_TABLE . " u
-						$sql_from
-					WHERE " . phpbb::$db->sql_in_set('u.user_id', $user_list) . "
-						$sql_where_data";
-			}
-			else
-			{
-				$sql = 'SELECT *
-					FROM ' . USERS_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('user_id', $user_list);
-			}
-			$result = phpbb::$db->sql_query($sql);
-
-			$id_cache = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$row['session_time'] = (!empty($session_times[$row['user_id']])) ? $session_times[$row['user_id']] : 0;
-				$row['last_visit'] = (!empty($row['session_time'])) ? $row['session_time'] : $row['user_lastvisit'];
-
-				$id_cache[$row['user_id']] = $row;
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			// Load custom profile fields
-			if (phpbb::$config['load_cpf_memberlist'])
-			{
-				include_once(PHPBB_ROOT_PATH . 'includes/functions_profile_fields.' . PHP_EXT);
-				$cp = new custom_profile();
-
-				// Grab all profile fields from users in id cache for later use - similar to the poster cache
-				$profile_fields_cache = $cp->generate_profile_fields_template('grab', $user_list);
-			}
-
-			// If we sort by last active date we need to adjust the id cache due to user_lastvisit not being the last active date...
-			if ($sort_key == 'l')
-			{
-//				uasort($id_cache, create_function('$first, $second', "return (\$first['last_visit'] == \$second['last_visit']) ? 0 : ((\$first['last_visit'] < \$second['last_visit']) ? $lesser_than : ($lesser_than * -1));"));
-				usort($user_list,  '_sort_last_active');
-			}
-
-			for ($i = 0, $end = sizeof($user_list); $i < $end; ++$i)
-			{
-				$user_id = $user_list[$i];
-				$row =& $id_cache[$user_id];
-				$is_leader = (isset($row['group_leader']) && $row['group_leader']) ? true : false;
-				$leaders_set = ($leaders_set || $is_leader);
-
-				$cp_row = array();
-				if (phpbb::$config['load_cpf_memberlist'])
-				{
-					$cp_row = (isset($profile_fields_cache[$user_id])) ? $cp->generate_profile_fields_template('show', false, $profile_fields_cache[$user_id]) : array();
-				}
-
-				$memberrow = array_merge(show_profile($row), array(
-					'ROW_NUMBER'		=> $i + ($start + 1),
-
-					'S_CUSTOM_PROFILE'	=> (isset($cp_row['row']) && sizeof($cp_row['row'])) ? true : false,
-					'S_GROUP_LEADER'	=> $is_leader,
-
-					'U_VIEW_PROFILE'	=> append_sid('memberlist', 'mode=viewprofile&amp;u=' . $user_id))
-				);
-
-				if (isset($cp_row['row']) && sizeof($cp_row['row']))
-				{
-					$memberrow = array_merge($memberrow, $cp_row['row']);
-				}
-
-				phpbb::$template->assign_block_vars('memberrow', $memberrow);
-
-				if (isset($cp_row['blockrow']) && sizeof($cp_row['blockrow']))
-				{
-					foreach ($cp_row['blockrow'] as $field_data)
-					{
-						phpbb::$template->assign_block_vars('memberrow.custom_fields', $field_data);
-					}
-				}
-
-				unset($id_cache[$user_id]);
-			}
-		}
-
-		// Generate page
-		phpbb::$template->assign_vars(array(
-			'PAGINATION'	=> generate_pagination($pagination_url, $total_users, phpbb::$config['topics_per_page'], $start),
-			'PAGE_NUMBER'	=> on_page($total_users, phpbb::$config['topics_per_page'], $start),
-			'TOTAL_USERS'	=> ($total_users == 1) ? phpbb::$user->lang['LIST_USER'] : sprintf(phpbb::$user->lang['LIST_USERS'], $total_users),
-
-			'PROFILE_IMG'	=> phpbb::$user->img('icon_user_profile', 'PROFILE'),
-			'PM_IMG'		=> phpbb::$user->img('icon_contact_pm', 'SEND_PRIVATE_MESSAGE'),
-			'EMAIL_IMG'		=> phpbb::$user->img('icon_contact_email', 'EMAIL'),
-			'WWW_IMG'		=> phpbb::$user->img('icon_contact_www', 'WWW'),
-			'ICQ_IMG'		=> phpbb::$user->img('icon_contact_icq', 'ICQ'),
-			'AIM_IMG'		=> phpbb::$user->img('icon_contact_aim', 'AIM'),
-			'MSN_IMG'		=> phpbb::$user->img('icon_contact_msnm', 'MSNM'),
-			'YIM_IMG'		=> phpbb::$user->img('icon_contact_yahoo', 'YIM'),
-			'JABBER_IMG'	=> phpbb::$user->img('icon_contact_jabber', 'JABBER'),
-			'SEARCH_IMG'	=> phpbb::$user->img('icon_user_search', 'SEARCH'),
-
-			'U_FIND_MEMBER'			=> (phpbb::$config['load_search'] || phpbb::$acl->acl_get('a_')) ? append_sid('memberlist', 'mode=searchuser' . (($start) ? "&amp;start=$start" : '') . (!empty($params) ? '&amp;' . implode('&amp;', $params) : '')) : '',
-			'U_HIDE_FIND_MEMBER'	=> ($mode == 'searchuser') ? $u_hide_find_member : '',
-			'U_SORT_USERNAME'		=> $sort_url . '&amp;sk=a&amp;sd=' . (($sort_key == 'a' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_SORT_FROM'			=> $sort_url . '&amp;sk=b&amp;sd=' . (($sort_key == 'b' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_SORT_JOINED'			=> $sort_url . '&amp;sk=c&amp;sd=' . (($sort_key == 'c' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_SORT_POSTS'			=> $sort_url . '&amp;sk=d&amp;sd=' . (($sort_key == 'd' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_SORT_EMAIL'			=> $sort_url . '&amp;sk=e&amp;sd=' . (($sort_key == 'e' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_SORT_WEBSITE'		=> $sort_url . '&amp;sk=f&amp;sd=' . (($sort_key == 'f' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_SORT_LOCATION'		=> $sort_url . '&amp;sk=b&amp;sd=' . (($sort_key == 'b' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_SORT_ICQ'			=> $sort_url . '&amp;sk=g&amp;sd=' . (($sort_key == 'g' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_SORT_AIM'			=> $sort_url . '&amp;sk=h&amp;sd=' . (($sort_key == 'h' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_SORT_MSN'			=> $sort_url . '&amp;sk=i&amp;sd=' . (($sort_key == 'i' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_SORT_YIM'			=> $sort_url . '&amp;sk=j&amp;sd=' . (($sort_key == 'j' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_SORT_ACTIVE'			=> (phpbb::$acl->acl_get('u_viewonline')) ? $sort_url . '&amp;sk=l&amp;sd=' . (($sort_key == 'l' && $sort_dir == 'a') ? 'd' : 'a') : '',
-			'U_SORT_RANK'			=> $sort_url . '&amp;sk=m&amp;sd=' . (($sort_key == 'm' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_LIST_CHAR'			=> $sort_url . '&amp;sk=a&amp;sd=' . (($sort_key == 'l' && $sort_dir == 'a') ? 'd' : 'a'),
-
-			'S_SHOW_GROUP'		=> ($mode == 'group') ? true : false,
-			'S_VIEWONLINE'		=> phpbb::$acl->acl_get('u_viewonline'),
-			'S_LEADERS_SET'		=> $leaders_set,
-			'S_MODE_SELECT'		=> $s_sort_key,
-			'S_ORDER_SELECT'	=> $s_sort_dir,
-			'S_CHAR_OPTIONS'	=> $s_char_options,
-			'S_MODE_ACTION'		=> $pagination_url,
-		));
-}
-
-// Output the page
-page_header($page_title);
-
-phpbb::$template->set_filenames(array(
-	'body' => $template_html)
-);
-make_jumpbox(append_sid('viewforum'));
-
-page_footer();
-
-/**
-* Prepare profile data
-*/
-function show_profile($data)
-{
-	$username = $data['username'];
-	$user_id = $data['user_id'];
-
-	$rank_title = $rank_img = $rank_img_src = '';
-	get_user_rank($user_id, $data['user_rank'], $data['user_posts'], $rank_title, $rank_img, $rank_img_src);
-
-	if (!empty($data['user_allow_viewemail']) || phpbb::$acl->acl_get('a_email'))
-	{
-		$email = (phpbb::$config['board_email_form'] && phpbb::$config['email_enable']) ? append_sid('memberlist', 'mode=email&amp;u=' . $user_id) : ((phpbb::$config['board_hide_emails'] && !phpbb::$acl->acl_get('a_email')) ? '' : 'mailto:' . $data['user_email']);
-	}
-	else
-	{
-		$email = '';
-	}
-
-	if (phpbb::$config['load_onlinetrack'])
-	{
-		$update_time = phpbb::$config['load_online_time'] * 60;
-		$online = (time() - $update_time < $data['session_time'] && ((isset($data['session_viewonline']) && $data['session_viewonline']) || phpbb::$acl->acl_get('u_viewonline'))) ? true : false;
-	}
-	else
-	{
-		$online = false;
-	}
-
-	if ($data['user_allow_viewonline'] || phpbb::$acl->acl_get('u_viewonline'))
-	{
-		$last_visit = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_lastvisit'];
-	}
-	else
-	{
-		$last_visit = '';
-	}
-
-	$age = '';
-
-	if (phpbb::$config['allow_birthdays'] && $data['user_birthday'])
-	{
-		list($bday_day, $bday_month, $bday_year) = array_map('intval', explode('-', $data['user_birthday']));
-
-		if ($bday_year)
-		{
-			$now = getdate(time() + phpbb::$user->timezone + phpbb::$user->dst - date('Z'));
-
-			$diff = $now['mon'] - $bday_month;
-			if ($diff == 0)
-			{
-				$diff = ($now['mday'] - $bday_day < 0) ? 1 : 0;
-			}
-			else
-			{
-				$diff = ($diff < 0) ? 1 : 0;
-			}
-
-			$age = (int) ($now['year'] - $bday_year - $diff);
-		}
-	}
-
-	// Dump it out to the template
-	return array(
-		'AGE'			=> $age,
-		'RANK_TITLE'	=> $rank_title,
-		'JOINED'		=> phpbb::$user->format_date($data['user_regdate']),
-		'VISITED'		=> (empty($last_visit)) ? ' - ' : phpbb::$user->format_date($last_visit),
-		'POSTS'			=> ($data['user_posts']) ? $data['user_posts'] : 0,
-		'WARNINGS'		=> isset($data['user_warnings']) ? $data['user_warnings'] : 0,
-
-		'USERNAME_FULL'		=> get_username_string('full', $user_id, $username, $data['user_colour']),
-		'USERNAME'			=> get_username_string('username', $user_id, $username, $data['user_colour']),
-		'USER_COLOR'		=> get_username_string('colour', $user_id, $username, $data['user_colour']),
-		'U_VIEW_PROFILE'	=> get_username_string('profile', $user_id, $username, $data['user_colour']),
-
-		'A_USERNAME'		=> addslashes(get_username_string('username', $user_id, $username, $data['user_colour'])),
-
-		'AVATAR_IMG'		=> get_user_avatar($data['user_avatar'], $data['user_avatar_type'], $data['user_avatar_width'], $data['user_avatar_height']),
-		'ONLINE_IMG'		=> (!phpbb::$config['load_onlinetrack']) ? '' : (($online) ? phpbb::$user->img('icon_user_online', 'ONLINE') : phpbb::$user->img('icon_user_offline', 'OFFLINE')),
-		'S_ONLINE'			=> (phpbb::$config['load_onlinetrack'] && $online) ? true : false,
-		'RANK_IMG'			=> $rank_img,
-		'RANK_IMG_SRC'		=> $rank_img_src,
-		'ICQ_STATUS_IMG'	=> (!empty($data['user_icq'])) ? '<img src="http://web.icq.com/whitepages/online?icq=' . $data['user_icq'] . '&amp;img=5" width="18" height="18" />' : '',
-		'S_JABBER_ENABLED'	=> (phpbb::$config['jab_enable']) ? true : false,
-
-		'U_SEARCH_USER'	=> (phpbb::$acl->acl_get('u_search')) ? append_sid('search', "author_id=$user_id&amp;sr=posts") : '',
-		'U_NOTES'		=> phpbb::$acl->acl_getf_global('m_') ? append_sid('mcp', 'i=notes&amp;mode=user_notes&amp;u=' . $user_id, true, phpbb::$user->session_id) : '',
-		'U_WARN'		=> phpbb::$acl->acl_get('m_warn') ? append_sid('mcp', 'i=warn&amp;mode=warn_user&amp;u=' . $user_id, true, phpbb::$user->session_id) : '',
-		'U_PM'			=> (phpbb::$config['allow_privmsg'] && phpbb::$acl->acl_get('u_sendpm') && ($data['user_allow_pm'] || phpbb::$acl->acl_gets('a_', 'm_') || phpbb::$acl->acl_getf_global('m_'))) ? append_sid('ucp', 'i=pm&amp;mode=compose&amp;u=' . $user_id) : '',
-		'U_EMAIL'		=> $email,
-		'U_WWW'			=> (!empty($data['user_website'])) ? $data['user_website'] : '',
-		'U_ICQ'			=> ($data['user_icq']) ? 'http://www.icq.com/people/webmsg.php?to=' . urlencode($data['user_icq']) : '',
-		'U_AIM'			=> ($data['user_aim'] && phpbb::$acl->acl_get('u_sendim')) ? append_sid('memberlist', 'mode=contact&amp;action=aim&amp;u=' . $user_id) : '',
-		'U_YIM'			=> ($data['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($data['user_yim']) . '&amp;.src=pg' : '',
-		'U_MSN'			=> ($data['user_msnm'] && phpbb::$acl->acl_get('u_sendim')) ? append_sid('memberlist', 'mode=contact&amp;action=msnm&amp;u=' . $user_id) : '',
-		'U_JABBER'		=> ($data['user_jabber'] && phpbb::$acl->acl_get('u_sendim')) ? append_sid('memberlist', 'mode=contact&amp;action=jabber&amp;u=' . $user_id) : '',
-		'LOCATION'		=> ($data['user_from']) ? $data['user_from'] : '',
-
-		'USER_ICQ'			=> $data['user_icq'],
-		'USER_AIM'			=> $data['user_aim'],
-		'USER_YIM'			=> $data['user_yim'],
-		'USER_MSN'			=> $data['user_msnm'],
-		'USER_JABBER'		=> $data['user_jabber'],
-		'USER_JABBER_IMG'	=> ($data['user_jabber']) ? phpbb::$user->img('icon_contact_jabber', $data['user_jabber']) : '',
-
-		'L_VIEWING_PROFILE'	=> sprintf(phpbb::$user->lang['VIEWING_PROFILE'], $username),
-	);
-}
-
-function _sort_last_active($first, $second)
-{
-	global $id_cache, $sort_dir;
-
-	$lesser_than = ($sort_dir === 'd') ? -1 : 1;
-
-	if (isset($id_cache[$first]['group_leader']) && $id_cache[$first]['group_leader'] && (!isset($id_cache[$second]['group_leader']) || !$id_cache[$second]['group_leader']))
-	{
-		return -1;
-	}
-	else if (isset($id_cache[$second]['group_leader']) && (!isset($id_cache[$first]['group_leader']) || !$id_cache[$first]['group_leader']) && $id_cache[$second]['group_leader'])
-	{
-		return 1;
-	}
-	else
-	{
-		return $lesser_than * (int) ($id_cache[$first]['last_visit'] - $id_cache[$second]['last_visit']);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_attachments.php b/phpBB/modules/acp/acp_attachments.php
deleted file mode 100644
index a6c35acdbd..0000000000
--- a/phpBB/modules/acp/acp_attachments.php
+++ /dev/null
@@ -1,1441 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_attachments
-{
-	var $u_action;
-	var $new_config;
-
-	function main($id, $mode)
-	{
-		phpbb::$user->add_lang(array('posting', 'viewtopic', 'acp/attachments'));
-
-		$error = $notify = array();
-		$submit = phpbb_request::is_set_post('submit');
-		$action = request_var('action', '');
-
-		$form_key = 'acp_attach';
-		add_form_key($form_key);
-
-		if ($submit && !check_form_key($form_key))
-		{
-			trigger_error(phpbb::$user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
-		switch ($mode)
-		{
-			case 'attach':
-				$l_title = 'ACP_ATTACHMENT_SETTINGS';
-			break;
-
-			case 'extensions':
-				$l_title = 'ACP_MANAGE_EXTENSIONS';
-			break;
-
-			case 'ext_groups':
-				$l_title = 'ACP_EXTENSION_GROUPS';
-			break;
-
-			case 'orphan':
-				$l_title = 'ACP_ORPHAN_ATTACHMENTS';
-			break;
-
-			default:
-				trigger_error('NO_MODE', E_USER_ERROR);
-			break;
-		}
-
-		$this->tpl_name = 'acp_attachments';
-		$this->page_title = $l_title;
-
-		phpbb::$template->assign_vars(array(
-			'L_TITLE'			=> phpbb::$user->lang[$l_title],
-			'L_TITLE_EXPLAIN'	=> phpbb::$user->lang[$l_title . '_EXPLAIN'],
-			'U_ACTION'			=> $this->u_action,
-		));
-
-		switch ($mode)
-		{
-			case 'attach':
-
-				include_once(PHPBB_ROOT_PATH . 'includes/functions_posting.' . PHP_EXT);
-
-				$sql = 'SELECT group_name, cat_id
-					FROM ' . EXTENSION_GROUPS_TABLE . '
-					WHERE cat_id > 0
-					ORDER BY cat_id';
-				$result = phpbb::$db->sql_query($sql);
-
-				$s_assigned_groups = array();
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$s_assigned_groups[$row['cat_id']][] = $row['group_name'];
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				$l_legend_cat_images = phpbb::$user->lang['SETTINGS_CAT_IMAGES'] . ' [' . phpbb::$user->lang['ASSIGNED_GROUP'] . ': ' . ((!empty($s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE])) ? implode(', ', $s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE]) : phpbb::$user->lang['NO_EXT_GROUP']) . ']';
-
-				$display_vars = array(
-					'title'	=> 'ACP_ATTACHMENT_SETTINGS',
-					'vars'	=> array(
-						'img_max_width' => false, 'img_max_height' => false, 'img_link_width' => false, 'img_link_height' => false,
-
-						'legend1'				=> 'ACP_ATTACHMENT_SETTINGS',
-						'allow_attachments'		=> array('lang' => 'ALLOW_ATTACHMENTS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_pm_attach'		=> array('lang' => 'ALLOW_PM_ATTACHMENTS',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'upload_path'			=> array('lang' => 'UPLOAD_DIR',			'validate' => 'wpath',	'type' => 'text:25:100', 'explain' => true),
-						'display_order'			=> array('lang' => 'DISPLAY_ORDER',			'validate' => 'bool',	'type' => 'custom', 'method' => 'display_order', 'explain' => true),
-						'attachment_quota'		=> array('lang' => 'ATTACH_QUOTA',			'validate' => 'string',	'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
-						'max_filesize'			=> array('lang' => 'ATTACH_MAX_FILESIZE',	'validate' => 'string',	'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
-						'max_filesize_pm'		=> array('lang' => 'ATTACH_MAX_PM_FILESIZE','validate' => 'string',	'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
-						'max_attachments'		=> array('lang' => 'MAX_ATTACHMENTS',		'validate' => 'int',	'type' => 'text:3:3', 'explain' => false),
-						'max_attachments_pm'	=> array('lang' => 'MAX_ATTACHMENTS_PM',	'validate' => 'int',	'type' => 'text:3:3', 'explain' => false),
-						'secure_downloads'		=> array('lang' => 'SECURE_DOWNLOADS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'secure_allow_deny'		=> array('lang' => 'SECURE_ALLOW_DENY',		'validate' => 'int',	'type' => 'custom', 'method' => 'select_allow_deny', 'explain' => true),
-						'secure_allow_empty_referer'	=> array('lang' => 'SECURE_EMPTY_REFERRER', 'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'check_attachment_content' 		=> array('lang' => 'CHECK_CONTENT', 'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-
-
-						'legend2'					=> $l_legend_cat_images,
-						'img_display_inlined'		=> array('lang' => 'DISPLAY_INLINED',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'img_create_thumbnail'		=> array('lang' => 'CREATE_THUMBNAIL',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'img_max_thumb_width'		=> array('lang' => 'MAX_THUMB_WIDTH',		'validate' => 'int',	'type' => 'text:7:15', 'explain' => true, 'append' => ' px'),
-						'img_min_thumb_filesize'	=> array('lang' => 'MIN_THUMB_FILESIZE',	'validate' => 'int',	'type' => 'text:7:15', 'explain' => true, 'append' => ' ' . phpbb::$user->lang['BYTES']),
-						'img_imagick'				=> array('lang' => 'IMAGICK_PATH',			'validate' => 'string',	'type' => 'text:20:200', 'explain' => true, 'append' => '&nbsp;&nbsp;<span>[ <a href="' . $this->u_action . '&amp;action=imgmagick">' . phpbb::$user->lang['SEARCH_IMAGICK'] . '</a> ]</span>'),
-						'img_max'					=> array('lang' => 'MAX_IMAGE_SIZE',		'validate' => 'int',	'type' => 'dimension:3:4', 'explain' => true, 'append' => ' px'),
-						'img_link'					=> array('lang' => 'IMAGE_LINK_SIZE',		'validate' => 'int',	'type' => 'dimension:3:4', 'explain' => true, 'append' => ' px'),
-					)
-				);
-
-				$this->new_config = phpbb::$config;
-				$cfg_array = (phpbb_request::is_set('config')) ? request_var('config', array('' => '')) : $this->new_config;
-				$error = array();
-
-				// We validate the complete config if whished
-				validate_config_vars($display_vars['vars'], $cfg_array, $error);
-
-				// Do not write values if there is an error
-				if (sizeof($error))
-				{
-					$submit = false;
-				}
-
-				// We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to...
-				foreach ($display_vars['vars'] as $config_name => $null)
-				{
-					if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false)
-					{
-						continue;
-					}
-
-					$this->new_config[$config_name] = $config_value = $cfg_array[$config_name];
-
-					if (in_array($config_name, array('attachment_quota', 'max_filesize', 'max_filesize_pm')))
-					{
-						$size_var = request_var($config_name, '');
-						$this->new_config[$config_name] = $config_value = ($size_var == 'kb') ? round($config_value * 1024) : (($size_var == 'mb') ? round($config_value * 1048576) : $config_value);
-					}
-
-					if ($submit)
-					{
-						set_config($config_name, $config_value);
-					}
-				}
-
-				$this->perform_site_list();
-
-				if ($submit)
-				{
-					add_log('admin', 'LOG_CONFIG_ATTACH');
-
-					// Check Settings
-					$this->test_upload($error, $this->new_config['upload_path'], false);
-
-					if (!sizeof($error))
-					{
-						trigger_error(phpbb::$user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action));
-					}
-				}
-
-				phpbb::$template->assign_var('S_ATTACHMENT_SETTINGS', true);
-
-				if ($action == 'imgmagick')
-				{
-					$this->new_config['img_imagick'] = $this->search_imagemagick();
-				}
-
-				// We strip eventually manual added convert program, we only want the patch
-				if ($this->new_config['img_imagick'])
-				{
-					// Change path separator
-					$this->new_config['img_imagick'] = str_replace('\\', '/', $this->new_config['img_imagick']);
-					$this->new_config['img_imagick'] = str_replace(array('convert', '.exe'), array('', ''), $this->new_config['img_imagick']);
-
-					// Check for trailing slash
-					if (substr($this->new_config['img_imagick'], -1) !== '/')
-					{
-						$this->new_config['img_imagick'] .= '/';
-					}
-				}
-
-				$supported_types = get_supported_image_types();
-
-				// Check Thumbnail Support
-				if (!$this->new_config['img_imagick'] && (!isset($supported_types['format']) || !sizeof($supported_types['format'])))
-				{
-					$this->new_config['img_create_thumbnail'] = 0;
-				}
-
-				phpbb::$template->assign_vars(array(
-					'U_SEARCH_IMAGICK'		=> $this->u_action . '&amp;action=imgmagick',
-					'S_THUMBNAIL_SUPPORT'	=> (!$this->new_config['img_imagick'] && (!isset($supported_types['format']) || !sizeof($supported_types['format']))) ? false : true,
-				));
-
-				// Secure Download Options - Same procedure as with banning
-				$allow_deny = ($this->new_config['secure_allow_deny']) ? 'ALLOWED' : 'DISALLOWED';
-
-				$sql = 'SELECT *
-					FROM ' . SITELIST_TABLE;
-				$result = phpbb::$db->sql_query($sql);
-
-				$defined_ips = '';
-				$ips = array();
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$value = ($row['site_ip']) ? $row['site_ip'] : $row['site_hostname'];
-					if ($value)
-					{
-						$defined_ips .= '<option' . (($row['ip_exclude']) ? ' class="sep"' : '') . ' value="' . $row['site_id'] . '">' . $value . '</option>';
-						$ips[$row['site_id']] = $value;
-					}
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				phpbb::$template->assign_vars(array(
-					'S_SECURE_DOWNLOADS'	=> $this->new_config['secure_downloads'],
-					'S_DEFINED_IPS'			=> ($defined_ips != '') ? true : false,
-					'S_WARNING'				=> (sizeof($error)) ? true : false,
-
-					'WARNING_MSG'			=> implode('<br />', $error),
-					'DEFINED_IPS'			=> $defined_ips,
-
-					'L_SECURE_TITLE'		=> phpbb::$user->lang['DEFINE_' . $allow_deny . '_IPS'],
-					'L_IP_EXCLUDE'			=> phpbb::$user->lang['EXCLUDE_FROM_' . $allow_deny . '_IP'],
-					'L_REMOVE_IPS'			=> phpbb::$user->lang['REMOVE_' . $allow_deny . '_IPS'],
-				));
-
-				// Output relevant options
-				foreach ($display_vars['vars'] as $config_key => $vars)
-				{
-					if (!is_array($vars) && strpos($config_key, 'legend') === false)
-					{
-						continue;
-					}
-
-					if (strpos($config_key, 'legend') !== false)
-					{
-						phpbb::$template->assign_block_vars('options', array(
-							'S_LEGEND'		=> true,
-							'LEGEND'		=> (isset(phpbb::$user->lang[$vars])) ? phpbb::$user->lang[$vars] : $vars,
-						));
-
-						continue;
-					}
-
-					$type = explode(':', $vars['type']);
-
-					$l_explain = '';
-					if ($vars['explain'] && isset($vars['lang_explain']))
-					{
-						$l_explain = (isset(phpbb::$user->lang[$vars['lang_explain']])) ? phpbb::$user->lang[$vars['lang_explain']] : $vars['lang_explain'];
-					}
-					else if ($vars['explain'])
-					{
-						$l_explain = (isset(phpbb::$user->lang[$vars['lang'] . '_EXPLAIN'])) ? phpbb::$user->lang[$vars['lang'] . '_EXPLAIN'] : '';
-					}
-
-					$content = build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars);
-					if (empty($content))
-					{
-						continue;
-					}
-
-					phpbb::$template->assign_block_vars('options', array(
-						'KEY'			=> $config_key,
-						'TITLE'			=> phpbb::$user->lang[$vars['lang']],
-						'S_EXPLAIN'		=> $vars['explain'],
-						'TITLE_EXPLAIN'	=> $l_explain,
-						'CONTENT'		=> $content,
-					));
-
-					unset($display_vars['vars'][$config_key]);
-				}
-
-			break;
-
-			case 'extensions':
-
-				if ($submit || phpbb_request::is_set_post('add_extension_check'))
-				{
-					if ($submit)
-					{
-						// Change Extensions ?
-						$extension_change_list	= request_var('extension_change_list', array(0));
-						$group_select_list		= request_var('group_select', array(0));
-
-						// Generate correct Change List
-						$extensions = array();
-
-						for ($i = 0, $size = sizeof($extension_change_list); $i < $size; $i++)
-						{
-							$extensions[$extension_change_list[$i]]['group_id'] = $group_select_list[$i];
-						}
-
-						$sql = 'SELECT *
-							FROM ' . EXTENSIONS_TABLE . '
-							ORDER BY extension_id';
-						$result = phpbb::$db->sql_query($sql);
-
-						while ($row = phpbb::$db->sql_fetchrow($result))
-						{
-							if ($row['group_id'] != $extensions[$row['extension_id']]['group_id'])
-							{
-								$sql = 'UPDATE ' . EXTENSIONS_TABLE . '
-									SET group_id = ' . (int) $extensions[$row['extension_id']]['group_id'] . '
-									WHERE extension_id = ' . $row['extension_id'];
-								phpbb::$db->sql_query($sql);
-
-								add_log('admin', 'LOG_ATTACH_EXT_UPDATE', $row['extension']);
-							}
-						}
-						phpbb::$db->sql_freeresult($result);
-
-						// Delete Extension?
-						$extension_id_list = request_var('extension_id_list', array(0));
-
-						if (sizeof($extension_id_list))
-						{
-							$sql = 'SELECT extension
-								FROM ' . EXTENSIONS_TABLE . '
-								WHERE ' . phpbb::$db->sql_in_set('extension_id', $extension_id_list);
-							$result = phpbb::$db->sql_query($sql);
-
-							$extension_list = '';
-							while ($row = phpbb::$db->sql_fetchrow($result))
-							{
-								$extension_list .= ($extension_list == '') ? $row['extension'] : ', ' . $row['extension'];
-							}
-							phpbb::$db->sql_freeresult($result);
-
-							$sql = 'DELETE
-								FROM ' . EXTENSIONS_TABLE . '
-								WHERE ' . phpbb::$db->sql_in_set('extension_id', $extension_id_list);
-							phpbb::$db->sql_query($sql);
-
-							add_log('admin', 'LOG_ATTACH_EXT_DEL', $extension_list);
-						}
-					}
-
-					// Add Extension?
-					$add_extension			= strtolower(request_var('add_extension', ''));
-					$add_extension_group	= request_var('add_group_select', 0);
-					$add					= phpbb_request::is_set_post('add_extension_check');
-
-					if ($add_extension && $add)
-					{
-						if (!sizeof($error))
-						{
-							$sql = 'SELECT extension_id
-								FROM ' . EXTENSIONS_TABLE . "
-								WHERE extension = '" . phpbb::$db->sql_escape($add_extension) . "'";
-							$result = phpbb::$db->sql_query($sql);
-
-							if ($row = phpbb::$db->sql_fetchrow($result))
-							{
-								$error[] = sprintf(phpbb::$user->lang['EXTENSION_EXIST'], $add_extension);
-							}
-							phpbb::$db->sql_freeresult($result);
-
-							if (!sizeof($error))
-							{
-								$sql_ary = array(
-									'group_id'	=>	$add_extension_group,
-									'extension'	=>	$add_extension
-								);
-
-								phpbb::$db->sql_query('INSERT INTO ' . EXTENSIONS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary));
-								add_log('admin', 'LOG_ATTACH_EXT_ADD', $add_extension);
-							}
-						}
-					}
-
-					if (!sizeof($error))
-					{
-						$notify[] = phpbb::$user->lang['EXTENSIONS_UPDATED'];
-					}
-
-					phpbb::$acm->destroy('extensions');
-				}
-
-				phpbb::$template->assign_vars(array(
-					'S_EXTENSIONS'			=> true,
-					'ADD_EXTENSION'			=> (isset($add_extension)) ? $add_extension : '',
-					'GROUP_SELECT_OPTIONS'	=> (phpbb_request::is_set_post('add_extension_check')) ? $this->group_select('add_group_select', $add_extension_group, 'extension_group') : $this->group_select('add_group_select', false, 'extension_group'),
-				));
-
-				$sql = 'SELECT *
-					FROM ' . EXTENSIONS_TABLE . '
-					ORDER BY group_id, extension';
-				$result = phpbb::$db->sql_query($sql);
-
-				if ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$old_group_id = $row['group_id'];
-					do
-					{
-						$s_spacer = false;
-
-						$current_group_id = $row['group_id'];
-						if ($old_group_id != $current_group_id)
-						{
-							$s_spacer = true;
-							$old_group_id = $current_group_id;
-						}
-
-						phpbb::$template->assign_block_vars('extensions', array(
-							'S_SPACER'		=> $s_spacer,
-							'EXTENSION_ID'	=> $row['extension_id'],
-							'EXTENSION'		=> $row['extension'],
-							'GROUP_OPTIONS'	=> $this->group_select('group_select[]', $row['group_id']),
-						));
-					}
-					while ($row = phpbb::$db->sql_fetchrow($result));
-				}
-				phpbb::$db->sql_freeresult($result);
-
-			break;
-
-			case 'ext_groups':
-
-				phpbb::$template->assign_var('S_EXTENSION_GROUPS', true);
-
-				if ($submit)
-				{
-					$action = request_var('action', '');
-					$group_id = request_var('g', 0);
-
-					if ($action != 'add' && $action != 'edit')
-					{
-						trigger_error('NO_MODE', E_USER_ERROR);
-					}
-
-					if (!$group_id && $action == 'edit')
-					{
-						trigger_error(phpbb::$user->lang['NO_EXT_GROUP_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-
-					if ($group_id)
-					{
-						$sql = 'SELECT *
-							FROM ' . EXTENSION_GROUPS_TABLE . "
-							WHERE group_id = $group_id";
-						$result = phpbb::$db->sql_query($sql);
-						$ext_row = phpbb::$db->sql_fetchrow($result);
-						phpbb::$db->sql_freeresult($result);
-
-						if (!$ext_row)
-						{
-							trigger_error(phpbb::$user->lang['NO_EXT_GROUP_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING);
-						}
-					}
-					else
-					{
-						$ext_row = array();
-					}
-
-					$group_name = utf8_normalize_nfc(request_var('group_name', '', true));
-					$new_group_name = ($action == 'add') ? $group_name : (($ext_row['group_name'] != $group_name) ? $group_name : '');
-
-					if (!$group_name)
-					{
-						$error[] = phpbb::$user->lang['NO_EXT_GROUP_NAME'];
-					}
-
-					// Check New Group Name
-					if ($new_group_name)
-					{
-						$sql = 'SELECT group_name
-							FROM ' . EXTENSION_GROUPS_TABLE;
-						$result = phpbb::$db->sql_query($sql);
-						$ext_row = phpbb::$db->sql_fetchrow($result);
-						phpbb::$db->sql_freeresult($result);
-
-						$clean_group_name = utf8_clean_string($new_group_name);
-
-						while ($row = phpbb::$db->sql_fetchrow($result))
-						{
-							if (utf8_clean_string($row['group_name']) === $clean_group_name)
-							{
-								$error[] = sprintf(phpbb::$user->lang['EXTENSION_GROUP_EXIST'], $new_group_name);
-								break;
-							}
-						}
-						phpbb::$db->sql_freeresult($result);
-					}
-
-					if (!sizeof($error))
-					{
-						// Ok, build the update/insert array
-						$upload_icon	= request_var('upload_icon', 'no_image');
-						$size_select	= request_var('size_select', 'b');
-						$forum_select	= request_var('forum_select', false);
-						$allowed_forums	= request_var('allowed_forums', array(0));
-						$allow_in_pm	= phpbb_request::is_set_post('allow_in_pm');
-						$max_filesize	= request_var('max_filesize', 0);
-						$max_filesize	= ($size_select == 'kb') ? round($max_filesize * 1024) : (($size_select == 'mb') ? round($max_filesize * 1048576) : $max_filesize);
-						$allow_group	= phpbb_request::is_set_post('allow_group');
-
-						if ($max_filesize == phpbb::$config['max_filesize'])
-						{
-							$max_filesize = 0;
-						}
-
-						if (!sizeof($allowed_forums))
-						{
-							$forum_select = false;
-						}
-
-						$group_ary = array(
-							'group_name'	=> $group_name,
-							'cat_id'		=> request_var('special_category', ATTACHMENT_CATEGORY_NONE),
-							'allow_group'	=> ($allow_group) ? 1 : 0,
-							'upload_icon'	=> ($upload_icon == 'no_image') ? '' : $upload_icon,
-							'max_filesize'	=> $max_filesize,
-							'allowed_forums'=> ($forum_select) ? serialize($allowed_forums) : '',
-							'allow_in_pm'	=> ($allow_in_pm) ? 1 : 0,
-						);
-
-						if ($action == 'add')
-						{
-							$group_ary['download_mode'] = INLINE_LINK;
-						}
-
-						// @TODO: rewrite with the new param db functions
-						$sql = ($action == 'add') ? 'INSERT INTO ' . EXTENSION_GROUPS_TABLE . ' ' : 'UPDATE ' . EXTENSION_GROUPS_TABLE . ' SET ';
-						$sql .= phpbb::$db->sql_build_array((($action == 'add') ? 'INSERT' : 'UPDATE'), $group_ary);
-						$sql .= ($action == 'edit') ? " WHERE group_id = $group_id" : '';
-
-						phpbb::$db->sql_query($sql);
-
-						if ($action == 'add')
-						{
-							$group_id = phpbb::$db->sql_nextid();
-						}
-
-						add_log('admin', 'LOG_ATTACH_EXTGROUP_' . strtoupper($action), $group_name);
-					}
-
-					$extension_list = request_var('extensions', array(0));
-
-					if ($action == 'edit' && sizeof($extension_list))
-					{
-						$sql = 'UPDATE ' . EXTENSIONS_TABLE . "
-							SET group_id = 0
-							WHERE group_id = $group_id";
-						phpbb::$db->sql_query($sql);
-					}
-
-					if (sizeof($extension_list))
-					{
-						$sql = 'UPDATE ' . EXTENSIONS_TABLE . "
-							SET group_id = $group_id
-							WHERE " . phpbb::$db->sql_in_set('extension_id', $extension_list);
-						phpbb::$db->sql_query($sql);
-					}
-
-					phpbb::$acm->destroy('extensions');
-
-					if (!sizeof($error))
-					{
-						$notify[] = phpbb::$user->lang['SUCCESS_EXTENSION_GROUP_' . strtoupper($action)];
-					}
-				}
-
-				$cat_lang = array(
-					ATTACHMENT_CATEGORY_NONE		=> phpbb::$user->lang['NO_FILE_CAT'],
-					ATTACHMENT_CATEGORY_IMAGE		=> phpbb::$user->lang['CAT_IMAGES'],
-					ATTACHMENT_CATEGORY_WM			=> phpbb::$user->lang['CAT_WM_FILES'],
-					ATTACHMENT_CATEGORY_RM			=> phpbb::$user->lang['CAT_RM_FILES'],
-					ATTACHMENT_CATEGORY_FLASH		=> phpbb::$user->lang['CAT_FLASH_FILES'],
-					ATTACHMENT_CATEGORY_QUICKTIME	=> phpbb::$user->lang['CAT_QUICKTIME_FILES'],
-				);
-
-				$group_id = request_var('g', 0);
-				$action = phpbb_request::is_set_post('add');
-
-				switch ($action)
-				{
-					case 'delete':
-
-						if (confirm_box(true))
-						{
-							$sql = 'SELECT group_name
-								FROM ' . EXTENSION_GROUPS_TABLE . "
-								WHERE group_id = $group_id";
-							$result = phpbb::$db->sql_query($sql);
-							$group_name = (string) phpbb::$db->sql_fetchfield('group_name');
-							phpbb::$db->sql_freeresult($result);
-
-							$sql = 'DELETE
-								FROM ' . EXTENSION_GROUPS_TABLE . "
-								WHERE group_id = $group_id";
-							phpbb::$db->sql_query($sql);
-
-							// Set corresponding Extensions to a pending Group
-							$sql = 'UPDATE ' . EXTENSIONS_TABLE . "
-								SET group_id = 0
-								WHERE group_id = $group_id";
-							phpbb::$db->sql_query($sql);
-
-							add_log('admin', 'LOG_ATTACH_EXTGROUP_DEL', $group_name);
-
-							phpbb::$acm->destroy('extensions');
-
-							trigger_error(phpbb::$user->lang['EXTENSION_GROUP_DELETED'] . adm_back_link($this->u_action));
-						}
-						else
-						{
-							confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-								'i'			=> $id,
-								'mode'		=> $mode,
-								'group_id'	=> $group_id,
-								'action'	=> 'delete',
-							)));
-						}
-
-					break;
-
-					case 'edit':
-
-						if (!$group_id)
-						{
-							trigger_error(phpbb::$user->lang['NO_EXT_GROUP_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING);
-						}
-
-						$sql = 'SELECT *
-							FROM ' . EXTENSION_GROUPS_TABLE . "
-							WHERE group_id = $group_id";
-						$result = phpbb::$db->sql_query($sql);
-						$ext_group_row = phpbb::$db->sql_fetchrow($result);
-						phpbb::$db->sql_freeresult($result);
-
-						$forum_ids = (!$ext_group_row['allowed_forums']) ? array() : unserialize(trim($ext_group_row['allowed_forums']));
-
-					// no break;
-
-					case 'add':
-
-						if ($action == 'add')
-						{
-							$ext_group_row = array(
-								'group_name'	=> utf8_normalize_nfc(request_var('group_name', '', true)),
-								'cat_id'		=> 0,
-								'allow_group'	=> 1,
-								'allow_in_pm'	=> 1,
-								'upload_icon'	=> '',
-								'max_filesize'	=> 0,
-							);
-
-							$forum_ids = array();
-						}
-
-						$extensions = array();
-
-						$sql = 'SELECT *
-							FROM ' . EXTENSIONS_TABLE . "
-							WHERE group_id = $group_id
-								OR group_id = 0
-							ORDER BY extension";
-						$result = phpbb::$db->sql_query($sql);
-						$extensions = phpbb::$db->sql_fetchrowset($result);
-						phpbb::$db->sql_freeresult($result);
-
-						if ($ext_group_row['max_filesize'] == 0)
-						{
-							$ext_group_row['max_filesize'] = (int) phpbb::$config['max_filesize'];
-						}
-
-						$size_format = ($ext_group_row['max_filesize'] >= 1048576) ? 'mb' : (($ext_group_row['max_filesize'] >= 1024) ? 'kb' : 'b');
-						$ext_group_row['max_filesize'] = get_formatted_filesize($ext_group_row['max_filesize'], false);
-
-						$img_path = phpbb::$config['upload_icons_path'];
-
-						$filename_list = '';
-						$no_image_select = false;
-
-						$imglist = filelist(PHPBB_ROOT_PATH . $img_path);
-
-						if (sizeof($imglist))
-						{
-							$imglist = array_values($imglist);
-							$imglist = $imglist[0];
-
-							foreach ($imglist as $key => $img)
-							{
-								if (!$ext_group_row['upload_icon'])
-								{
-									$no_image_select = true;
-									$selected = '';
-								}
-								else
-								{
-									$selected = ($ext_group_row['upload_icon'] == $img) ? ' selected="selected"' : '';
-								}
-
-								if (strlen($img) > 255)
-								{
-									continue;
-								}
-
-								$filename_list .= '<option value="' . htmlspecialchars($img) . '"' . $selected . '>' . htmlspecialchars($img) . '</option>';
-							}
-						}
-
-						$i = 0;
-						$assigned_extensions = '';
-						foreach ($extensions as $num => $row)
-						{
-							if ($row['group_id'] == $group_id && $group_id)
-							{
-								$assigned_extensions .= ($i) ? ', ' . $row['extension'] : $row['extension'];
-								$i++;
-							}
-						}
-
-						$s_extension_options = '';
-						foreach ($extensions as $row)
-						{
-							$s_extension_options .= '<option' . ((!$row['group_id']) ? ' class="disabled"' : '') . ' value="' . $row['extension_id'] . '"' . (($row['group_id'] == $group_id && $group_id) ? ' selected="selected"' : '') . '>' . $row['extension'] . '</option>';
-						}
-
-						phpbb::$template->assign_vars(array(
-							'PHPBB_ROOT_PATH'		=> PHPBB_ROOT_PATH,
-							'IMG_PATH'				=> $img_path,
-							'ACTION'				=> $action,
-							'GROUP_ID'				=> $group_id,
-							'GROUP_NAME'			=> $ext_group_row['group_name'],
-							'ALLOW_GROUP'			=> $ext_group_row['allow_group'],
-							'ALLOW_IN_PM'			=> $ext_group_row['allow_in_pm'],
-							'UPLOAD_ICON_SRC'		=> PHPBB_ROOT_PATH . $img_path . '/' . $ext_group_row['upload_icon'],
-							'EXTGROUP_FILESIZE'		=> $ext_group_row['max_filesize'],
-							'ASSIGNED_EXTENSIONS'	=> $assigned_extensions,
-
-							'S_CATEGORY_SELECT'			=> $this->category_select('special_category', $group_id, 'category'),
-							'S_EXT_GROUP_SIZE_OPTIONS'	=> size_select_options($size_format),
-							'S_EXTENSION_OPTIONS'		=> $s_extension_options,
-							'S_FILENAME_LIST'			=> $filename_list,
-							'S_EDIT_GROUP'				=> true,
-							'S_NO_IMAGE'				=> $no_image_select,
-							'S_FORUM_IDS'				=> (sizeof($forum_ids)) ? true : false,
-
-							'U_EXTENSIONS'		=> append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=$id&amp;mode=extensions"),
-							'U_BACK'			=> $this->u_action,
-
-							'L_LEGEND'			=> phpbb::$user->lang[strtoupper($action) . '_EXTENSION_GROUP'],
-						));
-
-						$s_forum_id_options = '';
-
-						/** @todo use in-built function **/
-
-						$sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id
-							FROM ' . FORUMS_TABLE . '
-							ORDER BY left_id ASC';
-						$result = phpbb::$db->sql_query($sql, 600);
-
-						$right = $cat_right = $padding_inc = 0;
-						$padding = $forum_list = $holding = '';
-						$padding_store = array('0' => '');
-
-						while ($row = phpbb::$db->sql_fetchrow($result))
-						{
-							if ($row['forum_type'] == FORUM_CAT && ($row['left_id'] + 1 == $row['right_id']))
-							{
-								// Non-postable forum with no subforums, don't display
-								continue;
-							}
-
-							if (!phpbb::$acl->acl_get('f_list', $row['forum_id']))
-							{
-								// if the user does not have permissions to list this forum skip
-								continue;
-							}
-
-							if ($row['left_id'] < $right)
-							{
-								$padding .= '&nbsp; &nbsp;';
-								$padding_store[$row['parent_id']] = $padding;
-							}
-							else if ($row['left_id'] > $right + 1)
-							{
-								$padding = empty($padding_store[$row['parent_id']]) ? '' : $padding_store[$row['parent_id']];
-							}
-
-							$right = $row['right_id'];
-
-							$selected = (in_array($row['forum_id'], $forum_ids)) ? ' selected="selected"' : '';
-
-							if ($row['left_id'] > $cat_right)
-							{
-								// make sure we don't forget anything
-								$s_forum_id_options .= $holding;
-								$holding = '';
-							}
-
-							if ($row['right_id'] - $row['left_id'] > 1)
-							{
-								$cat_right = max($cat_right, $row['right_id']);
-
-								$holding .= '<option value="' . $row['forum_id'] . '"' . (($row['forum_type'] == FORUM_POST) ? ' class="sep"' : '') . $selected . '>' . $padding . $row['forum_name'] . '</option>';
-							}
-							else
-							{
-								$s_forum_id_options .= $holding . '<option value="' . $row['forum_id'] . '"' . (($row['forum_type'] == FORUM_POST) ? ' class="sep"' : '') . $selected . '>' . $padding . $row['forum_name'] . '</option>';
-								$holding = '';
-							}
-						}
-
-						if ($holding)
-						{
-							$s_forum_id_options .= $holding;
-						}
-
-						phpbb::$db->sql_freeresult($result);
-						unset($padding_store);
-
-						phpbb::$template->assign_vars(array(
-							'S_FORUM_ID_OPTIONS'	=> $s_forum_id_options,
-						));
-
-					break;
-				}
-
-				$sql = 'SELECT *
-					FROM ' . EXTENSION_GROUPS_TABLE . '
-					ORDER BY allow_group DESC, allow_in_pm DESC, group_name';
-				$result = phpbb::$db->sql_query($sql);
-
-				$old_allow_group = $old_allow_pm = 1;
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$s_add_spacer = ($old_allow_group != $row['allow_group'] || $old_allow_pm != $row['allow_in_pm']) ? true : false;
-
-					phpbb::$template->assign_block_vars('groups', array(
-						'S_ADD_SPACER'		=> $s_add_spacer,
-						'S_ALLOWED_IN_PM'	=> ($row['allow_in_pm']) ? true : false,
-						'S_GROUP_ALLOWED'	=> ($row['allow_group']) ? true : false,
-
-						'U_EDIT'		=> $this->u_action . "&amp;action=edit&amp;g={$row['group_id']}",
-						'U_DELETE'		=> $this->u_action . "&amp;action=delete&amp;g={$row['group_id']}",
-
-						'GROUP_NAME'	=> $row['group_name'],
-						'CATEGORY'		=> $cat_lang[$row['cat_id']],
-					));
-
-					$old_allow_group = $row['allow_group'];
-					$old_allow_pm = $row['allow_in_pm'];
-				}
-				phpbb::$db->sql_freeresult($result);
-
-			break;
-
-			case 'orphan':
-
-				if ($submit)
-				{
-					$delete_files = array_keys(phpbb_request::variable('delete', array('' => 0), false, phpbb_request::POST));
-					$add_files = array_keys(phpbb_request::variable('add', array('' => 0), false, phpbb_request::POST));
-					$post_ids = request_var('post_id', array('' => 0));
-
-					if (sizeof($delete_files))
-					{
-						$sql = 'SELECT *
-							FROM ' . ATTACHMENTS_TABLE . '
-							WHERE ' . phpbb::$db->sql_in_set('attach_id', $delete_files) . '
-								AND is_orphan = 1';
-						$result = phpbb::$db->sql_query($sql);
-
-						$delete_files = array();
-						while ($row = phpbb::$db->sql_fetchrow($result))
-						{
-							phpbb_unlink($row['physical_filename'], 'file');
-
-							if ($row['thumbnail'])
-							{
-								phpbb_unlink($row['physical_filename'], 'thumbnail');
-							}
-
-							$delete_files[$row['attach_id']] = $row['real_filename'];
-						}
-						phpbb::$db->sql_freeresult($result);
-					}
-
-					if (sizeof($delete_files))
-					{
-						$sql = 'DELETE FROM ' . ATTACHMENTS_TABLE . '
-							WHERE ' . phpbb::$db->sql_in_set('attach_id', array_keys($delete_files));
-						phpbb::$db->sql_query($sql);
-
-						add_log('admin', 'LOG_ATTACH_ORPHAN_DEL', implode(', ', $delete_files));
-						$notify[] = sprintf(phpbb::$user->lang['LOG_ATTACH_ORPHAN_DEL'], implode(', ', $delete_files));
-					}
-
-					$upload_list = array();
-					foreach ($add_files as $attach_id)
-					{
-						if (!isset($delete_files[$attach_id]) && !empty($post_ids[$attach_id]))
-						{
-							$upload_list[$attach_id] = $post_ids[$attach_id];
-						}
-					}
-					unset($add_files);
-
-					if (sizeof($upload_list))
-					{
-						phpbb::$template->assign_var('S_UPLOADING_FILES', true);
-
-						$sql = 'SELECT forum_id, forum_name
-							FROM ' . FORUMS_TABLE;
-						$result = phpbb::$db->sql_query($sql);
-
-						$forum_names = array();
-						while ($row = phpbb::$db->sql_fetchrow($result))
-						{
-							$forum_names[$row['forum_id']] = $row['forum_name'];
-						}
-						phpbb::$db->sql_freeresult($result);
-
-						$sql = 'SELECT forum_id, topic_id, post_id, poster_id
-							FROM ' . POSTS_TABLE . '
-							WHERE ' . phpbb::$db->sql_in_set('post_id', $upload_list);
-						$result = phpbb::$db->sql_query($sql);
-
-						$post_info = array();
-						while ($row = phpbb::$db->sql_fetchrow($result))
-						{
-							$post_info[$row['post_id']] = $row;
-						}
-						phpbb::$db->sql_freeresult($result);
-
-						// Select those attachments we want to change...
-						$sql = 'SELECT *
-							FROM ' . ATTACHMENTS_TABLE . '
-							WHERE ' . phpbb::$db->sql_in_set('attach_id', array_keys($upload_list)) . '
-								AND is_orphan = 1';
-						$result = phpbb::$db->sql_query($sql);
-
-						$files_added = $space_taken = 0;
-						while ($row = phpbb::$db->sql_fetchrow($result))
-						{
-							$post_row = $post_info[$upload_list[$row['attach_id']]];
-
-							phpbb::$template->assign_block_vars('upload', array(
-								'FILE_INFO'		=> sprintf(phpbb::$user->lang['UPLOADING_FILE_TO'], $row['real_filename'], $post_row['post_id']),
-								'S_DENIED'		=> (!phpbb::$acl->acl_get('f_attach', $post_row['forum_id'])) ? true : false,
-								'L_DENIED'		=> (!phpbb::$acl->acl_get('f_attach', $post_row['forum_id'])) ? sprintf(phpbb::$user->lang['UPLOAD_DENIED_FORUM'], $forum_names[$row['forum_id']]) : '',
-							));
-
-							if (!phpbb::$acl->acl_get('f_attach', $post_row['forum_id']))
-							{
-								continue;
-							}
-
-							// Adjust attachment entry
-							$sql_ary = array(
-								'in_message'	=> 0,
-								'is_orphan'		=> 0,
-								'poster_id'		=> $post_row['poster_id'],
-								'post_msg_id'	=> $post_row['post_id'],
-								'topic_id'		=> $post_row['topic_id'],
-							);
-
-							$sql = 'UPDATE ' . ATTACHMENTS_TABLE . '
-								SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-								WHERE attach_id = ' . $row['attach_id'];
-							phpbb::$db->sql_query($sql);
-
-							$sql = 'UPDATE ' . POSTS_TABLE . '
-								SET post_attachment = 1
-								WHERE post_id = ' . $post_row['post_id'];
-							phpbb::$db->sql_query($sql);
-
-							$sql = 'UPDATE ' . TOPICS_TABLE . '
-								SET topic_attachment = 1
-								WHERE topic_id = ' . $post_row['topic_id'];
-							phpbb::$db->sql_query($sql);
-
-							$space_taken += $row['filesize'];
-							$files_added++;
-
-							add_log('admin', 'LOG_ATTACH_FILEUPLOAD', $post_row['post_id'], $row['real_filename']);
-						}
-						phpbb::$db->sql_freeresult($result);
-
-						if ($files_added)
-						{
-							set_config_count('upload_dir_size', $space_taken, true);
-							set_config_count('num_files', $files_added, true);
-						}
-					}
-				}
-
-				phpbb::$template->assign_vars(array(
-					'S_ORPHAN'		=> true,
-				));
-
-				// Just get the files with is_orphan set and older than 3 hours
-				$sql = 'SELECT *
-					FROM ' . ATTACHMENTS_TABLE . '
-					WHERE is_orphan = 1
-						AND filetime < ' . (time() - 3*60*60) . '
-					ORDER BY filetime DESC';
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					phpbb::$template->assign_block_vars('orphan', array(
-						'FILESIZE'			=> get_formatted_filesize($row['filesize']),
-						'FILETIME'			=> phpbb::$user->format_date($row['filetime']),
-						'REAL_FILENAME'		=> basename($row['real_filename']),
-						'PHYSICAL_FILENAME'	=> basename($row['physical_filename']),
-						'ATTACH_ID'			=> $row['attach_id'],
-						'POST_IDS'			=> (!empty($post_ids[$row['attach_id']])) ? $post_ids[$row['attach_id']] : '',
-						'U_FILE'			=> append_sid('download/file', 'mode=view&amp;id=' . $row['attach_id']),
-					));
-				}
-				phpbb::$db->sql_freeresult($result);
-
-			break;
-		}
-
-		if (sizeof($error))
-		{
-			phpbb::$template->assign_vars(array(
-				'S_WARNING'		=> true,
-				'WARNING_MSG'	=> implode('<br />', $error),
-			));
-		}
-
-		if (sizeof($notify))
-		{
-			phpbb::$template->assign_vars(array(
-				'S_NOTIFY'		=> true,
-				'NOTIFY_MSG'	=> implode('<br />', $notify),
-			));
-		}
-	}
-
-	/**
-	* Build Select for category items
-	*/
-	function category_select($select_name, $group_id = false, $key = '')
-	{
-		$types = array(
-			ATTACHMENT_CATEGORY_NONE		=> phpbb::$user->lang['NO_FILE_CAT'],
-			ATTACHMENT_CATEGORY_IMAGE		=> phpbb::$user->lang['CAT_IMAGES'],
-			ATTACHMENT_CATEGORY_WM			=> phpbb::$user->lang['CAT_WM_FILES'],
-			ATTACHMENT_CATEGORY_RM			=> phpbb::$user->lang['CAT_RM_FILES'],
-			ATTACHMENT_CATEGORY_FLASH		=> phpbb::$user->lang['CAT_FLASH_FILES'],
-			ATTACHMENT_CATEGORY_QUICKTIME	=> phpbb::$user->lang['CAT_QUICKTIME_FILES'],
-		);
-
-		if ($group_id)
-		{
-			$sql = 'SELECT cat_id
-				FROM ' . EXTENSION_GROUPS_TABLE . '
-				WHERE group_id = ' . (int) $group_id;
-			$result = phpbb::$db->sql_query($sql);
-
-			$cat_type = (!($row = phpbb::$db->sql_fetchrow($result))) ? ATTACHMENT_CATEGORY_NONE : $row['cat_id'];
-
-			phpbb::$db->sql_freeresult($result);
-		}
-		else
-		{
-			$cat_type = ATTACHMENT_CATEGORY_NONE;
-		}
-
-		$group_select = '<select name="' . $select_name . '"' . (($key) ? ' id="' . $key . '"' : '') . '>';
-
-		foreach ($types as $type => $mode)
-		{
-			$selected = ($type == $cat_type) ? ' selected="selected"' : '';
-			$group_select .= '<option value="' . $type . '"' . $selected . '>' . $mode . '</option>';
-		}
-
-		$group_select .= '</select>';
-
-		return $group_select;
-	}
-
-	/**
-	* Extension group select
-	*/
-	function group_select($select_name, $default_group = false, $key = '')
-	{
-		$group_select = '<select name="' . $select_name . '"' . (($key) ? ' id="' . $key . '"' : '') . '>';
-
-		$sql = 'SELECT group_id, group_name
-			FROM ' . EXTENSION_GROUPS_TABLE . '
-			ORDER BY group_name';
-		$result = phpbb::$db->sql_query($sql);
-
-		$group_name = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$group_name[] = $row;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$row['group_id'] = 0;
-		$row['group_name'] = phpbb::$user->lang['NOT_ASSIGNED'];
-		$group_name[] = $row;
-
-		for ($i = 0; $i < sizeof($group_name); $i++)
-		{
-			if ($default_group === false)
-			{
-				$selected = ($i == 0) ? ' selected="selected"' : '';
-			}
-			else
-			{
-				$selected = ($group_name[$i]['group_id'] == $default_group) ? ' selected="selected"' : '';
-			}
-
-			$group_select .= '<option value="' . $group_name[$i]['group_id'] . '"' . $selected . '>' . $group_name[$i]['group_name'] . '</option>';
-		}
-
-		$group_select .= '</select>';
-
-		return $group_select;
-	}
-
-	/**
-	* Search Imagick
-	*/
-	function search_imagemagick()
-	{
-		$imagick = '';
-
-		$exe = ((defined('PHP_OS')) && (preg_match('#^win#i', PHP_OS))) ? '.exe' : '';
-
-		$magic_home = getenv('MAGICK_HOME');
-
-		if (empty($magic_home))
-		{
-			$locations = array('C:/WINDOWS/', 'C:/WINNT/', 'C:/WINDOWS/SYSTEM/', 'C:/WINNT/SYSTEM/', 'C:/WINDOWS/SYSTEM32/', 'C:/WINNT/SYSTEM32/', '/usr/bin/', '/usr/sbin/', '/usr/local/bin/', '/usr/local/sbin/', '/opt/', '/usr/imagemagick/', '/usr/bin/imagemagick/');
-			$path_locations = str_replace('\\', '/', (explode(($exe) ? ';' : ':', getenv('PATH'))));
-
-			$locations = array_merge($path_locations, $locations);
-
-			foreach ($locations as $location)
-			{
-				// The path might not end properly, fudge it
-				if (substr($location, -1) !== '/')
-				{
-					$location .= '/';
-				}
-
-				if (@file_exists($location) && @is_readable($location . 'mogrify' . $exe) && @filesize($location . 'mogrify' . $exe) > 3000)
-				{
-					$imagick = str_replace('\\', '/', $location);
-					continue;
-				}
-			}
-		}
-		else
-		{
-			$imagick = str_replace('\\', '/', $magic_home);
-		}
-
-		return $imagick;
-	}
-
-	/**
-	* Test Settings
-	*/
-	function test_upload(&$error, $upload_dir, $create_directory = false)
-	{
-		// Does the target directory exist, is it a directory and writable.
-		if ($create_directory)
-		{
-			if (!file_exists(PHPBB_ROOT_PATH . $upload_dir))
-			{
-				@mkdir(PHPBB_ROOT_PATH . $upload_dir, 0777);
-				phpbb::$system->chmod(PHPBB_ROOT_PATH . $upload_dir, phpbb::CHMOD_READ | phpbb::CHMOD_WRITE);
-			}
-		}
-
-		if (!file_exists(PHPBB_ROOT_PATH . $upload_dir))
-		{
-			$error[] = sprintf(phpbb::$user->lang['NO_UPLOAD_DIR'], $upload_dir);
-			return;
-		}
-
-		if (!is_dir(PHPBB_ROOT_PATH . $upload_dir))
-		{
-			$error[] = sprintf(phpbb::$user->lang['UPLOAD_NOT_DIR'], $upload_dir);
-			return;
-		}
-
-		if (!is_writable(PHPBB_ROOT_PATH . $upload_dir))
-		{
-			$error[] = sprintf(phpbb::$user->lang['NO_WRITE_UPLOAD'], $upload_dir);
-			return;
-		}
-	}
-
-	/**
-	* Perform operations on sites for external linking
-	*/
-	function perform_site_list()
-	{
-		if (phpbb_request::is_set('securesubmit'))
-		{
-			// Grab the list of entries
-			$ips = request_var('ips', '');
-			$ip_list = array_unique(explode("\n", $ips));
-			$ip_list_log = implode(', ', $ip_list);
-
-			$ip_exclude = (int) phpbb_request::variable('ipexclude', false, false, phpbb_request::POST);
-
-			$iplist = array();
-			$hostlist = array();
-
-			foreach ($ip_list as $item)
-			{
-				if (preg_match('#^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})[ ]*\-[ ]*([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$#', trim($item), $ip_range_explode))
-				{
-					// Don't ask about all this, just don't ask ... !
-					$ip_1_counter = $ip_range_explode[1];
-					$ip_1_end = $ip_range_explode[5];
-
-					while ($ip_1_counter <= $ip_1_end)
-					{
-						$ip_2_counter = ($ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[2] : 0;
-						$ip_2_end = ($ip_1_counter < $ip_1_end) ? 254 : $ip_range_explode[6];
-
-						if ($ip_2_counter == 0 && $ip_2_end == 254)
-						{
-							$ip_2_counter = 256;
-							$ip_2_fragment = 256;
-
-							$iplist[] = "'$ip_1_counter.*'";
-						}
-
-						while ($ip_2_counter <= $ip_2_end)
-						{
-							$ip_3_counter = ($ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[3] : 0;
-							$ip_3_end = ($ip_2_counter < $ip_2_end || $ip_1_counter < $ip_1_end) ? 254 : $ip_range_explode[7];
-
-							if ($ip_3_counter == 0 && $ip_3_end == 254)
-							{
-								$ip_3_counter = 256;
-								$ip_3_fragment = 256;
-
-								$iplist[] = "'$ip_1_counter.$ip_2_counter.*'";
-							}
-
-							while ($ip_3_counter <= $ip_3_end)
-							{
-								$ip_4_counter = ($ip_3_counter == $ip_range_explode[3] && $ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[4] : 0;
-								$ip_4_end = ($ip_3_counter < $ip_3_end || $ip_2_counter < $ip_2_end) ? 254 : $ip_range_explode[8];
-
-								if ($ip_4_counter == 0 && $ip_4_end == 254)
-								{
-									$ip_4_counter = 256;
-									$ip_4_fragment = 256;
-
-									$iplist[] = "'$ip_1_counter.$ip_2_counter.$ip_3_counter.*'";
-								}
-
-								while ($ip_4_counter <= $ip_4_end)
-								{
-									$iplist[] = "'$ip_1_counter.$ip_2_counter.$ip_3_counter.$ip_4_counter'";
-									$ip_4_counter++;
-								}
-								$ip_3_counter++;
-							}
-							$ip_2_counter++;
-						}
-						$ip_1_counter++;
-					}
-				}
-				else if (preg_match('#^([0-9]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})$#', trim($item)) || preg_match('#^[a-f0-9:]+\*?$#i', trim($item)))
-				{
-					$iplist[] = "'" . trim($item) . "'";
-				}
-				else if (preg_match('#^([\w\-_]\.?){2,}$#is', trim($item)))
-				{
-					$hostlist[] = "'" . trim($item) . "'";
-				}
-				else if (preg_match("#^([a-z0-9\-\*\._/]+?)$#is", trim($item)))
-				{
-					$hostlist[] = "'" . trim($item) . "'";
-				}
-			}
-
-			$sql = 'SELECT site_ip, site_hostname
-				FROM ' . SITELIST_TABLE . "
-				WHERE ip_exclude = $ip_exclude";
-			$result = phpbb::$db->sql_query($sql);
-
-			if ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$iplist_tmp = array();
-				$hostlist_tmp = array();
-				do
-				{
-					if ($row['site_ip'])
-					{
-						if (strlen($row['site_ip']) > 40)
-						{
-							continue;
-						}
-
-						$iplist_tmp[] = "'" . $row['site_ip'] . "'";
-					}
-					else if ($row['site_hostname'])
-					{
-						if (strlen($row['site_hostname']) > 255)
-						{
-							continue;
-						}
-
-						$hostlist_tmp[] = "'" . $row['site_hostname'] . "'";
-					}
-					// break;
-				}
-				while ($row = phpbb::$db->sql_fetchrow($result));
-
-				$iplist = array_unique(array_diff($iplist, $iplist_tmp));
-				$hostlist = array_unique(array_diff($hostlist, $hostlist_tmp));
-				unset($iplist_tmp);
-				unset($hostlist_tmp);
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			if (sizeof($iplist))
-			{
-				foreach ($iplist as $ip_entry)
-				{
-					$sql = 'INSERT INTO ' . SITELIST_TABLE . " (site_ip, ip_exclude)
-						VALUES ($ip_entry, $ip_exclude)";
-					phpbb::$db->sql_query($sql);
-				}
-			}
-
-			if (sizeof($hostlist))
-			{
-				foreach ($hostlist as $host_entry)
-				{
-					$sql = 'INSERT INTO ' . SITELIST_TABLE . " (site_hostname, ip_exclude)
-						VALUES ($host_entry, $ip_exclude)";
-					phpbb::$db->sql_query($sql);
-				}
-			}
-
-			if (!empty($ip_list_log))
-			{
-				// Update log
-				$log_entry = ($ip_exclude) ? 'LOG_DOWNLOAD_EXCLUDE_IP' : 'LOG_DOWNLOAD_IP';
-				add_log('admin', $log_entry, $ip_list_log);
-			}
-
-			trigger_error(phpbb::$user->lang['SECURE_DOWNLOAD_UPDATE_SUCCESS'] . adm_back_link($this->u_action));
-		}
-		else if (phpbb_request::is_set_post('unsecuresubmit'))
-		{
-			$unip_sql = request_var('unip', array(0));
-
-			if (sizeof($unip_sql))
-			{
-				$l_unip_list = '';
-
-				// Grab details of ips for logging information later
-				$sql = 'SELECT site_ip, site_hostname
-					FROM ' . SITELIST_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('site_id', $unip_sql);
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$l_unip_list .= (($l_unip_list != '') ? ', ' : '') . (($row['site_ip']) ? $row['site_ip'] : $row['site_hostname']);
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				$sql = 'DELETE FROM ' . SITELIST_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('site_id', $unip_sql);
-				phpbb::$db->sql_query($sql);
-
-				add_log('admin', 'LOG_DOWNLOAD_REMOVE_IP', $l_unip_list);
-			}
-
-			trigger_error(phpbb::$user->lang['SECURE_DOWNLOAD_UPDATE_SUCCESS'] . adm_back_link($this->u_action));
-		}
-	}
-
-	/**
-	* Write display_order config field
-	*/
-	function display_order($value, $key = '')
-	{
-		$radio_ary = array(0 => 'DESCENDING', 1 => 'ASCENDING');
-
-		return h_radio('config[display_order]', $radio_ary, $value, $key);
-	}
-
-	/**
-	* Adjust all three max_filesize config vars for display
-	*/
-	function max_filesize($value, $key = '')
-	{
-		// Determine size var and adjust the value accordingly
-		$size_var = ($value >= 1048576) ? 'mb' : (($value >= 1024) ? 'kb' : 'b');
-		$value = get_formatted_filesize($value, false);
-
-		return '<input type="text" id="' . $key . '" size="8" maxlength="15" name="config[' . $key . ']" value="' . $value . '" /> <select name="' . $key . '">' . size_select_options($size_var) . '</select>';
-	}
-
-	/**
-	* Write secure_allow_deny config field
-	*/
-	function select_allow_deny($value, $key = '')
-	{
-		$radio_ary = array(1 => 'ORDER_ALLOW_DENY', 0 => 'ORDER_DENY_ALLOW');
-
-		return h_radio('config[' . $key . ']', $radio_ary, $value, $key);
-	}
-
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_ban.php b/phpBB/modules/acp/acp_ban.php
deleted file mode 100644
index d8d9a9d24c..0000000000
--- a/phpBB/modules/acp/acp_ban.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_ban
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-
-		$bansubmit	= phpbb_request::is_set_post('bansubmit');
-		$unbansubmit = phpbb_request::is_set_post('unbansubmit');
-		$current_time = time();
-
-		phpbb::$user->add_lang(array('acp/ban', 'acp/users'));
-		$this->tpl_name = 'acp_ban';
-		$form_key = 'acp_ban';
-		add_form_key($form_key);
-
-		if (($bansubmit || $unbansubmit) && !check_form_key($form_key))
-		{
-			trigger_error(phpbb::$user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
-		// Ban submitted?
-		if ($bansubmit)
-		{
-			// Grab the list of entries
-			$ban				= utf8_normalize_nfc(request_var('ban', '', true));
-			$ban_len			= request_var('banlength', 0);
-			$ban_len_other		= request_var('banlengthother', '');
-			$ban_exclude		= request_var('banexclude', 0);
-			$ban_reason			= utf8_normalize_nfc(request_var('banreason', '', true));
-			$ban_give_reason	= utf8_normalize_nfc(request_var('bangivereason', '', true));
-
-			if ($ban)
-			{
-				user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reason, $ban_give_reason);
-
-				trigger_error(phpbb::$user->lang['BAN_UPDATE_SUCCESSFUL'] . adm_back_link($this->u_action));
-			}
-		}
-		else if ($unbansubmit)
-		{
-			$ban = request_var('unban', array(''));
-
-			if ($ban)
-			{
-				user_unban($mode, $ban);
-
-				trigger_error(phpbb::$user->lang['BAN_UPDATE_SUCCESSFUL'] . adm_back_link($this->u_action));
-			}
-		}
-
-		// Define language vars
-		$this->page_title = phpbb::$user->lang[strtoupper($mode) . '_BAN'];
-
-		$l_ban_explain = phpbb::$user->lang[strtoupper($mode) . '_BAN_EXPLAIN'];
-		$l_ban_exclude_explain = phpbb::$user->lang[strtoupper($mode) . '_BAN_EXCLUDE_EXPLAIN'];
-		$l_unban_title = phpbb::$user->lang[strtoupper($mode) . '_UNBAN'];
-		$l_unban_explain = phpbb::$user->lang[strtoupper($mode) . '_UNBAN_EXPLAIN'];
-		$l_no_ban_cell = phpbb::$user->lang[strtoupper($mode) . '_NO_BANNED'];
-
-		switch ($mode)
-		{
-			case 'user':
-				$l_ban_cell = phpbb::$user->lang['USERNAME'];
-			break;
-
-			case 'ip':
-				$l_ban_cell = phpbb::$user->lang['IP_HOSTNAME'];
-			break;
-
-			case 'email':
-				$l_ban_cell = phpbb::$user->lang['EMAIL_ADDRESS'];
-			break;
-		}
-
-		self::display_ban_options($mode);
-
-		phpbb::$template->assign_vars(array(
-			'L_TITLE'				=> $this->page_title,
-			'L_EXPLAIN'				=> $l_ban_explain,
-			'L_UNBAN_TITLE'			=> $l_unban_title,
-			'L_UNBAN_EXPLAIN'		=> $l_unban_explain,
-			'L_BAN_CELL'			=> $l_ban_cell,
-			'L_BAN_EXCLUDE_EXPLAIN'	=> $l_ban_exclude_explain,
-			'L_NO_BAN_CELL'			=> $l_no_ban_cell,
-
-			'S_USERNAME_BAN'	=> ($mode == 'user') ? true : false,
-
-			'U_ACTION'			=> $this->u_action,
-			'U_FIND_USERNAME'	=> append_sid('memberlist', 'mode=searchuser&amp;form=acp_ban&amp;field=ban'),
-		));
-	}
-
-	/**
-	* Display ban options
-	*/
-	static function display_ban_options($mode)
-	{
-		// Ban length options
-		$ban_end_text = array(0 => phpbb::$user->lang['PERMANENT'], 30 => phpbb::$user->lang['30_MINS'], 60 => phpbb::$user->lang['1_HOUR'], 360 => phpbb::$user->lang['6_HOURS'], 1440 => phpbb::$user->lang['1_DAY'], 10080 => phpbb::$user->lang['7_DAYS'], 20160 => phpbb::$user->lang['2_WEEKS'], 40320 => phpbb::$user->lang['1_MONTH'], -1 => phpbb::$user->lang['UNTIL'] . ' -&gt; ');
-
-		$ban_end_options = '';
-		foreach ($ban_end_text as $length => $text)
-		{
-			$ban_end_options .= '<option value="' . $length . '">' . $text . '</option>';
-		}
-
-		switch ($mode)
-		{
-			case 'user':
-
-				$field = 'username';
-				$l_ban_cell = phpbb::$user->lang['USERNAME'];
-
-				$sql = 'SELECT b.*, u.user_id, u.username, u.username_clean
-					FROM ' . BANLIST_TABLE . ' b, ' . USERS_TABLE . ' u
-					WHERE (b.ban_end >= ' . time() . '
-							OR b.ban_end = 0)
-						AND u.user_id = b.ban_userid
-					ORDER BY u.username_clean ASC';
-			break;
-
-			case 'ip':
-
-				$field = 'ban_ip';
-				$l_ban_cell = phpbb::$user->lang['IP_HOSTNAME'];
-
-				$sql = 'SELECT *
-					FROM ' . BANLIST_TABLE . '
-					WHERE (ban_end >= ' . time() . "
-							OR ban_end = 0)
-						AND ban_ip <> ''";
-			break;
-
-			case 'email':
-
-				$field = 'ban_email';
-				$l_ban_cell = phpbb::$user->lang['EMAIL_ADDRESS'];
-
-				$sql = 'SELECT *
-					FROM ' . BANLIST_TABLE . '
-					WHERE (ban_end >= ' . time() . "
-							OR ban_end = 0)
-						AND ban_email <> ''";
-			break;
-		}
-		$result = phpbb::$db->sql_query($sql);
-
-		$banned_options = '';
-		$ban_length = $ban_reasons = $ban_give_reasons = array();
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$banned_options .= '<option' . (($row['ban_exclude']) ? ' class="sep"' : '') . ' value="' . $row['ban_id'] . '">' . $row[$field] . '</option>';
-
-			$time_length = ($row['ban_end']) ? ($row['ban_end'] - $row['ban_start']) / 60 : 0;
-			$ban_length[$row['ban_id']] = (isset($ban_end_text[$time_length])) ? $ban_end_text[$time_length] : phpbb::$user->lang['UNTIL'] . ' -> ' . phpbb::$user->format_date($row['ban_end']);
-
-			$ban_reasons[$row['ban_id']] = $row['ban_reason'];
-			$ban_give_reasons[$row['ban_id']] = $row['ban_give_reason'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if (sizeof($ban_length))
-		{
-			foreach ($ban_length as $ban_id => $length)
-			{
-				phpbb::$template->assign_block_vars('ban_length', array(
-					'BAN_ID'	=> (int) $ban_id,
-					'LENGTH'	=> $length,
-					'A_LENGTH'	=> addslashes($length),
-				));
-			}
-		}
-
-		if (sizeof($ban_reasons))
-		{
-			foreach ($ban_reasons as $ban_id => $reason)
-			{
-				phpbb::$template->assign_block_vars('ban_reason', array(
-					'BAN_ID'	=> $ban_id,
-					'REASON'	=> $reason,
-					'A_REASON'	=> addslashes(htmlspecialchars_decode($reason)),
-				));
-			}
-		}
-
-		if (sizeof($ban_give_reasons))
-		{
-			foreach ($ban_give_reasons as $ban_id => $reason)
-			{
-				phpbb::$template->assign_block_vars('ban_give_reason', array(
-					'BAN_ID'	=> $ban_id,
-					'REASON'	=> $reason,
-					'A_REASON'	=> addslashes(htmlspecialchars_decode($reason)),
-				));
-			}
-		}
-
-		phpbb::$template->assign_vars(array(
-			'S_BAN_END_OPTIONS'	=> $ban_end_options,
-			'S_BANNED_OPTIONS'	=> ($banned_options) ? true : false,
-			'BANNED_OPTIONS'	=> $banned_options,
-		));
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_bbcodes.php b/phpBB/modules/acp/acp_bbcodes.php
deleted file mode 100644
index e93043fda6..0000000000
--- a/phpBB/modules/acp/acp_bbcodes.php
+++ /dev/null
@@ -1,439 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_bbcodes
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		phpbb::$user->add_lang('acp/posting');
-
-		// Set up general vars
-		$action	= request_var('action', '');
-		$bbcode_id = request_var('bbcode', 0);
-
-		$this->tpl_name = 'acp_bbcodes';
-		$this->page_title = 'ACP_BBCODES';
-		$form_key = 'acp_bbcodes';
-
-		add_form_key($form_key);
-
-		// Set up mode-specific vars
-		switch ($action)
-		{
-			case 'add':
-				$bbcode_match = $bbcode_tpl = $bbcode_helpline = '';
-				$display_on_posting = 0;
-			break;
-
-			case 'edit':
-				$sql = 'SELECT bbcode_match, bbcode_tpl, display_on_posting, bbcode_helpline
-					FROM ' . BBCODES_TABLE . '
-					WHERE bbcode_id = ' . $bbcode_id;
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$row)
-				{
-					trigger_error(phpbb::$user->lang['BBCODE_NOT_EXIST'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				$bbcode_match = $row['bbcode_match'];
-				$bbcode_tpl = htmlspecialchars($row['bbcode_tpl']);
-				$display_on_posting = $row['display_on_posting'];
-				$bbcode_helpline = $row['bbcode_helpline'];
-			break;
-
-			case 'modify':
-				$sql = 'SELECT bbcode_id, bbcode_tag
-					FROM ' . BBCODES_TABLE . '
-					WHERE bbcode_id = ' . $bbcode_id;
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$row)
-				{
-					trigger_error(phpbb::$user->lang['BBCODE_NOT_EXIST'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-			// No break here
-
-			case 'create':
-				$display_on_posting = request_var('display_on_posting', 0);
-
-				$bbcode_match = request_var('bbcode_match', '');
-				$bbcode_tpl = htmlspecialchars_decode(utf8_normalize_nfc(request_var('bbcode_tpl', '', true)));
-				$bbcode_helpline = utf8_normalize_nfc(request_var('bbcode_helpline', '', true));
-			break;
-		}
-
-		// Do major work
-		switch ($action)
-		{
-			case 'edit':
-			case 'add':
-
-				phpbb::$template->assign_vars(array(
-					'S_EDIT_BBCODE'		=> true,
-					'U_BACK'			=> $this->u_action,
-					'U_ACTION'			=> $this->u_action . '&amp;action=' . (($action == 'add') ? 'create' : 'modify') . (($bbcode_id) ? "&amp;bbcode=$bbcode_id" : ''),
-
-					'L_BBCODE_USAGE_EXPLAIN'=> sprintf(phpbb::$user->lang['BBCODE_USAGE_EXPLAIN'], '<a href="#down">', '</a>'),
-					'BBCODE_MATCH'			=> $bbcode_match,
-					'BBCODE_TPL'			=> $bbcode_tpl,
-					'BBCODE_HELPLINE'		=> $bbcode_helpline,
-					'DISPLAY_ON_POSTING'	=> $display_on_posting,
-				));
-
-				foreach (phpbb::$user->lang['tokens'] as $token => $token_explain)
-				{
-					phpbb::$template->assign_block_vars('token', array(
-						'TOKEN'		=> '{' . $token . '}',
-						'EXPLAIN'	=> $token_explain,
-					));
-				}
-
-				return;
-
-			break;
-
-			case 'modify':
-			case 'create':
-
-				$data = $this->build_regexp($bbcode_match, $bbcode_tpl);
-
-				// Make sure the user didn't pick a "bad" name for the BBCode tag.
-				$hard_coded = array('code', 'quote', 'quote=', 'attachment', 'attachment=', 'b', 'i', 'url', 'url=', 'img', 'size', 'size=', 'color', 'color=', 'u', 'list', 'list=', 'email', 'email=', 'flash', 'flash=');
-
-				if (($action == 'modify' && strtolower($data['bbcode_tag']) !== strtolower($row['bbcode_tag'])) || ($action == 'create'))
-				{
-					$sql = 'SELECT 1 as test
-						FROM ' . BBCODES_TABLE . "
-						WHERE LOWER(bbcode_tag) = '" . phpbb::$db->sql_escape(strtolower($data['bbcode_tag'])) . "'";
-					$result = phpbb::$db->sql_query($sql);
-					$info = phpbb::$db->sql_fetchrow($result);
-					phpbb::$db->sql_freeresult($result);
-
-					// Grab the end, interrogate the last closing tag
-					if ($info['test'] === '1' || in_array(strtolower($data['bbcode_tag']), $hard_coded) || (preg_match('#\[/([^[]*)]$#', $bbcode_match, $regs) && in_array(strtolower($regs[1]), $hard_coded)))
-					{
-						trigger_error(phpbb::$user->lang['BBCODE_INVALID_TAG_NAME'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-				}
-
-				if (substr($data['bbcode_tag'], -1) === '=')
-				{
-					$test = substr($data['bbcode_tag'], 0, -1);
-				}
-				else
-				{
-					$test = $data['bbcode_tag'];
-				}
-
-				if (!preg_match('%\\[' . $test . '[^]]*].*?\\[/' . $test . ']%s', $bbcode_match))
-				{
-					trigger_error(phpbb::$user->lang['BBCODE_OPEN_ENDED_TAG'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				if (strlen($data['bbcode_tag']) > 16)
-				{
-					trigger_error(phpbb::$user->lang['BBCODE_TAG_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				if (strlen($bbcode_match) > 4000)
-				{
-					trigger_error(phpbb::$user->lang['BBCODE_TAG_DEF_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-
-				if (strlen($bbcode_helpline) > 255)
-				{
-					trigger_error(phpbb::$user->lang['BBCODE_HELPLINE_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				$sql_ary = array(
-					'bbcode_tag'				=> $data['bbcode_tag'],
-					'bbcode_match'				=> $bbcode_match,
-					'bbcode_tpl'				=> $bbcode_tpl,
-					'display_on_posting'		=> $display_on_posting,
-					'bbcode_helpline'			=> $bbcode_helpline,
-					'first_pass_match'			=> $data['first_pass_match'],
-					'first_pass_replace'		=> $data['first_pass_replace'],
-					'second_pass_match'			=> $data['second_pass_match'],
-					'second_pass_replace'		=> $data['second_pass_replace']
-				);
-
-				if ($action == 'create')
-				{
-					$sql = 'SELECT MAX(bbcode_id) as max_bbcode_id
-						FROM ' . BBCODES_TABLE;
-					$result = phpbb::$db->sql_query($sql);
-					$row = phpbb::$db->sql_fetchrow($result);
-					phpbb::$db->sql_freeresult($result);
-
-					if ($row)
-					{
-						$bbcode_id = $row['max_bbcode_id'] + 1;
-
-						// Make sure it is greater than the core bbcode ids...
-						if ($bbcode_id <= NUM_CORE_BBCODES)
-						{
-							$bbcode_id = NUM_CORE_BBCODES + 1;
-						}
-					}
-					else
-					{
-						$bbcode_id = NUM_CORE_BBCODES + 1;
-					}
-
-					if ($bbcode_id > 1511)
-					{
-						trigger_error(phpbb::$user->lang['TOO_MANY_BBCODES'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-
-					$sql_ary['bbcode_id'] = (int) $bbcode_id;
-
-					phpbb::$db->sql_query('INSERT INTO ' . BBCODES_TABLE . phpbb::$db->sql_build_array('INSERT', $sql_ary));
-					phpbb::$acm->destroy_sql(BBCODES_TABLE);
-
-					$lang = 'BBCODE_ADDED';
-					$log_action = 'LOG_BBCODE_ADD';
-				}
-				else
-				{
-					$sql = 'UPDATE ' . BBCODES_TABLE . '
-						SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-						WHERE bbcode_id = ' . $bbcode_id;
-					phpbb::$db->sql_query($sql);
-					phpbb::$acm->destroy_sql(BBCODES_TABLE);
-
-					$lang = 'BBCODE_EDITED';
-					$log_action = 'LOG_BBCODE_EDIT';
-				}
-
-				add_log('admin', $log_action, $data['bbcode_tag']);
-
-				trigger_error(phpbb::$user->lang[$lang] . adm_back_link($this->u_action));
-
-			break;
-
-			case 'delete':
-
-				$sql = 'SELECT bbcode_tag
-					FROM ' . BBCODES_TABLE . "
-					WHERE bbcode_id = $bbcode_id";
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if ($row)
-				{
-					if (confirm_box(true))
-					{
-						phpbb::$db->sql_query('DELETE FROM ' . BBCODES_TABLE . " WHERE bbcode_id = $bbcode_id");
-						phpbb::$acm->destroy_sql(BBCODES_TABLE);
-						add_log('admin', 'LOG_BBCODE_DELETE', $row['bbcode_tag']);
-					}
-					else
-					{
-						confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-							'bbcode'	=> $bbcode_id,
-							'i'			=> $id,
-							'mode'		=> $mode,
-							'action'	=> $action))
-						);
-					}
-				}
-
-			break;
-		}
-
-		phpbb::$template->assign_vars(array(
-			'U_ACTION'		=> $this->u_action . '&amp;action=add',
-		));
-
-		$sql = 'SELECT *
-			FROM ' . BBCODES_TABLE . '
-			ORDER BY bbcode_tag';
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			phpbb::$template->assign_block_vars('bbcodes', array(
-				'BBCODE_TAG'		=> $row['bbcode_tag'],
-				'U_EDIT'			=> $this->u_action . '&amp;action=edit&amp;bbcode=' . $row['bbcode_id'],
-				'U_DELETE'			=> $this->u_action . '&amp;action=delete&amp;bbcode=' . $row['bbcode_id'],
-			));
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	/*
-	* Build regular expression for custom bbcode
-	*/
-	function build_regexp(&$bbcode_match, &$bbcode_tpl)
-	{
-		$bbcode_match = trim($bbcode_match);
-		$bbcode_tpl = trim($bbcode_tpl);
-
-		$fp_match = preg_quote($bbcode_match, '!');
-		$fp_replace = preg_replace('#^\[(.*?)\]#', '[$1:$uid]', $bbcode_match);
-		$fp_replace = preg_replace('#\[/(.*?)\]$#', '[/$1:$uid]', $fp_replace);
-
-		$sp_match = preg_quote($bbcode_match, '!');
-		$sp_match = preg_replace('#^\\\\\[(.*?)\\\\\]#', '\[$1:$uid\]', $sp_match);
-		$sp_match = preg_replace('#\\\\\[/(.*?)\\\\\]$#', '\[/$1:$uid\]', $sp_match);
-		$sp_replace = $bbcode_tpl;
-
-		// @todo Make sure to change this too if something changed in message parsing
-		$tokens = array(
-			'URL'	 => array(
-				'!(?:(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('url')) . ')|(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('www_url')) . '))!ie'	=>	"\$this->bbcode_specialchars(('\$1') ? '\$1' : 'http://\$2')"
-			),
-			'LOCAL_URL'	 => array(
-				'!(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('relative_url')) . ')!e'	=>	"\$this->bbcode_specialchars('$1')"
-			),
-			'EMAIL' => array(
-				'!(' . get_preg_expression('email') . ')!ie'	=>	"\$this->bbcode_specialchars('$1')"
-			),
-			'TEXT' => array(
-				'!(.*?)!es'	 =>	"str_replace(array(\"\\r\\n\", '\\\"', '\\'', '(', ')'), array(\"\\n\", '\"', '&#39;', '&#40;', '&#41;'), trim('\$1'))"
-			),
-			'SIMPLETEXT' => array(
-				'!([a-zA-Z0-9-+.,_ ]+)!'	 =>	"$1"
-			),
-			'IDENTIFIER' => array(
-				'!([a-zA-Z0-9-_]+)!'	 =>	"$1"
-			),
-			'COLOR' => array(
-				'!([a-z]+|#[0-9abcdef]+)!i'	=>	'$1'
-			),
-			'NUMBER' => array(
-				'!([0-9]+)!'	=>	'$1'
-			)
-		);
-
-		$sp_tokens = array(
-			'URL'	 => '(?i)((?:' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('url')) . ')|(?:' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('www_url')) . '))(?-i)',
-			'LOCAL_URL'	 => '(?i)(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('relative_url')) . ')(?-i)',
-			'EMAIL' => '(' . get_preg_expression('email') . ')',
-			'TEXT' => '(.*?)',
-			'SIMPLETEXT' => '([a-zA-Z0-9-+.,_ ]+)',
-			'IDENTIFIER' => '([a-zA-Z0-9-_]+)',
-			'COLOR' => '([a-zA-Z]+|#[0-9abcdefABCDEF]+)',
-			'NUMBER' => '([0-9]+)',
-		);
-
-		$pad = 0;
-		$modifiers = 'i';
-
-		if (preg_match_all('/\{(' . implode('|', array_keys($tokens)) . ')[0-9]*\}/i', $bbcode_match, $m))
-		{
-			foreach ($m[0] as $n => $token)
-			{
-				$token_type = $m[1][$n];
-
-				reset($tokens[strtoupper($token_type)]);
-				list($match, $replace) = each($tokens[strtoupper($token_type)]);
-
-				// Pad backreference numbers from tokens
-				if (preg_match_all('/(?<!\\\\)\$([0-9]+)/', $replace, $repad))
-				{
-					$repad = $pad + sizeof(array_unique($repad[0]));
-					$replace = preg_replace('/(?<!\\\\)\$([0-9]+)/e', "'\${' . (\$1 + \$pad) . '}'", $replace);
-					$pad = $repad;
-				}
-
-				// Obtain pattern modifiers to use and alter the regex accordingly
-				$regex = preg_replace('/!(.*)!([a-z]*)/', '$1', $match);
-				$regex_modifiers = preg_replace('/!(.*)!([a-z]*)/', '$2', $match);
-
-				for ($i = 0, $size = strlen($regex_modifiers); $i < $size; ++$i)
-				{
-					if (strpos($modifiers, $regex_modifiers[$i]) === false)
-					{
-						$modifiers .= $regex_modifiers[$i];
-
-						if ($regex_modifiers[$i] == 'e')
-						{
-							$fp_replace = "'" . str_replace("'", "\\'", $fp_replace) . "'";
-						}
-					}
-
-					if ($regex_modifiers[$i] == 'e')
-					{
-						$replace = "'.$replace.'";
-					}
-				}
-
-				$fp_match = str_replace(preg_quote($token, '!'), $regex, $fp_match);
-				$fp_replace = str_replace($token, $replace, $fp_replace);
-
-				$sp_match = str_replace(preg_quote($token, '!'), $sp_tokens[$token_type], $sp_match);
-				$sp_replace = str_replace($token, '${' . ($n + 1) . '}', $sp_replace);
-			}
-
-			$fp_match = '!' . $fp_match . '!' . $modifiers;
-			$sp_match = '!' . $sp_match . '!s';
-
-			if (strpos($fp_match, 'e') !== false)
-			{
-				$fp_replace = str_replace("'.'", '', $fp_replace);
-				$fp_replace = str_replace(".''.", '.', $fp_replace);
-			}
-		}
-		else
-		{
-			// No replacement is present, no need for a second-pass pattern replacement
-			// A simple str_replace will suffice
-			$fp_match = '!' . $fp_match . '!' . $modifiers;
-			$sp_match = $fp_replace;
-			$sp_replace = '';
-		}
-
-		// Lowercase tags
-		$bbcode_tag = preg_replace('/.*?\[([a-z0-9_-]+=?).*/i', '$1', $bbcode_match);
-		$bbcode_search = preg_replace('/.*?\[([a-z0-9_-]+)=?.*/i', '$1', $bbcode_match);
-
-		if (!preg_match('/^[a-zA-Z0-9_-]+=?$/', $bbcode_tag))
-		{
-			trigger_error(phpbb::$user->lang['BBCODE_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
-		$fp_match = preg_replace('#\[/?' . $bbcode_search . '#ie', "strtolower('\$0')", $fp_match);
-		$fp_replace = preg_replace('#\[/?' . $bbcode_search . '#ie', "strtolower('\$0')", $fp_replace);
-		$sp_match = preg_replace('#\[/?' . $bbcode_search . '#ie', "strtolower('\$0')", $sp_match);
-		$sp_replace = preg_replace('#\[/?' . $bbcode_search . '#ie', "strtolower('\$0')", $sp_replace);
-
-		return array(
-			'bbcode_tag'				=> $bbcode_tag,
-			'first_pass_match'			=> $fp_match,
-			'first_pass_replace'		=> $fp_replace,
-			'second_pass_match'			=> $sp_match,
-			'second_pass_replace'		=> $sp_replace
-		);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_board.php b/phpBB/modules/acp/acp_board.php
deleted file mode 100644
index a888bcc4a3..0000000000
--- a/phpBB/modules/acp/acp_board.php
+++ /dev/null
@@ -1,805 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-* @todo add cron intervals to server settings? (database_gc, queue_interval, session_gc, search_gc, cache_gc, warnings_gc)
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_board
-{
-	var $u_action;
-	var $new_config = array();
-
-	function main($id, $mode)
-	{
-		phpbb::$user->add_lang('acp/board');
-
-		$action	= request_var('action', '');
-		$submit = phpbb_request::is_set_post('submit');
-
-		$form_key = 'acp_board';
-		add_form_key($form_key);
-
-		/**
-		*	Validation types are:
-		*		string, int, bool,
-		*		script_path (absolute path in url - beginning with / and no trailing slash),
-		*		rpath (relative), rwpath (realtive, writable), path (relative path, but able to escape the root), wpath (writable)
-		*/
-		switch ($mode)
-		{
-			case 'settings':
-				$display_vars = array(
-					'title'	=> 'ACP_BOARD_SETTINGS',
-					'vars'	=> array(
-						'legend1'				=> 'ACP_BOARD_SETTINGS',
-						'sitename'				=> array('lang' => 'SITE_NAME',				'validate' => 'string',	'type' => 'text:40:255', 'explain' => false),
-						'site_desc'				=> array('lang' => 'SITE_DESC',				'validate' => 'string',	'type' => 'text:40:255', 'explain' => false),
-						'board_disable'			=> array('lang' => 'DISABLE_BOARD',			'validate' => 'bool',	'type' => 'custom', 'method' => 'board_disable', 'explain' => true),
-						'board_disable_msg'		=> false,
-						'default_lang'			=> array('lang' => 'DEFAULT_LANGUAGE',		'validate' => 'lang',	'type' => 'select', 'function' => 'language_select', 'params' => array('{CONFIG_VALUE}'), 'explain' => false),
-						'default_dateformat'	=> array('lang' => 'DEFAULT_DATE_FORMAT',	'validate' => 'string',	'type' => 'custom', 'method' => 'dateformat_select', 'explain' => true),
-						'board_timezone'		=> array('lang' => 'SYSTEM_TIMEZONE',		'validate' => 'string',	'type' => 'select', 'function' => 'tz_select', 'params' => array('{CONFIG_VALUE}', 1), 'explain' => false),
-						'board_dst'				=> array('lang' => 'SYSTEM_DST',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'default_style'			=> array('lang' => 'DEFAULT_STYLE',			'validate' => 'int',	'type' => 'select', 'function' => 'style_select', 'params' => array('{CONFIG_VALUE}', false), 'explain' => false),
-						'override_user_style'	=> array('lang' => 'OVERRIDE_STYLE',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-
-						'legend2'				=> 'WARNINGS',
-						'warnings_expire_days'	=> array('lang' => 'WARNINGS_EXPIRE',		'validate' => 'int',	'type' => 'text:3:4', 'explain' => true, 'append' => ' ' . phpbb::$user->lang['DAYS']),
-					)
-				);
-			break;
-
-			case 'features':
-				$display_vars = array(
-					'title'	=> 'ACP_BOARD_FEATURES',
-					'vars'	=> array(
-						'legend1'				=> 'ACP_BOARD_FEATURES',
-						'allow_privmsg'			=> array('lang' => 'BOARD_PM',				'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'allow_topic_notify'	=> array('lang' => 'ALLOW_TOPIC_NOTIFY',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_forum_notify'	=> array('lang' => 'ALLOW_FORUM_NOTIFY',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_namechange'		=> array('lang' => 'ALLOW_NAME_CHANGE',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_attachments'		=> array('lang' => 'ALLOW_ATTACHMENTS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_pm_attach'		=> array('lang' => 'ALLOW_PM_ATTACHMENTS',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_bbcode'			=> array('lang' => 'ALLOW_BBCODE',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_smilies'			=> array('lang' => 'ALLOW_SMILIES',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_sig'				=> array('lang' => 'ALLOW_SIG',				'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_nocensors'		=> array('lang' => 'ALLOW_NO_CENSORS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'allow_bookmarks'		=> array('lang' => 'ALLOW_BOOKMARKS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'allow_birthdays'		=> array('lang' => 'ALLOW_BIRTHDAYS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-
-						'legend2'				=> 'ACP_LOAD_SETTINGS',
-						'load_birthdays'		=> array('lang' => 'YES_BIRTHDAYS',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'load_moderators'		=> array('lang' => 'YES_MODERATORS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'load_jumpbox'			=> array('lang' => 'YES_JUMPBOX',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'load_cpf_memberlist'	=> array('lang' => 'LOAD_CPF_MEMBERLIST',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'load_cpf_viewprofile'	=> array('lang' => 'LOAD_CPF_VIEWPROFILE',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'load_cpf_viewtopic'	=> array('lang' => 'LOAD_CPF_VIEWTOPIC',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-					)
-				);
-			break;
-
-			case 'avatar':
-				$display_vars = array(
-					'title'	=> 'ACP_AVATAR_SETTINGS',
-					'vars'	=> array(
-						'legend1'				=> 'ACP_AVATAR_SETTINGS',
-						'avatar_min_height'		=> false, 'avatar_min_width' => false, 'avatar_max_height' => false, 'avatar_max_width' => false,
-
-						'allow_avatar_local'	=> array('lang' => 'ALLOW_LOCAL',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_avatar_remote'	=> array('lang' => 'ALLOW_REMOTE',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'allow_avatar_upload'	=> array('lang' => 'ALLOW_UPLOAD',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'avatar_filesize'		=> array('lang' => 'MAX_FILESIZE',			'validate' => 'int:0',	'type' => 'text:4:10', 'explain' => true, 'append' => ' ' . phpbb::$user->lang['BYTES']),
-						'avatar_min'			=> array('lang' => 'MIN_AVATAR_SIZE',		'validate' => 'int:0',	'type' => 'dimension:3:4', 'explain' => true, 'append' => ' ' . phpbb::$user->lang['PIXEL']),
-						'avatar_max'			=> array('lang' => 'MAX_AVATAR_SIZE',		'validate' => 'int:0',	'type' => 'dimension:3:4', 'explain' => true, 'append' => ' ' . phpbb::$user->lang['PIXEL']),
-						'avatar_path'			=> array('lang' => 'AVATAR_STORAGE_PATH',	'validate' => 'rwpath',	'type' => 'text:20:255', 'explain' => true),
-						'avatar_gallery_path'	=> array('lang' => 'AVATAR_GALLERY_PATH',	'validate' => 'rpath',	'type' => 'text:20:255', 'explain' => true)
-					)
-				);
-			break;
-
-			case 'message':
-				$display_vars = array(
-					'title'	=> 'ACP_MESSAGE_SETTINGS',
-					'lang'	=> 'ucp',
-					'vars'	=> array(
-						'legend1'				=> 'GENERAL_SETTINGS',
-						'allow_privmsg'			=> array('lang' => 'BOARD_PM',				'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'pm_max_boxes'			=> array('lang' => 'BOXES_MAX',				'validate' => 'int:0',	'type' => 'text:4:4', 'explain' => true),
-						'pm_max_msgs'			=> array('lang' => 'BOXES_LIMIT',			'validate' => 'int:0',	'type' => 'text:4:4', 'explain' => true),
-						'full_folder_action'	=> array('lang' => 'FULL_FOLDER_ACTION',	'validate' => 'int',	'type' => 'select', 'method' => 'full_folder_select', 'explain' => true),
-						'pm_edit_time'			=> array('lang' => 'PM_EDIT_TIME',			'validate' => 'int:0',	'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . phpbb::$user->lang['MINUTES']),
-						'pm_max_recipients'		=> array('lang' => 'PM_MAX_RECIPIENTS',		'validate' => 'int:0',	'type' => 'text:5:5', 'explain' => true),
-
-						'legend2'				=> 'GENERAL_OPTIONS',
-						'allow_mass_pm'			=> array('lang' => 'ALLOW_MASS_PM',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'auth_bbcode_pm'		=> array('lang' => 'ALLOW_BBCODE_PM',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'auth_smilies_pm'		=> array('lang' => 'ALLOW_SMILIES_PM',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_pm_attach'		=> array('lang' => 'ALLOW_PM_ATTACHMENTS',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_sig_pm'			=> array('lang' => 'ALLOW_SIG_PM',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'print_pm'				=> array('lang' => 'ALLOW_PRINT_PM',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'forward_pm'			=> array('lang' => 'ALLOW_FORWARD_PM',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'auth_img_pm'			=> array('lang' => 'ALLOW_IMG_PM',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'auth_flash_pm'			=> array('lang' => 'ALLOW_FLASH_PM',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'enable_pm_icons'		=> array('lang' => 'ENABLE_PM_ICONS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false)
-					)
-				);
-			break;
-
-			case 'post':
-				$display_vars = array(
-					'title'	=> 'ACP_POST_SETTINGS',
-					'vars'	=> array(
-						'legend1'				=> 'GENERAL_OPTIONS',
-						'allow_topic_notify'	=> array('lang' => 'ALLOW_TOPIC_NOTIFY',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_forum_notify'	=> array('lang' => 'ALLOW_FORUM_NOTIFY',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_bbcode'			=> array('lang' => 'ALLOW_BBCODE',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_post_flash'		=> array('lang' => 'ALLOW_POST_FLASH',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'allow_smilies'			=> array('lang' => 'ALLOW_SMILIES',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_post_links'		=> array('lang' => 'ALLOW_POST_LINKS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'allow_nocensors'		=> array('lang' => 'ALLOW_NO_CENSORS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'allow_bookmarks'		=> array('lang' => 'ALLOW_BOOKMARKS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'enable_post_confirm'	=> array('lang' => 'VISUAL_CONFIRM_POST',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-
-						'legend2'				=> 'POSTING',
-						'enable_queue_trigger'	=> array('lang' => 'ENABLE_QUEUE_TRIGGER',	'validate' => 'bool',		'type' => 'radio:yes_no', 'explain' => true),
-						'queue_trigger_posts'	=> array('lang' => 'QUEUE_TRIGGER_POSTS',	'validate' => 'int:0:250',	'type' => 'text:4:4', 'explain' => true),
-						'bump_type'				=> false,
-						'edit_time'				=> array('lang' => 'EDIT_TIME',				'validate' => 'int:0',		'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . phpbb::$user->lang['MINUTES']),
-						'display_last_edited'	=> array('lang' => 'DISPLAY_LAST_EDITED',	'validate' => 'bool',		'type' => 'radio:yes_no', 'explain' => true),
-						'flood_interval'		=> array('lang' => 'FLOOD_INTERVAL',		'validate' => 'int:0',		'type' => 'text:3:10', 'explain' => true, 'append' => ' ' . phpbb::$user->lang['SECONDS']),
-						'bump_interval'			=> array('lang' => 'BUMP_INTERVAL',			'validate' => 'int:0',		'type' => 'custom', 'method' => 'bump_interval', 'explain' => true),
-						'topics_per_page'		=> array('lang' => 'TOPICS_PER_PAGE',		'validate' => 'int:1',		'type' => 'text:3:4', 'explain' => false),
-						'posts_per_page'		=> array('lang' => 'POSTS_PER_PAGE',		'validate' => 'int:1',		'type' => 'text:3:4', 'explain' => false),
-						'hot_threshold'			=> array('lang' => 'HOT_THRESHOLD',			'validate' => 'int:0',		'type' => 'text:3:4', 'explain' => true),
-						'max_poll_options'		=> array('lang' => 'MAX_POLL_OPTIONS',		'validate' => 'int:2:127',	'type' => 'text:4:4', 'explain' => false),
-						'max_post_chars'		=> array('lang' => 'CHAR_LIMIT',			'validate' => 'int:0',		'type' => 'text:4:6', 'explain' => true),
-						'max_post_smilies'		=> array('lang' => 'SMILIES_LIMIT',			'validate' => 'int:0',		'type' => 'text:4:4', 'explain' => true),
-						'max_post_urls'			=> array('lang' => 'MAX_POST_URLS',			'validate' => 'int:0',		'type' => 'text:5:4', 'explain' => true),
-						'max_post_font_size'	=> array('lang' => 'MAX_POST_FONT_SIZE',	'validate' => 'int:0',		'type' => 'text:5:4', 'explain' => true, 'append' => ' %'),
-						'max_quote_depth'		=> array('lang' => 'QUOTE_DEPTH_LIMIT',		'validate' => 'int:0',		'type' => 'text:4:4', 'explain' => true),
-						'max_post_img_width'	=> array('lang' => 'MAX_POST_IMG_WIDTH',	'validate' => 'int:0',		'type' => 'text:5:4', 'explain' => true, 'append' => ' ' . phpbb::$user->lang['PIXEL']),
-						'max_post_img_height'	=> array('lang' => 'MAX_POST_IMG_HEIGHT',	'validate' => 'int:0',		'type' => 'text:5:4', 'explain' => true, 'append' => ' ' . phpbb::$user->lang['PIXEL']),
-					)
-				);
-			break;
-
-			case 'signature':
-				$display_vars = array(
-					'title'	=> 'ACP_SIGNATURE_SETTINGS',
-					'vars'	=> array(
-						'legend1'				=> 'GENERAL_OPTIONS',
-						'allow_sig'				=> array('lang' => 'ALLOW_SIG',				'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_sig_bbcode'		=> array('lang' => 'ALLOW_SIG_BBCODE',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_sig_img'			=> array('lang' => 'ALLOW_SIG_IMG',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_sig_flash'		=> array('lang' => 'ALLOW_SIG_FLASH',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_sig_smilies'		=> array('lang' => 'ALLOW_SIG_SMILIES',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_sig_links'		=> array('lang' => 'ALLOW_SIG_LINKS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-
-						'legend2'				=> 'GENERAL_SETTINGS',
-						'max_sig_chars'			=> array('lang' => 'MAX_SIG_LENGTH',		'validate' => 'int:0',	'type' => 'text:5:4', 'explain' => true),
-						'max_sig_urls'			=> array('lang' => 'MAX_SIG_URLS',			'validate' => 'int:0',	'type' => 'text:5:4', 'explain' => true),
-						'max_sig_font_size'		=> array('lang' => 'MAX_SIG_FONT_SIZE',		'validate' => 'int:0',	'type' => 'text:5:4', 'explain' => true, 'append' => ' %'),
-						'max_sig_smilies'		=> array('lang' => 'MAX_SIG_SMILIES',		'validate' => 'int:0',	'type' => 'text:5:4', 'explain' => true),
-						'max_sig_img_width'		=> array('lang' => 'MAX_SIG_IMG_WIDTH',		'validate' => 'int:0',	'type' => 'text:5:4', 'explain' => true, 'append' => ' ' . phpbb::$user->lang['PIXEL']),
-						'max_sig_img_height'	=> array('lang' => 'MAX_SIG_IMG_HEIGHT',	'validate' => 'int:0',	'type' => 'text:5:4', 'explain' => true, 'append' => ' ' . phpbb::$user->lang['PIXEL']),
-					)
-				);
-			break;
-
-			case 'registration':
-				$display_vars = array(
-					'title'	=> 'ACP_REGISTER_SETTINGS',
-					'vars'	=> array(
-						'legend1'				=> 'GENERAL_SETTINGS',
-						'max_name_chars'		=> array('lang' => 'USERNAME_LENGTH', 'validate' => 'int:8:180', 'type' => false, 'method' => false, 'explain' => false,),
-						'max_pass_chars'		=> array('lang' => 'PASSWORD_LENGTH', 'validate' => 'int:8:255', 'type' => false, 'method' => false, 'explain' => false,),
-
-						'require_activation'	=> array('lang' => 'ACC_ACTIVATION',	'validate' => 'int',	'type' => 'custom', 'method' => 'select_acc_activation', 'explain' => true),
-						'min_name_chars'		=> array('lang' => 'USERNAME_LENGTH',	'validate' => 'int:1',	'type' => 'custom:5:180', 'method' => 'username_length', 'explain' => true),
-						'min_pass_chars'		=> array('lang' => 'PASSWORD_LENGTH',	'validate' => 'int:1',	'type' => 'custom', 'method' => 'password_length', 'explain' => true),
-						'allow_name_chars'		=> array('lang' => 'USERNAME_CHARS',	'validate' => 'string',	'type' => 'select', 'method' => 'select_username_chars', 'explain' => true),
-						'pass_complex'			=> array('lang' => 'PASSWORD_TYPE',		'validate' => 'string',	'type' => 'select', 'method' => 'select_password_chars', 'explain' => true),
-						'chg_passforce'			=> array('lang' => 'FORCE_PASS_CHANGE',	'validate' => 'int:0',	'type' => 'text:3:3', 'explain' => true, 'append' => ' ' . phpbb::$user->lang['DAYS']),
-
-						'legend2'				=> 'GENERAL_OPTIONS',
-						'allow_namechange'		=> array('lang' => 'ALLOW_NAME_CHANGE',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_emailreuse'		=> array('lang' => 'ALLOW_EMAIL_REUSE',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'enable_confirm'		=> array('lang' => 'VISUAL_CONFIRM_REG',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'max_login_attempts'	=> array('lang' => 'MAX_LOGIN_ATTEMPTS',	'validate' => 'int:0',	'type' => 'text:3:3', 'explain' => true),
-						'max_reg_attempts'		=> array('lang' => 'REG_LIMIT',				'validate' => 'int:0',	'type' => 'text:4:4', 'explain' => true),
-
-						'legend3'			=> 'COPPA',
-						'coppa_enable'		=> array('lang' => 'ENABLE_COPPA',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'coppa_mail'		=> array('lang' => 'COPPA_MAIL',		'validate' => 'string',	'type' => 'textarea:5:40', 'explain' => true),
-						'coppa_fax'			=> array('lang' => 'COPPA_FAX',			'validate' => 'string',	'type' => 'text:25:100', 'explain' => false),
-					)
-				);
-			break;
-
-			case 'cookie':
-				$display_vars = array(
-					'title'	=> 'ACP_COOKIE_SETTINGS',
-					'vars'	=> array(
-						'legend1'		=> 'ACP_COOKIE_SETTINGS',
-						'cookie_domain'	=> array('lang' => 'COOKIE_DOMAIN',	'validate' => 'string',	'type' => 'text::255', 'explain' => false),
-						'cookie_name'	=> array('lang' => 'COOKIE_NAME',	'validate' => 'string',	'type' => 'text::16', 'explain' => false),
-						'cookie_path'	=> array('lang'	=> 'COOKIE_PATH',	'validate' => 'string',	'type' => 'text::255', 'explain' => false),
-						'cookie_secure'	=> array('lang' => 'COOKIE_SECURE',	'validate' => 'bool',	'type' => 'radio:disabled_enabled', 'explain' => true)
-					)
-				);
-			break;
-
-			case 'load':
-				$display_vars = array(
-					'title'	=> 'ACP_LOAD_SETTINGS',
-					'vars'	=> array(
-						'legend1'			=> 'GENERAL_SETTINGS',
-						'limit_load'		=> array('lang' => 'LIMIT_LOAD',		'validate' => 'string',	'type' => 'text:4:4', 'explain' => true),
-						'session_length'	=> array('lang' => 'SESSION_LENGTH',	'validate' => 'int:60',	'type' => 'text:5:10', 'explain' => true, 'append' => ' ' . phpbb::$user->lang['SECONDS']),
-						'active_sessions'	=> array('lang' => 'LIMIT_SESSIONS',	'validate' => 'int:0',	'type' => 'text:4:4', 'explain' => true),
-						'load_online_time'	=> array('lang' => 'ONLINE_LENGTH',		'validate' => 'int:0',	'type' => 'text:4:3', 'explain' => true, 'append' => ' ' . phpbb::$user->lang['MINUTES']),
-
-						'legend2'				=> 'GENERAL_OPTIONS',
-						'load_db_track'			=> array('lang' => 'YES_POST_MARKING',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'load_db_lastread'		=> array('lang' => 'YES_READ_MARKING',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'load_anon_lastread'	=> array('lang' => 'YES_ANON_READ_MARKING',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'load_online'			=> array('lang' => 'YES_ONLINE',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'load_online_guests'	=> array('lang' => 'YES_ONLINE_GUESTS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'load_onlinetrack'		=> array('lang' => 'YES_ONLINE_TRACK',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'load_birthdays'		=> array('lang' => 'YES_BIRTHDAYS',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'load_moderators'		=> array('lang' => 'YES_MODERATORS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'load_jumpbox'			=> array('lang' => 'YES_JUMPBOX',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'load_user_activity'	=> array('lang' => 'LOAD_USER_ACTIVITY',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'load_tplcompile'		=> array('lang' => 'RECOMPILE_STYLES',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-
-						'legend3'				=> 'CUSTOM_PROFILE_FIELDS',
-						'load_cpf_memberlist'	=> array('lang' => 'LOAD_CPF_MEMBERLIST',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'load_cpf_viewprofile'	=> array('lang' => 'LOAD_CPF_VIEWPROFILE',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'load_cpf_viewtopic'	=> array('lang' => 'LOAD_CPF_VIEWTOPIC',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-					)
-				);
-			break;
-
-			case 'auth':
-				$display_vars = array(
-					'title'	=> 'ACP_AUTH_SETTINGS',
-					'vars'	=> array(
-						'legend1'		=> 'ACP_AUTH_SETTINGS',
-						'auth_method'	=> array('lang' => 'AUTH_METHOD',	'validate' => 'string',	'type' => 'select', 'method' => 'select_auth_method', 'explain' => false)
-					)
-				);
-			break;
-
-			case 'server':
-				$display_vars = array(
-					'title'	=> 'ACP_SERVER_SETTINGS',
-					'vars'	=> array(
-						'legend1'				=> 'ACP_SERVER_SETTINGS',
-						'gzip_compress'			=> array('lang' => 'ENABLE_GZIP',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-
-						'legend2'				=> 'PATH_SETTINGS',
-						'smilies_path'			=> array('lang' => 'SMILIES_PATH',		'validate' => 'rpath',	'type' => 'text:20:255', 'explain' => true),
-						'icons_path'			=> array('lang' => 'ICONS_PATH',		'validate' => 'rpath',	'type' => 'text:20:255', 'explain' => true),
-						'upload_icons_path'		=> array('lang' => 'UPLOAD_ICONS_PATH',	'validate' => 'rpath',	'type' => 'text:20:255', 'explain' => true),
-						'ranks_path'			=> array('lang' => 'RANKS_PATH',		'validate' => 'rpath',	'type' => 'text:20:255', 'explain' => true),
-
-						'legend3'				=> 'SERVER_URL_SETTINGS',
-						'force_server_vars'		=> array('lang' => 'FORCE_SERVER_VARS',	'validate' => 'bool',			'type' => 'radio:yes_no', 'explain' => true),
-						'server_protocol'		=> array('lang' => 'SERVER_PROTOCOL',	'validate' => 'string',			'type' => 'text:10:10', 'explain' => true),
-						'server_name'			=> array('lang' => 'SERVER_NAME',		'validate' => 'string',			'type' => 'text:40:255', 'explain' => true),
-						'server_port'			=> array('lang' => 'SERVER_PORT',		'validate' => 'int:0',			'type' => 'text:5:5', 'explain' => true),
-						'script_path'			=> array('lang' => 'SCRIPT_PATH',		'validate' => 'script_path',	'type' => 'text::255', 'explain' => true),
-					)
-				);
-			break;
-
-			case 'security':
-				$display_vars = array(
-					'title'	=> 'ACP_SECURITY_SETTINGS',
-					'vars'	=> array(
-						'legend1'				=> 'ACP_SECURITY_SETTINGS',
-						'allow_autologin'		=> array('lang' => 'ALLOW_AUTOLOGIN',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'max_autologin_time'	=> array('lang' => 'AUTOLOGIN_LENGTH',		'validate' => 'int:0',	'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . phpbb::$user->lang['DAYS']),
-						'ip_check'				=> array('lang' => 'IP_VALID',				'validate' => 'int',	'type' => 'custom', 'method' => 'select_ip_check', 'explain' => true),
-						'browser_check'			=> array('lang' => 'BROWSER_VALID',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'forwarded_for_check'	=> array('lang' => 'FORWARDED_FOR_VALID',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'referer_validation'	=> array('lang' => 'REFERER_VALID',		'validate' => 'int:0:3','type' => 'custom', 'method' => 'select_ref_check', 'explain' => true),
-						'check_dnsbl'			=> array('lang' => 'CHECK_DNSBL',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'email_check_mx'		=> array('lang' => 'EMAIL_CHECK_MX',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'pass_complex'			=> array('lang' => 'PASSWORD_TYPE',			'validate' => 'string',	'type' => 'select', 'method' => 'select_password_chars', 'explain' => true),
-						'chg_passforce'			=> array('lang' => 'FORCE_PASS_CHANGE',		'validate' => 'int:0',	'type' => 'text:3:3', 'explain' => true, 'append' => ' ' . phpbb::$user->lang['DAYS']),
-						'max_login_attempts'	=> array('lang' => 'MAX_LOGIN_ATTEMPTS',	'validate' => 'int:0',	'type' => 'text:3:3', 'explain' => true),
-						'tpl_allow_php'			=> array('lang' => 'TPL_ALLOW_PHP',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'form_token_lifetime'	=> array('lang' => 'FORM_TIME_MAX',			'validate' => 'int:-1',	'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . phpbb::$user->lang['SECONDS']),
-						'form_token_sid_guests'	=> array('lang' => 'FORM_SID_GUESTS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-
-					)
-				);
-			break;
-
-			case 'email':
-				$display_vars = array(
-					'title'	=> 'ACP_EMAIL_SETTINGS',
-					'vars'	=> array(
-						'legend1'				=> 'GENERAL_SETTINGS',
-						'email_enable'			=> array('lang' => 'ENABLE_EMAIL',			'validate' => 'bool',	'type' => 'radio:enabled_disabled', 'explain' => true),
-						'board_email_form'		=> array('lang' => 'BOARD_EMAIL_FORM',		'validate' => 'bool',	'type' => 'radio:enabled_disabled', 'explain' => true),
-						'email_function_name'	=> array('lang' => 'EMAIL_FUNCTION_NAME',	'validate' => 'string',	'type' => 'text:20:50', 'explain' => true),
-						'email_package_size'	=> array('lang' => 'EMAIL_PACKAGE_SIZE',	'validate' => 'int:0',	'type' => 'text:5:5', 'explain' => true),
-						'board_contact'			=> array('lang' => 'CONTACT_EMAIL',			'validate' => 'string',	'type' => 'text:25:100', 'explain' => true),
-						'board_email'			=> array('lang' => 'ADMIN_EMAIL',			'validate' => 'string',	'type' => 'text:25:100', 'explain' => true),
-						'board_email_sig'		=> array('lang' => 'EMAIL_SIG',				'validate' => 'string',	'type' => 'textarea:5:30', 'explain' => true),
-						'board_hide_emails'		=> array('lang' => 'BOARD_HIDE_EMAILS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-
-						'legend2'				=> 'SMTP_SETTINGS',
-						'smtp_delivery'			=> array('lang' => 'USE_SMTP',				'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'smtp_host'				=> array('lang' => 'SMTP_SERVER',			'validate' => 'string',	'type' => 'text:25:50', 'explain' => false),
-						'smtp_port'				=> array('lang' => 'SMTP_PORT',				'validate' => 'int:0',	'type' => 'text:4:5', 'explain' => true),
-						'smtp_auth_method'		=> array('lang' => 'SMTP_AUTH_METHOD',		'validate' => 'string',	'type' => 'select', 'method' => 'mail_auth_select', 'explain' => true),
-						'smtp_username'			=> array('lang' => 'SMTP_USERNAME',			'validate' => 'string',	'type' => 'text:25:255', 'explain' => true),
-						'smtp_password'			=> array('lang' => 'SMTP_PASSWORD',			'validate' => 'string',	'type' => 'password:25:255', 'explain' => true)
-					)
-				);
-			break;
-
-			default:
-				trigger_error('NO_MODE', E_USER_ERROR);
-			break;
-		}
-
-		if (isset($display_vars['lang']))
-		{
-			phpbb::$user->add_lang($display_vars['lang']);
-		}
-
-		$this->new_config = phpbb::$config;
-		$cfg_array = (phpbb_request::is_set('config')) ? utf8_normalize_nfc(request_var('config', array('' => ''), true)) : $this->new_config;
-		$error = array();
-
-		// We validate the complete config if whished
-		validate_config_vars($display_vars['vars'], $cfg_array, $error);
-
-		if ($submit && !check_form_key($form_key))
-		{
-			$error[] = phpbb::$user->lang['FORM_INVALID'];
-		}
-		// Do not write values if there is an error
-		if (sizeof($error))
-		{
-			$submit = false;
-		}
-
-		// We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to...
-		foreach ($display_vars['vars'] as $config_name => $null)
-		{
-			if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false)
-			{
-				continue;
-			}
-
-			if ($config_name == 'auth_method')
-			{
-				continue;
-			}
-
-			$this->new_config[$config_name] = $config_value = $cfg_array[$config_name];
-
-			if ($config_name == 'email_function_name')
-			{
-				$this->new_config['email_function_name'] = trim(str_replace(array('(', ')'), array('', ''), $this->new_config['email_function_name']));
-				$this->new_config['email_function_name'] = (empty($this->new_config['email_function_name']) || !function_exists($this->new_config['email_function_name'])) ? 'mail' : $this->new_config['email_function_name'];
-				$config_value = $this->new_config['email_function_name'];
-			}
-
-			if ($submit)
-			{
-				set_config($config_name, $config_value);
-			}
-		}
-
-		if ($mode == 'auth')
-		{
-			// Retrieve a list of auth plugins and check their config values
-			$auth_plugins = array();
-
-			$dp = @opendir(PHPBB_ROOT_PATH . 'includes/auth');
-
-			if ($dp)
-			{
-				while (($file = readdir($dp)) !== false)
-				{
-					if (preg_match('#^auth_(.*?)\.' . PHP_EXT . '$#', $file))
-					{
-						$auth_plugins[] = basename(preg_replace('#^auth_(.*?)\.' . PHP_EXT . '$#', '\1', $file));
-					}
-				}
-				closedir($dp);
-
-				sort($auth_plugins);
-			}
-
-			$updated_auth_settings = false;
-			$old_auth_config = array();
-			foreach ($auth_plugins as $method)
-			{
-				if ($method && file_exists(PHPBB_ROOT_PATH . 'includes/auth/auth_' . $method . '.' . PHP_EXT))
-				{
-					include_once(PHPBB_ROOT_PATH . 'includes/auth/auth_' . $method . '.' . PHP_EXT);
-
-					$method = 'acp_' . $method;
-					if (function_exists($method))
-					{
-						if ($fields = $method($this->new_config))
-						{
-							// Check if we need to create config fields for this plugin and save config when submit was pressed
-							foreach ($fields['config'] as $field)
-							{
-								if (!isset(phpbb::$config[$field]))
-								{
-									set_config($field, '');
-								}
-
-								if (!isset($cfg_array[$field]) || strpos($field, 'legend') !== false)
-								{
-									continue;
-								}
-
-								$old_auth_config[$field] = $this->new_config[$field];
-								$config_value = $cfg_array[$field];
-								$this->new_config[$field] = $config_value;
-
-								if ($submit)
-								{
-									$updated_auth_settings = true;
-									set_config($field, $config_value);
-								}
-							}
-						}
-						unset($fields);
-					}
-				}
-			}
-
-			if ($submit && (($cfg_array['auth_method'] != $this->new_config['auth_method']) || $updated_auth_settings))
-			{
-				$method = basename($cfg_array['auth_method']);
-				if ($method && in_array($method, $auth_plugins))
-				{
-					include_once(PHPBB_ROOT_PATH . 'includes/auth/auth_' . $method . '.' . PHP_EXT);
-
-					$method = 'init_' . $method;
-					if (function_exists($method))
-					{
-						if ($error = $method())
-						{
-							foreach ($old_auth_config as $config_name => $config_value)
-							{
-								set_config($config_name, $config_value);
-							}
-							trigger_error($error . adm_back_link($this->u_action), E_USER_WARNING);
-						}
-					}
-					set_config('auth_method', basename($cfg_array['auth_method']));
-				}
-				else
-				{
-					trigger_error('NO_AUTH_PLUGIN', E_USER_ERROR);
-				}
-			}
-		}
-
-		if ($submit)
-		{
-			add_log('admin', 'LOG_CONFIG_' . strtoupper($mode));
-
-			trigger_error(phpbb::$user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action));
-		}
-
-		$this->tpl_name = 'acp_board';
-		$this->page_title = $display_vars['title'];
-
-		phpbb::$template->assign_vars(array(
-			'L_TITLE'			=> phpbb::$user->lang[$display_vars['title']],
-			'L_TITLE_EXPLAIN'	=> phpbb::$user->lang[$display_vars['title'] . '_EXPLAIN'],
-
-			'S_ERROR'			=> (sizeof($error)) ? true : false,
-			'ERROR_MSG'			=> implode('<br />', $error),
-
-			'U_ACTION'			=> $this->u_action,
-		));
-
-		// Output relevant page
-		foreach ($display_vars['vars'] as $config_key => $vars)
-		{
-			if (!is_array($vars) && strpos($config_key, 'legend') === false)
-			{
-				continue;
-			}
-
-			if (strpos($config_key, 'legend') !== false)
-			{
-				phpbb::$template->assign_block_vars('options', array(
-					'S_LEGEND'		=> true,
-					'LEGEND'		=> (isset(phpbb::$user->lang[$vars])) ? phpbb::$user->lang[$vars] : $vars,
-				));
-
-				continue;
-			}
-
-			$type = explode(':', $vars['type']);
-
-			$l_explain = '';
-			if ($vars['explain'] && isset($vars['lang_explain']))
-			{
-				$l_explain = (isset(phpbb::$user->lang[$vars['lang_explain']])) ? phpbb::$user->lang[$vars['lang_explain']] : $vars['lang_explain'];
-			}
-			else if ($vars['explain'])
-			{
-				$l_explain = (isset(phpbb::$user->lang[$vars['lang'] . '_EXPLAIN'])) ? phpbb::$user->lang[$vars['lang'] . '_EXPLAIN'] : '';
-			}
-
-			$content = build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars);
-
-			if (empty($content))
-			{
-				continue;
-			}
-
-			phpbb::$template->assign_block_vars('options', array(
-				'KEY'			=> $config_key,
-				'TITLE'			=> (isset(phpbb::$user->lang[$vars['lang']])) ? phpbb::$user->lang[$vars['lang']] : $vars['lang'],
-				'S_EXPLAIN'		=> $vars['explain'],
-				'TITLE_EXPLAIN'	=> $l_explain,
-				'CONTENT'		=> $content,
-			));
-
-			unset($display_vars['vars'][$config_key]);
-		}
-
-		if ($mode == 'auth')
-		{
-			phpbb::$template->assign_var('S_AUTH', true);
-
-			foreach ($auth_plugins as $method)
-			{
-				if ($method && file_exists(PHPBB_ROOT_PATH . 'includes/auth/auth_' . $method . '.' . PHP_EXT))
-				{
-					$method = 'acp_' . $method;
-					if (function_exists($method))
-					{
-						$fields = $method($this->new_config);
-
-						if ($fields['tpl'])
-						{
-							phpbb::$template->assign_block_vars('auth_tpl', array(
-								'TPL'	=> $fields['tpl'],
-							));
-						}
-						unset($fields);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	* Select auth method
-	*/
-	function select_auth_method($selected_method, $key = '')
-	{
-		$auth_plugins = array();
-
-		$dp = @opendir(PHPBB_ROOT_PATH . 'includes/auth');
-
-		if (!$dp)
-		{
-			return '';
-		}
-
-		while (($file = readdir($dp)) !== false)
-		{
-			if (preg_match('#^auth_(.*?)\.' . PHP_EXT . '$#', $file))
-			{
-				$auth_plugins[] = preg_replace('#^auth_(.*?)\.' . PHP_EXT . '$#', '\1', $file);
-			}
-		}
-		closedir($dp);
-
-		sort($auth_plugins);
-
-		$auth_select = '';
-		foreach ($auth_plugins as $method)
-		{
-			$selected = ($selected_method == $method) ? ' selected="selected"' : '';
-			$auth_select .= '<option value="' . $method . '"' . $selected . '>' . ucfirst($method) . '</option>';
-		}
-
-		return $auth_select;
-	}
-
-	/**
-	* Select mail authentication method
-	*/
-	function mail_auth_select($selected_method, $key = '')
-	{
-		$auth_methods = array('PLAIN', 'LOGIN', 'CRAM-MD5', 'DIGEST-MD5', 'POP-BEFORE-SMTP');
-		$s_smtp_auth_options = '';
-
-		foreach ($auth_methods as $method)
-		{
-			$s_smtp_auth_options .= '<option value="' . $method . '"' . (($selected_method == $method) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang['SMTP_' . str_replace('-', '_', $method)] . '</option>';
-		}
-
-		return $s_smtp_auth_options;
-	}
-
-	/**
-	* Select full folder action
-	*/
-	function full_folder_select($value, $key = '')
-	{
-		return '<option value="1"' . (($value == 1) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang['DELETE_OLDEST_MESSAGES'] . '</option><option value="2"' . (($value == 2) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang['HOLD_NEW_MESSAGES_SHORT'] . '</option>';
-	}
-
-	/**
-	* Select ip validation
-	*/
-	function select_ip_check($value, $key = '')
-	{
-		$radio_ary = array(4 => 'ALL', 3 => 'CLASS_C', 2 => 'CLASS_B', 0 => 'NO_IP_VALIDATION');
-
-		return h_radio('config[ip_check]', $radio_ary, $value, $key);
-	}
-
-	/**
-	* Select referer validation
-	*/
-	function select_ref_check($value, $key = '')
-	{
-		$radio_ary = array(REFERER_VALIDATE_PATH => 'REF_PATH', REFERER_VALIDATE_HOST => 'REF_HOST', REFERER_VALIDATE_NONE => 'NO_REF_VALIDATION');
-
-		return h_radio('config[referer_validation]', $radio_ary, $value, $key);
-	}
-
-	/**
-	* Select account activation method
-	*/
-	function select_acc_activation($value, $key = '')
-	{
-		$radio_ary = array(USER_ACTIVATION_DISABLE => 'ACC_DISABLE', USER_ACTIVATION_NONE => 'ACC_NONE');
-		if (phpbb::$config['email_enable'])
-		{
-			$radio_ary += array(USER_ACTIVATION_SELF => 'ACC_USER', USER_ACTIVATION_ADMIN => 'ACC_ADMIN');
-		}
-
-		return h_radio('config[require_activation]', $radio_ary, $value, $key);
-	}
-
-	/**
-	* Maximum/Minimum username length
-	*/
-	function username_length($value, $key = '')
-	{
-		return '<input id="' . $key . '" type="text" size="3" maxlength="3" name="config[min_name_chars]" value="' . $value . '" /> ' . phpbb::$user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input type="text" size="3" maxlength="3" name="config[max_name_chars]" value="' . $this->new_config['max_name_chars'] . '" /> ' . phpbb::$user->lang['MAX_CHARS'];
-	}
-
-	/**
-	* Allowed chars in usernames
-	*/
-	function select_username_chars($selected_value, $key)
-	{
-		$user_char_ary = array('USERNAME_CHARS_ANY', 'USERNAME_ALPHA_ONLY', 'USERNAME_ALPHA_SPACERS', 'USERNAME_LETTER_NUM', 'USERNAME_LETTER_NUM_SPACERS', 'USERNAME_ASCII');
-		$user_char_options = '';
-		foreach ($user_char_ary as $user_type)
-		{
-			$selected = ($selected_value == $user_type) ? ' selected="selected"' : '';
-			$user_char_options .= '<option value="' . $user_type . '"' . $selected . '>' . phpbb::$user->lang[$user_type] . '</option>';
-		}
-
-		return $user_char_options;
-	}
-
-	/**
-	* Maximum/Minimum password length
-	*/
-	function password_length($value, $key)
-	{
-		return '<input id="' . $key . '" type="text" size="3" maxlength="3" name="config[min_pass_chars]" value="' . $value . '" /> ' . phpbb::$user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input type="text" size="3" maxlength="3" name="config[max_pass_chars]" value="' . $this->new_config['max_pass_chars'] . '" /> ' . phpbb::$user->lang['MAX_CHARS'];
-	}
-
-	/**
-	* Required chars in passwords
-	*/
-	function select_password_chars($selected_value, $key)
-	{
-		$pass_type_ary = array('PASS_TYPE_ANY', 'PASS_TYPE_CASE', 'PASS_TYPE_ALPHA', 'PASS_TYPE_SYMBOL');
-		$pass_char_options = '';
-		foreach ($pass_type_ary as $pass_type)
-		{
-			$selected = ($selected_value == $pass_type) ? ' selected="selected"' : '';
-			$pass_char_options .= '<option value="' . $pass_type . '"' . $selected . '>' . phpbb::$user->lang[$pass_type] . '</option>';
-		}
-
-		return $pass_char_options;
-	}
-
-	/**
-	* Select bump interval
-	*/
-	function bump_interval($value, $key)
-	{
-		$s_bump_type = '';
-		$types = array('m' => 'MINUTES', 'h' => 'HOURS', 'd' => 'DAYS');
-		foreach ($types as $type => $lang)
-		{
-			$selected = ($this->new_config['bump_type'] == $type) ? ' selected="selected"' : '';
-			$s_bump_type .= '<option value="' . $type . '"' . $selected . '>' . phpbb::$user->lang[$lang] . '</option>';
-		}
-
-		return '<input id="' . $key . '" type="text" size="3" maxlength="4" name="config[bump_interval]" value="' . $value . '" />&nbsp;<select name="config[bump_type]">' . $s_bump_type . '</select>';
-	}
-
-	/**
-	* Board disable option and message
-	*/
-	function board_disable($value, $key)
-	{
-		$radio_ary = array(1 => 'YES', 0 => 'NO');
-
-		return h_radio('config[board_disable]', $radio_ary, $value) . '<br /><input id="' . $key . '" type="text" name="config[board_disable_msg]" maxlength="255" size="40" value="' . $this->new_config['board_disable_msg'] . '" />';
-	}
-
-	/**
-	* Select default dateformat
-	*/
-	function dateformat_select($value, $key)
-	{
-		// Let the format_date function operate with the acp values
-		$old_tz = phpbb::$user->timezone;
-		$old_dst = phpbb::$user->dst;
-
-		phpbb::$user->timezone = phpbb::$config['board_timezone'];
-		phpbb::$user->dst = phpbb::$config['board_dst'];
-
-		$dateformat_options = '';
-
-		foreach (phpbb::$user->lang['dateformats'] as $format => $null)
-		{
-			$dateformat_options .= '<option value="' . $format . '"' . (($format == $value) ? ' selected="selected"' : '') . '>';
-			$dateformat_options .= phpbb::$user->format_date(time(), $format, false) . ((strpos($format, '|') !== false) ? phpbb::$user->lang['VARIANT_DATE_SEPARATOR'] . phpbb::$user->format_date(time(), $format, true) : '');
-			$dateformat_options .= '</option>';
-		}
-
-		$dateformat_options .= '<option value="custom"';
-		if (!isset(phpbb::$user->lang['dateformats'][$value]))
-		{
-			$dateformat_options .= ' selected="selected"';
-		}
-		$dateformat_options .= '>' . phpbb::$user->lang['CUSTOM_DATEFORMAT'] . '</option>';
-
-		// Reset users date options
-		phpbb::$user->timezone = $old_tz;
-		phpbb::$user->dst = $old_dst;
-
-		return "<select name=\"dateoptions\" id=\"dateoptions\" onchange=\"if (this.value == 'custom') { document.getElementById('" . addslashes($key) . "').value = '" . addslashes($value) . "'; } else { document.getElementById('" . addslashes($key) . "').value = this.value; }\">$dateformat_options</select>
-		<input type=\"text\" name=\"config[$key]\" id=\"$key\" value=\"$value\" maxlength=\"30\" />";
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_bots.php b/phpBB/modules/acp/acp_bots.php
deleted file mode 100644
index da56be624b..0000000000
--- a/phpBB/modules/acp/acp_bots.php
+++ /dev/null
@@ -1,412 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_bots
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		$action = request_var('action', '');
-		$submit = phpbb_request::is_set_post('submit');
-		$mark	= request_var('mark', array(0));
-		$bot_id	= request_var('id', 0);
-
-		if (phpbb_request::is_set_post('add'))
-		{
-			$action = 'add';
-		}
-
-		$error = array();
-
-		phpbb::$user->add_lang('acp/bots');
-		$this->tpl_name = 'acp_bots';
-		$this->page_title = 'ACP_BOTS';
-		$form_key = 'acp_bots';
-		add_form_key($form_key);
-
-		if ($submit && !check_form_key($form_key))
-		{
-			$error[] = phpbb::$user->lang['FORM_INVALID'];
-		}
-
-		// User wants to do something, how inconsiderate of them!
-		switch ($action)
-		{
-			case 'activate':
-				if ($bot_id || sizeof($mark))
-				{
-					$sql_id = ($bot_id) ? " = $bot_id" : ' IN (' . implode(', ', $mark) . ')';
-
-					$sql = 'UPDATE ' . BOTS_TABLE . "
-						SET bot_active = 1
-						WHERE bot_id $sql_id";
-					phpbb::$db->sql_query($sql);
-				}
-
-				phpbb::$acm->destroy('bots');
-			break;
-
-			case 'deactivate':
-				if ($bot_id || sizeof($mark))
-				{
-					$sql_id = ($bot_id) ? " = $bot_id" : ' IN (' . implode(', ', $mark) . ')';
-
-					$sql = 'UPDATE ' . BOTS_TABLE . "
-						SET bot_active = 0
-						WHERE bot_id $sql_id";
-					phpbb::$db->sql_query($sql);
-				}
-
-				phpbb::$acm->destroy('bots');
-			break;
-
-			case 'delete':
-				if ($bot_id || sizeof($mark))
-				{
-					if (confirm_box(true))
-					{
-						// We need to delete the relevant user, usergroup and bot entries ...
-						$sql_id = ($bot_id) ? " = $bot_id" : ' IN (' . implode(', ', $mark) . ')';
-
-						$sql = 'SELECT bot_name, user_id
-							FROM ' . BOTS_TABLE . "
-							WHERE bot_id $sql_id";
-						$result = phpbb::$db->sql_query($sql);
-
-						$user_id_ary = $bot_name_ary = array();
-						while ($row = phpbb::$db->sql_fetchrow($result))
-						{
-							$user_id_ary[] = (int) $row['user_id'];
-							$bot_name_ary[] = $row['bot_name'];
-						}
-						phpbb::$db->sql_freeresult($result);
-
-						phpbb::$db->sql_transaction('begin');
-
-						$sql = 'DELETE FROM ' . BOTS_TABLE . "
-							WHERE bot_id $sql_id";
-						phpbb::$db->sql_query($sql);
-
-						if (sizeof($user_id_ary))
-						{
-							$_tables = array(USERS_TABLE, USER_GROUP_TABLE);
-							foreach ($_tables as $table)
-							{
-								$sql = "DELETE FROM $table
-									WHERE " . phpbb::$db->sql_in_set('user_id', $user_id_ary);
-								phpbb::$db->sql_query($sql);
-							}
-						}
-
-						phpbb::$db->sql_transaction('commit');
-
-						phpbb::$acm->destroy('bots');
-
-						add_log('admin', 'LOG_BOT_DELETE', implode(', ', $bot_name_ary));
-						trigger_error(phpbb::$user->lang['BOT_DELETED'] . adm_back_link($this->u_action));
-					}
-					else
-					{
-						confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-							'mark'		=> $mark,
-							'id'		=> $bot_id,
-							'mode'		=> $mode,
-							'action'	=> $action))
-						);
-					}
-				}
-			break;
-
-			case 'edit':
-			case 'add':
-				include_once(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-
-				$bot_row = array(
-					'bot_name'		=> utf8_normalize_nfc(request_var('bot_name', '', true)),
-					'bot_agent'		=> request_var('bot_agent', ''),
-					'bot_ip'		=> request_var('bot_ip', ''),
-					'bot_active'	=> request_var('bot_active', true),
-					'bot_lang'		=> request_var('bot_lang', phpbb::$config['default_lang']),
-					'bot_style'		=> request_var('bot_style' , phpbb::$config['default_style']),
-				);
-
-				if ($submit)
-				{
-					if (!$bot_row['bot_agent'] && !$bot_row['bot_ip'])
-					{
-						$error[] = phpbb::$user->lang['ERR_BOT_NO_MATCHES'];
-					}
-
-					if ($bot_row['bot_ip'] && !preg_match('#^[\d\.,:]+$#', $bot_row['bot_ip']))
-					{
-						if (!$ip_list = gethostbynamel($bot_row['bot_ip']))
-						{
-							$error[] = phpbb::$user->lang['ERR_BOT_NO_IP'];
-						}
-						else
-						{
-							$bot_row['bot_ip'] = implode(',', $ip_list);
-						}
-					}
-					$bot_row['bot_ip'] = str_replace(' ', '', $bot_row['bot_ip']);
-
-					// Make sure the admin is not adding a bot with an user agent similar to his one
-					if ($bot_row['bot_agent'] && substr(phpbb::$user->data['session_browser'], 0, 149) === substr($bot_row['bot_agent'], 0, 149))
-					{
-						$error[] = phpbb::$user->lang['ERR_BOT_AGENT_MATCHES_UA'];
-					}
-
-					$bot_name = false;
-					if ($bot_id)
-					{
-						$sql = 'SELECT u.username_clean
-							FROM ' . BOTS_TABLE . ' b, ' . USERS_TABLE . " u
-							WHERE b.bot_id = $bot_id
-								AND u.user_id = b.user_id";
-						$result = phpbb::$db->sql_query($sql);
-						$row = phpbb::$db->sql_fetchrow($result);
-						phpbb::$db->sql_freeresult($result);
-
-						if (!$bot_row)
-						{
-							$error[] = phpbb::$user->lang['NO_BOT'];
-						}
-						else
-						{
-							$bot_name = $row['username_clean'];
-						}
-					}
-					if (!$this->validate_botname($bot_row['bot_name'], $bot_name))
-					{
-						$error[] = phpbb::$user->lang['BOT_NAME_TAKEN'];
-					}
-
-					if (!sizeof($error))
-					{
-						// New bot? Create a new user and group entry
-						if ($action == 'add')
-						{
-							$sql = 'SELECT group_id, group_colour
-								FROM ' . GROUPS_TABLE . "
-								WHERE group_name_clean = 'bots'
-									AND group_type = " . GROUP_SPECIAL;
-							$result = phpbb::$db->sql_query($sql);
-							$group_row = phpbb::$db->sql_fetchrow($result);
-							phpbb::$db->sql_freeresult($result);
-
-							if (!$group_row)
-							{
-								trigger_error(phpbb::$user->lang['NO_BOT_GROUP'] . adm_back_link($this->u_action . "&amp;id=$bot_id&amp;action=$action"), E_USER_WARNING);
-							}
-
-
-							$user_id = user_add(array(
-								'user_type'				=> (int) phpbb::USER_IGNORE,
-								'group_id'				=> (int) $group_row['group_id'],
-								'username'				=> (string) $bot_row['bot_name'],
-								'user_regdate'			=> time(),
-								'user_password'			=> '',
-								'user_colour'			=> (string) $group_row['group_colour'],
-								'user_email'			=> '',
-								'user_lang'				=> (string) $bot_row['bot_lang'],
-								'user_style'			=> (int) $bot_row['bot_style'],
-								'user_allow_massemail'	=> 0,
-							));
-
-							$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', array(
-								'user_id'		=> (int) $user_id,
-								'bot_name'		=> (string) $bot_row['bot_name'],
-								'bot_active'	=> (int) $bot_row['bot_active'],
-								'bot_agent'		=> (string) $bot_row['bot_agent'],
-								'bot_ip'		=> (string) $bot_row['bot_ip'])
-							);
-							phpbb::$db->sql_query($sql);
-
-							$log = 'ADDED';
-						}
-						else if ($bot_id)
-						{
-							$sql = 'SELECT user_id, bot_name
-								FROM ' . BOTS_TABLE . "
-								WHERE bot_id = $bot_id";
-							$result = phpbb::$db->sql_query($sql);
-							$row = phpbb::$db->sql_fetchrow($result);
-							phpbb::$db->sql_freeresult($result);
-
-							if (!$row)
-							{
-								trigger_error(phpbb::$user->lang['NO_BOT'] . adm_back_link($this->u_action . "&amp;id=$bot_id&amp;action=$action"), E_USER_WARNING);
-							}
-
-							$sql_ary = array(
-								'user_style'	=> (int) $bot_row['bot_style'],
-								'user_lang'		=> (string) $bot_row['bot_lang'],
-							);
-
-							if ($bot_row['bot_name'] !== $row['bot_name'])
-							{
-								$sql_ary['username'] = (string) $bot_row['bot_name'];
-								$sql_ary['username_clean'] = (string) utf8_clean_string($bot_row['bot_name']);
-							}
-
-							$sql = 'UPDATE ' . USERS_TABLE . ' SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . " WHERE user_id = {$row['user_id']}";
-							phpbb::$db->sql_query($sql);
-
-							$sql = 'UPDATE ' . BOTS_TABLE . ' SET ' . phpbb::$db->sql_build_array('UPDATE', array(
-								'bot_name'		=> (string) $bot_row['bot_name'],
-								'bot_active'	=> (int) $bot_row['bot_active'],
-								'bot_agent'		=> (string) $bot_row['bot_agent'],
-								'bot_ip'		=> (string) $bot_row['bot_ip'])
-							) . " WHERE bot_id = $bot_id";
-							phpbb::$db->sql_query($sql);
-
-							// Updated username?
-							if ($bot_row['bot_name'] !== $row['bot_name'])
-							{
-								user_update_name($row['bot_name'], $bot_row['bot_name']);
-							}
-
-							$log = 'UPDATED';
-						}
-
-						phpbb::$acm->destroy('bots');
-
-						add_log('admin', 'LOG_BOT_' . $log, $bot_row['bot_name']);
-						trigger_error(phpbb::$user->lang['BOT_' . $log] . adm_back_link($this->u_action));
-
-					}
-				}
-				else if ($bot_id)
-				{
-					$sql = 'SELECT b.*, u.user_lang, u.user_style
-						FROM ' . BOTS_TABLE . ' b, ' . USERS_TABLE . " u
-						WHERE b.bot_id = $bot_id
-							AND u.user_id = b.user_id";
-					$result = phpbb::$db->sql_query($sql);
-					$bot_row = phpbb::$db->sql_fetchrow($result);
-					phpbb::$db->sql_freeresult($result);
-
-					if (!$bot_row)
-					{
-						trigger_error(phpbb::$user->lang['NO_BOT'] . adm_back_link($this->u_action . "&amp;id=$bot_id&amp;action=$action"), E_USER_WARNING);
-					}
-
-					$bot_row['bot_lang'] = $bot_row['user_lang'];
-					$bot_row['bot_style'] = $bot_row['user_style'];
-					unset($bot_row['user_lang'], $bot_row['user_style']);
-				}
-
-				$s_active_options = '';
-				$_options = array('0' => 'NO', '1' => 'YES');
-				foreach ($_options as $value => $lang)
-				{
-					$selected = ($bot_row['bot_active'] == $value) ? ' selected="selected"' : '';
-					$s_active_options .= '<option value="' . $value . '"' . $selected . '>' . phpbb::$user->lang[$lang] . '</option>';
-				}
-
-				$style_select = style_select($bot_row['bot_style'], true);
-				$lang_select = language_select($bot_row['bot_lang']);
-
-				$l_title = ($action == 'edit') ? 'EDIT' : 'ADD';
-
-				phpbb::$template->assign_vars(array(
-					'L_TITLE'		=> phpbb::$user->lang['BOT_' . $l_title],
-					'U_ACTION'		=> $this->u_action . "&amp;id=$bot_id&amp;action=$action",
-					'U_BACK'		=> $this->u_action,
-					'ERROR_MSG'		=> (sizeof($error)) ? implode('<br />', $error) : '',
-
-					'BOT_NAME'		=> $bot_row['bot_name'],
-					'BOT_IP'		=> $bot_row['bot_ip'],
-					'BOT_AGENT'		=> $bot_row['bot_agent'],
-
-					'S_EDIT_BOT'		=> true,
-					'S_ACTIVE_OPTIONS'	=> $s_active_options,
-					'S_STYLE_OPTIONS'	=> $style_select,
-					'S_LANG_OPTIONS'	=> $lang_select,
-					'S_ERROR'			=> (sizeof($error)) ? true : false,
-				));
-
-				return;
-
-			break;
-		}
-
-		$s_options = '';
-		$_options = array('activate' => 'BOT_ACTIVATE', 'deactivate' => 'BOT_DEACTIVATE', 'delete' => 'DELETE');
-		foreach ($_options as $value => $lang)
-		{
-			$s_options .= '<option value="' . $value . '">' . phpbb::$user->lang[$lang] . '</option>';
-		}
-
-		phpbb::$template->assign_vars(array(
-			'U_ACTION'		=> $this->u_action,
-			'S_BOT_OPTIONS'	=> $s_options,
-		));
-
-		$sql = 'SELECT b.bot_id, b.bot_name, b.bot_active, u.user_lastvisit
-			FROM ' . BOTS_TABLE . ' b, ' . USERS_TABLE . ' u
-			WHERE u.user_id = b.user_id
-			ORDER BY u.user_lastvisit DESC, b.bot_name ASC';
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$active_lang = (!$row['bot_active']) ? 'BOT_ACTIVATE' : 'BOT_DEACTIVATE';
-			$active_value = (!$row['bot_active']) ? 'activate' : 'deactivate';
-
-			phpbb::$template->assign_block_vars('bots', array(
-				'BOT_NAME'		=> $row['bot_name'],
-				'BOT_ID'		=> $row['bot_id'],
-				'LAST_VISIT'	=> ($row['user_lastvisit']) ? phpbb::$user->format_date($row['user_lastvisit']) : phpbb::$user->lang['BOT_NEVER'],
-
-				'U_ACTIVATE_DEACTIVATE'	=> $this->u_action . "&amp;id={$row['bot_id']}&amp;action=$active_value",
-				'L_ACTIVATE_DEACTIVATE'	=> phpbb::$user->lang[$active_lang],
-				'U_EDIT'				=> $this->u_action . "&amp;id={$row['bot_id']}&amp;action=edit",
-				'U_DELETE'				=> $this->u_action . "&amp;id={$row['bot_id']}&amp;action=delete",
-			));
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	/**
-	* Validate bot name against username table
-	*/
-	function validate_botname($newname, $oldname = false)
-	{
-		if ($oldname && utf8_clean_string($newname) === $oldname)
-		{
-			return true;
-		}
-
-		// Admins might want to use names otherwise forbidden, thus we only check for duplicates.
-		$sql = 'SELECT username
-			FROM ' . USERS_TABLE . "
-			WHERE username_clean = '" . phpbb::$db->sql_escape(utf8_clean_string($newname)) . "'";
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		return ($row) ? false : true;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_captcha.php b/phpBB/modules/acp/acp_captcha.php
deleted file mode 100644
index 3ffefa85a1..0000000000
--- a/phpBB/modules/acp/acp_captcha.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*/
-
-/**
-* @ignore
-*/
-
-
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_captcha
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		phpbb::$user->add_lang('acp/board');
-
-		include(PHPBB_ROOT_PATH . 'includes/captcha/captcha_factory.' . PHP_EXT);
-
-		$selected = request_var('select_captcha', phpbb::$config['captcha_plugin']);
-		$configure = request_var('configure', false);
-
-		// Oh, they are just here for the view
-		if (phpbb_request::is_set('captcha_demo', phpbb_request::GET))
-		{
-			$this->deliver_demo($selected);
-		}
-
-		// Delegate
-		if ($configure)
-		{
-			$config_captcha = phpbb_captcha_factory::get_instance($selected);
-			$config_captcha->acp_page($id, $this);
-		}
-		else
-		{
-			$captchas = phpbb_captcha_factory::get_captcha_types();
-
-			$config_vars = array(
-				'enable_confirm'		=> 'REG_ENABLE',
-				'enable_post_confirm'	=> 'POST_ENABLE',
-				'confirm_refresh'		=> 'CONFIRM_REFRESH',
-				'captcha_gd'			=> 'CAPTCHA_GD',
-			);
-
-			$this->tpl_name = 'acp_captcha';
-			$this->page_title = 'ACP_VC_SETTINGS';
-			$form_key = 'acp_captcha';
-			add_form_key($form_key);
-
-			$submit = request_var('main_submit', false);
-
-			if ($submit && check_form_key($form_key))
-			{
-				$config_vars = array_keys($config_vars);
-				foreach ($config_vars as $config_var)
-				{
-					set_config($config_var, request_var($config_var, false));
-				}
-				if ($selected !== phpbb::$config['captcha_plugin'])
-				{
-					// sanity check
-					if (isset($captchas['available'][$selected]))
-					{
-						$old_captcha = phpbb_captcha_factory::get_instance(phpbb::$config['captcha_plugin']);
-						$old_captcha->uninstall();
-						set_config('captcha_plugin', $selected);
-						$new_captcha = phpbb_captcha_factory::get_instance(phpbb::$config['captcha_plugin']);
-						$new_captcha->install();
-					}
-					else
-					{
-						trigger_error(phpbb::$user->lang['CAPTCHA_UNAVAILABLE'] . adm_back_link($this->u_action));
-					}
-				}
-				trigger_error(phpbb::$user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action));
-			}
-			else if ($submit)
-			{
-				trigger_error(phpbb::$user->lang['FORM_INVALID'] . adm_back_link());
-			}
-			else
-			{
-				$captcha_select = '';
-				foreach ($captchas['available'] as $value => $title)
-				{
-					$current = ($selected !== false && $value == $selected) ? ' selected="selected"' : '';
-					$captcha_select .= '<option value="' . $value . '"' . $current . '>' . phpbb::$user->lang[$title] . '</option>';
-				}
-				foreach ($captchas['unavailable'] as $value => $title)
-				{
-					$captcha_select .= '<option value="' . $value . '"' . $current . ' class="disabled-option" >' . phpbb::$user->lang[$title] . '</option>';
-				}
-
-				$demo_captcha = phpbb_captcha_factory::get_instance($selected);
-
-				foreach ($config_vars as $config_var => $template_var)
-				{
-					phpbb::$template->assign_var($template_var, request_var($config_var, phpbb::$config[$config_var])) ;
-				}
-
-				phpbb::$template->assign_vars(array(
-					'CAPTCHA_PREVIEW'	=> $demo_captcha->get_demo_template($id),
-					'CAPTCHA_SELECT'	=> $captcha_select,
-				));
-			}
-
-		}
-	}
-
-
-	/**
-	* Entry point for delivering image CAPTCHAs in the ACP.
-	*/
-	function deliver_demo($selected)
-	{
-		$captcha = phpbb_captcha_factory::get_instance($selected);
-		$captcha->init(CONFIRM_REG);
-		$captcha->execute_demo();
-		garbage_collection();
-		exit_handler();
-	}
-
-
-
-
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_database.php b/phpBB/modules/acp/acp_database.php
deleted file mode 100644
index 1490882d01..0000000000
--- a/phpBB/modules/acp/acp_database.php
+++ /dev/null
@@ -1,2345 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_database
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		phpbb::$user->add_lang('acp/database');
-
-		$this->tpl_name = 'acp_database';
-		$this->page_title = 'ACP_DATABASE';
-
-		$action	= request_var('action', '');
-		$submit = phpbb_request::is_set_post('submit');
-
-		phpbb::$template->assign_vars(array(
-			'MODE'	=> $mode,
-		));
-
-		switch ($mode)
-		{
-			case 'backup':
-
-				$this->page_title = 'ACP_BACKUP';
-
-				switch ($action)
-				{
-					case 'download':
-						$type	= request_var('type', '');
-						$table	= request_var('table', array(''));
-						$format	= request_var('method', '');
-						$where	= request_var('where', '');
-
-						if (!sizeof($table))
-						{
-							trigger_error(phpbb::$user->lang['TABLE_SELECT_ERROR'] . adm_back_link($this->u_action), E_USER_WARNING);
-						}
-
-						$store = $download = $structure = $schema_data = false;
-
-						if ($where == 'store_and_download' || $where == 'store')
-						{
-							$store = true;
-						}
-
-						if ($where == 'store_and_download' || $where == 'download')
-						{
-							$download = true;
-						}
-
-						if ($type == 'full' || $type == 'structure')
-						{
-							$structure = true;
-						}
-
-						if ($type == 'full' || $type == 'data')
-						{
-							$schema_data = true;
-						}
-
-						@set_time_limit(0);
-
-						$time = time();
-
-						$filename = 'backup_' . $time . '_' . unique_id();
-						switch (phpbb::$db->dbms_type)
-						{
-							case 'mysql':
-								$extractor = new mysql_extractor($download, $store, $format, $filename, $time);
-							break;
-
-							case 'sqlite':
-								$extractor = new sqlite_extractor($download, $store, $format, $filename, $time);
-							break;
-
-							case 'postgres':
-								$extractor = new postgres_extractor($download, $store, $format, $filename, $time);
-							break;
-
-							case 'oracle':
-								$extractor = new oracle_extractor($download, $store, $format, $filename, $time);
-							break;
-
-							case 'mssql':
-								$extractor = new mssql_extractor($download, $store, $format, $filename, $time);
-							break;
-
-							case 'firebird':
-								$extractor = new firebird_extractor($download, $store, $format, $filename, $time);
-							break;
-
-							case 'db2':
-								$extractor = new db2_extractor($download, $store, $format, $filename, $time);
-							break;
-						}
-
-						$extractor->write_start();
-
-						foreach ($table as $table_name)
-						{
-							// Get the table structure
-							if ($structure)
-							{
-								$extractor->write_table($table_name);
-							}
-							else
-							{
-								// We might wanna empty out all that junk :D
-								switch (phpbb::$db->dbms_type)
-								{
-									case 'sqlite':
-									case 'firebird':
-									case 'db2':
-										$extractor->flush('DELETE FROM ' . $table_name . ";\n");
-									break;
-
-									case 'mssql':
-										$extractor->flush('TRUNCATE TABLE ' . $table_name . "GO\n");
-									break;
-
-									case 'oracle':
-										$extractor->flush('TRUNCATE TABLE ' . $table_name . "\\\n");
-									break;
-
-									default:
-										$extractor->flush('TRUNCATE TABLE ' . $table_name . ";\n");
-									break;
-								}
-							}
-
-							// Data
-							if ($schema_data)
-							{
-								$extractor->write_data($table_name);
-							}
-						}
-
-						$extractor->write_end();
-
-						add_log('admin', 'LOG_DB_BACKUP');
-
-						if ($download == true)
-						{
-							exit;
-						}
-
-						trigger_error(phpbb::$user->lang['BACKUP_SUCCESS'] . adm_back_link($this->u_action));
-					break;
-
-					default:
-						include(PHPBB_ROOT_PATH . 'includes/functions_install.' . PHP_EXT);
-						$tables = get_tables($db);
-						asort($tables);
-						foreach ($tables as $table_name)
-						{
-							if (strlen(phpbb::$base_config['table_prefix']) === 0 || stripos($table_name, phpbb::$base_config['table_prefix']) === 0)
-							{
-								phpbb::$template->assign_block_vars('tables', array(
-									'TABLE'	=> $table_name,
-								));
-							}
-						}
-						unset($tables);
-
-						phpbb::$template->assign_vars(array(
-							'U_ACTION'	=> $this->u_action . '&amp;action=download',
-						));
-
-						$available_methods = array('gzip' => 'zlib', 'bzip2' => 'bz2');
-
-						foreach ($available_methods as $type => $module)
-						{
-							if (!@extension_loaded($module))
-							{
-								continue;
-							}
-
-							phpbb::$template->assign_block_vars('methods', array(
-								'TYPE'	=> $type,
-							));
-						}
-
-						phpbb::$template->assign_block_vars('methods', array(
-							'TYPE'	=> 'text',
-						));
-					break;
-				}
-			break;
-
-			case 'restore':
-
-				$this->page_title = 'ACP_RESTORE';
-
-				switch ($action)
-				{
-					case 'submit':
-						$delete = request_var('delete', '');
-						$file = request_var('file', '');
-
-						if (!preg_match('#^backup_\d{10,}_[a-z\d]{16}\.(sql(?:\.(?:gz|bz2))?)$#', $file, $matches))
-						{
-							trigger_error(phpbb::$user->lang['BACKUP_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
-						}
-
-						$file_name = PHPBB_ROOT_PATH . 'store/' . $matches[0];
-
-						if (!file_exists($file_name) || !is_readable($file_name))
-						{
-							trigger_error(phpbb::$user->lang['BACKUP_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
-						}
-
-						if ($delete)
-						{
-							if (confirm_box(true))
-							{
-								unlink($file_name);
-								add_log('admin', 'LOG_DB_DELETE');
-								trigger_error(phpbb::$user->lang['BACKUP_DELETE'] . adm_back_link($this->u_action));
-							}
-							else
-							{
-								confirm_box(false, phpbb::$user->lang['DELETE_SELECTED_BACKUP'], build_hidden_fields(array('delete' => $delete, 'file' => $file)));
-							}
-						}
-						else
-						{
-							$download = request_var('download', '');
-
-							if ($download)
-							{
-								$name = $matches[0];
-
-								switch ($matches[1])
-								{
-									case 'sql':
-										$mimetype = 'text/x-sql';
-									break;
-									case 'sql.bz2':
-										$mimetype = 'application/x-bzip2';
-									break;
-									case 'sql.gz':
-										$mimetype = 'application/x-gzip';
-									break;
-								}
-
-								header('Pragma: no-cache');
-								header("Content-Type: $mimetype; name=\"$name\"");
-								header("Content-disposition: attachment; filename=$name");
-
-								@set_time_limit(0);
-
-								$fp = @fopen($file_name, 'rb');
-
-								if ($fp !== false)
-								{
-									while (!feof($fp))
-									{
-										echo fread($fp, 8192);
-									}
-									fclose($fp);
-								}
-
-								flush();
-								exit;
-							}
-
-							switch ($matches[1])
-							{
-								case 'sql':
-									$fp = fopen($file_name, 'rb');
-									$read = 'fread';
-									$seek = 'fseek';
-									$eof = 'feof';
-									$close = 'fclose';
-									$fgetd = 'fgetd';
-								break;
-
-								case 'sql.bz2':
-									$fp = bzopen($file_name, 'r');
-									$read = 'bzread';
-									$seek = '';
-									$eof = 'feof';
-									$close = 'bzclose';
-									$fgetd = 'fgetd_seekless';
-								break;
-
-								case 'sql.gz':
-									$fp = gzopen($file_name, 'rb');
-									$read = 'gzread';
-									$seek = 'gzseek';
-									$eof = 'gzeof';
-									$close = 'gzclose';
-									$fgetd = 'fgetd';
-								break;
-							}
-
-							switch (phpbb::$db->dbms_type)
-							{
-								case 'mysql':
-								case 'sqlite':
-								case 'db2':
-									while (($sql = $fgetd($fp, ";\n", $read, $seek, $eof)) !== false)
-									{
-										phpbb::$db->sql_query($sql);
-									}
-								break;
-
-								case 'firebird':
-									$delim = ";\n";
-									while (($sql = $fgetd($fp, $delim, $read, $seek, $eof)) !== false)
-									{
-										$query = trim($sql);
-										if (substr($query, 0, 8) === 'SET TERM')
-										{
-											$delim = $query[9] . "\n";
-											continue;
-										}
-										phpbb::$db->sql_query($query);
-									}
-								break;
-
-								case 'postgres':
-									$delim = ";\n";
-									while (($sql = $fgetd($fp, $delim, $read, $seek, $eof)) !== false)
-									{
-										$query = trim($sql);
-
-										if (substr($query, 0, 13) == 'CREATE DOMAIN')
-										{
-											list(, , $domain) = explode(' ', $query);
-											$sql = "SELECT domain_name
-												FROM information_schema.domains
-												WHERE domain_name = '$domain';";
-											$result = phpbb::$db->sql_query($sql);
-											if (!phpbb::$db->sql_fetchrow($result))
-											{
-												phpbb::$db->sql_query($query);
-											}
-											phpbb::$db->sql_freeresult($result);
-										}
-										else
-										{
-											phpbb::$db->sql_query($query);
-										}
-
-										if (substr($query, 0, 4) == 'COPY')
-										{
-											while (($sub = $fgetd($fp, "\n", $read, $seek, $eof)) !== '\.')
-											{
-												if ($sub === false)
-												{
-													trigger_error(phpbb::$user->lang['RESTORE_FAILURE'] . adm_back_link($this->u_action), E_USER_WARNING);
-												}
-												pg_put_line(phpbb::$db->db_connect_id, $sub . "\n");
-											}
-											pg_put_line(phpbb::$db->db_connect_id, "\\.\n");
-											pg_end_copy(phpbb::$db->db_connect_id);
-										}
-									}
-								break;
-
-								case 'oracle':
-									while (($sql = $fgetd($fp, "/\n", $read, $seek, $eof)) !== false)
-									{
-										phpbb::$db->sql_query($sql);
-									}
-								break;
-
-								case 'mssql':
-									while (($sql = $fgetd($fp, "GO\n", $read, $seek, $eof)) !== false)
-									{
-										phpbb::$db->sql_query($sql);
-									}
-								break;
-							}
-
-							$close($fp);
-
-							// Purge the cache due to updated data
-							phpbb::$acm->purge();
-
-							add_log('admin', 'LOG_DB_RESTORE');
-							trigger_error(phpbb::$user->lang['RESTORE_SUCCESS'] . adm_back_link($this->u_action));
-							break;
-						}
-
-					default:
-						$methods = array('sql');
-						$available_methods = array('sql.gz' => 'zlib', 'sql.bz2' => 'bz2');
-
-						foreach ($available_methods as $type => $module)
-						{
-							if (!@extension_loaded($module))
-							{
-								continue;
-							}
-							$methods[] = $type;
-						}
-
-						$dir = PHPBB_ROOT_PATH . 'store/';
-						$dh = @opendir($dir);
-
-						$backup_files = array();
-
-						if ($dh)
-						{
-							while (($file = readdir($dh)) !== false)
-							{
-								if (preg_match('#^backup_(\d{10,})_[a-z\d]{16}\.(sql(?:\.(?:gz|bz2))?)$#', $file, $matches))
-								{
-									if (in_array($matches[2], $methods))
-									{
-										$backup_files[gmdate("d-m-Y H:i:s", $matches[1])] = $file;
-									}
-								}
-							}
-							closedir($dh);
-						}
-
-						if (!empty($backup_files))
-						{
-							krsort($backup_files);
-
-							foreach ($backup_files as $name => $file)
-							{
-								phpbb::$template->assign_block_vars('files', array(
-									'FILE'		=> $file,
-									'NAME'		=> $name,
-									'SUPPORTED'	=> true,
-								));
-							}
-						}
-
-						phpbb::$template->assign_vars(array(
-							'U_ACTION'	=> $this->u_action . '&amp;action=submit',
-						));
-					break;
-				}
-			break;
-		}
-	}
-}
-
-/**
-* @package acp
-*/
-class base_extractor
-{
-	var $fh;
-	var $fp;
-	var $write;
-	var $close;
-	var $store;
-	var $download;
-	var $time;
-	var $format;
-	var $run_comp = false;
-
-	function __construct($download = false, $store = false, $format, $filename, $time)
-	{
-		$this->download = $download;
-		$this->store = $store;
-		$this->time = $time;
-		$this->format = $format;
-
-		switch ($format)
-		{
-			case 'text':
-				$ext = '.sql';
-				$open = 'fopen';
-				$this->write = 'fwrite';
-				$this->close = 'fclose';
-				$mimetype = 'text/x-sql';
-			break;
-			case 'bzip2':
-				$ext = '.sql.bz2';
-				$open = 'bzopen';
-				$this->write = 'bzwrite';
-				$this->close = 'bzclose';
-				$mimetype = 'application/x-bzip2';
-			break;
-			case 'gzip':
-				$ext = '.sql.gz';
-				$open = 'gzopen';
-				$this->write = 'gzwrite';
-				$this->close = 'gzclose';
-				$mimetype = 'application/x-gzip';
-			break;
-		}
-
-		if ($download == true)
-		{
-			$name = $filename . $ext;
-			header('Pragma: no-cache');
-			header("Content-Type: $mimetype; name=\"$name\"");
-			header("Content-disposition: attachment; filename=$name");
-
-			switch ($format)
-			{
-				case 'bzip2':
-					ob_start();
-				break;
-
-				case 'gzip':
-					if ((isset($_SERVER['HTTP_ACCEPT_ENCODING']) && strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false) && strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'msie') === false)
-					{
-						ob_start('ob_gzhandler');
-					}
-					else
-					{
-						$this->run_comp = true;
-					}
-				break;
-			}
-		}
-
-		if ($store == true)
-		{
-			$file = PHPBB_ROOT_PATH . 'store/' . $filename . $ext;
-
-			$this->fp = $open($file, 'w');
-
-			if (!$this->fp)
-			{
-				trigger_error('Unable to write temporary file to storage folder', E_USER_ERROR);
-			}
-		}
-	}
-
-	function write_end()
-	{
-		static $close;
-
-		if ($this->store)
-		{
-			if ($close === null)
-			{
-				$close = $this->close;
-			}
-			$close($this->fp);
-		}
-
-		// bzip2 must be written all the way at the end
-		if ($this->download && $this->format === 'bzip2')
-		{
-			$c = ob_get_clean();
-			echo bzcompress($c);
-		}
-	}
-
-	function flush($data)
-	{
-		static $write;
-		if ($this->store === true)
-		{
-			if ($write === null)
-			{
-				$write = $this->write;
-			}
-			$write($this->fp, $data);
-		}
-
-		if ($this->download === true)
-		{
-			if ($this->format === 'bzip2' || $this->format === 'text' || ($this->format === 'gzip' && !$this->run_comp))
-			{
-				echo $data;
-			}
-
-			// we can write the gzip data as soon as we get it
-			if ($this->format === 'gzip')
-			{
-				if ($this->run_comp)
-				{
-					echo gzencode($data);
-				}
-				else
-				{
-					ob_flush();
-					flush();
-				}
-			}
-		}
-	}
-}
-
-/**
-* @package acp
-*/
-class mysql_extractor extends base_extractor
-{
-	function write_start()
-	{
-		$sql_data = "#\n";
-		$sql_data .= "# phpBB Backup Script\n";
-		$sql_data .= "# Dump of tables for " . phpbb::$base_config['table_prefix'] . "\n";
-		$sql_data .= "# DATE : " . gmdate("d-m-Y H:i:s", $this->time) . " GMT\n";
-		$sql_data .= "#\n";
-		$this->flush($sql_data);
-	}
-
-	function write_table($table_name)
-	{
-		$sql = 'SHOW CREATE TABLE ' . $table_name;
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-
-		$sql_data = '# Table: ' . $table_name . "\n";
-		$sql_data .= "DROP TABLE IF EXISTS $table_name;\n";
-		$this->flush($sql_data . $row['Create Table'] . ";\n\n");
-
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	function write_data($table_name)
-	{
-		if (phpbb::$db->sql_layer === 'mysqli')
-		{
-			$this->write_data_mysqli($table_name);
-		}
-		else
-		{
-			$this->write_data_mysql($table_name);
-		}
-	}
-
-	function write_data_mysqli($table_name)
-	{
-		$sql = "SELECT *
-			FROM $table_name";
-		$result = mysqli_query(phpbb::$db->db_connect_id, $sql, MYSQLI_USE_RESULT);
-		if ($result != false)
-		{
-			$fields_cnt = mysqli_num_fields($result);
-
-			// Get field information
-			$field = mysqli_fetch_fields($result);
-			$field_set = array();
-
-			for ($j = 0; $j < $fields_cnt; $j++)
-			{
-				$field_set[] = $field[$j]->name;
-			}
-
-			$search			= array("\\", "'", "\x00", "\x0a", "\x0d", "\x1a", '"');
-			$replace		= array("\\\\", "\\'", '\0', '\n', '\r', '\Z', '\\"');
-			$fields			= implode(', ', $field_set);
-			$sql_data		= 'INSERT INTO ' . $table_name . ' (' . $fields . ') VALUES ';
-			$first_set		= true;
-			$query_len		= 0;
-			$max_len		= get_usable_memory();
-
-			while ($row = mysqli_fetch_row($result))
-			{
-				$values	= array();
-				if ($first_set)
-				{
-					$query = $sql_data . '(';
-				}
-				else
-				{
-					$query  .= ',(';
-				}
-
-				for ($j = 0; $j < $fields_cnt; $j++)
-				{
-					if (!isset($row[$j]) || is_null($row[$j]))
-					{
-						$values[$j] = 'NULL';
-					}
-					else if (($field[$j]->flags & 32768) && !($field[$j]->flags & 1024))
-					{
-						$values[$j] = $row[$j];
-					}
-					else
-					{
-						$values[$j] = "'" . str_replace($search, $replace, $row[$j]) . "'";
-					}
-				}
-				$query .= implode(', ', $values) . ')';
-
-				$query_len += strlen($query);
-				if ($query_len > $max_len)
-				{
-					$this->flush($query . ";\n\n");
-					$query = '';
-					$query_len = 0;
-					$first_set = true;
-				}
-				else
-				{
-					$first_set = false;
-				}
-			}
-			mysqli_free_result($result);
-
-			// check to make sure we have nothing left to flush
-			if (!$first_set && $query)
-			{
-				$this->flush($query . ";\n\n");
-			}
-		}
-	}
-
-	function write_data_mysql($table_name)
-	{
-		$sql = "SELECT *
-			FROM $table_name";
-		$result = mysql_unbuffered_query($sql, phpbb::$db->db_connect_id);
-
-		if ($result != false)
-		{
-			$fields_cnt = mysql_num_fields($result);
-
-			// Get field information
-			$field = array();
-			for ($i = 0; $i < $fields_cnt; $i++)
-			{
-				$field[] = mysql_fetch_field($result, $i);
-			}
-			$field_set = array();
-
-			for ($j = 0; $j < $fields_cnt; $j++)
-			{
-				$field_set[] = $field[$j]->name;
-			}
-
-			$search			= array("\\", "'", "\x00", "\x0a", "\x0d", "\x1a", '"');
-			$replace		= array("\\\\", "\\'", '\0', '\n', '\r', '\Z', '\\"');
-			$fields			= implode(', ', $field_set);
-			$sql_data		= 'INSERT INTO ' . $table_name . ' (' . $fields . ') VALUES ';
-			$first_set		= true;
-			$query_len		= 0;
-			$max_len		= get_usable_memory();
-
-			while ($row = mysql_fetch_row($result))
-			{
-				$values = array();
-				if ($first_set)
-				{
-					$query = $sql_data . '(';
-				}
-				else
-				{
-					$query  .= ',(';
-				}
-
-				for ($j = 0; $j < $fields_cnt; $j++)
-				{
-					if (!isset($row[$j]) || is_null($row[$j]))
-					{
-						$values[$j] = 'NULL';
-					}
-					else if ($field[$j]->numeric && ($field[$j]->type !== 'timestamp'))
-					{
-						$values[$j] = $row[$j];
-					}
-					else
-					{
-						$values[$j] = "'" . str_replace($search, $replace, $row[$j]) . "'";
-					}
-				}
-				$query .= implode(', ', $values) . ')';
-
-				$query_len += strlen($query);
-				if ($query_len > $max_len)
-				{
-					$this->flush($query . ";\n\n");
-					$query = '';
-					$query_len = 0;
-					$first_set = true;
-				}
-				else
-				{
-					$first_set = false;
-				}
-			}
-			mysql_free_result($result);
-
-			// check to make sure we have nothing left to flush
-			if (!$first_set && $query)
-			{
-				$this->flush($query . ";\n\n");
-			}
-		}
-	}
-}
-
-/**
-* @package acp
-*/
-class sqlite_extractor extends base_extractor
-{
-	function write_start($prefix)
-	{
-		$sql_data = "--\n";
-		$sql_data .= "-- phpBB Backup Script\n";
-		$sql_data .= "-- Dump of tables for $prefix\n";
-		$sql_data .= "-- DATE : " . gmdate("d-m-Y H:i:s", $this->time) . " GMT\n";
-		$sql_data .= "--\n";
-		$sql_data .= "BEGIN TRANSACTION;\n";
-		$this->flush($sql_data);
-	}
-
-	function write_table($table_name)
-	{
-		$sql_data = '-- Table: ' . $table_name . "\n";
-		$sql_data .= "DROP TABLE $table_name;\n";
-
-		$sql = "SELECT sql
-			FROM sqlite_master
-			WHERE type = 'table'
-				AND name = '" . phpbb::$db->sql_escape($table_name) . "'
-			ORDER BY type DESC, name;";
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		// Create Table
-		$sql_data .= $row['sql'] . ";\n";
-
-		$result = phpbb::$db->sql_query("PRAGMA index_list('" . phpbb::$db->sql_escape($table_name) . "');");
-
-		$ar = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$ar[] = $row;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		foreach ($ar as $value)
-		{
-			if (strpos($value['name'], 'autoindex') !== false)
-			{
-				continue;
-			}
-
-			$result = phpbb::$db->sql_query("PRAGMA index_info('" . phpbb::$db->sql_escape($value['name']) . "');");
-
-			$fields = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$fields[] = $row['name'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			$sql_data .= 'CREATE ' . ($value['unique'] ? 'UNIQUE ' : '') . 'INDEX ' . $value['name'] . ' on ' . $table_name . ' (' . implode(', ', $fields) . ");\n";
-		}
-
-		$this->flush($sql_data . "\n");
-	}
-
-	function write_data($table_name)
-	{
-		static $proper;
-
-		if (is_null($proper))
-		{
-			$proper = version_compare(PHP_VERSION, '5.1.3', '>=');
-		}
-
-		if ($proper)
-		{
-			$col_types = sqlite_fetch_column_types(phpbb::$db->db_connect_id, $table_name);
-		}
-		else
-		{
-			$sql = "SELECT sql
-				FROM sqlite_master
-				WHERE type = 'table'
-					AND name = '" . $table_name . "'";
-			$table_data = sqlite_single_query(phpbb::$db->db_connect_id, $sql);
-			$table_data = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', '', $table_data);
-			$table_data = trim($table_data);
-
-			preg_match('#\((.*)\)#s', $table_data, $matches);
-
-			$table_cols = explode(',', trim($matches[1]));
-			foreach ($table_cols as $declaration)
-			{
-				$entities = preg_split('#\s+#', trim($declaration));
-				$column_name = preg_replace('/"?([^"]+)"?/', '\1', $entities[0]);
-
-				// Hit a primary key, those are not what we need :D
-				if (empty($entities[1]) || (strtolower($entities[0]) === 'primary' && strtolower($entities[1]) === 'key'))
-				{
-					continue;
-				}
-				$col_types[$column_name] = $entities[1];
-			}
-		}
-
-		$sql = "SELECT *
-			FROM $table_name";
-		$result = sqlite_unbuffered_query(phpbb::$db->db_connect_id, $sql);
-		$rows = sqlite_fetch_all($result, SQLITE_ASSOC);
-		$sql_insert = 'INSERT INTO ' . $table_name . ' (' . implode(', ', array_keys($col_types)) . ') VALUES (';
-		foreach ($rows as $row)
-		{
-			foreach ($row as $column_name => $column_data)
-			{
-				if (is_null($column_data))
-				{
-					$row[$column_name] = 'NULL';
-				}
-				else if ($column_data == '')
-				{
-					$row[$column_name] = "''";
-				}
-				else if (strpos($col_types[$column_name], 'text') !== false || strpos($col_types[$column_name], 'char') !== false || strpos($col_types[$column_name], 'blob') !== false)
-				{
-					$row[$column_name] = sanitize_data_generic(str_replace("'", "''", $column_data));
-				}
-			}
-			$this->flush($sql_insert . implode(', ', $row) . ");\n");
-		}
-	}
-
-	function write_end()
-	{
-		$this->flush("COMMIT;\n");
-		parent::write_end();
-	}
-}
-
-/**
-* @package acp
-*/
-class postgres_extractor extends base_extractor
-{
-	function write_start($prefix)
-	{
-		$sql_data = "--\n";
-		$sql_data .= "-- phpBB Backup Script\n";
-		$sql_data .= "-- Dump of tables for $prefix\n";
-		$sql_data .= "-- DATE : " . gmdate("d-m-Y H:i:s", $this->time) . " GMT\n";
-		$sql_data .= "--\n";
-		$sql_data .= "BEGIN TRANSACTION;\n";
-		$this->flush($sql_data);
-	}
-
-	function write_table($table_name)
-	{
-		static $domains_created = array();
-
-		$sql = "SELECT a.domain_name, a.data_type, a.character_maximum_length, a.domain_default
-			FROM INFORMATION_SCHEMA.domains a, INFORMATION_SCHEMA.column_domain_usage b
-			WHERE a.domain_name = b.domain_name
-				AND b.table_name = '{$table_name}'";
-		$result = phpbb::$db->sql_query($sql);
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			if (empty($domains_created[$row['domain_name']]))
-			{
-				$domains_created[$row['domain_name']] = true;
-				//$sql_data = "DROP DOMAIN {$row['domain_name']};\n";
-				$sql_data = "CREATE DOMAIN {$row['domain_name']} as {$row['data_type']}";
-				if (!empty($row['character_maximum_length']))
-				{
-					$sql_data .= '(' . $row['character_maximum_length'] . ')';
-				}
-				$sql_data .= ' NOT NULL';
-				if (!empty($row['domain_default']))
-				{
-					$sql_data .= ' DEFAULT ' . $row['domain_default'];
-				}
-				$this->flush($sql_data . ";\n");
-			}
-		}
-
-		$sql_data = '-- Table: ' . $table_name . "\n";
-		$sql_data .= "DROP TABLE $table_name;\n";
-		// PGSQL does not "tightly" bind sequences and tables, we must guess...
-		$sql = "SELECT relname
-			FROM pg_class
-			WHERE relkind = 'S'
-				AND relname = '{$table_name}_seq'";
-		$result = phpbb::$db->sql_query($sql);
-		// We don't even care about storing the results. We already know the answer if we get rows back.
-		if (phpbb::$db->sql_fetchrow($result))
-		{
-			$sql_data .= "DROP SEQUENCE {$table_name}_seq;\n";
-			$sql_data .= "CREATE SEQUENCE {$table_name}_seq;\n";
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$field_query = "SELECT a.attnum, a.attname as field, t.typname as type, a.attlen as length, a.atttypmod as lengthvar, a.attnotnull as notnull
-			FROM pg_class c, pg_attribute a, pg_type t
-			WHERE c.relname = '" . phpbb::$db->sql_escape($table_name) . "'
-				AND a.attnum > 0
-				AND a.attrelid = c.oid
-				AND a.atttypid = t.oid
-			ORDER BY a.attnum";
-		$result = phpbb::$db->sql_query($field_query);
-
-		$sql_data .= "CREATE TABLE $table_name(\n";
-		$lines = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			// Get the data from the table
-			$sql_get_default = "SELECT pg_get_expr(d.adbin, d.adrelid) as rowdefault
-				FROM pg_attrdef d, pg_class c
-				WHERE (c.relname = '" . phpbb::$db->sql_escape($table_name) . "')
-					AND (c.oid = d.adrelid)
-					AND d.adnum = " . $row['attnum'];
-			$def_res = phpbb::$db->sql_query($sql_get_default);
-
-			if (!$def_res)
-			{
-				unset($row['rowdefault']);
-			}
-			else
-			{
-				$row['rowdefault'] = phpbb::$db->sql_fetchfield('rowdefault', $def_res);
-			}
-			phpbb::$db->sql_freeresult($def_res);
-
-			if ($row['type'] == 'bpchar')
-			{
-				// Internally stored as bpchar, but isn't accepted in a CREATE TABLE statement.
-				$row['type'] = 'char';
-			}
-
-			$line = '  ' . $row['field'] . ' ' . $row['type'];
-
-			if (strpos($row['type'], 'char') !== false)
-			{
-				if ($row['lengthvar'] > 0)
-				{
-					$line .= '(' . ($row['lengthvar'] - 4) . ')';
-				}
-			}
-
-			if (strpos($row['type'], 'numeric') !== false)
-			{
-				$line .= '(';
-				$line .= sprintf("%s,%s", (($row['lengthvar'] >> 16) & 0xffff), (($row['lengthvar'] - 4) & 0xffff));
-				$line .= ')';
-			}
-
-			if (isset($row['rowdefault']))
-			{
-				$line .= ' DEFAULT ' . $row['rowdefault'];
-			}
-
-			if ($row['notnull'] == 't')
-			{
-				$line .= ' NOT NULL';
-			}
-
-			$lines[] = $line;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-
-		// Get the listing of primary keys.
-		$sql_pri_keys = "SELECT ic.relname as index_name, bc.relname as tab_name, ta.attname as column_name, i.indisunique as unique_key, i.indisprimary as primary_key
-			FROM pg_class bc, pg_class ic, pg_index i, pg_attribute ta, pg_attribute ia
-			WHERE (bc.oid = i.indrelid)
-				AND (ic.oid = i.indexrelid)
-				AND (ia.attrelid = i.indexrelid)
-				AND	(ta.attrelid = bc.oid)
-				AND (bc.relname = '" . phpbb::$db->sql_escape($table_name) . "')
-				AND (ta.attrelid = i.indrelid)
-				AND (ta.attnum = i.indkey[ia.attnum-1])
-			ORDER BY index_name, tab_name, column_name";
-
-		$result = phpbb::$db->sql_query($sql_pri_keys);
-
-		$index_create = $index_rows = $primary_key = array();
-
-		// We do this in two steps. It makes placing the comma easier
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			if ($row['primary_key'] == 't')
-			{
-				$primary_key[] = $row['column_name'];
-				$primary_key_name = $row['index_name'];
-			}
-			else
-			{
-				// We have to store this all this info because it is possible to have a multi-column key...
-				// we can loop through it again and build the statement
-				$index_rows[$row['index_name']]['table'] = $table_name;
-				$index_rows[$row['index_name']]['unique'] = ($row['unique_key'] == 't') ? true : false;
-				$index_rows[$row['index_name']]['column_names'][] = $row['column_name'];
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if (!empty($index_rows))
-		{
-			foreach ($index_rows as $idx_name => $props)
-			{
-				$index_create[] = 'CREATE ' . ($props['unique'] ? 'UNIQUE ' : '') . "INDEX $idx_name ON $table_name (" . implode(', ', $props['column_names']) . ");";
-			}
-		}
-
-		if (!empty($primary_key))
-		{
-			$lines[] = "  CONSTRAINT $primary_key_name PRIMARY KEY (" . implode(', ', $primary_key) . ")";
-		}
-
-		// Generate constraint clauses for CHECK constraints
-		$sql_checks = "SELECT conname as index_name, consrc
-			FROM pg_constraint, pg_class bc
-			WHERE conrelid = bc.oid
-				AND bc.relname = '" . phpbb::$db->sql_escape($table_name) . "'
-				AND NOT EXISTS (
-					SELECT *
-						FROM pg_constraint as c, pg_inherits as i
-						WHERE i.inhrelid = pg_constraint.conrelid
-							AND c.conname = pg_constraint.conname
-							AND c.consrc = pg_constraint.consrc
-							AND c.conrelid = i.inhparent
-				)";
-		$result = phpbb::$db->sql_query($sql_checks);
-
-		// Add the constraints to the sql file.
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			if (!is_null($row['consrc']))
-			{
-				$lines[] = '  CONSTRAINT ' . $row['index_name'] . ' CHECK ' . $row['consrc'];
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$sql_data .= implode(", \n", $lines);
-		$sql_data .= "\n);\n";
-
-		if (!empty($index_create))
-		{
-			$sql_data .= implode("\n", $index_create) . "\n\n";
-		}
-		$this->flush($sql_data);
-	}
-
-	function write_data($table_name)
-	{
-		// Grab all of the data from current table.
-		$sql = "SELECT *
-			FROM $table_name";
-		$result = phpbb::$db->sql_query($sql);
-
-		$i_num_fields = pg_num_fields($result);
-		$seq = '';
-
-		for ($i = 0; $i < $i_num_fields; $i++)
-		{
-			$ary_type[] = pg_field_type($result, $i);
-			$ary_name[] = pg_field_name($result, $i);
-
-
-			$sql = "SELECT pg_get_expr(d.adbin, d.adrelid) as rowdefault
-				FROM pg_attrdef d, pg_class c
-				WHERE (c.relname = '{$table_name}')
-					AND (c.oid = d.adrelid)
-					AND d.adnum = " . strval($i + 1);
-			$result2 = phpbb::$db->sql_query($sql);
-			if ($row = phpbb::$db->sql_fetchrow($result2))
-			{
-				// Determine if we must reset the sequences
-				if (strpos($row['rowdefault'], "nextval('") === 0)
-				{
-					$seq .= "SELECT SETVAL('{$table_name}_seq',(select case when max({$ary_name[$i]})>0 then max({$ary_name[$i]})+1 else 1 end FROM {$table_name}));\n";
-				}
-			}
-		}
-
-		$this->flush("COPY $table_name (" . implode(', ', $ary_name) . ') FROM stdin;' . "\n");
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$schema_vals = array();
-
-			// Build the SQL statement to recreate the data.
-			for ($i = 0; $i < $i_num_fields; $i++)
-			{
-				$str_val = $row[$ary_name[$i]];
-
-				if (preg_match('#char|text|bool|bytea#i', $ary_type[$i]))
-				{
-					$str_val = str_replace(array("\n", "\t", "\r", "\b", "\f", "\v"), array('\n', '\t', '\r', '\b', '\f', '\v'), addslashes($str_val));
-					$str_empty = '';
-				}
-				else
-				{
-					$str_empty = '\N';
-				}
-
-				if (empty($str_val) && $str_val !== '0')
-				{
-					$str_val = $str_empty;
-				}
-
-				$schema_vals[] = $str_val;
-			}
-
-			// Take the ordered fields and their associated data and build it
-			// into a valid sql statement to recreate that field in the data.
-			$this->flush(implode("\t", $schema_vals) . "\n");
-		}
-		phpbb::$db->sql_freeresult($result);
-		$this->flush("\\.\n");
-
-		// Write out the sequence statements
-		$this->flush($seq);
-	}
-
-	function write_end()
-	{
-		$this->flush("COMMIT;\n");
-		parent::write_end();
-	}
-}
-
-/**
-* @package acp
-*/
-class mssql_extractor extends base_extractor
-{
-	function write_end()
-	{
-		$this->flush("COMMIT\nGO\n");
-		parent::write_end();
-	}
-
-	function write_start($prefix)
-	{
-		$sql_data = "--\n";
-		$sql_data .= "-- phpBB Backup Script\n";
-		$sql_data .= "-- Dump of tables for $prefix\n";
-		$sql_data .= "-- DATE : " . gmdate("d-m-Y H:i:s", $this->time) . " GMT\n";
-		$sql_data .= "--\n";
-		$sql_data .= "BEGIN TRANSACTION\n";
-		$sql_data .= "GO\n";
-		$this->flush($sql_data);
-	}
-
-	function write_table($table_name)
-	{
-		$sql_data = '-- Table: ' . $table_name . "\n";
-		$sql_data .= "IF OBJECT_ID(N'$table_name', N'U') IS NOT NULL\n";
-		$sql_data .= "DROP TABLE $table_name;\n";
-		$sql_data .= "GO\n";
-		$sql_data .= "\nCREATE TABLE [$table_name] (\n";
-		$rows = array();
-
-		$text_flag = false;
-
-		$sql = "SELECT COLUMN_NAME, COLUMN_DEFAULT, IS_NULLABLE, DATA_TYPE, CHARACTER_MAXIMUM_LENGTH, COLUMNPROPERTY(object_id(TABLE_NAME), COLUMN_NAME, 'IsIdentity') as IS_IDENTITY
-			FROM INFORMATION_SCHEMA.COLUMNS
-			WHERE TABLE_NAME = '$table_name'";
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$line = "\t[{$row['COLUMN_NAME']}] [{$row['DATA_TYPE']}]";
-
-			if ($row['DATA_TYPE'] == 'text')
-			{
-				$text_flag = true;
-			}
-
-			if ($row['IS_IDENTITY'])
-			{
-				$line .= ' IDENTITY (1 , 1)';
-			}
-
-			if ($row['CHARACTER_MAXIMUM_LENGTH'] && $row['DATA_TYPE'] !== 'text')
-			{
-				$line .= ' (' . $row['CHARACTER_MAXIMUM_LENGTH'] . ')';
-			}
-
-			if ($row['IS_NULLABLE'] == 'YES')
-			{
-				$line .= ' NULL';
-			}
-			else
-			{
-				$line .= ' NOT NULL';
-			}
-
-			if ($row['COLUMN_DEFAULT'])
-			{
-				$line .= ' DEFAULT ' . $row['COLUMN_DEFAULT'];
-			}
-
-			$rows[] = $line;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$sql_data .= implode(",\n", $rows);
-		$sql_data .= "\n) ON [PRIMARY]";
-
-		if ($text_flag)
-		{
-			$sql_data .= " TEXTIMAGE_ON [PRIMARY]";
-		}
-
-		$sql_data .= "\nGO\n\n";
-		$rows = array();
-
-		$sql = "SELECT CONSTRAINT_NAME, COLUMN_NAME
-			FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE
-			WHERE TABLE_NAME = '$table_name'";
-		$result = phpbb::$db->sql_query($sql);
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			if (!sizeof($rows))
-			{
-				$sql_data .= "ALTER TABLE [$table_name] WITH NOCHECK ADD\n";
-				$sql_data .= "\tCONSTRAINT [{$row['CONSTRAINT_NAME']}] PRIMARY KEY  CLUSTERED \n\t(\n";
-			}
-			$rows[] = "\t\t[{$row['COLUMN_NAME']}]";
-		}
-		if (sizeof($rows))
-		{
-			$sql_data .= implode(",\n", $rows);
-			$sql_data .= "\n\t)  ON [PRIMARY] \nGO\n";
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$index = array();
-		$sql = "EXEC sp_statistics '$table_name'";
-		$result = phpbb::$db->sql_query($sql);
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			if ($row['TYPE'] == 3)
-			{
-				$index[$row['INDEX_NAME']][] = '[' . $row['COLUMN_NAME'] . ']';
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		foreach ($index as $index_name => $column_name)
-		{
-			$index[$index_name] = implode(', ', $column_name);
-		}
-
-		foreach ($index as $index_name => $columns)
-		{
-			$sql_data .= "\nCREATE  INDEX [$index_name] ON [$table_name]($columns) ON [PRIMARY]\nGO\n";
-		}
-		$this->flush($sql_data);
-	}
-
-	function write_data($table_name)
-	{
-		if (phpbb::$db->sql_layer === 'mssql')
-		{
-			$this->write_data_mssql($table_name);
-		}
-		else if (phpbb::$db->sql_layer === 'mssql_odbc')
-		{
-			$this->write_data_odbc($table_name);
-		}
-		else
-		{
-			// @todo: write code for MS SQL 2005 DBAL
-			trigger_error('KungFuDeathGrip');
-		}
-	}
-
-	function write_data_mssql($table_name)
-	{
-		$ary_type = $ary_name = array();
-		$ident_set = false;
-		$sql_data = '';
-
-		// Grab all of the data from current table.
-		$sql = "SELECT *
-			FROM $table_name";
-		$result = phpbb::$db->sql_query($sql);
-
-		$retrieved_data = mssql_num_rows($result);
-
-		$i_num_fields = mssql_num_fields($result);
-
-		for ($i = 0; $i < $i_num_fields; $i++)
-		{
-			$ary_type[$i] = mssql_field_type($result, $i);
-			$ary_name[$i] = mssql_field_name($result, $i);
-		}
-
-		if ($retrieved_data)
-		{
-			$sql = "SELECT 1 as has_identity
-				FROM INFORMATION_SCHEMA.COLUMNS
-				WHERE COLUMNPROPERTY(object_id('$table_name'), COLUMN_NAME, 'IsIdentity') = 1";
-			$result2 = phpbb::$db->sql_query($sql);
-			$row2 = phpbb::$db->sql_fetchrow($result2);
-			if (!empty($row2['has_identity']))
-			{
-				$sql_data .= "\nSET IDENTITY_INSERT $table_name ON\nGO\n";
-				$ident_set = true;
-			}
-			phpbb::$db->sql_freeresult($result2);
-		}
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$schema_vals = $schema_fields = array();
-
-			// Build the SQL statement to recreate the data.
-			for ($i = 0; $i < $i_num_fields; $i++)
-			{
-				$str_val = $row[$ary_name[$i]];
-
-				if (preg_match('#char|text|bool|varbinary#i', $ary_type[$i]))
-				{
-					$str_quote = '';
-					$str_empty = "''";
-					$str_val = sanitize_data_mssql(str_replace("'", "''", $str_val));
-				}
-				else if (preg_match('#date|timestamp#i', $ary_type[$i]))
-				{
-					if (empty($str_val))
-					{
-						$str_quote = '';
-					}
-					else
-					{
-						$str_quote = "'";
-					}
-				}
-				else
-				{
-					$str_quote = '';
-					$str_empty = 'NULL';
-				}
-
-				if (empty($str_val) && $str_val !== '0' && !(is_int($str_val) || is_float($str_val)))
-				{
-					$str_val = $str_empty;
-				}
-
-				$schema_vals[$i] = $str_quote . $str_val . $str_quote;
-				$schema_fields[$i] = $ary_name[$i];
-			}
-
-			// Take the ordered fields and their associated data and build it
-			// into a valid sql statement to recreate that field in the data.
-			$sql_data .= "INSERT INTO $table_name (" . implode(', ', $schema_fields) . ') VALUES (' . implode(', ', $schema_vals) . ");\nGO\n";
-
-			$this->flush($sql_data);
-			$sql_data = '';
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if ($retrieved_data && $ident_set)
-		{
-			$sql_data .= "\nSET IDENTITY_INSERT $table_name OFF\nGO\n";
-		}
-		$this->flush($sql_data);
-	}
-
-	function write_data_odbc($table_name)
-	{
-		$ary_type = $ary_name = array();
-		$ident_set = false;
-		$sql_data = '';
-
-		// Grab all of the data from current table.
-		$sql = "SELECT *
-			FROM $table_name";
-		$result = phpbb::$db->sql_query($sql);
-
-		$retrieved_data = odbc_num_rows($result);
-
-		if ($retrieved_data)
-		{
-			$sql = "SELECT 1 as has_identity
-				FROM INFORMATION_SCHEMA.COLUMNS
-				WHERE COLUMNPROPERTY(object_id('$table_name'), COLUMN_NAME, 'IsIdentity') = 1";
-			$result2 = phpbb::$db->sql_query($sql);
-			$row2 = phpbb::$db->sql_fetchrow($result2);
-			if (!empty($row2['has_identity']))
-			{
-				$sql_data .= "\nSET IDENTITY_INSERT $table_name ON\nGO\n";
-				$ident_set = true;
-			}
-			phpbb::$db->sql_freeresult($result2);
-		}
-
-		$i_num_fields = odbc_num_fields($result);
-
-		for ($i = 0; $i < $i_num_fields; $i++)
-		{
-			$ary_type[$i] = odbc_field_type($result, $i + 1);
-			$ary_name[$i] = odbc_field_name($result, $i + 1);
-		}
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$schema_vals = $schema_fields = array();
-
-			// Build the SQL statement to recreate the data.
-			for ($i = 0; $i < $i_num_fields; $i++)
-			{
-				$str_val = $row[$ary_name[$i]];
-
-				if (preg_match('#char|text|bool|varbinary#i', $ary_type[$i]))
-				{
-					$str_quote = '';
-					$str_empty = "''";
-					$str_val = sanitize_data_mssql(str_replace("'", "''", $str_val));
-				}
-				else if (preg_match('#date|timestamp#i', $ary_type[$i]))
-				{
-					if (empty($str_val))
-					{
-						$str_quote = '';
-					}
-					else
-					{
-						$str_quote = "'";
-					}
-				}
-				else
-				{
-					$str_quote = '';
-					$str_empty = 'NULL';
-				}
-
-				if (empty($str_val) && $str_val !== '0' && !(is_int($str_val) || is_float($str_val)))
-				{
-					$str_val = $str_empty;
-				}
-
-				$schema_vals[$i] = $str_quote . $str_val . $str_quote;
-				$schema_fields[$i] = $ary_name[$i];
-			}
-
-			// Take the ordered fields and their associated data and build it
-			// into a valid sql statement to recreate that field in the data.
-			$sql_data .= "INSERT INTO $table_name (" . implode(', ', $schema_fields) . ') VALUES (' . implode(', ', $schema_vals) . ");\nGO\n";
-
-			$this->flush($sql_data);
-
-			$sql_data = '';
-
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if ($retrieved_data && $ident_set)
-		{
-			$sql_data .= "\nSET IDENTITY_INSERT $table_name OFF\nGO\n";
-		}
-		$this->flush($sql_data);
-	}
-
-}
-
-/**
-* @package acp
-*/
-class db2_extractor extends base_extractor
-{
-	function write_start($prefix)
-	{
-		$sql_data = "--\n";
-		$sql_data .= "-- phpBB Backup Script\n";
-		$sql_data .= "-- Dump of tables for $prefix\n";
-		$sql_data .= "-- DATE : " . gmdate("d-m-Y H:i:s", $this->time) . " GMT\n";
-		$sql_data .= "--\n";
-		$this->flush($sql_data);
-	}
-
-	function write_table($table_name)
-	{
-		$sql_data = '-- Table: ' . $table_name . "\n";
-		$sql_data .= "\nCREATE TABLE $table_name (\n";
-		$rows = array();
-
-		// switch to db2_columns()?
-		$sql = "SELECT colname, typename, length, default, identity, nulls
-			FROM syscat.columns
-			WHERE tabname = '$table_name'";
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$line = "\t{$row['colname']} {$row['typename']}";
-
-			if ($row['identity'] == 'Y')
-			{
-				$line .= ' GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1)';
-			}
-
-			if ($row['typename'] == 'VARCHAR' || $row['typename'] == 'CHARACTER' || $row['typename'] == 'CLOB')
-			{
-				$line .= ' (' . $row['length'] . ')';
-			}
-
-			if ($row['nulls'] == 'N')
-			{
-				$line .= ' NOT NULL';
-			}
-			else
-			{
-				$line .= ' NULL';
-			}
-
-			if ($row['default'] !== null)
-			{
-				$line .= ' DEFAULT ' . $row['default'];
-			}
-
-			$rows[] = $line;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// switch to db2_columns()?
-		$sql = "SELECT colname
-			FROM SYSCAT.KEYCOLUSE
-			WHERE tabname = '$table_name'";
-		$result = phpbb::$db->sql_query($sql);
-		$prim_cols = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$prim_cols[] = $row['colname'];
-		}
-		phpbb::$db->sql_freeresult($result);
-		if (sizeof($prim_cols))
-		{
-			$rows[] = "\tPRIMARY KEY (" . implode($prim_cols) . ')';
-		}
-
-		$sql_data .= implode(",\n", $rows);
-		$sql_data .= "\n);\n\n";
-		$rows = array();
-
-		$sql = "SELECT colnames, indname
-			FROM SYSCAT.INDEXES
-			WHERE TABNAME = '$table_name'
-				AND UNIQUERULE <> 'P'";
-		$result = phpbb::$db->sql_query($sql);
-		$index = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$inds = explode('+', $row['colnames']);
-			unset($inds[0]);
-			$sql_data .= 'CREATE INDEX ' . $row['indname'] . ' ON ' . $table_name . ' (' . implode(', ', $inds) . ") PCTFREE 10 MINPCTUSED 10 ALLOW REVERSE SCANS  PAGE SPLIT SYMMETRIC COLLECT  SAMPLED DETAILED  STATISTICS;\n";
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$this->flush($sql_data);
-	}
-
-	function write_data($table_name)
-	{
-		$ary_type = $ary_name = array();
-		$result = db2_columns(phpbb::$db->db_connect_id, '', '%', $table_name);
-		$i = 0;
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$ary_type[$i] = $row['type_name'];
-			$ary_name[$i++] = strtolower($row['column_name']);
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// Grab all of the data from current table.
-		$sql = "SELECT *
-			FROM $table_name";
-		$result = phpbb::$db->sql_query($sql);
-
-		$sql_data = '';
-		$i_num_fields = $i;
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$schema_vals = $schema_fields = array();
-
-			// Build the SQL statement to recreate the data.
-			for ($i = 0; $i < $i_num_fields; $i++)
-			{
-				$str_val = $row[$ary_name[$i]];
-
-				if (preg_match('#char|clob#i', $ary_type[$i]))
-				{
-					$str_quote = "'";
-					$str_empty = '';
-					$str_val = sanitize_data_generic(str_replace("'", "''", $str_val));
-				}
-				else if (preg_match('#date|timestamp#i', $ary_type[$i]))
-				{
-					if (empty($str_val))
-					{
-						$str_quote = '';
-					}
-					else
-					{
-						$str_quote = "'";
-					}
-				}
-				else
-				{
-					$str_quote = '';
-					$str_empty = 'NULL';
-				}
-
-				if (empty($str_val) && $str_val !== '0')
-				{
-					$str_val = $str_empty;
-				}
-
-				$schema_vals[$i] = $str_quote . $str_val . $str_quote;
-				$schema_fields[$i] = '"' . $ary_name[$i] . "'";
-			}
-
-			// Take the ordered fields and their associated data and build it
-			// into a valid sql statement to recreate that field in the data.
-			$sql_data = "INSERT INTO $table_name (" . implode(', ', $schema_fields) . ') VALUES (' . implode(', ', $schema_vals) . ");\n";
-
-			$this->flush($sql_data);
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-}
-
-/**
-* @package acp
-*/
-class oracle_extractor extends base_extractor
-{
-	function write_table($table_name)
-	{
-		$sql_data = '-- Table: ' . $table_name . "\n";
-		$sql_data .= "DROP TABLE $table_name;\n";
-		$sql_data .= '\\' . "\n";
-		$sql_data .= "\nCREATE TABLE $table_name (\n";
-
-		$sql = "SELECT COLUMN_NAME, DATA_TYPE, DATA_PRECISION, DATA_LENGTH, NULLABLE, DATA_DEFAULT
-			FROM ALL_TAB_COLS
-			WHERE table_name = '{$table_name}'";
-		$result = phpbb::$db->sql_query($sql);
-
-		$rows = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$line = '  "' . $row['column_name'] . '" ' . $row['data_type'];
-
-			if ($row['data_type'] !== 'CLOB')
-			{
-				if ($row['data_type'] !== 'VARCHAR2')
-				{
-					$line .= '(' . $row['data_precision'] . ')';
-				}
-				else
-				{
-					$line .= '(' . $row['data_length'] . ')';
-				}
-			}
-
-			if (!empty($row['data_default']))
-			{
-				$line .= ' DEFAULT ' . $row['data_default'];
-			}
-
-			if ($row['nullable'] == 'N')
-			{
-				$line .= ' NOT NULL';
-			}
-			$rows[] = $line;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$sql = "SELECT A.CONSTRAINT_NAME, A.COLUMN_NAME
-			FROM USER_CONS_COLUMNS A, USER_CONSTRAINTS B
-			WHERE A.CONSTRAINT_NAME = B.CONSTRAINT_NAME
-				AND B.CONSTRAINT_TYPE = 'P'
-				AND A.TABLE_NAME = '{$table_name}'";
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$rows[] = "  CONSTRAINT {$row['constraint_name']} PRIMARY KEY ({$row['column_name']})";
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$sql = "SELECT A.CONSTRAINT_NAME, A.COLUMN_NAME
-			FROM USER_CONS_COLUMNS A, USER_CONSTRAINTS B
-			WHERE A.CONSTRAINT_NAME = B.CONSTRAINT_NAME
-				AND B.CONSTRAINT_TYPE = 'U'
-				AND A.TABLE_NAME = '{$table_name}'";
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$rows[] = "  CONSTRAINT {$row['constraint_name']} UNIQUE ({$row['column_name']})";
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$sql_data .= implode(",\n", $rows);
-		$sql_data .= "\n)\n\\";
-
-		$sql = "SELECT A.REFERENCED_NAME
-			FROM USER_DEPENDENCIES A, USER_TRIGGERS B
-			WHERE A.REFERENCED_TYPE = 'SEQUENCE'
-				AND A.NAME = B.TRIGGER_NAME
-				AND B.TABLE_NAME = '{$table_name}'";
-		$result = phpbb::$db->sql_query($sql);
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$sql_data .= "\nCREATE SEQUENCE {$row['referenced_name']}\\\n";
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$sql = "SELECT DESCRIPTION, WHEN_CLAUSE, TRIGGER_BODY
-			FROM USER_TRIGGERS
-			WHERE TABLE_NAME = '{$table_name}'";
-		$result = phpbb::$db->sql_query($sql);
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$sql_data .= "\nCREATE OR REPLACE TRIGGER {$row['description']}WHEN ({$row['when_clause']})\n{$row['trigger_body']}\\";
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$sql = "SELECT A.INDEX_NAME, B.COLUMN_NAME
-			FROM USER_INDEXES A, USER_IND_COLUMNS B
-			WHERE A.UNIQUENESS = 'NONUNIQUE'
-				AND A.INDEX_NAME = B.INDEX_NAME
-				AND B.TABLE_NAME = '{$table_name}'";
-		$result = phpbb::$db->sql_query($sql);
-
-		$index = array();
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$index[$row['index_name']][] = $row['column_name'];
-		}
-
-		foreach ($index as $index_name => $column_names)
-		{
-			$sql_data .= "\nCREATE INDEX $index_name ON $table_name(" . implode(', ', $column_names) . ")\n\\";
-		}
-		phpbb::$db->sql_freeresult($result);
-		$this->flush($sql_data);
-	}
-
-	function write_data($table_name)
-	{
-		$ary_type = $ary_name = array();
-
-		// Grab all of the data from current table.
-		$sql = "SELECT *
-			FROM $table_name";
-		$result = phpbb::$db->sql_query($sql);
-
-		$i_num_fields = ocinumcols($result);
-
-		for ($i = 0; $i < $i_num_fields; $i++)
-		{
-			$ary_type[$i] = ocicolumntype($result, $i + 1);
-			$ary_name[$i] = ocicolumnname($result, $i + 1);
-		}
-
-		$sql_data = '';
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$schema_vals = $schema_fields = array();
-
-			// Build the SQL statement to recreate the data.
-			for ($i = 0; $i < $i_num_fields; $i++)
-			{
-				$str_val = $row[$ary_name[$i]];
-
-				if (preg_match('#char|text|bool|raw#i', $ary_type[$i]))
-				{
-					$str_quote = '';
-					$str_empty = "''";
-					$str_val = sanitize_data_oracle($str_val);
-				}
-				else if (preg_match('#date|timestamp#i', $ary_type[$i]))
-				{
-					if (empty($str_val))
-					{
-						$str_quote = '';
-					}
-					else
-					{
-						$str_quote = "'";
-					}
-				}
-				else
-				{
-					$str_quote = '';
-					$str_empty = 'NULL';
-				}
-
-				if (empty($str_val) && $str_val !== '0')
-				{
-					$str_val = $str_empty;
-				}
-
-				$schema_vals[$i] = $str_quote . $str_val . $str_quote;
-				$schema_fields[$i] = '"' . $ary_name[$i] . "'";
-			}
-
-			// Take the ordered fields and their associated data and build it
-			// into a valid sql statement to recreate that field in the data.
-			$sql_data = "INSERT INTO $table_name (" . implode(', ', $schema_fields) . ') VALUES (' . implode(', ', $schema_vals) . ");\n";
-
-			$this->flush($sql_data);
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	function write_start($prefix)
-	{
-		$sql_data = "--\n";
-		$sql_data .= "-- phpBB Backup Script\n";
-		$sql_data .= "-- Dump of tables for $prefix\n";
-		$sql_data .= "-- DATE : " . gmdate("d-m-Y H:i:s", $this->time) . " GMT\n";
-		$sql_data .= "--\n";
-		$this->flush($sql_data);
-	}
-}
-
-/**
-* @package acp
-*/
-class firebird_extractor extends base_extractor
-{
-	function write_start($prefix)
-	{
-		$sql_data = "--\n";
-		$sql_data .= "-- phpBB Backup Script\n";
-		$sql_data .= "-- Dump of tables for $prefix\n";
-		$sql_data .= "-- DATE : " . gmdate("d-m-Y H:i:s", $this->time) . " GMT\n";
-		$sql_data .= "--\n";
-		$this->flush($sql_data);
-	}
-
-	function write_data($table_name)
-	{
-		$ary_type = $ary_name = array();
-
-		// Grab all of the data from current table.
-		$sql = "SELECT *
-			FROM $table_name";
-		$result = phpbb::$db->sql_query($sql);
-
-		$i_num_fields = ibase_num_fields($result);
-
-		for ($i = 0; $i < $i_num_fields; $i++)
-		{
-			$info = ibase_field_info($result, $i);
-			$ary_type[$i] = $info['type'];
-			$ary_name[$i] = $info['name'];
-		}
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$schema_vals = $schema_fields = array();
-
-			// Build the SQL statement to recreate the data.
-			for ($i = 0; $i < $i_num_fields; $i++)
-			{
-				$str_val = $row[strtolower($ary_name[$i])];
-
-				if (preg_match('#char|text|bool|varbinary|blob#i', $ary_type[$i]))
-				{
-					$str_quote = '';
-					$str_empty = "''";
-					$str_val = sanitize_data_generic(str_replace("'", "''", $str_val));
-				}
-				else if (preg_match('#date|timestamp#i', $ary_type[$i]))
-				{
-					if (empty($str_val))
-					{
-						$str_quote = '';
-					}
-					else
-					{
-						$str_quote = "'";
-					}
-				}
-				else
-				{
-					$str_quote = '';
-					$str_empty = 'NULL';
-				}
-
-				if (empty($str_val) && $str_val !== '0')
-				{
-					$str_val = $str_empty;
-				}
-
-				$schema_vals[$i] = $str_quote . $str_val . $str_quote;
-				$schema_fields[$i] = '"' . $ary_name[$i] . '"';
-			}
-
-			// Take the ordered fields and their associated data and build it
-			// into a valid sql statement to recreate that field in the data.
-			$sql_data = "INSERT INTO $table_name (" . implode(', ', $schema_fields) . ') VALUES (' . implode(', ', $schema_vals) . ");\n";
-
-			$this->flush($sql_data);
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	function write_table($table_name)
-	{
-		$sql_data = '-- Table: ' . $table_name . "\n";
-		$sql_data .= "DROP TABLE $table_name;\n";
-
-		$data_types = array(7 => 'SMALLINT', 8 => 'INTEGER', 10 => 'FLOAT', 12 => 'DATE', 13 => 'TIME', 14 => 'CHARACTER', 27 => 'DOUBLE PRECISION', 35 => 'TIMESTAMP', 37 => 'VARCHAR', 40 => 'CSTRING', 261 => 'BLOB', 701 => 'DECIMAL', 702 => 'NUMERIC');
-
-		$sql_data .= "\nCREATE TABLE $table_name (\n";
-
-		$sql = 'SELECT DISTINCT R.RDB$FIELD_NAME as FNAME, R.RDB$NULL_FLAG as NFLAG, R.RDB$DEFAULT_SOURCE as DSOURCE, F.RDB$FIELD_TYPE as FTYPE, F.RDB$FIELD_SUB_TYPE as STYPE, F.RDB$FIELD_LENGTH as FLEN
-			FROM RDB$RELATION_FIELDS R
-			JOIN RDB$FIELDS F ON R.RDB$FIELD_SOURCE=F.RDB$FIELD_NAME
-			LEFT JOIN RDB$FIELD_DIMENSIONS D ON R.RDB$FIELD_SOURCE = D.RDB$FIELD_NAME
-			WHERE F.RDB$SYSTEM_FLAG = 0
-				AND R.RDB$RELATION_NAME = \''. $table_name . '\'
-			ORDER BY R.RDB$FIELD_POSITION';
-		$result = phpbb::$db->sql_query($sql);
-
-		$rows = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$line = "\t" . '"' . $row['fname'] . '" ' . $data_types[$row['ftype']];
-
-			if ($row['ftype'] == 261 && $row['stype'] == 1)
-			{
-				$line .= ' SUB_TYPE TEXT';
-			}
-
-			if ($row['ftype'] == 37 || $row['ftype'] == 14)
-			{
-				$line .= ' (' . $row['flen'] . ')';
-			}
-
-			if (!empty($row['dsource']))
-			{
-				$line .= ' ' . $row['dsource'];
-			}
-
-			if (!empty($row['nflag']))
-			{
-				$line .= ' NOT NULL';
-			}
-			$rows[] = $line;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$sql_data .= implode(",\n", $rows);
-		$sql_data .= "\n);\n";
-		$keys = array();
-
-		$sql = 'SELECT I.RDB$FIELD_NAME as NAME
-			FROM RDB$RELATION_CONSTRAINTS RC, RDB$INDEX_SEGMENTS I, RDB$INDICES IDX
-			WHERE (I.RDB$INDEX_NAME = RC.RDB$INDEX_NAME)
-				AND (IDX.RDB$INDEX_NAME = RC.RDB$INDEX_NAME)
-				AND (RC.RDB$RELATION_NAME = \''. $table_name . '\')
-			ORDER BY I.RDB$FIELD_POSITION';
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$keys[] = $row['name'];
-		}
-
-		if (sizeof($keys))
-		{
-			$sql_data .= "\nALTER TABLE $table_name ADD PRIMARY KEY (" . implode(', ', $keys) . ');';
-		}
-
-		phpbb::$db->sql_freeresult($result);
-
-		$sql = 'SELECT I.RDB$INDEX_NAME as INAME, I.RDB$UNIQUE_FLAG as UFLAG, S.RDB$FIELD_NAME as FNAME
-			FROM RDB$INDICES I JOIN RDB$INDEX_SEGMENTS S ON S.RDB$INDEX_NAME=I.RDB$INDEX_NAME
-			WHERE (I.RDB$SYSTEM_FLAG IS NULL  OR  I.RDB$SYSTEM_FLAG=0)
-				AND I.RDB$FOREIGN_KEY IS NULL
-				AND I.RDB$RELATION_NAME = \''. $table_name . '\'
-				AND I.RDB$INDEX_NAME NOT STARTING WITH \'RDB$\'
-			ORDER BY S.RDB$FIELD_POSITION';
-		$result = phpbb::$db->sql_query($sql);
-
-		$index = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$index[$row['iname']]['unique'] = !empty($row['uflag']);
-			$index[$row['iname']]['values'][] = $row['fname'];
-		}
-
-		foreach ($index as $index_name => $data)
-		{
-			$sql_data .= "\nCREATE ";
-			if ($data['unique'])
-			{
-				$sql_data .= 'UNIQUE ';
-			}
-			$sql_data .= "INDEX $index_name ON $table_name(" . implode(', ', $data['values']) . ");";
-		}
-		$sql_data .= "\n";
-
-		phpbb::$db->sql_freeresult($result);
-
-		$sql = 'SELECT D1.RDB$DEPENDENT_NAME as DNAME, D1.RDB$FIELD_NAME as FNAME, D1.RDB$DEPENDENT_TYPE, R1.RDB$RELATION_NAME
-			FROM RDB$DEPENDENCIES D1
-			LEFT JOIN RDB$RELATIONS R1 ON ((D1.RDB$DEPENDENT_NAME = R1.RDB$RELATION_NAME) AND (NOT (R1.RDB$VIEW_BLR IS NULL)))
-			WHERE (D1.RDB$DEPENDED_ON_TYPE = 0)
-				AND (D1.RDB$DEPENDENT_TYPE <> 3)
-				AND (D1.RDB$DEPENDED_ON_NAME = \'' . $table_name . '\')
-			UNION SELECT DISTINCT F2.RDB$RELATION_NAME, D2.RDB$FIELD_NAME, D2.RDB$DEPENDENT_TYPE, R2.RDB$RELATION_NAME FROM RDB$DEPENDENCIES D2, RDB$RELATION_FIELDS F2
-			LEFT JOIN RDB$RELATIONS R2 ON ((F2.RDB$RELATION_NAME = R2.RDB$RELATION_NAME) AND (NOT (R2.RDB$VIEW_BLR IS NULL)))
-			WHERE (D2.RDB$DEPENDENT_TYPE = 3)
-				AND (D2.RDB$DEPENDENT_NAME = F2.RDB$FIELD_SOURCE)
-				AND (D2.RDB$DEPENDED_ON_NAME = \'' . $table_name . '\')
-			ORDER BY 1, 2';
-		$result = phpbb::$db->sql_query($sql);
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$sql = 'SELECT T1.RDB$DEPENDED_ON_NAME as GEN, T1.RDB$FIELD_NAME, T1.RDB$DEPENDED_ON_TYPE
-				FROM RDB$DEPENDENCIES T1
-				WHERE (T1.RDB$DEPENDENT_NAME = \'' . $row['dname'] . '\')
-					AND (T1.RDB$DEPENDENT_TYPE = 2 AND T1.RDB$DEPENDED_ON_TYPE = 14)
-				UNION ALL SELECT DISTINCT D.RDB$DEPENDED_ON_NAME, D.RDB$FIELD_NAME, D.RDB$DEPENDED_ON_TYPE
-				FROM RDB$DEPENDENCIES D, RDB$RELATION_FIELDS F
-				WHERE (D.RDB$DEPENDENT_TYPE = 3)
-					AND (D.RDB$DEPENDENT_NAME = F.RDB$FIELD_SOURCE)
-					AND (F.RDB$RELATION_NAME = \'' . $row['dname'] . '\')
-				ORDER BY 1,2';
-			$result2 = phpbb::$db->sql_query($sql);
-			$row2 = phpbb::$db->sql_fetchrow($result2);
-			phpbb::$db->sql_freeresult($result2);
-			$gen_name = $row2['gen'];
-
-			$sql_data .= "\nDROP GENERATOR " . $gen_name . ";";
-			$sql_data .= "\nSET TERM ^ ;";
-			$sql_data .= "\nCREATE GENERATOR " . $gen_name . "^";
-			$sql_data .= "\nSET GENERATOR  " . $gen_name . " TO 0^\n";
-			$sql_data .= "\nCREATE TRIGGER {$row['dname']} FOR $table_name";
-			$sql_data .= "\nBEFORE INSERT\nAS\nBEGIN";
-			$sql_data .= "\n  NEW.{$row['fname']} = GEN_ID(" . $gen_name . ", 1);";
-			$sql_data .= "\nEND^\n";
-			$sql_data .= "\nSET TERM ; ^\n";
-		}
-
-		$this->flush($sql_data);
-
-		phpbb::$db->sql_freeresult($result);
-	}
-}
-
-// get how much space we allow for a chunk of data, very similar to phpMyAdmin's way of doing things ;-) (hey, we only do this for MySQL anyway :P)
-function get_usable_memory()
-{
-	$val = trim(@ini_get('memory_limit'));
-
-	if (preg_match('/(\\d+)([mkg]?)/i', $val, $regs))
-	{
-		$memory_limit = (int) $regs[1];
-		switch ($regs[2])
-		{
-
-			case 'k':
-			case 'K':
-				$memory_limit *= 1024;
-			break;
-
-			case 'm':
-			case 'M':
-				$memory_limit *= 1048576;
-			break;
-
-			case 'g':
-			case 'G':
-				$memory_limit *= 1073741824;
-			break;
-		}
-
-		// how much memory PHP requires at the start of export (it is really a little less)
-		if ($memory_limit > 6100000)
-		{
-			$memory_limit -= 6100000;
-		}
-
-		// allow us to consume half of the total memory available
-		$memory_limit /= 2;
-	}
-	else
-	{
-		// set the buffer to 1M if we have no clue how much memory PHP will give us :P
-		$memory_limit = 1048576;
-	}
-
-	return $memory_limit;
-}
-
-function sanitize_data_mssql($text)
-{
-	$data = preg_split('/[\n\t\r\b\f]/', $text);
-	preg_match_all('/[\n\t\r\b\f]/', $text, $matches);
-
-	$val = array();
-
-	foreach ($data as $value)
-	{
-		if (strlen($value))
-		{
-			$val[] = "'" . $value . "'";
-		}
-		if (sizeof($matches[0]))
-		{
-			$val[] = 'char(' . ord(array_shift($matches[0])) . ')';
-		}
-	}
-
-	return implode('+', $val);
-}
-
-function sanitize_data_oracle($text)
-{
-	$data = preg_split('/[\0\n\t\r\b\f\'"\\\]/', $text);
-	preg_match_all('/[\0\n\t\r\b\f\'"\\\]/', $text, $matches);
-
-	$val = array();
-
-	foreach ($data as $value)
-	{
-		if (strlen($value))
-		{
-			$val[] = "'" . $value . "'";
-		}
-		if (sizeof($matches[0]))
-		{
-			$val[] = 'chr(' . ord(array_shift($matches[0])) . ')';
-		}
-	}
-
-	return implode('||', $val);
-}
-
-function sanitize_data_generic($text)
-{
-	$data = preg_split('/[\n\t\r\b\f]/', $text);
-	preg_match_all('/[\n\t\r\b\f]/', $text, $matches);
-
-	$val = array();
-
-	foreach ($data as $value)
-	{
-		if (strlen($value))
-		{
-			$val[] = "'" . $value . "'";
-		}
-		if (sizeof($matches[0]))
-		{
-			$val[] = "'" . array_shift($matches[0]) . "'";
-		}
-	}
-
-	return implode('||', $val);
-}
-
-// modified from PHP.net
-function fgetd(&$fp, $delim, $read, $seek, $eof, $buffer = 8192)
-{
-	$record = '';
-	$delim_len = strlen($delim);
-
-	while (!$eof($fp))
-	{
-		$pos = strpos($record, $delim);
-		if ($pos === false)
-		{
-			$record .= $read($fp, $buffer);
-			if ($eof($fp) && ($pos = strpos($record, $delim)) !== false)
-			{
-				$seek($fp, $pos + $delim_len - strlen($record), SEEK_CUR);
-				return substr($record, 0, $pos);
-			}
-		}
-		else
-		{
-			$seek($fp, $pos + $delim_len - strlen($record), SEEK_CUR);
-			return substr($record, 0, $pos);
-		}
-	}
-
-	return false;
-}
-
-function fgetd_seekless(&$fp, $delim, $read, $seek, $eof, $buffer = 8192)
-{
-	static $array = array();
-	static $record = '';
-
-	if (!sizeof($array))
-	{
-		while (!$eof($fp))
-		{
-			if (strpos($record, $delim) !== false)
-			{
-				$array = explode($delim, $record);
-				$record = array_pop($array);
-				break;
-			}
-			else
-			{
-				$record .= $read($fp, $buffer);
-			}
-		}
-		if ($eof($fp) && strpos($record, $delim) !== false)
-		{
-			$array = explode($delim, $record);
-			$record = array_pop($array);
-		}
-	}
-
-	if (sizeof($array))
-	{
-		return array_shift($array);
-	}
-
-	return false;
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_disallow.php b/phpBB/modules/acp/acp_disallow.php
deleted file mode 100644
index b5307ff536..0000000000
--- a/phpBB/modules/acp/acp_disallow.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_disallow
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-
-		phpbb::$user->add_lang('acp/posting');
-
-		// Set up general vars
-		$this->tpl_name = 'acp_disallow';
-		$this->page_title = 'ACP_DISALLOW_USERNAMES';
-
-		$form_key = 'acp_disallow';
-		add_form_key($form_key);
-
-		$disallow = phpbb_request::is_set_post('disallow');
-		$allow = phpbb_request::is_set_post('allow');
-
-		if (($allow || $disallow) && !check_form_key($form_key))
-		{
-			trigger_error(phpbb::$user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
-		if ($disallow)
-		{
-			$disallowed_user = str_replace('*', '%', utf8_normalize_nfc(request_var('disallowed_user', '', true)));
-
-			if (!$disallowed_user)
-			{
-				trigger_error(phpbb::$user->lang['NO_USERNAME_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING);
-			}
-
-			$sql = 'INSERT INTO ' . DISALLOW_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', array('disallow_username' => $disallowed_user));
-			phpbb::$db->sql_query($sql);
-
-			phpbb::$acm->destroy('disallowed_usernames');
-
-			$message = phpbb::$user->lang['DISALLOW_SUCCESSFUL'];
-			add_log('admin', 'LOG_DISALLOW_ADD', str_replace('%', '*', $disallowed_user));
-
-			trigger_error($message . adm_back_link($this->u_action));
-		}
-		else if ($allow)
-		{
-			$disallowed_id = request_var('disallowed_id', 0);
-
-			if (!$disallowed_id)
-			{
-				trigger_error(phpbb::$user->lang['NO_USERNAME_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING);
-			}
-
-			$sql = 'DELETE FROM ' . DISALLOW_TABLE . '
-				WHERE disallow_id = ' . $disallowed_id;
-			phpbb::$db->sql_query($sql);
-
-			phpbb::$acm->destroy('disallowed_usernames');
-
-			add_log('admin', 'LOG_DISALLOW_DELETE');
-
-			trigger_error(phpbb::$user->lang['DISALLOWED_DELETED'] . adm_back_link($this->u_action));
-		}
-
-		// Grab the current list of disallowed usernames...
-		$sql = 'SELECT *
-			FROM ' . DISALLOW_TABLE;
-		$result = phpbb::$db->sql_query($sql);
-
-		$disallow_select = '';
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$disallow_select .= '<option value="' . $row['disallow_id'] . '">' . str_replace('%', '*', $row['disallow_username']) . '</option>';
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		phpbb::$template->assign_vars(array(
-			'U_ACTION'				=> $this->u_action,
-			'S_DISALLOWED_NAMES'	=> $disallow_select,
-		));
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_email.php b/phpBB/modules/acp/acp_email.php
deleted file mode 100644
index b0dbb87641..0000000000
--- a/phpBB/modules/acp/acp_email.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_email
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		phpbb::$user->add_lang('acp/email');
-		$this->tpl_name = 'acp_email';
-		$this->page_title = 'ACP_MASS_EMAIL';
-
-		$form_key = 'acp_email';
-		add_form_key($form_key);
-
-		// Set some vars
-		$submit = phpbb_request::is_set_post('submit');
-		$error = array();
-
-		$usernames	= request_var('usernames', '', true);
-		$group_id	= request_var('g', 0);
-		$subject	= utf8_normalize_nfc(request_var('subject', '', true));
-		$message	= utf8_normalize_nfc(request_var('message', '', true));
-
-		// Do the job ...
-		if ($submit)
-		{
-			// Error checking needs to go here ... if no subject and/or no message then skip
-			// over the send and return to the form
-			$use_queue		= phpbb_request::is_set_post('send_immediately');
-			$priority		= request_var('mail_priority_flag', MAIL_NORMAL_PRIORITY);
-
-			if (!check_form_key($form_key))
-			{
-				$error[] = phpbb::$user->lang['FORM_INVALID'];
-			}
-
-			if (!$subject)
-			{
-				$error[] = phpbb::$user->lang['NO_EMAIL_SUBJECT'];
-			}
-
-			if (!$message)
-			{
-				$error[] = phpbb::$user->lang['NO_EMAIL_MESSAGE'];
-			}
-
-			if (!sizeof($error))
-			{
-				if ($usernames)
-				{
-					// If giving usernames the admin is able to email inactive users too...
-					$sql = 'SELECT username, user_email, user_jabber, user_notify_type, user_lang
-						FROM ' . USERS_TABLE . '
-						WHERE ' . phpbb::$db->sql_in_set('username_clean', array_map('utf8_clean_string', explode("\n", $usernames))) . '
-							AND user_allow_massemail = 1
-						ORDER BY user_lang, user_notify_type'; // , SUBSTRING(user_email FROM INSTR(user_email, '@'))
-				}
-				else
-				{
-					if ($group_id)
-					{
-						$sql = 'SELECT u.user_email, u.username, u.username_clean, u.user_lang, u.user_jabber, u.user_notify_type
-							FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . ' ug
-							WHERE ug.group_id = ' . $group_id . '
-								AND ug.user_pending = 0
-								AND u.user_id = ug.user_id
-								AND u.user_allow_massemail = 1
-								AND u.user_type IN (' . phpbb::USER_NORMAL . ', ' . phpbb::USER_FOUNDER . ')
-							ORDER BY u.user_lang, u.user_notify_type';
-					}
-					else
-					{
-						$sql = 'SELECT username, username_clean, user_email, user_jabber, user_notify_type, user_lang
-							FROM ' . USERS_TABLE . '
-							WHERE user_allow_massemail = 1
-								AND user_type IN (' . phpbb::USER_NORMAL . ', ' . phpbb::USER_FOUNDER . ')
-							ORDER BY user_lang, user_notify_type';
-					}
-				}
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-
-				if (!$row)
-				{
-					phpbb::$db->sql_freeresult($result);
-					trigger_error(phpbb::$user->lang['NO_USER'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				$i = $j = 0;
-
-				// Send with BCC, no more than 50 recipients for one mail (to not exceed the limit)
-				$max_chunk_size = 50;
-				$email_list = array();
-				$old_lang = $row['user_lang'];
-				$old_notify_type = $row['user_notify_type'];
-
-				do
-				{
-					if (($row['user_notify_type'] == NOTIFY_EMAIL && $row['user_email']) ||
-						($row['user_notify_type'] == NOTIFY_IM && $row['user_jabber']) ||
-						($row['user_notify_type'] == NOTIFY_BOTH && ($row['user_email'] || $row['user_jabber'])))
-					{
-						if ($i == $max_chunk_size || $row['user_lang'] != $old_lang || $row['user_notify_type'] != $old_notify_type)
-						{
-							$i = 0;
-
-							if (sizeof($email_list))
-							{
-								$j++;
-							}
-
-							$old_lang = $row['user_lang'];
-							$old_notify_type = $row['user_notify_type'];
-						}
-
-						$email_list[$j][$i]['lang']		= $row['user_lang'];
-						$email_list[$j][$i]['method']	= $row['user_notify_type'];
-						$email_list[$j][$i]['email']	= $row['user_email'];
-						$email_list[$j][$i]['name']		= $row['username'];
-						$email_list[$j][$i]['jabber']	= $row['user_jabber'];
-						$i++;
-					}
-				}
-				while ($row = phpbb::$db->sql_fetchrow($result));
-				phpbb::$db->sql_freeresult($result);
-
-				// Send the messages
-				include_once(PHPBB_ROOT_PATH . 'includes/functions_messenger.' . PHP_EXT);
-				include_once(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-				$messenger = new messenger($use_queue);
-
-				$errored = false;
-
-				for ($i = 0, $size = sizeof($email_list); $i < $size; $i++)
-				{
-					$used_lang = $email_list[$i][0]['lang'];
-					$used_method = $email_list[$i][0]['method'];
-
-					for ($j = 0, $list_size = sizeof($email_list[$i]); $j < $list_size; $j++)
-					{
-						$email_row = $email_list[$i][$j];
-
-						$messenger->{((sizeof($email_list[$i]) == 1) ? 'to' : 'bcc')}($email_row['email'], $email_row['name']);
-						$messenger->im($email_row['jabber'], $email_row['name']);
-					}
-
-					$messenger->template('admin_send_email', $used_lang);
-
-					$messenger->headers('X-AntiAbuse: Board servername - ' . phpbb::$config['server_name']);
-					$messenger->headers('X-AntiAbuse: User_id - ' . phpbb::$user->data['user_id']);
-					$messenger->headers('X-AntiAbuse: Username - ' . phpbb::$user->data['username']);
-					$messenger->headers('X-AntiAbuse: User IP - ' . phpbb::$user->ip);
-
-					$messenger->subject(htmlspecialchars_decode($subject));
-					$messenger->set_mail_priority($priority);
-
-					$messenger->assign_vars(array(
-						'CONTACT_EMAIL' => phpbb::$config['board_contact'],
-						'MESSAGE'		=> htmlspecialchars_decode($message))
-					);
-
-					if (!($messenger->send($used_method)))
-					{
-						$errored = true;
-					}
-				}
-				unset($email_list);
-
-				$messenger->save_queue();
-
-				if ($usernames)
-				{
-					$usernames = explode("\n", $usernames);
-					add_log('admin', 'LOG_MASS_EMAIL', implode(', ', utf8_normalize_nfc($usernames)));
-				}
-				else
-				{
-					if ($group_id)
-					{
-						$group_name = get_group_name($group_id);
-					}
-					else
-					{
-						// Not great but the logging routine doesn't cope well with localising on the fly
-						$group_name = phpbb::$user->lang['ALL_USERS'];
-					}
-
-					add_log('admin', 'LOG_MASS_EMAIL', $group_name);
-				}
-
-				if (!$errored)
-				{
-					$message = ($use_queue) ? phpbb::$user->lang['EMAIL_SENT_QUEUE'] : phpbb::$user->lang['EMAIL_SENT'];
-					trigger_error($message . adm_back_link($this->u_action));
-				}
-				else
-				{
-					$message = sprintf(phpbb::$user->lang['EMAIL_SEND_ERROR'], '<a href="' . append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, 'i=logs&amp;mode=critical') . '">', '</a>');
-					trigger_error($message . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-			}
-		}
-
-		// Exclude bots and guests...
-		$sql = 'SELECT group_id
-			FROM ' . GROUPS_TABLE . "
-			WHERE group_name_clean IN ('bots', 'guests')";
-		$result = phpbb::$db->sql_query($sql);
-
-		$exclude = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$exclude[] = $row['group_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$select_list = '<option value="0"' . ((!$group_id) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang['ALL_USERS'] . '</option>';
-		$select_list .= group_select_options($group_id, $exclude);
-
-		$s_priority_options = '<option value="' . MAIL_LOW_PRIORITY . '">' . phpbb::$user->lang['MAIL_LOW_PRIORITY'] . '</option>';
-		$s_priority_options .= '<option value="' . MAIL_NORMAL_PRIORITY . '" selected="selected">' . phpbb::$user->lang['MAIL_NORMAL_PRIORITY'] . '</option>';
-		$s_priority_options .= '<option value="' . MAIL_HIGH_PRIORITY . '">' . phpbb::$user->lang['MAIL_HIGH_PRIORITY'] . '</option>';
-
-		phpbb::$template->assign_vars(array(
-			'S_WARNING'				=> (sizeof($error)) ? true : false,
-			'WARNING_MSG'			=> (sizeof($error)) ? implode('<br />', $error) : '',
-			'U_ACTION'				=> $this->u_action,
-			'S_GROUP_OPTIONS'		=> $select_list,
-			'USERNAMES'				=> $usernames,
-			'U_FIND_USERNAME'		=> append_sid('memberlist', 'mode=searchuser&amp;form=acp_email&amp;field=usernames'),
-			'SUBJECT'				=> $subject,
-			'MESSAGE'				=> $message,
-			'S_PRIORITY_OPTIONS'	=> $s_priority_options,
-		));
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_forums.php b/phpBB/modules/acp/acp_forums.php
deleted file mode 100644
index d0581a2a68..0000000000
--- a/phpBB/modules/acp/acp_forums.php
+++ /dev/null
@@ -1,1912 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_forums
-{
-	var $u_action;
-	var $parent_id = 0;
-
-	function main($id, $mode)
-	{
-		phpbb::$user->add_lang('acp/forums');
-		$this->tpl_name = 'acp_forums';
-		$this->page_title = 'ACP_MANAGE_FORUMS';
-
-		$form_key = 'acp_forums';
-		add_form_key($form_key);
-
-		$action		= request_var('action', '');
-		$update		= phpbb_request::is_set_post('update');
-		$forum_id	= request_var('f', 0);
-
-		$this->parent_id	= request_var('parent_id', 0);
-		$forum_data = $errors = array();
-		if ($update && !check_form_key($form_key))
-		{
-			$update = false;
-			$errors[] = phpbb::$user->lang['FORM_INVALID'];
-		}
-
-		// Check additional permissions
-		switch ($action)
-		{
-			case 'progress_bar':
-				$start = request_var('start', 0);
-				$total = request_var('total', 0);
-
-				$this->display_progress_bar($start, $total);
-				exit;
-			break;
-
-			case 'delete':
-
-				if (!phpbb::$acl->acl_get('a_forumdel'))
-				{
-					trigger_error(phpbb::$user->lang['NO_PERMISSION_FORUM_DELETE'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
-				}
-
-			break;
-
-			case 'add':
-
-				if (!phpbb::$acl->acl_get('a_forumadd'))
-				{
-					trigger_error(phpbb::$user->lang['NO_PERMISSION_FORUM_ADD'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
-				}
-
-			break;
-		}
-
-		// Major routines
-		if ($update)
-		{
-			switch ($action)
-			{
-				case 'delete':
-					$action_subforums	= request_var('action_subforums', '');
-					$subforums_to_id	= request_var('subforums_to_id', 0);
-					$action_posts		= request_var('action_posts', '');
-					$posts_to_id		= request_var('posts_to_id', 0);
-
-					$errors = $this->delete_forum($forum_id, $action_posts, $action_subforums, $posts_to_id, $subforums_to_id);
-
-					if (sizeof($errors))
-					{
-						break;
-					}
-
-					phpbb::$acl->acl_clear_prefetch();
-					phpbb::$acm->destroy_sql(FORUMS_TABLE);
-
-					trigger_error(phpbb::$user->lang['FORUM_DELETED'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
-
-				break;
-
-				case 'edit':
-					$forum_data = array(
-						'forum_id'		=>	$forum_id
-					);
-
-				// No break here
-
-				case 'add':
-
-					$forum_data += array(
-						'parent_id'				=> request_var('forum_parent_id', $this->parent_id),
-						'forum_type'			=> request_var('forum_type', FORUM_POST),
-						'type_action'			=> request_var('type_action', ''),
-						'forum_status'			=> request_var('forum_status', ITEM_UNLOCKED),
-						'forum_parents'			=> '',
-						'forum_name'			=> utf8_normalize_nfc(request_var('forum_name', '', true)),
-						'forum_link'			=> request_var('forum_link', ''),
-						'forum_link_track'		=> request_var('forum_link_track', false),
-						'forum_desc'			=> utf8_normalize_nfc(request_var('forum_desc', '', true)),
-						'forum_desc_uid'		=> '',
-						'forum_desc_options'	=> 7,
-						'forum_desc_bitfield'	=> '',
-						'forum_rules'			=> utf8_normalize_nfc(request_var('forum_rules', '', true)),
-						'forum_rules_uid'		=> '',
-						'forum_rules_options'	=> 7,
-						'forum_rules_bitfield'	=> '',
-						'forum_rules_link'		=> request_var('forum_rules_link', ''),
-						'forum_image'			=> request_var('forum_image', ''),
-						'forum_style'			=> request_var('forum_style', 0),
-						'display_subforum_list'	=> request_var('display_subforum_list', false),
-						'display_on_index'		=> request_var('display_on_index', false),
-						'forum_topics_per_page'	=> request_var('topics_per_page', 0),
-						'enable_indexing'		=> request_var('enable_indexing', true),
-						'enable_icons'			=> request_var('enable_icons', false),
-						'enable_prune'			=> request_var('enable_prune', false),
-						'enable_post_review'	=> request_var('enable_post_review', true),
-						'prune_days'			=> request_var('prune_days', 7),
-						'prune_viewed'			=> request_var('prune_viewed', 7),
-						'prune_freq'			=> request_var('prune_freq', 1),
-						'prune_old_polls'		=> request_var('prune_old_polls', false),
-						'prune_announce'		=> request_var('prune_announce', false),
-						'prune_sticky'			=> request_var('prune_sticky', false),
-						'forum_password'		=> request_var('forum_password', '', true),
-						'forum_password_confirm'=> request_var('forum_password_confirm', '', true),
-						'forum_password_unset'	=> request_var('forum_password_unset', false),
-					);
-
-					// Use link_display_on_index setting if forum type is link
-					if ($forum_data['forum_type'] == FORUM_LINK)
-					{
-						$forum_data['display_on_index'] = request_var('link_display_on_index', false);
-					}
-
-					// Linked forums and categories are not able to be locked...
-					if ($forum_data['forum_type'] == FORUM_LINK || $forum_data['forum_type'] == FORUM_CAT)
-					{
-						$forum_data['forum_status'] = ITEM_UNLOCKED;
-					}
-
-					$forum_data['show_active'] = ($forum_data['forum_type'] == FORUM_POST) ? request_var('display_recent', false) : request_var('display_active', false);
-
-					// Get data for forum rules if specified...
-					if ($forum_data['forum_rules'])
-					{
-						generate_text_for_storage($forum_data['forum_rules'], $forum_data['forum_rules_uid'], $forum_data['forum_rules_bitfield'], $forum_data['forum_rules_options'], request_var('rules_parse_bbcode', false), request_var('rules_parse_urls', false), request_var('rules_parse_smilies', false));
-					}
-
-					// Get data for forum description if specified
-					if ($forum_data['forum_desc'])
-					{
-						generate_text_for_storage($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_bitfield'], $forum_data['forum_desc_options'], request_var('desc_parse_bbcode', false), request_var('desc_parse_urls', false), request_var('desc_parse_smilies', false));
-					}
-
-					$errors = $this->update_forum_data($forum_data);
-
-					if (!sizeof($errors))
-					{
-						$forum_perm_from = request_var('forum_perm_from', 0);
-
-						// Copy permissions?
-						if (!empty($forum_perm_from) && $forum_perm_from != $forum_data['forum_id'] &&
-							(($action != 'edit') || empty($forum_id) || (phpbb::$acl->acl_get('a_fauth') && phpbb::$acl->acl_get('a_authusers') && phpbb::$acl->acl_get('a_authgroups') && phpbb::$acl->acl_get('a_mauth'))))
-						{
-							// if we edit a forum delete current permissions first
-							if ($action == 'edit')
-							{
-								$sql = 'DELETE FROM ' . ACL_USERS_TABLE . '
-									WHERE forum_id = ' . (int) $forum_data['forum_id'];
-								phpbb::$db->sql_query($sql);
-
-								$sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . '
-									WHERE forum_id = ' . (int) $forum_data['forum_id'];
-								phpbb::$db->sql_query($sql);
-							}
-
-							// From the mysql documentation:
-							// Prior to MySQL 4.0.14, the target table of the INSERT statement cannot appear in the FROM clause of the SELECT part of the query. This limitation is lifted in 4.0.14.
-							// Due to this we stay on the safe side if we do the insertion "the manual way"
-
-							// Copy permisisons from/to the acl users table (only forum_id gets changed)
-							$sql = 'SELECT user_id, auth_option_id, auth_role_id, auth_setting
-								FROM ' . ACL_USERS_TABLE . '
-								WHERE forum_id = ' . $forum_perm_from;
-							$result = phpbb::$db->sql_query($sql);
-
-							$users_sql_ary = array();
-							while ($row = phpbb::$db->sql_fetchrow($result))
-							{
-								$users_sql_ary[] = array(
-									'user_id'			=> (int) $row['user_id'],
-									'forum_id'			=> (int) $forum_data['forum_id'],
-									'auth_option_id'	=> (int) $row['auth_option_id'],
-									'auth_role_id'		=> (int) $row['auth_role_id'],
-									'auth_setting'		=> (int) $row['auth_setting']
-								);
-							}
-							phpbb::$db->sql_freeresult($result);
-
-							// Copy permisisons from/to the acl groups table (only forum_id gets changed)
-							$sql = 'SELECT group_id, auth_option_id, auth_role_id, auth_setting
-								FROM ' . ACL_GROUPS_TABLE . '
-								WHERE forum_id = ' . $forum_perm_from;
-							$result = phpbb::$db->sql_query($sql);
-
-							$groups_sql_ary = array();
-							while ($row = phpbb::$db->sql_fetchrow($result))
-							{
-								$groups_sql_ary[] = array(
-									'group_id'			=> (int) $row['group_id'],
-									'forum_id'			=> (int) $forum_data['forum_id'],
-									'auth_option_id'	=> (int) $row['auth_option_id'],
-									'auth_role_id'		=> (int) $row['auth_role_id'],
-									'auth_setting'		=> (int) $row['auth_setting']
-								);
-							}
-							phpbb::$db->sql_freeresult($result);
-
-							// Now insert the data
-							phpbb::$db->sql_multi_insert(ACL_USERS_TABLE, $users_sql_ary);
-							phpbb::$db->sql_multi_insert(ACL_GROUPS_TABLE, $groups_sql_ary);
-							cache_moderators();
-						}
-
-						phpbb::$acl->acl_clear_prefetch();
-						phpbb::$acm->destroy_sql(FORUMS_TABLE);
-
-						$acl_url = '&amp;mode=setting_forum_local&amp;forum_id[]=' . $forum_data['forum_id'];
-
-						$message = ($action == 'add') ? phpbb::$user->lang['FORUM_CREATED'] : phpbb::$user->lang['FORUM_UPDATED'];
-
-						// Redirect to permissions
-						if (phpbb::$acl->acl_get('a_fauth'))
-						{
-							$message .= '<br /><br />' . sprintf(phpbb::$user->lang['REDIRECT_ACL'], '<a href="' . append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, 'i=permissions' . $acl_url) . '">', '</a>');
-						}
-
-						// redirect directly to permission settings screen if authed
-						if ($action == 'add' && !$forum_perm_from && phpbb::$acl->acl_get('a_fauth'))
-						{
-							meta_refresh(4, append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, 'i=permissions' . $acl_url));
-						}
-
-						trigger_error($message . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
-					}
-
-				break;
-			}
-		}
-
-		switch ($action)
-		{
-			case 'move_up':
-			case 'move_down':
-
-				if (!$forum_id)
-				{
-					trigger_error(phpbb::$user->lang['NO_FORUM'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
-				}
-
-				$sql = 'SELECT *
-					FROM ' . FORUMS_TABLE . "
-					WHERE forum_id = $forum_id";
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$row)
-				{
-					trigger_error(phpbb::$user->lang['NO_FORUM'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
-				}
-
-				$move_forum_name = $this->move_forum_by($row, $action, 1);
-
-				if ($move_forum_name !== false)
-				{
-					add_log('admin', 'LOG_FORUM_' . strtoupper($action), $row['forum_name'], $move_forum_name);
-					phpbb::$acm->destroy_sql(FORUMS_TABLE);
-				}
-
-			break;
-
-			case 'sync':
-				if (!$forum_id)
-				{
-					trigger_error(phpbb::$user->lang['NO_FORUM'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
-				}
-
-				@set_time_limit(0);
-
-				$sql = 'SELECT forum_name, forum_topics_real
-					FROM ' . FORUMS_TABLE . "
-					WHERE forum_id = $forum_id";
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$row)
-				{
-					trigger_error(phpbb::$user->lang['NO_FORUM'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
-				}
-
-				if ($row['forum_topics_real'])
-				{
-					$sql = 'SELECT MIN(topic_id) as min_topic_id, MAX(topic_id) as max_topic_id
-						FROM ' . TOPICS_TABLE . '
-						WHERE forum_id = ' . $forum_id;
-					$result = phpbb::$db->sql_query($sql);
-					$row2 = phpbb::$db->sql_fetchrow($result);
-					phpbb::$db->sql_freeresult($result);
-
-					// Typecast to int if there is no data available
-					$row2['min_topic_id'] = (int) $row2['min_topic_id'];
-					$row2['max_topic_id'] = (int) $row2['max_topic_id'];
-
-					$start = request_var('start', $row2['min_topic_id']);
-
-					$batch_size = 2000;
-					$end = $start + $batch_size;
-
-					// Sync all topics in batch mode...
-					sync('topic_approved', 'range', 'topic_id BETWEEN ' . $start . ' AND ' . $end, true, false);
-					sync('topic', 'range', 'topic_id BETWEEN ' . $start . ' AND ' . $end, true, true);
-
-					if ($end < $row2['max_topic_id'])
-					{
-						// We really need to find a way of showing statistics... no progress here
-						$sql = 'SELECT COUNT(topic_id) as num_topics
-							FROM ' . TOPICS_TABLE . '
-							WHERE forum_id = ' . $forum_id . '
-								AND topic_id BETWEEN ' . $start . ' AND ' . $end;
-						$result = phpbb::$db->sql_query($sql);
-						$topics_done = request_var('topics_done', 0) + (int) phpbb::$db->sql_fetchfield('num_topics');
-						phpbb::$db->sql_freeresult($result);
-
-						$start += $batch_size;
-
-						$url = $this->u_action . "&amp;parent_id={$this->parent_id}&amp;f=$forum_id&amp;action=sync&amp;start=$start&amp;topics_done=$topics_done&amp;total={$row['forum_topics_real']}";
-
-						meta_refresh(0, $url);
-
-						phpbb::$template->assign_vars(array(
-							'U_PROGRESS_BAR'		=> $this->u_action . "&amp;action=progress_bar&amp;start=$topics_done&amp;total={$row['forum_topics_real']}",
-							'UA_PROGRESS_BAR'		=> addslashes($this->u_action . "&amp;action=progress_bar&amp;start=$topics_done&amp;total={$row['forum_topics_real']}"),
-							'S_CONTINUE_SYNC'		=> true,
-							'L_PROGRESS_EXPLAIN'	=> sprintf(phpbb::$user->lang['SYNC_IN_PROGRESS_EXPLAIN'], $topics_done, $row['forum_topics_real']),
-						));
-
-						return;
-					}
-				}
-
-				$url = $this->u_action . "&amp;parent_id={$this->parent_id}&amp;f=$forum_id&amp;action=sync_forum";
-				meta_refresh(0, $url);
-
-				phpbb::$template->assign_vars(array(
-					'U_PROGRESS_BAR'		=> $this->u_action . '&amp;action=progress_bar',
-					'UA_PROGRESS_BAR'		=> addslashes($this->u_action . '&amp;action=progress_bar'),
-					'S_CONTINUE_SYNC'		=> true,
-					'L_PROGRESS_EXPLAIN'	=> sprintf(phpbb::$user->lang['SYNC_IN_PROGRESS_EXPLAIN'], 0, $row['forum_topics_real']),
-				));
-
-				return;
-
-			break;
-
-			case 'sync_forum':
-
-				$sql = 'SELECT forum_name, forum_type
-					FROM ' . FORUMS_TABLE . "
-					WHERE forum_id = $forum_id";
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$row)
-				{
-					trigger_error(phpbb::$user->lang['NO_FORUM'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
-				}
-
-				sync('forum', 'forum_id', $forum_id, false, true);
-
-				add_log('admin', 'LOG_FORUM_SYNC', $row['forum_name']);
-				phpbb::$acm->destroy_sql(FORUMS_TABLE);
-
-				phpbb::$template->assign_var('L_FORUM_RESYNCED', sprintf(phpbb::$user->lang['FORUM_RESYNCED'], $row['forum_name']));
-
-			break;
-
-			case 'add':
-			case 'edit':
-
-				if ($update)
-				{
-					$forum_data['forum_flags'] = 0;
-					$forum_data['forum_flags'] += (request_var('forum_link_track', false)) ? FORUM_FLAG_LINK_TRACK : 0;
-					$forum_data['forum_flags'] += (request_var('prune_old_polls', false)) ? FORUM_FLAG_PRUNE_POLL : 0;
-					$forum_data['forum_flags'] += (request_var('prune_announce', false)) ? FORUM_FLAG_PRUNE_ANNOUNCE : 0;
-					$forum_data['forum_flags'] += (request_var('prune_sticky', false)) ? FORUM_FLAG_PRUNE_STICKY : 0;
-					$forum_data['forum_flags'] += ($forum_data['show_active']) ? FORUM_FLAG_ACTIVE_TOPICS : 0;
-					$forum_data['forum_flags'] += (request_var('enable_post_review', true)) ? FORUM_FLAG_POST_REVIEW : 0;
-				}
-
-				// Show form to create/modify a forum
-				if ($action == 'edit')
-				{
-					$this->page_title = 'EDIT_FORUM';
-					$row = $this->get_forum_info($forum_id);
-					$old_forum_type = $row['forum_type'];
-
-					if (!$update)
-					{
-						$forum_data = $row;
-					}
-					else
-					{
-						$forum_data['left_id'] = $row['left_id'];
-						$forum_data['right_id'] = $row['right_id'];
-					}
-
-					// Make sure no direct child forums are able to be selected as parents.
-					$exclude_forums = array();
-					foreach (get_forum_branch($forum_id, 'children') as $row)
-					{
-						$exclude_forums[] = $row['forum_id'];
-					}
-
-					$parents_list = make_forum_select($forum_data['parent_id'], $exclude_forums, false, false, false);
-
-					$forum_data['forum_password_confirm'] = $forum_data['forum_password'];
-				}
-				else
-				{
-					$this->page_title = 'CREATE_FORUM';
-
-					$forum_id = $this->parent_id;
-					$parents_list = make_forum_select($this->parent_id, false, false, false, false);
-
-					// Fill forum data with default values
-					if (!$update)
-					{
-						$forum_data = array(
-							'parent_id'				=> $this->parent_id,
-							'forum_type'			=> FORUM_POST,
-							'forum_status'			=> ITEM_UNLOCKED,
-							'forum_name'			=> utf8_normalize_nfc(request_var('forum_name', '', true)),
-							'forum_link'			=> '',
-							'forum_link_track'		=> false,
-							'forum_desc'			=> '',
-							'forum_rules'			=> '',
-							'forum_rules_link'		=> '',
-							'forum_image'			=> '',
-							'forum_style'			=> 0,
-							'display_subforum_list'	=> true,
-							'display_on_index'		=> false,
-							'forum_topics_per_page'	=> 0,
-							'enable_indexing'		=> true,
-							'enable_icons'			=> false,
-							'enable_prune'			=> false,
-							'prune_days'			=> 7,
-							'prune_viewed'			=> 7,
-							'prune_freq'			=> 1,
-							'forum_flags'			=> FORUM_FLAG_POST_REVIEW,
-							'forum_password'		=> '',
-							'forum_password_confirm'=> '',
-						);
-					}
-				}
-
-				$forum_rules_data = array(
-					'text'			=> $forum_data['forum_rules'],
-					'allow_bbcode'	=> true,
-					'allow_smilies'	=> true,
-					'allow_urls'	=> true
-				);
-
-				$forum_desc_data = array(
-					'text'			=> $forum_data['forum_desc'],
-					'allow_bbcode'	=> true,
-					'allow_smilies'	=> true,
-					'allow_urls'	=> true
-				);
-
-				$forum_rules_preview = '';
-
-				// Parse rules if specified
-				if ($forum_data['forum_rules'])
-				{
-					if (!isset($forum_data['forum_rules_uid']))
-					{
-						// Before we are able to display the preview and plane text, we need to parse our request_var()'d value...
-						$forum_data['forum_rules_uid'] = '';
-						$forum_data['forum_rules_bitfield'] = '';
-						$forum_data['forum_rules_options'] = 0;
-
-						generate_text_for_storage($forum_data['forum_rules'], $forum_data['forum_rules_uid'], $forum_data['forum_rules_bitfield'], $forum_data['forum_rules_options'], request_var('rules_allow_bbcode', false), request_var('rules_allow_urls', false), request_var('rules_allow_smilies', false));
-					}
-
-					// Generate preview content
-					$forum_rules_preview = generate_text_for_display($forum_data['forum_rules'], $forum_data['forum_rules_uid'], $forum_data['forum_rules_bitfield'], $forum_data['forum_rules_options']);
-
-					// decode...
-					$forum_rules_data = generate_text_for_edit($forum_data['forum_rules'], $forum_data['forum_rules_uid'], $forum_data['forum_rules_options']);
-				}
-
-				// Parse desciption if specified
-				if ($forum_data['forum_desc'])
-				{
-					if (!isset($forum_data['forum_desc_uid']))
-					{
-						// Before we are able to display the preview and plane text, we need to parse our request_var()'d value...
-						$forum_data['forum_desc_uid'] = '';
-						$forum_data['forum_desc_bitfield'] = '';
-						$forum_data['forum_desc_options'] = 0;
-
-						generate_text_for_storage($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_bitfield'], $forum_data['forum_desc_options'], request_var('desc_allow_bbcode', false), request_var('desc_allow_urls', false), request_var('desc_allow_smilies', false));
-					}
-
-					// decode...
-					$forum_desc_data = generate_text_for_edit($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_options']);
-				}
-
-				$forum_type_options = '';
-				$forum_type_ary = array(FORUM_CAT => 'CAT', FORUM_POST => 'FORUM', FORUM_LINK => 'LINK');
-
-				foreach ($forum_type_ary as $value => $lang)
-				{
-					$forum_type_options .= '<option value="' . $value . '"' . (($value == $forum_data['forum_type']) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang['TYPE_' . $lang] . '</option>';
-				}
-
-				$styles_list = style_select($forum_data['forum_style'], true);
-
-				$statuslist = '<option value="' . ITEM_UNLOCKED . '"' . (($forum_data['forum_status'] == ITEM_UNLOCKED) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang['UNLOCKED'] . '</option><option value="' . ITEM_LOCKED . '"' . (($forum_data['forum_status'] == ITEM_LOCKED) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang['LOCKED'] . '</option>';
-
-				$sql = 'SELECT forum_id
-					FROM ' . FORUMS_TABLE . '
-					WHERE forum_type = ' . FORUM_POST . "
-						AND forum_id <> $forum_id";
-				$result = phpbb::$db->sql_query_limit($sql, 1);
-
-				$postable_forum_exists = false;
-				if (phpbb::$db->sql_fetchrow($result))
-				{
-					$postable_forum_exists = true;
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				// Subforum move options
-				if ($action == 'edit' && $forum_data['forum_type'] == FORUM_CAT)
-				{
-					$subforums_id = array();
-					$subforums = get_forum_branch($forum_id, 'children');
-
-					foreach ($subforums as $row)
-					{
-						$subforums_id[] = $row['forum_id'];
-					}
-
-					$forums_list = make_forum_select($forum_data['parent_id'], $subforums_id);
-
-					if ($postable_forum_exists)
-					{
-						phpbb::$template->assign_vars(array(
-							'S_MOVE_FORUM_OPTIONS'		=> make_forum_select($forum_data['parent_id'], $subforums_id), // , false, true, false???
-						));
-					}
-
-					phpbb::$template->assign_vars(array(
-						'S_HAS_SUBFORUMS'		=> ($forum_data['right_id'] - $forum_data['left_id'] > 1) ? true : false,
-						'S_FORUMS_LIST'			=> $forums_list,
-					));
-				}
-				else if ($postable_forum_exists)
-				{
-					$template->assign_vars(array(
-						'S_MOVE_FORUM_OPTIONS'		=> make_forum_select($forum_data['parent_id'], $forum_id, false, true, false))
-					);
-				}
-
-				$s_show_display_on_index = false;
-
-				if ($forum_data['parent_id'] > 0)
-				{
-					// if this forum is a subforum put the "display on index" checkbox
-					if ($parent_info = $this->get_forum_info($forum_data['parent_id']))
-					{
-						if ($parent_info['parent_id'] > 0 || $parent_info['forum_type'] == FORUM_CAT)
-						{
-							$s_show_display_on_index = true;
-						}
-					}
-				}
-
-				if (strlen($forum_data['forum_password']) == 32)
-				{
-					$errors[] = phpbb::$user->lang['FORUM_PASSWORD_OLD'];
-				}
-
-				phpbb::$template->assign_vars(array(
-					'S_EDIT_FORUM'		=> true,
-					'S_ERROR'			=> (sizeof($errors)) ? true : false,
-					'S_PARENT_ID'		=> $this->parent_id,
-					'S_FORUM_PARENT_ID'	=> $forum_data['parent_id'],
-					'S_ADD_ACTION'		=> ($action == 'add') ? true : false,
-
-					'U_BACK'		=> $this->u_action . '&amp;parent_id=' . $this->parent_id,
-					'U_EDIT_ACTION'	=> $this->u_action . "&amp;parent_id={$this->parent_id}&amp;action=$action&amp;f=$forum_id",
-
-					'L_COPY_PERMISSIONS_EXPLAIN'	=> phpbb::$user->lang['COPY_PERMISSIONS_' . strtoupper($action) . '_EXPLAIN'],
-					'L_TITLE'						=> phpbb::$user->lang[$this->page_title],
-					'ERROR_MSG'						=> (sizeof($errors)) ? implode('<br />', $errors) : '',
-
-					'FORUM_NAME'				=> $forum_data['forum_name'],
-					'FORUM_DATA_LINK'			=> $forum_data['forum_link'],
-					'FORUM_IMAGE'				=> $forum_data['forum_image'],
-					'FORUM_IMAGE_SRC'			=> ($forum_data['forum_image']) ? PHPBB_ROOT_PATH . $forum_data['forum_image'] : '',
-					'FORUM_POST'				=> FORUM_POST,
-					'FORUM_LINK'				=> FORUM_LINK,
-					'FORUM_CAT'					=> FORUM_CAT,
-					'PRUNE_FREQ'				=> $forum_data['prune_freq'],
-					'PRUNE_DAYS'				=> $forum_data['prune_days'],
-					'PRUNE_VIEWED'				=> $forum_data['prune_viewed'],
-					'TOPICS_PER_PAGE'			=> $forum_data['forum_topics_per_page'],
-					'FORUM_RULES_LINK'			=> $forum_data['forum_rules_link'],
-					'FORUM_RULES'				=> $forum_data['forum_rules'],
-					'FORUM_RULES_PREVIEW'		=> $forum_rules_preview,
-					'FORUM_RULES_PLAIN'			=> $forum_rules_data['text'],
-					'S_BBCODE_CHECKED'			=> ($forum_rules_data['allow_bbcode']) ? true : false,
-					'S_SMILIES_CHECKED'			=> ($forum_rules_data['allow_smilies']) ? true : false,
-					'S_URLS_CHECKED'			=> ($forum_rules_data['allow_urls']) ? true : false,
-					'S_FORUM_PASSWORD_SET'		=> (empty($forum_data['forum_password'])) ? false : true,
-
-					'FORUM_DESC'				=> $forum_desc_data['text'],
-					'S_DESC_BBCODE_CHECKED'		=> ($forum_desc_data['allow_bbcode']) ? true : false,
-					'S_DESC_SMILIES_CHECKED'	=> ($forum_desc_data['allow_smilies']) ? true : false,
-					'S_DESC_URLS_CHECKED'		=> ($forum_desc_data['allow_urls']) ? true : false,
-
-					'S_FORUM_TYPE_OPTIONS'		=> $forum_type_options,
-					'S_STATUS_OPTIONS'			=> $statuslist,
-					'S_PARENT_OPTIONS'			=> $parents_list,
-					'S_STYLES_OPTIONS'			=> $styles_list,
-					'S_FORUM_OPTIONS'			=> make_forum_select(($action == 'add') ? $forum_data['parent_id'] : false, ($action == 'edit') ? $forum_data['forum_id'] : false, false, false, false),
-					'S_SHOW_DISPLAY_ON_INDEX'	=> $s_show_display_on_index,
-					'S_FORUM_POST'				=> ($forum_data['forum_type'] == FORUM_POST) ? true : false,
-					'S_FORUM_ORIG_POST'			=> (isset($old_forum_type) && $old_forum_type == FORUM_POST) ? true : false,
-					'S_FORUM_ORIG_CAT'			=> (isset($old_forum_type) && $old_forum_type == FORUM_CAT) ? true : false,
-					'S_FORUM_ORIG_LINK'			=> (isset($old_forum_type) && $old_forum_type == FORUM_LINK) ? true : false,
-					'S_FORUM_LINK'				=> ($forum_data['forum_type'] == FORUM_LINK) ? true : false,
-					'S_FORUM_CAT'				=> ($forum_data['forum_type'] == FORUM_CAT) ? true : false,
-					'S_ENABLE_INDEXING'			=> ($forum_data['enable_indexing']) ? true : false,
-					'S_TOPIC_ICONS'				=> ($forum_data['enable_icons']) ? true : false,
-					'S_DISPLAY_SUBFORUM_LIST'	=> ($forum_data['display_subforum_list']) ? true : false,
-					'S_DISPLAY_ON_INDEX'		=> ($forum_data['display_on_index']) ? true : false,
-					'S_PRUNE_ENABLE'			=> ($forum_data['enable_prune']) ? true : false,
-					'S_FORUM_LINK_TRACK'		=> ($forum_data['forum_flags'] & FORUM_FLAG_LINK_TRACK) ? true : false,
-					'S_PRUNE_OLD_POLLS'			=> ($forum_data['forum_flags'] & FORUM_FLAG_PRUNE_POLL) ? true : false,
-					'S_PRUNE_ANNOUNCE'			=> ($forum_data['forum_flags'] & FORUM_FLAG_PRUNE_ANNOUNCE) ? true : false,
-					'S_PRUNE_STICKY'			=> ($forum_data['forum_flags'] & FORUM_FLAG_PRUNE_STICKY) ? true : false,
-					'S_DISPLAY_ACTIVE_TOPICS'	=> ($forum_data['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS) ? true : false,
-					'S_ENABLE_POST_REVIEW'		=> ($forum_data['forum_flags'] & FORUM_FLAG_POST_REVIEW) ? true : false,
-					'S_CAN_COPY_PERMISSIONS'	=> ($action != 'edit' || empty($forum_id) || (phpbb::$acl->acl_get('a_fauth') && phpbb::$acl->acl_get('a_authusers') && phpbb::$acl->acl_get('a_authgroups') && phpbb::$acl->acl_get('a_mauth'))) ? true : false,
-				));
-
-				return;
-
-			break;
-
-			case 'delete':
-
-				if (!$forum_id)
-				{
-					trigger_error(phpbb::$user->lang['NO_FORUM'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
-				}
-
-				$forum_data = $this->get_forum_info($forum_id);
-
-				$subforums_id = array();
-				$subforums = get_forum_branch($forum_id, 'children');
-
-				foreach ($subforums as $row)
-				{
-					$subforums_id[] = $row['forum_id'];
-				}
-
-				$forums_list = make_forum_select($forum_data['parent_id'], $subforums_id);
-
-				$sql = 'SELECT forum_id
-					FROM ' . FORUMS_TABLE . '
-					WHERE forum_type = ' . FORUM_POST . "
-						AND forum_id <> $forum_id";
-				$result = phpbb::$db->sql_query_limit($sql, 1);
-
-				if (phpbb::$db->sql_fetchrow($result))
-				{
-					phpbb::$template->assign_vars(array(
-						'S_MOVE_FORUM_OPTIONS'		=> make_forum_select($forum_data['parent_id'], $subforums_id, false, true), // , false, true, false???
-					));
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				$parent_id = ($this->parent_id == $forum_id) ? 0 : $this->parent_id;
-
-				phpbb::$template->assign_vars(array(
-					'S_DELETE_FORUM'		=> true,
-					'U_ACTION'				=> $this->u_action . "&amp;parent_id={$parent_id}&amp;action=delete&amp;f=$forum_id",
-					'U_BACK'				=> $this->u_action . '&amp;parent_id=' . $this->parent_id,
-
-					'FORUM_NAME'			=> $forum_data['forum_name'],
-					'S_FORUM_POST'			=> ($forum_data['forum_type'] == FORUM_POST) ? true : false,
-					'S_FORUM_LINK'			=> ($forum_data['forum_type'] == FORUM_LINK) ? true : false,
-					'S_HAS_SUBFORUMS'		=> ($forum_data['right_id'] - $forum_data['left_id'] > 1) ? true : false,
-					'S_FORUMS_LIST'			=> $forums_list,
-					'S_ERROR'				=> (sizeof($errors)) ? true : false,
-					'ERROR_MSG'				=> (sizeof($errors)) ? implode('<br />', $errors) : '',
-				));
-
-				return;
-			break;
-		}
-
-		// Default management page
-		if (!$this->parent_id)
-		{
-			$navigation = phpbb::$user->lang['FORUM_INDEX'];
-		}
-		else
-		{
-			$navigation = '<a href="' . $this->u_action . '">' . phpbb::$user->lang['FORUM_INDEX'] . '</a>';
-
-			$forums_nav = get_forum_branch($this->parent_id, 'parents', 'descending');
-			foreach ($forums_nav as $row)
-			{
-				if ($row['forum_id'] == $this->parent_id)
-				{
-					$navigation .= ' -&gt; ' . $row['forum_name'];
-				}
-				else
-				{
-					$navigation .= ' -&gt; <a href="' . $this->u_action . '&amp;parent_id=' . $row['forum_id'] . '">' . $row['forum_name'] . '</a>';
-				}
-			}
-		}
-
-		// Jumpbox
-		$forum_box = make_forum_select($this->parent_id, false, false, false, false); //make_forum_select($this->parent_id);
-
-		if ($action == 'sync' || $action == 'sync_forum')
-		{
-			phpbb::$template->assign_var('S_RESYNCED', true);
-		}
-
-		$sql = 'SELECT *
-			FROM ' . FORUMS_TABLE . "
-			WHERE parent_id = $this->parent_id
-			ORDER BY left_id";
-		$result = phpbb::$db->sql_query($sql);
-
-		if ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			do
-			{
-				$forum_type = $row['forum_type'];
-
-				if ($row['forum_status'] == ITEM_LOCKED)
-				{
-					$folder_image = '<img src="images/icon_folder_lock.gif" alt="' . phpbb::$user->lang['LOCKED'] . '" />';
-				}
-				else
-				{
-					switch ($forum_type)
-					{
-						case FORUM_LINK:
-							$folder_image = '<img src="images/icon_folder_link.gif" alt="' . phpbb::$user->lang['LINK'] . '" />';
-						break;
-
-						default:
-							$folder_image = ($row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" alt="' . phpbb::$user->lang['SUBFORUM'] . '" />' : '<img src="images/icon_folder.gif" alt="' . phpbb::$user->lang['FOLDER'] . '" />';
-						break;
-					}
-				}
-
-				$url = $this->u_action . "&amp;parent_id=$this->parent_id&amp;f={$row['forum_id']}";
-
-				phpbb::$template->assign_block_vars('forums', array(
-					'FOLDER_IMAGE'		=> $folder_image,
-					'FORUM_IMAGE'		=> ($row['forum_image']) ? '<img src="' . PHPBB_ROOT_PATH . $row['forum_image'] . '" alt="" />' : '',
-					'FORUM_IMAGE_SRC'	=> ($row['forum_image']) ? PHPBB_ROOT_PATH . $row['forum_image'] : '',
-					'FORUM_NAME'		=> $row['forum_name'],
-					'FORUM_DESCRIPTION'	=> generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield'], $row['forum_desc_options']),
-					'FORUM_TOPICS'		=> $row['forum_topics'],
-					'FORUM_POSTS'		=> $row['forum_posts'],
-
-					'S_FORUM_LINK'		=> ($forum_type == FORUM_LINK) ? true : false,
-					'S_FORUM_POST'		=> ($forum_type == FORUM_POST) ? true : false,
-
-					'U_FORUM'			=> $this->u_action . '&amp;parent_id=' . $row['forum_id'],
-					'U_MOVE_UP'			=> $url . '&amp;action=move_up',
-					'U_MOVE_DOWN'		=> $url . '&amp;action=move_down',
-					'U_EDIT'			=> $url . '&amp;action=edit',
-					'U_DELETE'			=> $url . '&amp;action=delete',
-					'U_SYNC'			=> $url . '&amp;action=sync',
-				));
-			}
-			while ($row = phpbb::$db->sql_fetchrow($result));
-		}
-		else if ($this->parent_id)
-		{
-			$row = $this->get_forum_info($this->parent_id);
-
-			$url = $this->u_action . '&amp;parent_id=' . $this->parent_id . '&amp;f=' . $row['forum_id'];
-
-			phpbb::$template->assign_vars(array(
-				'S_NO_FORUMS'		=> true,
-
-				'U_EDIT'			=> $url . '&amp;action=edit',
-				'U_DELETE'			=> $url . '&amp;action=delete',
-				'U_SYNC'			=> $url . '&amp;action=sync',
-			));
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		phpbb::$template->assign_vars(array(
-			'ERROR_MSG'		=> (sizeof($errors)) ? implode('<br />', $errors) : '',
-			'NAVIGATION'	=> $navigation,
-			'FORUM_BOX'		=> $forum_box,
-			'U_SEL_ACTION'	=> $this->u_action,
-			'U_ACTION'		=> $this->u_action . '&amp;parent_id=' . $this->parent_id,
-
-			'U_PROGRESS_BAR'	=> $this->u_action . '&amp;action=progress_bar',
-			'UA_PROGRESS_BAR'	=> addslashes($this->u_action . '&amp;action=progress_bar'),
-		));
-	}
-
-	/**
-	* Get forum details
-	*/
-	function get_forum_info($forum_id)
-	{
-		$sql = 'SELECT *
-			FROM ' . FORUMS_TABLE . "
-			WHERE forum_id = $forum_id";
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$row)
-		{
-			trigger_error("Forum #$forum_id does not exist", E_USER_ERROR);
-		}
-
-		return $row;
-	}
-
-	/**
-	* Update forum data
-	*/
-	function update_forum_data(&$forum_data)
-	{
-		$errors = array();
-
-		if (!$forum_data['forum_name'])
-		{
-			$errors[] = phpbb::$user->lang['FORUM_NAME_EMPTY'];
-		}
-
-		if (utf8_strlen($forum_data['forum_desc']) > 4000)
-		{
-			$errors[] = phpbb::$user->lang['FORUM_DESC_TOO_LONG'];
-		}
-
-		if (utf8_strlen($forum_data['forum_rules']) > 4000)
-		{
-			$errors[] = phpbb::$user->lang['FORUM_RULES_TOO_LONG'];
-		}
-
-		if ($forum_data['forum_password'] || $forum_data['forum_password_confirm'])
-		{
-			if ($forum_data['forum_password'] != $forum_data['forum_password_confirm'])
-			{
-				$forum_data['forum_password'] = $forum_data['forum_password_confirm'] = '';
-				$errors[] = phpbb::$user->lang['FORUM_PASSWORD_MISMATCH'];
-			}
-		}
-
-		if ($forum_data['prune_days'] < 0 || $forum_data['prune_viewed'] < 0 || $forum_data['prune_freq'] < 0)
-		{
-			$forum_data['prune_days'] = $forum_data['prune_viewed'] = $forum_data['prune_freq'] = 0;
-			$errors[] = phpbb::$user->lang['FORUM_DATA_NEGATIVE'];
-		}
-
-		$range_test_ary = array(
-			array('lang' => 'FORUM_TOPICS_PAGE', 'value' => $forum_data['forum_topics_per_page'], 'column_type' => 'TINT:0'),
-		);
-
-		if (!file_exists(PHPBB_ROOT_PATH . $forum_data['forum_image']))
-		{
-			$errors[] = $user->lang['FORUM_IMAGE_NO_EXIST'];
-		}
-
-		validate_range($range_test_ary, $errors);
-
-		// Set forum flags
-		// 1 = link tracking
-		// 2 = prune old polls
-		// 4 = prune announcements
-		// 8 = prune stickies
-		// 16 = show active topics
-		// 32 = enable post review
-		$forum_data['forum_flags'] = 0;
-		$forum_data['forum_flags'] += ($forum_data['forum_link_track']) ? FORUM_FLAG_LINK_TRACK : 0;
-		$forum_data['forum_flags'] += ($forum_data['prune_old_polls']) ? FORUM_FLAG_PRUNE_POLL : 0;
-		$forum_data['forum_flags'] += ($forum_data['prune_announce']) ? FORUM_FLAG_PRUNE_ANNOUNCE : 0;
-		$forum_data['forum_flags'] += ($forum_data['prune_sticky']) ? FORUM_FLAG_PRUNE_STICKY : 0;
-		$forum_data['forum_flags'] += ($forum_data['show_active']) ? FORUM_FLAG_ACTIVE_TOPICS : 0;
-		$forum_data['forum_flags'] += ($forum_data['enable_post_review']) ? FORUM_FLAG_POST_REVIEW : 0;
-
-		// Unset data that are not database fields
-		$forum_data_sql = $forum_data;
-
-		unset($forum_data_sql['forum_link_track']);
-		unset($forum_data_sql['prune_old_polls']);
-		unset($forum_data_sql['prune_announce']);
-		unset($forum_data_sql['prune_sticky']);
-		unset($forum_data_sql['show_active']);
-		unset($forum_data_sql['enable_post_review']);
-		unset($forum_data_sql['forum_password_confirm']);
-
-		// What are we going to do tonight Brain? The same thing we do everynight,
-		// try to take over the world ... or decide whether to continue update
-		// and if so, whether it's a new forum/cat/link or an existing one
-		if (sizeof($errors))
-		{
-			return $errors;
-		}
-
-		// As we don't know the old password, it's kinda tricky to detect changes
-		if ($forum_data_sql['forum_password_unset'])
-		{
-			$forum_data_sql['forum_password'] = '';
-		}
-		else if (empty($forum_data_sql['forum_password']))
-		{
-			unset($forum_data_sql['forum_password']);
-		}
-		else
-		{
-			$forum_data_sql['forum_password'] = phpbb_hash($forum_data_sql['forum_password']);
-		}
-		unset($forum_data_sql['forum_password_unset']);
-
-		if (!isset($forum_data_sql['forum_id']))
-		{
-			// no forum_id means we're creating a new forum
-			unset($forum_data_sql['type_action']);
-
-			if ($forum_data_sql['parent_id'])
-			{
-				$sql = 'SELECT left_id, right_id, forum_type
-					FROM ' . FORUMS_TABLE . '
-					WHERE forum_id = ' . $forum_data_sql['parent_id'];
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$row)
-				{
-					trigger_error(phpbb::$user->lang['PARENT_NOT_EXIST'] . adm_back_link($this->u_action . '&amp;' . $this->parent_id), E_USER_WARNING);
-				}
-
-				if ($row['forum_type'] == FORUM_LINK)
-				{
-					$errors[] = phpbb::$user->lang['PARENT_IS_LINK_FORUM'];
-					return $errors;
-				}
-
-				$sql = 'UPDATE ' . FORUMS_TABLE . '
-					SET left_id = left_id + 2, right_id = right_id + 2
-					WHERE left_id > ' . $row['right_id'];
-				phpbb::$db->sql_query($sql);
-
-				$sql = 'UPDATE ' . FORUMS_TABLE . '
-					SET right_id = right_id + 2
-					WHERE ' . $row['left_id'] . ' BETWEEN left_id AND right_id';
-				phpbb::$db->sql_query($sql);
-
-				$forum_data_sql['left_id'] = $row['right_id'];
-				$forum_data_sql['right_id'] = $row['right_id'] + 1;
-			}
-			else
-			{
-				$sql = 'SELECT MAX(right_id) AS right_id
-					FROM ' . FORUMS_TABLE;
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				$forum_data_sql['left_id'] = $row['right_id'] + 1;
-				$forum_data_sql['right_id'] = $row['right_id'] + 2;
-			}
-
-			$sql = 'INSERT INTO ' . FORUMS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $forum_data_sql);
-			phpbb::$db->sql_query($sql);
-
-			$forum_data['forum_id'] = phpbb::$db->sql_nextid();
-
-			add_log('admin', 'LOG_FORUM_ADD', $forum_data['forum_name']);
-		}
-		else
-		{
-			$row = $this->get_forum_info($forum_data_sql['forum_id']);
-
-			if ($row['forum_type'] == FORUM_POST && $row['forum_type'] != $forum_data_sql['forum_type'])
-			{
-				// Has subforums and want to change into a link?
-				if ($row['right_id'] - $row['left_id'] > 1 && $forum_data_sql['forum_type'] == FORUM_LINK)
-				{
-					$errors[] = phpbb::$user->lang['FORUM_WITH_SUBFORUMS_NOT_TO_LINK'];
-					return $errors;
-				}
-
-				// we're turning a postable forum into a non-postable forum
-				if ($forum_data_sql['type_action'] == 'move')
-				{
-					$to_forum_id = request_var('to_forum_id', 0);
-
-					if ($to_forum_id)
-					{
-						$errors = $this->move_forum_content($forum_data_sql['forum_id'], $to_forum_id);
-					}
-					else
-					{
-						return array(phpbb::$user->lang['NO_DESTINATION_FORUM']);
-					}
-				}
-				else if ($forum_data_sql['type_action'] == 'delete')
-				{
-					$errors = $this->delete_forum_content($forum_data_sql['forum_id']);
-				}
-				else
-				{
-					return array(phpbb::$user->lang['NO_FORUM_ACTION']);
-				}
-
-				$forum_data_sql['forum_posts'] = $forum_data_sql['forum_topics'] = $forum_data_sql['forum_topics_real'] = $forum_data_sql['forum_last_post_id'] = $forum_data_sql['forum_last_poster_id'] = $forum_data_sql['forum_last_post_time'] = 0;
-				$forum_data_sql['forum_last_poster_name'] = $forum_data_sql['forum_last_poster_colour'] = '';
-			}
-			else if ($row['forum_type'] == FORUM_CAT && $forum_data_sql['forum_type'] == FORUM_LINK)
-			{
-				// Has subforums?
-				if ($row['right_id'] - $row['left_id'] > 1)
-				{
-					// We are turning a category into a link - but need to decide what to do with the subforums.
-					$action_subforums = request_var('action_subforums', '');
-					$subforums_to_id = request_var('subforums_to_id', 0);
-
-					if ($action_subforums == 'delete')
-					{
-						$rows = get_forum_branch($row['forum_id'], 'children', 'descending', false);
-
-						foreach ($rows as $_row)
-						{
-							// Do not remove the forum id we are about to change. ;)
-							if ($_row['forum_id'] == $row['forum_id'])
-							{
-								continue;
-							}
-
-							$forum_ids[] = $_row['forum_id'];
-							$errors = array_merge($errors, $this->delete_forum_content($_row['forum_id']));
-						}
-
-						if (sizeof($errors))
-						{
-							return $errors;
-						}
-
-						if (sizeof($forum_ids))
-						{
-							$sql = 'DELETE FROM ' . FORUMS_TABLE . '
-								WHERE ' . phpbb::$db->sql_in_set('forum_id', $forum_ids);
-							phpbb::$db->sql_query($sql);
-
-							$sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . '
-								WHERE ' . phpbb::$db->sql_in_set('forum_id', $forum_ids);
-							phpbb::$db->sql_query($sql);
-
-							$sql = 'DELETE FROM ' . ACL_USERS_TABLE . '
-								WHERE ' . phpbb::$db->sql_in_set('forum_id', $forum_ids);
-							phpbb::$db->sql_query($sql);
-
-							// Delete forum ids from extension groups table
-							$sql = 'SELECT group_id, allowed_forums
-								FROM ' . EXTENSION_GROUPS_TABLE;
-							$result = phpbb::$db->sql_query($sql);
-
-							while ($_row = phpbb::$db->sql_fetchrow($result))
-							{
-								if (!$_row['allowed_forums'])
-								{
-									continue;
-								}
-
-								$allowed_forums = unserialize(trim($_row['allowed_forums']));
-								$allowed_forums = array_diff($allowed_forums, $forum_ids);
-
-								$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . "
-									SET allowed_forums = '" . ((sizeof($allowed_forums)) ? serialize($allowed_forums) : '') . "'
-									WHERE group_id = {$_row['group_id']}";
-								phpbb::$db->sql_query($sql);
-							}
-							phpbb::$db->sql_freeresult($result);
-
-							phpbb::$acm->destroy('extensions');
-						}
-					}
-					else if ($action_subforums == 'move')
-					{
-						if (!$subforums_to_id)
-						{
-							return array(phpbb::$user->lang['NO_DESTINATION_FORUM']);
-						}
-
-						$sql = 'SELECT forum_name
-							FROM ' . FORUMS_TABLE . '
-							WHERE forum_id = ' . $subforums_to_id;
-						$result = phpbb::$db->sql_query($sql);
-						$_row = phpbb::$db->sql_fetchrow($result);
-						phpbb::$db->sql_freeresult($result);
-
-						if (!$_row)
-						{
-							return array(phpbb::$user->lang['NO_FORUM']);
-						}
-
-						$subforums_to_name = $_row['forum_name'];
-
-						$sql = 'SELECT forum_id
-							FROM ' . FORUMS_TABLE . "
-							WHERE parent_id = {$row['forum_id']}";
-						$result = phpbb::$db->sql_query($sql);
-
-						while ($_row = phpbb::$db->sql_fetchrow($result))
-						{
-							$this->move_forum($_row['forum_id'], $subforums_to_id);
-						}
-						phpbb::$db->sql_freeresult($result);
-
-						$sql = 'UPDATE ' . FORUMS_TABLE . "
-							SET parent_id = $subforums_to_id
-							WHERE parent_id = {$row['forum_id']}";
-						phpbb::$db->sql_query($sql);
-					}
-
-					// Adjust the left/right id
-					$sql = 'UPDATE ' . FORUMS_TABLE . '
-						SET right_id = left_id + 1
-						WHERE forum_id = ' . $row['forum_id'];
-					phpbb::$db->sql_query($sql);
-				}
-			}
-			else if ($row['forum_type'] == FORUM_CAT && $forum_data_sql['forum_type'] == FORUM_POST)
-			{
-				// Changing a category to a forum? Reset the data (you can't post directly in a cat, you must use a forum)
-				$forum_data_sql['forum_posts'] = 0;
-				$forum_data_sql['forum_topics'] = 0;
-				$forum_data_sql['forum_topics_real'] = 0;
-				$forum_data_sql['forum_last_post_id'] = 0;
-				$forum_data_sql['forum_last_post_subject'] = '';
-				$forum_data_sql['forum_last_post_time'] = 0;
-				$forum_data_sql['forum_last_poster_id'] = 0;
-				$forum_data_sql['forum_last_poster_name'] = '';
-				$forum_data_sql['forum_last_poster_colour'] = '';
-			}
-
-			if (sizeof($errors))
-			{
-				return $errors;
-			}
-
-			if ($row['parent_id'] != $forum_data_sql['parent_id'])
-			{
-				if ($row['forum_id'] != $forum_data_sql['parent_id'])
-				{
-					$errors = $this->move_forum($forum_data_sql['forum_id'], $forum_data_sql['parent_id']);
-				}
-				else
-				{
-					$forum_data_sql['parent_id'] = $row['parent_id'];
-				}
-			}
-
-			if (sizeof($errors))
-			{
-				return $errors;
-			}
-
-			unset($forum_data_sql['type_action']);
-
-			if ($row['forum_name'] != $forum_data_sql['forum_name'])
-			{
-				// the forum name has changed, clear the parents list of all forums (for safety)
-				$sql = 'UPDATE ' . FORUMS_TABLE . "
-					SET forum_parents = ''";
-				phpbb::$db->sql_query($sql);
-			}
-
-			// Setting the forum id to the forum id is not really received well by some dbs. ;)
-			$forum_id = $forum_data_sql['forum_id'];
-			unset($forum_data_sql['forum_id']);
-
-			$sql = 'UPDATE ' . FORUMS_TABLE . '
-				SET ' . phpbb::$db->sql_build_array('UPDATE', $forum_data_sql) . '
-				WHERE forum_id = ' . $forum_id;
-			phpbb::$db->sql_query($sql);
-
-			// Add it back
-			$forum_data['forum_id'] = $forum_id;
-
-			add_log('admin', 'LOG_FORUM_EDIT', $forum_data['forum_name']);
-		}
-
-		return $errors;
-	}
-
-	/**
-	* Move forum
-	*/
-	function move_forum($from_id, $to_id)
-	{
-		$to_data = $moved_ids = $errors = array();
-
-		// Check if we want to move to a parent with link type
-		if ($to_id > 0)
-		{
-			$to_data = $this->get_forum_info($to_id);
-
-			if ($to_data['forum_type'] == FORUM_LINK)
-			{
-				$errors[] = phpbb::$user->lang['PARENT_IS_LINK_FORUM'];
-				return $errors;
-			}
-		}
-
-		$moved_forums = get_forum_branch($from_id, 'children', 'descending');
-		$from_data = $moved_forums[0];
-		$diff = sizeof($moved_forums) * 2;
-
-		$moved_ids = array();
-		for ($i = 0; $i < sizeof($moved_forums); ++$i)
-		{
-			$moved_ids[] = $moved_forums[$i]['forum_id'];
-		}
-
-		// Resync parents
-		$sql = 'UPDATE ' . FORUMS_TABLE . "
-			SET right_id = right_id - $diff, forum_parents = ''
-			WHERE left_id < " . $from_data['right_id'] . "
-				AND right_id > " . $from_data['right_id'];
-		phpbb::$db->sql_query($sql);
-
-		// Resync righthand side of tree
-		$sql = 'UPDATE ' . FORUMS_TABLE . "
-			SET left_id = left_id - $diff, right_id = right_id - $diff, forum_parents = ''
-			WHERE left_id > " . $from_data['right_id'];
-		phpbb::$db->sql_query($sql);
-
-		if ($to_id > 0)
-		{
-			// Retrieve $to_data again, it may have been changed...
-			$to_data = $this->get_forum_info($to_id);
-
-			// Resync new parents
-			$sql = 'UPDATE ' . FORUMS_TABLE . "
-				SET right_id = right_id + $diff, forum_parents = ''
-				WHERE " . $to_data['right_id'] . ' BETWEEN left_id AND right_id
-					AND ' . phpbb::$db->sql_in_set('forum_id', $moved_ids, true);
-			phpbb::$db->sql_query($sql);
-
-			// Resync the righthand side of the tree
-			$sql = 'UPDATE ' . FORUMS_TABLE . "
-				SET left_id = left_id + $diff, right_id = right_id + $diff, forum_parents = ''
-				WHERE left_id > " . $to_data['right_id'] . '
-					AND ' . phpbb::$db->sql_in_set('forum_id', $moved_ids, true);
-			phpbb::$db->sql_query($sql);
-
-			// Resync moved branch
-			$to_data['right_id'] += $diff;
-
-			if ($to_data['right_id'] > $from_data['right_id'])
-			{
-				$diff = '+ ' . ($to_data['right_id'] - $from_data['right_id'] - 1);
-			}
-			else
-			{
-				$diff = '- ' . abs($to_data['right_id'] - $from_data['right_id'] - 1);
-			}
-		}
-		else
-		{
-			$sql = 'SELECT MAX(right_id) AS right_id
-				FROM ' . FORUMS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('forum_id', $moved_ids, true);
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			$diff = '+ ' . ($row['right_id'] - $from_data['left_id'] + 1);
-		}
-
-		$sql = 'UPDATE ' . FORUMS_TABLE . "
-			SET left_id = left_id $diff, right_id = right_id $diff, forum_parents = ''
-			WHERE " . phpbb::$db->sql_in_set('forum_id', $moved_ids);
-		phpbb::$db->sql_query($sql);
-
-		return $errors;
-	}
-
-	/**
-	* Move forum content from one to another forum
-	*/
-	function move_forum_content($from_id, $to_id, $sync = true)
-	{
-		$table_ary = array(LOG_TABLE, POSTS_TABLE, TOPICS_TABLE, DRAFTS_TABLE, TOPICS_TRACK_TABLE);
-
-		foreach ($table_ary as $table)
-		{
-			$sql = "UPDATE $table
-				SET forum_id = $to_id
-				WHERE forum_id = $from_id";
-			phpbb::$db->sql_query($sql);
-		}
-		unset($table_ary);
-
-		$table_ary = array(FORUMS_ACCESS_TABLE, FORUMS_TRACK_TABLE, FORUMS_WATCH_TABLE, MODERATOR_CACHE_TABLE);
-
-		foreach ($table_ary as $table)
-		{
-			$sql = "DELETE FROM $table
-				WHERE forum_id = $from_id";
-			phpbb::$db->sql_query($sql);
-		}
-
-		if ($sync)
-		{
-			// Delete ghost topics that link back to the same forum then resync counters
-			sync('topic_moved');
-			sync('forum', 'forum_id', $to_id, false, true);
-		}
-
-		return array();
-	}
-
-	/**
-	* Remove complete forum
-	*/
-	function delete_forum($forum_id, $action_posts = 'delete', $action_subforums = 'delete', $posts_to_id = 0, $subforums_to_id = 0)
-	{
-		$forum_data = $this->get_forum_info($forum_id);
-
-		$errors = array();
-		$log_action_posts = $log_action_forums = $posts_to_name = $subforums_to_name = '';
-		$forum_ids = array($forum_id);
-
-		if ($action_posts == 'delete')
-		{
-			$log_action_posts = 'POSTS';
-			$errors = array_merge($errors, $this->delete_forum_content($forum_id));
-		}
-		else if ($action_posts == 'move')
-		{
-			if (!$posts_to_id)
-			{
-				$errors[] = phpbb::$user->lang['NO_DESTINATION_FORUM'];
-			}
-			else
-			{
-				$log_action_posts = 'MOVE_POSTS';
-
-				$sql = 'SELECT forum_name
-					FROM ' . FORUMS_TABLE . '
-					WHERE forum_id = ' . $posts_to_id;
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$row)
-				{
-					$errors[] = phpbb::$user->lang['NO_FORUM'];
-				}
-				else
-				{
-					$posts_to_name = $row['forum_name'];
-					$errors = array_merge($errors, $this->move_forum_content($forum_id, $posts_to_id));
-				}
-			}
-		}
-
-		if (sizeof($errors))
-		{
-			return $errors;
-		}
-
-		if ($action_subforums == 'delete')
-		{
-			$log_action_forums = 'FORUMS';
-			$rows = get_forum_branch($forum_id, 'children', 'descending', false);
-
-			foreach ($rows as $row)
-			{
-				$forum_ids[] = $row['forum_id'];
-				$errors = array_merge($errors, $this->delete_forum_content($row['forum_id']));
-			}
-
-			if (sizeof($errors))
-			{
-				return $errors;
-			}
-
-			$diff = sizeof($forum_ids) * 2;
-
-			$sql = 'DELETE FROM ' . FORUMS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('forum_id', $forum_ids);
-			phpbb::$db->sql_query($sql);
-
-			$sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('forum_id', $forum_ids);
-			phpbb::$db->sql_query($sql);
-
-			$sql = 'DELETE FROM ' . ACL_USERS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('forum_id', $forum_ids);
-			phpbb::$db->sql_query($sql);
-		}
-		else if ($action_subforums == 'move')
-		{
-			if (!$subforums_to_id)
-			{
-				$errors[] = phpbb::$user->lang['NO_DESTINATION_FORUM'];
-			}
-			else
-			{
-				$log_action_forums = 'MOVE_FORUMS';
-
-				$sql = 'SELECT forum_name
-					FROM ' . FORUMS_TABLE . '
-					WHERE forum_id = ' . $subforums_to_id;
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$row)
-				{
-					$errors[] = phpbb::$user->lang['NO_FORUM'];
-				}
-				else
-				{
-					$subforums_to_name = $row['forum_name'];
-
-					$sql = 'SELECT forum_id
-						FROM ' . FORUMS_TABLE . "
-						WHERE parent_id = $forum_id";
-					$result = phpbb::$db->sql_query($sql);
-
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$this->move_forum($row['forum_id'], $subforums_to_id);
-					}
-					phpbb::$db->sql_freeresult($result);
-
-					// Grab new forum data for correct tree updating later
-					$forum_data = $this->get_forum_info($forum_id);
-
-					$sql = 'UPDATE ' . FORUMS_TABLE . "
-						SET parent_id = $subforums_to_id
-						WHERE parent_id = $forum_id";
-					phpbb::$db->sql_query($sql);
-
-					$diff = 2;
-					$sql = 'DELETE FROM ' . FORUMS_TABLE . "
-						WHERE forum_id = $forum_id";
-					phpbb::$db->sql_query($sql);
-
-					$sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . "
-						WHERE forum_id = $forum_id";
-					phpbb::$db->sql_query($sql);
-
-					$sql = 'DELETE FROM ' . ACL_USERS_TABLE . "
-						WHERE forum_id = $forum_id";
-					phpbb::$db->sql_query($sql);
-				}
-			}
-
-			if (sizeof($errors))
-			{
-				return $errors;
-			}
-		}
-		else
-		{
-			$diff = 2;
-			$sql = 'DELETE FROM ' . FORUMS_TABLE . "
-				WHERE forum_id = $forum_id";
-			phpbb::$db->sql_query($sql);
-
-			$sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . "
-				WHERE forum_id = $forum_id";
-			phpbb::$db->sql_query($sql);
-
-			$sql = 'DELETE FROM ' . ACL_USERS_TABLE . "
-				WHERE forum_id = $forum_id";
-			phpbb::$db->sql_query($sql);
-		}
-
-		// Resync tree
-		$sql = 'UPDATE ' . FORUMS_TABLE . "
-			SET right_id = right_id - $diff
-			WHERE left_id < {$forum_data['right_id']} AND right_id > {$forum_data['right_id']}";
-		phpbb::$db->sql_query($sql);
-
-		$sql = 'UPDATE ' . FORUMS_TABLE . "
-			SET left_id = left_id - $diff, right_id = right_id - $diff
-			WHERE left_id > {$forum_data['right_id']}";
-		phpbb::$db->sql_query($sql);
-
-		// Delete forum ids from extension groups table
-		$sql = 'SELECT group_id, allowed_forums
-			FROM ' . EXTENSION_GROUPS_TABLE;
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			if (!$row['allowed_forums'])
-			{
-				continue;
-			}
-
-			$allowed_forums = unserialize(trim($row['allowed_forums']));
-			$allowed_forums = array_diff($allowed_forums, $forum_ids);
-
-			$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . "
-				SET allowed_forums = '" . ((sizeof($allowed_forums)) ? serialize($allowed_forums) : '') . "'
-				WHERE group_id = {$row['group_id']}";
-			phpbb::$db->sql_query($sql);
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		phpbb::$acm->destroy('extensions');
-
-		$log_action = implode('_', array($log_action_posts, $log_action_forums));
-
-		switch ($log_action)
-		{
-			case 'MOVE_POSTS_MOVE_FORUMS':
-				add_log('admin', 'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS', $posts_to_name, $subforums_to_name, $forum_data['forum_name']);
-			break;
-
-			case 'MOVE_POSTS_FORUMS':
-				add_log('admin', 'LOG_FORUM_DEL_MOVE_POSTS_FORUMS', $posts_to_name, $forum_data['forum_name']);
-			break;
-
-			case 'POSTS_MOVE_FORUMS':
-				add_log('admin', 'LOG_FORUM_DEL_POSTS_MOVE_FORUMS', $subforums_to_name, $forum_data['forum_name']);
-			break;
-
-			case '_MOVE_FORUMS':
-				add_log('admin', 'LOG_FORUM_DEL_MOVE_FORUMS', $subforums_to_name, $forum_data['forum_name']);
-			break;
-
-			case 'MOVE_POSTS_':
-				add_log('admin', 'LOG_FORUM_DEL_MOVE_POSTS', $posts_to_name, $forum_data['forum_name']);
-			break;
-
-			case 'POSTS_FORUMS':
-				add_log('admin', 'LOG_FORUM_DEL_POSTS_FORUMS', $forum_data['forum_name']);
-			break;
-
-			case '_FORUMS':
-				add_log('admin', 'LOG_FORUM_DEL_FORUMS', $forum_data['forum_name']);
-			break;
-
-			case 'POSTS_':
-				add_log('admin', 'LOG_FORUM_DEL_POSTS', $forum_data['forum_name']);
-			break;
-
-			default:
-				add_log('admin', 'LOG_FORUM_DEL_FORUM', $forum_data['forum_name']);
-			break;
-		}
-
-		return $errors;
-	}
-
-	/**
-	* Delete forum content
-	*/
-	function delete_forum_content($forum_id)
-	{
-		include_once(PHPBB_ROOT_PATH . 'includes/functions_posting.' . PHP_EXT);
-
-		phpbb::$db->sql_transaction('begin');
-
-		// Select then delete all attachments
-		$sql = 'SELECT a.topic_id
-			FROM ' . POSTS_TABLE . ' p, ' . ATTACHMENTS_TABLE . " a
-			WHERE p.forum_id = $forum_id
-				AND a.in_message = 0
-				AND a.topic_id = p.topic_id";
-		$result = phpbb::$db->sql_query($sql);
-
-		$topic_ids = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$topic_ids[] = $row['topic_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		delete_attachments('topic', $topic_ids, false);
-
-		// Before we remove anything we make sure we are able to adjust the post counts later. ;)
-		$sql = 'SELECT poster_id
-			FROM ' . POSTS_TABLE . '
-			WHERE forum_id = ' . $forum_id . '
-				AND post_postcount = 1
-				AND post_approved = 1';
-		$result = phpbb::$db->sql_query($sql);
-
-		$post_counts = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$post_counts[$row['poster_id']] = (!empty($post_counts[$row['poster_id']])) ? $post_counts[$row['poster_id']] + 1 : 1;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		switch (phpbb::$db->dbms_type)
-		{
-			case 'mysql':
-
-				// Delete everything else and thank MySQL for offering multi-table deletion
-				$tables_ary = array(
-					SEARCH_WORDMATCH_TABLE	=> 'post_id',
-					REPORTS_TABLE			=> 'post_id',
-					WARNINGS_TABLE			=> 'post_id',
-					BOOKMARKS_TABLE			=> 'topic_id',
-					TOPICS_WATCH_TABLE		=> 'topic_id',
-					TOPICS_POSTED_TABLE		=> 'topic_id',
-					POLL_OPTIONS_TABLE		=> 'topic_id',
-					POLL_VOTES_TABLE		=> 'topic_id',
-				);
-
-				$sql = 'DELETE ' . POSTS_TABLE;
-				$sql_using = "\nFROM " . POSTS_TABLE;
-				$sql_where = "\nWHERE " . POSTS_TABLE . ".forum_id = $forum_id\n";
-
-				foreach ($tables_ary as $table => $field)
-				{
-					$sql .= ", $table ";
-					$sql_using .= ", $table ";
-					$sql_where .= "\nAND $table.$field = " . POSTS_TABLE . ".$field";
-				}
-
-				phpbb::$db->sql_query($sql . $sql_using . $sql_where);
-
-			break;
-
-			default:
-
-				// Delete everything else and curse your DB for not offering multi-table deletion
-				$tables_ary = array(
-					'post_id'	=>	array(
-						SEARCH_WORDMATCH_TABLE,
-						REPORTS_TABLE,
-						WARNINGS_TABLE,
-					),
-
-					'topic_id'	=>	array(
-						BOOKMARKS_TABLE,
-						TOPICS_WATCH_TABLE,
-						TOPICS_POSTED_TABLE,
-						POLL_OPTIONS_TABLE,
-						POLL_VOTES_TABLE,
-					)
-				);
-
-				foreach ($tables_ary as $field => $tables)
-				{
-					$start = 0;
-
-					do
-					{
-						$sql = "SELECT $field
-							FROM " . POSTS_TABLE . '
-							WHERE forum_id = ' . $forum_id;
-						$result = phpbb::$db->sql_query_limit($sql, 500, $start);
-
-						$ids = array();
-						while ($row = phpbb::$db->sql_fetchrow($result))
-						{
-							$ids[] = $row[$field];
-						}
-						phpbb::$db->sql_freeresult($result);
-
-						if (sizeof($ids))
-						{
-							$start += sizeof($ids);
-
-							foreach ($tables as $table)
-							{
-								phpbb::$db->sql_query("DELETE FROM $table WHERE " . phpbb::$db->sql_in_set($field, $ids));
-							}
-						}
-					}
-					while ($row);
-				}
-				unset($ids);
-
-			break;
-		}
-
-		$table_ary = array(FORUMS_ACCESS_TABLE, FORUMS_TRACK_TABLE, FORUMS_WATCH_TABLE, LOG_TABLE, MODERATOR_CACHE_TABLE, POSTS_TABLE, TOPICS_TABLE, TOPICS_TRACK_TABLE);
-
-		foreach ($table_ary as $table)
-		{
-			phpbb::$db->sql_query("DELETE FROM $table WHERE forum_id = $forum_id");
-		}
-
-		// Set forum ids to 0
-		$table_ary = array(DRAFTS_TABLE);
-
-		foreach ($table_ary as $table)
-		{
-			phpbb::$db->sql_query("UPDATE $table SET forum_id = 0 WHERE forum_id = $forum_id");
-		}
-
-		// Adjust users post counts
-		if (sizeof($post_counts))
-		{
-			foreach ($post_counts as $poster_id => $substract)
-			{
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_posts = 0
-					WHERE user_id = ' . $poster_id . '
-					AND user_posts < ' . $substract;
-				phpbb::$db->sql_query($sql);
-
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_posts = user_posts - ' . $substract . '
-					WHERE user_id = ' . $poster_id . '
-					AND user_posts >= ' . $substract;
-				phpbb::$db->sql_query($sql);
-			}
-		}
-
-		phpbb::$db->sql_transaction('commit');
-
-		// Make sure the overall post/topic count is correct...
-		$sql = 'SELECT COUNT(post_id) AS stat
-			FROM ' . POSTS_TABLE . '
-			WHERE post_approved = 1';
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		set_config('num_posts', (int) $row['stat'], true);
-
-		$sql = 'SELECT COUNT(topic_id) AS stat
-			FROM ' . TOPICS_TABLE . '
-			WHERE topic_approved = 1';
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		set_config('num_topics', (int) $row['stat'], true);
-
-		$sql = 'SELECT COUNT(attach_id) as stat
-			FROM ' . ATTACHMENTS_TABLE;
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		set_config('num_files', (int) $row['stat'], true);
-
-		$sql = 'SELECT SUM(filesize) as stat
-			FROM ' . ATTACHMENTS_TABLE;
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		set_config('upload_dir_size', (float) $row['stat'], true);
-
-		return array();
-	}
-
-	/**
-	* Move forum position by $steps up/down
-	*/
-	function move_forum_by($forum_row, $action = 'move_up', $steps = 1)
-	{
-		/**
-		* Fetch all the siblings between the module's current spot
-		* and where we want to move it to. If there are less than $steps
-		* siblings between the current spot and the target then the
-		* module will move as far as possible
-		*/
-		$sql = 'SELECT forum_id, forum_name, left_id, right_id
-			FROM ' . FORUMS_TABLE . "
-			WHERE parent_id = {$forum_row['parent_id']}
-				AND " . (($action == 'move_up') ? "right_id < {$forum_row['right_id']} ORDER BY right_id DESC" : "left_id > {$forum_row['left_id']} ORDER BY left_id ASC");
-		$result = phpbb::$db->sql_query_limit($sql, $steps);
-
-		$target = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$target = $row;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if (!sizeof($target))
-		{
-			// The forum is already on top or bottom
-			return false;
-		}
-
-		/**
-		* $left_id and $right_id define the scope of the nodes that are affected by the move.
-		* $diff_up and $diff_down are the values to substract or add to each node's left_id
-		* and right_id in order to move them up or down.
-		* $move_up_left and $move_up_right define the scope of the nodes that are moving
-		* up. Other nodes in the scope of ($left_id, $right_id) are considered to move down.
-		*/
-		if ($action == 'move_up')
-		{
-			$left_id = $target['left_id'];
-			$right_id = $forum_row['right_id'];
-
-			$diff_up = $forum_row['left_id'] - $target['left_id'];
-			$diff_down = $forum_row['right_id'] + 1 - $forum_row['left_id'];
-
-			$move_up_left = $forum_row['left_id'];
-			$move_up_right = $forum_row['right_id'];
-		}
-		else
-		{
-			$left_id = $forum_row['left_id'];
-			$right_id = $target['right_id'];
-
-			$diff_up = $forum_row['right_id'] + 1 - $forum_row['left_id'];
-			$diff_down = $target['right_id'] - $forum_row['right_id'];
-
-			$move_up_left = $forum_row['right_id'] + 1;
-			$move_up_right = $target['right_id'];
-		}
-
-		// Now do the dirty job
-		$sql = 'UPDATE ' . FORUMS_TABLE . "
-			SET left_id = left_id + CASE
-				WHEN left_id BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up}
-				ELSE {$diff_down}
-			END,
-			right_id = right_id + CASE
-				WHEN right_id BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up}
-				ELSE {$diff_down}
-			END,
-			forum_parents = ''
-			WHERE
-				left_id BETWEEN {$left_id} AND {$right_id}
-				AND right_id BETWEEN {$left_id} AND {$right_id}";
-		phpbb::$db->sql_query($sql);
-
-		return $target['forum_name'];
-	}
-
-	/**
-	* Display progress bar for syncinc forums
-	*/
-	function display_progress_bar($start, $total)
-	{
-		page_header(phpbb::$user->lang['SYNC_IN_PROGRESS']);
-
-		phpbb::$template->set_filenames(array(
-			'body'	=> 'progress_bar.html',
-		));
-
-		phpbb::$template->assign_vars(array(
-			'L_PROGRESS'			=> phpbb::$user->lang['SYNC_IN_PROGRESS'],
-			'L_PROGRESS_EXPLAIN'	=> ($start && $total) ? sprintf(phpbb::$user->lang['SYNC_IN_PROGRESS_EXPLAIN'], $start, $total) : phpbb::$user->lang['SYNC_IN_PROGRESS'],
-		));
-
-		page_footer();
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_groups.php b/phpBB/modules/acp/acp_groups.php
deleted file mode 100644
index 67d2f62ef4..0000000000
--- a/phpBB/modules/acp/acp_groups.php
+++ /dev/null
@@ -1,770 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_groups
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		global $file_uploads;
-
-		phpbb::$user->add_lang('acp/groups');
-		$this->tpl_name = 'acp_groups';
-		$this->page_title = 'ACP_GROUPS_MANAGE';
-
-		$form_key = 'acp_groups';
-		add_form_key($form_key);
-
-		include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-
-		// Check and set some common vars
-		$action		= (phpbb_request::is_set_post('add')) ? 'add' : ((phpbb_request::is_set_post('addusers')) ? 'addusers' : request_var('action', ''));
-		$group_id	= request_var('g', 0);
-		$mark_ary	= request_var('mark', array(0));
-		$name_ary	= request_var('usernames', '', true);
-		$leader		= request_var('leader', 0);
-		$default	= request_var('default', 0);
-		$start		= request_var('start', 0);
-		$update		= phpbb_request::is_set_post('update');
-
-
-		// Clear some vars
-		$can_upload = (file_exists(PHPBB_ROOT_PATH . phpbb::$config['avatar_path']) && @is_writable(PHPBB_ROOT_PATH . phpbb::$config['avatar_path']) && $file_uploads) ? true : false;
-		$group_row = array();
-
-		// Grab basic data for group, if group_id is set and exists
-		if ($group_id)
-		{
-			$sql = 'SELECT *
-				FROM ' . GROUPS_TABLE . "
-				WHERE group_id = $group_id";
-			$result = phpbb::$db->sql_query($sql);
-			$group_row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$group_row)
-			{
-				trigger_error(phpbb::$user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
-			}
-
-			// Check if the user is allowed to manage this group if set to founder only.
-			if (!phpbb::phpbb::$user->is_founder && $group_row['group_founder_manage'])
-			{
-				trigger_error(phpbb::$user->lang['NOT_ALLOWED_MANAGE_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
-			}
-		}
-
-		// Which page?
-		switch ($action)
-		{
-			case 'approve':
-			case 'demote':
-			case 'promote':
-				if (!$group_id)
-				{
-					trigger_error(phpbb::$user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				// Approve, demote or promote
-				$group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
-				$error = group_user_attributes($action, $group_id, $mark_ary, false, $group_name);
-
-				if (!$error)
-				{
-					switch ($action)
-					{
-						case 'demote':
-							$message = 'GROUP_MODS_DEMOTED';
-						break;
-
-						case 'promote':
-							$message = 'GROUP_MODS_PROMOTED';
-						break;
-
-						case 'approve':
-							$message = 'USERS_APPROVED';
-						break;
-					}
-
-					trigger_error(phpbb::$user->lang[$message] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
-				}
-				else
-				{
-					trigger_error(phpbb::$user->lang[$error] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id), E_USER_WARNING);
-				}
-
-			break;
-
-			case 'default':
-				if (!$group_id)
-				{
-					trigger_error(phpbb::$user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				if (confirm_box(true))
-				{
-					$group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
-
-					if (!sizeof($mark_ary))
-					{
-						$start = 0;
-
-						do
-						{
-							$sql = 'SELECT user_id
-								FROM ' . USER_GROUP_TABLE . "
-								WHERE group_id = $group_id
-								ORDER BY user_id";
-							$result = phpbb::$db->sql_query_limit($sql, 200, $start);
-
-							$mark_ary = array();
-							if ($row = phpbb::$db->sql_fetchrow($result))
-							{
-								do
-								{
-									$mark_ary[] = $row['user_id'];
-								}
-								while ($row = phpbb::$db->sql_fetchrow($result));
-
-								group_user_attributes('default', $group_id, $mark_ary, false, $group_name, $group_row);
-
-								$start = (sizeof($mark_ary) < 200) ? 0 : $start + 200;
-							}
-							else
-							{
-								$start = 0;
-							}
-							phpbb::$db->sql_freeresult($result);
-						}
-						while ($start);
-					}
-					else
-					{
-						group_user_attributes('default', $group_id, $mark_ary, false, $group_name, $group_row);
-					}
-
-					trigger_error(phpbb::$user->lang['GROUP_DEFS_UPDATED'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
-				}
-				else
-				{
-					confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-						'mark'		=> $mark_ary,
-						'g'			=> $group_id,
-						'i'			=> $id,
-						'mode'		=> $mode,
-						'action'	=> $action))
-					);
-				}
-
-			break;
-
-			case 'deleteusers':
-			case 'delete':
-				if (!$group_id)
-				{
-					trigger_error(phpbb::$user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-				else if ($action === 'delete' && $group_row['group_type'] == GROUP_SPECIAL)
-				{
-					trigger_error(phpbb::$user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				if (confirm_box(true))
-				{
-					$error = '';
-
-					switch ($action)
-					{
-						case 'delete':
-							if (!phpbb::$acl->acl_get('a_groupdel'))
-							{
-								trigger_error(phpbb::$user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
-							}
-
-							$error = group_delete($group_id, $group_row['group_name']);
-						break;
-
-						case 'deleteusers':
-							$group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
-							$error = group_user_del($group_id, $mark_ary, false, $group_name);
-						break;
-					}
-
-					$back_link = ($action == 'delete') ? $this->u_action : $this->u_action . '&amp;action=list&amp;g=' . $group_id;
-
-					if ($error)
-					{
-						trigger_error(phpbb::$user->lang[$error] . adm_back_link($back_link), E_USER_WARNING);
-					}
-
-					$message = ($action == 'delete') ? 'GROUP_DELETED' : 'GROUP_USERS_REMOVE';
-					trigger_error(phpbb::$user->lang[$message] . adm_back_link($back_link));
-				}
-				else
-				{
-					confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-						'mark'		=> $mark_ary,
-						'g'			=> $group_id,
-						'i'			=> $id,
-						'mode'		=> $mode,
-						'action'	=> $action))
-					);
-				}
-			break;
-
-			case 'addusers':
-				if (!$group_id)
-				{
-					trigger_error(phpbb::$user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				if (!$name_ary)
-				{
-					trigger_error(phpbb::$user->lang['NO_USERS'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id), E_USER_WARNING);
-				}
-
-				$name_ary = array_unique(explode("\n", $name_ary));
-				$group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
-
-				// Add user/s to group
-				if ($error = group_user_add($group_id, false, $name_ary, $group_name, $default, $leader, 0, $group_row))
-				{
-					trigger_error(phpbb::$user->lang[$error] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id), E_USER_WARNING);
-				}
-
-				$message = ($leader) ? 'GROUP_MODS_ADDED' : 'GROUP_USERS_ADDED';
-				trigger_error(phpbb::$user->lang[$message] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
-			break;
-
-			case 'edit':
-			case 'add':
-
-				include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-
-				$data = $submit_ary = array();
-
-				if ($action == 'edit' && !$group_id)
-				{
-					trigger_error(phpbb::$user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				if ($action == 'add' && !phpbb::$acl->acl_get('a_groupadd'))
-				{
-					trigger_error(phpbb::$user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				$error = array();
-				phpbb::$user->add_lang('ucp');
-
-				$avatar_select = basename(request_var('avatar_select', ''));
-				$category = basename(request_var('category', ''));
-
-				// Did we submit?
-				if ($update)
-				{
-					if (!check_form_key($form_key))
-					{
-						trigger_error(phpbb::$user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-
-					$group_name	= utf8_normalize_nfc(request_var('group_name', '', true));
-					$group_desc = utf8_normalize_nfc(request_var('group_desc', '', true));
-					$group_type	= request_var('group_type', GROUP_FREE);
-
-					$allow_desc_bbcode	= request_var('desc_parse_bbcode', false);
-					$allow_desc_urls	= request_var('desc_parse_urls', false);
-					$allow_desc_smilies	= request_var('desc_parse_smilies', false);
-
-					$data['uploadurl']	= request_var('uploadurl', '');
-					$data['remotelink']	= request_var('remotelink', '');
-					$data['width']		= request_var('width', '');
-					$data['height']		= request_var('height', '');
-					$delete				= request_var('delete', '');
-
-					$submit_ary = array(
-						'colour'			=> request_var('group_colour', ''),
-						'rank'				=> request_var('group_rank', 0),
-						'receive_pm'		=> phpbb_request::is_set('group_receive_pm') ? 1 : 0,
-						'legend'			=> phpbb_request::is_set('group_legend') ? 1 : 0,
-						'message_limit'		=> request_var('group_message_limit', 0),
-						'max_recipients'	=> request_var('group_max_recipients', 0),
-						'founder_manage'	=> 0,
-					);
-
-					if (phpbb::$user->is_founder)
-					{
-						$submit_ary['founder_manage'] = phpbb_request::is_set('group_founder_manage') ? 1 : 0;
-					}
-
-					if (!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl'] || $data['remotelink'])
-					{
-						// Avatar stuff
-						$var_ary = array(
-							'uploadurl'		=> array('string', true, 5, 255),
-							'remotelink'	=> array('string', true, 5, 255),
-							'width'			=> array('string', true, 1, 3),
-							'height'		=> array('string', true, 1, 3),
-						);
-
-						if (!($error = validate_data($data, $var_ary)))
-						{
-							$data['user_id'] = "g$group_id";
-
-							if ((!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl']) && $can_upload)
-							{
-								list($submit_ary['avatar_type'], $submit_ary['avatar'], $submit_ary['avatar_width'], $submit_ary['avatar_height']) = avatar_upload($data, $error);
-							}
-							else if ($data['remotelink'])
-							{
-								list($submit_ary['avatar_type'], $submit_ary['avatar'], $submit_ary['avatar_width'], $submit_ary['avatar_height']) = avatar_remote($data, $error);
-							}
-						}
-					}
-					else if ($avatar_select && phpbb::$config['allow_avatar_local'])
-					{
-						// check avatar gallery
-						if (is_dir(PHPBB_ROOT_PATH . phpbb::$config['avatar_gallery_path'] . '/' . $category))
-						{
-							$submit_ary['avatar_type'] = AVATAR_GALLERY;
-
-							list($submit_ary['avatar_width'], $submit_ary['avatar_height']) = getimagesize(PHPBB_ROOT_PATH . phpbb::$config['avatar_gallery_path'] . '/' . $category . '/' . $avatar_select);
-							$submit_ary['avatar'] = $category . '/' . $avatar_select;
-						}
-					}
-					else if ($delete)
-					{
-						$submit_ary['avatar'] = '';
-						$submit_ary['avatar_type'] = $submit_ary['avatar_width'] = $submit_ary['avatar_height'] = 0;
-					}
-					else if ($data['width'] && $data['height'])
-					{
-						// Only update the dimensions?
-						if (phpbb::$config['avatar_max_width'] || phpbb::$config['avatar_max_height'])
-						{
-							if ($data['width'] > phpbb::$config['avatar_max_width'] || $data['height'] > phpbb::$config['avatar_max_height'])
-							{
-								$error[] = sprintf(phpbb::$user->lang['AVATAR_WRONG_SIZE'], phpbb::$config['avatar_min_width'], phpbb::$config['avatar_min_height'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], $data['width'], $data['height']);
-							}
-						}
-
-						if (!sizeof($error))
-						{
-							if (phpbb::$config['avatar_min_width'] || phpbb::$config['avatar_min_height'])
-							{
-								if ($data['width'] < phpbb::$config['avatar_min_width'] || $data['height'] < phpbb::$config['avatar_min_height'])
-								{
-									$error[] = sprintf(phpbb::$user->lang['AVATAR_WRONG_SIZE'], phpbb::$config['avatar_min_width'], phpbb::$config['avatar_min_height'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], $data['width'], $data['height']);
-								}
-							}
-						}
-
-						if (!sizeof($error))
-						{
-							$submit_ary['avatar_width'] = $data['width'];
-							$submit_ary['avatar_height'] = $data['height'];
-						}
-					}
-
-					if ((isset($submit_ary['avatar']) && $submit_ary['avatar'] && (!isset($group_row['group_avatar']))) || $delete)
-					{
-						if (isset($group_row['group_avatar']) && $group_row['group_avatar'])
-						{
-							avatar_delete('group', $group_row, true);
-						}
-					}
-
-					if (!sizeof($error))
-					{
-						// Only set the rank, colour, etc. if it's changed or if we're adding a new
-						// group. This prevents existing group members being updated if no changes
-						// were made.
-
-						$group_attributes = array();
-						$test_variables = array('rank', 'colour', 'avatar', 'avatar_type', 'avatar_width', 'avatar_height', 'receive_pm', 'legend', 'message_limit', 'max_recipients', 'founder_manage');
-						foreach ($test_variables as $test)
-						{
-							if (isset($submit_ary[$test]) && ($action == 'add' || $group_row['group_' . $test] != $submit_ary[$test]))
-							{
-								$group_attributes['group_' . $test] = $group_row['group_' . $test] = $submit_ary[$test];
-							}
-						}
-
-						if (!($error = group_create($group_id, $group_type, $group_name, $group_desc, $group_attributes, $allow_desc_bbcode, $allow_desc_urls, $allow_desc_smilies)))
-						{
-							$group_perm_from = request_var('group_perm_from', 0);
-
-							// Copy permissions?
-							// If the user has the a_authgroups permission and at least one additional permission ability set the permissions are fully transferred.
-							// We do not limit on one auth category because this can lead to incomplete permissions being tricky to fix for the admin, roles being assigned or added non-default permissions.
-							// Since the user only has the option to copy permissions from non leader managed groups this seems to be a good compromise.
-							if ($group_perm_from && $action == 'add' && phpbb::$acl->acl_get('a_authgroups') && phpbb::$acl->acl_gets('a_aauth', 'a_fauth', 'a_mauth', 'a_uauth'))
-							{
-								$sql = 'SELECT group_founder_manage
-									FROM ' . GROUPS_TABLE . '
-									WHERE group_id = ' . $group_perm_from;
-								$result = phpbb::$db->sql_query($sql);
-								$check_row = phpbb::$db->sql_fetchrow($result);
-								phpbb::$db->sql_freeresult($result);
-
-								// Check the group if non-founder
-								if ($check_row && (phpbb::$user->is_founder || $check_row['group_founder_manage'] == 0))
-								{
-									// @todo CHANGE - do we support < 4.0.14?
-									// From the mysql documentation:
-									// Prior to MySQL 4.0.14, the target table of the INSERT statement cannot appear in the FROM clause of the SELECT part of the query. This limitation is lifted in 4.0.14.
-									// Due to this we stay on the safe side if we do the insertion "the manual way"
-
-									// Copy permisisons from/to the acl groups table (only group_id gets changed)
-									$sql = 'SELECT forum_id, auth_option_id, auth_role_id, auth_setting
-										FROM ' . ACL_GROUPS_TABLE . '
-										WHERE group_id = ' . $group_perm_from;
-									$result = phpbb::$db->sql_query($sql);
-
-									$groups_sql_ary = array();
-									while ($row = phpbb::$db->sql_fetchrow($result))
-									{
-										$groups_sql_ary[] = array(
-											'group_id'			=> (int) $group_id,
-											'forum_id'			=> (int) $row['forum_id'],
-											'auth_option_id'	=> (int) $row['auth_option_id'],
-											'auth_role_id'		=> (int) $row['auth_role_id'],
-											'auth_setting'		=> (int) $row['auth_setting']
-										);
-									}
-									phpbb::$db->sql_freeresult($result);
-
-									// Now insert the data
-									phpbb::$db->sql_multi_insert(ACL_GROUPS_TABLE, $groups_sql_ary);
-
-									phpbb::$acl->acl_clear_prefetch();
-								}
-							}
-
-							phpbb::$acm->destroy_sql(GROUPS_TABLE);
-
-							$message = ($action == 'edit') ? 'GROUP_UPDATED' : 'GROUP_CREATED';
-							trigger_error(phpbb::$user->lang[$message] . adm_back_link($this->u_action));
-						}
-					}
-
-					if (sizeof($error))
-					{
-						$group_rank = $submit_ary['rank'];
-
-						$group_desc_data = array(
-							'text'			=> $group_desc,
-							'allow_bbcode'	=> $allow_desc_bbcode,
-							'allow_smilies'	=> $allow_desc_smilies,
-							'allow_urls'	=> $allow_desc_urls
-						);
-					}
-				}
-				else if (!$group_id)
-				{
-					$group_name = utf8_normalize_nfc(request_var('group_name', '', true));
-					$group_desc_data = array(
-						'text'			=> '',
-						'allow_bbcode'	=> true,
-						'allow_smilies'	=> true,
-						'allow_urls'	=> true
-					);
-					$group_rank = 0;
-					$group_type = GROUP_OPEN;
-				}
-				else
-				{
-					$group_name = $group_row['group_name'];
-					$group_desc_data = generate_text_for_edit($group_row['group_desc'], $group_row['group_desc_uid'], $group_row['group_desc_options']);
-					$group_type = $group_row['group_type'];
-					$group_rank = $group_row['group_rank'];
-				}
-
-				$sql = 'SELECT *
-					FROM ' . RANKS_TABLE . '
-					WHERE rank_special = 1
-					ORDER BY rank_title';
-				$result = phpbb::$db->sql_query($sql);
-
-				$rank_options = '<option value="0"' . ((!$group_rank) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang['USER_DEFAULT'] . '</option>';
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$selected = ($group_rank && $row['rank_id'] == $group_rank) ? ' selected="selected"' : '';
-					$rank_options .= '<option value="' . $row['rank_id'] . '"' . $selected . '>' . $row['rank_title'] . '</option>';
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				$type_free		= ($group_type == GROUP_FREE) ? ' checked="checked"' : '';
-				$type_open		= ($group_type == GROUP_OPEN) ? ' checked="checked"' : '';
-				$type_closed	= ($group_type == GROUP_CLOSED) ? ' checked="checked"' : '';
-				$type_hidden	= ($group_type == GROUP_HIDDEN) ? ' checked="checked"' : '';
-
-				$avatar_img = (!empty($group_row['group_avatar'])) ? get_user_avatar($group_row['group_avatar'], $group_row['group_avatar_type'], $group_row['group_avatar_width'], $group_row['group_avatar_height'], 'GROUP_AVATAR') : '<img src="' . PHPBB_ADMIN_PATH . 'images/no_avatar.gif" alt="" />';
-
-				$display_gallery = phpbb_request::is_set_post('display_gallery');
-
-				if (phpbb::$config['allow_avatar_local'] && $display_gallery)
-				{
-					avatar_gallery($category, $avatar_select, 4);
-				}
-
-				$back_link = request_var('back_link', '');
-
-				switch ($back_link)
-				{
-					case 'acp_users_groups':
-						$u_back = append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, 'i=users&amp;mode=groups&amp;u=' . request_var('u', 0));
-					break;
-
-					default:
-						$u_back = $this->u_action;
-					break;
-				}
-
-				phpbb::$template->assign_vars(array(
-					'S_EDIT'			=> true,
-					'S_ADD_GROUP'		=> ($action == 'add') ? true : false,
-					'S_GROUP_PERM'		=> ($action == 'add' && phpbb::$acl->acl_get('a_authgroups') && phpbb::$acl->acl_gets('a_aauth', 'a_fauth', 'a_mauth', 'a_uauth')) ? true : false,
-					'S_INCLUDE_SWATCH'	=> true,
-					'S_CAN_UPLOAD'		=> $can_upload,
-					'S_ERROR'			=> (sizeof($error)) ? true : false,
-					'S_SPECIAL_GROUP'	=> ($group_type == GROUP_SPECIAL) ? true : false,
-					'S_DISPLAY_GALLERY'	=> (phpbb::$config['allow_avatar_local'] && !$display_gallery) ? true : false,
-					'S_IN_GALLERY'		=> (phpbb::$config['allow_avatar_local'] && $display_gallery) ? true : false,
-					'S_USER_FOUNDER'	=> phpbb::$user->is_founder,
-
-					'ERROR_MSG'				=> (sizeof($error)) ? implode('<br />', $error) : '',
-					'GROUP_NAME'			=> ($group_type == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $group_name] : $group_name,
-					'GROUP_INTERNAL_NAME'	=> $group_name,
-					'GROUP_DESC'			=> $group_desc_data['text'],
-					'GROUP_RECEIVE_PM'		=> (isset($group_row['group_receive_pm']) && $group_row['group_receive_pm']) ? ' checked="checked"' : '',
-					'GROUP_FOUNDER_MANAGE'	=> (isset($group_row['group_founder_manage']) && $group_row['group_founder_manage']) ? ' checked="checked"' : '',
-					'GROUP_LEGEND'			=> (isset($group_row['group_legend']) && $group_row['group_legend']) ? ' checked="checked"' : '',
-					'GROUP_MESSAGE_LIMIT'	=> (isset($group_row['group_message_limit'])) ? $group_row['group_message_limit'] : 0,
-					'GROUP_MAX_RECIPIENTS'	=> (isset($group_row['group_max_recipients'])) ? $group_row['group_max_recipients'] : 0,
-					'GROUP_COLOUR'			=> (isset($group_row['group_colour'])) ? $group_row['group_colour'] : '',
-
-					'S_DESC_BBCODE_CHECKED'	=> $group_desc_data['allow_bbcode'],
-					'S_DESC_URLS_CHECKED'	=> $group_desc_data['allow_urls'],
-					'S_DESC_SMILIES_CHECKED'=> $group_desc_data['allow_smilies'],
-
-					'S_RANK_OPTIONS'		=> $rank_options,
-					'S_GROUP_OPTIONS'		=> group_select_options(false, false, ((phpbb::$user->is_founder) ? false : 0)),
-					'AVATAR'				=> $avatar_img,
-					'AVATAR_IMAGE'			=> $avatar_img,
-					'AVATAR_MAX_FILESIZE'	=> phpbb::$config['avatar_filesize'],
-					'AVATAR_WIDTH'			=> (isset($group_row['group_avatar_width'])) ? $group_row['group_avatar_width'] : '',
-					'AVATAR_HEIGHT'			=> (isset($group_row['group_avatar_height'])) ? $group_row['group_avatar_height'] : '',
-
-					'GROUP_TYPE_FREE'		=> GROUP_FREE,
-					'GROUP_TYPE_OPEN'		=> GROUP_OPEN,
-					'GROUP_TYPE_CLOSED'		=> GROUP_CLOSED,
-					'GROUP_TYPE_HIDDEN'		=> GROUP_HIDDEN,
-					'GROUP_TYPE_SPECIAL'	=> GROUP_SPECIAL,
-
-					'GROUP_FREE'		=> $type_free,
-					'GROUP_OPEN'		=> $type_open,
-					'GROUP_CLOSED'		=> $type_closed,
-					'GROUP_HIDDEN'		=> $type_hidden,
-
-					'U_BACK'			=> $u_back,
-					'U_SWATCH'			=> append_sid(PHPBB_ADMIN_PATH . 'swatch.' . PHP_EXT, 'form=settings&amp;name=group_colour'),
-					'U_ACTION'			=> "{$this->u_action}&amp;action=$action&amp;g=$group_id",
-					'L_AVATAR_EXPLAIN'	=> sprintf(phpbb::$user->lang['AVATAR_EXPLAIN'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], round(phpbb::$config['avatar_filesize'] / 1024)),
-				));
-
-				return;
-			break;
-
-			case 'list':
-
-				if (!$group_id)
-				{
-					trigger_error(phpbb::$user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				$this->page_title = 'GROUP_MEMBERS';
-
-				// Grab the leaders - always, on every page...
-				$sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_regdate, u.user_posts, u.group_id, ug.group_leader, ug.user_pending
-					FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug
-					WHERE ug.group_id = $group_id
-						AND u.user_id = ug.user_id
-						AND ug.group_leader = 1
-					ORDER BY ug.group_leader DESC, ug.user_pending ASC, u.username_clean";
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					phpbb::$template->assign_block_vars('leader', array(
-						'U_USER_EDIT'		=> append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=users&amp;action=edit&amp;u={$row['user_id']}"),
-
-						'USERNAME'			=> $row['username'],
-						'S_GROUP_DEFAULT'	=> ($row['group_id'] == $group_id) ? true : false,
-						'JOINED'			=> ($row['user_regdate']) ? phpbb::$user->format_date($row['user_regdate']) : ' - ',
-						'USER_POSTS'		=> $row['user_posts'],
-						'USER_ID'			=> $row['user_id'],
-					));
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				// Total number of group members (non-leaders)
-				$sql = 'SELECT COUNT(user_id) AS total_members
-					FROM ' . USER_GROUP_TABLE . "
-					WHERE group_id = $group_id
-						AND group_leader = 0";
-				$result = phpbb::$db->sql_query($sql);
-				$total_members = (int) phpbb::$db->sql_fetchfield('total_members');
-				phpbb::$db->sql_freeresult($result);
-
-				$s_action_options = '';
-				$options = array('default' => 'DEFAULT', 'approve' => 'APPROVE', 'demote' => 'DEMOTE', 'promote' => 'PROMOTE', 'deleteusers' => 'DELETE');
-
-				foreach ($options as $option => $lang)
-				{
-					$s_action_options .= '<option value="' . $option . '">' . phpbb::$user->lang['GROUP_' . $lang] . '</option>';
-				}
-
-				phpbb::$template->assign_vars(array(
-					'S_LIST'			=> true,
-					'S_GROUP_SPECIAL'	=> ($group_row['group_type'] == GROUP_SPECIAL) ? true : false,
-					'S_ACTION_OPTIONS'	=> $s_action_options,
-
-					'S_ON_PAGE'		=> on_page($total_members, phpbb::$config['topics_per_page'], $start),
-					'PAGINATION'	=> generate_pagination($this->u_action . "&amp;action=$action&amp;g=$group_id", $total_members, phpbb::$config['topics_per_page'], $start, true),
-					'GROUP_NAME'	=> ($group_row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $group_row['group_name']] : $group_row['group_name'],
-
-					'U_ACTION'			=> $this->u_action . "&amp;g=$group_id",
-					'U_BACK'			=> $this->u_action,
-					'U_FIND_USERNAME'	=> append_sid('memberlist', 'mode=searchuser&amp;form=list&amp;field=usernames'),
-					'U_DEFAULT_ALL'		=> "{$this->u_action}&amp;action=default&amp;g=$group_id",
-				));
-
-				// Grab the members
-				$sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_regdate, u.user_posts, u.group_id, ug.group_leader, ug.user_pending
-					FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug
-					WHERE ug.group_id = $group_id
-						AND u.user_id = ug.user_id
-						AND ug.group_leader = 0
-					ORDER BY ug.group_leader DESC, ug.user_pending ASC, u.username_clean";
-				$result = phpbb::$db->sql_query_limit($sql, phpbb::$config['topics_per_page'], $start);
-
-				$pending = false;
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					if ($row['user_pending'] && !$pending)
-					{
-						phpbb::$template->assign_block_vars('member', array(
-							'S_PENDING'		=> true,
-						));
-
-						$pending = true;
-					}
-
-					phpbb::$template->assign_block_vars('member', array(
-						'U_USER_EDIT'		=> append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=users&amp;action=edit&amp;u={$row['user_id']}"),
-
-						'USERNAME'			=> $row['username'],
-						'S_GROUP_DEFAULT'	=> ($row['group_id'] == $group_id) ? true : false,
-						'JOINED'			=> ($row['user_regdate']) ? phpbb::$user->format_date($row['user_regdate']) : ' - ',
-						'USER_POSTS'		=> $row['user_posts'],
-						'USER_ID'			=> $row['user_id'],
-					));
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				return;
-			break;
-		}
-
-		phpbb::$template->assign_vars(array(
-			'U_ACTION'		=> $this->u_action,
-			'S_GROUP_ADD'	=> (phpbb::$acl->acl_get('a_groupadd')) ? true : false,
-		));
-
-		// Get us all the groups
-		$sql = 'SELECT g.group_id, g.group_name, g.group_type
-			FROM ' . GROUPS_TABLE . ' g
-			ORDER BY g.group_type ASC, g.group_name';
-		$result = phpbb::$db->sql_query($sql);
-
-		$lookup = $cached_group_data = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$type = ($row['group_type'] == GROUP_SPECIAL) ? 'special' : 'normal';
-
-			// used to determine what type a group is
-			$lookup[$row['group_id']] = $type;
-
-			// used for easy access to the data within a group
-			$cached_group_data[$type][$row['group_id']] = $row;
-			$cached_group_data[$type][$row['group_id']]['total_members'] = 0;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// How many people are in which group?
-		$sql = 'SELECT COUNT(ug.user_id) AS total_members, ug.group_id
-			FROM ' . USER_GROUP_TABLE . ' ug
-			WHERE ' . phpbb::$db->sql_in_set('ug.group_id', array_keys($lookup)) . '
-			GROUP BY ug.group_id';
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$type = $lookup[$row['group_id']];
-			$cached_group_data[$type][$row['group_id']]['total_members'] = $row['total_members'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// The order is... normal, then special
-		ksort($cached_group_data);
-
-		foreach ($cached_group_data as $type => $row_ary)
-		{
-			if ($type == 'special')
-			{
-				phpbb::$template->assign_block_vars('groups', array(
-					'S_SPECIAL'			=> true,
-				));
-			}
-
-			foreach ($row_ary as $group_id => $row)
-			{
-				$group_name = (!empty(phpbb::$user->lang['G_' . $row['group_name']]))? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name'];
-
-				phpbb::$template->assign_block_vars('groups', array(
-					'U_LIST'		=> "{$this->u_action}&amp;action=list&amp;g=$group_id",
-					'U_EDIT'		=> "{$this->u_action}&amp;action=edit&amp;g=$group_id",
-					'U_DELETE'		=> (phpbb::$acl->acl_get('a_groupdel')) ? "{$this->u_action}&amp;action=delete&amp;g=$group_id" : '',
-
-					'S_GROUP_SPECIAL'	=> ($row['group_type'] == GROUP_SPECIAL) ? true : false,
-
-					'GROUP_NAME'	=> $group_name,
-					'TOTAL_MEMBERS'	=> $row['total_members'],
-				));
-			}
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_icons.php b/phpBB/modules/acp/acp_icons.php
deleted file mode 100644
index be435995e1..0000000000
--- a/phpBB/modules/acp/acp_icons.php
+++ /dev/null
@@ -1,862 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @todo [smilies] check regular expressions for special char replacements (stored specialchared in db)
-* @package acp
-*/
-class acp_icons
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		phpbb::$user->add_lang('acp/posting');
-
-		// Set up general vars
-		$action = request_var('action', '');
-		$action = (phpbb_request::is_set_post('add')) ? 'add' : $action;
-		$action = (phpbb_request::is_set_post('edit')) ? 'edit' : $action;
-		$action = (phpbb_request::is_set_post('import')) ? 'import' : $action;
-		$icon_id = request_var('id', 0);
-
-		$mode = ($mode == 'smilies') ? 'smilies' : 'icons';
-
-		$this->tpl_name = 'acp_icons';
-
-		// What are we working on?
-		switch ($mode)
-		{
-			case 'smilies':
-				$table = SMILIES_TABLE;
-				$lang = 'SMILIES';
-				$fields = 'smiley';
-				$img_path = phpbb::$config['smilies_path'];
-			break;
-
-			case 'icons':
-				$table = ICONS_TABLE;
-				$lang = 'ICONS';
-				$fields = 'icons';
-				$img_path = phpbb::$config['icons_path'];
-			break;
-		}
-
-		$this->page_title = 'ACP_' . $lang;
-
-		// Clear some arrays
-		$_images = $_paks = array();
-		$notice = '';
-
-		// Grab file list of paks and images
-		if ($action == 'edit' || $action == 'add' || $action == 'import')
-		{
-			$imglist = filelist(PHPBB_ROOT_PATH . $img_path, '');
-
-			foreach ($imglist as $path => $img_ary)
-			{
-				if (empty($img_ary))
-				{
-					continue;
-				}
-
-				asort($img_ary, SORT_STRING);
-
-				foreach ($img_ary as $img)
-				{
-					$img_size = getimagesize(PHPBB_ROOT_PATH . $img_path . '/' . $path . $img);
-
-					if (!$img_size[0] || !$img_size[1] || strlen($img) > 255)
-					{
-						continue;
-					}
-
-					$_images[$path . $img]['file'] = $path . $img;
-					$_images[$path . $img]['width'] = $img_size[0];
-					$_images[$path . $img]['height'] = $img_size[1];
-				}
-			}
-			unset($imglist);
-
-			if ($dir = @opendir(PHPBB_ROOT_PATH . $img_path))
-			{
-				while (($file = readdir($dir)) !== false)
-				{
-					if (is_file(PHPBB_ROOT_PATH . $img_path . '/' . $file) && preg_match('#\.pak$#i', $file))
-					{
-						$_paks[] = $file;
-					}
-				}
-				closedir($dir);
-
-				if (!empty($_paks))
-				{
-					asort($_paks, SORT_STRING);
-				}
-			}
-		}
-
-		// What shall we do today? Oops, I believe that's trademarked ...
-		switch ($action)
-		{
-			case 'edit':
-				unset($_images);
-				$_images = array();
-
-			// no break;
-
-			case 'add':
-
-				$smilies = $default_row = array();
-				$smiley_options = $order_list = $add_order_list = '';
-
-				if ($action == 'add' && $mode == 'smilies')
-				{
-					$sql = 'SELECT *
-						FROM ' . SMILIES_TABLE . '
-						ORDER BY smiley_order';
-					$result = phpbb::$db->sql_query($sql);
-
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						if (empty($smilies[$row['smiley_url']]))
-						{
-							$smilies[$row['smiley_url']] = $row;
-						}
-					}
-					phpbb::$db->sql_freeresult($result);
-
-					if (sizeof($smilies))
-					{
-						foreach ($smilies as $row)
-						{
-							$selected = false;
-
-							if (!$smiley_options)
-							{
-								$selected = true;
-								$default_row = $row;
-							}
-							$smiley_options .= '<option value="' . $row['smiley_url'] . '"' . (($selected) ? ' selected="selected"' : '') . '>' . $row['smiley_url'] . '</option>';
-
-							phpbb::$template->assign_block_vars('smile', array(
-								'SMILEY_URL'	=> addslashes($row['smiley_url']),
-								'CODE'			=> addslashes($row['code']),
-								'EMOTION'		=> addslashes($row['emotion']),
-								'WIDTH'			=> $row['smiley_width'],
-								'HEIGHT'		=> $row['smiley_height'],
-								'ORDER'			=> $row['smiley_order'] + 1,
-							));
-						}
-					}
-				}
-
-				$sql = "SELECT *
-					FROM $table
-					ORDER BY {$fields}_order " . (($icon_id || $action == 'add') ? 'DESC' : 'ASC');
-				$result = phpbb::$db->sql_query($sql);
-
-				$data = array();
-				$after = false;
-				$display = 0;
-				$order_lists = array('', '');
-				$add_order_lists = array('', '');
-				$display_count = 0;
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					if ($action == 'add')
-					{
-						unset($_images[$row[$fields . '_url']]);
-					}
-
-
-					if ($row[$fields . '_id'] == $icon_id)
-					{
-						$after = true;
-						$display = $row['display_on_posting'];
-						$data[$row[$fields . '_url']] = $row;
-					}
-					else
-					{
-						if ($action == 'edit' && !$icon_id)
-						{
-							$data[$row[$fields . '_url']] = $row;
-						}
-
-						$selected = '';
-						if (!empty($after))
-						{
-							$selected = ' selected="selected"';
-							$after = false;
-						}
-						if ($row['display_on_posting'])
-						{
-							$display_count++;
-						}
-						$after_txt = ($mode == 'smilies') ? $row['code'] : $row['icons_url'];
-						$order_lists[$row['display_on_posting']] = '<option value="' . ($row[$fields . '_order'] + 1) . '"' . $selected . '>' . sprintf(phpbb::$user->lang['AFTER_' . $lang], ' -&gt; ' . $after_txt) . '</option>' . $order_lists[$row['display_on_posting']];
-
-						if (!empty($default_row))
-						{
-							$add_order_lists[$row['display_on_posting']] = '<option value="' . ($row[$fields . '_order'] + 1) . '"' . (($row[$fields . '_id'] == $default_row['smiley_id']) ? ' selected="selected"' : '') . '>' . sprintf(phpbb::$user->lang['AFTER_' . $lang], ' -&gt; ' . $after_txt) . '</option>' . $add_order_lists[$row['display_on_posting']];
-						}
-					}
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				$order_list = '<option value="1"' . ((!isset($after)) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang['FIRST'] . '</option>';
-				$add_order_list = '<option value="1">' . phpbb::$user->lang['FIRST'] . '</option>';
-
-				if ($action == 'add')
-				{
-					$data = $_images;
-				}
-
-				$colspan = (($mode == 'smilies') ? '7' : '5');
-				$colspan += ($icon_id) ? 1 : 0;
-				$colspan += ($action == 'add') ? 2 : 0;
-
-				phpbb::$template->assign_vars(array(
-					'S_EDIT'		=> true,
-					'S_SMILIES'		=> ($mode == 'smilies') ? true : false,
-					'S_ADD'			=> ($action == 'add') ? true : false,
-
-					'S_ORDER_LIST_DISPLAY'		=> $order_list . $order_lists[1],
-					'S_ORDER_LIST_UNDISPLAY'	=> $order_list . $order_lists[0],
-					'S_ORDER_LIST_DISPLAY_COUNT'	=> $display_count + 1,
-
-					'L_TITLE'		=> phpbb::$user->lang['ACP_' . $lang],
-					'L_EXPLAIN'		=> phpbb::$user->lang['ACP_' . $lang . '_EXPLAIN'],
-					'L_CONFIG'		=> phpbb::$user->lang[$lang . '_CONFIG'],
-					'L_URL'			=> phpbb::$user->lang[$lang . '_URL'],
-					'L_LOCATION'	=> phpbb::$user->lang[$lang . '_LOCATION'],
-					'L_WIDTH'		=> phpbb::$user->lang[$lang . '_WIDTH'],
-					'L_HEIGHT'		=> phpbb::$user->lang[$lang . '_HEIGHT'],
-					'L_ORDER'		=> phpbb::$user->lang[$lang . '_ORDER'],
-					'L_NO_ICONS'	=> phpbb::$user->lang['NO_' . $lang . '_' . strtoupper($action)],
-
-					'COLSPAN'		=> $colspan,
-					'ID'			=> $icon_id,
-
-					'U_BACK'		=> $this->u_action,
-					'U_ACTION'		=> $this->u_action . '&amp;action=' . (($action == 'add') ? 'create' : 'modify'),
-				));
-
-				foreach ($data as $img => $img_row)
-				{
-					phpbb::$template->assign_block_vars('items', array(
-						'IMG'		=> $img,
-						'A_IMG'		=> addslashes($img),
-						'IMG_SRC'	=> PHPBB_ROOT_PATH . $img_path . '/' . $img,
-
-						'CODE'		=> ($mode == 'smilies' && isset($img_row['code'])) ? $img_row['code'] : '',
-						'EMOTION'	=> ($mode == 'smilies' && isset($img_row['emotion'])) ? $img_row['emotion'] : '',
-
-						'S_ID'				=> (isset($img_row[$fields . '_id'])) ? true : false,
-						'ID'				=> (isset($img_row[$fields . '_id'])) ? $img_row[$fields . '_id'] : 0,
-						'WIDTH'				=> (!empty($img_row[$fields .'_width'])) ? $img_row[$fields .'_width'] : $img_row['width'],
-						'HEIGHT'			=> (!empty($img_row[$fields .'_height'])) ? $img_row[$fields .'_height'] : $img_row['height'],
-						'POSTING_CHECKED'	=> (!empty($img_row['display_on_posting']) || $action == 'add') ? ' checked="checked"' : '',
-					));
-				}
-
-				// Ok, another row for adding an addition code for a pre-existing image...
-				if ($action == 'add' && $mode == 'smilies' && sizeof($smilies))
-				{
-					phpbb::$template->assign_vars(array(
-						'S_ADD_CODE'		=> true,
-
-						'S_IMG_OPTIONS'		=> $smiley_options,
-
-						'S_ADD_ORDER_LIST_DISPLAY'		=> $add_order_list . $add_order_lists[1],
-						'S_ADD_ORDER_LIST_UNDISPLAY'	=> $add_order_list . $add_order_lists[0],
-
-						'IMG_SRC'			=> PHPBB_ROOT_PATH . $img_path . '/' . $default_row['smiley_url'],
-						'IMG_PATH'			=> $img_path,
-						'PHPBB_ROOT_PATH'	=> PHPBB_ROOT_PATH,
-
-						'CODE'				=> $default_row['code'],
-						'EMOTION'			=> $default_row['emotion'],
-
-						'WIDTH'				=> $default_row['smiley_width'],
-						'HEIGHT'			=> $default_row['smiley_height'],
-					));
-				}
-
-				return;
-
-			break;
-
-			case 'create':
-			case 'modify':
-
-				// Get items to create/modify
-				$images = array_keys(phpbb_request::variable('image', array('' => 0), false, phpbb_request::POST));
-
-				// Now really get the items
-				$image_id					= phpbb_request::variable('id',					array('' => 0), false, phpbb_request::POST);
-				$image_order				= phpbb_request::variable('order',				array('' => 0), false, phpbb_request::POST);
-				$image_width				= phpbb_request::variable('width',				array('' => 0), false, phpbb_request::POST);
-				$image_height				= phpbb_request::variable('height',				array('' => 0), false, phpbb_request::POST);
-				$image_add					= phpbb_request::variable('add_img',			array('' => 0), false, phpbb_request::POST);
-				$image_display_on_posting	= phpbb_request::variable('display_on_posting',	array('' => 0), false, phpbb_request::POST);
-				$image_emotion				= utf8_normalize_nfc(request_var('emotion',	array('' => ''), true));
-				$image_code					= utf8_normalize_nfc(request_var('code',		array('' => ''), true));
-
-				// Ok, add the relevant bits if we are adding new codes to existing emoticons...
-				if (phpbb_request::variable('add_additional_code', false, false, phpbb_request::POST))
-				{
-					$add_image			= request_var('add_image', '');
-					$add_code			= utf8_normalize_nfc(request_var('add_code', '', true));
-					$add_emotion		= utf8_normalize_nfc(request_var('add_emotion', '', true));
-
-					if ($add_image && $add_emotion && $add_code)
-					{
-						$images[] = $add_image;
-						$image_add[$add_image] = true;
-
-						$image_code[$add_image] = $add_code;
-						$image_emotion[$add_image] = $add_emotion;
-						$image_width[$add_image] = request_var('add_width', 0);
-						$image_height[$add_image] = request_var('add_height', 0);
-
-						if (phpbb_request::variable('add_display_on_posting', false, false, phpbb_request::POST))
-						{
-							$image_display_on_posting[$add_image] = 1;
-						}
-
-						$image_order[$add_image] = request_var('add_order', 0);
-					}
-				}
-
-				$icons_updated = 0;
-				$errors = array();
-				foreach ($images as $image)
-				{
-					if ($mode == 'smilies' && ($image_emotion[$image] == '' || $image_code[$image] == ''))
-					{
-						$errors[$image] = 'SMILIE_NO_' . (($image_emotion[$image] == '') ? 'EMOTION' : 'CODE');
-					}
-					else if ($action == 'create' && !isset($image_add[$image]))
-					{
-						// skip images where add wasn't checked
-					}
-					else
-					{
-						if ($image_width[$image] == 0 || $image_height[$image] == 0)
-						{
-							$img_size = getimagesize(PHPBB_ROOT_PATH . $img_path . '/' . $image);
-							$image_width[$image] = $img_size[0];
-							$image_height[$image] = $img_size[1];
-						}
-
-						$img_sql = array(
-							$fields . '_url'		=> $image,
-							$fields . '_width'		=> $image_width[$image],
-							$fields . '_height'		=> $image_height[$image],
-							'display_on_posting'	=> (isset($image_display_on_posting[$image])) ? 1 : 0,
-						);
-
-						if ($mode == 'smilies')
-						{
-							$img_sql = array_merge($img_sql, array(
-								'emotion'	=> $image_emotion[$image],
-								'code'		=> $image_code[$image])
-							);
-						}
-
-						// Image_order holds the 'new' order value
-						if (!empty($image_order[$image]))
-						{
-							$img_sql = array_merge($img_sql, array(
-								$fields . '_order'	=>	$image_order[$image])
-							);
-
-							// Since we always add 'after' an item, we just need to increase all following + the current by one
-							$sql = "UPDATE $table
-								SET {$fields}_order = {$fields}_order + 1
-								WHERE {$fields}_order >= {$image_order[$image]}";
-							phpbb::$db->sql_query($sql);
-
-							// If we adjust the order, we need to adjust all other orders too - they became inaccurate...
-							foreach ($image_order as $_image => $_order)
-							{
-								if ($_image == $image)
-								{
-									continue;
-								}
-
-								if ($_order >= $image_order[$image])
-								{
-									$image_order[$_image]++;
-								}
-							}
-						}
-
-						if ($action == 'modify'  && !empty($image_id[$image]))
-						{
-							$sql = "UPDATE $table
-								SET " . phpbb::$db->sql_build_array('UPDATE', $img_sql) . "
-								WHERE {$fields}_id = " . $image_id[$image];
-							phpbb::$db->sql_query($sql);
-							$icons_updated++;
-						}
-						else if ($action !== 'modify')
-						{
-							$sql = "INSERT INTO $table " . phpbb::$db->sql_build_array('INSERT', $img_sql);
-							phpbb::$db->sql_query($sql);
-							$icons_updated++;
-						}
-
- 					}
-				}
-
-				phpbb::$acm->destroy('icons');
-				phpbb::$acm->destroy_sql($table);
-
-				$level = E_USER_NOTICE;
-				switch ($icons_updated)
-				{
-					case 0:
-						$suc_lang = "{$lang}_NONE";
-						$level = E_USER_WARNING;
-						break;
-
-					case 1:
-						$suc_lang = "{$lang}_ONE";
-						break;
-
-					default:
-						$suc_lang = $lang;
-				}
-				$errormsgs = '';
-				foreach ($errors as $img => $error)
-				{
-					$errormsgs .= '<br />' . sprintf(phpbb::$user->lang[$error], $img);
-				}
-				if ($action == 'modify')
-				{
-					trigger_error(phpbb::$user->lang[$suc_lang . '_EDITED'] . $errormsgs . adm_back_link($this->u_action), $level);
-				}
-				else
-				{
-					trigger_error(phpbb::$user->lang[$suc_lang . '_ADDED'] . $errormsgs . adm_back_link($this->u_action), $level);
-				}
-
-			break;
-
-			case 'import':
-
-				$pak = request_var('pak', '');
-				$current = request_var('current', '');
-
-				if ($pak != '')
-				{
-					$order = 0;
-
-					if (!($pak_ary = @file(PHPBB_ROOT_PATH . $img_path . '/' . $pak)))
-					{
-						trigger_error(phpbb::$user->lang['PAK_FILE_NOT_READABLE'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-
-					// Make sure the pak_ary is valid
-					foreach ($pak_ary as $pak_entry)
-					{
-						if (preg_match_all("#'(.*?)', ?#", $pak_entry, $data))
-						{
-							if ((sizeof($data[1]) != 4 && $mode == 'icons') ||
-								((sizeof($data[1]) != 6 || (empty($data[1][4]) || empty($data[1][5]))) && $mode == 'smilies' ))
-							{
-								trigger_error(phpbb::$user->lang['WRONG_PAK_TYPE'] . adm_back_link($this->u_action), E_USER_WARNING);
-							}
-						}
-						else
-						{
-							trigger_error(phpbb::$user->lang['WRONG_PAK_TYPE'] . adm_back_link($this->u_action), E_USER_WARNING);
-						}
-					}
-
-
-					// The user has already selected a smilies_pak file
-					if ($current == 'delete')
-					{
-						if (phpbb::$db->truncate)
-						{
-							phpbb::$db->sql_query('TRUNCATE TABLE ' . $table);
-						}
-						else
-						{
-							phpbb::$db->sql_query('DELETE FROM ' . $table);
-						}
-
-						switch ($mode)
-						{
-							case 'smilies':
-							break;
-
-							case 'icons':
-								// Reset all icon_ids
-								phpbb::$db->sql_query('UPDATE ' . TOPICS_TABLE . ' SET icon_id = 0');
-								phpbb::$db->sql_query('UPDATE ' . POSTS_TABLE . ' SET icon_id = 0');
-							break;
-						}
-					}
-					else
-					{
-						$cur_img = array();
-
-						$field_sql = ($mode == 'smilies') ? 'code' : 'icons_url';
-
-						$sql = "SELECT $field_sql
-							FROM $table";
-						$result = phpbb::$db->sql_query($sql);
-
-						while ($row = phpbb::$db->sql_fetchrow($result))
-						{
-							++$order;
-							$cur_img[$row[$field_sql]] = 1;
-						}
-						phpbb::$db->sql_freeresult($result);
-					}
-
-					foreach ($pak_ary as $pak_entry)
-					{
-						$data = array();
-						if (preg_match_all("#'(.*?)', ?#", $pak_entry, $data))
-						{
-							if ((sizeof($data[1]) != 4 && $mode == 'icons') ||
-								(sizeof($data[1]) != 6 && $mode == 'smilies'))
-							{
-								trigger_error(phpbb::$user->lang['WRONG_PAK_TYPE'] . adm_back_link($this->u_action), E_USER_WARNING);
-							}
-
-							// Stripslash here because it got addslashed before... (on export)
-							$img = stripslashes($data[1][0]);
-							$width = stripslashes($data[1][1]);
-							$height = stripslashes($data[1][2]);
-							$display_on_posting = stripslashes($data[1][3]);
-
-							if (isset($data[1][4]) && isset($data[1][5]))
-							{
-								$emotion = stripslashes($data[1][4]);
-								$code = stripslashes($data[1][5]);
-							}
-
-							if ($current == 'replace' &&
-								(($mode == 'smilies' && !empty($cur_img[$code])) ||
-								($mode == 'icons' && !empty($cur_img[$img]))))
-							{
-								$replace_sql = ($mode == 'smilies') ? $code : $img;
-								$sql = array(
-									$fields . '_url'		=> $img,
-									$fields . '_height'		=> (int) $height,
-									$fields . '_width'		=> (int) $width,
-									'display_on_posting'	=> (int) $display_on_posting,
-								);
-
-								if ($mode == 'smilies')
-								{
-									$sql = array_merge($sql, array(
-										'emotion'				=> $emotion,
-									));
-								}
-
-								$sql = "UPDATE $table SET " . phpbb::$db->sql_build_array('UPDATE', $sql) . "
-									WHERE $field_sql = '" . phpbb::$db->sql_escape($replace_sql) . "'";
-								phpbb::$db->sql_query($sql);
-							}
-							else
-							{
-								++$order;
-
-								$sql = array(
-									$fields . '_url'	=> $img,
-									$fields . '_height'	=> (int) $height,
-									$fields . '_width'	=> (int) $width,
-									$fields . '_order'	=> (int) $order,
-									'display_on_posting'=> (int) $display_on_posting,
-								);
-
-								if ($mode == 'smilies')
-								{
-									$sql = array_merge($sql, array(
-										'code'				=> $code,
-										'emotion'			=> $emotion,
-									));
-								}
-								phpbb::$db->sql_query("INSERT INTO $table " . phpbb::$db->sql_build_array('INSERT', $sql));
-							}
-						}
-					}
-
-					phpbb::$acm->destroy('icons');
-					phpbb::$acm->destroy_sql($table);
-
-					trigger_error(phpbb::$user->lang[$lang . '_IMPORT_SUCCESS'] . adm_back_link($this->u_action));
-				}
-				else
-				{
-					$pak_options = '';
-
-					foreach ($_paks as $pak)
-					{
-						$pak_options .= '<option value="' . $pak . '">' . htmlspecialchars($pak) . '</option>';
-					}
-
-					phpbb::$template->assign_vars(array(
-						'S_CHOOSE_PAK'		=> true,
-						'S_PAK_OPTIONS'		=> $pak_options,
-
-						'L_TITLE'			=> phpbb::$user->lang['ACP_' . $lang],
-						'L_EXPLAIN'			=> phpbb::$user->lang['ACP_' . $lang . '_EXPLAIN'],
-						'L_NO_PAK_OPTIONS'	=> phpbb::$user->lang['NO_' . $lang . '_PAK'],
-						'L_CURRENT'			=> phpbb::$user->lang['CURRENT_' . $lang],
-						'L_CURRENT_EXPLAIN'	=> phpbb::$user->lang['CURRENT_' . $lang . '_EXPLAIN'],
-						'L_IMPORT_SUBMIT'	=> phpbb::$user->lang['IMPORT_' . $lang],
-
-						'U_BACK'		=> $this->u_action,
-						'U_ACTION'		=> $this->u_action . '&amp;action=import',
-					));
-				}
-			break;
-
-			case 'export':
-
-				$this->page_title = 'EXPORT_' . $lang;
-				$this->tpl_name = 'message_body';
-
-				phpbb::$template->assign_vars(array(
-					'MESSAGE_TITLE'		=> phpbb::$user->lang['EXPORT_' . $lang],
-					'MESSAGE_TEXT'		=> sprintf(phpbb::$user->lang['EXPORT_' . $lang . '_EXPLAIN'], '<a href="' . $this->u_action . '&amp;action=send">', '</a>'),
-
-					'S_USER_NOTICE'		=> true,
-				));
-
-				return;
-
-			break;
-
-			case 'send':
-
-				$sql = "SELECT *
-					FROM $table
-					ORDER BY {$fields}_order";
-				$result = phpbb::$db->sql_query($sql);
-
-				$pak = '';
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$pak .= "'" . addslashes($row[$fields . '_url']) . "', ";
-					$pak .= "'" . addslashes($row[$fields . '_width']) . "', ";
-					$pak .= "'" . addslashes($row[$fields . '_height']) . "', ";
-					$pak .= "'" . addslashes($row['display_on_posting']) . "', ";
-
-					if ($mode == 'smilies')
-					{
-						$pak .= "'" . addslashes($row['emotion']) . "', ";
-						$pak .= "'" . addslashes($row['code']) . "', ";
-					}
-
-					$pak .= "\n";
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				if ($pak != '')
-				{
-					garbage_collection();
-
-					header('Pragma: public');
-
-					// Send out the Headers
-					header('Content-Type: text/x-delimtext; name="' . $mode . '.pak"');
-					header('Content-Disposition: inline; filename="' . $mode . '.pak"');
-					echo $pak;
-
-					flush();
-					exit;
-				}
-				else
-				{
-					trigger_error(phpbb::$user->lang['NO_' . strtoupper($fields) . '_EXPORT'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-			break;
-
-			case 'delete':
-
-				if (confirm_box(true))
-				{
-					$sql = "DELETE FROM $table
-						WHERE {$fields}_id = $icon_id";
-					phpbb::$db->sql_query($sql);
-
-					switch ($mode)
-					{
-						case 'smilies':
-						break;
-
-						case 'icons':
-							// Reset appropriate icon_ids
-							phpbb::$db->sql_query('UPDATE ' . TOPICS_TABLE . "
-								SET icon_id = 0
-								WHERE icon_id = $icon_id");
-
-							phpbb::$db->sql_query('UPDATE ' . POSTS_TABLE . "
-								SET icon_id = 0
-								WHERE icon_id = $icon_id");
-						break;
-					}
-
-					$notice = phpbb::$user->lang[$lang . '_DELETED'];
-
-					phpbb::$acm->destroy('icons');
-					phpbb::$acm->destroy_sql($table);
-				}
-				else
-				{
-					confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-						'i'			=> $id,
-						'mode'		=> $mode,
-						'id'		=> $icon_id,
-						'action'	=> 'delete',
-					)));
-				}
-
-			break;
-
-			case 'move_up':
-			case 'move_down':
-
-				// Get current order id...
-				$sql = "SELECT {$fields}_order as current_order
-					FROM $table
-					WHERE {$fields}_id = $icon_id";
-				$result = phpbb::$db->sql_query($sql);
-				$current_order = (int) phpbb::$db->sql_fetchfield('current_order');
-				phpbb::$db->sql_freeresult($result);
-
-				if ($current_order == 0 && $action == 'move_up')
-				{
-					break;
-				}
-
-				// on move_down, switch position with next order_id...
-				// on move_up, switch position with previous order_id...
-				$switch_order_id = ($action == 'move_down') ? $current_order + 1 : $current_order - 1;
-
-				//
-				$sql = "UPDATE $table
-					SET {$fields}_order = $current_order
-					WHERE {$fields}_order = $switch_order_id
-						AND {$fields}_id <> $icon_id";
-				phpbb::$db->sql_query($sql);
-
-				// Only update the other entry too if the previous entry got updated
-				if (phpbb::$db->sql_affectedrows())
-				{
-					$sql = "UPDATE $table
-						SET {$fields}_order = $switch_order_id
-						WHERE {$fields}_order = $current_order
-							AND {$fields}_id = $icon_id";
-					phpbb::$db->sql_query($sql);
-				}
-
-				phpbb::$acm->destroy('icons');
-				phpbb::$acm->destroy_sql($table);
-
-			break;
-		}
-
-		// By default, check that image_order is valid and fix it if necessary
-		$sql = "SELECT {$fields}_id AS order_id, {$fields}_order AS fields_order
-			FROM $table
-			ORDER BY display_on_posting DESC, {$fields}_order";
-		$result = phpbb::$db->sql_query($sql);
-
-		if ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$order = 0;
-			do
-			{
-				++$order;
-				if ($row['fields_order'] != $order)
-				{
-					phpbb::$db->sql_query("UPDATE $table
-						SET {$fields}_order = $order
-						WHERE {$fields}_id = " . $row['order_id']);
-				}
-			}
-			while ($row = phpbb::$db->sql_fetchrow($result));
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		phpbb::$template->assign_vars(array(
-			'L_TITLE'			=> phpbb::$user->lang['ACP_' . $lang],
-			'L_EXPLAIN'			=> phpbb::$user->lang['ACP_' . $lang . '_EXPLAIN'],
-			'L_IMPORT'			=> phpbb::$user->lang['IMPORT_' . $lang],
-			'L_EXPORT'			=> phpbb::$user->lang['EXPORT_' . $lang],
-			'L_NOT_DISPLAYED'	=> phpbb::$user->lang[$lang . '_NOT_DISPLAYED'],
-			'L_ICON_ADD'		=> phpbb::$user->lang['ADD_' . $lang],
-			'L_ICON_EDIT'		=> phpbb::$user->lang['EDIT_' . $lang],
-
-			'NOTICE'			=> $notice,
-			'COLSPAN'			=> ($mode == 'smilies') ? 5 : 3,
-
-			'S_SMILIES'			=> ($mode == 'smilies') ? true : false,
-
-			'U_ACTION'			=> $this->u_action,
-			'U_IMPORT'			=> $this->u_action . '&amp;action=import',
-			'U_EXPORT'			=> $this->u_action . '&amp;action=export',
-		));
-
-		$spacer = false;
-
-		$sql = "SELECT *
-			FROM $table
-			ORDER BY {$fields}_order ASC";
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$alt_text = ($mode == 'smilies') ? $row['code'] : '';
-
-			phpbb::$template->assign_block_vars('items', array(
-				'S_SPACER'		=> (!$spacer && !$row['display_on_posting']) ? true : false,
-				'ALT_TEXT'		=> $alt_text,
-				'IMG_SRC'		=> PHPBB_ROOT_PATH . $img_path . '/' . $row[$fields . '_url'],
-				'WIDTH'			=> $row[$fields . '_width'],
-				'HEIGHT'		=> $row[$fields . '_height'],
-				'CODE'			=> (isset($row['code'])) ? $row['code'] : '',
-				'EMOTION'		=> (isset($row['emotion'])) ? $row['emotion'] : '',
-				'U_EDIT'		=> $this->u_action . '&amp;action=edit&amp;id=' . $row[$fields . '_id'],
-				'U_DELETE'		=> $this->u_action . '&amp;action=delete&amp;id=' . $row[$fields . '_id'],
-				'U_MOVE_UP'		=> $this->u_action . '&amp;action=move_up&amp;id=' . $row[$fields . '_id'],
-				'U_MOVE_DOWN'	=> $this->u_action . '&amp;action=move_down&amp;id=' . $row[$fields . '_id'],
-			));
-
-			if (!$spacer && !$row['display_on_posting'])
-			{
-				$spacer = true;
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_inactive.php b/phpBB/modules/acp/acp_inactive.php
deleted file mode 100644
index d93b2146a6..0000000000
--- a/phpBB/modules/acp/acp_inactive.php
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_inactive
-{
-	var $u_action;
-	var $p_master;
-
-	function __construct(&$p_master)
-	{
-		$this->p_master = &$p_master;
-	}
-
-	function main($id, $mode)
-	{
-		include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-
-		phpbb::$user->add_lang('memberlist');
-
-		$action = request_var('action', '');
-		$mark	= request_var('mark', array(0));
-		$start	= request_var('start', 0);
-		$submit = phpbb_request::is_set_post('submit');
-
-		// Sort keys
-		$sort_days	= request_var('st', 0);
-		$sort_key	= request_var('sk', 'i');
-		$sort_dir	= request_var('sd', 'd');
-
-		$form_key = 'acp_inactive';
-		add_form_key($form_key);
-
-		if ($submit && sizeof($mark))
-		{
-			if ($action !== 'delete' && !check_form_key($form_key))
-			{
-				trigger_error(phpbb::$user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
-			}
-
-			switch ($action)
-			{
-				case 'activate':
-				case 'delete':
-
-					$sql = 'SELECT user_id, username
-						FROM ' . USERS_TABLE . '
-						WHERE ' . phpbb::$db->sql_in_set('user_id', $mark);
-					$result = phpbb::$db->sql_query($sql);
-
-					$user_affected = array();
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$user_affected[$row['user_id']] = $row['username'];
-					}
-					phpbb::$db->sql_freeresult($result);
-
-					if ($action == 'activate')
-					{
-						if (phpbb::$config['require_activation'] == USER_ACTIVATION_ADMIN)
-						{
-							// Get those 'being activated'...
-							$sql = 'SELECT user_id, username, user_email, user_lang
-								FROM ' . USERS_TABLE . '
-								WHERE ' . phpbb::$db->sql_in_set('user_id', $mark) . '
-									AND user_type = ' . phpbb::USER_INACTIVE;
-							$result = phpbb::$db->sql_query($sql);
-
-							$inactive_users = array();
-							while ($row = phpbb::$db->sql_fetchrow($result))
-							{
-								$inactive_users[] = $row;
-							}
-							phpbb::$db->sql_freeresult($result);
-						}
-
-						user_active_flip('activate', $mark);
-
-						if (phpbb::$config['require_activation'] == USER_ACTIVATION_ADMIN && !empty($inactive_users))
-						{
-							include_once(PHPBB_ROOT_PATH . 'includes/functions_messenger.' . PHP_EXT);
-
-							$messenger = new messenger();
-
-							foreach ($inactive_users as $row)
-							{
-								$messenger->template('admin_welcome_activated', $row['user_lang']);
-
-								$messenger->to($row['user_email'], $row['username']);
-
-								$messenger->headers('X-AntiAbuse: Board servername - ' . phpbb::$config['server_name']);
-								$messenger->headers('X-AntiAbuse: User_id - ' . phpbb::$user->data['user_id']);
-								$messenger->headers('X-AntiAbuse: Username - ' . phpbb::$user->data['username']);
-								$messenger->headers('X-AntiAbuse: User IP - ' . phpbb::$user->ip);
-
-								$messenger->assign_vars(array(
-									'USERNAME'	=> htmlspecialchars_decode($row['username']))
-								);
-
-								$messenger->send(NOTIFY_EMAIL);
-							}
-
-							$messenger->save_queue();
-						}
-					}
-					else if ($action == 'delete')
-					{
-						if (confirm_box(true))
-						{
-							if (!phpbb::$acl->acl_get('a_userdel'))
-							{
-								trigger_error(phpbb::$user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
-							}
-
-							foreach ($mark as $user_id)
-							{
-								user_delete('retain', $user_id, $user_affected[$user_id]);
-							}
-
-							add_log('admin', 'LOG_INACTIVE_' . strtoupper($action), implode(', ', $user_affected));
-						}
-						else
-						{
-							$s_hidden_fields = array(
-								'mode'			=> $mode,
-								'action'		=> $action,
-								'mark'			=> $mark,
-								'submit'		=> 1,
-								'start'			=> $start,
-							);
-							confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields($s_hidden_fields));
-						}
-					}
-
-				break;
-
-				case 'remind':
-					if (empty(phpbb::$config['email_enable']))
-					{
-						trigger_error(phpbb::$user->lang['EMAIL_DISABLED'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-
-					$sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type, user_regdate, user_actkey
-						FROM ' . USERS_TABLE . '
-						WHERE ' . phpbb::$db->sql_in_set('user_id', $mark) . '
-							AND user_inactive_reason';
-
-					$sql .= (phpbb::$config['require_activation'] == USER_ACTIVATION_ADMIN) ? ' = ' . INACTIVE_REMIND : ' <> ' . INACTIVE_MANUAL;
-
-					$result = phpbb::$db->sql_query($sql);
-
-					if ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						// Send the messages
-						include_once(PHPBB_ROOT_PATH . 'includes/functions_messenger.' . PHP_EXT);
-
-						$messenger = new messenger();
-						$usernames = array();
-
-						do
-						{
-							$messenger->template('user_remind_inactive', $row['user_lang']);
-
-							$messenger->to($row['user_email'], $row['username']);
-							$messenger->im($row['user_jabber'], $row['username']);
-
-							$messenger->headers('X-AntiAbuse: Board servername - ' . phpbb::$config['server_name']);
-							$messenger->headers('X-AntiAbuse: User_id - ' . phpbb::$user->data['user_id']);
-							$messenger->headers('X-AntiAbuse: Username - ' . phpbb::$user->data['username']);
-							$messenger->headers('X-AntiAbuse: User IP - ' . phpbb::$user->ip);
-
-							$messenger->assign_vars(array(
-								'USERNAME'		=> htmlspecialchars_decode($row['username']),
-								'REGISTER_DATE'	=> phpbb::$user->format_date($row['user_regdate'], false, true),
-								'U_ACTIVATE'	=> generate_board_url() . '/ucp.' . PHP_EXT . '?mode=activate&u=' . $row['user_id'] . '&k=' . $row['user_actkey'])
-							);
-
-							$messenger->send($row['user_notify_type']);
-
-							$usernames[] = $row['username'];
-						}
-						while ($row = phpbb::$db->sql_fetchrow($result));
-
-						$messenger->save_queue();
-
-						add_log('admin', 'LOG_INACTIVE_REMIND', implode(', ', $usernames));
-						unset($usernames);
-					}
-					phpbb::$db->sql_freeresult($result);
-
-				break;
-			}
-		}
-
-		// Sorting
-		$limit_days = array(0 => phpbb::$user->lang['ALL_ENTRIES'], 1 => phpbb::$user->lang['1_DAY'], 7 => phpbb::$user->lang['7_DAYS'], 14 => phpbb::$user->lang['2_WEEKS'], 30 => phpbb::$user->lang['1_MONTH'], 90 => phpbb::$user->lang['3_MONTHS'], 180 => phpbb::$user->lang['6_MONTHS'], 365 => phpbb::$user->lang['1_YEAR']);
-		$sort_by_text = array('i' => phpbb::$user->lang['SORT_INACTIVE'], 'j' => phpbb::$user->lang['SORT_REG_DATE'], 'l' => phpbb::$user->lang['SORT_LAST_VISIT'], 'r' => phpbb::$user->lang['SORT_REASON'], 'u' => phpbb::$user->lang['SORT_USERNAME']);
-		$sort_by_sql = array('i' => 'user_inactive_time', 'j' => 'user_regdate', 'l' => 'user_lastvisit', 'r' => 'user_inactive_reason', 'u' => 'username_clean');
-
-		$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
-		gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
-
-		// Define where and sort sql for use in displaying logs
-		$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
-		$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
-
-		$inactive = array();
-		$inactive_count = 0;
-
-		$start = view_inactive_users($inactive, $inactive_count, phpbb::$config['topics_per_page'], $start, $sql_where, $sql_sort);
-
-		foreach ($inactive as $row)
-		{
-			phpbb::$template->assign_block_vars('inactive', array(
-				'INACTIVE_DATE'	=> phpbb::$user->format_date($row['user_inactive_time']),
-				'JOINED'		=> phpbb::$user->format_date($row['user_regdate']),
-				'LAST_VISIT'	=> (!$row['user_lastvisit']) ? ' - ' : phpbb::$user->format_date($row['user_lastvisit']),
-				'REASON'		=> $row['inactive_reason'],
-				'USER_ID'		=> $row['user_id'],
-				'USERNAME'		=> $row['username'],
-				'U_USER_ADMIN'	=> append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=users&amp;mode=overview&amp;u={$row['user_id']}"),
-			));
-		}
-
-		$option_ary = array('activate' => 'ACTIVATE', 'delete' => 'DELETE');
-		if (phpbb::$config['email_enable'])
-		{
-			$option_ary += array('remind' => 'REMIND');
-		}
-
-		phpbb::$template->assign_vars(array(
-			'S_INACTIVE_USERS'		=> true,
-			'S_INACTIVE_OPTIONS'	=> build_select($option_ary),
-
-			'S_LIMIT_DAYS'	=> $s_limit_days,
-			'S_SORT_KEY'	=> $s_sort_key,
-			'S_SORT_DIR'	=> $s_sort_dir,
-			'S_ON_PAGE'		=> on_page($inactive_count, phpbb::$config['topics_per_page'], $start),
-			'PAGINATION'	=> generate_pagination($this->u_action . "&amp;$u_sort_param", $inactive_count, phpbb::$config['topics_per_page'], $start, true),
-
-			'U_ACTION'		=> $this->u_action . '&amp;start=' . $start,
-		));
-
-		$this->tpl_name = 'acp_inactive';
-		$this->page_title = 'ACP_INACTIVE_USERS';
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_jabber.php b/phpBB/modules/acp/acp_jabber.php
deleted file mode 100644
index 875998a00c..0000000000
--- a/phpBB/modules/acp/acp_jabber.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-* @todo Check/enter/update transport info
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_jabber
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		phpbb::$user->add_lang('acp/board');
-
-		include_once(PHPBB_ROOT_PATH . 'includes/functions_jabber.' . PHP_EXT);
-
-		$action	= request_var('action', '');
-		$submit = phpbb_request::is_set_post('submit');
-
-		if ($mode != 'settings')
-		{
-			return;
-		}
-
-		$this->tpl_name = 'acp_jabber';
-		$this->page_title = 'ACP_JABBER_SETTINGS';
-
-		$jab_enable			= request_var('jab_enable', phpbb::$config['jab_enable']);
-		$jab_host			= request_var('jab_host', phpbb::$config['jab_host']);
-		$jab_port			= request_var('jab_port', phpbb::$config['jab_port']);
-		$jab_username		= request_var('jab_username', phpbb::$config['jab_username']);
-		$jab_password		= request_var('jab_password', phpbb::$config['jab_password']);
-		$jab_package_size	= request_var('jab_package_size', phpbb::$config['jab_package_size']);
-		$jab_use_ssl		= request_var('jab_use_ssl', phpbb::$config['jab_use_ssl']);
-
-		$form_name = 'acp_jabber';
-		add_form_key($form_name);
-
-		if ($submit)
-		{
-			if (!check_form_key($form_name))
-			{
-				trigger_error(phpbb::$user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING);
-			}
-
-			$error = array();
-
-			$message = phpbb::$user->lang['JAB_SETTINGS_CHANGED'];
-			$log = 'JAB_SETTINGS_CHANGED';
-
-			// Is this feature enabled? Then try to establish a connection
-			if ($jab_enable)
-			{
-				$jabber = new jabber($jab_host, $jab_port, $jab_username, $jab_password, $jab_use_ssl);
-
-				if (!$jabber->connect())
-				{
-					trigger_error(phpbb::$user->lang['ERR_JAB_CONNECT'] . '<br /><br />' . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				// We'll try to authorise using this account
-				if (!$jabber->login())
-				{
-					trigger_error(phpbb::$user->lang['ERR_JAB_AUTH'] . '<br /><br />' . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				$jabber->disconnect();
-			}
-			else
-			{
-				// This feature is disabled.
-				// We update the user table to be sure all users that have IM as notify type are set to both as notify type
-				// We set this to both because users still have their jabber address entered and may want to receive jabber notifications again once it is re-enabled.
-				$sql_ary = array(
-					'user_notify_type'		=> NOTIFY_BOTH,
-				);
-
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-					WHERE user_notify_type = ' . NOTIFY_IM;
-				phpbb::$db->sql_query($sql);
-			}
-
-			set_config('jab_enable', $jab_enable);
-			set_config('jab_host', $jab_host);
-			set_config('jab_port', $jab_port);
-			set_config('jab_username', $jab_username);
-			set_config('jab_password', $jab_password);
-			set_config('jab_package_size', $jab_package_size);
-			set_config('jab_use_ssl', $jab_use_ssl);
-
-			add_log('admin', 'LOG_' . $log);
-			trigger_error($message . adm_back_link($this->u_action));
-		}
-
-		phpbb::$template->assign_vars(array(
-			'U_ACTION'				=> $this->u_action,
-			'JAB_ENABLE'			=> $jab_enable,
-			'L_JAB_SERVER_EXPLAIN'	=> sprintf(phpbb::$user->lang['JAB_SERVER_EXPLAIN'], '<a href="http://www.jabber.org/">', '</a>'),
-			'JAB_HOST'				=> $jab_host,
-			'JAB_PORT'				=> $jab_port,
-			'JAB_USERNAME'			=> $jab_username,
-			'JAB_PASSWORD'			=> $jab_password,
-			'JAB_PACKAGE_SIZE'		=> $jab_package_size,
-			'JAB_USE_SSL'			=> $jab_use_ssl,
-			'S_CAN_USE_SSL'			=> jabber::can_use_ssl(),
-			'S_GTALK_NOTE'			=> (!@function_exists('dns_get_record')) ? true : false,
-		));
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_language.php b/phpBB/modules/acp/acp_language.php
deleted file mode 100644
index 6359bdf099..0000000000
--- a/phpBB/modules/acp/acp_language.php
+++ /dev/null
@@ -1,1350 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_language
-{
-	var $u_action;
-	var $main_files;
-	var $language_header = '';
-	var $lang_header = '';
-
-	var $language_file = '';
-	var $language_directory = '';
-
-	function main($id, $mode)
-	{
-		global $safe_mode, $file_uploads;
-
-		/**
-		* @todo make this work with the request class, might require some additional functionality
-		* inside the request class. Reducing some of the redundance of this code would certainly
-		* not hurt either.
-		*/
-		phpbb_request::enable_super_globals();
-
-		include_once(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-
-		$this->default_variables();
-
-		// Check and set some common vars
-
-		$action		= (phpbb_request::is_set_post('update_details')) ? 'update_details' : '';
-		$action		= (phpbb_request::is_set_post('submit_file')) ? 'submit_file' : $action;
-		$action		= (phpbb_request::is_set_post('remove_store')) ? 'details' : $action;
-		$action		= (phpbb_request::is_set_post('ftp_upload')) ? 'ftp_upload' : $action;
-		$action		= (phpbb_request::is_set_post('download')) ? 'download' : $action;
-
-		$submit = (empty($action) && !phpbb_request::is_set_post('update') && !phpbb_request::is_set_post('test_connection')) ? false : true;
-		$action = (empty($action)) ? request_var('action', '') : $action;
-
-		$form_name = 'acp_lang';
-		add_form_key('acp_lang');
-
-		$lang_id = request_var('id', 0);
-		if (phpbb_request::is_set_post('missing_file'))
-		{
-			$missing_file = request_var('missing_file', array('' => 0));
-			/**
-			* @todo Do NOT overwrite a request variable.
-			*/
-			phpbb_request::overwrite('language_file', key($missing_file));
-		}
-
-		$selected_lang_file = request_var('language_file', '|common.' . PHP_EXT);
-
-		list($this->language_directory, $this->language_file) = explode('|', $selected_lang_file);
-
-		$this->language_directory = basename($this->language_directory);
-		$this->language_file = basename($this->language_file);
-
-		phpbb::$user->add_lang('acp/language');
-		$this->tpl_name = 'acp_language';
-		$this->page_title = 'ACP_LANGUAGE_PACKS';
-
-		switch ($action)
-		{
-			case 'update_details':
-
-				if (!$submit || !check_form_key($form_name))
-				{
-					trigger_error(phpbb::$user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				if (!$lang_id)
-				{
-					trigger_error(phpbb::$user->lang['NO_LANG_ID'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				$sql = 'SELECT *
-					FROM ' . LANG_TABLE . "
-					WHERE lang_id = $lang_id";
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				$sql_ary	= array(
-					'lang_english_name'		=> request_var('lang_english_name', $row['lang_english_name']),
-					'lang_local_name'		=> utf8_normalize_nfc(request_var('lang_local_name', $row['lang_local_name'], true)),
-					'lang_author'			=> utf8_normalize_nfc(request_var('lang_author', $row['lang_author'], true)),
-				);
-
-				phpbb::$db->sql_query('UPDATE ' . LANG_TABLE . '
-					SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-					WHERE lang_id = ' . $lang_id);
-
-				add_log('admin', 'LOG_LANGUAGE_PACK_UPDATED', $sql_ary['lang_english_name']);
-
-				trigger_error(phpbb::$user->lang['LANGUAGE_DETAILS_UPDATED'] . adm_back_link($this->u_action));
-			break;
-
-			case 'ftp_upload':
-			case 'download':
-
-				if (!$submit || !check_form_key($form_name))
-				{
-					trigger_error(phpbb::$user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				if (!$lang_id || empty($_POST['entry']))
-				{
-					trigger_error(phpbb::$user->lang['NO_LANG_ID'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				if ($this->language_directory != 'email' && !is_array($_POST['entry']))
-				{
-					trigger_error(phpbb::$user->lang['NO_LANG_ID'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				if (!$this->language_file || (!$this->language_directory && !in_array($this->language_file, $this->main_files)))
-				{
-					trigger_error(phpbb::$user->lang['NO_FILE_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				$sql = 'SELECT *
-					FROM ' . LANG_TABLE . "
-					WHERE lang_id = $lang_id";
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$row)
-				{
-					trigger_error(phpbb::$user->lang['NO_LANG_ID'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				if (!request_var('test_connection', false))
-				{
-					// Before we attempt to write anything let's check if the admin really chose a correct filename
-					switch ($this->language_directory)
-					{
-						case 'email':
-							// Get email templates
-							$email_files = filelist(PHPBB_ROOT_PATH . 'language/' . $row['lang_iso'], 'email', 'txt');
-							$email_files = $email_files['email/'];
-
-							if (!in_array($this->language_file, $email_files))
-							{
-								trigger_error(phpbb::$user->lang['WRONG_LANGUAGE_FILE'] . adm_back_link($this->u_action . '&amp;action=details&amp;id=' . $lang_id), E_USER_WARNING);
-							}
-						break;
-
-						case 'acp':
-							// Get acp files
-							$acp_files = filelist(PHPBB_ROOT_PATH . 'language/' . $row['lang_iso'], 'acp', PHP_EXT);
-							$acp_files = $acp_files['acp/'];
-
-							if (!in_array($this->language_file, $acp_files))
-							{
-								trigger_error(phpbb::$user->lang['WRONG_LANGUAGE_FILE'] . adm_back_link($this->u_action . '&amp;action=details&amp;id=' . $lang_id), E_USER_WARNING);
-							}
-						break;
-
-						case 'mods':
-							// Get mod files
-							$mods_files = filelist(PHPBB_ROOT_PATH . 'language/' . $row['lang_iso'], 'mods', PHP_EXT);
-							$mods_files = (isset($mods_files['mods/'])) ? $mods_files['mods/'] : array();
-
-							if (!in_array($this->language_file, $mods_files))
-							{
-								trigger_error(phpbb::$user->lang['WRONG_LANGUAGE_FILE'] . adm_back_link($this->u_action . '&amp;action=details&amp;id=' . $lang_id), E_USER_WARNING);
-							}
-						break;
-
-						default:
-							if (!in_array($this->language_file, $this->main_files))
-							{
-								trigger_error(phpbb::$user->lang['WRONG_LANGUAGE_FILE'] . adm_back_link($this->u_action . '&amp;action=details&amp;id=' . $lang_id), E_USER_WARNING);
-							}
-						break;
-					}
-
-					if (!$safe_mode)
-					{
-						$mkdir_ary = array('language', 'language/' . $row['lang_iso']);
-
-						if ($this->language_directory)
-						{
-							$mkdir_ary[] = 'language/' . $row['lang_iso'] . '/' . $this->language_directory;
-						}
-
-						foreach ($mkdir_ary as $dir)
-						{
-							$dir = PHPBB_ROOT_PATH . 'store/' . $dir;
-
-							if (!is_dir($dir))
-							{
-								if (!@mkdir($dir, 0777))
-								{
-									trigger_error("Could not create directory $dir", E_USER_ERROR);
-								}
-								phpbb::$system->chmod($dir, phpbb::CHMOD_READ | phpbb::CHMOD_WRITE);
-							}
-						}
-					}
-
-					// Get target filename for storage folder
-					$filename = $this->get_filename($row['lang_iso'], $this->language_directory, $this->language_file, true, true);
-					$fp = @fopen(PHPBB_ROOT_PATH . $filename, 'wb');
-
-					if (!$fp)
-					{
-						trigger_error(sprintf(phpbb::$user->lang['UNABLE_TO_WRITE_FILE'], $filename) . adm_back_link($this->u_action . '&amp;id=' . $lang_id . '&amp;action=details&amp;language_file=' . urlencode($selected_lang_file)), E_USER_WARNING);
-					}
-
-					if ($this->language_directory == 'email')
-					{
-						// Email Template
-						$entry = $this->prepare_lang_entry($_POST['entry'], false);
-						fwrite($fp, $entry);
-					}
-					else
-					{
-						$name = (($this->language_directory) ? $this->language_directory . '_' : '') . $this->language_file;
-						$header = str_replace(array('{FILENAME}', '{LANG_NAME}', '{CHANGED}', '{AUTHOR}'), array($name, $row['lang_english_name'], date('Y-m-d', time()), $row['lang_author']), $this->language_file_header);
-
-						if (strpos($this->language_file, 'help_') === 0)
-						{
-							// Help File
-							$header .= '$help = array(' . "\n";
-							fwrite($fp, $header);
-
-							foreach ($_POST['entry'] as $key => $value)
-							{
-								if (!is_array($value))
-								{
-									continue;
-								}
-
-								$entry = "\tarray(\n";
-
-								foreach ($value as $_key => $_value)
-								{
-									$entry .= "\t\t" . (int) $_key . "\t=> '" . $this->prepare_lang_entry($_value) . "',\n";
-								}
-
-								$entry .= "\t),\n";
-								fwrite($fp, $entry);
-							}
-
-							$footer = ");\n\n?>";
-							fwrite($fp, $footer);
-						}
-						else
-						{
-							// Language File
-							$header .= $this->lang_header;
-							fwrite($fp, $header);
-
-							foreach ($_POST['entry'] as $key => $value)
-							{
-								$entry = $this->format_lang_array($key, $value);
-								fwrite($fp, $entry);
-							}
-
-							$footer = "));\n\n?>";
-							fwrite($fp, $footer);
-						}
-					}
-
-					fclose($fp);
-				}
-
-				include_once(PHPBB_ROOT_PATH . 'includes/functions_compress.' . PHP_EXT);
-				include_once(PHPBB_ROOT_PATH . 'includes/functions_transfer.' . PHP_EXT);
-
-				$file = request_var('file', '');
-				$dir = request_var('dir', '');
-				$lang_path = 'language/' . $row['lang_iso'] . '/' . (($dir) ? $dir . '/' : '');
-
-				$module_url = $this->u_action . "&amp;action=ftp_upload&amp;id=$lang_id";
-				$update_list = array('not_modified' => array(array('filename' => $lang_path . $file, 'custom' => false)));
-				$new_location = PHPBB_ROOT_PATH . 'store/';
-				$download_filename = $this->language_file;
-
-				process_transfer($module_url, $update_list, $new_location, $download_filename);
-
-				// bug: if you're downloading the file, the following code will never be called as process_transfer() will exit before it has a chance to be called
-
-				if (!request_var('test_connection', false))
-				{
-					// Remove from storage folder
-					if (file_exists(PHPBB_ROOT_PATH . 'store/' . $lang_path . $file))
-					{
-						@unlink(PHPBB_ROOT_PATH . 'store/' . $lang_path . $file);
-					}
-
-					if ($action == 'ftp_upload')
-					{
-						add_log('admin', 'LOG_LANGUAGE_FILE_REPLACED', $file);
-					}
-
-					add_log('admin', 'LOG_LANGUAGE_FILE_SUBMITTED', $this->language_file);
-				}
-
-			// no break;
-
-			case 'submit_file':
-
-				$s_hidden_fields = build_hidden_fields(array(
-					'file'			=> $this->language_file,
-					'dir'			=> $this->language_directory,
-					'language_file'	=> $selected_lang_file)
-				);
-
-				/**
-				* @todo Do not use $_POST here, but phpbb_request::variable which needs to support more dimensions
-				*/
-				$s_hidden_fields .= build_hidden_fields(array('entry' => $_POST['entry']), true, STRIP);
-
-				$module_url = $this->u_action . '&amp;action=details&amp;id=' . $lang_id . '&amp;language_file=' . urlencode($selected_lang_file);
-
-				phpbb::$template->assign_vars(array(
-					'S_HIDDEN_FIELDS' => $s_hidden_fields,
-					'S_UPDATE_OPTIONS' => true,
-					'U_INITIAL_ACTION' => $module_url,
-					'U_FINAL_ACTION' => $module_url)
-				);
-
-			break;
-
-			case 'details':
-
-				if (!$lang_id)
-				{
-					trigger_error(phpbb::$user->lang['NO_LANG_ID'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				$this->page_title = 'LANGUAGE_PACK_DETAILS';
-
-				$sql = 'SELECT *
-					FROM ' . LANG_TABLE . '
-					WHERE lang_id = ' . $lang_id;
-				$result = phpbb::$db->sql_query($sql);
-				$lang_entries = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				$lang_iso = $lang_entries['lang_iso'];
-				$missing_vars = $missing_files = array();
-
-				// Get email templates
-				$email_files = filelist(PHPBB_ROOT_PATH . 'language/' . phpbb::$config['default_lang'], 'email', 'txt');
-				$email_files = $email_files['email/'];
-
-				// Get acp files
-				$acp_files = filelist(PHPBB_ROOT_PATH . 'language/' . phpbb::$config['default_lang'], 'acp', PHP_EXT);
-				$acp_files = $acp_files['acp/'];
-
-				// Get mod files
-				$mods_files = filelist(PHPBB_ROOT_PATH . 'language/' . phpbb::$config['default_lang'], 'mods', PHP_EXT);
-				$mods_files = (isset($mods_files['mods/'])) ? $mods_files['mods/'] : array();
-
-				// Check if our current filename matches the files
-				switch ($this->language_directory)
-				{
-					case 'email':
-						if (!in_array($this->language_file, $email_files))
-						{
-							trigger_error(phpbb::$user->lang['WRONG_LANGUAGE_FILE'] . adm_back_link($this->u_action . '&amp;action=details&amp;id=' . $lang_id), E_USER_WARNING);
-						}
-					break;
-
-					case 'acp':
-						if (!in_array($this->language_file, $acp_files))
-						{
-							trigger_error(phpbb::$user->lang['WRONG_LANGUAGE_FILE'] . adm_back_link($this->u_action . '&amp;action=details&amp;id=' . $lang_id), E_USER_WARNING);
-						}
-					break;
-
-					case 'mods':
-						if (!in_array($this->language_file, $mods_files))
-						{
-							trigger_error(phpbb::$user->lang['WRONG_LANGUAGE_FILE'] . adm_back_link($this->u_action . '&amp;action=details&amp;id=' . $lang_id), E_USER_WARNING);
-						}
-					break;
-
-					default:
-						if (!in_array($this->language_file, $this->main_files))
-						{
-							trigger_error(phpbb::$user->lang['WRONG_LANGUAGE_FILE'] . adm_back_link($this->u_action . '&amp;action=details&amp;id=' . $lang_id), E_USER_WARNING);
-						}
-				}
-
-				if (phpbb_request::is_set_post('remove_store'))
-				{
-					$store_filename = $this->get_filename($lang_iso, $this->language_directory, $this->language_file, true, true);
-
-					if (file_exists(PHPBB_ROOT_PATH . $store_filename))
-					{
-						@unlink(PHPBB_ROOT_PATH . $store_filename);
-					}
-				}
-
-				include_once(PHPBB_ROOT_PATH . 'includes/functions_transfer.' . PHP_EXT);
-
-				$methods = transfer::methods();
-
-				foreach ($methods as $method)
-				{
-					phpbb::$template->assign_block_vars('buttons', array(
-						'VALUE' => $method,
-					));
-				}
-
-				phpbb::$template->assign_vars(array(
-					'S_DETAILS'			=> true,
-					'U_ACTION'			=> $this->u_action . "&amp;action=details&amp;id=$lang_id",
-					'U_BACK'			=> $this->u_action,
-					'LANG_LOCAL_NAME'	=> $lang_entries['lang_local_name'],
-					'LANG_ENGLISH_NAME'	=> $lang_entries['lang_english_name'],
-					'LANG_ISO'			=> $lang_entries['lang_iso'],
-					'LANG_AUTHOR'		=> $lang_entries['lang_author'],
-					'ALLOW_UPLOAD'		=> sizeof($methods),
-				));
-
-				// If current lang is different from the default lang, then first try to grab missing/additional vars
-				if ($lang_iso != phpbb::$config['default_lang'])
-				{
-					$is_missing_var = false;
-
-					foreach ($this->main_files as $file)
-					{
-						if (file_exists(PHPBB_ROOT_PATH . $this->get_filename($lang_iso, '', $file)))
-						{
-							$missing_vars[$file] = $this->compare_language_files(phpbb::$config['default_lang'], $lang_iso, '', $file);
-
-							if (sizeof($missing_vars[$file]))
-							{
-								$is_missing_var = true;
-							}
-						}
-						else
-						{
-							$missing_files[] = $this->get_filename($lang_iso, '', $file);
-						}
-					}
-
-					// Now go through acp/mods directories
-					foreach ($acp_files as $file)
-					{
-						if (file_exists(PHPBB_ROOT_PATH . $this->get_filename($lang_iso, 'acp', $file)))
-						{
-							$missing_vars['acp/' . $file] = $this->compare_language_files(phpbb::$config['default_lang'], $lang_iso, 'acp', $file);
-
-							if (sizeof($missing_vars['acp/' . $file]))
-							{
-								$is_missing_var = true;
-							}
-						}
-						else
-						{
-							$missing_files[] = $this->get_filename($lang_iso, 'acp', $file);
-						}
-					}
-
-					if (sizeof($mods_files))
-					{
-						foreach ($mods_files as $file)
-						{
-							if (file_exists(PHPBB_ROOT_PATH . $this->get_filename($lang_iso, 'mods', $file)))
-							{
-								$missing_vars['mods/' . $file] = $this->compare_language_files(phpbb::$config['default_lang'], $lang_iso, 'mods', $file);
-
-								if (sizeof($missing_vars['mods/' . $file]))
-								{
-									$is_missing_var = true;
-								}
-							}
-							else
-							{
-								$missing_files[] = $this->get_filename($lang_iso, 'mods', $file);
-							}
-						}
-					}
-
-					// More missing files... for example email templates?
-					foreach ($email_files as $file)
-					{
-						if (!file_exists(PHPBB_ROOT_PATH . $this->get_filename($lang_iso, 'email', $file)))
-						{
-							$missing_files[] = $this->get_filename($lang_iso, 'email', $file);
-						}
-					}
-
-					if (sizeof($missing_files))
-					{
-						phpbb::$template->assign_vars(array(
-							'S_MISSING_FILES'		=> true,
-							'L_MISSING_FILES'		=> sprintf(phpbb::$user->lang['THOSE_MISSING_LANG_FILES'], $lang_entries['lang_local_name']),
-							'MISSING_FILES'			=> implode('<br />', $missing_files),
-						));
-					}
-
-					if ($is_missing_var)
-					{
-						phpbb::$template->assign_vars(array(
-							'S_MISSING_VARS'			=> true,
-							'L_MISSING_VARS_EXPLAIN'	=> sprintf(phpbb::$user->lang['THOSE_MISSING_LANG_VARIABLES'], $lang_entries['lang_local_name']),
-							'U_MISSING_ACTION'			=> $this->u_action . "&amp;action=$action&amp;id=$lang_id",
-						));
-
-						foreach ($missing_vars as $file => $vars)
-						{
-							if (!sizeof($vars))
-							{
-								continue;
-							}
-
-							phpbb::$template->assign_block_vars('missing', array(
-								'FILE'			=> $file,
-								'TPL'			=> $this->print_language_entries($vars, '', false),
-								'KEY'			=> (strpos($file, '/') === false) ? '|' . $file : str_replace('/', '|', $file),
-							));
-						}
-					}
-				}
-
-				// Main language files
-				$s_lang_options = '<option value="|common.' . PHP_EXT . '" class="sep">' . phpbb::$user->lang['LANGUAGE_FILES'] . '</option>';
-				foreach ($this->main_files as $file)
-				{
-					if (strpos($file, 'help_') === 0)
-					{
-						continue;
-					}
-
-					$prefix = (file_exists(PHPBB_ROOT_PATH . $this->get_filename($lang_iso, '', $file, true, true))) ? '* ' : '';
-
-					$selected = (!$this->language_directory && $this->language_file == $file) ? ' selected="selected"' : '';
-					$s_lang_options .= '<option value="|' . $file . '"' . $selected . '>' . $prefix . $file . '</option>';
-				}
-
-				// Help Files
-				$s_lang_options .= '<option value="|common.' . PHP_EXT . '" class="sep">' . phpbb::$user->lang['HELP_FILES'] . '</option>';
-				foreach ($this->main_files as $file)
-				{
-					if (strpos($file, 'help_') !== 0)
-					{
-						continue;
-					}
-
-					$prefix = (file_exists(PHPBB_ROOT_PATH . $this->get_filename($lang_iso, '', $file, true, true))) ? '* ' : '';
-
-					$selected = (!$this->language_directory && $this->language_file == $file) ? ' selected="selected"' : '';
-					$s_lang_options .= '<option value="|' . $file . '"' . $selected . '>' . $prefix . $file . '</option>';
-				}
-
-				// Now every other language directory
-				$check_files = array('email', 'acp', 'mods');
-
-				foreach ($check_files as $check)
-				{
-					if (!sizeof(${$check . '_files'}))
-					{
-						continue;
-					}
-
-					$s_lang_options .= '<option value="|common.' . PHP_EXT . '" class="sep">' . phpbb::$user->lang[strtoupper($check) . '_FILES'] . '</option>';
-
-					foreach (${$check . '_files'} as $file)
-					{
-						$prefix = (file_exists(PHPBB_ROOT_PATH . $this->get_filename($lang_iso, $check, $file, true, true))) ? '* ' : '';
-
-						$selected = ($this->language_directory == $check && $this->language_file == $file) ? ' selected="selected"' : '';
-						$s_lang_options .= '<option value="' . $check . '|' . $file . '"' . $selected . '>' . $prefix . $file . '</option>';
-					}
-				}
-
-				// Get Language Entries - if saved within store folder, we take this one (with the option to remove it)
-				$lang = array();
-
-				$is_email_file = ($this->language_directory == 'email') ? true : false;
-				$is_help_file = (strpos($this->language_file, 'help_') === 0) ? true : false;
-
-				$file_from_store = (file_exists(PHPBB_ROOT_PATH . $this->get_filename($lang_iso, $this->language_directory, $this->language_file, true, true))) ? true : false;
-				$no_store_filename = $this->get_filename($lang_iso, $this->language_directory, $this->language_file);
-
-				if (!$file_from_store && !file_exists(PHPBB_ROOT_PATH . $no_store_filename))
-				{
-					$print_message = sprintf(phpbb::$user->lang['MISSING_LANGUAGE_FILE'], $no_store_filename);
-				}
-				else
-				{
-					if ($is_email_file)
-					{
-						$lang = file_get_contents(PHPBB_ROOT_PATH . $this->get_filename($lang_iso, $this->language_directory, $this->language_file, $file_from_store));
-					}
-					else
-					{
-						$help = array();
-						include(PHPBB_ROOT_PATH . $this->get_filename($lang_iso, $this->language_directory, $this->language_file, $file_from_store));
-
-						if ($is_help_file)
-						{
-							$lang = $help;
-							unset($help);
-						}
-					}
-
-					$print_message = (($this->language_directory) ? $this->language_directory . '/' : '') . $this->language_file;
-				}
-
-				// Normal language pack entries
-				phpbb::$template->assign_vars(array(
-					'U_ENTRY_ACTION'		=> $this->u_action . "&amp;action=details&amp;id=$lang_id#entries",
-					'S_EMAIL_FILE'			=> $is_email_file,
-					'S_FROM_STORE'			=> $file_from_store,
-					'S_LANG_OPTIONS'		=> $s_lang_options,
-					'PRINT_MESSAGE'			=> $print_message,
-				));
-
-				if (!$is_email_file)
-				{
-					$tpl = '';
-					$name = (($this->language_directory) ? $this->language_directory . '/' : '') . $this->language_file;
-
-					if (isset($missing_vars[$name]) && sizeof($missing_vars[$name]))
-					{
-						$tpl .= $this->print_language_entries($missing_vars[$name], '* ');
-					}
-
-					$tpl .= $this->print_language_entries($lang);
-
-					phpbb::$template->assign_var('TPL', $tpl);
-					unset($tpl);
-				}
-				else
-				{
-					phpbb::$template->assign_vars(array(
-						'LANG'		=> $lang,
-					));
-
-					unset($lang);
-				}
-
-				return;
-
-			break;
-
-			case 'delete':
-
-				if (!$lang_id)
-				{
-					trigger_error(phpbb::$user->lang['NO_LANG_ID'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				$sql = 'SELECT *
-					FROM ' . LANG_TABLE . '
-					WHERE lang_id = ' . $lang_id;
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if ($row['lang_iso'] == phpbb::$config['default_lang'])
-				{
-					trigger_error(phpbb::$user->lang['NO_REMOVE_DEFAULT_LANG'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				phpbb::$db->sql_query('DELETE FROM ' . LANG_TABLE . ' WHERE lang_id = ' . $lang_id);
-
-				$sql = 'UPDATE ' . USERS_TABLE . "
-					SET user_lang = '" . phpbb::$db->sql_escape(phpbb::$config['default_lang']) . "'
-					WHERE user_lang = '" . phpbb::$db->sql_escape($row['lang_iso']) . "'";
-				phpbb::$db->sql_query($sql);
-
-				// We also need to remove the translated entries for custom profile fields - we want clean tables, don't we?
-				$sql = 'DELETE FROM ' . PROFILE_LANG_TABLE . ' WHERE lang_id = ' . $lang_id;
-				phpbb::$db->sql_query($sql);
-
-				$sql = 'DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . ' WHERE lang_id = ' . $lang_id;
-				phpbb::$db->sql_query($sql);
-
-				$sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . " WHERE image_lang = '" . phpbb::$db->sql_escape($row['lang_iso']) . "'";
-				$result = phpbb::$db->sql_query($sql);
-
-				phpbb::$acm->destroy_sql(STYLES_IMAGESET_DATA_TABLE);
-
-				add_log('admin', 'LOG_LANGUAGE_PACK_DELETED', $row['lang_english_name']);
-
-				trigger_error(sprintf(phpbb::$user->lang['LANGUAGE_PACK_DELETED'], $row['lang_english_name']) . adm_back_link($this->u_action));
-			break;
-
-			case 'install':
-				$lang_iso = request_var('iso', '');
-				$lang_iso = basename($lang_iso);
-
-				if (!$lang_iso || !file_exists(PHPBB_ROOT_PATH . "language/$lang_iso/iso.txt"))
-				{
-					trigger_error(phpbb::$user->lang['LANGUAGE_PACK_NOT_EXIST'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				$file = file(PHPBB_ROOT_PATH . "language/$lang_iso/iso.txt");
-
-				$lang_pack = array(
-					'iso'		=> $lang_iso,
-					'name'		=> trim(htmlspecialchars($file[0])),
-					'local_name'=> trim(htmlspecialchars($file[1], ENT_COMPAT, 'UTF-8')),
-					'author'	=> trim(htmlspecialchars($file[2], ENT_COMPAT, 'UTF-8'))
-				);
-				unset($file);
-
-				$sql = 'SELECT lang_iso
-					FROM ' . LANG_TABLE . "
-					WHERE lang_iso = '" . phpbb::$db->sql_escape($lang_iso) . "'";
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if ($row)
-				{
-					trigger_error(phpbb::$user->lang['LANGUAGE_PACK_ALREADY_INSTALLED'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				if (!$lang_pack['name'] || !$lang_pack['local_name'])
-				{
-					trigger_error(phpbb::$user->lang['INVALID_LANGUAGE_PACK'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				// Add language pack
-				$sql_ary = array(
-					'lang_iso'			=> $lang_pack['iso'],
-					'lang_dir'			=> $lang_pack['iso'],
-					'lang_english_name'	=> $lang_pack['name'],
-					'lang_local_name'	=> $lang_pack['local_name'],
-					'lang_author'		=> $lang_pack['author']
-				);
-
-				phpbb::$db->sql_query('INSERT INTO ' . LANG_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary));
-				$lang_id = phpbb::$db->sql_nextid();
-
-				$valid_localized = array(
-					'icon_back_top', 'icon_contact_aim', 'icon_contact_email', 'icon_contact_icq', 'icon_contact_jabber', 'icon_contact_msnm', 'icon_contact_pm', 'icon_contact_yahoo', 'icon_contact_www', 'icon_post_delete', 'icon_post_edit', 'icon_post_info', 'icon_post_quote', 'icon_post_report', 'icon_user_online', 'icon_user_offline', 'icon_user_profile', 'icon_user_search', 'icon_user_warn', 'button_pm_forward', 'button_pm_new', 'button_pm_reply', 'button_topic_locked', 'button_topic_new', 'button_topic_reply',
-				);
-
-				$sql_ary = array();
-
-				$sql = 'SELECT *
-					FROM ' . STYLES_IMAGESET_TABLE;
-				$result = phpbb::$db->sql_query($sql);
-				while ($imageset_row = phpbb::$db->sql_fetchrow($result))
-				{
-					if (@file_exists(PHPBB_ROOT_PATH . "styles/{$imageset_row['imageset_path']}/imageset/{$lang_pack['iso']}/imageset.cfg"))
-					{
-						$cfg_data_imageset_data = parse_cfg_file(PHPBB_ROOT_PATH . "styles/{$imageset_row['imageset_path']}/imageset/{$lang_pack['iso']}/imageset.cfg");
-						foreach ($cfg_data_imageset_data as $image_name => $value)
-						{
-							if (strpos($value, '*') !== false)
-							{
-								if (substr($value, -1, 1) === '*')
-								{
-									list($image_filename, $image_height) = explode('*', $value);
-									$image_width = 0;
-								}
-								else
-								{
-									list($image_filename, $image_height, $image_width) = explode('*', $value);
-								}
-							}
-							else
-							{
-								$image_filename = $value;
-								$image_height = $image_width = 0;
-							}
-
-							if (strpos($image_name, 'img_') === 0 && $image_filename)
-							{
-								$image_name = substr($image_name, 4);
-								if (in_array($image_name, $valid_localized))
-								{
-									$sql_ary[] = array(
-										'image_name'		=> (string) $image_name,
-										'image_filename'	=> (string) $image_filename,
-										'image_height'		=> (int) $image_height,
-										'image_width'		=> (int) $image_width,
-										'imageset_id'		=> (int) $imageset_row['imageset_id'],
-										'image_lang'		=> (string) $lang_pack['iso'],
-									);
-								}
-							}
-						}
-					}
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				if (sizeof($sql_ary))
-				{
-					phpbb::$db->sql_multi_insert(STYLES_IMAGESET_DATA_TABLE, $sql_ary);
-					phpbb::$acm->destroy_sql(STYLES_IMAGESET_DATA_TABLE);
-				}
-
-				// Now let's copy the default language entries for custom profile fields for this new language - makes admin's life easier.
-				$sql = 'SELECT lang_id
-					FROM ' . LANG_TABLE . "
-					WHERE lang_iso = '" . phpbb::$db->sql_escape(phpbb::$config['default_lang']) . "'";
-				$result = phpbb::$db->sql_query($sql);
-				$default_lang_id = (int) phpbb::$db->sql_fetchfield('lang_id');
-				phpbb::$db->sql_freeresult($result);
-
-				// From the mysql documentation:
-				// Prior to MySQL 4.0.14, the target table of the INSERT statement cannot appear in the FROM clause of the SELECT part of the query. This limitation is lifted in 4.0.14.
-				// Due to this we stay on the safe side if we do the insertion "the manual way"
-
-				$sql = 'SELECT field_id, lang_name, lang_explain, lang_default_value
-					FROM ' . PROFILE_LANG_TABLE . '
-					WHERE lang_id = ' . $default_lang_id;
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$row['lang_id'] = $lang_id;
-					phpbb::$db->sql_query('INSERT INTO ' . PROFILE_LANG_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $row));
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				$sql = 'SELECT field_id, option_id, field_type, lang_value
-					FROM ' . PROFILE_FIELDS_LANG_TABLE . '
-					WHERE lang_id = ' . $default_lang_id;
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$row['lang_id'] = $lang_id;
-					phpbb::$db->sql_query('INSERT INTO ' . PROFILE_FIELDS_LANG_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $row));
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				add_log('admin', 'LOG_LANGUAGE_PACK_INSTALLED', $lang_pack['name']);
-
-				trigger_error(sprintf(phpbb::$user->lang['LANGUAGE_PACK_INSTALLED'], $lang_pack['name']) . adm_back_link($this->u_action));
-
-			break;
-
-			case 'download':
-
-				if (!$lang_id)
-				{
-					trigger_error(phpbb::$user->lang['NO_LANG_ID'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				$sql = 'SELECT *
-					FROM ' . LANG_TABLE . '
-					WHERE lang_id = ' . $lang_id;
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				$use_method = request_var('use_method', '');
-				$methods = array('.tar');
-
-				$available_methods = array('.tar.gz' => 'zlib', '.tar.bz2' => 'bz2', '.zip' => 'zlib');
-				foreach ($available_methods as $type => $module)
-				{
-					if (!@extension_loaded($module))
-					{
-						continue;
-					}
-
-					$methods[] = $type;
-				}
-
-				// Let the user decide in which format he wants to have the pack
-				if (!$use_method)
-				{
-					$this->page_title = 'SELECT_DOWNLOAD_FORMAT';
-
-					$radio_buttons = '';
-					foreach ($methods as $method)
-					{
-						$radio_buttons .= '<label><input type="radio"' . ((!$radio_buttons) ? ' id="use_method"' : '') . ' class="radio" value="' . $method . '" name="use_method" /> ' . $method . '</label>';
-					}
-
-					phpbb::$template->assign_vars(array(
-						'S_SELECT_METHOD'		=> true,
-						'U_BACK'				=> $this->u_action,
-						'U_ACTION'				=> $this->u_action . "&amp;action=$action&amp;id=$lang_id",
-						'RADIO_BUTTONS'			=> $radio_buttons,
-					));
-
-					return;
-				}
-
-				if (!in_array($use_method, $methods))
-				{
-					$use_method = '.tar';
-				}
-
-				include_once(PHPBB_ROOT_PATH . 'includes/functions_compress.' . PHP_EXT);
-
-				if ($use_method == '.zip')
-				{
-					$compress = new compress_zip('w', PHPBB_ROOT_PATH . 'store/lang_' . $row['lang_iso'] . $use_method);
-				}
-				else
-				{
-					$compress = new compress_tar('w', PHPBB_ROOT_PATH . 'store/lang_' . $row['lang_iso'] . $use_method, $use_method);
-				}
-
-				// Get email templates
-				$email_templates = filelist(PHPBB_ROOT_PATH . 'language/' . $row['lang_iso'], 'email', 'txt');
-				$email_templates = $email_templates['email/'];
-
-				// Get acp files
-				$acp_files = filelist(PHPBB_ROOT_PATH . 'language/' . $row['lang_iso'], 'acp', PHP_EXT);
-				$acp_files = $acp_files['acp/'];
-
-				// Get mod files
-				$mod_files = filelist(PHPBB_ROOT_PATH . 'language/' . $row['lang_iso'], 'mods', PHP_EXT);
-				$mod_files = (isset($mod_files['mods/'])) ? $mod_files['mods/'] : array();
-
-				// Add main files
-				$this->add_to_archive($compress, $this->main_files, $row['lang_iso']);
-
-				// Add search files if they exist...
-				if (file_exists(PHPBB_ROOT_PATH . 'language/' . $row['lang_iso'] . '/search_ignore_words.' . PHP_EXT))
-				{
-					$this->add_to_archive($compress, array('search_ignore_words.' . PHP_EXT), $row['lang_iso']);
-				}
-
-				if (file_exists(PHPBB_ROOT_PATH . 'language/' . $row['lang_iso'] . '/search_synonyms.' . PHP_EXT))
-				{
-					$this->add_to_archive($compress, array('search_synonyms.' . PHP_EXT), $row['lang_iso']);
-				}
-
-				// Write files in folders
-				$this->add_to_archive($compress, $email_templates, $row['lang_iso'], 'email');
-				$this->add_to_archive($compress, $acp_files, $row['lang_iso'], 'acp');
-				$this->add_to_archive($compress, $mod_files, $row['lang_iso'], 'mods');
-
-				// Write ISO File
-				$iso_src = htmlspecialchars_decode($row['lang_english_name']) . "\n";
-				$iso_src .= htmlspecialchars_decode($row['lang_local_name']) . "\n";
-				$iso_src .= htmlspecialchars_decode($row['lang_author']);
-				$compress->add_data($iso_src, 'language/' . $row['lang_iso'] . '/iso.txt');
-
-				// index.html files
-				$compress->add_data('', 'language/' . $row['lang_iso'] . '/index.html');
-				$compress->add_data('', 'language/' . $row['lang_iso'] . '/email/index.html');
-				$compress->add_data('', 'language/' . $row['lang_iso'] . '/acp/index.html');
-
-				if (sizeof($mod_files))
-				{
-					$compress->add_data('', 'language/' . $row['lang_iso'] . '/mods/index.html');
-				}
-
-				$compress->close();
-
-				$compress->download('lang_' . $row['lang_iso']);
-				@unlink(PHPBB_ROOT_PATH . 'store/lang_' . $row['lang_iso'] . $use_method);
-
-				exit;
-
-			break;
-		}
-
-		$sql = 'SELECT user_lang, COUNT(user_lang) AS lang_count
-			FROM ' . USERS_TABLE . '
-			GROUP BY user_lang';
-		$result = phpbb::$db->sql_query($sql);
-
-		$lang_count = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$lang_count[$row['user_lang']] = $row['lang_count'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$sql = 'SELECT *
-			FROM ' . LANG_TABLE . '
-			ORDER BY lang_english_name';
-		$result = phpbb::$db->sql_query($sql);
-
-		$installed = array();
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$installed[] = $row['lang_iso'];
-			$tagstyle = ($row['lang_iso'] == phpbb::$config['default_lang']) ? '*' : '';
-
-			phpbb::$template->assign_block_vars('lang', array(
-				'U_DETAILS'			=> $this->u_action . "&amp;action=details&amp;id={$row['lang_id']}",
-				'U_DOWNLOAD'		=> $this->u_action . "&amp;action=download&amp;id={$row['lang_id']}",
-				'U_DELETE'			=> $this->u_action . "&amp;action=delete&amp;id={$row['lang_id']}",
-
-				'ENGLISH_NAME'		=> $row['lang_english_name'],
-				'TAG'				=> $tagstyle,
-				'LOCAL_NAME'		=> $row['lang_local_name'],
-				'ISO'				=> $row['lang_iso'],
-				'USED_BY'			=> (isset($lang_count[$row['lang_iso']])) ? $lang_count[$row['lang_iso']] : 0,
-			));
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$new_ary = $iso = array();
-		$dp = @opendir(PHPBB_ROOT_PATH . 'language');
-
-		if ($dp)
-		{
-			while (($file = readdir($dp)) !== false)
-			{
-				if ($file[0] != '.' && file_exists(PHPBB_ROOT_PATH . "language/$file/iso.txt"))
-				{
-					if (!in_array($file, $installed))
-					{
-						if ($iso = file(PHPBB_ROOT_PATH . "language/$file/iso.txt"))
-						{
-							if (sizeof($iso) == 3)
-							{
-								$new_ary[$file] = array(
-									'iso'		=> $file,
-									'name'		=> trim($iso[0]),
-									'local_name'=> trim($iso[1]),
-									'author'	=> trim($iso[2])
-								);
-							}
-						}
-					}
-				}
-			}
-			closedir($dp);
-		}
-
-		unset($installed);
-
-		if (sizeof($new_ary))
-		{
-			foreach ($new_ary as $iso => $lang_ary)
-			{
-				phpbb::$template->assign_block_vars('notinst', array(
-					'ISO'			=> htmlspecialchars($lang_ary['iso']),
-					'LOCAL_NAME'	=> htmlspecialchars($lang_ary['local_name'], ENT_COMPAT, 'UTF-8'),
-					'NAME'			=> htmlspecialchars($lang_ary['name'], ENT_COMPAT, 'UTF-8'),
-					'U_INSTALL'		=> $this->u_action . '&amp;action=install&amp;iso=' . urlencode($lang_ary['iso']),
-				));
-			}
-		}
-
-		unset($new_ary);
-	}
-
-
-	/**
-	* Set default language variables/header
-	*/
-	function default_variables()
-	{
-		$this->language_file_header = '<?php
-/**
-*
-* {FILENAME} [{LANG_NAME}]
-*
-* @package language
-* @version $' . 'Id: ' . '$
-* @copyright (c) ' . date('Y') . ' phpBB Group
-* @author {CHANGED} - {AUTHOR}
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined(\'IN_PHPBB\'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// \'Page %s of %s\' you can (and should) write \'Page %1$s of %2$s\', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. \'Message %d\' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., \'Click %sHERE%s\' is fine
-';
-
-		$this->lang_header = '
-$lang = array_merge($lang, array(
-';
-
-		// Language files in language root directory
-		$this->main_files = array('common.' . PHP_EXT, 'groups.' . PHP_EXT, 'install.' . PHP_EXT, 'mcp.' . PHP_EXT, 'memberlist.' . PHP_EXT, 'posting.' . PHP_EXT, 'search.' . PHP_EXT, 'ucp.' . PHP_EXT, 'viewforum.' . PHP_EXT, 'viewtopic.' . PHP_EXT, 'help_bbcode.' . PHP_EXT, 'help_faq.' . PHP_EXT);
-	}
-
-	/**
-	* Get filename/location of language file
-	*/
-	function get_filename($lang_iso, $directory, $filename, $check_store = false, $only_return_filename = false)
-	{
-		global $safe_mode;
-
-		$check_filename = "language/$lang_iso/" . (($directory) ? $directory . '/' : '') . $filename;
-
-		if ($check_store)
-		{
-			$check_store_filename = ($safe_mode) ? "store/langfile_{$lang_iso}" . (($directory) ? '_' . $directory : '') . "_{$filename}" : "store/language/$lang_iso/" . (($directory) ? $directory . '/' : '') . $filename;
-
-			if (!$only_return_filename && file_exists(PHPBB_ROOT_PATH . $check_store_filename))
-			{
-				return $check_store_filename;
-			}
-			else if ($only_return_filename)
-			{
-				return $check_store_filename;
-			}
-		}
-
-		return $check_filename;
-	}
-
-	/**
-	* Add files to archive
-	*/
-	function add_to_archive(&$compress, $filelist, $lang_iso, $directory = '')
-	{
-		foreach ($filelist as $file)
-		{
-			// Get source filename
-			$source = $this->get_filename($lang_iso, $directory, $file, true);
-			$destination = 'language/' . $lang_iso . '/' . (($directory) ? $directory . '/' : '') . $file;
-
-			// Add file to archive
-			$compress->add_custom_file(PHPBB_ROOT_PATH . $source, $destination);
-		}
-	}
-
-	/**
-	* Little helper to add some hardcoded template bits
-	*/
-	function add_input_field()
-	{
-		$keys = func_get_args();
-
-		$non_static		= array_shift($keys);
-		$value			= array_shift($keys);
-
-		if (!$non_static)
-		{
-			return '<strong>' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '</strong>';
-		}
-
-		// If more then 270 characters, then we present a textarea, else an input field
-		$textarea = (utf8_strlen($value) > 270) ? true : false;
-		$tpl = '';
-
-		$tpl .= ($textarea) ? '<textarea name="' : '<input type="text" name="';
-		$tpl .= 'entry[' . implode('][', array_map('utf8_htmlspecialchars', $keys)) . ']"';
-
-		$tpl .= ($textarea) ? ' cols="80" rows="5" class="langvalue">' : ' class="langvalue" value="';
-		$tpl .= htmlspecialchars($value, ENT_COMPAT, 'UTF-8');
-		$tpl .= ($textarea) ? '</textarea>' : '" />';
-
-		return $tpl;
-	}
-
-	/**
-	* Print language entries
-	*/
-	function print_language_entries(&$lang_ary, $key_prefix = '', $input_field = true)
-	{
-		$tpl = '';
-
-		foreach ($lang_ary as $key => $value)
-		{
-			if (is_array($value))
-			{
-				// Write key
-				$tpl .= '
-				<tr>
-					<td class="row3" colspan="2">' . htmlspecialchars($key_prefix, ENT_COMPAT, 'UTF-8') . '<strong>' . htmlspecialchars($key, ENT_COMPAT, 'UTF-8') . '</strong></td>
-				</tr>';
-
-				foreach ($value as $_key => $_value)
-				{
-					if (is_array($_value))
-					{
-						// Write key
-						$tpl .= '
-							<tr>
-								<td class="row3" colspan="2">' . htmlspecialchars($key_prefix, ENT_COMPAT, 'UTF-8') . '&nbsp; &nbsp;<strong>' . htmlspecialchars($_key, ENT_COMPAT, 'UTF-8') . '</strong></td>
-							</tr>';
-
-						foreach ($_value as $__key => $__value)
-						{
-							// Write key
-							$tpl .= '
-								<tr>
-									<td class="row1" style="white-space: nowrap;">' . htmlspecialchars($key_prefix, ENT_COMPAT, 'UTF-8') . '<strong>' . htmlspecialchars($__key, ENT_COMPAT, 'UTF-8') . '</strong></td>
-									<td class="row2">';
-
-							$tpl .= $this->add_input_field($input_field, $__value, $key, $_key, $__key);
-
-							$tpl .= '</td>
-								</tr>';
-						}
-					}
-					else
-					{
-						// Write key
-						$tpl .= '
-							<tr>
-								<td class="row1" style="white-space: nowrap;">' . htmlspecialchars($key_prefix, ENT_COMPAT, 'UTF-8') . '<strong>' . htmlspecialchars($_key, ENT_COMPAT, 'UTF-8') . '</strong></td>
-								<td class="row2">';
-
-						$tpl .= $this->add_input_field($input_field, $_value, $key, $_key);
-
-						$tpl .= '</td>
-							</tr>';
-					}
-				}
-
-				$tpl .= '
-				<tr>
-					<td class="spacer" colspan="2">&nbsp;</td>
-				</tr>';
-			}
-			else
-			{
-				// Write key
-				$tpl .= '
-				<tr>
-					<td class="row1" style="white-space: nowrap;">' . htmlspecialchars($key_prefix, ENT_COMPAT, 'UTF-8') . '<strong>' . htmlspecialchars($key, ENT_COMPAT, 'UTF-8') . '</strong></td>
-					<td class="row2">';
-
-				$tpl .= $this->add_input_field($input_field, $value, $key);
-
-				$tpl .= '</td>
-					</tr>';
-			}
-		}
-
-		return $tpl;
-	}
-
-	/**
-	* Compare two language files
-	*/
-	function compare_language_files($source_lang, $dest_lang, $directory, $file)
-	{
-		$return_ary = array();
-
-		$lang = array();
-		include(PHPBB_ROOT_PATH . "language/{$source_lang}/" . (($directory) ? $directory . '/' : '') . $file);
-		$lang_entry_src = $lang;
-
-		$lang = array();
-
-		if (!file_exists(PHPBB_ROOT_PATH . $this->get_filename($dest_lang, $directory, $file, true)))
-		{
-			return array();
-		}
-
-		include(PHPBB_ROOT_PATH . $this->get_filename($dest_lang, $directory, $file, true));
-
-		$lang_entry_dst = $lang;
-
-		unset($lang);
-
-		$diff_array_keys = array_diff(array_keys($lang_entry_src), array_keys($lang_entry_dst));
-		unset($lang_entry_dst);
-
-		foreach ($diff_array_keys as $key)
-		{
-			$return_ary[$key] = $lang_entry_src[$key];
-		}
-
-		unset($lang_entry_src);
-
-		return $return_ary;
-	}
-
-	/**
-	* Return language string value for storage
-	*/
-	function prepare_lang_entry($text, $store = true)
-	{
-		$text = (STRIP) ? stripslashes($text) : $text;
-
-		// Adjust for storage...
-		if ($store)
-		{
-			$text = str_replace("'", "\\'", str_replace('\\', '\\\\', $text));
-		}
-
-		return $text;
-	}
-
-	/**
-	* Format language array for storage
-	*/
-	function format_lang_array($key, $value, $tabs = "\t")
-	{
-		$entry = '';
-
-		if (!is_array($value))
-		{
-			$entry .= "{$tabs}'" . $this->prepare_lang_entry($key) . "'\t=> '" . $this->prepare_lang_entry($value) . "',\n";
-		}
-		else
-		{
-			$_tabs = $tabs . "\t";
-			$entry .= "\n{$tabs}'" . $this->prepare_lang_entry($key) . "'\t=> array(\n";
-
-			foreach ($value as $_key => $_value)
-			{
-				$entry .= $this->format_lang_array($_key, $_value, $_tabs);
-			}
-
-			$entry .= "{$tabs}),\n\n";
-		}
-
-		return $entry;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_logs.php b/phpBB/modules/acp/acp_logs.php
deleted file mode 100644
index ff847d36b5..0000000000
--- a/phpBB/modules/acp/acp_logs.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_logs
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		phpbb::$user->add_lang('mcp');
-
-		// Set up general vars
-		$action		= request_var('action', '');
-		$forum_id	= request_var('f', 0);
-		$start		= request_var('start', 0);
-		$deletemark = phpbb_request::variable('delmarked', false, false, phpbb_request::POST);
-		$deleteall	= phpbb_request::variable('delall', false, false, phpbb_request::POST);
-		$marked		= request_var('mark', array(0));
-
-		// Sort keys
-		$sort_days	= request_var('st', 0);
-		$sort_key	= request_var('sk', 't');
-		$sort_dir	= request_var('sd', 'd');
-
-		$this->tpl_name = 'acp_logs';
-		$this->log_type = constant('LOG_' . strtoupper($mode));
-
-		// Delete entries if requested and able
-		if (($deletemark || $deleteall) && phpbb::$acl->acl_get('a_clearlogs'))
-		{
-			if (confirm_box(true))
-			{
-				$where_sql = '';
-
-				if ($deletemark && sizeof($marked))
-				{
-					$sql_in = array();
-					foreach ($marked as $mark)
-					{
-						$sql_in[] = $mark;
-					}
-					$where_sql = ' AND ' . phpbb::$db->sql_in_set('log_id', $sql_in);
-					unset($sql_in);
-				}
-
-				if ($where_sql || $deleteall)
-				{
-					$sql = 'DELETE FROM ' . LOG_TABLE . "
-						WHERE log_type = {$this->log_type}
-						$where_sql";
-					phpbb::$db->sql_query($sql);
-
-					add_log('admin', 'LOG_CLEAR_' . strtoupper($mode));
-				}
-			}
-			else
-			{
-				confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-					'f'			=> $forum_id,
-					'start'		=> $start,
-					'delmarked'	=> $deletemark,
-					'delall'	=> $deleteall,
-					'mark'		=> $marked,
-					'st'		=> $sort_days,
-					'sk'		=> $sort_key,
-					'sd'		=> $sort_dir,
-					'i'			=> $id,
-					'mode'		=> $mode,
-					'action'	=> $action))
-				);
-			}
-		}
-
-		// Sorting
-		$limit_days = array(0 => phpbb::$user->lang['ALL_ENTRIES'], 1 => phpbb::$user->lang['1_DAY'], 7 => phpbb::$user->lang['7_DAYS'], 14 => phpbb::$user->lang['2_WEEKS'], 30 => phpbb::$user->lang['1_MONTH'], 90 => phpbb::$user->lang['3_MONTHS'], 180 => phpbb::$user->lang['6_MONTHS'], 365 => phpbb::$user->lang['1_YEAR']);
-		$sort_by_text = array('u' => phpbb::$user->lang['SORT_USERNAME'], 't' => phpbb::$user->lang['SORT_DATE'], 'i' => phpbb::$user->lang['SORT_IP'], 'o' => phpbb::$user->lang['SORT_ACTION']);
-		$sort_by_sql = array('u' => 'u.username_clean', 't' => 'l.log_time', 'i' => 'l.log_ip', 'o' => 'l.log_operation');
-
-		$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
-		gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
-
-		// Define where and sort sql for use in displaying logs
-		$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
-		$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
-
-		$l_title = phpbb::$user->lang['ACP_' . strtoupper($mode) . '_LOGS'];
-		$l_title_explain = phpbb::$user->lang['ACP_' . strtoupper($mode) . '_LOGS_EXPLAIN'];
-
-		$this->page_title = $l_title;
-
-		// Define forum list if we're looking @ mod logs
-		if ($mode == 'mod')
-		{
-			$forum_box = '<option value="0">' . phpbb::$user->lang['ALL_FORUMS'] . '</option>' . make_forum_select($forum_id);
-
-			phpbb::$template->assign_vars(array(
-				'S_SHOW_FORUMS'			=> true,
-				'S_FORUM_BOX'			=> $forum_box,
-			));
-		}
-
-		// Grab log data
-		$log_data = array();
-		$log_count = 0;
-		view_log($mode, $log_data, $log_count, phpbb::$config['topics_per_page'], $start, $forum_id, 0, 0, $sql_where, $sql_sort);
-
-		phpbb::$template->assign_vars(array(
-			'L_TITLE'		=> $l_title,
-			'L_EXPLAIN'		=> $l_title_explain,
-			'U_ACTION'		=> $this->u_action,
-
-			'S_ON_PAGE'		=> on_page($log_count, phpbb::$config['topics_per_page'], $start),
-			'PAGINATION'	=> generate_pagination($this->u_action . "&amp;$u_sort_param", $log_count, phpbb::$config['topics_per_page'], $start, true),
-
-			'S_LIMIT_DAYS'	=> $s_limit_days,
-			'S_SORT_KEY'	=> $s_sort_key,
-			'S_SORT_DIR'	=> $s_sort_dir,
-			'S_CLEARLOGS'	=> phpbb::$acl->acl_get('a_clearlogs'),
-		));
-
-		foreach ($log_data as $row)
-		{
-			$data = array();
-
-			$checks = array('viewtopic', 'viewlogs', 'viewforum');
-			foreach ($checks as $check)
-			{
-				if (isset($row[$check]) && $row[$check])
-				{
-					$data[] = '<a href="' . $row[$check] . '">' . phpbb::$user->lang['LOGVIEW_' . strtoupper($check)] . '</a>';
-				}
-			}
-
-			phpbb::$template->assign_block_vars('log', array(
-				'USERNAME'			=> $row['username_full'],
-				'REPORTEE_USERNAME'	=> ($row['reportee_username'] && $row['user_id'] != $row['reportee_id']) ? $row['reportee_username_full'] : '',
-
-				'IP'				=> $row['ip'],
-				'DATE'				=> phpbb::$user->format_date($row['time']),
-				'ACTION'			=> $row['action'],
-				'DATA'				=> (sizeof($data)) ? implode(' | ', $data) : '',
-				'ID'				=> $row['id'],
-			));
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_main.php b/phpBB/modules/acp/acp_main.php
deleted file mode 100644
index a7d3dbf0cf..0000000000
--- a/phpBB/modules/acp/acp_main.php
+++ /dev/null
@@ -1,517 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_main
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		// Show restore permissions notice
-		if (phpbb::$user->data['user_perm_from'] && phpbb::$acl->acl_get('a_switchperm'))
-		{
-			$this->tpl_name = 'acp_main';
-			$this->page_title = 'ACP_MAIN';
-
-			$sql = 'SELECT user_id, username, user_colour
-				FROM ' . USERS_TABLE . '
-				WHERE user_id = ' . phpbb::$user->data['user_perm_from'];
-			$result = phpbb::$db->sql_query($sql);
-			$user_row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			$perm_from = '<strong' . (($user_row['user_colour']) ? ' style="color: #' . $user_row['user_colour'] . '">' : '>');
-			$perm_from .= ($user_row['user_id'] != ANONYMOUS) ? '<a href="' . phpbb::$url->append_sid('memberlist', 'mode=viewprofile&amp;u=' . $user_row['user_id']) . '">' : '';
-			$perm_from .= $user_row['username'];
-			$perm_from .= ($user_row['user_id'] != ANONYMOUS) ? '</a>' : '';
-			$perm_from .= '</strong>';
-
-			phpbb::$template->assign_vars(array(
-				'S_RESTORE_PERMISSIONS'		=> true,
-				'U_RESTORE_PERMISSIONS'		=> phpbb::$url->append_sid('ucp', 'mode=restore_perm'),
-				'PERM_FROM'					=> $perm_from,
-				'L_PERMISSIONS_TRANSFERRED_EXPLAIN'	=> sprintf(phpbb::$user->lang['PERMISSIONS_TRANSFERRED_EXPLAIN'], $perm_from, phpbb::$url->append_sid('ucp', 'mode=restore_perm')),
-			));
-
-			return;
-		}
-
-		$action = request_var('action', '');
-
-		if ($action)
-		{
-			if ($action === 'admlogout')
-			{
-				phpbb::$user->unset_admin();
-				$redirect_url = phpbb::$url->append_sid(PHPBB_ROOT_PATH . 'index.' . PHP_EXT);
-				phpbb::$url->meta_refresh(3, $redirect_url);
-				trigger_error(phpbb::$user->lang['ADM_LOGGED_OUT'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_INDEX'], '<a href="' . $redirect_url . '">', '</a>'));
-			}
-
-			if (!confirm_box(true))
-			{
-				switch ($action)
-				{
-					case 'online':
-						$confirm = true;
-						$confirm_lang = 'RESET_ONLINE_CONFIRM';
-					break;
-					case 'stats':
-						$confirm = true;
-						$confirm_lang = 'RESYNC_STATS_CONFIRM';
-					break;
-					case 'user':
-						$confirm = true;
-						$confirm_lang = 'RESYNC_POSTCOUNTS_CONFIRM';
-					break;
-					case 'date':
-						$confirm = true;
-						$confirm_lang = 'RESET_DATE_CONFIRM';
-					break;
-					case 'db_track':
-						$confirm = true;
-						$confirm_lang = 'RESYNC_POST_MARKING_CONFIRM';
-					break;
-					case 'purge_cache':
-						$confirm = true;
-						$confirm_lang = 'PURGE_CACHE_CONFIRM';
-					break;
-
-					default:
-						$confirm = true;
-						$confirm_lang = 'CONFIRM_OPERATION';
-				}
-
-				if ($confirm)
-				{
-					confirm_box(false, phpbb::$user->lang[$confirm_lang], build_hidden_fields(array(
-						'i'			=> $id,
-						'mode'		=> $mode,
-						'action'	=> $action,
-					)));
-				}
-			}
-			else
-			{
-				switch ($action)
-				{
-
-					case 'online':
-						if (!phpbb::$acl->acl_get('a_board'))
-						{
-							trigger_error(phpbb::$user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
-						}
-
-						set_config('record_online_users', 1, true);
-						set_config('record_online_date', time(), true);
-						add_log('admin', 'LOG_RESET_ONLINE');
-					break;
-
-					case 'stats':
-						if (!phpbb::$acl->acl_get('a_board'))
-						{
-							trigger_error(phpbb::$user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
-						}
-
-						$sql = 'SELECT COUNT(post_id) AS stat
-							FROM ' . POSTS_TABLE . '
-							WHERE post_approved = 1';
-						$result = phpbb::$db->sql_query($sql);
-						set_config('num_posts', (int) phpbb::$db->sql_fetchfield('stat'), true);
-						phpbb::$db->sql_freeresult($result);
-
-						$sql = 'SELECT COUNT(topic_id) AS stat
-							FROM ' . TOPICS_TABLE . '
-							WHERE topic_approved = 1';
-						$result = phpbb::$db->sql_query($sql);
-						set_config('num_topics', (int) phpbb::$db->sql_fetchfield('stat'), true);
-						phpbb::$db->sql_freeresult($result);
-
-						$sql = 'SELECT COUNT(user_id) AS stat
-							FROM ' . USERS_TABLE . '
-							WHERE user_type IN (' . phpbb::USER_NORMAL . ',' . phpbb::USER_FOUNDER . ')';
-						$result = phpbb::$db->sql_query($sql);
-						set_config('num_users', (int) phpbb::$db->sql_fetchfield('stat'), true);
-						phpbb::$db->sql_freeresult($result);
-
-						$sql = 'SELECT COUNT(attach_id) as stat
-							FROM ' . ATTACHMENTS_TABLE . '
-							WHERE is_orphan = 0';
-						$result = phpbb::$db->sql_query($sql);
-						set_config('num_files', (int) phpbb::$db->sql_fetchfield('stat'), true);
-						phpbb::$db->sql_freeresult($result);
-
-						$sql = 'SELECT SUM(filesize) as stat
-							FROM ' . ATTACHMENTS_TABLE . '
-							WHERE is_orphan = 0';
-						$result = phpbb::$db->sql_query($sql);
-						set_config('upload_dir_size', (float) phpbb::$db->sql_fetchfield('stat'), true);
-						phpbb::$db->sql_freeresult($result);
-
-						if (!function_exists('update_last_username'))
-						{
-							include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-						}
-						update_last_username();
-
-						add_log('admin', 'LOG_RESYNC_STATS');
-					break;
-
-					case 'user':
-						if (!phpbb::$acl->acl_get('a_board'))
-						{
-							trigger_error(phpbb::$user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
-						}
-
-						// Resync post counts
-						$start = $max_post_id = 0;
-
-						// Find the maximum post ID, we can only stop the cycle when we've reached it
-						$sql = 'SELECT MAX(forum_last_post_id) as max_post_id
-							FROM ' . FORUMS_TABLE;
-						$result = phpbb::$db->sql_query($sql);
-						$max_post_id = (int) phpbb::$db->sql_fetchfield('max_post_id');
-						phpbb::$db->sql_freeresult($result);
-
-						// No maximum post id? :o
-						if (!$max_post_id)
-						{
-							$sql = 'SELECT MAX(post_id)
-								FROM ' . POSTS_TABLE;
-							$result = phpbb::$db->sql_query($sql);
-							$max_post_id = (int) phpbb::$db->sql_fetchfield('max_post_id');
-							phpbb::$db->sql_freeresult($result);
-						}
-
-						// Still no maximum post id? Then we are finished
-						if (!$max_post_id)
-						{
-							add_log('admin', 'LOG_RESYNC_POSTCOUNTS');
-							break;
-						}
-
-						$step = (phpbb::$config['num_posts']) ? (max((int) (phpbb::$config['num_posts'] / 5), 20000)) : 20000;
-						phpbb::$db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_posts = 0');
-
-						while ($start < $max_post_id)
-						{
-							$sql = 'SELECT COUNT(post_id) AS num_posts, poster_id
-								FROM ' . POSTS_TABLE . '
-								WHERE post_id BETWEEN ' . ($start + 1) . ' AND ' . ($start + $step) . '
-									AND post_postcount = 1 AND post_approved = 1
-								GROUP BY poster_id';
-							$result = phpbb::$db->sql_query($sql);
-
-							if ($row = phpbb::$db->sql_fetchrow($result))
-							{
-								do
-								{
-									$sql = 'UPDATE ' . USERS_TABLE . " SET user_posts = user_posts + {$row['num_posts']} WHERE user_id = {$row['poster_id']}";
-									phpbb::$db->sql_query($sql);
-								}
-								while ($row = phpbb::$db->sql_fetchrow($result));
-							}
-							phpbb::$db->sql_freeresult($result);
-
-							$start += $step;
-						}
-
-						add_log('admin', 'LOG_RESYNC_POSTCOUNTS');
-
-					break;
-
-					case 'date':
-						if (!phpbb::$acl->acl_get('a_board'))
-						{
-							trigger_error(phpbb::$user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
-						}
-
-						set_config('board_startdate', time() - 1);
-						add_log('admin', 'LOG_RESET_DATE');
-					break;
-
-					case 'db_track':
-						if (phpbb::$db->features['truncate'])
-						{
-							phpbb::$db->sql_query('TRUNCATE TABLE ' . TOPICS_POSTED_TABLE);
-						}
-						else
-						{
-							phpbb::$db->sql_query('DELETE FROM ' . TOPICS_POSTED_TABLE);
-						}
-
-						// This can get really nasty... therefore we only do the last six months
-						$get_from_time = time() - (6 * 4 * 7 * 24 * 60 * 60);
-
-						// Select forum ids, do not include categories
-						$sql = 'SELECT forum_id
-							FROM ' . FORUMS_TABLE . '
-							WHERE forum_type <> ' . FORUM_CAT;
-						$result = phpbb::$db->sql_query($sql);
-
-						$forum_ids = array();
-						while ($row = phpbb::$db->sql_fetchrow($result))
-						{
-							$forum_ids[] = $row['forum_id'];
-						}
-						phpbb::$db->sql_freeresult($result);
-
-						// Any global announcements? ;)
-						$forum_ids[] = 0;
-
-						// Now go through the forums and get us some topics...
-						foreach ($forum_ids as $forum_id)
-						{
-							$sql = 'SELECT p.poster_id, p.topic_id
-								FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t
-								WHERE t.forum_id = ' . $forum_id . '
-									AND t.topic_moved_id = 0
-									AND t.topic_last_post_time > ' . $get_from_time . '
-									AND t.topic_id = p.topic_id
-									AND p.poster_id <> ' . ANONYMOUS . '
-								GROUP BY p.poster_id, p.topic_id';
-							$result = phpbb::$db->sql_query($sql);
-
-							$posted = array();
-							while ($row = phpbb::$db->sql_fetchrow($result))
-							{
-								$posted[$row['poster_id']][] = $row['topic_id'];
-							}
-							phpbb::$db->sql_freeresult($result);
-
-							$sql_ary = array();
-							foreach ($posted as $user_id => $topic_row)
-							{
-								foreach ($topic_row as $topic_id)
-								{
-									$sql_ary[] = array(
-										'user_id'		=> (int) $user_id,
-										'topic_id'		=> (int) $topic_id,
-										'topic_posted'	=> 1,
-									);
-								}
-							}
-							unset($posted);
-
-							if (sizeof($sql_ary))
-							{
-								phpbb::$db->sql_multi_insert(TOPICS_POSTED_TABLE, $sql_ary);
-							}
-						}
-
-						add_log('admin', 'LOG_RESYNC_POST_MARKING');
-					break;
-
-					case 'purge_cache':
-						if (!phpbb::$user->is_founder)
-						{
-							trigger_error(phpbb::$user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
-						}
-
-						phpbb::$acm->purge();
-
-						// Clear permissions
-						phpbb::$acl->acl_clear_prefetch();
-						cache_moderators();
-
-						add_log('admin', 'LOG_PURGE_CACHE');
-					break;
-				}
-			}
-		}
-
-		// Get forum statistics
-		$total_posts = phpbb::$config['num_posts'];
-		$total_topics = phpbb::$config['num_topics'];
-		$total_users = phpbb::$config['num_users'];
-		$total_files = phpbb::$config['num_files'];
-
-		$start_date = phpbb::$user->format_date(phpbb::$config['board_startdate']);
-
-		$boarddays = (time() - phpbb::$config['board_startdate']) / 86400;
-
-		$posts_per_day = sprintf('%.2f', $total_posts / $boarddays);
-		$topics_per_day = sprintf('%.2f', $total_topics / $boarddays);
-		$users_per_day = sprintf('%.2f', $total_users / $boarddays);
-		$files_per_day = sprintf('%.2f', $total_files / $boarddays);
-
-		$upload_dir_size = get_formatted_filesize(phpbb::$config['upload_dir_size']);
-
-		$avatar_dir_size = 0;
-
-		if ($avatar_dir = @opendir(PHPBB_ROOT_PATH . phpbb::$config['avatar_path']))
-		{
-			while (($file = readdir($avatar_dir)) !== false)
-			{
-				if ($file[0] != '.' && $file != 'CVS' && strpos($file, 'index.') === false)
-				{
-					$avatar_dir_size += filesize(PHPBB_ROOT_PATH . phpbb::$config['avatar_path'] . '/' . $file);
-				}
-			}
-			closedir($avatar_dir);
-
-			$avatar_dir_size = get_formatted_filesize($avatar_dir_size);
-		}
-		else
-		{
-			// Couldn't open Avatar dir.
-			$avatar_dir_size = phpbb::$user->lang['NOT_AVAILABLE'];
-		}
-
-		if ($posts_per_day > $total_posts)
-		{
-			$posts_per_day = $total_posts;
-		}
-
-		if ($topics_per_day > $total_topics)
-		{
-			$topics_per_day = $total_topics;
-		}
-
-		if ($users_per_day > $total_users)
-		{
-			$users_per_day = $total_users;
-		}
-
-		if ($files_per_day > $total_files)
-		{
-			$files_per_day = $total_files;
-		}
-
-		if (phpbb::$config['allow_attachments'] || phpbb::$config['allow_pm_attach'])
-		{
-			$sql = 'SELECT COUNT(attach_id) AS total_orphan
-				FROM ' . ATTACHMENTS_TABLE . '
-				WHERE is_orphan = 1
-					AND filetime < ' . (time() - 3*60*60);
-			$result = phpbb::$db->sql_query($sql);
-			$total_orphan = (int) phpbb::$db->sql_fetchfield('total_orphan');
-			phpbb::$db->sql_freeresult($result);
-		}
-		else
-		{
-			$total_orphan = false;
-		}
-
-		$dbsize = get_database_size();
-
-		phpbb::$template->assign_vars(array(
-			'TOTAL_POSTS'		=> $total_posts,
-			'POSTS_PER_DAY'		=> $posts_per_day,
-			'TOTAL_TOPICS'		=> $total_topics,
-			'TOPICS_PER_DAY'	=> $topics_per_day,
-			'TOTAL_USERS'		=> $total_users,
-			'USERS_PER_DAY'		=> $users_per_day,
-			'TOTAL_FILES'		=> $total_files,
-			'FILES_PER_DAY'		=> $files_per_day,
-			'START_DATE'		=> $start_date,
-			'AVATAR_DIR_SIZE'	=> $avatar_dir_size,
-			'DBSIZE'			=> $dbsize,
-			'UPLOAD_DIR_SIZE'	=> $upload_dir_size,
-			'TOTAL_ORPHAN'		=> $total_orphan,
-			'S_TOTAL_ORPHAN'	=> ($total_orphan === false) ? false : true,
-			'GZIP_COMPRESSION'	=> (phpbb::$config['gzip_compress']) ? phpbb::$user->lang['ON'] : phpbb::$user->lang['OFF'],
-			'DATABASE_INFO'		=> phpbb::$db->sql_server_info(),
-			'BOARD_VERSION'		=> phpbb::$config['version'],
-
-			'U_ACTION'			=> $this->u_action,
-			'U_ADMIN_LOG'		=> phpbb::$url->append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, 'i=logs&amp;mode=admin'),
-			'U_INACTIVE_USERS'	=> phpbb::$url->append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, 'i=inactive&amp;mode=list'),
-
-			'S_ACTION_OPTIONS'	=> (phpbb::$acl->acl_get('a_board')) ? true : false,
-			'S_FOUNDER'			=> phpbb::$user->is_founder,
-			)
-		);
-
-		$log_data = array();
-		$log_count = 0;
-
-		if (phpbb::$acl->acl_get('a_viewlogs'))
-		{
-			view_log('admin', $log_data, $log_count, 5);
-
-			foreach ($log_data as $row)
-			{
-				phpbb::$template->assign_block_vars('log', array(
-					'USERNAME'	=> $row['username_full'],
-					'IP'		=> $row['ip'],
-					'DATE'		=> phpbb::$user->format_date($row['time']),
-					'ACTION'	=> $row['action'])
-				);
-			}
-		}
-
-		if (phpbb::$acl->acl_get('a_user'))
-		{
-			$inactive = array();
-			$inactive_count = 0;
-
-			view_inactive_users($inactive, $inactive_count, 10);
-
-			foreach ($inactive as $row)
-			{
-				phpbb::$template->assign_block_vars('inactive', array(
-					'INACTIVE_DATE'	=> phpbb::$user->format_date($row['user_inactive_time']),
-					'JOINED'		=> phpbb::$user->format_date($row['user_regdate']),
-					'LAST_VISIT'	=> (!$row['user_lastvisit']) ? ' - ' : phpbb::$user->format_date($row['user_lastvisit']),
-					'REASON'		=> $row['inactive_reason'],
-					'USER_ID'		=> $row['user_id'],
-					'USERNAME'		=> $row['username'],
-					'U_USER_ADMIN'	=> phpbb::$url->append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=users&amp;mode=overview&amp;u={$row['user_id']}"))
-				);
-			}
-
-			$option_ary = array('activate' => 'ACTIVATE', 'delete' => 'DELETE');
-			if (phpbb::$config['email_enable'])
-			{
-				$option_ary += array('remind' => 'REMIND');
-			}
-
-			phpbb::$template->assign_vars(array(
-				'S_INACTIVE_USERS'		=> true,
-				'S_INACTIVE_OPTIONS'	=> build_select($option_ary))
-			);
-		}
-
-		// Warn if install is still present
-		if (file_exists(PHPBB_ROOT_PATH . 'install'))
-		{
-			phpbb::$template->assign_var('S_REMOVE_INSTALL', true);
-		}
-
-		if (!defined('PHPBB_DISABLE_CONFIG_CHECK') && file_exists(PHPBB_ROOT_PATH . 'config.' . PHP_EXT) && is_writable(PHPBB_ROOT_PATH . 'config.' . PHP_EXT))
-		{
-			// World-Writable? (000x)
-			phpbb::$template->assign_var('S_WRITABLE_CONFIG', (bool) (@fileperms(PHPBB_ROOT_PATH . 'config.' . PHP_EXT) & 0x0002));
-		}
-
-		// Fill dbms version if not yet filled
-		if (empty(phpbb::$config['dbms_version']))
-		{
-			set_config('dbms_version', phpbb::$db->sql_server_info(true));
-		}
-
-		$this->tpl_name = 'acp_main';
-		$this->page_title = 'ACP_MAIN';
-	}
-}
-
-?>
diff --git a/phpBB/modules/acp/acp_modules.php b/phpBB/modules/acp/acp_modules.php
deleted file mode 100644
index 631f78c830..0000000000
--- a/phpBB/modules/acp/acp_modules.php
+++ /dev/null
@@ -1,1041 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* - Able to check for new module versions (modes changed/adjusted/added/removed)
-* Icons for:
-* - module enabled and displayed (common)
-* - module enabled and not displayed
-* - module deactivated
-* - category (enabled)
-* - category disabled
-*/
-
-/**
-* @package acp
-*/
-class acp_modules
-{
-	var $module_class = '';
-	var $parent_id;
-	var $u_action;
-	var $p_master;
-
-	function __construct(p_master $p_master = null)
-	{
-		$this->p_master = $p_master;
-	}
-
-	function main($id, $mode)
-	{
-		global $module;
-
-		// Set a global define for modules we might include (the author is able to prevent execution of code by checking this constant)
-		define('MODULE_INCLUDE', true);
-
-		phpbb::$user->add_lang('acp/modules');
-		$this->tpl_name = 'acp_modules';
-
-		// module class
-		$this->module_class = $mode;
-
-		if ($this->module_class == 'ucp')
-		{
-			phpbb::$user->add_lang('ucp');
-		}
-		else if ($this->module_class == 'mcp')
-		{
-			phpbb::$user->add_lang('mcp');
-		}
-
-		if ($module->p_class != $this->module_class)
-		{
-			$module->add_mod_info($this->module_class);
-		}
-
-		$this->page_title = strtoupper($this->module_class);
-
-		$this->parent_id = request_var('parent_id', 0);
-		$module_id = request_var('m', 0);
-		$action = request_var('action', '');
-		$errors = array();
-
-		switch ($action)
-		{
-			case 'delete':
-				if (!$module_id)
-				{
-					trigger_error(phpbb::$user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
-				}
-
-				if (confirm_box(true))
-				{
-					// Make sure we are not directly within a module
-					if ($module_id == $this->parent_id)
-					{
-						$sql = 'SELECT parent_id
-							FROM ' . MODULES_TABLE . '
-							WHERE module_id = ' . $module_id;
-						$result = phpbb::$db->sql_query($sql);
-						$this->parent_id = (int) phpbb::$db->sql_fetchfield('parent_id');
-						phpbb::$db->sql_freeresult($result);
-					}
-
-					$errors = $this->delete_module($module_id);
-
-					if (!sizeof($errors))
-					{
-						$this->remove_cache_file();
-						trigger_error(phpbb::$user->lang['MODULE_DELETED'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
-					}
-				}
-				else
-				{
-					confirm_box(false, 'DELETE_MODULE', build_hidden_fields(array(
-						'i'			=> $id,
-						'mode'		=> $mode,
-						'parent_id'	=> $this->parent_id,
-						'module_id'	=> $module_id,
-						'action'	=> $action,
-					)));
-				}
-
-			break;
-
-			case 'enable':
-			case 'disable':
-				if (!$module_id)
-				{
-					trigger_error(phpbb::$user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
-				}
-
-				$sql = 'SELECT *
-					FROM ' . MODULES_TABLE . "
-					WHERE module_class = '" . phpbb::$db->sql_escape($this->module_class) . "'
-						AND module_id = $module_id";
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$row)
-				{
-					trigger_error(phpbb::$user->lang['NO_MODULE'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
-				}
-
-				$sql = 'UPDATE ' . MODULES_TABLE . '
-					SET module_enabled = ' . (($action == 'enable') ? 1 : 0) . "
-					WHERE module_class = '" . phpbb::$db->sql_escape($this->module_class) . "'
-						AND module_id = $module_id";
-				phpbb::$db->sql_query($sql);
-
-				add_log('admin', 'LOG_MODULE_' . strtoupper($action), phpbb::$user->lang($row['module_langname']));
-				$this->remove_cache_file();
-
-			break;
-
-			case 'move_up':
-			case 'move_down':
-				if (!$module_id)
-				{
-					trigger_error(phpbb::$user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
-				}
-
-				$sql = 'SELECT *
-					FROM ' . MODULES_TABLE . "
-					WHERE module_class = '" . phpbb::$db->sql_escape($this->module_class) . "'
-						AND module_id = $module_id";
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$row)
-				{
-					trigger_error(phpbb::$user->lang['NO_MODULE'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
-				}
-
-				$move_module_name = $this->move_module_by($row, $action, 1);
-
-				if ($move_module_name !== false)
-				{
-					add_log('admin', 'LOG_MODULE_' . strtoupper($action), phpbb::$user->lang($row['module_langname']), $move_module_name);
-					$this->remove_cache_file();
-				}
-
-			break;
-
-			case 'quickadd':
-				$quick_install = request_var('quick_install', '');
-
-				if (confirm_box(true))
-				{
-					if (!$quick_install || strpos($quick_install, '::') === false)
-					{
-						break;
-					}
-
-					list($module_basename, $module_mode) = explode('::', $quick_install);
-
-					// Check if module name and mode exist...
-					$fileinfo = $this->get_module_infos($module_basename);
-					$fileinfo = $fileinfo[$module_basename];
-
-					if (isset($fileinfo['modes'][$module_mode]))
-					{
-						$module_data = array(
-							'module_basename'	=> $module_basename,
-							'module_enabled'	=> 0,
-							'module_display'	=> (isset($fileinfo['modes'][$module_mode]['display'])) ? $fileinfo['modes'][$module_mode]['display'] : 1,
-							'parent_id'			=> $this->parent_id,
-							'module_class'		=> $this->module_class,
-							'module_langname'	=> $fileinfo['modes'][$module_mode]['title'],
-							'module_mode'		=> $module_mode,
-							'module_auth'		=> $fileinfo['modes'][$module_mode]['auth'],
-						);
-
-						$errors = $this->update_module_data($module_data);
-
-						if (!sizeof($errors))
-						{
-							$this->remove_cache_file();
-
-							trigger_error(phpbb::$user->lang['MODULE_ADDED'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
-						}
-					}
-				}
-				else
-				{
-					confirm_box(false, 'ADD_MODULE', build_hidden_fields(array(
-						'i'			=> $id,
-						'mode'		=> $mode,
-						'parent_id'	=> $this->parent_id,
-						'action'	=> 'quickadd',
-						'quick_install'	=> $quick_install,
-					)));
-				}
-
-			break;
-
-			case 'edit':
-
-				if (!$module_id)
-				{
-					trigger_error(phpbb::$user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
-				}
-
-				$module_row = $this->get_module_row($module_id);
-
-			// no break
-
-			case 'add':
-
-				if ($action == 'add')
-				{
-					$module_row = array(
-						'module_basename'	=> '',
-						'module_enabled'	=> 0,
-						'module_display'	=> 1,
-						'parent_id'			=> 0,
-						'module_langname'	=> utf8_normalize_nfc(request_var('module_langname', '', true)),
-						'module_mode'		=> '',
-						'module_auth'		=> '',
-					);
-				}
-
-				$module_data = array();
-
-				$module_data['module_basename'] = request_var('module_basename', (string) $module_row['module_basename']);
-				$module_data['module_enabled'] = request_var('module_enabled', (int) $module_row['module_enabled']);
-				$module_data['module_display'] = request_var('module_display', (int) $module_row['module_display']);
-				$module_data['parent_id'] = request_var('module_parent_id', (int) $module_row['parent_id']);
-				$module_data['module_class'] = $this->module_class;
-				$module_data['module_langname'] = utf8_normalize_nfc(request_var('module_langname', (string) $module_row['module_langname'], true));
-				$module_data['module_mode'] = request_var('module_mode', (string) $module_row['module_mode']);
-
-				$submit = phpbb_request::is_set_post('submit');
-
-				if ($submit)
-				{
-					if (!$module_data['module_langname'])
-					{
-						trigger_error(phpbb::$user->lang['NO_MODULE_LANGNAME'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
-					}
-
-					$module_type = request_var('module_type', 'category');
-
-					if ($module_type == 'category')
-					{
-						$module_data['module_basename'] = $module_data['module_mode'] = $module_data['module_auth'] = '';
-						$module_data['module_display'] = 1;
-					}
-
-					if ($action == 'edit')
-					{
-						$module_data['module_id'] = $module_id;
-					}
-
-					// Adjust auth row
-					if ($module_data['module_basename'] && $module_data['module_mode'])
-					{
-						$fileinfo = $this->get_module_infos($module_data['module_basename']);
-						$module_data['module_auth'] = $fileinfo[$module_data['module_basename']]['modes'][$module_data['module_mode']]['auth'];
-					}
-
-					$errors = $this->update_module_data($module_data);
-
-					if (!sizeof($errors))
-					{
-						$this->remove_cache_file();
-
-						trigger_error((($action == 'add') ? phpbb::$user->lang['MODULE_ADDED'] : phpbb::$user->lang['MODULE_EDITED']) . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
-					}
-				}
-
-				// Category/not category?
-				$is_cat = (!$module_data['module_basename']) ? true : false;
-
-				// Get module information
-				$module_infos = $this->get_module_infos();
-
-				// Build name options
-				$s_name_options = $s_mode_options = '';
-				foreach ($module_infos as $option => $values)
-				{
-					if (!$module_data['module_basename'])
-					{
-						$module_data['module_basename'] = $option;
-					}
-
-					// Name options
-					$s_name_options .= '<option value="' . $option . '"' . (($option == $module_data['module_basename']) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang($values['title']) . ' [' . $this->module_class . '_' . $option . ']</option>';
-
-					phpbb::$template->assign_block_vars('m_names', array('NAME' => $option, 'A_NAME' => addslashes($option)));
-
-					// Build module modes
-					foreach ($values['modes'] as $m_mode => $m_values)
-					{
-						if ($option == $module_data['module_basename'])
-						{
-							$s_mode_options .= '<option value="' . $m_mode . '"' . (($m_mode == $module_data['module_mode']) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang($m_values['title']) . '</option>';
-						}
-
-						phpbb::$template->assign_block_vars('m_names.modes', array(
-							'OPTION'		=> $m_mode,
-							'VALUE'			=> phpbb::$user->lang($m_values['title']),
-							'A_OPTION'		=> addslashes($m_mode),
-							'A_VALUE'		=> addslashes(phpbb::$user->lang($m_values['title'])),
-						));
-					}
-				}
-
-				$s_cat_option = '<option value="0"' . (($module_data['parent_id'] == 0) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang['NO_PARENT'] . '</option>';
-
-				phpbb::$template->assign_vars(array_merge(array(
-					'S_EDIT_MODULE'		=> true,
-					'S_IS_CAT'			=> $is_cat,
-					'S_CAT_OPTIONS'		=> $s_cat_option . $this->make_module_select($module_data['parent_id'], ($action == 'edit') ? $module_row['module_id'] : false, false, false, false, true),
-					'S_MODULE_NAMES'	=> $s_name_options,
-					'S_MODULE_MODES'	=> $s_mode_options,
-					'U_BACK'			=> $this->u_action . '&amp;parent_id=' . $this->parent_id,
-					'U_EDIT_ACTION'		=> $this->u_action . '&amp;parent_id=' . $this->parent_id,
-
-					'L_TITLE'			=> phpbb::$user->lang[strtoupper($action) . '_MODULE'],
-
-					'MODULENAME'		=> phpbb::$user->lang($module_data['module_langname']),
-					'ACTION'			=> $action,
-					'MODULE_ID'			=> $module_id,
-
-				),
-					array_change_key_case($module_data, CASE_UPPER))
-				);
-
-				if (sizeof($errors))
-				{
-					phpbb::$template->assign_vars(array(
-						'S_ERROR'	=> true,
-						'ERROR_MSG'	=> implode('<br />', $errors),
-					));
-				}
-
-				return;
-
-			break;
-		}
-
-		// Default management page
-		if (sizeof($errors))
-		{
-			phpbb::$template->assign_vars(array(
-				'S_ERROR'	=> true,
-				'ERROR_MSG'	=> implode('<br />', $errors),
-			));
-		}
-
-		if (!$this->parent_id)
-		{
-			$navigation = strtoupper($this->module_class);
-		}
-		else
-		{
-			$navigation = '<a href="' . $this->u_action . '">' . strtoupper($this->module_class) . '</a>';
-
-			$modules_nav = $this->get_module_branch($this->parent_id, 'parents', 'descending');
-
-			foreach ($modules_nav as $row)
-			{
-				$langname = phpbb::$user->lang($row['module_langname']);
-
-				if ($row['module_id'] == $this->parent_id)
-				{
-					$navigation .= ' -&gt; ' . $langname;
-				}
-				else
-				{
-					$navigation .= ' -&gt; <a href="' . $this->u_action . '&amp;parent_id=' . $row['module_id'] . '">' . $langname . '</a>';
-				}
-			}
-		}
-
-		// Jumpbox
-		$module_box = $this->make_module_select($this->parent_id, false, false, false, false);
-
-		$sql = 'SELECT *
-			FROM ' . MODULES_TABLE . "
-			WHERE parent_id = {$this->parent_id}
-				AND module_class = '" . phpbb::$db->sql_escape($this->module_class) . "'
-			ORDER BY left_id";
-		$result = phpbb::$db->sql_query($sql);
-
-		if ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			do
-			{
-				$langname = phpbb::$user->lang($row['module_langname']);
-
-				if (!$row['module_enabled'])
-				{
-					$module_image = '<img src="images/icon_folder_lock.gif" alt="' . phpbb::$user->lang['DEACTIVATED_MODULE'] .'" />';
-				}
-				else
-				{
-					$module_image = (!$row['module_basename'] || $row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" alt="' . phpbb::$user->lang['CATEGORY'] . '" />' : '<img src="images/icon_folder.gif" alt="' . phpbb::$user->lang['MODULE'] . '" />';
-				}
-
-				$url = $this->u_action . '&amp;parent_id=' . $this->parent_id . '&amp;m=' . $row['module_id'];
-
-				phpbb::$template->assign_block_vars('modules', array(
-					'MODULE_IMAGE'		=> $module_image,
-					'MODULE_TITLE'		=> $langname,
-					'MODULE_ENABLED'	=> ($row['module_enabled']) ? true : false,
-					'MODULE_DISPLAYED'	=> ($row['module_display']) ? true : false,
-
-					'S_ACP_CAT_SYSTEM'			=> ($this->module_class == 'acp' && $row['module_langname'] == 'ACP_CAT_SYSTEM') ? true : false,
-					'S_ACP_MODULE_MANAGEMENT'	=> ($this->module_class == 'acp' && ($row['module_basename'] == 'modules' || $row['module_langname'] == 'ACP_MODULE_MANAGEMENT')) ? true : false,
-
-					'U_MODULE'			=> $this->u_action . '&amp;parent_id=' . $row['module_id'],
-					'U_MOVE_UP'			=> $url . '&amp;action=move_up',
-					'U_MOVE_DOWN'		=> $url . '&amp;action=move_down',
-					'U_EDIT'			=> $url . '&amp;action=edit',
-					'U_DELETE'			=> $url . '&amp;action=delete',
-					'U_ENABLE'			=> $url . '&amp;action=enable',
-					'U_DISABLE'			=> $url . '&amp;action=disable',
-				));
-			}
-			while ($row = phpbb::$db->sql_fetchrow($result));
-		}
-		else if ($this->parent_id)
-		{
-			$row = $this->get_module_row($this->parent_id);
-
-			$url = $this->u_action . '&amp;parent_id=' . $this->parent_id . '&amp;m=' . $row['module_id'];
-
-			phpbb::$template->assign_vars(array(
-				'S_NO_MODULES'		=> true,
-				'MODULE_TITLE'		=> $langname,
-				'MODULE_ENABLED'	=> ($row['module_enabled']) ? true : false,
-				'MODULE_DISPLAYED'	=> ($row['module_display']) ? true : false,
-
-				'U_EDIT'			=> $url . '&amp;action=edit',
-				'U_DELETE'			=> $url . '&amp;action=delete',
-				'U_ENABLE'			=> $url . '&amp;action=enable',
-				'U_DISABLE'			=> $url . '&amp;action=disable',
-			));
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// Quick adding module
-		$module_infos = $this->get_module_infos();
-
-		// Build quick options
-		$s_install_options = '';
-		foreach ($module_infos as $option => $values)
-		{
-			// Name options
-			$s_install_options .= '<optgroup label="' . phpbb::$user->lang($values['title']) . ' [' . $this->module_class . '_' . $option . ']">';
-
-			// Build module modes
-			foreach ($values['modes'] as $m_mode => $m_values)
-			{
-				$s_install_options .= '<option value="' . $option . '::' . $m_mode . '">&nbsp; &nbsp;' . phpbb::$user->lang($m_values['title']) . '</option>';
-			}
-
-			$s_install_options .= '</optgroup>';
-		}
-
-		phpbb::$template->assign_vars(array(
-			'U_SEL_ACTION'		=> $this->u_action,
-			'U_ACTION'			=> $this->u_action . '&amp;parent_id=' . $this->parent_id,
-			'NAVIGATION'		=> $navigation,
-			'MODULE_BOX'		=> $module_box,
-			'PARENT_ID'			=> $this->parent_id,
-			'S_INSTALL_OPTIONS'	=> $s_install_options,
-		));
-	}
-
-	/**
-	* Get row for specified module
-	*/
-	function get_module_row($module_id)
-	{
-		$sql = 'SELECT *
-			FROM ' . MODULES_TABLE . "
-			WHERE module_class = '" . phpbb::$db->sql_escape($this->module_class) . "'
-				AND module_id = $module_id";
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$row)
-		{
-			trigger_error(phpbb::$user->lang['NO_MODULE'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
-		}
-
-		return $row;
-	}
-
-	/**
-	* Get available module information from module files
-	*/
-	function get_module_infos($module = '', $module_class = false)
-	{
-		$module_class = ($module_class === false) ? $this->module_class : $module_class;
-
-		$directory = PHPBB_ROOT_PATH . 'modules/' . $module_class . '/info/';
-		$fileinfo = array();
-
-		if (!$module)
-		{
-			$dh = @opendir($directory);
-
-			if (!$dh)
-			{
-				return $fileinfo;
-			}
-
-			while (($file = readdir($dh)) !== false)
-			{
-				// Is module?
-				if (preg_match('/^' . $module_class . '_.+\.' . PHP_EXT . '$/', $file))
-				{
-					$class = str_replace('.' . PHP_EXT, '', $file) . '_info';
-
-					if (!class_exists($class))
-					{
-						include($directory . $file);
-					}
-
-					// Get module title tag
-					if (class_exists($class))
-					{
-						$c_class = new $class();
-						$module_info = $c_class->module();
-						$fileinfo[str_replace($module_class . '_', '', $module_info['filename'])] = $module_info;
-					}
-				}
-			}
-			closedir($dh);
-
-			ksort($fileinfo);
-		}
-		else
-		{
-			$filename = $module_class . '_' . basename($module);
-			$class = $module_class . '_' . basename($module) . '_info';
-
-			if (!class_exists($class))
-			{
-				include($directory . $filename . '.' . PHP_EXT);
-			}
-
-			// Get module title tag
-			if (class_exists($class))
-			{
-				$c_class = new $class();
-				$module_info = $c_class->module();
-				$fileinfo[str_replace($module_class . '_', '', $module_info['filename'])] = $module_info;
-			}
-		}
-
-		return $fileinfo;
-	}
-
-	/**
-	* Simple version of jumpbox, just lists modules
-	*/
-	function make_module_select($select_id = false, $ignore_id = false, $ignore_acl = false, $ignore_nonpost = false, $ignore_emptycat = true, $ignore_noncat = false)
-	{
-		$sql = 'SELECT module_id, module_enabled, module_basename, parent_id, module_langname, left_id, right_id, module_auth
-			FROM ' . MODULES_TABLE . "
-			WHERE module_class = '" . phpbb::$db->sql_escape($this->module_class) . "'
-			ORDER BY left_id ASC";
-		$result = phpbb::$db->sql_query($sql);
-
-		$right = $iteration = 0;
-		$padding_store = array('0' => '');
-		$module_list = $padding = '';
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			if ($row['left_id'] < $right)
-			{
-				$padding .= '&nbsp; &nbsp;';
-				$padding_store[$row['parent_id']] = $padding;
-			}
-			else if ($row['left_id'] > $right + 1)
-			{
-				$padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : '';
-			}
-
-			$right = $row['right_id'];
-
-			if (!$ignore_acl && $row['module_auth'])
-			{
-				// We use zero as the forum id to check - global setting.
-				if (!$this->p_master->module_auth($row['module_auth'], 0))
-				{
-					continue;
-				}
-			}
-
-			// ignore this module?
-			if ((is_array($ignore_id) && in_array($row['module_id'], $ignore_id)) || $row['module_id'] == $ignore_id)
-			{
-				continue;
-			}
-
-			// empty category
-			if (!$row['module_basename'] && ($row['left_id'] + 1 == $row['right_id']) && $ignore_emptycat)
-			{
-				continue;
-			}
-
-			// ignore non-category?
-			if ($row['module_basename'] && $ignore_noncat)
-			{
-				continue;
-			}
-
-			$selected = (is_array($select_id)) ? ((in_array($row['module_id'], $select_id)) ? ' selected="selected"' : '') : (($row['module_id'] == $select_id) ? ' selected="selected"' : '');
-
-			$langname = phpbb::$user->lang($row['module_langname']);
-			$module_list .= '<option value="' . $row['module_id'] . '"' . $selected . ((!$row['module_enabled']) ? ' class="disabled"' : '') . '>' . $padding . $langname . '</option>';
-
-			$iteration++;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		unset($padding_store);
-
-		return $module_list;
-	}
-
-	/**
-	* Get module branch
-	*/
-	function get_module_branch($module_id, $type = 'all', $order = 'descending', $include_module = true)
-	{
-		switch ($type)
-		{
-			case 'parents':
-				$condition = 'm1.left_id BETWEEN m2.left_id AND m2.right_id';
-			break;
-
-			case 'children':
-				$condition = 'm2.left_id BETWEEN m1.left_id AND m1.right_id';
-			break;
-
-			default:
-				$condition = 'm2.left_id BETWEEN m1.left_id AND m1.right_id OR m1.left_id BETWEEN m2.left_id AND m2.right_id';
-			break;
-		}
-
-		$rows = array();
-
-		$sql = 'SELECT m2.*
-			FROM ' . MODULES_TABLE . ' m1
-			LEFT JOIN ' . MODULES_TABLE . " m2 ON ($condition)
-			WHERE m1.module_class = '" . phpbb::$db->sql_escape($this->module_class) . "'
-				AND m2.module_class = '" . phpbb::$db->sql_escape($this->module_class) . "'
-				AND m1.module_id = $module_id
-			ORDER BY m2.left_id " . (($order == 'descending') ? 'ASC' : 'DESC');
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			if (!$include_module && $row['module_id'] == $module_id)
-			{
-				continue;
-			}
-
-			$rows[] = $row;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		return $rows;
-	}
-
-	/**
-	* Remove modules cache file
-	*/
-	function remove_cache_file()
-	{
-		// Sanitise for future path use, it's escaped as appropriate for queries
-		$p_class = str_replace(array('.', '/', '\\'), '', basename($this->module_class));
-
-		phpbb::$acm->destroy('modules_' . $p_class);
-
-		// Additionally remove sql cache
-		phpbb::$acm->destroy_sql(MODULES_TABLE);
-	}
-
-	/**
-	* Update/Add module
-	*
-	* @param bool $run_inline if set to true errors will be returned and no logs being written
-	*/
-	function update_module_data(&$module_data, $run_inline = false)
-	{
-		if (!isset($module_data['module_id']))
-		{
-			// no module_id means we're creating a new category/module
-			if ($module_data['parent_id'])
-			{
-				$sql = 'SELECT left_id, right_id
-					FROM ' . MODULES_TABLE . "
-					WHERE module_class = '" . phpbb::$db->sql_escape($module_data['module_class']) . "'
-						AND module_id = " . (int) $module_data['parent_id'];
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$row)
-				{
-					if ($run_inline)
-					{
-						return 'PARENT_NO_EXIST';
-					}
-
-					trigger_error(phpbb::$user->lang['PARENT_NO_EXIST'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
-				}
-
-				// Workaround
-				$row['left_id'] = (int) $row['left_id'];
-				$row['right_id'] = (int) $row['right_id'];
-
-				$sql = 'UPDATE ' . MODULES_TABLE . "
-					SET left_id = left_id + 2, right_id = right_id + 2
-					WHERE module_class = '" . phpbb::$db->sql_escape($module_data['module_class']) . "'
-						AND left_id > {$row['right_id']}";
-				phpbb::$db->sql_query($sql);
-
-				$sql = 'UPDATE ' . MODULES_TABLE . "
-					SET right_id = right_id + 2
-					WHERE module_class = '" . phpbb::$db->sql_escape($module_data['module_class']) . "'
-						AND {$row['left_id']} BETWEEN left_id AND right_id";
-				phpbb::$db->sql_query($sql);
-
-				$module_data['left_id'] = (int) $row['right_id'];
-				$module_data['right_id'] = (int) $row['right_id'] + 1;
-			}
-			else
-			{
-				$sql = 'SELECT MAX(right_id) AS right_id
-					FROM ' . MODULES_TABLE . "
-					WHERE module_class = '" . phpbb::$db->sql_escape($module_data['module_class']) . "'";
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				$module_data['left_id'] = (int) $row['right_id'] + 1;
-				$module_data['right_id'] = (int) $row['right_id'] + 2;
-			}
-
-			$sql = 'INSERT INTO ' . MODULES_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $module_data);
-			phpbb::$db->sql_query($sql);
-
-			$module_data['module_id'] = phpbb::$db->sql_nextid();
-
-			if (!$run_inline)
-			{
-				add_log('admin', 'LOG_MODULE_ADD', phpbb::$user->lang($module_data['module_langname']));
-			}
-		}
-		else
-		{
-			$row = $this->get_module_row($module_data['module_id']);
-
-			if ($module_data['module_basename'] && !$row['module_basename'])
-			{
-				// we're turning a category into a module
-				$branch = $this->get_module_branch($module_data['module_id'], 'children', 'descending', false);
-
-				if (sizeof($branch))
-				{
-					return array(phpbb::$user->lang['NO_CATEGORY_TO_MODULE']);
-				}
-			}
-
-			if ($row['parent_id'] != $module_data['parent_id'])
-			{
-				$this->move_module($module_data['module_id'], $module_data['parent_id']);
-			}
-
-			$update_ary = $module_data;
-			unset($update_ary['module_id']);
-
-			$sql = 'UPDATE ' . MODULES_TABLE . '
-				SET ' . phpbb::$db->sql_build_array('UPDATE', $update_ary) . "
-				WHERE module_class = '" . phpbb::$db->sql_escape($module_data['module_class']) . "'
-					AND module_id = " . (int) $module_data['module_id'];
-			phpbb::$db->sql_query($sql);
-
-			if (!$run_inline)
-			{
-				add_log('admin', 'LOG_MODULE_EDIT', phpbb::$user->lang($module_data['module_langname']));
-			}
-		}
-
-		return array();
-	}
-
-	/**
-	* Move module around the tree
-	*/
-	function move_module($from_module_id, $to_parent_id)
-	{
-		$moved_modules = $this->get_module_branch($from_module_id, 'children', 'descending');
-		$from_data = $moved_modules[0];
-		$diff = sizeof($moved_modules) * 2;
-
-		$moved_ids = array();
-		for ($i = 0; $i < sizeof($moved_modules); ++$i)
-		{
-			$moved_ids[] = $moved_modules[$i]['module_id'];
-		}
-
-		// Resync parents
-		$sql = 'UPDATE ' . MODULES_TABLE . "
-			SET right_id = right_id - $diff
-			WHERE module_class = '" . phpbb::$db->sql_escape($this->module_class) . "'
-				AND left_id < " . (int) $from_data['right_id'] . '
-				AND right_id > ' . (int) $from_data['right_id'];
-		phpbb::$db->sql_query($sql);
-
-		// Resync righthand side of tree
-		$sql = 'UPDATE ' . MODULES_TABLE . "
-			SET left_id = left_id - $diff, right_id = right_id - $diff
-			WHERE module_class = '" . phpbb::$db->sql_escape($this->module_class) . "'
-				AND left_id > " . (int) $from_data['right_id'];
-		phpbb::$db->sql_query($sql);
-
-		if ($to_parent_id > 0)
-		{
-			$to_data = $this->get_module_row($to_parent_id);
-
-			// Resync new parents
-			$sql = 'UPDATE ' . MODULES_TABLE . "
-				SET right_id = right_id + $diff
-				WHERE module_class = '" . phpbb::$db->sql_escape($this->module_class) . "'
-					AND " . (int) $to_data['right_id'] . ' BETWEEN left_id AND right_id
-					AND ' . phpbb::$db->sql_in_set('module_id', $moved_ids, true);
-			phpbb::$db->sql_query($sql);
-
-			// Resync the righthand side of the tree
-			$sql = 'UPDATE ' . MODULES_TABLE . "
-				SET left_id = left_id + $diff, right_id = right_id + $diff
-				WHERE module_class = '" . phpbb::$db->sql_escape($this->module_class) . "'
-					AND left_id > " . (int) $to_data['right_id'] . '
-					AND ' . phpbb::$db->sql_in_set('module_id', $moved_ids, true);
-			phpbb::$db->sql_query($sql);
-
-			// Resync moved branch
-			$to_data['right_id'] += $diff;
-			if ($to_data['right_id'] > $from_data['right_id'])
-			{
-				$diff = '+ ' . ($to_data['right_id'] - $from_data['right_id'] - 1);
-			}
-			else
-			{
-				$diff = '- ' . abs($to_data['right_id'] - $from_data['right_id'] - 1);
-			}
-		}
-		else
-		{
-			$sql = 'SELECT MAX(right_id) AS right_id
-				FROM ' . MODULES_TABLE . "
-				WHERE module_class = '" . phpbb::$db->sql_escape($this->module_class) . "'
-					AND " . phpbb::$db->sql_in_set('module_id', $moved_ids, true);
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			$diff = '+ ' . (int) ($row['right_id'] - $from_data['left_id'] + 1);
-		}
-
-		$sql = 'UPDATE ' . MODULES_TABLE . "
-			SET left_id = left_id $diff, right_id = right_id $diff
-			WHERE module_class = '" . phpbb::$db->sql_escape($this->module_class) . "'
-				AND " . phpbb::$db->sql_in_set('module_id', $moved_ids);
-		phpbb::$db->sql_query($sql);
-	}
-
-	/**
-	* Remove module from tree
-	*/
-	function delete_module($module_id)
-	{
-		$row = $this->get_module_row($module_id);
-
-		$branch = $this->get_module_branch($module_id, 'children', 'descending', false);
-
-		if (sizeof($branch))
-		{
-			return array(phpbb::$user->lang['CANNOT_REMOVE_MODULE']);
-		}
-
-		// If not move
-		$diff = 2;
-		$sql = 'DELETE FROM ' . MODULES_TABLE . "
-			WHERE module_class = '" . phpbb::$db->sql_escape($this->module_class) . "'
-				AND module_id = $module_id";
-		phpbb::$db->sql_query($sql);
-
-		$row['right_id'] = (int) $row['right_id'];
-		$row['left_id'] = (int) $row['left_id'];
-
-		// Resync tree
-		$sql = 'UPDATE ' . MODULES_TABLE . "
-			SET right_id = right_id - $diff
-			WHERE module_class = '" . phpbb::$db->sql_escape($this->module_class) . "'
-				AND left_id < {$row['right_id']} AND right_id > {$row['right_id']}";
-		phpbb::$db->sql_query($sql);
-
-		$sql = 'UPDATE ' . MODULES_TABLE . "
-			SET left_id = left_id - $diff, right_id = right_id - $diff
-			WHERE module_class = '" . phpbb::$db->sql_escape($this->module_class) . "'
-				AND left_id > {$row['right_id']}";
-		phpbb::$db->sql_query($sql);
-
-		add_log('admin', 'LOG_MODULE_REMOVED', phpbb::$user->lang($row['module_langname']));
-
-		return array();
-
-	}
-
-	/**
-	* Move module position by $steps up/down
-	*/
-	function move_module_by($module_row, $action = 'move_up', $steps = 1)
-	{
-		/**
-		* Fetch all the siblings between the module's current spot
-		* and where we want to move it to. If there are less than $steps
-		* siblings between the current spot and the target then the
-		* module will move as far as possible
-		*/
-		$sql = 'SELECT module_id, left_id, right_id, module_langname
-			FROM ' . MODULES_TABLE . "
-			WHERE module_class = '" . phpbb::$db->sql_escape($this->module_class) . "'
-				AND parent_id = " . (int) $module_row['parent_id'] . '
-				AND ' . (($action == 'move_up') ? 'right_id < ' . (int) $module_row['right_id'] . ' ORDER BY right_id DESC' : 'left_id > ' . (int) $module_row['left_id'] . ' ORDER BY left_id ASC');
-		$result = phpbb::$db->sql_query_limit($sql, $steps);
-
-		$target = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$target = $row;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if (!sizeof($target))
-		{
-			// The module is already on top or bottom
-			return false;
-		}
-
-		/**
-		* $left_id and $right_id define the scope of the nodes that are affected by the move.
-		* $diff_up and $diff_down are the values to substract or add to each node's left_id
-		* and right_id in order to move them up or down.
-		* $move_up_left and $move_up_right define the scope of the nodes that are moving
-		* up. Other nodes in the scope of ($left_id, $right_id) are considered to move down.
-		*/
-		if ($action == 'move_up')
-		{
-			$left_id = (int) $target['left_id'];
-			$right_id = (int) $module_row['right_id'];
-
-			$diff_up = (int) ($module_row['left_id'] - $target['left_id']);
-			$diff_down = (int) ($module_row['right_id'] + 1 - $module_row['left_id']);
-
-			$move_up_left = (int) $module_row['left_id'];
-			$move_up_right = (int) $module_row['right_id'];
-		}
-		else
-		{
-			$left_id = (int) $module_row['left_id'];
-			$right_id = (int) $target['right_id'];
-
-			$diff_up = (int) ($module_row['right_id'] + 1 - $module_row['left_id']);
-			$diff_down = (int) ($target['right_id'] - $module_row['right_id']);
-
-			$move_up_left = (int) ($module_row['right_id'] + 1);
-			$move_up_right = (int) $target['right_id'];
-		}
-
-		// Now do the dirty job
-		$sql = 'UPDATE ' . MODULES_TABLE . "
-			SET left_id = left_id + CASE
-				WHEN left_id BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up}
-				ELSE {$diff_down}
-			END,
-			right_id = right_id + CASE
-				WHEN right_id BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up}
-				ELSE {$diff_down}
-			END
-			WHERE module_class = '" . phpbb::$db->sql_escape($this->module_class) . "'
-				AND left_id BETWEEN {$left_id} AND {$right_id}
-				AND right_id BETWEEN {$left_id} AND {$right_id}";
-		phpbb::$db->sql_query($sql);
-
-		$this->remove_cache_file();
-
-		return phpbb::$user->lang($target['module_langname']);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_permission_roles.php b/phpBB/modules/acp/acp_permission_roles.php
deleted file mode 100644
index deb697f891..0000000000
--- a/phpBB/modules/acp/acp_permission_roles.php
+++ /dev/null
@@ -1,563 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_permission_roles
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		include_once(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-		include_once(PHPBB_ROOT_PATH . 'includes/acp/auth.' . PHP_EXT);
-
-		$auth_admin = new auth_admin();
-
-		phpbb::$user->add_lang('acp/permissions');
-		add_permission_language();
-
-		$this->tpl_name = 'acp_permission_roles';
-
-		$submit = phpbb_request::is_set_post('submit');
-		$role_id = request_var('role_id', 0);
-		$action = request_var('action', '');
-		$action = (phpbb_request::is_set_post('add')) ? 'add' : $action;
-
-		$form_name = 'acp_permissions';
-		add_form_key($form_name);
-
-		switch ($mode)
-		{
-			case 'admin_roles':
-				$permission_type = 'a_';
-				$this->page_title = 'ACP_ADMIN_ROLES';
-			break;
-
-			case 'user_roles':
-				$permission_type = 'u_';
-				$this->page_title = 'ACP_USER_ROLES';
-			break;
-
-			case 'mod_roles':
-				$permission_type = 'm_';
-				$this->page_title = 'ACP_MOD_ROLES';
-			break;
-
-			case 'forum_roles':
-				$permission_type = 'f_';
-				$this->page_title = 'ACP_FORUM_ROLES';
-			break;
-
-			default:
-				trigger_error('NO_MODE', E_USER_ERROR);
-			break;
-		}
-
-		phpbb::$template->assign_vars(array(
-			'L_TITLE'		=> phpbb::$user->lang[$this->page_title],
-			'L_EXPLAIN'		=> phpbb::$user->lang[$this->page_title . '_EXPLAIN'],
-		));
-
-		// Take action... admin submitted something
-		if ($submit || $action == 'remove')
-		{
-			switch ($action)
-			{
-				case 'remove':
-
-					if (!$role_id)
-					{
-						trigger_error(phpbb::$user->lang['NO_ROLE_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-
-					$sql = 'SELECT *
-						FROM ' . ACL_ROLES_TABLE . '
-						WHERE role_id = ' . $role_id;
-					$result = phpbb::$db->sql_query($sql);
-					$role_row = phpbb::$db->sql_fetchrow($result);
-					phpbb::$db->sql_freeresult($result);
-
-					if (!$role_row)
-					{
-						trigger_error(phpbb::$user->lang['NO_ROLE_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-
-					if (confirm_box(true))
-					{
-						$this->remove_role($role_id, $permission_type);
-
-						$role_name = (!empty(phpbb::$user->lang[$role_row['role_name']])) ? phpbb::$user->lang[$role_row['role_name']] : $role_row['role_name'];
-						add_log('admin', 'LOG_' . strtoupper($permission_type) . 'ROLE_REMOVED', $role_name);
-						trigger_error(phpbb::$user->lang['ROLE_DELETED'] . adm_back_link($this->u_action));
-					}
-					else
-					{
-						confirm_box(false, 'DELETE_ROLE', build_hidden_fields(array(
-							'i'			=> $id,
-							'mode'		=> $mode,
-							'role_id'	=> $role_id,
-							'action'	=> $action,
-						)));
-					}
-
-				break;
-
-				case 'edit':
-					if (!$role_id)
-					{
-						trigger_error(phpbb::$user->lang['NO_ROLE_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-
-					// Get role we edit
-					$sql = 'SELECT *
-						FROM ' . ACL_ROLES_TABLE . '
-						WHERE role_id = ' . $role_id;
-					$result = phpbb::$db->sql_query($sql);
-					$role_row = phpbb::$db->sql_fetchrow($result);
-					phpbb::$db->sql_freeresult($result);
-
-					if (!$role_row)
-					{
-						trigger_error(phpbb::$user->lang['NO_ROLE_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-
-				// no break;
-
-				case 'add':
-
-					if (!check_form_key($form_name))
-					{
-						trigger_error(phpbb::$user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING);
-					}
-
-					$role_name = utf8_normalize_nfc(request_var('role_name', '', true));
-					$role_description = utf8_normalize_nfc(request_var('role_description', '', true));
-					$auth_settings = request_var('setting', array('' => 0));
-
-					if (!$role_name)
-					{
-						trigger_error(phpbb::$user->lang['NO_ROLE_NAME_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-
-					if (utf8_strlen($role_description) > 4000)
-					{
-						trigger_error(phpbb::$user->lang['ROLE_DESCRIPTION_LONG'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-
-					// if we add/edit a role we check the name to be unique among the settings...
-					$sql = 'SELECT role_id
-						FROM ' . ACL_ROLES_TABLE . "
-						WHERE role_type = '" . phpbb::$db->sql_escape($permission_type) . "'
-							AND role_name = '" . phpbb::$db->sql_escape($role_name) . "'";
-					$result = phpbb::$db->sql_query($sql);
-					$row = phpbb::$db->sql_fetchrow($result);
-					phpbb::$db->sql_freeresult($result);
-
-					// Make sure we only print out the error if we add the role or change it's name
-					if ($row && ($mode == 'add' || ($mode == 'edit' && $role_row['role_name'] != $role_name)))
-					{
-						trigger_error(sprintf(phpbb::$user->lang['ROLE_NAME_ALREADY_EXIST'], $role_name) . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-
-					$sql_ary = array(
-						'role_name'			=> (string) $role_name,
-						'role_description'	=> (string) $role_description,
-						'role_type'			=> (string) $permission_type,
-					);
-
-					if ($action == 'edit')
-					{
-						$sql = 'UPDATE ' . ACL_ROLES_TABLE . '
-							SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-							WHERE role_id = ' . $role_id;
-						phpbb::$db->sql_query($sql);
-					}
-					else
-					{
-						// Get maximum role order for inserting a new role...
-						$sql = 'SELECT MAX(role_order) as max_order
-							FROM ' . ACL_ROLES_TABLE . "
-							WHERE role_type = '" . phpbb::$db->sql_escape($permission_type) . "'";
-						$result = phpbb::$db->sql_query($sql);
-						$max_order = (int) phpbb::$db->sql_fetchfield('max_order');
-						phpbb::$db->sql_freeresult($result);
-
-						$sql_ary['role_order'] = $max_order + 1;
-
-						$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary);
-						phpbb::$db->sql_query($sql);
-
-						$role_id = phpbb::$db->sql_nextid();
-					}
-
-					// Now add the auth settings
-					$auth_admin->acl_set_role($role_id, $auth_settings);
-
-					$role_name = (!empty(phpbb::$user->lang[$role_name])) ? phpbb::$user->lang[$role_name] : $role_name;
-					add_log('admin', 'LOG_' . strtoupper($permission_type) . 'ROLE_' . strtoupper($action), $role_name);
-
-					trigger_error(phpbb::$user->lang['ROLE_' . strtoupper($action) . '_SUCCESS'] . adm_back_link($this->u_action));
-
-				break;
-			}
-		}
-
-		// Display screens
-		switch ($action)
-		{
-			case 'add':
-
-				$options_from = request_var('options_from', 0);
-
-				$role_row = array(
-					'role_name'			=> utf8_normalize_nfc(request_var('role_name', '', true)),
-					'role_description'	=> utf8_normalize_nfc(request_var('role_description', '', true)),
-					'role_type'			=> $permission_type,
-				);
-
-				if ($options_from)
-				{
-					$sql = 'SELECT p.auth_option_id, p.auth_setting, o.auth_option
-						FROM ' . ACL_ROLES_DATA_TABLE . ' p, ' . ACL_OPTIONS_TABLE . ' o
-						WHERE o.auth_option_id = p.auth_option_id
-							AND p.role_id = ' . $options_from . '
-						ORDER BY p.auth_option_id';
-					$result = phpbb::$db->sql_query($sql);
-
-					$auth_options = array();
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$auth_options[$row['auth_option']] = $row['auth_setting'];
-					}
-					phpbb::$db->sql_freeresult($result);
-				}
-				else
-				{
-					$sql = 'SELECT auth_option_id, auth_option
-						FROM ' . ACL_OPTIONS_TABLE . "
-						WHERE auth_option " . phpbb::$db->sql_like_expression($permission_type . phpbb::$db->any_char) . "
-							AND auth_option <> '{$permission_type}'
-						ORDER BY auth_option_id";
-					$result = phpbb::$db->sql_query($sql);
-
-					$auth_options = array();
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$auth_options[$row['auth_option']] = phpbb::ACL_NO;
-					}
-					phpbb::$db->sql_freeresult($result);
-				}
-
-			// no break;
-
-			case 'edit':
-
-				if ($action == 'edit')
-				{
-					if (!$role_id)
-					{
-						trigger_error(phpbb::$user->lang['NO_ROLE_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-
-					$sql = 'SELECT *
-						FROM ' . ACL_ROLES_TABLE . '
-						WHERE role_id = ' . $role_id;
-					$result = phpbb::$db->sql_query($sql);
-					$role_row = phpbb::$db->sql_fetchrow($result);
-					phpbb::$db->sql_freeresult($result);
-
-					$sql = 'SELECT p.auth_option_id, p.auth_setting, o.auth_option
-						FROM ' . ACL_ROLES_DATA_TABLE . ' p, ' . ACL_OPTIONS_TABLE . ' o
-						WHERE o.auth_option_id = p.auth_option_id
-							AND p.role_id = ' . $role_id . '
-						ORDER BY p.auth_option_id';
-					$result = phpbb::$db->sql_query($sql);
-
-					$auth_options = array();
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$auth_options[$row['auth_option']] = $row['auth_setting'];
-					}
-					phpbb::$db->sql_freeresult($result);
-				}
-
-				if (!$role_row)
-				{
-					trigger_error(phpbb::$user->lang['NO_ROLE_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				phpbb::$template->assign_vars(array(
-					'S_EDIT'			=> true,
-
-					'U_ACTION'			=> $this->u_action . "&amp;action={$action}&amp;role_id={$role_id}",
-					'U_BACK'			=> $this->u_action,
-
-					'ROLE_NAME'			=> $role_row['role_name'],
-					'ROLE_DESCRIPTION'	=> $role_row['role_description'],
-					'L_ACL_TYPE'		=> phpbb::$user->lang['ACL_TYPE_' . strtoupper($permission_type)],
-				));
-
-				// We need to fill the auth options array with ACL_NO options ;)
-				$sql = 'SELECT auth_option_id, auth_option
-					FROM ' . ACL_OPTIONS_TABLE . "
-					WHERE auth_option " . phpbb::$db->sql_like_expression($permission_type . phpbb::$db->any_char) . "
-						AND auth_option <> '{$permission_type}'
-					ORDER BY auth_option_id";
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					if (!isset($auth_options[$row['auth_option']]))
-					{
-						$auth_options[$row['auth_option']] = phpbb::ACL_NO;
-					}
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				// Unset global permission option
-				unset($auth_options[$permission_type]);
-
-				// Display auth options
-				$this->display_auth_options($auth_options);
-
-				// Get users/groups/forums using this preset...
-				if ($action == 'edit')
-				{
-					$hold_ary = $auth_admin->get_role_mask($role_id);
-
-					if (sizeof($hold_ary))
-					{
-						$role_name = (!empty(phpbb::$user->lang[$role_row['role_name']])) ? phpbb::$user->lang[$role_row['role_name']] : $role_row['role_name'];
-
-						phpbb::$template->assign_vars(array(
-							'S_DISPLAY_ROLE_MASK'	=> true,
-							'L_ROLE_ASSIGNED_TO'	=> sprintf(phpbb::$user->lang['ROLE_ASSIGNED_TO'], $role_name),
-						));
-
-						$auth_admin->display_role_mask($hold_ary);
-					}
-				}
-
-				return;
-			break;
-
-			case 'move_up':
-			case 'move_down':
-
-				$order = request_var('order', 0);
-				$order_total = $order * 2 + (($action == 'move_up') ? -1 : 1);
-
-				$sql = 'UPDATE ' . ACL_ROLES_TABLE . '
-					SET role_order = ' . $order_total . " - role_order
-					WHERE role_type = '" . phpbb::$db->sql_escape($permission_type) . "'
-						AND role_order IN ($order, " . (($action == 'move_up') ? $order - 1 : $order + 1) . ')';
-				phpbb::$db->sql_query($sql);
-
-			break;
-		}
-
-		// By default, check that role_order is valid and fix it if necessary
-		$sql = 'SELECT role_id, role_order
-			FROM ' . ACL_ROLES_TABLE . "
-			WHERE role_type = '" . phpbb::$db->sql_escape($permission_type) . "'
-			ORDER BY role_order ASC";
-		$result = phpbb::$db->sql_query($sql);
-
-		if ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$order = 0;
-			do
-			{
-				$order++;
-				if ($row['role_order'] != $order)
-				{
-					phpbb::$db->sql_query('UPDATE ' . ACL_ROLES_TABLE . " SET role_order = $order WHERE role_id = {$row['role_id']}");
-				}
-			}
-			while ($row = phpbb::$db->sql_fetchrow($result));
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// Display assigned items?
-		$display_item = request_var('display_item', 0);
-
-		// Select existing roles
-		$sql = 'SELECT *
-			FROM ' . ACL_ROLES_TABLE . "
-			WHERE role_type = '" . phpbb::$db->sql_escape($permission_type) . "'
-			ORDER BY role_order ASC";
-		$result = phpbb::$db->sql_query($sql);
-
-		$s_role_options = '';
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$role_name = (!empty(phpbb::$user->lang[$row['role_name']])) ? phpbb::$user->lang[$row['role_name']] : $row['role_name'];
-
-			phpbb::$template->assign_block_vars('roles', array(
-				'ROLE_NAME'				=> $role_name,
-				'ROLE_DESCRIPTION'		=> (!empty(phpbb::$user->lang[$row['role_description']])) ? phpbb::$user->lang[$row['role_description']] : nl2br($row['role_description']),
-
-				'U_EDIT'			=> $this->u_action . '&amp;action=edit&amp;role_id=' . $row['role_id'],
-				'U_REMOVE'			=> $this->u_action . '&amp;action=remove&amp;role_id=' . $row['role_id'],
-				'U_MOVE_UP'			=> $this->u_action . '&amp;action=move_up&amp;order=' . $row['role_order'],
-				'U_MOVE_DOWN'		=> $this->u_action . '&amp;action=move_down&amp;order=' . $row['role_order'],
-				'U_DISPLAY_ITEMS'	=> ($row['role_id'] == $display_item) ? '' : $this->u_action . '&amp;display_item=' . $row['role_id'] . '#assigned_to',
-			));
-
-			$s_role_options .= '<option value="' . $row['role_id'] . '">' . $role_name . '</option>';
-
-			if ($display_item == $row['role_id'])
-			{
-				phpbb::$template->assign_vars(array(
-					'L_ROLE_ASSIGNED_TO'	=> sprintf(phpbb::$user->lang['ROLE_ASSIGNED_TO'], $role_name),
-				));
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		phpbb::$template->assign_vars(array(
-			'S_ROLE_OPTIONS'		=> $s_role_options,
-		));
-
-		if ($display_item)
-		{
-			phpbb::$template->assign_vars(array(
-				'S_DISPLAY_ROLE_MASK'	=> true,
-			));
-
-			$hold_ary = $auth_admin->get_role_mask($display_item);
-			$auth_admin->display_role_mask($hold_ary);
-		}
-	}
-
-	/**
-	* Display permission settings able to be set
-	*/
-	function display_auth_options($auth_options)
-	{
-		$content_array = $categories = array();
-		$key_sort_array = array(0);
-		$auth_options = array(0 => $auth_options);
-
-		// Making use of auth_admin method here (we do not really want to change two similar code fragments)
-		auth_admin::build_permission_array($auth_options, $content_array, $categories, $key_sort_array);
-
-		$content_array = $content_array[0];
-
-		phpbb::$template->assign_var('S_NUM_PERM_COLS', sizeof($categories));
-
-		// Assign to template
-		foreach ($content_array as $cat => $cat_array)
-		{
-			phpbb::$template->assign_block_vars('auth', array(
-				'CAT_NAME'	=> phpbb::$user->lang['permission_cat'][$cat],
-
-				'S_YES'		=> ($cat_array['S_YES'] && !$cat_array['S_NEVER'] && !$cat_array['S_NO']) ? true : false,
-				'S_NEVER'	=> ($cat_array['S_NEVER'] && !$cat_array['S_YES'] && !$cat_array['S_NO']) ? true : false,
-				'S_NO'		=> ($cat_array['S_NO'] && !$cat_array['S_NEVER'] && !$cat_array['S_YES']) ? true : false,
-			));
-
-			foreach ($cat_array['permissions'] as $permission => $allowed)
-			{
-				phpbb::$template->assign_block_vars('auth.mask', array(
-					'S_YES'		=> ($allowed == phpbb::ACL_YES) ? true : false,
-					'S_NEVER'	=> ($allowed == phpbb::ACL_NEVER) ? true : false,
-					'S_NO'		=> ($allowed == phpbb::ACL_NO) ? true : false,
-
-					'FIELD_NAME'	=> $permission,
-					'PERMISSION'	=> phpbb::$user->lang['acl_' . $permission]['lang'],
-				));
-			}
-		}
-	}
-
-	/**
-	* Remove role
-	*/
-	function remove_role($role_id, $permission_type)
-	{
-		$auth_admin = new auth_admin();
-
-		// Get complete auth array
-		$sql = 'SELECT auth_option, auth_option_id
-			FROM ' . ACL_OPTIONS_TABLE . "
-			WHERE auth_option " . phpbb::$db->sql_like_expression($permission_type . phpbb::$db->any_char);
-		$result = phpbb::$db->sql_query($sql);
-
-		$auth_settings = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$auth_settings[$row['auth_option']] = phpbb::ACL_NO;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// Get the role auth settings we need to re-set...
-		$sql = 'SELECT o.auth_option, r.auth_setting
-			FROM ' . ACL_ROLES_DATA_TABLE . ' r, ' . ACL_OPTIONS_TABLE . ' o
-			WHERE o.auth_option_id = r.auth_option_id
-				AND r.role_id = ' . $role_id;
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$auth_settings[$row['auth_option']] = $row['auth_setting'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// Get role assignments
-		$hold_ary = $auth_admin->get_role_mask($role_id);
-
-		// Re-assign permissions
-		foreach ($hold_ary as $forum_id => $forum_ary)
-		{
-			if (isset($forum_ary['users']))
-			{
-				$auth_admin->acl_set('user', $forum_id, $forum_ary['users'], $auth_settings, 0, false);
-			}
-
-			if (isset($forum_ary['groups']))
-			{
-				$auth_admin->acl_set('group', $forum_id, $forum_ary['groups'], $auth_settings, 0, false);
-			}
-		}
-
-		// Remove role from users and groups just to be sure (happens through acl_set)
-		$sql = 'DELETE FROM ' . ACL_USERS_TABLE . '
-			WHERE auth_role_id = ' . $role_id;
-		phpbb::$db->sql_query($sql);
-
-		$sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . '
-			WHERE auth_role_id = ' . $role_id;
-		phpbb::$db->sql_query($sql);
-
-		// Remove role data and role
-		$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
-			WHERE role_id = ' . $role_id;
-		phpbb::$db->sql_query($sql);
-
-		$sql = 'DELETE FROM ' . ACL_ROLES_TABLE . '
-			WHERE role_id = ' . $role_id;
-		phpbb::$db->sql_query($sql);
-
-		$auth_admin->acl_clear_prefetch();
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_permissions.php b/phpBB/modules/acp/acp_permissions.php
deleted file mode 100644
index 074a468fef..0000000000
--- a/phpBB/modules/acp/acp_permissions.php
+++ /dev/null
@@ -1,1177 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_permissions
-{
-	var $u_action;
-	var $permission_dropdown;
-
-	function main($id, $mode)
-	{
-		include_once(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-		include_once(PHPBB_ROOT_PATH . 'includes/acp/auth.' . PHP_EXT);
-
-		$auth_admin = new auth_admin();
-
-		phpbb::$user->add_lang('acp/permissions');
-		add_permission_language();
-
-		$this->tpl_name = 'acp_permissions';
-
-		// Trace has other vars
-		if ($mode == 'trace')
-		{
-			$user_id = request_var('u', 0);
-			$forum_id = request_var('f', 0);
-			$permission = request_var('auth', '');
-
-			$this->tpl_name = 'permission_trace';
-
-			if ($user_id && isset($auth_admin->acl_options['id'][$permission]) && phpbb::$acl->acl_get('a_viewauth'))
-			{
-				$this->page_title = sprintf(phpbb::$user->lang['TRACE_PERMISSION'], phpbb::$user->lang['acl_' . $permission]['lang']);
-				$this->permission_trace($user_id, $forum_id, $permission);
-				return;
-			}
-			trigger_error('NO_MODE', E_USER_ERROR);
-		}
-
-		// Set some vars
-		$action = request_var('action', array('' => 0));
-		$action = key($action);
-		$action = (phpbb_request::is_set_post('psubmit')) ? 'apply_permissions' : $action;
-
-		$all_forums = request_var('all_forums', 0);
-		$subforum_id = request_var('subforum_id', 0);
-		$forum_id = request_var('forum_id', array(0));
-
-		$username = request_var('username', array(''), true);
-		$usernames = request_var('usernames', '', true);
-		$user_id = request_var('user_id', array(0));
-
-		$group_id = request_var('group_id', array(0));
-		$select_all_groups = request_var('select_all_groups', 0);
-
-		$form_name = 'acp_permissions';
-		add_form_key($form_name);
-
-		// If select all groups is set, we pre-build the group id array (this option is used for other screens to link to the permission settings screen)
-		if ($select_all_groups)
-		{
-			// Add default groups to selection
-			$sql_and = (!phpbb::$config['coppa_enable']) ? " AND group_name <> 'REGISTERED_COPPA'" : '';
-
-			$sql = 'SELECT group_id
-				FROM ' . GROUPS_TABLE . '
-				WHERE group_type = ' . GROUP_SPECIAL . "
-				$sql_and";
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$group_id[] = $row['group_id'];
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		// Map usernames to ids and vice versa
-		if ($usernames)
-		{
-			$username = explode("\n", $usernames);
-		}
-		unset($usernames);
-
-		if (sizeof($username) && !sizeof($user_id))
-		{
-			user_get_id_name($user_id, $username);
-
-			if (!sizeof($user_id))
-			{
-				trigger_error(phpbb::$user->lang['SELECTED_USER_NOT_EXIST'] . adm_back_link($this->u_action), E_USER_WARNING);
-			}
-		}
-		unset($username);
-
-		// Build forum ids (of all forums are checked or subforum listing used)
-		if ($all_forums)
-		{
-			$sql = 'SELECT forum_id
-				FROM ' . FORUMS_TABLE . '
-				ORDER BY left_id';
-			$result = phpbb::$db->sql_query($sql);
-
-			$forum_id = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$forum_id[] = (int) $row['forum_id'];
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-		else if ($subforum_id)
-		{
-			$forum_id = array();
-			foreach (get_forum_branch($subforum_id, 'children') as $row)
-			{
-				$forum_id[] = (int) $row['forum_id'];
-			}
-		}
-
-		// Define some common variables for every mode
-		$error = array();
-
-		$permission_scope = (strpos($mode, '_global') !== false) ? 'global' : 'local';
-
-		// Showing introductionary page?
-		if ($mode == 'intro')
-		{
-			$this->page_title = 'ACP_PERMISSIONS';
-
-			phpbb::$template->assign_vars(array(
-				'S_INTRO'		=> true,
-			));
-
-			return;
-		}
-
-		switch ($mode)
-		{
-			case 'setting_user_global':
-			case 'setting_group_global':
-				$this->permission_dropdown = array('u_', 'm_', 'a_');
-				$permission_victim = ($mode == 'setting_user_global') ? array('user') : array('group');
-				$this->page_title = ($mode == 'setting_user_global') ? 'ACP_USERS_PERMISSIONS' : 'ACP_GROUPS_PERMISSIONS';
-			break;
-
-			case 'setting_user_local':
-			case 'setting_group_local':
-				$this->permission_dropdown = array('f_', 'm_');
-				$permission_victim = ($mode == 'setting_user_local') ? array('user', 'forums') : array('group', 'forums');
-				$this->page_title = ($mode == 'setting_user_local') ? 'ACP_USERS_FORUM_PERMISSIONS' : 'ACP_GROUPS_FORUM_PERMISSIONS';
-			break;
-
-			case 'setting_admin_global':
-			case 'setting_mod_global':
-				$this->permission_dropdown = (strpos($mode, '_admin_') !== false) ? array('a_') : array('m_');
-				$permission_victim = array('usergroup');
-				$this->page_title = ($mode == 'setting_admin_global') ? 'ACP_ADMINISTRATORS' : 'ACP_GLOBAL_MODERATORS';
-			break;
-
-			case 'setting_mod_local':
-			case 'setting_forum_local':
-				$this->permission_dropdown = ($mode == 'setting_mod_local') ? array('m_') : array('f_');
-				$permission_victim = array('forums', 'usergroup');
-				$this->page_title = ($mode == 'setting_mod_local') ? 'ACP_FORUM_MODERATORS' : 'ACP_FORUM_PERMISSIONS';
-			break;
-
-			case 'view_admin_global':
-			case 'view_user_global':
-			case 'view_mod_global':
-				$this->permission_dropdown = ($mode == 'view_admin_global') ? array('a_') : (($mode == 'view_user_global') ? array('u_') : array('m_'));
-				$permission_victim = array('usergroup_view');
-				$this->page_title = ($mode == 'view_admin_global') ? 'ACP_VIEW_ADMIN_PERMISSIONS' : (($mode == 'view_user_global') ? 'ACP_VIEW_USER_PERMISSIONS' : 'ACP_VIEW_GLOBAL_MOD_PERMISSIONS');
-			break;
-
-			case 'view_mod_local':
-			case 'view_forum_local':
-				$this->permission_dropdown = ($mode == 'view_mod_local') ? array('m_') : array('f_');
-				$permission_victim = array('forums', 'usergroup_view');
-				$this->page_title = ($mode == 'view_mod_local') ? 'ACP_VIEW_FORUM_MOD_PERMISSIONS' : 'ACP_VIEW_FORUM_PERMISSIONS';
-			break;
-
-			default:
-				trigger_error('NO_MODE', E_USER_ERROR);
-			break;
-		}
-
-		phpbb::$template->assign_vars(array(
-			'L_TITLE'		=> phpbb::$user->lang[$this->page_title],
-			'L_EXPLAIN'		=> phpbb::$user->lang[$this->page_title . '_EXPLAIN'],
-		));
-
-		// Get permission type
-		$permission_type = request_var('type', $this->permission_dropdown[0]);
-
-		if (!in_array($permission_type, $this->permission_dropdown))
-		{
-			trigger_error(phpbb::$user->lang['WRONG_PERMISSION_TYPE'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
-
-		// Handle actions
-		if (strpos($mode, 'setting_') === 0 && $action)
-		{
-			switch ($action)
-			{
-				case 'delete':
-
-					if (!check_form_key($form_name))
-					{
-						trigger_error(phpbb::$user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING);
-					}
-					// All users/groups selected?
-					$all_users = phpbb_request::is_set_post('all_users');
-					$all_groups = phpbb_request::is_set_post('all_groups');
-
-					if ($all_users || $all_groups)
-					{
-						$items = $this->retrieve_defined_user_groups($permission_scope, $forum_id, $permission_type);
-
-						if ($all_users && sizeof($items['user_ids']))
-						{
-							$user_id = $items['user_ids'];
-						}
-						else if ($all_groups && sizeof($items['group_ids']))
-						{
-							$group_id = $items['group_ids'];
-						}
-					}
-
-					if (sizeof($user_id) || sizeof($group_id))
-					{
-						$this->remove_permissions($mode, $permission_type, $auth_admin, $user_id, $group_id, $forum_id);
-					}
-					else
-					{
-						trigger_error(phpbb::$user->lang['NO_USER_GROUP_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-				break;
-
-				case 'apply_permissions':
-					if (!phpbb_request::is_set_post('setting'))
-					{
-						trigger_error(phpbb::$user->lang['NO_AUTH_SETTING_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-					if (!check_form_key($form_name))
-					{
-						trigger_error(phpbb::$user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING);
-					}
-
-					$this->set_permissions($mode, $permission_type, $auth_admin, $user_id, $group_id);
-				break;
-
-				case 'apply_all_permissions':
-					if (!phpbb_request::is_set_post('setting'))
-					{
-						trigger_error(phpbb::$user->lang['NO_AUTH_SETTING_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-					if (!check_form_key($form_name))
-					{
-						trigger_error(phpbb::$user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING);
-					}
-
-					$this->set_all_permissions($mode, $permission_type, $auth_admin, $user_id, $group_id);
-				break;
-			}
-		}
-
-
-		// Setting permissions screen
-		$s_hidden_fields = build_hidden_fields(array(
-			'user_id'		=> $user_id,
-			'group_id'		=> $group_id,
-			'forum_id'		=> $forum_id,
-			'type'			=> $permission_type)
-		);
-
-		// Go through the screens/options needed and present them in correct order
-		foreach ($permission_victim as $victim)
-		{
-			switch ($victim)
-			{
-				case 'forum_dropdown':
-
-					if (sizeof($forum_id))
-					{
-						$this->check_existence('forum', $forum_id);
-						continue 2;
-					}
-
-					phpbb::$template->assign_vars(array(
-						'S_SELECT_FORUM'		=> true,
-						'S_FORUM_OPTIONS'		=> make_forum_select(false, false, true, false, false),
-					));
-
-				break;
-
-				case 'forums':
-
-					if (sizeof($forum_id))
-					{
-						$this->check_existence('forum', $forum_id);
-						continue 2;
-					}
-
-					$forum_list = make_forum_select(false, false, true, false, false, false, true);
-
-					// Build forum options
-					$s_forum_options = '';
-					foreach ($forum_list as $f_id => $f_row)
-					{
-						$s_forum_options .= '<option value="' . $f_id . '"' . (($f_row['selected']) ? ' selected="selected"' : '') . (($f_row['disabled']) ? ' disabled="disabled" class="disabled-option"' : '') . '>' . $f_row['padding'] . $f_row['forum_name'] . '</option>';
-					}
-
-					// Build subforum options
-					$s_subforum_options = $this->build_subforum_options($forum_list);
-
-					phpbb::$template->assign_vars(array(
-						'S_SELECT_FORUM'		=> true,
-						'S_FORUM_OPTIONS'		=> $s_forum_options,
-						'S_SUBFORUM_OPTIONS'	=> $s_subforum_options,
-						'S_FORUM_ALL'			=> true,
-						'S_FORUM_MULTIPLE'		=> true,
-					));
-
-				break;
-
-				case 'user':
-
-					if (sizeof($user_id))
-					{
-						$this->check_existence('user', $user_id);
-						continue 2;
-					}
-
-					phpbb::$template->assign_vars(array(
-						'S_SELECT_USER'			=> true,
-						'U_FIND_USERNAME'		=> append_sid('memberlist', 'mode=searchuser&amp;form=select_victim&amp;field=username&amp;select_single=true'),
-					));
-
-				break;
-
-				case 'group':
-
-					if (sizeof($group_id))
-					{
-						$this->check_existence('group', $group_id);
-						continue 2;
-					}
-
-					phpbb::$template->assign_vars(array(
-						'S_SELECT_GROUP'		=> true,
-						'S_GROUP_OPTIONS'		=> group_select_options(false, false, ((phpbb::$user->is_founder) ? false : 0)),
-					));
-
-				break;
-
-				case 'usergroup':
-				case 'usergroup_view':
-
-					$all_users = phpbb_request::is_set_post('all_users');
-					$all_groups = phpbb_request::is_set_post('all_groups');
-
-					if ((sizeof($user_id) && !$all_users) || (sizeof($group_id) && !$all_groups))
-					{
-						if (sizeof($user_id))
-						{
-							$this->check_existence('user', $user_id);
-						}
-
-						if (sizeof($group_id))
-						{
-							$this->check_existence('group', $group_id);
-						}
-
-						continue 2;
-					}
-
-					// Now we check the users... because the "all"-selection is different here (all defined users/groups)
-					$items = $this->retrieve_defined_user_groups($permission_scope, $forum_id, $permission_type);
-
-					if ($all_users && sizeof($items['user_ids']))
-					{
-						$user_id = $items['user_ids'];
-						continue 2;
-					}
-
-					if ($all_groups && sizeof($items['group_ids']))
-					{
-						$group_id = $items['group_ids'];
-						continue 2;
-					}
-
-					phpbb::$template->assign_vars(array(
-						'S_SELECT_USERGROUP'		=> ($victim == 'usergroup') ? true : false,
-						'S_SELECT_USERGROUP_VIEW'	=> ($victim == 'usergroup_view') ? true : false,
-						'S_DEFINED_USER_OPTIONS'	=> $items['user_ids_options'],
-						'S_DEFINED_GROUP_OPTIONS'	=> $items['group_ids_options'],
-						'S_ADD_GROUP_OPTIONS'		=> group_select_options(false, $items['group_ids'], ((phpbb::$user->is_founder) ? false : 0)),
-						'U_FIND_USERNAME'			=> append_sid('memberlist', 'mode=searchuser&amp;form=add_user&amp;field=username&amp;select_single=true'),
-					));
-
-				break;
-			}
-
-			// The S_ALLOW_SELECT parameter below is a measure to lower memory usage.
-			// If there are more than 5 forums selected the admin is not able to select all users/groups too.
-			// We need to see if the number of forums can be increased or need to be decreased.
-
-			phpbb::$template->assign_vars(array(
-				'U_ACTION'				=> $this->u_action,
-				'ANONYMOUS_USER_ID'		=> ANONYMOUS,
-
-				'S_SELECT_VICTIM'		=> true,
-				'S_ALLOW_ALL_SELECT'	=> (sizeof($forum_id) > 5) ? false : true,
-				'S_CAN_SELECT_USER'		=> (phpbb::$acl->acl_get('a_authusers')) ? true : false,
-				'S_CAN_SELECT_GROUP'	=> (phpbb::$acl->acl_get('a_authgroups')) ? true : false,
-				'S_HIDDEN_FIELDS'		=> $s_hidden_fields,
-			));
-
-			// Let the forum names being displayed
-			if (sizeof($forum_id))
-			{
-				$sql = 'SELECT forum_name
-					FROM ' . FORUMS_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('forum_id', $forum_id) . '
-					ORDER BY left_id ASC';
-				$result = phpbb::$db->sql_query($sql);
-
-				$forum_names = array();
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$forum_names[] = $row['forum_name'];
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				phpbb::$template->assign_vars(array(
-					'S_FORUM_NAMES'		=> (sizeof($forum_names)) ? true : false,
-					'FORUM_NAMES'		=> implode(', ', $forum_names),
-				));
-			}
-
-			return;
-		}
-
-		// Do not allow forum_ids being set and no other setting defined (will bog down the server too much)
-		if (sizeof($forum_id) && !sizeof($user_id) && !sizeof($group_id))
-		{
-			trigger_error(phpbb::$user->lang['ONLY_FORUM_DEFINED'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
-		phpbb::$template->assign_vars(array(
-			'S_PERMISSION_DROPDOWN'		=> (sizeof($this->permission_dropdown) > 1) ? $this->build_permission_dropdown($this->permission_dropdown, $permission_type, $permission_scope) : false,
-			'L_PERMISSION_TYPE'			=> phpbb::$user->lang['ACL_TYPE_' . strtoupper($permission_type)],
-
-			'U_ACTION'					=> $this->u_action,
-			'S_HIDDEN_FIELDS'			=> $s_hidden_fields,
-		));
-
-		if (strpos($mode, 'setting_') === 0)
-		{
-			phpbb::$template->assign_vars(array(
-				'S_SETTING_PERMISSIONS'		=> true,
-			));
-
-			$hold_ary = $auth_admin->get_mask('set', (sizeof($user_id)) ? $user_id : false, (sizeof($group_id)) ? $group_id : false, (sizeof($forum_id)) ? $forum_id : false, $permission_type, $permission_scope, phpbb::ACL_NO);
-			$auth_admin->display_mask('set', $permission_type, $hold_ary, ((sizeof($user_id)) ? 'user' : 'group'), (($permission_scope == 'local') ? true : false));
-		}
-		else
-		{
-			phpbb::$template->assign_vars(array(
-				'S_VIEWING_PERMISSIONS'		=> true,
-			));
-
-			$hold_ary = $auth_admin->get_mask('view', (sizeof($user_id)) ? $user_id : false, (sizeof($group_id)) ? $group_id : false, (sizeof($forum_id)) ? $forum_id : false, $permission_type, $permission_scope, phpbb::ACL_NEVER);
-			$auth_admin->display_mask('view', $permission_type, $hold_ary, ((sizeof($user_id)) ? 'user' : 'group'), (($permission_scope == 'local') ? true : false));
-		}
-	}
-
-	/**
-	* Build +subforum options
-	*/
-	function build_subforum_options($forum_list)
-	{
-		$s_options = '';
-
-		$forum_list = array_merge($forum_list);
-
-		foreach ($forum_list as $key => $row)
-		{
-			if ($row['disabled'])
-			{
-				continue;
-			}
-
-			$s_options .= '<option value="' . $row['forum_id'] . '"' . (($row['selected']) ? ' selected="selected"' : '') . '>' . $row['padding'] . $row['forum_name'];
-
-			// We check if a branch is there...
-			$branch_there = false;
-
-			foreach (array_slice($forum_list, $key + 1) as $temp_row)
-			{
-				if ($temp_row['left_id'] > $row['left_id'] && $temp_row['left_id'] < $row['right_id'])
-				{
-					$branch_there = true;
-					break;
-				}
-				continue;
-			}
-
-			if ($branch_there)
-			{
-				$s_options .= ' [' . phpbb::$user->lang['PLUS_SUBFORUMS'] . ']';
-			}
-
-			$s_options .= '</option>';
-		}
-
-		return $s_options;
-	}
-
-	/**
-	* Build dropdown field for changing permission types
-	*/
-	function build_permission_dropdown($options, $default_option, $permission_scope)
-	{
-		$s_dropdown_options = '';
-		foreach ($options as $setting)
-		{
-			if (!phpbb::$acl->acl_get('a_' . str_replace('_', '', $setting) . 'auth'))
-			{
-				continue;
-			}
-
-			$selected = ($setting == $default_option) ? ' selected="selected"' : '';
-			$l_setting = (isset(phpbb::$user->lang['permission_type'][$permission_scope][$setting])) ? phpbb::$user->lang['permission_type'][$permission_scope][$setting] : phpbb::$user->lang['permission_type'][$setting];
-			$s_dropdown_options .= '<option value="' . $setting . '"' . $selected . '>' . $l_setting . '</option>';
-		}
-
-		return $s_dropdown_options;
-	}
-
-	/**
-	* Check if selected items exist. Remove not found ids and if empty return error.
-	*/
-	function check_existence($mode, &$ids)
-	{
-		switch ($mode)
-		{
-			case 'user':
-				$table = USERS_TABLE;
-				$sql_id = 'user_id';
-			break;
-
-			case 'group':
-				$table = GROUPS_TABLE;
-				$sql_id = 'group_id';
-			break;
-
-			case 'forum':
-				$table = FORUMS_TABLE;
-				$sql_id = 'forum_id';
-			break;
-		}
-
-		if (sizeof($ids))
-		{
-			$sql = "SELECT $sql_id
-				FROM $table
-				WHERE " . phpbb::$db->sql_in_set($sql_id, $ids);
-			$result = phpbb::$db->sql_query($sql);
-
-			$ids = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$ids[] = (int) $row[$sql_id];
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		if (!sizeof($ids))
-		{
-			trigger_error(phpbb::$user->lang['SELECTED_' . strtoupper($mode) . '_NOT_EXIST'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-	}
-
-	/**
-	* Apply permissions
-	*/
-	function set_permissions($mode, $permission_type, &$auth_admin, &$user_id, &$group_id)
-	{
-		$psubmit = request_var('psubmit', array(0 => array(0 => 0)));
-
-		// User or group to be set?
-		$ug_type = (sizeof($user_id)) ? 'user' : 'group';
-
-		// Check the permission setting again
-		if (!phpbb::$acl->acl_get('a_' . str_replace('_', '', $permission_type) . 'auth') || !phpbb::$acl->acl_get('a_auth' . $ug_type . 's'))
-		{
-			trigger_error(phpbb::$user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
-		$ug_id = $forum_id = 0;
-
-		// We loop through the auth settings defined in our submit
-		list($ug_id, ) = each($psubmit);
-		list($forum_id, ) = each($psubmit[$ug_id]);
-
-		$auth_settings = phpbb_request::variable('setting', array(0 => array(0 => array('' => 0))), false, phpbb_request::POST);
-		if (!isset($auth_settings[$ug_id][$forum_id]) || !sizeof($auth_settings[$ug_id][$forum_id])))
-		{
-			trigger_error('WRONG_PERMISSION_SETTING_FORMAT', E_USER_WARNING);
-		}
-
-		// Do we have a role we want to set?
-		$assigned_role = phpbb_request::variable(array('role', $ug_id, $forum_id), 0, false, phpbb_request::POST));
-
-		// Do the admin want to set these permissions to other items too?
-		$inherit = request_var('inherit', array(0 => array(0)));
-
-		$ug_id = array($ug_id);
-		$forum_id = array($forum_id);
-
-		if (sizeof($inherit))
-		{
-			foreach ($inherit as $_ug_id => $forum_id_ary)
-			{
-				// Inherit users/groups?
-				if (!in_array($_ug_id, $ug_id))
-				{
-					$ug_id[] = $_ug_id;
-				}
-
-				// Inherit forums?
-				$forum_id = array_merge($forum_id, array_keys($forum_id_ary));
-			}
-		}
-
-		$forum_id = array_unique($forum_id);
-
-		// If the auth settings differ from the assigned role, then do not set a role...
-		if ($assigned_role)
-		{
-			if (!$this->check_assigned_role($assigned_role, $auth_settings))
-			{
-				$assigned_role = 0;
-			}
-		}
-
-		// Update the permission set...
-		$auth_admin->acl_set($ug_type, $forum_id, $ug_id, $auth_settings, $assigned_role);
-
-		// Do we need to recache the moderator lists?
-		if ($permission_type == 'm_')
-		{
-			cache_moderators();
-		}
-
-		// Remove users who are now moderators or admins from everyones foes list
-		if ($permission_type == 'm_' || $permission_type == 'a_')
-		{
-			update_foes($group_id, $user_id);
-		}
-
-		$this->log_action($mode, 'add', $permission_type, $ug_type, $ug_id, $forum_id);
-
-		trigger_error(phpbb::$user->lang['AUTH_UPDATED'] . adm_back_link($this->u_action));
-	}
-
-	/**
-	* Apply all permissions
-	*/
-	function set_all_permissions($mode, $permission_type, &$auth_admin, &$user_id, &$group_id)
-	{
-		// User or group to be set?
-		$ug_type = (sizeof($user_id)) ? 'user' : 'group';
-
-		// Check the permission setting again
-		if (!phpbb::$acl->acl_get('a_' . str_replace('_', '', $permission_type) . 'auth') || !phpbb::$acl->acl_get('a_auth' . $ug_type . 's'))
-		{
-			trigger_error(phpbb::$user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
-		$auth_settings = phpbb_request::variable('setting', array(0 => array(0 => array('' => 0))), false, phpbb_request::POST);
-		$auth_roles = phpbb_request::variable('role', array(0 => array(0 => 0)), false, phpbb_request::POST);
-		$ug_ids = $forum_ids = array();
-
-		// We need to go through the auth settings
-		foreach ($auth_settings as $ug_id => $forum_auth_row)
-		{
-			$ug_ids[] = $ug_id;
-
-			foreach ($forum_auth_row as $forum_id => $auth_options)
-			{
-				$forum_ids[] = $forum_id;
-
-				// Check role...
-				$assigned_role = (isset($auth_roles[$ug_id][$forum_id])) ? $auth_roles[$ug_id][$forum_id] : 0;
-
-				// If the auth settings differ from the assigned role, then do not set a role...
-				if ($assigned_role)
-				{
-					if (!$this->check_assigned_role($assigned_role, $auth_options))
-					{
-						$assigned_role = 0;
-					}
-				}
-
-				// Update the permission set...
-				$auth_admin->acl_set($ug_type, $forum_id, $ug_id, $auth_options, $assigned_role, false);
-			}
-		}
-
-		$auth_admin->acl_clear_prefetch();
-
-		// Do we need to recache the moderator lists?
-		if ($permission_type == 'm_')
-		{
-			cache_moderators();
-		}
-
-		// Remove users who are now moderators or admins from everyones foes list
-		if ($permission_type == 'm_' || $permission_type == 'a_')
-		{
-			update_foes($group_id, $user_id);
-		}
-
-		$this->log_action($mode, 'add', $permission_type, $ug_type, $ug_ids, $forum_ids);
-
-		trigger_error(phpbb::$user->lang['AUTH_UPDATED'] . adm_back_link($this->u_action . '&amp;forum_id[]=' . implode('&amp;forum_id[]=', $forum_ids)));
-	}
-
-	/**
-	* Compare auth settings with auth settings from role
-	* returns false if they differ, true if they are equal
-	*/
-	function check_assigned_role($role_id, &$auth_settings)
-	{
-		$sql = 'SELECT o.auth_option, r.auth_setting
-			FROM ' . ACL_OPTIONS_TABLE . ' o, ' . ACL_ROLES_DATA_TABLE . ' r
-			WHERE o.auth_option_id = r.auth_option_id
-				AND r.role_id = ' . $role_id;
-		$result = phpbb::$db->sql_query($sql);
-
-		$test_auth_settings = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$test_auth_settings[$row['auth_option']] = $row['auth_setting'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// We need to add any ACL_NO setting from auth_settings to compare correctly
-		foreach ($auth_settings as $option => $setting)
-		{
-			if ($setting == phpbb::ACL_NO)
-			{
-				$test_auth_settings[$option] = $setting;
-			}
-		}
-
-		if (sizeof(array_diff_assoc($auth_settings, $test_auth_settings)))
-		{
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	* Remove permissions
-	*/
-	function remove_permissions($mode, $permission_type, &$auth_admin, &$user_id, &$group_id, &$forum_id)
-	{
-		// User or group to be set?
-		$ug_type = (sizeof($user_id)) ? 'user' : 'group';
-
-		// Check the permission setting again
-		if (!phpbb::$acl->acl_get('a_' . str_replace('_', '', $permission_type) . 'auth') || !phpbb::$acl->acl_get('a_auth' . $ug_type . 's'))
-		{
-			trigger_error(phpbb::$user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
-		$auth_admin->acl_delete($ug_type, (($ug_type == 'user') ? $user_id : $group_id), (sizeof($forum_id) ? $forum_id : false), $permission_type);
-
-		// Do we need to recache the moderator lists?
-		if ($permission_type == 'm_')
-		{
-			cache_moderators();
-		}
-
-		$this->log_action($mode, 'del', $permission_type, $ug_type, (($ug_type == 'user') ? $user_id : $group_id), (sizeof($forum_id) ? $forum_id : array(0 => 0)));
-
-		trigger_error(phpbb::$user->lang['AUTH_UPDATED'] . adm_back_link($this->u_action . '&amp;forum_id[]=' . implode('&amp;forum_id[]=', $forum_id)));
-	}
-
-	/**
-	* Log permission changes
-	*/
-	function log_action($mode, $action, $permission_type, $ug_type, $ug_id, $forum_id)
-	{
-		if (!is_array($ug_id))
-		{
-			$ug_id = array($ug_id);
-		}
-
-		if (!is_array($forum_id))
-		{
-			$forum_id = array($forum_id);
-		}
-
-		// Logging ... first grab user or groupnames ...
-		$sql = ($ug_type == 'group') ? 'SELECT group_name as name, group_type FROM ' . GROUPS_TABLE . ' WHERE ' : 'SELECT username as name FROM ' . USERS_TABLE . ' WHERE ';
-		$sql .= phpbb::$db->sql_in_set(($ug_type == 'group') ? 'group_id' : 'user_id', array_map('intval', $ug_id));
-		$result = phpbb::$db->sql_query($sql);
-
-		$l_ug_list = '';
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$l_ug_list .= (($l_ug_list != '') ? ', ' : '') . ((isset($row['group_type']) && $row['group_type'] == GROUP_SPECIAL) ? '<span class="sep">' . phpbb::$user->lang['G_' . $row['name']] . '</span>' : $row['name']);
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$mode = str_replace('setting_', '', $mode);
-
-		if ($forum_id[0] == 0)
-		{
-			add_log('admin', 'LOG_ACL_' . strtoupper($action) . '_' . strtoupper($mode) . '_' . strtoupper($permission_type), $l_ug_list);
-		}
-		else
-		{
-			// Grab the forum details if non-zero forum_id
-			$sql = 'SELECT forum_name
-				FROM ' . FORUMS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('forum_id', $forum_id);
-			$result = phpbb::$db->sql_query($sql);
-
-			$l_forum_list = '';
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$l_forum_list .= (($l_forum_list != '') ? ', ' : '') . $row['forum_name'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			add_log('admin', 'LOG_ACL_' . strtoupper($action) . '_' . strtoupper($mode) . '_' . strtoupper($permission_type), $l_forum_list, $l_ug_list);
-		}
-	}
-
-	/**
-	* Display a complete trace tree for the selected permission to determine where settings are set/unset
-	*/
-	function permission_trace($user_id, $forum_id, $permission)
-	{
-		if ($user_id != phpbb::$user->data['user_id'])
-		{
-			$sql = 'SELECT user_id, username, user_permissions, user_type
-				FROM ' . USERS_TABLE . '
-				WHERE user_id = ' . $user_id;
-			$result = phpbb::$db->sql_query($sql);
-			$userdata = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-		}
-		else
-		{
-			$userdata = phpbb::$user->data;
-		}
-
-		if (!$userdata)
-		{
-			trigger_error('NO_USERS', E_USER_ERROR);
-		}
-
-		$forum_name = false;
-
-		if ($forum_id)
-		{
-			$sql = 'SELECT forum_name
-				FROM ' . FORUMS_TABLE . "
-				WHERE forum_id = $forum_id";
-			$result = phpbb::$db->sql_query($sql, 3600);
-			$forum_name = phpbb::$db->sql_fetchfield('forum_name');
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		$back = request_var('back', 0);
-
-		phpbb::$template->assign_vars(array(
-			'PERMISSION'			=> phpbb::$user->lang['acl_' . $permission]['lang'],
-			'PERMISSION_USERNAME'	=> $userdata['username'],
-			'FORUM_NAME'			=> $forum_name,
-
-			'S_GLOBAL_TRACE'		=> ($forum_id) ? false : true,
-
-			'U_BACK'				=> ($back) ? build_url(array('f', 'back')) . "&amp;f=$back" : '',
-		));
-
-		phpbb::$template->assign_block_vars('trace', array(
-			'WHO'			=> phpbb::$user->lang['DEFAULT'],
-			'INFORMATION'	=> phpbb::$user->lang['TRACE_DEFAULT'],
-
-			'S_SETTING_NO'		=> true,
-			'S_TOTAL_NO'		=> true,
-		));
-
-		$sql = 'SELECT DISTINCT g.group_name, g.group_id, g.group_type
-			FROM ' . GROUPS_TABLE . ' g
-				LEFT JOIN ' . USER_GROUP_TABLE . ' ug ON (ug.group_id = g.group_id)
-			WHERE ug.user_id = ' . $user_id . '
-				AND ug.user_pending = 0
-			ORDER BY g.group_type DESC, g.group_id DESC';
-		$result = phpbb::$db->sql_query($sql);
-
-		$groups = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$groups[$row['group_id']] = array(
-				'auth_setting'		=> phpbb::ACL_NO,
-				'group_name'		=> ($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name']
-			);
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$total = phpbb::ACL_NO;
-		$add_key = (($forum_id) ? '_LOCAL' : '');
-
-		if (sizeof($groups))
-		{
-			// Get group auth settings
-			$hold_ary = phpbb::$acl->acl_group_raw_data(array_keys($groups), $permission, $forum_id);
-
-			foreach ($hold_ary as $group_id => $forum_ary)
-			{
-				$groups[$group_id]['auth_setting'] = $hold_ary[$group_id][$forum_id][$permission];
-			}
-			unset($hold_ary);
-
-			foreach ($groups as $id => $row)
-			{
-				switch ($row['auth_setting'])
-				{
-					case phpbb::ACL_NO:
-						$information = phpbb::$user->lang['TRACE_GROUP_NO' . $add_key];
-					break;
-
-					case phpbb::ACL_YES:
-						$information = ($total == phpbb::ACL_YES) ? phpbb::$user->lang['TRACE_GROUP_YES_TOTAL_YES' . $add_key] : (($total == phpbb::ACL_NEVER) ? phpbb::$user->lang['TRACE_GROUP_YES_TOTAL_NEVER' . $add_key] : phpbb::$user->lang['TRACE_GROUP_YES_TOTAL_NO' . $add_key]);
-						$total = ($total == phpbb::ACL_NO) ? phpbb::ACL_YES : $total;
-					break;
-
-					case phpbb::ACL_NEVER:
-						$information = ($total == phpbb::ACL_YES) ? phpbb::$user->lang['TRACE_GROUP_NEVER_TOTAL_YES' . $add_key] : (($total == phpbb::ACL_NEVER) ? phpbb::$user->lang['TRACE_GROUP_NEVER_TOTAL_NEVER' . $add_key] : phpbb::$user->lang['TRACE_GROUP_NEVER_TOTAL_NO' . $add_key]);
-						$total = phpbb::ACL_NEVER;
-					break;
-				}
-
-				phpbb::$template->assign_block_vars('trace', array(
-					'WHO'			=> $row['group_name'],
-					'INFORMATION'	=> $information,
-
-					'S_SETTING_NO'		=> ($row['auth_setting'] == phpbb::ACL_NO) ? true : false,
-					'S_SETTING_YES'		=> ($row['auth_setting'] == phpbb::ACL_YES) ? true : false,
-					'S_SETTING_NEVER'	=> ($row['auth_setting'] == phpbb::ACL_NEVER) ? true : false,
-					'S_TOTAL_NO'		=> ($total == phpbb::ACL_NO) ? true : false,
-					'S_TOTAL_YES'		=> ($total == phpbb::ACL_YES) ? true : false,
-					'S_TOTAL_NEVER'		=> ($total == phpbb::ACL_NEVER) ? true : false,
-				));
-			}
-		}
-
-		// Get user specific permission... globally or for this forum
-		$hold_ary = phpbb::$acl->acl_user_raw_data($user_id, $permission, $forum_id);
-		$auth_setting = (!sizeof($hold_ary)) ? phpbb::ACL_NO : $hold_ary[$user_id][$forum_id][$permission];
-
-		switch ($auth_setting)
-		{
-			case phpbb::ACL_NO:
-				$information = ($total == phpbb::ACL_NO) ? phpbb::$user->lang['TRACE_USER_NO_TOTAL_NO' . $add_key] : phpbb::$user->lang['TRACE_USER_KEPT' . $add_key];
-				$total = ($total == phpbb::ACL_NO) ? phpbb::ACL_NEVER : $total;
-			break;
-
-			case phpbb::ACL_YES:
-				$information = ($total == phpbb::ACL_YES) ? phpbb::$user->lang['TRACE_USER_YES_TOTAL_YES' . $add_key] : (($total == phpbb::ACL_NEVER) ? phpbb::$user->lang['TRACE_USER_YES_TOTAL_NEVER' . $add_key] : phpbb::$user->lang['TRACE_USER_YES_TOTAL_NO' . $add_key]);
-				$total = ($total == phpbb::ACL_NO) ? phpbb::ACL_YES : $total;
-			break;
-
-			case phpbb::ACL_NEVER:
-				$information = ($total == phpbb::ACL_YES) ? phpbb::$user->lang['TRACE_USER_NEVER_TOTAL_YES' . $add_key] : (($total == phpbb::ACL_NEVER) ? phpbb::$user->lang['TRACE_USER_NEVER_TOTAL_NEVER' . $add_key] : phpbb::$user->lang['TRACE_USER_NEVER_TOTAL_NO' . $add_key]);
-				$total = phpbb::ACL_NEVER;
-			break;
-		}
-
-		phpbb::$template->assign_block_vars('trace', array(
-			'WHO'			=> $userdata['username'],
-			'INFORMATION'	=> $information,
-
-			'S_SETTING_NO'		=> ($auth_setting == phpbb::ACL_NO) ? true : false,
-			'S_SETTING_YES'		=> ($auth_setting == phpbb::ACL_YES) ? true : false,
-			'S_SETTING_NEVER'	=> ($auth_setting == phpbb::ACL_NEVER) ? true : false,
-			'S_TOTAL_NO'		=> false,
-			'S_TOTAL_YES'		=> ($total == phpbb::ACL_YES) ? true : false,
-			'S_TOTAL_NEVER'		=> ($total == phpbb::ACL_NEVER) ? true : false,
-		));
-
-		if ($forum_id != 0 && isset(phpbb::$acl->acl_options['global'][$permission]))
-		{
-			if ($user_id != phpbb::$user->data['user_id'])
-			{
-				$auth2 = new auth();
-				$auth2->acl($userdata);
-				$auth_setting = $auth2->acl_get($permission);
-			}
-			else
-			{
-				$auth_setting = phpbb::$acl->acl_get($permission);
-			}
-
-			if ($auth_setting)
-			{
-				$information = ($total == phpbb::ACL_YES) ? phpbb::$user->lang['TRACE_USER_GLOBAL_YES_TOTAL_YES'] : phpbb::$user->lang['TRACE_USER_GLOBAL_YES_TOTAL_NEVER'];
-				$total = phpbb::ACL_YES;
-			}
-			else
-			{
-				$information = phpbb::$user->lang['TRACE_USER_GLOBAL_NEVER_TOTAL_KEPT'];
-			}
-
-			// If there is no auth information we do not need to worry the user by showing non-relevant data.
-			if ($auth_setting)
-			{
-				phpbb::$template->assign_block_vars('trace', array(
-					'WHO'			=> sprintf(phpbb::$user->lang['TRACE_GLOBAL_SETTING'], $userdata['username']),
-					'INFORMATION'	=> sprintf($information, '<a href="' . $this->u_action . "&amp;u=$user_id&amp;f=0&amp;auth=$permission&amp;back=$forum_id\">", '</a>'),
-
-					'S_SETTING_NO'		=> false,
-					'S_SETTING_YES'		=> $auth_setting,
-					'S_SETTING_NEVER'	=> !$auth_setting,
-					'S_TOTAL_NO'		=> false,
-					'S_TOTAL_YES'		=> ($total == phpbb::ACL_YES) ? true : false,
-					'S_TOTAL_NEVER'		=> ($total == phpbb::ACL_NEVER) ? true : false,
-				));
-			}
-		}
-
-		// Take founder status into account, overwriting the default values
-		if ($userdata['user_type'] == phpbb::USER_FOUNDER && strpos($permission, 'a_') === 0)
-		{
-			phpbb::$template->assign_block_vars('trace', array(
-				'WHO'			=> $userdata['username'],
-				'INFORMATION'	=> phpbb::$user->lang['TRACE_USER_FOUNDER'],
-
-				'S_SETTING_NO'		=> ($auth_setting == phpbb::ACL_NO) ? true : false,
-				'S_SETTING_YES'		=> ($auth_setting == phpbb::ACL_YES) ? true : false,
-				'S_SETTING_NEVER'	=> ($auth_setting == phpbb::ACL_NEVER) ? true : false,
-				'S_TOTAL_NO'		=> false,
-				'S_TOTAL_YES'		=> true,
-				'S_TOTAL_NEVER'		=> false,
-			));
-
-			$total = phpbb::ACL_YES;
-		}
-
-		// Total value...
-		phpbb::$template->assign_vars(array(
-			'S_RESULT_NO'		=> ($total == phpbb::ACL_NO) ? true : false,
-			'S_RESULT_YES'		=> ($total == phpbb::ACL_YES) ? true : false,
-			'S_RESULT_NEVER'	=> ($total == phpbb::ACL_NEVER) ? true : false,
-		));
-	}
-
-	/**
-	* Get already assigned users/groups
-	*/
-	function retrieve_defined_user_groups($permission_scope, $forum_id, $permission_type)
-	{
-		$sql_forum_id = ($permission_scope == 'global') ? 'AND a.forum_id = 0' : ((sizeof($forum_id)) ? 'AND ' . phpbb::$db->sql_in_set('a.forum_id', $forum_id) : 'AND a.forum_id <> 0');
-
-		// Permission options are only able to be a permission set... therefore we will pre-fetch the possible options and also the possible roles
-		$option_ids = $role_ids = array();
-
-		$sql = 'SELECT auth_option_id
-			FROM ' . ACL_OPTIONS_TABLE . '
-			WHERE auth_option ' . phpbb::$db->sql_like_expression($permission_type . phpbb::$db->any_char);
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$option_ids[] = (int) $row['auth_option_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if (sizeof($option_ids))
-		{
-			$sql = 'SELECT DISTINCT role_id
-				FROM ' . ACL_ROLES_DATA_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('auth_option_id', $option_ids);
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$role_ids[] = (int) $row['role_id'];
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		if (sizeof($option_ids) && sizeof($role_ids))
-		{
-			$sql_where = 'AND (' . phpbb::$db->sql_in_set('a.auth_option_id', $option_ids) . ' OR ' . phpbb::$db->sql_in_set('a.auth_role_id', $role_ids) . ')';
-		}
-		else if (sizeof($role_ids))
-		{
-			$sql_where = 'AND ' . phpbb::$db->sql_in_set('a.auth_role_id', $role_ids);
-		}
-		else if (sizeof($option_ids))
-		{
-			$sql_where = 'AND ' . phpbb::$db->sql_in_set('a.auth_option_id', $option_ids);
-		}
-
-		// Not ideal, due to the filesort, non-use of indexes, etc.
-		$sql = 'SELECT DISTINCT u.user_id, u.username, u.username_clean, u.user_regdate
-			FROM ' . USERS_TABLE . ' u, ' . ACL_USERS_TABLE . " a
-			WHERE u.user_id = a.user_id
-				$sql_forum_id
-				$sql_where
-			ORDER BY u.username_clean, u.user_regdate ASC";
-		$result = phpbb::$db->sql_query($sql);
-
-		$s_defined_user_options = '';
-		$defined_user_ids = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$s_defined_user_options .= '<option value="' . $row['user_id'] . '">' . $row['username'] . '</option>';
-			$defined_user_ids[] = $row['user_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$sql = 'SELECT DISTINCT g.group_type, g.group_name, g.group_id
-			FROM ' . GROUPS_TABLE . ' g, ' . ACL_GROUPS_TABLE . " a
-			WHERE g.group_id = a.group_id
-				$sql_forum_id
-				$sql_where
-			ORDER BY g.group_type DESC, g.group_name ASC";
-		$result = phpbb::$db->sql_query($sql);
-
-		$s_defined_group_options = '';
-		$defined_group_ids = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$s_defined_group_options .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '') . ' value="' . $row['group_id'] . '">' . (($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
-			$defined_group_ids[] = $row['group_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		return array(
-			'group_ids'			=> $defined_group_ids,
-			'group_ids_options'	=> $s_defined_group_options,
-			'user_ids'			=> $defined_user_ids,
-			'user_ids_options'	=> $s_defined_user_options
-		);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_php_info.php b/phpBB/modules/acp/acp_php_info.php
deleted file mode 100644
index 31a241a36f..0000000000
--- a/phpBB/modules/acp/acp_php_info.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_php_info
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		if ($mode != 'info')
-		{
-			trigger_error('NO_MODE', E_USER_ERROR);
-		}
-
-		$this->tpl_name = 'acp_php_info';
-		$this->page_title = 'ACP_PHP_INFO';
-
-		ob_start();
-		@phpinfo(INFO_GENERAL | INFO_CONFIGURATION | INFO_MODULES | INFO_VARIABLES);
-		$phpinfo = ob_get_clean();
-
-		$phpinfo = trim($phpinfo);
-
-		// Here we play around a little with the PHP Info HTML to try and stylise
-		// it along phpBB's lines ... hopefully without breaking anything. The idea
-		// for this was nabbed from the PHP annotated manual
-		preg_match_all('#<body[^>]*>(.*)</body>#si', $phpinfo, $output);
-
-		if (empty($phpinfo) || empty($output))
-		{
-			trigger_error('NO_PHPINFO_AVAILABLE', E_USER_WARNING);
-		}
-
-		$output = $output[1][0];
-
-		// expose_php can make the image not exist
-		if (preg_match('#<a[^>]*><img[^>]*></a>#', $output))
-		{
-			$output = preg_replace('#<tr class="v"><td>(.*?<a[^>]*><img[^>]*></a>)(.*?)</td></tr>#s', '<tr class="row1"><td><table class="type2"><tr><td>\2</td><td>\1</td></tr></table></td></tr>', $output);
-		}
-		else
-		{
-			$output = preg_replace('#<tr class="v"><td>(.*?)</td></tr>#s', '<tr class="row1"><td><table class="type2"><tr><td>\1</td></tr></table></td></tr>', $output);
-		}
-		$output = preg_replace('#<table[^>]+>#i', '<table>', $output);
-		$output = preg_replace('#<img border="0"#i', '<img', $output);
-		$output = str_replace(array('class="e"', 'class="v"', 'class="h"', '<hr />', '<font', '</font>'), array('class="row1"', 'class="row2"', '', '', '<span', '</span>'), $output);
-
-		if (empty($output))
-		{
-			trigger_error('NO_PHPINFO_AVAILABLE', E_USER_WARNING);
-		}
-
-		$orig_output = $output;
-
-		preg_match_all('#<div class="center">(.*)</div>#siU', $output, $output);
-		$output = (!empty($output[1][0])) ? $output[1][0] : $orig_output;
-
-		phpbb::$template->assign_var('PHPINFO', $output);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_profile.php b/phpBB/modules/acp/acp_profile.php
deleted file mode 100644
index 335c0f4835..0000000000
--- a/phpBB/modules/acp/acp_profile.php
+++ /dev/null
@@ -1,1651 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_profile
-{
-	var $u_action;
-
-	var $edit_lang_id;
-	var $lang_defs;
-
-	function main($id, $mode)
-	{
-		include(PHPBB_ROOT_PATH . 'includes/functions_posting.' . PHP_EXT);
-		include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-		include(PHPBB_ROOT_PATH . 'includes/functions_profile_fields.' . PHP_EXT);
-
-		phpbb::$user->add_lang(array('ucp', 'acp/profile'));
-		$this->tpl_name = 'acp_profile';
-		$this->page_title = 'ACP_CUSTOM_PROFILE_FIELDS';
-
-		$action = (phpbb_request::is_set_post('create')) ? 'create' : request_var('action', '');
-
-		$error = array();
-		$s_hidden_fields = '';
-
-		// Define some default values for each field type
-		$default_values = array(
-			FIELD_STRING	=> array('field_length' => 10, 'field_minlen' => 0, 'field_maxlen' => 20, 'field_validation' => '.*', 'field_novalue' => '', 'field_default_value' => ''),
-			FIELD_TEXT		=> array('field_length' => '5|80', 'field_minlen' => 0, 'field_maxlen' => 1000, 'field_validation' => '.*', 'field_novalue' => '', 'field_default_value' => ''),
-			FIELD_INT		=> array('field_length' => 5, 'field_minlen' => 0, 'field_maxlen' => 100, 'field_validation' => '', 'field_novalue' => 0, 'field_default_value' => 0),
-			FIELD_DATE		=> array('field_length' => 10, 'field_minlen' => 10, 'field_maxlen' => 10, 'field_validation' => '', 'field_novalue' => ' 0- 0-   0', 'field_default_value' => ' 0- 0-   0'),
-			FIELD_BOOL		=> array('field_length' => 1, 'field_minlen' => 0, 'field_maxlen' => 0, 'field_validation' => '', 'field_novalue' => 0, 'field_default_value' => 0),
-			FIELD_DROPDOWN	=> array('field_length' => 0, 'field_minlen' => 0, 'field_maxlen' => 5, 'field_validation' => '', 'field_novalue' => 0, 'field_default_value' => 0),
-		);
-
-		$cp = new custom_profile_admin();
-
-		// Build Language array
-		// Based on this, we decide which elements need to be edited later and which language items are missing
-		$this->lang_defs = array();
-
-		$sql = 'SELECT lang_id, lang_iso
-			FROM ' . LANG_TABLE . '
-			ORDER BY lang_english_name';
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			// Make some arrays with all available languages
-			$this->lang_defs['id'][$row['lang_id']] = $row['lang_iso'];
-			$this->lang_defs['iso'][$row['lang_iso']] = $row['lang_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$sql = 'SELECT field_id, lang_id
-			FROM ' . PROFILE_LANG_TABLE . '
-			ORDER BY lang_id';
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			// Which languages are available for each item
-			$this->lang_defs['entry'][$row['field_id']][] = $row['lang_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// Have some fields been defined?
-		if (isset($this->lang_defs['entry']))
-		{
-			foreach ($this->lang_defs['entry'] as $field_id => $field_ary)
-			{
-				// Fill an array with the languages that are missing for each field
-				$this->lang_defs['diff'][$field_id] = array_diff(array_values($this->lang_defs['iso']), $field_ary);
-			}
-		}
-
-		switch ($action)
-		{
-			case 'delete':
-				$field_id = request_var('field_id', 0);
-
-				if (!$field_id)
-				{
-					trigger_error(phpbb::$user->lang['NO_FIELD_ID'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				if (confirm_box(true))
-				{
-					$sql = 'SELECT field_ident
-						FROM ' . PROFILE_FIELDS_TABLE . "
-						WHERE field_id = $field_id";
-					$result = phpbb::$db->sql_query($sql);
-					$field_ident = (string) phpbb::$db->sql_fetchfield('field_ident');
-					phpbb::$db->sql_freeresult($result);
-
-					phpbb::$db->sql_transaction('begin');
-
-					phpbb::$db->sql_query('DELETE FROM ' . PROFILE_FIELDS_TABLE . " WHERE field_id = $field_id");
-					phpbb::$db->sql_query('DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . " WHERE field_id = $field_id");
-					phpbb::$db->sql_query('DELETE FROM ' . PROFILE_LANG_TABLE . " WHERE field_id = $field_id");
-
-					if (phpbb::$db->dbms_type == 'sqlite')
-					{
-							$sql = "SELECT sql
-								FROM sqlite_master
-								WHERE type = 'table'
-									AND name = '" . PROFILE_FIELDS_DATA_TABLE . "'
-								ORDER BY type DESC, name;";
-							$result = phpbb::$db->sql_query($sql);
-							$row = phpbb::$db->sql_fetchrow($result);
-							phpbb::$db->sql_freeresult($result);
-
-							// Create a temp table and populate it, destroy the existing one
-							phpbb::$db->sql_query(preg_replace('#CREATE\s+TABLE\s+"?' . PROFILE_FIELDS_DATA_TABLE . '"?#i', 'CREATE TEMPORARY TABLE ' . PROFILE_FIELDS_DATA_TABLE . '_temp', $row['sql']));
-							phpbb::$db->sql_query('INSERT INTO ' . PROFILE_FIELDS_DATA_TABLE . '_temp SELECT * FROM ' . PROFILE_FIELDS_DATA_TABLE);
-							phpbb::$db->sql_query('DROP TABLE ' . PROFILE_FIELDS_DATA_TABLE);
-
-							preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-							$new_table_cols = trim($matches[1]);
-							$old_table_cols = preg_split('/,(?=[\\sa-z])/im', $new_table_cols);
-							$column_list = array();
-
-							foreach ($old_table_cols as $declaration)
-							{
-								$entities = preg_split('#\s+#', trim($declaration));
-
-								if ($entities[0] == 'PRIMARY')
-								{
-									continue;
-								}
-
-								if ($entities[0] !== 'pf_' . $field_ident)
-								{
-									$column_list[] = $entities[0];
-								}
-							}
-
-							$columns = implode(',', $column_list);
-
-							$new_table_cols = preg_replace('/' . 'pf_' . $field_ident . '[^,]+,/', '', $new_table_cols);
-
-							// create a new table and fill it up. destroy the temp one
-							phpbb::$db->sql_query('CREATE TABLE ' . PROFILE_FIELDS_DATA_TABLE . ' (' . $new_table_cols . ');');
-							phpbb::$db->sql_query('INSERT INTO ' . PROFILE_FIELDS_DATA_TABLE . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . PROFILE_FIELDS_DATA_TABLE . '_temp;');
-							phpbb::$db->sql_query('DROP TABLE ' . PROFILE_FIELDS_DATA_TABLE . '_temp');
-					}
-					else
-					{
-						phpbb::$db->sql_query('ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " DROP COLUMN pf_$field_ident");
-					}
-
-					$order = 0;
-
-					$sql = 'SELECT *
-						FROM ' . PROFILE_FIELDS_TABLE . '
-						ORDER BY field_order';
-					$result = phpbb::$db->sql_query($sql);
-
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$order++;
-						if ($row['field_order'] != $order)
-						{
-							$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . "
-								SET field_order = $order
-								WHERE field_id = {$row['field_id']}";
-							phpbb::$db->sql_query($sql);
-						}
-					}
-					phpbb::$db->sql_freeresult($result);
-
-					phpbb::$db->sql_transaction('commit');
-
-					add_log('admin', 'LOG_PROFILE_FIELD_REMOVED', $field_ident);
-					trigger_error(phpbb::$user->lang['REMOVED_PROFILE_FIELD'] . adm_back_link($this->u_action));
-				}
-				else
-				{
-					confirm_box(false, 'DELETE_PROFILE_FIELD', build_hidden_fields(array(
-						'i'			=> $id,
-						'mode'		=> $mode,
-						'action'	=> $action,
-						'field_id'	=> $field_id,
-					)));
-				}
-
-			break;
-
-			case 'activate':
-				$field_id = request_var('field_id', 0);
-
-				if (!$field_id)
-				{
-					trigger_error(phpbb::$user->lang['NO_FIELD_ID'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				$sql = 'SELECT lang_id
-					FROM ' . LANG_TABLE . "
-					WHERE lang_iso = '" . phpbb::$db->sql_escape(phpbb::$config['default_lang']) . "'";
-				$result = phpbb::$db->sql_query($sql);
-				$default_lang_id = (int) phpbb::$db->sql_fetchfield('lang_id');
-				phpbb::$db->sql_freeresult($result);
-
-				if (!in_array($default_lang_id, $this->lang_defs['entry'][$field_id]))
-				{
-					trigger_error(phpbb::$user->lang['DEFAULT_LANGUAGE_NOT_FILLED'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . "
-					SET field_active = 1
-					WHERE field_id = $field_id";
-				phpbb::$db->sql_query($sql);
-
-				$sql = 'SELECT field_ident
-					FROM ' . PROFILE_FIELDS_TABLE . "
-					WHERE field_id = $field_id";
-				$result = phpbb::$db->sql_query($sql);
-				$field_ident = (string) phpbb::$db->sql_fetchfield('field_ident');
-				phpbb::$db->sql_freeresult($result);
-
-				add_log('admin', 'LOG_PROFILE_FIELD_ACTIVATE', $field_ident);
-				trigger_error(phpbb::$user->lang['PROFILE_FIELD_ACTIVATED'] . adm_back_link($this->u_action));
-
-			break;
-
-			case 'deactivate':
-				$field_id = request_var('field_id', 0);
-
-				if (!$field_id)
-				{
-					trigger_error(phpbb::$user->lang['NO_FIELD_ID'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . "
-					SET field_active = 0
-					WHERE field_id = $field_id";
-				phpbb::$db->sql_query($sql);
-
-				$sql = 'SELECT field_ident
-					FROM ' . PROFILE_FIELDS_TABLE . "
-					WHERE field_id = $field_id";
-				$result = phpbb::$db->sql_query($sql);
-				$field_ident = (string) phpbb::$db->sql_fetchfield('field_ident');
-				phpbb::$db->sql_freeresult($result);
-
-				add_log('admin', 'LOG_PROFILE_FIELD_DEACTIVATE', $field_ident);
-				trigger_error(phpbb::$user->lang['PROFILE_FIELD_DEACTIVATED'] . adm_back_link($this->u_action));
-
-			break;
-
-			case 'move_up':
-			case 'move_down':
-				$field_order = request_var('order', 0);
-				$order_total = $field_order * 2 + (($action == 'move_up') ? -1 : 1);
-
-				$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . "
-					SET field_order = $order_total - field_order
-					WHERE field_order IN ($field_order, " . (($action == 'move_up') ? $field_order - 1 : $field_order + 1) . ')';
-				phpbb::$db->sql_query($sql);
-
-			break;
-
-			case 'create':
-			case 'edit':
-
-				$field_id = request_var('field_id', 0);
-				$step = request_var('step', 1);
-
-				$submit = (phpbb_request::is_set('next') || phpbb_request::is_set('prev')) ? true : false;
-				$save = phpbb_request::is_set('save');
-
-				// The language id of default language
-				$this->edit_lang_id = $this->lang_defs['iso'][phpbb::$config['default_lang']];
-
-				// We are editing... we need to grab basic things
-				if ($action == 'edit')
-				{
-					if (!$field_id)
-					{
-						trigger_error(phpbb::$user->lang['NO_FIELD_ID'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-
-					$sql = 'SELECT l.*, f.*
-						FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f
-						WHERE l.lang_id = ' . $this->edit_lang_id . "
-							AND f.field_id = $field_id
-							AND l.field_id = f.field_id";
-					$result = phpbb::$db->sql_query($sql);
-					$field_row = phpbb::$db->sql_fetchrow($result);
-					phpbb::$db->sql_freeresult($result);
-
-					if (!$field_row)
-					{
-						// Some admin changed the default language?
-						$sql = 'SELECT l.*, f.*
-							FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f
-							WHERE l.lang_id <> ' . $this->edit_lang_id . "
-							AND f.field_id = $field_id
-							AND l.field_id = f.field_id";
-						$result = phpbb::$db->sql_query($sql);
-						$field_row = phpbb::$db->sql_fetchrow($result);
-						phpbb::$db->sql_freeresult($result);
-
-						if (!$field_row)
-						{
-							trigger_error(phpbb::$user->lang['FIELD_NOT_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
-						}
-
-						$this->edit_lang_id = $field_row['lang_id'];
-					}
-					$field_type = $field_row['field_type'];
-
-					// Get language entries
-					$sql = 'SELECT *
-						FROM ' . PROFILE_FIELDS_LANG_TABLE . '
-						WHERE lang_id = ' . $this->edit_lang_id . "
-							AND field_id = $field_id
-						ORDER BY option_id ASC";
-					$result = phpbb::$db->sql_query($sql);
-
-					$lang_options = array();
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$lang_options[$row['option_id']] = $row['lang_value'];
-					}
-					phpbb::$db->sql_freeresult($result);
-
-					$s_hidden_fields = '<input type="hidden" name="field_id" value="' . $field_id . '" />';
-				}
-				else
-				{
-					// We are adding a new field, define basic params
-					$lang_options = $field_row = array();
-
-					$field_type = request_var('field_type', 0);
-
-					if (!$field_type)
-					{
-						trigger_error(phpbb::$user->lang['NO_FIELD_TYPE'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-
-					$field_row = array_merge($default_values[$field_type], array(
-						'field_ident'		=> utf8_clean_string(request_var('field_ident', '', true)),
-						'field_required'	=> 0,
-						'field_hide'		=> 0,
-						'field_no_view'		=> 0,
-						'field_show_on_reg'	=> 0,
-						'lang_name'			=> utf8_normalize_nfc(request_var('field_ident', '', true)),
-						'lang_explain'		=> '',
-						'lang_default_value'=> '')
-					);
-
-					$s_hidden_fields = '<input type="hidden" name="field_type" value="' . $field_type . '" />';
-				}
-
-				// $exclude contains the data we gather in each step
-				$exclude = array(
-					1	=> array('field_ident', 'lang_name', 'lang_explain', 'field_option', 'field_no_view'),
-					2	=> array('field_length', 'field_maxlen', 'field_minlen', 'field_validation', 'field_novalue', 'field_default_value'),
-					3	=> array('l_lang_name', 'l_lang_explain', 'l_lang_default_value', 'l_lang_options')
-				);
-
-				// Text-based fields require the lang_default_value to be excluded
-				if ($field_type == FIELD_STRING || $field_type == FIELD_TEXT)
-				{
-					$exclude[1][] = 'lang_default_value';
-				}
-
-				// option-specific fields require lang_options to be excluded
-				if ($field_type == FIELD_BOOL || $field_type == FIELD_DROPDOWN)
-				{
-					$exclude[1][] = 'lang_options';
-				}
-
-				$cp->vars['field_ident']		= ($action == 'create' && $step == 1) ? utf8_clean_string(request_var('field_ident', $field_row['field_ident'], true)) : request_var('field_ident', $field_row['field_ident']);
-				$cp->vars['lang_name']			= utf8_normalize_nfc(request_var('lang_name', $field_row['lang_name'], true));
-				$cp->vars['lang_explain']		= utf8_normalize_nfc(request_var('lang_explain', $field_row['lang_explain'], true));
-				$cp->vars['lang_default_value']	= utf8_normalize_nfc(request_var('lang_default_value', $field_row['lang_default_value'], true));
-
-				// Field option...
-				if (phpbb_request::is_set('field_option'))
-				{
-					$field_option = request_var('field_option', '');
-
-					$cp->vars['field_required'] = ($field_option == 'field_required') ? 1 : 0;
-					$cp->vars['field_show_on_reg'] = ($field_option == 'field_show_on_reg') ? 1 : 0;
-					$cp->vars['field_hide'] = ($field_option == 'field_hide') ? 1 : 0;
-				}
-				else
-				{
-					$cp->vars['field_required'] = $field_row['field_required'];
-					$cp->vars['field_show_on_reg'] = $field_row['field_show_on_reg'];
-					$cp->vars['field_hide'] = $field_row['field_hide'];
-
-					$field_option = ($field_row['field_required']) ? 'field_required' : (($field_row['field_show_on_reg']) ? 'field_show_on_reg' : (($field_row['field_hide']) ? 'field_hide' : ''));
-				}
-
-				$cp->vars['field_no_view'] = request_var('field_no_view', $field_row['field_no_view']);
-
-				// A boolean field expects an array as the lang options
-				if ($field_type == FIELD_BOOL)
-				{
-					$options = utf8_normalize_nfc(request_var('lang_options', array(''), true));
-				}
-				else
-				{
-					$options = utf8_normalize_nfc(request_var('lang_options', '', true));
-				}
-
-				// If the user has submitted a form with options (i.e. dropdown field)
-				if ($options)
-				{
-					$exploded_options = (is_array($options)) ? $options : explode("\n", $options);
-
-					if (sizeof($exploded_options) == sizeof($lang_options) || $action == 'create')
-					{
-						// The number of options in the field is equal to the number of options already in the database
-						// Or we are creating a new dropdown list.
-						$cp->vars['lang_options'] = $exploded_options;
-					}
-					else if ($action == 'edit')
-					{
-						// Changing the number of options? (We remove and re-create the option fields)
-						$cp->vars['lang_options'] = $exploded_options;
-					}
-				}
-				else
-				{
-					$cp->vars['lang_options'] = $lang_options;
-				}
-
-				// step 2
-				foreach ($exclude[2] as $key)
-				{
-					$var = utf8_normalize_nfc(request_var($key, $field_row[$key], true));
-
-					// Manipulate the intended variables a little bit if needed
-					if ($field_type == FIELD_DROPDOWN && $key == 'field_maxlen')
-					{
-						// Get the number of options if this key is 'field_maxlen'
-						$var = sizeof(explode("\n", utf8_normalize_nfc(request_var('lang_options', '', true))));
-					}
-					else if ($field_type == FIELD_TEXT && $key == 'field_length')
-					{
-						if (phpbb_request::is_set('rows'))
-						{
-							$cp->vars['rows'] = request_var('rows', 0);
-							$cp->vars['columns'] = request_var('columns', 0);
-							$var = $cp->vars['rows'] . '|' . $cp->vars['columns'];
-						}
-						else
-						{
-							$row_col = explode('|', $var);
-							$cp->vars['rows'] = $row_col[0];
-							$cp->vars['columns'] = $row_col[1];
-						}
-					}
-					else if ($field_type == FIELD_DATE && $key == 'field_default_value')
-					{
-						$always_now = request_var('always_now', -1);
-
-						if ($always_now == 1 || ($always_now === -1 && $var == 'now'))
-						{
-							$now = getdate();
-
-							$cp->vars['field_default_value_day'] = $now['mday'];
-							$cp->vars['field_default_value_month'] = $now['mon'];
-							$cp->vars['field_default_value_year'] = $now['year'];
-
-							$var = 'now';
-							/**
-							* @todo Do NOT overwrite a request variable.
-							*/
-							phpbb_request::overwrite('field_default_value', $var, phpbb_request::REQUEST);
-							phpbb_request::overwrite('field_default_value', $var, phpbb_request::POST);
-						}
-						else
-						{
-							if (phpbb_request::is_set('field_default_value_day'))
-							{
-								$cp->vars['field_default_value_day'] = request_var('field_default_value_day', 0);
-								$cp->vars['field_default_value_month'] = request_var('field_default_value_month', 0);
-								$cp->vars['field_default_value_year'] = request_var('field_default_value_year', 0);
-								$var = sprintf('%2d-%2d-%4d', $cp->vars['field_default_value_day'], $cp->vars['field_default_value_month'], $cp->vars['field_default_value_year']);
-								/**
-								* @todo Do NOT overwrite a request variable.
-								*/
-								phpbb_request::overwrite('field_default_value', $var, phpbb_request::REQUEST);
-								phpbb_request::overwrite('field_default_value', $var, phpbb_request::POST);
-							}
-							else
-							{
-								list($cp->vars['field_default_value_day'], $cp->vars['field_default_value_month'], $cp->vars['field_default_value_year']) = explode('-', $var);
-							}
-						}
-					}
-					/* else if ($field_type == FIELD_BOOL && $key == 'field_default_value')
-					{
-						// Get the number of options if this key is 'field_maxlen'
-						$var = request_var('field_default_value', 0);
-					}*/
-
-					$cp->vars[$key] = $var;
-				}
-
-				// step 3 - all arrays
-				if ($action == 'edit')
-				{
-					// Get language entries
-					$sql = 'SELECT *
-						FROM ' . PROFILE_FIELDS_LANG_TABLE . '
-						WHERE lang_id <> ' . $this->edit_lang_id . "
-							AND field_id = $field_id
-						ORDER BY option_id ASC";
-					$result = phpbb::$db->sql_query($sql);
-
-					$l_lang_options = array();
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$l_lang_options[$row['lang_id']][$row['option_id']] = $row['lang_value'];
-					}
-					phpbb::$db->sql_freeresult($result);
-
-
-					$sql = 'SELECT lang_id, lang_name, lang_explain, lang_default_value
-						FROM ' . PROFILE_LANG_TABLE . '
-						WHERE lang_id <> ' . $this->edit_lang_id . "
-							AND field_id = $field_id
-						ORDER BY lang_id ASC";
-					$result = phpbb::$db->sql_query($sql);
-
-					$l_lang_name = $l_lang_explain = $l_lang_default_value = array();
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$l_lang_name[$row['lang_id']] = $row['lang_name'];
-						$l_lang_explain[$row['lang_id']] = $row['lang_explain'];
-						$l_lang_default_value[$row['lang_id']] = $row['lang_default_value'];
-					}
-					phpbb::$db->sql_freeresult($result);
-				}
-
-				foreach ($exclude[3] as $key)
-				{
-					$cp->vars[$key] = utf8_normalize_nfc(request_var($key, array(0 => ''), true));
-
-					if (!$cp->vars[$key] && $action == 'edit')
-					{
-						$cp->vars[$key] = $$key;
-					}
-					else if ($key == 'l_lang_options' && $field_type == FIELD_BOOL)
-					{
-						$cp->vars[$key] = utf8_normalize_nfc(request_var($key, array(0 => array('')), true));
-					}
-					else if ($key == 'l_lang_options' && is_array($cp->vars[$key]))
-					{
-						foreach ($cp->vars[$key] as $lang_id => $options)
-						{
-							$cp->vars[$key][$lang_id] = explode("\n", $options);
-						}
-
-					}
-				}
-
-				// Check for general issues in every step
-				if ($submit) //  && $step == 1
-				{
-					// Check values for step 1
-					if ($cp->vars['field_ident'] == '')
-					{
-						$error[] = phpbb::$user->lang['EMPTY_FIELD_IDENT'];
-					}
-
-					if (!preg_match('/^[a-z_]+$/', $cp->vars['field_ident']))
-					{
-						$error[] = phpbb::$user->lang['INVALID_CHARS_FIELD_IDENT'];
-					}
-
-					if (strlen($cp->vars['field_ident']) > 17)
-					{
-						$error[] = phpbb::$user->lang['INVALID_FIELD_IDENT_LEN'];
-					}
-
-					if ($cp->vars['lang_name'] == '')
-					{
-						$error[] = phpbb::$user->lang['EMPTY_USER_FIELD_NAME'];
-					}
-
-					if ($field_type == FIELD_DROPDOWN && !sizeof($cp->vars['lang_options']))
-					{
-						$error[] = phpbb::$user->lang['NO_FIELD_ENTRIES'];
-					}
-
-					if ($field_type == FIELD_BOOL && (empty($cp->vars['lang_options'][0]) || empty($cp->vars['lang_options'][1])))
-					{
-						$error[] = phpbb::$user->lang['NO_FIELD_ENTRIES'];
-					}
-
-					// Check for already existing field ident
-					if ($action != 'edit')
-					{
-						$sql = 'SELECT field_ident
-							FROM ' . PROFILE_FIELDS_TABLE . "
-							WHERE field_ident = '" . phpbb::$db->sql_escape($cp->vars['field_ident']) . "'";
-						$result = phpbb::$db->sql_query($sql);
-						$row = phpbb::$db->sql_fetchrow($result);
-						phpbb::$db->sql_freeresult($result);
-
-						if ($row)
-						{
-							$error[] = phpbb::$user->lang['FIELD_IDENT_ALREADY_EXIST'];
-						}
-					}
-				}
-
-				$step = (phpbb_request::is_set('next')) ? $step + 1 : ((phpbb_request::is_set('prev')) ? $step - 1 : $step);
-
-				if (sizeof($error))
-				{
-					$step--;
-					$submit = false;
-				}
-
-				// Build up the specific hidden fields
-				foreach ($exclude as $num => $key_ary)
-				{
-					if ($num == $step)
-					{
-						continue;
-					}
-
-					$_new_key_ary = array();
-
-					foreach ($key_ary as $key)
-					{
-						if ($field_type == FIELD_TEXT && $key == 'field_length' && phpbb_request::is_set('rows'))
-						{
-							$cp->vars['rows'] = request_var('rows', 0);
-							$cp->vars['columns'] = request_var('columns', 0);
-							$_new_key_ary[$key] = $cp->vars['rows'] . '|' . $cp->vars['columns'];
-						}
-						else if ($field_type == FIELD_DATE && $key == 'field_default_value')
-						{
-							$always_now = request_var('always_now', 0);
-
-							if ($always_now)
-							{
-								$_new_key_ary[$key] = 'now';
-							}
-							else if (phpbb_request::is_set('field_default_value_day'))
-							{
-								$cp->vars['field_default_value_day'] = request_var('field_default_value_day', 0);
-								$cp->vars['field_default_value_month'] = request_var('field_default_value_month', 0);
-								$cp->vars['field_default_value_year'] = request_var('field_default_value_year', 0);
-								$_new_key_ary[$key] = sprintf('%2d-%2d-%4d', $cp->vars['field_default_value_day'], $cp->vars['field_default_value_month'], $cp->vars['field_default_value_year']);
-							}
-						}
-						else if ($field_type == FIELD_BOOL && $key == 'l_lang_options' && phpbb_request::is_set('l_lang_options'))
-						{
-							$_new_key_ary[$key] = utf8_normalize_nfc(request_var($key, array(array('')), true));
-						}
-						else
-						{
-							if (!phpbb_request::is_set($key))
-							{
-								$var = false;
-							}
-							else if ($key == 'field_ident' && isset($cp->vars[$key]))
-							{
-								$_new_key_ary[$key]= $cp->vars[$key];
-							}
-							else
-							{
-								$_new_key_ary[$key] = utf8_normalize_nfc(request_var($key, array(''), true));
-								if (!sizeof($_new_key_ary[$key]))
-								{
-									$_new_key_ary[$key] = utf8_normalize_nfc(request_var($key, '', true));
-								}
-							}
-						}
-					}
-
-					$s_hidden_fields .= build_hidden_fields($_new_key_ary);
-				}
-
-				if (!sizeof($error))
-				{
-					if ($step == 3 && (sizeof($this->lang_defs['iso']) == 1 || $save))
-					{
-						$this->save_profile_field($cp, $field_type, $action);
-					}
-					else if ($action == 'edit' && $save)
-					{
-						$this->save_profile_field($cp, $field_type, $action);
-					}
-				}
-
-				phpbb::$template->assign_vars(array(
-					'S_EDIT'			=> true,
-					'S_EDIT_MODE'		=> ($action == 'edit') ? true : false,
-					'ERROR_MSG'			=> (sizeof($error)) ? implode('<br />', $error) : '',
-
-					'L_TITLE'			=> phpbb::$user->lang['STEP_' . $step . '_TITLE_' . strtoupper($action)],
-					'L_EXPLAIN'			=> phpbb::$user->lang['STEP_' . $step . '_EXPLAIN_' . strtoupper($action)],
-
-					'U_ACTION'			=> $this->u_action . "&amp;action=$action&amp;step=$step",
-					'U_BACK'			=> $this->u_action,
-				));
-
-				// Now go through the steps
-				switch ($step)
-				{
-					// Create basic options - only small differences between field types
-					case 1:
-
-						// Build common create options
-						phpbb::$template->assign_vars(array(
-							'S_STEP_ONE'		=> true,
-							'S_FIELD_REQUIRED'	=> ($cp->vars['field_required']) ? true : false,
-							'S_SHOW_ON_REG'		=> ($cp->vars['field_show_on_reg']) ? true : false,
-							'S_FIELD_HIDE'		=> ($cp->vars['field_hide']) ? true : false,
-							'S_FIELD_NO_VIEW'	=> ($cp->vars['field_no_view']) ? true : false,
-
-							'L_LANG_SPECIFIC'	=> sprintf(phpbb::$user->lang['LANG_SPECIFIC_OPTIONS'], phpbb::$config['default_lang']),
-							'FIELD_TYPE'		=> phpbb::$user->lang['FIELD_' . strtoupper(custom_profile::$profile_types[$field_type])],
-							'FIELD_IDENT'		=> $cp->vars['field_ident'],
-							'LANG_NAME'			=> $cp->vars['lang_name'],
-							'LANG_EXPLAIN'		=> $cp->vars['lang_explain'],
-						));
-
-						// String and Text needs to set default values here...
-						if ($field_type == FIELD_STRING || $field_type == FIELD_TEXT)
-						{
-							phpbb::$template->assign_vars(array(
-								'S_TEXT'		=> ($field_type == FIELD_TEXT) ? true : false,
-								'S_STRING'		=> ($field_type == FIELD_STRING) ? true : false,
-
-								'L_DEFAULT_VALUE_EXPLAIN'	=> phpbb::$user->lang[strtoupper(custom_profile::$profile_types[$field_type]) . '_DEFAULT_VALUE_EXPLAIN'],
-								'LANG_DEFAULT_VALUE'		=> $cp->vars['lang_default_value'],
-							));
-						}
-
-						if ($field_type == FIELD_BOOL || $field_type == FIELD_DROPDOWN)
-						{
-							// Initialize these array elements if we are creating a new field
-							if (!sizeof($cp->vars['lang_options']))
-							{
-								if ($field_type == FIELD_BOOL)
-								{
-									// No options have been defined for a boolean field.
-									$cp->vars['lang_options'][0] = '';
-									$cp->vars['lang_options'][1] = '';
-								}
-								else
-								{
-									// No options have been defined for the dropdown menu
-									$cp->vars['lang_options'] = array();
-								}
-							}
-
-							phpbb::$template->assign_vars(array(
-								'S_BOOL'		=> ($field_type == FIELD_BOOL) ? true : false,
-								'S_DROPDOWN'	=> ($field_type == FIELD_DROPDOWN) ? true : false,
-
-								'L_LANG_OPTIONS_EXPLAIN'	=> phpbb::$user->lang[strtoupper(custom_profile::$profile_types[$field_type]) . '_ENTRIES_EXPLAIN'],
-								'LANG_OPTIONS'				=> ($field_type == FIELD_DROPDOWN) ? implode("\n", $cp->vars['lang_options']) : '',
-								'FIRST_LANG_OPTION'			=> ($field_type == FIELD_BOOL) ? $cp->vars['lang_options'][0] : '',
-								'SECOND_LANG_OPTION'		=> ($field_type == FIELD_BOOL) ? $cp->vars['lang_options'][1] : '',
-							));
-						}
-
-					break;
-
-					case 2:
-
-						phpbb::$template->assign_vars(array(
-							'S_STEP_TWO'		=> true,
-							'L_NEXT_STEP'			=> (sizeof($this->lang_defs['iso']) == 1) ? phpbb::$user->lang['SAVE'] : phpbb::$user->lang['PROFILE_LANG_OPTIONS'],
-						));
-
-						// Build options based on profile type
-						$function = 'get_' . custom_profile::$profile_types[$field_type] . '_options';
-						$options = $cp->$function();
-
-						foreach ($options as $num => $option_ary)
-						{
-							phpbb::$template->assign_block_vars('option', $option_ary);
-						}
-
-					break;
-
-					// Define remaining language variables
-					case 3:
-
-						phpbb::$template->assign_var('S_STEP_THREE', true);
-						$options = $this->build_language_options($cp, $field_type, $action);
-
-						foreach ($options as $lang_id => $lang_ary)
-						{
-							phpbb::$template->assign_block_vars('options', array(
-								'LANGUAGE'		=> sprintf(phpbb::$user->lang[(($lang_id == $this->edit_lang_id) ? 'DEFAULT_' : '') . 'ISO_LANGUAGE'], $lang_ary['lang_iso']),
-							));
-
-							foreach ($lang_ary['fields'] as $field_ident => $field_ary)
-							{
-								phpbb::$template->assign_block_vars('options.field', array(
-									'L_TITLE'		=> $field_ary['TITLE'],
-									'L_EXPLAIN'		=> (isset($field_ary['EXPLAIN'])) ? $field_ary['EXPLAIN'] : '',
-									'FIELD'			=> $field_ary['FIELD'],
-								));
-							}
-						}
-
-					break;
-				}
-
-				phpbb::$template->assign_vars(array(
-					'S_HIDDEN_FIELDS'	=> $s_hidden_fields,
-				));
-
-				return;
-
-			break;
-		}
-
-		$sql = 'SELECT *
-			FROM ' . PROFILE_FIELDS_TABLE . '
-			ORDER BY field_order';
-		$result = phpbb::$db->sql_query($sql);
-
-		$s_one_need_edit = false;
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$active_lang = (!$row['field_active']) ? 'ACTIVATE' : 'DEACTIVATE';
-			$active_value = (!$row['field_active']) ? 'activate' : 'deactivate';
-			$id = $row['field_id'];
-
-			$s_need_edit = (sizeof($this->lang_defs['diff'][$row['field_id']])) ? true : false;
-
-			if ($s_need_edit)
-			{
-				$s_one_need_edit = true;
-			}
-
-			phpbb::$template->assign_block_vars('fields', array(
-				'FIELD_IDENT'		=> $row['field_ident'],
-				'FIELD_TYPE'		=> phpbb::$user->lang['FIELD_' . strtoupper(custom_profile::$profile_types[$row['field_type']])],
-
-				'L_ACTIVATE_DEACTIVATE'		=> phpbb::$user->lang[$active_lang],
-				'U_ACTIVATE_DEACTIVATE'		=> $this->u_action . "&amp;action=$active_value&amp;field_id=$id",
-				'U_EDIT'					=> $this->u_action . "&amp;action=edit&amp;field_id=$id",
-				'U_TRANSLATE'				=> $this->u_action . "&amp;action=edit&amp;field_id=$id&amp;step=3",
-				'U_DELETE'					=> $this->u_action . "&amp;action=delete&amp;field_id=$id",
-				'U_MOVE_UP'					=> $this->u_action . "&amp;action=move_up&amp;order={$row['field_order']}",
-				'U_MOVE_DOWN'				=> $this->u_action . "&amp;action=move_down&amp;order={$row['field_order']}",
-
-				'S_NEED_EDIT'				=> $s_need_edit,
-			));
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// At least one option field needs editing?
-		if ($s_one_need_edit)
-		{
-			phpbb::$template->assign_var('S_NEED_EDIT', true);
-		}
-
-		$s_select_type = '';
-		foreach (custom_profile::$profile_types as $key => $value)
-		{
-			$s_select_type .= '<option value="' . $key . '">' . phpbb::$user->lang['FIELD_' . strtoupper($value)] . '</option>';
-		}
-
-		phpbb::$template->assign_vars(array(
-			'U_ACTION'			=> $this->u_action,
-			'S_TYPE_OPTIONS'	=> $s_select_type,
-		));
-	}
-
-	/**
-	* Build all Language specific options
-	*/
-	function build_language_options(&$cp, $field_type, $action = 'create')
-	{
-		$default_lang_id = (!empty($this->edit_lang_id)) ? $this->edit_lang_id : $this->lang_defs['iso'][phpbb::$config['default_lang']];
-
-		$sql = 'SELECT lang_id, lang_iso
-			FROM ' . LANG_TABLE . '
-			WHERE lang_id <> ' . (int) $default_lang_id . '
-			ORDER BY lang_english_name';
-		$result = phpbb::$db->sql_query($sql);
-
-		$languages = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$languages[$row['lang_id']] = $row['lang_iso'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$options = array();
-		$options['lang_name'] = 'string';
-		if ($cp->vars['lang_explain'])
-		{
-			$options['lang_explain'] = 'text';
-		}
-
-		switch ($field_type)
-		{
-			case FIELD_BOOL:
-				$options['lang_options'] = 'two_options';
-			break;
-
-			case FIELD_DROPDOWN:
-				$options['lang_options'] = 'optionfield';
-			break;
-
-			case FIELD_TEXT:
-			case FIELD_STRING:
-				if ($cp->vars['lang_default_value'])
-				{
-					$options['lang_default_value'] = ($field_type == FIELD_STRING) ? 'string' : 'text';
-				}
-			break;
-		}
-
-		$lang_options = array();
-
-		foreach ($options as $field => $field_type)
-		{
-			$lang_options[1]['lang_iso'] = $this->lang_defs['id'][$default_lang_id];
-			$lang_options[1]['fields'][$field] = array(
-				'TITLE'		=> phpbb::$user->lang['CP_' . strtoupper($field)],
-				'FIELD'		=> '<dd>' . ((is_array($cp->vars[$field])) ? implode('<br />', $cp->vars[$field]) : bbcode_nl2br($cp->vars[$field])) . '</dd>'
-			);
-
-			if (isset(phpbb::$user->lang['CP_' . strtoupper($field) . '_EXPLAIN']))
-			{
-				$lang_options[1]['fields'][$field]['EXPLAIN'] = phpbb::$user->lang['CP_' . strtoupper($field) . '_EXPLAIN'];
-			}
-		}
-
-		foreach ($languages as $lang_id => $lang_iso)
-		{
-			$lang_options[$lang_id]['lang_iso'] = $lang_iso;
-			foreach ($options as $field => $field_type)
-			{
-				$value = ($action == 'create') ? utf8_normalize_nfc(request_var('l_' . $field, array(0 => ''), true)) : $cp->vars['l_' . $field];
-				if ($field == 'lang_options')
-				{
-					$var = (!isset($cp->vars['l_lang_options'][$lang_id]) || !is_array($cp->vars['l_lang_options'][$lang_id])) ? $cp->vars['lang_options'] : $cp->vars['l_lang_options'][$lang_id];
-
-					switch ($field_type)
-					{
-						case 'two_options':
-
-							$lang_options[$lang_id]['fields'][$field] = array(
-								'TITLE'		=> phpbb::$user->lang['CP_' . strtoupper($field)],
-								'FIELD'		=> '
-											<dd><input class="medium" name="l_' . $field . '[' . $lang_id . '][]" value="' . ((isset($value[$lang_id][0])) ? $value[$lang_id][0] : $var[0]) . '" /> ' . phpbb::$user->lang['FIRST_OPTION'] . '</dd>
-											<dd><input class="medium" name="l_' . $field . '[' . $lang_id . '][]" value="' . ((isset($value[$lang_id][1])) ? $value[$lang_id][1] : $var[1]) . '" /> ' . phpbb::$user->lang['SECOND_OPTION'] . '</dd>'
-							);
-						break;
-
-						case 'optionfield':
-							$value = ((isset($value[$lang_id])) ? ((is_array($value[$lang_id])) ?  implode("\n", $value[$lang_id]) : $value[$lang_id]) : implode("\n", $var));
-							$lang_options[$lang_id]['fields'][$field] = array(
-								'TITLE'		=> phpbb::$user->lang['CP_' . strtoupper($field)],
-								'FIELD'		=> '<dd><textarea name="l_' . $field . '[' . $lang_id . ']" rows="7" cols="80">' . $value . '</textarea></dd>'
-							);
-						break;
-					}
-
-					if (isset(phpbb::$user->lang['CP_' . strtoupper($field) . '_EXPLAIN']))
-					{
-						$lang_options[$lang_id]['fields'][$field]['EXPLAIN'] = phpbb::$user->lang['CP_' . strtoupper($field) . '_EXPLAIN'];
-					}
-				}
-				else
-				{
-					$var = ($action == 'create' || !is_array($cp->vars[$field])) ? $cp->vars[$field] : $cp->vars[$field][$lang_id];
-
-					$lang_options[$lang_id]['fields'][$field] = array(
-						'TITLE'		=> phpbb::$user->lang['CP_' . strtoupper($field)],
-						'FIELD'		=> ($field_type == 'string') ? '<dd><input class="medium" type="text" name="l_' . $field . '[' . $lang_id . ']" value="' . ((isset($value[$lang_id])) ? $value[$lang_id] : $var) . '" /></dd>' : '<dd><textarea name="l_' . $field . '[' . $lang_id . ']" rows="3" cols="80">' . ((isset($value[$lang_id])) ? $value[$lang_id] : $var) . '</textarea></dd>'
-					);
-
-					if (isset(phpbb::$user->lang['CP_' . strtoupper($field) . '_EXPLAIN']))
-					{
-						$lang_options[$lang_id]['fields'][$field]['EXPLAIN'] = phpbb::$user->lang['CP_' . strtoupper($field) . '_EXPLAIN'];
-					}
-				}
-			}
-		}
-
-		return $lang_options;
-	}
-
-	/**
-	* Save Profile Field
-	*/
-	function save_profile_field(&$cp, $field_type, $action = 'create')
-	{
-		$field_id = request_var('field_id', 0);
-
-		// Collect all information, if something is going wrong, abort the operation
-		$profile_sql = $profile_lang = $empty_lang = $profile_lang_fields = array();
-
-		$default_lang_id = (!empty($this->edit_lang_id)) ? $this->edit_lang_id : $this->lang_defs['iso'][phpbb::$config['default_lang']];
-
-		if ($action == 'create')
-		{
-			$sql = 'SELECT MAX(field_order) as max_field_order
-				FROM ' . PROFILE_FIELDS_TABLE;
-			$result = phpbb::$db->sql_query($sql);
-			$new_field_order = (int) phpbb::$db->sql_fetchfield('max_field_order');
-			phpbb::$db->sql_freeresult($result);
-
-			$field_ident = $cp->vars['field_ident'];
-		}
-
-		// Save the field
-		$profile_fields = array(
-			'field_length'			=> $cp->vars['field_length'],
-			'field_minlen'			=> $cp->vars['field_minlen'],
-			'field_maxlen'			=> $cp->vars['field_maxlen'],
-			'field_novalue'			=> $cp->vars['field_novalue'],
-			'field_default_value'	=> $cp->vars['field_default_value'],
-			'field_validation'		=> $cp->vars['field_validation'],
-			'field_required'		=> $cp->vars['field_required'],
-			'field_show_on_reg'		=> $cp->vars['field_show_on_reg'],
-			'field_hide'			=> $cp->vars['field_hide'],
-			'field_no_view'			=> $cp->vars['field_no_view']
-		);
-
-		if ($action == 'create')
-		{
-			$profile_fields += array(
-				'field_type'		=> $field_type,
-				'field_ident'		=> $field_ident,
-				'field_name'		=> $field_ident,
-				'field_order'		=> $new_field_order + 1,
-				'field_active'		=> 1
-			);
-
-			$sql = 'INSERT INTO ' . PROFILE_FIELDS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $profile_fields);
-			phpbb::$db->sql_query($sql);
-
-			$field_id = phpbb::$db->sql_nextid();
-		}
-		else
-		{
-			$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . '
-				SET ' . phpbb::$db->sql_build_array('UPDATE', $profile_fields) . "
-				WHERE field_id = $field_id";
-			phpbb::$db->sql_query($sql);
-		}
-
-		if ($action == 'create')
-		{
-			$field_ident = 'pf_' . $field_ident;
-			$profile_sql[] = $this->add_field_ident($field_ident, $field_type);
-		}
-
-		$sql_ary = array(
-			'lang_name'				=> $cp->vars['lang_name'],
-			'lang_explain'			=> $cp->vars['lang_explain'],
-			'lang_default_value'	=> $cp->vars['lang_default_value']
-		);
-
-		if ($action == 'create')
-		{
-			$sql_ary['field_id'] = $field_id;
-			$sql_ary['lang_id'] = $default_lang_id;
-
-			$profile_sql[] = 'INSERT INTO ' . PROFILE_LANG_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary);
-		}
-		else
-		{
-			$this->update_insert(PROFILE_LANG_TABLE, $sql_ary, array('field_id' => $field_id, 'lang_id' => $default_lang_id));
-		}
-
-		if (is_array($cp->vars['l_lang_name']) && sizeof($cp->vars['l_lang_name']))
-		{
-			foreach ($cp->vars['l_lang_name'] as $lang_id => $data)
-			{
-				if (($cp->vars['lang_name'] != '' && $cp->vars['l_lang_name'][$lang_id] == '')
-					|| ($cp->vars['lang_explain'] != '' && $cp->vars['l_lang_explain'][$lang_id] == '')
-					|| ($cp->vars['lang_default_value'] != '' && $cp->vars['l_lang_default_value'][$lang_id] == ''))
-				{
-					$empty_lang[$lang_id] = true;
-					break;
-				}
-
-				if (!isset($empty_lang[$lang_id]))
-				{
-					$profile_lang[] = array(
-						'field_id'		=> $field_id,
-						'lang_id'		=> $lang_id,
-						'lang_name'		=> $cp->vars['l_lang_name'][$lang_id],
-						'lang_explain'	=> (isset($cp->vars['l_lang_explain'][$lang_id])) ? $cp->vars['l_lang_explain'][$lang_id] : '',
-						'lang_default_value'	=> (isset($cp->vars['l_lang_default_value'][$lang_id])) ? $cp->vars['l_lang_default_value'][$lang_id] : ''
-					);
-				}
-			}
-
-			foreach ($empty_lang as $lang_id => $NULL)
-			{
-				$sql = 'DELETE FROM ' . PROFILE_LANG_TABLE . "
-					WHERE field_id = $field_id
-					AND lang_id = " . (int) $lang_id;
-				phpbb::$db->sql_query($sql);
-			}
-		}
-
-		// These are always arrays because the key is the language id...
-		$cp->vars['l_lang_name']			= utf8_normalize_nfc(request_var('l_lang_name', array(0 => ''), true));
-		$cp->vars['l_lang_explain']			= utf8_normalize_nfc(request_var('l_lang_explain', array(0 => ''), true));
-		$cp->vars['l_lang_default_value']	= utf8_normalize_nfc(request_var('l_lang_default_value', array(0 => ''), true));
-
-		if ($field_type != FIELD_BOOL)
-		{
-			$cp->vars['l_lang_options']			= utf8_normalize_nfc(request_var('l_lang_options', array(0 => ''), true));
-		}
-		else
-		{
-			/**
-			* @todo check if this line is correct...
-			$cp->vars['l_lang_default_value']	= request_var('l_lang_default_value', array(0 => array('')), true);
-			*/
-			$cp->vars['l_lang_options']	= utf8_normalize_nfc(request_var('l_lang_options', array(0 => array('')), true));
-		}
-
-		if ($cp->vars['lang_options'])
-		{
-			if (!is_array($cp->vars['lang_options']))
-			{
-				$cp->vars['lang_options'] = explode("\n", $cp->vars['lang_options']);
-			}
-
-			if ($action != 'create')
-			{
-				$sql = 'DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . "
-					WHERE field_id = $field_id
-						AND lang_id = " . (int) $default_lang_id;
-				phpbb::$db->sql_query($sql);
-			}
-
-			foreach ($cp->vars['lang_options'] as $option_id => $value)
-			{
-				$sql_ary = array(
-					'field_type'	=> (int) $field_type,
-					'lang_value'	=> $value
-				);
-
-				if ($action == 'create')
-				{
-					$sql_ary['field_id'] = $field_id;
-					$sql_ary['lang_id'] = $default_lang_id;
-					$sql_ary['option_id'] = (int) $option_id;
-
-					$profile_sql[] = 'INSERT INTO ' . PROFILE_FIELDS_LANG_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary);
-				}
-				else
-				{
-					$this->update_insert(PROFILE_FIELDS_LANG_TABLE, $sql_ary, array(
-						'field_id'	=> $field_id,
-						'lang_id'	=> (int) $default_lang_id,
-						'option_id'	=> (int) $option_id)
-					);
-				}
-			}
-		}
-
-		if (is_array($cp->vars['l_lang_options']) && sizeof($cp->vars['l_lang_options']))
-		{
-			$empty_lang = array();
-
-			foreach ($cp->vars['l_lang_options'] as $lang_id => $lang_ary)
-			{
-				if (!is_array($lang_ary))
-				{
-					$lang_ary = explode("\n", $lang_ary);
-				}
-
-				if (sizeof($lang_ary) != sizeof($cp->vars['lang_options']))
-				{
-					$empty_lang[$lang_id] = true;
-				}
-
-				if (!isset($empty_lang[$lang_id]))
-				{
-					if ($action != 'create')
-					{
-						$sql = 'DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . "
-							WHERE field_id = $field_id
-							AND lang_id = " . (int) $lang_id;
-						phpbb::$db->sql_query($sql);
-					}
-
-					foreach ($lang_ary as $option_id => $value)
-					{
-						$profile_lang_fields[] = array(
-							'field_id'		=> (int) $field_id,
-							'lang_id'		=> (int) $lang_id,
-							'option_id'		=> (int) $option_id,
-							'field_type'	=> (int) $field_type,
-							'lang_value'	=> $value
-						);
-					}
-				}
-			}
-
-			foreach ($empty_lang as $lang_id => $NULL)
-			{
-				$sql = 'DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . "
-					WHERE field_id = $field_id
-					AND lang_id = " . (int) $lang_id;
-				phpbb::$db->sql_query($sql);
-			}
-		}
-
-		foreach ($profile_lang as $sql)
-		{
-			if ($action == 'create')
-			{
-				$profile_sql[] = 'INSERT INTO ' . PROFILE_LANG_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql);
-			}
-			else
-			{
-				$lang_id = $sql['lang_id'];
-				unset($sql['lang_id'], $sql['field_id']);
-
-				$this->update_insert(PROFILE_LANG_TABLE, $sql, array('lang_id' => (int) $lang_id, 'field_id' => $field_id));
-			}
-		}
-
-		if (sizeof($profile_lang_fields))
-		{
-			foreach ($profile_lang_fields as $sql)
-			{
-				if ($action == 'create')
-				{
-					$profile_sql[] = 'INSERT INTO ' . PROFILE_FIELDS_LANG_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql);
-				}
-				else
-				{
-					$lang_id = $sql['lang_id'];
-					$option_id = $sql['option_id'];
-					unset($sql['lang_id'], $sql['field_id'], $sql['option_id']);
-
-					$this->update_insert(PROFILE_FIELDS_LANG_TABLE, $sql, array(
-						'lang_id'	=> $lang_id,
-						'field_id'	=> $field_id,
-						'option_id'	=> $option_id)
-					);
-				}
-			}
-		}
-
-
-		phpbb::$db->sql_transaction('begin');
-
-		if ($action == 'create')
-		{
-			foreach ($profile_sql as $sql)
-			{
-				phpbb::$db->sql_query($sql);
-			}
-		}
-
-		phpbb::$db->sql_transaction('commit');
-
-		if ($action == 'edit')
-		{
-			add_log('admin', 'LOG_PROFILE_FIELD_EDIT', $cp->vars['field_ident'] . ':' . $cp->vars['lang_name']);
-			trigger_error(phpbb::$user->lang['CHANGED_PROFILE_FIELD'] . adm_back_link($this->u_action));
-		}
-		else
-		{
-			add_log('admin', 'LOG_PROFILE_FIELD_CREATE', substr($field_ident, 3) . ':' . $cp->vars['lang_name']);
-			trigger_error(phpbb::$user->lang['ADDED_PROFILE_FIELD'] . adm_back_link($this->u_action));
-		}
-	}
-
-	/**
-	* Update, then insert if not successfull
-	*/
-	function update_insert($table, $sql_ary, $where_fields)
-	{
-		$where_sql = array();
-		$check_key = '';
-
-		foreach ($where_fields as $key => $value)
-		{
-			$check_key = (!$check_key) ? $key : $check_key;
-			$where_sql[] = $key . ' = ' . ((is_string($value)) ? "'" . phpbb::$db->sql_escape($value) . "'" : (int) $value);
-		}
-
-		if (!sizeof($where_sql))
-		{
-			return;
-		}
-
-		$sql = "SELECT $check_key
-			FROM $table
-			WHERE " . implode(' AND ', $where_sql);
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$row)
-		{
-			$sql_ary = array_merge($where_fields, $sql_ary);
-
-			if (sizeof($sql_ary))
-			{
-				phpbb::$db->sql_query("INSERT INTO $table " . phpbb::$db->sql_build_array('INSERT', $sql_ary));
-			}
-		}
-		else
-		{
-			if (sizeof($sql_ary))
-			{
-				$sql = "UPDATE $table SET " . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-					WHERE ' . implode(' AND ', $where_sql);
-				phpbb::$db->sql_query($sql);
-			}
-		}
-	}
-
-	/**
-	* Return sql statement for adding a new field ident (profile field) to the profile fields data table
-	*/
-	function add_field_ident($field_ident, $field_type)
-	{
-		switch (phpbb::$db->dbms_type)
-		{
-			case 'mysql':
-
-				// We are defining the biggest common value, because of the possibility to edit the min/max values of each field.
-				$sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD `$field_ident` ";
-
-				switch ($field_type)
-				{
-					case FIELD_STRING:
-						$sql .= ' VARCHAR(255) ';
-					break;
-
-					case FIELD_DATE:
-						$sql .= 'VARCHAR(10) ';
-					break;
-
-					case FIELD_TEXT:
-						$sql .= "TEXT";
-		//						ADD {$field_ident}_bbcode_uid VARCHAR(5) NOT NULL,
-		//						ADD {$field_ident}_bbcode_bitfield INT(11) UNSIGNED";
-					break;
-
-					case FIELD_BOOL:
-						$sql .= 'TINYINT(2) ';
-					break;
-
-					case FIELD_DROPDOWN:
-						$sql .= 'MEDIUMINT(8) ';
-					break;
-
-					case FIELD_INT:
-						$sql .= 'BIGINT(20) ';
-					break;
-				}
-
-			break;
-
-			case 'sqlite':
-
-				switch ($field_type)
-				{
-					case FIELD_STRING:
-						$type = ' VARCHAR(255) ';
-					break;
-
-					case FIELD_DATE:
-						$type = 'VARCHAR(10) ';
-					break;
-
-					case FIELD_TEXT:
-						$type = "TEXT(65535)";
-		//						ADD {$field_ident}_bbcode_uid VARCHAR(5) NOT NULL,
-		//						ADD {$field_ident}_bbcode_bitfield INT(11) UNSIGNED";
-					break;
-
-					case FIELD_BOOL:
-						$type = 'TINYINT(2) ';
-					break;
-
-					case FIELD_DROPDOWN:
-						$type = 'MEDIUMINT(8) ';
-					break;
-
-					case FIELD_INT:
-						$type = 'BIGINT(20) ';
-					break;
-				}
-
-				// We are defining the biggest common value, because of the possibility to edit the min/max values of each field.
-				if (version_compare(sqlite_libversion(), '3.0') == -1)
-				{
-					$sql = "SELECT sql
-						FROM sqlite_master
-						WHERE type = 'table'
-							AND name = '" . PROFILE_FIELDS_DATA_TABLE . "'
-						ORDER BY type DESC, name;";
-					$result = phpbb::$db->sql_query($sql);
-					$row = phpbb::$db->sql_fetchrow($result);
-					phpbb::$db->sql_freeresult($result);
-
-					// Create a temp table and populate it, destroy the existing one
-					phpbb::$db->sql_query(preg_replace('#CREATE\s+TABLE\s+"?' . PROFILE_FIELDS_DATA_TABLE . '"?#i', 'CREATE TEMPORARY TABLE ' . PROFILE_FIELDS_DATA_TABLE . '_temp', $row['sql']));
-					phpbb::$db->sql_query('INSERT INTO ' . PROFILE_FIELDS_DATA_TABLE . '_temp SELECT * FROM ' . PROFILE_FIELDS_DATA_TABLE);
-					phpbb::$db->sql_query('DROP TABLE ' . PROFILE_FIELDS_DATA_TABLE);
-
-					preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-					$new_table_cols = trim($matches[1]);
-					$old_table_cols = explode(',', $new_table_cols);
-					$column_list = array();
-
-					foreach ($old_table_cols as $declaration)
-					{
-						$entities = preg_split('#\s+#', trim($declaration));
-						if ($entities[0] == 'PRIMARY')
-						{
-							continue;
-						}
-						$column_list[] = $entities[0];
-					}
-
-					$columns = implode(',', $column_list);
-
-					$new_table_cols = $field_ident . ' ' . $type . ',' . $new_table_cols;
-
-					// create a new table and fill it up. destroy the temp one
-					phpbb::$db->sql_query('CREATE TABLE ' . PROFILE_FIELDS_DATA_TABLE . ' (' . $new_table_cols . ');');
-					phpbb::$db->sql_query('INSERT INTO ' . PROFILE_FIELDS_DATA_TABLE . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . PROFILE_FIELDS_DATA_TABLE . '_temp;');
-					phpbb::$db->sql_query('DROP TABLE ' . PROFILE_FIELDS_DATA_TABLE . '_temp');
-				}
-				else
-				{
-					$sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD $field_ident [$type]";
-				}
-
-			break;
-
-			case 'mssql':
-
-				// We are defining the biggest common value, because of the possibility to edit the min/max values of each field.
-				$sql = 'ALTER TABLE [' . PROFILE_FIELDS_DATA_TABLE . "] ADD [$field_ident] ";
-
-				switch ($field_type)
-				{
-					case FIELD_STRING:
-						$sql .= ' [VARCHAR] (255) ';
-					break;
-
-					case FIELD_DATE:
-						$sql .= '[VARCHAR] (10) ';
-					break;
-
-					case FIELD_TEXT:
-						$sql .= "[TEXT]";
-		//						ADD {$field_ident}_bbcode_uid [VARCHAR] (5) NOT NULL,
-		//						ADD {$field_ident}_bbcode_bitfield [INT] UNSIGNED";
-					break;
-
-					case FIELD_BOOL:
-					case FIELD_DROPDOWN:
-						$sql .= '[INT] ';
-					break;
-
-					case FIELD_INT:
-						$sql .= '[FLOAT] ';
-					break;
-				}
-
-			break;
-
-			case 'postgres':
-
-				// We are defining the biggest common value, because of the possibility to edit the min/max values of each field.
-				$sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD COLUMN \"$field_ident\" ";
-
-				switch ($field_type)
-				{
-					case FIELD_STRING:
-						$sql .= ' VARCHAR(255) ';
-					break;
-
-					case FIELD_DATE:
-						$sql .= 'VARCHAR(10) ';
-					break;
-
-					case FIELD_TEXT:
-						$sql .= "TEXT";
-		//						ADD {$field_ident}_bbcode_uid VARCHAR(5) NOT NULL,
-		//						ADD {$field_ident}_bbcode_bitfield INT4 UNSIGNED";
-					break;
-
-					case FIELD_BOOL:
-						$sql .= 'INT2 ';
-					break;
-
-					case FIELD_DROPDOWN:
-						$sql .= 'INT4 ';
-					break;
-
-					case FIELD_INT:
-						$sql .= 'INT8 ';
-					break;
-				}
-
-			break;
-
-			case 'firebird':
-
-				// We are defining the biggest common value, because of the possibility to edit the min/max values of each field.
-				$sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD \"$field_ident\" ";
-
-				switch ($field_type)
-				{
-					case FIELD_STRING:
-						$sql .= ' VARCHAR(255) ';
-					break;
-
-					case FIELD_DATE:
-						$sql .= 'VARCHAR(10) ';
-					break;
-
-					case FIELD_TEXT:
-						$sql .= "BLOB SUB_TYPE TEXT";
-		//						ADD {$field_ident}_bbcode_uid VARCHAR(5) NOT NULL,
-		//						ADD {$field_ident}_bbcode_bitfield INTEGER UNSIGNED";
-					break;
-
-					case FIELD_BOOL:
-					case FIELD_DROPDOWN:
-						$sql .= 'INTEGER ';
-					break;
-
-					case FIELD_INT:
-						$sql .= 'DOUBLE PRECISION ';
-					break;
-				}
-
-			break;
-
-			case 'oracle':
-
-				// We are defining the biggest common value, because of the possibility to edit the min/max values of each field.
-				$sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD $field_ident ";
-
-				switch ($field_type)
-				{
-					case FIELD_STRING:
-						$sql .= ' VARCHAR2(255) ';
-					break;
-
-					case FIELD_DATE:
-						$sql .= 'VARCHAR2(10) ';
-					break;
-
-					case FIELD_TEXT:
-						$sql .= "CLOB";
-		//						ADD {$field_ident}_bbcode_uid VARCHAR2(5) NOT NULL,
-		//						ADD {$field_ident}_bbcode_bitfield NUMBER(11) UNSIGNED";
-					break;
-
-					case FIELD_BOOL:
-						$sql .= 'NUMBER(2) ';
-					break;
-
-					case FIELD_DROPDOWN:
-						$sql .= 'NUMBER(8) ';
-					break;
-
-					case FIELD_INT:
-						$sql .= 'NUMBER(20) ';
-					break;
-				}
-
-			break;
-
-			case 'db2':
-
-				// We are defining the biggest common value, because of the possibility to edit the min/max values of each field.
-				$sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD \"$field_ident\" ";
-
-				switch ($field_type)
-				{
-					case FIELD_STRING:
-						$sql .= ' VARCHAR(255) ';
-					break;
-
-					case FIELD_DATE:
-						$sql .= 'VARCHAR(10) ';
-					break;
-
-					case FIELD_TEXT:
-						$sql .= "varchar(32672)";
-		//						ADD {$field_ident}_bbcode_uid VARCHAR2(5) NOT NULL,
-		//						ADD {$field_ident}_bbcode_bitfield NUMBER(11) UNSIGNED";
-					break;
-
-					case FIELD_BOOL:
-						$sql .= 'smallint ';
-					break;
-
-					case FIELD_DROPDOWN:
-						$sql .= 'integer ';
-					break;
-
-					case FIELD_INT:
-						$sql .= 'float ';
-					break;
-				}
-
-			break;
-		}
-
-		return $sql;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_prune.php b/phpBB/modules/acp/acp_prune.php
deleted file mode 100644
index e50f51dccd..0000000000
--- a/phpBB/modules/acp/acp_prune.php
+++ /dev/null
@@ -1,451 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_prune
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		phpbb::$user->add_lang('acp/prune');
-		include_once(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-
-		switch ($mode)
-		{
-			case 'forums':
-				$this->tpl_name = 'acp_prune_forums';
-				$this->page_title = 'ACP_PRUNE_FORUMS';
-				$this->prune_forums($id, $mode);
-			break;
-
-			case 'users':
-				$this->tpl_name = 'acp_prune_users';
-				$this->page_title = 'ACP_PRUNE_USERS';
-				$this->prune_users($id, $mode);
-			break;
-		}
-	}
-
-	/**
-	* Prune forums
-	*/
-	function prune_forums($id, $mode)
-	{
-		$all_forums = request_var('all_forums', 0);
-		$forum_id = request_var('f', array(0));
-		$submit = phpbb_request::is_set_post('submit');
-
-		if ($all_forums)
-		{
-			$sql = 'SELECT forum_id
-				FROM ' . FORUMS_TABLE . '
-				ORDER BY left_id';
-			$result = phpbb::$db->sql_query($sql);
-
-			$forum_id = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$forum_id[] = $row['forum_id'];
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		if ($submit)
-		{
-			if (confirm_box(true))
-			{
-				$prune_posted = request_var('prune_days', 0);
-				$prune_viewed = request_var('prune_vieweddays', 0);
-				$prune_all = (!$prune_posted && !$prune_viewed) ? true : false;
-
-				$prune_flags = 0;
-				$prune_flags += (request_var('prune_old_polls', 0)) ? 2 : 0;
-				$prune_flags += (request_var('prune_announce', 0)) ? 4 : 0;
-				$prune_flags += (request_var('prune_sticky', 0)) ? 8 : 0;
-
-				// Convert days to seconds for timestamp functions...
-				$prunedate_posted = time() - ($prune_posted * 86400);
-				$prunedate_viewed = time() - ($prune_viewed * 86400);
-
-				phpbb::$template->assign_vars(array(
-					'S_PRUNED'		=> true,
-				));
-
-				$sql_forum = (sizeof($forum_id)) ? ' AND ' . phpbb::$db->sql_in_set('forum_id', $forum_id) : '';
-
-				// Get a list of forum's or the data for the forum that we are pruning.
-				$sql = 'SELECT forum_id, forum_name
-					FROM ' . FORUMS_TABLE . '
-					WHERE forum_type = ' . FORUM_POST . "
-						$sql_forum
-					ORDER BY left_id ASC";
-				$result = phpbb::$db->sql_query($sql);
-
-				if ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$prune_ids = array();
-					$p_result['topics'] = 0;
-					$p_result['posts'] = 0;
-					$log_data = '';
-
-					do
-					{
-						if (!phpbb::$acl->acl_get('f_list', $row['forum_id']))
-						{
-							continue;
-						}
-
-						if ($prune_all)
-						{
-							$p_result = prune($row['forum_id'], 'posted', time(), $prune_flags, false);
-						}
-						else
-						{
-							if ($prune_posted)
-							{
-								$return = prune($row['forum_id'], 'posted', $prunedate_posted, $prune_flags, false);
-								$p_result['topics'] += $return['topics'];
-								$p_result['posts'] += $return['posts'];
-							}
-
-							if ($prune_viewed)
-							{
-								$return = prune($row['forum_id'], 'viewed', $prunedate_viewed, $prune_flags, false);
-								$p_result['topics'] += $return['topics'];
-								$p_result['posts'] += $return['posts'];
-							}
-						}
-
-						$prune_ids[] = $row['forum_id'];
-
-						phpbb::$template->assign_block_vars('pruned', array(
-							'FORUM_NAME'	=> $row['forum_name'],
-							'NUM_TOPICS'	=> $p_result['topics'],
-							'NUM_POSTS'		=> $p_result['posts'],
-						));
-
-						$log_data .= (($log_data != '') ? ', ' : '') . $row['forum_name'];
-					}
-					while ($row = phpbb::$db->sql_fetchrow($result));
-
-					// Sync all pruned forums at once
-					sync('forum', 'forum_id', $prune_ids, true, true);
-					add_log('admin', 'LOG_PRUNE', $log_data);
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				return;
-			}
-			else
-			{
-				confirm_box(false, phpbb::$user->lang['PRUNE_FORUM_CONFIRM'], build_hidden_fields(array(
-					'i'				=> $id,
-					'mode'			=> $mode,
-					'submit'		=> 1,
-					'all_forums'	=> $all_forums,
-					'f'				=> $forum_id,
-
-					'prune_days'		=> request_var('prune_days', 0),
-					'prune_vieweddays'	=> request_var('prune_vieweddays', 0),
-					'prune_old_polls'	=> request_var('prune_old_polls', 0),
-					'prune_announce'	=> request_var('prune_announce', 0),
-					'prune_sticky'		=> request_var('prune_sticky', 0),
-				)));
-			}
-		}
-
-		// If they haven't selected a forum for pruning yet then
-		// display a select box to use for pruning.
-		if (!sizeof($forum_id))
-		{
-			phpbb::$template->assign_vars(array(
-				'U_ACTION'			=> $this->u_action,
-				'S_SELECT_FORUM'	=> true,
-				'S_FORUM_OPTIONS'	=> make_forum_select(false, false, false),
-			));
-		}
-		else
-		{
-			$sql = 'SELECT forum_id, forum_name
-				FROM ' . FORUMS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('forum_id', $forum_id);
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-
-			if (!$row)
-			{
-				phpbb::$db->sql_freeresult($result);
-				trigger_error(phpbb::$user->lang['NO_FORUM'] . adm_back_link($this->u_action), E_USER_WARNING);
-			}
-
-			$forum_list = $s_hidden_fields = '';
-			do
-			{
-				$forum_list .= (($forum_list != '') ? ', ' : '') . '<b>' . $row['forum_name'] . '</b>';
-				$s_hidden_fields .= '<input type="hidden" name="f[]" value="' . $row['forum_id'] . '" />';
-			}
-			while ($row = phpbb::$db->sql_fetchrow($result));
-
-			phpbb::$db->sql_freeresult($result);
-
-			$l_selected_forums = (sizeof($forum_id) == 1) ? 'SELECTED_FORUM' : 'SELECTED_FORUMS';
-
-			phpbb::$template->assign_vars(array(
-				'L_SELECTED_FORUMS'		=> phpbb::$user->lang[$l_selected_forums],
-				'U_ACTION'				=> $this->u_action,
-				'U_BACK'				=> $this->u_action,
-				'FORUM_LIST'			=> $forum_list,
-				'S_HIDDEN_FIELDS'		=> $s_hidden_fields,
-			));
-		}
-	}
-
-	/**
-	* Prune users
-	*/
-	function prune_users($id, $mode)
-	{
-		phpbb::$user->add_lang('memberlist');
-
-		$prune = phpbb_request::is_set_post('prune');
-
-		if ($prune)
-		{
-			$action = request_var('action', 'deactivate');
-			$deleteposts = request_var('deleteposts', 0);
-
-			if (confirm_box(true))
-			{
-				$user_ids = $usernames = array();
-				$this->get_prune_users($user_ids, $usernames);
-
-				if (sizeof($user_ids))
-				{
-					if ($action == 'deactivate')
-					{
-						user_active_flip('deactivate', $user_ids);
-						$l_log = 'LOG_PRUNE_USER_DEAC';
-					}
-					else if ($action == 'delete')
-					{
-						if ($deleteposts)
-						{
-							foreach ($user_ids as $user_id)
-							{
-								user_delete('remove', $user_id);
-							}
-
-							$l_log = 'LOG_PRUNE_USER_DEL_DEL';
-						}
-						else
-						{
-							foreach ($user_ids as $user_id)
-							{
-								user_delete('retain', $user_id, $usernames[$user_id]);
-							}
-
-							$l_log = 'LOG_PRUNE_USER_DEL_ANON';
-						}
-					}
-
-					add_log('admin', $l_log, implode(', ', $usernames));
-					$msg = phpbb::$user->lang['USER_' . strtoupper($action) . '_SUCCESS'];
-				}
-				else
-				{
-					$msg = phpbb::$user->lang['USER_PRUNE_FAILURE'];
-				}
-
-				trigger_error($msg . adm_back_link($this->u_action));
-			}
-			else
-			{
-				// We list the users which will be pruned...
-				$user_ids = $usernames = array();
-				$this->get_prune_users($user_ids, $usernames);
-
-				if (!sizeof($user_ids))
-				{
-					trigger_error(phpbb::$user->lang['USER_PRUNE_FAILURE'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				// Assign to template
-				foreach ($user_ids as $user_id)
-				{
-					phpbb::$template->assign_block_vars('users', array(
-						'USERNAME'			=> $usernames[$user_id],
-						'U_PROFILE'			=> append_sid('memberlist', 'mode=viewprofile&amp;u=' . $user_id),
-						'U_USER_ADMIN'		=> (phpbb::$acl->acl_get('a_user')) ? append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, 'i=users&amp;mode=overview&amp;u=' . $user_id, true, phpbb::$user->session_id) : '',
-					));
-				}
-
-				phpbb::$template->assign_vars(array(
-					'S_DEACTIVATE'		=> ($action == 'deactivate') ? true : false,
-					'S_DELETE'			=> ($action == 'delete') ? true : false,
-				));
-
-				confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-					'i'				=> $id,
-					'mode'			=> $mode,
-					'prune'			=> 1,
-
-					'users'			=> request_var('users', '', true),
-					'username'		=> request_var('username', '', true),
-					'email'			=> request_var('email', ''),
-					'joined_select'	=> request_var('joined_select', ''),
-					'joined'		=> request_var('joined', ''),
-					'active_select'	=> request_var('active_select', ''),
-					'active'		=> request_var('active', ''),
-					'count_select'	=> request_var('count_select', ''),
-					'count'			=> request_var('count', ''),
-					'deleteposts'	=> request_var('deleteposts', 0),
-
-					'action'		=> request_var('action', ''),
-				)), 'confirm_body_prune.html');
-			}
-		}
-
-		$find_count = array('lt' => phpbb::$user->lang['LESS_THAN'], 'eq' => phpbb::$user->lang['EQUAL_TO'], 'gt' => phpbb::$user->lang['MORE_THAN']);
-		$s_find_count = '';
-
-		foreach ($find_count as $key => $value)
-		{
-			$selected = ($key == 'eq') ? ' selected="selected"' : '';
-			$s_find_count .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
-		}
-
-		$find_time = array('lt' => phpbb::$user->lang['BEFORE'], 'gt' => phpbb::$user->lang['AFTER']);
-		$s_find_join_time = '';
-		foreach ($find_time as $key => $value)
-		{
-			$s_find_join_time .= '<option value="' . $key . '">' . $value . '</option>';
-		}
-
-		$s_find_active_time = '';
-		foreach ($find_time as $key => $value)
-		{
-			$s_find_active_time .= '<option value="' . $key . '">' . $value . '</option>';
-		}
-
-		phpbb::$template->assign_vars(array(
-			'U_ACTION'			=> $this->u_action,
-			'S_JOINED_OPTIONS'	=> $s_find_join_time,
-			'S_ACTIVE_OPTIONS'	=> $s_find_active_time,
-			'S_COUNT_OPTIONS'	=> $s_find_count,
-			'U_FIND_USERNAME'	=> append_sid('memberlist', 'mode=searchuser&amp;form=acp_prune&amp;field=users'),
-		));
-	}
-
-	/**
-	* Get user_ids/usernames from those being pruned
-	*/
-	function get_prune_users(&$user_ids, &$usernames)
-	{
-		$users = request_var('users', '', true);
-
-		if ($users)
-		{
-			$users = explode("\n", $users);
-			$where_sql = ' AND ' . phpbb::$db->sql_in_set('username_clean', array_map('utf8_clean_string', $users));
-		}
-		else
-		{
-			$username = request_var('username', '', true);
-			$email = request_var('email', '');
-
-			$joined_select = request_var('joined_select', 'lt');
-			$active_select = request_var('active_select', 'lt');
-			$count_select = request_var('count_select', 'eq');
-			$joined = request_var('joined', '');
-			$active = request_var('active', '');
-
-			$active = ($active) ? explode('-', $active) : array();
-			$joined = ($joined) ? explode('-', $joined) : array();
-
-			if ((sizeof($active) && sizeof($active) != 3) || (sizeof($joined) && sizeof($joined) != 3))
-			{
-				trigger_error(phpbb::$user->lang['WRONG_ACTIVE_JOINED_DATE'] . adm_back_link($this->u_action), E_USER_WARNING);
-			}
-
-			$count = request_var('count', '');
-
-			$key_match = array('lt' => '<', 'gt' => '>', 'eq' => '=');
-			$sort_by_types = array('username', 'user_email', 'user_posts', 'user_regdate', 'user_lastvisit');
-
-			$where_sql = '';
-			$where_sql .= ($username) ? ' AND username_clean ' . phpbb::$db->sql_like_expression(str_replace('*', phpbb::$db->any_char, utf8_clean_string($username))) : '';
-			$where_sql .= ($email) ? ' AND user_email ' . phpbb::$db->sql_like_expression(str_replace('*', phpbb::$db->any_char, $email)) . ' ' : '';
-			$where_sql .= (sizeof($joined)) ? " AND user_regdate " . $key_match[$joined_select] . ' ' . gmmktime(0, 0, 0, (int) $joined[1], (int) $joined[2], (int) $joined[0]) : '';
-			$where_sql .= ($count !== '') ? " AND user_posts " . $key_match[$count_select] . ' ' . (int) $count . ' ' : '';
-
-			if (sizeof($active) && $active_select != 'lt')
-			{
-				$where_sql .= ' AND user_lastvisit ' . $key_match[$active_select] . ' ' . gmmktime(0, 0, 0, (int) $active[1], (int) $active[2], (int) $active[0]);
-			}
-			else if (sizeof($active))
-			{
-				$where_sql .= ' AND (user_lastvisit > 0 AND user_lastvisit < ' . gmmktime(0, 0, 0, (int) $active[1], (int) $active[2], (int) $active[0]) . ')';
-			}
-		}
-
-		// Protect the admin, do not prune if no options are given...
-		if (!$where_sql)
-		{
-			return;
-		}
-
-		// Get bot ids
-		$sql = 'SELECT user_id
-			FROM ' . BOTS_TABLE;
-		$result = phpbb::$db->sql_query($sql);
-
-		$bot_ids = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$bot_ids[] = $row['user_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// Do not prune founder members
-		$sql = 'SELECT user_id, username
-			FROM ' . USERS_TABLE . '
-			WHERE user_id <> ' . ANONYMOUS . '
-				AND user_type <> ' . phpbb::USER_FOUNDER . "
-			$where_sql";
-		$result = phpbb::$db->sql_query($sql);
-
-		$where_sql = '';
-		$user_ids = $usernames = array();
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			// Do not prune bots and the user currently pruning.
-			if ($row['user_id'] != phpbb::$user->data['user_id'] && !in_array($row['user_id'], $bot_ids))
-			{
-				$user_ids[] = $row['user_id'];
-				$usernames[$row['user_id']] = $row['username'];
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_ranks.php b/phpBB/modules/acp/acp_ranks.php
deleted file mode 100644
index 2b45f85c58..0000000000
--- a/phpBB/modules/acp/acp_ranks.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_ranks
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		phpbb::$user->add_lang('acp/posting');
-
-		// Set up general vars
-		$action = request_var('action', '');
-		$action = (phpbb_request::is_set_post('add')) ? 'add' : $action;
-		$action = (phpbb_request::is_set_post('save')) ? 'save' : $action;
-		$rank_id = request_var('id', 0);
-
-		$this->tpl_name = 'acp_ranks';
-		$this->page_title = 'ACP_MANAGE_RANKS';
-
-		$form_name = 'acp_prune';
-		add_form_key($form_name);
-
-		switch ($action)
-		{
-			case 'save':
-
-				if (!check_form_key($form_name))
-				{
-					trigger_error(phpbb::$user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING);
-				}
-				$rank_title = utf8_normalize_nfc(request_var('title', '', true));
-				$special_rank = request_var('special_rank', 0);
-				$min_posts = ($special_rank) ? 0 : request_var('min_posts', 0);
-				$rank_image = request_var('rank_image', '');
-
-				// The rank image has to be a jpg, gif or png
-				if ($rank_image != '' && !preg_match('#(\.gif|\.png|\.jpg|\.jpeg)$#i', $rank_image))
-				{
-					$rank_image = '';
-				}
-
-				if (!$rank_title)
-				{
-					trigger_error(phpbb::$user->lang['NO_RANK_TITLE'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				$sql_ary = array(
-					'rank_title'		=> $rank_title,
-					'rank_special'		=> $special_rank,
-					'rank_min'			=> $min_posts,
-					'rank_image'		=> htmlspecialchars_decode($rank_image)
-				);
-
-				if ($rank_id)
-				{
-					$sql = 'UPDATE ' . RANKS_TABLE . ' SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . " WHERE rank_id = $rank_id";
-					$message = phpbb::$user->lang['RANK_UPDATED'];
-
-					add_log('admin', 'LOG_RANK_UPDATED', $rank_title);
-				}
-				else
-				{
-					$sql = 'INSERT INTO ' . RANKS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary);
-					$message = phpbb::$user->lang['RANK_ADDED'];
-
-					add_log('admin', 'LOG_RANK_ADDED', $rank_title);
-				}
-				phpbb::$db->sql_query($sql);
-
-				phpbb::$acm->destroy('ranks');
-
-				trigger_error($message . adm_back_link($this->u_action));
-
-			break;
-
-			case 'delete':
-
-				if (!$rank_id)
-				{
-					trigger_error(phpbb::$user->lang['MUST_SELECT_RANK'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				if (confirm_box(true))
-				{
-					$sql = 'SELECT rank_title
-						FROM ' . RANKS_TABLE . '
-						WHERE rank_id = ' . $rank_id;
-					$result = phpbb::$db->sql_query($sql);
-					$rank_title = (string) phpbb::$db->sql_fetchfield('rank_title');
-					phpbb::$db->sql_freeresult($result);
-
-					$sql = 'DELETE FROM ' . RANKS_TABLE . "
-						WHERE rank_id = $rank_id";
-					phpbb::$db->sql_query($sql);
-
-					$sql = 'UPDATE ' . USERS_TABLE . "
-						SET user_rank = 0
-						WHERE user_rank = $rank_id";
-					phpbb::$db->sql_query($sql);
-
-					phpbb::$acm->destroy('ranks');
-
-					add_log('admin', 'LOG_RANK_REMOVED', $rank_title);
-				}
-				else
-				{
-					confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-						'i'			=> $id,
-						'mode'		=> $mode,
-						'rank_id'	=> $rank_id,
-						'action'	=> 'delete',
-					)));
-				}
-
-			break;
-
-			case 'edit':
-			case 'add':
-
-				$data = $ranks = $existing_imgs = array();
-
-				$sql = 'SELECT *
-					FROM ' . RANKS_TABLE . '
-					ORDER BY rank_min ASC, rank_special ASC';
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$existing_imgs[] = $row['rank_image'];
-
-					if ($action == 'edit' && $rank_id == $row['rank_id'])
-					{
-						$ranks = $row;
-					}
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				$imglist = filelist(PHPBB_ROOT_PATH . phpbb::$config['ranks_path'], '');
-				$edit_img = $filename_list = '';
-
-				foreach ($imglist as $path => $img_ary)
-				{
-					sort($img_ary);
-
-					foreach ($img_ary as $img)
-					{
-						$img = $path . $img;
-
-						if (!in_array($img, $existing_imgs) || $action == 'edit')
-						{
-							if ($ranks && $img == $ranks['rank_image'])
-							{
-								$selected = ' selected="selected"';
-								$edit_img = $img;
-							}
-							else
-							{
-								$selected = '';
-							}
-
-							if (strlen($img) > 255)
-							{
-								continue;
-							}
-
-							$filename_list .= '<option value="' . htmlspecialchars($img) . '"' . $selected . '>' . $img . '</option>';
-						}
-					}
-				}
-
-				$filename_list = '<option value=""' . (($edit_img == '') ? ' selected="selected"' : '') . '>----------</option>' . $filename_list;
-				unset($existing_imgs, $imglist);
-
-				phpbb::$template->assign_vars(array(
-					'S_EDIT'			=> true,
-					'U_BACK'			=> $this->u_action,
-					'RANKS_PATH'		=> PHPBB_ROOT_PATH . phpbb::$config['ranks_path'],
-					'U_ACTION'			=> $this->u_action . '&amp;id=' . $rank_id,
-
-					'RANK_TITLE'		=> (isset($ranks['rank_title'])) ? $ranks['rank_title'] : '',
-					'S_FILENAME_LIST'	=> $filename_list,
-					'RANK_IMAGE'		=> ($edit_img) ? PHPBB_ROOT_PATH . phpbb::$config['ranks_path'] . '/' . $edit_img : PHPBB_ADMIN_PATH . 'images/spacer.gif',
-					'S_SPECIAL_RANK'	=> (!isset($ranks['rank_special']) || $ranks['rank_special']) ? true : false,
-					'MIN_POSTS'			=> (isset($ranks['rank_min']) && !$ranks['rank_special']) ? $ranks['rank_min'] : 0,
-				));
-
-
-				return;
-
-			break;
-		}
-
-		phpbb::$template->assign_vars(array(
-			'U_ACTION'		=> $this->u_action,
-		));
-
-		$sql = 'SELECT *
-			FROM ' . RANKS_TABLE . '
-			ORDER BY rank_special DESC, rank_min ASC, rank_title ASC';
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			phpbb::$template->assign_block_vars('ranks', array(
-				'S_RANK_IMAGE'		=> ($row['rank_image']) ? true : false,
-				'S_SPECIAL_RANK'	=> ($row['rank_special']) ? true : false,
-
-				'RANK_IMAGE'		=> PHPBB_ROOT_PATH . phpbb::$config['ranks_path'] . '/' . $row['rank_image'],
-				'RANK_TITLE'		=> $row['rank_title'],
-				'MIN_POSTS'			=> $row['rank_min'],
-
-				'U_EDIT'			=> $this->u_action . '&amp;action=edit&amp;id=' . $row['rank_id'],
-				'U_DELETE'			=> $this->u_action . '&amp;action=delete&amp;id=' . $row['rank_id'],
-			));
-		}
-		phpbb::$db->sql_freeresult($result);
-
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_reasons.php b/phpBB/modules/acp/acp_reasons.php
deleted file mode 100644
index b8c18220ef..0000000000
--- a/phpBB/modules/acp/acp_reasons.php
+++ /dev/null
@@ -1,338 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_reasons
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		phpbb::$user->add_lang(array('mcp', 'acp/posting'));
-
-		// Set up general vars
-		$action = request_var('action', '');
-		$submit = phpbb_request::is_set_post('submit');
-		$reason_id = request_var('id', 0);
-
-		$this->tpl_name = 'acp_reasons';
-		$this->page_title = 'ACP_REASONS';
-
-		$form_name = 'acp_reason';
-		add_form_key('acp_reason');
-
-		$error = array();
-
-		switch ($action)
-		{
-			case 'add':
-			case 'edit':
-
-				$reason_row = array(
-					'reason_title'			=> utf8_normalize_nfc(request_var('reason_title', '', true)),
-					'reason_description'	=> utf8_normalize_nfc(request_var('reason_description', '', true)),
-				);
-
-				if ($submit)
-				{
-					if (!check_form_key($form_name))
-					{
-						$error[] = phpbb::$user->lang['FORM_INVALID'];
-					}
-					// Reason specified?
-					if (!$reason_row['reason_title'] || !$reason_row['reason_description'])
-					{
-						$error[] = phpbb::$user->lang['NO_REASON_INFO'];
-					}
-
-					$check_double = ($action == 'add') ? true : false;
-
-					if ($action == 'edit')
-					{
-						$sql = 'SELECT reason_title
-							FROM ' . REPORTS_REASONS_TABLE . "
-							WHERE reason_id = $reason_id";
-						$result = phpbb::$db->sql_query($sql);
-						$row = phpbb::$db->sql_fetchrow($result);
-						phpbb::$db->sql_freeresult($result);
-
-						if (strtolower($row['reason_title']) == 'other' || strtolower($reason_row['reason_title']) == 'other')
-						{
-							$reason_row['reason_title'] = 'other';
-						}
-
-						if ($row['reason_title'] != $reason_row['reason_title'])
-						{
-							$check_double = true;
-						}
-					}
-
-					// Check for same reason if adding it...
-					if ($check_double)
-					{
-						$sql = 'SELECT reason_id
-							FROM ' . REPORTS_REASONS_TABLE . "
-							WHERE reason_title = '" . phpbb::$db->sql_escape($reason_row['reason_title']) . "'";
-						$result = phpbb::$db->sql_query($sql);
-						$row = phpbb::$db->sql_fetchrow($result);
-						phpbb::$db->sql_freeresult($result);
-
-						if ($row || ($action == 'add' && strtolower($reason_row['reason_title']) == 'other'))
-						{
-							$error[] = phpbb::$user->lang['REASON_ALREADY_EXIST'];
-						}
-					}
-
-					if (!sizeof($error))
-					{
-						// New reason?
-						if ($action == 'add')
-						{
-							// Get new order...
-							$sql = 'SELECT MAX(reason_order) as max_reason_order
-								FROM ' . REPORTS_REASONS_TABLE;
-							$result = phpbb::$db->sql_query($sql);
-							$max_order = (int) phpbb::$db->sql_fetchfield('max_reason_order');
-							phpbb::$db->sql_freeresult($result);
-
-							$sql_ary = array(
-								'reason_title'			=> (string) $reason_row['reason_title'],
-								'reason_description'	=> (string) $reason_row['reason_description'],
-								'reason_order'			=> $max_order + 1
-							);
-
-							phpbb::$db->sql_query('INSERT INTO ' . REPORTS_REASONS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary));
-
-							$log = 'ADDED';
-						}
-						else if ($reason_id)
-						{
-							$sql_ary = array(
-								'reason_title'			=> (string) $reason_row['reason_title'],
-								'reason_description'	=> (string) $reason_row['reason_description'],
-							);
-
-							phpbb::$db->sql_query('UPDATE ' . REPORTS_REASONS_TABLE . ' SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-								WHERE reason_id = ' . $reason_id);
-
-							$log = 'UPDATED';
-						}
-
-						add_log('admin', 'LOG_REASON_' . $log, $reason_row['reason_title']);
-						trigger_error(phpbb::$user->lang['REASON_' . $log] . adm_back_link($this->u_action));
-					}
-				}
-				else if ($reason_id)
-				{
-					$sql = 'SELECT *
-						FROM ' . REPORTS_REASONS_TABLE . '
-						WHERE reason_id = ' . $reason_id;
-					$result = phpbb::$db->sql_query($sql);
-					$reason_row = phpbb::$db->sql_fetchrow($result);
-					phpbb::$db->sql_freeresult($result);
-
-					if (!$reason_row)
-					{
-						trigger_error(phpbb::$user->lang['NO_REASON'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-				}
-
-				$l_title = ($action == 'edit') ? 'EDIT' : 'ADD';
-
-				$translated = false;
-
-				// If the reason is defined within the language file, we will use the localized version, else just use the database entry...
-				if (isset(phpbb::$user->lang['report_reasons']['TITLE'][strtoupper($reason_row['reason_title'])]) && isset(phpbb::$user->lang['report_reasons']['DESCRIPTION'][strtoupper($reason_row['reason_title'])]))
-				{
-					$translated = true;
-				}
-
-				phpbb::$template->assign_vars(array(
-					'L_TITLE'		=> phpbb::$user->lang['REASON_' . $l_title],
-					'U_ACTION'		=> $this->u_action . "&amp;id=$reason_id&amp;action=$action",
-					'U_BACK'		=> $this->u_action,
-					'ERROR_MSG'		=> (sizeof($error)) ? implode('<br />', $error) : '',
-
-					'REASON_TITLE'			=> $reason_row['reason_title'],
-					'REASON_DESCRIPTION'	=> $reason_row['reason_description'],
-
-					'TRANSLATED_TITLE'		=> ($translated) ? phpbb::$user->lang['report_reasons']['TITLE'][strtoupper($reason_row['reason_title'])] : '',
-					'TRANSLATED_DESCRIPTION'=> ($translated) ? phpbb::$user->lang['report_reasons']['DESCRIPTION'][strtoupper($reason_row['reason_title'])] : '',
-
-					'S_AVAILABLE_TITLES'	=> implode(', ', array_map('htmlspecialchars', array_keys(phpbb::$user->lang['report_reasons']['TITLE']))),
-					'S_EDIT_REASON'			=> true,
-					'S_TRANSLATED'			=> $translated,
-					'S_ERROR'				=> (sizeof($error)) ? true : false,
-				));
-
-				return;
-			break;
-
-			case 'delete':
-
-				$sql = 'SELECT *
-					FROM ' . REPORTS_REASONS_TABLE . '
-					WHERE reason_id = ' . $reason_id;
-				$result = phpbb::$db->sql_query($sql);
-				$reason_row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$reason_row)
-				{
-					trigger_error(phpbb::$user->lang['NO_REASON'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				if (strtolower($reason_row['reason_title']) == 'other')
-				{
-					trigger_error(phpbb::$user->lang['NO_REMOVE_DEFAULT_REASON'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				// Let the deletion be confirmed...
-				if (confirm_box(true))
-				{
-					$sql = 'SELECT reason_id, report_text
-						FROM ' . REPORTS_REASONS_TABLE . "
-						WHERE LOWER(reason_title) = 'other'";
-					$result = phpbb::$db->sql_query($sql);
-					$row = phpbb::$db->sql_fetchrow($result);
-
-					$other_reason_id = (int) $row['reason_id'];
-					$report_text = $row['report_text'];
-
-					phpbb::$db->sql_freeresult($result);
-
-					$report_text .= $reason_row['reason_description'] . "\n\n";
-
-					$sql = 'UPDATE ' . REPORTS_TABLE . '
-						SET reason_id = ' . $other_reason_id . ", report_text = '" . phpbb::$db->sql_escape($report_text) . "'
-						WHERE reason_id = $reason_id";
-					phpbb::$db->sql_query($sql);
-
-					phpbb::$db->sql_query('DELETE FROM ' . REPORTS_REASONS_TABLE . ' WHERE reason_id = ' . $reason_id);
-
-					add_log('admin', 'LOG_REASON_REMOVED', $reason_row['reason_title']);
-					trigger_error(phpbb::$user->lang['REASON_REMOVED'] . adm_back_link($this->u_action));
-				}
-				else
-				{
-					confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-						'i'			=> $id,
-						'mode'		=> $mode,
-						'action'	=> $action,
-						'id'		=> $reason_id))
-					);
-				}
-
-			break;
-
-			case 'move_up':
-			case 'move_down':
-
-				$order = request_var('order', 0);
-				$order_total = $order * 2 + (($action == 'move_up') ? -1 : 1);
-
-				$sql = 'UPDATE ' . REPORTS_REASONS_TABLE . '
-					SET reason_order = ' . $order_total . ' - reason_order
-					WHERE reason_order IN (' . $order . ', ' . (($action == 'move_up') ? $order - 1 : $order + 1) . ')';
-				phpbb::$db->sql_query($sql);
-
-			break;
-		}
-
-		// By default, check that order is valid and fix it if necessary
-		$sql = 'SELECT reason_id, reason_order
-			FROM ' . REPORTS_REASONS_TABLE . '
-			ORDER BY reason_order';
-		$result = phpbb::$db->sql_query($sql);
-
-		if ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$order = 0;
-			do
-			{
-				++$order;
-
-				if ($row['reason_order'] != $order)
-				{
-					$sql = 'UPDATE ' . REPORTS_REASONS_TABLE . "
-						SET reason_order = $order
-						WHERE reason_id = {$row['reason_id']}";
-					phpbb::$db->sql_query($sql);
-				}
-			}
-			while ($row = phpbb::$db->sql_fetchrow($result));
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		phpbb::$template->assign_vars(array(
-			'U_ACTION'			=> $this->u_action,
-		));
-
-		// Reason count
-		$sql = 'SELECT reason_id, COUNT(reason_id) AS reason_count
-			FROM ' . REPORTS_TABLE . '
-			GROUP BY reason_id';
-		$result = phpbb::$db->sql_query($sql);
-
-		$reason_count = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$reason_count[$row['reason_id']] = $row['reason_count'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$sql = 'SELECT *
-			FROM ' . REPORTS_REASONS_TABLE . '
-			ORDER BY reason_order ASC';
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$translated = false;
-			$other_reason = ($row['reason_title'] == 'other') ? true : false;
-
-			// If the reason is defined within the language file, we will use the localized version, else just use the database entry...
-			if (isset(phpbb::$user->lang['report_reasons']['TITLE'][strtoupper($row['reason_title'])]) && isset(phpbb::$user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])]))
-			{
-				$row['reason_description'] = phpbb::$user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])];
-				$row['reason_title'] = phpbb::$user->lang['report_reasons']['TITLE'][strtoupper($row['reason_title'])];
-
-				$translated = true;
-			}
-
-			phpbb::$template->assign_block_vars('reasons', array(
-				'REASON_TITLE'			=> $row['reason_title'],
-				'REASON_DESCRIPTION'	=> $row['reason_description'],
-				'REASON_COUNT'			=> (isset($reason_count[$row['reason_id']])) ? $reason_count[$row['reason_id']] : 0,
-
-				'S_TRANSLATED'		=> $translated,
-				'S_OTHER_REASON'	=> $other_reason,
-
-				'U_EDIT'		=> $this->u_action . '&amp;action=edit&amp;id=' . $row['reason_id'],
-				'U_DELETE'		=> (!$other_reason) ? $this->u_action . '&amp;action=delete&amp;id=' . $row['reason_id'] : '',
-				'U_MOVE_UP'		=> $this->u_action . '&amp;action=move_up&amp;order=' . $row['reason_order'],
-				'U_MOVE_DOWN'	=> $this->u_action . '&amp;action=move_down&amp;order=' . $row['reason_order'],
-			));
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_search.php b/phpBB/modules/acp/acp_search.php
deleted file mode 100644
index fd2133f0a4..0000000000
--- a/phpBB/modules/acp/acp_search.php
+++ /dev/null
@@ -1,613 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_search
-{
-	var $u_action;
-	var $state;
-	var $search;
-	var $max_post_id;
-	var $batch_size = 100;
-
-	function main($id, $mode)
-	{
-		phpbb::$user->add_lang('acp/search');
-
-		// For some this may be of help...
-		@ini_set('memory_limit', '128M');
-
-		switch ($mode)
-		{
-			case 'settings':
-				$this->settings($id, $mode);
-			break;
-
-			case 'index':
-				$this->index($id, $mode);
-			break;
-		}
-	}
-
-	function settings($id, $mode)
-	{
-		$submit = phpbb_request::is_set_post('submit');
-
-		$search_types = $this->get_search_types();
-
-		$settings = array(
-			'search_interval'			=> 'float',
-			'search_anonymous_interval'	=> 'float',
-			'load_search'				=> 'bool',
-			'limit_search_load'			=> 'float',
-			'min_search_author_chars'	=> 'integer',
-			'max_num_search_keywords'	=> 'integer',
-			'search_store_results'		=> 'integer',
-		);
-
-		$search = null;
-		$error = false;
-		$search_options = '';
-		foreach ($search_types as $type)
-		{
-			if ($this->init_search($type, $search, $error))
-			{
-				continue;
-			}
-
-			$name = ucfirst(strtolower(str_replace('_', ' ', $type)));
-			$selected = (phpbb::$config['search_type'] == $type) ? ' selected="selected"' : '';
-			$search_options .= '<option value="' . $type . '"' . $selected . '>' . $name . '</option>';
-
-			if (method_exists($search, 'acp'))
-			{
-				$vars = $search->acp();
-
-				if (!$submit)
-				{
-					phpbb::$template->assign_block_vars('backend', array(
-						'NAME'		=> $name,
-						'SETTINGS'	=> $vars['tpl'],
-					));
-				}
-				else if (is_array($vars['config']))
-				{
-					$settings = array_merge($settings, $vars['config']);
-				}
-			}
-		}
-		unset($search);
-		unset($error);
-
-		$cfg_array = request_var('config', array('' => ''), true);
-		$updated = request_var('updated', false);
-
-		foreach ($settings as $config_name => $var_type)
-		{
-			if (!isset($cfg_array[$config_name]))
-			{
-				continue;
-			}
-
-			// e.g. integer:4:12 (min 4, max 12)
-			$var_type = explode(':', $var_type);
-
-			$config_value = $cfg_array[$config_name];
-			settype($config_value, $var_type[0]);
-
-			if (isset($var_type[1]))
-			{
-				$config_value = max($var_type[1], $config_value);
-			}
-
-			if (isset($var_type[2]))
-			{
-				$config_value = min($var_type[2], $config_value);
-			}
-
-			// only change config if anything was actually changed
-			if ($submit && (phpbb::$config[$config_name] != $config_value))
-			{
-				set_config($config_name, $config_value);
-				$updated = true;
-			}
-		}
-
-		if ($submit)
-		{
-			$extra_message = '';
-			if ($updated)
-			{
-				add_log('admin', 'LOG_CONFIG_SEARCH');
-			}
-
-			if (isset($cfg_array['search_type']) && in_array($cfg_array['search_type'], $search_types, true) && ($cfg_array['search_type'] != phpbb::$config['search_type']))
-			{
-				$search = null;
-				$error = false;
-
-				if (!$this->init_search($cfg_array['search_type'], $search, $error))
-				{
-					if (confirm_box(true))
-					{
-						if (!method_exists($search, 'init') || !($error = $search->init()))
-						{
-							set_config('search_type', $cfg_array['search_type']);
-
-							if (!$updated)
-							{
-								add_log('admin', 'LOG_CONFIG_SEARCH');
-							}
-							$extra_message = '<br />' . phpbb::$user->lang['SWITCHED_SEARCH_BACKEND'] . '<br /><a href="' . append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, 'i=search&amp;mode=index') . '">&raquo; ' . phpbb::$user->lang['GO_TO_SEARCH_INDEX'] . '</a>';
-						}
-						else
-						{
-							trigger_error($error . adm_back_link($this->u_action), E_USER_WARNING);
-						}
-					}
-					else
-					{
-						confirm_box(false, phpbb::$user->lang['CONFIRM_SEARCH_BACKEND'], build_hidden_fields(array(
-							'i'			=> $id,
-							'mode'		=> $mode,
-							'submit'	=> true,
-							'updated'	=> $updated,
-							'config'	=> array('search_type' => $cfg_array['search_type']),
-						)));
-					}
-				}
-				else
-				{
-					trigger_error($error . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-			}
-
-			$search = null;
-			$error = false;
-			if (!$this->init_search(phpbb::$config['search_type'], $search, $error))
-			{
-				if ($updated)
-				{
-					if (method_exists($search, 'config_updated'))
-					{
-						if ($search->config_updated())
-						{
-							trigger_error($error . adm_back_link($this->u_action), E_USER_WARNING);
-						}
-					}
-				}
-			}
-			else
-			{
-				trigger_error($error . adm_back_link($this->u_action), E_USER_WARNING);
-			}
-
-			trigger_error(phpbb::$user->lang['CONFIG_UPDATED'] . $extra_message . adm_back_link($this->u_action));
-		}
-		unset($cfg_array);
-
-		$this->tpl_name = 'acp_search';
-		$this->page_title = 'ACP_SEARCH_SETTINGS';
-
-		phpbb::$template->assign_vars(array(
-			'LIMIT_SEARCH_LOAD'		=> (float) phpbb::$config['limit_search_load'],
-			'MIN_SEARCH_AUTHOR_CHARS'	=> (int) phpbb::$config['min_search_author_chars'],
-			'SEARCH_INTERVAL'		=> (float) phpbb::$config['search_interval'],
-			'SEARCH_GUEST_INTERVAL'	=> (float) phpbb::$config['search_anonymous_interval'],
-			'SEARCH_STORE_RESULTS'	=> (int) phpbb::$config['search_store_results'],
-			'MAX_NUM_SEARCH_KEYWORDS'	=> (int) phpbb::$config['max_num_search_keywords'],
-
-			'S_SEARCH_TYPES'		=> $search_options,
-			'S_YES_SEARCH'			=> (bool) phpbb::$config['load_search'],
-			'S_SETTINGS'			=> true,
-
-			'U_ACTION'				=> $this->u_action,
-		));
-	}
-
-	function index($id, $mode)
-	{
-		$action = request_var('action', array('' => false));
-		if (sizeof($action))
-		{
-			$action = key($action);
-		}
-		else
-		{
-			$action = request_var('action', '');
-		}
-		$this->state = explode(',', phpbb::$config['search_indexing_state']);
-
-		if (phpbb_request::is_set_post('cancel'))
-		{
-			$action = '';
-			$this->state = array();
-			$this->save_state();
-		}
-
-		if ($action)
-		{
-			switch ($action)
-			{
-				case 'progress_bar':
-					$type = request_var('type', '');
-					$this->display_progress_bar($type);
-				break;
-
-				case 'delete':
-					$this->state[1] = 'delete';
-				break;
-
-				case 'create':
-					$this->state[1] = 'create';
-				break;
-
-				default:
-					trigger_error('NO_ACTION', E_USER_ERROR);
-				break;
-			}
-
-			if (empty($this->state[0]))
-			{
-				$this->state[0] = request_var('search_type', '');
-			}
-
-			$this->search = null;
-			$error = false;
-			if ($this->init_search($this->state[0], $this->search, $error))
-			{
-				trigger_error($error . adm_back_link($this->u_action), E_USER_WARNING);
-			}
-			$name = ucfirst(strtolower(str_replace('_', ' ', $this->state[0])));
-
-			$action = &$this->state[1];
-
-			$this->max_post_id = $this->get_max_post_id();
-
-			$post_counter = (isset($this->state[2])) ? $this->state[2] : 0;
-			$this->state[2] = &$post_counter;
-			$this->save_state();
-
-			switch ($action)
-			{
-				case 'delete':
-					if (method_exists($this->search, 'delete_index'))
-					{
-						// pass a reference to myself so the $search object can make use of save_state() and attributes
-						if ($error = $this->search->delete_index($this, append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=$id&mode=$mode&action=delete", false)))
-						{
-							$this->state = array('');
-							$this->save_state();
-							trigger_error($error . adm_back_link($this->u_action) . $this->close_popup_js(), E_USER_WARNING);
-						}
-					}
-					else
-					{
-						$starttime = explode(' ', microtime());
-						$starttime = $starttime[1] + $starttime[0];
-						$row_count = 0;
-						while (still_on_time() && $post_counter <= $this->max_post_id)
-						{
-							$sql = 'SELECT post_id, poster_id, forum_id
-								FROM ' . POSTS_TABLE . '
-								WHERE post_id >= ' . (int) ($post_counter + 1) . '
-									AND post_id <= ' . (int) ($post_counter + $this->batch_size);
-							$result = phpbb::$db->sql_query($sql);
-
-							$ids = $posters = $forum_ids = array();
-							while ($row = phpbb::$db->sql_fetchrow($result))
-							{
-								$ids[] = $row['post_id'];
-								$posters[] = $row['poster_id'];
-								$forum_ids[] = $row['forum_id'];
-							}
-							phpbb::$db->sql_freeresult($result);
-							$row_count += sizeof($ids);
-
-							if (sizeof($ids))
-							{
-								$this->search->index_remove($ids, $posters, $forum_ids);
-							}
-
-							$post_counter += $this->batch_size;
-						}
-						// save the current state
-						$this->save_state();
-
-						if ($post_counter <= $this->max_post_id)
-						{
-							$mtime = explode(' ', microtime());
-							$totaltime = $mtime[0] + $mtime[1] - $starttime;
-							$rows_per_second = $row_count / $totaltime;
-							meta_refresh(1, append_sid($this->u_action . '&amp;action=delete&amp;skip_rows=' . $post_counter));
-							trigger_error(sprintf(phpbb::$user->lang['SEARCH_INDEX_DELETE_REDIRECT'], $post_counter, $row_count, $rows_per_second));
-						}
-					}
-
-					$this->search->tidy();
-
-					$this->state = array('');
-					$this->save_state();
-
-					add_log('admin', 'LOG_SEARCH_INDEX_REMOVED', $name);
-					trigger_error(phpbb::$user->lang['SEARCH_INDEX_REMOVED'] . adm_back_link($this->u_action) . $this->close_popup_js());
-				break;
-
-				case 'create':
-					if (method_exists($this->search, 'create_index'))
-					{
-						// pass a reference to acp_search so the $search object can make use of save_state() and attributes
-						if ($error = $this->search->create_index($this, append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=$id&mode=$mode&action=create", false)))
-						{
-							$this->state = array('');
-							$this->save_state();
-							trigger_error($error . adm_back_link($this->u_action) . $this->close_popup_js(), E_USER_WARNING);
-						}
-					}
-					else
-					{
-						$sql = 'SELECT forum_id, enable_indexing
-							FROM ' . FORUMS_TABLE;
-						$result = phpbb::$db->sql_query($sql, 3600);
-
-						while ($row = phpbb::$db->sql_fetchrow($result))
-						{
-							$forums[$row['forum_id']] = (bool) $row['enable_indexing'];
-						}
-						phpbb::$db->sql_freeresult($result);
-
-						$starttime = explode(' ', microtime());
-						$starttime = $starttime[1] + $starttime[0];
-						$row_count = 0;
-						while (still_on_time() && $post_counter <= $this->max_post_id)
-						{
-							$sql = 'SELECT post_id, post_subject, post_text, poster_id, forum_id
-								FROM ' . POSTS_TABLE . '
-								WHERE post_id >= ' . (int) ($post_counter + 1) . '
-									AND post_id <= ' . (int) ($post_counter + $this->batch_size);
-							$result = phpbb::$db->sql_query($sql);
-
-							while ($row = phpbb::$db->sql_fetchrow($result))
-							{
-								// Indexing enabled for this forum or global announcement?
-								// Global announcements get indexed by default.
-								if (!$row['forum_id'] || (isset($forums[$row['forum_id']]) && $forums[$row['forum_id']]))
-								{
-									$this->search->index('post', $row['post_id'], $row['post_text'], $row['post_subject'], $row['poster_id'], $row['forum_id']);
-								}
-								$row_count++;
-							}
-							phpbb::$db->sql_freeresult($result);
-
-							$post_counter += $this->batch_size;
-						}
-						// save the current state
-						$this->save_state();
-
-						// pretend the number of posts was as big as the number of ids we indexed so far
-						// just an estimation as it includes deleted posts
-						$num_posts = phpbb::$config['num_posts'];
-						phpbb::$config['num_posts'] = min(phpbb::$config['num_posts'], $post_counter);
-						$this->search->tidy();
-						phpbb::$config['num_posts'] = $num_posts;
-
-						if ($post_counter <= $this->max_post_id)
-						{
-							$mtime = explode(' ', microtime());
-							$totaltime = $mtime[0] + $mtime[1] - $starttime;
-							$rows_per_second = $row_count / $totaltime;
-							meta_refresh(1, append_sid($this->u_action . '&amp;action=create&amp;skip_rows=' . $post_counter));
-							trigger_error(sprintf(phpbb::$user->lang['SEARCH_INDEX_CREATE_REDIRECT'], $post_counter, $row_count, $rows_per_second));
-						}
-					}
-
-					$this->search->tidy();
-
-					$this->state = array('');
-					$this->save_state();
-
-					add_log('admin', 'LOG_SEARCH_INDEX_CREATED', $name);
-					trigger_error(phpbb::$user->lang['SEARCH_INDEX_CREATED'] . adm_back_link($this->u_action) . $this->close_popup_js());
-				break;
-			}
-		}
-
-		$search_types = $this->get_search_types();
-
-		$search = null;
-		$error = false;
-		$search_options = '';
-		foreach ($search_types as $type)
-		{
-			if ($this->init_search($type, $search, $error) || !method_exists($search, 'index_created'))
-			{
-				continue;
-			}
-
-			$name = ucfirst(strtolower(str_replace('_', ' ', $type)));
-
-			$data = array();
-			if (method_exists($search, 'index_stats'))
-			{
-				$data = $search->index_stats();
-			}
-
-			$statistics = array();
-			foreach ($data as $statistic => $value)
-			{
-				$n = sizeof($statistics);
-				if ($n && sizeof($statistics[$n - 1]) < 3)
-				{
-					$statistics[$n - 1] += array('statistic_2' => $statistic, 'value_2' => $value);
-				}
-				else
-				{
-					$statistics[] = array('statistic_1' => $statistic, 'value_1' => $value);
-				}
-			}
-
-			phpbb::$template->assign_block_vars('backend', array(
-				'L_NAME'			=> $name,
-				'NAME'				=> $type,
-
-				'S_ACTIVE'			=> ($type == phpbb::$config['search_type']) ? true : false,
-				'S_HIDDEN_FIELDS'	=> build_hidden_fields(array('search_type' => $type)),
-				'S_INDEXED'			=> (bool) $search->index_created(),
-				'S_STATS'			=> (bool) sizeof($statistics),
-			));
-
-			foreach ($statistics as $statistic)
-			{
-				phpbb::$template->assign_block_vars('backend.data', array(
-					'STATISTIC_1'	=> $statistic['statistic_1'],
-					'VALUE_1'		=> $statistic['value_1'],
-					'STATISTIC_2'	=> (isset($statistic['statistic_2'])) ? $statistic['statistic_2'] : '',
-					'VALUE_2'		=> (isset($statistic['value_2'])) ? $statistic['value_2'] : '',
-				));
-			}
-		}
-		unset($search);
-		unset($error);
-		unset($statistics);
-		unset($data);
-
-		$this->tpl_name = 'acp_search';
-		$this->page_title = 'ACP_SEARCH_INDEX';
-
-		phpbb::$template->assign_vars(array(
-			'S_INDEX'				=> true,
-			'U_ACTION'				=> $this->u_action,
-			'U_PROGRESS_BAR'		=> append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=$id&amp;mode=$mode&amp;action=progress_bar"),
-			'UA_PROGRESS_BAR'		=> addslashes(append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=$id&amp;mode=$mode&amp;action=progress_bar")),
-		));
-
-		if (isset($this->state[1]))
-		{
-			phpbb::$template->assign_vars(array(
-				'S_CONTINUE_INDEXING'	=> $this->state[1],
-				'U_CONTINUE_INDEXING'	=> $this->u_action . '&amp;action=' . $this->state[1],
-				'L_CONTINUE'			=> ($this->state[1] == 'create') ? phpbb::$user->lang['CONTINUE_INDEXING'] : phpbb::$user->lang['CONTINUE_DELETING_INDEX'],
-				'L_CONTINUE_EXPLAIN'	=> ($this->state[1] == 'create') ? phpbb::$user->lang['CONTINUE_INDEXING_EXPLAIN'] : phpbb::$user->lang['CONTINUE_DELETING_INDEX_EXPLAIN'],
-			));
-		}
-	}
-
-	function display_progress_bar($type)
-	{
-		$l_type = ($type == 'create') ? 'INDEXING_IN_PROGRESS' : 'DELETING_INDEX_IN_PROGRESS';
-
-		page_header(phpbb::$user->lang[$l_type]);
-
-		phpbb::$template->set_filenames(array(
-			'body'	=> 'progress_bar.html',
-		));
-
-		phpbb::$template->assign_vars(array(
-			'L_PROGRESS'			=> phpbb::$user->lang[$l_type],
-			'L_PROGRESS_EXPLAIN'	=> phpbb::$user->lang[$l_type . '_EXPLAIN'],
-		));
-
-		page_footer();
-	}
-
-	function close_popup_js()
-	{
-		return "<script type=\"text/javascript\">\n" .
-			"// <![CDATA[\n" .
-			"	close_waitscreen = 1;\n" .
-			"// ]]>\n" .
-			"</script>\n";
-	}
-
-	function get_search_types()
-	{
-		$search_types = array();
-
-		$dp = @opendir(PHPBB_ROOT_PATH . 'includes/search');
-
-		if ($dp)
-		{
-			while (($file = readdir($dp)) !== false)
-			{
-				if ((preg_match('#\.' . PHP_EXT . '$#', $file)) && ($file != 'search.' . PHP_EXT))
-				{
-					$search_types[] = preg_replace('#^(.*?)\.' . PHP_EXT . '$#', '\1', $file);
-				}
-			}
-			closedir($dp);
-
-			sort($search_types);
-		}
-
-		return $search_types;
-	}
-
-	function get_max_post_id()
-	{
-		$sql = 'SELECT MAX(post_id) as max_post_id
-			FROM '. POSTS_TABLE;
-		$result = phpbb::$db->sql_query($sql);
-		$max_post_id = (int) phpbb::$db->sql_fetchfield('max_post_id');
-		phpbb::$db->sql_freeresult($result);
-
-		return $max_post_id;
-	}
-
-	function save_state($state = false)
-	{
-		if ($state)
-		{
-			$this->state = $state;
-		}
-
-		ksort($this->state);
-
-		set_config('search_indexing_state', implode(',', $this->state));
-	}
-
-	/**
-	* Initialises a search backend object
-	*
-	* @return false if no error occurred else an error message
-	*/
-	function init_search($type, &$search, &$error)
-	{
-		if (!preg_match('#^\w+$#', $type) || !file_exists(PHPBB_ROOT_PATH . "includes/search/$type." . PHP_EXT))
-		{
-			$error = phpbb::$user->lang['NO_SUCH_SEARCH_MODULE'];
-			return $error;
-		}
-
-		include_once(PHPBB_ROOT_PATH . "includes/search/$type." . PHP_EXT);
-
-		if (!class_exists($type))
-		{
-			$error = phpbb::$user->lang['NO_SUCH_SEARCH_MODULE'];
-			return $error;
-		}
-
-		$error = false;
-		$search = new $type($error);
-
-		return $error;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_styles.php b/phpBB/modules/acp/acp_styles.php
deleted file mode 100644
index db2a777900..0000000000
--- a/phpBB/modules/acp/acp_styles.php
+++ /dev/null
@@ -1,3047 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_styles
-{
-	var $u_action;
-
-	var $style_cfg;
-	var $template_cfg;
-	var $theme_cfg;
-	var $imageset_cfg;
-	var $imageset_keys;
-
-	function main($id, $mode)
-	{
-		// Hardcoded template bitfield to add for new templates
-		$bitfield = new bitfield();
-		$bitfield->set(0);
-		$bitfield->set(1);
-		$bitfield->set(2);
-		$bitfield->set(3);
-		$bitfield->set(4);
-		$bitfield->set(8);
-		$bitfield->set(9);
-		$bitfield->set(11);
-		$bitfield->set(12);
-		define('TEMPLATE_BITFIELD', $bitfield->get_base64());
-		unset($bitfield);
-
-		phpbb::$user->add_lang('acp/styles');
-
-		$this->tpl_name = 'acp_styles';
-		$this->page_title = 'ACP_CAT_STYLES';
-
-		$action = request_var('action', '');
-		$action = (phpbb_request::is_set_post('add')) ? 'add' : $action;
-		$style_id = request_var('id', 0);
-
-		// Fill the configuration variables
-		$this->style_cfg = $this->template_cfg = $this->theme_cfg = $this->imageset_cfg = '
-#
-# phpBB {MODE} configuration file
-#
-# @package phpBB3
-# @copyright (c) 2005 phpBB Group
-# @license http://opensource.org/licenses/gpl-license.php GNU Public License
-#
-#
-# At the left is the name, please do not change this
-# At the right the value is entered
-# For on/off options the valid values are on, off, 1, 0, true and false
-#
-# Values get trimmed, if you want to add a space in front or at the end of
-# the value, then enclose the value with single or double quotes.
-# Single and double quotes do not need to be escaped.
-#
-#
-
-# General Information about this {MODE}
-name = {NAME}
-copyright = {COPYRIGHT}
-version = {VERSION}
-';
-
-		$this->theme_cfg .= '
-# Some configuration options
-
-#
-# You have to turn this option on if you want to use the
-# path template variables ({T_IMAGESET_PATH} for example) within
-# your css file.
-# This is mostly the case if you want to use language specific
-# images within your css file.
-#
-parse_css_file = {PARSE_CSS_FILE}
-';
-
-		$this->imageset_keys = array(
-			'logos' => array(
-				'site_logo',
-			),
-			'buttons'	=> array(
-				'icon_back_top', 'icon_contact_aim', 'icon_contact_email', 'icon_contact_icq', 'icon_contact_jabber', 'icon_contact_msnm', 'icon_contact_pm', 'icon_contact_yahoo', 'icon_contact_www', 'icon_post_delete', 'icon_post_edit', 'icon_post_info', 'icon_post_quote', 'icon_post_report', 'icon_user_online', 'icon_user_offline', 'icon_user_profile', 'icon_user_search', 'icon_user_warn', 'button_pm_forward', 'button_pm_new', 'button_pm_reply', 'button_topic_locked', 'button_topic_new', 'button_topic_reply',
-			),
-			'icons'		=> array(
-				'icon_post_target', 'icon_post_target_unread', 'icon_topic_attach', 'icon_topic_latest', 'icon_topic_newest', 'icon_topic_reported', 'icon_topic_unapproved', 'icon_friend', 'icon_foe',
-			),
-			'forums'	=> array(
-				'forum_link', 'forum_read', 'forum_read_locked', 'forum_read_subforum', 'forum_unread', 'forum_unread_locked', 'forum_unread_subforum', 'subforum_read', 'subforum_unread'
-			),
-			'folders'	=> array(
-				'topic_moved', 'topic_read', 'topic_read_mine', 'topic_read_hot', 'topic_read_hot_mine', 'topic_read_locked', 'topic_read_locked_mine', 'topic_unread', 'topic_unread_mine', 'topic_unread_hot', 'topic_unread_hot_mine', 'topic_unread_locked', 'topic_unread_locked_mine', 'sticky_read', 'sticky_read_mine', 'sticky_read_locked', 'sticky_read_locked_mine', 'sticky_unread', 'sticky_unread_mine', 'sticky_unread_locked', 'sticky_unread_locked_mine', 'announce_read', 'announce_read_mine', 'announce_read_locked', 'announce_read_locked_mine', 'announce_unread', 'announce_unread_mine', 'announce_unread_locked', 'announce_unread_locked_mine', 'global_read', 'global_read_mine', 'global_read_locked', 'global_read_locked_mine', 'global_unread', 'global_unread_mine', 'global_unread_locked', 'global_unread_locked_mine', 'pm_read', 'pm_unread',
-			),
-			'polls'		=> array(
-				'poll_left', 'poll_center', 'poll_right',
-			),
-			'ui'		=> array(
-				'upload_bar',
-			),
-			'user'		=> array(
-				'user_icon1', 'user_icon2', 'user_icon3', 'user_icon4', 'user_icon5', 'user_icon6', 'user_icon7', 'user_icon8', 'user_icon9', 'user_icon10',
-			),
-		);
-
-		// Execute overall actions
-		switch ($action)
-		{
-			case 'delete':
-				if ($style_id)
-				{
-					$this->remove($mode, $style_id);
-					return;
-				}
-			break;
-
-			case 'export':
-				if ($style_id)
-				{
-					$this->export($mode, $style_id);
-					return;
-				}
-			break;
-
-			case 'install':
-				$this->install($mode);
-				return;
-			break;
-
-			case 'add':
-				$this->add($mode);
-				return;
-			break;
-
-			case 'details':
-				if ($style_id)
-				{
-					$this->details($mode, $style_id);
-					return;
-				}
-			break;
-
-			case 'edit':
-				if ($style_id)
-				{
-					switch ($mode)
-					{
-						case 'imageset':
-							return $this->edit_imageset($style_id);
-						case 'template':
-							return $this->edit_template($style_id);
-						case 'theme':
-							return $this->edit_theme($style_id);
-					}
-				}
-			break;
-
-			case 'cache':
-				if ($style_id)
-				{
-					switch ($mode)
-					{
-						case 'template':
-							return $this->template_cache($style_id);
-					}
-				}
-			break;
-		}
-
-		switch ($mode)
-		{
-			case 'style':
-
-				switch ($action)
-				{
-					case 'activate':
-					case 'deactivate':
-
-						if ($style_id == phpbb::$config['default_style'])
-						{
-							trigger_error(phpbb::$user->lang['DEACTIVATE_DEFAULT'] . adm_back_link($this->u_action), E_USER_WARNING);
-						}
-
-						$sql = 'UPDATE ' . STYLES_TABLE . '
-							SET style_active = ' . (($action == 'activate') ? 1 : 0) . '
-							WHERE style_id = ' . $style_id;
-						phpbb::$db->sql_query($sql);
-
-						// Set style to default for any member using deactivated style
-						if ($action == 'deactivate')
-						{
-							$sql = 'UPDATE ' . USERS_TABLE . '
-								SET user_style = ' . phpbb::$config['default_style'] . "
-								WHERE user_style = $style_id";
-							phpbb::$db->sql_query($sql);
-
-							$sql = 'UPDATE ' . FORUMS_TABLE . '
-								SET forum_style = 0
-								WHERE forum_style = ' . $style_id;
-							phpbb::$db->sql_query($sql);
-						}
-					break;
-				}
-
-				$this->frontend('style', array('details'), array('export', 'delete'));
-			break;
-
-			case 'template':
-
-				switch ($action)
-				{
-					// Clear cache
-					case 'refresh':
-
-						$sql = 'SELECT *
-							FROM ' . STYLES_TEMPLATE_TABLE . "
-							WHERE template_id = $style_id";
-						$result = phpbb::$db->sql_query($sql);
-						$template_row = phpbb::$db->sql_fetchrow($result);
-						phpbb::$db->sql_freeresult($result);
-
-						if (!$template_row)
-						{
-							trigger_error(phpbb::$user->lang['NO_TEMPLATE'] . adm_back_link($this->u_action), E_USER_WARNING);
-						}
-
-						if (confirm_box(true))
-						{
-							$this->clear_template_cache($template_row);
-
-							trigger_error(phpbb::$user->lang['TEMPLATE_CACHE_CLEARED'] . adm_back_link($this->u_action));
-						}
-						else
-						{
-							confirm_box(false, phpbb::$user->lang['CONFIRM_TEMPLATE_CLEAR_CACHE'], build_hidden_fields(array(
-								'i'			=> $id,
-								'mode'		=> $mode,
-								'action'	=> $action,
-								'id'		=> $style_id
-							)));
-						}
-
-					break;
-				}
-
-				$this->frontend('template', array('edit', 'cache', 'details'), array('refresh', 'export', 'delete'));
-			break;
-
-			case 'theme':
-
-				switch ($action)
-				{
-					// Refresh theme data stored in the database
-					case 'refresh':
-
-						$sql = 'SELECT *
-							FROM ' . STYLES_THEME_TABLE . "
-							WHERE theme_id = $style_id";
-						$result = phpbb::$db->sql_query($sql);
-						$theme_row = phpbb::$db->sql_fetchrow($result);
-						phpbb::$db->sql_freeresult($result);
-
-						if (!$theme_row)
-						{
-							trigger_error(phpbb::$user->lang['NO_THEME'] . adm_back_link($this->u_action), E_USER_WARNING);
-						}
-
-						if (!$theme_row['theme_storedb'])
-						{
-							trigger_error(phpbb::$user->lang['THEME_ERR_REFRESH_FS'] . adm_back_link($this->u_action), E_USER_WARNING);
-						}
-
-						if (confirm_box(true))
-						{
-							if ($theme_row['theme_storedb'] && file_exists(PHPBB_ROOT_PATH . "styles/{$theme_row['theme_path']}/theme/stylesheet.css"))
-							{
-								// Save CSS contents
-								$sql_ary = array(
-									'theme_mtime'	=> (int) filemtime(PHPBB_ROOT_PATH . "styles/{$theme_row['theme_path']}/theme/stylesheet.css"),
-									'theme_data'	=> self::db_theme_data($theme_row)
-								);
-
-								$sql = 'UPDATE ' . STYLES_THEME_TABLE . ' SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . "
-									WHERE theme_id = $style_id";
-								phpbb::$db->sql_query($sql);
-
-								phpbb::$acm->destroy_sql(STYLES_THEME_TABLE);
-
-								add_log('admin', 'LOG_THEME_REFRESHED', $theme_row['theme_name']);
-								trigger_error(phpbb::$user->lang['THEME_REFRESHED'] . adm_back_link($this->u_action));
-							}
-						}
-						else
-						{
-							confirm_box(false, phpbb::$user->lang['CONFIRM_THEME_REFRESH'], build_hidden_fields(array(
-								'i'			=> $id,
-								'mode'		=> $mode,
-								'action'	=> $action,
-								'id'		=> $style_id
-							)));
-						}
-					break;
-				}
-
-				$this->frontend('theme', array('edit', 'details'), array('refresh', 'export', 'delete'));
-			break;
-
-			case 'imageset':
-
-				switch ($action)
-				{
-					case 'refresh':
-
-						$sql = 'SELECT *
-							FROM ' . STYLES_IMAGESET_TABLE . "
-							WHERE imageset_id = $style_id";
-						$result = phpbb::$db->sql_query($sql);
-						$imageset_row = phpbb::$db->sql_fetchrow($result);
-						phpbb::$db->sql_freeresult($result);
-
-						if (!$imageset_row)
-						{
-							trigger_error(phpbb::$user->lang['NO_IMAGESET'] . adm_back_link($this->u_action), E_USER_WARNING);
-						}
-
-						if (confirm_box(true))
-						{
-							$sql_ary = array();
-
-							$imageset_definitions = array();
-							foreach ($this->imageset_keys as $topic => $key_array)
-							{
-								$imageset_definitions = array_merge($imageset_definitions, $key_array);
-							}
-
-							$cfg_data_imageset = parse_cfg_file(PHPBB_ROOT_PATH . "styles/{$imageset_row['imageset_path']}/imageset/imageset.cfg");
-
-							phpbb::$db->sql_transaction('begin');
-
-							$sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . '
-								WHERE imageset_id = ' . $style_id;
-							$result = phpbb::$db->sql_query($sql);
-
-							foreach ($cfg_data_imageset as $image_name => $value)
-							{
-								if (strpos($value, '*') !== false)
-								{
-									if (substr($value, -1, 1) === '*')
-									{
-										list($image_filename, $image_height) = explode('*', $value);
-										$image_width = 0;
-									}
-									else
-									{
-										list($image_filename, $image_height, $image_width) = explode('*', $value);
-									}
-								}
-								else
-								{
-									$image_filename = $value;
-									$image_height = $image_width = 0;
-								}
-
-								if (strpos($image_name, 'img_') === 0 && $image_filename)
-								{
-									$image_name = substr($image_name, 4);
-									if (in_array($image_name, $imageset_definitions))
-									{
-										$sql_ary[] = array(
-											'image_name'		=> (string) $image_name,
-											'image_filename'	=> (string) $image_filename,
-											'image_height'		=> (int) $image_height,
-											'image_width'		=> (int) $image_width,
-											'imageset_id'		=> (int) $style_id,
-											'image_lang'		=> '',
-										);
-									}
-								}
-							}
-
-							$sql = 'SELECT lang_dir
-								FROM ' . LANG_TABLE;
-							$result = phpbb::$db->sql_query($sql);
-
-							while ($row = phpbb::$db->sql_fetchrow($result))
-							{
-								if (@file_exists(PHPBB_ROOT_PATH . "styles/{$imageset_row['imageset_path']}/imageset/{$row['lang_dir']}/imageset.cfg"))
-								{
-									$cfg_data_imageset_data = parse_cfg_file(PHPBB_ROOT_PATH . "styles/{$imageset_row['imageset_path']}/imageset/{$row['lang_dir']}/imageset.cfg");
-									foreach ($cfg_data_imageset_data as $image_name => $value)
-									{
-										if (strpos($value, '*') !== false)
-										{
-											if (substr($value, -1, 1) === '*')
-											{
-												list($image_filename, $image_height) = explode('*', $value);
-												$image_width = 0;
-											}
-											else
-											{
-												list($image_filename, $image_height, $image_width) = explode('*', $value);
-											}
-										}
-										else
-										{
-											$image_filename = $value;
-											$image_height = $image_width = 0;
-										}
-
-										if (strpos($image_name, 'img_') === 0 && $image_filename)
-										{
-											$image_name = substr($image_name, 4);
-											if (in_array($image_name, $imageset_definitions))
-											{
-												$sql_ary[] = array(
-													'image_name'		=> (string) $image_name,
-													'image_filename'	=> (string) $image_filename,
-													'image_height'		=> (int) $image_height,
-													'image_width'		=> (int) $image_width,
-													'imageset_id'		=> (int) $style_id,
-													'image_lang'		=> (string) $row['lang_dir'],
-												);
-											}
-										}
-									}
-								}
-							}
-							phpbb::$db->sql_freeresult($result);
-
-							phpbb::$db->sql_multi_insert(STYLES_IMAGESET_DATA_TABLE, $sql_ary);
-
-							phpbb::$db->sql_transaction('commit');
-
-							phpbb::$acm->destroy_sql(STYLES_IMAGESET_DATA_TABLE);
-
-							add_log('admin', 'LOG_IMAGESET_REFRESHED', $imageset_row['imageset_name']);
-							trigger_error(phpbb::$user->lang['IMAGESET_REFRESHED'] . adm_back_link($this->u_action));
-						}
-						else
-						{
-							confirm_box(false, phpbb::$user->lang['CONFIRM_IMAGESET_REFRESH'], build_hidden_fields(array(
-								'i'			=> $id,
-								'mode'		=> $mode,
-								'action'	=> $action,
-								'id'		=> $style_id
-							)));
-						}
-					break;
-				}
-
-				$this->frontend('imageset', array('edit', 'details'), array('refresh', 'export', 'delete'));
-			break;
-		}
-	}
-
-	/**
-	* Build Frontend with supplied options
-	*/
-	function frontend($mode, $options, $actions)
-	{
-		$sql_from = '';
-		$style_count = array();
-
-		switch ($mode)
-		{
-			case 'style':
-				$sql_from = STYLES_TABLE;
-
-				$sql = 'SELECT user_style, COUNT(user_style) AS style_count
-					FROM ' . USERS_TABLE . '
-					GROUP BY user_style';
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$style_count[$row['user_style']] = $row['style_count'];
-				}
-				phpbb::$db->sql_freeresult($result);
-
-			break;
-
-			case 'template':
-				$sql_from = STYLES_TEMPLATE_TABLE;
-			break;
-
-			case 'theme':
-				$sql_from = STYLES_THEME_TABLE;
-			break;
-
-			case 'imageset':
-				$sql_from = STYLES_IMAGESET_TABLE;
-			break;
-		}
-
-		$l_prefix = strtoupper($mode);
-
-		$this->page_title = 'ACP_' . $l_prefix . 'S';
-
-		phpbb::$template->assign_vars(array(
-			'S_FRONTEND'		=> true,
-			'S_STYLE'			=> ($mode == 'style') ? true : false,
-
-			'L_TITLE'			=> phpbb::$user->lang[$this->page_title],
-			'L_EXPLAIN'			=> phpbb::$user->lang[$this->page_title . '_EXPLAIN'],
-			'L_NAME'			=> phpbb::$user->lang[$l_prefix . '_NAME'],
-			'L_INSTALLED'		=> phpbb::$user->lang['INSTALLED_' . $l_prefix],
-			'L_UNINSTALLED'		=> phpbb::$user->lang['UNINSTALLED_' . $l_prefix],
-			'L_NO_UNINSTALLED'	=> phpbb::$user->lang['NO_UNINSTALLED_' . $l_prefix],
-			'L_CREATE'			=> phpbb::$user->lang['CREATE_' . $l_prefix],
-
-			'U_ACTION'			=> $this->u_action,
-		));
-
-		$sql = "SELECT *
-			FROM $sql_from";
-		$result = phpbb::$db->sql_query($sql);
-
-		$installed = array();
-
-		$basis_options = '<option class="sep" value="">' . phpbb::$user->lang['OPTIONAL_BASIS'] . '</option>';
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$installed[] = $row[$mode . '_name'];
-			$basis_options .= '<option value="' . $row[$mode . '_id'] . '">' . $row[$mode . '_name'] . '</option>';
-
-			$stylevis = ($mode == 'style' && !$row['style_active']) ? 'activate' : 'deactivate';
-
-			$s_options = array();
-			foreach ($options as $option)
-			{
-				$s_options[] = '<a href="' . $this->u_action . "&amp;action=$option&amp;id=" . $row[$mode . '_id'] . '">' . phpbb::$user->lang[strtoupper($option)] . '</a>';
-			}
-
-			$s_actions = array();
-			foreach ($actions as $option)
-			{
-				$s_actions[] = '<a href="' . $this->u_action . "&amp;action=$option&amp;id=" . $row[$mode . '_id'] . '">' . phpbb::$user->lang[strtoupper($option)] . '</a>';
-			}
-
-			phpbb::$template->assign_block_vars('installed', array(
-				'S_DEFAULT_STYLE'		=> ($mode == 'style' && $row['style_id'] == phpbb::$config['default_style']) ? true : false,
-				'U_EDIT'				=> $this->u_action . '&amp;action=' . (($mode == 'style') ? 'details' : 'edit') . '&amp;id=' . $row[$mode . '_id'],
-				'U_STYLE_ACT_DEACT'		=> $this->u_action . '&amp;action=' . $stylevis . '&amp;id=' . $row[$mode . '_id'],
-				'L_STYLE_ACT_DEACT'		=> phpbb::$user->lang['STYLE_' . strtoupper($stylevis)],
-				'S_OPTIONS'				=> implode(' | ', $s_options),
-				'S_ACTIONS'				=> implode(' | ', $s_actions),
-				'U_PREVIEW'				=> ($mode == 'style') ? append_sid('index', "style=" . $row[$mode . '_id']) : '',
-
-				'NAME'					=> $row[$mode . '_name'],
-				'STYLE_COUNT'			=> ($mode == 'style' && isset($style_count[$row['style_id']])) ? $style_count[$row['style_id']] : 0,
-			));
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// Grab uninstalled items
-		$new_ary = $cfg = array();
-
-		$dp = @opendir(PHPBB_ROOT_PATH . 'styles');
-
-		if ($dp)
-		{
-			while (($file = readdir($dp)) !== false)
-			{
-				$subpath = ($mode != 'style') ? "$mode/" : '';
-				if ($file[0] != '.' && file_exists(PHPBB_ROOT_PATH . "styles/$file/$subpath$mode.cfg"))
-				{
-					if ($cfg = file(PHPBB_ROOT_PATH . "styles/$file/$subpath$mode.cfg"))
-					{
-						$items = parse_cfg_file('', $cfg);
-						$name = (isset($items['name'])) ? trim($items['name']) : false;
-
-						if ($name && !in_array($name, $installed))
-						{
-							$new_ary[] = array(
-								'path'		=> $file,
-								'name'		=> $name,
-								'copyright'	=> $items['copyright'],
-							);
-						}
-					}
-				}
-			}
-			closedir($dp);
-		}
-
-		unset($installed);
-
-		if (sizeof($new_ary))
-		{
-			foreach ($new_ary as $cfg)
-			{
-				phpbb::$template->assign_block_vars('uninstalled', array(
-					'NAME'			=> $cfg['name'],
-					'COPYRIGHT'		=> $cfg['copyright'],
-					'U_INSTALL'		=> $this->u_action . '&amp;action=install&amp;path=' . urlencode($cfg['path']),
-				));
-			}
-		}
-		unset($new_ary);
-
-		phpbb::$template->assign_vars(array(
-			'S_BASIS_OPTIONS'		=> $basis_options,
-		));
-
-	}
-
-	/**
-	* Provides a template editor which allows saving changes to template files on the filesystem or in the database.
-	*
-	* @param int $template_id specifies which template set is being edited
-	*/
-	function edit_template($template_id)
-	{
-		global $safe_mode;
-
-		if (defined('PHPBB_DISABLE_ACP_EDITOR'))
-		{
-			trigger_error(phpbb::$user->lang['EDITOR_DISABLED'] . adm_back_link($this->u_action));
-		}
-
-		$this->page_title = 'EDIT_TEMPLATE';
-
-		$filelist = $filelist_cats = array();
-
-		$template_data	= utf8_normalize_nfc(request_var('template_data', '', true));
-		$template_data	= htmlspecialchars_decode($template_data);
-		$template_file	= utf8_normalize_nfc(request_var('template_file', '', true));
-		$text_rows		= max(5, min(999, request_var('text_rows', 20)));
-		$save_changes	= phpbb_request::is_set_post('save');
-
-		// make sure template_file path doesn't go upwards
-		$template_file = str_replace('..', '.', $template_file);
-
-		// Retrieve some information about the template
-		$sql = 'SELECT template_path, template_name
-			FROM ' . STYLES_TEMPLATE_TABLE . "
-			WHERE template_id = $template_id";
-		$result = phpbb::$db->sql_query($sql);
-		$template_info = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$template_info)
-		{
-			trigger_error(phpbb::$user->lang['NO_TEMPLATE'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
-		if ($save_changes && !check_form_key('acp_styles'))
-		{
-			trigger_error(phpbb::$user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-		else if (!$save_changes)
-		{
-			add_form_key('acp_styles');
-		}
-
-		// save changes to the template if the user submitted any
-		if ($save_changes && $template_file)
-		{
-			// Get the filesystem location of the current file
-			$file = PHPBB_ROOT_PATH . "styles/{$template_info['template_path']}/template/$template_file";
-			$additional = '';
-
-			// If the template is stored on the filesystem try to write the file else store it in the database
-			//if (!$safe_mode && !$template_info['template_storedb'] && file_exists($file) && @is_writable($file))
-			if (!($fp = @fopen($file, 'wb')))
-			{
-				trigger_error(phpbb::$user->lang['NO_TEMPLATE'] . adm_back_link($this->u_action), E_USER_WARNING);
-			}
-			fwrite($fp, $template_data);
-			fclose($fp);
-
-			// destroy the cached version of the template (filename without extension)
-			$this->clear_template_cache($template_info, array(substr($template_file, 0, -5)));
-
-			phpbb::$acm->destroy_sql(STYLES_TABLE);
-
-			add_log('admin', 'LOG_TEMPLATE_EDIT', $template_info['template_name'], $template_file);
-			trigger_error(phpbb::$user->lang['TEMPLATE_FILE_UPDATED'] . $additional . adm_back_link($this->u_action . "&amp;action=edit&amp;id=$template_id&amp;text_rows=$text_rows&amp;template_file=$template_file"));
-		}
-
-		// Generate a category array containing template filenames
-		$template_path = PHPBB_ROOT_PATH . "styles/{$template_info['template_path']}/template";
-
-		$filelist = filelist($template_path, '', 'html');
-		$filelist[''] = array_diff($filelist[''], array('bbcode.html'));
-
-		if ($template_file)
-		{
-			if (!file_exists($template_path . "/$template_file") || !($template_data = file_get_contents($template_path . "/$template_file")))
-			{
-				trigger_error(phpbb::$user->lang['NO_TEMPLATE'] . adm_back_link($this->u_action), E_USER_WARNING);
-			}
-		}
-
-		// Now create the categories
-		$filelist_cats[''] = array();
-		foreach ($filelist as $pathfile => $file_ary)
-		{
-			// Use the directory name as category name
-			if (!empty($pathfile))
-			{
-				$filelist_cats[$pathfile] = array();
-				foreach ($file_ary as $file)
-				{
-					$filelist_cats[$pathfile][$pathfile . $file] = $file;
-				}
-			}
-			// or if it's in the main category use the word before the first underscore to group files
-			else
-			{
-				$cats = array();
-				foreach ($file_ary as $file)
-				{
-					$cats[] = substr($file, 0, strpos($file, '_'));
-					$filelist_cats[substr($file, 0, strpos($file, '_'))][$file] = $file;
-				}
-
-				$cats = array_values(array_unique($cats));
-
-				// we don't need any single element categories so put them into the misc '' category
-				for ($i = 0, $n = sizeof($cats); $i < $n; $i++)
-				{
-					if (sizeof($filelist_cats[$cats[$i]]) == 1 && $cats[$i] !== '')
-					{
-						$filelist_cats[''][key($filelist_cats[$cats[$i]])] = current($filelist_cats[$cats[$i]]);
-						unset($filelist_cats[$cats[$i]]);
-					}
-				}
-				unset($cats);
-			}
-		}
-		unset($filelist);
-
-		// Generate list of categorised template files
-		$tpl_options = '';
-		ksort($filelist_cats);
-		foreach ($filelist_cats as $category => $tpl_ary)
-		{
-			ksort($tpl_ary);
-
-			if (!empty($category))
-			{
-				$tpl_options .= '<option class="sep" value="">' . $category . '</option>';
-			}
-
-			foreach ($tpl_ary as $filename => $file)
-			{
-				$selected = ($template_file == $filename) ? ' selected="selected"' : '';
-				$tpl_options .= '<option value="' . $filename . '"' . $selected . '>' . $file . '</option>';
-			}
-		}
-
-		phpbb::$template->assign_vars(array(
-			'S_EDIT_TEMPLATE'	=> true,
-			'S_HIDDEN_FIELDS'	=> build_hidden_fields(array('template_file' => $template_file)),
-			'S_TEMPLATES'		=> $tpl_options,
-
-			'U_ACTION'			=> $this->u_action . "&amp;action=edit&amp;id=$template_id&amp;text_rows=$text_rows",
-			'U_BACK'			=> $this->u_action,
-
-			'L_EDIT'			=> phpbb::$user->lang['EDIT_TEMPLATE'],
-			'L_EDIT_EXPLAIN'	=> phpbb::$user->lang['EDIT_TEMPLATE_EXPLAIN'],
-			'L_EDITOR'			=> phpbb::$user->lang['TEMPLATE_EDITOR'],
-			'L_EDITOR_HEIGHT'	=> phpbb::$user->lang['TEMPLATE_EDITOR_HEIGHT'],
-			'L_FILE'			=> phpbb::$user->lang['TEMPLATE_FILE'],
-			'L_SELECT'			=> phpbb::$user->lang['SELECT_TEMPLATE'],
-			'L_SELECTED'		=> phpbb::$user->lang['SELECTED_TEMPLATE'],
-			'L_SELECTED_FILE'	=> phpbb::$user->lang['SELECTED_TEMPLATE_FILE'],
-
-			'SELECTED_TEMPLATE'	=> $template_info['template_name'],
-			'TEMPLATE_FILE'		=> $template_file,
-			'TEMPLATE_DATA'		=> utf8_htmlspecialchars($template_data),
-			'TEXT_ROWS'			=> $text_rows,
-		));
-	}
-
-	/**
-	* Allows the admin to view cached versions of template files and clear single template cache files
-	*
-	* @param int $template_id specifies which template's cache is shown
-	*/
-	function template_cache($template_id)
-	{
-		$source		= str_replace('/', '.', request_var('source', ''));
-		$file_ary	= array_diff(request_var('delete', array('')), array(''));
-		$submit		= phpbb_request::is_set_post('submit');
-
-		$sql = 'SELECT *
-			FROM ' . STYLES_TEMPLATE_TABLE . "
-			WHERE template_id = $template_id";
-		$result = phpbb::$db->sql_query($sql);
-		$template_row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$template_row)
-		{
-			trigger_error(phpbb::$user->lang['NO_TEMPLATE'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
-		// User wants to delete one or more files ...
-		if ($submit && $file_ary)
-		{
-			$this->clear_template_cache($template_row, $file_ary);
-			trigger_error(phpbb::$user->lang['TEMPLATE_CACHE_CLEARED'] . adm_back_link($this->u_action . "&amp;action=cache&amp;id=$template_id"));
-		}
-
-		$cache_prefix = 'tpl_' . str_replace('_', '-', $template_row['template_path']);
-
-		// Someone wants to see the cached source ... so we'll highlight it,
-		// add line numbers and indent it appropriately. This could be nasty
-		// on larger source files ...
-		if ($source && file_exists(PHPBB_ROOT_PATH . "cache/{$cache_prefix}_$source.html." . PHP_EXT))
-		{
-			page_header(phpbb::$user->lang['TEMPLATE_CACHE']);
-
-			phpbb::$template->set_filenames(array(
-				'body'	=> 'viewsource.html',
-			));
-
-			phpbb::$template->assign_vars(array(
-				'FILENAME'	=> str_replace('.', '/', $source) . '.html',
-			));
-
-			$code = str_replace(array("\r\n", "\r"), array("\n", "\n"), file_get_contents(PHPBB_ROOT_PATH . "cache/{$cache_prefix}_$source.html." . PHP_EXT));
-
-			$conf = array('highlight.bg', 'highlight.comment', 'highlight.default', 'highlight.html', 'highlight.keyword', 'highlight.string');
-			foreach ($conf as $ini_var)
-			{
-				@ini_set($ini_var, str_replace('highlight.', 'syntax', $ini_var));
-			}
-
-			$marker = 'MARKER' . time();
-			$code = highlight_string(str_replace("\n", $marker, $code), true);
-			$code = str_replace($marker, "\n", $code);
-			$str_from = array('<span style="color: ', '<font color="syntax', '</font>', '<code>', '</code>','[', ']', '.', ':');
-			$str_to = array('<span class="', '<span class="syntax', '</span>', '', '', '&#91;', '&#93;', '&#46;', '&#58;');
-
-			$code = str_replace($str_from, $str_to, $code);
-			$code = preg_replace('#^(<span class="[a-z_]+">)\n?(.*?)\n?(</span>)$#ism', '$1$2$3', $code);
-			$code = substr($code, strlen('<span class="syntaxhtml">'));
-			$code = substr($code, 0, -1 * strlen('</ span>'));
-			$code = explode("\n", $code);
-
-			foreach ($code as $key => $line)
-			{
-				phpbb::$template->assign_block_vars('source', array(
-					'LINENUM'	=> $key + 1,
-					'LINE'		=> preg_replace('#([^ ;])&nbsp;([^ &])#', '$1 $2', $line),
-				));
-				unset($code[$key]);
-			}
-
-			page_footer();
-		}
-
-		// Get a list of cached template files and then retrieve additional information about them
-		$file_ary = $this->template_cache_filelist($template_row['template_path']);
-
-		foreach ($file_ary as $file)
-		{
-			$file 		= str_replace('/', '.', $file);
-
-			// perform some dirty guessing to get the path right.
-			// We assume that three dots in a row were '../'
-			$tpl_file 	= str_replace('.', '/', $file);
-			$tpl_file 	= str_replace('///', '../', $tpl_file);
-
-			$filename = "{$cache_prefix}_$file.html." . PHP_EXT;
-
-			if (!file_exists(PHPBB_ROOT_PATH . "cache/$filename"))
-			{
-				continue;
-			}
-
-			phpbb::$template->assign_block_vars('file', array(
-				'U_VIEWSOURCE'	=> $this->u_action . "&amp;action=cache&amp;id=$template_id&amp;source=$file",
-
-				'CACHED'		=> phpbb::$user->format_date(filemtime(PHPBB_ROOT_PATH . "cache/$filename")),
-				'FILENAME'		=> $file,
-				'FILESIZE'		=> sprintf('%.1f ' . phpbb::$user->lang['KIB'], filesize(PHPBB_ROOT_PATH . "cache/$filename") / 1024),
-				'MODIFIED'		=> phpbb::$user->format_date(filemtime(PHPBB_ROOT_PATH . "styles/{$template_row['template_path']}/template/$tpl_file.html")),
-			));
-		}
-
-		phpbb::$template->assign_vars(array(
-			'S_CACHE'			=> true,
-			'S_TEMPLATE'		=> true,
-
-			'U_ACTION'			=> $this->u_action . "&amp;action=cache&amp;id=$template_id",
-			'U_BACK'			=> $this->u_action,
-		));
-	}
-
-	/**
-	* Provides a css editor and a basic easier to use stylesheet editing tool for less experienced (or lazy) users
-	*
-	* @param int $theme_id specifies which theme is being edited
-	*/
-	function edit_theme($theme_id)
-	{
-		global $safe_mode;
-
-		$this->page_title = 'EDIT_THEME';
-
-		$filelist = $filelist_cats = array();
-
-		$theme_data		= utf8_normalize_nfc(request_var('template_data', '', true));
-		$theme_data		= htmlspecialchars_decode($theme_data);
-		$theme_file		= utf8_normalize_nfc(request_var('template_file', '', true));
-		$text_rows		= max(5, min(999, request_var('text_rows', 20)));
-		$save_changes	= phpbb_request::is_set_post('save');
-
-		// make sure theme_file path doesn't go upwards
-		$theme_file = str_replace('..', '.', $theme_file);
-
-		// Retrieve some information about the theme
-		$sql = 'SELECT theme_storedb, theme_path, theme_name, theme_data
-			FROM ' . STYLES_THEME_TABLE . "
-			WHERE theme_id = $theme_id";
-		$result = phpbb::$db->sql_query($sql);
-
-		if (!($theme_info = phpbb::$db->sql_fetchrow($result)))
-		{
-			trigger_error(phpbb::$user->lang['NO_THEME'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$theme_info['theme_id'] = $theme_id;
-		self::generate_stylesheets($theme_info);
-
-		// save changes to the theme if the user submitted any
-		if ($save_changes)
-		{
-			// Get the filesystem location of the current file
-			$file = PHPBB_ROOT_PATH . "styles/{$theme_info['theme_path']}/theme/$theme_file";
-			$additional = '';
-			$message = phpbb::$user->lang['THEME_UPDATED'];
-
-			// If the theme is stored on the filesystem try to write the file else store it in the database
-			if (!$safe_mode && !$theme_info['theme_storedb'] && file_exists($file) && @is_writable($file))
-			{
-				if (!($fp = @fopen($file, 'wb')))
-				{
-					trigger_error(phpbb::$user->lang['NO_THEME'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-				fwrite($fp, $theme_data);
-				fclose($fp);
-			}
-			else
-			{
-				// Write stylesheet to db
-				$sql_ary = array(
-					'theme_mtime'		=> time(),
-					'theme_storedb'		=> 1,
-					'theme_data'		=> self::db_theme_data($theme_info, $theme_data),
-				);
-				$sql = 'UPDATE ' . STYLES_THEME_TABLE . '
-					SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-					WHERE theme_id = ' . $theme_id;
-				phpbb::$db->sql_query($sql);
-
-				phpbb::$acm->destroy_sql(STYLES_THEME_TABLE);
-
-				// notify the user if the theme was not stored in the db before his modification
-				if (!$theme_info['theme_storedb'])
-				{
-					add_log('admin', 'LOG_THEME_EDIT_DETAILS', $theme_info['theme_name']);
-					$message .= '<br />' . phpbb::$user->lang['EDIT_THEME_STORED_DB'];
-				}
-			}
-			phpbb::$acm->destroy_sql(STYLES_THEME_TABLE);
-			add_log('admin', (!$theme_info['theme_storedb']) ? 'LOG_THEME_EDIT_FILE' : 'LOG_THEME_EDIT', $theme_info['theme_name'], (!$theme_info['theme_storedb']) ? $theme_file : '');
-
-			trigger_error($message . adm_back_link($this->u_action . "&amp;action=edit&amp;id=$theme_id&amp;template_file=$theme_file&amp;text_rows=$text_rows"));
-		}
-
-		// Generate a category array containing theme filenames
-		if (!$theme_info['theme_storedb'])
-		{
-			$theme_path = PHPBB_ROOT_PATH ."styles/{$theme_info['theme_path']}/theme";
-
-			$filelist = filelist($theme_path, '', 'css');
-
-			if ($theme_file)
-			{
-				if (!file_exists($theme_path . "/$theme_file") || !($theme_data = file_get_contents($theme_path . "/$theme_file")))
-				{
-					trigger_error(phpbb::$user->lang['NO_THEME'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-			}
-		}
-		else
-		{
-			$theme_data = &$theme_info['theme_data'];
-		}
-
-		// Now create the categories
-		$filelist_cats[''] = array();
-		foreach ($filelist as $pathfile => $file_ary)
-		{
-			// Use the directory name as category name
-			if (!empty($pathfile))
-			{
-				$filelist_cats[$pathfile] = array();
-				foreach ($file_ary as $file)
-				{
-					$filelist_cats[$pathfile][$pathfile . $file] = $file;
-				}
-			}
-			// or if it's in the main category use the word before the first underscore to group files
-			else
-			{
-				$cats = array();
-				foreach ($file_ary as $file)
-				{
-					$cats[] = substr($file, 0, strpos($file, '_'));
-					$filelist_cats[substr($file, 0, strpos($file, '_'))][$file] = $file;
-				}
-
-				$cats = array_values(array_unique($cats));
-
-				// we don't need any single element categories so put them into the misc '' category
-				for ($i = 0, $n = sizeof($cats); $i < $n; $i++)
-				{
-					if (sizeof($filelist_cats[$cats[$i]]) == 1 && $cats[$i] !== '')
-					{
-						$filelist_cats[''][key($filelist_cats[$cats[$i]])] = current($filelist_cats[$cats[$i]]);
-						unset($filelist_cats[$cats[$i]]);
-					}
-				}
-				unset($cats);
-			}
-		}
-		unset($filelist);
-
-		// Generate list of categorised theme files
-		$tpl_options = '';
-		ksort($filelist_cats);
-		foreach ($filelist_cats as $category => $tpl_ary)
-		{
-			ksort($tpl_ary);
-
-			if (!empty($category))
-			{
-				$tpl_options .= '<option class="sep" value="">' . $category . '</option>';
-			}
-
-			foreach ($tpl_ary as $filename => $file)
-			{
-				$selected = ($theme_file == $filename) ? ' selected="selected"' : '';
-				$tpl_options .= '<option value="' . $filename . '"' . $selected . '>' . $file . '</option>';
-			}
-		}
-
-		phpbb::$template->assign_vars(array(
-			'S_EDIT_THEME'		=> true,
-			'S_HIDDEN_FIELDS'	=> build_hidden_fields(array('template_file' => $theme_file)),
-			'S_THEME_IN_DB'		=> $theme_info['theme_storedb'],
-			'S_TEMPLATES'		=> $tpl_options,
-
-			'U_ACTION'			=> $this->u_action . "&amp;action=edit&amp;id=$theme_id&amp;text_rows=$text_rows",
-			'U_BACK'			=> $this->u_action,
-
-			'L_EDIT'			=> phpbb::$user->lang['EDIT_THEME'],
-			'L_EDIT_EXPLAIN'	=> phpbb::$user->lang['EDIT_THEME_EXPLAIN'],
-			'L_EDITOR'			=> phpbb::$user->lang['THEME_EDITOR'],
-			'L_EDITOR_HEIGHT'	=> phpbb::$user->lang['THEME_EDITOR_HEIGHT'],
-			'L_FILE'			=> phpbb::$user->lang['THEME_FILE'],
-			'L_SELECT'			=> phpbb::$user->lang['SELECT_THEME'],
-			'L_SELECTED'		=> phpbb::$user->lang['SELECTED_THEME'],
-			'L_SELECTED_FILE'	=> phpbb::$user->lang['SELECTED_THEME_FILE'],
-
-			'SELECTED_TEMPLATE'	=> $theme_info['theme_name'],
-			'TEMPLATE_FILE'		=> $theme_file,
-			'TEMPLATE_DATA'		=> utf8_htmlspecialchars($theme_data),
-			'TEXT_ROWS'			=> $text_rows,
-		));
-	}
-
-
-	/**
-	* Edit imagesets
-	*
-	* @param int $imageset_id specifies which imageset is being edited
-	*/
-	function edit_imageset($imageset_id)
-	{
-		$this->page_title = 'EDIT_IMAGESET';
-
-		if (!$imageset_id)
-		{
-			trigger_error(phpbb::$user->lang['NO_IMAGESET'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
-		$update		= phpbb_request::is_set_post('update');
-		$imgname	= request_var('imgname', 'site_logo');
-		$imgname	= preg_replace('#[^a-z0-9\-+_]#i', '', $imgname);
-		$sql_extra = $imgnamelang = '';
-
-		$sql = 'SELECT imageset_path, imageset_name
-			FROM ' . STYLES_IMAGESET_TABLE . "
-			WHERE imageset_id = $imageset_id";
-		$result = phpbb::$db->sql_query($sql);
-		$imageset_row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$imageset_row)
-		{
-			trigger_error(phpbb::$user->lang['NO_IMAGESET'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
-		$imageset_path		= $imageset_row['imageset_path'];
-		$imageset_name		= $imageset_row['imageset_name'];
-
-		if (strpos($imgname, '-') !== false)
-		{
-			list($imgname, $imgnamelang) = explode('-', $imgname);
-			$sql_extra = " AND image_lang IN ('" . phpbb::$db->sql_escape($imgnamelang) . "', '')";
-		}
-
-		$sql = 'SELECT image_filename, image_width, image_height, image_lang, image_id
-			FROM ' . STYLES_IMAGESET_DATA_TABLE . "
-			WHERE imageset_id = $imageset_id
-				AND image_name = '" . phpbb::$db->sql_escape($imgname) . "'$sql_extra";
-		$result = phpbb::$db->sql_query($sql);
-		$imageset_data_row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		$image_filename	= $imageset_data_row['image_filename'];
-		$image_width	= $imageset_data_row['image_width'];
-		$image_height	= $imageset_data_row['image_height'];
-		$image_lang		= $imageset_data_row['image_lang'];
-		$image_id		= $imageset_data_row['image_id'];
-		$imgsize		= ($imageset_data_row['image_width'] && $imageset_data_row['image_height']) ? 1 : 0;
-
-		// Check to see whether the selected image exists in the table
-		$valid_name = ($update) ? false : true;
-
-		foreach ($this->imageset_keys as $category => $img_ary)
-		{
-			if (in_array($imgname, $img_ary))
-			{
-				$valid_name = true;
-				break;
-			}
-		}
-
-		if ($update && phpbb_request::is_set_post('imgpath') && $valid_name)
-		{
-			// If imgwidth and imgheight are non-zero grab the actual size
-			// from the image itself ... we ignore width settings for the poll center image
-			$imgwidth	= request_var('imgwidth', 0);
-			$imgheight	= request_var('imgheight', 0);
-			$imgsize	= request_var('imgsize', 0);
-			$imgpath	= request_var('imgpath', '');
-			$imgpath	= str_replace('..', '.', $imgpath);
-
-			// If no dimensions selected, we reset width and height to 0 ;)
-			if (!$imgsize)
-			{
-				$imgwidth = $imgheight = 0;
-			}
-
-			$imglang = '';
-
-			if ($imgpath && !file_exists(PHPBB_ROOT_PATH . "styles/$imageset_path/imageset/$imgpath"))
-			{
-				trigger_error(phpbb::$user->lang['NO_IMAGE_ERROR'] . adm_back_link($this->u_action), E_USER_WARNING);
-			}
-
-			// Determine width/height. If dimensions included and no width/height given, we detect them automatically...
-			if ($imgsize && $imgpath)
-			{
-				if (!$imgwidth || !$imgheight)
-				{
-					list($imgwidth_file, $imgheight_file) = getimagesize(PHPBB_ROOT_PATH . "styles/$imageset_path/imageset/$imgpath");
-					$imgwidth = ($imgwidth) ? $imgwidth : $imgwidth_file;
-					$imgheight = ($imgheight) ? $imgheight : $imgheight_file;
-				}
-				$imgwidth	= ($imgname != 'poll_center') ? (int) $imgwidth : 0;
-				$imgheight	= (int) $imgheight;
-			}
-
-			if (strpos($imgpath, '/') !== false)
-			{
-				list($imglang, $imgfilename) = explode('/', $imgpath);
-			}
-			else
-			{
-				$imgfilename = $imgpath;
-			}
-
-			$sql_ary = array(
-				'image_filename'	=> (string) $imgfilename,
-				'image_width'		=> (int) $imgwidth,
-				'image_height'		=> (int) $imgheight,
-				'image_lang'		=> (string) $imglang,
-			);
-
-			// already exists
-			if ($imageset_data_row)
-			{
-				$sql = 'UPDATE ' . STYLES_IMAGESET_DATA_TABLE . '
-					SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . "
-					WHERE image_id = $image_id";
-				phpbb::$db->sql_query($sql);
-			}
-			// does not exist
-			else if (!$imageset_data_row)
-			{
-				$sql_ary['image_name']	= $imgname;
-				$sql_ary['imageset_id']	= (int) $imageset_id;
-				phpbb::$db->sql_query('INSERT INTO ' . STYLES_IMAGESET_DATA_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary));
-			}
-
-			phpbb::$acm->destroy_sql(STYLES_IMAGESET_DATA_TABLE);
-
-			add_log('admin', 'LOG_IMAGESET_EDIT', $imageset_name);
-
-			phpbb::$template->assign_var('SUCCESS', true);
-
-			$image_filename = $imgfilename;
-			$image_width	= $imgwidth;
-			$image_height	= $imgheight;
-			$image_lang		= $imglang;
-		}
-
-		$imglang = '';
-		$imagesetlist = array('nolang' => array(), 'lang' => array());
-		$langs = array();
-
-		$dir = PHPBB_ROOT_PATH . "styles/$imageset_path/imageset";
-		$dp = @opendir($dir);
-
-		if ($dp)
-		{
-			while (($file = readdir($dp)) !== false)
-			{
-				if ($file[0] != '.' && strtoupper($file) != 'CVS' && !is_file($dir . '/' . $file) && !is_link($dir . '/' . $file))
-				{
-					$langs[] = $file;
-				}
-				else if (preg_match('#\.(?:gif|jpg|png)$#', $file))
-				{
-					$imagesetlist['nolang'][] = $file;
-				}
-			}
-
-			if ($sql_extra)
-			{
-				$dp2 = @opendir("$dir/$imgnamelang");
-
-				if ($dp2)
-				{
-					while (($file2 = readdir($dp2)) !== false)
-					{
-						if (preg_match('#\.(?:gif|jpg|png)$#', $file2))
-						{
-							$imagesetlist['lang'][] = "$imgnamelang/$file2";
-						}
-					}
-					closedir($dp2);
-				}
-			}
-			closedir($dp);
-		}
-
-		// Generate list of image options
-		$img_options = '';
-		foreach ($this->imageset_keys as $category => $img_ary)
-		{
-			phpbb::$template->assign_block_vars('category', array(
-				'NAME'			=> phpbb::$user->lang['IMG_CAT_' . strtoupper($category)],
-			));
-
-			foreach ($img_ary as $img)
-			{
-				if ($category == 'buttons')
-				{
-					foreach ($langs as $language)
-					{
-						phpbb::$template->assign_block_vars('category.images', array(
-							'SELECTED'			=> ($img == $imgname && $language == $imgnamelang),
-							'VALUE'				=> $img . '-' . $language,
-							'TEXT'				=> phpbb::$user->lang['IMG_' . strtoupper($img)] . ' [ ' . $language . ' ]',
-						));
-					}
-				}
-				else
-				{
-					phpbb::$template->assign_block_vars('category.images', array(
-						'SELECTED'			=> ($img == $imgname),
-						'VALUE'				=> $img,
-						'TEXT'				=> (($category == 'custom') ? $img : phpbb::$user->lang['IMG_' . strtoupper($img)]),
-					));
-				}
-			}
-		}
-
-		// Make sure the list of possible images is sorted alphabetically
-		sort($imagesetlist['lang']);
-		sort($imagesetlist['nolang']);
-
-		$image_found = false;
-		$img_val = '';
-		foreach ($imagesetlist as $type => $img_ary)
-		{
-			if ($type !== 'lang' || $sql_extra)
-			{
-				phpbb::$template->assign_block_vars('imagesetlist', array(
-					'TYPE'	=> ($type == 'lang'),
-				));
-			}
-
-			foreach ($img_ary as $img)
-			{
-				$imgtext = preg_replace('/^([^\/]+\/)/', '', $img);
-				$selected = (!empty($imgname) && strpos($image_filename, $imgtext) !== false);
-				if ($selected)
-				{
-					$image_found = true;
-					$img_val = htmlspecialchars($img);
-				}
-				phpbb::$template->assign_block_vars('imagesetlist.images', array(
-					'SELECTED'			=> $selected,
-					'TEXT'				=> $imgtext,
-					'VALUE'				=> htmlspecialchars($img),
-				));
-			}
-		}
-
-		$imgsize_bool = (!empty($imgname) && $image_width && $image_height) ? true : false;
-		$image_request = '../styles/' . $imageset_path . '/imageset/' . ($image_lang ? $imgnamelang . '/' : '') . $image_filename;
-
-		phpbb::$template->assign_vars(array(
-			'S_EDIT_IMAGESET'	=> true,
-			'L_TITLE'			=> phpbb::$user->lang[$this->page_title],
-			'L_EXPLAIN'			=> phpbb::$user->lang[$this->page_title . '_EXPLAIN'],
-			'IMAGE_OPTIONS'		=> $img_options,
-			'IMAGE_SIZE'		=> $image_width,
-			'IMAGE_HEIGHT'		=> $image_height,
-			'IMAGE_REQUEST'		=> (empty($image_filename)) ? 'images/no_image.png' : $image_request,
-			'U_ACTION'			=> $this->u_action . "&amp;action=edit&amp;id=$imageset_id",
-			'U_BACK'			=> $this->u_action,
-			'NAME'				=> $imageset_name,
-			'A_NAME'			=> addslashes($imageset_name),
-			'PATH'				=> $imageset_path,
-			'A_PATH'			=> addslashes($imageset_path),
-			'ERROR'				=> !$valid_name,
-			'IMG_SRC'			=> ($image_found) ? '../styles/' . $imageset_path . '/imageset/' . $img_val : 'images/no_image.png',
-			'IMAGE_SELECT'		=> $image_found,
-		));
-	}
-
-	/**
-	* Remove style/template/theme/imageset
-	*/
-	function remove($mode, $style_id)
-	{
-		$new_id = request_var('new_id', 0);
-		$update = phpbb_request::is_set_post('update');
-		$sql_where = '';
-
-		switch ($mode)
-		{
-			case 'style':
-				$sql_from = STYLES_TABLE;
-				$sql_select = 'style_name';
-				$sql_where = 'AND style_active = 1';
-			break;
-
-			case 'template':
-				$sql_from = STYLES_TEMPLATE_TABLE;
-				$sql_select = 'template_name, template_path';
-			break;
-
-			case 'theme':
-				$sql_from = STYLES_THEME_TABLE;
-				$sql_select = 'theme_name, theme_path, theme_storedb';
-			break;
-
-			case 'imageset':
-				$sql_from = STYLES_IMAGESET_TABLE;
-				$sql_select = 'imageset_name, imageset_path';
-			break;
-		}
-
-		$l_prefix = strtoupper($mode);
-
-		$sql = "SELECT $sql_select
-			FROM $sql_from
-			WHERE {$mode}_id = $style_id";
-		$result = phpbb::$db->sql_query($sql);
-		$style_row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$style_row)
-		{
-			trigger_error(phpbb::$user->lang['NO_' . $l_prefix] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
-		$sql = "SELECT {$mode}_id, {$mode}_name
-			FROM $sql_from
-			WHERE {$mode}_id <> $style_id
-			$sql_where
-			ORDER BY {$mode}_name ASC";
-		$result = phpbb::$db->sql_query($sql);
-
-		$s_options = '';
-
-		if ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			do
-			{
-				$s_options .= '<option value="' . $row[$mode . '_id'] . '">' . $row[$mode . '_name'] . '</option>';
-			}
-			while ($row = phpbb::$db->sql_fetchrow($result));
-		}
-		else
-		{
-			trigger_error(phpbb::$user->lang['ONLY_' . $l_prefix] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if ($update)
-		{
-			$sql = "DELETE FROM $sql_from
-				WHERE {$mode}_id = $style_id";
-			phpbb::$db->sql_query($sql);
-
-			if ($mode == 'style')
-			{
-				$sql = 'UPDATE ' . USERS_TABLE . "
-					SET user_style = $new_id
-					WHERE user_style = $style_id";
-				phpbb::$db->sql_query($sql);
-
-				$sql = 'UPDATE ' . FORUMS_TABLE . "
-					SET forum_style = $new_id
-					WHERE forum_style = $style_id";
-				phpbb::$db->sql_query($sql);
-
-				if ($style_id == phpbb::$config['default_style'])
-				{
-					set_config('default_style', $new_id);
-				}
-			}
-			else
-			{
-				if ($mode == 'imageset')
-				{
-					$sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . "
-						WHERE imageset_id = $style_id";
-					phpbb::$db->sql_query($sql);
-				}
-				$sql = 'UPDATE ' . STYLES_TABLE . "
-					SET {$mode}_id = $new_id
-					WHERE {$mode}_id = $style_id";
-				phpbb::$db->sql_query($sql);
-			}
-
-			phpbb::$acm->destroy_sql(STYLES_TABLE);
-
-			add_log('admin', 'LOG_' . $l_prefix . '_DELETE', $style_row[$mode . '_name']);
-			$message = ($mode != 'style') ? $l_prefix . '_DELETED_FS' : $l_prefix . '_DELETED';
-			trigger_error(phpbb::$user->lang[$message] . adm_back_link($this->u_action));
-		}
-
-		$this->page_title = 'DELETE_' . $l_prefix;
-
-		phpbb::$template->assign_vars(array(
-			'S_DELETE'			=> true,
-			'S_REPLACE_OPTIONS'	=> $s_options,
-
-			'L_TITLE'			=> phpbb::$user->lang[$this->page_title],
-			'L_EXPLAIN'			=> phpbb::$user->lang[$this->page_title . '_EXPLAIN'],
-			'L_NAME'			=> phpbb::$user->lang[$l_prefix . '_NAME'],
-			'L_REPLACE'			=> phpbb::$user->lang['REPLACE_' . $l_prefix],
-			'L_REPLACE_EXPLAIN'	=> phpbb::$user->lang['REPLACE_' . $l_prefix . '_EXPLAIN'],
-
-			'U_ACTION'		=> $this->u_action . "&amp;action=delete&amp;id=$style_id",
-			'U_BACK'		=> $this->u_action,
-
-			'NAME'			=> $style_row[$mode . '_name'],
-		));
-	}
-
-	/**
-	* Export style or style elements
-	*/
-	function export($mode, $style_id)
-	{
-		$update = phpbb_request::is_set_post('update');
-
-		$inc_template = request_var('inc_template', 0);
-		$inc_theme = request_var('inc_theme', 0);
-		$inc_imageset = request_var('inc_imageset', 0);
-		$store = request_var('store', 0);
-		$format = request_var('format', '');
-
-		$error = array();
-		$methods = array('tar');
-
-		$available_methods = array('tar.gz' => 'zlib', 'tar.bz2' => 'bz2', 'zip' => 'zlib');
-		foreach ($available_methods as $type => $module)
-		{
-			if (!@extension_loaded($module))
-			{
-				continue;
-			}
-
-			$methods[] = $type;
-		}
-
-		if (!in_array($format, $methods))
-		{
-			$format = 'tar';
-		}
-
-		switch ($mode)
-		{
-			case 'style':
-				if ($update && ($inc_template + $inc_theme + $inc_imageset) < 1)
-				{
-					$error[] = phpbb::$user->lang['STYLE_ERR_MORE_ELEMENTS'];
-				}
-
-				$name = 'style_name';
-
-				$sql_select = 's.style_id, s.style_name, s.style_copyright';
-				$sql_select .= ($inc_template) ? ', t.*' : ', t.template_name';
-				$sql_select .= ($inc_theme) ? ', c.*' : ', c.theme_name';
-				$sql_select .= ($inc_imageset) ? ', i.*' : ', i.imageset_name';
-				$sql_from = STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . ' i';
-				$sql_where = "s.style_id = $style_id AND t.template_id = s.template_id AND c.theme_id = s.theme_id AND i.imageset_id = s.imageset_id";
-
-				$l_prefix = 'STYLE';
-			break;
-
-			case 'template':
-				$name = 'template_name';
-
-				$sql_select = '*';
-				$sql_from = STYLES_TEMPLATE_TABLE;
-				$sql_where = "template_id = $style_id";
-
-				$l_prefix = 'TEMPLATE';
-			break;
-
-			case 'theme':
-				$name = 'theme_name';
-
-				$sql_select = '*';
-				$sql_from = STYLES_THEME_TABLE;
-				$sql_where = "theme_id = $style_id";
-
-				$l_prefix = 'THEME';
-			break;
-
-			case 'imageset':
-				$name = 'imageset_name';
-
-				$sql_select = '*';
-				$sql_from = STYLES_IMAGESET_TABLE;
-				$sql_where = "imageset_id = $style_id";
-
-				$l_prefix = 'IMAGESET';
-			break;
-		}
-
-		if ($update && !sizeof($error))
-		{
-			$sql = "SELECT $sql_select
-				FROM $sql_from
-				WHERE $sql_where";
-			$result = phpbb::$db->sql_query($sql);
-			$style_row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$style_row)
-			{
-				trigger_error(phpbb::$user->lang['NO_' . $l_prefix] . adm_back_link($this->u_action), E_USER_WARNING);
-			}
-
-			$var_ary = array('style_id', 'style_name', 'style_copyright', 'template_id', 'template_name', 'template_path', 'template_copyright', 'bbcode_bitfield', 'theme_id', 'theme_name', 'theme_path', 'theme_copyright', 'theme_storedb', 'theme_mtime', 'theme_data', 'imageset_id', 'imageset_name', 'imageset_path', 'imageset_copyright');
-
-			foreach ($var_ary as $var)
-			{
-				if (!isset($style_row[$var]))
-				{
-					$style_row[$var] = '';
-				}
-			}
-
-			$files = $data = array();
-
-			if ($mode == 'style')
-			{
-				$style_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['style_name'], $style_row['style_copyright'], phpbb::$config['version']), $this->style_cfg);
-
-				$style_cfg .= (!$inc_template) ? "\nrequired_template = {$style_row['template_name']}" : '';
-				$style_cfg .= (!$inc_theme) ? "\nrequired_theme = {$style_row['theme_name']}" : '';
-				$style_cfg .= (!$inc_imageset) ? "\nrequired_imageset = {$style_row['imageset_name']}" : '';
-
-				$data[] = array(
-					'src'		=> $style_cfg,
-					'prefix'	=> 'style.cfg'
-				);
-
-				unset($style_cfg);
-			}
-
-			// Export template core code
-			if ($mode == 'template' || $inc_template)
-			{
-				$template_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['template_name'], $style_row['template_copyright'], phpbb::$config['version']), $this->template_cfg);
-
-				$data[] = array(
-					'src'		=> $template_cfg,
-					'prefix'	=> 'template/template.cfg'
-				);
-
-				// This is potentially nasty memory-wise ...
-				$files[] = array(
-					'src'		=> "styles/{$style_row['template_path']}/template/",
-					'prefix-'	=> "styles/{$style_row['template_path']}/",
-					'prefix+'	=> false,
-					'exclude'	=> 'template.cfg'
-				);
-				unset($template_cfg);
-			}
-
-			// Export theme core code
-			if ($mode == 'theme' || $inc_theme)
-			{
-				$theme_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['theme_name'], $style_row['theme_copyright'], phpbb::$config['version']), $this->theme_cfg);
-
-				// Read old cfg file
-				$items = phpbb_cache::obtain_cfg_item($style_row, 'theme');
-
-				if (!isset($items['parse_css_file']))
-				{
-					$items['parse_css_file'] = 'off';
-				}
-
-				$theme_cfg = str_replace(array('{PARSE_CSS_FILE}'), array($items['parse_css_file']), $theme_cfg);
-
-				$files[] = array(
-					'src'		=> "styles/{$style_row['theme_path']}/theme/",
-					'prefix-'	=> "styles/{$style_row['theme_path']}/",
-					'prefix+'	=> false,
-					'exclude'	=> ($style_row['theme_storedb']) ? 'stylesheet.css,theme.cfg' : 'theme.cfg'
-				);
-
-				$data[] = array(
-					'src'		=> $theme_cfg,
-					'prefix'	=> 'theme/theme.cfg'
-				);
-
-				if ($style_row['theme_storedb'])
-				{
-					$data[] = array(
-						'src'		=> $style_row['theme_data'],
-						'prefix'	=> 'theme/stylesheet.css'
-					);
-				}
-
-				unset($items, $theme_cfg);
-			}
-
-			// Export imageset core code
-			if ($mode == 'imageset' || $inc_imageset)
-			{
-				$imageset_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['imageset_name'], $style_row['imageset_copyright'], phpbb::$config['version']), $this->imageset_cfg);
-
-				$imageset_main = array();
-
-				$sql = 'SELECT image_filename, image_name, image_height, image_width
-					FROM ' . STYLES_IMAGESET_DATA_TABLE . "
-					WHERE imageset_id = $style_id
-						AND image_lang = ''";
-				$result = phpbb::$db->sql_query($sql);
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$imageset_main[$row['image_name']] = $row['image_filename'] . ($row['image_height'] ? '*' . $row['image_height']: '') . ($row['image_width'] ? '*' . $row['image_width']: '');
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				foreach ($this->imageset_keys as $topic => $key_array)
-				{
-					foreach ($key_array as $key)
-					{
-						if (isset($imageset_main[$key]))
-						{
-							$imageset_cfg .= "\nimg_" . $key . ' = ' . str_replace("styles/{$style_row['imageset_path']}/imageset/", '{PATH}', $imageset_main[$key]);
-						}
-					}
-				}
-
-				$files[] = array(
-					'src'		=> "styles/{$style_row['imageset_path']}/imageset/",
-					'prefix-'	=> "styles/{$style_row['imageset_path']}/",
-					'prefix+'	=> false,
-					'exclude'	=> 'imageset.cfg'
-				);
-
-				$data[] = array(
-					'src'		=> trim($imageset_cfg),
-					'prefix'	=> 'imageset/imageset.cfg'
-				);
-
-				end($data);
-
-				$imageset_root = PHPBB_ROOT_PATH . "styles/{$style_row['imageset_path']}/imageset/";
-
-				if ($dh = @opendir($imageset_root))
-				{
-					while (($fname = readdir($dh)) !== false)
-					{
-						if ($fname[0] != '.' && $fname != 'CVS' && is_dir("$imageset_root$fname"))
-						{
-							$files[key($files)]['exclude'] .= ',' . $fname . '/imageset.cfg';
-						}
-					}
-					closedir($dh);
-				}
-
-				$imageset_lang = array();
-
-				$sql = 'SELECT image_filename, image_name, image_height, image_width, image_lang
-					FROM ' . STYLES_IMAGESET_DATA_TABLE . "
-					WHERE imageset_id = $style_id
-						AND image_lang <> ''";
-				$result = phpbb::$db->sql_query($sql);
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$imageset_lang[$row['image_lang']][$row['image_name']] = $row['image_filename'] . ($row['image_height'] ? '*' . $row['image_height']: '') . ($row['image_width'] ? '*' . $row['image_width']: '');
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				foreach ($imageset_lang as $lang => $imageset_localized)
-				{
-					$imageset_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['imageset_name'], $style_row['imageset_copyright'], phpbb::$config['version']), $this->imageset_cfg);
-
-					foreach ($this->imageset_keys as $topic => $key_array)
-					{
-						foreach ($key_array as $key)
-						{
-							if (isset($imageset_localized[$key]))
-							{
-								$imageset_cfg .= "\nimg_" . $key . ' = ' . str_replace("styles/{$style_row['imageset_path']}/imageset/", '{PATH}', $imageset_localized[$key]);
-							}
-						}
-					}
-
-					$data[] = array(
-						'src'		=> trim($imageset_cfg),
-						'prefix'	=> 'imageset/' . $lang . '/imageset.cfg'
-					);
-				}
-
-				unset($imageset_cfg);
-			}
-
-			switch ($format)
-			{
-				case 'tar':
-					$ext = '.tar';
-					$mimetype = 'x-tar';
-					$compress = 'compress_tar';
-				break;
-
-				case 'zip':
-					$ext = '.zip';
-					$mimetype = 'zip';
-				break;
-
-				case 'tar.gz':
-					$ext = '.tar.gz';
-					$mimetype = 'x-gzip';
-				break;
-
-				case 'tar.bz2':
-					$ext = '.tar.bz2';
-					$mimetype = 'x-bzip2';
-				break;
-
-				default:
-					$error[] = phpbb::$user->lang[$l_prefix . '_ERR_ARCHIVE'];
-			}
-
-			if (!sizeof($error))
-			{
-				include(PHPBB_ROOT_PATH . 'includes/functions_compress.' . PHP_EXT);
-
-				if ($mode == 'style')
-				{
-					$path = preg_replace('#[^\w-]+#', '_', $style_row['style_name']);
-				}
-				else
-				{
-					$path = $style_row[$mode . '_path'];
-				}
-
-				if ($format == 'zip')
-				{
-					$compress = new compress_zip('w', PHPBB_ROOT_PATH . "store/$path$ext");
-				}
-				else
-				{
-					$compress = new compress_tar('w', PHPBB_ROOT_PATH . "store/$path$ext", $ext);
-				}
-
-				if (sizeof($files))
-				{
-					foreach ($files as $file_ary)
-					{
-						$compress->add_file($file_ary['src'], $file_ary['prefix-'], $file_ary['prefix+'], $file_ary['exclude']);
-					}
-				}
-
-				if (sizeof($data))
-				{
-					foreach ($data as $data_ary)
-					{
-						$compress->add_data($data_ary['src'], $data_ary['prefix']);
-					}
-				}
-
-				$compress->close();
-
-				add_log('admin', 'LOG_' . $l_prefix . '_EXPORT', $style_row[$mode . '_name']);
-
-				if (!$store)
-				{
-					$compress->download($path);
-					@unlink(PHPBB_ROOT_PATH . "store/$path$ext");
-					exit;
-				}
-
-				trigger_error(sprintf(phpbb::$user->lang[$l_prefix . '_EXPORTED'], "store/$path$ext") . adm_back_link($this->u_action));
-			}
-		}
-
-		$sql = "SELECT {$mode}_id, {$mode}_name
-			FROM " . (($mode == 'style') ? STYLES_TABLE : $sql_from) . "
-			WHERE {$mode}_id = $style_id";
-		$result = phpbb::$db->sql_query($sql);
-		$style_row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$style_row)
-		{
-			trigger_error(phpbb::$user->lang['NO_' . $l_prefix] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
-		$this->page_title = $l_prefix . '_EXPORT';
-
-		$format_buttons = '';
-		foreach ($methods as $method)
-		{
-			$format_buttons .= '<label><input type="radio"' . ((!$format_buttons) ? ' id="format"' : '') . ' class="radio" value="' . $method . '" name="format"' . (($method == $format) ? ' checked="checked"' : '') . ' /> ' . $method . '</label>';
-		}
-
-		phpbb::$template->assign_vars(array(
-			'S_EXPORT'		=> true,
-			'S_ERROR_MSG'	=> (sizeof($error)) ? true : false,
-			'S_STYLE'		=> ($mode == 'style') ? true : false,
-
-			'L_TITLE'		=> phpbb::$user->lang[$this->page_title],
-			'L_EXPLAIN'		=> phpbb::$user->lang[$this->page_title . '_EXPLAIN'],
-			'L_NAME'		=> phpbb::$user->lang[$l_prefix . '_NAME'],
-
-			'U_ACTION'		=> $this->u_action . '&amp;action=export&amp;id=' . $style_id,
-			'U_BACK'		=> $this->u_action,
-
-			'ERROR_MSG'			=> (sizeof($error)) ? implode('<br />', $error) : '',
-			'NAME'				=> $style_row[$mode . '_name'],
-			'FORMAT_BUTTONS'	=> $format_buttons,
-		));
-	}
-
-	/**
-	* Display details
-	*/
-	function details($mode, $style_id)
-	{
-		global $safe_mode;
-
-		$update = phpbb_request::is_set_post('update');
-		$l_type = strtoupper($mode);
-
-		$error = array();
-		$element_ary = array('template' => STYLES_TEMPLATE_TABLE, 'theme' => STYLES_THEME_TABLE, 'imageset' => STYLES_IMAGESET_TABLE);
-
-		switch ($mode)
-		{
-			case 'style':
-				$sql_from = STYLES_TABLE;
-			break;
-
-			case 'template':
-				$sql_from = STYLES_TEMPLATE_TABLE;
-			break;
-
-			case 'theme':
-				$sql_from = STYLES_THEME_TABLE;
-			break;
-
-			case 'imageset':
-				$sql_from = STYLES_IMAGESET_TABLE;
-			break;
-		}
-
-		$sql = "SELECT *
-			FROM $sql_from
-			WHERE {$mode}_id = $style_id";
-		$result = phpbb::$db->sql_query($sql);
-		$style_row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$style_row)
-		{
-			trigger_error(phpbb::$user->lang['NO_' . $l_type] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
-		$style_row['style_default'] = ($mode == 'style' && phpbb::$config['default_style'] == $style_id) ? 1 : 0;
-
-		if ($update)
-		{
-			$name = utf8_normalize_nfc(request_var('name', '', true));
-			$copyright = utf8_normalize_nfc(request_var('copyright', '', true));
-
-			$template_id = request_var('template_id', 0);
-			$theme_id = request_var('theme_id', 0);
-			$imageset_id = request_var('imageset_id', 0);
-
-			$style_active = request_var('style_active', 0);
-			$style_default = request_var('style_default', 0);
-
-			$sql = "SELECT {$mode}_id
-				FROM $sql_from
-				WHERE {$mode}_id <> $style_id
-				AND {$mode}_name = '" . phpbb::$db->sql_escape(strtolower($name)) . "'";
-			$result = phpbb::$db->sql_query($sql);
-			$conflict = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if ($mode == 'style' && (!$template_id || !$theme_id || !$imageset_id))
-			{
-				$error[] = phpbb::$user->lang['STYLE_ERR_NO_IDS'];
-			}
-
-			if ($mode == 'style' && $style_row['style_active'] && !$style_active && phpbb::$config['default_style'] == $style_id)
-			{
-				$error[] = phpbb::$user->lang['DEACTIVATE_DEFAULT'];
-			}
-
-			if (!$name || $conflict)
-			{
-				$error[] = phpbb::$user->lang[$l_type . '_ERR_STYLE_NAME'];
-			}
-
-			if (!sizeof($error))
-			{
-				// Check length settings
-				if (utf8_strlen($name) > 30)
-				{
-					$error[] = phpbb::$user->lang[$l_type . '_ERR_NAME_LONG'];
-				}
-
-				if (utf8_strlen($copyright) > 60)
-				{
-					$error[] = phpbb::$user->lang[$l_type . '_ERR_COPY_LONG'];
-				}
-			}
-		}
-
-		if ($update && sizeof($error))
-		{
-			$style_row = array_merge($style_row, array(
-				'template_id'			=> $template_id,
-				'theme_id'				=> $theme_id,
-				'imageset_id'			=> $imageset_id,
-				'style_active'			=> $style_active,
-				$mode . '_name'			=> $name,
-				$mode . '_copyright'	=> $copyright)
-			);
-		}
-
-		// User has submitted form and no errors have occurred
-		if ($update && !sizeof($error))
-		{
-			$sql_ary = array(
-				$mode . '_name'			=> $name,
-				$mode . '_copyright'	=> $copyright
-			);
-
-			switch ($mode)
-			{
-				case 'style':
-
-					$sql_ary += array(
-						'template_id'		=> (int) $template_id,
-						'theme_id'			=> (int) $theme_id,
-						'imageset_id'		=> (int) $imageset_id,
-						'style_active'		=> (int) $style_active,
-					);
-				break;
-
-				case 'imageset':
-				break;
-
-				case 'theme':
-				break;
-
-				case 'template':
-				break;
-			}
-
-			if (sizeof($sql_ary))
-			{
-				$sql = "UPDATE $sql_from
-					SET " . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . "
-					WHERE {$mode}_id = $style_id";
-				phpbb::$db->sql_query($sql);
-
-				// Making this the default style?
-				if ($mode == 'style' && $style_default)
-				{
-					set_config('default_style', $style_id);
-				}
-			}
-
-			phpbb::$acm->destroy_sql(STYLES_TABLE);
-
-			add_log('admin', 'LOG_' . $l_type . '_EDIT_DETAILS', $name);
-			if (sizeof($error))
-			{
-				trigger_error(implode('<br />', $error) . adm_back_link($this->u_action), E_USER_WARNING);
-			}
-			else
-			{
-				trigger_error(phpbb::$user->lang[$l_type . '_DETAILS_UPDATED'] . adm_back_link($this->u_action));
-			}
-		}
-
-		if ($mode == 'style')
-		{
-			foreach ($element_ary as $element => $table)
-			{
-				$sql = "SELECT {$element}_id, {$element}_name
-					FROM $table
-					ORDER BY {$element}_id ASC";
-				$result = phpbb::$db->sql_query($sql);
-
-				${$element . '_options'} = '';
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$selected = ($row[$element . '_id'] == $style_row[$element . '_id']) ? ' selected="selected"' : '';
-					${$element . '_options'} .= '<option value="' . $row[$element . '_id'] . '"' . $selected . '>' . $row[$element . '_name'] . '</option>';
-				}
-				phpbb::$db->sql_freeresult($result);
-			}
-		}
-
-		$this->page_title = 'EDIT_DETAILS_' . $l_type;
-
-		phpbb::$template->assign_vars(array(
-			'S_DETAILS'				=> true,
-			'S_ERROR_MSG'			=> (sizeof($error)) ? true : false,
-			'S_STYLE'				=> ($mode == 'style') ? true : false,
-			'S_TEMPLATE'			=> ($mode == 'template') ? true : false,
-			'S_THEME'				=> ($mode == 'theme') ? true : false,
-			'S_IMAGESET'			=> ($mode == 'imageset') ? true : false,
-			'S_STYLE_ACTIVE'		=> (isset($style_row['style_active'])) ? $style_row['style_active'] : 0,
-			'S_STYLE_DEFAULT'		=> (isset($style_row['style_default'])) ? $style_row['style_default'] : 0,
-
-			'S_TEMPLATE_OPTIONS'	=> ($mode == 'style') ? $template_options : '',
-			'S_THEME_OPTIONS'		=> ($mode == 'style') ? $theme_options : '',
-			'S_IMAGESET_OPTIONS'	=> ($mode == 'style') ? $imageset_options : '',
-
-			'U_ACTION'		=> $this->u_action . '&amp;action=details&amp;id=' . $style_id,
-			'U_BACK'		=> $this->u_action,
-
-			'L_TITLE'				=> phpbb::$user->lang[$this->page_title],
-			'L_EXPLAIN'				=> phpbb::$user->lang[$this->page_title . '_EXPLAIN'],
-			'L_NAME'				=> phpbb::$user->lang[$l_type . '_NAME'],
-			'L_LOCATION'			=> ($mode == 'template' || $mode == 'theme') ? phpbb::$user->lang[$l_type . '_LOCATION'] : '',
-			'L_LOCATION_EXPLAIN'	=> ($mode == 'template' || $mode == 'theme') ? phpbb::$user->lang[$l_type . '_LOCATION_EXPLAIN'] : '',
-
-			'ERROR_MSG'		=> (sizeof($error)) ? implode('<br />', $error) : '',
-			'NAME'			=> $style_row[$mode . '_name'],
-			'COPYRIGHT'		=> $style_row[$mode . '_copyright'],
-		));
-	}
-
-	/**
-	* Load css file contents
-	*/
-	static function load_css_file($path, $filename)
-	{
-		$file = PHPBB_ROOT_PATH . "styles/$path/theme/$filename";
-
-		if (file_exists($file) && ($content = file_get_contents($file)))
-		{
-			$content = trim($content);
-		}
-		else
-		{
-			$content = '';
-		}
-
-		return $content;
-	}
-
-	/**
-	* Returns a string containing the value that should be used for the theme_data column in the theme database table.
-	* Includes contents of files loaded via @import
-	*
-	* @param array $theme_row is an associative array containing the theme's current database entry
-	* @param mixed $stylesheet can either be the new content for the stylesheet or false to load from the standard file
-	* @param string $root_path should only be used in case you want to use a different root path than PHPBB_ROOT_PATH . "styles/{$theme_row['theme_path']}"
-	*
-	* @return string Stylesheet data for theme_data column in the theme table
-	*/
-	static function db_theme_data($theme_row, $stylesheet = false, $root_path = '')
-	{
-		if (!$root_path)
-		{
-			$root_path = PHPBB_ROOT_PATH . 'styles/' . $theme_row['theme_path'];
-		}
-
-		if (!$stylesheet)
-		{
-			$stylesheet = '';
-			if (file_exists($root_path . '/theme/stylesheet.css'))
-			{
-				$stylesheet = file_get_contents($root_path . '/theme/stylesheet.css');
-			}
-		}
-
-		// Match CSS imports
-		$matches = array();
-		preg_match_all('/@import url\(["\'](.*)["\']\);/i', $stylesheet, $matches);
-
-		if (sizeof($matches))
-		{
-			foreach ($matches[0] as $idx => $match)
-			{
-				$stylesheet = str_replace($match, self::load_css_file($theme_row['theme_path'], $matches[1][$idx]), $stylesheet);
-			}
-		}
-
-		// adjust paths
-		return str_replace('./', 'styles/' . $theme_row['theme_path'] . '/theme/', $stylesheet);
-	}
-
-	/**
-	* Returns an array containing all template filenames for one template that are currently cached.
-	*
-	* @param string $template_path contains the name of the template's folder in /styles/
-	*
-	* @return array of filenames that exist in /styles/$template_path/template/ (without extension!)
-	*/
-	function template_cache_filelist($template_path)
-	{
-		$cache_prefix = 'tpl_' . str_replace('_', '-', $template_path);
-
-		if (!($dp = @opendir(PHPBB_ROOT_PATH . 'cache')))
-		{
-			trigger_error(phpbb::$user->lang['TEMPLATE_ERR_CACHE_READ'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
-		$file_ary = array();
-		while ($file = readdir($dp))
-		{
-			if ($file[0] == '.')
-			{
-				continue;
-			}
-
-			if (is_file(PHPBB_ROOT_PATH . 'cache/' . $file) && (strpos($file, $cache_prefix) === 0))
-			{
-				$file_ary[] = str_replace('.', '/', preg_replace('#^' . preg_quote($cache_prefix, '#') . '_(.*?)\.html\.' . PHP_EXT . '$#i', '\1', $file));
-			}
-		}
-		closedir($dp);
-
-		return $file_ary;
-	}
-
-	/**
-	* Destroys cached versions of template files
-	*
-	* @param array $template_row contains the template's row in the STYLES_TEMPLATE_TABLE database table
-	* @param mixed $file_ary is optional and may contain an array of template file names which should be refreshed in the cache.
-	*	The file names should be the original template file names and not the cache file names.
-	*/
-	function clear_template_cache($template_row, $file_ary = false)
-	{
-		$cache_prefix = 'tpl_' . str_replace('_', '-', $template_row['template_path']);
-
-		if (!$file_ary || !is_array($file_ary))
-		{
-			$file_ary = $this->template_cache_filelist($template_row['template_path']);
-			$log_file_list = phpbb::$user->lang['ALL_FILES'];
-		}
-		else
-		{
-			$log_file_list = implode(', ', $file_ary);
-		}
-
-		foreach ($file_ary as $file)
-		{
-			$file = str_replace('/', '.', $file);
-
-			$file = PHPBB_ROOT_PATH . "cache/{$cache_prefix}_$file.html." . PHP_EXT;
-			if (file_exists($file) && is_file($file))
-			{
-				@unlink($file);
-			}
-		}
-		unset($file_ary);
-
-		add_log('admin', 'LOG_TEMPLATE_CACHE_CLEARED', $template_row['template_name'], $log_file_list);
-	}
-
-	/**
-	* Install Style/Template/Theme/Imageset
-	*/
-	function install($mode)
-	{
-		$l_type = strtoupper($mode);
-
-		$error = $installcfg = $style_row = array();
-		$root_path = $cfg_file = '';
-		$element_ary = array('template' => STYLES_TEMPLATE_TABLE, 'theme' => STYLES_THEME_TABLE, 'imageset' => STYLES_IMAGESET_TABLE);
-
-		$install_path = request_var('path', '');
-		$update = phpbb_request::is_set_post('update');
-
-		// Installing, obtain cfg file contents
-		if ($install_path)
-		{
-			$root_path = PHPBB_ROOT_PATH . 'styles/' . $install_path . '/';
-			$cfg_file = ($mode == 'style') ? "$root_path$mode.cfg" : "$root_path$mode/$mode.cfg";
-
-			if (!file_exists($cfg_file))
-			{
-				$error[] = phpbb::$user->lang[$l_type . '_ERR_NOT_' . $l_type];
-			}
-			else
-			{
-				$installcfg = parse_cfg_file($cfg_file);
-			}
-		}
-
-		// Installing
-		if (sizeof($installcfg))
-		{
-			$name		= $installcfg['name'];
-			$copyright	= $installcfg['copyright'];
-			$version	= $installcfg['version'];
-
-			$style_row = array(
-				$mode . '_id'			=> 0,
-				$mode . '_name'			=> '',
-				$mode . '_copyright'	=> ''
-			);
-
-			switch ($mode)
-			{
-				case 'style':
-
-					$style_row = array(
-						'style_id'			=> 0,
-						'style_name'		=> $installcfg['name'],
-						'style_copyright'	=> $installcfg['copyright']
-					);
-
-					$reqd_template = (isset($installcfg['required_template'])) ? $installcfg['required_template'] : false;
-					$reqd_theme = (isset($installcfg['required_theme'])) ? $installcfg['required_theme'] : false;
-					$reqd_imageset = (isset($installcfg['required_imageset'])) ? $installcfg['required_imageset'] : false;
-
-					// Check to see if each element is already installed, if it is grab the id
-					foreach ($element_ary as $element => $table)
-					{
-						$style_row = array_merge($style_row, array(
-							$element . '_id'			=> 0,
-							$element . '_name'			=> '',
-							$element . '_copyright'		=> '')
-						);
-
-			 			$this->test_installed($element, $error, (${'reqd_' . $element}) ? PHPBB_ROOT_PATH . 'styles/' . $reqd_template . '/' : $root_path, ${'reqd_' . $element}, $style_row[$element . '_id'], $style_row[$element . '_name'], $style_row[$element . '_copyright']);
-
-						if (!$style_row[$element . '_name'])
-						{
-							$style_row[$element . '_name'] = $reqd_template;
-						}
-					}
-
-				break;
-
-				case 'template':
-					$this->test_installed('template', $error, $root_path, false, $style_row['template_id'], $style_row['template_name'], $style_row['template_copyright']);
-				break;
-
-				case 'theme':
-					$this->test_installed('theme', $error, $root_path, false, $style_row['theme_id'], $style_row['theme_name'], $style_row['theme_copyright']);
-				break;
-
-				case 'imageset':
-					$this->test_installed('imageset', $error, $root_path, false, $style_row['imageset_id'], $style_row['imageset_name'], $style_row['imageset_copyright']);
-				break;
-			}
-		}
-		else
-		{
-			trigger_error(phpbb::$user->lang['NO_' . $l_type] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
-		$style_row['style_active'] = request_var('style_active', 1);
-		$style_row['style_default'] = request_var('style_default', 0);
-
-		// User has submitted form and no errors have occurred
-		if ($update && !sizeof($error))
-		{
-			if ($mode == 'style')
-			{
-				foreach ($element_ary as $element => $table)
-				{
-					${$element . '_root_path'} = (${'reqd_' . $element}) ? PHPBB_ROOT_PATH . 'styles/' . ${'reqd_' . $element} . '/' : false;
-					${$element . '_path'} = (${'reqd_' . $element}) ? ${'reqd_' . $element} : false;
-				}
-				$this->install_style($error, 'install', $root_path, $style_row['style_id'], $style_row['style_name'], $install_path, $style_row['style_copyright'], $style_row['style_active'], $style_row['style_default'], $style_row, $template_root_path, $template_path, $theme_root_path, $theme_path, $imageset_root_path, $imageset_path);
-			}
-			else
-			{
-				$this->install_element($mode, $error, 'install', $root_path, $style_row[$mode . '_id'], $style_row[$mode . '_name'], $install_path, $style_row[$mode . '_copyright']);
-			}
-
-			if (!sizeof($error))
-			{
-				phpbb::$acm->destroy_sql(STYLES_TABLE);
-
-				trigger_error(phpbb::$user->lang[$l_type . '_ADDED'] . adm_back_link($this->u_action));
-			}
-		}
-
-		$this->page_title = 'INSTALL_' . $l_type;
-
-		phpbb::$template->assign_vars(array(
-			'S_DETAILS'			=> true,
-			'S_INSTALL'			=> true,
-			'S_ERROR_MSG'		=> (sizeof($error)) ? true : false,
-			'S_STYLE'			=> ($mode == 'style') ? true : false,
-			'S_TEMPLATE'		=> ($mode == 'template') ? true : false,
-			'S_THEME'			=> ($mode == 'theme') ? true : false,
-
-			'S_STYLE_ACTIVE'		=> (isset($style_row['style_active'])) ? $style_row['style_active'] : 0,
-			'S_STYLE_DEFAULT'		=> (isset($style_row['style_default'])) ? $style_row['style_default'] : 0,
-
-			'U_ACTION'			=> $this->u_action . "&amp;action=install&amp;path=" . urlencode($install_path),
-			'U_BACK'			=> $this->u_action,
-
-			'L_TITLE'				=> phpbb::$user->lang[$this->page_title],
-			'L_EXPLAIN'				=> phpbb::$user->lang[$this->page_title . '_EXPLAIN'],
-			'L_NAME'				=> phpbb::$user->lang[$l_type . '_NAME'],
-			'L_LOCATION'			=> ($mode == 'template' || $mode == 'theme') ? phpbb::$user->lang[$l_type . '_LOCATION'] : '',
-			'L_LOCATION_EXPLAIN'	=> ($mode == 'template' || $mode == 'theme') ? phpbb::$user->lang[$l_type . '_LOCATION_EXPLAIN'] : '',
-
-			'ERROR_MSG'			=> (sizeof($error)) ? implode('<br />', $error) : '',
-			'NAME'				=> $style_row[$mode . '_name'],
-			'COPYRIGHT'			=> $style_row[$mode . '_copyright'],
-			'TEMPLATE_NAME'		=> ($mode == 'style') ? $style_row['template_name'] : '',
-			'THEME_NAME'		=> ($mode == 'style') ? $style_row['theme_name'] : '',
-			'IMAGESET_NAME'		=> ($mode == 'style') ? $style_row['imageset_name'] : '',
-		));
-	}
-
-	/**
-	* Add new style
-	*/
-	function add($mode)
-	{
-		$l_type = strtoupper($mode);
-		$element_ary = array('template' => STYLES_TEMPLATE_TABLE, 'theme' => STYLES_THEME_TABLE, 'imageset' => STYLES_IMAGESET_TABLE);
-		$error = array();
-
-		$style_row = array(
-			$mode . '_name'			=> utf8_normalize_nfc(request_var('name', '', true)),
-			$mode . '_copyright'	=> utf8_normalize_nfc(request_var('copyright', '', true)),
-			'template_id'			=> 0,
-			'theme_id'				=> 0,
-			'imageset_id'			=> 0,
-			'style_active'			=> request_var('style_active', 1),
-			'style_default'			=> request_var('style_default', 0),
-		);
-
-		$basis = request_var('basis', 0);
-		$update = phpbb_request::is_set_post('update');
-
-		if ($basis)
-		{
-			switch ($mode)
-			{
-				case 'style':
-					$sql_select = 'template_id, theme_id, imageset_id';
-					$sql_from = STYLES_TABLE;
-				break;
-
-				case 'template':
-					$sql_select = 'template_id';
-					$sql_from = STYLES_TEMPLATE_TABLE;
-				break;
-
-				case 'theme':
-					$sql_select = 'theme_id';
-					$sql_from = STYLES_THEME_TABLE;
-				break;
-
-				case 'imageset':
-					$sql_select = 'imageset_id';
-					$sql_from = STYLES_IMAGESET_TABLE;
-				break;
-			}
-
-			$sql = "SELECT $sql_select
-				FROM $sql_from
-				WHERE {$mode}_id = $basis";
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$row)
-			{
-				$error[] = phpbb::$user->lang['NO_' . $l_type];
-			}
-
-			if (!sizeof($error))
-			{
-				$style_row['template_id']	= (isset($row['template_id'])) ? $row['template_id'] : $style_row['template_id'];
-				$style_row['theme_id']		= (isset($row['theme_id'])) ? $row['theme_id'] : $style_row['theme_id'];
-				$style_row['imageset_id']	= (isset($row['imageset_id'])) ? $row['imageset_id'] : $style_row['imageset_id'];
-			}
-		}
-
-		if ($update)
-		{
-			$style_row['template_id'] = request_var('template_id', $style_row['template_id']);
-			$style_row['theme_id'] = request_var('theme_id', $style_row['theme_id']);
-			$style_row['imageset_id'] = request_var('imageset_id', $style_row['imageset_id']);
-
-			if ($mode == 'style' && (!$style_row['template_id'] || !$style_row['theme_id'] || !$style_row['imageset_id']))
-			{
-				$error[] = phpbb::$user->lang['STYLE_ERR_NO_IDS'];
-			}
-		}
-
-		// User has submitted form and no errors have occurred
-		if ($update && !sizeof($error))
-		{
-			if ($mode == 'style')
-			{
-				$style_row['style_id'] = 0;
-
-				$this->install_style($error, 'add', '', $style_row['style_id'], $style_row['style_name'], '', $style_row['style_copyright'], $style_row['style_active'], $style_row['style_default'], $style_row);
-			}
-
-			if (!sizeof($error))
-			{
-				phpbb::$acm->destroy_sql(STYLES_TABLE);
-
-				trigger_error(phpbb::$user->lang[$l_type . '_ADDED'] . adm_back_link($this->u_action));
-			}
-		}
-
-		if ($mode == 'style')
-		{
-			foreach ($element_ary as $element => $table)
-			{
-				$sql = "SELECT {$element}_id, {$element}_name
-					FROM $table
-					ORDER BY {$element}_id ASC";
-				$result = phpbb::$db->sql_query($sql);
-
-				${$element . '_options'} = '';
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$selected = ($row[$element . '_id'] == $style_row[$element . '_id']) ? ' selected="selected"' : '';
-					${$element . '_options'} .= '<option value="' . $row[$element . '_id'] . '"' . $selected . '>' . $row[$element . '_name'] . '</option>';
-				}
-				phpbb::$db->sql_freeresult($result);
-			}
-		}
-
-		$this->page_title = 'ADD_' . $l_type;
-
-		phpbb::$template->assign_vars(array(
-			'S_DETAILS'			=> true,
-			'S_ADD'				=> true,
-			'S_ERROR_MSG'		=> (sizeof($error)) ? true : false,
-			'S_STYLE'			=> ($mode == 'style') ? true : false,
-			'S_TEMPLATE'		=> ($mode == 'template') ? true : false,
-			'S_THEME'			=> ($mode == 'theme') ? true : false,
-			'S_BASIS'			=> ($basis) ? true : false,
-
-			'S_STYLE_ACTIVE'		=> (isset($style_row['style_active'])) ? $style_row['style_active'] : 0,
-			'S_STYLE_DEFAULT'		=> (isset($style_row['style_default'])) ? $style_row['style_default'] : 0,
-			'S_TEMPLATE_OPTIONS'	=> ($mode == 'style') ? $template_options : '',
-			'S_THEME_OPTIONS'		=> ($mode == 'style') ? $theme_options : '',
-			'S_IMAGESET_OPTIONS'	=> ($mode == 'style') ? $imageset_options : '',
-
-			'U_ACTION'			=> $this->u_action . '&amp;action=add&amp;basis=' . $basis,
-			'U_BACK'			=> $this->u_action,
-
-			'L_TITLE'				=> phpbb::$user->lang[$this->page_title],
-			'L_EXPLAIN'				=> phpbb::$user->lang[$this->page_title . '_EXPLAIN'],
-			'L_NAME'				=> phpbb::$user->lang[$l_type . '_NAME'],
-			'L_LOCATION'			=> ($mode == 'template' || $mode == 'theme') ? phpbb::$user->lang[$l_type . '_LOCATION'] : '',
-			'L_LOCATION_EXPLAIN'	=> ($mode == 'template' || $mode == 'theme') ? phpbb::$user->lang[$l_type . '_LOCATION_EXPLAIN'] : '',
-
-			'ERROR_MSG'			=> (sizeof($error)) ? implode('<br />', $error) : '',
-			'NAME'				=> $style_row[$mode . '_name'],
-			'COPYRIGHT'			=> $style_row[$mode . '_copyright'],
-		));
-
-	}
-
-	function generate_stylesheets($theme)
-	{
-		// get all the lang_dirs
-		$sql = 'SELECT lang_dir
-			FROM ' . LANG_TABLE;
-		$result = phpbb::$db->sql_query($sql);
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$lang_dirs[] = $row['lang_dir'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// get all imagesets this theme is associated with
-		$sql = 'SELECT si.imageset_id, si.imageset_path, st.template_path
-			FROM ' . STYLES_TABLE . ' s, ' . STYLES_IMAGESET_TABLE . ' si, ' . STYLES_TEMPLATE_TABLE . ' st
-			WHERE s.theme_id = ' . (int) $theme['theme_id'] . '
-				AND s.imageset_id = si.imageset_id
-				AND s.template_id = st.template_id';
-		$result = phpbb::$db->sql_query($sql);
-		while ($theme_row = phpbb::$db->sql_fetchrow($result))
-		{
-			foreach ($lang_dirs as $lang_dir)
-			{
-				$theme['imageset_path'] = $theme_row['imageset_path'];
-				$theme['imageset_id'] = $theme_row['imageset_id'];
-				$theme['template_path'] = $theme_row['template_path'];
-
-				$user_image_lang = (file_exists(PHPBB_ROOT_PATH . 'styles/' . $theme['imageset_path'] . '/imageset/' . $lang_dir)) ? $lang_dir : phpbb::$config['default_lang'];
-
-				// Parse Theme Data
-				$replace = array(
-					'{T_THEME_PATH}'			=> "./styles/" . $theme['theme_path'] . '/theme',
-					'{T_TEMPLATE_PATH}'			=> "./styles/" . $theme['template_path'] . '/template',
-					'{T_IMAGESET_PATH}'			=> "./styles/" . $theme['imageset_path'] . '/imageset',
-					'{T_IMAGESET_LANG_PATH}'	=> "./styles/" . $theme['imageset_path'] . '/imageset/' . $user_image_lang,
-					'{T_STYLESHEET_NAME}'		=> $theme['theme_name'],
-					'{S_USER_LANG}'				=> $lang_dir // this bastard forces us to make a copy for every language that is installed, not just those with an actual i18'd imageset!
-				);
-
-				$sql = 'SELECT image_name, image_filename, image_lang, image_width, image_height
-					FROM ' . STYLES_IMAGESET_DATA_TABLE . '
-					WHERE imageset_id = ' . $theme['imageset_id'] . "
-					AND image_filename <> ''
-					AND image_lang IN ('" . phpbb::$db->sql_escape($user_image_lang) . "', '')";
-				$result2 = phpbb::$db->sql_query($sql);
-
-				$img_array = array();
-				while ($row = phpbb::$db->sql_fetchrow($result2))
-				{
-					$img_array[$row['image_name']] = $row;
-				}
-				phpbb::$db->sql_freeresult($result2);
-
-				$specific_theme_data = str_replace(array_keys($replace), array_values($replace), $theme['theme_data']);
-
-				$matches = array();
-				preg_match_all('#\{IMG_([A-Za-z0-9_]*?)_(WIDTH|HEIGHT|SRC)\}#', $specific_theme_data, $matches);
-
-				$imgs = $find = $replace = array();
-				if (isset($matches[0]) && sizeof($matches[0]))
-				{
-					foreach ($matches[1] as $i => $img)
-					{
-						$img = strtolower($img);
-						$find[] = $matches[0][$i];
-
-						if (!isset($img_array[$img]))
-						{
-							$replace[] = '';
-							continue;
-						}
-
-						if (!isset($imgs[$img]))
-						{
-							$img_data = &$img_array[$img];
-							$imgsrc = ($img_data['image_lang'] ? $img_data['image_lang'] . '/' : '') . $img_data['image_filename'];
-							$imgs[$img] = array(
-								'src'		=> './styles/' . $theme['imageset_path'] . '/imageset/' . $imgsrc,
-								'width'		=> $img_data['image_width'],
-								'height'	=> $img_data['image_height'],
-							);
-						}
-
-						switch ($matches[2][$i])
-						{
-							case 'SRC':
-								$replace[] = $imgs[$img]['src'];
-							break;
-
-							case 'WIDTH':
-								$replace[] = $imgs[$img]['width'];
-							break;
-
-							case 'HEIGHT':
-								$replace[] = $imgs[$img]['height'];
-							break;
-
-							default:
-								continue;
-						}
-					}
-
-					if (sizeof($find))
-					{
-						$specific_theme_data = str_replace($find, $replace, $specific_theme_data);
-					}
-				}
-				file_put_contents(PHPBB_ROOT_PATH . '/store/' . $theme['theme_id'] . '_' . $theme['imageset_id'] . '_' . $lang_dir . '.css', $specific_theme_data, LOCK_EX);
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-	/**
-
-					$reqd_template = (isset($installcfg['required_template'])) ? $installcfg['required_template'] : false;
-					$reqd_theme = (isset($installcfg['required_theme'])) ? $installcfg['required_theme'] : false;
-					$reqd_imageset = (isset($installcfg['required_imageset'])) ? $installcfg['required_imageset'] : false;
-
-					// Check to see if each element is already installed, if it is grab the id
-					foreach ($element_ary as $element => $table)
-					{
-						$style_row = array_merge($style_row, array(
-							$element . '_id'			=> 0,
-							$element . '_name'			=> '',
-							$element . '_copyright'		=> '')
-						);
-
-			 			$this->test_installed($element, $error, $root_path, ${'reqd_' . $element}, $style_row[$element . '_id'], $style_row[$element . '_name'], $style_row[$element . '_copyright']);
-	* Is this element installed? If not, grab its cfg details
-	*/
-	function test_installed($element, &$error, $root_path, $reqd_name, &$id, &$name, &$copyright)
-	{
-		switch ($element)
-		{
-			case 'template':
-				$sql_from = STYLES_TEMPLATE_TABLE;
-			break;
-
-			case 'theme':
-				$sql_from = STYLES_THEME_TABLE;
-			break;
-
-			case 'imageset':
-				$sql_from = STYLES_IMAGESET_TABLE;
-			break;
-		}
-
-		$l_element = strtoupper($element);
-
-		$chk_name = ($reqd_name !== false) ? $reqd_name : $name;
-
-		$sql = "SELECT {$element}_id, {$element}_name
-			FROM $sql_from
-			WHERE {$element}_name = '" . phpbb::$db->sql_escape($chk_name) . "'";
-		$result = phpbb::$db->sql_query($sql);
-
-		if ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$name = $row[$element . '_name'];
-			$id = $row[$element . '_id'];
-		}
-		else
-		{
-			if (!($cfg = @file("$root_path$element/$element.cfg")))
-			{
-				$error[] = sprintf(phpbb::$user->lang['REQUIRES_' . $l_element], $reqd_name);
-				return false;
-			}
-
-			$cfg = parse_cfg_file("$root_path$element/$element.cfg", $cfg);
-
-			$name = $cfg['name'];
-			$copyright = $cfg['copyright'];
-			$id = 0;
-
-			unset($cfg);
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	/**
-	* Install/Add style
-	*/
-	function install_style(&$error, $action, $root_path, &$id, $name, $path, $copyright, $active, $default, &$style_row, $template_root_path = false, $template_path = false, $theme_root_path = false, $theme_path = false, $imageset_root_path = false, $imageset_path = false)
-	{
-		$element_ary = array('template', 'theme', 'imageset');
-
-		if (!$name)
-		{
-			$error[] = phpbb::$user->lang['STYLE_ERR_STYLE_NAME'];
-		}
-
-		// Check length settings
-		if (utf8_strlen($name) > 30)
-		{
-			$error[] = phpbb::$user->lang['STYLE_ERR_NAME_LONG'];
-		}
-
-		if (utf8_strlen($copyright) > 60)
-		{
-			$error[] = phpbb::$user->lang['STYLE_ERR_COPY_LONG'];
-		}
-
-		// Check if the name already exist
-		$sql = 'SELECT style_id
-			FROM ' . STYLES_TABLE . "
-			WHERE style_name = '" . phpbb::$db->sql_escape($name) . "'";
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if ($row)
-		{
-			$error[] = phpbb::$user->lang['STYLE_ERR_NAME_EXIST'];
-		}
-
-		if (sizeof($error))
-		{
-			return false;
-		}
-
-		foreach ($element_ary as $element)
-		{
-			// Zero id value ... need to install element ... run usual checks
-			// and do the install if necessary
-			if (!$style_row[$element . '_id'])
-			{
-				$this->install_element($element, $error, $action, (${$element . '_root_path'}) ? ${$element . '_root_path'} : $root_path, $style_row[$element . '_id'], $style_row[$element . '_name'], (${$element . '_path'}) ? ${$element . '_path'} : $path, $style_row[$element . '_copyright']);
-			}
-		}
-
-		if (!$style_row['template_id'] || !$style_row['theme_id'] || !$style_row['imageset_id'])
-		{
-			$error[] = phpbb::$user->lang['STYLE_ERR_NO_IDS'];
-		}
-
-		if (sizeof($error))
-		{
-			return false;
-		}
-
-		phpbb::$db->sql_transaction('begin');
-
-		$sql_ary = array(
-			'style_name'		=> $name,
-			'style_copyright'	=> $copyright,
-			'style_active'		=> (int) $active,
-			'template_id'		=> (int) $style_row['template_id'],
-			'theme_id'			=> (int) $style_row['theme_id'],
-			'imageset_id'		=> (int) $style_row['imageset_id'],
-		);
-
-		$sql = 'INSERT INTO ' . STYLES_TABLE . '
-			' . phpbb::$db->sql_build_array('INSERT', $sql_ary);
-		phpbb::$db->sql_query($sql);
-
-		$id = phpbb::$db->sql_nextid();
-
-		if ($default)
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . "
-				SET user_style = $id
-				WHERE user_style = " . phpbb::$config['default_style'];
-			phpbb::$db->sql_query($sql);
-
-			set_config('default_style', $id);
-		}
-
-		phpbb::$db->sql_transaction('commit');
-
-		add_log('admin', 'LOG_STYLE_ADD', $name);
-	}
-
-	/**
-	* Install/add an element, doing various checks as we go
-	*/
-	function install_element($mode, &$error, $action, $root_path, &$id, $name, $path, $copyright, $store_db = 0)
-	{
-		switch ($mode)
-		{
-			case 'template':
-				$sql_from = STYLES_TEMPLATE_TABLE;
-			break;
-
-			case 'theme':
-				$sql_from = STYLES_THEME_TABLE;
-			break;
-
-			case 'imageset':
-				$sql_from = STYLES_IMAGESET_TABLE;
-			break;
-		}
-
-		$l_type = strtoupper($mode);
-
-		if (!$name)
-		{
-			$error[] = phpbb::$user->lang[$l_type . '_ERR_STYLE_NAME'];
-		}
-
-		// Check length settings
-		if (utf8_strlen($name) > 30)
-		{
-			$error[] = phpbb::$user->lang[$l_type . '_ERR_NAME_LONG'];
-		}
-
-		if (utf8_strlen($copyright) > 60)
-		{
-			$error[] = phpbb::$user->lang[$l_type . '_ERR_COPY_LONG'];
-		}
-
-		// Check if the name already exist
-		$sql = "SELECT {$mode}_id
-			FROM $sql_from
-			WHERE {$mode}_name = '" . phpbb::$db->sql_escape($name) . "'";
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-
-		if ($row)
-		{
-			// If it exist, we just use the style on installation
-			if ($action == 'install')
-			{
-				$id = $row[$mode . '_id'];
-				return false;
-			}
-
-			$error[] = phpbb::$user->lang[$l_type . '_ERR_NAME_EXIST'];
-		}
-
-		if (sizeof($error))
-		{
-			return false;
-		}
-
-		$sql_ary = array(
-			$mode . '_name'			=> $name,
-			$mode . '_copyright'	=> $copyright,
-			$mode . '_path'			=> $path,
-		);
-
-		switch ($mode)
-		{
-			case 'template':
-				// We check if the template author defined a different bitfield
-				$cfg_data = parse_cfg_file("$root_path$mode/template.cfg");
-
-				if (!empty($cfg_data['template_bitfield']))
-				{
-					$sql_ary['bbcode_bitfield'] = $cfg_data['template_bitfield'];
-				}
-				else
-				{
-					$sql_ary['bbcode_bitfield'] = TEMPLATE_BITFIELD;
-				}
-			break;
-
-			case 'theme':
-				// We are only interested in the theme configuration for now
-				$theme_cfg = parse_cfg_file(PHPBB_ROOT_PATH . "styles/$path/theme/theme.cfg");
-
-				if (isset($theme_cfg['parse_css_file']) && $theme_cfg['parse_css_file'])
-				{
-					$store_db = 1;
-				}
-
-				$sql_ary += array(
-					'theme_storedb'	=> $store_db,
-					'theme_data'	=> ($store_db) ? self::db_theme_data($sql_ary, false, $root_path) : '',
-					'theme_mtime'	=> (int) filemtime(PHPBB_ROOT_PATH . "styles/$path/theme/stylesheet.css")
-				);
-			break;
-
-			// all the heavy lifting is done later
-			case 'imageset':
-			break;
-		}
-
-		phpbb::$db->sql_transaction('begin');
-
-		$sql = "INSERT INTO $sql_from
-			" . phpbb::$db->sql_build_array('INSERT', $sql_ary);
-		phpbb::$db->sql_query($sql);
-
-		$id = phpbb::$db->sql_nextid();
-
-		if ($mode == 'imageset')
-		{
-			$cfg_data = parse_cfg_file("$root_path$mode/imageset.cfg");
-
-			$imageset_definitions = array();
-			foreach ($this->imageset_keys as $topic => $key_array)
-			{
-				$imageset_definitions = array_merge($imageset_definitions, $key_array);
-			}
-
-			foreach ($cfg_data as $key => $value)
-			{
-				if (strpos($value, '*') !== false)
-				{
-					if (substr($value, -1, 1) === '*')
-					{
-						list($image_filename, $image_height) = explode('*', $value);
-						$image_width = 0;
-					}
-					else
-					{
-						list($image_filename, $image_height, $image_width) = explode('*', $value);
-					}
-				}
-				else
-				{
-					$image_filename = $value;
-					$image_height = $image_width = 0;
-				}
-
-				if (strpos($key, 'img_') === 0 && $image_filename)
-				{
-					$key = substr($key, 4);
-					if (in_array($key, $imageset_definitions))
-					{
-						$sql_ary = array(
-							'image_name'		=> $key,
-							'image_filename'	=> str_replace('{PATH}', "styles/$path/imageset/", trim($image_filename)),
-							'image_height'		=> (int) $image_height,
-							'image_width'		=> (int) $image_width,
-							'imageset_id'		=> (int) $id,
-							'image_lang'		=> '',
-						);
-						phpbb::$db->sql_query('INSERT INTO ' . STYLES_IMAGESET_DATA_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary));
-					}
-				}
-			}
-			unset($cfg_data);
-
-			$sql = 'SELECT lang_dir
-				FROM ' . LANG_TABLE;
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				if (@file_exists("$root_path$mode/{$row['lang_dir']}/imageset.cfg"))
-				{
-					$cfg_data_imageset_data = parse_cfg_file("$root_path$mode/{$row['lang_dir']}/imageset.cfg");
-					foreach ($cfg_data_imageset_data as $image_name => $value)
-					{
-						if (strpos($value, '*') !== false)
-						{
-							if (substr($value, -1, 1) === '*')
-							{
-								list($image_filename, $image_height) = explode('*', $value);
-								$image_width = 0;
-							}
-							else
-							{
-								list($image_filename, $image_height, $image_width) = explode('*', $value);
-							}
-						}
-						else
-						{
-							$image_filename = $value;
-							$image_height = $image_width = 0;
-						}
-
-						if (strpos($image_name, 'img_') === 0 && $image_filename)
-						{
-							$image_name = substr($image_name, 4);
-							if (in_array($image_name, $imageset_definitions))
-							{
-								$sql_ary = array(
-									'image_name'		=> $image_name,
-									'image_filename'	=> $image_filename,
-									'image_height'		=> (int) $image_height,
-									'image_width'		=> (int) $image_width,
-									'imageset_id'		=> (int) $id,
-									'image_lang'		=> $row['lang_dir'],
-								);
-								phpbb::$db->sql_query('INSERT INTO ' . STYLES_IMAGESET_DATA_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary));
-							}
-						}
-					}
-					unset($cfg_data_imageset_data);
-				}
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		phpbb::$db->sql_transaction('commit');
-
-		$log = ($store_db) ? 'LOG_' . $l_type . '_ADD_DB' : 'LOG_' . $l_type . '_ADD_FS';
-		add_log('admin', $log, $name);
-
-		// Return store_db in case it had to be altered
-		return $store_db;
-	}
-}
-
-?>
diff --git a/phpBB/modules/acp/acp_update.php b/phpBB/modules/acp/acp_update.php
deleted file mode 100644
index 6440e86616..0000000000
--- a/phpBB/modules/acp/acp_update.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_update
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		phpbb::$user->add_lang('install');
-
-		$this->tpl_name = 'acp_update';
-		$this->page_title = 'ACP_VERSION_CHECK';
-
-		// Get current and latest version
-		$errstr = '';
-		$errno = 0;
-
-		$info = get_remote_file('www.phpbb.com', '/updatecheck', ((defined('PHPBB_QA')) ? '30x_qa.txt' : '30x.txt'), $errstr, $errno);
-
-		if ($info === false)
-		{
-			trigger_error($errstr, E_USER_WARNING);
-		}
-
-		$info = explode("\n", $info);
-		$latest_version = trim($info[0]);
-
-		$announcement_url = trim($info[1]);
-		$update_link = append_sid('install/index', 'mode=update');
-
-		// Determine automatic update...
-		$sql = 'SELECT config_value
-			FROM ' . CONFIG_TABLE . "
-			WHERE config_name = 'version_update_from'";
-		$result = phpbb::$db->sql_query($sql);
-		$version_update_from = (string) phpbb::$db->sql_fetchfield('config_value');
-		phpbb::$db->sql_freeresult($result);
-
-		$current_version = (!empty($version_update_from)) ? $version_update_from : phpbb::$config['version'];
-
-		$up_to_date_automatic = (version_compare(str_replace('rc', 'RC', strtolower($current_version)), str_replace('rc', 'RC', strtolower($latest_version)), '<')) ? false : true;
-		$up_to_date = (version_compare(str_replace('rc', 'RC', strtolower(phpbb::$config['version'])), str_replace('rc', 'RC', strtolower($latest_version)), '<')) ? false : true;
-
-		phpbb::$template->assign_vars(array(
-			'S_UP_TO_DATE'		=> $up_to_date,
-			'S_UP_TO_DATE_AUTO'	=> $up_to_date_automatic,
-			'S_VERSION_CHECK'	=> true,
-			'U_ACTION'			=> $this->u_action,
-
-			'LATEST_VERSION'	=> $latest_version,
-			'CURRENT_VERSION'	=> phpbb::$config['version'],
-			'AUTO_VERSION'		=> $version_update_from,
-
-			'UPDATE_INSTRUCTIONS'	=> sprintf(phpbb::$user->lang['UPDATE_INSTRUCTIONS'], $announcement_url, $update_link),
-		));
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_users.php b/phpBB/modules/acp/acp_users.php
deleted file mode 100644
index bf83e6b842..0000000000
--- a/phpBB/modules/acp/acp_users.php
+++ /dev/null
@@ -1,2094 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acp
-*/
-class acp_users
-{
-	var $u_action;
-	var $p_master;
-
-	function __construct(&$p_master)
-	{
-		$this->p_master = &$p_master;
-	}
-
-	function main($id, $mode)
-	{
-		global $file_uploads;
-
-		phpbb::$user->add_lang(array('posting', 'ucp', 'acp/users'));
-		$this->tpl_name = 'acp_users';
-		$this->page_title = 'ACP_USER_' . strtoupper($mode);
-
-		$error		= array();
-		$username	= utf8_normalize_nfc(request_var('username', '', true));
-		$user_id	= request_var('u', 0);
-		$action		= request_var('action', '');
-
-		$submit		= (phpbb_request::is_set_post('update') && !phpbb_request::is_set_post('cancel')) ? true : false;
-
-		$form_name = 'acp_users';
-		add_form_key($form_name);
-
-		// Whois (special case)
-		if ($action == 'whois')
-		{
-			include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-
-			$this->page_title = 'WHOIS';
-			$this->tpl_name = 'simple_body';
-
-			$user_ip = request_var('user_ip', '');
-			$domain = gethostbyaddr($user_ip);
-			$ipwhois = user_ipwhois($user_ip);
-
-			phpbb::$template->assign_vars(array(
-				'MESSAGE_TITLE'		=> sprintf(phpbb::$user->lang['IP_WHOIS_FOR'], $domain),
-				'MESSAGE_TEXT'		=> nl2br($ipwhois),
-			));
-
-			return;
-		}
-
-		// Show user selection mask
-		if (!$username && !$user_id)
-		{
-			$this->page_title = 'SELECT_USER';
-
-			phpbb::$template->assign_vars(array(
-				'U_ACTION'			=> $this->u_action,
-				'ANONYMOUS_USER_ID'	=> ANONYMOUS,
-
-				'S_SELECT_USER'		=> true,
-				'U_FIND_USERNAME'	=> append_sid('memberlist', 'mode=searchuser&amp;form=select_user&amp;field=username&amp;select_single=true'),
-			));
-
-			return;
-		}
-
-		if (!$user_id)
-		{
-			$sql = 'SELECT user_id
-				FROM ' . USERS_TABLE . "
-				WHERE username_clean = '" . phpbb::$db->sql_escape(utf8_clean_string($username)) . "'";
-			$result = phpbb::$db->sql_query($sql);
-			$user_id = (int) phpbb::$db->sql_fetchfield('user_id');
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$user_id)
-			{
-				trigger_error(phpbb::$user->lang['NO_USER'] . adm_back_link($this->u_action), E_USER_WARNING);
-			}
-		}
-
-		// Generate content for all modes
-		$sql = 'SELECT u.*, s.*
-			FROM ' . USERS_TABLE . ' u
-				LEFT JOIN ' . SESSIONS_TABLE . ' s ON (s.session_user_id = u.user_id)
-			WHERE u.user_id = ' . $user_id . '
-			ORDER BY s.session_time DESC';
-		$result = phpbb::$db->sql_query($sql);
-		$user_row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$user_row)
-		{
-			trigger_error(phpbb::$user->lang['NO_USER'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
-		// Generate overall "header" for user admin
-		$s_form_options = '';
-
-		// Build modes dropdown list
-		$sql = 'SELECT module_mode, module_auth
-			FROM ' . MODULES_TABLE . "
-			WHERE module_basename = 'users'
-				AND module_enabled = 1
-				AND module_class = 'acp'
-			ORDER BY left_id, module_mode";
-		$result = phpbb::$db->sql_query($sql);
-
-		$dropdown_modes = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			if (!$this->p_master->module_auth($row['module_auth']))
-			{
-				continue;
-			}
-
-			$dropdown_modes[$row['module_mode']] = true;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		foreach ($dropdown_modes as $module_mode => $null)
-		{
-			$selected = ($mode == $module_mode) ? ' selected="selected"' : '';
-			$s_form_options .= '<option value="' . $module_mode . '"' . $selected . '>' . phpbb::$user->lang['ACP_USER_' . strtoupper($module_mode)] . '</option>';
-		}
-
-		phpbb::$template->assign_vars(array(
-			'U_BACK'			=> $this->u_action,
-			'U_MODE_SELECT'		=> append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=$id&amp;u=$user_id"),
-			'U_ACTION'			=> $this->u_action . '&amp;u=' . $user_id,
-			'S_FORM_OPTIONS'	=> $s_form_options,
-			'MANAGED_USERNAME'	=> $user_row['username'],
-		));
-
-		// Prevent normal users/admins change/view founders if they are not a founder by themselves
-		if (!phpbb::$user->is_founder && $user_row['user_type'] == phpbb::USER_FOUNDER)
-		{
-			trigger_error(phpbb::$user->lang['NOT_MANAGE_FOUNDER'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
-		switch ($mode)
-		{
-			case 'overview':
-
-				include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-
-				phpbb::$user->add_lang('acp/ban');
-
-				$delete			= request_var('delete', 0);
-				$delete_type	= request_var('delete_type', '');
-				$ip				= request_var('ip', 'ip');
-
-				if ($submit)
-				{
-					// You can't delete the founder
-					if ($delete && $user_row['user_type'] != phpbb::USER_FOUNDER)
-					{
-						if (!phpbb::$acl->acl_get('a_userdel'))
-						{
-							trigger_error(phpbb::$user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-						}
-
-						// Check if the user wants to remove himself or the guest user account
-						if ($user_id == ANONYMOUS)
-						{
-							trigger_error(phpbb::$user->lang['CANNOT_REMOVE_ANONYMOUS'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-						}
-
-						if ($user_id == phpbb::$user->data['user_id'])
-						{
-							trigger_error(phpbb::$user->lang['CANNOT_REMOVE_YOURSELF'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-						}
-
-						if (confirm_box(true))
-						{
-							user_delete($delete_type, $user_id, $user_row['username']);
-
-							add_log('admin', 'LOG_USER_DELETED', $user_row['username']);
-							trigger_error(phpbb::$user->lang['USER_DELETED'] . adm_back_link($this->u_action));
-						}
-						else
-						{
-							confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-								'u'				=> $user_id,
-								'i'				=> $id,
-								'mode'			=> $mode,
-								'action'		=> $action,
-								'update'		=> true,
-								'delete'		=> 1,
-								'delete_type'	=> $delete_type))
-							);
-						}
-					}
-
-					// Handle quicktool actions
-					switch ($action)
-					{
-						case 'banuser':
-						case 'banemail':
-						case 'banip':
-
-							if ($user_id == phpbb::$user->data['user_id'])
-							{
-								trigger_error(phpbb::$user->lang['CANNOT_BAN_YOURSELF'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-							}
-
-							if ($user_row['user_type'] == phpbb::USER_FOUNDER)
-							{
-								trigger_error(phpbb::$user->lang['CANNOT_BAN_FOUNDER'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-							}
-
-							if (!check_form_key($form_name))
-							{
-								trigger_error(phpbb::$user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-							}
-
-							$ban = array();
-
-							switch ($action)
-							{
-								case 'banuser':
-									$ban[] = $user_row['username'];
-									$reason = 'USER_ADMIN_BAN_NAME_REASON';
-									$log = 'LOG_USER_BAN_USER';
-								break;
-
-								case 'banemail':
-									$ban[] = $user_row['user_email'];
-									$reason = 'USER_ADMIN_BAN_EMAIL_REASON';
-									$log = 'LOG_USER_BAN_EMAIL';
-								break;
-
-								case 'banip':
-									$ban[] = $user_row['user_ip'];
-
-									$sql = 'SELECT DISTINCT poster_ip
-										FROM ' . POSTS_TABLE . "
-										WHERE poster_id = $user_id";
-									$result = phpbb::$db->sql_query($sql);
-
-									while ($row = phpbb::$db->sql_fetchrow($result))
-									{
-										$ban[] = $row['poster_ip'];
-									}
-									phpbb::$db->sql_freeresult($result);
-
-									$reason = 'USER_ADMIN_BAN_IP_REASON';
-									$log = 'LOG_USER_BAN_IP';
-								break;
-							}
-
-							$ban_reason = utf8_normalize_nfc(request_var('ban_reason', phpbb::$user->lang[$reason], true));
-							$ban_give_reason = utf8_normalize_nfc(request_var('ban_give_reason', '', true));
-
-							// Log not used at the moment, we simply utilize the ban function.
-							$result = user_ban(substr($action, 3), $ban, 0, 0, 0, $ban_reason, $ban_give_reason);
-
-							trigger_error((($result === false) ? phpbb::$user->lang['BAN_ALREADY_ENTERED'] : phpbb::$user->lang['BAN_SUCCESSFUL']) . adm_back_link($this->u_action . '&amp;u=' . $user_id));
-
-						break;
-
-						case 'reactivate':
-
-							if ($user_id == phpbb::$user->data['user_id'])
-							{
-								trigger_error(phpbb::$user->lang['CANNOT_FORCE_REACT_YOURSELF'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-							}
-
-							if (!check_form_key($form_name))
-							{
-								trigger_error(phpbb::$user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-							}
-
-							if ($user_row['user_type'] == phpbb::USER_FOUNDER)
-							{
-								trigger_error(phpbb::$user->lang['CANNOT_FORCE_REACT_FOUNDER'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-							}
-
-							if ($user_row['user_type'] == phpbb::USER_IGNORE)
-							{
-								trigger_error(phpbb::$user->lang['CANNOT_FORCE_REACT_BOT'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-							}
-
-							if (phpbb::$config['email_enable'])
-							{
-								include_once(PHPBB_ROOT_PATH . 'includes/functions_messenger.' . PHP_EXT);
-
-								$server_url = generate_board_url();
-
-								$user_actkey = gen_rand_string(10);
-								$key_len = 54 - (strlen($server_url));
-								$key_len = ($key_len > 6) ? $key_len : 6;
-								$user_actkey = substr($user_actkey, 0, $key_len);
-								$email_template = ($user_row['user_type'] == phpbb::USER_NORMAL) ? 'user_reactivate_account' : 'user_resend_inactive';
-
-								if ($user_row['user_type'] == phpbb::USER_NORMAL)
-								{
-									user_active_flip('deactivate', $user_id, INACTIVE_REMIND);
-
-									$sql = 'UPDATE ' . USERS_TABLE . "
-										SET user_actkey = '" . phpbb::$db->sql_escape($user_actkey) . "'
-										WHERE user_id = $user_id";
-									phpbb::$db->sql_query($sql);
-								}
-								else
-								{
-									// Grabbing the last confirm key - we only send a reminder
-									$sql = 'SELECT user_actkey
-										FROM ' . USERS_TABLE . '
-										WHERE user_id = ' . $user_id;
-									$result = phpbb::$db->sql_query($sql);
-									$user_actkey = (string) phpbb::$db->sql_fetchfield('user_actkey');
-									phpbb::$db->sql_freeresult($result);
-								}
-
-								$messenger = new messenger(false);
-
-								$messenger->template($email_template, $user_row['user_lang']);
-
-								$messenger->to($user_row['user_email'], $user_row['username']);
-
-								$messenger->headers('X-AntiAbuse: Board servername - ' . phpbb::$config['server_name']);
-								$messenger->headers('X-AntiAbuse: User_id - ' . phpbb::$user->data['user_id']);
-								$messenger->headers('X-AntiAbuse: Username - ' . phpbb::$user->data['username']);
-								$messenger->headers('X-AntiAbuse: User IP - ' . phpbb::$user->ip);
-
-								$messenger->assign_vars(array(
-									'WELCOME_MSG'	=> htmlspecialchars_decode(sprintf(phpbb::$user->lang['WELCOME_SUBJECT'], phpbb::$config['sitename'])),
-									'USERNAME'		=> htmlspecialchars_decode($user_row['username']),
-									'U_ACTIVATE'	=> "$server_url/ucp." . PHP_EXT . "?mode=activate&u={$user_row['user_id']}&k=$user_actkey")
-								);
-
-								$messenger->send(NOTIFY_EMAIL);
-
-								add_log('admin', 'LOG_USER_REACTIVATE', $user_row['username']);
-								add_log('user', $user_id, 'LOG_USER_REACTIVATE_USER');
-
-								trigger_error(phpbb::$user->lang['FORCE_REACTIVATION_SUCCESS'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
-							}
-
-						break;
-
-						case 'active':
-
-							if ($user_id == phpbb::$user->data['user_id'])
-							{
-								// It is only deactivation since the user is already activated (else he would not have reached this page)
-								trigger_error(phpbb::$user->lang['CANNOT_DEACTIVATE_YOURSELF'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-							}
-
-							if (!check_form_key($form_name))
-							{
-								trigger_error(phpbb::$user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-							}
-
-							if ($user_row['user_type'] == phpbb::USER_FOUNDER)
-							{
-								trigger_error(phpbb::$user->lang['CANNOT_DEACTIVATE_FOUNDER'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-							}
-
-							if ($user_row['user_type'] == phpbb::USER_IGNORE)
-							{
-								trigger_error(phpbb::$user->lang['CANNOT_DEACTIVATE_BOT'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-							}
-
-							user_active_flip('flip', $user_id);
-
-							$message = ($user_row['user_type'] == phpbb::USER_INACTIVE) ? 'USER_ADMIN_ACTIVATED' : 'USER_ADMIN_DEACTIVED';
-							$log = ($user_row['user_type'] == phpbb::USER_INACTIVE) ? 'LOG_USER_ACTIVE' : 'LOG_USER_INACTIVE';
-
-							add_log('admin', $log, $user_row['username']);
-							add_log('user', $user_id, $log . '_USER');
-
-							trigger_error(phpbb::$user->lang[$message] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
-
-						break;
-
-						case 'delsig':
-
-							if (!check_form_key($form_name))
-							{
-								trigger_error(phpbb::$user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-							}
-
-							$sql_ary = array(
-								'user_sig'					=> '',
-								'user_sig_bbcode_uid'		=> '',
-								'user_sig_bbcode_bitfield'	=> ''
-							);
-
-							$sql = 'UPDATE ' . USERS_TABLE . ' SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . "
-								WHERE user_id = $user_id";
-							phpbb::$db->sql_query($sql);
-
-							add_log('admin', 'LOG_USER_DEL_SIG', $user_row['username']);
-							add_log('user', $user_id, 'LOG_USER_DEL_SIG_USER');
-
-							trigger_error(phpbb::$user->lang['USER_ADMIN_SIG_REMOVED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
-
-						break;
-
-						case 'delavatar':
-
-							if (!check_form_key($form_name))
-							{
-								trigger_error(phpbb::$user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-							}
-
-							$sql_ary = array(
-								'user_avatar'			=> '',
-								'user_avatar_type'		=> 0,
-								'user_avatar_width'		=> 0,
-								'user_avatar_height'	=> 0,
-							);
-
-							$sql = 'UPDATE ' . USERS_TABLE . '
-								SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . "
-								WHERE user_id = $user_id";
-							phpbb::$db->sql_query($sql);
-
-							// Delete old avatar if present
-							if ($user_row['user_avatar'] && $user_row['user_avatar_type'] != AVATAR_GALLERY)
-							{
-								avatar_delete('user', $user_row);
-							}
-
-							add_log('admin', 'LOG_USER_DEL_AVATAR', $user_row['username']);
-							add_log('user', $user_id, 'LOG_USER_DEL_AVATAR_USER');
-
-							trigger_error(phpbb::$user->lang['USER_ADMIN_AVATAR_REMOVED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
-						break;
-
-						case 'delposts':
-
-							if (confirm_box(true))
-							{
-								// Delete posts, attachments, etc.
-								delete_posts('poster_id', $user_id);
-
-								add_log('admin', 'LOG_USER_DEL_POSTS', $user_row['username']);
-								trigger_error(phpbb::$user->lang['USER_POSTS_DELETED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
-							}
-							else
-							{
-								confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-									'u'				=> $user_id,
-									'i'				=> $id,
-									'mode'			=> $mode,
-									'action'		=> $action,
-									'update'		=> true))
-								);
-							}
-
-						break;
-
-						case 'delattach':
-
-							if (confirm_box(true))
-							{
-								delete_attachments('user', $user_id);
-
-								add_log('admin', 'LOG_USER_DEL_ATTACH', $user_row['username']);
-								trigger_error(phpbb::$user->lang['USER_ATTACHMENTS_REMOVED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
-							}
-							else
-							{
-								confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-									'u'				=> $user_id,
-									'i'				=> $id,
-									'mode'			=> $mode,
-									'action'		=> $action,
-									'update'		=> true))
-								);
-							}
-
-						break;
-
-						case 'moveposts':
-
-							if (!check_form_key($form_name))
-							{
-								trigger_error(phpbb::$user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-							}
-
-							phpbb::$user->add_lang('acp/forums');
-
-							$new_forum_id = request_var('new_f', 0);
-
-							if (!$new_forum_id)
-							{
-								$this->page_title = 'USER_ADMIN_MOVE_POSTS';
-
-								phpbb::$template->assign_vars(array(
-									'S_SELECT_FORUM'		=> true,
-									'U_ACTION'				=> $this->u_action . "&amp;action=$action&amp;u=$user_id",
-									'U_BACK'				=> $this->u_action . "&amp;u=$user_id",
-									'S_FORUM_OPTIONS'		=> make_forum_select(false, false, false, true),
-								));
-
-								return;
-							}
-
-							// Is the new forum postable to?
-							$sql = 'SELECT forum_name, forum_type
-								FROM ' . FORUMS_TABLE . "
-								WHERE forum_id = $new_forum_id";
-							$result = phpbb::$db->sql_query($sql);
-							$forum_info = phpbb::$db->sql_fetchrow($result);
-							phpbb::$db->sql_freeresult($result);
-
-							if (!$forum_info)
-							{
-								trigger_error(phpbb::$user->lang['NO_FORUM'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-							}
-
-							if ($forum_info['forum_type'] != FORUM_POST)
-							{
-								trigger_error(phpbb::$user->lang['MOVE_POSTS_NO_POSTABLE_FORUM'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-							}
-
-							// Two stage?
-							// Move topics comprising only posts from this user
-							$topic_id_ary = $move_topic_ary = $move_post_ary = $new_topic_id_ary = array();
-							$forum_id_ary = array($new_forum_id);
-
-							$sql = 'SELECT topic_id, COUNT(post_id) AS total_posts
-								FROM ' . POSTS_TABLE . "
-								WHERE poster_id = $user_id
-									AND forum_id <> $new_forum_id
-								GROUP BY topic_id";
-							$result = phpbb::$db->sql_query($sql);
-
-							while ($row = phpbb::$db->sql_fetchrow($result))
-							{
-								$topic_id_ary[$row['topic_id']] = $row['total_posts'];
-							}
-							phpbb::$db->sql_freeresult($result);
-
-							if (sizeof($topic_id_ary))
-							{
-								$sql = 'SELECT topic_id, forum_id, topic_title, topic_replies, topic_replies_real, topic_attachment
-									FROM ' . TOPICS_TABLE . '
-									WHERE ' . phpbb::$db->sql_in_set('topic_id', array_keys($topic_id_ary));
-								$result = phpbb::$db->sql_query($sql);
-
-								while ($row = phpbb::$db->sql_fetchrow($result))
-								{
-									if (max($row['topic_replies'], $row['topic_replies_real']) + 1 == $topic_id_ary[$row['topic_id']])
-									{
-										$move_topic_ary[] = $row['topic_id'];
-									}
-									else
-									{
-										$move_post_ary[$row['topic_id']]['title'] = $row['topic_title'];
-										$move_post_ary[$row['topic_id']]['attach'] = ($row['topic_attachment']) ? 1 : 0;
-									}
-
-									$forum_id_ary[] = $row['forum_id'];
-								}
-								phpbb::$db->sql_freeresult($result);
-							}
-
-							// Entire topic comprises posts by this user, move these topics
-							if (sizeof($move_topic_ary))
-							{
-								move_topics($move_topic_ary, $new_forum_id, false);
-							}
-
-							if (sizeof($move_post_ary))
-							{
-								// Create new topic
-								// Update post_ids, report_ids, attachment_ids
-								foreach ($move_post_ary as $topic_id => $post_ary)
-								{
-									// Create new topic
-									$sql = 'INSERT INTO ' . TOPICS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', array(
-										'topic_poster'				=> $user_id,
-										'topic_time'				=> time(),
-										'forum_id' 					=> $new_forum_id,
-										'icon_id'					=> 0,
-										'topic_approved'			=> 1,
-										'topic_title' 				=> $post_ary['title'],
-										'topic_first_poster_name'	=> $user_row['username'],
-										'topic_type'				=> POST_NORMAL,
-										'topic_time_limit'			=> 0,
-										'topic_attachment'			=> $post_ary['attach'])
-									);
-									phpbb::$db->sql_query($sql);
-
-									$new_topic_id = phpbb::$db->sql_nextid();
-
-									// Move posts
-									$sql = 'UPDATE ' . POSTS_TABLE . "
-										SET forum_id = $new_forum_id, topic_id = $new_topic_id
-										WHERE topic_id = $topic_id
-											AND poster_id = $user_id";
-									phpbb::$db->sql_query($sql);
-
-									if ($post_ary['attach'])
-									{
-										$sql = 'UPDATE ' . ATTACHMENTS_TABLE . "
-											SET topic_id = $new_topic_id
-											WHERE topic_id = $topic_id
-												AND poster_id = $user_id";
-										phpbb::$db->sql_query($sql);
-									}
-
-									$new_topic_id_ary[] = $new_topic_id;
-								}
-							}
-
-							$forum_id_ary = array_unique($forum_id_ary);
-							$topic_id_ary = array_unique(array_merge(array_keys($topic_id_ary), $new_topic_id_ary));
-
-							if (sizeof($topic_id_ary))
-							{
-								sync('topic_reported', 'topic_id', $topic_id_ary);
-								sync('topic', 'topic_id', $topic_id_ary);
-							}
-
-							if (sizeof($forum_id_ary))
-							{
-								sync('forum', 'forum_id', $forum_id_ary, false, true);
-							}
-
-
-							add_log('admin', 'LOG_USER_MOVE_POSTS', $user_row['username'], $forum_info['forum_name']);
-							add_log('user', $user_id, 'LOG_USER_MOVE_POSTS_USER', $forum_info['forum_name']);
-
-							trigger_error(phpbb::$user->lang['USER_POSTS_MOVED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
-
-						break;
-					}
-
-					// Handle registration info updates
-					$data = array(
-						'username'			=> utf8_normalize_nfc(request_var('user', $user_row['username'], true)),
-						'user_founder'		=> request_var('user_founder', ($user_row['user_type'] == phpbb::USER_FOUNDER) ? 1 : 0),
-						'email'				=> strtolower(request_var('user_email', $user_row['user_email'])),
-						'email_confirm'		=> strtolower(request_var('email_confirm', '')),
-						'new_password'		=> request_var('new_password', '', true),
-						'password_confirm'	=> request_var('password_confirm', '', true),
-					);
-
-					// Validation data - we do not check the password complexity setting here
-					$check_ary = array(
-						'new_password'		=> array(
-							array('string', true, phpbb::$config['min_pass_chars'], phpbb::$config['max_pass_chars']),
-							array('password')),
-						'password_confirm'	=> array('string', true, phpbb::$config['min_pass_chars'], phpbb::$config['max_pass_chars']),
-					);
-
-					// Check username if altered
-					if ($data['username'] != $user_row['username'])
-					{
-						$check_ary += array(
-							'username'			=> array(
-								array('string', false, phpbb::$config['min_name_chars'], phpbb::$config['max_name_chars']),
-								array('username', $user_row['username'])
-							),
-						);
-					}
-
-					// Check email if altered
-					if ($data['email'] != $user_row['user_email'])
-					{
-						$check_ary += array(
-							'email'				=> array(
-								array('string', false, 6, 60),
-								array('email', $user_row['user_email'])
-							),
-							'email_confirm'		=> array('string', true, 6, 60)
-						);
-					}
-
-					$error = validate_data($data, $check_ary);
-
-					if ($data['new_password'] && $data['password_confirm'] != $data['new_password'])
-					{
-						$error[] = 'NEW_PASSWORD_ERROR';
-					}
-
-					if ($data['email'] != $user_row['user_email'] && $data['email_confirm'] != $data['email'])
-					{
-						$error[] = 'NEW_EMAIL_ERROR';
-					}
-
-					if (!check_form_key($form_name))
-					{
-						$error[] = 'FORM_INVALID';
-					}
-
-					// Which updates do we need to do?
-					$update_username = ($user_row['username'] != $data['username']) ? $data['username'] : false;
-					$update_password = ($data['new_password'] && !phpbb_check_hash($user_row['user_password'], $data['new_password'])) ? true : false;
-					$update_email = ($data['email'] != $user_row['user_email']) ? $data['email'] : false;
-
-					if (!sizeof($error))
-					{
-						$sql_ary = array();
-
-						if ($user_row['user_type'] != phpbb::USER_FOUNDER || phpbb::$user->is_founder)
-						{
-							// Only allow founders updating the founder status...
-							if (phpbb::$user->is_founder)
-							{
-								// Setting a normal member to be a founder
-								if ($data['user_founder'] && $user_row['user_type'] != phpbb::USER_FOUNDER)
-								{
-									// Make sure the user is not setting an Inactive or ignored user to be a founder
-									if ($user_row['user_type'] == phpbb::USER_IGNORE)
-									{
-										trigger_error(phpbb::$user->lang['CANNOT_SET_FOUNDER_IGNORED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-									}
-
-									if ($user_row['user_type'] == phpbb::USER_INACTIVE)
-									{
-										trigger_error(phpbb::$user->lang['CANNOT_SET_FOUNDER_INACTIVE'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-									}
-
-									$sql_ary['user_type'] = phpbb::USER_FOUNDER;
-								}
-								else if (!$data['user_founder'] && $user_row['user_type'] == phpbb::USER_FOUNDER)
-								{
-									// Check if at least one founder is present
-									$sql = 'SELECT user_id
-										FROM ' . USERS_TABLE . '
-										WHERE user_type = ' . phpbb::USER_FOUNDER . '
-											AND user_id <> ' . $user_id;
-									$result = phpbb::$db->sql_query_limit($sql, 1);
-									$row = phpbb::$db->sql_fetchrow($result);
-									phpbb::$db->sql_freeresult($result);
-
-									if ($row)
-									{
-										$sql_ary['user_type'] = phpbb::USER_NORMAL;
-									}
-									else
-									{
-										trigger_error(phpbb::$user->lang['AT_LEAST_ONE_FOUNDER'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-									}
-								}
-							}
-						}
-
-						if ($update_username !== false)
-						{
-							$sql_ary['username'] = $update_username;
-							$sql_ary['username_clean'] = utf8_clean_string($update_username);
-
-							add_log('user', $user_id, 'LOG_USER_UPDATE_NAME', $user_row['username'], $update_username);
-						}
-
-						if ($update_email !== false)
-						{
-							$sql_ary += array(
-								'user_email'		=> $update_email,
-								'user_email_hash'	=> hexdec(crc32($update_email) . strlen($update_email))
-							);
-
-							add_log('user', $user_id, 'LOG_USER_UPDATE_EMAIL', $user_row['username'], $user_row['user_email'], $update_email);
-						}
-
-						if ($update_password)
-						{
-							$sql_ary += array(
-								'user_password'		=> phpbb_hash($data['new_password']),
-								'user_passchg'		=> time(),
-								'user_pass_convert'	=> 0,
-							);
-
-							phpbb::$user->reset_login_keys($user_id);
-							add_log('user', $user_id, 'LOG_USER_NEW_PASSWORD', $user_row['username']);
-						}
-
-						if (sizeof($sql_ary))
-						{
-							$sql = 'UPDATE ' . USERS_TABLE . '
-								SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-								WHERE user_id = ' . $user_id;
-							phpbb::$db->sql_query($sql);
-						}
-
-						if ($update_username)
-						{
-							user_update_name($user_row['username'], $update_username);
-						}
-
-						// Let the users permissions being updated
-						phpbb::$acl->acl_clear_prefetch($user_id);
-
-						add_log('admin', 'LOG_USER_USER_UPDATE', $data['username']);
-
-						trigger_error(phpbb::$user->lang['USER_OVERVIEW_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
-					}
-
-					// Replace "error" strings with their real, localised form
-					$error = preg_replace('#^([A-Z_]+)$#e', "phpbb::\$user->lang('\\1')", $error);
-				}
-
-				if ($user_id == phpbb::$user->data['user_id'])
-				{
-					$quick_tool_ary = array('delsig' => 'DEL_SIG', 'delavatar' => 'DEL_AVATAR', 'moveposts' => 'MOVE_POSTS', 'delposts' => 'DEL_POSTS', 'delattach' => 'DEL_ATTACH');
-				}
-				else
-				{
-					$quick_tool_ary = array();
-
-					if ($user_row['user_type'] != phpbb::USER_FOUNDER)
-					{
-						$quick_tool_ary += array('banuser' => 'BAN_USER', 'banemail' => 'BAN_EMAIL', 'banip' => 'BAN_IP');
-					}
-
-					if ($user_row['user_type'] != phpbb::USER_FOUNDER && $user_row['user_type'] != phpbb::USER_IGNORE)
-					{
-						$quick_tool_ary += array('active' => (($user_row['user_type'] == phpbb::USER_INACTIVE) ? 'ACTIVATE' : 'DEACTIVATE'));
-					}
-
-					$quick_tool_ary += array('delsig' => 'DEL_SIG', 'delavatar' => 'DEL_AVATAR', 'moveposts' => 'MOVE_POSTS', 'delposts' => 'DEL_POSTS', 'delattach' => 'DEL_ATTACH');
-
-					if (phpbb::$config['email_enable'] && ($user_row['user_type'] == phpbb::USER_NORMAL || $user_row['user_type'] == phpbb::USER_INACTIVE))
-					{
-						$quick_tool_ary['reactivate'] = 'FORCE';
-					}
-				}
-
-				$s_action_options = '<option class="sep" value="">' . phpbb::$user->lang['SELECT_OPTION'] . '</option>';
-				foreach ($quick_tool_ary as $value => $lang)
-				{
-					$s_action_options .= '<option value="' . $value . '">' . phpbb::$user->lang['USER_ADMIN_' . $lang] . '</option>';
-				}
-
-				if (phpbb::$config['load_onlinetrack'])
-				{
-					$sql = 'SELECT MAX(session_time) AS session_time, MIN(session_viewonline) AS session_viewonline
-						FROM ' . SESSIONS_TABLE . "
-						WHERE session_user_id = $user_id";
-					$result = phpbb::$db->sql_query($sql);
-					$row = phpbb::$db->sql_fetchrow($result);
-					phpbb::$db->sql_freeresult($result);
-
-					$user_row['session_time'] = (isset($row['session_time'])) ? $row['session_time'] : 0;
-					$user_row['session_viewonline'] = (isset($row['session_viewonline'])) ? $row['session_viewonline'] : 0;
-					unset($row);
-				}
-
-				$last_visit = (!empty($user_row['session_time'])) ? $user_row['session_time'] : $user_row['user_lastvisit'];
-
-				$inactive_reason = '';
-				if ($user_row['user_type'] == phpbb::USER_INACTIVE)
-				{
-					$inactive_reason = phpbb::$user->lang['INACTIVE_REASON_UNKNOWN'];
-
-					switch ($user_row['user_inactive_reason'])
-					{
-						case INACTIVE_REGISTER:
-							$inactive_reason = phpbb::$user->lang['INACTIVE_REASON_REGISTER'];
-						break;
-
-						case INACTIVE_PROFILE:
-							$inactive_reason = phpbb::$user->lang['INACTIVE_REASON_PROFILE'];
-						break;
-
-						case INACTIVE_MANUAL:
-							$inactive_reason = phpbb::$user->lang['INACTIVE_REASON_MANUAL'];
-						break;
-
-						case INACTIVE_REMIND:
-							$inactive_reason = phpbb::$user->lang['INACTIVE_REASON_REMIND'];
-						break;
-					}
-				}
-
-				// Posts in Queue
-				$sql = 'SELECT COUNT(post_id) as posts_in_queue
-					FROM ' . POSTS_TABLE . '
-					WHERE poster_id = ' . $user_id . '
-						AND post_approved = 0';
-				$result = phpbb::$db->sql_query($sql);
-				$user_row['posts_in_queue'] = (int) phpbb::$db->sql_fetchfield('posts_in_queue');
-				phpbb::$db->sql_freeresult($result);
-
-				phpbb::$template->assign_vars(array(
-					'L_NAME_CHARS_EXPLAIN'		=> sprintf(phpbb::$user->lang[phpbb::$config['allow_name_chars'] . '_EXPLAIN'], phpbb::$config['min_name_chars'], phpbb::$config['max_name_chars']),
-					'L_CHANGE_PASSWORD_EXPLAIN'	=> sprintf(phpbb::$user->lang[phpbb::$config['pass_complex'] . '_EXPLAIN'], phpbb::$config['min_pass_chars'], phpbb::$config['max_pass_chars']),
-					'L_POSTS_IN_QUEUE'			=> phpbb::$user->lang('NUM_POSTS_IN_QUEUE', $user_row['posts_in_queue']),
-					'S_FOUNDER'					=> phpbb::$user->is_founder,
-
-					'S_OVERVIEW'		=> true,
-					'S_USER_IP'			=> ($user_row['user_ip']) ? true : false,
-					'S_USER_FOUNDER'	=> ($user_row['user_type'] == phpbb::USER_FOUNDER) ? true : false,
-					'S_ACTION_OPTIONS'	=> $s_action_options,
-					'S_OWN_ACCOUNT'		=> ($user_id == phpbb::$user->data['user_id']) ? true : false,
-					'S_USER_INACTIVE'	=> ($user_row['user_type'] == phpbb::USER_INACTIVE) ? true : false,
-
-					'U_SHOW_IP'		=> $this->u_action . "&amp;u=$user_id&amp;ip=" . (($ip == 'ip') ? 'hostname' : 'ip'),
-					'U_WHOIS'		=> $this->u_action . "&amp;action=whois&amp;user_ip={$user_row['user_ip']}",
-					'U_MCP_QUEUE'	=> (phpbb::$acl->acl_getf_global('m_approve')) ? append_sid('mcp', 'i=queue', true, phpbb::$user->session_id) : '',
-
-					'U_SWITCH_PERMISSIONS'	=> (phpbb::$acl->acl_get('a_switchperm') && phpbb::$user->data['user_id'] != $user_row['user_id']) ? append_sid('ucp', "mode=switch_perm&amp;u={$user_row['user_id']}") : '',
-
-					'POSTS_IN_QUEUE'	=> $user_row['posts_in_queue'],
-					'USER'				=> $user_row['username'],
-					'USER_REGISTERED'	=> phpbb::$user->format_date($user_row['user_regdate']),
-					'REGISTERED_IP'		=> ($ip == 'hostname') ? gethostbyaddr($user_row['user_ip']) : $user_row['user_ip'],
-					'USER_LASTACTIVE'	=> ($last_visit) ? phpbb::$user->format_date($last_visit) : ' - ',
-					'USER_EMAIL'		=> $user_row['user_email'],
-					'USER_WARNINGS'		=> $user_row['user_warnings'],
-					'USER_POSTS'		=> $user_row['user_posts'],
-					'USER_INACTIVE_REASON'	=> $inactive_reason,
-				));
-
-			break;
-
-			case 'feedback':
-
-				phpbb::$user->add_lang('mcp');
-
-				// Set up general vars
-				$start		= request_var('start', 0);
-				$deletemark = phpbb_request::is_set_post('delmarked');
-				$deleteall	= phpbb_request::is_set_post('delall');
-				$marked		= request_var('mark', array(0));
-				$message	= utf8_normalize_nfc(request_var('message', '', true));
-
-				// Sort keys
-				$sort_days	= request_var('st', 0);
-				$sort_key	= request_var('sk', 't');
-				$sort_dir	= request_var('sd', 'd');
-
-				// Delete entries if requested and able
-				if (($deletemark || $deleteall) && phpbb::$acl->acl_get('a_clearlogs'))
-				{
-					if (!check_form_key($form_name))
-					{
-						trigger_error(phpbb::$user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-					}
-
-					$where_sql = '';
-					if ($deletemark && $marked)
-					{
-						$sql_in = array();
-						foreach ($marked as $mark)
-						{
-							$sql_in[] = $mark;
-						}
-						$where_sql = ' AND ' . phpbb::$db->sql_in_set('log_id', $sql_in);
-						unset($sql_in);
-					}
-
-					if ($where_sql || $deleteall)
-					{
-						$sql = 'DELETE FROM ' . LOG_TABLE . '
-							WHERE log_type = ' . LOG_USERS . "
-							AND reportee_id = $user_id
-							$where_sql";
-						phpbb::$db->sql_query($sql);
-
-						add_log('admin', 'LOG_CLEAR_USER', $user_row['username']);
-					}
-				}
-
-				if ($submit && $message)
-				{
-					if (!check_form_key($form_name))
-					{
-						trigger_error(phpbb::$user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-					}
-
-					add_log('admin', 'LOG_USER_FEEDBACK', $user_row['username']);
-					add_log('mod', 0, 0, 'LOG_USER_FEEDBACK', $user_row['username']);
-					add_log('user', $user_id, 'LOG_USER_GENERAL', $message);
-
-					trigger_error(phpbb::$user->lang['USER_FEEDBACK_ADDED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
-				}
-
-				// Sorting
-				$limit_days = array(0 => phpbb::$user->lang['ALL_ENTRIES'], 1 => phpbb::$user->lang['1_DAY'], 7 => phpbb::$user->lang['7_DAYS'], 14 => phpbb::$user->lang['2_WEEKS'], 30 => phpbb::$user->lang['1_MONTH'], 90 => phpbb::$user->lang['3_MONTHS'], 180 => phpbb::$user->lang['6_MONTHS'], 365 => phpbb::$user->lang['1_YEAR']);
-				$sort_by_text = array('u' => phpbb::$user->lang['SORT_USERNAME'], 't' => phpbb::$user->lang['SORT_DATE'], 'i' => phpbb::$user->lang['SORT_IP'], 'o' => phpbb::$user->lang['SORT_ACTION']);
-				$sort_by_sql = array('u' => 'u.username_clean', 't' => 'l.log_time', 'i' => 'l.log_ip', 'o' => 'l.log_operation');
-
-				$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
-				gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
-
-				// Define where and sort sql for use in displaying logs
-				$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
-				$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
-
-				// Grab log data
-				$log_data = array();
-				$log_count = 0;
-				view_log('user', $log_data, $log_count, phpbb::$config['topics_per_page'], $start, 0, 0, $user_id, $sql_where, $sql_sort);
-
-				phpbb::$template->assign_vars(array(
-					'S_FEEDBACK'	=> true,
-					'S_ON_PAGE'		=> on_page($log_count, phpbb::$config['topics_per_page'], $start),
-					'PAGINATION'	=> generate_pagination($this->u_action . "&amp;u=$user_id&amp;$u_sort_param", $log_count, phpbb::$config['topics_per_page'], $start, true),
-
-					'S_LIMIT_DAYS'	=> $s_limit_days,
-					'S_SORT_KEY'	=> $s_sort_key,
-					'S_SORT_DIR'	=> $s_sort_dir,
-					'S_CLEARLOGS'	=> phpbb::$acl->acl_get('a_clearlogs'),
-				));
-
-				foreach ($log_data as $row)
-				{
-					phpbb::$template->assign_block_vars('log', array(
-						'USERNAME'		=> $row['username_full'],
-						'IP'			=> $row['ip'],
-						'DATE'			=> phpbb::$user->format_date($row['time']),
-						'ACTION'		=> nl2br($row['action']),
-						'ID'			=> $row['id'],
-					));
-				}
-
-			break;
-
-			case 'profile':
-
-				include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-				include(PHPBB_ROOT_PATH . 'includes/functions_profile_fields.' . PHP_EXT);
-
-				$cp = new custom_profile();
-
-				$cp_data = $cp_error = array();
-
-				$sql = 'SELECT lang_id
-					FROM ' . LANG_TABLE . "
-					WHERE lang_iso = '" . phpbb::$db->sql_escape(phpbb::$user->data['user_lang']) . "'";
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				$user_row['iso_lang_id'] = $row['lang_id'];
-
-				$data = array(
-					'icq'			=> request_var('icq', $user_row['user_icq']),
-					'aim'			=> request_var('aim', $user_row['user_aim']),
-					'msn'			=> request_var('msn', $user_row['user_msnm']),
-					'yim'			=> request_var('yim', $user_row['user_yim']),
-					'jabber'		=> utf8_normalize_nfc(request_var('jabber', $user_row['user_jabber'], true)),
-					'website'		=> request_var('website', $user_row['user_website']),
-					'location'		=> utf8_normalize_nfc(request_var('location', $user_row['user_from'], true)),
-					'occupation'	=> utf8_normalize_nfc(request_var('occupation', $user_row['user_occ'], true)),
-					'interests'		=> utf8_normalize_nfc(request_var('interests', $user_row['user_interests'], true)),
-					'bday_day'		=> 0,
-					'bday_month'	=> 0,
-					'bday_year'		=> 0,
-				);
-
-				if ($user_row['user_birthday'])
-				{
-					list($data['bday_day'], $data['bday_month'], $data['bday_year']) = explode('-', $user_row['user_birthday']);
-				}
-
-				$data['bday_day']		= request_var('bday_day', $data['bday_day']);
-				$data['bday_month']		= request_var('bday_month', $data['bday_month']);
-				$data['bday_year']		= request_var('bday_year', $data['bday_year']);
-				$data['user_birthday']	= sprintf('%2d-%2d-%4d', $data['bday_day'], $data['bday_month'], $data['bday_year']);
-
-
-				if ($submit)
-				{
-					$error = validate_data($data, array(
-						'icq'			=> array(
-							array('string', true, 3, 15),
-							array('match', true, '#^[0-9]+$#i')),
-						'aim'			=> array('string', true, 3, 255),
-						'msn'			=> array('string', true, 5, 255),
-						'jabber'		=> array(
-							array('string', true, 5, 255),
-							array('jabber')),
-						'yim'			=> array('string', true, 5, 255),
-						'website'		=> array(
-							array('string', true, 12, 255),
-							array('match', true, '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')),
-						'location'		=> array('string', true, 2, 100),
-						'occupation'	=> array('string', true, 2, 500),
-						'interests'		=> array('string', true, 2, 500),
-						'bday_day'		=> array('num', true, 1, 31),
-						'bday_month'	=> array('num', true, 1, 12),
-						'bday_year'		=> array('num', true, 1901, gmdate('Y', time())),
-						'user_birthday'	=> array('date', true),
-					));
-
-					// validate custom profile fields
-					$cp->submit_cp_field('profile', $user_row['iso_lang_id'], $cp_data, $cp_error);
-
-					if (sizeof($cp_error))
-					{
-						$error = array_merge($error, $cp_error);
-					}
-					if (!check_form_key($form_name))
-					{
-						$error[] = 'FORM_INVALID';
-					}
-
-					if (!sizeof($error))
-					{
-						$sql_ary = array(
-							'user_icq'		=> $data['icq'],
-							'user_aim'		=> $data['aim'],
-							'user_msnm'		=> $data['msn'],
-							'user_yim'		=> $data['yim'],
-							'user_jabber'	=> $data['jabber'],
-							'user_website'	=> $data['website'],
-							'user_from'		=> $data['location'],
-							'user_occ'		=> $data['occupation'],
-							'user_interests'=> $data['interests'],
-							'user_birthday'	=> $data['user_birthday'],
-						);
-
-						$sql = 'UPDATE ' . USERS_TABLE . '
-							SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . "
-							WHERE user_id = $user_id";
-						phpbb::$db->sql_query($sql);
-
-						// Update Custom Fields
-						if (sizeof($cp_data))
-						{
-							switch (phpbb::$db->dbms_type)
-							{
-								case 'oracle':
-								case 'firebird':
-								case 'postgres':
-								case 'db2':
-									$right_delim = $left_delim = '"';
-								break;
-
-								case 'sqlite':
-								case 'mssql':
-									$right_delim = ']';
-									$left_delim = '[';
-								break;
-
-								case 'mysql':
-									$right_delim = $left_delim = '`';
-								break;
-							}
-
-							foreach ($cp_data as $key => $value)
-							{
-								$cp_data[$left_delim . $key . $right_delim] = $value;
-								unset($cp_data[$key]);
-							}
-
-							$sql = 'UPDATE ' . PROFILE_FIELDS_DATA_TABLE . '
-								SET ' . phpbb::$db->sql_build_array('UPDATE', $cp_data) . "
-								WHERE user_id = $user_id";
-							phpbb::$db->sql_query($sql);
-
-							if (!phpbb::$db->sql_affectedrows())
-							{
-								$cp_data['user_id'] = (int) $user_id;
-
-								phpbb::$db->sql_return_on_error(true);
-
-								$sql = 'INSERT INTO ' . PROFILE_FIELDS_DATA_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $cp_data);
-								phpbb::$db->sql_query($sql);
-
-								phpbb::$db->sql_return_on_error(false);
-							}
-						}
-
-						trigger_error(phpbb::$user->lang['USER_PROFILE_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
-					}
-
-					// Replace "error" strings with their real, localised form
-					$error = preg_replace('#^([A-Z_]+)$#e', "phpbb::\$user->lang('\\1')", $error);
-				}
-
-				$s_birthday_day_options = '<option value="0"' . ((!$data['bday_day']) ? ' selected="selected"' : '') . '>--</option>';
-				for ($i = 1; $i < 32; $i++)
-				{
-					$selected = ($i == $data['bday_day']) ? ' selected="selected"' : '';
-					$s_birthday_day_options .= "<option value=\"$i\"$selected>$i</option>";
-				}
-
-				$s_birthday_month_options = '<option value="0"' . ((!$data['bday_month']) ? ' selected="selected"' : '') . '>--</option>';
-				for ($i = 1; $i < 13; $i++)
-				{
-					$selected = ($i == $data['bday_month']) ? ' selected="selected"' : '';
-					$s_birthday_month_options .= "<option value=\"$i\"$selected>$i</option>";
-				}
-				$s_birthday_year_options = '';
-
-				$now = getdate();
-				$s_birthday_year_options = '<option value="0"' . ((!$data['bday_year']) ? ' selected="selected"' : '') . '>--</option>';
-				for ($i = $now['year'] - 100; $i < $now['year']; $i++)
-				{
-					$selected = ($i == $data['bday_year']) ? ' selected="selected"' : '';
-					$s_birthday_year_options .= "<option value=\"$i\"$selected>$i</option>";
-				}
-				unset($now);
-
-				phpbb::$template->assign_vars(array(
-					'ICQ'			=> $data['icq'],
-					'YIM'			=> $data['yim'],
-					'AIM'			=> $data['aim'],
-					'MSN'			=> $data['msn'],
-					'JABBER'		=> $data['jabber'],
-					'WEBSITE'		=> $data['website'],
-					'LOCATION'		=> $data['location'],
-					'OCCUPATION'	=> $data['occupation'],
-					'INTERESTS'		=> $data['interests'],
-
-					'S_BIRTHDAY_DAY_OPTIONS'	=> $s_birthday_day_options,
-					'S_BIRTHDAY_MONTH_OPTIONS'	=> $s_birthday_month_options,
-					'S_BIRTHDAY_YEAR_OPTIONS'	=> $s_birthday_year_options,
-
-					'S_PROFILE'		=> true,
-				));
-
-				// Get additional profile fields and assign them to the template block var 'profile_fields'
-				phpbb::$user->get_profile_fields($user_id);
-
-				$cp->generate_profile_fields('profile', $user_row['iso_lang_id']);
-
-			break;
-
-			case 'prefs':
-
-				include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-
-				$data = array(
-					'dateformat'		=> utf8_normalize_nfc(request_var('dateformat', $user_row['user_dateformat'], true)),
-					'lang'				=> basename(request_var('lang', $user_row['user_lang'])),
-					'tz'				=> request_var('tz', (float) $user_row['user_timezone']),
-					'style'				=> request_var('style', $user_row['user_style']),
-					'dst'				=> request_var('dst', $user_row['user_dst']),
-					'viewemail'			=> request_var('viewemail', $user_row['user_allow_viewemail']),
-					'massemail'			=> request_var('massemail', $user_row['user_allow_massemail']),
-					'hideonline'		=> request_var('hideonline', !$user_row['user_allow_viewonline']),
-					'notifymethod'		=> request_var('notifymethod', $user_row['user_notify_type']),
-					'notifypm'			=> request_var('notifypm', $user_row['user_notify_pm']),
-					'popuppm'			=> request_var('popuppm', $this->optionget($user_row, 'popuppm')),
-					'allowpm'			=> request_var('allowpm', $user_row['user_allow_pm']),
-
-					'topic_sk'			=> request_var('topic_sk', ($user_row['user_topic_sortby_type']) ? $user_row['user_topic_sortby_type'] : 't'),
-					'topic_sd'			=> request_var('topic_sd', ($user_row['user_topic_sortby_dir']) ? $user_row['user_topic_sortby_dir'] : 'd'),
-					'topic_st'			=> request_var('topic_st', ($user_row['user_topic_show_days']) ? $user_row['user_topic_show_days'] : 0),
-
-					'post_sk'			=> request_var('post_sk', ($user_row['user_post_sortby_type']) ? $user_row['user_post_sortby_type'] : 't'),
-					'post_sd'			=> request_var('post_sd', ($user_row['user_post_sortby_dir']) ? $user_row['user_post_sortby_dir'] : 'a'),
-					'post_st'			=> request_var('post_st', ($user_row['user_post_show_days']) ? $user_row['user_post_show_days'] : 0),
-
-					'view_images'		=> request_var('view_images', $this->optionget($user_row, 'viewimg')),
-					'view_flash'		=> request_var('view_flash', $this->optionget($user_row, 'viewflash')),
-					'view_smilies'		=> request_var('view_smilies', $this->optionget($user_row, 'viewsmilies')),
-					'view_sigs'			=> request_var('view_sigs', $this->optionget($user_row, 'viewsigs')),
-					'view_avatars'		=> request_var('view_avatars', $this->optionget($user_row, 'viewavatars')),
-					'view_wordcensor'	=> request_var('view_wordcensor', $this->optionget($user_row, 'viewcensors')),
-
-					'bbcode'	=> request_var('bbcode', $this->optionget($user_row, 'bbcode')),
-					'smilies'	=> request_var('smilies', $this->optionget($user_row, 'smilies')),
-					'sig'		=> request_var('sig', $this->optionget($user_row, 'attachsig')),
-					'notify'	=> request_var('notify', $user_row['user_notify']),
-				);
-
-				if ($submit)
-				{
-					$error = validate_data($data, array(
-						'dateformat'	=> array('string', false, 1, 30),
-						'lang'			=> array('match', false, '#^[a-z_\-]{2,}$#i'),
-						'tz'			=> array('num', false, -14, 14),
-
-						'topic_sk'		=> array('string', false, 1, 1),
-						'topic_sd'		=> array('string', false, 1, 1),
-						'post_sk'		=> array('string', false, 1, 1),
-						'post_sd'		=> array('string', false, 1, 1),
-					));
-
-					if (!check_form_key($form_name))
-					{
-						$error[] = 'FORM_INVALID';
-					}
-
-					if (!sizeof($error))
-					{
-						$this->optionset($user_row, 'popuppm', $data['popuppm']);
-						$this->optionset($user_row, 'viewimg', $data['view_images']);
-						$this->optionset($user_row, 'viewflash', $data['view_flash']);
-						$this->optionset($user_row, 'viewsmilies', $data['view_smilies']);
-						$this->optionset($user_row, 'viewsigs', $data['view_sigs']);
-						$this->optionset($user_row, 'viewavatars', $data['view_avatars']);
-						$this->optionset($user_row, 'viewcensors', $data['view_wordcensor']);
-						$this->optionset($user_row, 'bbcode', $data['bbcode']);
-						$this->optionset($user_row, 'smilies', $data['smilies']);
-						$this->optionset($user_row, 'attachsig', $data['sig']);
-
-						$sql_ary = array(
-							'user_options'			=> $user_row['user_options'],
-
-							'user_allow_pm'			=> $data['allowpm'],
-							'user_allow_viewemail'	=> $data['viewemail'],
-							'user_allow_massemail'	=> $data['massemail'],
-							'user_allow_viewonline'	=> !$data['hideonline'],
-							'user_notify_type'		=> $data['notifymethod'],
-							'user_notify_pm'		=> $data['notifypm'],
-
-							'user_dst'				=> $data['dst'],
-							'user_dateformat'		=> $data['dateformat'],
-							'user_lang'				=> $data['lang'],
-							'user_timezone'			=> $data['tz'],
-							'user_style'			=> $data['style'],
-
-							'user_topic_sortby_type'	=> $data['topic_sk'],
-							'user_post_sortby_type'		=> $data['post_sk'],
-							'user_topic_sortby_dir'		=> $data['topic_sd'],
-							'user_post_sortby_dir'		=> $data['post_sd'],
-
-							'user_topic_show_days'	=> $data['topic_st'],
-							'user_post_show_days'	=> $data['post_st'],
-
-							'user_notify'	=> $data['notify'],
-						);
-
-						$sql = 'UPDATE ' . USERS_TABLE . '
-							SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . "
-							WHERE user_id = $user_id";
-						phpbb::$db->sql_query($sql);
-
-						trigger_error(phpbb::$user->lang['USER_PREFS_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
-					}
-
-					// Replace "error" strings with their real, localised form
-					$error = preg_replace('#^([A-Z_]+)$#e', "phpbb::\$user->lang('\\1')", $error);
-				}
-
-				$dateformat_options = '';
-				foreach (phpbb::$user->lang['dateformats'] as $format => $null)
-				{
-					$dateformat_options .= '<option value="' . $format . '"' . (($format == $data['dateformat']) ? ' selected="selected"' : '') . '>';
-					$dateformat_options .= phpbb::$user->format_date(time(), $format, false) . ((strpos($format, '|') !== false) ? phpbb::$user->lang['VARIANT_DATE_SEPARATOR'] . phpbb::$user->format_date(time(), $format, true) : '');
-					$dateformat_options .= '</option>';
-				}
-
-				$s_custom = false;
-
-				$dateformat_options .= '<option value="custom"';
-				if (!isset(phpbb::$user->lang['dateformats'][$data['dateformat']]))
-				{
-					$dateformat_options .= ' selected="selected"';
-					$s_custom = true;
-				}
-				$dateformat_options .= '>' . phpbb::$user->lang['CUSTOM_DATEFORMAT'] . '</option>';
-
-				$sort_dir_text = array('a' => phpbb::$user->lang['ASCENDING'], 'd' => phpbb::$user->lang['DESCENDING']);
-
-				// Topic ordering options
-				$limit_topic_days = array(0 => phpbb::$user->lang['ALL_TOPICS'], 1 => phpbb::$user->lang['1_DAY'], 7 => phpbb::$user->lang['7_DAYS'], 14 => phpbb::$user->lang['2_WEEKS'], 30 => phpbb::$user->lang['1_MONTH'], 90 => phpbb::$user->lang['3_MONTHS'], 180 => phpbb::$user->lang['6_MONTHS'], 365 => phpbb::$user->lang['1_YEAR']);
-				$sort_by_topic_text = array('a' => phpbb::$user->lang['AUTHOR'], 't' => phpbb::$user->lang['POST_TIME'], 'r' => phpbb::$user->lang['REPLIES'], 's' => phpbb::$user->lang['SUBJECT'], 'v' => phpbb::$user->lang['VIEWS']);
-
-				// Post ordering options
-				$limit_post_days = array(0 => phpbb::$user->lang['ALL_POSTS'], 1 => phpbb::$user->lang['1_DAY'], 7 => phpbb::$user->lang['7_DAYS'], 14 => phpbb::$user->lang['2_WEEKS'], 30 => phpbb::$user->lang['1_MONTH'], 90 => phpbb::$user->lang['3_MONTHS'], 180 => phpbb::$user->lang['6_MONTHS'], 365 => phpbb::$user->lang['1_YEAR']);
-				$sort_by_post_text = array('a' => phpbb::$user->lang['AUTHOR'], 't' => phpbb::$user->lang['POST_TIME'], 's' => phpbb::$user->lang['SUBJECT']);
-
-				$_options = array('topic', 'post');
-				foreach ($_options as $sort_option)
-				{
-					${'s_limit_' . $sort_option . '_days'} = '<select name="' . $sort_option . '_st">';
-					foreach (${'limit_' . $sort_option . '_days'} as $day => $text)
-					{
-						$selected = ($data[$sort_option . '_st'] == $day) ? ' selected="selected"' : '';
-						${'s_limit_' . $sort_option . '_days'} .= '<option value="' . $day . '"' . $selected . '>' . $text . '</option>';
-					}
-					${'s_limit_' . $sort_option . '_days'} .= '</select>';
-
-					${'s_sort_' . $sort_option . '_key'} = '<select name="' . $sort_option . '_sk">';
-					foreach (${'sort_by_' . $sort_option . '_text'} as $key => $text)
-					{
-						$selected = ($data[$sort_option . '_sk'] == $key) ? ' selected="selected"' : '';
-						${'s_sort_' . $sort_option . '_key'} .= '<option value="' . $key . '"' . $selected . '>' . $text . '</option>';
-					}
-					${'s_sort_' . $sort_option . '_key'} .= '</select>';
-
-					${'s_sort_' . $sort_option . '_dir'} = '<select name="' . $sort_option . '_sd">';
-					foreach ($sort_dir_text as $key => $value)
-					{
-						$selected = ($data[$sort_option . '_sd'] == $key) ? ' selected="selected"' : '';
-						${'s_sort_' . $sort_option . '_dir'} .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
-					}
-					${'s_sort_' . $sort_option . '_dir'} .= '</select>';
-				}
-
-				phpbb::$template->assign_vars(array(
-					'S_PREFS'			=> true,
-					'S_JABBER_DISABLED'	=> (phpbb::$config['jab_enable'] && $user_row['user_jabber'] && @extension_loaded('xml')) ? false : true,
-
-					'VIEW_EMAIL'		=> $data['viewemail'],
-					'MASS_EMAIL'		=> $data['massemail'],
-					'ALLOW_PM'			=> $data['allowpm'],
-					'HIDE_ONLINE'		=> $data['hideonline'],
-					'NOTIFY_EMAIL'		=> ($data['notifymethod'] == NOTIFY_EMAIL) ? true : false,
-					'NOTIFY_IM'			=> ($data['notifymethod'] == NOTIFY_IM) ? true : false,
-					'NOTIFY_BOTH'		=> ($data['notifymethod'] == NOTIFY_BOTH) ? true : false,
-					'NOTIFY_PM'			=> $data['notifypm'],
-					'POPUP_PM'			=> $data['popuppm'],
-					'DST'				=> $data['dst'],
-					'BBCODE'			=> $data['bbcode'],
-					'SMILIES'			=> $data['smilies'],
-					'ATTACH_SIG'		=> $data['sig'],
-					'NOTIFY'			=> $data['notify'],
-					'VIEW_IMAGES'		=> $data['view_images'],
-					'VIEW_FLASH'		=> $data['view_flash'],
-					'VIEW_SMILIES'		=> $data['view_smilies'],
-					'VIEW_SIGS'			=> $data['view_sigs'],
-					'VIEW_AVATARS'		=> $data['view_avatars'],
-					'VIEW_WORDCENSOR'	=> $data['view_wordcensor'],
-
-					'S_TOPIC_SORT_DAYS'		=> $s_limit_topic_days,
-					'S_TOPIC_SORT_KEY'		=> $s_sort_topic_key,
-					'S_TOPIC_SORT_DIR'		=> $s_sort_topic_dir,
-					'S_POST_SORT_DAYS'		=> $s_limit_post_days,
-					'S_POST_SORT_KEY'		=> $s_sort_post_key,
-					'S_POST_SORT_DIR'		=> $s_sort_post_dir,
-
-					'DATE_FORMAT'			=> $data['dateformat'],
-					'S_DATEFORMAT_OPTIONS'	=> $dateformat_options,
-					'S_CUSTOM_DATEFORMAT'	=> $s_custom,
-					'DEFAULT_DATEFORMAT'	=> phpbb::$config['default_dateformat'],
-					'A_DEFAULT_DATEFORMAT'	=> addslashes(phpbb::$config['default_dateformat']),
-
-					'S_LANG_OPTIONS'	=> language_select($data['lang']),
-					'S_STYLE_OPTIONS'	=> style_select($data['style']),
-					'S_TZ_OPTIONS'		=> tz_select($data['tz'], true),
-				));
-
-			break;
-
-			case 'avatar':
-
-				include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-				include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-
-				$can_upload = (file_exists(PHPBB_ROOT_PATH . phpbb::$config['avatar_path']) && @is_writable(PHPBB_ROOT_PATH . phpbb::$config['avatar_path']) && $file_uploads) ? true : false;
-
-				if ($submit)
-				{
-
-					if (!check_form_key($form_name))
-					{
-							trigger_error(phpbb::$user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-					}
-
-					if (avatar_process_user($error, $user_row))
-					{
-						trigger_error(phpbb::$user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_row['user_id']));
-					}
-
-					// Replace "error" strings with their real, localised form
-					$error = preg_replace('#^([A-Z_]+)$#e', "phpbb::\$user->lang('\\1')", $error);
-				}
-
-				// Generate users avatar
-				$avatar_img = ($user_row['user_avatar']) ? get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']) : '<img src="' . PHPBB_ADMIN_PATH . 'images/no_avatar.gif" alt="" />';
-
-				$display_gallery = phpbb_request::is_set_post('display_gallery');
-				$avatar_select = basename(request_var('avatar_select', ''));
-				$category = basename(request_var('category', ''));
-
-				if (phpbb::$config['allow_avatar_local'] && $display_gallery)
-				{
-					avatar_gallery($category, $avatar_select, 4);
-				}
-
-				phpbb::$template->assign_vars(array(
-					'S_AVATAR'			=> true,
-					'S_CAN_UPLOAD'		=> ($can_upload && phpbb::$config['allow_avatar_upload']) ? true : false,
-					'S_ALLOW_REMOTE'	=> (phpbb::$config['allow_avatar_remote']) ? true : false,
-					'S_DISPLAY_GALLERY'	=> (phpbb::$config['allow_avatar_local'] && !$display_gallery) ? true : false,
-					'S_IN_GALLERY'		=> (phpbb::$config['allow_avatar_local'] && $display_gallery) ? true : false,
-
-					'AVATAR_IMAGE'			=> $avatar_img,
-					'AVATAR_MAX_FILESIZE'	=> phpbb::$config['avatar_filesize'],
-					'USER_AVATAR_WIDTH'		=> $user_row['user_avatar_width'],
-					'USER_AVATAR_HEIGHT'	=> $user_row['user_avatar_height'],
-
-					'L_AVATAR_EXPLAIN'	=> sprintf(phpbb::$user->lang['AVATAR_EXPLAIN'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], round(phpbb::$config['avatar_filesize'] / 1024)),
-				));
-
-			break;
-
-			case 'rank':
-
-				if ($submit)
-				{
-					if (!check_form_key($form_name))
-					{
-						trigger_error(phpbb::$user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-					}
-
-					$rank_id = request_var('user_rank', 0);
-
-					$sql = 'UPDATE ' . USERS_TABLE . "
-						SET user_rank = $rank_id
-						WHERE user_id = $user_id";
-					phpbb::$db->sql_query($sql);
-
-					trigger_error(phpbb::$user->lang['USER_RANK_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
-				}
-
-				$sql = 'SELECT *
-					FROM ' . RANKS_TABLE . '
-					WHERE rank_special = 1
-					ORDER BY rank_title';
-				$result = phpbb::$db->sql_query($sql);
-
-				$s_rank_options = '<option value="0"' . ((!$user_row['user_rank']) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang['NO_SPECIAL_RANK'] . '</option>';
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$selected = ($user_row['user_rank'] && $row['rank_id'] == $user_row['user_rank']) ? ' selected="selected"' : '';
-					$s_rank_options .= '<option value="' . $row['rank_id'] . '"' . $selected . '>' . $row['rank_title'] . '</option>';
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				phpbb::$template->assign_vars(array(
-					'S_RANK'			=> true,
-					'S_RANK_OPTIONS'	=> $s_rank_options,
-				));
-
-			break;
-
-			case 'sig':
-
-				include_once(PHPBB_ROOT_PATH . 'includes/functions_posting.' . PHP_EXT);
-				include_once(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-
-				$enable_bbcode	= (phpbb::$config['allow_sig_bbcode']) ? ((request_var('disable_bbcode', !phpbb::$user->optionget('bbcode'))) ? false : true) : false;
-				$enable_smilies	= (phpbb::$config['allow_sig_smilies']) ? ((request_var('disable_smilies', !phpbb::$user->optionget('smilies'))) ? false : true) : false;
-				$enable_urls	= (phpbb::$config['allow_sig_links']) ? ((request_var('disable_magic_url', false)) ? false : true) : false;
-				$signature		= utf8_normalize_nfc(request_var('signature', (string) $user_row['user_sig'], true));
-
-				$preview		= phpbb_request::is_set_post('preview');
-
-				if ($submit || $preview)
-				{
-					include_once(PHPBB_ROOT_PATH . 'includes/message_parser.' . PHP_EXT);
-
-					$message_parser = new parse_message($signature);
-
-					// Allowing Quote BBCode
-					$message_parser->parse($enable_bbcode, $enable_urls, $enable_smilies, phpbb::$config['allow_sig_img'], phpbb::$config['allow_sig_flash'], true, phpbb::$config['allow_sig_links'], true, 'sig');
-
-					if (sizeof($message_parser->warn_msg))
-					{
-						$error[] = implode('<br />', $message_parser->warn_msg);
-					}
-
-					if (!check_form_key($form_name))
-					{
-						$error = 'FORM_INVALID';
-					}
-
-					if (!sizeof($error) && $submit)
-					{
-						$sql_ary = array(
-							'user_sig'					=> (string) $message_parser->message,
-							'user_sig_bbcode_uid'		=> (string) $message_parser->bbcode_uid,
-							'user_sig_bbcode_bitfield'	=> (string) $message_parser->bbcode_bitfield
-						);
-
-						$sql = 'UPDATE ' . USERS_TABLE . '
-							SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-							WHERE user_id = ' . $user_id;
-						phpbb::$db->sql_query($sql);
-
-						trigger_error(phpbb::$user->lang['USER_SIG_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
-					}
-
-					// Replace "error" strings with their real, localised form
-					$error = preg_replace('#^([A-Z_]+)$#e', "phpbb::\$user->lang('\\1')", $error);
-				}
-
-				$signature_preview = '';
-
-				if ($preview)
-				{
-					// Now parse it for displaying
-					$signature_preview = $message_parser->format_display($enable_bbcode, $enable_urls, $enable_smilies, false);
-					unset($message_parser);
-				}
-
-				decode_message($signature, $user_row['user_sig_bbcode_uid']);
-
-				phpbb::$template->assign_vars(array(
-					'S_SIGNATURE'		=> true,
-
-					'SIGNATURE'			=> $signature,
-					'SIGNATURE_PREVIEW'	=> $signature_preview,
-
-					'S_BBCODE_CHECKED'		=> (!$enable_bbcode) ? ' checked="checked"' : '',
-					'S_SMILIES_CHECKED'		=> (!$enable_smilies) ? ' checked="checked"' : '',
-					'S_MAGIC_URL_CHECKED'	=> (!$enable_urls) ? ' checked="checked"' : '',
-
-					'BBCODE_STATUS'			=> (phpbb::$config['allow_sig_bbcode']) ? sprintf(phpbb::$user->lang['BBCODE_IS_ON'], '<a href="' . append_sid('faq', 'mode=bbcode') . '">', '</a>') : sprintf(phpbb::$user->lang['BBCODE_IS_OFF'], '<a href="' . append_sid('faq', 'mode=bbcode') . '">', '</a>'),
-					'SMILIES_STATUS'		=> (phpbb::$config['allow_sig_smilies']) ? phpbb::$user->lang['SMILIES_ARE_ON'] : phpbb::$user->lang['SMILIES_ARE_OFF'],
-					'IMG_STATUS'			=> (phpbb::$config['allow_sig_img']) ? phpbb::$user->lang['IMAGES_ARE_ON'] : phpbb::$user->lang['IMAGES_ARE_OFF'],
-					'FLASH_STATUS'			=> (phpbb::$config['allow_sig_flash']) ? phpbb::$user->lang['FLASH_IS_ON'] : phpbb::$user->lang['FLASH_IS_OFF'],
-					'URL_STATUS'			=> (phpbb::$config['allow_sig_links']) ? phpbb::$user->lang['URL_IS_ON'] : phpbb::$user->lang['URL_IS_OFF'],
-
-					'L_SIGNATURE_EXPLAIN'	=> sprintf(phpbb::$user->lang['SIGNATURE_EXPLAIN'], phpbb::$config['max_sig_chars']),
-
-					'S_BBCODE_ALLOWED'		=> phpbb::$config['allow_sig_bbcode'],
-					'S_SMILIES_ALLOWED'		=> phpbb::$config['allow_sig_smilies'],
-					'S_BBCODE_IMG'			=> (phpbb::$config['allow_sig_img']) ? true : false,
-					'S_BBCODE_FLASH'		=> (phpbb::$config['allow_sig_flash']) ? true : false,
-					'S_LINKS_ALLOWED'		=> (phpbb::$config['allow_sig_links']) ? true : false,
-				));
-
-				// Assigning custom bbcodes
-				display_custom_bbcodes();
-
-			break;
-
-			case 'attach':
-
-				$start		= request_var('start', 0);
-				$deletemark = phpbb_request::is_set_post('delmarked');
-				$marked		= request_var('mark', array(0));
-
-				// Sort keys
-				$sort_key	= request_var('sk', 'a');
-				$sort_dir	= request_var('sd', 'd');
-
-				if ($deletemark && sizeof($marked))
-				{
-					$sql = 'SELECT attach_id
-						FROM ' . ATTACHMENTS_TABLE . '
-						WHERE poster_id = ' . $user_id . '
-							AND is_orphan = 0
-							AND ' . phpbb::$db->sql_in_set('attach_id', $marked);
-					$result = phpbb::$db->sql_query($sql);
-
-					$marked = array();
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$marked[] = $row['attach_id'];
-					}
-					phpbb::$db->sql_freeresult($result);
-				}
-
-				if ($deletemark && sizeof($marked))
-				{
-					if (confirm_box(true))
-					{
-						$sql = 'SELECT real_filename
-							FROM ' . ATTACHMENTS_TABLE . '
-							WHERE ' . phpbb::$db->sql_in_set('attach_id', $marked);
-						$result = phpbb::$db->sql_query($sql);
-
-						$log_attachments = array();
-						while ($row = phpbb::$db->sql_fetchrow($result))
-						{
-							$log_attachments[] = $row['real_filename'];
-						}
-						phpbb::$db->sql_freeresult($result);
-
-						delete_attachments('attach', $marked);
-
-						$message = (sizeof($log_attachments) == 1) ? phpbb::$user->lang['ATTACHMENT_DELETED'] : phpbb::$user->lang['ATTACHMENTS_DELETED'];
-
-						add_log('admin', 'LOG_ATTACHMENTS_DELETED', implode(', ', $log_attachments));
-						trigger_error($message . adm_back_link($this->u_action . '&amp;u=' . $user_id));
-					}
-					else
-					{
-						confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-							'u'				=> $user_id,
-							'i'				=> $id,
-							'mode'			=> $mode,
-							'action'		=> $action,
-							'delmarked'		=> true,
-							'mark'			=> $marked))
-						);
-					}
-				}
-
-				$sk_text = array('a' => phpbb::$user->lang['SORT_FILENAME'], 'c' => phpbb::$user->lang['SORT_EXTENSION'], 'd' => phpbb::$user->lang['SORT_SIZE'], 'e' => phpbb::$user->lang['SORT_DOWNLOADS'], 'f' => phpbb::$user->lang['SORT_POST_TIME'], 'g' => phpbb::$user->lang['SORT_TOPIC_TITLE']);
-				$sk_sql = array('a' => 'a.real_filename', 'c' => 'a.extension', 'd' => 'a.filesize', 'e' => 'a.download_count', 'f' => 'a.filetime', 'g' => 't.topic_title');
-
-				$sd_text = array('a' => phpbb::$user->lang['ASCENDING'], 'd' => phpbb::$user->lang['DESCENDING']);
-
-				$s_sort_key = '';
-				foreach ($sk_text as $key => $value)
-				{
-					$selected = ($sort_key == $key) ? ' selected="selected"' : '';
-					$s_sort_key .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
-				}
-
-				$s_sort_dir = '';
-				foreach ($sd_text as $key => $value)
-				{
-					$selected = ($sort_dir == $key) ? ' selected="selected"' : '';
-					$s_sort_dir .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
-				}
-
-				if (!isset($sk_sql[$sort_key]))
-				{
-					$sort_key = 'a';
-				}
-
-				$order_by = $sk_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC');
-
-				$sql = 'SELECT COUNT(attach_id) as num_attachments
-					FROM ' . ATTACHMENTS_TABLE . "
-					WHERE poster_id = $user_id
-						AND is_orphan = 0";
-				$result = phpbb::$db->sql_query_limit($sql, 1);
-				$num_attachments = (int) phpbb::$db->sql_fetchfield('num_attachments');
-				phpbb::$db->sql_freeresult($result);
-
-				$sql = 'SELECT a.*, t.topic_title, p.message_subject as message_title
-					FROM ' . ATTACHMENTS_TABLE . ' a
-						LEFT JOIN ' . TOPICS_TABLE . ' t ON (a.topic_id = t.topic_id
-							AND a.in_message = 0)
-						LEFT JOIN ' . PRIVMSGS_TABLE . ' p ON (a.post_msg_id = p.msg_id
-							AND a.in_message = 1)
-					WHERE a.poster_id = ' . $user_id . "
-						AND a.is_orphan = 0
-					ORDER BY $order_by";
-				$result = phpbb::$db->sql_query_limit($sql, phpbb::$config['posts_per_page'], $start);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					if ($row['in_message'])
-					{
-						$view_topic = append_sid('ucp', "i=pm&amp;p={$row['post_msg_id']}");
-					}
-					else
-					{
-						$view_topic = append_sid('viewtopic', "t={$row['topic_id']}&amp;p={$row['post_msg_id']}") . '#p' . $row['post_msg_id'];
-					}
-
-					phpbb::$template->assign_block_vars('attach', array(
-						'REAL_FILENAME'		=> $row['real_filename'],
-						'COMMENT'			=> nl2br($row['attach_comment']),
-						'EXTENSION'			=> $row['extension'],
-						'SIZE'				=> get_formatted_filesize($row['filesize']),
-						'DOWNLOAD_COUNT'	=> $row['download_count'],
-						'POST_TIME'			=> phpbb::$user->format_date($row['filetime']),
-						'TOPIC_TITLE'		=> ($row['in_message']) ? $row['message_title'] : $row['topic_title'],
-
-						'ATTACH_ID'			=> $row['attach_id'],
-						'POST_ID'			=> $row['post_msg_id'],
-						'TOPIC_ID'			=> $row['topic_id'],
-
-						'S_IN_MESSAGE'		=> $row['in_message'],
-
-						'U_DOWNLOAD'		=> append_sid('download/file', 'mode=view&amp;id=' . $row['attach_id']),
-						'U_VIEW_TOPIC'		=> $view_topic,
-					));
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				phpbb::$template->assign_vars(array(
-					'S_ATTACHMENTS'		=> true,
-					'S_ON_PAGE'			=> on_page($num_attachments, phpbb::$config['topics_per_page'], $start),
-					'S_SORT_KEY'		=> $s_sort_key,
-					'S_SORT_DIR'		=> $s_sort_dir,
-
-					'PAGINATION'		=> generate_pagination($this->u_action . "&amp;u=$user_id&amp;sk=$sort_key&amp;sd=$sort_dir", $num_attachments, phpbb::$config['topics_per_page'], $start, true),
-				));
-
-			break;
-
-			case 'groups':
-
-				include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-
-				phpbb::$user->add_lang(array('groups', 'acp/groups'));
-				$group_id = request_var('g', 0);
-
-				if ($group_id)
-				{
-					// Check the founder only entry for this group to make sure everything is well
-					$sql = 'SELECT group_founder_manage
-						FROM ' . GROUPS_TABLE . '
-						WHERE group_id = ' . $group_id;
-					$result = phpbb::$db->sql_query($sql);
-					$founder_manage = (int) phpbb::$db->sql_fetchfield('group_founder_manage');
-					phpbb::$db->sql_freeresult($result);
-
-					if (!phpbb::$user->is_founder && $founder_manage)
-					{
-						trigger_error(phpbb::$user->lang['NOT_ALLOWED_MANAGE_GROUP'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-					}
-				}
-				else
-				{
-					$founder_manage = 0;
-				}
-
-				switch ($action)
-				{
-					case 'demote':
-					case 'promote':
-					case 'default':
-						if (!$group_id)
-						{
-							trigger_error(phpbb::$user->lang['NO_GROUP'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-						}
-						group_user_attributes($action, $group_id, $user_id);
-
-						if ($action == 'default')
-						{
-							$user_row['group_id'] = $group_id;
-						}
-					break;
-
-					case 'delete':
-
-						if (confirm_box(true))
-						{
-							if (!$group_id)
-							{
-								trigger_error(phpbb::$user->lang['NO_GROUP'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-							}
-
-							if ($error = group_user_del($group_id, $user_id))
-							{
-								trigger_error(phpbb::$user->lang[$error] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-							}
-
-							$error = array();
-
-							// The delete action was successful - therefore update the user row...
-							$sql = 'SELECT u.*, s.*
-								FROM ' . USERS_TABLE . ' u
-									LEFT JOIN ' . SESSIONS_TABLE . ' s ON (s.session_user_id = u.user_id)
-								WHERE u.user_id = ' . $user_id . '
-								ORDER BY s.session_time DESC';
-							$result = $db->sql_query($sql);
-							$user_row = $db->sql_fetchrow($result);
-							$db->sql_freeresult($result);
-						}
-						else
-						{
-							confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-								'u'				=> $user_id,
-								'i'				=> $id,
-								'mode'			=> $mode,
-								'action'		=> $action,
-								'g'				=> $group_id))
-							);
-						}
-
-					break;
-				}
-
-				// Add user to group?
-				if ($submit)
-				{
-
-					if (!check_form_key($form_name))
-					{
-						trigger_error(phpbb::$user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-					}
-
-					if (!$group_id)
-					{
-						trigger_error(phpbb::$user->lang['NO_GROUP'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-					}
-
-					// Add user/s to group
-					if ($error = group_user_add($group_id, $user_id))
-					{
-						trigger_error(phpbb::$user->lang[$error] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-					}
-
-					$error = array();
-				}
-
-
-				$sql = 'SELECT ug.*, g.*
-					FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . " ug
-					WHERE ug.user_id = $user_id
-						AND g.group_id = ug.group_id
-					ORDER BY g.group_type DESC, ug.user_pending ASC, g.group_name";
-				$result = phpbb::$db->sql_query($sql);
-
-				$i = 0;
-				$group_data = $id_ary = array();
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$type = ($row['group_type'] == GROUP_SPECIAL) ? 'special' : (($row['user_pending']) ? 'pending' : 'normal');
-
-					$group_data[$type][$i]['group_id']		= $row['group_id'];
-					$group_data[$type][$i]['group_name']	= $row['group_name'];
-					$group_data[$type][$i]['group_leader']	= ($row['group_leader']) ? 1 : 0;
-
-					$id_ary[] = $row['group_id'];
-
-					$i++;
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				// Select box for other groups
-				$sql = 'SELECT group_id, group_name, group_type, group_founder_manage
-					FROM ' . GROUPS_TABLE . '
-					' . ((sizeof($id_ary)) ? 'WHERE ' . phpbb::$db->sql_in_set('group_id', $id_ary, true) : '') . '
-					ORDER BY group_type DESC, group_name ASC';
-				$result = phpbb::$db->sql_query($sql);
-
-				$s_group_options = '';
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					if (!phpbb::$config['coppa_enable'] && $row['group_name'] == 'REGISTERED_COPPA')
-					{
-						continue;
-					}
-
-					// Do not display those groups not allowed to be managed
-					if (!phpbb::$user->is_founder && $row['group_founder_manage'])
-					{
-						continue;
-					}
-
-					$s_group_options .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '') . ' value="' . $row['group_id'] . '">' . (($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				$current_type = '';
-				foreach ($group_data as $group_type => $data_ary)
-				{
-					if ($current_type != $group_type)
-					{
-						phpbb::$template->assign_block_vars('group', array(
-							'S_NEW_GROUP_TYPE'		=> true,
-							'GROUP_TYPE'			=> phpbb::$user->lang['USER_GROUP_' . strtoupper($group_type)],
-						));
-					}
-
-					foreach ($data_ary as $data)
-					{
-						phpbb::$template->assign_block_vars('group', array(
-							'U_EDIT_GROUP'		=> append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=groups&amp;mode=manage&amp;action=edit&amp;u=$user_id&amp;g={$data['group_id']}&amp;back_link=acp_users_groups"),
-							'U_DEFAULT'			=> $this->u_action . "&amp;action=default&amp;u=$user_id&amp;g=" . $data['group_id'],
-							'U_DEMOTE_PROMOTE'	=> $this->u_action . '&amp;action=' . (($data['group_leader']) ? 'demote' : 'promote') . "&amp;u=$user_id&amp;g=" . $data['group_id'],
-							'U_DELETE'			=> $this->u_action . "&amp;action=delete&amp;u=$user_id&amp;g=" . $data['group_id'],
-
-							'GROUP_NAME'		=> ($group_type == 'special') ? phpbb::$user->lang['G_' . $data['group_name']] : $data['group_name'],
-							'L_DEMOTE_PROMOTE'	=> ($data['group_leader']) ? phpbb::$user->lang['GROUP_DEMOTE'] : phpbb::$user->lang['GROUP_PROMOTE'],
-
-							'S_NO_DEFAULT'		=> ($user_row['group_id'] != $data['group_id']) ? true : false,
-							'S_SPECIAL_GROUP'	=> ($group_type == 'special') ? true : false,
-						));
-					}
-				}
-
-				phpbb::$template->assign_vars(array(
-					'S_GROUPS'			=> true,
-					'S_GROUP_OPTIONS'	=> $s_group_options,
-				));
-
-			break;
-
-			case 'perm':
-
-				include_once(PHPBB_ROOT_PATH . 'includes/acp/auth.' . PHP_EXT);
-
-				$auth_admin = new auth_admin();
-
-				phpbb::$user->add_lang('acp/permissions');
-				add_permission_language();
-
-				$forum_id = request_var('f', 0);
-
-				// Global Permissions
-				if (!$forum_id)
-				{
-					// Select auth options
-					$sql = 'SELECT auth_option, is_local, is_global
-						FROM ' . ACL_OPTIONS_TABLE . '
-						WHERE auth_option ' . phpbb::$db->sql_like_expression(phpbb::$db->any_char . '_') . '
-							AND is_global = 1
-						ORDER BY auth_option';
-					$result = phpbb::$db->sql_query($sql);
-
-					$hold_ary = array();
-
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$hold_ary = $auth_admin->get_mask('view', $user_id, false, false, $row['auth_option'], 'global', phpbb::ACL_NEVER);
-						$auth_admin->display_mask('view', $row['auth_option'], $hold_ary, 'user', false, false);
-					}
-					phpbb::$db->sql_freeresult($result);
-
-					unset($hold_ary);
-				}
-				else
-				{
-					$sql = 'SELECT auth_option, is_local, is_global
-						FROM ' . ACL_OPTIONS_TABLE . "
-						WHERE auth_option " . phpbb::$db->sql_like_expression(phpbb::$db->any_char . '_') . "
-							AND is_local = 1
-						ORDER BY is_global DESC, auth_option";
-					$result = phpbb::$db->sql_query($sql);
-
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$hold_ary = $auth_admin->get_mask('view', $user_id, false, $forum_id, $row['auth_option'], 'local', phpbb::ACL_NEVER);
-						$auth_admin->display_mask('view', $row['auth_option'], $hold_ary, 'user', true, false);
-					}
-					phpbb::$db->sql_freeresult($result);
-				}
-
-				$s_forum_options = '<option value="0"' . ((!$forum_id) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang['VIEW_GLOBAL_PERMS'] . '</option>';
-				$s_forum_options .= make_forum_select($forum_id, false, true, false, false, false);
-
-				phpbb::$template->assign_vars(array(
-					'S_PERMISSIONS'				=> true,
-
-					'S_GLOBAL'					=> (!$forum_id) ? true : false,
-					'S_FORUM_OPTIONS'			=> $s_forum_options,
-
-					'U_ACTION'					=> $this->u_action . '&amp;u=' . $user_id,
-					'U_USER_PERMISSIONS'		=> append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, 'i=permissions&amp;mode=setting_user_global&amp;user_id[]=' . $user_id),
-					'U_USER_FORUM_PERMISSIONS'	=> append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, 'i=permissions&amp;mode=setting_user_local&amp;user_id[]=' . $user_id),
-				));
-
-			break;
-
-		}
-
-		// Assign general variables
-		phpbb::$template->assign_vars(array(
-			'S_ERROR'			=> (sizeof($error)) ? true : false,
-			'ERROR_MSG'			=> (sizeof($error)) ? implode('<br />', $error) : '',
-		));
-	}
-
-	/**
-	* Optionset replacement for this module based on phpbb::$user->optionset
-	*/
-	function optionset(&$user_row, $key, $value, $data = false)
-	{
-		$var = ($data) ? $data : $user_row['user_options'];
-
-		if ($value && !($var & 1 << phpbb::$user->keyoptions[$key]))
-		{
-			$var += 1 << phpbb::$user->keyoptions[$key];
-		}
-		else if (!$value && ($var & 1 << phpbb::$user->keyoptions[$key]))
-		{
-			$var -= 1 << phpbb::$user->keyoptions[$key];
-		}
-		else
-		{
-			return ($data) ? $var : false;
-		}
-
-		if (!$data)
-		{
-			$user_row['user_options'] = $var;
-			return true;
-		}
-		else
-		{
-			return $var;
-		}
-	}
-
-	/**
-	* Optionget replacement for this module based on phpbb::$user->optionget
-	*/
-	function optionget(&$user_row, $key, $data = false)
-	{
-		$var = ($data) ? $data : $user_row['user_options'];
-		return ($var & 1 << phpbb::$user->keyoptions[$key]) ? true : false;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/acp_words.php b/phpBB/modules/acp/acp_words.php
deleted file mode 100644
index 62c0cfdd1a..0000000000
--- a/phpBB/modules/acp/acp_words.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @todo [words] check regular expressions for special char replacements (stored specialchared in db)
-* @package acp
-*/
-class acp_words
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		phpbb::$user->add_lang('acp/posting');
-
-		// Set up general vars
-		$action = request_var('action', '');
-		$action = (phpbb_request::is_set_post('add')) ? 'add' : ((phpbb_request::is_set_post('save')) ? 'save' : $action);
-
-		$s_hidden_fields = '';
-		$word_info = array();
-
-		$this->tpl_name = 'acp_words';
-		$this->page_title = 'ACP_WORDS';
-
-		$form_name = 'acp_words';
-		add_form_key($form_name);
-
-		switch ($action)
-		{
-			case 'edit':
-				$word_id = request_var('id', 0);
-
-				if (!$word_id)
-				{
-					trigger_error(phpbb::$user->lang['NO_WORD'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				$sql = 'SELECT *
-					FROM ' . WORDS_TABLE . "
-					WHERE word_id = $word_id";
-				$result = phpbb::$db->sql_query($sql);
-				$word_info = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				$s_hidden_fields .= '<input type="hidden" name="id" value="' . $word_id . '" />';
-
-			case 'add':
-
-				phpbb::$template->assign_vars(array(
-					'S_EDIT_WORD'		=> true,
-					'U_ACTION'			=> $this->u_action,
-					'U_BACK'			=> $this->u_action,
-					'WORD'				=> (isset($word_info['word'])) ? $word_info['word'] : '',
-					'REPLACEMENT'		=> (isset($word_info['replacement'])) ? $word_info['replacement'] : '',
-					'S_HIDDEN_FIELDS'	=> $s_hidden_fields,
-				));
-
-				return;
-
-			break;
-
-			case 'save':
-
-				if (!check_form_key($form_name))
-				{
-					trigger_error(phpbb::$user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING);
-				}
-				$word_id		= request_var('id', 0);
-				$word			= utf8_normalize_nfc(request_var('word', '', true));
-				$replacement	= utf8_normalize_nfc(request_var('replacement', '', true));
-
-				if (!$word || !$replacement)
-				{
-					trigger_error(phpbb::$user->lang['ENTER_WORD'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				$sql_ary = array(
-					'word'			=> $word,
-					'replacement'	=> $replacement
-				);
-
-				if ($word_id)
-				{
-					phpbb::$db->sql_query('UPDATE ' . WORDS_TABLE . ' SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . ' WHERE word_id = ' . $word_id);
-				}
-				else
-				{
-					phpbb::$db->sql_query('INSERT INTO ' . WORDS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary));
-				}
-
-				phpbb::$acm->destroy('word_censors');
-
-				$log_action = ($word_id) ? 'LOG_WORD_EDIT' : 'LOG_WORD_ADD';
-				add_log('admin', $log_action, $word);
-
-				$message = ($word_id) ? phpbb::$user->lang['WORD_UPDATED'] : phpbb::$user->lang['WORD_ADDED'];
-				trigger_error($message . adm_back_link($this->u_action));
-
-			break;
-
-			case 'delete':
-
-				$word_id = request_var('id', 0);
-
-				if (!$word_id)
-				{
-					trigger_error(phpbb::$user->lang['NO_WORD'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				if (confirm_box(true))
-				{
-					$sql = 'SELECT word
-						FROM ' . WORDS_TABLE . "
-						WHERE word_id = $word_id";
-					$result = phpbb::$db->sql_query($sql);
-					$deleted_word = phpbb::$db->sql_fetchfield('word');
-					phpbb::$db->sql_freeresult($result);
-
-					$sql = 'DELETE FROM ' . WORDS_TABLE . "
-						WHERE word_id = $word_id";
-					phpbb::$db->sql_query($sql);
-
-					phpbb::$acm->destroy('word_censors');
-
-					add_log('admin', 'LOG_WORD_DELETE', $deleted_word);
-
-					trigger_error(phpbb::$user->lang['WORD_REMOVED'] . adm_back_link($this->u_action));
-				}
-				else
-				{
-					confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-						'i'			=> $id,
-						'mode'		=> $mode,
-						'id'		=> $word_id,
-						'action'	=> 'delete',
-					)));
-				}
-
-			break;
-		}
-
-
-		phpbb::$template->assign_vars(array(
-			'U_ACTION'			=> $this->u_action,
-			'S_HIDDEN_FIELDS'	=> $s_hidden_fields,
-		));
-
-		$sql = 'SELECT *
-			FROM ' . WORDS_TABLE . '
-			ORDER BY word';
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			phpbb::$template->assign_block_vars('words', array(
-				'WORD'			=> $row['word'],
-				'REPLACEMENT'	=> $row['replacement'],
-				'U_EDIT'		=> $this->u_action . '&amp;action=edit&amp;id=' . $row['word_id'],
-				'U_DELETE'		=> $this->u_action . '&amp;action=delete&amp;id=' . $row['word_id'],
-			));
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/auth.php b/phpBB/modules/acp/auth.php
deleted file mode 100644
index b1dae06cea..0000000000
--- a/phpBB/modules/acp/auth.php
+++ /dev/null
@@ -1,1256 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* ACP Permission/Auth class
-* @package phpBB3
-*/
-class auth_admin extends auth
-{
-	/**
-	* Init auth settings
-	*/
-	function __construct()
-	{
-		if (($this->acl_options = phpbb::$acm->get('acl_options')) === false)
-		{
-			$sql = 'SELECT auth_option_id, auth_option, is_global, is_local
-				FROM ' . ACL_OPTIONS_TABLE . '
-				ORDER BY auth_option_id';
-			$result = phpbb::$db->sql_query($sql);
-
-			$global = $local = 0;
-			$this->acl_options = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				if ($row['is_global'])
-				{
-					$this->acl_options['global'][$row['auth_option']] = $global++;
-				}
-
-				if ($row['is_local'])
-				{
-					$this->acl_options['local'][$row['auth_option']] = $local++;
-				}
-
-				$this->acl_options['id'][$row['auth_option']] = (int) $row['auth_option_id'];
-				$this->acl_options['option'][(int) $row['auth_option_id']] = $row['auth_option'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			phpbb::$acm->put('acl_options', $this->acl_options);
-		}
-	}
-
-	/**
-	* Get permission mask
-	* This function only supports getting permissions of one type (for example a_)
-	*
-	* @param set|view $mode defines the permissions we get, view gets effective permissions (checking user AND group permissions), set only gets the user or group permission set alone
-	* @param mixed $user_id user ids to search for (a user_id or a group_id has to be specified at least)
-	* @param mixed $group_id group ids to search for, return group related settings (a user_id or a group_id has to be specified at least)
-	* @param mixed $forum_id forum_ids to search for. Defining a forum id also means getting local settings
-	* @param string $auth_option the auth_option defines the permission setting to look for (a_ for example)
-	* @param local|global $scope the scope defines the permission scope. If local, a forum_id is additionally required
-	* @param phpbb::ACL_NEVER|phpbb::ACL_NO|phpbb::ACL_YES $acl_fill defines the mode those permissions not set are getting filled with
-	*/
-	public function get_mask($mode, $user_id = false, $group_id = false, $forum_id = false, $auth_option = false, $scope = false, $acl_fill = phpbb::ACL_NEVER)
-	{
-		$hold_ary = array();
-		$view_user_mask = ($mode == 'view' && $group_id === false) ? true : false;
-
-		if ($auth_option === false || $scope === false)
-		{
-			return array();
-		}
-
-		$acl_user_function = ($mode == 'set') ? 'acl_user_raw_data' : 'acl_raw_data';
-
-		if (!$view_user_mask)
-		{
-			if ($forum_id !== false)
-			{
-				$hold_ary = ($group_id !== false) ? $this->acl_group_raw_data($group_id, $auth_option . '%', $forum_id) : $this->$acl_user_function($user_id, $auth_option . '%', $forum_id);
-			}
-			else
-			{
-				$hold_ary = ($group_id !== false) ? $this->acl_group_raw_data($group_id, $auth_option . '%', ($scope == 'global') ? 0 : false) : $this->$acl_user_function($user_id, $auth_option . '%', ($scope == 'global') ? 0 : false);
-			}
-		}
-
-		// Make sure hold_ary is filled with every setting (prevents missing forums/users/groups)
-		$ug_id = ($group_id !== false) ? ((!is_array($group_id)) ? array($group_id) : $group_id) : ((!is_array($user_id)) ? array($user_id) : $user_id);
-		$forum_ids = ($forum_id !== false) ? ((!is_array($forum_id)) ? array($forum_id) : $forum_id) : (($scope == 'global') ? array(0) : array());
-
-		// Only those options we need
-		$compare_options = array_diff(preg_replace('/^((?!' . $auth_option . ').+)|(' . $auth_option . ')$/', '', array_keys($this->acl_options[$scope])), array(''));
-
-		// If forum_ids is false and the scope is local we actually want to have all forums within the array
-		if ($scope == 'local' && !sizeof($forum_ids))
-		{
-			$sql = 'SELECT forum_id
-				FROM ' . FORUMS_TABLE;
-			$result = phpbb::$db->sql_query($sql, 120);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$forum_ids[] = (int) $row['forum_id'];
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		if ($view_user_mask)
-		{
-			$auth2 = null;
-
-			$sql = 'SELECT user_id, user_permissions, user_type
-				FROM ' . USERS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('user_id', $ug_id);
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($userdata = phpbb::$db->sql_fetchrow($result))
-			{
-				if (phpbb::$user->data['user_id'] != $userdata['user_id'])
-				{
-					$auth2 = new auth();
-					$auth2->acl($userdata);
-				}
-				else
-				{
-					global $auth;
-					$auth2 = &$auth;
-				}
-
-
-				$hold_ary[$userdata['user_id']] = array();
-				foreach ($forum_ids as $f_id)
-				{
-					$hold_ary[$userdata['user_id']][$f_id] = array();
-					foreach ($compare_options as $option)
-					{
-						$hold_ary[$userdata['user_id']][$f_id][$option] = $auth2->acl_get($option, $f_id);
-					}
-				}
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			unset($userdata);
-			unset($auth2);
-		}
-
-		foreach ($ug_id as $_id)
-		{
-			if (!isset($hold_ary[$_id]))
-			{
-				$hold_ary[$_id] = array();
-			}
-
-			foreach ($forum_ids as $f_id)
-			{
-				if (!isset($hold_ary[$_id][$f_id]))
-				{
-					$hold_ary[$_id][$f_id] = array();
-				}
-			}
-		}
-
-		// Now, we need to fill the gaps with $acl_fill. ;)
-
-		// Now switch back to keys
-		if (sizeof($compare_options))
-		{
-			$compare_options = array_combine($compare_options, array_fill(1, sizeof($compare_options), $acl_fill));
-		}
-
-		// Defining the user-function here to save some memory
-		$return_acl_fill = create_function('$value', 'return ' . $acl_fill . ';');
-
-		// Actually fill the gaps
-		if (sizeof($hold_ary))
-		{
-			foreach ($hold_ary as $ug_id => $row)
-			{
-				foreach ($row as $id => $options)
-				{
-					// Do not include the global auth_option
-					unset($options[$auth_option]);
-
-					// Not a "fine" solution, but at all it's a 1-dimensional
-					// array_diff_key function filling the resulting array values with zeros
-					// The differences get merged into $hold_ary (all permissions having $acl_fill set)
-					$hold_ary[$ug_id][$id] = array_merge($options,
-
-						array_map($return_acl_fill,
-							array_flip(
-								array_diff(
-									array_keys($compare_options), array_keys($options)
-								)
-							)
-						)
-					);
-				}
-			}
-		}
-		else
-		{
-			$hold_ary[($group_id !== false) ? $group_id : $user_id][(int) $forum_id] = $compare_options;
-		}
-
-		return $hold_ary;
-	}
-
-	/**
-	* Get permission mask for roles
-	* This function only supports getting masks for one role
-	*/
-	public function get_role_mask($role_id)
-	{
-		$hold_ary = array();
-
-		// Get users having this role set...
-		$sql = 'SELECT user_id, forum_id
-			FROM ' . ACL_USERS_TABLE . '
-			WHERE auth_role_id = ' . $role_id . '
-			ORDER BY forum_id';
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$hold_ary[$row['forum_id']]['users'][] = $row['user_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// Now grab groups...
-		$sql = 'SELECT group_id, forum_id
-			FROM ' . ACL_GROUPS_TABLE . '
-			WHERE auth_role_id = ' . $role_id . '
-			ORDER BY forum_id';
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$hold_ary[$row['forum_id']]['groups'][] = $row['group_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		return $hold_ary;
-	}
-
-	/**
-	* Display permission mask (assign to template)
-	*/
-	public function display_mask($mode, $permission_type, array $hold_ary, $user_mode = 'user', $local = false, $group_display = true)
-	{
-		// Define names for template loops, might be able to be set
-		$tpl_pmask = 'p_mask';
-		$tpl_fmask = 'f_mask';
-		$tpl_category = 'category';
-		$tpl_mask = 'mask';
-
-		$l_acl_type = (isset(phpbb::$user->lang['ACL_TYPE_' . (($local) ? 'LOCAL' : 'GLOBAL') . '_' . strtoupper($permission_type)])) ? phpbb::$user->lang['ACL_TYPE_' . (($local) ? 'LOCAL' : 'GLOBAL') . '_' . strtoupper($permission_type)] : 'ACL_TYPE_' . (($local) ? 'LOCAL' : 'GLOBAL') . '_' . strtoupper($permission_type);
-
-		// Allow trace for viewing permissions and in user mode
-		$show_trace = ($mode == 'view' && $user_mode == 'user') ? true : false;
-
-		// Get names
-		if ($user_mode == 'user')
-		{
-			$sql = 'SELECT user_id as ug_id, username as ug_name
-				FROM ' . USERS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('user_id', array_keys($hold_ary)) . '
-				ORDER BY username_clean ASC';
-		}
-		else
-		{
-			$sql = 'SELECT group_id as ug_id, group_name as ug_name, group_type
-				FROM ' . GROUPS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('group_id', array_keys($hold_ary)) . '
-				ORDER BY group_type DESC, group_name ASC';
-		}
-		$result = phpbb::$db->sql_query($sql);
-
-		$ug_names_ary = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$ug_names_ary[$row['ug_id']] = ($user_mode == 'user') ? $row['ug_name'] : (($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['ug_name']] : $row['ug_name']);
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// Get used forums
-		$forum_ids = array();
-		foreach ($hold_ary as $ug_id => $row)
-		{
-			$forum_ids = array_merge($forum_ids, array_keys($row));
-		}
-		$forum_ids = array_unique($forum_ids);
-
-		$forum_names_ary = array();
-		if ($local)
-		{
-			$forum_names_ary = make_forum_select(false, false, true, false, false, false, true);
-
-			// Remove the disabled ones, since we do not create an option field here...
-			foreach ($forum_names_ary as $key => $value)
-			{
-				if (!$value['disabled'])
-				{
-					continue;
-				}
-				unset($forum_names_ary[$key]);
-			}
-		}
-		else
-		{
-			$forum_names_ary[0] = $l_acl_type;
-		}
-
-		// Get available roles
-		$sql = 'SELECT *
-			FROM ' . ACL_ROLES_TABLE . "
-			WHERE role_type = '" . phpbb::$db->sql_escape($permission_type) . "'
-			ORDER BY role_order ASC";
-		$result = phpbb::$db->sql_query($sql);
-
-		$roles = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$roles[$row['role_id']] = $row;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$cur_roles = $this->acl_role_data($user_mode, $permission_type, array_keys($hold_ary));
-
-		// Build js roles array (role data assignments)
-		$s_role_js_array = '';
-
-		if (sizeof($roles))
-		{
-			$s_role_js_array = array();
-
-			// Make sure every role (even if empty) has its array defined
-			foreach ($roles as $_role_id => $null)
-			{
-				$s_role_js_array[$_role_id] = "\n" . 'role_options[' . $_role_id . '] = new Array();' . "\n";
-			}
-
-			$sql = 'SELECT r.role_id, o.auth_option, r.auth_setting
-				FROM ' . ACL_ROLES_DATA_TABLE . ' r, ' . ACL_OPTIONS_TABLE . ' o
-				WHERE o.auth_option_id = r.auth_option_id
-					AND ' . phpbb::$db->sql_in_set('r.role_id', array_keys($roles));
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$flag = substr($row['auth_option'], 0, strpos($row['auth_option'], '_') + 1);
-				if ($flag == $row['auth_option'])
-				{
-					continue;
-				}
-
-				$s_role_js_array[$row['role_id']] .= 'role_options[' . $row['role_id'] . '][\'' . addslashes($row['auth_option']) . '\'] = ' . $row['auth_setting'] . '; ';
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			$s_role_js_array = implode('', $s_role_js_array);
-		}
-
-		phpbb::$template->assign_var('S_ROLE_JS_ARRAY', $s_role_js_array);
-		unset($s_role_js_array);
-
-		// Now obtain memberships
-		$user_groups_default = $user_groups_custom = array();
-		if ($user_mode == 'user' && $group_display)
-		{
-			$sql = 'SELECT group_id, group_name, group_type
-				FROM ' . GROUPS_TABLE . '
-				ORDER BY group_type DESC, group_name ASC';
-			$result = phpbb::$db->sql_query($sql);
-
-			$groups = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$groups[$row['group_id']] = $row;
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			$memberships = group_memberships(false, array_keys($hold_ary), false);
-
-			// User is not a member of any group? Bad admin, bad bad admin...
-			if ($memberships)
-			{
-				foreach ($memberships as $row)
-				{
-					if ($groups[$row['group_id']]['group_type'] == GROUP_SPECIAL)
-					{
-						$user_groups_default[$row['user_id']][] = phpbb::$user->lang['G_' . $groups[$row['group_id']]['group_name']];
-					}
-					else
-					{
-						$user_groups_custom[$row['user_id']][] = $groups[$row['group_id']]['group_name'];
-					}
-				}
-			}
-			unset($memberships, $groups);
-		}
-
-		// If we only have one forum id to display or being in local mode and more than one user/group to display,
-		// we switch the complete interface to group by user/usergroup instead of grouping by forum
-		// To achieve this, we need to switch the array a bit
-		if (sizeof($forum_ids) == 1 || ($local && sizeof($ug_names_ary) > 1))
-		{
-			$hold_ary_temp = $hold_ary;
-			$hold_ary = array();
-			foreach ($hold_ary_temp as $ug_id => $row)
-			{
-				foreach ($forum_names_ary as $forum_id => $forum_row)
-				{
-					if (isset($row[$forum_id]))
-					{
-						$hold_ary[$forum_id][$ug_id] = $row[$forum_id];
-					}
-				}
-			}
-			unset($hold_ary_temp);
-
-			foreach ($hold_ary as $forum_id => $forum_array)
-			{
-				$content_array = $categories = array();
-				self::build_permission_array($hold_ary[$forum_id], $content_array, $categories, array_keys($ug_names_ary));
-
-				phpbb::$template->assign_block_vars($tpl_pmask, array(
-					'NAME'			=> ($forum_id == 0) ? $forum_names_ary[0] : $forum_names_ary[$forum_id]['forum_name'],
-					'PADDING'		=> ($forum_id == 0) ? '' : $forum_names_ary[$forum_id]['padding'],
-
-					'CATEGORIES'	=> implode('</th><th>', $categories),
-
-					'L_ACL_TYPE'	=> $l_acl_type,
-
-					'S_LOCAL'		=> ($local) ? true : false,
-					'S_GLOBAL'		=> (!$local) ? true : false,
-					'S_NUM_CATS'	=> sizeof($categories),
-					'S_VIEW'		=> ($mode == 'view') ? true : false,
-					'S_NUM_OBJECTS'	=> sizeof($content_array),
-					'S_USER_MODE'	=> ($user_mode == 'user') ? true : false,
-					'S_GROUP_MODE'	=> ($user_mode == 'group') ? true : false,
-				));
-
-				@reset($content_array);
-				while (list($ug_id, $ug_array) = each($content_array))
-				{
-					// Build role dropdown options
-					$current_role_id = (isset($cur_roles[$ug_id][$forum_id])) ? $cur_roles[$ug_id][$forum_id] : 0;
-
-					$s_role_options = '';
-
-					@reset($roles);
-					while (list($role_id, $role_row) = each($roles))
-					{
-						$role_description = (!empty(phpbb::$user->lang[$role_row['role_description']])) ? phpbb::$user->lang[$role_row['role_description']] : nl2br($role_row['role_description']);
-						$role_name = (!empty(phpbb::$user->lang[$role_row['role_name']])) ? phpbb::$user->lang[$role_row['role_name']] : $role_row['role_name'];
-
-						$title = ($role_description) ? ' title="' . $role_description . '"' : '';
-						$s_role_options .= '<option value="' . $role_id . '"' . (($role_id == $current_role_id) ? ' selected="selected"' : '') . $title . '>' . $role_name . '</option>';
-					}
-
-					if ($s_role_options)
-					{
-						$s_role_options = '<option value="0"' . ((!$current_role_id) ? ' selected="selected"' : '') . ' title="' . htmlspecialchars(phpbb::$user->lang['NO_ROLE_ASSIGNED_EXPLAIN']) . '">' . phpbb::$user->lang['NO_ROLE_ASSIGNED'] . '</option>' . $s_role_options;
-					}
-
-					if (!$current_role_id && $mode != 'view')
-					{
-						$s_custom_permissions = false;
-
-						foreach ($ug_array as $key => $value)
-						{
-							if ($value['S_NEVER'] || $value['S_YES'])
-							{
-								$s_custom_permissions = true;
-								break;
-							}
-						}
-					}
-					else
-					{
-						$s_custom_permissions = false;
-					}
-
-					phpbb::$template->assign_block_vars($tpl_pmask . '.' . $tpl_fmask, array(
-						'NAME'				=> $ug_names_ary[$ug_id],
-						'S_ROLE_OPTIONS'	=> $s_role_options,
-						'UG_ID'				=> $ug_id,
-						'S_CUSTOM'			=> $s_custom_permissions,
-						'FORUM_ID'			=> $forum_id,
-					));
-
-					self::assign_cat_array($ug_array, $tpl_pmask . '.' . $tpl_fmask . '.' . $tpl_category, $tpl_mask, $ug_id, $forum_id, $show_trace, ($mode == 'view'));
-
-					unset($content_array[$ug_id]);
-				}
-
-				unset($hold_ary[$forum_id]);
-			}
-		}
-		else
-		{
-			foreach ($ug_names_ary as $ug_id => $ug_name)
-			{
-				if (!isset($hold_ary[$ug_id]))
-				{
-					continue;
-				}
-
-				$content_array = $categories = array();
-				self::build_permission_array($hold_ary[$ug_id], $content_array, $categories, array_keys($forum_names_ary));
-
-				phpbb::$template->assign_block_vars($tpl_pmask, array(
-					'NAME'			=> $ug_name,
-					'CATEGORIES'	=> implode('</th><th>', $categories),
-
-					'USER_GROUPS_DEFAULT'	=> ($user_mode == 'user' && isset($user_groups_default[$ug_id]) && sizeof($user_groups_default[$ug_id])) ? implode(', ', $user_groups_default[$ug_id]) : '',
-					'USER_GROUPS_CUSTOM'	=> ($user_mode == 'user' && isset($user_groups_custom[$ug_id]) && sizeof($user_groups_custom[$ug_id])) ? implode(', ', $user_groups_custom[$ug_id]) : '',
-					'L_ACL_TYPE'			=> $l_acl_type,
-
-					'S_LOCAL'		=> ($local) ? true : false,
-					'S_GLOBAL'		=> (!$local) ? true : false,
-					'S_NUM_CATS'	=> sizeof($categories),
-					'S_VIEW'		=> ($mode == 'view') ? true : false,
-					'S_NUM_OBJECTS'	=> sizeof($content_array),
-					'S_USER_MODE'	=> ($user_mode == 'user') ? true : false,
-					'S_GROUP_MODE'	=> ($user_mode == 'group') ? true : false,
-				));
-
-				@reset($content_array);
-				while (list($forum_id, $forum_array) = each($content_array))
-				{
-					// Build role dropdown options
-					$current_role_id = (isset($cur_roles[$ug_id][$forum_id])) ? $cur_roles[$ug_id][$forum_id] : 0;
-
-					$s_role_options = '';
-
-					@reset($roles);
-					while (list($role_id, $role_row) = each($roles))
-					{
-						$role_description = (!empty(phpbb::$user->lang[$role_row['role_description']])) ? phpbb::$user->lang[$role_row['role_description']] : nl2br($role_row['role_description']);
-						$role_name = (!empty(phpbb::$user->lang[$role_row['role_name']])) ? phpbb::$user->lang[$role_row['role_name']] : $role_row['role_name'];
-
-						$title = ($role_description) ? ' title="' . $role_description . '"' : '';
-						$s_role_options .= '<option value="' . $role_id . '"' . (($role_id == $current_role_id) ? ' selected="selected"' : '') . $title . '>' . $role_name . '</option>';
-					}
-
-					if ($s_role_options)
-					{
-						$s_role_options = '<option value="0"' . ((!$current_role_id) ? ' selected="selected"' : '') . ' title="' . htmlspecialchars(phpbb::$user->lang['NO_ROLE_ASSIGNED_EXPLAIN']) . '">' . phpbb::$user->lang['NO_ROLE_ASSIGNED'] . '</option>' . $s_role_options;
-					}
-
-					if (!$current_role_id && $mode != 'view')
-					{
-						$s_custom_permissions = false;
-
-						foreach ($forum_array as $key => $value)
-						{
-							if ($value['S_NEVER'] || $value['S_YES'])
-							{
-								$s_custom_permissions = true;
-								break;
-							}
-						}
-					}
-					else
-					{
-						$s_custom_permissions = false;
-					}
-
-					phpbb::$template->assign_block_vars($tpl_pmask . '.' . $tpl_fmask, array(
-						'NAME'				=> ($forum_id == 0) ? $forum_names_ary[0] : $forum_names_ary[$forum_id]['forum_name'],
-						'PADDING'			=> ($forum_id == 0) ? '' : $forum_names_ary[$forum_id]['padding'],
-						'S_ROLE_OPTIONS'	=> $s_role_options,
-						'S_CUSTOM'			=> $s_custom_permissions,
-						'UG_ID'				=> $ug_id,
-						'FORUM_ID'			=> $forum_id,
-					));
-
-					self::assign_cat_array($forum_array, $tpl_pmask . '.' . $tpl_fmask . '.' . $tpl_category, $tpl_mask, $ug_id, $forum_id, $show_trace, ($mode == 'view'));
-				}
-
-				unset($hold_ary[$ug_id], $ug_names_ary[$ug_id]);
-			}
-		}
-	}
-
-	/**
-	* Display permission mask for roles
-	*/
-	public function display_role_mask(array $hold_ary)
-	{
-		if (!sizeof($hold_ary))
-		{
-			return;
-		}
-
-		// Get forum names
-		$sql = 'SELECT forum_id, forum_name
-			FROM ' . FORUMS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('forum_id', array_keys($hold_ary)) . '
-			ORDER BY left_id';
-		$result = phpbb::$db->sql_query($sql);
-
-		// If the role is used globally, then reflect that
-		$forum_names = (isset($hold_ary[0])) ? array(0 => '') : array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$forum_names[$row['forum_id']] = $row['forum_name'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		foreach ($forum_names as $forum_id => $forum_name)
-		{
-			$auth_ary = $hold_ary[$forum_id];
-
-			phpbb::$template->assign_block_vars('role_mask', array(
-				'NAME'				=> ($forum_id == 0) ? phpbb::$user->lang['GLOBAL_MASK'] : $forum_name,
-				'FORUM_ID'			=> $forum_id,
-			));
-
-			if (isset($auth_ary['users']) && sizeof($auth_ary['users']))
-			{
-				$sql = 'SELECT user_id, username
-					FROM ' . USERS_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('user_id', $auth_ary['users']) . '
-					ORDER BY username_clean ASC';
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					phpbb::$template->assign_block_vars('role_mask.users', array(
-						'USER_ID'		=> $row['user_id'],
-						'USERNAME'		=> $row['username'],
-						'U_PROFILE'		=> append_sid('memberlist', "mode=viewprofile&amp;u={$row['user_id']}"),
-					));
-				}
-				phpbb::$db->sql_freeresult($result);
-			}
-
-			if (isset($auth_ary['groups']) && sizeof($auth_ary['groups']))
-			{
-				$sql = 'SELECT group_id, group_name, group_type
-					FROM ' . GROUPS_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('group_id', $auth_ary['groups']) . '
-					ORDER BY group_type ASC, group_name';
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					phpbb::$template->assign_block_vars('role_mask.groups', array(
-						'GROUP_ID'		=> $row['group_id'],
-						'GROUP_NAME'	=> ($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name'],
-						'U_PROFILE'		=> append_sid('memberlist', "mode=group&amp;g={$row['group_id']}"),
-					));
-				}
-				phpbb::$db->sql_freeresult($result);
-			}
-		}
-	}
-
-	/**
-	* NOTE: this function is not in use atm
-	* Add a new option to the list ... $options is a hash of form ->
-	* $options = array(
-	*	'local'		=> array('option1', 'option2', ...),
-	*	'global'	=> array('optionA', 'optionB', ...)
-	* );
-	*/
-	public function acl_add_option(array $options)
-	{
-		$cur_options = array();
-
-		// Determine current options
-		$sql = 'SELECT auth_option, is_global, is_local
-			FROM ' . ACL_OPTIONS_TABLE . '
-			ORDER BY auth_option_id';
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$cur_options[$row['auth_option']] = ($row['is_global'] && $row['is_local']) ? 'both' : (($row['is_global']) ? 'global' : 'local');
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// Here we need to insert new options ... this requires discovering whether
-		// an options is global, local or both and whether we need to add an permission
-		// set flag (x_)
-		$new_options = array('local' => array(), 'global' => array());
-
-		foreach ($options as $type => $option_ary)
-		{
-			$option_ary = array_unique($option_ary);
-
-			foreach ($option_ary as $option_value)
-			{
-				$new_options[$type][] = $option_value;
-
-				$flag = substr($option_value, 0, strpos($option_value, '_') + 1);
-
-				if (!in_array($flag, $new_options[$type]))
-				{
-					$new_options[$type][] = $flag;
-				}
-			}
-		}
-		unset($options);
-
-		$options = array();
-		$options['local'] = array_diff($new_options['local'], $new_options['global']);
-		$options['global'] = array_diff($new_options['global'], $new_options['local']);
-		$options['both'] = array_intersect($new_options['local'], $new_options['global']);
-
-		// Now check which options to add/update
-		$add_options = $update_options = array();
-
-		// First local ones...
-		foreach ($options as $type => $option_ary)
-		{
-			foreach ($option_ary as $option)
-			{
-				if (!isset($cur_options[$option]))
-				{
-					$add_options[] = array(
-						'auth_option'	=> (string) $option,
-						'is_global'		=> ($type == 'global' || $type == 'both') ? 1 : 0,
-						'is_local'		=> ($type == 'local' || $type == 'both') ? 1 : 0
-					);
-
-					continue;
-				}
-
-				// Else, update existing entry if it is changed...
-				if ($type === $cur_options[$option])
-				{
-					continue;
-				}
-
-				// New type is always both:
-				// If is now both, we set both.
-				// If it was global the new one is local and we need to set it to both
-				// If it was local the new one is global and we need to set it to both
-				$update_options[] = $option;
-			}
-		}
-
-		if (!empty($add_options))
-		{
-			phpbb::$db->sql_multi_insert(ACL_OPTIONS_TABLE, $add_options);
-		}
-
-		if (!empty($update_options))
-		{
-			$sql = 'UPDATE ' . ACL_OPTIONS_TABLE . '
-				SET is_global = 1, is_local = 1
-				WHERE ' . phpbb::$db->sql_in_set('auth_option', $update_options);
-			phpbb::$db->sql_query($sql);
-		}
-
-		phpbb::$acm->destroy('acl_options');
-		$this->acl_clear_prefetch();
-
-		// Because we just changed the options and also purged the options cache, we instantly update/regenerate it for later calls to succeed.
-		$this->acl_options = array();
-		$this->__construct();
-
-		return true;
-	}
-
-	/**
-	* Set a user or group ACL record
-	*/
-	public function acl_set($ug_type, $forum_id, $ug_id, $auth, $role_id = 0, $clear_prefetch = true)
-	{
-		// One or more forums
-		if (!is_array($forum_id))
-		{
-			$forum_id = array($forum_id);
-		}
-
-		// One or more users
-		if (!is_array($ug_id))
-		{
-			$ug_id = array($ug_id);
-		}
-
-		$ug_id_sql = phpbb::$db->sql_in_set($ug_type . '_id', array_map('intval', $ug_id));
-		$forum_sql = phpbb::$db->sql_in_set('forum_id', array_map('intval', $forum_id));
-
-		// Instead of updating, inserting, removing we just remove all current settings and re-set everything...
-		$table = ($ug_type == 'user') ? ACL_USERS_TABLE : ACL_GROUPS_TABLE;
-		$id_field = $ug_type . '_id';
-
-		// Get any flags as required
-		reset($auth);
-		$flag = key($auth);
-		$flag = substr($flag, 0, strpos($flag, '_') + 1);
-
-		// This ID (the any-flag) is set if one or more permissions are true...
-		$any_option_id = (int) $this->acl_options['id'][$flag];
-
-		// Remove any-flag from auth ary
-		if (isset($auth[$flag]))
-		{
-			unset($auth[$flag]);
-		}
-
-		// Remove current auth options...
-		$auth_option_ids = array((int)$any_option_id);
-		foreach ($auth as $auth_option => $auth_setting)
-		{
-			$auth_option_ids[] = (int) $this->acl_options['id'][$auth_option];
-		}
-
-		$sql = "DELETE FROM $table
-			WHERE $forum_sql
-				AND $ug_id_sql
-				AND " . phpbb::$db->sql_in_set('auth_option_id', $auth_option_ids);
-		phpbb::$db->sql_query($sql);
-
-		// Remove those having a role assigned... the correct type of course...
-		$sql = 'SELECT role_id
-			FROM ' . ACL_ROLES_TABLE . "
-			WHERE role_type = '" . phpbb::$db->sql_escape($flag) . "'";
-		$result = phpbb::$db->sql_query($sql);
-
-		$role_ids = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$role_ids[] = $row['role_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if (sizeof($role_ids))
-		{
-			$sql = "DELETE FROM $table
-				WHERE $forum_sql
-					AND $ug_id_sql
-					AND auth_option_id = 0
-					AND " . phpbb::$db->sql_in_set('auth_role_id', $role_ids);
-			phpbb::$db->sql_query($sql);
-		}
-
-		// Ok, include the any-flag if one or more auth options are set to yes...
-		foreach ($auth as $auth_option => $setting)
-		{
-			if ($setting == phpbb::ACL_YES && (!isset($auth[$flag]) || $auth[$flag] == phpbb::ACL_NEVER))
-			{
-				$auth[$flag] = phpbb::ACL_YES;
-			}
-		}
-
-		$sql_ary = array();
-		foreach ($forum_id as $forum)
-		{
-			$forum = (int) $forum;
-
-			if ($role_id)
-			{
-				foreach ($ug_id as $id)
-				{
-					$sql_ary[] = array(
-						$id_field			=> (int) $id,
-						'forum_id'			=> (int) $forum,
-						'auth_option_id'	=> 0,
-						'auth_setting'		=> 0,
-						'auth_role_id'		=> (int) $role_id,
-					);
-				}
-			}
-			else
-			{
-				foreach ($auth as $auth_option => $setting)
-				{
-					$auth_option_id = (int) $this->acl_options['id'][$auth_option];
-
-					if ($setting != phpbb::ACL_NO)
-					{
-						foreach ($ug_id as $id)
-						{
-							$sql_ary[] = array(
-								$id_field			=> (int) $id,
-								'forum_id'			=> (int) $forum,
-								'auth_option_id'	=> (int) $auth_option_id,
-								'auth_setting'		=> (int) $setting
-							);
-						}
-					}
-				}
-			}
-		}
-
-		phpbb::$db->sql_multi_insert($table, $sql_ary);
-
-		if ($clear_prefetch)
-		{
-			$this->acl_clear_prefetch();
-		}
-	}
-
-	/**
-	* Set a role-specific ACL record
-	*/
-	public function acl_set_role($role_id, $auth)
-	{
-		// Get any-flag as required
-		reset($auth);
-		$flag = key($auth);
-		$flag = substr($flag, 0, strpos($flag, '_') + 1);
-
-		// Remove any-flag from auth ary
-		if (isset($auth[$flag]))
-		{
-			unset($auth[$flag]);
-		}
-
-		// Re-set any flag...
-		foreach ($auth as $auth_option => $setting)
-		{
-			if ($setting == phpbb::ACL_YES && (!isset($auth[$flag]) || $auth[$flag] == phpbb::ACL_NEVER))
-			{
-				$auth[$flag] = phpbb::ACL_YES;
-			}
-		}
-
-		$sql_ary = array();
-		foreach ($auth as $auth_option => $setting)
-		{
-			$auth_option_id = (int) $this->acl_options['id'][$auth_option];
-
-			if ($setting != phpbb::ACL_NO)
-			{
-				$sql_ary[] = array(
-					'role_id'			=> (int) $role_id,
-					'auth_option_id'	=> (int) $auth_option_id,
-					'auth_setting'		=> (int) $setting
-				);
-			}
-		}
-
-		// If no data is there, we set the any-flag to ACL_NEVER...
-		if (!sizeof($sql_ary))
-		{
-			$sql_ary[] = array(
-				'role_id'			=> (int) $role_id,
-				'auth_option_id'	=> (int) $this->acl_options['id'][$flag],
-				'auth_setting'		=> phpbb::ACL_NEVER
-			);
-		}
-
-		// Remove current auth options...
-		$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
-			WHERE role_id = ' . $role_id;
-		phpbb::$db->sql_query($sql);
-
-		// Now insert the new values
-		phpbb::$db->sql_multi_insert(ACL_ROLES_DATA_TABLE, $sql_ary);
-
-		$this->acl_clear_prefetch();
-	}
-
-	/**
-	* Remove local permission
-	*/
-	public function acl_delete($mode, $ug_id = false, $forum_id = false, $permission_type = false)
-	{
-		if ($ug_id === false && $forum_id === false)
-		{
-			return;
-		}
-
-		$option_id_ary = array();
-		$table = ($mode == 'user') ? ACL_USERS_TABLE : ACL_GROUPS_TABLE;
-		$id_field = $mode . '_id';
-
-		$where_sql = array();
-
-		if ($forum_id !== false)
-		{
-			$where_sql[] = (!is_array($forum_id)) ? 'forum_id = ' . (int) $forum_id : phpbb::$db->sql_in_set('forum_id', array_map('intval', $forum_id));
-		}
-
-		if ($ug_id !== false)
-		{
-			$where_sql[] = (!is_array($ug_id)) ? $id_field . ' = ' . (int) $ug_id : phpbb::$db->sql_in_set($id_field, array_map('intval', $ug_id));
-		}
-
-		// There seem to be auth options involved, therefore we need to go through the list and make sure we capture roles correctly
-		if ($permission_type !== false)
-		{
-			// Get permission type
-			$sql = 'SELECT auth_option, auth_option_id
-				FROM ' . ACL_OPTIONS_TABLE . "
-				WHERE auth_option " . phpbb::$db->sql_like_expression($permission_type . phpbb::$db->any_char);
-			$result = phpbb::$db->sql_query($sql);
-
-			$auth_id_ary = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$option_id_ary[] = $row['auth_option_id'];
-				$auth_id_ary[$row['auth_option']] = phpbb::ACL_NO;
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			// First of all, lets grab the items having roles with the specified auth options assigned
-			$sql = "SELECT auth_role_id, $id_field, forum_id
-				FROM $table, " . ACL_ROLES_TABLE . " r
-				WHERE auth_role_id <> 0
-					AND auth_role_id = r.role_id
-					AND r.role_type = '{$permission_type}'
-					AND " . implode(' AND ', $where_sql) . '
-				ORDER BY auth_role_id';
-			$result = phpbb::$db->sql_query($sql);
-
-			$cur_role_auth = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$cur_role_auth[$row['auth_role_id']][$row['forum_id']][] = $row[$id_field];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			// Get role data for resetting data
-			if (sizeof($cur_role_auth))
-			{
-				$sql = 'SELECT ao.auth_option, rd.role_id, rd.auth_setting
-					FROM ' . ACL_OPTIONS_TABLE . ' ao, ' . ACL_ROLES_DATA_TABLE . ' rd
-					WHERE ao.auth_option_id = rd.auth_option_id
-						AND ' . phpbb::$db->sql_in_set('rd.role_id', array_keys($cur_role_auth));
-				$result = phpbb::$db->sql_query($sql);
-
-				$auth_settings = array();
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					// We need to fill all auth_options, else setting it will fail...
-					if (!isset($auth_settings[$row['role_id']]))
-					{
-						$auth_settings[$row['role_id']] = $auth_id_ary;
-					}
-					$auth_settings[$row['role_id']][$row['auth_option']] = $row['auth_setting'];
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				// Set the options
-				foreach ($cur_role_auth as $role_id => $auth_row)
-				{
-					foreach ($auth_row as $f_id => $ug_row)
-					{
-						$this->acl_set($mode, $f_id, $ug_row, $auth_settings[$role_id], 0, false);
-					}
-				}
-			}
-		}
-
-		// Now, normally remove permissions...
-		if ($permission_type !== false)
-		{
-			$where_sql[] = phpbb::$db->sql_in_set('auth_option_id', array_map('intval', $option_id_ary));
-		}
-
-		$sql = "DELETE FROM $table
-			WHERE " . implode(' AND ', $where_sql);
-		phpbb::$db->sql_query($sql);
-
-		$this->acl_clear_prefetch();
-	}
-
-	/**
-	* Assign category to template
-	* used by display_mask()
-	*/
-	private static function assign_cat_array(array $category_array, $tpl_cat, $tpl_mask, $ug_id, $forum_id, $show_trace = false, $s_view)
-	{
-		@reset($category_array);
-		while (list($cat, $cat_array) = each($category_array))
-		{
-			phpbb::$template->assign_block_vars($tpl_cat, array(
-				'S_YES'		=> ($cat_array['S_YES'] && !$cat_array['S_NEVER'] && !$cat_array['S_NO']) ? true : false,
-				'S_NEVER'	=> ($cat_array['S_NEVER'] && !$cat_array['S_YES'] && !$cat_array['S_NO']) ? true : false,
-				'S_NO'		=> ($cat_array['S_NO'] && !$cat_array['S_NEVER'] && !$cat_array['S_YES']) ? true : false,
-
-				'CAT_NAME'	=> phpbb::$user->lang['permission_cat'][$cat],
-			));
-
-			/*	Sort permissions by name (more naturaly and user friendly than sorting by a primary key)
-			*	Commented out due to it's memory consumption and time needed
-			*
-			$key_array = array_intersect(array_keys(phpbb::$user->lang), array_map(create_function('$a', 'return "acl_" . $a;'), array_keys($cat_array['permissions'])));
-			$values_array = $cat_array['permissions'];
-
-			$cat_array['permissions'] = array();
-
-			foreach ($key_array as $key)
-			{
-				$key = str_replace('acl_', '', $key);
-				$cat_array['permissions'][$key] = $values_array[$key];
-			}
-			unset($key_array, $values_array);
-*/
-			@reset($cat_array['permissions']);
-			while (list($permission, $allowed) = each($cat_array['permissions']))
-			{
-				if ($s_view)
-				{
-					phpbb::$template->assign_block_vars($tpl_cat . '.' . $tpl_mask, array(
-						'S_YES'		=> ($allowed == phpbb::ACL_YES) ? true : false,
-						'S_NEVER'	=> ($allowed == phpbb::ACL_NEVER) ? true : false,
-
-						'UG_ID'			=> $ug_id,
-						'FORUM_ID'		=> $forum_id,
-						'FIELD_NAME'	=> $permission,
-						'S_FIELD_NAME'	=> 'setting[' . $ug_id . '][' . $forum_id . '][' . $permission . ']',
-
-						'U_TRACE'		=> ($show_trace) ? append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=permissions&amp;mode=trace&amp;u=$ug_id&amp;f=$forum_id&amp;auth=$permission") : '',
-						'UA_TRACE'		=> ($show_trace) ? append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=permissions&mode=trace&u=$ug_id&f=$forum_id&auth=$permission", false) : '',
-
-						'PERMISSION'	=> phpbb::$user->lang['acl_' . $permission]['lang'],
-					));
-				}
-				else
-				{
-					phpbb::$template->assign_block_vars($tpl_cat . '.' . $tpl_mask, array(
-						'S_YES'		=> ($allowed == phpbb::ACL_YES) ? true : false,
-						'S_NEVER'	=> ($allowed == phpbb::ACL_NEVER) ? true : false,
-						'S_NO'		=> ($allowed == phpbb::ACL_NO) ? true : false,
-
-						'UG_ID'			=> $ug_id,
-						'FORUM_ID'		=> $forum_id,
-						'FIELD_NAME'	=> $permission,
-						'S_FIELD_NAME'	=> 'setting[' . $ug_id . '][' . $forum_id . '][' . $permission . ']',
-
-						'U_TRACE'		=> ($show_trace) ? append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=permissions&amp;mode=trace&amp;u=$ug_id&amp;f=$forum_id&amp;auth=$permission") : '',
-						'UA_TRACE'		=> ($show_trace) ? append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=permissions&mode=trace&u=$ug_id&f=$forum_id&auth=$permission", false) : '',
-
-						'PERMISSION'	=> phpbb::$user->lang['acl_' . $permission]['lang'],
-					));
-				}
-			}
-		}
-	}
-
-	/**
-	* Building content array from permission rows with explicit key ordering
-	* used by display_mask()
-	*/
-	public static function build_permission_array(array $permission_row, array &$content_array, array &$categories, array $key_sort_array)
-	{
-		foreach ($key_sort_array as $forum_id)
-		{
-			if (!isset($permission_row[$forum_id]))
-			{
-				continue;
-			}
-
-			$permissions = $permission_row[$forum_id];
-			ksort($permissions);
-
-			@reset($permissions);
-			while (list($permission, $auth_setting) = each($permissions))
-			{
-				if (!isset(phpbb::$user->lang['acl_' . $permission]))
-				{
-					phpbb::$user->lang['acl_' . $permission] = array(
-						'cat'	=> 'misc',
-						'lang'	=> '{ acl_' . $permission . ' }'
-					);
-				}
-
-				$cat = phpbb::$user->lang['acl_' . $permission]['cat'];
-
-				// Build our categories array
-				if (!isset($categories[$cat]))
-				{
-					$categories[$cat] = phpbb::$user->lang['permission_cat'][$cat];
-				}
-
-				// Build our content array
-				if (!isset($content_array[$forum_id]))
-				{
-					$content_array[$forum_id] = array();
-				}
-
-				if (!isset($content_array[$forum_id][$cat]))
-				{
-					$content_array[$forum_id][$cat] = array(
-						'S_YES'			=> false,
-						'S_NEVER'		=> false,
-						'S_NO'			=> false,
-						'permissions'	=> array(),
-					);
-				}
-
-				$content_array[$forum_id][$cat]['S_YES'] |= ($auth_setting == phpbb::ACL_YES) ? true : false;
-				$content_array[$forum_id][$cat]['S_NEVER'] |= ($auth_setting == phpbb::ACL_NEVER) ? true : false;
-				$content_array[$forum_id][$cat]['S_NO'] |= ($auth_setting == phpbb::ACL_NO) ? true : false;
-
-				$content_array[$forum_id][$cat]['permissions'][$permission] = $auth_setting;
-			}
-		}
-	}
-
-	/**
-	* Use permissions from another user. This transferes a permission set from one user to another.
-	* The other user is always able to revert back to his permission set.
-	* This function does not check for lower/higher permissions, it is possible for the user to gain
-	* "more" permissions by this.
-	* Admin permissions will not be copied.
-	*/
-	public function ghost_permissions($from_user_id, $to_user_id)
-	{
-		if ($to_user_id == ANONYMOUS)
-		{
-			return false;
-		}
-
-		$hold_ary = $this->acl_raw_data_single_user($from_user_id);
-
-		// Key 0 in $hold_ary are global options, all others are forum_ids
-
-		// We disallow copying admin permissions
-		foreach ($this->acl_options['global'] as $opt => $id)
-		{
-			if (strpos($opt, 'a_') === 0)
-			{
-				$hold_ary[0][$this->acl_options['id'][$opt]] = phpbb::ACL_NEVER;
-			}
-		}
-
-		// Force a_switchperm to be allowed
-		$hold_ary[0][$this->acl_options['id']['a_switchperm']] = phpbb::ACL_YES;
-
-		$user_permissions = $this->build_bitstring($hold_ary);
-
-		if (!$user_permissions)
-		{
-			return false;
-		}
-
-		$sql = 'UPDATE ' . USERS_TABLE . "
-			SET user_permissions = '" . phpbb::$db->sql_escape($user_permissions) . "',
-				user_perm_from = $from_user_id
-			WHERE user_id = " . $to_user_id;
-		phpbb::$db->sql_query($sql);
-
-		return true;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_attachments.php b/phpBB/modules/acp/info/acp_attachments.php
deleted file mode 100644
index b77785801f..0000000000
--- a/phpBB/modules/acp/info/acp_attachments.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_attachments_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_attachments',
-			'title'		=> 'ACP_ATTACHMENTS',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'attach'		=> array('title' => 'ACP_ATTACHMENT_SETTINGS', 'auth' => 'acl_a_attach', 'cat' => array('ACP_BOARD_CONFIGURATION', 'ACP_ATTACHMENTS')),
-				'extensions'	=> array('title' => 'ACP_MANAGE_EXTENSIONS', 'auth' => 'acl_a_attach', 'cat' => array('ACP_ATTACHMENTS')),
-				'ext_groups'	=> array('title' => 'ACP_EXTENSION_GROUPS', 'auth' => 'acl_a_attach', 'cat' => array('ACP_ATTACHMENTS')),
-				'orphan'		=> array('title' => 'ACP_ORPHAN_ATTACHMENTS', 'auth' => 'acl_a_attach', 'cat' => array('ACP_ATTACHMENTS'))
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_ban.php b/phpBB/modules/acp/info/acp_ban.php
deleted file mode 100644
index df51011ec6..0000000000
--- a/phpBB/modules/acp/info/acp_ban.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_ban_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_ban',
-			'title'		=> 'ACP_BAN',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'email'		=> array('title' => 'ACP_BAN_EMAILS', 'auth' => 'acl_a_ban', 'cat' => array('ACP_USER_SECURITY')),
-				'ip'		=> array('title' => 'ACP_BAN_IPS', 'auth' => 'acl_a_ban', 'cat' => array('ACP_USER_SECURITY')),
-				'user'		=> array('title' => 'ACP_BAN_USERNAMES', 'auth' => 'acl_a_ban', 'cat' => array('ACP_USER_SECURITY')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_bbcodes.php b/phpBB/modules/acp/info/acp_bbcodes.php
deleted file mode 100644
index c0206432d6..0000000000
--- a/phpBB/modules/acp/info/acp_bbcodes.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_bbcodes_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_bbcodes',
-			'title'		=> 'ACP_BBCODES',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'bbcodes'		=> array('title' => 'ACP_BBCODES', 'auth' => 'acl_a_bbcode', 'cat' => array('ACP_MESSAGES')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_board.php b/phpBB/modules/acp/info/acp_board.php
deleted file mode 100644
index 72d86676a6..0000000000
--- a/phpBB/modules/acp/info/acp_board.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_board_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_board',
-			'title'		=> 'ACP_BOARD_MANAGEMENT',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'settings'		=> array('title' => 'ACP_BOARD_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')),
-				'features'		=> array('title' => 'ACP_BOARD_FEATURES', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')),
-				'avatar'		=> array('title' => 'ACP_AVATAR_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')),
-				'message'		=> array('title' => 'ACP_MESSAGE_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION', 'ACP_MESSAGES')),
-				'post'			=> array('title' => 'ACP_POST_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')),
-				'signature'		=> array('title' => 'ACP_SIGNATURE_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')),
-				'registration'	=> array('title' => 'ACP_REGISTER_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')),
-
-				'auth'		=> array('title' => 'ACP_AUTH_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_CLIENT_COMMUNICATION')),
-				'email'		=> array('title' => 'ACP_EMAIL_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_CLIENT_COMMUNICATION')),
-
-				'cookie'	=> array('title' => 'ACP_COOKIE_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_SERVER_CONFIGURATION')),
-				'server'	=> array('title' => 'ACP_SERVER_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_SERVER_CONFIGURATION')),
-				'security'	=> array('title' => 'ACP_SECURITY_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_SERVER_CONFIGURATION')),
-				'load'		=> array('title' => 'ACP_LOAD_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_SERVER_CONFIGURATION')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_bots.php b/phpBB/modules/acp/info/acp_bots.php
deleted file mode 100644
index 45087f9225..0000000000
--- a/phpBB/modules/acp/info/acp_bots.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_bots_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_bots',
-			'title'		=> 'ACP_BOTS',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'bots'		=> array('title' => 'ACP_BOTS', 'auth' => 'acl_a_bots', 'cat' => array('ACP_GENERAL_TASKS')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_captcha.php b/phpBB/modules/acp/info/acp_captcha.php
deleted file mode 100644
index b2541c252c..0000000000
--- a/phpBB/modules/acp/info/acp_captcha.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_captcha_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_captcha',
-			'title'		=> 'ACP_CAPTCHA',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'visual'		=> array('title' => 'ACP_VC_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')),
-				'img'			=> array('title' => 'ACP_VC_CAPTCHA_DISPLAY', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION'), 'display' => false)
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_database.php b/phpBB/modules/acp/info/acp_database.php
deleted file mode 100644
index 85c3c8b21c..0000000000
--- a/phpBB/modules/acp/info/acp_database.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_database_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_database',
-			'title'		=> 'ACP_DATABASE',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'backup'	=> array('title' => 'ACP_BACKUP', 'auth' => 'acl_a_backup', 'cat' => array('ACP_CAT_DATABASE')),
-				'restore'	=> array('title' => 'ACP_RESTORE', 'auth' => 'acl_a_backup', 'cat' => array('ACP_CAT_DATABASE')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_disallow.php b/phpBB/modules/acp/info/acp_disallow.php
deleted file mode 100644
index 41315eb716..0000000000
--- a/phpBB/modules/acp/info/acp_disallow.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_disallow_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_disallow',
-			'title'		=> 'ACP_DISALLOW',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'usernames'		=> array('title' => 'ACP_DISALLOW_USERNAMES', 'auth' => 'acl_a_names', 'cat' => array('ACP_USER_SECURITY')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_email.php b/phpBB/modules/acp/info/acp_email.php
deleted file mode 100644
index 4ad7bca58b..0000000000
--- a/phpBB/modules/acp/info/acp_email.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_email_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_email',
-			'title'		=> 'ACP_MASS_EMAIL',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'email'		=> array('title' => 'ACP_MASS_EMAIL', 'auth' => 'acl_a_email && cfg_email_enable', 'cat' => array('ACP_GENERAL_TASKS')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_forums.php b/phpBB/modules/acp/info/acp_forums.php
deleted file mode 100644
index 8d82eaf42d..0000000000
--- a/phpBB/modules/acp/info/acp_forums.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_forums_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_forums',
-			'title'		=> 'ACP_FORUM_MANAGEMENT',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'manage'	=> array('title' => 'ACP_MANAGE_FORUMS', 'auth' => 'acl_a_forum', 'cat' => array('ACP_MANAGE_FORUMS')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_groups.php b/phpBB/modules/acp/info/acp_groups.php
deleted file mode 100644
index 3910c24e6b..0000000000
--- a/phpBB/modules/acp/info/acp_groups.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_groups_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_groups',
-			'title'		=> 'ACP_GROUPS_MANAGEMENT',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'manage'		=> array('title' => 'ACP_GROUPS_MANAGE', 'auth' => 'acl_a_group', 'cat' => array('ACP_GROUPS')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_icons.php b/phpBB/modules/acp/info/acp_icons.php
deleted file mode 100644
index 16bf753940..0000000000
--- a/phpBB/modules/acp/info/acp_icons.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_icons_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_icons',
-			'title'		=> 'ACP_ICONS_SMILIES',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'icons'		=> array('title' => 'ACP_ICONS', 'auth' => 'acl_a_icons', 'cat' => array('ACP_MESSAGES')),
-				'smilies'	=> array('title' => 'ACP_SMILIES', 'auth' => 'acl_a_icons', 'cat' => array('ACP_MESSAGES')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_inactive.php b/phpBB/modules/acp/info/acp_inactive.php
deleted file mode 100644
index e17fbda9dd..0000000000
--- a/phpBB/modules/acp/info/acp_inactive.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_inactive_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_inactive',
-			'title'		=> 'ACP_INACTIVE_USERS',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'list'		=> array('title' => 'ACP_INACTIVE_USERS', 'auth' => 'acl_a_user', 'cat' => array('ACP_CAT_USERS')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_jabber.php b/phpBB/modules/acp/info/acp_jabber.php
deleted file mode 100644
index 7bcf7744e1..0000000000
--- a/phpBB/modules/acp/info/acp_jabber.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_jabber_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_jabber',
-			'title'		=> 'ACP_JABBER_SETTINGS',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'settings'		=> array('title' => 'ACP_JABBER_SETTINGS', 'auth' => 'acl_a_jabber', 'cat' => array('ACP_CLIENT_COMMUNICATION')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_language.php b/phpBB/modules/acp/info/acp_language.php
deleted file mode 100644
index f7606631fe..0000000000
--- a/phpBB/modules/acp/info/acp_language.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_language_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_language',
-			'title'		=> 'ACP_LANGUAGE',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'lang_packs'		=> array('title' => 'ACP_LANGUAGE_PACKS', 'auth' => 'acl_a_language', 'cat' => array('ACP_GENERAL_TASKS')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_logs.php b/phpBB/modules/acp/info/acp_logs.php
deleted file mode 100644
index f119e10b83..0000000000
--- a/phpBB/modules/acp/info/acp_logs.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_logs_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_logs',
-			'title'		=> 'ACP_LOGGING',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'admin'		=> array('title' => 'ACP_ADMIN_LOGS', 'auth' => 'acl_a_viewlogs', 'cat' => array('ACP_FORUM_LOGS')),
-				'mod'		=> array('title' => 'ACP_MOD_LOGS', 'auth' => 'acl_a_viewlogs', 'cat' => array('ACP_FORUM_LOGS')),
-				'users'		=> array('title' => 'ACP_USERS_LOGS', 'auth' => 'acl_a_viewlogs', 'cat' => array('ACP_FORUM_LOGS')),
-				'critical'	=> array('title' => 'ACP_CRITICAL_LOGS', 'auth' => 'acl_a_viewlogs', 'cat' => array('ACP_FORUM_LOGS')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_main.php b/phpBB/modules/acp/info/acp_main.php
deleted file mode 100644
index 5574cc40d1..0000000000
--- a/phpBB/modules/acp/info/acp_main.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_main_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_main',
-			'title'		=> 'ACP_INDEX',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'main'		=> array('title' => 'ACP_INDEX', 'auth' => '', 'cat' => array('ACP_CAT_GENERAL')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_modules.php b/phpBB/modules/acp/info/acp_modules.php
deleted file mode 100644
index 886f17d628..0000000000
--- a/phpBB/modules/acp/info/acp_modules.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_modules_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_modules',
-			'title'		=> 'ACP_MODULE_MANAGEMENT',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'acp'		=> array('title' => 'ACP', 'auth' => 'acl_a_modules', 'cat' => array('ACP_MODULE_MANAGEMENT')),
-				'ucp'		=> array('title' => 'UCP', 'auth' => 'acl_a_modules', 'cat' => array('ACP_MODULE_MANAGEMENT')),
-				'mcp'		=> array('title' => 'MCP', 'auth' => 'acl_a_modules', 'cat' => array('ACP_MODULE_MANAGEMENT')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_permission_roles.php b/phpBB/modules/acp/info/acp_permission_roles.php
deleted file mode 100644
index 3ab2fecd53..0000000000
--- a/phpBB/modules/acp/info/acp_permission_roles.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_permission_roles_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_permission_roles',
-			'title'		=> 'ACP_PERMISSION_ROLES',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'admin_roles'		=> array('title' => 'ACP_ADMIN_ROLES', 'auth' => 'acl_a_roles && acl_a_aauth', 'cat' => array('ACP_PERMISSION_ROLES')),
-				'user_roles'		=> array('title' => 'ACP_USER_ROLES', 'auth' => 'acl_a_roles && acl_a_uauth', 'cat' => array('ACP_PERMISSION_ROLES')),
-				'mod_roles'			=> array('title' => 'ACP_MOD_ROLES', 'auth' => 'acl_a_roles && acl_a_mauth', 'cat' => array('ACP_PERMISSION_ROLES')),
-				'forum_roles'		=> array('title' => 'ACP_FORUM_ROLES', 'auth' => 'acl_a_roles && acl_a_fauth', 'cat' => array('ACP_PERMISSION_ROLES')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_permissions.php b/phpBB/modules/acp/info/acp_permissions.php
deleted file mode 100644
index 22de666af3..0000000000
--- a/phpBB/modules/acp/info/acp_permissions.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_permissions_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_permissions',
-			'title'		=> 'ACP_PERMISSIONS',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'intro'					=> array('title' => 'ACP_PERMISSIONS', 'auth' => 'acl_a_authusers || acl_a_authgroups || acl_a_viewauth', 'cat' => array('ACP_CAT_PERMISSIONS')),
-				'trace'					=> array('title' => 'ACP_PERMISSION_TRACE', 'auth' => 'acl_a_viewauth', 'display' => false, 'cat' => array('ACP_PERMISSION_MASKS')),
-
-				'setting_forum_local'	=> array('title' => 'ACP_FORUM_PERMISSIONS', 'auth' => 'acl_a_fauth && (acl_a_authusers || acl_a_authgroups)', 'cat' => array('ACP_FORUM_BASED_PERMISSIONS')),
-				'setting_mod_local'		=> array('title' => 'ACP_FORUM_MODERATORS', 'auth' => 'acl_a_mauth && (acl_a_authusers || acl_a_authgroups)', 'cat' => array('ACP_FORUM_BASED_PERMISSIONS')),
-				'setting_user_global'	=> array('title' => 'ACP_USERS_PERMISSIONS', 'auth' => 'acl_a_authusers && (acl_a_aauth || acl_a_mauth || acl_a_uauth)', 'cat' => array('ACP_GLOBAL_PERMISSIONS', 'ACP_CAT_USERS')),
-				'setting_user_local'	=> array('title' => 'ACP_USERS_FORUM_PERMISSIONS', 'auth' => 'acl_a_authusers && (acl_a_mauth || acl_a_fauth)', 'cat' => array('ACP_FORUM_BASED_PERMISSIONS', 'ACP_CAT_USERS')),
-				'setting_group_global'	=> array('title' => 'ACP_GROUPS_PERMISSIONS', 'auth' => 'acl_a_authgroups && (acl_a_aauth || acl_a_mauth || acl_a_uauth)', 'cat' => array('ACP_GLOBAL_PERMISSIONS', 'ACP_GROUPS')),
-				'setting_group_local'	=> array('title' => 'ACP_GROUPS_FORUM_PERMISSIONS', 'auth' => 'acl_a_authgroups && (acl_a_mauth || acl_a_fauth)', 'cat' => array('ACP_FORUM_BASED_PERMISSIONS', 'ACP_GROUPS')),
-				'setting_admin_global'	=> array('title' => 'ACP_ADMINISTRATORS', 'auth' => 'acl_a_aauth && (acl_a_authusers || acl_a_authgroups)', 'cat' => array('ACP_GLOBAL_PERMISSIONS')),
-				'setting_mod_global'	=> array('title' => 'ACP_GLOBAL_MODERATORS', 'auth' => 'acl_a_mauth && (acl_a_authusers || acl_a_authgroups)', 'cat' => array('ACP_GLOBAL_PERMISSIONS')),
-
-				'view_admin_global'		=> array('title' => 'ACP_VIEW_ADMIN_PERMISSIONS', 'auth' => 'acl_a_viewauth', 'cat' => array('ACP_PERMISSION_MASKS')),
-				'view_user_global'		=> array('title' => 'ACP_VIEW_USER_PERMISSIONS', 'auth' => 'acl_a_viewauth', 'cat' => array('ACP_PERMISSION_MASKS')),
-				'view_mod_global'		=> array('title' => 'ACP_VIEW_GLOBAL_MOD_PERMISSIONS', 'auth' => 'acl_a_viewauth', 'cat' => array('ACP_PERMISSION_MASKS')),
-				'view_mod_local'		=> array('title' => 'ACP_VIEW_FORUM_MOD_PERMISSIONS', 'auth' => 'acl_a_viewauth', 'cat' => array('ACP_PERMISSION_MASKS')),
-				'view_forum_local'		=> array('title' => 'ACP_VIEW_FORUM_PERMISSIONS', 'auth' => 'acl_a_viewauth', 'cat' => array('ACP_PERMISSION_MASKS')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_php_info.php b/phpBB/modules/acp/info/acp_php_info.php
deleted file mode 100644
index 7d716b0f83..0000000000
--- a/phpBB/modules/acp/info/acp_php_info.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_php_info_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_php_info',
-			'title'		=> 'ACP_PHP_INFO',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'info'		=> array('title' => 'ACP_PHP_INFO', 'auth' => 'acl_a_phpinfo', 'cat' => array('ACP_GENERAL_TASKS')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_profile.php b/phpBB/modules/acp/info/acp_profile.php
deleted file mode 100644
index 8590226038..0000000000
--- a/phpBB/modules/acp/info/acp_profile.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_profile_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_profile',
-			'title'		=> 'ACP_CUSTOM_PROFILE_FIELDS',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'profile'	=> array('title' => 'ACP_CUSTOM_PROFILE_FIELDS', 'auth' => 'acl_a_profile', 'cat' => array('ACP_CAT_USERS')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_prune.php b/phpBB/modules/acp/info/acp_prune.php
deleted file mode 100644
index 46565c4f16..0000000000
--- a/phpBB/modules/acp/info/acp_prune.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_prune_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_prune',
-			'title'		=> 'ACP_PRUNING',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'forums'	=> array('title' => 'ACP_PRUNE_FORUMS', 'auth' => 'acl_a_prune', 'cat' => array('ACP_MANAGE_FORUMS')),
-				'users'		=> array('title' => 'ACP_PRUNE_USERS', 'auth' => 'acl_a_userdel', 'cat' => array('ACP_USER_SECURITY')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_ranks.php b/phpBB/modules/acp/info/acp_ranks.php
deleted file mode 100644
index 06b9c6d284..0000000000
--- a/phpBB/modules/acp/info/acp_ranks.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_ranks_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_ranks',
-			'title'		=> 'ACP_RANKS',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'ranks'		=> array('title' => 'ACP_MANAGE_RANKS', 'auth' => 'acl_a_ranks', 'cat' => array('ACP_CAT_USERS')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_reasons.php b/phpBB/modules/acp/info/acp_reasons.php
deleted file mode 100644
index 65d805ee18..0000000000
--- a/phpBB/modules/acp/info/acp_reasons.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_reasons_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_reasons',
-			'title'		=> 'ACP_REASONS',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'main'		=> array('title' => 'ACP_MANAGE_REASONS', 'auth' => 'acl_a_reasons', 'cat' => array('ACP_GENERAL_TASKS')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_search.php b/phpBB/modules/acp/info/acp_search.php
deleted file mode 100644
index 4afd6c6994..0000000000
--- a/phpBB/modules/acp/info/acp_search.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_search_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_search',
-			'title'		=> 'ACP_SEARCH',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'settings'	=> array('title' => 'ACP_SEARCH_SETTINGS', 'auth' => 'acl_a_search', 'cat' => array('ACP_SERVER_CONFIGURATION')),
-				'index'		=> array('title' => 'ACP_SEARCH_INDEX', 'auth' => 'acl_a_search', 'cat' => array('ACP_CAT_DATABASE')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_styles.php b/phpBB/modules/acp/info/acp_styles.php
deleted file mode 100644
index db67167e39..0000000000
--- a/phpBB/modules/acp/info/acp_styles.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_styles_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_styles',
-			'title'		=> 'ACP_CAT_STYLES',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'style'		=> array('title' => 'ACP_STYLES', 'auth' => 'acl_a_styles', 'cat' => array('ACP_STYLE_MANAGEMENT')),
-				'template'	=> array('title' => 'ACP_TEMPLATES', 'auth' => 'acl_a_styles', 'cat' => array('ACP_STYLE_COMPONENTS')),
-				'theme'		=> array('title' => 'ACP_THEMES', 'auth' => 'acl_a_styles', 'cat' => array('ACP_STYLE_COMPONENTS')),
-				'imageset'	=> array('title' => 'ACP_IMAGESETS', 'auth' => 'acl_a_styles', 'cat' => array('ACP_STYLE_COMPONENTS')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_update.php b/phpBB/modules/acp/info/acp_update.php
deleted file mode 100644
index 886cdc94d5..0000000000
--- a/phpBB/modules/acp/info/acp_update.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_update_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_update',
-			'title'		=> 'ACP_UPDATE',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'version_check'		=> array('title' => 'ACP_VERSION_CHECK', 'auth' => 'acl_a_board', 'cat' => array('ACP_AUTOMATION')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_users.php b/phpBB/modules/acp/info/acp_users.php
deleted file mode 100644
index 0cd5f7ae97..0000000000
--- a/phpBB/modules/acp/info/acp_users.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_users_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_users',
-			'title'		=> 'ACP_USER_MANAGEMENT',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'overview'		=> array('title' => 'ACP_MANAGE_USERS', 'auth' => 'acl_a_user', 'cat' => array('ACP_CAT_USERS')),
-				'feedback'		=> array('title' => 'ACP_USER_FEEDBACK', 'auth' => 'acl_a_user', 'display' => false, 'cat' => array('ACP_CAT_USERS')),
-				'profile'		=> array('title' => 'ACP_USER_PROFILE', 'auth' => 'acl_a_user', 'display' => false, 'cat' => array('ACP_CAT_USERS')),
-				'prefs'			=> array('title' => 'ACP_USER_PREFS', 'auth' => 'acl_a_user', 'display' => false, 'cat' => array('ACP_CAT_USERS')),
-				'avatar'		=> array('title' => 'ACP_USER_AVATAR', 'auth' => 'acl_a_user', 'display' => false, 'cat' => array('ACP_CAT_USERS')),
-				'rank'			=> array('title' => 'ACP_USER_RANK', 'auth' => 'acl_a_user', 'display' => false, 'cat' => array('ACP_CAT_USERS')),
-				'sig'			=> array('title' => 'ACP_USER_SIG', 'auth' => 'acl_a_user', 'display' => false, 'cat' => array('ACP_CAT_USERS')),
-				'groups'		=> array('title' => 'ACP_USER_GROUPS', 'auth' => 'acl_a_user && acl_a_group', 'display' => false, 'cat' => array('ACP_CAT_USERS')),
-				'perm'			=> array('title' => 'ACP_USER_PERM', 'auth' => 'acl_a_user && acl_a_viewauth', 'display' => false, 'cat' => array('ACP_CAT_USERS')),
-				'attach'		=> array('title' => 'ACP_USER_ATTACH', 'auth' => 'acl_a_user', 'display' => false, 'cat' => array('ACP_CAT_USERS')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/acp/info/acp_words.php b/phpBB/modules/acp/info/acp_words.php
deleted file mode 100644
index a2417f8a7f..0000000000
--- a/phpBB/modules/acp/info/acp_words.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
-*
-* @package acp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class acp_words_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'acp_words',
-			'title'		=> 'ACP_WORDS',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'words'		=> array('title' => 'ACP_WORDS', 'auth' => 'acl_a_words', 'cat' => array('ACP_MESSAGES')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/mcp/info/mcp_ban.php b/phpBB/modules/mcp/info/mcp_ban.php
deleted file mode 100644
index 383df30498..0000000000
--- a/phpBB/modules/mcp/info/mcp_ban.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
-*
-* @package mcp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class mcp_ban_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'mcp_ban',
-			'title'		=> 'MCP_BAN',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'user'		=> array('title' => 'MCP_BAN_USERNAMES', 'auth' => 'acl_m_ban', 'cat' => array('MCP_BAN')),
-				'ip'		=> array('title' => 'MCP_BAN_IPS', 'auth' => 'acl_m_ban', 'cat' => array('MCP_BAN')),
-				'email'		=> array('title' => 'MCP_BAN_EMAILS', 'auth' => 'acl_m_ban', 'cat' => array('MCP_BAN')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/mcp/info/mcp_logs.php b/phpBB/modules/mcp/info/mcp_logs.php
deleted file mode 100644
index fe2f9fa1d7..0000000000
--- a/phpBB/modules/mcp/info/mcp_logs.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
-*
-* @package mcp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class mcp_logs_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'mcp_logs',
-			'title'		=> 'MCP_LOGS',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'front'			=> array('title' => 'MCP_LOGS_FRONT', 'auth' => 'acl_m_ || aclf_m_', 'cat' => array('MCP_LOGS')),
-				'forum_logs'	=> array('title' => 'MCP_LOGS_FORUM_VIEW', 'auth' => 'acl_m_,$id', 'cat' => array('MCP_LOGS')),
-				'topic_logs'	=> array('title' => 'MCP_LOGS_TOPIC_VIEW', 'auth' => 'acl_m_,$id', 'cat' => array('MCP_LOGS')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/mcp/info/mcp_main.php b/phpBB/modules/mcp/info/mcp_main.php
deleted file mode 100644
index 9755cdfc07..0000000000
--- a/phpBB/modules/mcp/info/mcp_main.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
-*
-* @package mcp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class mcp_main_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'mcp_main',
-			'title'		=> 'MCP_MAIN',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'front'			=> array('title' => 'MCP_MAIN_FRONT', 'auth' => '', 'cat' => array('MCP_MAIN')),
-				'forum_view'	=> array('title' => 'MCP_MAIN_FORUM_VIEW', 'auth' => 'acl_m_,$id', 'cat' => array('MCP_MAIN')),
-				'topic_view'	=> array('title' => 'MCP_MAIN_TOPIC_VIEW', 'auth' => 'acl_m_,$id', 'cat' => array('MCP_MAIN')),
-				'post_details'	=> array('title' => 'MCP_MAIN_POST_DETAILS', 'auth' => 'acl_m_,$id || (!$id && aclf_m_)', 'cat' => array('MCP_MAIN')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/mcp/info/mcp_notes.php b/phpBB/modules/mcp/info/mcp_notes.php
deleted file mode 100644
index afe232e5b5..0000000000
--- a/phpBB/modules/mcp/info/mcp_notes.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
-*
-* @package mcp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class mcp_notes_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'mcp_notes',
-			'title'		=> 'MCP_NOTES',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'front'				=> array('title' => 'MCP_NOTES_FRONT', 'auth' => '', 'cat' => array('MCP_NOTES')),
-				'user_notes'		=> array('title' => 'MCP_NOTES_USER', 'auth' => '', 'cat' => array('MCP_NOTES')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/mcp/info/mcp_queue.php b/phpBB/modules/mcp/info/mcp_queue.php
deleted file mode 100644
index 7a256642b9..0000000000
--- a/phpBB/modules/mcp/info/mcp_queue.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
-*
-* @package mcp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class mcp_queue_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'mcp_queue',
-			'title'		=> 'MCP_QUEUE',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'unapproved_topics'	=> array('title' => 'MCP_QUEUE_UNAPPROVED_TOPICS', 'auth' => 'aclf_m_approve', 'cat' => array('MCP_QUEUE')),
-				'unapproved_posts'	=> array('title' => 'MCP_QUEUE_UNAPPROVED_POSTS', 'auth' => 'aclf_m_approve', 'cat' => array('MCP_QUEUE')),
-				'approve_details'	=> array('title' => 'MCP_QUEUE_APPROVE_DETAILS', 'auth' => 'acl_m_approve,$id || (!$id && aclf_m_approve)', 'cat' => array('MCP_QUEUE')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/mcp/info/mcp_reports.php b/phpBB/modules/mcp/info/mcp_reports.php
deleted file mode 100644
index 3893ba5abb..0000000000
--- a/phpBB/modules/mcp/info/mcp_reports.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
-*
-* @package mcp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class mcp_reports_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'mcp_reports',
-			'title'		=> 'MCP_REPORTS',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'reports'			=> array('title' => 'MCP_REPORTS_OPEN', 'auth' => 'aclf_m_report', 'cat' => array('MCP_REPORTS')),
-				'reports_closed'	=> array('title' => 'MCP_REPORTS_CLOSED', 'auth' => 'aclf_m_report', 'cat' => array('MCP_REPORTS')),
-				'report_details'	=> array('title' => 'MCP_REPORT_DETAILS', 'auth' => 'acl_m_report,$id || (!$id && aclf_m_report)', 'cat' => array('MCP_REPORTS')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/mcp/info/mcp_warn.php b/phpBB/modules/mcp/info/mcp_warn.php
deleted file mode 100644
index 2b0b09f75a..0000000000
--- a/phpBB/modules/mcp/info/mcp_warn.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
-*
-* @package mcp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class mcp_warn_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'mcp_warn',
-			'title'		=> 'MCP_WARN',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'front'				=> array('title' => 'MCP_WARN_FRONT', 'auth' => 'aclf_m_warn', 'cat' => array('MCP_WARN')),
-				'list'				=> array('title' => 'MCP_WARN_LIST', 'auth' => 'aclf_m_warn', 'cat' => array('MCP_WARN')),
-				'warn_user'			=> array('title' => 'MCP_WARN_USER', 'auth' => 'aclf_m_warn', 'cat' => array('MCP_WARN')),
-				'warn_post'			=> array('title' => 'MCP_WARN_POST', 'auth' => 'acl_m_warn && acl_f_read,$id', 'cat' => array('MCP_WARN')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/mcp/mcp_ban.php b/phpBB/modules/mcp/mcp_ban.php
deleted file mode 100644
index bcf895ebeb..0000000000
--- a/phpBB/modules/mcp/mcp_ban.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-/**
-*
-* @package mcp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package mcp
-*/
-class mcp_ban
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-
-		// Include the admin banning interface...
-		include(PHPBB_ROOT_PATH . 'includes/acp/acp_ban.' . PHP_EXT);
-
-		$bansubmit		= phpbb_request::is_set_post('bansubmit');
-		$unbansubmit	= phpbb_request::is_set_post('unbansubmit');
-		$current_time	= time();
-
-		phpbb::$user->add_lang(array('acp/ban', 'acp/users'));
-		$this->tpl_name = 'mcp_ban';
-
-		// Ban submitted?
-		if ($bansubmit)
-		{
-			// Grab the list of entries
-			$ban				= request_var('ban', '', ($mode === 'user') ? true : false);
-
-			if ($mode === 'user')
-			{
-				$ban = utf8_normalize_nfc($ban);
-			}
-
-			$ban_len			= request_var('banlength', 0);
-			$ban_len_other		= request_var('banlengthother', '');
-			$ban_exclude		= request_var('banexclude', 0);
-			$ban_reason			= utf8_normalize_nfc(request_var('banreason', '', true));
-			$ban_give_reason	= utf8_normalize_nfc(request_var('bangivereason', '', true));
-
-			if ($ban)
-			{
-				if (confirm_box(true))
-				{
-					user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reason, $ban_give_reason);
-
-					trigger_error(phpbb::$user->lang['BAN_UPDATE_SUCCESSFUL'] . '<br /><br /><a href="' . $this->u_action . '">&laquo; ' . phpbb::$user->lang['BACK_TO_PREV'] . '</a>');
-				}
-				else
-				{
-					confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-						'mode'				=> $mode,
-						'ban'				=> $ban,
-						'bansubmit'			=> true,
-						'banlength'			=> $ban_len,
-						'banlengthother'	=> $ban_len_other,
-						'banexclude'		=> $ban_exclude,
-						'banreason'			=> $ban_reason,
-						'bangivereason'		=> $ban_give_reason)));
-				}
-			}
-		}
-		else if ($unbansubmit)
-		{
-			$ban = request_var('unban', array(''));
-
-			if ($ban)
-			{
-				if (confirm_box(true))
-				{
-					user_unban($mode, $ban);
-
-					trigger_error(phpbb::$user->lang['BAN_UPDATE_SUCCESSFUL'] . '<br /><br /><a href="' . $this->u_action . '">&laquo; ' . phpbb::$user->lang['BACK_TO_PREV'] . '</a>');
-				}
-				else
-				{
-					confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-						'mode'			=> $mode,
-						'unbansubmit'	=> true,
-						'unban'			=> $ban)));
-				}
-			}
-		}
-
-		// Ban length options
-		$ban_end_text = array(0 => phpbb::$user->lang['PERMANENT'], 30 => phpbb::$user->lang['30_MINS'], 60 => phpbb::$user->lang['1_HOUR'], 360 => phpbb::$user->lang['6_HOURS'], 1440 => phpbb::$user->lang['1_DAY'], 10080 => phpbb::$user->lang['7_DAYS'], 20160 => phpbb::$user->lang['2_WEEKS'], 40320 => phpbb::$user->lang['1_MONTH'], -1 => phpbb::$user->lang['UNTIL'] . ' -&gt; ');
-
-		$ban_end_options = '';
-		foreach ($ban_end_text as $length => $text)
-		{
-			$ban_end_options .= '<option value="' . $length . '">' . $text . '</option>';
-		}
-
-		// Define language vars
-		$this->page_title = phpbb::$user->lang[strtoupper($mode) . '_BAN'];
-
-		$l_ban_explain = phpbb::$user->lang[strtoupper($mode) . '_BAN_EXPLAIN'];
-		$l_ban_exclude_explain = phpbb::$user->lang[strtoupper($mode) . '_BAN_EXCLUDE_EXPLAIN'];
-		$l_unban_title = phpbb::$user->lang[strtoupper($mode) . '_UNBAN'];
-		$l_unban_explain = phpbb::$user->lang[strtoupper($mode) . '_UNBAN_EXPLAIN'];
-		$l_no_ban_cell = phpbb::$user->lang[strtoupper($mode) . '_NO_BANNED'];
-
-		switch ($mode)
-		{
-			case 'user':
-				$l_ban_cell = phpbb::$user->lang['USERNAME'];
-			break;
-
-			case 'ip':
-				$l_ban_cell = phpbb::$user->lang['IP_HOSTNAME'];
-			break;
-
-			case 'email':
-				$l_ban_cell = phpbb::$user->lang['EMAIL_ADDRESS'];
-			break;
-		}
-
-		acp_ban::display_ban_options($mode);
-
-		phpbb::$template->assign_vars(array(
-			'L_TITLE'				=> $this->page_title,
-			'L_EXPLAIN'				=> $l_ban_explain,
-			'L_UNBAN_TITLE'			=> $l_unban_title,
-			'L_UNBAN_EXPLAIN'		=> $l_unban_explain,
-			'L_BAN_CELL'			=> $l_ban_cell,
-			'L_BAN_EXCLUDE_EXPLAIN'	=> $l_ban_exclude_explain,
-			'L_NO_BAN_CELL'			=> $l_no_ban_cell,
-
-			'S_USERNAME_BAN'	=> ($mode == 'user') ? true : false,
-
-			'U_ACTION'			=> $this->u_action,
-			'U_FIND_USERNAME'	=> append_sid('memberlist', 'mode=searchuser&amp;form=mcp_ban&amp;field=ban'),
-		));
-
-		if ($mode === 'email' && !phpbb::$acl->acl_get('a_user'))
-		{
-			return;
-		}
-
-		// As a "service" we will check if any post id is specified and populate the username of the poster id if given
-		$post_id = request_var('p', 0);
-		$user_id = request_var('u', 0);
-		$username = $pre_fill = false;
-
-		if ($user_id && $user_id <> ANONYMOUS)
-		{
-			$sql = 'SELECT username, user_email, user_ip
-				FROM ' . USERS_TABLE . '
-				WHERE user_id = ' . $user_id;
-			$result = phpbb::$db->sql_query($sql);
-			switch ($mode)
-			{
-				case 'user':
-					$pre_fill = (string) phpbb::$db->sql_fetchfield('username');
-				break;
-
-				case 'ip':
-					$pre_fill = (string) phpbb::$db->sql_fetchfield('user_ip');
-				break;
-
-				case 'email':
-					$pre_fill = (string) phpbb::$db->sql_fetchfield('user_email');
-				break;
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-		else if ($post_id)
-		{
-			$post_info = get_post_data($post_id, 'm_ban');
-
-			if (sizeof($post_info) && !empty($post_info[$post_id]))
-			{
-				switch ($mode)
-				{
-					case 'user':
-						$pre_fill = $post_info[$post_id]['username'];
-					break;
-
-					case 'ip':
-						$pre_fill = $post_info[$post_id]['poster_ip'];
-					break;
-
-					case 'email':
-						$pre_fill = $post_info[$post_id]['user_email'];
-					break;
-				}
-
-			}
-		}
-
-		if ($pre_fill)
-		{
-			phpbb::$template->assign_var('BAN_QUANTIFIER', $pre_fill);
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/mcp/mcp_forum.php b/phpBB/modules/mcp/mcp_forum.php
deleted file mode 100644
index e09ed93923..0000000000
--- a/phpBB/modules/mcp/mcp_forum.php
+++ /dev/null
@@ -1,445 +0,0 @@
-<?php
-/**
-*
-* @package mcp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* MCP Forum View
-*/
-function mcp_forum_view($id, $mode, $action, $forum_info)
-{
-	global $module;
-
-	phpbb::$user->add_lang(array('viewtopic', 'viewforum'));
-
-	include_once(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-
-	// merge_topic is the quickmod action, merge_topics is the mcp_forum action, and merge_select is the mcp_topic action
-	$merge_select = ($action == 'merge_select' || $action == 'merge_topic' || $action == 'merge_topics') ? true : false;
-
-	if ($merge_select)
-	{
-		// Fixes a "bug" that makes forum_view use the same ordering as topic_view
-		phpbb_request::overwrite('sk', null, phpbb_request::POST);
-		phpbb_request::overwrite('sd', null, phpbb_request::POST);
-		phpbb_request::overwrite('sk', null, phpbb_request::REQUEST);
-		phpbb_request::overwrite('sd', null, phpbb_request::REQUEST);
-	}
-
-	$forum_id			= $forum_info['forum_id'];
-	$start				= request_var('start', 0);
-	$topic_id_list		= request_var('topic_id_list', array(0));
-	$post_id_list		= request_var('post_id_list', array(0));
-	$source_topic_ids	= array(request_var('t', 0));
-	$to_topic_id		= request_var('to_topic_id', 0);
-
-	$url_extra = '';
-	$url_extra .= ($forum_id) ? "&amp;f=$forum_id" : '';
-	$url_extra .= ($GLOBALS['topic_id']) ? '&amp;t=' . $GLOBALS['topic_id'] : '';
-	$url_extra .= ($GLOBALS['post_id']) ? '&amp;p=' . $GLOBALS['post_id'] : '';
-	$url_extra .= ($GLOBALS['user_id']) ? '&amp;u=' . $GLOBALS['user_id'] : '';
-
-	$url = ($url_extra) ? append_sid('mcp', $url_extra) : append_sid('mcp');
-
-	// Resync Topics
-	switch ($action)
-	{
-		case 'resync':
-			$topic_ids = request_var('topic_id_list', array(0));
-			mcp_resync_topics($topic_ids);
-		break;
-
-		case 'merge_topics':
-			$source_topic_ids = $topic_id_list;
-		case 'merge_topic':
-			if ($to_topic_id)
-			{
-				merge_topics($forum_id, $source_topic_ids, $to_topic_id);
-			}
-		break;
-	}
-
-	$selected_ids = '';
-	if (sizeof($post_id_list) && $action != 'merge_topics')
-	{
-		foreach ($post_id_list as $num => $post_id)
-		{
-			$selected_ids .= '&amp;post_id_list[' . $num . ']=' . $post_id;
-		}
-	}
-	else if (sizeof($topic_id_list) && $action == 'merge_topics')
-	{
-		foreach ($topic_id_list as $num => $topic_id)
-		{
-			$selected_ids .= '&amp;topic_id_list[' . $num . ']=' . $topic_id;
-		}
-	}
-
-	make_jumpbox($url . "&amp;i=$id&amp;action=$action&amp;mode=$mode" . (($merge_select) ? $selected_ids : ''), $forum_id, false, 'm_', true);
-
-	$topics_per_page = ($forum_info['forum_topics_per_page']) ? $forum_info['forum_topics_per_page'] : phpbb::$config['topics_per_page'];
-
-	$sort_days = $total = 0;
-	$sort_key = $sort_dir = '';
-	$sort_by_sql = $sort_order_sql = array();
-	mcp_sorting('viewforum', $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id);
-
-	$forum_topics = ($total == -1) ? $forum_info['forum_topics'] : $total;
-	$limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : '';
-
-	phpbb::$template->assign_vars(array(
-		'ACTION'				=> $action,
-		'FORUM_NAME'			=> $forum_info['forum_name'],
-		'FORUM_DESCRIPTION'		=> generate_text_for_display($forum_info['forum_desc'], $forum_info['forum_desc_uid'], $forum_info['forum_desc_bitfield'], $forum_info['forum_desc_options']),
-
-		'REPORTED_IMG'			=> phpbb::$user->img('icon_topic_reported', 'TOPIC_REPORTED'),
-		'UNAPPROVED_IMG'		=> phpbb::$user->img('icon_topic_unapproved', 'TOPIC_UNAPPROVED'),
-		'LAST_POST_IMG'			=> phpbb::$user->img('icon_topic_latest', 'VIEW_LATEST_POST'),
-		'NEWEST_POST_IMG'		=> phpbb::$user->img('icon_topic_newest', 'VIEW_NEWEST_POST'),
-
-		'S_CAN_REPORT'			=> phpbb::$acl->acl_get('m_report', $forum_id),
-		'S_CAN_DELETE'			=> phpbb::$acl->acl_get('m_delete', $forum_id),
-		'S_CAN_MERGE'			=> phpbb::$acl->acl_get('m_merge', $forum_id),
-		'S_CAN_MOVE'			=> phpbb::$acl->acl_get('m_move', $forum_id),
-		'S_CAN_FORK'			=> phpbb::$acl->acl_get('m_', $forum_id),
-		'S_CAN_LOCK'			=> phpbb::$acl->acl_get('m_lock', $forum_id),
-		'S_CAN_SYNC'			=> phpbb::$acl->acl_get('m_', $forum_id),
-		'S_CAN_APPROVE'			=> phpbb::$acl->acl_get('m_approve', $forum_id),
-		'S_MERGE_SELECT'		=> ($merge_select) ? true : false,
-		'S_CAN_MAKE_NORMAL'		=> phpbb::$acl->acl_gets('f_sticky', 'f_announce', $forum_id),
-		'S_CAN_MAKE_STICKY'		=> phpbb::$acl->acl_get('f_sticky', $forum_id),
-		'S_CAN_MAKE_ANNOUNCE'	=> phpbb::$acl->acl_get('f_announce', $forum_id),
-
-		'U_VIEW_FORUM'			=> append_sid('viewforum', 'f=' . $forum_id),
-		'U_VIEW_FORUM_LOGS'		=> (phpbb::$acl->acl_gets('a_', 'm_', $forum_id) && $module->loaded('logs')) ? append_sid('mcp', 'i=logs&amp;mode=forum_logs&amp;f=' . $forum_id) : '',
-
-		'S_MCP_ACTION'			=> $url . "&amp;i=$id&amp;forum_action=$action&amp;mode=$mode&amp;start=$start" . (($merge_select) ? $selected_ids : ''),
-
-		'PAGINATION'			=> generate_pagination($url . "&amp;i=$id&amp;action=$action&amp;mode=$mode&amp;sd=$sort_dir&amp;sk=$sort_key&amp;st=$sort_days" . (($merge_select) ? $selected_ids : ''), $forum_topics, $topics_per_page, $start),
-		'PAGE_NUMBER'			=> on_page($forum_topics, $topics_per_page, $start),
-		'TOTAL_TOPICS'			=> ($forum_topics == 1) ? phpbb::$user->lang['VIEW_FORUM_TOPIC'] : sprintf(phpbb::$user->lang['VIEW_FORUM_TOPICS'], $forum_topics),
-	));
-
-	// Grab icons
-	$icons = phpbb_cache::obtain_icons();
-
-	$topic_rows = array();
-
-	if (phpbb::$config['load_db_lastread'])
-	{
-		$read_tracking_join = ' LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.topic_id = t.topic_id AND tt.user_id = ' . phpbb::$user->data['user_id'] . ')';
-		$read_tracking_select = ', tt.mark_time';
-	}
-	else
-	{
-		$read_tracking_join = $read_tracking_select = '';
-	}
-
-	$sql = "SELECT t.topic_id
-		FROM " . TOPICS_TABLE . " t
-		WHERE t.forum_id IN($forum_id, 0)
-			" . ((phpbb::$acl->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1') . "
-			$limit_time_sql
-		ORDER BY t.topic_type DESC, $sort_order_sql";
-	$result = phpbb::$db->sql_query_limit($sql, $topics_per_page, $start);
-
-	$topic_list = $topic_tracking_info = array();
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$topic_list[] = $row['topic_id'];
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	$sql = "SELECT t.*$read_tracking_select
-		FROM " . TOPICS_TABLE . " t $read_tracking_join
-		WHERE " . phpbb::$db->sql_in_set('t.topic_id', $topic_list, false, true);
-
-	$result = phpbb::$db->sql_query($sql);
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$topic_rows[$row['topic_id']] = $row;
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	// If there is more than one page, but we have no topic list, then the start parameter is... erm... out of sync
-	if (!sizeof($topic_list) && $forum_topics && $start > 0)
-	{
-		redirect($url . "&amp;i=$id&amp;action=$action&amp;mode=$mode");
-	}
-
-	// Get topic tracking info
-	if (sizeof($topic_list))
-	{
-		if (phpbb::$config['load_db_lastread'])
-		{
-			$topic_tracking_info = get_topic_tracking($forum_id, $topic_list, $topic_rows, array($forum_id => $forum_info['mark_time']), array());
-		}
-		else
-		{
-			$topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_list, array());
-		}
-	}
-
-	foreach ($topic_list as $topic_id)
-	{
-		$topic_title = '';
-
-		$row = &$topic_rows[$topic_id];
-
-		$replies = (phpbb::$acl->acl_get('m_approve', $forum_id)) ? $row['topic_replies_real'] : $row['topic_replies'];
-
-		if ($row['topic_status'] == ITEM_MOVED)
-		{
-			$unread_topic = false;
-		}
-		else
-		{
-			$unread_topic = (isset($topic_tracking_info[$topic_id]) && $row['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false;
-		}
-
-		// Get folder img, topic status/type related information
-		$folder_img = $folder_alt = $topic_type = '';
-		topic_status($row, $replies, $unread_topic, $folder_img, $folder_alt, $topic_type);
-
-		$topic_title = censor_text($row['topic_title']);
-
-		$topic_unapproved = (!$row['topic_approved'] && phpbb::$acl->acl_get('m_approve', $row['forum_id'])) ? true : false;
-		$posts_unapproved = ($row['topic_approved'] && $row['topic_replies'] < $row['topic_replies_real'] && phpbb::$acl->acl_get('m_approve', $row['forum_id'])) ? true : false;
-		$u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? $url . '&amp;i=queue&amp;mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . '&amp;t=' . $row['topic_id'] : '';
-
-		$topic_row = array(
-			'ATTACH_ICON_IMG'		=> (phpbb::$acl->acl_get('u_download') && phpbb::$acl->acl_get('f_download', $row['forum_id']) && $row['topic_attachment']) ? phpbb::$user->img('icon_topic_attach', 'TOTAL_ATTACHMENTS') : '',
-			'TOPIC_FOLDER_IMG'		=> phpbb::$user->img($folder_img, $folder_alt),
-			'TOPIC_FOLDER_IMG_SRC'	=> phpbb::$user->img($folder_img, $folder_alt, 'src'),
-			'TOPIC_ICON_IMG'		=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['img'] : '',
-			'TOPIC_ICON_IMG_WIDTH'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '',
-			'TOPIC_ICON_IMG_HEIGHT'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['height'] : '',
-			'UNAPPROVED_IMG'		=> ($topic_unapproved || $posts_unapproved) ? phpbb::$user->img('icon_topic_unapproved', ($topic_unapproved) ? 'TOPIC_UNAPPROVED' : 'POSTS_UNAPPROVED') : '',
-
-			'TOPIC_AUTHOR'				=> get_username_string('username', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
-			'TOPIC_AUTHOR_COLOUR'		=> get_username_string('colour', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
-			'TOPIC_AUTHOR_FULL'			=> get_username_string('full', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
-			'U_TOPIC_AUTHOR'			=> get_username_string('profile', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
-
-			'LAST_POST_AUTHOR'			=> get_username_string('username', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
-			'LAST_POST_AUTHOR_COLOUR'	=> get_username_string('colour', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
-			'LAST_POST_AUTHOR_FULL'		=> get_username_string('full', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
-			'U_LAST_POST_AUTHOR'		=> get_username_string('profile', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
-
-			'TOPIC_TYPE'		=> $topic_type,
-			'TOPIC_TITLE'		=> $topic_title,
-			'REPLIES'			=> (phpbb::$acl->acl_get('m_approve', $row['forum_id'])) ? $row['topic_replies_real'] : $row['topic_replies'],
-			'LAST_POST_TIME'	=> phpbb::$user->format_date($row['topic_last_post_time']),
-			'FIRST_POST_TIME'	=> phpbb::$user->format_date($row['topic_time']),
-			'LAST_POST_SUBJECT'	=> $row['topic_last_post_subject'],
-			'LAST_VIEW_TIME'	=> phpbb::$user->format_date($row['topic_last_view_time']),
-
-			'S_TOPIC_REPORTED'		=> (!empty($row['topic_reported']) && empty($row['topic_moved_id']) && phpbb::$acl->acl_get('m_report', $row['forum_id'])) ? true : false,
-			'S_TOPIC_UNAPPROVED'	=> $topic_unapproved,
-			'S_POSTS_UNAPPROVED'	=> $posts_unapproved,
-			'S_UNREAD_TOPIC'		=> $unread_topic,
-		);
-
-		if ($row['topic_status'] == ITEM_MOVED)
-		{
-			$topic_row = array_merge($topic_row, array(
-				'U_VIEW_TOPIC'		=> append_sid('viewtopic', "t={$row['topic_moved_id']}"),
-				'U_DELETE_TOPIC'	=> (phpbb::$acl->acl_get('m_delete', $forum_id)) ? append_sid('mcp', "i=$id&amp;f=$forum_id&amp;topic_id_list[]={$row['topic_id']}&amp;mode=forum_view&amp;action=delete_topic") : '',
-				'S_MOVED_TOPIC'		=> true,
-				'TOPIC_ID'			=> $row['topic_moved_id'],
-			));
-		}
-		else
-		{
-			if ($action == 'merge_topic' || $action == 'merge_topics')
-			{
-				$u_select_topic = $url . "&amp;i=$id&amp;mode=forum_view&amp;action=$action&amp;to_topic_id=" . $row['topic_id'] . $selected_ids;
-			}
-			else
-			{
-				$u_select_topic = $url . "&amp;i=$id&amp;mode=topic_view&amp;action=merge&amp;to_topic_id=" . $row['topic_id'] . $selected_ids;
-			}
-			$topic_row = array_merge($topic_row, array(
-				'U_VIEW_TOPIC'		=> append_sid('mcp', "i=$id&amp;f=$forum_id&amp;t={$row['topic_id']}&amp;mode=topic_view"),
-
-				'S_SELECT_TOPIC'	=> ($merge_select && !in_array($row['topic_id'], $source_topic_ids)) ? true : false,
-				'U_SELECT_TOPIC'	=> $u_select_topic,
-				'U_MCP_QUEUE'		=> $u_mcp_queue,
-				'U_MCP_REPORT'		=> (phpbb::$acl->acl_get('m_report', $forum_id)) ? append_sid('mcp', 'i=main&amp;mode=topic_view&amp;t=' . $row['topic_id'] . '&amp;action=reports') : '',
-				'TOPIC_ID'			=> $row['topic_id'],
-				'S_TOPIC_CHECKED'	=> ($topic_id_list && in_array($row['topic_id'], $topic_id_list)) ? true : false,
-			));
-		}
-
-		phpbb::$template->assign_block_vars('topicrow', $topic_row);
-	}
-	unset($topic_rows);
-}
-
-/**
-* Resync topics
-*/
-function mcp_resync_topics($topic_ids)
-{
-	if (!sizeof($topic_ids))
-	{
-		trigger_error('NO_TOPIC_SELECTED');
-	}
-
-	if (!check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_')))
-	{
-		return;
-	}
-
-	// Sync everything and perform extra checks separately
-	sync('topic_reported', 'topic_id', $topic_ids, false, true);
-	sync('topic_attachment', 'topic_id', $topic_ids, false, true);
-	sync('topic', 'topic_id', $topic_ids, true, false);
-
-	$sql = 'SELECT topic_id, forum_id, topic_title
-		FROM ' . TOPICS_TABLE . '
-		WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_ids);
-	$result = phpbb::$db->sql_query($sql);
-
-	// Log this action
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		add_log('mod', $row['forum_id'], $row['topic_id'], 'LOG_TOPIC_RESYNC', $row['topic_title']);
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	$msg = (sizeof($topic_ids) == 1) ? phpbb::$user->lang['TOPIC_RESYNC_SUCCESS'] : phpbb::$user->lang['TOPICS_RESYNC_SUCCESS'];
-
-	$redirect = request_var('redirect', phpbb::$user->data['session_page']);
-
-	meta_refresh(3, $redirect);
-	trigger_error($msg . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
-
-	return;
-}
-
-/**
-* Merge selected topics into selected topic
-*/
-function merge_topics($forum_id, $topic_ids, $to_topic_id)
-{
-	if (!sizeof($topic_ids))
-	{
-		phpbb::$template->assign_var('MESSAGE', phpbb::$user->lang['NO_TOPIC_SELECTED']);
-		return;
-	}
-	if (!$to_topic_id)
-	{
-		phpbb::$template->assign_var('MESSAGE', phpbb::$user->lang['NO_FINAL_TOPIC_SELECTED']);
-		return;
-	}
-
-	$topic_data = get_topic_data(array($to_topic_id), 'm_merge');
-
-	if (!sizeof($topic_data))
-	{
-		phpbb::$template->assign_var('MESSAGE', phpbb::$user->lang['NO_FINAL_TOPIC_SELECTED']);
-		return;
-	}
-
-	$topic_data = $topic_data[$to_topic_id];
-
-	$post_id_list	= request_var('post_id_list', array(0));
-	$start			= request_var('start', 0);
-
-	if (!sizeof($post_id_list) && sizeof($topic_ids))
-	{
-		$sql = 'SELECT post_id
-			FROM ' . POSTS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_ids);
-		$result = phpbb::$db->sql_query($sql);
-
-		$post_id_list = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$post_id_list[] = $row['post_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	if (!sizeof($post_id_list))
-	{
-		phpbb::$template->assign_var('MESSAGE', phpbb::$user->lang['NO_POST_SELECTED']);
-		return;
-	}
-
-	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_merge')))
-	{
-		return;
-	}
-
-	$redirect = request_var('redirect', build_url(array('quickmod')));
-
-	$s_hidden_fields = build_hidden_fields(array(
-		'i'				=> 'main',
-		'f'				=> $forum_id,
-		'post_id_list'	=> $post_id_list,
-		'to_topic_id'	=> $to_topic_id,
-		'mode'			=> 'forum_view',
-		'action'		=> 'merge_topics',
-		'start'			=> $start,
-		'redirect'		=> $redirect,
-		'topic_id_list'	=> $topic_ids)
-	);
-	$success_msg = $return_link = '';
-
-	if (confirm_box(true))
-	{
-		$to_forum_id = $topic_data['forum_id'];
-
-		move_posts($post_id_list, $to_topic_id);
-		add_log('mod', $to_forum_id, $to_topic_id, 'LOG_MERGE', $topic_data['topic_title']);
-
-		// Message and return links
-		$success_msg = 'POSTS_MERGED_SUCCESS';
-
-		// If the topic no longer exist, we will update the topic watch table.
-		// To not let it error out on users watching both topics, we just return on an error...
-		phpbb::$db->sql_return_on_error(true);
-		phpbb::$db->sql_query('UPDATE ' . TOPICS_WATCH_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_ids));
-		phpbb::$db->sql_return_on_error(false);
-
-		phpbb::$db->sql_query('DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_ids));
-
-		// Link to the new topic
-		$return_link .= (($return_link) ? '<br /><br />' : '') . sprintf(phpbb::$user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid('viewtopic', 'f=' . $to_forum_id . '&amp;t=' . $to_topic_id) . '">', '</a>');
-	}
-	else
-	{
-		confirm_box(false, 'MERGE_TOPICS', $s_hidden_fields);
-	}
-
-	$redirect = request_var('redirect', 'index.' . PHP_EXT);
-	$redirect = reapply_sid($redirect);
-
-	if (!$success_msg)
-	{
-		return;
-	}
-	else
-	{
-		meta_refresh(3, append_sid('viewtopic', "f=$to_forum_id&amp;t=$to_topic_id"));
-		trigger_error(phpbb::$user->lang[$success_msg] . '<br /><br />' . $return_link);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/mcp/mcp_front.php b/phpBB/modules/mcp/mcp_front.php
deleted file mode 100644
index 65177792ae..0000000000
--- a/phpBB/modules/mcp/mcp_front.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-/**
-*
-* @package mcp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* MCP Front Panel
-*/
-function mcp_front_view($id, $mode, $action)
-{
-	global $module;
-
-	// Latest 5 unapproved
-	if ($module->loaded('queue'))
-	{
-		$forum_list = array_values(array_intersect(get_forum_list('f_read'), get_forum_list('m_approve')));
-		$post_list = array();
-		$forum_names = array();
-
-		$forum_id = request_var('f', 0);
-
-		phpbb::$template->assign_var('S_SHOW_UNAPPROVED', (!empty($forum_list)) ? true : false);
-
-		if (!empty($forum_list))
-		{
-			$sql = 'SELECT COUNT(post_id) AS total
-				FROM ' . POSTS_TABLE . '
-				WHERE forum_id IN (0, ' . implode(', ', $forum_list) . ')
-					AND post_approved = 0';
-			$result = phpbb::$db->sql_query($sql);
-			$total = (int) phpbb::$db->sql_fetchfield('total');
-			phpbb::$db->sql_freeresult($result);
-
-			if ($total)
-			{
-				$global_id = $forum_list[0];
-
-				$sql = 'SELECT forum_id, forum_name
-					FROM ' . FORUMS_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('forum_id', $forum_list);
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$forum_names[$row['forum_id']] = $row['forum_name'];
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				$sql = 'SELECT post_id
-					FROM ' . POSTS_TABLE . '
-					WHERE forum_id IN (0, ' . implode(', ', $forum_list) . ')
-						AND post_approved = 0
-					ORDER BY post_time DESC';
-				$result = phpbb::$db->sql_query_limit($sql, 5);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$post_list[] = $row['post_id'];
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				if (empty($post_list))
-				{
-					$total = 0;
-				}
-			}
-
-			if ($total)
-			{
-				$sql = 'SELECT p.post_id, p.post_subject, p.post_time, p.poster_id, p.post_username, u.username, u.username_clean, u.user_colour, t.topic_id, t.topic_title, t.topic_first_post_id, p.forum_id
-					FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . USERS_TABLE . ' u
-					WHERE ' . phpbb::$db->sql_in_set('p.post_id', $post_list) . '
-						AND t.topic_id = p.topic_id
-						AND p.poster_id = u.user_id
-					ORDER BY p.post_time DESC';
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$global_topic = ($row['forum_id']) ? false : true;
-					if ($global_topic)
-					{
-						$row['forum_id'] = $global_id;
-					}
-
-					phpbb::$template->assign_block_vars('unapproved', array(
-						'U_POST_DETAILS'	=> append_sid('mcp', 'i=queue&amp;mode=approve_details&amp;f=' . $row['forum_id'] . '&amp;p=' . $row['post_id']),
-						'U_MCP_FORUM'		=> (!$global_topic) ? append_sid('mcp', 'i=main&amp;mode=forum_view&amp;f=' . $row['forum_id']) : '',
-						'U_MCP_TOPIC'		=> append_sid('mcp', 'i=main&amp;mode=topic_view&amp;f=' . $row['forum_id'] . '&amp;t=' . $row['topic_id']),
-						'U_FORUM'			=> (!$global_topic) ? append_sid('viewforum', 'f=' . $row['forum_id']) : '',
-						'U_TOPIC'			=> append_sid('viewtopic', 'f=' . $row['forum_id'] . '&amp;t=' . $row['topic_id']),
-
-						'AUTHOR_FULL'		=> get_username_string('full', $row['poster_id'], $row['username'], $row['user_colour']),
-						'AUTHOR'			=> get_username_string('username', $row['poster_id'], $row['username'], $row['user_colour']),
-						'AUTHOR_COLOUR'		=> get_username_string('colour', $row['poster_id'], $row['username'], $row['user_colour']),
-						'U_AUTHOR'			=> get_username_string('profile', $row['poster_id'], $row['username'], $row['user_colour']),
-
-						'FORUM_NAME'	=> (!$global_topic) ? $forum_names[$row['forum_id']] : phpbb::$user->lang['GLOBAL_ANNOUNCEMENT'],
-						'POST_ID'		=> $row['post_id'],
-						'TOPIC_TITLE'	=> $row['topic_title'],
-						'SUBJECT'		=> ($row['post_subject']) ? $row['post_subject'] : phpbb::$user->lang['NO_SUBJECT'],
-						'POST_TIME'		=> phpbb::$user->format_date($row['post_time']),
-					));
-				}
-				phpbb::$db->sql_freeresult($result);
-			}
-
-			phpbb::$template->assign_vars(array(
-				'S_MCP_QUEUE_ACTION'	=> append_sid('mcp', 'i=queue'),
-			));
-
-			if ($total == 0)
-			{
-				phpbb::$template->assign_vars(array(
-					'L_UNAPPROVED_TOTAL'		=> phpbb::$user->lang['UNAPPROVED_POSTS_ZERO_TOTAL'],
-					'S_HAS_UNAPPROVED_POSTS'	=> false,
-				));
-			}
-			else
-			{
-				phpbb::$template->assign_vars(array(
-					'L_UNAPPROVED_TOTAL'		=> ($total == 1) ? phpbb::$user->lang['UNAPPROVED_POST_TOTAL'] : sprintf(phpbb::$user->lang['UNAPPROVED_POSTS_TOTAL'], $total),
-					'S_HAS_UNAPPROVED_POSTS'	=> true,
-				));
-			}
-		}
-	}
-
-	// Latest 5 reported
-	if ($module->loaded('reports'))
-	{
-		$forum_list = array_values(array_intersect(get_forum_list('f_read'), get_forum_list('m_report')));
-
-		phpbb::$template->assign_var('S_SHOW_REPORTS', (!empty($forum_list)) ? true : false);
-
-		if (!empty($forum_list))
-		{
-			$sql = 'SELECT COUNT(r.report_id) AS total
-				FROM ' . REPORTS_TABLE . ' r, ' . POSTS_TABLE . ' p
-				WHERE r.post_id = p.post_id
-					AND r.report_closed = 0
-					AND p.forum_id IN (0, ' . implode(', ', $forum_list) . ')';
-			$result = phpbb::$db->sql_query($sql);
-			$total = (int) phpbb::$db->sql_fetchfield('total');
-			phpbb::$db->sql_freeresult($result);
-
-			if ($total)
-			{
-				$global_id = $forum_list[0];
-
-				$sql = phpbb::$db->sql_build_query('SELECT', array(
-					'SELECT'	=> 'r.report_time, p.post_id, p.post_subject, p.post_time, u.username, u.username_clean, u.user_colour, u.user_id, u2.username as author_name, u2.username_clean as author_name_clean, u2.user_colour as author_colour, u2.user_id as author_id, t.topic_id, t.topic_title, f.forum_id, f.forum_name',
-
-					'FROM'		=> array(
-						REPORTS_TABLE			=> 'r',
-						REPORTS_REASONS_TABLE	=> 'rr',
-						TOPICS_TABLE			=> 't',
-						USERS_TABLE				=> array('u', 'u2'),
-						POSTS_TABLE				=> 'p'
-					),
-
-					'LEFT_JOIN'	=> array(
-						array(
-							'FROM'	=> array(FORUMS_TABLE => 'f'),
-							'ON'	=> 'f.forum_id = p.forum_id'
-						)
-					),
-
-					'WHERE'		=> 'r.post_id = p.post_id
-						AND r.report_closed = 0
-						AND r.reason_id = rr.reason_id
-						AND p.topic_id = t.topic_id
-						AND r.user_id = u.user_id
-						AND p.poster_id = u2.user_id
-						AND p.forum_id IN (0, ' . implode(', ', $forum_list) . ')',
-
-					'ORDER_BY'	=> 'p.post_time DESC'
-				));
-				$result = phpbb::$db->sql_query_limit($sql, 5);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$global_topic = ($row['forum_id']) ? false : true;
-					if ($global_topic)
-					{
-						$row['forum_id'] = $global_id;
-					}
-
-					phpbb::$template->assign_block_vars('report', array(
-						'U_POST_DETAILS'	=> append_sid('mcp', 'f=' . $row['forum_id'] . '&amp;p=' . $row['post_id'] . "&amp;i=reports&amp;mode=report_details"),
-						'U_MCP_FORUM'		=> (!$global_topic) ? append_sid('mcp', 'f=' . $row['forum_id'] . "&amp;i=$id&amp;mode=forum_view") : '',
-						'U_MCP_TOPIC'		=> append_sid('mcp', 'f=' . $row['forum_id'] . '&amp;t=' . $row['topic_id'] . "&amp;i=$id&amp;mode=topic_view"),
-						'U_FORUM'			=> (!$global_topic) ? append_sid('viewforum', 'f=' . $row['forum_id']) : '',
-						'U_TOPIC'			=> append_sid('viewtopic', 'f=' . $row['forum_id'] . '&amp;t=' . $row['topic_id']),
-
-						'REPORTER_FULL'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
-						'REPORTER'			=> get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']),
-						'REPORTER_COLOUR'	=> get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']),
-						'U_REPORTER'		=> get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']),
-
-						'AUTHOR_FULL'		=> get_username_string('full', $row['author_id'], $row['author_name'], $row['author_colour']),
-						'AUTHOR'			=> get_username_string('username', $row['author_id'], $row['author_name'], $row['author_colour']),
-						'AUTHOR_COLOUR'		=> get_username_string('colour', $row['author_id'], $row['author_name'], $row['author_colour']),
-						'U_AUTHOR'			=> get_username_string('profile', $row['author_id'], $row['author_name'], $row['author_colour']),
-
-						'FORUM_NAME'	=> (!$global_topic) ? $row['forum_name'] : phpbb::$user->lang['GLOBAL_ANNOUNCEMENT'],
-						'TOPIC_TITLE'	=> $row['topic_title'],
-						'SUBJECT'		=> ($row['post_subject']) ? $row['post_subject'] : phpbb::$user->lang['NO_SUBJECT'],
-						'REPORT_TIME'	=> phpbb::$user->format_date($row['report_time']),
-						'POST_TIME'		=> phpbb::$user->format_date($row['post_time']),
-					));
-				}
-			}
-
-			if ($total == 0)
-			{
-				phpbb::$template->assign_vars(array(
-					'L_REPORTS_TOTAL'	=>	phpbb::$user->lang['REPORTS_ZERO_TOTAL'],
-					'S_HAS_REPORTS'		=>	false,
-				));
-			}
-			else
-			{
-				phpbb::$template->assign_vars(array(
-					'L_REPORTS_TOTAL'	=> ($total == 1) ? phpbb::$user->lang['REPORT_TOTAL'] : sprintf(phpbb::$user->lang['REPORTS_TOTAL'], $total),
-					'S_HAS_REPORTS'		=> true,
-				));
-			}
-		}
-	}
-
-	// Latest 5 logs
-	if ($module->loaded('logs'))
-	{
-		$forum_list = array_values(array_intersect(get_forum_list('f_read'), get_forum_list('m_')));
-
-		if (!empty($forum_list))
-		{
-			// Add forum_id 0 for global announcements
-			$forum_list[] = 0;
-
-			$log_count = 0;
-			$log = array();
-			view_log('mod', $log, $log_count, 5, 0, $forum_list);
-
-			foreach ($log as $row)
-			{
-				phpbb::$template->assign_block_vars('log', array(
-					'USERNAME'		=> $row['username_full'],
-					'IP'			=> $row['ip'],
-					'TIME'			=> phpbb::$user->format_date($row['time']),
-					'ACTION'		=> $row['action'],
-					'U_VIEW_TOPIC'	=> (!empty($row['viewtopic'])) ? $row['viewtopic'] : '',
-					'U_VIEWLOGS'	=> (!empty($row['viewlogs'])) ? $row['viewlogs'] : '',
-				));
-			}
-		}
-
-		phpbb::$template->assign_vars(array(
-			'S_SHOW_LOGS'	=> (!empty($forum_list)) ? true : false,
-			'S_HAS_LOGS'	=> (!empty($log)) ? true : false,
-		));
-	}
-
-	phpbb::$template->assign_var('S_MCP_ACTION', append_sid('mcp'));
-	make_jumpbox(append_sid('mcp', 'i=main&amp;mode=forum_view'), 0, false, 'm_', true);
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/mcp/mcp_logs.php b/phpBB/modules/mcp/mcp_logs.php
deleted file mode 100644
index 9bfbef5c7b..0000000000
--- a/phpBB/modules/mcp/mcp_logs.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-/**
-*
-* @package mcp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* mcp_logs
-* Handling warning the users
-* @package mcp
-*/
-class mcp_logs
-{
-	var $u_action;
-	var $p_master;
-
-	function __construct(&$p_master)
-	{
-		$this->p_master = &$p_master;
-	}
-
-	function main($id, $mode)
-	{
-		phpbb::$user->add_lang('acp/common');
-
-		$action = request_var('action', array('' => ''));
-
-		if (is_array($action))
-		{
-			list($action, ) = each($action);
-		}
-		else
-		{
-			$action = request_var('action', '');
-		}
-
-		// Set up general vars
-		$start		= request_var('start', 0);
-		$deletemark = ($action == 'del_marked') ? true : false;
-		$deleteall	= ($action == 'del_all') ? true : false;
-		$marked		= request_var('mark', array(0));
-
-		// Sort keys
-		$sort_days	= request_var('st', 0);
-		$sort_key	= request_var('sk', 't');
-		$sort_dir	= request_var('sd', 'd');
-
-		$this->tpl_name = 'mcp_logs';
-		$this->page_title = 'MCP_LOGS';
-
-		$forum_list = array_values(array_intersect(get_forum_list('f_read'), get_forum_list('m_')));
-		$forum_list[] = 0;
-
-		$forum_id = $topic_id = 0;
-
-		switch ($mode)
-		{
-			case 'front':
-			break;
-
-			case 'forum_logs':
-				$forum_id = request_var('f', 0);
-
-				if (!in_array($forum_id, $forum_list))
-				{
-					trigger_error('NOT_AUTHORISED');
-				}
-
-				$forum_list = array($forum_id);
-			break;
-
-			case 'topic_logs':
-				$topic_id = request_var('t', 0);
-
-				$sql = 'SELECT forum_id
-					FROM ' . TOPICS_TABLE . '
-					WHERE topic_id = ' . $topic_id;
-				$result = phpbb::$db->sql_query($sql);
-				$forum_id = (int) phpbb::$db->sql_fetchfield('forum_id');
-				phpbb::$db->sql_freeresult($result);
-
-				if (!in_array($forum_id, $forum_list))
-				{
-					trigger_error('NOT_AUTHORISED');
-				}
-
-				$forum_list = array($forum_id);
-			break;
-		}
-
-		// Delete entries if requested and able
-		if (($deletemark || $deleteall) && phpbb::$acl->acl_get('a_clearlogs'))
-		{
-			if (confirm_box(true))
-			{
-				if ($deletemark && sizeof($marked))
-				{
-					$sql = 'DELETE FROM ' . LOG_TABLE . '
-						WHERE log_type = ' . LOG_MOD . '
-							AND ' . phpbb::$db->sql_in_set('forum_id', $forum_list) . '
-							AND ' . phpbb::$db->sql_in_set('log_id', $marked);
-					phpbb::$db->sql_query($sql);
-
-					add_log('admin', 'LOG_CLEAR_MOD');
-				}
-				else if ($deleteall)
-				{
-					$sql = 'DELETE FROM ' . LOG_TABLE . '
-						WHERE log_type = ' . LOG_MOD . '
-							AND ' . phpbb::$db->sql_in_set('forum_id', $forum_list);
-
-					if ($mode == 'topic_logs')
-					{
-						$sql .= ' AND topic_id = ' . $topic_id;
-					}
-					phpbb::$db->sql_query($sql);
-
-					add_log('admin', 'LOG_CLEAR_MOD');
-				}
-			}
-			else
-			{
-				confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-					'f'			=> $forum_id,
-					't'			=> $topic_id,
-					'start'		=> $start,
-					'delmarked'	=> $deletemark,
-					'delall'	=> $deleteall,
-					'mark'		=> $marked,
-					'st'		=> $sort_days,
-					'sk'		=> $sort_key,
-					'sd'		=> $sort_dir,
-					'i'			=> $id,
-					'mode'		=> $mode,
-					'action'	=> request_var('action', array('' => ''))))
-				);
-			}
-		}
-
-		// Sorting
-		$limit_days = array(0 => phpbb::$user->lang['ALL_ENTRIES'], 1 => phpbb::$user->lang['1_DAY'], 7 => phpbb::$user->lang['7_DAYS'], 14 => phpbb::$user->lang['2_WEEKS'], 30 => phpbb::$user->lang['1_MONTH'], 90 => phpbb::$user->lang['3_MONTHS'], 180 => phpbb::$user->lang['6_MONTHS'], 365 => phpbb::$user->lang['1_YEAR']);
-		$sort_by_text = array('u' => phpbb::$user->lang['SORT_USERNAME'], 't' => phpbb::$user->lang['SORT_DATE'], 'i' => phpbb::$user->lang['SORT_IP'], 'o' => phpbb::$user->lang['SORT_ACTION']);
-		$sort_by_sql = array('u' => 'u.username_clean', 't' => 'l.log_time', 'i' => 'l.log_ip', 'o' => 'l.log_operation');
-
-		$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
-		gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
-
-		// Define where and sort sql for use in displaying logs
-		$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
-		$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
-
-		// Grab log data
-		$log_data = array();
-		$log_count = 0;
-		view_log('mod', $log_data, $log_count, phpbb::$config['topics_per_page'], $start, $forum_list, $topic_id, 0, $sql_where, $sql_sort);
-
-		phpbb::$template->assign_vars(array(
-			'PAGE_NUMBER'		=> on_page($log_count, phpbb::$config['topics_per_page'], $start),
-			'TOTAL'				=> ($log_count == 1) ? phpbb::$user->lang['TOTAL_LOG'] : sprintf(phpbb::$user->lang['TOTAL_LOGS'], $log_count),
-			'PAGINATION'		=> generate_pagination($this->u_action . "&amp;$u_sort_param", $log_count, phpbb::$config['topics_per_page'], $start),
-
-			'L_TITLE'			=> phpbb::$user->lang['MCP_LOGS'],
-
-			'U_POST_ACTION'			=> $this->u_action,
-			'S_CLEAR_ALLOWED'		=> (phpbb::$acl->acl_get('a_clearlogs')) ? true : false,
-			'S_SELECT_SORT_DIR'		=> $s_sort_dir,
-			'S_SELECT_SORT_KEY'		=> $s_sort_key,
-			'S_SELECT_SORT_DAYS'	=> $s_limit_days,
-			'S_LOGS'				=> ($log_count > 0),
-		));
-
-		foreach ($log_data as $row)
-		{
-			$data = array();
-
-			$checks = array('viewtopic', 'viewforum');
-			foreach ($checks as $check)
-			{
-				if (isset($row[$check]) && $row[$check])
-				{
-					$data[] = '<a href="' . $row[$check] . '">' . phpbb::$user->lang['LOGVIEW_' . strtoupper($check)] . '</a>';
-				}
-			}
-
-			phpbb::$template->assign_block_vars('log', array(
-				'USERNAME'		=> $row['username_full'],
-				'IP'			=> $row['ip'],
-				'DATE'			=> phpbb::$user->format_date($row['time']),
-				'ACTION'		=> $row['action'],
-				'DATA'			=> (sizeof($data)) ? implode(' | ', $data) : '',
-				'ID'			=> $row['id'],
-			));
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/mcp/mcp_main.php b/phpBB/modules/mcp/mcp_main.php
deleted file mode 100644
index b2b71722e2..0000000000
--- a/phpBB/modules/mcp/mcp_main.php
+++ /dev/null
@@ -1,1211 +0,0 @@
-<?php
-/**
-*
-* @package mcp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* mcp_main
-* Handling mcp actions
-* @package mcp
-*/
-class mcp_main
-{
-	var $p_master;
-	var $u_action;
-
-	function __construct(&$p_master)
-	{
-		$this->p_master = &$p_master;
-	}
-
-	function main($id, $mode)
-	{
-		global $action;
-
-		$quickmod = ($mode == 'quickmod') ? true : false;
-
-		switch ($action)
-		{
-			case 'lock':
-			case 'unlock':
-				$topic_ids = (!$quickmod) ? request_var('topic_id_list', array(0)) : array(request_var('t', 0));
-
-				if (!sizeof($topic_ids))
-				{
-					trigger_error('NO_TOPIC_SELECTED');
-				}
-
-				lock_unlock($action, $topic_ids);
-			break;
-
-			case 'lock_post':
-			case 'unlock_post':
-
-				$post_ids = (!$quickmod) ? request_var('post_id_list', array(0)) : array(request_var('p', 0));
-
-				if (!sizeof($post_ids))
-				{
-					trigger_error('NO_POST_SELECTED');
-				}
-
-				lock_unlock($action, $post_ids);
-			break;
-
-			case 'make_announce':
-			case 'make_sticky':
-			case 'make_global':
-			case 'make_normal':
-
-				$topic_ids = (!$quickmod) ? request_var('topic_id_list', array(0)) : array(request_var('t', 0));
-
-				if (!sizeof($topic_ids))
-				{
-					trigger_error('NO_TOPIC_SELECTED');
-				}
-
-				change_topic_type($action, $topic_ids);
-			break;
-
-			case 'move':
-				phpbb::$user->add_lang('viewtopic');
-
-				$topic_ids = (!$quickmod) ? request_var('topic_id_list', array(0)) : array(request_var('t', 0));
-
-				if (!sizeof($topic_ids))
-				{
-					trigger_error('NO_TOPIC_SELECTED');
-				}
-
-				mcp_move_topic($topic_ids);
-			break;
-
-			case 'fork':
-				phpbb::$user->add_lang('viewtopic');
-
-				$topic_ids = (!$quickmod) ? request_var('topic_id_list', array(0)) : array(request_var('t', 0));
-
-				if (!sizeof($topic_ids))
-				{
-					trigger_error('NO_TOPIC_SELECTED');
-				}
-
-				mcp_fork_topic($topic_ids);
-			break;
-
-			case 'delete_topic':
-				phpbb::$user->add_lang('viewtopic');
-
-				$topic_ids = (!$quickmod) ? request_var('topic_id_list', array(0)) : array(request_var('t', 0));
-
-				if (!sizeof($topic_ids))
-				{
-					trigger_error('NO_TOPIC_SELECTED');
-				}
-
-				mcp_delete_topic($topic_ids);
-			break;
-
-			case 'delete_post':
-				phpbb::$user->add_lang('posting');
-
-				$post_ids = (!$quickmod) ? request_var('post_id_list', array(0)) : array(request_var('p', 0));
-
-				if (!sizeof($post_ids))
-				{
-					trigger_error('NO_POST_SELECTED');
-				}
-
-				mcp_delete_post($post_ids);
-			break;
-		}
-
-		switch ($mode)
-		{
-			case 'front':
-				include(PHPBB_ROOT_PATH . 'includes/mcp/mcp_front.' . PHP_EXT);
-
-				phpbb::$user->add_lang('acp/common');
-
-				mcp_front_view($id, $mode, $action);
-
-				$this->tpl_name = 'mcp_front';
-				$this->page_title = 'MCP_MAIN';
-			break;
-
-			case 'forum_view':
-				include(PHPBB_ROOT_PATH . 'includes/mcp/mcp_forum.' . PHP_EXT);
-
-				phpbb::$user->add_lang('viewforum');
-
-				$forum_id = request_var('f', 0);
-
-				$forum_info = get_forum_data($forum_id, 'm_', true);
-
-				if (!sizeof($forum_info))
-				{
-					$this->main('main', 'front');
-					return;
-				}
-
-				$forum_info = $forum_info[$forum_id];
-
-				mcp_forum_view($id, $mode, $action, $forum_info);
-
-				$this->tpl_name = 'mcp_forum';
-				$this->page_title = 'MCP_MAIN_FORUM_VIEW';
-			break;
-
-			case 'topic_view':
-				include(PHPBB_ROOT_PATH . 'includes/mcp/mcp_topic.' . PHP_EXT);
-
-				mcp_topic_view($id, $mode, $action);
-
-				$this->tpl_name = 'mcp_topic';
-				$this->page_title = 'MCP_MAIN_TOPIC_VIEW';
-			break;
-
-			case 'post_details':
-				include(PHPBB_ROOT_PATH . 'includes/mcp/mcp_post.' . PHP_EXT);
-
-				mcp_post_details($id, $mode, $action);
-
-				$this->tpl_name = ($action == 'whois') ? 'mcp_whois' : 'mcp_post';
-				$this->page_title = 'MCP_MAIN_POST_DETAILS';
-			break;
-
-			default:
-				trigger_error('NO_MODE', E_USER_ERROR);
-			break;
-		}
-	}
-}
-
-/**
-* Lock/Unlock Topic/Post
-*/
-function lock_unlock($action, $ids)
-{
-	if ($action == 'lock' || $action == 'unlock')
-	{
-		$table = TOPICS_TABLE;
-		$sql_id = 'topic_id';
-		$set_id = 'topic_status';
-		$l_prefix = 'TOPIC';
-	}
-	else
-	{
-		$table = POSTS_TABLE;
-		$sql_id = 'post_id';
-		$set_id = 'post_edit_locked';
-		$l_prefix = 'POST';
-	}
-
-	$orig_ids = $ids;
-
-	if (!check_ids($ids, $table, $sql_id, array('m_lock')))
-	{
-		// Make sure that for f_user_lock only the lock action is triggered.
-		if ($action != 'lock')
-		{
-			return;
-		}
-
-		$ids = $orig_ids;
-
-		if (!check_ids($ids, $table, $sql_id, array('f_user_lock')))
-		{
-			return;
-		}
-	}
-	unset($orig_ids);
-
-	$redirect = request_var('redirect', build_url(array('action', 'quickmod')));
-
-	$s_hidden_fields = build_hidden_fields(array(
-		$sql_id . '_list'	=> $ids,
-		'action'			=> $action,
-		'redirect'			=> $redirect)
-	);
-	$success_msg = '';
-
-	if (confirm_box(true))
-	{
-		$sql = "UPDATE $table
-			SET $set_id = " . (($action == 'lock' || $action == 'lock_post') ? ITEM_LOCKED : ITEM_UNLOCKED) . '
-			WHERE ' . phpbb::$db->sql_in_set($sql_id, $ids);
-		phpbb::$db->sql_query($sql);
-
-		$data = ($action == 'lock' || $action == 'unlock') ? get_topic_data($ids) : get_post_data($ids);
-
-		foreach ($data as $id => $row)
-		{
-			add_log('mod', $row['forum_id'], $row['topic_id'], 'LOG_' . strtoupper($action), $row['topic_title']);
-		}
-
-		$success_msg = $l_prefix . ((sizeof($ids) == 1) ? '' : 'S') . '_' . (($action == 'lock' || $action == 'lock_post') ? 'LOCKED' : 'UNLOCKED') . '_SUCCESS';
-	}
-	else
-	{
-		confirm_box(false, strtoupper($action) . '_' . $l_prefix . ((sizeof($ids) == 1) ? '' : 'S'), $s_hidden_fields);
-	}
-
-	$redirect = request_var('redirect', 'index.' . PHP_EXT);
-	$redirect = reapply_sid($redirect);
-
-	if (!$success_msg)
-	{
-		redirect($redirect);
-	}
-	else
-	{
-		meta_refresh(2, $redirect);
-		trigger_error(phpbb::$user->lang[$success_msg] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
-	}
-}
-
-/**
-* Change Topic Type
-*/
-function change_topic_type($action, $topic_ids)
-{
-	// For changing topic types, we only allow operations in one forum.
-	$forum_id = check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('f_announce', 'f_sticky', 'm_'), true);
-
-	if ($forum_id === false)
-	{
-		return;
-	}
-
-	switch ($action)
-	{
-		case 'make_announce':
-			$new_topic_type = POST_ANNOUNCE;
-			$check_acl = 'f_announce';
-			$l_new_type = (sizeof($topic_ids) == 1) ? 'MCP_MAKE_ANNOUNCEMENT' : 'MCP_MAKE_ANNOUNCEMENTS';
-		break;
-
-		case 'make_global':
-			$new_topic_type = POST_GLOBAL;
-			$check_acl = 'f_announce';
-			$l_new_type = (sizeof($topic_ids) == 1) ? 'MCP_MAKE_GLOBAL' : 'MCP_MAKE_GLOBALS';
-		break;
-
-		case 'make_sticky':
-			$new_topic_type = POST_STICKY;
-			$check_acl = 'f_sticky';
-			$l_new_type = (sizeof($topic_ids) == 1) ? 'MCP_MAKE_STICKY' : 'MCP_MAKE_STICKIES';
-		break;
-
-		default:
-			$new_topic_type = POST_NORMAL;
-			$check_acl = '';
-			$l_new_type = (sizeof($topic_ids) == 1) ? 'MCP_MAKE_NORMAL' : 'MCP_MAKE_NORMALS';
-		break;
-	}
-
-	$redirect = request_var('redirect', build_url(array('action', 'quickmod')));
-
-	$s_hidden_fields = array(
-		'topic_id_list'	=> $topic_ids,
-		'f'				=> $forum_id,
-		'action'		=> $action,
-		'redirect'		=> $redirect,
-	);
-	$success_msg = '';
-
-	if (confirm_box(true))
-	{
-		if ($new_topic_type != POST_GLOBAL)
-		{
-			$sql = 'UPDATE ' . TOPICS_TABLE . "
-				SET topic_type = $new_topic_type
-				WHERE " . phpbb::$db->sql_in_set('topic_id', $topic_ids) . '
-					AND forum_id <> 0';
-			phpbb::$db->sql_query($sql);
-
-			// Reset forum id if a global topic is within the array
-			$to_forum_id = request_var('to_forum_id', 0);
-
-			if ($to_forum_id)
-			{
-				$sql = 'UPDATE ' . TOPICS_TABLE . "
-					SET topic_type = $new_topic_type, forum_id = $to_forum_id
-					WHERE " . phpbb::$db->sql_in_set('topic_id', $topic_ids) . '
-						AND forum_id = 0';
-				phpbb::$db->sql_query($sql);
-
-				// Update forum_ids for all posts
-				$sql = 'UPDATE ' . POSTS_TABLE . "
-					SET forum_id = $to_forum_id
-					WHERE " . phpbb::$db->sql_in_set('topic_id', $topic_ids) . '
-						AND forum_id = 0';
-				phpbb::$db->sql_query($sql);
-
-				// Do a little forum sync stuff
-				$sql = 'SELECT SUM(t.topic_replies + t.topic_approved) as topic_posts, COUNT(t.topic_approved) as topics_authed
-					FROM ' . TOPICS_TABLE . ' t
-					WHERE ' . phpbb::$db->sql_in_set('t.topic_id', $topic_ids);
-				$result = phpbb::$db->sql_query($sql);
-				$row_data = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				$sync_sql = array();
-
-				if ($row_data['topic_posts'])
-				{
-					$sync_sql[$to_forum_id][]	= 'forum_posts = forum_posts + ' . (int) $row_data['topic_posts'];
-				}
-
-				if ($row_data['topics_authed'])
-				{
-					$sync_sql[$to_forum_id][]	= 'forum_topics = forum_topics + ' . (int) $row_data['topics_authed'];
-				}
-
-				$sync_sql[$to_forum_id][]	= 'forum_topics_real = forum_topics_real + ' . (int) sizeof($topic_ids);
-
-				foreach ($sync_sql as $forum_id_key => $array)
-				{
-					$sql = 'UPDATE ' . FORUMS_TABLE . '
-						SET ' . implode(', ', $array) . '
-						WHERE forum_id = ' . $forum_id_key;
-					phpbb::$db->sql_query($sql);
-				}
-
-				sync('forum', 'forum_id', $to_forum_id);
-			}
-		}
-		else
-		{
-			// Get away with those topics already being a global announcement by re-calculating $topic_ids
-			$sql = 'SELECT topic_id
-				FROM ' . TOPICS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_ids) . '
-					AND forum_id <> 0';
-			$result = phpbb::$db->sql_query($sql);
-
-			$topic_ids = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$topic_ids[] = $row['topic_id'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			if (sizeof($topic_ids))
-			{
-				// Delete topic shadows for global announcements
-				$sql = 'DELETE FROM ' . TOPICS_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('topic_moved_id', $topic_ids);
-				phpbb::$db->sql_query($sql);
-
-				$sql = 'UPDATE ' . TOPICS_TABLE . "
-					SET topic_type = $new_topic_type, forum_id = 0
-						WHERE " . phpbb::$db->sql_in_set('topic_id', $topic_ids);
-				phpbb::$db->sql_query($sql);
-
-				// Update forum_ids for all posts
-				$sql = 'UPDATE ' . POSTS_TABLE . '
-					SET forum_id = 0
-					WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_ids);
-				phpbb::$db->sql_query($sql);
-
-				// Do a little forum sync stuff
-				$sql = 'SELECT SUM(t.topic_replies + t.topic_approved) as topic_posts, COUNT(t.topic_approved) as topics_authed
-					FROM ' . TOPICS_TABLE . ' t
-					WHERE ' . phpbb::$db->sql_in_set('t.topic_id', $topic_ids);
-				$result = phpbb::$db->sql_query($sql);
-				$row_data = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				$sync_sql = array();
-
-				if ($row_data['topic_posts'])
-				{
-					$sync_sql[$forum_id][]	= 'forum_posts = forum_posts - ' . (int) $row_data['topic_posts'];
-				}
-
-				if ($row_data['topics_authed'])
-				{
-					$sync_sql[$forum_id][]	= 'forum_topics = forum_topics - ' . (int) $row_data['topics_authed'];
-				}
-
-				$sync_sql[$forum_id][]	= 'forum_topics_real = forum_topics_real - ' . (int) sizeof($topic_ids);
-
-				foreach ($sync_sql as $forum_id_key => $array)
-				{
-					$sql = 'UPDATE ' . FORUMS_TABLE . '
-						SET ' . implode(', ', $array) . '
-						WHERE forum_id = ' . $forum_id_key;
-					phpbb::$db->sql_query($sql);
-				}
-
-				sync('forum', 'forum_id', $forum_id);
-			}
-		}
-
-		$success_msg = (sizeof($topic_ids) == 1) ? 'TOPIC_TYPE_CHANGED' : 'TOPICS_TYPE_CHANGED';
-
-		if (sizeof($topic_ids))
-		{
-			$data = get_topic_data($topic_ids);
-
-			foreach ($data as $topic_id => $row)
-			{
-				add_log('mod', $forum_id, $topic_id, 'LOG_TOPIC_TYPE_CHANGED', $row['topic_title']);
-			}
-		}
-	}
-	else
-	{
-		// Global topic involved?
-		$global_involved = false;
-
-		if ($new_topic_type != POST_GLOBAL)
-		{
-			$sql = 'SELECT forum_id
-				FROM ' . TOPICS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_ids) . '
-					AND forum_id = 0';
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if ($row)
-			{
-				$global_involved = true;
-			}
-		}
-
-		if ($global_involved)
-		{
-			phpbb::$template->assign_vars(array(
-				'S_FORUM_SELECT'		=> make_forum_select(request_var('f', $forum_id), false, false, true, true),
-				'S_CAN_LEAVE_SHADOW'	=> false,
-				'ADDITIONAL_MSG'		=> (sizeof($topic_ids) == 1) ? phpbb::$user->lang['SELECT_FORUM_GLOBAL_ANNOUNCEMENT'] : phpbb::$user->lang['SELECT_FORUM_GLOBAL_ANNOUNCEMENTS'],
-			));
-
-			confirm_box(false, $l_new_type, build_hidden_fields($s_hidden_fields), 'mcp_move.html');
-		}
-		else
-		{
-			confirm_box(false, $l_new_type, build_hidden_fields($s_hidden_fields));
-		}
-	}
-
-	$redirect = request_var('redirect', 'index.' . PHP_EXT);
-	$redirect = reapply_sid($redirect);
-
-	if (!$success_msg)
-	{
-		redirect($redirect);
-	}
-	else
-	{
-		meta_refresh(2, $redirect);
-		trigger_error(phpbb::$user->lang[$success_msg] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
-	}
-}
-
-/**
-* Move Topic
-*/
-function mcp_move_topic($topic_ids)
-{
-	// Here we limit the operation to one forum only
-	$forum_id = check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_move'), true);
-
-	if ($forum_id === false)
-	{
-		return;
-	}
-
-	$to_forum_id = request_var('to_forum_id', 0);
-	$redirect = request_var('redirect', build_url(array('action', 'quickmod')));
-	$additional_msg = $success_msg = '';
-
-	$s_hidden_fields = build_hidden_fields(array(
-		'topic_id_list'	=> $topic_ids,
-		'f'				=> $forum_id,
-		'action'		=> 'move',
-		'redirect'		=> $redirect)
-	);
-
-	if ($to_forum_id)
-	{
-		$forum_data = get_forum_data($to_forum_id, 'f_post');
-
-		if (!sizeof($forum_data))
-		{
-			$additional_msg = phpbb::$user->lang['FORUM_NOT_EXIST'];
-		}
-		else
-		{
-			$forum_data = $forum_data[$to_forum_id];
-
-			if ($forum_data['forum_type'] != FORUM_POST)
-			{
-				$additional_msg = phpbb::$user->lang['FORUM_NOT_POSTABLE'];
-			}
-			else if (!phpbb::$acl->acl_get('f_post', $to_forum_id))
-			{
-				$additional_msg = phpbb::$user->lang['USER_CANNOT_POST'];
-			}
-			else if ($forum_id == $to_forum_id)
-			{
-				$additional_msg = phpbb::$user->lang['CANNOT_MOVE_SAME_FORUM'];
-			}
-		}
-	}
-	else if (phpbb_request::is_set_post('confirm'))
-	{
-		$additional_msg = phpbb::$user->lang['FORUM_NOT_EXIST'];
-	}
-
-	if ($to_forum_id && !$additional_msg && confirm_box(true))
-	{
-		$topic_data = get_topic_data($topic_ids);
-		$leave_shadow = phpbb_request::is_set_post('move_leave_shadow');
-
-		$topics_moved = sizeof($topic_ids);
-		$topics_authed_moved = 0;
-		$forum_sync_data = array();
-
-		$forum_sync_data[$forum_id] = current($topic_data);
-		$forum_sync_data[$to_forum_id] = $forum_data;
-
-		foreach ($topic_data as $topic_id => $topic_info)
-		{
-			if ($topic_info['topic_approved'] == '1')
-			{
-				$topics_authed_moved++;
-			}
-		}
-
-		phpbb::$db->sql_transaction('begin');
-
-		$sql = 'SELECT SUM(t.topic_replies + t.topic_approved) as topic_posts
-			FROM ' . TOPICS_TABLE . ' t
-			WHERE ' . phpbb::$db->sql_in_set('t.topic_id', $topic_ids);
-		$result = phpbb::$db->sql_query($sql);
-		$row_data = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		$sync_sql = array();
-
-		if ($row_data['topic_posts'])
-		{
-			$sync_sql[$forum_id][]		= 'forum_posts = forum_posts - ' . (int) $row_data['topic_posts'];
-			$sync_sql[$to_forum_id][]	= 'forum_posts = forum_posts + ' . (int) $row_data['topic_posts'];
-		}
-
-		if ($topics_authed_moved)
-		{
-			$sync_sql[$to_forum_id][]	= 'forum_topics = forum_topics + ' . (int) $topics_authed_moved;
-		}
-
-		$sync_sql[$to_forum_id][]	= 'forum_topics_real = forum_topics_real + ' . (int) $topics_moved;
-
-		// Move topics, but do not resync yet
-		move_topics($topic_ids, $to_forum_id, false);
-
-		$forum_ids = array($to_forum_id);
-		foreach ($topic_data as $topic_id => $row)
-		{
-			// Get the list of forums to resync, add a log entry
-			$forum_ids[] = $row['forum_id'];
-			add_log('mod', $to_forum_id, $topic_id, 'LOG_MOVE', $row['forum_name'], $forum_data['forum_name']);
-
-			// If we have moved a global announcement, we need to correct the topic type
-			if ($row['topic_type'] == POST_GLOBAL)
-			{
-				$sql = 'UPDATE ' . TOPICS_TABLE . '
-					SET topic_type = ' . POST_ANNOUNCE . '
-					WHERE topic_id = ' . (int) $row['topic_id'];
-				phpbb::$db->sql_query($sql);
-			}
-
-			// Leave a redirection if required and only if the topic is visible to users
-			if ($leave_shadow && $row['topic_approved'] && $row['topic_type'] != POST_GLOBAL)
-			{
-				$shadow = array(
-					'forum_id'				=>	(int) $row['forum_id'],
-					'icon_id'				=>	(int) $row['icon_id'],
-					'topic_attachment'		=>	(int) $row['topic_attachment'],
-					'topic_approved'		=>	1, // a shadow topic is always approved
-					'topic_reported'		=>	0, // a shadow topic is never reported
-					'topic_title'			=>	(string) $row['topic_title'],
-					'topic_poster'			=>	(int) $row['topic_poster'],
-					'topic_time'			=>	(int) $row['topic_time'],
-					'topic_time_limit'		=>	(int) $row['topic_time_limit'],
-					'topic_views'			=>	(int) $row['topic_views'],
-					'topic_replies'			=>	(int) $row['topic_replies'],
-					'topic_replies_real'	=>	(int) $row['topic_replies_real'],
-					'topic_status'			=>	ITEM_MOVED,
-					'topic_type'			=>	POST_NORMAL,
-					'topic_first_post_id'	=>	(int) $row['topic_first_post_id'],
-					'topic_first_poster_colour'=>(string) $row['topic_first_poster_colour'],
-					'topic_first_poster_name'=>	(string) $row['topic_first_poster_name'],
-					'topic_last_post_id'	=>	(int) $row['topic_last_post_id'],
-					'topic_last_poster_id'	=>	(int) $row['topic_last_poster_id'],
-					'topic_last_poster_colour'=>(string) $row['topic_last_poster_colour'],
-					'topic_last_poster_name'=>	(string) $row['topic_last_poster_name'],
-					'topic_last_post_subject'=>	(string)  $row['topic_last_post_subject'],
-					'topic_last_post_time'	=>	(int) $row['topic_last_post_time'],
-					'topic_last_view_time'	=>	(int) $row['topic_last_view_time'],
-					'topic_moved_id'		=>	(int) $row['topic_id'],
-					'topic_bumped'			=>	(int) $row['topic_bumped'],
-					'topic_bumper'			=>	(int) $row['topic_bumper'],
-					'poll_title'			=>	(string) $row['poll_title'],
-					'poll_start'			=>	(int) $row['poll_start'],
-					'poll_length'			=>	(int) $row['poll_length'],
-					'poll_max_options'		=>	(int) $row['poll_max_options'],
-					'poll_last_vote'		=>	(int) $row['poll_last_vote']
-				);
-
-				phpbb::$db->sql_query('INSERT INTO ' . TOPICS_TABLE . phpbb::$db->sql_build_array('INSERT', $shadow));
-
-				$topics_authed_moved--;
-				$topics_moved--;
-			}
-		}
-		unset($topic_data);
-
-		$sync_sql[$forum_id][]	= 'forum_topics_real = forum_topics_real - ' . (int) $topics_moved;
-
-		if ($topics_authed_moved)
-		{
-			$sync_sql[$forum_id][]	= 'forum_topics = forum_topics - ' . (int) $topics_authed_moved;
-		}
-
-		$success_msg = (sizeof($topic_ids) == 1) ? 'TOPIC_MOVED_SUCCESS' : 'TOPICS_MOVED_SUCCESS';
-
-		foreach ($sync_sql as $forum_id_key => $array)
-		{
-			$sql = 'UPDATE ' . FORUMS_TABLE . '
-				SET ' . implode(', ', $array) . '
-				WHERE forum_id = ' . $forum_id_key;
-			phpbb::$db->sql_query($sql);
-		}
-
-		phpbb::$db->sql_transaction('commit');
-
-		sync('forum', 'forum_id', array($forum_id, $to_forum_id));
-	}
-	else
-	{
-		phpbb::$template->assign_vars(array(
-			'S_FORUM_SELECT'		=> make_forum_select($to_forum_id, $forum_id, false, true, true, true),
-			'S_CAN_LEAVE_SHADOW'	=> true,
-			'ADDITIONAL_MSG'		=> $additional_msg,
-		));
-
-		confirm_box(false, 'MOVE_TOPIC' . ((sizeof($topic_ids) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_move.html');
-	}
-
-	$redirect = request_var('redirect', 'index.' . PHP_EXT);
-	$redirect = reapply_sid($redirect);
-
-	if (!$success_msg)
-	{
-		redirect($redirect);
-	}
-	else
-	{
-		meta_refresh(3, $redirect);
-
-		$message = phpbb::$user->lang[$success_msg];
-		$message .= '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>');
-		$message .= '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_FORUM'], '<a href="' . append_sid('viewforum', "f=$forum_id") . '">', '</a>');
-		$message .= '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_NEW_FORUM'], '<a href="' . append_sid('viewforum', "f=$to_forum_id") . '">', '</a>');
-
-		trigger_error($message);
-	}
-}
-
-/**
-* Delete Topics
-*/
-function mcp_delete_topic($topic_ids)
-{
-	if (!check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_delete')))
-	{
-		return;
-	}
-
-	$redirect = request_var('redirect', build_url(array('action', 'quickmod')));
-	$forum_id = request_var('f', 0);
-
-	$s_hidden_fields = build_hidden_fields(array(
-		'topic_id_list'	=> $topic_ids,
-		'f'				=> $forum_id,
-		'action'		=> 'delete_topic',
-		'redirect'		=> $redirect)
-	);
-	$success_msg = '';
-
-	if (confirm_box(true))
-	{
-		$success_msg = (sizeof($topic_ids) == 1) ? 'TOPIC_DELETED_SUCCESS' : 'TOPICS_DELETED_SUCCESS';
-
-		$data = get_topic_data($topic_ids);
-
-		foreach ($data as $topic_id => $row)
-		{
-			add_log('mod', $row['forum_id'], $topic_id, 'LOG_DELETE_' . ($row['topic_moved_id'] ? 'SHADOW_' : '') . 'TOPIC', $row['topic_title']);
-		}
-
-		$return = delete_topics('topic_id', $topic_ids);
-	}
-	else
-	{
-		confirm_box(false, (sizeof($topic_ids) == 1) ? 'DELETE_TOPIC' : 'DELETE_TOPICS', $s_hidden_fields);
-	}
-
-	if (!phpbb_request::is_set('quickmod'))
-	{
-		$redirect = request_var('redirect', 'index.' . PHP_EXT);
-		$redirect = reapply_sid($redirect);
-		$redirect_message = 'PAGE';
-	}
-	else
-	{
-		$redirect = append_sid('viewforum', 'f=' . $forum_id);
-		$redirect_message = 'FORUM';
-	}
-
-	if (!$success_msg)
-	{
-		redirect($redirect);
-	}
-	else
-	{
-		meta_refresh(3, $redirect);
-		trigger_error(phpbb::$user->lang[$success_msg] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_' . $redirect_message], '<a href="' . $redirect . '">', '</a>'));
-	}
-}
-
-/**
-* Delete Posts
-*/
-function mcp_delete_post($post_ids)
-{
-	if (!check_ids($post_ids, POSTS_TABLE, 'post_id', array('m_delete')))
-	{
-		return;
-	}
-
-	$redirect = request_var('redirect', build_url(array('action', 'quickmod')));
-	$forum_id = request_var('f', 0);
-
-	$s_hidden_fields = build_hidden_fields(array(
-		'post_id_list'	=> $post_ids,
-		'f'				=> $forum_id,
-		'action'		=> 'delete_post',
-		'redirect'		=> $redirect)
-	);
-	$success_msg = '';
-
-	if (confirm_box(true))
-	{
-		if (!function_exists('delete_posts'))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/functions_admin.' . PHP_EXT);
-		}
-
-		// Count the number of topics that are affected
-		// I did not use COUNT(DISTINCT ...) because I remember having problems
-		// with it on older versions of MySQL -- Ashe
-
-		$sql = 'SELECT DISTINCT topic_id
-			FROM ' . POSTS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('post_id', $post_ids);
-		$result = phpbb::$db->sql_query($sql);
-
-		$topic_id_list = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$topic_id_list[] = $row['topic_id'];
-		}
-		$affected_topics = sizeof($topic_id_list);
-		phpbb::$db->sql_freeresult($result);
-
-		$post_data = get_post_data($post_ids);
-
-		foreach ($post_data as $id => $row)
-		{
-			add_log('mod', $row['forum_id'], $row['topic_id'], 'LOG_DELETE_POST', $row['post_subject']);
-		}
-
-		// Now delete the posts, topics and forums are automatically resync'ed
-		delete_posts('post_id', $post_ids);
-
-		$sql = 'SELECT COUNT(topic_id) AS topics_left
-			FROM ' . TOPICS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_id_list);
-		$result = phpbb::$db->sql_query_limit($sql, 1);
-
-		$deleted_topics = ($row = phpbb::$db->sql_fetchrow($result)) ? ($affected_topics - $row['topics_left']) : $affected_topics;
-		phpbb::$db->sql_freeresult($result);
-
-		$topic_id = request_var('t', 0);
-
-		// Return links
-		$return_link = array();
-		if ($affected_topics == 1 && !$deleted_topics && $topic_id)
-		{
-			$return_link[] = sprintf(phpbb::$user->lang['RETURN_TOPIC'], '<a href="' . append_sid('viewtopic', "f=$forum_id&amp;t=$topic_id") . '">', '</a>');
-		}
-		$return_link[] = sprintf(phpbb::$user->lang['RETURN_FORUM'], '<a href="' . append_sid('viewforum', 'f=' . $forum_id) . '">', '</a>');
-
-		if (sizeof($post_ids) == 1)
-		{
-			if ($deleted_topics)
-			{
-				// We deleted the only post of a topic, which in turn has
-				// been removed from the database
-				$success_msg = phpbb::$user->lang['TOPIC_DELETED_SUCCESS'];
-			}
-			else
-			{
-				$success_msg = phpbb::$user->lang['POST_DELETED_SUCCESS'];
-			}
-		}
-		else
-		{
-			if ($deleted_topics)
-			{
-				// Some of topics disappeared
-				$success_msg = phpbb::$user->lang['POSTS_DELETED_SUCCESS'] . '<br /><br />' . phpbb::$user->lang['EMPTY_TOPICS_REMOVED_WARNING'];
-			}
-			else
-			{
-				$success_msg = phpbb::$user->lang['POSTS_DELETED_SUCCESS'];
-			}
-		}
-	}
-	else
-	{
-		confirm_box(false, (sizeof($post_ids) == 1) ? 'DELETE_POST' : 'DELETE_POSTS', $s_hidden_fields);
-	}
-
-	$redirect = request_var('redirect', 'index.' . PHP_EXT);
-	$redirect = reapply_sid($redirect);
-
-	if (!$success_msg)
-	{
-		redirect($redirect);
-	}
-	else
-	{
-		if ($affected_topics != 1 || $deleted_topics || !$topic_id)
-		{
-			$redirect = append_sid('mcp', "f=$forum_id&i=main&mode=forum_view", false);
-		}
-
-		meta_refresh(3, $redirect);
-		trigger_error($success_msg . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>') . '<br /><br />' . implode('<br /><br />', $return_link));
-	}
-}
-
-/**
-* Fork Topic
-*/
-function mcp_fork_topic($topic_ids)
-{
-	if (!check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_')))
-	{
-		return;
-	}
-
-	$to_forum_id = request_var('to_forum_id', 0);
-	$forum_id = request_var('f', 0);
-	$redirect = request_var('redirect', build_url(array('action', 'quickmod')));
-	$additional_msg = $success_msg = '';
-
-	$s_hidden_fields = build_hidden_fields(array(
-		'topic_id_list'	=> $topic_ids,
-		'f'				=> $forum_id,
-		'action'		=> 'fork',
-		'redirect'		=> $redirect)
-	);
-
-	if ($to_forum_id)
-	{
-		$forum_data = get_forum_data($to_forum_id, 'f_post');
-
-		if (!sizeof($topic_ids))
-		{
-			$additional_msg = phpbb::$user->lang['NO_TOPIC_SELECTED'];
-		}
-		else if (!sizeof($forum_data))
-		{
-			$additional_msg = phpbb::$user->lang['FORUM_NOT_EXIST'];
-		}
-		else
-		{
-			$forum_data = $forum_data[$to_forum_id];
-
-			if ($forum_data['forum_type'] != FORUM_POST)
-			{
-				$additional_msg = phpbb::$user->lang['FORUM_NOT_POSTABLE'];
-			}
-			else if (!phpbb::$acl->acl_get('f_post', $to_forum_id))
-			{
-				$additional_msg = phpbb::$user->lang['USER_CANNOT_POST'];
-			}
-		}
-	}
-	else if (phpbb_request::is_set_post('confirm'))
-	{
-		$additional_msg = phpbb::$user->lang['FORUM_NOT_EXIST'];
-	}
-
-	if (!$additional_msg && confirm_box(true))
-	{
-		$topic_data = get_topic_data($topic_ids, 'f_post');
-
-		$total_posts = 0;
-		$new_topic_id_list = array();
-
-		foreach ($topic_data as $topic_id => $topic_row)
-		{
-			$sql_ary = array(
-				'forum_id'					=> (int) $to_forum_id,
-				'icon_id'					=> (int) $topic_row['icon_id'],
-				'topic_attachment'			=> (int) $topic_row['topic_attachment'],
-				'topic_approved'			=> 1,
-				'topic_reported'			=> 0,
-				'topic_title'				=> (string) $topic_row['topic_title'],
-				'topic_poster'				=> (int) $topic_row['topic_poster'],
-				'topic_time'				=> (int) $topic_row['topic_time'],
-				'topic_replies'				=> (int) $topic_row['topic_replies_real'],
-				'topic_replies_real'		=> (int) $topic_row['topic_replies_real'],
-				'topic_status'				=> (int) $topic_row['topic_status'],
-				'topic_type'				=> (int) $topic_row['topic_type'],
-				'topic_first_poster_name'	=> (string) $topic_row['topic_first_poster_name'],
-				'topic_last_poster_id'		=> (int) $topic_row['topic_last_poster_id'],
-				'topic_last_poster_name'	=> (string) $topic_row['topic_last_poster_name'],
-				'topic_last_post_time'		=> (int) $topic_row['topic_last_post_time'],
-				'topic_last_view_time'		=> (int) $topic_row['topic_last_view_time'],
-				'topic_bumped'				=> (int) $topic_row['topic_bumped'],
-				'topic_bumper'				=> (int) $topic_row['topic_bumper'],
-				'poll_title'				=> (string) $topic_row['poll_title'],
-				'poll_start'				=> (int) $topic_row['poll_start'],
-				'poll_length'				=> (int) $topic_row['poll_length']
-			);
-
-			phpbb::$db->sql_query('INSERT INTO ' . TOPICS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary));
-			$new_topic_id = phpbb::$db->sql_nextid();
-			$new_topic_id_list[$topic_id] = $new_topic_id;
-
-			if ($topic_row['poll_start'])
-			{
-				$poll_rows = array();
-
-				$sql = 'SELECT *
-					FROM ' . POLL_OPTIONS_TABLE . "
-					WHERE topic_id = $topic_id";
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$sql_ary = array(
-						'poll_option_id'	=> (int) $row['poll_option_id'],
-						'topic_id'			=> (int) $new_topic_id,
-						'poll_option_text'	=> (string) $row['poll_option_text'],
-						'poll_option_total'	=> 0
-					);
-
-					phpbb::$db->sql_query('INSERT INTO ' . POLL_OPTIONS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary));
-				}
-			}
-
-			$sql = 'SELECT *
-				FROM ' . POSTS_TABLE . "
-				WHERE topic_id = $topic_id
-				ORDER BY post_time ASC";
-			$result = phpbb::$db->sql_query($sql);
-
-			$post_rows = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$post_rows[] = $row;
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			if (!sizeof($post_rows))
-			{
-				continue;
-			}
-
-			$total_posts += sizeof($post_rows);
-			foreach ($post_rows as $row)
-			{
-				$sql_ary = array(
-					'topic_id'			=> (int) $new_topic_id,
-					'forum_id'			=> (int) $to_forum_id,
-					'poster_id'			=> (int) $row['poster_id'],
-					'icon_id'			=> (int) $row['icon_id'],
-					'poster_ip'			=> (string) $row['poster_ip'],
-					'post_time'			=> (int) $row['post_time'],
-					'post_approved'		=> 1,
-					'post_reported'		=> 0,
-					'enable_bbcode'		=> (int) $row['enable_bbcode'],
-					'enable_smilies'	=> (int) $row['enable_smilies'],
-					'enable_magic_url'	=> (int) $row['enable_magic_url'],
-					'enable_sig'		=> (int) $row['enable_sig'],
-					'post_username'		=> (string) $row['post_username'],
-					'post_subject'		=> (string) $row['post_subject'],
-					'post_text'			=> (string) $row['post_text'],
-					'post_edit_reason'	=> (string) $row['post_edit_reason'],
-					'post_edit_user'	=> (int) $row['post_edit_user'],
-					'post_checksum'		=> (string) $row['post_checksum'],
-					'post_attachment'	=> (int) $row['post_attachment'],
-					'bbcode_bitfield'	=> $row['bbcode_bitfield'],
-					'bbcode_uid'		=> (string) $row['bbcode_uid'],
-					'post_edit_time'	=> (int) $row['post_edit_time'],
-					'post_edit_count'	=> (int) $row['post_edit_count'],
-					'post_edit_locked'	=> (int) $row['post_edit_locked'],
-					'post_postcount'	=> 0,
-				);
-
-				phpbb::$db->sql_query('INSERT INTO ' . POSTS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary));
-				$new_post_id = phpbb::$db->sql_nextid();
-
-				// Copy whether the topic is dotted
-				markread('post', $to_forum_id, $new_topic_id, 0, $row['poster_id']);
-
-				// Copy Attachments
-				if ($row['post_attachment'])
-				{
-					$sql = 'SELECT * FROM ' . ATTACHMENTS_TABLE . "
-						WHERE post_msg_id = {$row['post_id']}
-							AND topic_id = $topic_id
-							AND in_message = 0";
-					$result = phpbb::$db->sql_query($sql);
-
-					$sql_ary = array();
-					while ($attach_row = phpbb::$db->sql_fetchrow($result))
-					{
-						$sql_ary[] = array(
-							'post_msg_id'		=> (int) $new_post_id,
-							'topic_id'			=> (int) $new_topic_id,
-							'in_message'		=> 0,
-							'is_orphan'			=> (int) $attach_row['is_orphan'],
-							'poster_id'			=> (int) $attach_row['poster_id'],
-							'physical_filename'	=> (string) basename($attach_row['physical_filename']),
-							'real_filename'		=> (string) basename($attach_row['real_filename']),
-							'download_count'	=> (int) $attach_row['download_count'],
-							'attach_comment'	=> (string) $attach_row['attach_comment'],
-							'extension'			=> (string) $attach_row['extension'],
-							'mimetype'			=> (string) $attach_row['mimetype'],
-							'filesize'			=> (int) $attach_row['filesize'],
-							'filetime'			=> (int) $attach_row['filetime'],
-							'thumbnail'			=> (int) $attach_row['thumbnail']
-						);
-					}
-					phpbb::$db->sql_freeresult($result);
-
-					if (sizeof($sql_ary))
-					{
-						phpbb::$db->sql_multi_insert(ATTACHMENTS_TABLE, $sql_ary);
-					}
-				}
-			}
-
-			$sql = 'SELECT user_id, notify_status
-				FROM ' . TOPICS_WATCH_TABLE . '
-				WHERE topic_id = ' . $topic_id;
-			$result = phpbb::$db->sql_query($sql);
-
-			$sql_ary = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$sql_ary[] = array(
-					'topic_id'		=> (int) $new_topic_id,
-					'user_id'		=> (int) $row['user_id'],
-					'notify_status'	=> (int) $row['notify_status'],
-				);
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			if (sizeof($sql_ary))
-			{
-				phpbb::$db->sql_multi_insert(TOPICS_WATCH_TABLE, $sql_ary);
-			}
-		}
-
-		// Sync new topics, parent forums and board stats
-		sync('topic', 'topic_id', $new_topic_id_list);
-
-		$sync_sql = array();
-
-		$sync_sql[$to_forum_id][]	= 'forum_posts = forum_posts + ' . $total_posts;
-		$sync_sql[$to_forum_id][]	= 'forum_topics = forum_topics + ' . sizeof($new_topic_id_list);
-		$sync_sql[$to_forum_id][]	= 'forum_topics_real = forum_topics_real + ' . sizeof($new_topic_id_list);
-
-		foreach ($sync_sql as $forum_id_key => $array)
-		{
-			$sql = 'UPDATE ' . FORUMS_TABLE . '
-				SET ' . implode(', ', $array) . '
-				WHERE forum_id = ' . $forum_id_key;
-			phpbb::$db->sql_query($sql);
-		}
-
-		sync('forum', 'forum_id', $to_forum_id);
-		set_config_count('num_topics', sizeof($new_topic_id_list), true);
-		set_config_count('num_posts', $total_posts, true);
-
-		foreach ($new_topic_id_list as $topic_id => $new_topic_id)
-		{
-			add_log('mod', $to_forum_id, $new_topic_id, 'LOG_FORK', $topic_row['forum_name']);
-		}
-
-		$success_msg = (sizeof($topic_ids) == 1) ? 'TOPIC_FORKED_SUCCESS' : 'TOPICS_FORKED_SUCCESS';
-	}
-	else
-	{
-		phpbb::$template->assign_vars(array(
-			'S_FORUM_SELECT'		=> make_forum_select($to_forum_id, false, false, true, true, true),
-			'S_CAN_LEAVE_SHADOW'	=> false,
-			'ADDITIONAL_MSG'		=> $additional_msg,
-		));
-
-		confirm_box(false, 'FORK_TOPIC' . ((sizeof($topic_ids) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_move.html');
-	}
-
-	$redirect = request_var('redirect', 'index.' . PHP_EXT);
-	$redirect = reapply_sid($redirect);
-
-	if (!$success_msg)
-	{
-		redirect($redirect);
-	}
-	else
-	{
-		$redirect_url = append_sid('viewforum', 'f=' . $forum_id);
-		meta_refresh(3, $redirect_url);
-		$return_link = sprintf(phpbb::$user->lang['RETURN_FORUM'], '<a href="' . $redirect_url . '">', '</a>');
-
-		if ($forum_id != $to_forum_id)
-		{
-			$return_link .= '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_NEW_FORUM'], '<a href="' . append_sid('viewforum', 'f=' . $to_forum_id) . '">', '</a>');
-		}
-
-		trigger_error(phpbb::$user->lang[$success_msg] . '<br /><br />' . $return_link);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/mcp/mcp_notes.php b/phpBB/modules/mcp/mcp_notes.php
deleted file mode 100644
index ed0bf373bf..0000000000
--- a/phpBB/modules/mcp/mcp_notes.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-/**
-*
-* @package mcp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* mcp_notes
-* Displays notes about a user
-* @package mcp
-*/
-class mcp_notes
-{
-	var $p_master;
-	var $u_action;
-
-	function __construct(&$p_master)
-	{
-		$this->p_master = &$p_master;
-	}
-
-	function main($id, $mode)
-	{
-		$action = request_var('action', array('' => ''));
-
-		if (is_array($action))
-		{
-			list($action, ) = each($action);
-		}
-
-		$this->page_title = 'MCP_NOTES';
-
-		switch ($mode)
-		{
-			case 'front':
-				phpbb::$template->assign_vars(array(
-					'U_FIND_USERNAME'	=> append_sid('memberlist', 'mode=searchuser&amp;form=mcp&amp;field=username&amp;select_single=true'),
-					'U_POST_ACTION'		=> append_sid('mcp', 'i=notes&amp;mode=user_notes'),
-
-					'L_TITLE'			=> phpbb::$user->lang['MCP_NOTES'],
-				));
-
-				$this->tpl_name = 'mcp_notes_front';
-			break;
-
-			case 'user_notes':
-				phpbb::$user->add_lang('acp/common');
-
-				$this->mcp_notes_user_view($action);
-				$this->tpl_name = 'mcp_notes_user';
-			break;
-		}
-	}
-
-	/**
-	* Display user notes
-	*/
-	function mcp_notes_user_view($action)
-	{
-		$user_id = request_var('u', 0);
-		$username = request_var('username', '', true);
-		$start = request_var('start', 0);
-		$st	= request_var('st', 0);
-		$sk	= request_var('sk', 'b');
-		$sd	= request_var('sd', 'd');
-
-		add_form_key('mcp_notes');
-
-		$sql_where = ($user_id) ? "user_id = $user_id" : "username_clean = '" . phpbb::$db->sql_escape(utf8_clean_string($username)) . "'";
-
-		$sql = 'SELECT *
-			FROM ' . USERS_TABLE . "
-			WHERE $sql_where";
-		$result = phpbb::$db->sql_query($sql);
-		$userrow = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$userrow)
-		{
-			trigger_error('NO_USER');
-		}
-
-		$user_id = $userrow['user_id'];
-
-		// Populate user id to the currently active module (this module)
-		// The following method is another way of adjusting module urls. It is the easy variant if we want
-		// to directly adjust the current module url based on data retrieved within the same module.
-		if (strpos($this->u_action, "&amp;u=$user_id") === false)
-		{
-			$this->p_master->adjust_url('&amp;u=' . $user_id);
-			$this->u_action .= "&amp;u=$user_id";
-		}
-
-		$deletemark = ($action == 'del_marked') ? true : false;
-		$deleteall	= ($action == 'del_all') ? true : false;
-		$marked		= request_var('marknote', array(0));
-		$usernote	= utf8_normalize_nfc(request_var('usernote', '', true));
-
-		// Handle any actions
-		if (($deletemark || $deleteall) && phpbb::$acl->acl_get('a_clearlogs'))
-		{
-			$where_sql = '';
-			if ($deletemark && $marked)
-			{
-				$sql_in = array();
-				foreach ($marked as $mark)
-				{
-					$sql_in[] = $mark;
-				}
-				$where_sql = ' AND ' . phpbb::$db->sql_in_set('log_id', $sql_in);
-				unset($sql_in);
-			}
-
-			if ($where_sql || $deleteall)
-			{
-				if (check_form_key('mcp_notes'))
-				{
-					$sql = 'DELETE FROM ' . LOG_TABLE . '
-						WHERE log_type = ' . LOG_USERS . "
-							AND reportee_id = $user_id
-							$where_sql";
-					phpbb::$db->sql_query($sql);
-
-					add_log('admin', 'LOG_CLEAR_USER', $userrow['username']);
-
-					$msg = ($deletemark) ? 'MARKED_NOTES_DELETED' : 'ALL_NOTES_DELETED';
-				}
-				else
-				{
-					$msg = 'FORM_INVALID';
-				}
-				$redirect = $this->u_action . '&amp;u=' . $user_id;
-				meta_refresh(3, $redirect);
-				trigger_error(phpbb::$user->lang[$msg] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
-			}
-		}
-
-		if ($usernote && $action == 'add_feedback')
-		{
-			if (check_form_key('mcp_notes'))
-			{
-				add_log('admin', 'LOG_USER_FEEDBACK', $userrow['username']);
-				add_log('mod', 0, 0, 'LOG_USER_FEEDBACK', $userrow['username']);
-
-				add_log('user', $user_id, 'LOG_USER_GENERAL', $usernote);
-				$msg = phpbb::$user->lang['USER_FEEDBACK_ADDED'];
-			}
-			else
-			{
-				$msg = phpbb::$user->lang['FORM_INVALID'];
-			}
-			$redirect = $this->u_action;
-			meta_refresh(3, $redirect);
-
-			trigger_error($msg .  '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
-		}
-
-		// Generate the appropriate user information for the user we are looking at
-		if (!function_exists('get_user_avatar'))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-		}
-
-		$rank_title = $rank_img = '';
-		$avatar_img = get_user_avatar($userrow['user_avatar'], $userrow['user_avatar_type'], $userrow['user_avatar_width'], $userrow['user_avatar_height']);
-
-		$limit_days = array(0 => phpbb::$user->lang['ALL_ENTRIES'], 1 => phpbb::$user->lang['1_DAY'], 7 => phpbb::$user->lang['7_DAYS'], 14 => phpbb::$user->lang['2_WEEKS'], 30 => phpbb::$user->lang['1_MONTH'], 90 => phpbb::$user->lang['3_MONTHS'], 180 => phpbb::$user->lang['6_MONTHS'], 365 => phpbb::$user->lang['1_YEAR']);
-		$sort_by_text = array('a' => phpbb::$user->lang['SORT_USERNAME'], 'b' => phpbb::$user->lang['SORT_DATE'], 'c' => phpbb::$user->lang['SORT_IP'], 'd' => phpbb::$user->lang['SORT_ACTION']);
-		$sort_by_sql = array('a' => 'u.username_clean', 'b' => 'l.log_time', 'c' => 'l.log_ip', 'd' => 'l.log_operation');
-
-		$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
-		gen_sort_selects($limit_days, $sort_by_text, $st, $sk, $sd, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
-
-		// Define where and sort sql for use in displaying logs
-		$sql_where = ($st) ? (time() - ($st * 86400)) : 0;
-		$sql_sort = $sort_by_sql[$sk] . ' ' . (($sd == 'd') ? 'DESC' : 'ASC');
-
-		$log_data = array();
-		$log_count = 0;
-		view_log('user', $log_data, $log_count, phpbb::$config['posts_per_page'], $start, 0, 0, $user_id, $sql_where, $sql_sort);
-
-		if ($log_count)
-		{
-			phpbb::$template->assign_var('S_USER_NOTES', true);
-
-			foreach ($log_data as $row)
-			{
-				phpbb::$template->assign_block_vars('usernotes', array(
-					'REPORT_BY'		=> $row['username_full'],
-					'REPORT_AT'		=> phpbb::$user->format_date($row['time']),
-					'ACTION'		=> $row['action'],
-					'IP'			=> $row['ip'],
-					'ID'			=> $row['id'],
-				));
-			}
-		}
-
-		phpbb::$template->assign_vars(array(
-			'U_POST_ACTION'			=> $this->u_action,
-			'S_CLEAR_ALLOWED'		=> (phpbb::$acl->acl_get('a_clearlogs')) ? true : false,
-			'S_SELECT_SORT_DIR'		=> $s_sort_dir,
-			'S_SELECT_SORT_KEY'		=> $s_sort_key,
-			'S_SELECT_SORT_DAYS'	=> $s_limit_days,
-
-			'L_TITLE'			=> phpbb::$user->lang['MCP_NOTES_USER'],
-
-			'PAGE_NUMBER'		=> on_page($log_count, phpbb::$config['posts_per_page'], $start),
-			'PAGINATION'		=> generate_pagination($this->u_action . "&amp;st=$st&amp;sk=$sk&amp;sd=$sd", $log_count, phpbb::$config['posts_per_page'], $start),
-			'TOTAL_REPORTS'		=> ($log_count == 1) ? phpbb::$user->lang['LIST_REPORT'] : sprintf(phpbb::$user->lang['LIST_REPORTS'], $log_count),
-
-			'RANK_TITLE'		=> $rank_title,
-			'JOINED'			=> phpbb::$user->format_date($userrow['user_regdate']),
-			'POSTS'				=> ($userrow['user_posts']) ? $userrow['user_posts'] : 0,
-			'WARNINGS'			=> ($userrow['user_warnings']) ? $userrow['user_warnings'] : 0,
-
-			'USERNAME_FULL'		=> get_username_string('full', $userrow['user_id'], $userrow['username'], $userrow['user_colour']),
-			'USERNAME_COLOUR'	=> get_username_string('colour', $userrow['user_id'], $userrow['username'], $userrow['user_colour']),
-			'USERNAME'			=> get_username_string('username', $userrow['user_id'], $userrow['username'], $userrow['user_colour']),
-			'U_PROFILE'			=> get_username_string('profile', $userrow['user_id'], $userrow['username'], $userrow['user_colour']),
-
-			'AVATAR_IMG'		=> $avatar_img,
-			'RANK_IMG'			=> $rank_img,
-		));
-	}
-
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/mcp/mcp_post.php b/phpBB/modules/mcp/mcp_post.php
deleted file mode 100644
index 2f3320dd07..0000000000
--- a/phpBB/modules/mcp/mcp_post.php
+++ /dev/null
@@ -1,497 +0,0 @@
-<?php
-/**
-*
-* @package mcp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Handling actions in post details screen
-*/
-function mcp_post_details($id, $mode, $action)
-{
-	phpbb::$user->add_lang('posting');
-
-	$post_id = request_var('p', 0);
-	$start	= request_var('start', 0);
-
-	// Get post data
-	$post_info = get_post_data(array($post_id), false, true);
-
-	add_form_key('mcp_post_details');
-
-	if (!sizeof($post_info))
-	{
-		trigger_error('POST_NOT_EXIST');
-	}
-
-	$post_info = $post_info[$post_id];
-	$extra_url = extra_url();
-	$url = ($extra_url) ? append_sid('mcp', extra_url()) : append_sid('mcp') . '?';
-
-	switch ($action)
-	{
-		case 'whois':
-
-			if (phpbb::$acl->acl_get('m_info', $post_info['forum_id']))
-			{
-				$ip = request_var('ip', '');
-				include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-
-				phpbb::$template->assign_vars(array(
-					'RETURN_POST'	=> sprintf(phpbb::$user->lang['RETURN_POST'], '<a href="' . append_sid('mcp', "i=$id&amp;mode=$mode&amp;p=$post_id") . '">', '</a>'),
-					'U_RETURN_POST'	=> append_sid('mcp', "i=$id&amp;mode=$mode&amp;p=$post_id"),
-					'L_RETURN_POST'	=> sprintf(phpbb::$user->lang['RETURN_POST'], '', ''),
-					'WHOIS'			=> user_ipwhois($ip),
-				));
-			}
-
-			// We're done with the whois page so return
-			return;
-
-		break;
-
-		case 'chgposter':
-		case 'chgposter_ip':
-
-			if ($action == 'chgposter')
-			{
-				$username = request_var('username', '', true);
-				$sql_where = "username_clean = '" . phpbb::$db->sql_escape(utf8_clean_string($username)) . "'";
-			}
-			else
-			{
-				$new_user_id = request_var('u', 0);
-				$sql_where = 'user_id = ' . $new_user_id;
-			}
-
-			$sql = 'SELECT *
-				FROM ' . USERS_TABLE . '
-				WHERE ' . $sql_where;
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$row)
-			{
-				trigger_error('NO_USER');
-			}
-
-			if (phpbb::$acl->acl_get('m_chgposter', $post_info['forum_id']))
-			{
-				if (check_form_key('mcp_post_details'))
-				{
-					change_poster($post_info, $row);
-				}
-				else
-				{
-					trigger_error('FORM_INVALID');
-				}
-			}
-
-		break;
-	}
-
-	// Set some vars
-	$users_ary = $usernames_ary = array();
-	$attachments = $extensions = array();
-	$post_id = $post_info['post_id'];
-	$topic_tracking_info = array();
-
-	// Get topic tracking info
-	if (phpbb::$config['load_db_lastread'])
-	{
-		$tmp_topic_data = array($post_info['topic_id'] => $post_info);
-		$topic_tracking_info = get_topic_tracking($post_info['forum_id'], $post_info['topic_id'], $tmp_topic_data, array($post_info['forum_id'] => $post_info['forum_mark_time']));
-		unset($tmp_topic_data);
-	}
-	else
-	{
-		$topic_tracking_info = get_complete_topic_tracking($post_info['forum_id'], $post_info['topic_id']);
-	}
-
-	$post_unread = (isset($topic_tracking_info[$post_info['topic_id']]) && $post_info['post_time'] > $topic_tracking_info[$post_info['topic_id']]) ? true : false;
-
-	// Process message, leave it uncensored
-	$message = $post_info['post_text'];
-
-	if ($post_info['bbcode_bitfield'])
-	{
-		include_once(PHPBB_ROOT_PATH . 'includes/bbcode.' . PHP_EXT);
-		$bbcode = new bbcode($post_info['bbcode_bitfield']);
-		$bbcode->bbcode_second_pass($message, $post_info['bbcode_uid'], $post_info['bbcode_bitfield']);
-	}
-
-	$message = bbcode_nl2br($message);
-	$message = smiley_text($message);
-
-	if ($post_info['post_attachment'] && phpbb::$acl->acl_get('u_download') && phpbb::$acl->acl_get('f_download', $post_info['forum_id']))
-	{
-		$extensions = phpbb_cache::obtain_extensions_forum($post_info['forum_id']);
-
-		$sql = 'SELECT *
-			FROM ' . ATTACHMENTS_TABLE . '
-			WHERE post_msg_id = ' . $post_id . '
-				AND in_message = 0
-			ORDER BY filetime DESC, post_msg_id ASC';
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$attachments[] = $row;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if (sizeof($attachments))
-		{
-			$update_count = array();
-			parse_attachments($post_info['forum_id'], $message, $attachments, $update_count);
-		}
-
-		// Display not already displayed Attachments for this post, we already parsed them. ;)
-		if (!empty($attachments))
-		{
-			phpbb::$template->assign_var('S_HAS_ATTACHMENTS', true);
-
-			foreach ($attachments as $attachment)
-			{
-				phpbb::$template->assign_block_vars('attachment', array(
-					'DISPLAY_ATTACHMENT'	=> $attachment,
-				));
-			}
-		}
-	}
-
-	phpbb::$template->assign_vars(array(
-		'U_MCP_ACTION'			=> "$url&amp;i=main&amp;quickmod=1", // Use this for mode paramaters
-		'U_POST_ACTION'			=> "$url&amp;i=$id&amp;mode=post_details", // Use this for action parameters
-		'U_APPROVE_ACTION'		=> append_sid('mcp', "i=queue&amp;p=$post_id&amp;f={$post_info['forum_id']}"),
-
-		'S_CAN_VIEWIP'			=> phpbb::$acl->acl_get('m_info', $post_info['forum_id']),
-		'S_CAN_CHGPOSTER'		=> phpbb::$acl->acl_get('m_chgposter', $post_info['forum_id']),
-		'S_CAN_LOCK_POST'		=> phpbb::$acl->acl_get('m_lock', $post_info['forum_id']),
-		'S_CAN_DELETE_POST'		=> phpbb::$acl->acl_get('m_delete', $post_info['forum_id']),
-
-		'S_POST_REPORTED'		=> ($post_info['post_reported']) ? true : false,
-		'S_POST_UNAPPROVED'		=> (!$post_info['post_approved']) ? true : false,
-		'S_POST_LOCKED'			=> ($post_info['post_edit_locked']) ? true : false,
-		'S_USER_NOTES'			=> true,
-		'S_CLEAR_ALLOWED'		=> (phpbb::$acl->acl_get('a_clearlogs')) ? true : false,
-
-		'U_EDIT'				=> (phpbb::$acl->acl_get('m_edit', $post_info['forum_id'])) ? append_sid('posting', "mode=edit&amp;f={$post_info['forum_id']}&amp;p={$post_info['post_id']}") : '',
-		'U_FIND_USERNAME'		=> append_sid('memberlist', 'mode=searchuser&amp;form=mcp_chgposter&amp;field=username&amp;select_single=true'),
-		'U_MCP_APPROVE'			=> append_sid('mcp', 'i=queue&amp;mode=approve_details&amp;f=' . $post_info['forum_id'] . '&amp;p=' . $post_id),
-		'U_MCP_REPORT'			=> append_sid('mcp', 'i=reports&amp;mode=report_details&amp;f=' . $post_info['forum_id'] . '&amp;p=' . $post_id),
-		'U_MCP_USER_NOTES'		=> append_sid('mcp', 'i=notes&amp;mode=user_notes&amp;u=' . $post_info['user_id']),
-		'U_MCP_WARN_USER'		=> (phpbb::$acl->acl_get('m_warn')) ? append_sid('mcp', 'i=warn&amp;mode=warn_user&amp;u=' . $post_info['user_id']) : '',
-		'U_VIEW_POST'			=> append_sid('viewtopic', 'f=' . $post_info['forum_id'] . '&amp;p=' . $post_info['post_id'] . '#p' . $post_info['post_id']),
-		'U_VIEW_TOPIC'			=> append_sid('viewtopic', 'f=' . $post_info['forum_id'] . '&amp;t=' . $post_info['topic_id']),
-
-		'MINI_POST_IMG'			=> ($post_unread) ? phpbb::$user->img('icon_post_target_unread', 'NEW_POST') : phpbb::$user->img('icon_post_target', 'POST'),
-
-		'RETURN_TOPIC'			=> sprintf(phpbb::$user->lang['RETURN_TOPIC'], '<a href="' . append_sid('viewtopic', "f={$post_info['forum_id']}&amp;p=$post_id") . "#p$post_id\">", '</a>'),
-		'RETURN_FORUM'			=> sprintf(phpbb::$user->lang['RETURN_FORUM'], '<a href="' . append_sid('viewforum', "f={$post_info['forum_id']}&amp;start={$start}") . '">', '</a>'),
-		'REPORTED_IMG'			=> phpbb::$user->img('icon_topic_reported', 'POST_REPORTED'),
-		'UNAPPROVED_IMG'		=> phpbb::$user->img('icon_topic_unapproved', 'POST_UNAPPROVED'),
-		'EDIT_IMG'				=> phpbb::$user->img('icon_post_edit', 'EDIT_POST'),
-		'SEARCH_IMG'			=> phpbb::$user->img('icon_user_search', 'SEARCH'),
-
-		'POST_AUTHOR_FULL'		=> get_username_string('full', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']),
-		'POST_AUTHOR_COLOUR'	=> get_username_string('colour', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']),
-		'POST_AUTHOR'			=> get_username_string('username', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']),
-		'U_POST_AUTHOR'			=> get_username_string('profile', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']),
-
-		'POST_PREVIEW'			=> $message,
-		'POST_SUBJECT'			=> $post_info['post_subject'],
-		'POST_DATE'				=> phpbb::$user->format_date($post_info['post_time']),
-		'POST_IP'				=> $post_info['poster_ip'],
-		'POST_IPADDR'			=> (phpbb::$acl->acl_get('m_info', $post_info['forum_id']) && request_var('lookup', '')) ? @gethostbyaddr($post_info['poster_ip']) : '',
-		'POST_ID'				=> $post_info['post_id'],
-
-		'U_LOOKUP_IP'			=> (phpbb::$acl->acl_get('m_info', $post_info['forum_id'])) ? "$url&amp;i=$id&amp;mode=$mode&amp;lookup={$post_info['poster_ip']}#ip" : '',
-		'U_WHOIS'				=> (phpbb::$acl->acl_get('m_info', $post_info['forum_id'])) ? append_sid('mcp', "i=$id&amp;mode=$mode&amp;action=whois&amp;p=$post_id&amp;ip={$post_info['poster_ip']}") : '',
-	));
-
-	// Get User Notes
-	$log_data = array();
-	$log_count = 0;
-	view_log('user', $log_data, $log_count, phpbb::$config['posts_per_page'], 0, 0, 0, $post_info['user_id']);
-
-	if ($log_count)
-	{
-		phpbb::$template->assign_var('S_USER_NOTES', true);
-
-		foreach ($log_data as $row)
-		{
-			phpbb::$template->assign_block_vars('usernotes', array(
-				'REPORT_BY'		=> $row['username_full'],
-				'REPORT_AT'		=> phpbb::$user->format_date($row['time']),
-				'ACTION'		=> $row['action'],
-				'ID'			=> $row['id'],
-			));
-		}
-	}
-
-	// Get Reports
-	if (phpbb::$acl->acl_get('m_', $post_info['forum_id']))
-	{
-		$sql = 'SELECT r.*, re.*, u.user_id, u.username
-			FROM ' . REPORTS_TABLE . ' r, ' . USERS_TABLE . ' u, ' . REPORTS_REASONS_TABLE . " re
-			WHERE r.post_id = $post_id
-				AND r.reason_id = re.reason_id
-				AND u.user_id = r.user_id
-			ORDER BY r.report_time DESC";
-		$result = phpbb::$db->sql_query($sql);
-
-		if ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			phpbb::$template->assign_var('S_SHOW_REPORTS', true);
-
-			do
-			{
-				// If the reason is defined within the language file, we will use the localized version, else just use the database entry...
-				if (isset(phpbb::$user->lang['report_reasons']['TITLE'][strtoupper($row['reason_title'])]) && isset(phpbb::$user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])]))
-				{
-					$row['reson_description'] = phpbb::$user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])];
-					$row['reason_title'] = phpbb::$user->lang['report_reasons']['TITLE'][strtoupper($row['reason_title'])];
-				}
-
-				phpbb::$template->assign_block_vars('reports', array(
-					'REPORT_ID'		=> $row['report_id'],
-					'REASON_TITLE'	=> $row['reason_title'],
-					'REASON_DESC'	=> $row['reason_description'],
-					'REPORTER'		=> ($row['user_id'] != ANONYMOUS) ? $row['username'] : phpbb::$user->lang['GUEST'],
-					'U_REPORTER'	=> ($row['user_id'] != ANONYMOUS) ? append_sid('memberlist', 'mode=viewprofile&amp;u=' . $row['user_id']) : '',
-					'USER_NOTIFY'	=> ($row['user_notify']) ? true : false,
-					'REPORT_TIME'	=> phpbb::$user->format_date($row['report_time']),
-					'REPORT_TEXT'	=> bbcode_nl2br(trim($row['report_text'])),
-				));
-			}
-			while ($row = phpbb::$db->sql_fetchrow($result));
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	// Get IP
-	if (phpbb::$acl->acl_get('m_info', $post_info['forum_id']))
-	{
-		$rdns_ip_num = request_var('rdns', '');
-
-		if ($rdns_ip_num != 'all')
-		{
-			phpbb::$template->assign_vars(array(
-				'U_LOOKUP_ALL'	=> "$url&amp;i=main&amp;mode=post_details&amp;rdns=all",
-			));
-		}
-
-		// Get other users who've posted under this IP
-		$sql = 'SELECT poster_id, COUNT(poster_id) as postings
-			FROM ' . POSTS_TABLE . "
-			WHERE poster_ip = '" . phpbb::$db->sql_escape($post_info['poster_ip']) . "'
-			GROUP BY poster_id
-			ORDER BY postings DESC";
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			// Fill the user select list with users who have posted under this IP
-			if ($row['poster_id'] != $post_info['poster_id'])
-			{
-				$users_ary[$row['poster_id']] = $row;
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if (sizeof($users_ary))
-		{
-			// Get the usernames
-			$sql = 'SELECT user_id, username
-				FROM ' . USERS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('user_id', array_keys($users_ary));
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$users_ary[$row['user_id']]['username'] = $row['username'];
-				$usernames_ary[utf8_clean_string($row['username'])] = $users_ary[$row['user_id']];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			foreach ($users_ary as $user_id => $user_row)
-			{
-				phpbb::$template->assign_block_vars('userrow', array(
-					'USERNAME'		=> ($user_id == ANONYMOUS) ? phpbb::$user->lang['GUEST'] : $user_row['username'],
-					'NUM_POSTS'		=> $user_row['postings'],
-					'L_POST_S'		=> ($user_row['postings'] == 1) ? phpbb::$user->lang['POST'] : phpbb::$user->lang['POSTS'],
-
-					'U_PROFILE'		=> ($user_id == ANONYMOUS) ? '' : append_sid('memberlist', 'mode=viewprofile&amp;u=' . $user_id),
-					'U_SEARCHPOSTS' => append_sid('search', 'author_id=' . $user_id . '&amp;sr=topics'),
-				));
-			}
-		}
-
-		// Get other IP's this user has posted under
-
-		// A compound index on poster_id, poster_ip (posts table) would help speed up this query a lot,
-		// but the extra size is only valuable if there are persons having more than a thousands posts.
-		// This is better left to the really really big forums.
-
-		$sql = 'SELECT poster_ip, COUNT(poster_ip) AS postings
-			FROM ' . POSTS_TABLE . '
-			WHERE poster_id = ' . $post_info['poster_id'] . "
-			GROUP BY poster_ip
-			ORDER BY postings DESC";
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$hostname = (($rdns_ip_num == $row['poster_ip'] || $rdns_ip_num == 'all') && $row['poster_ip']) ? @gethostbyaddr($row['poster_ip']) : '';
-
-			phpbb::$template->assign_block_vars('iprow', array(
-				'IP'			=> $row['poster_ip'],
-				'HOSTNAME'		=> $hostname,
-				'NUM_POSTS'		=> $row['postings'],
-				'L_POST_S'		=> ($row['postings'] == 1) ? phpbb::$user->lang['POST'] : phpbb::$user->lang['POSTS'],
-
-				'U_LOOKUP_IP'	=> ($rdns_ip_num == $row['poster_ip'] || $rdns_ip_num == 'all') ? '' : "$url&amp;i=$id&amp;mode=post_details&amp;rdns={$row['poster_ip']}#ip",
-				'U_WHOIS'		=> append_sid('mcp', "i=$id&amp;mode=$mode&amp;action=whois&amp;p=$post_id&amp;ip={$row['poster_ip']}"),
-			));
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$user_select = '';
-
-		if (sizeof($usernames_ary))
-		{
-			ksort($usernames_ary);
-
-			foreach ($usernames_ary as $row)
-			{
-				$user_select .= '<option value="' . $row['poster_id'] . '">' . $row['username'] . "</option>\n";
-			}
-		}
-
-		phpbb::$template->assign_var('S_USER_SELECT', $user_select);
-	}
-
-}
-
-/**
-* Change a post's poster
-*/
-function change_poster(&$post_info, $userdata)
-{
-	if (empty($userdata) || $userdata['user_id'] == $post_info['user_id'])
-	{
-		return;
-	}
-
-	$post_id = $post_info['post_id'];
-
-	$sql = 'UPDATE ' . POSTS_TABLE . "
-		SET poster_id = {$userdata['user_id']}
-		WHERE post_id = $post_id";
-	phpbb::$db->sql_query($sql);
-
-	// Resync topic/forum if needed
-	if ($post_info['topic_last_post_id'] == $post_id || $post_info['forum_last_post_id'] == $post_id || $post_info['topic_first_post_id'] == $post_id)
-	{
-		sync('topic', 'topic_id', $post_info['topic_id'], false, false);
-		sync('forum', 'forum_id', $post_info['forum_id'], false, false);
-	}
-
-	// Adjust post counts... only if the post is approved (else, it was not added the users post count anyway)
-	if ($post_info['post_postcount'] && $post_info['post_approved'])
-	{
-		$sql = 'UPDATE ' . USERS_TABLE . '
-			SET user_posts = user_posts - 1
-			WHERE user_id = ' . $post_info['user_id'] .'
-			AND user_posts > 0';
-		phpbb::$db->sql_query($sql);
-
-		$sql = 'UPDATE ' . USERS_TABLE . '
-			SET user_posts = user_posts + 1
-			WHERE user_id = ' . $userdata['user_id'];
-		phpbb::$db->sql_query($sql);
-	}
-
-	// Add posted to information for this topic for the new user
-	markread('post', $post_info['forum_id'], $post_info['topic_id'], time(), $userdata['user_id']);
-
-	// Remove the dotted topic option if the old user has no more posts within this topic
-	if (phpbb::$config['load_db_track'] && $post_info['user_id'] != ANONYMOUS)
-	{
-		$sql = 'SELECT topic_id
-			FROM ' . POSTS_TABLE . '
-			WHERE topic_id = ' . $post_info['topic_id'] . '
-				AND poster_id = ' . $post_info['user_id'];
-		$result = phpbb::$db->sql_query_limit($sql, 1);
-		$topic_id = (int) phpbb::$db->sql_fetchfield('topic_id');
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$topic_id)
-		{
-			$sql = 'DELETE FROM ' . TOPICS_POSTED_TABLE . '
-				WHERE user_id = ' . $post_info['user_id'] . '
-					AND topic_id = ' . $post_info['topic_id'];
-			phpbb::$db->sql_query($sql);
-		}
-	}
-
-	// change the poster_id within the attachments table, else the data becomes out of sync and errors displayed because of wrong ownership
-	if ($post_info['post_attachment'])
-	{
-		$sql = 'UPDATE ' . ATTACHMENTS_TABLE . '
-			SET poster_id = ' . $userdata['user_id'] . '
-			WHERE poster_id = ' . $post_info['user_id'] . '
-				AND post_msg_id = ' . $post_info['post_id'] . '
-				AND topic_id = ' . $post_info['topic_id'];
-		phpbb::$db->sql_query($sql);
-	}
-
-	// refresh search cache of this post
-	$search_type = basename(phpbb::$config['search_type']);
-
-	if (file_exists(PHPBB_ROOT_PATH . 'includes/search/' . $search_type . '.' . PHP_EXT))
-	{
-		require(PHPBB_ROOT_PATH . "includes/search/$search_type." . PHP_EXT);
-
-		// We do some additional checks in the module to ensure it can actually be utilised
-		$error = false;
-		$search = new $search_type($error);
-
-		if (!$error && method_exists($search, 'destroy_cache'))
-		{
-			$search->destroy_cache(array(), array($post_info['user_id'], $userdata['user_id']));
-		}
-	}
-
-	$from_username = $post_info['username'];
-	$to_username = $userdata['username'];
-
-	// Renew post info
-	$post_info = get_post_data(array($post_id), false, true);
-
-	if (!sizeof($post_info))
-	{
-		trigger_error('POST_NOT_EXIST');
-	}
-
-	$post_info = $post_info[$post_id];
-
-	// Now add log entry
-	add_log('mod', $post_info['forum_id'], $post_info['topic_id'], 'LOG_MCP_CHANGE_POSTER', $post_info['topic_title'], $from_username, $to_username);
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/mcp/mcp_queue.php b/phpBB/modules/mcp/mcp_queue.php
deleted file mode 100644
index ff4698b117..0000000000
--- a/phpBB/modules/mcp/mcp_queue.php
+++ /dev/null
@@ -1,1078 +0,0 @@
-<?php
-/**
-*
-* @package mcp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* mcp_queue
-* Handling the moderation queue
-* @package mcp
-*/
-class mcp_queue
-{
-	var $p_master;
-	var $u_action;
-
-	function __construct(&$p_master)
-	{
-		$this->p_master = &$p_master;
-	}
-
-	function main($id, $mode)
-	{
-		global $action;
-
-		include_once(PHPBB_ROOT_PATH . 'includes/functions_posting.' . PHP_EXT);
-
-		$forum_id = request_var('f', 0);
-		$start = request_var('start', 0);
-
-		$this->page_title = 'MCP_QUEUE';
-
-		switch ($action)
-		{
-			case 'approve':
-			case 'disapprove':
-				include_once(PHPBB_ROOT_PATH . 'includes/functions_messenger.' . PHP_EXT);
-
-				$post_id_list = request_var('post_id_list', array(0));
-
-				if (!sizeof($post_id_list))
-				{
-					trigger_error('NO_POST_SELECTED');
-				}
-
-				if ($action == 'approve')
-				{
-					approve_post($post_id_list, 'queue', $mode);
-				}
-				else
-				{
-					disapprove_post($post_id_list, 'queue', $mode);
-				}
-
-			break;
-		}
-
-		switch ($mode)
-		{
-			case 'approve_details':
-
-				$this->tpl_name = 'mcp_post';
-
-				phpbb::$user->add_lang(array('posting', 'viewtopic'));
-
-				$post_id = request_var('p', 0);
-				$topic_id = request_var('t', 0);
-
-				if ($topic_id)
-				{
-					$topic_info = get_topic_data(array($topic_id), 'm_approve');
-					if (isset($topic_info[$topic_id]['topic_first_post_id']))
-					{
-						$post_id = (int) $topic_info[$topic_id]['topic_first_post_id'];
-					}
-					else
-					{
-						$topic_id = 0;
-					}
-				}
-
-				$post_info = get_post_data(array($post_id), 'm_approve', true);
-
-				if (!sizeof($post_info))
-				{
-					trigger_error('NO_POST_SELECTED');
-				}
-
-				$post_info = $post_info[$post_id];
-
-				if ($post_info['topic_first_post_id'] != $post_id && topic_review($post_info['topic_id'], $post_info['forum_id'], 'topic_review', 0, false))
-				{
-					phpbb::$template->assign_vars(array(
-						'S_TOPIC_REVIEW'	=> true,
-						'TOPIC_TITLE'		=> $post_info['topic_title'],
-					));
-				}
-
-				$extensions = $attachments = $topic_tracking_info = array();
-
-				// Get topic tracking info
-				if (phpbb::$config['load_db_lastread'])
-				{
-					$tmp_topic_data = array($post_info['topic_id'] => $post_info);
-					$topic_tracking_info = get_topic_tracking($post_info['forum_id'], $post_info['topic_id'], $tmp_topic_data, array($post_info['forum_id'] => $post_info['forum_mark_time']));
-					unset($tmp_topic_data);
-				}
-				else
-				{
-					$topic_tracking_info = get_complete_topic_tracking($post_info['forum_id'], $post_info['topic_id']);
-				}
-
-				$post_unread = (isset($topic_tracking_info[$post_info['topic_id']]) && $post_info['post_time'] > $topic_tracking_info[$post_info['topic_id']]) ? true : false;
-
-				// Process message, leave it uncensored
-				$message = $post_info['post_text'];
-
-				if ($post_info['bbcode_bitfield'])
-				{
-					include_once(PHPBB_ROOT_PATH . 'includes/bbcode.' . PHP_EXT);
-					$bbcode = new bbcode($post_info['bbcode_bitfield']);
-					$bbcode->bbcode_second_pass($message, $post_info['bbcode_uid'], $post_info['bbcode_bitfield']);
-				}
-
-				$message = bbcode_nl2br($message);
-				$message = smiley_text($message);
-
-				if ($post_info['post_attachment'] && phpbb::$acl->acl_get('u_download') && phpbb::$acl->acl_get('f_download', $post_info['forum_id']))
-				{
-					$extensions = phpbb_cache::obtain_extensions_forum($post_info['forum_id']);
-
-					$sql = 'SELECT *
-						FROM ' . ATTACHMENTS_TABLE . '
-						WHERE post_msg_id = ' . $post_id . '
-							AND in_message = 0
-						ORDER BY filetime DESC, post_msg_id ASC';
-					$result = phpbb::$db->sql_query($sql);
-
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$attachments[] = $row;
-					}
-					phpbb::$db->sql_freeresult($result);
-
-					if (sizeof($attachments))
-					{
-						$update_count = array();
-						parse_attachments($post_info['forum_id'], $message, $attachments, $update_count);
-					}
-
-					// Display not already displayed Attachments for this post, we already parsed them. ;)
-					if (!empty($attachments))
-					{
-						phpbb::$template->assign_var('S_HAS_ATTACHMENTS', true);
-
-						foreach ($attachments as $attachment)
-						{
-							phpbb::$template->assign_block_vars('attachment', array(
-								'DISPLAY_ATTACHMENT'	=> $attachment,
-							));
-						}
-					}
-				}
-
-				$post_url = append_sid('viewtopic', 'f=' . $post_info['forum_id'] . '&amp;p=' . $post_info['post_id'] . '#p' . $post_info['post_id']);
-				$topic_url = append_sid('viewtopic', 'f=' . $post_info['forum_id'] . '&amp;t=' . $post_info['topic_id']);
-
-				phpbb::$template->assign_vars(array(
-					'S_MCP_QUEUE'			=> true,
-					'U_APPROVE_ACTION'		=> append_sid('mcp', "i=queue&amp;p=$post_id&amp;f=$forum_id"),
-					'S_CAN_VIEWIP'			=> phpbb::$acl->acl_get('m_info', $post_info['forum_id']),
-					'S_POST_REPORTED'		=> $post_info['post_reported'],
-					'S_POST_UNAPPROVED'		=> !$post_info['post_approved'],
-					'S_POST_LOCKED'			=> $post_info['post_edit_locked'],
-					'S_USER_NOTES'			=> true,
-
-					'U_EDIT'				=> (phpbb::$acl->acl_get('m_edit', $post_info['forum_id'])) ? append_sid('posting', "mode=edit&amp;f={$post_info['forum_id']}&amp;p={$post_info['post_id']}") : '',
-					'U_MCP_APPROVE'			=> append_sid('mcp', 'i=queue&amp;mode=approve_details&amp;f=' . $post_info['forum_id'] . '&amp;p=' . $post_id),
-					'U_MCP_REPORT'			=> append_sid('mcp', 'i=reports&amp;mode=report_details&amp;f=' . $post_info['forum_id'] . '&amp;p=' . $post_id),
-					'U_MCP_USER_NOTES'		=> append_sid('mcp', 'i=notes&amp;mode=user_notes&amp;u=' . $post_info['user_id']),
-					'U_MCP_WARN_USER'		=> (phpbb::$acl->acl_get('m_warn')) ? append_sid('mcp', 'i=warn&amp;mode=warn_user&amp;u=' . $post_info['user_id']) : '',
-					'U_VIEW_POST'			=> $post_url,
-					'U_VIEW_TOPIC'			=> $topic_url,
-
-					'MINI_POST_IMG'			=> ($post_unread) ? phpbb::$user->img('icon_post_target_unread', 'NEW_POST') : phpbb::$user->img('icon_post_target', 'POST'),
-
-					'RETURN_QUEUE'			=> sprintf(phpbb::$user->lang['RETURN_QUEUE'], '<a href="' . append_sid('mcp', 'i=queue' . (($topic_id) ? '&amp;mode=unapproved_topics' : '&amp;mode=unapproved_posts')) . "&amp;start=$start\">", '</a>'),
-					'RETURN_POST'			=> sprintf(phpbb::$user->lang['RETURN_POST'], '<a href="' . $post_url . '">', '</a>'),
-					'RETURN_TOPIC_SIMPLE'	=> sprintf(phpbb::$user->lang['RETURN_TOPIC_SIMPLE'], '<a href="' . $topic_url . '">', '</a>'),
-					'REPORTED_IMG'			=> phpbb::$user->img('icon_topic_reported', 'POST_REPORTED'),
-					'UNAPPROVED_IMG'		=> phpbb::$user->img('icon_topic_unapproved', 'POST_UNAPPROVED'),
-					'EDIT_IMG'				=> phpbb::$user->img('icon_post_edit', 'EDIT_POST'),
-
-					'POST_AUTHOR_FULL'		=> get_username_string('full', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']),
-					'POST_AUTHOR_COLOUR'	=> get_username_string('colour', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']),
-					'POST_AUTHOR'			=> get_username_string('username', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']),
-					'U_POST_AUTHOR'			=> get_username_string('profile', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']),
-
-					'POST_PREVIEW'			=> $message,
-					'POST_SUBJECT'			=> $post_info['post_subject'],
-					'POST_DATE'				=> phpbb::$user->format_date($post_info['post_time']),
-					'POST_IP'				=> $post_info['poster_ip'],
-					'POST_IPADDR'			=> (phpbb::$acl->acl_get('m_info', $post_info['forum_id']) && request_var('lookup', '')) ? @gethostbyaddr($post_info['poster_ip']) : '',
-					'POST_ID'				=> $post_info['post_id'],
-
-					'U_LOOKUP_IP'			=> (phpbb::$acl->acl_get('m_info', $post_info['forum_id'])) ? append_sid('mcp', 'i=queue&amp;mode=approve_details&amp;f=' . $post_info['forum_id'] . '&amp;p=' . $post_id . '&amp;lookup=' . $post_info['poster_ip']) . '#ip' : '',
-				));
-
-			break;
-
-			case 'unapproved_topics':
-			case 'unapproved_posts':
-				phpbb::$user->add_lang(array('viewtopic', 'viewforum'));
-
-				$topic_id = request_var('t', 0);
-				$forum_info = array();
-
-				if ($topic_id)
-				{
-					$topic_info = get_topic_data(array($topic_id));
-
-					if (!sizeof($topic_info))
-					{
-						trigger_error('TOPIC_NOT_EXIST');
-					}
-
-					$topic_info = $topic_info[$topic_id];
-					$forum_id = $topic_info['forum_id'];
-				}
-
-				$forum_list_approve = get_forum_list('m_approve', false, true);
-				$forum_list_read = array_flip(get_forum_list('f_read', true, true)); // Flipped so we can isset() the forum IDs
-
-				// Remove forums we cannot read
-				foreach ($forum_list_approve as $k => $forum_data)
-				{
-					if (!isset($forum_list_read[$forum_data['forum_id']]))
-					{
-						unset($forum_list_approve[$k]);
-					}
-				}
-				unset($forum_list_read);
-
-				if (!$forum_id)
-				{
-					$forum_list = array();
-					foreach ($forum_list_approve as $row)
-					{
-						$forum_list[] = $row['forum_id'];
-					}
-
-					if (!sizeof($forum_list))
-					{
-						trigger_error('NOT_MODERATOR');
-					}
-
-					$global_id = $forum_list[0];
-
-					$forum_list = implode(', ', $forum_list);
-
-					$sql = 'SELECT SUM(forum_topics) as sum_forum_topics
-						FROM ' . FORUMS_TABLE . "
-						WHERE forum_id IN (0, $forum_list)";
-					$result = phpbb::$db->sql_query($sql);
-					$forum_info['forum_topics'] = (int) phpbb::$db->sql_fetchfield('sum_forum_topics');
-					phpbb::$db->sql_freeresult($result);
-				}
-				else
-				{
-					$forum_info = get_forum_data(array($forum_id), 'm_approve');
-
-					if (!sizeof($forum_info))
-					{
-						trigger_error('NOT_MODERATOR');
-					}
-
-					$forum_info = $forum_info[$forum_id];
-					$forum_list = $forum_id;
-					$global_id = $forum_id;
-				}
-
-				$forum_options = '<option value="0"' . (($forum_id == 0) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang['ALL_FORUMS'] . '</option>';
-				foreach ($forum_list_approve as $row)
-				{
-					$forum_options .= '<option value="' . $row['forum_id'] . '"' . (($forum_id == $row['forum_id']) ? ' selected="selected"' : '') . '>' . str_repeat('&nbsp; &nbsp;', $row['padding']) . $row['forum_name'] . '</option>';
-				}
-
-				$sort_days = $total = 0;
-				$sort_key = $sort_dir = '';
-				$sort_by_sql = $sort_order_sql = array();
-				mcp_sorting($mode, $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id, $topic_id);
-
-				$forum_topics = ($total == -1) ? $forum_info['forum_topics'] : $total;
-				$limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : '';
-
-				$forum_names = array();
-
-				if ($mode == 'unapproved_posts')
-				{
-					$sql = 'SELECT p.post_id
-						FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t' . (($sort_order_sql[0] == 'u') ? ', ' . USERS_TABLE . ' u' : '') . "
-						WHERE p.forum_id IN (0, $forum_list)
-							AND p.post_approved = 0
-							" . (($sort_order_sql[0] == 'u') ? 'AND u.user_id = p.poster_id' : '') . '
-							' . (($topic_id) ? 'AND p.topic_id = ' . $topic_id : '') . "
-							AND t.topic_id = p.topic_id
-							AND t.topic_first_post_id <> p.post_id
-							$limit_time_sql
-						ORDER BY $sort_order_sql";
-					$result = phpbb::$db->sql_query_limit($sql, phpbb::$config['topics_per_page'], $start);
-
-					$i = 0;
-					$post_ids = array();
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$post_ids[] = $row['post_id'];
-						$row_num[$row['post_id']] = $i++;
-					}
-					phpbb::$db->sql_freeresult($result);
-
-					if (sizeof($post_ids))
-					{
-						$sql = 'SELECT t.topic_id, t.topic_title, t.forum_id, p.post_id, p.post_subject, p.post_username, p.poster_id, p.post_time, u.username, u.username_clean, u.user_colour
-							FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . USERS_TABLE . ' u
-							WHERE ' . phpbb::$db->sql_in_set('p.post_id', $post_ids) . '
-								AND t.topic_id = p.topic_id
-								AND u.user_id = p.poster_id
-							ORDER BY ' . $sort_order_sql;
-						$result = phpbb::$db->sql_query($sql);
-
-						$post_data = $rowset = array();
-						while ($row = phpbb::$db->sql_fetchrow($result))
-						{
-							if ($row['forum_id'])
-							{
-								$forum_names[] = $row['forum_id'];
-							}
-							$post_data[$row['post_id']] = $row;
-						}
-						phpbb::$db->sql_freeresult($result);
-
-						foreach ($post_ids as $post_id)
-						{
-							$rowset[] = $post_data[$post_id];
-						}
-						unset($post_data, $post_ids);
-					}
-					else
-					{
-						$rowset = array();
-					}
-				}
-				else
-				{
-					$sql = 'SELECT t.forum_id, t.topic_id, t.topic_title, t.topic_title AS post_subject, t.topic_time AS post_time, t.topic_poster AS poster_id, t.topic_first_post_id AS post_id, t.topic_first_poster_name AS username, t.topic_first_poster_colour AS user_colour
-						FROM ' . TOPICS_TABLE . " t
-						WHERE forum_id IN (0, $forum_list)
-							AND topic_approved = 0
-							$limit_time_sql
-						ORDER BY $sort_order_sql";
-					$result = phpbb::$db->sql_query_limit($sql, phpbb::$config['topics_per_page'], $start);
-
-					$rowset = array();
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						if ($row['forum_id'])
-						{
-							$forum_names[] = $row['forum_id'];
-						}
-						$rowset[] = $row;
-					}
-					phpbb::$db->sql_freeresult($result);
-				}
-
-				if (sizeof($forum_names))
-				{
-					// Select the names for the forum_ids
-					$sql = 'SELECT forum_id, forum_name
-						FROM ' . FORUMS_TABLE . '
-						WHERE ' . phpbb::$db->sql_in_set('forum_id', $forum_names);
-					$result = phpbb::$db->sql_query($sql, 3600);
-
-					$forum_names = array();
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$forum_names[$row['forum_id']] = $row['forum_name'];
-					}
-					phpbb::$db->sql_freeresult($result);
-				}
-
-				foreach ($rowset as $row)
-				{
-					$global_topic = ($row['forum_id']) ? false : true;
-					if ($global_topic)
-					{
-						$row['forum_id'] = $global_id;
-					}
-
-					if (empty($row['post_username']))
-					{
-						$row['post_username'] = phpbb::$user->lang['GUEST'];
-					}
-
-					phpbb::$template->assign_block_vars('postrow', array(
-						'U_TOPIC'			=> append_sid('viewtopic', 'f=' . $row['forum_id'] . '&amp;t=' . $row['topic_id']),
-						'U_VIEWFORUM'		=> (!$global_topic) ? append_sid('viewforum', 'f=' . $row['forum_id']) : '',
-						'U_VIEWPOST'		=> append_sid('viewtopic', 'f=' . $row['forum_id'] . '&amp;p=' . $row['post_id']) . (($mode == 'unapproved_posts') ? '#p' . $row['post_id'] : ''),
-						'U_VIEW_DETAILS'	=> append_sid('mcp', "i=queue&amp;start=$start&amp;mode=approve_details&amp;f={$row['forum_id']}&amp;p={$row['post_id']}" . (($mode == 'unapproved_topics') ? "&amp;t={$row['topic_id']}" : '')),
-
-						'POST_AUTHOR_FULL'		=> get_username_string('full', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']),
-						'POST_AUTHOR_COLOUR'	=> get_username_string('colour', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']),
-						'POST_AUTHOR'			=> get_username_string('username', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']),
-						'U_POST_AUTHOR'			=> get_username_string('profile', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']),
-
-						'POST_ID'		=> $row['post_id'],
-						'FORUM_NAME'	=> (!$global_topic) ? $forum_names[$row['forum_id']] : phpbb::$user->lang['GLOBAL_ANNOUNCEMENT'],
-						'POST_SUBJECT'	=> $row['post_subject'],
-						'TOPIC_TITLE'	=> $row['topic_title'],
-						'POST_TIME'		=> phpbb::$user->format_date($row['post_time']),
-					));
-				}
-				unset($rowset, $forum_names);
-
-				// Now display the page
-				phpbb::$template->assign_vars(array(
-					'L_DISPLAY_ITEMS'		=> ($mode == 'unapproved_posts') ? phpbb::$user->lang['DISPLAY_POSTS'] : phpbb::$user->lang['DISPLAY_TOPICS'],
-					'L_EXPLAIN'				=> ($mode == 'unapproved_posts') ? phpbb::$user->lang['MCP_QUEUE_UNAPPROVED_POSTS_EXPLAIN'] : phpbb::$user->lang['MCP_QUEUE_UNAPPROVED_TOPICS_EXPLAIN'],
-					'L_TITLE'				=> ($mode == 'unapproved_posts') ? phpbb::$user->lang['MCP_QUEUE_UNAPPROVED_POSTS'] : phpbb::$user->lang['MCP_QUEUE_UNAPPROVED_TOPICS'],
-					'L_ONLY_TOPIC'			=> ($topic_id) ? sprintf(phpbb::$user->lang['ONLY_TOPIC'], $topic_info['topic_title']) : '',
-
-					'S_FORUM_OPTIONS'		=> $forum_options,
-					'S_MCP_ACTION'			=> build_url(array('t', 'f', 'sd', 'st', 'sk')),
-					'S_TOPICS'				=> ($mode == 'unapproved_posts') ? false : true,
-
-					'PAGINATION'			=> generate_pagination($this->u_action . "&amp;f=$forum_id&amp;st=$sort_days&amp;sk=$sort_key&amp;sd=$sort_dir", $total, phpbb::$config['topics_per_page'], $start),
-					'PAGE_NUMBER'			=> on_page($total, phpbb::$config['topics_per_page'], $start),
-					'TOPIC_ID'				=> $topic_id,
-					'TOTAL'					=> ($total == 1) ? (($mode == 'unapproved_posts') ? phpbb::$user->lang['VIEW_TOPIC_POST'] : phpbb::$user->lang['VIEW_FORUM_TOPIC']) : sprintf((($mode == 'unapproved_posts') ? phpbb::$user->lang['VIEW_TOPIC_POSTS'] : phpbb::$user->lang['VIEW_FORUM_TOPICS']), $total),
-				));
-
-				$this->tpl_name = 'mcp_queue';
-			break;
-		}
-	}
-}
-
-/**
-* Approve Post/Topic
-*/
-function approve_post($post_id_list, $id, $mode)
-{
-	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
-	{
-		trigger_error('NOT_AUTHORISED');
-	}
-
-	$redirect = request_var('redirect', build_url(array('quickmod')));
-	$success_msg = '';
-
-	$s_hidden_fields = build_hidden_fields(array(
-		'i'				=> $id,
-		'mode'			=> $mode,
-		'post_id_list'	=> $post_id_list,
-		'action'		=> 'approve',
-		'redirect'		=> $redirect)
-	);
-
-	$post_info = get_post_data($post_id_list, 'm_approve');
-
-	if (confirm_box(true))
-	{
-		$notify_poster = phpbb_request::is_set('notify_poster');
-
-		// If Topic -> total_topics = total_topics+1, total_posts = total_posts+1, forum_topics = forum_topics+1, forum_posts = forum_posts+1
-		// If Post -> total_posts = total_posts+1, forum_posts = forum_posts+1, topic_replies = topic_replies+1
-
-		$total_topics = $total_posts = 0;
-		$forum_topics_posts = $topic_approve_sql = $topic_replies_sql = $post_approve_sql = $topic_id_list = $forum_id_list = $approve_log = array();
-		$user_posts_sql = $post_approved_list = array();
-
-		$update_forum_information = false;
-
-		foreach ($post_info as $post_id => $post_data)
-		{
-			if ($post_data['post_approved'])
-			{
-				$post_approved_list[] = $post_id;
-				continue;
-			}
-
-			$topic_id_list[$post_data['topic_id']] = 1;
-
-			if ($post_data['forum_id'])
-			{
-				$forum_id_list[$post_data['forum_id']] = 1;
-			}
-
-			// User post update (we do not care about topic or post, since user posts are strictly connected to posts)
-			// But we care about forums where post counts get not increased. ;)
-			if ($post_data['post_postcount'])
-			{
-				$user_posts_sql[$post_data['poster_id']] = (empty($user_posts_sql[$post_data['poster_id']])) ? 1 : $user_posts_sql[$post_data['poster_id']] + 1;
-			}
-
-			// Topic or Post. ;)
-			if ($post_data['topic_first_post_id'] == $post_id)
-			{
-				if ($post_data['forum_id'])
-				{
-					if (!isset($forum_topics_posts[$post_data['forum_id']]))
-					{
-						$forum_topics_posts[$post_data['forum_id']] = array(
-							'forum_posts'	=> 0,
-							'forum_topics'	=> 0
-						);
-					}
-
-					$total_topics++;
-					$forum_topics_posts[$post_data['forum_id']]['forum_topics']++;
-				}
-				$topic_approve_sql[] = $post_data['topic_id'];
-
-				$approve_log[] = array(
-					'type'			=> 'topic',
-					'post_subject'	=> $post_data['post_subject'],
-					'forum_id'		=> $post_data['forum_id'],
-					'topic_id'		=> $post_data['topic_id'],
-				);
-			}
-			else
-			{
-				if (!isset($topic_replies_sql[$post_data['topic_id']]))
-				{
-					$topic_replies_sql[$post_data['topic_id']] = 0;
-				}
-				$topic_replies_sql[$post_data['topic_id']]++;
-
-				$approve_log[] = array(
-					'type'			=> 'post',
-					'post_subject'	=> $post_data['post_subject'],
-					'forum_id'		=> $post_data['forum_id'],
-					'topic_id'		=> $post_data['topic_id'],
-				);
-			}
-
-			if ($post_data['forum_id'])
-			{
-				if (!isset($forum_topics_posts[$post_data['forum_id']]))
-				{
-					$forum_topics_posts[$post_data['forum_id']] = array(
-						'forum_posts'	=> 0,
-						'forum_topics'	=> 0
-					);
-				}
-
-				$total_posts++;
-				$forum_topics_posts[$post_data['forum_id']]['forum_posts']++;
-
-				// Increment by topic_replies if we approve a topic...
-				// This works because we do not adjust the topic_replies when re-approving a topic after an edit.
-				if ($post_data['topic_first_post_id'] == $post_id && $post_data['topic_replies'])
-				{
-					$total_posts += $post_data['topic_replies'];
-					$forum_topics_posts[$post_data['forum_id']]['forum_posts'] += $post_data['topic_replies'];
-				}
-			}
-
-			$post_approve_sql[] = $post_id;
-
-			// If the post is newer than the last post information stored we need to update the forum information
-			if ($post_data['post_time'] >= $post_data['forum_last_post_time'])
-			{
-				$update_forum_information = true;
-			}
-		}
-		$post_id_list = array_values(array_diff($post_id_list, $post_approved_list));
-		for ($i = 0, $size = sizeof($post_approved_list); $i < $size; $i++)
-		{
-			unset($post_info[$post_approved_list[$i]]);
-		}
-
-		if (sizeof($topic_approve_sql))
-		{
-			$sql = 'UPDATE ' . TOPICS_TABLE . '
-				SET topic_approved = 1
-				WHERE ' . phpbb::$db->sql_in_set('topic_id', $topic_approve_sql);
-			phpbb::$db->sql_query($sql);
-		}
-
-		if (sizeof($post_approve_sql))
-		{
-			$sql = 'UPDATE ' . POSTS_TABLE . '
-				SET post_approved = 1
-				WHERE ' . phpbb::$db->sql_in_set('post_id', $post_approve_sql);
-			phpbb::$db->sql_query($sql);
-		}
-
-		foreach ($approve_log as $log_data)
-		{
-			add_log('mod', $log_data['forum_id'], $log_data['topic_id'], ($log_data['type'] == 'topic') ? 'LOG_TOPIC_APPROVED' : 'LOG_POST_APPROVED', $log_data['post_subject']);
-		}
-
-		if (sizeof($topic_replies_sql))
-		{
-			foreach ($topic_replies_sql as $topic_id => $num_replies)
-			{
-				$sql = 'UPDATE ' . TOPICS_TABLE . "
-					SET topic_replies = topic_replies + $num_replies
-					WHERE topic_id = $topic_id";
-				phpbb::$db->sql_query($sql);
-			}
-		}
-
-		if (sizeof($forum_topics_posts))
-		{
-			foreach ($forum_topics_posts as $forum_id => $row)
-			{
-				$sql = 'UPDATE ' . FORUMS_TABLE . '
-					SET ';
-				$sql .= ($row['forum_topics']) ? "forum_topics = forum_topics + {$row['forum_topics']}" : '';
-				$sql .= ($row['forum_topics'] && $row['forum_posts']) ? ', ' : '';
-				$sql .= ($row['forum_posts']) ? "forum_posts = forum_posts + {$row['forum_posts']}" : '';
-				$sql .= " WHERE forum_id = $forum_id";
-
-				phpbb::$db->sql_query($sql);
-			}
-		}
-
-		if (sizeof($user_posts_sql))
-		{
-			// Try to minimize the query count by merging users with the same post count additions
-			$user_posts_update = array();
-
-			foreach ($user_posts_sql as $user_id => $user_posts)
-			{
-				$user_posts_update[$user_posts][] = $user_id;
-			}
-
-			foreach ($user_posts_update as $user_posts => $user_id_ary)
-			{
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_posts = user_posts + ' . $user_posts . '
-					WHERE ' . phpbb::$db->sql_in_set('user_id', $user_id_ary);
-				phpbb::$db->sql_query($sql);
-			}
-		}
-
-		if ($total_topics)
-		{
-			set_config_count('num_topics', $total_topics, true);
-		}
-
-		if ($total_posts)
-		{
-			set_config_count('num_posts', $total_posts, true);
-		}
-		unset($topic_approve_sql, $topic_replies_sql, $post_approve_sql);
-
-		update_post_information('topic', array_keys($topic_id_list));
-
-		if ($update_forum_information)
-		{
-			update_post_information('forum', array_keys($forum_id_list));
-		}
-		unset($topic_id_list, $forum_id_list);
-
-		$messenger = new messenger();
-
-		// Notify Poster?
-		if ($notify_poster)
-		{
-			foreach ($post_info as $post_id => $post_data)
-			{
-				if ($post_data['poster_id'] == ANONYMOUS)
-				{
-					continue;
-				}
-
-				$email_template = ($post_data['post_id'] == $post_data['topic_first_post_id'] && $post_data['post_id'] == $post_data['topic_last_post_id']) ? 'topic_approved' : 'post_approved';
-
-				$messenger->template($email_template, $post_data['user_lang']);
-
-				$messenger->to($post_data['user_email'], $post_data['username']);
-				$messenger->im($post_data['user_jabber'], $post_data['username']);
-
-				$messenger->assign_vars(array(
-					'USERNAME'		=> htmlspecialchars_decode($post_data['username']),
-					'POST_SUBJECT'	=> htmlspecialchars_decode(censor_text($post_data['post_subject'])),
-					'TOPIC_TITLE'	=> htmlspecialchars_decode(censor_text($post_data['topic_title'])),
-
-					'U_VIEW_TOPIC'	=> generate_board_url() . '/viewtopic.' . PHP_EXT . "?f={$post_data['forum_id']}&t={$post_data['topic_id']}&e=0",
-					'U_VIEW_POST'	=> generate_board_url() . '/viewtopic.' . PHP_EXT . "?f={$post_data['forum_id']}&t={$post_data['topic_id']}&p=$post_id&e=$post_id")
-				);
-
-				$messenger->send($post_data['user_notify_type']);
-			}
-		}
-
-		$messenger->save_queue();
-
-		// Send out normal user notifications
-		$email_sig = str_replace('<br />', "\n", "-- \n" . phpbb::$config['board_email_sig']);
-
-		foreach ($post_info as $post_id => $post_data)
-		{
-			if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
-			{
-				// Forum Notifications
-				user_notification('post', $post_data['topic_title'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id);
-			}
-			else
-			{
-				// Topic Notifications
-				user_notification('reply', $post_data['post_subject'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id);
-			}
-		}
-
-		if (sizeof($post_id_list) == 1)
-		{
-			$post_data = $post_info[$post_id_list[0]];
-			$post_url = append_sid('viewtopic', "f={$post_data['forum_id']}&amp;t={$post_data['topic_id']}&amp;p={$post_data['post_id']}") . '#p' . $post_data['post_id'];
-		}
-		unset($post_info);
-
-		if ($total_topics)
-		{
-			$success_msg = ($total_topics == 1) ? 'TOPIC_APPROVED_SUCCESS' : 'TOPICS_APPROVED_SUCCESS';
-		}
-		else
-		{
-			$success_msg = (sizeof($post_id_list) + sizeof($post_approved_list) == 1) ? 'POST_APPROVED_SUCCESS' : 'POSTS_APPROVED_SUCCESS';
-		}
-	}
-	else
-	{
-		$show_notify = false;
-
-		foreach ($post_info as $post_data)
-		{
-			if ($post_data['poster_id'] == ANONYMOUS)
-			{
-				continue;
-			}
-			else
-			{
-				$show_notify = true;
-				break;
-			}
-		}
-
-		phpbb::$template->assign_vars(array(
-			'S_NOTIFY_POSTER'	=> $show_notify,
-			'S_APPROVE'			=> true,
-		));
-
-		confirm_box(false, 'APPROVE_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
-	}
-
-	$redirect = request_var('redirect', 'index.' . PHP_EXT);
-	$redirect = reapply_sid($redirect);
-
-	if (!$success_msg)
-	{
-		redirect($redirect);
-	}
-	else
-	{
-		meta_refresh(3, $redirect);
-
-		// If approving one post, also give links back to post...
-		$add_message = '';
-		if (sizeof($post_id_list) == 1 && !empty($post_url))
-		{
-			$add_message = '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_POST'], '<a href="' . $post_url . '">', '</a>');
-		}
-
-		trigger_error(phpbb::$user->lang[$success_msg] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>') . $add_message);
-	}
-}
-
-/**
-* Disapprove Post/Topic
-*/
-function disapprove_post($post_id_list, $id, $mode)
-{
-	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
-	{
-		trigger_error('NOT_AUTHORISED');
-	}
-
-	$redirect = request_var('redirect', build_url(array('t', 'mode', 'quickmod')) . "&amp;mode=$mode");
-	$reason = utf8_normalize_nfc(request_var('reason', '', true));
-	$reason_id = request_var('reason_id', 0);
-	$success_msg = $additional_msg = '';
-
-	$s_hidden_fields = build_hidden_fields(array(
-		'i'				=> $id,
-		'mode'			=> $mode,
-		'post_id_list'	=> $post_id_list,
-		'action'		=> 'disapprove',
-		'redirect'		=> $redirect)
-	);
-
-	$notify_poster = phpbb_request::is_set('notify_poster');
-	$disapprove_reason = '';
-
-	if ($reason_id)
-	{
-		$sql = 'SELECT reason_title, reason_description
-			FROM ' . REPORTS_REASONS_TABLE . "
-			WHERE reason_id = $reason_id";
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$row || (!$reason && strtolower($row['reason_title']) == 'other'))
-		{
-			$additional_msg = phpbb::$user->lang['NO_REASON_DISAPPROVAL'];
-		}
-		else
-		{
-			// If the reason is defined within the language file, we will use the localized version, else just use the database entry...
-			$disapprove_reason = (strtolower($row['reason_title']) != 'other') ? ((isset(phpbb::$user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])])) ? phpbb::$user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])] : $row['reason_description']) : '';
-			$disapprove_reason .= ($reason) ? "\n\n" . $reason : '';
-
-			if (isset(phpbb::$user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])]))
-			{
-				$disapprove_reason_lang = strtoupper($row['reason_title']);
-			}
-
-			$email_disapprove_reason = $disapprove_reason;
-		}
-	}
-
-	$post_info = get_post_data($post_id_list, 'm_approve');
-
-	if (!$additional_message && confirm_box(true))
-	{
-
-		// If Topic -> forum_topics_real -= 1
-		// If Post -> topic_replies_real -= 1
-
-		$num_disapproved = 0;
-		$forum_topics_real = $topic_id_list = $forum_id_list = $topic_replies_real_sql = $post_disapprove_sql = $disapprove_log = array();
-
-		foreach ($post_info as $post_id => $post_data)
-		{
-			$topic_id_list[$post_data['topic_id']] = 1;
-
-			if ($post_data['forum_id'])
-			{
-				$forum_id_list[$post_data['forum_id']] = 1;
-			}
-
-			// Topic or Post. ;)
-			/**
-			* @todo this probably is a different method than the one used by delete_posts, does this cause counter inconsistency?
-			*/
-			if ($post_data['topic_first_post_id'] == $post_id && $post_data['topic_last_post_id'] == $post_id)
-			{
-				if ($post_data['forum_id'])
-				{
-					if (!isset($forum_topics_real[$post_data['forum_id']]))
-					{
-						$forum_topics_real[$post_data['forum_id']] = 0;
-					}
-					$forum_topics_real[$post_data['forum_id']]++;
-					$num_disapproved++;
-				}
-
-				$disapprove_log[] = array(
-					'type'			=> 'topic',
-					'post_subject'	=> $post_data['post_subject'],
-					'forum_id'		=> $post_data['forum_id'],
-					'topic_id'		=> 0, // useless to log a topic id, as it will be deleted
-				);
-			}
-			else
-			{
-				if (!isset($topic_replies_real_sql[$post_data['topic_id']]))
-				{
-					$topic_replies_real_sql[$post_data['topic_id']] = 0;
-				}
-				$topic_replies_real_sql[$post_data['topic_id']]++;
-
-				$disapprove_log[] = array(
-					'type'			=> 'post',
-					'post_subject'	=> $post_data['post_subject'],
-					'forum_id'		=> $post_data['forum_id'],
-					'topic_id'		=> $post_data['topic_id'],
-				);
-			}
-
-			$post_disapprove_sql[] = $post_id;
-		}
-
-		unset($post_data);
-
-		if (sizeof($forum_topics_real))
-		{
-			foreach ($forum_topics_real as $forum_id => $topics_real)
-			{
-				$sql = 'UPDATE ' . FORUMS_TABLE . "
-					SET forum_topics_real = forum_topics_real - $topics_real
-					WHERE forum_id = $forum_id";
-				phpbb::$db->sql_query($sql);
-			}
-		}
-
-		if (sizeof($topic_replies_real_sql))
-		{
-			foreach ($topic_replies_real_sql as $topic_id => $num_replies)
-			{
-				$sql = 'UPDATE ' . TOPICS_TABLE . "
-					SET topic_replies_real = topic_replies_real - $num_replies
-					WHERE topic_id = $topic_id";
-				phpbb::$db->sql_query($sql);
-			}
-		}
-
-		if (sizeof($post_disapprove_sql))
-		{
-			if (!function_exists('delete_posts'))
-			{
-				include_once(PHPBB_ROOT_PATH . 'includes/functions_admin.' . PHP_EXT);
-			}
-
-			// We do not check for permissions here, because the moderator allowed approval/disapproval should be allowed to delete the disapproved posts
-			delete_posts('post_id', $post_disapprove_sql);
-
-			foreach ($disapprove_log as $log_data)
-			{
-				add_log('mod', $log_data['forum_id'], $log_data['topic_id'], ($log_data['type'] == 'topic') ? 'LOG_TOPIC_DISAPPROVED' : 'LOG_POST_DISAPPROVED', $log_data['post_subject'], $disapprove_reason);
-			}
-		}
-		unset($post_disapprove_sql, $topic_replies_real_sql);
-
-		update_post_information('topic', array_keys($topic_id_list));
-
-		if (sizeof($forum_id_list))
-		{
-			update_post_information('forum', array_keys($forum_id_list));
-		}
-		unset($topic_id_list, $forum_id_list);
-
-		$messenger = new messenger();
-
-		// Notify Poster?
-		if ($notify_poster)
-		{
-			$lang_reasons = array();
-
-			foreach ($post_info as $post_id => $post_data)
-			{
-				if ($post_data['poster_id'] == ANONYMOUS)
-				{
-					continue;
-				}
-
-				if (isset($disapprove_reason_lang))
-				{
-					// Okay we need to get the reason from the posters language
-					if (!isset($lang_reasons[$post_data['user_lang']]))
-					{
-						// Assign the current users translation as the default, this is not ideal but getting the board default adds another layer of complexity.
-						$lang_reasons[$post_data['user_lang']] = phpbb::$user->lang['report_reasons']['DESCRIPTION'][$disapprove_reason_lang];
-
-						// Only load up the language pack if the language is different to the current one
-						if ($post_data['user_lang'] != phpbb::$user->lang_name && file_exists(PHPBB_ROOT_PATH . '/language/' . $post_data['user_lang'] . '/mcp.' . PHP_EXT))
-						{
-							// Load up the language pack
-							$lang = array();
-							@include(PHPBB_ROOT_PATH . '/language/' . $post_data['user_lang'] . '/mcp.' . PHP_EXT);
-
-							// If we find the reason in this language pack use it
-							if (isset($lang['report_reasons']['DESCRIPTION'][$disapprove_reason_lang]))
-							{
-								$lang_reasons[$post_data['user_lang']] = $lang['report_reasons']['DESCRIPTION'][$disapprove_reason_lang];
-							}
-
-							unset($lang); // Free memory
-						}
-					}
-
-					$email_disapprove_reason = $lang_reasons[$post_data['user_lang']];
-					$email_disapprove_reason .= ($reason) ? "\n\n" . $reason : '';
-				}
-
-				$email_template = ($post_data['post_id'] == $post_data['topic_first_post_id'] && $post_data['post_id'] == $post_data['topic_last_post_id']) ? 'topic_disapproved' : 'post_disapproved';
-
-				$messenger->template($email_template, $post_data['user_lang']);
-
-				$messenger->to($post_data['user_email'], $post_data['username']);
-				$messenger->im($post_data['user_jabber'], $post_data['username']);
-
-				$messenger->assign_vars(array(
-					'USERNAME'		=> htmlspecialchars_decode($post_data['username']),
-					'REASON'		=> htmlspecialchars_decode($email_disapprove_reason),
-					'POST_SUBJECT'	=> htmlspecialchars_decode(censor_text($post_data['post_subject'])),
-					'TOPIC_TITLE'	=> htmlspecialchars_decode(censor_text($post_data['topic_title'])))
-				);
-
-				$messenger->send($post_data['user_notify_type']);
-			}
-
-			unset($lang_reasons);
-		}
-		unset($post_info, $disapprove_reason, $email_disapprove_reason, $disapprove_reason_lang);
-
-		$messenger->save_queue();
-
-		if (sizeof($forum_topics_real))
-		{
-			$success_msg = ($num_disapproved == 1) ? 'TOPIC_DISAPPROVED_SUCCESS' : 'TOPICS_DISAPPROVED_SUCCESS';
-		}
-		else
-		{
-			$success_msg = (sizeof($post_id_list) == 1) ? 'POST_DISAPPROVED_SUCCESS' : 'POSTS_DISAPPROVED_SUCCESS';
-		}
-	}
-	else
-	{
-		include_once(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-
-		display_reasons($reason_id);
-
-		$show_notify = false;
-
-		foreach ($post_info as $post_data)
-		{
-			if ($post_data['poster_id'] == ANONYMOUS)
-			{
-				continue;
-			}
-			else
-			{
-				$show_notify = true;
-				break;
-			}
-		}
-
-		phpbb::$template->assign_vars(array(
-			'S_NOTIFY_POSTER'	=> $show_notify,
-			'S_APPROVE'			=> false,
-			'REASON'			=> $reason,
-			'ADDITIONAL_MSG'	=> $additional_msg,
-		));
-
-		confirm_box(false, 'DISAPPROVE_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
-	}
-
-	$redirect = request_var('redirect', 'index.' . PHP_EXT);
-	$redirect = reapply_sid($redirect);
-
-	if (!$success_msg)
-	{
-		redirect($redirect);
-	}
-	else
-	{
-		meta_refresh(3, $redirect);
-		trigger_error(phpbb::$user->lang[$success_msg] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>'));
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/mcp/mcp_reports.php b/phpBB/modules/mcp/mcp_reports.php
deleted file mode 100644
index 01f8a8fac6..0000000000
--- a/phpBB/modules/mcp/mcp_reports.php
+++ /dev/null
@@ -1,652 +0,0 @@
-<?php
-/**
-*
-* @package mcp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* mcp_reports
-* Handling the reports queue
-* @package mcp
-*/
-class mcp_reports
-{
-	var $p_master;
-	var $u_action;
-
-	function __construct(&$p_master)
-	{
-		$this->p_master = &$p_master;
-	}
-
-	function main($id, $mode)
-	{
-		global $action;
-
-		include_once(PHPBB_ROOT_PATH . 'includes/functions_posting.' . PHP_EXT);
-
-		$forum_id = request_var('f', 0);
-		$start = request_var('start', 0);
-
-		$this->page_title = 'MCP_REPORTS';
-
-		switch ($action)
-		{
-			case 'close':
-			case 'delete':
-				include_once(PHPBB_ROOT_PATH . 'includes/functions_messenger.' . PHP_EXT);
-
-				$report_id_list = request_var('report_id_list', array(0));
-
-				if (!sizeof($report_id_list))
-				{
-					trigger_error('NO_REPORT_SELECTED');
-				}
-
-				close_report($report_id_list, $mode, $action);
-
-			break;
-		}
-
-		switch ($mode)
-		{
-			case 'report_details':
-
-				phpbb::$user->add_lang(array('posting', 'viewforum', 'viewtopic'));
-
-				$post_id = request_var('p', 0);
-
-				// closed reports are accessed by report id
-				$report_id = request_var('r', 0);
-
-				$sql = 'SELECT r.post_id, r.user_id, r.report_id, r.report_closed, report_time, r.report_text, rr.reason_title, rr.reason_description, u.username, u.username_clean, u.user_colour
-					FROM ' . REPORTS_TABLE . ' r, ' . REPORTS_REASONS_TABLE . ' rr, ' . USERS_TABLE . ' u
-					WHERE ' . (($report_id) ? 'r.report_id = ' . $report_id : "r.post_id = $post_id") . '
-						AND rr.reason_id = r.reason_id
-						AND r.user_id = u.user_id
-					ORDER BY report_closed ASC';
-				$result = phpbb::$db->sql_query_limit($sql, 1);
-				$report = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$report)
-				{
-					trigger_error('NO_REPORT');
-				}
-
-				if (!$report_id && $report['report_closed'])
-				{
-					trigger_error('REPORT_CLOSED');
-				}
-
-				$post_id = $report['post_id'];
-				$report_id = $report['report_id'];
-
-				$post_info = get_post_data(array($post_id), 'm_report', true);
-
-				if (!sizeof($post_info))
-				{
-					trigger_error('NO_REPORT_SELECTED');
-				}
-
-				$post_info = $post_info[$post_id];
-
-				$reason = array('title' => $report['reason_title'], 'description' => $report['reason_description']);
-				if (isset(phpbb::$user->lang['report_reasons']['TITLE'][strtoupper($reason['title'])]) && isset(phpbb::$user->lang['report_reasons']['DESCRIPTION'][strtoupper($reason['title'])]))
-				{
-					$reason['description'] = phpbb::$user->lang['report_reasons']['DESCRIPTION'][strtoupper($reason['title'])];
-					$reason['title'] = phpbb::$user->lang['report_reasons']['TITLE'][strtoupper($reason['title'])];
-				}
-
-				if (topic_review($post_info['topic_id'], $post_info['forum_id'], 'topic_review', 0, false))
-				{
-					phpbb::$template->assign_vars(array(
-						'S_TOPIC_REVIEW'	=> true,
-						'TOPIC_TITLE'		=> $post_info['topic_title'],
-					));
-				}
-
-				$topic_tracking_info = $extensions = $attachments = array();
-				// Get topic tracking info
-				if (phpbb::$config['load_db_lastread'])
-				{
-					$tmp_topic_data = array($post_info['topic_id'] => $post_info);
-					$topic_tracking_info = get_topic_tracking($post_info['forum_id'], $post_info['topic_id'], $tmp_topic_data, array($post_info['forum_id'] => $post_info['forum_mark_time']));
-					unset($tmp_topic_data);
-				}
-				else
-				{
-					$topic_tracking_info = get_complete_topic_tracking($post_info['forum_id'], $post_info['topic_id']);
-				}
-
-				$post_unread = (isset($topic_tracking_info[$post_info['topic_id']]) && $post_info['post_time'] > $topic_tracking_info[$post_info['topic_id']]) ? true : false;
-
-				// Process message, leave it uncensored
-				$message = $post_info['post_text'];
-
-				if ($post_info['bbcode_bitfield'])
-				{
-					include_once(PHPBB_ROOT_PATH . 'includes/bbcode.' . PHP_EXT);
-					$bbcode = new bbcode($post_info['bbcode_bitfield']);
-					$bbcode->bbcode_second_pass($message, $post_info['bbcode_uid'], $post_info['bbcode_bitfield']);
-				}
-
-				$message = bbcode_nl2br($message);
-				$message = smiley_text($message);
-
-				if ($post_info['post_attachment'] && phpbb::$acl->acl_get('u_download') && phpbb::$acl->acl_get('f_download', $post_info['forum_id']))
-				{
-					$extensions = phpbb_cache::obtain_extensions_forum($post_info['forum_id']);
-
-					$sql = 'SELECT *
-						FROM ' . ATTACHMENTS_TABLE . '
-						WHERE post_msg_id = ' . $post_id . '
-							AND in_message = 0
-						ORDER BY filetime DESC, post_msg_id ASC';
-					$result = phpbb::$db->sql_query($sql);
-
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$attachments[] = $row;
-					}
-					phpbb::$db->sql_freeresult($result);
-
-					if (sizeof($attachments))
-					{
-						$update_count = array();
-						parse_attachments($post_info['forum_id'], $message, $attachments, $update_count);
-					}
-
-					// Display not already displayed Attachments for this post, we already parsed them. ;)
-					if (!empty($attachments))
-					{
-						phpbb::$template->assign_var('S_HAS_ATTACHMENTS', true);
-
-						foreach ($attachments as $attachment)
-						{
-							phpbb::$template->assign_block_vars('attachment', array(
-								'DISPLAY_ATTACHMENT'	=> $attachment,
-							));
-						}
-					}
-				}
-
-				phpbb::$template->assign_vars(array(
-					'S_MCP_REPORT'			=> true,
-					'S_CLOSE_ACTION'		=> append_sid('mcp', 'i=reports&amp;mode=report_details&amp;f=' . $post_info['forum_id'] . '&amp;p=' . $post_id),
-					'S_CAN_VIEWIP'			=> phpbb::$acl->acl_get('m_info', $post_info['forum_id']),
-					'S_POST_REPORTED'		=> $post_info['post_reported'],
-					'S_POST_UNAPPROVED'		=> !$post_info['post_approved'],
-					'S_POST_LOCKED'			=> $post_info['post_edit_locked'],
-					'S_USER_NOTES'			=> true,
-
-					'U_EDIT'					=> (phpbb::$acl->acl_get('m_edit', $post_info['forum_id'])) ? append_sid('posting', "mode=edit&amp;f={$post_info['forum_id']}&amp;p={$post_info['post_id']}") : '',
-					'U_MCP_APPROVE'				=> append_sid('mcp', 'i=queue&amp;mode=approve_details&amp;f=' . $post_info['forum_id'] . '&amp;p=' . $post_id),
-					'U_MCP_REPORT'				=> append_sid('mcp', 'i=reports&amp;mode=report_details&amp;f=' . $post_info['forum_id'] . '&amp;p=' . $post_id),
-					'U_MCP_REPORTER_NOTES'		=> append_sid('mcp', 'i=notes&amp;mode=user_notes&amp;u=' . $report['user_id']),
-					'U_MCP_USER_NOTES'			=> append_sid('mcp', 'i=notes&amp;mode=user_notes&amp;u=' . $post_info['user_id']),
-					'U_MCP_WARN_REPORTER'		=> (phpbb::$acl->acl_get('m_warn')) ? append_sid('mcp', 'i=warn&amp;mode=warn_user&amp;u=' . $report['user_id']) : '',
-					'U_MCP_WARN_USER'			=> (phpbb::$acl->acl_get('m_warn')) ? append_sid('mcp', 'i=warn&amp;mode=warn_user&amp;u=' . $post_info['user_id']) : '',
-					'U_VIEW_FORUM'				=> append_sid('viewforum', 'f=' . $post_info['forum_id']),
-					'U_VIEW_POST'				=> append_sid('viewtopic', 'f=' . $post_info['forum_id'] . '&amp;p=' . $post_info['post_id'] . '#p' . $post_info['post_id']),
-					'U_VIEW_TOPIC'				=> append_sid('viewtopic', 'f=' . $post_info['forum_id'] . '&amp;t=' . $post_info['topic_id']),
-
-					'EDIT_IMG'				=> phpbb::$user->img('icon_post_edit', 'EDIT_POST'),
-					'MINI_POST_IMG'			=> ($post_unread) ? phpbb::$user->img('icon_post_target_unread', 'NEW_POST') : phpbb::$user->img('icon_post_target', 'POST'),
-					'UNAPPROVED_IMG'		=> phpbb::$user->img('icon_topic_unapproved', 'POST_UNAPPROVED'),
-
-					'RETURN_REPORTS'			=> sprintf(phpbb::$user->lang['RETURN_REPORTS'], '<a href="' . append_sid('mcp', 'i=reports' . (($post_info['post_reported']) ? '&amp;mode=reports' : '&amp;mode=reports_closed') . '&amp;start=' . $start . '&amp;f=' . $post_info['forum_id']) . '">', '</a>'),
-					'REPORTED_IMG'				=> phpbb::$user->img('icon_topic_reported', 'POST_REPORTED'),
-					'REPORT_DATE'				=> phpbb::$user->format_date($report['report_time']),
-					'REPORT_ID'					=> $report_id,
-					'REPORT_REASON_TITLE'		=> $reason['title'],
-					'REPORT_REASON_DESCRIPTION'	=> $reason['description'],
-					'REPORT_TEXT'				=> $report['report_text'],
-
-					'POST_AUTHOR_FULL'		=> get_username_string('full', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']),
-					'POST_AUTHOR_COLOUR'	=> get_username_string('colour', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']),
-					'POST_AUTHOR'			=> get_username_string('username', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']),
-					'U_POST_AUTHOR'			=> get_username_string('profile', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']),
-
-					'REPORTER_FULL'				=> get_username_string('full', $report['user_id'], $report['username'], $report['user_colour']),
-					'REPORTER_COLOUR'			=> get_username_string('colour', $report['user_id'], $report['username'], $report['user_colour']),
-					'REPORTER_NAME'				=> get_username_string('username', $report['user_id'], $report['username'], $report['user_colour']),
-					'U_VIEW_REPORTER_PROFILE'	=> get_username_string('profile', $report['user_id'], $report['username'], $report['user_colour']),
-
-					'POST_PREVIEW'			=> $message,
-					'POST_SUBJECT'			=> ($post_info['post_subject']) ? $post_info['post_subject'] : phpbb::$user->lang['NO_SUBJECT'],
-					'POST_DATE'				=> phpbb::$user->format_date($post_info['post_time']),
-					'POST_IP'				=> $post_info['poster_ip'],
-					'POST_IPADDR'			=> (phpbb::$acl->acl_get('m_info', $post_info['forum_id']) && request_var('lookup', '')) ? @gethostbyaddr($post_info['poster_ip']) : '',
-					'POST_ID'				=> $post_info['post_id'],
-
-					'U_LOOKUP_IP'			=> (phpbb::$acl->acl_get('m_info', $post_info['forum_id'])) ? $this->u_action . '&amp;r=' . $report_id . '&amp;p=' . $post_id . '&amp;f=' . $forum_id . '&amp;lookup=' . $post_info['poster_ip'] . '#ip' : '',
-				));
-
-				$this->tpl_name = 'mcp_post';
-
-			break;
-
-			case 'reports':
-			case 'reports_closed':
-				$topic_id = request_var('t', 0);
-
-				$forum_info = array();
-				$forum_list_reports = get_forum_list('m_report', false, true);
-				$forum_list_read = array_flip(get_forum_list('f_read', true, true)); // Flipped so we can isset() the forum IDs
-
-				// Remove forums we cannot read
-				foreach ($forum_list_reports as $k => $forum_data)
-				{
-					if (!isset($forum_list_read[$forum_data['forum_id']]))
-					{
-						unset($forum_list_reports[$k]);
-					}
-				}
-				unset($forum_list_read);
-
-				if ($topic_id && $forum_id)
-				{
-					$topic_info = get_topic_data(array($topic_id));
-
-					if (!sizeof($topic_info))
-					{
-						trigger_error('TOPIC_NOT_EXIST');
-					}
-
-					$topic_info = $topic_info[$topic_id];
-					$forum_id = $topic_info['forum_id'];
-				}
-				else if ($topic_id && !$forum_id)
-				{
-					$topic_id = 0;
-				}
-
-				$forum_list = array();
-
-				if (!$forum_id)
-				{
-					foreach ($forum_list_reports as $row)
-					{
-						$forum_list[] = $row['forum_id'];
-					}
-
-					if (!sizeof($forum_list))
-					{
-						trigger_error('NOT_MODERATOR');
-					}
-
-					$global_id = $forum_list[0];
-
-					$sql = 'SELECT SUM(forum_topics) as sum_forum_topics
-						FROM ' . FORUMS_TABLE . '
-						WHERE ' . phpbb::$db->sql_in_set('forum_id', $forum_list);
-					$result = phpbb::$db->sql_query($sql);
-					$forum_info['forum_topics'] = (int) phpbb::$db->sql_fetchfield('sum_forum_topics');
-					phpbb::$db->sql_freeresult($result);
-				}
-				else
-				{
-					$forum_info = get_forum_data(array($forum_id), 'm_report');
-
-					if (!sizeof($forum_info))
-					{
-						trigger_error('NOT_MODERATOR');
-					}
-
-					$forum_info = $forum_info[$forum_id];
-					$forum_list = array($forum_id);
-					$global_id = $forum_id;
-				}
-
-				$forum_list[] = 0;
-				$forum_data = array();
-
-				$forum_options = '<option value="0"' . (($forum_id == 0) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang['ALL_FORUMS'] . '</option>';
-				foreach ($forum_list_reports as $row)
-				{
-					$forum_options .= '<option value="' . $row['forum_id'] . '"' . (($forum_id == $row['forum_id']) ? ' selected="selected"' : '') . '>' . str_repeat('&nbsp; &nbsp;', $row['padding']) . $row['forum_name'] . '</option>';
-					$forum_data[$row['forum_id']] = $row;
-				}
-				unset($forum_list_reports);
-
-				$sort_days = $total = 0;
-				$sort_key = $sort_dir = '';
-				$sort_by_sql = $sort_order_sql = array();
-				mcp_sorting($mode, $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id, $topic_id);
-
-				$forum_topics = ($total == -1) ? $forum_info['forum_topics'] : $total;
-				$limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : '';
-
-				if ($mode == 'reports')
-				{
-					$report_state = 'AND p.post_reported = 1 AND r.report_closed = 0';
-				}
-				else
-				{
-					$report_state = 'AND r.report_closed = 1';
-				}
-
-				$sql = 'SELECT r.report_id
-					FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . REPORTS_TABLE . ' r ' . (($sort_order_sql[0] == 'u') ? ', ' . USERS_TABLE . ' u' : '') . (($sort_order_sql[0] == 'r') ? ', ' . USERS_TABLE . ' ru' : '') . '
-					WHERE ' . phpbb::$db->sql_in_set('p.forum_id', $forum_list) . "
-						$report_state
-						AND r.post_id = p.post_id
-						" . (($sort_order_sql[0] == 'u') ? 'AND u.user_id = p.poster_id' : '') . '
-						' . (($sort_order_sql[0] == 'r') ? 'AND ru.user_id = p.poster_id' : '') . '
-						' . (($topic_id) ? 'AND p.topic_id = ' . $topic_id : '') . "
-						AND t.topic_id = p.topic_id
-						$limit_time_sql
-					ORDER BY $sort_order_sql";
-				$result = phpbb::$db->sql_query_limit($sql, phpbb::$config['topics_per_page'], $start);
-
-				$i = 0;
-				$report_ids = array();
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$report_ids[] = $row['report_id'];
-					$row_num[$row['report_id']] = $i++;
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				if (sizeof($report_ids))
-				{
-					$sql = 'SELECT t.forum_id, t.topic_id, t.topic_title, p.post_id, p.post_subject, p.post_username, p.poster_id, p.post_time, u.username, u.username_clean, u.user_colour, r.user_id as reporter_id, ru.username as reporter_name, ru.user_colour as reporter_colour, r.report_time, r.report_id
-						FROM ' . REPORTS_TABLE . ' r, ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . USERS_TABLE . ' u, ' . USERS_TABLE . ' ru
-						WHERE ' . phpbb::$db->sql_in_set('r.report_id', $report_ids) . '
-							AND t.topic_id = p.topic_id
-							AND r.post_id = p.post_id
-							AND u.user_id = p.poster_id
-							AND ru.user_id = r.user_id
-						ORDER BY ' . $sort_order_sql;
-					$result = phpbb::$db->sql_query($sql);
-
-					$report_data = $rowset = array();
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$global_topic = ($row['forum_id']) ? false : true;
-						if ($global_topic)
-						{
-							$row['forum_id'] = $global_id;
-						}
-
-						phpbb::$template->assign_block_vars('postrow', array(
-							'U_VIEWFORUM'				=> (!$global_topic) ? append_sid('viewforum', 'f=' . $row['forum_id']) : '',
-							'U_VIEWPOST'				=> append_sid('viewtopic', 'f=' . $row['forum_id'] . '&amp;p=' . $row['post_id']) . '#p' . $row['post_id'],
-							'U_VIEW_DETAILS'			=> append_sid('mcp', "i=reports&amp;start=$start&amp;mode=report_details&amp;f={$row['forum_id']}&amp;r={$row['report_id']}"),
-
-							'POST_AUTHOR_FULL'		=> get_username_string('full', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']),
-							'POST_AUTHOR_COLOUR'	=> get_username_string('colour', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']),
-							'POST_AUTHOR'			=> get_username_string('username', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']),
-							'U_POST_AUTHOR'			=> get_username_string('profile', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']),
-
-							'REPORTER_FULL'			=> get_username_string('full', $row['reporter_id'], $row['reporter_name'], $row['reporter_colour']),
-							'REPORTER_COLOUR'		=> get_username_string('colour', $row['reporter_id'], $row['reporter_name'], $row['reporter_colour']),
-							'REPORTER'				=> get_username_string('username', $row['reporter_id'], $row['reporter_name'], $row['reporter_colour']),
-							'U_REPORTER'			=> get_username_string('profile', $row['reporter_id'], $row['reporter_name'], $row['reporter_colour']),
-
-							'FORUM_NAME'	=> (!$global_topic) ? $forum_data[$row['forum_id']]['forum_name'] : phpbb::$user->lang['GLOBAL_ANNOUNCEMENT'],
-							'POST_ID'		=> $row['post_id'],
-							'POST_SUBJECT'	=> ($row['post_subject']) ? $row['post_subject'] : phpbb::$user->lang['NO_SUBJECT'],
-							'POST_TIME'		=> phpbb::$user->format_date($row['post_time']),
-							'REPORT_ID'		=> $row['report_id'],
-							'REPORT_TIME'	=> phpbb::$user->format_date($row['report_time']),
-							'TOPIC_TITLE'	=> $row['topic_title'],
-						));
-					}
-					phpbb::$db->sql_freeresult($result);
-					unset($report_ids, $row);
-				}
-
-				// Now display the page
-				phpbb::$template->assign_vars(array(
-					'L_EXPLAIN'				=> ($mode == 'reports') ? phpbb::$user->lang['MCP_REPORTS_OPEN_EXPLAIN'] : phpbb::$user->lang['MCP_REPORTS_CLOSED_EXPLAIN'],
-					'L_TITLE'				=> ($mode == 'reports') ? phpbb::$user->lang['MCP_REPORTS_OPEN'] : phpbb::$user->lang['MCP_REPORTS_CLOSED'],
-					'L_ONLY_TOPIC'			=> ($topic_id) ? sprintf(phpbb::$user->lang['ONLY_TOPIC'], $topic_info['topic_title']) : '',
-
-					'S_MCP_ACTION'			=> $this->u_action,
-					'S_FORUM_OPTIONS'		=> $forum_options,
-					'S_CLOSED'				=> ($mode == 'reports_closed') ? true : false,
-
-					'PAGINATION'			=> generate_pagination($this->u_action . "&amp;f=$forum_id&amp;t=$topic_id&amp;st=$sort_days&amp;sk=$sort_key&amp;sd=$sort_dir", $total, phpbb::$config['topics_per_page'], $start),
-					'PAGE_NUMBER'			=> on_page($total, phpbb::$config['topics_per_page'], $start),
-					'TOPIC_ID'				=> $topic_id,
-					'TOTAL'					=> $total,
-					'TOTAL_REPORTS'			=> ($total == 1) ? phpbb::$user->lang['LIST_REPORT'] : sprintf(phpbb::$user->lang['LIST_REPORTS'], $total),
-				));
-
-				$this->tpl_name = 'mcp_reports';
-			break;
-		}
-	}
-}
-
-/**
-* Closes a report
-*/
-function close_report($report_id_list, $mode, $action)
-{
-	$sql = 'SELECT r.post_id
-		FROM ' . REPORTS_TABLE . ' r
-		WHERE ' . phpbb::$db->sql_in_set('r.report_id', $report_id_list);
-	$result = phpbb::$db->sql_query($sql);
-
-	$post_id_list = array();
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$post_id_list[] = $row['post_id'];
-	}
-	$post_id_list = array_unique($post_id_list);
-
-	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_report')))
-	{
-		trigger_error('NOT_AUTHORISED');
-	}
-
-	if ($action == 'delete' && strpos(phpbb::$user->data['session_page'], 'mode=report_details') !== false)
-	{
-		$redirect = request_var('redirect', build_url(array('mode', 'r', 'quickmod')) . '&amp;mode=reports');
-	}
-	else if ($action == 'close' && !request_var('r', 0))
-	{
-		$redirect = request_var('redirect', build_url(array('mode', 'p', 'quickmod')) . '&amp;mode=reports');
-	}
-	else
-	{
-		$redirect = request_var('redirect', build_url(array('quickmod')));
-	}
-	$success_msg = '';
-	$forum_ids = array();
-	$topic_ids = array();
-
-	$s_hidden_fields = build_hidden_fields(array(
-		'i'					=> 'reports',
-		'mode'				=> $mode,
-		'report_id_list'	=> $report_id_list,
-		'action'			=> $action,
-		'redirect'			=> $redirect)
-	);
-
-	if (confirm_box(true))
-	{
-		$post_info = get_post_data($post_id_list, 'm_report');
-
-		$sql = 'SELECT r.report_id, r.post_id, r.report_closed, r.user_id, r.user_notify, u.username, u.username_clean, u.user_email, u.user_jabber, u.user_lang, u.user_notify_type
-			FROM ' . REPORTS_TABLE . ' r, ' . USERS_TABLE . ' u
-			WHERE ' . phpbb::$db->sql_in_set('r.report_id', $report_id_list) . '
-				' . (($action == 'close') ? 'AND r.report_closed = 0' : '') . '
-				AND r.user_id = u.user_id';
-		$result = phpbb::$db->sql_query($sql);
-
-		$reports = $close_report_posts = $close_report_topics = $notify_reporters = $report_id_list = array();
-		while ($report = phpbb::$db->sql_fetchrow($result))
-		{
-			$reports[$report['report_id']] = $report;
-			$report_id_list[] = $report['report_id'];
-
-			if (!$report['report_closed'])
-			{
-				$close_report_posts[] = $report['post_id'];
-				$close_report_topics[] = $post_info[$report['post_id']]['topic_id'];
-			}
-
-			if ($report['user_notify'] && !$report['report_closed'])
-			{
-				$notify_reporters[$report['report_id']] = &$reports[$report['report_id']];
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if (sizeof($reports))
-		{
-			$close_report_posts = array_unique($close_report_posts);
-			$close_report_topics = array_unique($close_report_topics);
-
-			if (sizeof($close_report_posts))
-			{
-				// Get a list of topics that still contain reported posts
-				$sql = 'SELECT DISTINCT topic_id
-					FROM ' . POSTS_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('topic_id', $close_report_topics) . '
-						AND post_reported = 1
-						AND ' . phpbb::$db->sql_in_set('post_id', $close_report_posts, true);
-				$result = phpbb::$db->sql_query($sql);
-
-				$keep_report_topics = array();
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$keep_report_topics[] = $row['topic_id'];
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				$close_report_topics = array_diff($close_report_topics, $keep_report_topics);
-				unset($keep_report_topics);
-			}
-
-			phpbb::$db->sql_transaction('begin');
-
-			if ($action == 'close')
-			{
-				$sql = 'UPDATE ' . REPORTS_TABLE . '
-					SET report_closed = 1
-					WHERE ' . phpbb::$db->sql_in_set('report_id', $report_id_list);
-			}
-			else
-			{
-				$sql = 'DELETE FROM ' . REPORTS_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('report_id', $report_id_list);
-			}
-			phpbb::$db->sql_query($sql);
-
-
-			if (sizeof($close_report_posts))
-			{
-				$sql = 'UPDATE ' . POSTS_TABLE . '
-					SET post_reported = 0
-					WHERE ' . phpbb::$db->sql_in_set('post_id', $close_report_posts);
-				phpbb::$db->sql_query($sql);
-
-				if (sizeof($close_report_topics))
-				{
-					$sql = 'UPDATE ' . TOPICS_TABLE . '
-						SET topic_reported = 0
-						WHERE ' . phpbb::$db->sql_in_set('topic_id', $close_report_topics) . '
-							OR ' . phpbb::$db->sql_in_set('topic_moved_id', $close_report_topics);
-					phpbb::$db->sql_query($sql);
-				}
-			}
-
-			phpbb::$db->sql_transaction('commit');
-		}
-		unset($close_report_posts, $close_report_topics);
-
-		foreach ($reports as $report)
-		{
-			add_log('mod', $post_info[$report['post_id']]['forum_id'], $post_info[$report['post_id']]['topic_id'], 'LOG_REPORT_' .  strtoupper($action) . 'D', $post_info[$report['post_id']]['post_subject']);
-		}
-
-		$messenger = new messenger();
-
-		// Notify reporters
-		if (sizeof($notify_reporters))
-		{
-			foreach ($notify_reporters as $report_id => $reporter)
-			{
-				if ($reporter['user_id'] == ANONYMOUS)
-				{
-					continue;
-				}
-
-				$post_id = $reporter['post_id'];
-
-				$messenger->template('report_' . $action . 'd', $reporter['user_lang']);
-
-				$messenger->to($reporter['user_email'], $reporter['username']);
-				$messenger->im($reporter['user_jabber'], $reporter['username']);
-
-				$messenger->assign_vars(array(
-					'USERNAME'		=> htmlspecialchars_decode($reporter['username']),
-					'CLOSER_NAME'	=> htmlspecialchars_decode(phpbb::$user->data['username']),
-					'POST_SUBJECT'	=> htmlspecialchars_decode(censor_text($post_info[$post_id]['post_subject'])),
-					'TOPIC_TITLE'	=> htmlspecialchars_decode(censor_text($post_info[$post_id]['topic_title'])))
-				);
-
-				$messenger->send($reporter['user_notify_type']);
-			}
-		}
-
-		foreach ($post_info as $post)
-		{
-			$forum_ids[$post['forum_id']] = $post['forum_id'];
-			$topic_ids[$post['topic_id']] = $post['topic_id'];
-		}
-
-		unset($notify_reporters, $post_info, $reports);
-
-		$messenger->save_queue();
-
-		$success_msg = (sizeof($report_id_list) == 1) ? 'REPORT_' . strtoupper($action) . 'D_SUCCESS' : 'REPORTS_' . strtoupper($action) . 'D_SUCCESS';
-	}
-	else
-	{
-		confirm_box(false, phpbb::$user->lang[strtoupper($action) . '_REPORT' . ((sizeof($report_id_list) == 1) ? '' : 'S') . '_CONFIRM'], $s_hidden_fields);
-	}
-
-	$redirect = request_var('redirect', 'index.' . PHP_EXT);
-	$redirect = reapply_sid($redirect);
-
-	if (!$success_msg)
-	{
-		redirect($redirect);
-	}
-	else
-	{
-		meta_refresh(3, $redirect);
-		$return_forum = '';
-		if (sizeof($forum_ids == 1))
-		{
-			$return_forum = sprintf(phpbb::$user->lang['RETURN_FORUM'], '<a href="' . append_sid('viewforum', 'f=' . current($forum_ids)) . '">', '</a>') . '<br /><br />';
-		}
-		$return_topic = '';
-		if (sizeof($topic_ids == 1))
-		{
-			$return_topic = sprintf(phpbb::$user->lang['RETURN_TOPIC'], '<a href="' . append_sid('viewtopic', 't=' . current($topic_ids) . '&amp;f=' . current($forum_ids)) . '">', '</a>') . '<br /><br />';
-		}
-
-		trigger_error(phpbb::$user->lang[$success_msg] . '<br /><br />' . $return_forum . $return_topic . sprintf(phpbb::$user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>'));
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/mcp/mcp_topic.php b/phpBB/modules/mcp/mcp_topic.php
deleted file mode 100644
index 91579b1059..0000000000
--- a/phpBB/modules/mcp/mcp_topic.php
+++ /dev/null
@@ -1,627 +0,0 @@
-<?php
-/**
-*
-* @package mcp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* View topic in MCP
-*/
-function mcp_topic_view($id, $mode, $action)
-{
-	$url = append_sid(PHPBB_ROOT_PATH. 'mcp.' . PHP_EXT . '?' . extra_url());
-
-	phpbb::$user->add_lang('viewtopic');
-
-	$topic_id = request_var('t', 0);
-	$topic_info = get_topic_data(array($topic_id), false, true);
-
-	if (!sizeof($topic_info))
-	{
-		trigger_error('TOPIC_NOT_EXIST');
-	}
-
-	$topic_info = $topic_info[$topic_id];
-
-	// Set up some vars
-	$icon_id		= request_var('icon', 0);
-	$subject		= utf8_normalize_nfc(request_var('subject', '', true));
-	$start			= request_var('start', 0);
-	$sort_days_old	= request_var('st_old', 0);
-	$forum_id		= request_var('f', 0);
-	$to_topic_id	= request_var('to_topic_id', 0);
-	$to_forum_id	= request_var('to_forum_id', 0);
-	$sort			= phpbb_request::is_set_post('sort');
-	$submitted_id_list	= request_var('post_ids', array(0));
-	$checked_ids = $post_id_list = request_var('post_id_list', array(0));
-
-	// Split Topic?
-	if ($action == 'split_all' || $action == 'split_beyond')
-	{
-		if (!$sort)
-		{
-			split_topic($action, $topic_id, $to_forum_id, $subject);
-		}
-		$action = 'split';
-	}
-
-	// Merge Posts?
-	if ($action == 'merge_posts')
-	{
-		if (!$sort)
-		{
-			merge_posts($topic_id, $to_topic_id);
-		}
-		$action = 'merge';
-	}
-
-	if ($action == 'split' && !$subject)
-	{
-		$subject = $topic_info['topic_title'];
-	}
-
-	// Approve posts?
-	if ($action == 'approve' && phpbb::$acl->acl_get('m_approve', $topic_info['forum_id']))
-	{
-		include(PHPBB_ROOT_PATH . 'includes/mcp/mcp_queue.' . PHP_EXT);
-		include_once(PHPBB_ROOT_PATH . 'includes/functions_posting.' . PHP_EXT);
-		include_once(PHPBB_ROOT_PATH . 'includes/functions_messenger.' . PHP_EXT);
-
-		if (!sizeof($post_id_list))
-		{
-			trigger_error('NO_POST_SELECTED');
-		}
-
-		if (!$sort)
-		{
-			approve_post($post_id_list, $id, $mode);
-		}
-	}
-
-	// Jumpbox, sort selects and that kind of things
-	make_jumpbox($url . "&amp;i=$id&amp;mode=forum_view", $topic_info['forum_id'], false, 'm_', true);
-	$where_sql = ($action == 'reports') ? 'WHERE post_reported = 1 AND ' : 'WHERE';
-
-	$sort_days = $total = 0;
-	$sort_key = $sort_dir = '';
-	$sort_by_sql = $sort_order_sql = array();
-	mcp_sorting('viewtopic', $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $topic_info['forum_id'], $topic_id, $where_sql);
-
-	$limit_time_sql = ($sort_days) ? 'AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
-
-	if ($total == -1)
-	{
-		$total = $topic_info['topic_replies'] + 1;
-	}
-
-	$posts_per_page = max(0, request_var('posts_per_page', intval(phpbb::$config['posts_per_page'])));
-	if ($posts_per_page == 0)
-	{
-		$posts_per_page = $total;
-	}
-
-	if ((!empty($sort_days_old) && $sort_days_old != $sort_days) || $total <= $posts_per_page)
-	{
-		$start = 0;
-	}
-
-	// Make sure $start is set to the last page if it exceeds the amount
-	if ($start < 0 || $start >= $total)
-	{
-		$start = ($start < 0) ? 0 : floor(($total - 1) / $posts_per_page) * $posts_per_page;
-	}
-
-	$sql = 'SELECT u.username, u.username_clean, u.user_colour, p.*
-		FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
-		WHERE ' . (($action == 'reports') ? 'p.post_reported = 1 AND ' : '') . '
-			p.topic_id = ' . $topic_id . ' ' .
-			((!phpbb::$acl->acl_get('m_approve', $topic_info['forum_id'])) ? ' AND p.post_approved = 1 ' : '') . '
-			AND p.poster_id = u.user_id ' .
-			$limit_time_sql . '
-		ORDER BY ' . $sort_order_sql;
-	$result = phpbb::$db->sql_query_limit($sql, $posts_per_page, $start);
-
-	$rowset = $post_id_list = array();
-	$bbcode_bitfield = '';
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$rowset[] = $row;
-		$post_id_list[] = $row['post_id'];
-		$bbcode_bitfield = $bbcode_bitfield | base64_decode($row['bbcode_bitfield']);
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	if ($bbcode_bitfield !== '')
-	{
-		include_once(PHPBB_ROOT_PATH . 'includes/bbcode.' . PHP_EXT);
-		$bbcode = new bbcode(base64_encode($bbcode_bitfield));
-	}
-
-	$topic_tracking_info = array();
-
-	// Get topic tracking info
-	if (phpbb::$config['load_db_lastread'])
-	{
-		$tmp_topic_data = array($topic_id => $topic_info);
-		$topic_tracking_info = get_topic_tracking($topic_info['forum_id'], $topic_id, $tmp_topic_data, array($topic_info['forum_id'] => $topic_info['forum_mark_time']));
-		unset($tmp_topic_data);
-	}
-	else
-	{
-		$topic_tracking_info = get_complete_topic_tracking($topic_info['forum_id'], $topic_id);
-	}
-
-	$has_unapproved_posts = false;
-
-	// Grab extensions
-	$extensions = $attachments = array();
-	if ($topic_info['topic_attachment'] && sizeof($post_id_list))
-	{
-		$extensions = phpbb_cache::obtain_extensions_forum($topic_info['forum_id']);
-
-		// Get attachments...
-		if (phpbb::$acl->acl_get('u_download') && phpbb::$acl->acl_get('f_download', $topic_info['forum_id']))
-		{
-			$sql = 'SELECT *
-				FROM ' . ATTACHMENTS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('post_msg_id', $post_id_list) . '
-					AND in_message = 0
-				ORDER BY filetime DESC, post_msg_id ASC';
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$attachments[$row['post_msg_id']][] = $row;
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-	}
-
-	foreach ($rowset as $i => $row)
-	{
-		$message = $row['post_text'];
-		$post_subject = ($row['post_subject'] != '') ? $row['post_subject'] : $topic_info['topic_title'];
-
-		if ($row['bbcode_bitfield'])
-		{
-			$bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']);
-		}
-
-		$message = bbcode_nl2br($message);
-		$message = smiley_text($message);
-
-		if (!empty($attachments[$row['post_id']]))
-		{
-			$update_count = array();
-			parse_attachments($topic_info['forum_id'], $message, $attachments[$row['post_id']], $update_count);
-		}
-
-		if (!$row['post_approved'])
-		{
-			$has_unapproved_posts = true;
-		}
-
-		$post_unread = (isset($topic_tracking_info[$topic_id]) && $row['post_time'] > $topic_tracking_info[$topic_id]) ? true : false;
-
-		phpbb::$template->assign_block_vars('postrow', array(
-			'POST_AUTHOR_FULL'		=> get_username_string('full', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']),
-			'POST_AUTHOR_COLOUR'	=> get_username_string('colour', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']),
-			'POST_AUTHOR'			=> get_username_string('username', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']),
-			'U_POST_AUTHOR'			=> get_username_string('profile', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']),
-
-			'POST_DATE'		=> phpbb::$user->format_date($row['post_time']),
-			'POST_SUBJECT'	=> $post_subject,
-			'MESSAGE'		=> $message,
-			'POST_ID'		=> $row['post_id'],
-			'RETURN_TOPIC'	=> sprintf(phpbb::$user->lang['RETURN_TOPIC'], '<a href="' . append_sid('viewtopic', 't=' . $topic_id) . '">', '</a>'),
-
-			'MINI_POST_IMG'			=> ($post_unread) ? phpbb::$user->img('icon_post_target_unread', 'NEW_POST') : phpbb::$user->img('icon_post_target', 'POST'),
-
-			'S_POST_REPORTED'	=> ($row['post_reported']) ? true : false,
-			'S_POST_UNAPPROVED'	=> ($row['post_approved']) ? false : true,
-			'S_CHECKED'			=> (($submitted_id_list && !in_array(intval($row['post_id']), $submitted_id_list)) || in_array(intval($row['post_id']), $checked_ids)) ? true : false,
-			'S_HAS_ATTACHMENTS'	=> (!empty($attachments[$row['post_id']])) ? true : false,
-
-			'U_POST_DETAILS'	=> "$url&amp;i=$id&amp;p={$row['post_id']}&amp;mode=post_details" . (($forum_id) ? "&amp;f=$forum_id" : ''),
-			'U_MCP_APPROVE'		=> (phpbb::$acl->acl_get('m_approve', $topic_info['forum_id'])) ? append_sid('mcp', 'i=queue&amp;mode=approve_details&amp;f=' . $topic_info['forum_id'] . '&amp;p=' . $row['post_id']) : '',
-			'U_MCP_REPORT'		=> (phpbb::$acl->acl_get('m_report', $topic_info['forum_id'])) ? append_sid('mcp', 'i=reports&amp;mode=report_details&amp;f=' . $topic_info['forum_id'] . '&amp;p=' . $row['post_id']) : '',
-		));
-
-		// Display not already displayed Attachments for this post, we already parsed them. ;)
-		if (!empty($attachments[$row['post_id']]))
-		{
-			foreach ($attachments[$row['post_id']] as $attachment)
-			{
-				phpbb::$template->assign_block_vars('postrow.attachment', array(
-					'DISPLAY_ATTACHMENT'	=> $attachment,
-				));
-			}
-		}
-
-		unset($rowset[$i]);
-	}
-
-	// Display topic icons for split topic
-	$s_topic_icons = false;
-
-	if (phpbb::$acl->acl_get('m_split', $topic_info['forum_id']))
-	{
-		include_once(PHPBB_ROOT_PATH . 'includes/functions_posting.' . PHP_EXT);
-		$s_topic_icons = posting_gen_topic_icons('', $icon_id);
-
-		// Has the user selected a topic for merge?
-		if ($to_topic_id)
-		{
-			$to_topic_info = get_topic_data(array($to_topic_id), 'm_merge');
-
-			if (!sizeof($to_topic_info))
-			{
-				$to_topic_id = 0;
-			}
-			else
-			{
-				$to_topic_info = $to_topic_info[$to_topic_id];
-
-				if (!$to_topic_info['enable_icons'] || phpbb::$acl->acl_get('!f_icons', $topic_info['forum_id']))
-				{
-					$s_topic_icons = false;
-				}
-			}
-		}
-	}
-
-	$s_hidden_fields = build_hidden_fields(array(
-		'st_old'	=> $sort_days,
-		'post_ids'	=> $post_id_list,
-	));
-
-	phpbb::$template->assign_vars(array(
-		'TOPIC_TITLE'		=> $topic_info['topic_title'],
-		'U_VIEW_TOPIC'		=> append_sid('viewtopic', 'f=' . $topic_info['forum_id'] . '&amp;t=' . $topic_info['topic_id']),
-
-		'TO_TOPIC_ID'		=> $to_topic_id,
-		'TO_TOPIC_INFO'		=> ($to_topic_id) ? sprintf(phpbb::$user->lang['YOU_SELECTED_TOPIC'], $to_topic_id, '<a href="' . append_sid('viewtopic', 'f=' . $to_topic_info['forum_id'] . '&amp;t=' . $to_topic_id) . '">' . $to_topic_info['topic_title'] . '</a>') : '',
-
-		'SPLIT_SUBJECT'		=> $subject,
-		'POSTS_PER_PAGE'	=> $posts_per_page,
-		'ACTION'			=> $action,
-
-		'REPORTED_IMG'		=> phpbb::$user->img('icon_topic_reported', 'POST_REPORTED'),
-		'UNAPPROVED_IMG'	=> phpbb::$user->img('icon_topic_unapproved', 'POST_UNAPPROVED'),
-
-		'S_MCP_ACTION'		=> "$url&amp;i=$id&amp;mode=$mode&amp;action=$action&amp;start=$start",
-		'S_FORUM_SELECT'	=> ($to_forum_id) ? make_forum_select($to_forum_id, false, false, true, true, true) : make_forum_select($topic_info['forum_id'], false, false, true, true, true),
-		'S_CAN_SPLIT'		=> (phpbb::$acl->acl_get('m_split', $topic_info['forum_id'])) ? true : false,
-		'S_CAN_MERGE'		=> (phpbb::$acl->acl_get('m_merge', $topic_info['forum_id'])) ? true : false,
-		'S_CAN_DELETE'		=> (phpbb::$acl->acl_get('m_delete', $topic_info['forum_id'])) ? true : false,
-		'S_CAN_APPROVE'		=> ($has_unapproved_posts && phpbb::$acl->acl_get('m_approve', $topic_info['forum_id'])) ? true : false,
-		'S_CAN_LOCK'		=> (phpbb::$acl->acl_get('m_lock', $topic_info['forum_id'])) ? true : false,
-		'S_CAN_REPORT'		=> (phpbb::$acl->acl_get('m_report', $topic_info['forum_id'])) ? true : false,
-		'S_REPORT_VIEW'		=> ($action == 'reports') ? true : false,
-		'S_MERGE_VIEW'		=> ($action == 'merge') ? true : false,
-		'S_SPLIT_VIEW'		=> ($action == 'split') ? true : false,
-
-		'S_HIDDEN_FIELDS'	=> $s_hidden_fields,
-
-		'S_SHOW_TOPIC_ICONS'	=> $s_topic_icons,
-		'S_TOPIC_ICON'			=> $icon_id,
-
-		'U_SELECT_TOPIC'	=> "$url&amp;i=$id&amp;mode=forum_view&amp;action=merge_select" . (($forum_id) ? "&amp;f=$forum_id" : ''),
-
-		'RETURN_TOPIC'		=> sprintf(phpbb::$user->lang['RETURN_TOPIC'], '<a href="' . append_sid('viewtopic', "f={$topic_info['forum_id']}&amp;t={$topic_info['topic_id']}&amp;start=$start") . '">', '</a>'),
-		'RETURN_FORUM'		=> sprintf(phpbb::$user->lang['RETURN_FORUM'], '<a href="' . append_sid('viewforum', "f={$topic_info['forum_id']}&amp;start=$start") . '">', '</a>'),
-
-		'PAGE_NUMBER'		=> on_page($total, $posts_per_page, $start),
-		'PAGINATION'		=> (!$posts_per_page) ? '' : generate_pagination(append_sid('mcp', "i=$id&amp;t={$topic_info['topic_id']}&amp;mode=$mode&amp;action=$action&amp;to_topic_id=$to_topic_id&amp;posts_per_page=$posts_per_page&amp;st=$sort_days&amp;sk=$sort_key&amp;sd=$sort_dir"), $total, $posts_per_page, $start),
-		'TOTAL_POSTS'		=> ($total == 1) ? phpbb::$user->lang['VIEW_TOPIC_POST'] : sprintf(phpbb::$user->lang['VIEW_TOPIC_POSTS'], $total),
-	));
-}
-
-/**
-* Split topic
-*/
-function split_topic($action, $topic_id, $to_forum_id, $subject)
-{
-	$post_id_list	= request_var('post_id_list', array(0));
-	$forum_id		= request_var('forum_id', 0);
-	$start			= request_var('start', 0);
-
-	if (!sizeof($post_id_list))
-	{
-		phpbb::$template->assign_var('MESSAGE', phpbb::$user->lang['NO_POST_SELECTED']);
-		return;
-	}
-
-	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_split')))
-	{
-		return;
-	}
-
-	$post_id = $post_id_list[0];
-	$post_info = get_post_data(array($post_id));
-
-	if (!sizeof($post_info))
-	{
-		phpbb::$template->assign_var('MESSAGE', phpbb::$user->lang['NO_POST_SELECTED']);
-		return;
-	}
-
-	$post_info = $post_info[$post_id];
-	$subject = trim($subject);
-
-	// Make some tests
-	if (!$subject)
-	{
-		phpbb::$template->assign_var('MESSAGE', phpbb::$user->lang['EMPTY_SUBJECT']);
-		return;
-	}
-
-	if ($to_forum_id <= 0)
-	{
-		phpbb::$template->assign_var('MESSAGE', phpbb::$user->lang['NO_DESTINATION_FORUM']);
-		return;
-	}
-
-	$forum_info = get_forum_data(array($to_forum_id), 'f_post');
-
-	if (!sizeof($forum_info))
-	{
-		phpbb::$template->assign_var('MESSAGE', phpbb::$user->lang['USER_CANNOT_POST']);
-		return;
-	}
-
-	$forum_info = $forum_info[$to_forum_id];
-
-	if ($forum_info['forum_type'] != FORUM_POST)
-	{
-		phpbb::$template->assign_var('MESSAGE', phpbb::$user->lang['FORUM_NOT_POSTABLE']);
-		return;
-	}
-
-	$redirect = request_var('redirect', build_url(array('quickmod')));
-
-	$s_hidden_fields = build_hidden_fields(array(
-		'i'				=> 'main',
-		'post_id_list'	=> $post_id_list,
-		'f'				=> $forum_id,
-		'mode'			=> 'topic_view',
-		'start'			=> $start,
-		'action'		=> $action,
-		't'				=> $topic_id,
-		'redirect'		=> $redirect,
-		'subject'		=> $subject,
-		'to_forum_id'	=> $to_forum_id,
-		'icon'			=> request_var('icon', 0))
-	);
-	$success_msg = $return_link = '';
-
-	if (confirm_box(true))
-	{
-		if ($action == 'split_beyond')
-		{
-			$sort_days = $total = 0;
-			$sort_key = $sort_dir = '';
-			$sort_by_sql = $sort_order_sql = array();
-			mcp_sorting('viewtopic', $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id, $topic_id);
-
-			$limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : '';
-
-			if ($sort_order_sql[0] == 'u')
-			{
-				$sql = 'SELECT p.post_id, p.forum_id, p.post_approved
-					FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u
-					WHERE p.topic_id = $topic_id
-						AND p.poster_id = u.user_id
-						$limit_time_sql
-					ORDER BY $sort_order_sql";
-			}
-			else
-			{
-				$sql = 'SELECT p.post_id, p.forum_id, p.post_approved
-					FROM ' . POSTS_TABLE . " p
-					WHERE p.topic_id = $topic_id
-						$limit_time_sql
-					ORDER BY $sort_order_sql";
-			}
-			$result = phpbb::$db->sql_query_limit($sql, 0, $start);
-
-			$store = false;
-			$post_id_list = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				// If split from selected post (split_beyond), we split the unapproved items too.
-				if (!$row['post_approved'] && !phpbb::$acl->acl_get('m_approve', $row['forum_id']))
-				{
-//					continue;
-				}
-
-				// Start to store post_ids as soon as we see the first post that was selected
-				if ($row['post_id'] == $post_id)
-				{
-					$store = true;
-				}
-
-				if ($store)
-				{
-					$post_id_list[] = $row['post_id'];
-				}
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		if (!sizeof($post_id_list))
-		{
-			trigger_error('NO_POST_SELECTED');
-		}
-
-		$icon_id = request_var('icon', 0);
-
-		$sql_ary = array(
-			'forum_id'		=> $to_forum_id,
-			'topic_title'	=> $subject,
-			'icon_id'		=> $icon_id,
-			'topic_approved'=> 1
-		);
-
-		$sql = 'INSERT INTO ' . TOPICS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary);
-		phpbb::$db->sql_query($sql);
-
-		$to_topic_id = phpbb::$db->sql_nextid();
-		move_posts($post_id_list, $to_topic_id);
-
-		$topic_info = get_topic_data(array($topic_id));
-		$topic_info = $topic_info[$topic_id];
-
-		add_log('mod', $to_forum_id, $to_topic_id, 'LOG_SPLIT_DESTINATION', $subject);
-		add_log('mod', $forum_id, $topic_id, 'LOG_SPLIT_SOURCE', $topic_info['topic_title']);
-
-		// Change topic title of first post
-		$sql = 'UPDATE ' . POSTS_TABLE . "
-			SET post_subject = '" . phpbb::$db->sql_escape($subject) . "'
-			WHERE post_id = {$post_id_list[0]}";
-		phpbb::$db->sql_query($sql);
-
-		$success_msg = 'TOPIC_SPLIT_SUCCESS';
-
-		// Update forum statistics
-		set_config_count('num_topics', 1, true);
-
-		// Link back to both topics
-		$return_link = sprintf(phpbb::$user->lang['RETURN_TOPIC'], '<a href="' . append_sid('viewtopic', 'f=' . $post_info['forum_id'] . '&amp;t=' . $post_info['topic_id']) . '">', '</a>') . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid('viewtopic', 'f=' . $to_forum_id . '&amp;t=' . $to_topic_id) . '">', '</a>');
-	}
-	else
-	{
-		confirm_box(false, ($action == 'split_all') ? 'SPLIT_TOPIC_ALL' : 'SPLIT_TOPIC_BEYOND', $s_hidden_fields);
-	}
-
-	$redirect = request_var('redirect', 'index.' . PHP_EXT);
-	$redirect = reapply_sid($redirect);
-
-	if (!$success_msg)
-	{
-		return;
-	}
-	else
-	{
-		meta_refresh(3, append_sid('viewtopic', "f=$to_forum_id&amp;t=$to_topic_id"));
-		trigger_error(phpbb::$user->lang[$success_msg] . '<br /><br />' . $return_link);
-	}
-}
-
-/**
-* Merge selected posts into selected topic
-*/
-function merge_posts($topic_id, $to_topic_id)
-{
-	if (!$to_topic_id)
-	{
-		phpbb::$template->assign_var('MESSAGE', phpbb::$user->lang['NO_FINAL_TOPIC_SELECTED']);
-		return;
-	}
-
-	$topic_data = get_topic_data(array($to_topic_id), 'm_merge');
-
-	if (!sizeof($topic_data))
-	{
-		phpbb::$template->assign_var('MESSAGE', phpbb::$user->lang['NO_FINAL_TOPIC_SELECTED']);
-		return;
-	}
-
-	$topic_data = $topic_data[$to_topic_id];
-
-	$post_id_list	= request_var('post_id_list', array(0));
-	$start			= request_var('start', 0);
-
-	if (!sizeof($post_id_list))
-	{
-		phpbb::$template->assign_var('MESSAGE', phpbb::$user->lang['NO_POST_SELECTED']);
-		return;
-	}
-
-	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_merge')))
-	{
-		return;
-	}
-
-	$redirect = request_var('redirect', build_url(array('quickmod')));
-
-	$s_hidden_fields = build_hidden_fields(array(
-		'i'				=> 'main',
-		'post_id_list'	=> $post_id_list,
-		'to_topic_id'	=> $to_topic_id,
-		'mode'			=> 'topic_view',
-		'action'		=> 'merge_posts',
-		'start'			=> $start,
-		'redirect'		=> $redirect,
-		't'				=> $topic_id)
-	);
-	$success_msg = $return_link = '';
-
-	if (confirm_box(true))
-	{
-		$to_forum_id = $topic_data['forum_id'];
-
-		move_posts($post_id_list, $to_topic_id);
-		add_log('mod', $to_forum_id, $to_topic_id, 'LOG_MERGE', $topic_data['topic_title']);
-
-		// Message and return links
-		$success_msg = 'POSTS_MERGED_SUCCESS';
-
-		// Does the original topic still exist? If yes, link back to it
-		$sql = 'SELECT forum_id
-			FROM ' . TOPICS_TABLE . '
-			WHERE topic_id = ' . $topic_id;
-		$result = phpbb::$db->sql_query_limit($sql, 1);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if ($row)
-		{
-			$return_link .= sprintf(phpbb::$user->lang['RETURN_TOPIC'], '<a href="' . append_sid('viewtopic', 'f=' . $row['forum_id'] . '&amp;t=' . $topic_id) . '">', '</a>');
-		}
-		else
-		{
-			// If the topic no longer exist, we will update the topic watch table.
-			// To not let it error out on users watching both topics, we just return on an error...
-			phpbb::$db->sql_return_on_error(true);
-			phpbb::$db->sql_query('UPDATE ' . TOPICS_WATCH_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE topic_id = ' . (int) $topic_id);
-			phpbb::$db->sql_return_on_error(false);
-
-			phpbb::$db->sql_query('DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE topic_id = ' . (int) $topic_id);
-		}
-
-		// Link to the new topic
-		$return_link .= (($return_link) ? '<br /><br />' : '') . sprintf(phpbb::$user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid('viewtopic', 'f=' . $to_forum_id . '&amp;t=' . $to_topic_id) . '">', '</a>');
-	}
-	else
-	{
-		confirm_box(false, 'MERGE_POSTS', $s_hidden_fields);
-	}
-
-	$redirect = request_var('redirect', 'index.' . PHP_EXT);
-	$redirect = reapply_sid($redirect);
-
-	if (!$success_msg)
-	{
-		return;
-	}
-	else
-	{
-		meta_refresh(3, append_sid('viewtopic', "f=$to_forum_id&amp;t=$to_topic_id"));
-		trigger_error(phpbb::$user->lang[$success_msg] . '<br /><br />' . $return_link);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/mcp/mcp_warn.php b/phpBB/modules/mcp/mcp_warn.php
deleted file mode 100644
index 734a61b8f2..0000000000
--- a/phpBB/modules/mcp/mcp_warn.php
+++ /dev/null
@@ -1,495 +0,0 @@
-<?php
-/**
-*
-* @package mcp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* mcp_warn
-* Handling warning the users
-* @package mcp
-*/
-class mcp_warn
-{
-	var $p_master;
-	var $u_action;
-
-	function __construct(&$p_master)
-	{
-		$this->p_master = &$p_master;
-	}
-
-	function main($id, $mode)
-	{
-		$action = request_var('action', array('' => ''));
-
-		if (is_array($action))
-		{
-			list($action, ) = each($action);
-		}
-
-		$this->page_title = 'MCP_WARN';
-
-		add_form_key('mcp_warn');
-
-		switch ($mode)
-		{
-			case 'front':
-				$this->mcp_warn_front_view();
-				$this->tpl_name = 'mcp_warn_front';
-			break;
-
-			case 'list':
-				$this->mcp_warn_list_view($action);
-				$this->tpl_name = 'mcp_warn_list';
-			break;
-
-			case 'warn_post':
-				$this->mcp_warn_post_view($action);
-				$this->tpl_name = 'mcp_warn_post';
-			break;
-
-			case 'warn_user':
-				$this->mcp_warn_user_view($action);
-				$this->tpl_name = 'mcp_warn_user';
-			break;
-		}
-	}
-
-	/**
-	* Generates the summary on the main page of the warning module
-	*/
-	function mcp_warn_front_view()
-	{
-		phpbb::$template->assign_vars(array(
-			'U_FIND_USERNAME'	=> append_sid('memberlist', 'mode=searchuser&amp;form=mcp&amp;field=username&amp;select_single=true'),
-			'U_POST_ACTION'		=> append_sid('mcp', 'i=warn&amp;mode=warn_user'),
-		));
-
-		// Obtain a list of the 5 naughtiest users....
-		// These are the 5 users with the highest warning count
-		$highest = array();
-		$count = 0;
-
-		view_warned_users($highest, $count, 5);
-
-		foreach ($highest as $row)
-		{
-			phpbb::$template->assign_block_vars('highest', array(
-				'U_NOTES'		=> append_sid('mcp', 'i=notes&amp;mode=user_notes&amp;u=' . $row['user_id']),
-
-				'USERNAME_FULL'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
-				'USERNAME'			=> $row['username'],
-				'USERNAME_COLOUR'	=> ($row['user_colour']) ? '#' . $row['user_colour'] : '',
-				'U_USER'			=> append_sid('memberlist', 'mode=viewprofile&amp;u=' . $row['user_id']),
-
-				'WARNING_TIME'	=> phpbb::$user->format_date($row['user_last_warning']),
-				'WARNINGS'		=> $row['user_warnings'],
-			));
-		}
-
-		// And now the 5 most recent users to get in trouble
-		$sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_colour, u.user_warnings, w.warning_time
-			FROM ' . USERS_TABLE . ' u, ' . WARNINGS_TABLE . ' w
-			WHERE u.user_id = w.user_id
-			ORDER BY w.warning_time DESC';
-		$result = phpbb::$db->sql_query_limit($sql, 5);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			phpbb::$template->assign_block_vars('latest', array(
-				'U_NOTES'		=> append_sid('mcp', 'i=notes&amp;mode=user_notes&amp;u=' . $row['user_id']),
-
-				'USERNAME_FULL'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
-				'USERNAME'			=> $row['username'],
-				'USERNAME_COLOUR'	=> ($row['user_colour']) ? '#' . $row['user_colour'] : '',
-				'U_USER'			=> append_sid('memberlist', 'mode=viewprofile&amp;u=' . $row['user_id']),
-
-				'WARNING_TIME'	=> phpbb::$user->format_date($row['warning_time']),
-				'WARNINGS'		=> $row['user_warnings'],
-			));
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	/**
-	* Lists all users with warnings
-	*/
-	function mcp_warn_list_view($action)
-	{
-		phpbb::$user->add_lang('memberlist');
-
-		$start	= request_var('start', 0);
-		$st		= request_var('st', 0);
-		$sk		= request_var('sk', 'b');
-		$sd		= request_var('sd', 'd');
-
-		$limit_days = array(0 => phpbb::$user->lang['ALL_ENTRIES'], 1 => phpbb::$user->lang['1_DAY'], 7 => phpbb::$user->lang['7_DAYS'], 14 => phpbb::$user->lang['2_WEEKS'], 30 => phpbb::$user->lang['1_MONTH'], 90 => phpbb::$user->lang['3_MONTHS'], 180 => phpbb::$user->lang['6_MONTHS'], 365 => phpbb::$user->lang['1_YEAR']);
-		$sort_by_text = array('a' => phpbb::$user->lang['SORT_USERNAME'], 'b' => phpbb::$user->lang['SORT_DATE'], 'c' => phpbb::$user->lang['SORT_WARNINGS']);
-		$sort_by_sql = array('a' => 'username_clean', 'b' => 'user_last_warning', 'c' => 'user_warnings');
-
-		$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
-		gen_sort_selects($limit_days, $sort_by_text, $st, $sk, $sd, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
-
-		// Define where and sort sql for use in displaying logs
-		$sql_where = ($st) ? (time() - ($st * 86400)) : 0;
-		$sql_sort = $sort_by_sql[$sk] . ' ' . (($sd == 'd') ? 'DESC' : 'ASC');
-
-		$users = array();
-		$user_count = 0;
-
-		view_warned_users($users, $user_count, phpbb::$config['topics_per_page'], $start, $sql_where, $sql_sort);
-
-		foreach ($users as $row)
-		{
-			phpbb::$template->assign_block_vars('user', array(
-				'U_NOTES'		=> append_sid('mcp', 'i=notes&amp;mode=user_notes&amp;u=' . $row['user_id']),
-
-				'USERNAME_FULL'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
-				'USERNAME'			=> $row['username'],
-				'USERNAME_COLOUR'	=> ($row['user_colour']) ? '#' . $row['user_colour'] : '',
-				'U_USER'			=> append_sid('memberlist', 'mode=viewprofile&amp;u=' . $row['user_id']),
-
-				'WARNING_TIME'	=> phpbb::$user->format_date($row['user_last_warning']),
-				'WARNINGS'		=> $row['user_warnings'],
-			));
-		}
-
-		phpbb::$template->assign_vars(array(
-			'U_POST_ACTION'			=> $this->u_action,
-			'S_CLEAR_ALLOWED'		=> (phpbb::$acl->acl_get('a_clearlogs')) ? true : false,
-			'S_SELECT_SORT_DIR'		=> $s_sort_dir,
-			'S_SELECT_SORT_KEY'		=> $s_sort_key,
-			'S_SELECT_SORT_DAYS'	=> $s_limit_days,
-
-			'PAGE_NUMBER'		=> on_page($user_count, phpbb::$config['topics_per_page'], $start),
-			'PAGINATION'		=> generate_pagination(append_sid('mcp', "i=warn&amp;mode=list&amp;st=$st&amp;sk=$sk&amp;sd=$sd"), $user_count, phpbb::$config['topics_per_page'], $start),
-			'TOTAL_USERS'		=> ($user_count == 1) ? phpbb::$user->lang['LIST_USER'] : sprintf(phpbb::$user->lang['LIST_USERS'], $user_count),
-		));
-	}
-
-	/**
-	* Handles warning the user when the warning is for a specific post
-	*/
-	function mcp_warn_post_view($action)
-	{
-		$post_id = request_var('p', 0);
-		$forum_id = request_var('f', 0);
-		$notify = phpbb_request::is_set('notify_user');
-		$warning = utf8_normalize_nfc(request_var('warning', '', true));
-
-		$sql = 'SELECT u.*, p.*
-			FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u
-			WHERE post_id = $post_id
-				AND u.user_id = p.poster_id";
-		$result = phpbb::$db->sql_query($sql);
-		$user_row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$user_row)
-		{
-			trigger_error('NO_POST');
-		}
-
-		// There is no point issuing a warning to ignored users (ie anonymous and bots)
-		if ($user_row['user_type'] == phpbb::USER_IGNORE)
-		{
-			trigger_error('CANNOT_WARN_ANONYMOUS');
-		}
-
-		// Prevent someone from warning themselves
-		if ($user_row['user_id'] == phpbb::$user->data['user_id'])
-		{
-			trigger_error('CANNOT_WARN_SELF');
-		}
-
-		// Check if there is already a warning for this post to prevent multiple
-		// warnings for the same offence
-		$sql = 'SELECT post_id
-			FROM ' . WARNINGS_TABLE . "
-			WHERE post_id = $post_id";
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if ($row)
-		{
-			trigger_error('ALREADY_WARNED');
-		}
-
-		$user_id = $user_row['user_id'];
-
-		if (strpos($this->u_action, "&amp;f=$forum_id&amp;p=$post_id") === false)
-		{
-			$this->p_master->adjust_url("&amp;f=$forum_id&amp;p=$post_id");
-			$this->u_action .= "&amp;f=$forum_id&amp;p=$post_id";
-		}
-
-		// Check if can send a notification
-		if (phpbb::$config['allow_privmsg'])
-		{
-			$auth2 = new auth();
-			$auth2->acl($user_row);
-			$s_can_notify = ($auth2->acl_get('u_readpm')) ? true : false;
-			unset($auth2);
-		}
-		else
-		{
-			$s_can_notify = false;
-		}
-
-		// Prevent against clever people
-		if ($notify && !$s_can_notify)
-		{
-			$notify = false;
-		}
-
-		if ($warning && $action == 'add_warning')
-		{
-			if (check_form_key('mcp_warn'))
-			{
-				add_warning($user_row, $warning, $notify, $post_id);
-				$msg = phpbb::$user->lang['USER_WARNING_ADDED'];
-			}
-			else
-			{
-				$msg = phpbb::$user->lang['FORM_INVALID'];
-			}
-			$redirect = append_sid('mcp', "i=notes&amp;mode=user_notes&amp;u=$user_id");
-			meta_refresh(2, $redirect);
-			trigger_error($msg . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
-		}
-
-		// OK, they didn't submit a warning so lets build the page for them to do so
-
-		// We want to make the message available here as a reminder
-		// Parse the message and subject
-		$message = censor_text($user_row['post_text']);
-
-		// Second parse bbcode here
-		if ($user_row['bbcode_bitfield'])
-		{
-			include_once(PHPBB_ROOT_PATH . 'includes/bbcode.' . PHP_EXT);
-
-			$bbcode = new bbcode($user_row['bbcode_bitfield']);
-			$bbcode->bbcode_second_pass($message, $user_row['bbcode_uid'], $user_row['bbcode_bitfield']);
-		}
-
-		$message = bbcode_nl2br($message);
-		$message = smiley_text($message);
-
-		// Generate the appropriate user information for the user we are looking at
-		if (!function_exists('get_user_avatar'))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-		}
-
-		$rank_title = $rank_img = '';
-		$avatar_img = get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']);
-
-		phpbb::$template->assign_vars(array(
-			'U_POST_ACTION'		=> $this->u_action,
-
-			'POST'				=> $message,
-			'USERNAME'			=> $user_row['username'],
-			'USER_COLOR'		=> (!empty($user_row['user_colour'])) ? $user_row['user_colour'] : '',
-			'RANK_TITLE'		=> $rank_title,
-			'JOINED'			=> phpbb::$user->format_date($user_row['user_regdate']),
-			'POSTS'				=> ($user_row['user_posts']) ? $user_row['user_posts'] : 0,
-			'WARNINGS'			=> ($user_row['user_warnings']) ? $user_row['user_warnings'] : 0,
-
-			'AVATAR_IMG'		=> $avatar_img,
-			'RANK_IMG'			=> $rank_img,
-
-			'L_WARNING_POST_DEFAULT'	=> sprintf(phpbb::$user->lang['WARNING_POST_DEFAULT'], generate_board_url() . '/viewtopic.' . PHP_EXT . "?f=$forum_id&amp;p=$post_id#p$post_id"),
-
-			'S_CAN_NOTIFY'		=> $s_can_notify,
-		));
-	}
-
-	/**
-	* Handles warning the user
-	*/
-	function mcp_warn_user_view($action)
-	{
-		global $module;
-
-		$user_id = request_var('u', 0);
-		$username = request_var('username', '', true);
-		$notify = phpbb_request::is_set('notify_user');
-		$warning = utf8_normalize_nfc(request_var('warning', '', true));
-
-		$sql_where = ($user_id) ? "user_id = $user_id" : "username_clean = '" . phpbb::$db->sql_escape(utf8_clean_string($username)) . "'";
-
-		$sql = 'SELECT *
-			FROM ' . USERS_TABLE . '
-			WHERE ' . $sql_where;
-		$result = phpbb::$db->sql_query($sql);
-		$user_row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$user_row)
-		{
-			trigger_error('NO_USER');
-		}
-
-		// Prevent someone from warning themselves
-		if ($user_row['user_id'] == phpbb::$user->data['user_id'])
-		{
-			trigger_error('CANNOT_WARN_SELF');
-		}
-
-		$user_id = $user_row['user_id'];
-
-		if (strpos($this->u_action, "&amp;u=$user_id") === false)
-		{
-			$this->p_master->adjust_url('&amp;u=' . $user_id);
-			$this->u_action .= "&amp;u=$user_id";
-		}
-
-		// Check if can send a notification
-		if (phpbb::$config['allow_privmsg'])
-		{
-			$auth2 = new auth();
-			$auth2->acl($user_row);
-			$s_can_notify = ($auth2->acl_get('u_readpm')) ? true : false;
-			unset($auth2);
-		}
-		else
-		{
-			$s_can_notify = false;
-		}
-
-		// Prevent against clever people
-		if ($notify && !$s_can_notify)
-		{
-			$notify = false;
-		}
-
-		if ($warning && $action == 'add_warning')
-		{
-			if (check_form_key('mcp_warn'))
-			{
-				add_warning($user_row, $warning, $notify);
-				$msg = phpbb::$user->lang['USER_WARNING_ADDED'];
-			}
-			else
-			{
-				$msg = phpbb::$user->lang['FORM_INVALID'];
-			}
-			$redirect = append_sid('mcp', "i=notes&amp;mode=user_notes&amp;u=$user_id");
-			meta_refresh(2, $redirect);
-			trigger_error($msg . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
-		}
-
-		// Generate the appropriate user information for the user we are looking at
-		if (!function_exists('get_user_avatar'))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-		}
-
-		$rank_title = $rank_img = '';
-		$avatar_img = get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']);
-
-		// OK, they didn't submit a warning so lets build the page for them to do so
-		phpbb::$template->assign_vars(array(
-			'U_POST_ACTION'		=> $this->u_action,
-
-			'RANK_TITLE'		=> $rank_title,
-			'JOINED'			=> phpbb::$user->format_date($user_row['user_regdate']),
-			'POSTS'				=> ($user_row['user_posts']) ? $user_row['user_posts'] : 0,
-			'WARNINGS'			=> ($user_row['user_warnings']) ? $user_row['user_warnings'] : 0,
-
-			'USERNAME_FULL'		=> get_username_string('full', $user_row['user_id'], $user_row['username'], $user_row['user_colour']),
-			'USERNAME_COLOUR'	=> get_username_string('colour', $user_row['user_id'], $user_row['username'], $user_row['user_colour']),
-			'USERNAME'			=> get_username_string('username', $user_row['user_id'], $user_row['username'], $user_row['user_colour']),
-			'U_PROFILE'			=> get_username_string('profile', $user_row['user_id'], $user_row['username'], $user_row['user_colour']),
-
-			'AVATAR_IMG'		=> $avatar_img,
-			'RANK_IMG'			=> $rank_img,
-
-			'S_CAN_NOTIFY'		=> $s_can_notify,
-		));
-
-		return $user_id;
-	}
-}
-
-/**
-* Insert the warning into the database
-*/
-function add_warning($user_row, $warning, $send_pm = true, $post_id = 0)
-{
-	if ($send_pm)
-	{
-		include_once(PHPBB_ROOT_PATH . 'includes/functions_privmsgs.' . PHP_EXT);
-		include_once(PHPBB_ROOT_PATH . 'includes/message_parser.' . PHP_EXT);
-
-		$user_row['user_lang'] = (file_exists(PHPBB_ROOT_PATH . 'language/' . $user_row['user_lang'] . '/mcp.' . PHP_EXT)) ? $user_row['user_lang'] : phpbb::$config['default_lang'];
-		include(PHPBB_ROOT_PATH . 'language/' . basename($user_row['user_lang']) . '/mcp.' . PHP_EXT);
-
-		$message_parser = new parse_message();
-
-		$message_parser->message = sprintf($lang['WARNING_PM_BODY'], $warning);
-		$message_parser->parse(true, true, true, false, false, true, true);
-
-		$pm_data = array(
-			'from_user_id'			=> phpbb::$user->data['user_id'],
-			'from_user_ip'			=> phpbb::$user->ip,
-			'from_username'			=> phpbb::$user->data['username'],
-			'enable_sig'			=> false,
-			'enable_bbcode'			=> true,
-			'enable_smilies'		=> true,
-			'enable_urls'			=> false,
-			'icon_id'				=> 0,
-			'bbcode_bitfield'		=> $message_parser->bbcode_bitfield,
-			'bbcode_uid'			=> $message_parser->bbcode_uid,
-			'message'				=> $message_parser->message,
-			'address_list'			=> array('u' => array($user_row['user_id'] => 'to')),
-		);
-
-		submit_pm('post', $lang['WARNING_PM_SUBJECT'], $pm_data, false);
-	}
-
-	add_log('admin', 'LOG_USER_WARNING', $user_row['username']);
-	$log_id = add_log('user', $user_row['user_id'], 'LOG_USER_WARNING_BODY', $warning);
-
-	$sql_ary = array(
-		'user_id'		=> $user_row['user_id'],
-		'post_id'		=> $post_id,
-		'log_id'		=> $log_id,
-		'warning_time'	=> time(),
-	);
-
-	phpbb::$db->sql_query('INSERT INTO ' . WARNINGS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary));
-
-	$sql = 'UPDATE ' . USERS_TABLE . '
-		SET user_warnings = user_warnings + 1,
-			user_last_warning = ' . time() . '
-		WHERE user_id = ' . $user_row['user_id'];
-	phpbb::$db->sql_query($sql);
-
-	// We add this to the mod log too for moderators to see that a specific user got warned.
-	$sql = 'SELECT forum_id, topic_id
-		FROM ' . POSTS_TABLE . '
-		WHERE post_id = ' . $post_id;
-	$result = phpbb::$db->sql_query($sql);
-	$row = phpbb::$db->sql_fetchrow($result);
-	phpbb::$db->sql_freeresult($result);
-
-	add_log('mod', $row['forum_id'], $row['topic_id'], 'LOG_USER_WARNING', $user_row['username']);
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/info/ucp_attachments.php b/phpBB/modules/ucp/info/ucp_attachments.php
deleted file mode 100644
index 84edce446c..0000000000
--- a/phpBB/modules/ucp/info/ucp_attachments.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
-*
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class ucp_attachments_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'ucp_attachments',
-			'title'		=> 'UCP_ATTACHMENTS',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'attachments'	=> array('title' => 'UCP_MAIN_ATTACHMENTS', 'auth' => 'acl_u_attach', 'cat' => array('UCP_MAIN')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/info/ucp_groups.php b/phpBB/modules/ucp/info/ucp_groups.php
deleted file mode 100644
index 2002123c50..0000000000
--- a/phpBB/modules/ucp/info/ucp_groups.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
-*
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class ucp_groups_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'ucp_groups',
-			'title'		=> 'UCP_USERGROUPS',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'membership'	=> array('title' => 'UCP_USERGROUPS_MEMBER', 'auth' => '', 'cat' => array('UCP_USERGROUPS')),
-				'manage'		=> array('title' => 'UCP_USERGROUPS_MANAGE', 'auth' => '', 'cat' => array('UCP_USERGROUPS')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/info/ucp_main.php b/phpBB/modules/ucp/info/ucp_main.php
deleted file mode 100644
index 722b7865e6..0000000000
--- a/phpBB/modules/ucp/info/ucp_main.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
-*
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class ucp_main_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'ucp_main',
-			'title'		=> 'UCP_MAIN',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'front'			=> array('title' => 'UCP_MAIN_FRONT', 'auth' => '', 'cat' => array('UCP_MAIN')),
-				'subscribed'	=> array('title' => 'UCP_MAIN_SUBSCRIBED', 'auth' => '', 'cat' => array('UCP_MAIN')),
-				'bookmarks'		=> array('title' => 'UCP_MAIN_BOOKMARKS', 'auth' => 'cfg_allow_bookmarks', 'cat' => array('UCP_MAIN')),
-				'drafts'		=> array('title' => 'UCP_MAIN_DRAFTS', 'auth' => '', 'cat' => array('UCP_MAIN')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/info/ucp_pm.php b/phpBB/modules/ucp/info/ucp_pm.php
deleted file mode 100644
index ade12005c0..0000000000
--- a/phpBB/modules/ucp/info/ucp_pm.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class ucp_pm_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'ucp_pm',
-			'title'		=> 'UCP_PM',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'view'		=> array('title' => 'UCP_PM_VIEW', 'auth' => 'cfg_allow_privmsg', 'display' => false, 'cat' => array('UCP_PM')),
-				'compose'	=> array('title' => 'UCP_PM_COMPOSE', 'auth' => 'cfg_allow_privmsg', 'cat' => array('UCP_PM')),
-				'drafts'	=> array('title' => 'UCP_PM_DRAFTS', 'auth' => 'cfg_allow_privmsg', 'cat' => array('UCP_PM')),
-				'options'	=> array('title' => 'UCP_PM_OPTIONS', 'auth' => 'cfg_allow_privmsg', 'cat' => array('UCP_PM')),
-				'popup'		=> array('title' => 'UCP_PM_POPUP_TITLE', 'auth' => 'cfg_allow_privmsg', 'display' => false, 'cat' => array('UCP_PM')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/info/ucp_prefs.php b/phpBB/modules/ucp/info/ucp_prefs.php
deleted file mode 100644
index 58359e8a19..0000000000
--- a/phpBB/modules/ucp/info/ucp_prefs.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
-*
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class ucp_prefs_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'ucp_prefs',
-			'title'		=> 'UCP_PREFS',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'personal'	=> array('title' => 'UCP_PREFS_PERSONAL', 'auth' => '', 'cat' => array('UCP_PREFS')),
-				'post'		=> array('title' => 'UCP_PREFS_POST', 'auth' => '', 'cat' => array('UCP_PREFS')),
-				'view'		=> array('title' => 'UCP_PREFS_VIEW', 'auth' => '', 'cat' => array('UCP_PREFS')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/info/ucp_profile.php b/phpBB/modules/ucp/info/ucp_profile.php
deleted file mode 100644
index 03a4c81f46..0000000000
--- a/phpBB/modules/ucp/info/ucp_profile.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
-*
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class ucp_profile_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'ucp_profile',
-			'title'		=> 'UCP_PROFILE',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'profile_info'	=> array('title' => 'UCP_PROFILE_PROFILE_INFO', 'auth' => '', 'cat' => array('UCP_PROFILE')),
-				'signature'		=> array('title' => 'UCP_PROFILE_SIGNATURE', 'auth' => '', 'cat' => array('UCP_PROFILE')),
-				'avatar'		=> array('title' => 'UCP_PROFILE_AVATAR', 'auth' => '', 'cat' => array('UCP_PROFILE')),
-				'reg_details'	=> array('title' => 'UCP_PROFILE_REG_DETAILS', 'auth' => '', 'cat' => array('UCP_PROFILE')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/info/ucp_zebra.php b/phpBB/modules/ucp/info/ucp_zebra.php
deleted file mode 100644
index 5fc1f8bee7..0000000000
--- a/phpBB/modules/ucp/info/ucp_zebra.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
-*
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @package module_install
-*/
-class ucp_zebra_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> 'ucp_zebra',
-			'title'		=> 'UCP_ZEBRA',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'friends'		=> array('title' => 'UCP_ZEBRA_FRIENDS', 'auth' => '', 'cat' => array('UCP_ZEBRA')),
-				'foes'			=> array('title' => 'UCP_ZEBRA_FOES', 'auth' => '', 'cat' => array('UCP_ZEBRA')),
-			),
-		);
-	}
-
-	function install()
-	{
-	}
-
-	function uninstall()
-	{
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/ucp_activate.php b/phpBB/modules/ucp/ucp_activate.php
deleted file mode 100644
index 0f1d122a42..0000000000
--- a/phpBB/modules/ucp/ucp_activate.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
-*
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* ucp_activate
-* User activation
-* @package ucp
-*/
-class ucp_activate
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		$user_id = request_var('u', 0);
-		$key = request_var('k', '');
-
-		$sql = 'SELECT user_id, username, user_type, user_email, user_newpasswd, user_lang, user_notify_type, user_actkey, user_inactive_reason
-			FROM ' . USERS_TABLE . "
-			WHERE user_id = $user_id";
-		$result = phpbb::$db->sql_query($sql);
-		$user_row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$user_row)
-		{
-			trigger_error('NO_USER');
-		}
-
-		if ($user_row['user_type'] <> phpbb::USER_INACTIVE && !$user_row['user_newpasswd'])
-		{
-			meta_refresh(3, append_sid('index'));
-			trigger_error('ALREADY_ACTIVATED');
-		}
-
-		if (($user_row['user_inactive_reason'] ==  INACTIVE_MANUAL) || $user_row['user_actkey'] != $key)
-		{
-			trigger_error('WRONG_ACTIVATION');
-		}
-
-		$update_password = ($user_row['user_newpasswd']) ? true : false;
-
-		if ($update_password)
-		{
-			$sql_ary = array(
-				'user_actkey'		=> '',
-				'user_password'		=> $user_row['user_newpasswd'],
-				'user_newpasswd'	=> '',
-				'user_pass_convert'	=> 0,
-				'user_login_attempts'	=> 0,
-			);
-
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-				WHERE user_id = ' . $user_row['user_id'];
-			phpbb::$db->sql_query($sql);
-
-			add_log('user', $user_row['user_id'], 'LOG_USER_NEW_PASSWORD', $user_row['username']);
-		}
-
-		if (!$update_password)
-		{
-			include_once(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-
-			user_active_flip('activate', $user_row['user_id']);
-
-			$sql = 'UPDATE ' . USERS_TABLE . "
-				SET user_actkey = ''
-				WHERE user_id = {$user_row['user_id']}";
-			phpbb::$db->sql_query($sql);
-		}
-
-		if (phpbb::$config['require_activation'] == USER_ACTIVATION_ADMIN && !$update_password)
-		{
-			include_once(PHPBB_ROOT_PATH . 'includes/functions_messenger.' . PHP_EXT);
-
-			$messenger = new messenger(false);
-
-			$messenger->template('admin_welcome_activated', $user_row['user_lang']);
-
-			$messenger->to($user_row['user_email'], $user_row['username']);
-
-			$messenger->headers('X-AntiAbuse: Board servername - ' . phpbb::$config['server_name']);
-			$messenger->headers('X-AntiAbuse: User_id - ' . phpbb::$user->data['user_id']);
-			$messenger->headers('X-AntiAbuse: Username - ' . phpbb::$user->data['username']);
-			$messenger->headers('X-AntiAbuse: User IP - ' . phpbb::$user->ip);
-
-			$messenger->assign_vars(array(
-				'USERNAME'	=> htmlspecialchars_decode($user_row['username']))
-			);
-
-			$messenger->send($user_row['user_notify_type']);
-
-			$message = 'ACCOUNT_ACTIVE_ADMIN';
-		}
-		else
-		{
-			if (!$update_password)
-			{
-				$message = ($user_row['user_inactive_reason'] == INACTIVE_PROFILE) ? 'ACCOUNT_ACTIVE_PROFILE' : 'ACCOUNT_ACTIVE';
-			}
-			else
-			{
-				$message = 'PASSWORD_ACTIVATED';
-			}
-		}
-
-		meta_refresh(3, append_sid('index'));
-		trigger_error(phpbb::$user->lang[$message]);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/ucp_attachments.php b/phpBB/modules/ucp/ucp_attachments.php
deleted file mode 100644
index 055b0c0b94..0000000000
--- a/phpBB/modules/ucp/ucp_attachments.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/**
-*
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* ucp_attachments
-* User attachments
-* @package ucp
-*/
-class ucp_attachments
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		$start		= request_var('start', 0);
-		$sort_key	= request_var('sk', 'a');
-		$sort_dir	= request_var('sd', 'a');
-
-		$delete		= phpbb_request::is_set_post('delete');
-		$confirm	= phpbb_request::is_set_post('confirm');
-		$delete_ids	= array_keys(request_var('attachment', array(0)));
-
-		if ($delete && sizeof($delete_ids))
-		{
-			// Validate $delete_ids...
-			$sql = 'SELECT attach_id
-				FROM ' . ATTACHMENTS_TABLE . '
-				WHERE poster_id = ' . phpbb::$user->data['user_id'] . '
-					AND is_orphan = 0
-					AND ' . phpbb::$db->sql_in_set('attach_id', $delete_ids);
-			$result = phpbb::$db->sql_query($sql);
-
-			$delete_ids = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$delete_ids[] = $row['attach_id'];
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		if ($delete && sizeof($delete_ids))
-		{
-			$s_hidden_fields = array(
-				'delete'	=> 1
-			);
-
-			foreach ($delete_ids as $attachment_id)
-			{
-				$s_hidden_fields['attachment'][$attachment_id] = 1;
-			}
-
-			if (confirm_box(true))
-			{
-				if (!function_exists('delete_attachments'))
-				{
-					include_once(PHPBB_ROOT_PATH . 'includes/functions_admin.' . PHP_EXT);
-				}
-
-				delete_attachments('attach', $delete_ids);
-
-				meta_refresh(3, $this->u_action);
-				$message = ((sizeof($delete_ids) == 1) ? phpbb::$user->lang['ATTACHMENT_DELETED'] : phpbb::$user->lang['ATTACHMENTS_DELETED']) . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
-				trigger_error($message);
-			}
-			else
-			{
-				confirm_box(false, (sizeof($delete_ids) == 1) ? 'DELETE_ATTACHMENT' : 'DELETE_ATTACHMENTS', build_hidden_fields($s_hidden_fields));
-			}
-		}
-
-		// Select box eventually
-		$sort_key_text = array('a' => phpbb::$user->lang['SORT_FILENAME'], 'b' => phpbb::$user->lang['SORT_COMMENT'], 'c' => phpbb::$user->lang['SORT_EXTENSION'], 'd' => phpbb::$user->lang['SORT_SIZE'], 'e' => phpbb::$user->lang['SORT_DOWNLOADS'], 'f' => phpbb::$user->lang['SORT_POST_TIME'], 'g' => phpbb::$user->lang['SORT_TOPIC_TITLE']);
-		$sort_key_sql = array('a' => 'a.real_filename', 'b' => 'a.attach_comment', 'c' => 'a.extension', 'd' => 'a.filesize', 'e' => 'a.download_count', 'f' => 'a.filetime', 'g' => 't.topic_title');
-
-		$sort_dir_text = array('a' => phpbb::$user->lang['ASCENDING'], 'd' => phpbb::$user->lang['DESCENDING']);
-
-		$s_sort_key = '';
-		foreach ($sort_key_text as $key => $value)
-		{
-			$selected = ($sort_key == $key) ? ' selected="selected"' : '';
-			$s_sort_key .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
-		}
-
-		$s_sort_dir = '';
-		foreach ($sort_dir_text as $key => $value)
-		{
-			$selected = ($sort_dir == $key) ? ' selected="selected"' : '';
-			$s_sort_dir .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
-		}
-
-		if (!isset($sort_key_sql[$sort_key]))
-		{
-			$sort_key = 'a';
-		}
-
-		$order_by = $sort_key_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC');
-
-		$sql = 'SELECT COUNT(attach_id) as num_attachments
-			FROM ' . ATTACHMENTS_TABLE . '
-			WHERE poster_id = ' . phpbb::$user->data['user_id'] . '
-				AND is_orphan = 0';
-		$result = phpbb::$db->sql_query($sql);
-		$num_attachments = phpbb::$db->sql_fetchfield('num_attachments');
-		phpbb::$db->sql_freeresult($result);
-
-		$sql = 'SELECT a.*, t.topic_title, p.message_subject as message_title
-			FROM ' . ATTACHMENTS_TABLE . ' a
-				LEFT JOIN ' . TOPICS_TABLE . ' t ON (a.topic_id = t.topic_id AND a.in_message = 0)
-				LEFT JOIN ' . PRIVMSGS_TABLE . ' p ON (a.post_msg_id = p.msg_id AND a.in_message = 1)
-			WHERE a.poster_id = ' . phpbb::$user->data['user_id'] . "
-				AND a.is_orphan = 0
-			ORDER BY $order_by";
-		$result = phpbb::$db->sql_query_limit($sql, phpbb::$config['topics_per_page'], $start);
-
-		$row_count = 0;
-		if ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			phpbb::$template->assign_var('S_ATTACHMENT_ROWS', true);
-
-			do
-			{
-				if ($row['in_message'])
-				{
-					$view_topic = append_sid('ucp', "i=pm&amp;p={$row['post_msg_id']}");
-				}
-				else
-				{
-					$view_topic = append_sid('viewtopic', "t={$row['topic_id']}&amp;p={$row['post_msg_id']}") . "#p{$row['post_msg_id']}";
-				}
-
-				phpbb::$template->assign_block_vars('attachrow', array(
-					'ROW_NUMBER'		=> $row_count + ($start + 1),
-					'FILENAME'			=> $row['real_filename'],
-					'COMMENT'			=> bbcode_nl2br($row['attach_comment']),
-					'EXTENSION'			=> $row['extension'],
-					'SIZE'				=> get_formatted_filesize($row['filesize']),
-					'DOWNLOAD_COUNT'	=> $row['download_count'],
-					'POST_TIME'			=> phpbb::$user->format_date($row['filetime']),
-					'TOPIC_TITLE'		=> ($row['in_message']) ? $row['message_title'] : $row['topic_title'],
-
-					'ATTACH_ID'			=> $row['attach_id'],
-					'POST_ID'			=> $row['post_msg_id'],
-					'TOPIC_ID'			=> $row['topic_id'],
-
-					'S_IN_MESSAGE'		=> $row['in_message'],
-
-					'U_VIEW_ATTACHMENT'	=> append_sid('download/file', 'id=' . $row['attach_id']),
-					'U_VIEW_TOPIC'		=> $view_topic,
-				));
-
-				$row_count++;
-			}
-			while ($row = phpbb::$db->sql_fetchrow($result));
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		phpbb::$template->assign_vars(array(
-			'PAGE_NUMBER'			=> on_page($num_attachments, phpbb::$config['topics_per_page'], $start),
-			'PAGINATION'			=> generate_pagination($this->u_action . "&amp;sk=$sort_key&amp;sd=$sort_dir", $num_attachments, phpbb::$config['topics_per_page'], $start),
-			'TOTAL_ATTACHMENTS'		=> $num_attachments,
-
-			'L_TITLE'				=> phpbb::$user->lang['UCP_ATTACHMENTS'],
-
-			'U_SORT_FILENAME'		=> $this->u_action . "&amp;sk=a&amp;sd=" . (($sort_key == 'a' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_SORT_FILE_COMMENT'	=> $this->u_action . "&amp;sk=b&amp;sd=" . (($sort_key == 'b' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_SORT_EXTENSION'		=> $this->u_action . "&amp;sk=c&amp;sd=" . (($sort_key == 'c' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_SORT_FILESIZE'		=> $this->u_action . "&amp;sk=d&amp;sd=" . (($sort_key == 'd' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_SORT_DOWNLOADS'		=> $this->u_action . "&amp;sk=e&amp;sd=" . (($sort_key == 'e' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_SORT_POST_TIME'		=> $this->u_action . "&amp;sk=f&amp;sd=" . (($sort_key == 'f' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_SORT_TOPIC_TITLE'	=> $this->u_action . "&amp;sk=g&amp;sd=" . (($sort_key == 'f' && $sort_dir == 'a') ? 'd' : 'a'),
-
-			'S_DISPLAY_MARK_ALL'	=> ($num_attachments) ? true : false,
-			'S_DISPLAY_PAGINATION'	=> ($num_attachments) ? true : false,
-			'S_UCP_ACTION'			=> $this->u_action,
-			'S_SORT_OPTIONS' 		=> $s_sort_key,
-			'S_ORDER_SELECT'		=> $s_sort_dir,
-		));
-
-		$this->tpl_name = 'ucp_attachments';
-		$this->page_title = 'UCP_ATTACHMENTS';
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/ucp_confirm.php b/phpBB/modules/ucp/ucp_confirm.php
deleted file mode 100644
index 321d07ad14..0000000000
--- a/phpBB/modules/ucp/ucp_confirm.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
-*
-* @package VC
-* @version $Id$
-* @copyright (c) 2005 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* ucp_confirm
-* Visual confirmation
-*
-* Note to potential users of this code ...
-*
-* Remember this is released under the _GPL_ and is subject
-* to that licence. Do not incorporate this within software
-* released or distributed in any way under a licence other
-* than the GPL. We will be watching ... ;)
-*
-* @package VC
-*/
-class ucp_confirm
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		include(PHPBB_ROOT_PATH . 'includes/captcha/captcha_factory.' . PHP_EXT);
-		$captcha = phpbb_captcha_factory::get_instance(phpbb::$config['captcha_plugin']);
-		$captcha->init(request_var('type', 0));
-		$captcha->execute();
-		garbage_collection();
-		exit_handler();
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/ucp_groups.php b/phpBB/modules/ucp/ucp_groups.php
deleted file mode 100644
index c8627802e2..0000000000
--- a/phpBB/modules/ucp/ucp_groups.php
+++ /dev/null
@@ -1,1087 +0,0 @@
-<?php
-/**
-*
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* ucp_groups
-* @package ucp
-*/
-class ucp_groups
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		phpbb::$user->add_lang('groups');
-
-		$return_page = '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '">', '</a>');
-
-		$mark_ary	= request_var('mark', array(0));
-		$submit		= phpbb_request::variable('submit', false, false, phpbb_request::POST);
-		$delete		= phpbb_request::variable('delete', false, false, phpbb_request::POST);
-		$error = $data = array();
-
-		switch ($mode)
-		{
-			case 'membership':
-
-				$this->page_title = 'UCP_USERGROUPS_MEMBER';
-
-				if ($submit || phpbb_request::is_set_post('change_default'))
-				{
-					$action = (phpbb_request::is_set_post('change_default')) ? 'change_default' : request_var('action', '');
-					$group_id = ($action == 'change_default') ? request_var('default', 0) : request_var('selected', 0);
-
-					if (!$group_id)
-					{
-						trigger_error('NO_GROUP_SELECTED');
-					}
-
-					$sql = 'SELECT group_id, group_name, group_type
-						FROM ' . GROUPS_TABLE . '
-						WHERE group_id IN (' . $group_id . ', ' . phpbb::$user->data['group_id'] . ')';
-					$result = phpbb::$db->sql_query($sql);
-
-					$group_row = array();
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$row['group_name'] = ($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name'];
-						$group_row[$row['group_id']] = $row;
-					}
-					phpbb::$db->sql_freeresult($result);
-
-					if (!sizeof($group_row))
-					{
-						trigger_error('GROUP_NOT_EXIST');
-					}
-
-					switch ($action)
-					{
-						case 'change_default':
-							// User already having this group set as default?
-							if ($group_id == phpbb::$user->data['group_id'])
-							{
-								trigger_error(phpbb::$user->lang['ALREADY_DEFAULT_GROUP'] . $return_page);
-							}
-
-							if (!phpbb::$acl->acl_get('u_chggrp'))
-							{
-								trigger_error(phpbb::$user->lang['NOT_AUTHORISED'] . $return_page);
-							}
-
-							// User needs to be member of the group in order to make it default
-							if (!group_memberships($group_id, phpbb::$user->data['user_id'], true))
-							{
-								trigger_error(phpbb::$user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
-							}
-
-							if (confirm_box(true))
-							{
-								group_user_attributes('default', $group_id, phpbb::$user->data['user_id']);
-
-								add_log('user', phpbb::$user->data['user_id'], 'LOG_USER_GROUP_CHANGE', sprintf(phpbb::$user->lang['USER_GROUP_CHANGE'], $group_row[phpbb::$user->data['group_id']]['group_name'], $group_row[$group_id]['group_name']));
-
-								meta_refresh(3, $this->u_action);
-								trigger_error(phpbb::$user->lang['CHANGED_DEFAULT_GROUP'] . $return_page);
-							}
-							else
-							{
-								$s_hidden_fields = array(
-									'default'		=> $group_id,
-									'change_default'=> true
-								);
-
-								confirm_box(false, sprintf(phpbb::$user->lang['GROUP_CHANGE_DEFAULT'], $group_row[$group_id]['group_name']), build_hidden_fields($s_hidden_fields));
-							}
-
-						break;
-
-						case 'resign':
-
-							// User tries to resign from default group but is not allowed to change it?
-							if ($group_id == phpbb::$user->data['group_id'] && !phpbb::$acl->acl_get('u_chggrp'))
-							{
-								trigger_error(phpbb::$user->lang['NOT_RESIGN_FROM_DEFAULT_GROUP'] . $return_page);
-							}
-
-							if (!($row = group_memberships($group_id, phpbb::$user->data['user_id'])))
-							{
-								trigger_error(phpbb::$user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
-							}
-							list(, $row) = each($row);
-
-							$sql = 'SELECT group_type
-								FROM ' . GROUPS_TABLE . '
-								WHERE group_id = ' . $group_id;
-							$result = phpbb::$db->sql_query($sql);
-							$group_type = (int) phpbb::$db->sql_fetchfield('group_type');
-							phpbb::$db->sql_freeresult($result);
-
-							if ($group_type != GROUP_OPEN && $group_type != GROUP_FREE)
-							{
-								trigger_error(phpbb::$user->lang['CANNOT_RESIGN_GROUP'] . $return_page);
-							}
-
-							if (confirm_box(true))
-							{
-								group_user_del($group_id, phpbb::$user->data['user_id']);
-
-								add_log('user', phpbb::$user->data['user_id'], 'LOG_USER_GROUP_RESIGN', $group_row[$group_id]['group_name']);
-
-								meta_refresh(3, $this->u_action);
-								trigger_error(phpbb::$user->lang[($row['user_pending']) ? 'GROUP_RESIGNED_PENDING' : 'GROUP_RESIGNED_MEMBERSHIP'] . $return_page);
-							}
-							else
-							{
-								$s_hidden_fields = array(
-									'selected'		=> $group_id,
-									'action'		=> 'resign',
-									'submit'		=> true
-								);
-
-								confirm_box(false, ($row['user_pending']) ? 'GROUP_RESIGN_PENDING' : 'GROUP_RESIGN_MEMBERSHIP', build_hidden_fields($s_hidden_fields));
-							}
-
-						break;
-
-						case 'join':
-
-							$sql = 'SELECT ug.*, u.username, u.username_clean, u.user_email
-								FROM ' . USER_GROUP_TABLE . ' ug, ' . USERS_TABLE . ' u
-								WHERE ug.user_id = u.user_id
-									AND ug.group_id = ' . $group_id . '
-									AND ug.user_id = ' . phpbb::$user->data['user_id'];
-							$result = phpbb::$db->sql_query($sql);
-							$row = phpbb::$db->sql_fetchrow($result);
-							phpbb::$db->sql_freeresult($result);
-
-							if ($row)
-							{
-								if ($row['user_pending'])
-								{
-									trigger_error(phpbb::$user->lang['ALREADY_IN_GROUP_PENDING'] . $return_page);
-								}
-
-								trigger_error(phpbb::$user->lang['ALREADY_IN_GROUP'] . $return_page);
-							}
-
-							// Check permission to join (open group or request)
-							if ($group_row[$group_id]['group_type'] != GROUP_OPEN && $group_row[$group_id]['group_type'] != GROUP_FREE)
-							{
-								trigger_error(phpbb::$user->lang['CANNOT_JOIN_GROUP'] . $return_page);
-							}
-
-							if (confirm_box(true))
-							{
-								if ($group_row[$group_id]['group_type'] == GROUP_FREE)
-								{
-									group_user_add($group_id, phpbb::$user->data['user_id']);
-
-									$email_template = 'group_added';
-								}
-								else
-								{
-									group_user_add($group_id, phpbb::$user->data['user_id'], false, false, false, 0, 1);
-
-									$email_template = 'group_request';
-								}
-
-								include_once(PHPBB_ROOT_PATH . 'includes/functions_messenger.' . PHP_EXT);
-								$messenger = new messenger();
-
-								$sql = 'SELECT u.username, u.username_clean, u.user_email, u.user_notify_type, u.user_jabber, u.user_lang
-									FROM ' . USER_GROUP_TABLE . ' ug, ' . USERS_TABLE . ' u
-									WHERE ug.user_id = u.user_id
-										AND ' . (($group_row[$group_id]['group_type'] == GROUP_FREE) ? 'ug.user_id = ' . phpbb::$user->data['user_id'] : 'ug.group_leader = 1') . "
-										AND ug.group_id = $group_id";
-								$result = phpbb::$db->sql_query($sql);
-
-								while ($row = phpbb::$db->sql_fetchrow($result))
-								{
-									$messenger->template($email_template, $row['user_lang']);
-
-									$messenger->to($row['user_email'], $row['username']);
-									$messenger->im($row['user_jabber'], $row['username']);
-
-									$messenger->assign_vars(array(
-										'USERNAME'			=> htmlspecialchars_decode($row['username']),
-										'GROUP_NAME'		=> htmlspecialchars_decode($group_row[$group_id]['group_name']),
-										'REQUEST_USERNAME'	=> phpbb::$user->data['username'],
-
-										'U_PENDING'		=> generate_board_url() . '/ucp.' . PHP_EXT . "?i=groups&mode=manage&action=list&g=$group_id",
-										'U_GROUP'		=> generate_board_url() . '/memberlist.' . PHP_EXT . "?mode=group&g=$group_id")
-									);
-
-									$messenger->send($row['user_notify_type']);
-								}
-								phpbb::$db->sql_freeresult($result);
-
-								$messenger->save_queue();
-
-								add_log('user', phpbb::$user->data['user_id'], 'LOG_USER_GROUP_JOIN' . (($group_row[$group_id]['group_type'] == GROUP_FREE) ? '' : '_PENDING'), $group_row[$group_id]['group_name']);
-
-								meta_refresh(3, $this->u_action);
-								trigger_error(phpbb::$user->lang[($group_row[$group_id]['group_type'] == GROUP_FREE) ? 'GROUP_JOINED' : 'GROUP_JOINED_PENDING'] . $return_page);
-							}
-							else
-							{
-								$s_hidden_fields = array(
-									'selected'		=> $group_id,
-									'action'		=> 'join',
-									'submit'		=> true
-								);
-
-								confirm_box(false, ($group_row[$group_id]['group_type'] == GROUP_FREE) ? 'GROUP_JOIN' : 'GROUP_JOIN_PENDING', build_hidden_fields($s_hidden_fields));
-							}
-
-						break;
-
-						case 'demote':
-
-							if (!($row = group_memberships($group_id, phpbb::$user->data['user_id'])))
-							{
-								trigger_error(phpbb::$user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
-							}
-							list(, $row) = each($row);
-
-							if (!$row['group_leader'])
-							{
-								trigger_error(phpbb::$user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
-							}
-
-							if (confirm_box(true))
-							{
-								group_user_attributes('demote', $group_id, phpbb::$user->data['user_id']);
-
-								add_log('user', phpbb::$user->data['user_id'], 'LOG_USER_GROUP_DEMOTE', $group_row[$group_id]['group_name']);
-
-								meta_refresh(3, $this->u_action);
-								trigger_error(phpbb::$user->lang['USER_GROUP_DEMOTED'] . $return_page);
-							}
-							else
-							{
-								$s_hidden_fields = array(
-									'selected'		=> $group_id,
-									'action'		=> 'demote',
-									'submit'		=> true
-								);
-
-								confirm_box(false, 'USER_GROUP_DEMOTE', build_hidden_fields($s_hidden_fields));
-							}
-
-						break;
-					}
-				}
-
-				$sql = 'SELECT g.*, ug.group_leader, ug.user_pending
-					FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . ' ug
-					WHERE ug.user_id = ' . phpbb::$user->data['user_id'] . '
-						AND g.group_id = ug.group_id
-					ORDER BY g.group_type DESC, g.group_name';
-				$result = phpbb::$db->sql_query($sql);
-
-				$group_id_ary = array();
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$block = ($row['group_leader']) ? 'leader' : (($row['user_pending']) ? 'pending' : 'member');
-
-					switch ($row['group_type'])
-					{
-						case GROUP_OPEN:
-							$group_status = 'OPEN';
-						break;
-
-						case GROUP_CLOSED:
-							$group_status = 'CLOSED';
-						break;
-
-						case GROUP_HIDDEN:
-							$group_status = 'HIDDEN';
-						break;
-
-						case GROUP_SPECIAL:
-							$group_status = 'SPECIAL';
-						break;
-
-						case GROUP_FREE:
-							$group_status = 'FREE';
-						break;
-					}
-
-					phpbb::$template->assign_block_vars($block, array(
-						'GROUP_ID'		=> $row['group_id'],
-						'GROUP_NAME'	=> ($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name'],
-						'GROUP_DESC'	=> ($row['group_type'] <> GROUP_SPECIAL) ? generate_text_for_display($row['group_desc'], $row['group_desc_uid'], $row['group_desc_bitfield'], $row['group_desc_options']) : phpbb::$user->lang['GROUP_IS_SPECIAL'],
-						'GROUP_SPECIAL'	=> ($row['group_type'] <> GROUP_SPECIAL) ? false : true,
-						'GROUP_STATUS'	=> phpbb::$user->lang['GROUP_IS_' . $group_status],
-						'GROUP_COLOUR'	=> $row['group_colour'],
-
-						'U_VIEW_GROUP'	=> append_sid('memberlist', 'mode=group&amp;g=' . $row['group_id']),
-
-						'S_GROUP_DEFAULT'	=> ($row['group_id'] == phpbb::$user->data['group_id']) ? true : false,
-					));
-
-					$group_id_ary[] = (int) $row['group_id'];
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				// Hide hidden groups unless user is an admin with group privileges
-				$sql_and = (phpbb::$acl->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? '<> ' . GROUP_SPECIAL : 'NOT IN (' . GROUP_SPECIAL . ', ' . GROUP_HIDDEN . ')';
-
-				$sql = 'SELECT group_id, group_name, group_colour, group_desc, group_desc_uid, group_desc_bitfield, group_desc_options, group_type, group_founder_manage
-					FROM ' . GROUPS_TABLE . '
-					WHERE ' . ((sizeof($group_id_ary)) ? phpbb::$db->sql_in_set('group_id', $group_id_ary, true) . ' AND ' : '') . "
-						group_type $sql_and
-					ORDER BY group_type DESC, group_name";
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					switch ($row['group_type'])
-					{
-						case GROUP_OPEN:
-							$group_status = 'OPEN';
-						break;
-
-						case GROUP_CLOSED:
-							$group_status = 'CLOSED';
-						break;
-
-						case GROUP_HIDDEN:
-							$group_status = 'HIDDEN';
-						break;
-
-						case GROUP_SPECIAL:
-							$group_status = 'SPECIAL';
-						break;
-
-						case GROUP_FREE:
-							$group_status = 'FREE';
-						break;
-					}
-
-					phpbb::$template->assign_block_vars('nonmember', array(
-						'GROUP_ID'		=> $row['group_id'],
-						'GROUP_NAME'	=> ($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name'],
-						'GROUP_DESC'	=> ($row['group_type'] <> GROUP_SPECIAL) ? generate_text_for_display($row['group_desc'], $row['group_desc_uid'], $row['group_desc_bitfield'], $row['group_desc_options']) : phpbb::$user->lang['GROUP_IS_SPECIAL'],
-						'GROUP_SPECIAL'	=> ($row['group_type'] <> GROUP_SPECIAL) ? false : true,
-						'GROUP_CLOSED'	=> ($row['group_type'] <> GROUP_CLOSED || phpbb::$acl->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? false : true,
-						'GROUP_STATUS'	=> phpbb::$user->lang['GROUP_IS_' . $group_status],
-						'S_CAN_JOIN'	=> ($row['group_type'] == GROUP_OPEN || $row['group_type'] == GROUP_FREE) ? true : false,
-						'GROUP_COLOUR'	=> $row['group_colour'],
-
-						'U_VIEW_GROUP'	=> append_sid('memberlist', 'mode=group&amp;g=' . $row['group_id']),
-					));
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				phpbb::$template->assign_vars(array(
-					'S_CHANGE_DEFAULT'	=> (phpbb::$acl->acl_get('u_chggrp')) ? true : false,
-					'S_LEADER_COUNT'	=> $leader_count,
-					'S_MEMBER_COUNT'	=> $member_count,
-					'S_PENDING_COUNT'	=> $pending_count,
-					'S_NONMEMBER_COUNT'	=> $nonmember_count,
-
-					'S_UCP_ACTION'			=> $this->u_action,
-				));
-
-			break;
-
-			case 'manage':
-
-				$this->page_title = 'UCP_USERGROUPS_MANAGE';
-				$action		= (phpbb_request::is_set_post('addusers')) ? 'addusers' : request_var('action', '');
-				$group_id	= request_var('g', 0);
-
-				include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-
-				add_form_key('ucp_groups');
-
-				if ($group_id)
-				{
-					$sql = 'SELECT *
-						FROM ' . GROUPS_TABLE . "
-						WHERE group_id = $group_id";
-					$result = phpbb::$db->sql_query($sql);
-					$group_row = phpbb::$db->sql_fetchrow($result);
-					phpbb::$db->sql_freeresult($result);
-
-					if (!$group_row)
-					{
-						trigger_error(phpbb::$user->lang['NO_GROUP'] . $return_page);
-					}
-
-					// Check if the user is allowed to manage this group if set to founder only.
-					if (!phpbb::$user->is_founder && $group_row['group_founder_manage'])
-					{
-						trigger_error(phpbb::$user->lang['NOT_ALLOWED_MANAGE_GROUP'] . $return_page, E_USER_WARNING);
-					}
-
-					$group_name = $group_row['group_name'];
-					$group_type = $group_row['group_type'];
-
-					$avatar_img = (!empty($group_row['group_avatar'])) ? get_user_avatar($group_row['group_avatar'], $group_row['group_avatar_type'], $group_row['group_avatar_width'], $group_row['group_avatar_height'], 'GROUP_AVATAR') : '<img src="' . PHPBB_ROOT_PATH . phpbb::$base_config['admin_folder'] . '/images/no_avatar.gif" alt="" />';
-
-					phpbb::$template->assign_vars(array(
-						'GROUP_NAME'			=> ($group_type == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $group_name] : $group_name,
-						'GROUP_INTERNAL_NAME'	=> $group_name,
-						'GROUP_COLOUR'			=> (isset($group_row['group_colour'])) ? $group_row['group_colour'] : '',
-						'GROUP_DESC_DISP'		=> generate_text_for_display($group_row['group_desc'], $group_row['group_desc_uid'], $group_row['group_desc_bitfield'], $group_row['group_desc_options']),
-						'GROUP_TYPE'			=> $group_row['group_type'],
-
-						'AVATAR'				=> $avatar_img,
-						'AVATAR_IMAGE'			=> $avatar_img,
-						'AVATAR_WIDTH'			=> (isset($group_row['group_avatar_width'])) ? $group_row['group_avatar_width'] : '',
-						'AVATAR_HEIGHT'			=> (isset($group_row['group_avatar_height'])) ? $group_row['group_avatar_height'] : '',
-					));
-				}
-
-				switch ($action)
-				{
-					case 'edit':
-
-						if (!$group_id)
-						{
-							trigger_error(phpbb::$user->lang['NO_GROUP'] . $return_page);
-						}
-
-						if (!($row = group_memberships($group_id, phpbb::$user->data['user_id'])))
-						{
-							trigger_error(phpbb::$user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
-						}
-						list(, $row) = each($row);
-
-						if (!$row['group_leader'])
-						{
-							trigger_error(phpbb::$user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
-						}
-
-						$file_uploads = (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on') ? true : false;
-						phpbb::$user->add_lang(array('acp/groups', 'acp/common'));
-
-						$data = $submit_ary = array();
-
-						$update	= phpbb_request::is_set_post('update');
-
-						$error = array();
-
-						$avatar_select = basename(request_var('avatar_select', ''));
-						$category = basename(request_var('category', ''));
-
-						$can_upload = (file_exists(PHPBB_ROOT_PATH . phpbb::$config['avatar_path']) && @is_writable(PHPBB_ROOT_PATH . phpbb::$config['avatar_path']) && $file_uploads) ? true : false;
-
-						// Did we submit?
-						if ($update)
-						{
-							$group_name	= utf8_normalize_nfc(request_var('group_name', '', true));
-							$group_desc = utf8_normalize_nfc(request_var('group_desc', '', true));
-							$group_type	= request_var('group_type', GROUP_FREE);
-
-							$allow_desc_bbcode	= request_var('desc_parse_bbcode', false);
-							$allow_desc_urls	= request_var('desc_parse_urls', false);
-							$allow_desc_smilies	= request_var('desc_parse_smilies', false);
-
-							$submit_ary = array(
-								'colour'		=> request_var('group_colour', ''),
-								'rank'			=> request_var('group_rank', 0),
-								'receive_pm'	=> phpbb_request::is_set('group_receive_pm') ? 1 : 0,
-								'message_limit'	=> request_var('group_message_limit', 0),
-								'max_recipients'=> request_var('group_max_recipients', 0),
-							);
-
-							$data['uploadurl']	= request_var('uploadurl', '');
-							$data['remotelink'] = request_var('remotelink', '');
-							$data['width']		= request_var('width', '');
-							$data['height']		= request_var('height', '');
-							$delete				= request_var('delete', '');
-
-							if (!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl'] || $data['remotelink'])
-							{
-								// Avatar stuff
-								$var_ary = array(
-									'uploadurl'		=> array('string', true, 5, 255),
-									'remotelink'	=> array('string', true, 5, 255),
-									'width'			=> array('string', true, 1, 3),
-									'height'		=> array('string', true, 1, 3),
-								);
-
-								if (!($error = validate_data($data, $var_ary)))
-								{
-									$data['user_id'] = "g$group_id";
-
-									if ((!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl']) && $can_upload)
-									{
-										list($submit_ary['avatar_type'], $submit_ary['avatar'], $submit_ary['avatar_width'], $submit_ary['avatar_height']) = avatar_upload($data, $error);
-									}
-									else if ($data['remotelink'])
-									{
-										list($submit_ary['avatar_type'], $submit_ary['avatar'], $submit_ary['avatar_width'], $submit_ary['avatar_height']) = avatar_remote($data, $error);
-									}
-								}
-							}
-							else if ($avatar_select && phpbb::$config['allow_avatar_local'])
-							{
-								// check avatar gallery
-								if (is_dir(PHPBB_ROOT_PATH . phpbb::$config['avatar_gallery_path'] . '/' . $category))
-								{
-									$submit_ary['avatar_type'] = AVATAR_GALLERY;
-
-									list($submit_ary['avatar_width'], $submit_ary['avatar_height']) = getimagesize(PHPBB_ROOT_PATH . phpbb::$config['avatar_gallery_path'] . '/' . $category . '/' . $avatar_select);
-									$submit_ary['avatar'] = $category . '/' . $avatar_select;
-								}
-							}
-							else if ($delete)
-							{
-								$submit_ary['avatar'] = '';
-								$submit_ary['avatar_type'] = $submit_ary['avatar_width'] = $submit_ary['avatar_height'] = 0;
-							}
-							else if ($data['width'] && $data['height'])
-							{
-								// Only update the dimensions?
-								if (phpbb::$config['avatar_max_width'] || phpbb::$config['avatar_max_height'])
-								{
-									if ($data['width'] > phpbb::$config['avatar_max_width'] || $data['height'] > phpbb::$config['avatar_max_height'])
-									{
-										$error[] = sprintf(phpbb::$user->lang['AVATAR_WRONG_SIZE'], phpbb::$config['avatar_min_width'], phpbb::$config['avatar_min_height'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], $data['width'], $data['height']);
-									}
-								}
-
-								if (!sizeof($error))
-								{
-									if (phpbb::$config['avatar_min_width'] || phpbb::$config['avatar_min_height'])
-									{
-										if ($data['width'] < phpbb::$config['avatar_min_width'] || $data['height'] < phpbb::$config['avatar_min_height'])
-										{
-											$error[] = sprintf(phpbb::$user->lang['AVATAR_WRONG_SIZE'], phpbb::$config['avatar_min_width'], phpbb::$config['avatar_min_height'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], $data['width'], $data['height']);
-										}
-									}
-								}
-
-								if (!sizeof($error))
-								{
-									$submit_ary['avatar_width'] = $data['width'];
-									$submit_ary['avatar_height'] = $data['height'];
-								}
-							}
-
-							if ((isset($submit_ary['avatar']) && $submit_ary['avatar'] && (!isset($group_row['group_avatar']))) || $delete)
-							{
-								if (isset($group_row['group_avatar']) && $group_row['group_avatar'])
-								{
-									avatar_delete('group', $group_row, true);
-								}
-							}
-
-							if (!check_form_key('ucp_groups'))
-							{
-								$error[] = phpbb::$user->lang['FORM_INVALID'];
-							}
-
-							if (!sizeof($error))
-							{
-								// Only set the rank, colour, etc. if it's changed or if we're adding a new
-								// group. This prevents existing group members being updated if no changes
-								// were made.
-
-								$group_attributes = array();
-								$test_variables = array('rank', 'colour', 'avatar', 'avatar_type', 'avatar_width', 'avatar_height', 'receive_pm', 'legend', 'message_limit', 'max_recipients');
-								foreach ($test_variables as $test)
-								{
-									if ($action == 'add' || (isset($submit_ary[$test]) && $group_row['group_' . $test] != $submit_ary[$test]))
-									{
-										$group_attributes['group_' . $test] = $group_row['group_' . $test] = $submit_ary[$test];
-									}
-								}
-
-								if (!($error = group_create($group_id, $group_type, $group_name, $group_desc, $group_attributes, $allow_desc_bbcode, $allow_desc_urls, $allow_desc_smilies)))
-								{
-									phpbb::$acm->destroy_sql(GROUPS_TABLE);
-
-									$message = ($action == 'edit') ? 'GROUP_UPDATED' : 'GROUP_CREATED';
-									trigger_error(phpbb::$user->lang[$message] . $return_page);
-								}
-							}
-
-							if (sizeof($error))
-							{
-								$group_rank = $submit_ary['rank'];
-
-								$group_desc_data = array(
-									'text'			=> $group_desc,
-									'allow_bbcode'	=> $allow_desc_bbcode,
-									'allow_smilies'	=> $allow_desc_smilies,
-									'allow_urls'	=> $allow_desc_urls
-								);
-							}
-						}
-						else if (!$group_id)
-						{
-							$group_name = utf8_normalize_nfc(request_var('group_name', '', true));
-							$group_desc_data = array(
-								'text'			=> '',
-								'allow_bbcode'	=> true,
-								'allow_smilies'	=> true,
-								'allow_urls'	=> true
-							);
-							$group_rank = 0;
-							$group_type = GROUP_OPEN;
-						}
-						else
-						{
-							$group_desc_data = generate_text_for_edit($group_row['group_desc'], $group_row['group_desc_uid'], $group_row['group_desc_options']);
-							$group_rank = $group_row['group_rank'];
-						}
-
-						$sql = 'SELECT *
-							FROM ' . RANKS_TABLE . '
-							WHERE rank_special = 1
-							ORDER BY rank_title';
-						$result = phpbb::$db->sql_query($sql);
-
-						$rank_options = '<option value="0"' . ((!$group_rank) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang['USER_DEFAULT'] . '</option>';
-						while ($row = phpbb::$db->sql_fetchrow($result))
-						{
-							$selected = ($group_rank && $row['rank_id'] == $group_rank) ? ' selected="selected"' : '';
-							$rank_options .= '<option value="' . $row['rank_id'] . '"' . $selected . '>' . $row['rank_title'] . '</option>';
-						}
-						phpbb::$db->sql_freeresult($result);
-
-						$type_free		= ($group_type == GROUP_FREE) ? ' checked="checked"' : '';
-						$type_open		= ($group_type == GROUP_OPEN) ? ' checked="checked"' : '';
-						$type_closed	= ($group_type == GROUP_CLOSED) ? ' checked="checked"' : '';
-						$type_hidden	= ($group_type == GROUP_HIDDEN) ? ' checked="checked"' : '';
-
-						$display_gallery = phpbb_request::is_set_post('display_gallery');
-
-						if (phpbb::$config['allow_avatar_local'] && $display_gallery)
-						{
-							avatar_gallery($category, $avatar_select, 4);
-						}
-
-						$avatars_enabled = ($can_upload || (phpbb::$config['allow_avatar_local'] || phpbb::$config['allow_avatar_remote'])) ? true : false;
-
-						phpbb::$template->assign_vars(array(
-							'S_EDIT'			=> true,
-							'S_INCLUDE_SWATCH'	=> true,
-							'S_CAN_UPLOAD'		=> $can_upload,
-							'S_FORM_ENCTYPE'	=> ($can_upload) ? ' enctype="multipart/form-data"' : '',
-							'S_ERROR'			=> (sizeof($error)) ? true : false,
-							'S_SPECIAL_GROUP'	=> ($group_type == GROUP_SPECIAL) ? true : false,
-							'S_AVATARS_ENABLED'	=> $avatars_enabled,
-							'S_DISPLAY_GALLERY'	=> (phpbb::$config['allow_avatar_local'] && !$display_gallery) ? true : false,
-							'S_IN_GALLERY'		=> (phpbb::$config['allow_avatar_local'] && $display_gallery) ? true : false,
-
-							'ERROR_MSG'				=> (sizeof($error)) ? implode('<br />', $error) : '',
-							'GROUP_RECEIVE_PM'		=> (isset($group_row['group_receive_pm']) && $group_row['group_receive_pm']) ? ' checked="checked"' : '',
-							'GROUP_MESSAGE_LIMIT'	=> (isset($group_row['group_message_limit'])) ? $group_row['group_message_limit'] : 0,
-							'GROUP_MAX_RECIPIENTS'	=> (isset($group_row['group_max_recipients'])) ? $group_row['group_max_recipients'] : 0,
-
-							'GROUP_DESC'			=> $group_desc_data['text'],
-							'S_DESC_BBCODE_CHECKED'	=> $group_desc_data['allow_bbcode'],
-							'S_DESC_URLS_CHECKED'	=> $group_desc_data['allow_urls'],
-							'S_DESC_SMILIES_CHECKED'=> $group_desc_data['allow_smilies'],
-
-							'S_RANK_OPTIONS'		=> $rank_options,
-							'AVATAR_MAX_FILESIZE'	=> phpbb::$config['avatar_filesize'],
-
-							'GROUP_TYPE_FREE'		=> GROUP_FREE,
-							'GROUP_TYPE_OPEN'		=> GROUP_OPEN,
-							'GROUP_TYPE_CLOSED'		=> GROUP_CLOSED,
-							'GROUP_TYPE_HIDDEN'		=> GROUP_HIDDEN,
-							'GROUP_TYPE_SPECIAL'	=> GROUP_SPECIAL,
-
-							'GROUP_FREE'		=> $type_free,
-							'GROUP_OPEN'		=> $type_open,
-							'GROUP_CLOSED'		=> $type_closed,
-							'GROUP_HIDDEN'		=> $type_hidden,
-
-							'U_SWATCH'			=> append_sid(phpbb::$base_config['admin_folder'] . '/swatch', 'form=ucp&amp;name=group_colour'),
-							'S_UCP_ACTION'		=> $this->u_action . "&amp;action=$action&amp;g=$group_id",
-							'L_AVATAR_EXPLAIN'	=> sprintf(phpbb::$user->lang['AVATAR_EXPLAIN'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], phpbb::$config['avatar_filesize'] / 1024),
-						));
-
-					break;
-
-					case 'list':
-
-						if (!$group_id)
-						{
-							trigger_error(phpbb::$user->lang['NO_GROUP'] . $return_page);
-						}
-
-						if (!($row = group_memberships($group_id, phpbb::$user->data['user_id'])))
-						{
-							trigger_error(phpbb::$user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
-						}
-						list(, $row) = each($row);
-
-						if (!$row['group_leader'])
-						{
-							trigger_error(phpbb::$user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
-						}
-
-						phpbb::$user->add_lang(array('acp/groups', 'acp/common'));
-						$start = request_var('start', 0);
-
-						// Grab the leaders - always, on every page...
-						$sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_colour, u.user_regdate, u.user_posts, u.group_id, ug.group_leader, ug.user_pending
-							FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug
-							WHERE ug.group_id = $group_id
-								AND u.user_id = ug.user_id
-								AND ug.group_leader = 1
-							ORDER BY ug.user_pending DESC, u.username_clean";
-						$result = phpbb::$db->sql_query($sql);
-
-						while ($row = phpbb::$db->sql_fetchrow($result))
-						{
-							phpbb::$template->assign_block_vars('leader', array(
-								'USERNAME'			=> $row['username'],
-								'USERNAME_COLOUR'	=> $row['user_colour'],
-								'USERNAME_FULL'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
-								'U_USER_VIEW'		=> get_username_string('profile', $row['user_id'], $row['username']),
-								'S_GROUP_DEFAULT'	=> ($row['group_id'] == $group_id) ? true : false,
-								'JOINED'			=> ($row['user_regdate']) ? phpbb::$user->format_date($row['user_regdate']) : ' - ',
-								'USER_POSTS'		=> $row['user_posts'],
-								'USER_ID'			=> $row['user_id'],
-							));
-						}
-						phpbb::$db->sql_freeresult($result);
-
-						// Total number of group members (non-leaders)
-						$sql = 'SELECT COUNT(user_id) AS total_members
-							FROM ' . USER_GROUP_TABLE . "
-							WHERE group_id = $group_id
-								AND group_leader = 0";
-						$result = phpbb::$db->sql_query($sql);
-						$total_members = (int) phpbb::$db->sql_fetchfield('total_members');
-						phpbb::$db->sql_freeresult($result);
-
-						// Grab the members
-						$sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_colour, u.user_regdate, u.user_posts, u.group_id, ug.group_leader, ug.user_pending
-							FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug
-							WHERE ug.group_id = $group_id
-								AND u.user_id = ug.user_id
-								AND ug.group_leader = 0
-							ORDER BY ug.user_pending DESC, u.username_clean";
-						$result = phpbb::$db->sql_query_limit($sql, phpbb::$config['topics_per_page'], $start);
-
-						$pending = false;
-						$approved = false;
-
-						while ($row = phpbb::$db->sql_fetchrow($result))
-						{
-							if ($row['user_pending'] && !$pending)
-							{
-								phpbb::$template->assign_block_vars('member', array(
-									'S_PENDING'		=> true,
-								));
-								phpbb::$template->assign_var('S_PENDING_SET', true);
-
-								$pending = true;
-							}
-							else if (!$row['user_pending'] && !$approved)
-							{
-								phpbb::$template->assign_block_vars('member', array(
-									'S_APPROVED'		=> true,
-								));
-								phpbb::$template->assign_var('S_APPROVED_SET', true);
-
-								$approved = true;
-							}
-
-							phpbb::$template->assign_block_vars('member', array(
-								'USERNAME'			=> $row['username'],
-								'USERNAME_COLOUR'	=> $row['user_colour'],
-								'USERNAME_FULL'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
-								'U_USER_VIEW'		=> get_username_string('profile', $row['user_id'], $row['username']),
-								'S_GROUP_DEFAULT'	=> ($row['group_id'] == $group_id) ? true : false,
-								'JOINED'			=> ($row['user_regdate']) ? phpbb::$user->format_date($row['user_regdate']) : ' - ',
-								'USER_POSTS'		=> $row['user_posts'],
-								'USER_ID'			=> $row['user_id'],
-							));
-						}
-						phpbb::$db->sql_freeresult($result);
-
-						$s_action_options = '';
-						$options = array('default' => 'DEFAULT', 'approve' => 'APPROVE', 'deleteusers' => 'DELETE');
-
-						foreach ($options as $option => $lang)
-						{
-							$s_action_options .= '<option value="' . $option . '">' . phpbb::$user->lang['GROUP_' . $lang] . '</option>';
-						}
-
-						phpbb::$template->assign_vars(array(
-							'S_LIST'			=> true,
-							'S_ACTION_OPTIONS'	=> $s_action_options,
-							'S_ON_PAGE'			=> on_page($total_members, phpbb::$config['topics_per_page'], $start),
-							'PAGINATION'		=> generate_pagination($this->u_action . "&amp;action=$action&amp;g=$group_id", $total_members, phpbb::$config['topics_per_page'], $start),
-
-							'U_ACTION'			=> $this->u_action . "&amp;g=$group_id",
-							'U_FIND_USERNAME'	=> append_sid('memberlist', 'mode=searchuser&amp;form=ucp&amp;field=usernames'),
-						));
-
-					break;
-
-					case 'approve':
-
-						if (!$group_id)
-						{
-							trigger_error(phpbb::$user->lang['NO_GROUP'] . $return_page);
-						}
-
-						if (!($row = group_memberships($group_id, phpbb::$user->data['user_id'])))
-						{
-							trigger_error(phpbb::$user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
-						}
-						list(, $row) = each($row);
-
-						if (!$row['group_leader'])
-						{
-							trigger_error(phpbb::$user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
-						}
-
-						phpbb::$user->add_lang('acp/groups');
-
-						// Approve, demote or promote
-						group_user_attributes('approve', $group_id, $mark_ary, false, false);
-
-						trigger_error(phpbb::$user->lang['USERS_APPROVED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
-
-					break;
-
-					case 'default':
-
-						if (!$group_id)
-						{
-							trigger_error(phpbb::$user->lang['NO_GROUP'] . $return_page);
-						}
-
-						if (!($row = group_memberships($group_id, phpbb::$user->data['user_id'])))
-						{
-							trigger_error(phpbb::$user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
-						}
-						list(, $row) = each($row);
-
-						if (!$row['group_leader'])
-						{
-							trigger_error(phpbb::$user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
-						}
-
-						$group_row['group_name'] = ($group_row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
-
-						if (confirm_box(true))
-						{
-							if (!sizeof($mark_ary))
-							{
-								$start = 0;
-
-								do
-								{
-									$sql = 'SELECT user_id
-										FROM ' . USER_GROUP_TABLE . "
-										WHERE group_id = $group_id
-										ORDER BY user_id";
-									$result = phpbb::$db->sql_query_limit($sql, 200, $start);
-
-									$mark_ary = array();
-									if ($row = phpbb::$db->sql_fetchrow($result))
-									{
-										do
-										{
-											$mark_ary[] = $row['user_id'];
-										}
-										while ($row = phpbb::$db->sql_fetchrow($result));
-
-										group_user_attributes('default', $group_id, $mark_ary, false, $group_row['group_name'], $group_row);
-
-										$start = (sizeof($mark_ary) < 200) ? 0 : $start + 200;
-									}
-									else
-									{
-										$start = 0;
-									}
-									phpbb::$db->sql_freeresult($result);
-								}
-								while ($start);
-							}
-							else
-							{
-								group_user_attributes('default', $group_id, $mark_ary, false, $group_row['group_name'], $group_row);
-							}
-
-							phpbb::$user->add_lang('acp/groups');
-
-							trigger_error(phpbb::$user->lang['GROUP_DEFS_UPDATED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
-						}
-						else
-						{
-							phpbb::$user->add_lang('acp/common');
-
-							confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-								'mark'		=> $mark_ary,
-								'g'			=> $group_id,
-								'i'			=> $id,
-								'mode'		=> $mode,
-								'action'	=> $action))
-							);
-						}
-
-					break;
-
-					case 'deleteusers':
-
-						phpbb::$user->add_lang(array('acp/groups', 'acp/common'));
-
-						if (!($row = group_memberships($group_id, phpbb::$user->data['user_id'])))
-						{
-							trigger_error(phpbb::$user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
-						}
-						list(, $row) = each($row);
-
-						if (!$row['group_leader'])
-						{
-							trigger_error(phpbb::$user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
-						}
-
-						$group_row['group_name'] = ($group_row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
-
-						if (confirm_box(true))
-						{
-							if (!$group_id)
-							{
-								trigger_error(phpbb::$user->lang['NO_GROUP'] . $return_page);
-							}
-
-							$error = group_user_del($group_id, $mark_ary, false, $group_row['group_name']);
-
-							if ($error)
-							{
-								trigger_error(phpbb::$user->lang[$error] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
-							}
-
-							trigger_error(phpbb::$user->lang['GROUP_USERS_REMOVE'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
-						}
-						else
-						{
-							confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-								'mark'		=> $mark_ary,
-								'g'			=> $group_id,
-								'i'			=> $id,
-								'mode'		=> $mode,
-								'action'	=> $action))
-							);
-						}
-
-					break;
-
-					case 'addusers':
-
-						phpbb::$user->add_lang(array('acp/groups', 'acp/common'));
-
-						$names = utf8_normalize_nfc(request_var('usernames', '', true));
-
-						if (!$group_id)
-						{
-							trigger_error(phpbb::$user->lang['NO_GROUP'] . $return_page);
-						}
-
-						if (!$names)
-						{
-							trigger_error(phpbb::$user->lang['NO_USERS'] . $return_page);
-						}
-
-						if (!($row = group_memberships($group_id, phpbb::$user->data['user_id'])))
-						{
-							trigger_error(phpbb::$user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
-						}
-						list(, $row) = each($row);
-
-						if (!$row['group_leader'])
-						{
-							trigger_error(phpbb::$user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
-						}
-
-						$name_ary = array_unique(explode("\n", $names));
-						$group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
-
-						$default = request_var('default', 0);
-
-						if (confirm_box(true))
-						{
-							// Add user/s to group
-							if ($error = group_user_add($group_id, false, $name_ary, $group_name, $default, 0, 0, $group_row))
-							{
-								trigger_error(phpbb::$user->lang[$error] . $return_page);
-							}
-
-							trigger_error(phpbb::$user->lang['GROUP_USERS_ADDED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
-						}
-						else
-						{
-							$s_hidden_fields = array(
-								'default'	=> $default,
-								'usernames'	=> $names,
-								'g'			=> $group_id,
-								'i'			=> $id,
-								'mode'		=> $mode,
-								'action'	=> $action
-							);
-							confirm_box(false, sprintf(phpbb::$user->lang['GROUP_CONFIRM_ADD_USER' . ((sizeof($name_ary) == 1) ? '' : 'S')], implode(', ', $name_ary)), build_hidden_fields($s_hidden_fields));
-						}
-
-						trigger_error(phpbb::$user->lang['NO_USERS_ADDED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
-
-					break;
-
-					default:
-						phpbb::$user->add_lang('acp/common');
-
-						$sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_desc, g.group_desc_uid, g.group_desc_bitfield, g.group_desc_options, g.group_type, ug.group_leader
-							FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . ' ug
-							WHERE ug.user_id = ' . phpbb::$user->data['user_id'] . '
-								AND g.group_id = ug.group_id
-								AND ug.group_leader = 1
-							ORDER BY g.group_type DESC, g.group_name';
-						$result = phpbb::$db->sql_query($sql);
-
-						while ($value = phpbb::$db->sql_fetchrow($result))
-						{
-							phpbb::$template->assign_block_vars('leader', array(
-								'GROUP_NAME'	=> ($value['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $value['group_name']] : $value['group_name'],
-								'GROUP_DESC'	=> generate_text_for_display($value['group_desc'], $value['group_desc_uid'], $value['group_desc_bitfield'], $value['group_desc_options']),
-								'GROUP_TYPE'	=> $value['group_type'],
-								'GROUP_ID'		=> $value['group_id'],
-								'GROUP_COLOUR'	=> $value['group_colour'],
-
-								'U_LIST'	=> $this->u_action . "&amp;action=list&amp;g={$value['group_id']}",
-								'U_EDIT'	=> $this->u_action . "&amp;action=edit&amp;g={$value['group_id']}",
-							));
-						}
-						phpbb::$db->sql_freeresult($result);
-
-					break;
-				}
-
-			break;
-		}
-
-		$this->tpl_name = 'ucp_groups_' . $mode;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/ucp_main.php b/phpBB/modules/ucp/ucp_main.php
deleted file mode 100644
index 1206d51681..0000000000
--- a/phpBB/modules/ucp/ucp_main.php
+++ /dev/null
@@ -1,831 +0,0 @@
-<?php
-/**
-*
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* ucp_main
-* UCP Front Panel
-* @package ucp
-*/
-class ucp_main
-{
-	var $p_master;
-	var $u_action;
-
-	function __construct(&$p_master)
-	{
-		$this->p_master = &$p_master;
-	}
-
-	function main($id, $mode)
-	{
-		switch ($mode)
-		{
-			case 'front':
-
-				phpbb::$user->add_lang('memberlist');
-
-				$sql_from = TOPICS_TABLE . ' t ';
-				$sql_select = '';
-
-				if (phpbb::$config['load_db_track'])
-				{
-					$sql_from .= ' LEFT JOIN ' . TOPICS_POSTED_TABLE . ' tp ON (tp.topic_id = t.topic_id
-						AND tp.user_id = ' . phpbb::$user->data['user_id'] . ')';
-					$sql_select .= ', tp.topic_posted';
-				}
-
-				if (phpbb::$config['load_db_lastread'])
-				{
-					$sql_from .= ' LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.topic_id = t.topic_id
-						AND tt.user_id = ' . phpbb::$user->data['user_id'] . ')';
-					$sql_select .= ', tt.mark_time';
-				}
-
-				$topic_type = phpbb::$user->lang['VIEW_TOPIC_GLOBAL'];
-				$folder = 'global_read';
-				$folder_new = 'global_unread';
-
-				// Get cleaned up list... return only those forums not having the f_read permission
-				$forum_ary = phpbb::$acl->acl_getf('!f_read', true);
-				$forum_ary = array_unique(array_keys($forum_ary));
-
-				// Determine first forum the user is able to read into - for global announcement link
-				$sql = 'SELECT forum_id
-					FROM ' . FORUMS_TABLE . '
-					WHERE forum_type = ' . FORUM_POST;
-
-				if (sizeof($forum_ary))
-				{
-					$sql .= ' AND ' . phpbb::$db->sql_in_set('forum_id', $forum_ary, true);
-				}
-				$result = phpbb::$db->sql_query_limit($sql, 1);
-				$g_forum_id = (int) phpbb::$db->sql_fetchfield('forum_id');
-				phpbb::$db->sql_freeresult($result);
-
-				$sql = "SELECT t.* $sql_select
-					FROM $sql_from
-					WHERE t.forum_id = 0
-						AND t.topic_type = " . POST_GLOBAL . '
-					ORDER BY t.topic_last_post_time DESC';
-
-				$topic_list = $rowset = array();
-				// If the user can't see any forums, he can't read any posts because fid of 0 is invalid
-				if ($g_forum_id)
-				{
-					$result = phpbb::$db->sql_query($sql);
-
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$topic_list[] = $row['topic_id'];
-						$rowset[$row['topic_id']] = $row;
-					}
-					phpbb::$db->sql_freeresult($result);
-				}
-
-				$topic_tracking_info = array();
-				if (phpbb::$config['load_db_lastread'])
-				{
-					$topic_tracking_info = get_topic_tracking(0, $topic_list, $rowset, false, $topic_list);
-				}
-				else
-				{
-					$topic_tracking_info = get_complete_topic_tracking(0, $topic_list, $topic_list);
-				}
-
-				foreach ($topic_list as $topic_id)
-				{
-					$row = &$rowset[$topic_id];
-
-					$forum_id = $row['forum_id'];
-					$topic_id = $row['topic_id'];
-
-					$unread_topic = (isset($topic_tracking_info[$topic_id]) && $row['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false;
-
-					$folder_img = ($unread_topic) ? $folder_new : $folder;
-					$folder_alt = ($unread_topic) ? 'NEW_POSTS' : (($row['topic_status'] == ITEM_LOCKED) ? 'TOPIC_LOCKED' : 'NO_NEW_POSTS');
-
-					if ($row['topic_status'] == ITEM_LOCKED)
-					{
-						$folder_img .= '_locked';
-					}
-
-					// Posted image?
-					if (!empty($row['topic_posted']) && $row['topic_posted'])
-					{
-						$folder_img .= '_mine';
-					}
-
-					phpbb::$template->assign_block_vars('topicrow', array(
-						'FORUM_ID'					=> $forum_id,
-						'TOPIC_ID'					=> $topic_id,
-						'TOPIC_AUTHOR'				=> get_username_string('username', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
-						'TOPIC_AUTHOR_COLOUR'		=> get_username_string('colour', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
-						'TOPIC_AUTHOR_FULL'			=> get_username_string('full', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
-						'FIRST_POST_TIME'			=> phpbb::$user->format_date($row['topic_time']),
-						'LAST_POST_SUBJECT'			=> censor_text($row['topic_last_post_subject']),
-						'LAST_POST_TIME'			=> phpbb::$user->format_date($row['topic_last_post_time']),
-						'LAST_VIEW_TIME'			=> phpbb::$user->format_date($row['topic_last_view_time']),
-						'LAST_POST_AUTHOR'			=> get_username_string('username', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
-						'LAST_POST_AUTHOR_COLOUR'	=> get_username_string('colour', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
-						'LAST_POST_AUTHOR_FULL'		=> get_username_string('full', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
-						'TOPIC_TITLE'				=> censor_text($row['topic_title']),
-						'TOPIC_TYPE'				=> $topic_type,
-
-						'TOPIC_FOLDER_IMG'		=> phpbb::$user->img($folder_img, $folder_alt),
-						'TOPIC_FOLDER_IMG_SRC'	=> phpbb::$user->img($folder_img, $folder_alt, 'src'),
-						'ATTACH_ICON_IMG'		=> (phpbb::$acl->acl_get('u_download') && phpbb::$acl->acl_get('f_download', $forum_id) && $row['topic_attachment']) ? phpbb::$user->img('icon_topic_attach', '') : '',
-
-						'S_USER_POSTED'		=> (!empty($row['topic_posted']) && $row['topic_posted']) ? true : false,
-						'S_UNREAD'			=> $unread_topic,
-
-						'U_TOPIC_AUTHOR'		=> get_username_string('profile', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
-						'U_LAST_POST'			=> append_sid('viewtopic', "f=$g_forum_id&amp;t=$topic_id&amp;p=" . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'],
-						'U_LAST_POST_AUTHOR'	=> get_username_string('profile', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
-						'U_NEWEST_POST'			=> append_sid('viewtopic', "f=$g_forum_id&amp;t=$topic_id&amp;view=unread") . '#unread',
-						'U_VIEW_TOPIC'			=> append_sid('viewtopic', "f=$g_forum_id&amp;t=$topic_id"),
-					));
-				}
-
-				if (phpbb::$config['load_user_activity'])
-				{
-					if (!function_exists('display_user_activity'))
-					{
-						include_once(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-					}
-					display_user_activity(phpbb::$user->data);
-				}
-
-				// Do the relevant calculations
-				$memberdays = max(1, round((time() - phpbb::$user->data['user_regdate']) / 86400));
-				$posts_per_day = phpbb::$user->data['user_posts'] / $memberdays;
-				$percentage = (phpbb::$config['num_posts']) ? min(100, (phpbb::$user->data['user_posts'] / phpbb::$config['num_posts']) * 100) : 0;
-
-				phpbb::$template->assign_vars(array(
-					'USER_COLOR'		=> (!empty(phpbb::$user->data['user_colour'])) ? phpbb::$user->data['user_colour'] : '',
-					'JOINED'			=> phpbb::$user->format_date(phpbb::$user->data['user_regdate']),
-					'VISITED'			=> (empty($last_visit)) ? ' - ' : phpbb::$user->format_date($last_visit),
-					'WARNINGS'			=> (phpbb::$user->data['user_warnings']) ? phpbb::$user->data['user_warnings'] : 0,
-					'POSTS'				=> (phpbb::$user->data['user_posts']) ? phpbb::$user->data['user_posts'] : 0,
-					'POSTS_DAY'			=> sprintf(phpbb::$user->lang['POST_DAY'], $posts_per_day),
-					'POSTS_PCT'			=> sprintf(phpbb::$user->lang['POST_PCT'], $percentage),
-
-					'OCCUPATION'	=> (!empty($row['user_occ'])) ? $row['user_occ'] : '',
-					'INTERESTS'		=> (!empty($row['user_interests'])) ? $row['user_interests'] : '',
-
-//					'S_GROUP_OPTIONS'	=> $group_options,
-
-					'U_SEARCH_USER'		=> (phpbb::$acl->acl_get('u_search')) ? append_sid('search', 'author_id=' . phpbb::$user->data['user_id'] . '&amp;sr=posts') : '',
-				));
-
-			break;
-
-			case 'subscribed':
-
-				include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-
-				phpbb::$user->add_lang('viewforum');
-
-				add_form_key('ucp_front_subscribed');
-
-				$unwatch = phpbb_request::is_set_post('unwatch');
-
-				if ($unwatch)
-				{
-					if (check_form_key('ucp_front_subscribed'))
-					{
-						$forums = array_keys(request_var('f', array(0 => 0)));
-						$topics = array_keys(request_var('t', array(0 => 0)));
-						$msg = '';
-
-						if (sizeof($forums) || sizeof($topics))
-						{
-							$l_unwatch = '';
-							if (sizeof($forums))
-							{
-								$sql = 'DELETE FROM ' . FORUMS_WATCH_TABLE . '
-									WHERE ' . phpbb::$db->sql_in_set('forum_id', $forums) . '
-										AND user_id = ' . phpbb::$user->data['user_id'];
-								phpbb::$db->sql_query($sql);
-
-								$l_unwatch .= '_FORUMS';
-							}
-
-							if (sizeof($topics))
-							{
-								$sql = 'DELETE FROM ' . TOPICS_WATCH_TABLE . '
-									WHERE ' . phpbb::$db->sql_in_set('topic_id', $topics) . '
-										AND user_id = ' . phpbb::$user->data['user_id'];
-								phpbb::$db->sql_query($sql);
-
-								$l_unwatch .= '_TOPICS';
-							}
-							$msg = phpbb::$user->lang['UNWATCHED' . $l_unwatch];
-						}
-						else
-						{
-							$msg = phpbb::$user->lang['NO_WATCHED_SELECTED'];
-						}
-					}
-					else
-					{
-						$msg = phpbb::$user->lang['FORM_INVALID'];
-					}
-					$message = $msg . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . append_sid('ucp', "i=$id&amp;mode=subscribed") . '">', '</a>');
-					meta_refresh(3, append_sid('ucp', "i=$id&amp;mode=subscribed"));
-					trigger_error($message);
-				}
-
-				$forbidden_forums = array();
-
-				if (phpbb::$config['allow_forum_notify'])
-				{
-					$forbidden_forums = phpbb::$acl->acl_getf('!f_read', true);
-					$forbidden_forums = array_unique(array_keys($forbidden_forums));
-
-					$sql_array = array(
-						'SELECT'	=> 'f.*',
-
-						'FROM'		=> array(
-							FORUMS_WATCH_TABLE	=> 'fw',
-							FORUMS_TABLE		=> 'f'
-						),
-
-						'WHERE'		=> 'fw.user_id = ' . phpbb::$user->data['user_id'] . '
-							AND f.forum_id = fw.forum_id
-							AND ' . phpbb::$db->sql_in_set('f.forum_id', $forbidden_forums, true, true),
-
-						'ORDER_BY'	=> 'left_id'
-					);
-
-					if (phpbb::$config['load_db_lastread'])
-					{
-						$sql_array['LEFT_JOIN'] = array(
-							array(
-								'FROM'	=> array(FORUMS_TRACK_TABLE => 'ft'),
-								'ON'	=> 'ft.user_id = ' . phpbb::$user->data['user_id'] . ' AND ft.forum_id = f.forum_id'
-							)
-						);
-
-						$sql_array['SELECT'] .= ', ft.mark_time ';
-					}
-					else
-					{
-						$tracking_topics = phpbb_request::variable(phpbb::$config['cookie_name'] . '_track', '', false, phpbb_request::COOKIE);
-						$tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array();
-					}
-
-					$sql = phpbb::$db->sql_build_query('SELECT', $sql_array);
-					$result = phpbb::$db->sql_query($sql);
-
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$forum_id = $row['forum_id'];
-
-						if (phpbb::$config['load_db_lastread'])
-						{
-							$forum_check = (!empty($row['mark_time'])) ? $row['mark_time'] : phpbb::$user->data['user_lastmark'];
-						}
-						else
-						{
-							$forum_check = (isset($tracking_topics['f'][$forum_id])) ? (int) (base_convert($tracking_topics['f'][$forum_id], 36, 10) + phpbb::$config['board_startdate']) : phpbb::$user->data['user_lastmark'];
-						}
-
-						$unread_forum = ($row['forum_last_post_time'] > $forum_check) ? true : false;
-
-						// Which folder should we display?
-						if ($row['forum_status'] == ITEM_LOCKED)
-						{
-							$folder_image = ($unread_forum) ? 'forum_unread_locked' : 'forum_read_locked';
-							$folder_alt = 'FORUM_LOCKED';
-						}
-						else
-						{
-							$folder_image = ($unread_forum) ? 'forum_unread' : 'forum_read';
-							$folder_alt = ($unread_forum) ? 'NEW_POSTS' : 'NO_NEW_POSTS';
-						}
-
-						// Create last post link information, if appropriate
-						if ($row['forum_last_post_id'])
-						{
-							$last_post_time = phpbb::$user->format_date($row['forum_last_post_time']);
-							$last_post_url = append_sid('viewtopic', "f=$forum_id&amp;p=" . $row['forum_last_post_id']) . '#p' . $row['forum_last_post_id'];
-						}
-						else
-						{
-							$last_post_time = $last_post_url = '';
-						}
-
-						phpbb::$template->assign_block_vars('forumrow', array(
-							'FORUM_ID'				=> $forum_id,
-							'FORUM_FOLDER_IMG'		=> phpbb::$user->img($folder_image, $folder_alt),
-							'FORUM_FOLDER_IMG_SRC'	=> phpbb::$user->img($folder_image, $folder_alt, 'src'),
-							'FORUM_IMAGE'			=> ($row['forum_image']) ? '<img src="' . PHPBB_ROOT_PATH . $row['forum_image'] . '" alt="' . phpbb::$user->lang[$folder_alt] . '" />' : '',
-							'FORUM_IMAGE_SRC'		=> ($row['forum_image']) ? PHPBB_ROOT_PATH . $row['forum_image'] : '',
-							'FORUM_NAME'			=> $row['forum_name'],
-							'FORUM_DESC'			=> generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield'], $row['forum_desc_options']),
-							'LAST_POST_SUBJECT'		=> $row['forum_last_post_subject'],
-							'LAST_POST_TIME'		=> $last_post_time,
-
-							'LAST_POST_AUTHOR'			=> get_username_string('username', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),
-							'LAST_POST_AUTHOR_COLOUR'	=> get_username_string('colour', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),
-							'LAST_POST_AUTHOR_FULL'		=> get_username_string('full', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),
-							'U_LAST_POST_AUTHOR'		=> get_username_string('profile', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),
-
-							'U_LAST_POST'			=> $last_post_url,
-							'U_VIEWFORUM'			=> append_sid('viewforum', 'f=' . $row['forum_id']),
-						));
-					}
-					phpbb::$db->sql_freeresult($result);
-				}
-
-				// Subscribed Topics
-				if (phpbb::$config['allow_topic_notify'])
-				{
-					if (empty($forbidden_forums))
-					{
-						$forbidden_forums = phpbb::$acl->acl_getf('!f_read', true);
-						$forbidden_forums = array_unique(array_keys($forbidden_forums));
-					}
-					$this->assign_topiclist('subscribed', $forbidden_forums);
-				}
-
-				phpbb::$template->assign_vars(array(
-					'S_TOPIC_NOTIFY'		=> phpbb::$config['allow_topic_notify'],
-					'S_FORUM_NOTIFY'		=> phpbb::$config['allow_forum_notify'],
-				));
-
-			break;
-
-			case 'bookmarks':
-
-				if (!phpbb::$config['allow_bookmarks'])
-				{
-					phpbb::$template->assign_vars(array(
-						'S_NO_DISPLAY_BOOKMARKS'	=> true,
-					));
-					break;
-				}
-
-				include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-
-				phpbb::$user->add_lang('viewforum');
-
-				if (phpbb_request::is_set_post('unbookmark'))
-				{
-					$s_hidden_fields = array('unbookmark' => 1);
-					$topics = array_keys(phpbb_request::variable('t', array(0 => 0), false, phpbb_request::POST));
-					$url = $this->u_action;
-
-					if (!sizeof($topics))
-					{
-						trigger_error('NO_BOOKMARKS_SELECTED');
-					}
-
-					foreach ($topics as $topic_id)
-					{
-						$s_hidden_fields['t'][$topic_id] = 1;
-					}
-
-					if (confirm_box(true))
-					{
-						$sql = 'DELETE FROM ' . BOOKMARKS_TABLE . '
-							WHERE user_id = ' . phpbb::$user->data['user_id'] . '
-								AND ' . phpbb::$db->sql_in_set('topic_id', $topics);
-						phpbb::$db->sql_query($sql);
-
-						meta_refresh(3, $url);
-						$message = phpbb::$user->lang['BOOKMARKS_REMOVED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $url . '">', '</a>');
-						trigger_error($message);
-					}
-					else
-					{
-						confirm_box(false, 'REMOVE_SELECTED_BOOKMARKS', build_hidden_fields($s_hidden_fields));
-					}
-				}
-				$forbidden_forums = phpbb::$acl->acl_getf('!f_read', true);
-				$forbidden_forums = array_unique(array_keys($forbidden_forums));
-
-				$this->assign_topiclist('bookmarks', $forbidden_forums);
-
-			break;
-
-			case 'drafts':
-
-				$pm_drafts = ($this->p_master->p_name == 'pm') ? true : false;
-				phpbb::$template->assign_var('S_SHOW_DRAFTS', true);
-
-				phpbb::$user->add_lang('posting');
-
-				$edit		= phpbb_request::is_set('edit');
-				$draft_id	= phpbb_request::variable('edit', 0);
-				$submit		= phpbb_request::is_set_post('submit');
-				$delete		= phpbb_request::is_set_post('delete');
-
-				$s_hidden_fields = ($edit) ? '<input type="hidden" name="edit" value="' . $draft_id . '" />' : '';
-				$draft_subject = $draft_message = '';
-				add_form_key('ucp_draft');
-
-				if ($delete)
-				{
-					if (check_form_key('ucp_draft'))
-					{
-						$drafts = array_keys(request_var('d', array(0 => 0)));
-
-						if (sizeof($drafts))
-						{
-							$sql = 'DELETE FROM ' . DRAFTS_TABLE . '
-								WHERE ' . phpbb::$db->sql_in_set('draft_id', $drafts) . '
-									AND user_id = ' . phpbb::$user->data['user_id'];
-							phpbb::$db->sql_query($sql);
-						}
-						$msg = phpbb::$user->lang['DRAFTS_DELETED'];
-						unset($drafts);
-					}
-					else
-					{
-						$msg = phpbb::$user->lang['FORM_INVALID'];
-					}
-					$message = $msg . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
-					meta_refresh(3, $this->u_action);
-					trigger_error($message);
-				}
-
-				if ($submit && $edit)
-				{
-					$draft_subject = utf8_normalize_nfc(request_var('subject', '', true));
-					$draft_message = utf8_normalize_nfc(request_var('message', '', true));
-					if (check_form_key('ucp_draft'))
-					{
-						if ($draft_message && $draft_subject)
-						{
-							$draft_row = array(
-								'draft_subject' => $draft_subject,
-								'draft_message' => $draft_message
-							);
-
-							$sql = 'UPDATE ' . DRAFTS_TABLE . '
-								SET ' . phpbb::$db->sql_build_array('UPDATE', $draft_row) . "
-								WHERE draft_id = $draft_id
-									AND user_id = " . phpbb::$user->data['user_id'];
-							phpbb::$db->sql_query($sql);
-
-							$message = phpbb::$user->lang['DRAFT_UPDATED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
-
-							meta_refresh(3, $this->u_action);
-							trigger_error($message);
-						}
-						else
-						{
-							phpbb::$template->assign_var('ERROR', ($draft_message == '') ? phpbb::$user->lang['EMPTY_DRAFT'] : (($draft_subject == '') ? phpbb::$user->lang['EMPTY_DRAFT_TITLE'] : ''));
-						}
-					}
-					else
-					{
-						phpbb::$template->assign_var('ERROR', phpbb::$user->lang['FORM_INVALID']);
-					}
-				}
-
-				if (!$pm_drafts)
-				{
-					$sql = 'SELECT d.*, f.forum_name
-						FROM ' . DRAFTS_TABLE . ' d, ' . FORUMS_TABLE . ' f
-						WHERE d.user_id = ' . phpbb::$user->data['user_id'] . ' ' .
-							(($edit) ? "AND d.draft_id = $draft_id" : '') . '
-							AND f.forum_id = d.forum_id
-						ORDER BY d.save_time DESC';
-				}
-				else
-				{
-					$sql = 'SELECT * FROM ' . DRAFTS_TABLE . '
-						WHERE user_id = ' . phpbb::$user->data['user_id'] . ' ' .
-							(($edit) ? "AND draft_id = $draft_id" : '') . '
-							AND forum_id = 0
-							AND topic_id = 0
-						ORDER BY save_time DESC';
-				}
-				$result = phpbb::$db->sql_query($sql);
-
-				$draftrows = $topic_ids = array();
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					if ($row['topic_id'])
-					{
-						$topic_ids[] = (int) $row['topic_id'];
-					}
-					$draftrows[] = $row;
-				}
-				phpbb::$db->sql_freeresult($result);
-
-				if (sizeof($topic_ids))
-				{
-					$sql = 'SELECT topic_id, forum_id, topic_title
-						FROM ' . TOPICS_TABLE . '
-						WHERE ' . phpbb::$db->sql_in_set('topic_id', array_unique($topic_ids));
-					$result = phpbb::$db->sql_query($sql);
-
-					while ($row = phpbb::$db->sql_fetchrow($result))
-					{
-						$topic_rows[$row['topic_id']] = $row;
-					}
-					phpbb::$db->sql_freeresult($result);
-				}
-				unset($topic_ids);
-
-				phpbb::$template->assign_var('S_EDIT_DRAFT', $edit);
-
-				$row_count = 0;
-				foreach ($draftrows as $draft)
-				{
-					$link_topic = $link_forum = $link_pm = false;
-					$insert_url = $view_url = $title = '';
-
-					if (isset($topic_rows[$draft['topic_id']]) && phpbb::$acl->acl_get('f_read', $topic_rows[$draft['topic_id']]['forum_id']))
-					{
-						$link_topic = true;
-						$view_url = append_sid('viewtopic', 'f=' . $topic_rows[$draft['topic_id']]['forum_id'] . '&amp;t=' . $draft['topic_id']);
-						$title = $topic_rows[$draft['topic_id']]['topic_title'];
-
-						$insert_url = append_sid('posting', 'f=' . $topic_rows[$draft['topic_id']]['forum_id'] . '&amp;t=' . $draft['topic_id'] . '&amp;mode=reply&amp;d=' . $draft['draft_id']);
-					}
-					else if (phpbb::$acl->acl_get('f_read', $draft['forum_id']))
-					{
-						$link_forum = true;
-						$view_url = append_sid('viewforum', 'f=' . $draft['forum_id']);
-						$title = $draft['forum_name'];
-
-						$insert_url = append_sid('posting', 'f=' . $draft['forum_id'] . '&amp;mode=post&amp;d=' . $draft['draft_id']);
-					}
-					else if ($pm_drafts)
-					{
-						$link_pm = true;
-						$insert_url = append_sid('ucp', "i=$id&amp;mode=compose&amp;d=" . $draft['draft_id']);
-					}
-
-					$template_row = array(
-						'DATE'			=> phpbb::$user->format_date($draft['save_time']),
-						'DRAFT_MESSAGE'	=> ($submit) ? $draft_message : $draft['draft_message'],
-						'DRAFT_SUBJECT'	=> ($submit) ? $draft_subject : $draft['draft_subject'],
-						'TITLE'			=> $title,
-
-						'DRAFT_ID'	=> $draft['draft_id'],
-						'FORUM_ID'	=> $draft['forum_id'],
-						'TOPIC_ID'	=> $draft['topic_id'],
-
-						'U_VIEW'		=> $view_url,
-						'U_VIEW_EDIT'	=> $this->u_action . '&amp;edit=' . $draft['draft_id'],
-						'U_INSERT'		=> $insert_url,
-
-						'S_LINK_TOPIC'		=> $link_topic,
-						'S_LINK_FORUM'		=> $link_forum,
-						'S_LINK_PM'			=> $link_pm,
-						'S_HIDDEN_FIELDS'	=> $s_hidden_fields
-					);
-					$row_count++;
-
-					($edit) ? phpbb::$template->assign_vars($template_row) : phpbb::$template->assign_block_vars('draftrow', $template_row);
-				}
-
-				if (!$edit)
-				{
-					phpbb::$template->assign_var('S_DRAFT_ROWS', $row_count);
-				}
-
-			break;
-		}
-
-
-		phpbb::$template->assign_vars(array(
-			'L_TITLE'			=> phpbb::$user->lang['UCP_MAIN_' . strtoupper($mode)],
-
-			'S_DISPLAY_MARK_ALL'	=> ($mode == 'watched' || ($mode == 'drafts' && !phpbb_request::is_set('edit', phpbb_request::GET))) ? true : false,
-			'S_HIDDEN_FIELDS'		=> (isset($s_hidden_fields)) ? $s_hidden_fields : '',
-			'S_UCP_ACTION'			=> $this->u_action,
-
-			'LAST_POST_IMG'			=> phpbb::$user->img('icon_topic_latest', 'VIEW_LATEST_POST'),
-			'NEWEST_POST_IMG'		=> phpbb::$user->img('icon_topic_newest', 'VIEW_NEWEST_POST'),
-		));
-
-		// Set desired template
-		$this->tpl_name = 'ucp_main_' . $mode;
-		$this->page_title = 'UCP_MAIN_' . strtoupper($mode);
-	}
-
-	/**
-	* Build and assign topiclist for bookmarks/subscribed topics
-	*/
-	function assign_topiclist($mode = 'subscribed', $forbidden_forum_ary = array())
-	{
-		$table = ($mode == 'subscribed') ? TOPICS_WATCH_TABLE : BOOKMARKS_TABLE;
-		$start = request_var('start', 0);
-
-		// Grab icons
-		$icons = phpbb_cache::obtain_icons();
-
-		$sql_array = array(
-			'SELECT'	=> 'COUNT(t.topic_id) as topics_count',
-
-			'FROM'		=> array(
-				$table			=> 'i',
-				TOPICS_TABLE	=> 't'
-			),
-
-			'WHERE'		=>	'i.topic_id = t.topic_id
-				AND i.user_id = ' . phpbb::$user->data['user_id'] . '
-				AND ' . phpbb::$db->sql_in_set('t.forum_id', $forbidden_forum_ary, true, true),
-		);
-		$sql = phpbb::$db->sql_build_query('SELECT', $sql_array);
-		$result = phpbb::$db->sql_query($sql);
-		$topics_count = (int) phpbb::$db->sql_fetchfield('topics_count');
-		phpbb::$db->sql_freeresult($result);
-
-		if ($topics_count)
-		{
-			phpbb::$template->assign_vars(array(
-				'PAGINATION'	=> generate_pagination($this->u_action, $topics_count, phpbb::$config['topics_per_page'], $start),
-				'PAGE_NUMBER'	=> on_page($topics_count, phpbb::$config['topics_per_page'], $start),
-				'TOTAL_TOPICS'	=> ($topics_count == 1) ? phpbb::$user->lang['VIEW_FORUM_TOPIC'] : sprintf(phpbb::$user->lang['VIEW_FORUM_TOPICS'], $topics_count),
-			));
-		}
-
-		if ($mode == 'subscribed')
-		{
-			$sql_array = array(
-				'SELECT'	=> 't.*, f.forum_name',
-
-				'FROM'		=> array(
-					TOPICS_WATCH_TABLE	=> 'tw',
-					TOPICS_TABLE		=> 't'
-				),
-
-				'WHERE'		=> 'tw.user_id = ' . phpbb::$user->data['user_id'] . '
-					AND t.topic_id = tw.topic_id
-					AND ' . phpbb::$db->sql_in_set('t.forum_id', $forbidden_forum_ary, true, true),
-
-
-				'ORDER_BY'	=> 't.topic_last_post_time DESC'
-			);
-
-			$sql_array['LEFT_JOIN'] = array();
-		}
-		else
-		{
-			$sql_array = array(
-				'SELECT'	=> 't.*, f.forum_name, b.topic_id as b_topic_id',
-
-				'FROM'		=> array(
-					BOOKMARKS_TABLE		=> 'b',
-				),
-
-				'WHERE'		=> 'b.user_id = ' . phpbb::$user->data['user_id'] . '
-					AND ' . phpbb::$db->sql_in_set('f.forum_id', $forbidden_forum_ary, true, true),
-
-				'ORDER_BY'	=> 't.topic_last_post_time DESC'
-			);
-
-			$sql_array['LEFT_JOIN'] = array();
-			$sql_array['LEFT_JOIN'][] = array('FROM' => array(TOPICS_TABLE => 't'), 'ON' => 'b.topic_id = t.topic_id');
-		}
-
-		$sql_array['LEFT_JOIN'][] = array('FROM' => array(FORUMS_TABLE => 'f'), 'ON' => 't.forum_id = f.forum_id');
-
-		if (phpbb::$config['load_db_lastread'])
-		{
-			$sql_array['LEFT_JOIN'][] = array('FROM' => array(FORUMS_TRACK_TABLE => 'ft'), 'ON' => 'ft.forum_id = t.forum_id AND ft.user_id = ' . phpbb::$user->data['user_id']);
-			$sql_array['LEFT_JOIN'][] = array('FROM' => array(TOPICS_TRACK_TABLE => 'tt'), 'ON' => 'tt.topic_id = t.topic_id AND tt.user_id = ' . phpbb::$user->data['user_id']);
-			$sql_array['SELECT'] .= ', tt.mark_time, ft.mark_time AS forum_mark_time';
-		}
-
-		if (phpbb::$config['load_db_track'])
-		{
-			$sql_array['LEFT_JOIN'][] = array('FROM' => array(TOPICS_POSTED_TABLE => 'tp'), 'ON' => 'tp.topic_id = t.topic_id AND tp.user_id = ' . phpbb::$user->data['user_id']);
-			$sql_array['SELECT'] .= ', tp.topic_posted';
-		}
-
-		$sql = phpbb::$db->sql_build_query('SELECT', $sql_array);
-		$result = phpbb::$db->sql_query_limit($sql, phpbb::$config['topics_per_page'], $start);
-
-		$topic_list = $topic_forum_list = $global_announce_list = $rowset = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$topic_id = (isset($row['b_topic_id'])) ? $row['b_topic_id'] : $row['topic_id'];
-
-			$topic_list[] = $topic_id;
-			$rowset[$topic_id] = $row;
-
-			$topic_forum_list[$row['forum_id']]['forum_mark_time'] = (phpbb::$config['load_db_lastread']) ? $row['forum_mark_time'] : 0;
-			$topic_forum_list[$row['forum_id']]['topics'][] = $topic_id;
-
-			if ($row['topic_type'] == POST_GLOBAL)
-			{
-				$global_announce_list[] = $topic_id;
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$topic_tracking_info = array();
-		if (phpbb::$config['load_db_lastread'])
-		{
-			foreach ($topic_forum_list as $f_id => $topic_row)
-			{
-				$topic_tracking_info += get_topic_tracking($f_id, $topic_row['topics'], $rowset, array($f_id => $topic_row['forum_mark_time']), ($f_id == 0) ? $global_announce_list : false);
-			}
-		}
-		else
-		{
-			foreach ($topic_forum_list as $f_id => $topic_row)
-			{
-				$topic_tracking_info += get_complete_topic_tracking($f_id, $topic_row['topics'], $global_announce_list);
-			}
-		}
-
-		foreach ($topic_list as $topic_id)
-		{
-			$row = &$rowset[$topic_id];
-
-			$forum_id = $row['forum_id'];
-			$topic_id = (isset($row['b_topic_id'])) ? $row['b_topic_id'] : $row['topic_id'];
-
-			$unread_topic = (isset($topic_tracking_info[$topic_id]) && $row['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false;
-
-			// Replies
-			$replies = (phpbb::$acl->acl_get('m_approve', $forum_id)) ? $row['topic_replies_real'] : $row['topic_replies'];
-
-			if ($row['topic_status'] == ITEM_MOVED && !empty($row['topic_moved_id']))
-			{
-				$topic_id = $row['topic_moved_id'];
-			}
-
-			// Get folder img, topic status/type related information
-			$folder_img = $folder_alt = $topic_type = '';
-			topic_status($row, $replies, $unread_topic, $folder_img, $folder_alt, $topic_type);
-
-			$view_topic_url_params = "f=$forum_id&amp;t=$topic_id";
-			$view_topic_url = append_sid('viewtopic', $view_topic_url_params);
-
-			// Send vars to template
-			phpbb::$template->assign_block_vars('topicrow', array(
-				'FORUM_ID'					=> $forum_id,
-				'TOPIC_ID'					=> $topic_id,
-				'FIRST_POST_TIME'			=> phpbb::$user->format_date($row['topic_time']),
-				'LAST_POST_SUBJECT'			=> $row['topic_last_post_subject'],
-				'LAST_POST_TIME'			=> phpbb::$user->format_date($row['topic_last_post_time']),
-				'LAST_VIEW_TIME'			=> phpbb::$user->format_date($row['topic_last_view_time']),
-
-				'TOPIC_AUTHOR'				=> get_username_string('username', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
-				'TOPIC_AUTHOR_COLOUR'		=> get_username_string('colour', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
-				'TOPIC_AUTHOR_FULL'			=> get_username_string('full', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
-				'U_TOPIC_AUTHOR'			=> get_username_string('profile', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
-
-				'LAST_POST_AUTHOR'			=> get_username_string('username', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
-				'LAST_POST_AUTHOR_COLOUR'	=> get_username_string('colour', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
-				'LAST_POST_AUTHOR_FULL'		=> get_username_string('full', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
-				'U_LAST_POST_AUTHOR'		=> get_username_string('profile', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
-
-				'S_DELETED_TOPIC'	=> (!$row['topic_id']) ? true : false,
-				'S_GLOBAL_TOPIC'	=> (!$forum_id) ? true : false,
-
-				'PAGINATION'		=> topic_generate_pagination($replies, append_sid('viewtopic', 'f=' . (($row['forum_id']) ? $row['forum_id'] : $forum_id) . "&amp;t=$topic_id")),
-				'REPLIES'			=> $replies,
-				'VIEWS'				=> $row['topic_views'],
-				'TOPIC_TITLE'		=> censor_text($row['topic_title']),
-				'TOPIC_TYPE'		=> $topic_type,
-				'FORUM_NAME'		=> $row['forum_name'],
-
-				'TOPIC_FOLDER_IMG'		=> phpbb::$user->img($folder_img, $folder_alt),
-				'TOPIC_FOLDER_IMG_SRC'	=> phpbb::$user->img($folder_img, $folder_alt, 'src'),
-				'TOPIC_FOLDER_IMG_ALT'	=> phpbb::$user->lang[$folder_alt],
-				'TOPIC_ICON_IMG'		=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['img'] : '',
-				'TOPIC_ICON_IMG_WIDTH'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '',
-				'TOPIC_ICON_IMG_HEIGHT'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['height'] : '',
-				'ATTACH_ICON_IMG'		=> (phpbb::$acl->acl_get('u_download') && phpbb::$acl->acl_get('f_download', $forum_id) && $row['topic_attachment']) ? phpbb::$user->img('icon_topic_attach', phpbb::$user->lang['TOTAL_ATTACHMENTS']) : '',
-
-				'S_TOPIC_TYPE'			=> $row['topic_type'],
-				'S_USER_POSTED'			=> (!empty($row['topic_posted'])) ? true : false,
-				'S_UNREAD_TOPIC'		=> $unread_topic,
-
-				'U_NEWEST_POST'			=> append_sid('viewtopic', $view_topic_url_params . '&amp;view=unread') . '#unread',
-				'U_LAST_POST'			=> append_sid('viewtopic', $view_topic_url_params . '&amp;p=' . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'],
-				'U_VIEW_TOPIC'			=> $view_topic_url,
-				'U_VIEW_FORUM'			=> append_sid('viewforum', 'f=' . $forum_id),
-			));
-		}
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/ucp_pm.php b/phpBB/modules/ucp/ucp_pm.php
deleted file mode 100644
index 707573d31e..0000000000
--- a/phpBB/modules/ucp/ucp_pm.php
+++ /dev/null
@@ -1,407 +0,0 @@
-<?php
-/**
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Private Message Class
-*
-* _REQUEST['folder'] display folder with the id used
-* _REQUEST['folder'] inbox|outbox|sentbox display folder with the associated name
-*
-*	Display Messages (default to inbox) - mode=view
-*	Display single message - mode=view&p=[msg_id] or &p=[msg_id] (short linkage)
-*
-*	if the folder id with (&f=[folder_id]) is used when displaying messages, one query will be saved. If it is not used, phpBB needs to grab
-*	the folder id first in order to display the input boxes and folder names and such things. ;) phpBB always checks this against the database to make
-*	sure the user is able to view the message.
-*
-*	Composing Messages (mode=compose):
-*		To specific user (u=[user_id])
-*		To specific group (g=[group_id])
-*		Quoting a post (action=quotepost&p=[post_id])
-*		Quoting a PM (action=quote&p=[msg_id])
-*		Forwarding a PM (action=forward&p=[msg_id])
-*
-* @package ucp
-*/
-class ucp_pm
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		if (!phpbb::$user->is_registered)
-		{
-			trigger_error('NO_MESSAGE');
-		}
-
-		// Is PM disabled?
-		if (!phpbb::$config['allow_privmsg'])
-		{
-			trigger_error('PM_DISABLED');
-		}
-
-		phpbb::$user->add_lang('posting');
-		phpbb::$template->assign_var('S_PRIVMSGS', true);
-
-		// Folder directly specified?
-		$folder_specified = request_var('folder', '');
-
-		if (!in_array($folder_specified, array('inbox', 'outbox', 'sentbox')))
-		{
-			$folder_specified = (int) $folder_specified;
-		}
-		else
-		{
-			$folder_specified = ($folder_specified == 'inbox') ? PRIVMSGS_INBOX : (($folder_specified == 'outbox') ? PRIVMSGS_OUTBOX : PRIVMSGS_SENTBOX);
-		}
-
-		if (!$folder_specified)
-		{
-			$mode = (!$mode) ? request_var('mode', 'view') : $mode;
-		}
-		else
-		{
-			$mode = 'view';
-		}
-
-		include(PHPBB_ROOT_PATH . 'includes/functions_privmsgs.' . PHP_EXT);
-
-		switch ($mode)
-		{
-			// New private messages popup
-			case 'popup':
-
-				$l_new_message = '';
-				if (phpbb::$user->is_registered)
-				{
-					if (phpbb::$user->data['user_new_privmsg'])
-					{
-						$l_new_message = (phpbb::$user->data['user_new_privmsg'] == 1) ? phpbb::$user->lang['YOU_NEW_PM'] : phpbb::$user->lang['YOU_NEW_PMS'];
-					}
-					else
-					{
-						$l_new_message = phpbb::$user->lang['YOU_NO_NEW_PM'];
-					}
-				}
-
-				phpbb::$template->assign_vars(array(
-					'MESSAGE'			=> $l_new_message,
-					'S_NOT_LOGGED_IN'	=> phpbb::$user->is_guest,
-					'CLICK_TO_VIEW'		=> sprintf(phpbb::$user->lang['CLICK_VIEW_PRIVMSG'], '<a href="' . append_sid('ucp', 'i=pm&amp;folder=inbox') . '" onclick="jump_to_inbox(this.href); return false;">', '</a>'),
-					'U_INBOX'			=> append_sid('ucp', 'i=pm&amp;folder=inbox'),
-					'UA_INBOX'			=> append_sid('ucp', 'i=pm&folder=inbox', false),
-				));
-
-				$tpl_file = 'ucp_pm_popup';
-			break;
-
-			// Compose message
-			case 'compose':
-				$action = request_var('action', 'post');
-
-				get_folder(phpbb::$user->data['user_id']);
-
-				if (!phpbb::$acl->acl_get('u_sendpm'))
-				{
-					trigger_error('NO_AUTH_SEND_MESSAGE');
-				}
-
-				include(PHPBB_ROOT_PATH . 'includes/ucp/ucp_pm_compose.' . PHP_EXT);
-				compose_pm($id, $mode, $action);
-
-				$tpl_file = 'posting_body';
-			break;
-
-			case 'options':
-				set_user_message_limit();
-				get_folder(phpbb::$user->data['user_id']);
-
-				include(PHPBB_ROOT_PATH . 'includes/ucp/ucp_pm_options.' . PHP_EXT);
-				message_options($id, $mode, $global_privmsgs_rules, $global_rule_conditions);
-
-				$tpl_file = 'ucp_pm_options';
-			break;
-
-			case 'drafts':
-
-				get_folder(phpbb::$user->data['user_id']);
-				$this->p_name = 'pm';
-
-				// Call another module... please do not try this at home... Hoochie Coochie Man
-				include(PHPBB_ROOT_PATH . 'includes/ucp/ucp_main.' . PHP_EXT);
-
-				$module = new ucp_main($this);
-				$module->u_action = $this->u_action;
-				$module->main($id, $mode);
-
-				$this->tpl_name = $module->tpl_name;
-				$this->page_title = 'UCP_PM_DRAFTS';
-
-				unset($module);
-				return;
-
-			break;
-
-			case 'view':
-
-				set_user_message_limit();
-
-				if ($folder_specified)
-				{
-					$folder_id = $folder_specified;
-					$action = 'view_folder';
-				}
-				else
-				{
-					$folder_id = request_var('f', PRIVMSGS_NO_BOX);
-					$action = request_var('action', 'view_folder');
-				}
-
-				$msg_id = request_var('p', 0);
-				$view	= request_var('view', '');
-
-				// View message if specified
-				if ($msg_id)
-				{
-					$action = 'view_message';
-				}
-
-				if (!phpbb::$acl->acl_get('u_readpm'))
-				{
-					trigger_error('NO_AUTH_READ_MESSAGE');
-				}
-
-				// Do not allow hold messages to be seen
-				if ($folder_id == PRIVMSGS_HOLD_BOX)
-				{
-					trigger_error('NO_AUTH_READ_HOLD_MESSAGE');
-				}
-
-
-				// First Handle Mark actions and moving messages
-				$submit_mark	= phpbb_request::is_set_post('submit_mark');
-				$move_pm		= phpbb_request::is_set_post('move_pm');
-				$mark_option	= request_var('mark_option', '');
-				$dest_folder	= request_var('dest_folder', PRIVMSGS_NO_BOX);
-
-				// Is moving PM triggered through mark options?
-				if (!in_array($mark_option, array('mark_important', 'delete_marked')) && $submit_mark)
-				{
-					$move_pm = true;
-					$dest_folder = (int) $mark_option;
-					$submit_mark = false;
-				}
-
-				// Move PM
-				if ($move_pm)
-				{
-					$move_msg_ids	= phpbb_request::variable('marked_msg_id', array(0), false, phpbb_request::POST);
-					$cur_folder_id	= request_var('cur_folder_id', PRIVMSGS_NO_BOX);
-
-					if (move_pm(phpbb::$user->data['user_id'], phpbb::$user->data['message_limit'], $move_msg_ids, $dest_folder, $cur_folder_id))
-					{
-						// Return to folder view if single message moved
-						if ($action == 'view_message')
-						{
-							$msg_id		= 0;
-							$folder_id	= request_var('cur_folder_id', PRIVMSGS_NO_BOX);
-							$action		= 'view_folder';
-						}
-					}
-				}
-
-				// Message Mark Options
-				if ($submit_mark)
-				{
-					handle_mark_actions(phpbb::$user->data['user_id'], $mark_option);
-				}
-
-				// If new messages arrived, place them into the appropriate folder
-				$num_not_moved = $num_removed = 0;
-				$release = request_var('release', 0);
-
-				if (phpbb::$user->data['user_new_privmsg'] && $action == 'view_folder')
-				{
-					$return = place_pm_into_folder($global_privmsgs_rules, $release);
-					$num_not_moved = $return['not_moved'];
-					$num_removed = $return['removed'];
-				}
-
-				if (!$msg_id && $folder_id == PRIVMSGS_NO_BOX)
-				{
-					$folder_id = PRIVMSGS_INBOX;
-				}
-				else if ($msg_id && $folder_id == PRIVMSGS_NO_BOX)
-				{
-					$sql = 'SELECT folder_id
-						FROM ' . PRIVMSGS_TO_TABLE . "
-						WHERE msg_id = $msg_id
-							AND folder_id <> " . PRIVMSGS_NO_BOX . '
-							AND user_id = ' . phpbb::$user->data['user_id'];
-					$result = phpbb::$db->sql_query($sql);
-					$row = phpbb::$db->sql_fetchrow($result);
-					phpbb::$db->sql_freeresult($result);
-
-					if (!$row)
-					{
-						trigger_error('NO_MESSAGE');
-					}
-					$folder_id = (int) $row['folder_id'];
-				}
-
-				$message_row = array();
-				if ($action == 'view_message' && $msg_id)
-				{
-					// Get Message user want to see
-					if ($view == 'next' || $view == 'previous')
-					{
-						$sql_condition = ($view == 'next') ? '>' : '<';
-						$sql_ordering = ($view == 'next') ? 'ASC' : 'DESC';
-
-						$sql = 'SELECT t.msg_id
-							FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p, ' . PRIVMSGS_TABLE . " p2
-							WHERE p2.msg_id = $msg_id
-								AND t.folder_id = $folder_id
-								AND t.user_id = " . phpbb::$user->data['user_id'] . "
-								AND t.msg_id = p.msg_id
-								AND p.message_time $sql_condition p2.message_time
-							ORDER BY p.message_time $sql_ordering";
-						$result = phpbb::$db->sql_query_limit($sql, 1);
-						$row = phpbb::$db->sql_fetchrow($result);
-						phpbb::$db->sql_freeresult($result);
-
-						if (!$row)
-						{
-							$message = ($view == 'next') ? 'NO_NEWER_PM' : 'NO_OLDER_PM';
-							trigger_error($message);
-						}
-						else
-						{
-							$msg_id = $row['msg_id'];
-						}
-					}
-
-					$sql = 'SELECT t.*, p.*, u.*
-						FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p, ' . USERS_TABLE . ' u
-						WHERE t.user_id = ' . phpbb::$user->data['user_id'] . "
-							AND p.author_id = u.user_id
-							AND t.folder_id = $folder_id
-							AND t.msg_id = p.msg_id
-							AND p.msg_id = $msg_id";
-					$result = phpbb::$db->sql_query($sql);
-					$message_row = phpbb::$db->sql_fetchrow($result);
-					phpbb::$db->sql_freeresult($result);
-
-					if (!$message_row)
-					{
-						trigger_error('NO_MESSAGE');
-					}
-
-					// Update unread status
-					update_unread_status($message_row['pm_unread'], $message_row['msg_id'], phpbb::$user->data['user_id'], $folder_id);
-				}
-
-				$folder = get_folder(phpbb::$user->data['user_id'], $folder_id);
-
-				$s_folder_options = $s_to_folder_options = '';
-				foreach ($folder as $f_id => $folder_ary)
-				{
-					$option = '<option' . ((!in_array($f_id, array(PRIVMSGS_INBOX, PRIVMSGS_OUTBOX, PRIVMSGS_SENTBOX))) ? ' class="sep"' : '') . ' value="' . $f_id . '"' . (($f_id == $folder_id) ? ' selected="selected"' : '') . '>' . $folder_ary['folder_name'] . (($folder_ary['unread_messages']) ? ' [' . $folder_ary['unread_messages'] . '] ' : '') . '</option>';
-
-					$s_to_folder_options .= ($f_id != PRIVMSGS_OUTBOX && $f_id != PRIVMSGS_SENTBOX) ? $option : '';
-					$s_folder_options .= $option;
-				}
-				clean_sentbox($folder[PRIVMSGS_SENTBOX]['num_messages']);
-
-				// Header for message view - folder and so on
-				$folder_status = get_folder_status($folder_id, $folder);
-
-				phpbb::$template->assign_vars(array(
-					'CUR_FOLDER_ID'			=> $folder_id,
-					'CUR_FOLDER_NAME'		=> $folder_status['folder_name'],
-					'NUM_NOT_MOVED'			=> $num_not_moved,
-					'NUM_REMOVED'			=> $num_removed,
-					'RELEASE_MESSAGE_INFO'	=> sprintf(phpbb::$user->lang['RELEASE_MESSAGES'], '<a href="' . $this->u_action . '&amp;folder=' . $folder_id . '&amp;release=1">', '</a>'),
-					'NOT_MOVED_MESSAGES'	=> ($num_not_moved == 1) ? phpbb::$user->lang['NOT_MOVED_MESSAGE'] : sprintf(phpbb::$user->lang['NOT_MOVED_MESSAGES'], $num_not_moved),
-					'RULE_REMOVED_MESSAGES'	=> ($num_removed == 1) ? phpbb::$user->lang['RULE_REMOVED_MESSAGE'] : sprintf(phpbb::$user->lang['RULE_REMOVED_MESSAGES'], $num_removed),
-
-					'S_FOLDER_OPTIONS'		=> $s_folder_options,
-					'S_TO_FOLDER_OPTIONS'	=> $s_to_folder_options,
-					'S_FOLDER_ACTION'		=> $this->u_action . '&amp;action=view_folder',
-					'S_PM_ACTION'			=> $this->u_action . '&amp;action=' . $action,
-
-					'U_INBOX'				=> $this->u_action . '&amp;folder=inbox',
-					'U_OUTBOX'				=> $this->u_action . '&amp;folder=outbox',
-					'U_SENTBOX'				=> $this->u_action . '&amp;folder=sentbox',
-					'U_CREATE_FOLDER'		=> $this->u_action . '&amp;mode=options',
-					'U_CURRENT_FOLDER'		=> $this->u_action . '&amp;folder=' . $folder_id,
-
-					'S_IN_INBOX'			=> ($folder_id == PRIVMSGS_INBOX) ? true : false,
-					'S_IN_OUTBOX'			=> ($folder_id == PRIVMSGS_OUTBOX) ? true : false,
-					'S_IN_SENTBOX'			=> ($folder_id == PRIVMSGS_SENTBOX) ? true : false,
-
-					'FOLDER_STATUS'				=> $folder_status['message'],
-					'FOLDER_MAX_MESSAGES'		=> $folder_status['max'],
-					'FOLDER_CUR_MESSAGES'		=> $folder_status['cur'],
-					'FOLDER_REMAINING_MESSAGES'	=> $folder_status['remaining'],
-					'FOLDER_PERCENT'			=> $folder_status['percent'],
-				));
-
-				if ($action == 'view_folder')
-				{
-					include(PHPBB_ROOT_PATH . 'includes/ucp/ucp_pm_viewfolder.' . PHP_EXT);
-					view_folder($id, $mode, $folder_id, $folder);
-
-					$tpl_file = 'ucp_pm_viewfolder';
-				}
-				else if ($action == 'view_message')
-				{
-					phpbb::$template->assign_vars(array(
-						'S_VIEW_MESSAGE'	=> true,
-						'MSG_ID'			=> $msg_id,
-					));
-
-					if (!$msg_id)
-					{
-						trigger_error('NO_MESSAGE');
-					}
-
-					include(PHPBB_ROOT_PATH . 'includes/ucp/ucp_pm_viewmessage.' . PHP_EXT);
-					view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row);
-
-					$tpl_file = ($view == 'print') ? 'ucp_pm_viewmessage_print' : 'ucp_pm_viewmessage';
-				}
-
-			break;
-
-			default:
-				trigger_error('NO_ACTION_MODE', E_USER_ERROR);
-			break;
-		}
-
-		phpbb::$template->assign_vars(array(
-			'L_TITLE'			=> phpbb::$user->lang['UCP_PM_' . strtoupper($mode)],
-			'S_UCP_ACTION'		=> $this->u_action . ((isset($action)) ? "&amp;action=$action" : ''),
-		));
-
-		// Set desired template
-		$this->tpl_name = $tpl_file;
-		$this->page_title = 'UCP_PM_' . strtoupper($mode);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/ucp_pm_compose.php b/phpBB/modules/ucp/ucp_pm_compose.php
deleted file mode 100644
index d316c0a775..0000000000
--- a/phpBB/modules/ucp/ucp_pm_compose.php
+++ /dev/null
@@ -1,1256 +0,0 @@
-<?php
-/**
-*
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Compose private message
-* Called from ucp_pm with mode == 'compose'
-*/
-function compose_pm($id, $mode, $action)
-{
-	// Damn php and globals - i know, this is horrible
-	// Needed for handle_message_list_actions()
-	global $refresh, $submit, $preview;
-
-	include(PHPBB_ROOT_PATH . 'includes/functions_posting.' . PHP_EXT);
-	include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-	include(PHPBB_ROOT_PATH . 'includes/message_parser.' . PHP_EXT);
-
-	if (!$action)
-	{
-		$action = 'post';
-	}
-	add_form_key('ucp_pm_compose');
-
-	// Grab only parameters needed here
-	$to_user_id		= request_var('u', 0);
-	$to_group_id	= request_var('g', 0);
-	$msg_id			= request_var('p', 0);
-	$draft_id		= request_var('d', 0);
-	$lastclick		= request_var('lastclick', 0);
-	$address_list	= request_var('address_list', array('' => array(0 => '')));
-
-	$submit		= phpbb_request::is_set_post('post');
-	$preview	= phpbb_request::is_set_post('preview');
-	$save		= phpbb_request::is_set_post('save');
-	$load		= phpbb_request::is_set_post('load');
-	$cancel		= (phpbb_request::is_set_post('cancel') && !$save) ? true : false;
-	$delete		= phpbb_request::is_set_post('delete');
-
-	$remove_u	= phpbb_request::is_set('remove_u');
-	$remove_g	= phpbb_request::is_set('remove_g');
-	$add_to		= phpbb_request::is_set('add_to');
-	$add_bcc	= phpbb_request::is_set('add_bcc');
-
-	$refresh	= phpbb_request::is_set_post('add_file') || phpbb_request::is_set_post('delete_file') || $save || $load
-		|| $remove_u || $remove_g || $add_to || $add_bcc;
-
-	$action		= ($delete && !$preview && !$refresh && $submit) ? 'delete' : $action;
-	$select_single = (phpbb::$config['allow_mass_pm'] && phpbb::$acl->acl_get('u_masspm')) ? false : true;
-
-	$error = array();
-	$current_time = time();
-
-	// Was cancel pressed? If so then redirect to the appropriate page
-	if ($cancel || ($current_time - $lastclick < 2 && $submit))
-	{
-		if ($msg_id)
-		{
-			redirect(append_sid('ucp', 'i=pm&amp;mode=view&amp;action=view_message&amp;p=' . $msg_id));
-		}
-		redirect(append_sid('ucp', 'i=pm'));
-	}
-
-	// Output PM_TO box if message composing
-	if ($action != 'edit')
-	{
-		// Add groups to PM box
-		if (phpbb::$config['allow_mass_pm'] && phpbb::$acl->acl_get('u_masspm_group'))
-		{
-			$sql = 'SELECT g.group_id, g.group_name, g.group_type
-				FROM ' . GROUPS_TABLE . ' g';
-
-			if (!phpbb::$acl->acl_gets('a_group', 'a_groupadd', 'a_groupdel'))
-			{
-				$sql .= ' LEFT JOIN ' . USER_GROUP_TABLE . ' ug
-					ON (
-						g.group_id = ug.group_id
-						AND ug.user_id = ' . phpbb::$user->data['user_id'] . '
-						AND ug.user_pending = 0
-					)
-					WHERE (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . phpbb::$user->data['user_id'] . ')';
-			}
-
-			$sql .= (phpbb::$acl->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? ' WHERE ' : ' AND ';
-
-			$sql .= 'g.group_receive_pm = 1
-				ORDER BY g.group_type DESC, g.group_name ASC';
-			$result = phpbb::$db->sql_query($sql);
-
-			$group_options = '';
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$group_options .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '') . ' value="' . $row['group_id'] . '">' . (($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		phpbb::$template->assign_vars(array(
-			'S_SHOW_PM_BOX'		=> true,
-			'S_ALLOW_MASS_PM'	=> (phpbb::$config['allow_mass_pm'] && phpbb::$acl->acl_get('u_masspm')) ? true : false,
-			'S_GROUP_OPTIONS'	=> (phpbb::$config['allow_mass_pm'] && phpbb::$acl->acl_get('u_masspm_group')) ? $group_options : '',
-			'U_FIND_USERNAME'	=> append_sid('memberlist', "mode=searchuser&amp;form=postform&amp;field=username_list&amp;select_single=$select_single"),
-		));
-	}
-
-	$sql = '';
-
-	// What is all this following SQL for? Well, we need to know
-	// some basic information in all cases before we do anything.
-	switch ($action)
-	{
-		case 'post':
-			if (!phpbb::$acl->acl_get('u_sendpm'))
-			{
-				trigger_error('NO_AUTH_SEND_MESSAGE');
-			}
-		break;
-
-		case 'reply':
-		case 'quote':
-		case 'forward':
-		case 'quotepost':
-			if (!$msg_id)
-			{
-				trigger_error('NO_MESSAGE');
-			}
-
-			if (!phpbb::$acl->acl_get('u_sendpm'))
-			{
-				trigger_error('NO_AUTH_SEND_MESSAGE');
-			}
-
-			if ($action == 'quotepost')
-			{
-				$sql = 'SELECT p.post_id as msg_id, p.forum_id, p.post_text as message_text, p.poster_id as author_id, p.post_time as message_time, p.bbcode_bitfield, p.bbcode_uid, p.enable_sig, p.enable_smilies, p.enable_magic_url, t.topic_title as message_subject, u.username as quote_username
-					FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . USERS_TABLE . " u
-					WHERE p.post_id = $msg_id
-						AND t.topic_id = p.topic_id
-						AND u.user_id = p.poster_id";
-			}
-			else
-			{
-				$sql = 'SELECT t.folder_id, p.*, u.username as quote_username
-					FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p, ' . USERS_TABLE . ' u
-					WHERE t.user_id = ' . phpbb::$user->data['user_id'] . "
-						AND p.author_id = u.user_id
-						AND t.msg_id = p.msg_id
-						AND p.msg_id = $msg_id";
-			}
-		break;
-
-		case 'edit':
-			if (!$msg_id)
-			{
-				trigger_error('NO_MESSAGE');
-			}
-
-			// check for outbox (not read) status, we do not allow editing if one user already having the message
-			$sql = 'SELECT p.*, t.folder_id
-				FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p
-				WHERE t.user_id = ' . phpbb::$user->data['user_id'] . '
-					AND t.folder_id = ' . PRIVMSGS_OUTBOX . "
-					AND t.msg_id = $msg_id
-					AND t.msg_id = p.msg_id";
-		break;
-
-		case 'delete':
-			if (!phpbb::$acl->acl_get('u_pm_delete'))
-			{
-				trigger_error('NO_AUTH_DELETE_MESSAGE');
-			}
-
-			if (!$msg_id)
-			{
-				trigger_error('NO_MESSAGE');
-			}
-
-			$sql = 'SELECT msg_id, pm_unread, pm_new, author_id, folder_id
-				FROM ' . PRIVMSGS_TO_TABLE . '
-				WHERE user_id = ' . phpbb::$user->data['user_id'] . "
-					AND msg_id = $msg_id";
-		break;
-
-		case 'smilies':
-			generate_smilies('window', 0);
-		break;
-
-		default:
-			trigger_error('NO_ACTION_MODE', E_USER_ERROR);
-		break;
-	}
-
-	if ($action == 'forward' && (!phpbb::$config['forward_pm'] || !phpbb::$acl->acl_get('u_pm_forward')))
-	{
-		trigger_error('NO_AUTH_FORWARD_MESSAGE');
-	}
-
-	if ($action == 'edit' && !phpbb::$acl->acl_get('u_pm_edit'))
-	{
-		trigger_error('NO_AUTH_EDIT_MESSAGE');
-	}
-
-	if ($sql)
-	{
-		$result = phpbb::$db->sql_query($sql);
-		$post = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$post)
-		{
-			// If editing it could be the recipient already read the message...
-			if ($action == 'edit')
-			{
-				$sql = 'SELECT p.*, t.folder_id
-					FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p
-					WHERE t.user_id = ' . phpbb::$user->data['user_id'] . "
-						AND t.msg_id = $msg_id
-						AND t.msg_id = p.msg_id";
-				$result = phpbb::$db->sql_query($sql);
-				$post = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if ($post)
-				{
-					trigger_error('NO_EDIT_READ_MESSAGE');
-				}
-			}
-
-			trigger_error('NO_MESSAGE');
-		}
-
-		if ($action == 'quotepost')
-		{
-			if (($post['forum_id'] && !phpbb::$acl->acl_get('f_read', $post['forum_id'])) || (!$post['forum_id'] && !phpbb::$acl->acl_getf_global('f_read')))
-			{
-				trigger_error('NOT_AUTHORISED');
-			}
-
-			// Passworded forum?
-			if ($post['forum_id'])
-			{
-				$sql = 'SELECT forum_password
-					FROM ' . FORUMS_TABLE . '
-					WHERE forum_id = ' . (int) $post['forum_id'];
-				$result = phpbb::$db->sql_query($sql);
-				$forum_password = (string) phpbb::$db->sql_fetchfield('forum_password');
-				phpbb::$db->sql_freeresult($result);
-
-				if ($forum_password)
-				{
-					login_forum_box(array(
-						'forum_id'			=> $post['forum_id'],
-						'forum_password'	=> $forum_password,
-					));
-				}
-			}
-		}
-
-		$msg_id			= (int) $post['msg_id'];
-		$folder_id		= (isset($post['folder_id'])) ? $post['folder_id'] : 0;
-		$message_text	= (isset($post['message_text'])) ? $post['message_text'] : '';
-
-		if ((!$post['author_id'] || ($post['author_id'] == ANONYMOUS && $action != 'delete')) && $msg_id)
-		{
-			trigger_error('NO_AUTHOR');
-		}
-
-		if ($action == 'quotepost')
-		{
-			// Decode text for message display
-			decode_message($message_text, $post['bbcode_uid']);
-		}
-
-		if ($action != 'delete')
-		{
-			$enable_urls = $post['enable_magic_url'];
-			$enable_sig = (isset($post['enable_sig'])) ? $post['enable_sig'] : 0;
-
-			$message_attachment = (isset($post['message_attachment'])) ? $post['message_attachment'] : 0;
-			$message_subject = $post['message_subject'];
-			$message_time = $post['message_time'];
-			$bbcode_uid = $post['bbcode_uid'];
-
-			$quote_username = (isset($post['quote_username'])) ? $post['quote_username'] : '';
-			$icon_id = (isset($post['icon_id'])) ? $post['icon_id'] : 0;
-
-			if (($action == 'reply' || $action == 'quote' || $action == 'quotepost') && !sizeof($address_list) && !$refresh && !$submit && !$preview)
-			{
-				if ($action == 'quotepost')
-				{
-					$address_list = array('u' => array($post['author_id'] => 'to'));
-				}
-				else
-				{
-					// We try to include every previously listed member from the TO Header
-					$address_list = rebuild_header(array('to' => $post['to_address']));
-
-					// Add the author (if he is already listed then this is no shame (it will be overwritten))
-					$address_list['u'][$post['author_id']] = 'to';
-
-					// Now, make sure the user itself is not listed. ;)
-					if (isset($address_list['u'][phpbb::$user->data['user_id']]))
-					{
-						unset($address_list['u'][phpbb::$user->data['user_id']]);
-					}
-				}
-			}
-			else if ($action == 'edit' && !sizeof($address_list) && !$refresh && !$submit && !$preview)
-			{
-				// Rebuild TO and BCC Header
-				$address_list = rebuild_header(array('to' => $post['to_address'], 'bcc' => $post['bcc_address']));
-			}
-
-			if ($action == 'quotepost')
-			{
-				$check_value = 0;
-			}
-			else
-			{
-				$check_value = (($post['enable_bbcode']+1) << 8) + (($post['enable_smilies']+1) << 4) + (($enable_urls+1) << 2) + (($post['enable_sig']+1) << 1);
-			}
-		}
-	}
-	else
-	{
-		$message_attachment = 0;
-		$message_text = $message_subject = '';
-
-		if ($to_user_id && $action == 'post')
-		{
-			$address_list['u'][$to_user_id] = 'to';
-		}
-		else if ($to_group_id && $action == 'post')
-		{
-			$address_list['g'][$to_group_id] = 'to';
-		}
-		$check_value = 0;
-	}
-
-	if (($to_group_id || isset($address_list['g'])) && (!phpbb::$config['allow_mass_pm'] || !phpbb::$acl->acl_get('u_masspm_group')))
-	{
-		trigger_error('NO_AUTH_GROUP_MESSAGE');
-	}
-
-	if ($action == 'edit' && !$refresh && !$preview && !$submit)
-	{
-		if (!($message_time > time() - (phpbb::$config['pm_edit_time'] * 60) || !phpbb::$config['pm_edit_time']))
-		{
-			trigger_error('CANNOT_EDIT_MESSAGE_TIME');
-		}
-	}
-
-	if ($action == 'post')
-	{
-		phpbb::$template->assign_var('S_NEW_MESSAGE', true);
-	}
-
-	if (!isset($icon_id))
-	{
-		$icon_id = 0;
-	}
-
-	$message_parser = new parse_message();
-
-	$message_parser->message = ($action == 'reply') ? '' : $message_text;
-	unset($message_text);
-
-	$s_action = append_sid('ucp', "i=$id&amp;mode=$mode&amp;action=$action", true, phpbb::$user->session_id);
-	$s_action .= ($msg_id) ? "&amp;p=$msg_id" : '';
-
-	// Delete triggered ?
-	if ($action == 'delete')
-	{
-		// Folder id has been determined by the SQL Statement
-		// $folder_id = request_var('f', PRIVMSGS_NO_BOX);
-
-		// Do we need to confirm ?
-		if (confirm_box(true))
-		{
-			delete_pm(phpbb::$user->data['user_id'], $msg_id, $folder_id);
-
-			// jump to next message in "history"? nope, not for the moment. But able to be included later.
-			$meta_info = append_sid('ucp', "i=pm&amp;folder=$folder_id");
-			$message = phpbb::$user->lang['MESSAGE_DELETED'];
-
-			meta_refresh(3, $meta_info);
-			$message .= '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_FOLDER'], '<a href="' . $meta_info . '">', '</a>');
-			trigger_error($message);
-		}
-		else
-		{
-			$s_hidden_fields = array(
-				'p'			=> $msg_id,
-				'f'			=> $folder_id,
-				'action'	=> 'delete'
-			);
-
-			// "ucp.php?i=pm&amp;mode=compose"
-			confirm_box(false, 'DELETE_MESSAGE', build_hidden_fields($s_hidden_fields));
-		}
-
-		redirect(append_sid('ucp', 'i=pm&amp;mode=view&amp;action=view_message&amp;p=' . $msg_id));
-	}
-
-	// Get maximum number of allowed recipients
-	$sql = 'SELECT MAX(g.group_max_recipients) as max_recipients
-		FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . ' ug
-		WHERE ug.user_id = ' . phpbb::$user->data['user_id'] . '
-			AND ug.user_pending = 0
-			AND ug.group_id = g.group_id';
-	$result = phpbb::$db->sql_query($sql);
-	$max_recipients = (int) phpbb::$db->sql_fetchfield('max_recipients');
-	phpbb::$db->sql_freeresult($result);
-
-	$max_recipients = (!$max_recipients) ? phpbb::$config['pm_max_recipients'] : $max_recipients;
-
-	// If this is a quote/reply "to all"... we may increase the max_recpients to the number of original recipients
-	if (($action == 'reply' || $action == 'quote') && $max_recipients)
-	{
-		// We try to include every previously listed member from the TO Header
-		$list = rebuild_header(array('to' => $post['to_address']));
-
-		// Can be an empty array too ;)
-		$list = (!empty($list['u'])) ? $list['u'] : array();
-		$list[$post['author_id']] = 'to';
-
-		if (isset($list[phpbb::$user->data['user_id']]))
-		{
-			unset($list[phpbb::$user->data['user_id']]);
-		}
-
-		$max_recipients = ($max_recipients < sizeof($list)) ? sizeof($list) : $max_recipients;
-
-		unset($list);
-	}
-
-	// Handle User/Group adding/removing
-	handle_message_list_actions($address_list, $error, $remove_u, $remove_g, $add_to, $add_bcc);
-
-	// Check mass pm to group permission
-	if ((!phpbb::$config['allow_mass_pm'] || !phpbb::$acl->acl_get('u_masspm_group')) && !empty($address_list['g']))
-	{
-		$address_list = array();
-		$error[] = phpbb::$user->lang['NO_AUTH_GROUP_MESSAGE'];
-	}
-
-	// Check mass pm to users permission
-	if ((!phpbb::$config['allow_mass_pm'] || !phpbb::$acl->acl_get('u_masspm')) && num_recipients($address_list) > 1)
-	{
-		$address_list = get_recipients($address_list, 1);
-		$error[] = phpbb::$user->lang('TOO_MANY_RECIPIENTS', 1);
-	}
-
-	// Check for too many recipients
-	if (!empty($address_list['u']) && $max_recipients && sizeof($address_list['u']) > $max_recipients)
-	{
-		$address_list = get_recipients($address_list, $max_recipients);
-		$error[] = phpbb::$user->lang('TOO_MANY_RECIPIENTS', $max_recipients);
-	}
-
-	// Always check if the submitted attachment data is valid and belongs to the user.
-	// Further down (especially in submit_post()) we do not check this again.
-	$message_parser->get_submitted_attachment_data();
-
-	if ($message_attachment && !$submit && !$refresh && !$preview && $action == 'edit')
-	{
-		// Do not change to SELECT *
-		$sql = 'SELECT attach_id, is_orphan, attach_comment, real_filename
-			FROM ' . ATTACHMENTS_TABLE . "
-			WHERE post_msg_id = $msg_id
-				AND in_message = 1
-				AND is_orphan = 0
-			ORDER BY filetime DESC";
-		$result = phpbb::$db->sql_query($sql);
-		$message_parser->attachment_data = array_merge($message_parser->attachment_data, phpbb::$db->sql_fetchrowset($result));
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	if (!in_array($action, array('quote', 'edit', 'delete', 'forward')))
-	{
-		$enable_sig		= (phpbb::$config['allow_sig'] && phpbb::$config['allow_sig_pm'] && phpbb::$acl->acl_get('u_sig') && phpbb::$user->optionget('attachsig'));
-		$enable_smilies	= (phpbb::$config['allow_smilies'] && phpbb::$acl->acl_get('u_pm_smilies') && phpbb::$user->optionget('smilies'));
-		$enable_bbcode	= (phpbb::$config['allow_bbcode'] && phpbb::$acl->acl_get('u_pm_bbcode') && phpbb::$user->optionget('bbcode'));
-		$enable_urls	= true;
-	}
-
-	$enable_magic_url = $drafts = false;
-
-	// User own some drafts?
-	if (phpbb::$acl->acl_get('u_savedrafts') && $action != 'delete')
-	{
-		$sql = 'SELECT draft_id
-			FROM ' . DRAFTS_TABLE . '
-			WHERE forum_id = 0
-				AND topic_id = 0
-				AND user_id = ' . phpbb::$user->data['user_id'] .
-				(($draft_id) ? " AND draft_id <> $draft_id" : '');
-		$result = phpbb::$db->sql_query_limit($sql, 1);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if ($row)
-		{
-			$drafts = true;
-		}
-	}
-
-	if ($action == 'edit')
-	{
-		$message_parser->bbcode_uid = $bbcode_uid;
-	}
-
-	$bbcode_status	= (phpbb::$config['allow_bbcode'] && phpbb::$config['auth_bbcode_pm'] && phpbb::$acl->acl_get('u_pm_bbcode')) ? true : false;
-	$smilies_status	= (phpbb::$config['allow_smilies'] && phpbb::$config['auth_smilies_pm'] && phpbb::$acl->acl_get('u_pm_smilies')) ? true : false;
-	$img_status		= (phpbb::$config['auth_img_pm'] && phpbb::$acl->acl_get('u_pm_img')) ? true : false;
-	$flash_status	= (phpbb::$config['auth_flash_pm'] && phpbb::$acl->acl_get('u_pm_flash')) ? true : false;
-	$url_status		= (phpbb::$config['allow_post_links']) ? true : false;
-
-	// Save Draft
-	if ($save && phpbb::$acl->acl_get('u_savedrafts'))
-	{
-		$subject = utf8_normalize_nfc(request_var('subject', '', true));
-		$subject = (!$subject && $action != 'post') ? phpbb::$user->lang['NEW_MESSAGE'] : $subject;
-		$message = utf8_normalize_nfc(request_var('message', '', true));
-
-		if ($subject && $message)
-		{
-			if (confirm_box(true))
-			{
-				$sql = 'INSERT INTO ' . DRAFTS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', array(
-					'user_id'		=> phpbb::$user->data['user_id'],
-					'topic_id'		=> 0,
-					'forum_id'		=> 0,
-					'save_time'		=> $current_time,
-					'draft_subject'	=> $subject,
-					'draft_message'	=> $message
-					)
-				);
-				phpbb::$db->sql_query($sql);
-
-				$redirect_url = append_sid('ucp', "i=pm&amp;mode=$mode");
-
-				meta_refresh(3, $redirect_url);
-				$message = phpbb::$user->lang['DRAFT_SAVED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
-
-				trigger_error($message);
-			}
-			else
-			{
-				$s_hidden_fields = build_hidden_fields(array(
-					'mode'		=> $mode,
-					'action'	=> $action,
-					'save'		=> true,
-					'subject'	=> $subject,
-					'message'	=> $message,
-					'u'			=> $to_user_id,
-					'g'			=> $to_group_id,
-					'p'			=> $msg_id)
-				);
-				$s_hidden_fields .= build_address_field($address_list);
-
-
-				confirm_box(false, 'SAVE_DRAFT', $s_hidden_fields);
-			}
-		}
-		else
-		{
-			if (utf8_clean_string($subject) === '')
-			{
-				$error[] = phpbb::$user->lang['EMPTY_MESSAGE_SUBJECT'];
-			}
-
-			if (utf8_clean_string($message) === '')
-			{
-				$error[] = phpbb::$user->lang['TOO_FEW_CHARS'];
-			}
-		}
-
-		unset($subject, $message);
-	}
-
-	// Load Draft
-	if ($draft_id && phpbb::$acl->acl_get('u_savedrafts'))
-	{
-		$sql = 'SELECT draft_subject, draft_message
-			FROM ' . DRAFTS_TABLE . "
-			WHERE draft_id = $draft_id
-				AND topic_id = 0
-				AND forum_id = 0
-				AND user_id = " . phpbb::$user->data['user_id'];
-		$result = phpbb::$db->sql_query_limit($sql, 1);
-
-		if ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$message_parser->message = $row['draft_message'];
-			$message_subject = $row['draft_subject'];
-
-			phpbb::$template->assign_var('S_DRAFT_LOADED', true);
-		}
-		else
-		{
-			$draft_id = 0;
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	// Load Drafts
-	if ($load && $drafts)
-	{
-		load_drafts(0, 0, $id);
-	}
-
-	if ($submit || $preview || $refresh)
-	{
-		if (($submit || $preview) && !check_form_key('ucp_pm_compose'))
-		{
-			$error[] = phpbb::$user->lang['FORM_INVALID'];
-		}
-		$subject = utf8_normalize_nfc(request_var('subject', '', true));
-		$message_parser->message = utf8_normalize_nfc(request_var('message', '', true));
-
-		$icon_id			= request_var('icon', 0);
-
-		$enable_bbcode 		= (!$bbcode_status || phpbb_request::is_set_post('disable_bbcode')) ? false : true;
-		$enable_smilies		= (!$smilies_status || phpbb_request::is_set_post'disable_smilies')) ? false : true;
-		$enable_urls 		= (phpbb_request::is_set_post('disable_magic_url')) ? 0 : 1;
-		$enable_sig			= (!phpbb::$config['allow_sig'] ||!phpbb::$config['allow_sig_pm']) ? false : phpbb_request::is_set_post('attach_sig');
-
-		if ($submit)
-		{
-			$status_switch	= (($enable_bbcode+1) << 8) + (($enable_smilies+1) << 4) + (($enable_urls+1) << 2) + (($enable_sig+1) << 1);
-			$status_switch = ($status_switch != $check_value);
-		}
-		else
-		{
-			$status_switch = 1;
-		}
-
-		// Parse Attachments - before checksum is calculated
-		$message_parser->parse_attachments('fileupload', $action, 0, $submit, $preview, $refresh, true);
-
-		if (sizeof($message_parser->warn_msg) && !($remove_u || $remove_g || $add_to || $add_bcc))
-		{
-			$error[] = implode('<br />', $message_parser->warn_msg);
-			$message_parser->warn_msg = array();
-		}
-
-		// Parse message
-		$message_parser->parse($enable_bbcode, (phpbb::$config['allow_post_links']) ? $enable_urls : false, $enable_smilies, $img_status, $flash_status, true, phpbb::$config['allow_post_links']);
-
-		// On a refresh we do not care about message parsing errors
-		if (sizeof($message_parser->warn_msg) && !$refresh)
-		{
-			$error[] = implode('<br />', $message_parser->warn_msg);
-		}
-
-		if ($action != 'edit' && !$preview && !$refresh && phpbb::$config['flood_interval'] && !phpbb::$acl->acl_get('u_ignoreflood'))
-		{
-			// Flood check
-			$last_post_time = phpbb::$user->data['user_lastpost_time'];
-
-			if ($last_post_time)
-			{
-				if ($last_post_time && ($current_time - $last_post_time) < intval(phpbb::$config['flood_interval']))
-				{
-					$error[] = phpbb::$user->lang['FLOOD_ERROR'];
-				}
-			}
-		}
-
-		// Subject defined
-		if ($submit)
-		{
-			if (utf8_clean_string($subject) === '')
-			{
-				$error[] = phpbb::$user->lang['EMPTY_MESSAGE_SUBJECT'];
-			}
-
-			if (!sizeof($address_list))
-			{
-				$error[] = phpbb::$user->lang['NO_RECIPIENT'];
-			}
-		}
-
-		// Store message, sync counters
-		if (!sizeof($error) && $submit)
-		{
-			$pm_data = array(
-				'msg_id'				=> (int) $msg_id,
-				'from_user_id'			=> phpbb::$user->data['user_id'],
-				'from_user_ip'			=> phpbb::$user->ip,
-				'from_username'			=> phpbb::$user->data['username'],
-				'reply_from_root_level'	=> (isset($post['root_level'])) ? (int) $post['root_level'] : 0,
-				'reply_from_msg_id'		=> (int) $msg_id,
-				'icon_id'				=> (int) $icon_id,
-				'enable_sig'			=> (bool) $enable_sig,
-				'enable_bbcode'			=> (bool) $enable_bbcode,
-				'enable_smilies'		=> (bool) $enable_smilies,
-				'enable_urls'			=> (bool) $enable_urls,
-				'bbcode_bitfield'		=> $message_parser->bbcode_bitfield,
-				'bbcode_uid'			=> $message_parser->bbcode_uid,
-				'message'				=> $message_parser->message,
-				'attachment_data'		=> $message_parser->attachment_data,
-				'filename_data'			=> $message_parser->filename_data,
-				'address_list'			=> $address_list
-			);
-
-			// ((!$message_subject) ? $subject : $message_subject)
-			$msg_id = submit_pm($action, $subject, $pm_data);
-
-			$return_message_url = append_sid('ucp', 'i=pm&amp;mode=view&amp;p=' . $msg_id);
-			$return_folder_url = append_sid('ucp', 'i=pm&amp;folder=outbox');
-			meta_refresh(3, $return_message_url);
-
-			$message = phpbb::$user->lang['MESSAGE_STORED'] . '<br /><br />' . sprintf(phpbb::$user->lang['VIEW_PRIVATE_MESSAGE'], '<a href="' . $return_message_url . '">', '</a>') . '<br /><br />' . sprintf(phpbb::$user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $return_folder_url . '">', '</a>', phpbb::$user->lang['PM_OUTBOX']);
-			trigger_error($message);
-		}
-
-		$message_subject = $subject;
-	}
-
-	// Preview
-	if (!sizeof($error) && $preview)
-	{
-		phpbb::$user->add_lang('viewtopic');
-		$preview_message = $message_parser->format_display($enable_bbcode, $enable_urls, $enable_smilies, false);
-
-		$preview_signature = phpbb::$user->data['user_sig'];
-		$preview_signature_uid = phpbb::$user->data['user_sig_bbcode_uid'];
-		$preview_signature_bitfield = phpbb::$user->data['user_sig_bbcode_bitfield'];
-
-		// Signature
-		if ($enable_sig && phpbb::$config['allow_sig'] && $preview_signature)
-		{
-			$parse_sig = new parse_message($preview_signature);
-			$parse_sig->bbcode_uid = $preview_signature_uid;
-			$parse_sig->bbcode_bitfield = $preview_signature_bitfield;
-
-			$parse_sig->format_display($enable_bbcode, $enable_urls, $enable_smilies);
-			$preview_signature = $parse_sig->message;
-			unset($parse_sig);
-		}
-		else
-		{
-			$preview_signature = '';
-		}
-
-		// Attachment Preview
-		if (sizeof($message_parser->attachment_data))
-		{
-			phpbb::$template->assign_var('S_HAS_ATTACHMENTS', true);
-
-			$update_count = array();
-			$attachment_data = $message_parser->attachment_data;
-
-			parse_attachments(false, $preview_message, $attachment_data, $update_count, true);
-
-			foreach ($attachment_data as $i => $attachment)
-			{
-				phpbb::$template->assign_block_vars('attachment', array(
-					'DISPLAY_ATTACHMENT'	=> $attachment,
-				));
-			}
-			unset($attachment_data);
-		}
-
-		$preview_subject = censor_text($subject);
-
-		if (!sizeof($error))
-		{
-			phpbb::$template->assign_vars(array(
-				'PREVIEW_SUBJECT'		=> $preview_subject,
-				'PREVIEW_MESSAGE'		=> $preview_message,
-				'PREVIEW_SIGNATURE'		=> $preview_signature,
-
-				'S_DISPLAY_PREVIEW'		=> true,
-			));
-		}
-		unset($message_text);
-	}
-
-	// Decode text for message display
-	$bbcode_uid = (($action == 'quote' || $action == 'forward') && !$preview && !$refresh && !sizeof($error)) ? $bbcode_uid : $message_parser->bbcode_uid;
-
-	$message_parser->decode_message($bbcode_uid);
-
-	if (($action == 'quote' || $action == 'quotepost') && !$preview && !$refresh && !$submit)
-	{
-		if ($action == 'quotepost')
-		{
-			$post_id = request_var('p', 0);
-			if (phpbb::$config['allow_post_links'])
-			{
-				$message_link = "[url=" . generate_board_url() . '/viewtopic.' . PHP_EXT . '?p=' . $post_id . '#p' . $post_id . ']' . phpbb::$user->lang['SUBJECT'] . ': ' . $message_subject . "[/url]\n\n";
-			}
-			else
-			{
-				$message_link = phpbb::$user->lang['SUBJECT'] . ': ' . $message_subject . " (" . generate_board_url() . '/viewtopic.' . PHP_EXT . "?p={$post_id}#p{$post_id})\n\n";
-			}
-		}
-		else
-		{
-			$message_link = '';
-		}
-		$message_parser->message = $message_link . '[quote=&quot;' . $quote_username . '&quot;]' . censor_text(trim($message_parser->message)) . "[/quote]\n";
-	}
-
-	if (($action == 'reply' || $action == 'quote' || $action == 'quotepost') && !$preview && !$refresh)
-	{
-		$message_subject = ((!preg_match('/^Re:/', $message_subject)) ? 'Re: ' : '') . censor_text($message_subject);
-	}
-
-	if ($action == 'forward' && !$preview && !$refresh && !$submit)
-	{
-		$fwd_to_field = write_pm_addresses(array('to' => $post['to_address']), 0, true);
-
-		if (phpbb::$config['allow_post_links'])
-		{
-			$quote_username_text = '[url=' . generate_board_url() . '/memberlist.' . PHP_EXT . "?mode=viewprofile&amp;u={$post['author_id']}]{$quote_username}[/url]";
-		}
-		else
-		{
-			$quote_username_text = $quote_username . ' (' . generate_board_url() . '/memberlist.' . PHP_EXT . "?mode=viewprofile&amp;u={$post['author_id']})";
-		}
-
-		$forward_text = array();
-		$forward_text[] = phpbb::$user->lang['FWD_ORIGINAL_MESSAGE'];
-		$forward_text[] = phpbb::$user->lang('FWD_SUBJECT', censor_text($message_subject));
-		$forward_text[] = phpbb::$user->lang('FWD_DATE', phpbb::$user->format_date($message_time, false, true));
-		$forward_text[] = phpbb::$user->lang('FWD_FROM', $quote_username_text);
-		$forward_text[] = phpbb::$user->lang('FWD_TO', implode(', ', $fwd_to_field['to']));
-
-		$message_parser->message = implode("\n", $forward_text) . "\n\n[quote=&quot;{$quote_username}&quot;]\n" . censor_text(trim($message_parser->message)) . "\n[/quote]";
-		$message_subject = ((!preg_match('/^Fwd:/', $message_subject)) ? 'Fwd: ' : '') . censor_text($message_subject);
-	}
-
-	$attachment_data = $message_parser->attachment_data;
-	$filename_data = $message_parser->filename_data;
-	$message_text = $message_parser->message;
-
-	// MAIN PM PAGE BEGINS HERE
-
-	// Generate smiley listing
-	generate_smilies('inline', 0);
-
-	// Generate PM Icons
-	$s_pm_icons = false;
-	if (phpbb::$config['enable_pm_icons'])
-	{
-		$s_pm_icons = posting_gen_topic_icons($action, $icon_id);
-	}
-
-	// Generate inline attachment select box
-	posting_gen_inline_attachments($attachment_data);
-
-	// Build address list for display
-	// array('u' => array($author_id => 'to'));
-	if (sizeof($address_list))
-	{
-		// Get Usernames and Group Names
-		$result = array();
-		if (!empty($address_list['u']))
-		{
-			$sql = 'SELECT user_id as id, username as name, user_colour as colour
-				FROM ' . USERS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('user_id', array_map('intval', array_keys($address_list['u']))) . '
-				ORDER BY username_clean ASC';
-			$result['u'] = phpbb::$db->sql_query($sql);
-		}
-
-		if (!empty($address_list['g']))
-		{
-			$sql = 'SELECT g.group_id AS id, g.group_name AS name, g.group_colour AS colour, g.group_type
-				FROM ' . GROUPS_TABLE . ' g';
-
-			if (!phpbb::$acl->acl_gets('a_group', 'a_groupadd', 'a_groupdel'))
-			{
-				$sql .= ' LEFT JOIN ' . USER_GROUP_TABLE . ' ug
-					ON (
-						g.group_id = ug.group_id
-						AND ug.user_id = ' . phpbb::$user->data['user_id'] . '
-						AND ug.user_pending = 0
-					)
-					WHERE (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . phpbb::$user->data['user_id'] . ')';
-			}
-
-			$sql .= (phpbb::$acl->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? ' WHERE ' : ' AND ';
-
-			$sql .= 'g.group_receive_pm = 1
-				AND ' . phpbb::$db->sql_in_set('g.group_id', array_map('intval', array_keys($address_list['g']))) . '
-				ORDER BY g.group_name ASC';
-
-			$result['g'] = phpbb::$db->sql_query($sql);
-		}
-
-		$u = $g = array();
-		$_types = array('u', 'g');
-		foreach ($_types as $type)
-		{
-			if (isset($result[$type]) && $result[$type])
-			{
-				while ($row = phpbb::$db->sql_fetchrow($result[$type]))
-				{
-					if ($type == 'g')
-					{
-						$row['name'] = ($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['name']] : $row['name'];
-					}
-
-					${$type}[$row['id']] = array('name' => $row['name'], 'colour' => $row['colour']);
-				}
-				phpbb::$db->sql_freeresult($result[$type]);
-			}
-		}
-
-		// Now Build the address list
-		$plain_address_field = '';
-		foreach ($address_list as $type => $adr_ary)
-		{
-			foreach ($adr_ary as $id => $field)
-			{
-				if (!isset(${$type}[$id]))
-				{
-					unset($address_list[$type][$id]);
-					continue;
-				}
-
-				$field = ($field == 'to') ? 'to' : 'bcc';
-				$type = ($type == 'u') ? 'u' : 'g';
-				$id = (int) $id;
-
-				$tpl_ary = array(
-					'IS_GROUP'	=> ($type == 'g') ? true : false,
-					'IS_USER'	=> ($type == 'u') ? true : false,
-					'UG_ID'		=> $id,
-					'NAME'		=> ${$type}[$id]['name'],
-					'COLOUR'	=> (${$type}[$id]['colour']) ? '#' . ${$type}[$id]['colour'] : '',
-					'TYPE'		=> $type,
-				);
-
-				if ($type == 'u')
-				{
-					$tpl_ary = array_merge($tpl_ary, array(
-						'U_VIEW'		=> get_username_string('profile', $id, ${$type}[$id]['name'], ${$type}[$id]['colour']),
-						'NAME_FULL'		=> get_username_string('full', $id, ${$type}[$id]['name'], ${$type}[$id]['colour']),
-					));
-				}
-				else
-				{
-					$tpl_ary = array_merge($tpl_ary, array(
-						'U_VIEW'		=> append_sid('memberlist', 'mode=group&amp;g=' . $id),
-					));
-				}
-
-				phpbb::$template->assign_block_vars($field . '_recipient', $tpl_ary);
-			}
-		}
-	}
-
-	// Build hidden address list
-	$s_hidden_address_field = build_address_field($address_list);
-
-
-	$bbcode_checked		= (isset($enable_bbcode)) ? !$enable_bbcode : ((phpbb::$config['allow_bbcode'] && phpbb::$acl->acl_get('u_pm_bbcode')) ? !phpbb::$user->optionget('bbcode') : 1);
-	$smilies_checked	= (isset($enable_smilies)) ? !$enable_smilies : ((phpbb::$config['allow_smilies'] && phpbb::$acl->acl_get('u_pm_smilies')) ? !phpbb::$user->optionget('smilies') : 1);
-	$urls_checked		= (isset($enable_urls)) ? !$enable_urls : 0;
-	$sig_checked		= $enable_sig;
-
-	switch ($action)
-	{
-		case 'post':
-			$page_title = phpbb::$user->lang['POST_NEW_PM'];
-		break;
-
-		case 'quote':
-			$page_title = phpbb::$user->lang['POST_QUOTE_PM'];
-		break;
-
-		case 'quotepost':
-			$page_title = phpbb::$user->lang['POST_PM_POST'];
-		break;
-
-		case 'reply':
-			$page_title = phpbb::$user->lang['POST_REPLY_PM'];
-		break;
-
-		case 'edit':
-			$page_title = phpbb::$user->lang['POST_EDIT_PM'];
-		break;
-
-		case 'forward':
-			$page_title = phpbb::$user->lang['POST_FORWARD_PM'];
-		break;
-
-		default:
-			trigger_error('NO_ACTION_MODE', E_USER_ERROR);
-		break;
-	}
-
-	$s_hidden_fields = '<input type="hidden" name="lastclick" value="' . $current_time . '" />';
-	$s_hidden_fields .= (isset($check_value)) ? '<input type="hidden" name="status_switch" value="' . $check_value . '" />' : '';
-	$s_hidden_fields .= ($draft_id || phpbb_request::is_set('draft_loaded')) ? '<input type="hidden" name="draft_loaded" value="' . request_var('draft_loaded', (int) $draft_id) . '" />' : '';
-
-	$form_enctype = (@ini_get('file_uploads') == '0' || strtolower(@ini_get('file_uploads')) == 'off' || !phpbb::$config['allow_pm_attach'] || !phpbb::$acl->acl_get('u_pm_attach')) ? '' : ' enctype="multipart/form-data"';
-
-	// Start assigning vars for main posting page ...
-	phpbb::$template->assign_vars(array(
-		'L_POST_A'					=> $page_title,
-		'L_ICON'					=> phpbb::$user->lang['PM_ICON'],
-		'L_MESSAGE_BODY_EXPLAIN'	=> (intval(phpbb::$config['max_post_chars'])) ? sprintf(phpbb::$user->lang['MESSAGE_BODY_EXPLAIN'], intval(phpbb::$config['max_post_chars'])) : '',
-
-		'SUBJECT'				=> (isset($message_subject)) ? $message_subject : '',
-		'MESSAGE'				=> $message_text,
-		'BBCODE_STATUS'			=> ($bbcode_status) ? sprintf(phpbb::$user->lang['BBCODE_IS_ON'], '<a href="' . append_sid('faq', 'mode=bbcode') . '">', '</a>') : sprintf(phpbb::$user->lang['BBCODE_IS_OFF'], '<a href="' . append_sid('faq', 'mode=bbcode') . '">', '</a>'),
-		'IMG_STATUS'			=> ($img_status) ? phpbb::$user->lang['IMAGES_ARE_ON'] : phpbb::$user->lang['IMAGES_ARE_OFF'],
-		'FLASH_STATUS'			=> ($flash_status) ? phpbb::$user->lang['FLASH_IS_ON'] : phpbb::$user->lang['FLASH_IS_OFF'],
-		'SMILIES_STATUS'		=> ($smilies_status) ? phpbb::$user->lang['SMILIES_ARE_ON'] : phpbb::$user->lang['SMILIES_ARE_OFF'],
-		'URL_STATUS'			=> ($url_status) ? phpbb::$user->lang['URL_IS_ON'] : phpbb::$user->lang['URL_IS_OFF'],
-		'MAX_FONT_SIZE'			=> (int) phpbb::$config['max_post_font_size'],
-		'MINI_POST_IMG'			=> phpbb::$user->img('icon_post_target', phpbb::$user->lang['PM']),
-		'ERROR'					=> (sizeof($error)) ? implode('<br />', $error) : '',
-		'MAX_RECIPIENTS'		=> (phpbb::$config['allow_mass_pm'] && (phpbb::$acl->acl_get('u_masspm') || phpbb::$acl->acl_get('u_masspm_group'))) ? $max_recipients : 0,
-
-		'S_COMPOSE_PM'			=> true,
-		'S_EDIT_POST'			=> ($action == 'edit'),
-		'S_SHOW_PM_ICONS'		=> $s_pm_icons,
-		'S_BBCODE_ALLOWED'		=> $bbcode_status,
-		'S_BBCODE_CHECKED'		=> ($bbcode_checked) ? ' checked="checked"' : '',
-		'S_SMILIES_ALLOWED'		=> $smilies_status,
-		'S_SMILIES_CHECKED'		=> ($smilies_checked) ? ' checked="checked"' : '',
-		'S_SIG_ALLOWED'			=> (phpbb::$config['allow_sig'] && phpbb::$config['allow_sig_pm'] && phpbb::$acl->acl_get('u_sig')),
-		'S_SIGNATURE_CHECKED'	=> ($sig_checked) ? ' checked="checked"' : '',
-		'S_LINKS_ALLOWED'		=> $url_status,
-		'S_MAGIC_URL_CHECKED'	=> ($urls_checked) ? ' checked="checked"' : '',
-		'S_SAVE_ALLOWED'		=> (phpbb::$acl->acl_get('u_savedrafts') && $action != 'edit') ? true : false,
-		'S_HAS_DRAFTS'			=> (phpbb::$acl->acl_get('u_savedrafts') && $drafts),
-		'S_FORM_ENCTYPE'		=> $form_enctype,
-
-		'S_BBCODE_IMG'			=> $img_status,
-		'S_BBCODE_FLASH'		=> $flash_status,
-		'S_BBCODE_QUOTE'		=> true,
-		'S_BBCODE_URL'			=> $url_status,
-
-		'S_POST_ACTION'				=> $s_action,
-		'S_HIDDEN_ADDRESS_FIELD'	=> $s_hidden_address_field,
-		'S_HIDDEN_FIELDS'			=> $s_hidden_fields,
-
-		'S_CLOSE_PROGRESS_WINDOW'	=> phpbb_request::is_set_post('add_file'),
-		'U_PROGRESS_BAR'			=> append_sid('posting', 'f=0&amp;mode=popup'),
-		'UA_PROGRESS_BAR'			=> addslashes(append_sid('posting', 'f=0&amp;mode=popup')),
-	));
-
-	// Build custom bbcodes array
-	display_custom_bbcodes();
-
-	// Show attachment box for adding attachments if true
-	$allowed = (phpbb::$acl->acl_get('u_pm_attach') && phpbb::$config['allow_pm_attach'] && $form_enctype);
-
-	// Attachment entry
-	posting_gen_attachment_entry($attachment_data, $filename_data, $allowed);
-
-	// Message History
-	if ($action == 'reply' || $action == 'quote' || $action == 'forward')
-	{
-		if (message_history($msg_id, phpbb::$user->data['user_id'], $post, array(), true))
-		{
-			phpbb::$template->assign_var('S_DISPLAY_HISTORY', true);
-		}
-	}
-}
-
-/**
-* For composing messages, handle list actions
-*/
-function handle_message_list_actions(&$address_list, &$error, $remove_u, $remove_g, $add_to, $add_bcc)
-{
-	// Delete User [TO/BCC]
-	$remove_user_id = request_var('remove_u', array(0 => false));
-	if ($remove_u && sizeof($remove_user_id))
-	{
-		unset($address_list['u'][(int) key($remove_user_id)]);
-	}
-
-	// Delete Group [TO/BCC]
-	$remove_group_id = request_var('remove_g', array(0 => false));
-	if ($remove_g && sizeof($remove_group_id))
-	{
-		unset($address_list['g'][(int) key($remove_group_id)]);
-	}
-
-	// Add Selected Groups
-	$group_list = request_var('group_list', array(0));
-
-	// Build usernames to add
-	$username = request_var('username', '', true)
-	$usernames = ($username) ? array($username) : array();
-	$username_list = request_var('username_list', '', true);
-	if ($username_list)
-	{
-		$usernames = array_merge($usernames, explode("\n", $username_list));
-	}
-
-	// If add to or add bcc not pressed, users could still have usernames listed they want to add...
-	if (!$add_to && !$add_bcc && (sizeof($group_list) || sizeof($usernames)))
-	{
-		$add_to = true;
-
-		global $refresh, $submit, $preview;
-
-		$refresh = $preview = true;
-		$submit = false;
-	}
-
-	// Add User/Group [TO]
-	if ($add_to || $add_bcc)
-	{
-		$type = ($add_to) ? 'to' : 'bcc';
-
-		if (sizeof($group_list))
-		{
-			foreach ($group_list as $group_id)
-			{
-				$address_list['g'][$group_id] = $type;
-			}
-		}
-
-		// User ID's to add...
-		$user_id_ary = array();
-
-		// Reveal the correct user_ids
-		if (sizeof($usernames))
-		{
-			$user_id_ary = array();
-			user_get_id_name($user_id_ary, $usernames, array(phpbb::USER_NORMAL, phpbb::USER_FOUNDER, phpbb::USER_INACTIVE));
-
-			// If there are users not existing, we will at least print a notice...
-			if (!sizeof($user_id_ary))
-			{
-				$error[] = phpbb::$user->lang['PM_NO_USERS'];
-			}
-		}
-
-		// Add Friends if specified
-		$friend_list = array_keys(request_var('add_' . $type, array(0 => false)));
-		$user_id_ary = array_merge($user_id_ary, $friend_list);
-
-		foreach ($user_id_ary as $user_id)
-		{
-			if ($user_id == ANONYMOUS)
-			{
-				continue;
-			}
-
-			$address_list['u'][$user_id] = $type;
-		}
-	}
-
-	// Check for disallowed recipients
-	if (!empty($address_list['u']))
-	{
-		// We need to check their PM status (do they want to receive PM's?)
-		// Only check if not a moderator or admin, since they are allowed to override this user setting
-		if (!phpbb::$acl->acl_gets('a_', 'm_') && !phpbb::$acl->acl_getf_global('m_'))
-		{
-			$sql = 'SELECT user_id
-				FROM ' . USERS_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('user_id', array_keys($address_list['u'])) . '
-					AND user_allow_pm = 0';
-			$result = phpbb::$db->sql_query($sql);
-
-			$removed = false;
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$removed = true;
-				unset($address_list['u'][$row['user_id']]);
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			// print a notice about users not being added who do not want to receive pms
-			if ($removed)
-			{
-				$error[] = phpbb::$user->lang['PM_USERS_REMOVED_NO_PM'];
-			}
-		}
-	}
-}
-
-/**
-* Build the hidden field for the recipients. Needed, as the variable is not read via request_var.
-*/
-function build_address_field($address_list)
-{
-	$s_hidden_address_field = '';
-	foreach ($address_list as $type => $adr_ary)
-	{
-		foreach ($adr_ary as $id => $field)
-		{
-			$s_hidden_address_field .= '<input type="hidden" name="address_list[' . (($type == 'u') ? 'u' : 'g') . '][' . (int) $id . ']" value="' . (($field == 'to') ? 'to' : 'bcc') . '" />';
-		}
-	}
-	return $s_hidden_address_field;
-}
-
-/**
-* Return number of private message recipients
-*/
-function num_recipients($address_list)
-{
-	$num_recipients = 0;
-
-	foreach ($address_list as $field => $adr_ary)
-	{
-		$num_recipients += sizeof($adr_ary);
-	}
-
-	return $num_recipients;
-}
-
-/**
-* Get number of 'num_recipients' recipients from first position
-*/
-function get_recipients($address_list, $num_recipients = 1)
-{
-	$recipient = array();
-
-	$count = 0;
-	foreach ($address_list as $field => $adr_ary)
-	{
-		foreach ($adr_ary as $id => $type)
-		{
-			if ($count >= $num_recipients)
-			{
-				break 2;
-			}
-			$recipient[$field][$id] = $type;
-			$count++;
-		}
-	}
-
-	return $recipient;
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/ucp_pm_options.php b/phpBB/modules/ucp/ucp_pm_options.php
deleted file mode 100644
index bb363069c9..0000000000
--- a/phpBB/modules/ucp/ucp_pm_options.php
+++ /dev/null
@@ -1,820 +0,0 @@
-<?php
-/**
-*
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Execute message options
-*/
-function message_options($id, $mode, $global_privmsgs_rules, $global_rule_conditions)
-{
-	$redirect_url = append_sid('ucp', "i=pm&amp;mode=options");
-
-	add_form_key('ucp_pm_options');
-	// Change "full folder" setting - what to do if folder is full
-	if (phpbb_request::is_set_post('fullfolder'))
-	{
-		check_form_key('ucp_pm_options', phpbb::$config['form_token_lifetime'], $redirect_url);
-		$full_action = request_var('full_action', 0);
-
-		$set_folder_id = 0;
-		switch ($full_action)
-		{
-			case 1:
-				$set_folder_id = FULL_FOLDER_DELETE;
-			break;
-
-			case 2:
-				$set_folder_id = request_var('full_move_to', PRIVMSGS_INBOX);
-			break;
-
-			case 3:
-				$set_folder_id = FULL_FOLDER_HOLD;
-			break;
-
-			default:
-				$full_action = 0;
-			break;
-		}
-
-		if ($full_action)
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_full_folder = ' . $set_folder_id . '
-				WHERE user_id = ' . phpbb::$user->data['user_id'];
-			phpbb::$db->sql_query($sql);
-
-			phpbb::$user->data['user_full_folder'] = $set_folder_id;
-
-			$message = phpbb::$user->lang['FULL_FOLDER_OPTION_CHANGED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
-			meta_refresh(3, $redirect_url);
-			trigger_error($message);
-		}
-	}
-
-	// Add Folder
-	if (phpbb_request::is_set_post('addfolder'))
-	{
-		if (check_form_key('ucp_pm_options'))
-		{
-			$folder_name = utf8_normalize_nfc(request_var('foldername', '', true));
-			$msg = '';
-
-			if ($folder_name)
-			{
-				$sql = 'SELECT folder_name
-					FROM ' . PRIVMSGS_FOLDER_TABLE . "
-					WHERE folder_name = '" . phpbb::$db->sql_escape($folder_name) . "'
-						AND user_id = " . phpbb::$user->data['user_id'];
-				$result = phpbb::$db->sql_query_limit($sql, 1);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if ($row)
-				{
-					trigger_error(sprintf(phpbb::$user->lang['FOLDER_NAME_EXIST'], $folder_name));
-				}
-
-				$sql = 'SELECT COUNT(folder_id) as num_folder
-					FROM ' . PRIVMSGS_FOLDER_TABLE . '
-						WHERE user_id = ' . phpbb::$user->data['user_id'];
-				$result = phpbb::$db->sql_query($sql);
-				$num_folder = (int) phpbb::$db->sql_fetchfield('num_folder');
-				phpbb::$db->sql_freeresult($result);
-
-				if ($num_folder >= phpbb::$config['pm_max_boxes'])
-				{
-					trigger_error('MAX_FOLDER_REACHED');
-				}
-
-				$sql = 'INSERT INTO ' . PRIVMSGS_FOLDER_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', array(
-					'user_id'		=> (int) phpbb::$user->data['user_id'],
-					'folder_name'	=> $folder_name)
-				);
-				phpbb::$db->sql_query($sql);
-				$msg = phpbb::$user->lang['FOLDER_ADDED'];
-			}
-		}
-		else
-		{
-			$msg = phpbb::$user->lang['FORM_INVALID'];
-		}
-		$message = $msg . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
-		meta_refresh(3, $redirect_url);
-		trigger_error($message);
-	}
-
-	// Rename folder
-	if (phpbb_request::is_set_post('rename_folder'))
-	{
-		if (check_form_key('ucp_pm_options'))
-		{
-			$new_folder_name = utf8_normalize_nfc(request_var('new_folder_name', '', true));
-			$rename_folder_id= request_var('rename_folder_id', 0);
-
-			if (!$new_folder_name)
-			{
-				trigger_error('NO_NEW_FOLDER_NAME');
-			}
-
-			// Select custom folder
-			$sql = 'SELECT folder_name, pm_count
-				FROM ' . PRIVMSGS_FOLDER_TABLE . '
-				WHERE user_id = ' . phpbb::$user->data['user_id'] . "
-					AND folder_id = $rename_folder_id";
-			$result = phpbb::$db->sql_query_limit($sql, 1);
-			$folder_row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$folder_row)
-			{
-				trigger_error('CANNOT_RENAME_FOLDER');
-			}
-
-			$sql = 'UPDATE ' . PRIVMSGS_FOLDER_TABLE . "
-				SET folder_name = '" . phpbb::$db->sql_escape($new_folder_name) . "'
-				WHERE folder_id = $rename_folder_id
-					AND user_id = " . phpbb::$user->data['user_id'];
-			phpbb::$db->sql_query($sql);
-			$msg = phpbb::$user->lang['FOLDER_RENAMED'];
-		}
-		else
-		{
-			$msg = phpbb::$user->lang['FORM_INVALID'];
-		}
-
-		$message = $msg . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
-
-		meta_refresh(3, $redirect_url);
-		trigger_error($message);
-	}
-
-	// Remove Folder
-	if (phpbb_request::is_set_post('remove_folder'))
-	{
-		$remove_folder_id = request_var('remove_folder_id', 0);
-
-		// Default to "move all messages to inbox"
-		$remove_action = request_var('remove_action', 1);
-		$move_to = request_var('move_to', PRIVMSGS_INBOX);
-
-		// Move to same folder?
-		if ($remove_action == 1 && $remove_folder_id == $move_to)
-		{
-			trigger_error('CANNOT_MOVE_TO_SAME_FOLDER');
-		}
-
-		// Select custom folder
-		$sql = 'SELECT folder_name, pm_count
-			FROM ' . PRIVMSGS_FOLDER_TABLE . '
-			WHERE user_id = ' . phpbb::$user->data['user_id'] . "
-				AND folder_id = $remove_folder_id";
-		$result = phpbb::$db->sql_query_limit($sql, 1);
-		$folder_row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$folder_row)
-		{
-			trigger_error('CANNOT_REMOVE_FOLDER');
-		}
-
-		$s_hidden_fields = array(
-			'remove_folder_id'	=> $remove_folder_id,
-			'remove_action'		=> $remove_action,
-			'move_to'			=> $move_to,
-			'remove_folder'		=> 1
-		);
-
-		// Do we need to confirm?
-		if (confirm_box(true))
-		{
-			// Gather message ids
-			$sql = 'SELECT msg_id
-				FROM ' . PRIVMSGS_TO_TABLE . '
-				WHERE user_id = ' . phpbb::$user->data['user_id'] . "
-					AND folder_id = $remove_folder_id";
-			$result = phpbb::$db->sql_query($sql);
-
-			$msg_ids = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$msg_ids[] = (int) $row['msg_id'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			// First of all, copy all messages to another folder... or delete all messages
-			switch ($remove_action)
-			{
-				// Move Messages
-				case 1:
-					$num_moved = move_pm(phpbb::$user->data['user_id'], phpbb::$user->data['message_limit'], $msg_ids, $move_to, $remove_folder_id);
-
-					// Something went wrong, only partially moved?
-					if ($num_moved != $folder_row['pm_count'])
-					{
-						trigger_error(sprintf(phpbb::$user->lang['MOVE_PM_ERROR'], $num_moved, $folder_row['pm_count']));
-					}
-				break;
-
-				// Remove Messages
-				case 2:
-					delete_pm(phpbb::$user->data['user_id'], $msg_ids, $remove_folder_id);
-				break;
-			}
-
-			// Remove folder
-			$sql = 'DELETE FROM ' . PRIVMSGS_FOLDER_TABLE . '
-				WHERE user_id = ' . phpbb::$user->data['user_id'] . "
-					AND folder_id = $remove_folder_id";
-			phpbb::$db->sql_query($sql);
-
-			// Check full folder option. If the removed folder has been specified as destination switch back to inbox
-			if (phpbb::$user->data['user_full_folder'] == $remove_folder_id)
-			{
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_full_folder = ' . PRIVMSGS_INBOX . '
-					WHERE user_id = ' . phpbb::$user->data['user_id'];
-				phpbb::$db->sql_query($sql);
-
-				phpbb::$user->data['user_full_folder'] = PRIVMSGS_INBOX;
-			}
-
-			// Now make sure the folder is not used for rules
-			// We assign another folder id (the one the messages got moved to) or assign the INBOX (to not have to remove any rule)
-			$sql = 'UPDATE ' . PRIVMSGS_RULES_TABLE . ' SET rule_folder_id = ';
-			$sql .= ($remove_action == 1) ? $move_to : PRIVMSGS_INBOX;
-			$sql .= ' WHERE rule_folder_id = ' . $remove_folder_id;
-
-			phpbb::$db->sql_query($sql);
-
-			$meta_info = append_sid('ucp', "i=pm&amp;mode=$mode");
-			$message = phpbb::$user->lang['FOLDER_REMOVED'];
-
-			meta_refresh(3, $meta_info);
-			$message .= '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $meta_info . '">', '</a>');
-			trigger_error($message);
-		}
-		else
-		{
-			confirm_box(false, 'REMOVE_FOLDER', build_hidden_fields($s_hidden_fields));
-		}
-	}
-
-	// Add Rule
-	if (phpbb_request::is_set_post('add_rule'))
-	{
-		if (check_form_key('ucp_pm_options'))
-		{
-			$check_option	= request_var('check_option', 0);
-			$rule_option	= request_var('rule_option', 0);
-			$cond_option	= request_var('cond_option', '');
-			$action_option	= explode('|', request_var('action_option', ''));
-			$rule_string	= ($cond_option != 'none') ? utf8_normalize_nfc(request_var('rule_string', '', true)) : '';
-			$rule_user_id	= ($cond_option != 'none') ? request_var('rule_user_id', 0) : 0;
-			$rule_group_id	= ($cond_option != 'none') ? request_var('rule_group_id', 0) : 0;
-
-			$action = (int) $action_option[0];
-			$folder_id = (int) $action_option[1];
-
-			if (!$action || !$check_option || !$rule_option || !$cond_option || ($cond_option != 'none' && !$rule_string))
-			{
-				trigger_error('RULE_NOT_DEFINED');
-			}
-
-			if (($cond_option == 'user' && !$rule_user_id) || ($cond_option == 'group' && !$rule_group_id))
-			{
-				trigger_error('RULE_NOT_DEFINED');
-			}
-
-			$rule_ary = array(
-				'user_id'			=> phpbb::$user->data['user_id'],
-				'rule_check'		=> $check_option,
-				'rule_connection'	=> $rule_option,
-				'rule_string'		=> $rule_string,
-				'rule_user_id'		=> $rule_user_id,
-				'rule_group_id'		=> $rule_group_id,
-				'rule_action'		=> $action,
-				'rule_folder_id'	=> $folder_id
-			);
-
-			$sql = 'SELECT rule_id
-				FROM ' . PRIVMSGS_RULES_TABLE . '
-				WHERE ' . phpbb::$db->sql_build_array('SELECT', $rule_ary);
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if ($row)
-			{
-				trigger_error('RULE_ALREADY_DEFINED');
-			}
-
-			$sql = 'INSERT INTO ' . PRIVMSGS_RULES_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $rule_ary);
-			phpbb::$db->sql_query($sql);
-
-			// Update users message rules
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_message_rules = 1
-				WHERE user_id = ' . phpbb::$user->data['user_id'];
-			phpbb::$db->sql_query($sql);
-
-			$msg = phpbb::$user->lang['RULE_ADDED'];
-		}
-		else
-		{
-			$msg = phpbb::$user->lang['FORM_INVALID'];
-		}
-		$message = $msg . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
-		meta_refresh(3, $redirect_url);
-		trigger_error($message);
-	}
-
-	// Remove Rule
-	if (phpbb_request::is_set_post('delete_rule') && !phpbb_request::is_set_post('cancel'))
-	{
-		$delete_id = array_keys(request_var('delete_rule', array(0 => 0)));
-		$delete_id = (!empty($delete_id[0])) ? $delete_id[0] : 0;
-
-		if (!$delete_id)
-		{
-			redirect(append_sid('ucp', 'i=pm&amp;mode=' . $mode));
-		}
-
-		// Do we need to confirm?
-		if (confirm_box(true))
-		{
-			$sql = 'DELETE FROM ' . PRIVMSGS_RULES_TABLE . '
-				WHERE user_id = ' . phpbb::$user->data['user_id'] . "
-					AND rule_id = $delete_id";
-			phpbb::$db->sql_query($sql);
-
-			$meta_info = append_sid('ucp', 'i=pm&amp;mode=' . $mode);
-			$message = phpbb::$user->lang['RULE_DELETED'];
-
-			// Reset user_message_rules if no more assigned
-			$sql = 'SELECT rule_id
-				FROM ' . PRIVMSGS_RULES_TABLE . '
-				WHERE user_id = ' . phpbb::$user->data['user_id'];
-			$result = phpbb::$db->sql_query_limit($sql, 1);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			// Update users message rules
-			if (!$row)
-			{
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_message_rules = 0
-					WHERE user_id = ' . phpbb::$user->data['user_id'];
-				phpbb::$db->sql_query($sql);
-			}
-
-			meta_refresh(3, $meta_info);
-			$message .= '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $meta_info . '">', '</a>');
-			trigger_error($message);
-		}
-		else
-		{
-			confirm_box(false, 'DELETE_RULE', build_hidden_fields(array('delete_rule' => array($delete_id => 1))));
-		}
-	}
-
-	$folder = array();
-
-	$sql = 'SELECT COUNT(msg_id) as num_messages
-		FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE user_id = ' . phpbb::$user->data['user_id'] . '
-			AND folder_id = ' . PRIVMSGS_INBOX;
-	$result = phpbb::$db->sql_query($sql);
-	$num_messages = (int) phpbb::$db->sql_fetchfield('num_messages');
-	phpbb::$db->sql_freeresult($result);
-
-	$folder[PRIVMSGS_INBOX] = array(
-		'folder_name'		=> phpbb::$user->lang['PM_INBOX'],
-		'message_status'	=> sprintf(phpbb::$user->lang['FOLDER_MESSAGE_STATUS'], $num_messages, phpbb::$user->data['message_limit'])
-	);
-
-	$sql = 'SELECT folder_id, folder_name, pm_count
-		FROM ' . PRIVMSGS_FOLDER_TABLE . '
-			WHERE user_id = ' . phpbb::$user->data['user_id'];
-	$result = phpbb::$db->sql_query($sql);
-
-	$num_user_folder = 0;
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$num_user_folder++;
-		$folder[$row['folder_id']] = array(
-			'folder_name'		=> $row['folder_name'],
-			'message_status'	=> sprintf(phpbb::$user->lang['FOLDER_MESSAGE_STATUS'], $row['pm_count'], phpbb::$user->data['message_limit'])
-		);
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	$s_full_folder_options = $s_to_folder_options = $s_folder_options = '';
-
-	if (phpbb::$user->data['user_full_folder'] == FULL_FOLDER_NONE)
-	{
-		// -3 here to let the correct folder id be selected
-		$to_folder_id = phpbb::$config['full_folder_action'] - 3;
-	}
-	else
-	{
-		$to_folder_id = phpbb::$user->data['user_full_folder'];
-	}
-
-	foreach ($folder as $folder_id => $folder_ary)
-	{
-		$s_full_folder_options .= '<option value="' . $folder_id . '"' . ((phpbb::$user->data['user_full_folder'] == $folder_id) ? ' selected="selected"' : '') . '>' . $folder_ary['folder_name'] . ' (' . $folder_ary['message_status'] . ')</option>';
-		$s_to_folder_options .= '<option value="' . $folder_id . '"' . (($to_folder_id == $folder_id) ? ' selected="selected"' : '') . '>' . $folder_ary['folder_name'] . ' (' . $folder_ary['message_status'] . ')</option>';
-
-		if ($folder_id != PRIVMSGS_INBOX)
-		{
-			$s_folder_options .= '<option value="' . $folder_id . '">' . $folder_ary['folder_name'] . ' (' . $folder_ary['message_status'] . ')</option>';
-		}
-	}
-
-	$s_delete_checked = (phpbb::$user->data['user_full_folder'] == FULL_FOLDER_DELETE) ? ' checked="checked"' : '';
-	$s_hold_checked = (phpbb::$user->data['user_full_folder'] == FULL_FOLDER_HOLD) ? ' checked="checked"' : '';
-	$s_move_checked = (phpbb::$user->data['user_full_folder'] >= 0) ? ' checked="checked"' : '';
-
-	if (phpbb::$user->data['user_full_folder'] == FULL_FOLDER_NONE)
-	{
-		switch (phpbb::$config['full_folder_action'])
-		{
-			case 1:
-				$s_delete_checked = ' checked="checked"';
-			break;
-
-			case 2:
-				$s_hold_checked = ' checked="checked"';
-			break;
-		}
-	}
-
-	phpbb::$template->assign_vars(array(
-		'S_FULL_FOLDER_OPTIONS'	=> $s_full_folder_options,
-		'S_TO_FOLDER_OPTIONS'	=> $s_to_folder_options,
-		'S_FOLDER_OPTIONS'		=> $s_folder_options,
-		'S_DELETE_CHECKED'		=> $s_delete_checked,
-		'S_HOLD_CHECKED'		=> $s_hold_checked,
-		'S_MOVE_CHECKED'		=> $s_move_checked,
-		'S_MAX_FOLDER_REACHED'	=> ($num_user_folder >= phpbb::$config['pm_max_boxes']) ? true : false,
-		'S_MAX_FOLDER_ZERO'		=> (phpbb::$config['pm_max_boxes'] == 0) ? true : false,
-
-		'DEFAULT_ACTION'		=> (phpbb::$config['full_folder_action'] == 1) ? phpbb::$user->lang['DELETE_OLDEST_MESSAGES'] : phpbb::$user->lang['HOLD_NEW_MESSAGES'],
-
-		'U_FIND_USERNAME'		=> append_sid('memberlist', 'mode=searchuser&amp;form=ucp&amp;field=rule_string&amp;select_single=true'),
-	));
-
-	$rule_lang = $action_lang = $check_lang = array();
-
-	// Build all three language arrays
-	preg_replace('#^((RULE|ACTION|CHECK)_([A-Z0-9_]+))$#e', "\${strtolower('\\2') . '_lang'}[constant('\\1')] = phpbb::\$user->lang['PM_\\2']['\\3']", array_keys(get_defined_constants()));
-
-	/*
-		Rule Ordering:
-			-> CHECK_* -> RULE_* [IN $global_privmsgs_rules:CHECK_*] -> [IF $rule_conditions[RULE_*] [|text|bool|user|group|own_group]] -> ACTION_*
-	*/
-
-	$check_option	= request_var('check_option', 0);
-	$rule_option	= request_var('rule_option', 0);
-	$cond_option	= request_var('cond_option', '');
-	$action_option	= request_var('action_option', '');
-	$back = request_var('back', array('' => 0));
-
-	if (sizeof($back))
-	{
-		if ($action_option)
-		{
-			$action_option = '';
-		}
-		else if ($cond_option)
-		{
-			$cond_option = '';
-		}
-		else if ($rule_option)
-		{
-			$rule_option = 0;
-		}
-		else if ($check_option)
-		{
-			$check_option = 0;
-		}
-	}
-
-	if (isset($back['action']) && $cond_option == 'none')
-	{
-		$back['cond'] = true;
-	}
-
-	// Check
-	if (!isset($global_privmsgs_rules[$check_option]))
-	{
-		$check_option = 0;
-	}
-
-	define_check_option(($check_option && !isset($back['rule'])) ? true : false, $check_option, $check_lang);
-
-	if ($check_option && !isset($back['rule']))
-	{
-		define_rule_option(($rule_option && !isset($back['cond'])) ? true : false, $rule_option, $rule_lang, $global_privmsgs_rules[$check_option]);
-	}
-
-	if ($rule_option && !isset($back['cond']))
-	{
-		if (!isset($global_rule_conditions[$rule_option]))
-		{
-			$cond_option = 'none';
-			phpbb::$template->assign_var('NONE_CONDITION', true);
-		}
-		else
-		{
-			define_cond_option(($cond_option && !isset($back['action'])) ? true : false, $cond_option, $rule_option, $global_rule_conditions);
-		}
-	}
-
-	if ($cond_option && !isset($back['action']))
-	{
-		define_action_option(false, $action_option, $action_lang, $folder);
-	}
-
-	show_defined_rules(phpbb::$user->data['user_id'], $check_lang, $rule_lang, $action_lang, $folder);
-}
-
-/**
-* Defining check option for message rules
-*/
-function define_check_option($hardcoded, $check_option, $check_lang)
-{
-	$s_check_options = '';
-	if (!$hardcoded)
-	{
-		foreach ($check_lang as $value => $lang)
-		{
-			$s_check_options .= '<option value="' . $value . '"' . (($value == $check_option) ? ' selected="selected"' : '') . '>' . $lang . '</option>';
-		}
-	}
-
-	phpbb::$template->assign_vars(array(
-		'S_CHECK_DEFINED'	=> true,
-		'S_CHECK_SELECT'	=> ($hardcoded) ? false : true,
-		'CHECK_CURRENT'		=> isset($check_lang[$check_option]) ? $check_lang[$check_option] : '',
-		'S_CHECK_OPTIONS'	=> $s_check_options,
-		'CHECK_OPTION'		=> $check_option,
-	));
-}
-
-/**
-* Defining action option for message rules
-*/
-function define_action_option($hardcoded, $action_option, $action_lang, $folder)
-{
-	$l_action = $s_action_options = '';
-	if ($hardcoded)
-	{
-		$option = explode('|', $action_option);
-		$action = (int) $option[0];
-		$folder_id = (int) $option[1];
-
-		$l_action = $action_lang[$action];
-		if ($action == ACTION_PLACE_INTO_FOLDER)
-		{
-			$l_action .= ' -> ' . $folder[$folder_id]['folder_name'];
-		}
-	}
-	else
-	{
-		foreach ($action_lang as $action => $lang)
-		{
-			if ($action == ACTION_PLACE_INTO_FOLDER)
-			{
-				foreach ($folder as $folder_id => $folder_ary)
-				{
-					$s_action_options .= '<option value="' . $action . '|' . $folder_id . '"' . (($action_option == $action . '|' . $folder_id) ? ' selected="selected"' : '') . '>' . $lang . ' -> ' . $folder_ary['folder_name'] . '</option>';
-				}
-			}
-			else
-			{
-				$s_action_options .= '<option value="' . $action . '|0"' . (($action_option == $action . '|0') ? ' selected="selected"' : '') . '>' . $lang . '</option>';
-			}
-		}
-	}
-
-	phpbb::$template->assign_vars(array(
-		'S_ACTION_DEFINED'	=> true,
-		'S_ACTION_SELECT'	=> ($hardcoded) ? false : true,
-		'ACTION_CURRENT'	=> $l_action,
-		'S_ACTION_OPTIONS'	=> $s_action_options,
-		'ACTION_OPTION'		=> $action_option,
-	));
-}
-
-/**
-* Defining rule option for message rules
-*/
-function define_rule_option($hardcoded, $rule_option, $rule_lang, $check_ary)
-{
-	$s_rule_options = '';
-	if (!$hardcoded)
-	{
-		foreach ($check_ary as $value => $_check)
-		{
-			$s_rule_options .= '<option value="' . $value . '"' . (($value == $rule_option) ? ' selected="selected"' : '') . '>' . $rule_lang[$value] . '</option>';
-		}
-	}
-
-	phpbb::$template->assign_vars(array(
-		'S_RULE_DEFINED'	=> true,
-		'S_RULE_SELECT'		=> !$hardcoded,
-		'RULE_CURRENT'		=> isset($rule_lang[$rule_option]) ? $rule_lang[$rule_option] : '',
-		'S_RULE_OPTIONS'	=> $s_rule_options,
-		'RULE_OPTION'		=> $rule_option,
-	));
-}
-
-/**
-* Defining condition option for message rules
-*/
-function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule_conditions)
-{
-	phpbb::$template->assign_vars(array(
-		'S_COND_DEFINED'	=> true,
-		'S_COND_SELECT'		=> (!$hardcoded && isset($global_rule_conditions[$rule_option])) ? true : false,
-	));
-
-	// Define COND_OPTION
-	if (!isset($global_rule_conditions[$rule_option]))
-	{
-		phpbb::$template->assign_vars(array(
-			'COND_OPTION'	=> 'none',
-			'COND_CURRENT'	=> false,
-		));
-		return;
-	}
-
-	// Define Condition
-	$condition = $global_rule_conditions[$rule_option];
-	$current_value = '';
-
-	switch ($condition)
-	{
-		case 'text':
-			$rule_string = utf8_normalize_nfc(request_var('rule_string', '', true));
-
-			phpbb::$template->assign_vars(array(
-				'S_TEXT_CONDITION'	=> true,
-				'CURRENT_STRING'	=> $rule_string,
-				'CURRENT_USER_ID'	=> 0,
-				'CURRENT_GROUP_ID'	=> 0,
-			));
-
-			$current_value = $rule_string;
-		break;
-
-		case 'user':
-			$rule_user_id = request_var('rule_user_id', 0);
-			$rule_string = utf8_normalize_nfc(request_var('rule_string', '', true));
-
-			if ($rule_string && !$rule_user_id)
-			{
-				$sql = 'SELECT user_id
-					FROM ' . USERS_TABLE . "
-					WHERE username_clean = '" . phpbb::$db->sql_escape(utf8_clean_string($rule_string)) . "'";
-				$result = phpbb::$db->sql_query($sql);
-				$rule_user_id = (int) phpbb::$db->sql_fetchfield('user_id');
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$rule_user_id)
-				{
-					$rule_string = '';
-				}
-			}
-			else if (!$rule_string && $rule_user_id)
-			{
-				$sql = 'SELECT username
-					FROM ' . USERS_TABLE . "
-					WHERE user_id = $rule_user_id";
-				$result = phpbb::$db->sql_query($sql);
-				$rule_string = phpbb::$db->sql_fetchfield('username');
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$rule_string)
-				{
-					$rule_user_id = 0;
-				}
-			}
-
-			phpbb::$template->assign_vars(array(
-				'S_USER_CONDITION'	=> true,
-				'CURRENT_STRING'	=> $rule_string,
-				'CURRENT_USER_ID'	=> $rule_user_id,
-				'CURRENT_GROUP_ID'	=> 0,
-			));
-
-			$current_value = $rule_string;
-		break;
-
-		case 'group':
-			$rule_group_id = request_var('rule_group_id', 0);
-			$rule_string = utf8_normalize_nfc(request_var('rule_string', '', true));
-
-			$sql = 'SELECT g.group_id, g.group_name, g.group_type
-					FROM ' . GROUPS_TABLE . ' g ';
-
-			if (!phpbb::$acl->acl_gets('a_group', 'a_groupadd', 'a_groupdel'))
-			{
-				$sql .= 'LEFT JOIN ' . USER_GROUP_TABLE . ' ug
-					ON (
-						g.group_id = ug.group_id
-						AND ug.user_id = ' . phpbb::$user->data['user_id'] . '
-						AND ug.user_pending = 0
-					)
-					WHERE (ug.user_id = ' . phpbb::$user->data['user_id'] . ' OR g.group_type <> ' . GROUP_HIDDEN . ')
-					AND';
-			}
-			else
-			{
-				$sql .= 'WHERE';
-			}
-
-			$sql .= " (g.group_name NOT IN ('GUESTS', 'BOTS') OR g.group_type <> " . GROUP_SPECIAL . ')
-				ORDER BY g.group_type DESC, g.group_name ASC';
-
-			$result = phpbb::$db->sql_query($sql);
-
-			$s_group_options = '';
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				if ($rule_group_id && ($row['group_id'] == $rule_group_id))
-				{
-					$rule_string = (($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name']);
-				}
-
-				$s_class	= ($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '';
-				$s_selected	= ($row['group_id'] == $rule_group_id) ? ' selected="selected"' : '';
-
-				$s_group_options .= '<option value="' . $row['group_id'] . '"' . $s_class . $s_selected . '>' . (($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			phpbb::$template->assign_vars(array(
-				'S_GROUP_CONDITION'	=> true,
-				'S_GROUP_OPTIONS'	=> $s_group_options,
-				'CURRENT_STRING'	=> $rule_string,
-				'CURRENT_USER_ID'	=> 0,
-				'CURRENT_GROUP_ID'	=> $rule_group_id,
-			));
-
-			$current_value = $rule_string;
-		break;
-
-		default:
-			return;
-	}
-
-	phpbb::$template->assign_vars(array(
-		'COND_OPTION'	=> $condition,
-		'COND_CURRENT'	=> $current_value,
-	));
-}
-
-/**
-* Display defined message rules
-*/
-function show_defined_rules($user_id, $check_lang, $rule_lang, $action_lang, $folder)
-{
-	$sql = 'SELECT *
-		FROM ' . PRIVMSGS_RULES_TABLE . '
-		WHERE user_id = ' . $user_id . '
-		ORDER BY rule_id ASC';
-	$result = phpbb::$db->sql_query($sql);
-
-	$count = 0;
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		phpbb::$template->assign_block_vars('rule', array(
-			'COUNT'		=> ++$count,
-			'RULE_ID'	=> $row['rule_id'],
-			'CHECK'		=> $check_lang[$row['rule_check']],
-			'RULE'		=> $rule_lang[$row['rule_connection']],
-			'STRING'	=> $row['rule_string'],
-			'ACTION'	=> $action_lang[$row['rule_action']],
-			'FOLDER'	=> ($row['rule_action'] == ACTION_PLACE_INTO_FOLDER) ? $folder[$row['rule_folder_id']]['folder_name'] : '',
-		));
-	}
-	phpbb::$db->sql_freeresult($result);
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/ucp_pm_viewfolder.php b/phpBB/modules/ucp/ucp_pm_viewfolder.php
deleted file mode 100644
index 5b252f7410..0000000000
--- a/phpBB/modules/ucp/ucp_pm_viewfolder.php
+++ /dev/null
@@ -1,565 +0,0 @@
-<?php
-/**
-*
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* View message folder
-* Called from ucp_pm with mode == 'view' && action == 'view_folder'
-*/
-function view_folder($id, $mode, $folder_id, $folder)
-{
-	$submit_export = phpbb_request::is_set_post('submit_export');
-
-	$folder_info = get_pm_from($folder_id, $folder, phpbb::$user->data['user_id']);
-
-	if (!$submit_export)
-	{
-		phpbb::$user->add_lang('viewforum');
-
-		// Grab icons
-		$icons = phpbb_cache::obtain_icons();
-
-		$color_rows = array('marked', 'replied');
-
-		// only show the friend/foe color rows if the module is enabled
-		$zebra_enabled = false;
-
-		$_module = new p_master();
-		$_module->list_modules('ucp');
-		$_module->set_active('zebra');
-
-		$zebra_enabled = ($_module->active_module === false) ? false : true;
-
-		unset($_module);
-
-		if ($zebra_enabled)
-		{
-			$color_rows = array_merge($color_rows, array('friend', 'foe'));
-		}
-
-		foreach ($color_rows as $var)
-		{
-			phpbb::$template->assign_block_vars('pm_colour_info', array(
-				'IMG'	=> phpbb::$user->img("pm_{$var}", ''),
-				'CLASS'	=> "pm_{$var}_colour",
-				'LANG'	=> phpbb::$user->lang[strtoupper($var) . '_MESSAGE'],
-			));
-		}
-
-		$mark_options = array('mark_important', 'delete_marked');
-
-		$s_mark_options = '';
-		foreach ($mark_options as $mark_option)
-		{
-			$s_mark_options .= '<option value="' . $mark_option . '">' . phpbb::$user->lang[strtoupper($mark_option)] . '</option>';
-		}
-
-		// We do the folder moving options here too, for template authors to use...
-		$s_folder_move_options = '';
-		if ($folder_id != PRIVMSGS_NO_BOX && $folder_id != PRIVMSGS_OUTBOX)
-		{
-			foreach ($folder as $f_id => $folder_ary)
-			{
-				if ($f_id == PRIVMSGS_OUTBOX || $f_id == PRIVMSGS_SENTBOX || $f_id == $folder_id)
-				{
-					continue;
-				}
-
-				$s_folder_move_options .= '<option' . (($f_id != PRIVMSGS_INBOX) ? ' class="sep"' : '') . ' value="' . $f_id . '">';
-				$s_folder_move_options .= sprintf(phpbb::$user->lang['MOVE_MARKED_TO_FOLDER'], $folder_ary['folder_name']);
-				$s_folder_move_options .= (($folder_ary['unread_messages']) ? ' [' . $folder_ary['unread_messages'] . '] ' : '') . '</option>';
-			}
-		}
-		$friend = $foe = array();
-
-		// Get friends and foes
-		$sql = 'SELECT *
-			FROM ' . ZEBRA_TABLE . '
-			WHERE user_id = ' . phpbb::$user->data['user_id'];
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$friend[$row['zebra_id']] = $row['friend'];
-			$foe[$row['zebra_id']] = $row['foe'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		phpbb::$template->assign_vars(array(
-			'S_MARK_OPTIONS'		=> $s_mark_options,
-			'S_MOVE_MARKED_OPTIONS'	=> $s_folder_move_options,
-		));
-
-		// Okay, lets dump out the page ...
-		if (sizeof($folder_info['pm_list']))
-		{
-			$address_list = array();
-
-			// Build Recipient List if in outbox/sentbox - max two additional queries
-			if ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX)
-			{
-				$recipient_list = $address = array();
-
-				foreach ($folder_info['rowset'] as $message_id => $row)
-				{
-					$address[$message_id] = rebuild_header(array('to' => $row['to_address'], 'bcc' => $row['bcc_address']));
-					$_save = array('u', 'g');
-					foreach ($_save as $save)
-					{
-						if (isset($address[$message_id][$save]) && sizeof($address[$message_id][$save]))
-						{
-							foreach (array_keys($address[$message_id][$save]) as $ug_id)
-							{
-								$recipient_list[$save][$ug_id] = array('name' => phpbb::$user->lang['NA'], 'colour' => '');
-							}
-						}
-					}
-				}
-
-				$_types = array('u', 'g');
-				foreach ($_types as $ug_type)
-				{
-					if (!empty($recipient_list[$ug_type]))
-					{
-						if ($ug_type == 'u')
-						{
-							$sql = 'SELECT user_id as id, username as name, user_colour as colour
-								FROM ' . USERS_TABLE . '
-								WHERE ';
-						}
-						else
-						{
-							$sql = 'SELECT group_id as id, group_name as name, group_colour as colour, group_type
-								FROM ' . GROUPS_TABLE . '
-								WHERE ';
-						}
-						$sql .= phpbb::$db->sql_in_set(($ug_type == 'u') ? 'user_id' : 'group_id', array_map('intval', array_keys($recipient_list[$ug_type])));
-
-						$result = phpbb::$db->sql_query($sql);
-
-						while ($row = phpbb::$db->sql_fetchrow($result))
-						{
-							if ($ug_type == 'g')
-							{
-								$row['name'] = ($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['name']] : $row['name'];
-							}
-
-							$recipient_list[$ug_type][$row['id']] = array('name' => $row['name'], 'colour' => $row['colour']);
-						}
-						phpbb::$db->sql_freeresult($result);
-					}
-				}
-
-				foreach ($address as $message_id => $adr_ary)
-				{
-					foreach ($adr_ary as $type => $id_ary)
-					{
-						foreach ($id_ary as $ug_id => $_id)
-						{
-							if ($type == 'u')
-							{
-								$address_list[$message_id][] = get_username_string('full', $ug_id, $recipient_list[$type][$ug_id]['name'], $recipient_list[$type][$ug_id]['colour']);
-							}
-							else
-							{
-								$user_colour = ($recipient_list[$type][$ug_id]['colour']) ? ' style="font-weight: bold; color:#' . $recipient_list[$type][$ug_id]['colour'] . '"' : '';
-								$link = '<a href="' . append_sid('memberlist', 'mode=group&amp;g=' . $ug_id) . '"' . $user_colour . '>';
-								$address_list[$message_id][] = $link . $recipient_list[$type][$ug_id]['name'] . (($link) ? '</a>' : '');
-							}
-						}
-					}
-				}
-				unset($recipient_list, $address);
-			}
-
-			$data = array();
-
-			foreach ($folder_info['pm_list'] as $message_id)
-			{
-				$row = &$folder_info['rowset'][$message_id];
-
-				$folder_img = ($row['pm_unread']) ? 'pm_unread' : 'pm_read';
-				$folder_alt = ($row['pm_unread']) ? 'NEW_MESSAGES' : 'NO_NEW_MESSAGES';
-
-				// Generate all URIs ...
-				$view_message_url = append_sid('ucp', "i=$id&amp;mode=view&amp;f=$folder_id&amp;p=$message_id");
-				$remove_message_url = append_sid('ucp', "i=$id&amp;mode=compose&amp;action=delete&amp;p=$message_id");
-
-				$row_indicator = '';
-				foreach ($color_rows as $var)
-				{
-					if (($var != 'friend' && $var != 'foe' && $row['pm_' . $var])
-						||
-						(($var == 'friend' || $var == 'foe') && isset(${$var}[$row['author_id']]) && ${$var}[$row['author_id']]))
-					{
-						$row_indicator = $var;
-						break;
-					}
-				}
-
-				// Send vars to template
-				phpbb::$template->assign_block_vars('messagerow', array(
-					'PM_CLASS'			=> ($row_indicator) ? 'pm_' . $row_indicator . '_colour' : '',
-
-					'MESSAGE_AUTHOR_FULL'		=> get_username_string('full', $row['author_id'], $row['username'], $row['user_colour'], $row['username']),
-					'MESSAGE_AUTHOR_COLOUR'		=> get_username_string('colour', $row['author_id'], $row['username'], $row['user_colour'], $row['username']),
-					'MESSAGE_AUTHOR'			=> get_username_string('username', $row['author_id'], $row['username'], $row['user_colour'], $row['username']),
-					'U_MESSAGE_AUTHOR'			=> get_username_string('profile', $row['author_id'], $row['username'], $row['user_colour'], $row['username']),
-
-					'FOLDER_ID'			=> $folder_id,
-					'MESSAGE_ID'		=> $message_id,
-					'SENT_TIME'			=> phpbb::$user->format_date($row['message_time']),
-					'SUBJECT'			=> censor_text($row['message_subject']),
-					'FOLDER'			=> (isset($folder[$row['folder_id']])) ? $folder[$row['folder_id']]['folder_name'] : '',
-					'U_FOLDER'			=> (isset($folder[$row['folder_id']])) ? append_sid('ucp', 'folder=' . $row['folder_id']) : '',
-					'PM_ICON_IMG'		=> (!empty($icons[$row['icon_id']])) ? '<img src="' . phpbb::$config['icons_path'] . '/' . $icons[$row['icon_id']]['img'] . '" width="' . $icons[$row['icon_id']]['width'] . '" height="' . $icons[$row['icon_id']]['height'] . '" alt="" title="" />' : '',
-					'PM_ICON_URL'		=> (!empty($icons[$row['icon_id']])) ? phpbb::$config['icons_path'] . '/' . $icons[$row['icon_id']]['img'] : '',
-					'FOLDER_IMG'		=> phpbb::$user->img($folder_img, $folder_alt),
-					'FOLDER_IMG_SRC'	=> phpbb::$user->img($folder_img, $folder_alt, 'src'),
-					'PM_IMG'			=> ($row_indicator) ? phpbb::$user->img('pm_' . $row_indicator, '') : '',
-					'ATTACH_ICON_IMG'	=> (phpbb::$acl->acl_get('u_pm_download') && $row['message_attachment'] && phpbb::$config['allow_pm_attach']) ? phpbb::$user->img('icon_topic_attach', 'TOTAL_ATTACHMENTS') : '',
-
-					'S_PM_DELETED'		=> ($row['pm_deleted']) ? true : false,
-					'S_AUTHOR_DELETED'	=> ($row['author_id'] == ANONYMOUS) ? true : false,
-
-					'U_VIEW_PM'			=> ($row['pm_deleted']) ? '' : $view_message_url,
-					'U_REMOVE_PM'		=> ($row['pm_deleted']) ? $remove_message_url : '',
-					'RECIPIENTS'		=> ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? implode(', ', $address_list[$message_id]) : '',
-				));
-			}
-			unset($folder_info['rowset']);
-
-			phpbb::$template->assign_vars(array(
-				'S_SHOW_RECIPIENTS'		=> ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? true : false,
-				'S_SHOW_COLOUR_LEGEND'	=> true,
-
-				'S_PM_ICONS'			=> (phpbb::$config['enable_pm_icons']) ? true : false,
-			));
-		}
-	}
-	else
-	{
-		$export_type = request_var('export_option', '');
-		$enclosure = request_var('enclosure', '');
-		$delimiter = request_var('delimiter', '');
-
-		if ($export_type == 'CSV' && ($delimiter === '' || $enclosure === ''))
-		{
-			phpbb::$template->assign_var('PROMPT', true);
-		}
-		else
-		{
-			// Build Recipient List if in outbox/sentbox
-			$address = array();
-			if ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX)
-			{
-				foreach ($folder_info['rowset'] as $message_id => $row)
-				{
-					$address[$message_id] = rebuild_header(array('to' => $row['to_address'], 'bcc' => $row['bcc_address']));
-				}
-			}
-
-			foreach ($folder_info['pm_list'] as $message_id)
-			{
-				$row = &$folder_info['rowset'][$message_id];
-
-				include_once(PHPBB_ROOT_PATH . 'includes/functions_posting.' . PHP_EXT);
-
-				$sql = 'SELECT p.message_text, p.bbcode_uid
-					FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p, ' . USERS_TABLE . ' u
-					WHERE t.user_id = ' . phpbb::$user->data['user_id'] . "
-						AND p.author_id = u.user_id
-						AND t.folder_id = $folder_id
-						AND t.msg_id = p.msg_id
-						AND p.msg_id = $message_id";
-				$result = phpbb::$db->sql_query_limit($sql, 1);
-				$message_row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				$_types = array('u', 'g');
-				foreach ($_types as $ug_type)
-				{
-					if (isset($address[$message_id][$ug_type]) && sizeof($address[$message_id][$ug_type]))
-					{
-						if ($ug_type == 'u')
-						{
-							$sql = 'SELECT user_id as id, username as name
-								FROM ' . USERS_TABLE . '
-								WHERE ';
-						}
-						else
-						{
-							$sql = 'SELECT group_id as id, group_name as name
-								FROM ' . GROUPS_TABLE . '
-								WHERE ';
-						}
-						$sql .= phpbb::$db->sql_in_set(($ug_type == 'u') ? 'user_id' : 'group_id', array_map('intval', array_keys($address[$message_id][$ug_type])));
-
-						$result = phpbb::$db->sql_query($sql);
-
-						while ($info_row = phpbb::$db->sql_fetchrow($result))
-						{
-							$address[$message_id][$ug_type][$address[$message_id][$ug_type][$info_row['id']]][] = $info_row['name'];
-							unset($address[$message_id][$ug_type][$info_row['id']]);
-						}
-						phpbb::$db->sql_freeresult($result);
-					}
-				}
-
-				decode_message($message_row['message_text'], $message_row['bbcode_uid']);
-
-				$data[] = array(
-					'subject'	=> censor_text($row['message_subject']),
-					'sender'	=> $row['username'],
-					'date'		=> phpbb::$user->format_date($row['message_time'], 'c', true), // ISO 8601 date.
-					'to'		=> ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? $address[$message_id] : '',
-					'message'	=> $message_row['message_text']
-				);
-			}
-
-			switch ($export_type)
-			{
-				case 'CSV':
-				case 'CSV_EXCEL':
-					$mimetype = 'text/csv';
-					$filetype = 'csv';
-
-					if ($export_type == 'CSV_EXCEL')
-					{
-						$enclosure = '"';
-						$delimiter = ',';
-						$newline = "\r\n";
-					}
-					else
-					{
-						$newline = "\n";
-					}
-
-					$string = '';
-					foreach ($data as $value)
-					{
-						$recipients = $value['to'];
-						$value['to'] = $value['bcc'] = '';
-
-						if (is_array($recipients))
-						{
-							foreach ($recipients as $values)
-							{
-								$value['bcc'] .= (isset($values['bcc']) && is_array($values['bcc'])) ? ',' . implode(',', $values['bcc']) : '';
-								$value['to'] .= (isset($values['to']) && is_array($values['to'])) ? ',' . implode(',', $values['to']) : '';
-							}
-
-							// Remove the commas which will appear before the first entry.
-							$value['to'] = substr($value['to'], 1);
-							$value['bcc'] = substr($value['bcc'], 1);
-						}
-
-						foreach ($value as $tag => $text)
-						{
-							$cell = str_replace($enclosure, $enclosure . $enclosure, $text);
-
-							if (strpos($cell, $enclosure) !== false || strpos($cell, $delimiter) !== false || strpos($cell, $newline) !== false)
-							{
-								$string .= $enclosure . $text . $enclosure . $delimiter;
-							}
-							else
-							{
-								$string .= $cell . $delimiter;
-							}
-						}
-						$string = substr($string, 0, -1) . $newline;
-					}
-				break;
-
-				case 'XML':
-					$mimetype = 'application/xml';
-					$filetype = 'xml';
-					$string = '<?xml version="1.0"?>' . "\n";
-					$string .= "<phpbb>\n";
-
-					foreach ($data as $value)
-					{
-						$string .= "\t<privmsg>\n";
-
-						if (is_array($value['to']))
-						{
-							foreach ($value['to'] as $key => $values)
-							{
-								foreach ($values as $type => $types)
-								{
-									foreach ($types as $name)
-									{
-										$string .= "\t\t<recipient type=\"$type\" status=\"$key\">$name</recipient>\n";
-									}
-								}
-							}
-						}
-
-						unset($value['to']);
-
-						foreach ($value as $tag => $text)
-						{
-							$string .= "\t\t<$tag>$text</$tag>\n";
-						}
-
-						$string .= "\t</privmsg>\n";
-					}
-					$string .= '</phpbb>';
-				break;
-			}
-
-			header('Pragma: no-cache');
-			header("Content-Type: $mimetype; name=\"data.$filetype\"");
-			header("Content-disposition: attachment; filename=data.$filetype");
-			echo $string;
-			exit;
-		}
-	}
-}
-
-/**
-* Get Messages from folder/user
-*/
-function get_pm_from($folder_id, $folder, $user_id)
-{
-	$start = request_var('start', 0);
-
-	// Additional vars later, pm ordering is mostly different from post ordering. :/
-	$sort_days	= request_var('st', 0);
-	$sort_key	= request_var('sk', 't');
-	$sort_dir	= request_var('sd', 'd');
-
-	// PM ordering options
-	$limit_days = array(0 => phpbb::$user->lang['ALL_MESSAGES'], 1 => phpbb::$user->lang['1_DAY'], 7 => phpbb::$user->lang['7_DAYS'], 14 => phpbb::$user->lang['2_WEEKS'], 30 => phpbb::$user->lang['1_MONTH'], 90 => phpbb::$user->lang['3_MONTHS'], 180 => phpbb::$user->lang['6_MONTHS'], 365 => phpbb::$user->lang['1_YEAR']);
-
-	// No sort by Author for sentbox/outbox (already only author available)
-	// Also, sort by msg_id for the time - private messages are not as prone to errors as posts are.
-	if ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX)
-	{
-		$sort_by_text = array('t' => phpbb::$user->lang['POST_TIME'], 's' => phpbb::$user->lang['SUBJECT']);
-		$sort_by_sql = array('t' => 'p.msg_id', 's' => 'p.message_subject');
-	}
-	else
-	{
-		$sort_by_text = array('a' => phpbb::$user->lang['AUTHOR'], 't' => phpbb::$user->lang['POST_TIME'], 's' => phpbb::$user->lang['SUBJECT']);
-		$sort_by_sql = array('a' => 'u.username_clean', 't' => 'p.msg_id', 's' => 'p.message_subject');
-	}
-
-	$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
-	gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
-
-	$folder_sql = 't.folder_id = ' . (int) $folder_id;
-
-	// Limit pms to certain time frame, obtain correct pm count
-	if ($sort_days)
-	{
-		$min_post_time = time() - ($sort_days * 86400);
-
-		if (phpbb_request::is_set_post('sort'))
-		{
-			$start = 0;
-		}
-
-		$sql = 'SELECT COUNT(t.msg_id) AS pm_count
-			FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . " p
-			WHERE $folder_sql
-				AND t.user_id = $user_id
-				AND t.msg_id = p.msg_id
-				AND p.message_time >= $min_post_time";
-		$result = phpbb::$db->sql_query_limit($sql, 1);
-		$pm_count = (int) phpbb::$db->sql_fetchfield('pm_count');
-		phpbb::$db->sql_freeresult($result);
-
-		$sql_limit_time = "AND p.message_time >= $min_post_time";
-	}
-	else
-	{
-		$pm_count = (!empty($folder[$folder_id]['num_messages'])) ? $folder[$folder_id]['num_messages'] : 0;
-		$sql_limit_time = '';
-	}
-
-	phpbb::$template->assign_vars(array(
-		'PAGINATION'		=> generate_pagination(append_sid('ucp', "i=pm&amp;mode=view&amp;action=view_folder&amp;f=$folder_id&amp;$u_sort_param"), $pm_count, phpbb::$config['topics_per_page'], $start),
-		'PAGE_NUMBER'		=> on_page($pm_count, phpbb::$config['topics_per_page'], $start),
-		'TOTAL_MESSAGES'	=> (($pm_count == 1) ? phpbb::$user->lang['VIEW_PM_MESSAGE'] : sprintf(phpbb::$user->lang['VIEW_PM_MESSAGES'], $pm_count)),
-
-		'POST_IMG'		=> (!phpbb::$acl->acl_get('u_sendpm')) ? phpbb::$user->img('button_topic_locked', 'POST_PM_LOCKED') : phpbb::$user->img('button_pm_new', 'POST_NEW_PM'),
-
-		'L_NO_MESSAGES'	=> (!phpbb::$acl->acl_get('u_sendpm')) ? phpbb::$user->lang['POST_PM_LOCKED'] : phpbb::$user->lang['NO_MESSAGES'],
-
-		'S_SELECT_SORT_DIR'		=> $s_sort_dir,
-		'S_SELECT_SORT_KEY'		=> $s_sort_key,
-		'S_SELECT_SORT_DAYS'	=> $s_limit_days,
-		'S_TOPIC_ICONS'			=> (phpbb::$config['enable_pm_icons']) ? true : false,
-
-		'U_POST_NEW_TOPIC'	=> (phpbb::$acl->acl_get('u_sendpm')) ? append_sid('ucp', 'i=pm&amp;mode=compose') : '',
-		'S_PM_ACTION'		=> append_sid('ucp', "i=pm&amp;mode=view&amp;action=view_folder&amp;f=$folder_id" . (($start !== 0) ? "&amp;start=$start" : '')),
-	));
-
-	// Grab all pm data
-	$rowset = $pm_list = array();
-
-	// If the user is trying to reach late pages, start searching from the end
-	$store_reverse = false;
-	$sql_limit = phpbb::$config['topics_per_page'];
-	if ($start > $pm_count / 2)
-	{
-		$store_reverse = true;
-
-		if ($start + phpbb::$config['topics_per_page'] > $pm_count)
-		{
-			$sql_limit = min(phpbb::$config['topics_per_page'], max(1, $pm_count - $start));
-		}
-
-		// Select the sort order
-		$sql_sort_order = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'ASC' : 'DESC');
-		$sql_start = max(0, $pm_count - $sql_limit - $start);
-	}
-	else
-	{
-		// Select the sort order
-		$sql_sort_order = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
-		$sql_start = $start;
-	}
-
-	$sql = 'SELECT t.*, p.root_level, p.message_time, p.message_subject, p.icon_id, p.to_address, p.message_attachment, p.bcc_address, u.username, u.username_clean, u.user_colour
-		FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p, ' . USERS_TABLE . " u
-		WHERE t.user_id = $user_id
-			AND p.author_id = u.user_id
-			AND $folder_sql
-			AND t.msg_id = p.msg_id
-			$sql_limit_time
-		ORDER BY $sql_sort_order";
-	$result = phpbb::$db->sql_query_limit($sql, $sql_limit, $sql_start);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$rowset[$row['msg_id']] = $row;
-		$pm_list[] = $row['msg_id'];
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	$pm_list = ($store_reverse) ? array_reverse($pm_list) : $pm_list;
-
-	return array(
-		'pm_count'	=> $pm_count,
-		'pm_list'	=> $pm_list,
-		'rowset'	=> $rowset
-	);
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/ucp_pm_viewmessage.php b/phpBB/modules/ucp/ucp_pm_viewmessage.php
deleted file mode 100644
index 02fdf2dd11..0000000000
--- a/phpBB/modules/ucp/ucp_pm_viewmessage.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-/**
-*
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* View private message
-*/
-function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
-{
-	global $user, $template, $auth, $db;
-
-	phpbb::$user->add_lang(array('viewtopic', 'memberlist'));
-
-	$msg_id		= (int) $msg_id;
-	$folder_id	= (int) $folder_id;
-	$author_id	= (int) $message_row['author_id'];
-
-	// Not able to view message, it was deleted by the sender
-	if ($message_row['pm_deleted'])
-	{
-		$meta_info = append_sid('ucp', "i=pm&amp;folder=$folder_id");
-		$message = phpbb::$user->lang['NO_AUTH_READ_REMOVED_MESSAGE'];
-
-		$message .= '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_FOLDER'], '<a href="' . $meta_info . '">', '</a>');
-		trigger_error($message);
-	}
-
-	// Do not allow hold messages to be seen
-	if ($folder_id == PRIVMSGS_HOLD_BOX)
-	{
-		trigger_error('NO_AUTH_READ_HOLD_MESSAGE');
-	}
-
-	// Grab icons
-	$icons = phpbb_cache::obtain_icons();
-
-	$bbcode = false;
-
-	// Instantiate BBCode if need be
-	if ($message_row['bbcode_bitfield'])
-	{
-		include(PHPBB_ROOT_PATH . 'includes/bbcode.' . PHP_EXT);
-		$bbcode = new bbcode($message_row['bbcode_bitfield']);
-	}
-
-	// Assign TO/BCC Addresses to template
-	write_pm_addresses(array('to' => $message_row['to_address'], 'bcc' => $message_row['bcc_address']), $author_id);
-
-	$user_info = get_user_information($author_id, $message_row);
-
-	// Parse the message and subject
-	$message = censor_text($message_row['message_text']);
-
-	// Second parse bbcode here
-	if ($message_row['bbcode_bitfield'])
-	{
-		$bbcode->bbcode_second_pass($message, $message_row['bbcode_uid'], $message_row['bbcode_bitfield']);
-	}
-
-	// Always process smilies after parsing bbcodes
-	$message = bbcode_nl2br($message);
-	$message = smiley_text($message);
-
-	// Replace naughty words such as farty pants
-	$message_row['message_subject'] = censor_text($message_row['message_subject']);
-
-	// Editing information
-	if ($message_row['message_edit_count'] && phpbb::$config['display_last_edited'])
-	{
-		$l_edit_time_total = ($message_row['message_edit_count'] == 1) ? phpbb::$user->lang['EDITED_TIME_TOTAL'] : phpbb::$user->lang['EDITED_TIMES_TOTAL'];
-		$l_edited_by = '<br /><br />' . sprintf($l_edit_time_total, (!$message_row['message_edit_user']) ? $message_row['username'] : $message_row['message_edit_user'], phpbb::$user->format_date($message_row['message_edit_time'], false, true), $message_row['message_edit_count']);
-	}
-	else
-	{
-		$l_edited_by = '';
-	}
-
-	// Pull attachment data
-	$display_notice = false;
-	$attachments = array();
-
-	if ($message_row['message_attachment'] && phpbb::$config['allow_pm_attach'])
-	{
-		if (phpbb::$acl->acl_get('u_pm_download'))
-		{
-			$sql = 'SELECT *
-				FROM ' . ATTACHMENTS_TABLE . "
-				WHERE post_msg_id = $msg_id
-					AND in_message = 1
-				ORDER BY filetime DESC, post_msg_id ASC";
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$attachments[] = $row;
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			// No attachments exist, but message table thinks they do so go ahead and reset attach flags
-			if (!sizeof($attachments))
-			{
-				$sql = 'UPDATE ' . PRIVMSGS_TABLE . "
-					SET message_attachment = 0
-					WHERE msg_id = $msg_id";
-				phpbb::$db->sql_query($sql);
-			}
-		}
-		else
-		{
-			$display_notice = true;
-		}
-	}
-
-	// Assign inline attachments
-	if (!empty($attachments))
-	{
-		$update_count = array();
-		parse_attachments(false, $message, $attachments, $update_count);
-
-		// Update the attachment download counts
-		if (sizeof($update_count))
-		{
-			$sql = 'UPDATE ' . ATTACHMENTS_TABLE . '
-				SET download_count = download_count + 1
-				WHERE ' . phpbb::$db->sql_in_set('attach_id', array_unique($update_count));
-			phpbb::$db->sql_query($sql);
-		}
-	}
-
-	$user_info['sig'] = '';
-
-	$signature = ($message_row['enable_sig'] && phpbb::$config['allow_sig'] && phpbb::$acl->acl_get('u_sig') && phpbb::$user->optionget('viewsigs')) ? $user_info['user_sig'] : '';
-
-	// End signature parsing, only if needed
-	if ($signature)
-	{
-		$signature = censor_text($signature);
-
-		if ($user_info['user_sig_bbcode_bitfield'])
-		{
-			if ($bbcode === false)
-			{
-				include(PHPBB_ROOT_PATH . 'includes/bbcode.' . PHP_EXT);
-				$bbcode = new bbcode($user_info['user_sig_bbcode_bitfield']);
-			}
-
-			$bbcode->bbcode_second_pass($signature, $user_info['user_sig_bbcode_uid'], $user_info['user_sig_bbcode_bitfield']);
-		}
-
-		$signature = bbcode_nl2br($signature);
-		$signature = smiley_text($signature);
-	}
-
-	$url = append_sid('ucp', 'i=pm');
-
-	phpbb::$template->assign_vars(array(
-		'MESSAGE_AUTHOR_FULL'		=> get_username_string('full', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']),
-		'MESSAGE_AUTHOR_COLOUR'		=> get_username_string('colour', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']),
-		'MESSAGE_AUTHOR'			=> get_username_string('username', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']),
-		'U_MESSAGE_AUTHOR'			=> get_username_string('profile', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']),
-
-		'RANK_TITLE'		=> $user_info['rank_title'],
-		'RANK_IMG'			=> $user_info['rank_image'],
-		'AUTHOR_AVATAR'		=> (isset($user_info['avatar'])) ? $user_info['avatar'] : '',
-		'AUTHOR_JOINED'		=> phpbb::$user->format_date($user_info['user_regdate']),
-		'AUTHOR_POSTS'		=> (!empty($user_info['user_posts'])) ? $user_info['user_posts'] : '',
-		'AUTHOR_FROM'		=> (!empty($user_info['user_from'])) ? $user_info['user_from'] : '',
-
-		'ONLINE_IMG'		=> (!phpbb::$config['load_onlinetrack']) ? '' : ((isset($user_info['online']) && $user_info['online']) ? phpbb::$user->img('icon_user_online', 'ONLINE') : phpbb::$user->img('icon_user_offline', 'OFFLINE')),
-		'S_ONLINE'			=> (!phpbb::$config['load_onlinetrack']) ? false : ((isset($user_info['online']) && $user_info['online']) ? true : false),
-		'DELETE_IMG'		=> phpbb::$user->img('icon_post_delete', 'DELETE_MESSAGE'),
-		'INFO_IMG'			=> phpbb::$user->img('icon_post_info', 'VIEW_PM_INFO'),
-		'PROFILE_IMG'		=> phpbb::$user->img('icon_user_profile', 'READ_PROFILE'),
-		'EMAIL_IMG'			=> phpbb::$user->img('icon_contact_email', 'SEND_EMAIL'),
-		'QUOTE_IMG'			=> phpbb::$user->img('icon_post_quote', 'POST_QUOTE_PM'),
-		'REPLY_IMG'			=> phpbb::$user->img('button_pm_reply', 'POST_REPLY_PM'),
-		'EDIT_IMG'			=> phpbb::$user->img('icon_post_edit', 'POST_EDIT_PM'),
-		'MINI_POST_IMG'		=> phpbb::$user->img('icon_post_target', 'PM'),
-
-		'SENT_DATE'			=> phpbb::$user->format_date($message_row['message_time']),
-		'SUBJECT'			=> $message_row['message_subject'],
-		'MESSAGE'			=> $message,
-		'SIGNATURE'			=> ($message_row['enable_sig']) ? $signature : '',
-		'EDITED_MESSAGE'	=> $l_edited_by,
-		'MESSAGE_ID'		=> $message_row['msg_id'],
-
-		'U_PM'			=> (phpbb::$config['allow_privmsg'] && phpbb::$acl->acl_get('u_sendpm') && ($user_info['user_allow_pm'] || phpbb::$acl->acl_gets('a_', 'm_') || phpbb::$acl->acl_getf_global('m_'))) ? append_sid('ucp', 'i=pm&amp;mode=compose&amp;u=' . $author_id) : '',
-		'U_WWW'			=> (!empty($user_info['user_website'])) ? $user_info['user_website'] : '',
-		'U_ICQ'			=> ($user_info['user_icq']) ? 'http://www.icq.com/people/webmsg.php?to=' . urlencode($user_info['user_icq']) : '',
-		'U_AIM'			=> ($user_info['user_aim'] && phpbb::$acl->acl_get('u_sendim')) ? append_sid('memberlist', 'mode=contact&amp;action=aim&amp;u=' . $author_id) : '',
-		'U_YIM'			=> ($user_info['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($user_info['user_yim']) . '&amp;.src=pg' : '',
-		'U_MSN'			=> ($user_info['user_msnm'] && phpbb::$acl->acl_get('u_sendim')) ? append_sid('memberlist', 'mode=contact&amp;action=msnm&amp;u=' . $author_id) : '',
-		'U_JABBER'		=> ($user_info['user_jabber'] && phpbb::$acl->acl_get('u_sendim')) ? append_sid('memberlist', 'mode=contact&amp;action=jabber&amp;u=' . $author_id) : '',
-
-		'U_DELETE'			=> (phpbb::$acl->acl_get('u_pm_delete')) ? "$url&amp;mode=compose&amp;action=delete&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] : '',
-		'U_EMAIL'			=> $user_info['email'],
-		'U_QUOTE'			=> (phpbb::$acl->acl_get('u_sendpm') && $author_id != ANONYMOUS) ? "$url&amp;mode=compose&amp;action=quote&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] : '',
-		'U_EDIT'			=> (($message_row['message_time'] > time() - (phpbb::$config['pm_edit_time'] * 60) || !phpbb::$config['pm_edit_time']) && $folder_id == PRIVMSGS_OUTBOX && phpbb::$acl->acl_get('u_pm_edit')) ? "$url&amp;mode=compose&amp;action=edit&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] : '',
-		'U_POST_REPLY_PM'	=> (phpbb::$acl->acl_get('u_sendpm') && $author_id != ANONYMOUS) ? "$url&amp;mode=compose&amp;action=reply&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] : '',
-		'U_PREVIOUS_PM'		=> "$url&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] . "&amp;view=previous",
-		'U_NEXT_PM'			=> "$url&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] . "&amp;view=next",
-
-		'S_HAS_ATTACHMENTS'	=> (sizeof($attachments)) ? true : false,
-		'S_DISPLAY_NOTICE'	=> $display_notice && $message_row['message_attachment'],
-		'S_AUTHOR_DELETED'	=> ($author_id == ANONYMOUS) ? true : false,
-		'S_SPECIAL_FOLDER'	=> in_array($folder_id, array(PRIVMSGS_NO_BOX, PRIVMSGS_OUTBOX)),
-
-		'U_PRINT_PM'		=> (phpbb::$config['print_pm'] && phpbb::$acl->acl_get('u_pm_printpm')) ? "$url&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] . "&amp;view=print" : '',
-		'U_FORWARD_PM'		=> (phpbb::$config['forward_pm'] && phpbb::$acl->acl_get('u_sendpm') && phpbb::$acl->acl_get('u_pm_forward')) ? "$url&amp;mode=compose&amp;action=forward&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] : '',
-	));
-
-	// Display not already displayed Attachments for this post, we already parsed them. ;)
-	if (isset($attachments) && sizeof($attachments))
-	{
-		foreach ($attachments as $attachment)
-		{
-			phpbb::$template->assign_block_vars('attachment', array(
-				'DISPLAY_ATTACHMENT'	=> $attachment,
-			));
-		}
-	}
-
-	if (request_var('view', '') != 'print')
-	{
-		// Message History
-		if (message_history($msg_id, phpbb::$user->data['user_id'], $message_row, $folder))
-		{
-			phpbb::$template->assign_var('S_DISPLAY_HISTORY', true);
-		}
-	}
-}
-
-/**
-* Get user information (only for message display)
-*/
-function get_user_information($user_id, $user_row)
-{
-	global $db, $auth, $user;
-
-	if (!$user_id)
-	{
-		return array();
-	}
-
-	if (empty($user_row))
-	{
-		$sql = 'SELECT *
-			FROM ' . USERS_TABLE . '
-			WHERE user_id = ' . (int) $user_id;
-		$result = phpbb::$db->sql_query($sql);
-		$user_row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	// Some standard values
-	$user_row['online'] = false;
-	$user_row['rank_title'] = $user_row['rank_image'] = $user_row['rank_image_src'] = $user_row['email'] = '';
-
-	// Generate online information for user
-	if (phpbb::$config['load_onlinetrack'])
-	{
-		$sql = 'SELECT session_user_id, MAX(session_time) as online_time, MIN(session_viewonline) AS viewonline
-			FROM ' . SESSIONS_TABLE . "
-			WHERE session_user_id = $user_id
-			GROUP BY session_user_id";
-		$result = phpbb::$db->sql_query_limit($sql, 1);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		$update_time = phpbb::$config['load_online_time'] * 60;
-		if ($row)
-		{
-			$user_row['online'] = (time() - $update_time < $row['online_time'] && ($row['viewonline'])) ? true : false;
-		}
-	}
-
-	if (!function_exists('get_user_avatar'))
-	{
-		include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-	}
-
-	$user_row['avatar'] = (phpbb::$user->optionget('viewavatars')) ? get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']) : '';
-
-	get_user_rank($user_id, $user_row['user_rank'], $user_row['user_posts'], $user_row['rank_title'], $user_row['rank_image'], $user_row['rank_image_src']);
-
-	if (!empty($user_row['user_allow_viewemail']) || phpbb::$acl->acl_get('a_email'))
-	{
-		$user_row['email'] = (phpbb::$config['board_email_form'] && phpbb::$config['email_enable']) ? append_sid('memberlist', "mode=email&amp;u=$user_id") : (((phpbb::$config['board_hide_emails'] && !phpbb::$acl->acl_get('a_email')) || empty($user_row['user_email'])) ? '' : 'mailto:' . $user_row['user_email']);
-	}
-
-	return $user_row;
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/ucp_prefs.php b/phpBB/modules/ucp/ucp_prefs.php
deleted file mode 100644
index 966f8bb8a8..0000000000
--- a/phpBB/modules/ucp/ucp_prefs.php
+++ /dev/null
@@ -1,355 +0,0 @@
-<?php
-/**
-*
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* ucp_prefs
-* Changing user preferences
-* @package ucp
-*/
-class ucp_prefs
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		$submit = phpbb_request::is_set_post('submit');
-		$error = $data = array();
-		$s_hidden_fields = '';
-
-		switch ($mode)
-		{
-			case 'personal':
-				add_form_key('ucp_prefs_personal');
-				$data = array(
-					'notifymethod'	=> request_var('notifymethod', phpbb::$user->data['user_notify_type']),
-					'dateformat'	=> request_var('dateformat', phpbb::$user->data['user_dateformat'], true),
-					'lang'			=> basename(request_var('lang', phpbb::$user->data['user_lang'])),
-					'style'			=> request_var('style', (int) phpbb::$user->data['user_style']),
-					'tz'			=> request_var('tz', (float) phpbb::$user->data['user_timezone']),
-
-					'dst'			=> request_var('dst', (bool) phpbb::$user->data['user_dst']),
-					'viewemail'		=> request_var('viewemail', (bool) phpbb::$user->data['user_allow_viewemail']),
-					'massemail'		=> request_var('massemail', (bool) phpbb::$user->data['user_allow_massemail']),
-					'hideonline'	=> request_var('hideonline', (bool) !phpbb::$user->data['user_allow_viewonline']),
-					'notifypm'		=> request_var('notifypm', (bool) phpbb::$user->data['user_notify_pm']),
-					'popuppm'		=> request_var('popuppm', (bool) phpbb::$user->optionget('popuppm')),
-					'allowpm'		=> request_var('allowpm', (bool) phpbb::$user->data['user_allow_pm']),
-				);
-
-				if ($data['notifymethod'] == NOTIFY_IM && (!phpbb::$config['jab_enable'] || !phpbb::$user->data['user_jabber'] || !@extension_loaded('xml')))
-				{
-					// Jabber isnt enabled, or no jabber field filled in. Update the users table to be sure its correct.
-					$data['notifymethod'] = NOTIFY_BOTH;
-				}
-
-				if ($submit)
-				{
-					$data['style'] = (phpbb::$config['override_user_style']) ? phpbb::$config['default_style'] : $data['style'];
-
-					$error = validate_data($data, array(
-						'dateformat'	=> array('string', false, 1, 30),
-						'lang'			=> array('match', false, '#^[a-z0-9_\-]{2,}$#i'),
-						'tz'			=> array('num', false, -14, 14),
-					));
-
-					if (!check_form_key('ucp_prefs_personal'))
-					{
-						$error[] = 'FORM_INVALID';
-					}
-
-					if (!sizeof($error))
-					{
-						phpbb::$user->optionset('popuppm', $data['popuppm']);
-
-						$sql_ary = array(
-							'user_allow_pm'			=> $data['allowpm'],
-							'user_allow_viewemail'	=> $data['viewemail'],
-							'user_allow_massemail'	=> $data['massemail'],
-							'user_allow_viewonline'	=> (phpbb::$acl->acl_get('u_hideonline')) ? !$data['hideonline'] : phpbb::$user->data['user_allow_viewonline'],
-							'user_notify_type'		=> $data['notifymethod'],
-							'user_notify_pm'		=> $data['notifypm'],
-							'user_options'			=> phpbb::$user->data['user_options'],
-
-							'user_dst'				=> $data['dst'],
-							'user_dateformat'		=> $data['dateformat'],
-							'user_lang'				=> $data['lang'],
-							'user_timezone'			=> $data['tz'],
-							'user_style'			=> $data['style'],
-						);
-
-						$sql = 'UPDATE ' . USERS_TABLE . '
-							SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-							WHERE user_id = ' . phpbb::$user->data['user_id'];
-						phpbb::$db->sql_query($sql);
-
-						meta_refresh(3, $this->u_action);
-						$message = phpbb::$user->lang['PREFERENCES_UPDATED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
-						trigger_error($message);
-					}
-
-					// Replace "error" strings with their real, localised form
-					$error = preg_replace('#^([A-Z_]+)$#e', "phpbb::\$user->lang('\\1')", $error);
-				}
-
-				$dateformat_options = '';
-
-				foreach (phpbb::$user->lang['dateformats'] as $format => $null)
-				{
-					$dateformat_options .= '<option value="' . $format . '"' . (($format == $data['dateformat']) ? ' selected="selected"' : '') . '>';
-					$dateformat_options .= phpbb::$user->format_date(time(), $format, false) . ((strpos($format, '|') !== false) ? phpbb::$user->lang['VARIANT_DATE_SEPARATOR'] . phpbb::$user->format_date(time(), $format, true) : '');
-					$dateformat_options .= '</option>';
-				}
-
-				$s_custom = false;
-
-				$dateformat_options .= '<option value="custom"';
-				if (!isset(phpbb::$user->lang['dateformats'][$data['dateformat']]))
-				{
-					$dateformat_options .= ' selected="selected"';
-					$s_custom = true;
-				}
-				$dateformat_options .= '>' . phpbb::$user->lang['CUSTOM_DATEFORMAT'] . '</option>';
-
-				phpbb::$template->assign_vars(array(
-					'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
-
-					'S_NOTIFY_EMAIL'	=> ($data['notifymethod'] == NOTIFY_EMAIL) ? true : false,
-					'S_NOTIFY_IM'		=> ($data['notifymethod'] == NOTIFY_IM) ? true : false,
-					'S_NOTIFY_BOTH'		=> ($data['notifymethod'] == NOTIFY_BOTH) ? true : false,
-					'S_VIEW_EMAIL'		=> $data['viewemail'],
-					'S_MASS_EMAIL'		=> $data['massemail'],
-					'S_ALLOW_PM'		=> $data['allowpm'],
-					'S_HIDE_ONLINE'		=> $data['hideonline'],
-					'S_NOTIFY_PM'		=> $data['notifypm'],
-					'S_POPUP_PM'		=> $data['popuppm'],
-					'S_DST'				=> $data['dst'],
-
-					'DATE_FORMAT'			=> $data['dateformat'],
-					'A_DATE_FORMAT'			=> addslashes($data['dateformat']),
-					'S_DATEFORMAT_OPTIONS'	=> $dateformat_options,
-					'S_CUSTOM_DATEFORMAT'	=> $s_custom,
-					'DEFAULT_DATEFORMAT'	=> phpbb::$config['default_dateformat'],
-					'A_DEFAULT_DATEFORMAT'	=> addslashes(phpbb::$config['default_dateformat']),
-
-					'S_LANG_OPTIONS'		=> language_select($data['lang']),
-					'S_STYLE_OPTIONS'		=> (phpbb::$config['override_user_style']) ? '' : style_select($data['style']),
-					'S_TZ_OPTIONS'			=> tz_select($data['tz'], true),
-					'S_CAN_HIDE_ONLINE'		=> (phpbb::$acl->acl_get('u_hideonline')) ? true : false,
-					'S_SELECT_NOTIFY'		=> (phpbb::$config['jab_enable'] && phpbb::$user->data['user_jabber'] && @extension_loaded('xml')) ? true : false,
-				));
-
-			break;
-
-			case 'view':
-
-				add_form_key('ucp_prefs_view');
-
-				$data = array(
-					'topic_sk'		=> request_var('topic_sk', (!empty(phpbb::$user->data['user_topic_sortby_type'])) ? phpbb::$user->data['user_topic_sortby_type'] : 't'),
-					'topic_sd'		=> request_var('topic_sd', (!empty(phpbb::$user->data['user_topic_sortby_dir'])) ? phpbb::$user->data['user_topic_sortby_dir'] : 'd'),
-					'topic_st'		=> request_var('topic_st', (!empty(phpbb::$user->data['user_topic_show_days'])) ? phpbb::$user->data['user_topic_show_days'] : 0),
-
-					'post_sk'		=> request_var('post_sk', (!empty(phpbb::$user->data['user_post_sortby_type'])) ? phpbb::$user->data['user_post_sortby_type'] : 't'),
-					'post_sd'		=> request_var('post_sd', (!empty(phpbb::$user->data['user_post_sortby_dir'])) ? phpbb::$user->data['user_post_sortby_dir'] : 'a'),
-					'post_st'		=> request_var('post_st', (!empty(phpbb::$user->data['user_post_show_days'])) ? phpbb::$user->data['user_post_show_days'] : 0),
-
-					'images'		=> request_var('images', (bool) phpbb::$user->optionget('viewimg')),
-					'flash'			=> request_var('flash', (bool) phpbb::$user->optionget('viewflash')),
-					'smilies'		=> request_var('smilies', (bool) phpbb::$user->optionget('viewsmilies')),
-					'sigs'			=> request_var('sigs', (bool) phpbb::$user->optionget('viewsigs')),
-					'avatars'		=> request_var('avatars', (bool) phpbb::$user->optionget('viewavatars')),
-					'wordcensor'	=> request_var('wordcensor', (bool) phpbb::$user->optionget('viewcensors')),
-				);
-
-				if ($submit)
-				{
-					$error = validate_data($data, array(
-						'topic_sk'	=> array('string', false, 1, 1),
-						'topic_sd'	=> array('string', false, 1, 1),
-						'post_sk'	=> array('string', false, 1, 1),
-						'post_sd'	=> array('string', false, 1, 1),
-					));
-
-					if (!check_form_key('ucp_prefs_view'))
-					{
-						$error[] = 'FORM_INVALID';
-					}
-
-					if (!sizeof($error))
-					{
-						phpbb::$user->optionset('viewimg', $data['images']);
-						phpbb::$user->optionset('viewflash', $data['flash']);
-						phpbb::$user->optionset('viewsmilies', $data['smilies']);
-						phpbb::$user->optionset('viewsigs', $data['sigs']);
-						phpbb::$user->optionset('viewavatars', $data['avatars']);
-
-						if (phpbb::$acl->acl_get('u_chgcensors'))
-						{
-							phpbb::$user->optionset('viewcensors', $data['wordcensor']);
-						}
-
-						$sql_ary = array(
-							'user_options'				=> phpbb::$user->data['user_options'],
-							'user_topic_sortby_type'	=> $data['topic_sk'],
-							'user_post_sortby_type'		=> $data['post_sk'],
-							'user_topic_sortby_dir'		=> $data['topic_sd'],
-							'user_post_sortby_dir'		=> $data['post_sd'],
-
-							'user_topic_show_days'	=> $data['topic_st'],
-							'user_post_show_days'	=> $data['post_st'],
-						);
-
-						$sql = 'UPDATE ' . USERS_TABLE . '
-							SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-							WHERE user_id = ' . phpbb::$user->data['user_id'];
-						phpbb::$db->sql_query($sql);
-
-						meta_refresh(3, $this->u_action);
-						$message = phpbb::$user->lang['PREFERENCES_UPDATED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
-						trigger_error($message);
-					}
-
-					// Replace "error" strings with their real, localised form
-					$error = preg_replace('#^([A-Z_]+)$#e', "phpbb::\$user->lang('\\1')", $error);
-				}
-
-				$sort_dir_text = array('a' => phpbb::$user->lang['ASCENDING'], 'd' => phpbb::$user->lang['DESCENDING']);
-
-				// Topic ordering options
-				$limit_topic_days = array(0 => phpbb::$user->lang['ALL_TOPICS'], 1 => phpbb::$user->lang['1_DAY'], 7 => phpbb::$user->lang['7_DAYS'], 14 => phpbb::$user->lang['2_WEEKS'], 30 => phpbb::$user->lang['1_MONTH'], 90 => phpbb::$user->lang['3_MONTHS'], 180 => phpbb::$user->lang['6_MONTHS'], 365 => phpbb::$user->lang['1_YEAR']);
-
-				$sort_by_topic_text = array('a' => phpbb::$user->lang['AUTHOR'], 't' => phpbb::$user->lang['POST_TIME'], 'r' => phpbb::$user->lang['REPLIES'], 's' => phpbb::$user->lang['SUBJECT'], 'v' => phpbb::$user->lang['VIEWS']);
-				$sort_by_topic_sql = array('a' => 't.topic_first_poster_name', 't' => 't.topic_last_post_time', 'r' => 't.topic_replies', 's' => 't.topic_title', 'v' => 't.topic_views');
-
-				// Post ordering options
-				$limit_post_days = array(0 => phpbb::$user->lang['ALL_POSTS'], 1 => phpbb::$user->lang['1_DAY'], 7 => phpbb::$user->lang['7_DAYS'], 14 => phpbb::$user->lang['2_WEEKS'], 30 => phpbb::$user->lang['1_MONTH'], 90 => phpbb::$user->lang['3_MONTHS'], 180 => phpbb::$user->lang['6_MONTHS'], 365 => phpbb::$user->lang['1_YEAR']);
-
-				$sort_by_post_text = array('a' => phpbb::$user->lang['AUTHOR'], 't' => phpbb::$user->lang['POST_TIME'], 's' => phpbb::$user->lang['SUBJECT']);
-				$sort_by_post_sql = array('a' => 'u.username_clean', 't' => 'p.post_id', 's' => 'p.post_subject');
-
-				$_options = array('topic', 'post');
-				foreach ($_options as $sort_option)
-				{
-					${'s_limit_' . $sort_option . '_days'} = '<select name="' . $sort_option . '_st">';
-					foreach (${'limit_' . $sort_option . '_days'} as $day => $text)
-					{
-						$selected = ($data[$sort_option . '_st'] == $day) ? ' selected="selected"' : '';
-						${'s_limit_' . $sort_option . '_days'} .= '<option value="' . $day . '"' . $selected . '>' . $text . '</option>';
-					}
-					${'s_limit_' . $sort_option . '_days'} .= '</select>';
-
-					${'s_sort_' . $sort_option . '_key'} = '<select name="' . $sort_option . '_sk">';
-					foreach (${'sort_by_' . $sort_option . '_text'} as $key => $text)
-					{
-						$selected = ($data[$sort_option . '_sk'] == $key) ? ' selected="selected"' : '';
-						${'s_sort_' . $sort_option . '_key'} .= '<option value="' . $key . '"' . $selected . '>' . $text . '</option>';
-					}
-					${'s_sort_' . $sort_option . '_key'} .= '</select>';
-
-					${'s_sort_' . $sort_option . '_dir'} = '<select name="' . $sort_option . '_sd">';
-					foreach ($sort_dir_text as $key => $value)
-					{
-						$selected = ($data[$sort_option . '_sd'] == $key) ? ' selected="selected"' : '';
-						${'s_sort_' . $sort_option . '_dir'} .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
-					}
-					${'s_sort_' . $sort_option . '_dir'} .= '</select>';
-				}
-
-				phpbb::$template->assign_vars(array(
-					'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
-
-					'S_IMAGES'			=> $data['images'],
-					'S_FLASH'			=> $data['flash'],
-					'S_SMILIES'			=> $data['smilies'],
-					'S_SIGS'			=> $data['sigs'],
-					'S_AVATARS'			=> $data['avatars'],
-					'S_DISABLE_CENSORS'	=> $data['wordcensor'],
-
-					'S_CHANGE_CENSORS'		=> (phpbb::$acl->acl_get('u_chgcensors')) ? true : false,
-
-					'S_TOPIC_SORT_DAYS'		=> $s_limit_topic_days,
-					'S_TOPIC_SORT_KEY'		=> $s_sort_topic_key,
-					'S_TOPIC_SORT_DIR'		=> $s_sort_topic_dir,
-					'S_POST_SORT_DAYS'		=> $s_limit_post_days,
-					'S_POST_SORT_KEY'		=> $s_sort_post_key,
-					'S_POST_SORT_DIR'		=> $s_sort_post_dir,
-				));
-
-			break;
-
-			case 'post':
-
-				$data = array(
-					'bbcode'	=> request_var('bbcode', phpbb::$user->optionget('bbcode')),
-					'smilies'	=> request_var('smilies', phpbb::$user->optionget('smilies')),
-					'sig'		=> request_var('sig', phpbb::$user->optionget('attachsig')),
-					'notify'	=> request_var('notify', (bool) phpbb::$user->data['user_notify']),
-				);
-				add_form_key('ucp_prefs_post');
-
-				if ($submit)
-				{
-					if (check_form_key('ucp_prefs_post'))
-					{
-						phpbb::$user->optionset('bbcode', $data['bbcode']);
-						phpbb::$user->optionset('smilies', $data['smilies']);
-						phpbb::$user->optionset('attachsig', $data['sig']);
-
-						$sql_ary = array(
-							'user_options'	=> phpbb::$user->data['user_options'],
-							'user_notify'	=> $data['notify'],
-						);
-
-						$sql = 'UPDATE ' . USERS_TABLE . '
-							SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-							WHERE user_id = ' . phpbb::$user->data['user_id'];
-						phpbb::$db->sql_query($sql);
-
-						$msg = phpbb::$user->lang['PREFERENCES_UPDATED'];
-					}
-					else
-					{
-						$msg = phpbb::$user->lang['FORM_INVALID'];
-					}
-					meta_refresh(3, $this->u_action);
-					$message = $msg . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
-					trigger_error($message);
-				}
-
-				phpbb::$template->assign_vars(array(
-					'S_BBCODE'	=> $data['bbcode'],
-					'S_SMILIES'	=> $data['smilies'],
-					'S_SIG'		=> $data['sig'],
-					'S_NOTIFY'	=> $data['notify'],
-				));
-			break;
-		}
-
-		phpbb::$template->assign_vars(array(
-			'L_TITLE'			=> phpbb::$user->lang['UCP_PREFS_' . strtoupper($mode)],
-
-			'S_HIDDEN_FIELDS'	=> $s_hidden_fields,
-			'S_UCP_ACTION'		=> $this->u_action,
-		));
-
-		$this->tpl_name = 'ucp_prefs_' . $mode;
-		$this->page_title = 'UCP_PREFS_' . strtoupper($mode);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/ucp_profile.php b/phpBB/modules/ucp/ucp_profile.php
deleted file mode 100644
index 7c2edb2a80..0000000000
--- a/phpBB/modules/ucp/ucp_profile.php
+++ /dev/null
@@ -1,645 +0,0 @@
-<?php
-/**
-*
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* ucp_profile
-* Changing profile settings
-*
-* @todo what about pertaining user_sig_options?
-* @package ucp
-*/
-class ucp_profile
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		phpbb::$user->add_lang('posting');
-
-		$preview	= phpbb_request::variable('preview', false, false, phpbb_request::POST);
-		$submit		= phpbb_request::variable('submit', false, false, phpbb_request::POST);
-		$delete		= phpbb_request::variable('delete', false, false, phpbb_request::POST);
-		$error = $data = array();
-		$s_hidden_fields = '';
-
-		switch ($mode)
-		{
-			case 'reg_details':
-
-				$data = array(
-					'username'			=> utf8_normalize_nfc(request_var('username', phpbb::$user->data['username'], true)),
-					'email'				=> strtolower(request_var('email', phpbb::$user->data['user_email'])),
-					'email_confirm'		=> strtolower(request_var('email_confirm', '')),
-					'new_password'		=> request_var('new_password', '', true),
-					'cur_password'		=> request_var('cur_password', '', true),
-					'password_confirm'	=> request_var('password_confirm', '', true),
-				);
-
-				add_form_key('ucp_reg_details');
-
-				if ($submit)
-				{
-					// Do not check cur_password, it is the old one.
-					$check_ary = array(
-						'new_password'		=> array(
-							array('string', true, phpbb::$config['min_pass_chars'], phpbb::$config['max_pass_chars']),
-							array('password')),
-						'password_confirm'	=> array('string', true, phpbb::$config['min_pass_chars'], phpbb::$config['max_pass_chars']),
-						'email'				=> array(
-							array('string', false, 6, 60),
-							array('email')),
-						'email_confirm'		=> array('string', true, 6, 60),
-					);
-
-					if (phpbb::$acl->acl_get('u_chgname') && phpbb::$config['allow_namechange'])
-					{
-						$check_ary['username'] = array(
-							array('string', false, phpbb::$config['min_name_chars'], phpbb::$config['max_name_chars']),
-							array('username'),
-						);
-					}
-
-					$error = validate_data($data, $check_ary);
-
-					if (phpbb::$acl->acl_get('u_chgpasswd') && $data['new_password'] && $data['password_confirm'] != $data['new_password'])
-					{
-						$error[] = 'NEW_PASSWORD_ERROR';
-					}
-
-					if (($data['new_password'] || (phpbb::$acl->acl_get('u_chgemail') && $data['email'] != phpbb::$user->data['user_email']) || ($data['username'] != phpbb::$user->data['username'] && phpbb::$acl->acl_get('u_chgname') && phpbb::$config['allow_namechange'])) && !phpbb_check_hash($data['cur_password'], phpbb::$user->data['user_password']))
-					{
-						$error[] = 'CUR_PASSWORD_ERROR';
-					}
-
-					// Only check the new password against the previous password if there have been no errors
-					if (!sizeof($error) && phpbb::$acl->acl_get('u_chgpasswd') && $data['new_password'] && phpbb_check_hash($data['new_password'], phpbb::$user->data['user_password']))
-					{
-						$error[] = 'SAME_PASSWORD_ERROR';
-					}
-
-					if (phpbb::$acl->acl_get('u_chgemail') && $data['email'] != phpbb::$user->data['user_email'] && $data['email_confirm'] != $data['email'])
-					{
-						$error[] = 'NEW_EMAIL_ERROR';
-					}
-
-					if (!check_form_key('ucp_reg_details'))
-					{
-						$error[] = 'FORM_INVALID';
-					}
-
-					if (!sizeof($error))
-					{
-						$sql_ary = array(
-							'username'			=> (phpbb::$acl->acl_get('u_chgname') && phpbb::$config['allow_namechange']) ? $data['username'] : phpbb::$user->data['username'],
-							'username_clean'	=> (phpbb::$acl->acl_get('u_chgname') && phpbb::$config['allow_namechange']) ? utf8_clean_string($data['username']) : phpbb::$user->data['username_clean'],
-							'user_email'		=> (phpbb::$acl->acl_get('u_chgemail')) ? $data['email'] : phpbb::$user->data['user_email'],
-							'user_email_hash'	=> (phpbb::$acl->acl_get('u_chgemail')) ? hexdec(crc32($data['email']) . strlen($data['email'])) : phpbb::$user->data['user_email_hash'],
-							'user_password'		=> (phpbb::$acl->acl_get('u_chgpasswd') && $data['new_password']) ? phpbb_hash($data['new_password']) : phpbb::$user->data['user_password'],
-							'user_passchg'		=> (phpbb::$acl->acl_get('u_chgpasswd') && $data['new_password']) ? time() : 0,
-						);
-
-						if (phpbb::$acl->acl_get('u_chgname') && phpbb::$config['allow_namechange'] && $data['username'] != phpbb::$user->data['username'])
-						{
-							add_log('user', phpbb::$user->data['user_id'], 'LOG_USER_UPDATE_NAME', phpbb::$user->data['username'], $data['username']);
-						}
-
-						if (phpbb::$acl->acl_get('u_chgpasswd') && $data['new_password'] && !phpbb_check_hash($data['new_password'], phpbb::$user->data['user_password']))
-						{
-							phpbb::$user->reset_login_keys();
-							add_log('user', phpbb::$user->data['user_id'], 'LOG_USER_NEW_PASSWORD', $data['username']);
-						}
-
-						if (phpbb::$acl->acl_get('u_chgemail') && $data['email'] != phpbb::$user->data['user_email'])
-						{
-							add_log('user', phpbb::$user->data['user_id'], 'LOG_USER_UPDATE_EMAIL', $data['username'], phpbb::$user->data['user_email'], $data['email']);
-						}
-
-						$message = 'PROFILE_UPDATED';
-
-						if (phpbb::$config['email_enable'] && $data['email'] != phpbb::$user->data['user_email'] && !phpbb::$user->is_founder && (phpbb::$config['require_activation'] == USER_ACTIVATION_SELF || phpbb::$config['require_activation'] == USER_ACTIVATION_ADMIN))
-						{
-							$message = (phpbb::$config['require_activation'] == USER_ACTIVATION_SELF) ? 'ACCOUNT_EMAIL_CHANGED' : 'ACCOUNT_EMAIL_CHANGED_ADMIN';
-
-							include_once(PHPBB_ROOT_PATH . 'includes/functions_messenger.' . PHP_EXT);
-
-							$server_url = generate_board_url();
-
-							$user_actkey = gen_rand_string(10);
-							$key_len = 54 - (strlen($server_url));
-							$key_len = ($key_len > 6) ? $key_len : 6;
-							$user_actkey = substr($user_actkey, 0, $key_len);
-
-							$messenger = new messenger(false);
-
-							$template_file = (phpbb::$config['require_activation'] == USER_ACTIVATION_ADMIN) ? 'user_activate_inactive' : 'user_activate';
-							$messenger->template($template_file, phpbb::$user->data['user_lang']);
-
-							$messenger->to($data['email'], $data['username']);
-
-							$messenger->headers('X-AntiAbuse: Board servername - ' . phpbb::$config['server_name']);
-							$messenger->headers('X-AntiAbuse: User_id - ' . phpbb::$user->data['user_id']);
-							$messenger->headers('X-AntiAbuse: Username - ' . phpbb::$user->data['username']);
-							$messenger->headers('X-AntiAbuse: User IP - ' . phpbb::$user->ip);
-
-							$messenger->assign_vars(array(
-								'USERNAME'		=> htmlspecialchars_decode($data['username']),
-								'U_ACTIVATE'	=> "$server_url/ucp." . PHP_EXT . '?mode=activate&u=' . phpbb::$user->data['user_id'] . "&k=$user_actkey")
-							);
-
-							$messenger->send(NOTIFY_EMAIL);
-
-							if (phpbb::$config['require_activation'] == USER_ACTIVATION_ADMIN)
-							{
-								// Grab an array of user_id's with a_user permissions ... these users can activate a user
-								$admin_ary = phpbb::$acl->acl_get_list(false, 'a_user', false);
-								$admin_ary = (!empty($admin_ary[0]['a_user'])) ? $admin_ary[0]['a_user'] : array();
-
-								// Also include founders
-								$where_sql = ' WHERE user_type = ' . phpbb::USER_FOUNDER;
-
-								if (sizeof($admin_ary))
-								{
-									$where_sql .= ' OR ' . phpbb::$db->sql_in_set('user_id', $admin_ary);
-								}
-
-								$sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type
-									FROM ' . USERS_TABLE . ' ' .
-									$where_sql;
-								$result = phpbb::$db->sql_query($sql);
-
-								while ($row = phpbb::$db->sql_fetchrow($result))
-								{
-									$messenger->template('admin_activate', $row['user_lang']);
-									$messenger->to($row['user_email'], $row['username']);
-									$messenger->im($row['user_jabber'], $row['username']);
-
-									$messenger->assign_vars(array(
-										'USERNAME'			=> htmlspecialchars_decode($data['username']),
-										'U_USER_DETAILS'	=> "$server_url/memberlist." . PHP_EXT . '?mode=viewprofile&u=' . phpbb::$user->data['user_id'],
-										'U_ACTIVATE'		=> "$server_url/ucp." . PHP_EXT . '?mode=activate&u=' . phpbb::$user->data['user_id'] . "&k=$user_actkey")
-									);
-
-									$messenger->send($row['user_notify_type']);
-								}
-								phpbb::$db->sql_freeresult($result);
-							}
-
-							user_active_flip('deactivate', phpbb::$user->data['user_id'], INACTIVE_PROFILE);
-
-							// Because we want the profile to be reactivated we set user_newpasswd to empty (else the reactivation will fail)
-							$sql_ary['user_actkey'] = $user_actkey;
-							$sql_ary['user_newpasswd'] = '';
-						}
-
-						if (sizeof($sql_ary))
-						{
-							$sql = 'UPDATE ' . USERS_TABLE . '
-								SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-								WHERE user_id = ' . phpbb::$user->data['user_id'];
-							phpbb::$db->sql_query($sql);
-						}
-
-						// Need to update config, forum, topic, posting, messages, etc.
-						if ($data['username'] != phpbb::$user->data['username'] && phpbb::$acl->acl_get('u_chgname') && phpbb::$config['allow_namechange'])
-						{
-							user_update_name(phpbb::$user->data['username'], $data['username']);
-						}
-
-						// Now, we can remove the user completely (kill the session) - NOT BEFORE!!!
-						if (!empty($sql_ary['user_actkey']))
-						{
-							meta_refresh(5, append_sid('index'));
-							$message = phpbb::$user->lang[$message] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_INDEX'], '<a href="' . append_sid('index') . '">', '</a>');
-
-							// Because the user gets deactivated we log him out too, killing his session
-							phpbb::$user->session_kill();
-						}
-						else
-						{
-							meta_refresh(3, $this->u_action);
-							$message = phpbb::$user->lang[$message] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
-						}
-
-						trigger_error($message);
-					}
-
-					// Replace "error" strings with their real, localised form
-					$error = preg_replace('#^([A-Z_]+)$#e', "phpbb::\$user->lang('\\1')", $error);
-				}
-
-				phpbb::$template->assign_vars(array(
-					'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
-
-					'USERNAME'			=> $data['username'],
-					'EMAIL'				=> $data['email'],
-					'PASSWORD_CONFIRM'	=> $data['password_confirm'],
-					'NEW_PASSWORD'		=> $data['new_password'],
-					'CUR_PASSWORD'		=> '',
-
-					'L_USERNAME_EXPLAIN'		=> sprintf(phpbb::$user->lang[phpbb::$config['allow_name_chars'] . '_EXPLAIN'], phpbb::$config['min_name_chars'], phpbb::$config['max_name_chars']),
-					'L_CHANGE_PASSWORD_EXPLAIN'	=> sprintf(phpbb::$user->lang[phpbb::$config['pass_complex'] . '_EXPLAIN'], phpbb::$config['min_pass_chars'], phpbb::$config['max_pass_chars']),
-
-					'S_FORCE_PASSWORD'	=> (phpbb::$acl->acl_get('u_chgpasswd') && phpbb::$config['chg_passforce'] && phpbb::$user->data['user_passchg'] < time() - (phpbb::$config['chg_passforce'] * 86400)) ? true : false,
-					'S_CHANGE_USERNAME' => (phpbb::$config['allow_namechange'] && phpbb::$acl->acl_get('u_chgname')) ? true : false,
-					'S_CHANGE_EMAIL'	=> (phpbb::$acl->acl_get('u_chgemail')) ? true : false,
-					'S_CHANGE_PASSWORD'	=> (phpbb::$acl->acl_get('u_chgpasswd')) ? true : false,
-				));
-			break;
-
-			case 'profile_info':
-
-				include(PHPBB_ROOT_PATH . 'includes/functions_profile_fields.' . PHP_EXT);
-
-				$cp = new custom_profile();
-
-				$cp_data = $cp_error = array();
-
-				$data = array(
-					'icq'			=> request_var('icq', phpbb::$user->data['user_icq']),
-					'aim'			=> request_var('aim', phpbb::$user->data['user_aim']),
-					'msn'			=> request_var('msn', phpbb::$user->data['user_msnm']),
-					'yim'			=> request_var('yim', phpbb::$user->data['user_yim']),
-					'jabber'		=> utf8_normalize_nfc(request_var('jabber', phpbb::$user->data['user_jabber'], true)),
-					'website'		=> request_var('website', phpbb::$user->data['user_website']),
-					'location'		=> utf8_normalize_nfc(request_var('location', phpbb::$user->data['user_from'], true)),
-					'occupation'	=> utf8_normalize_nfc(request_var('occupation', phpbb::$user->data['user_occ'], true)),
-					'interests'		=> utf8_normalize_nfc(request_var('interests', phpbb::$user->data['user_interests'], true)),
-				);
-
-				if (phpbb::$config['allow_birthdays'])
-				{
-					$data['bday_day'] = $data['bday_month'] = $data['bday_year'] = 0;
-
-					if (phpbb::$user->data['user_birthday'])
-					{
-						list($data['bday_day'], $data['bday_month'], $data['bday_year']) = explode('-', phpbb::$user->data['user_birthday']);
-					}
-
-					$data['bday_day'] = request_var('bday_day', $data['bday_day']);
-					$data['bday_month'] = request_var('bday_month', $data['bday_month']);
-					$data['bday_year'] = request_var('bday_year', $data['bday_year']);
-					$data['user_birthday'] = sprintf('%2d-%2d-%4d', $data['bday_day'], $data['bday_month'], $data['bday_year']);
-				}
-
-				add_form_key('ucp_profile_info');
-
-				if ($submit)
-				{
-					$validate_array = array(
-						'icq'			=> array(
-							array('string', true, 3, 15),
-							array('match', true, '#^[0-9]+$#i')),
-						'aim'			=> array('string', true, 3, 255),
-						'msn'			=> array('string', true, 5, 255),
-						'jabber'		=> array(
-							array('string', true, 5, 255),
-							array('jabber')),
-						'yim'			=> array('string', true, 5, 255),
-						'website'		=> array(
-							array('string', true, 12, 255),
-							array('match', true, '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')),
-						'location'		=> array('string', true, 2, 100),
-						'occupation'	=> array('string', true, 2, 500),
-						'interests'		=> array('string', true, 2, 500),
-					);
-
-					if (phpbb::$config['allow_birthdays'])
-					{
-						$validate_array = array_merge($validate_array, array(
-							'bday_day'		=> array('num', true, 1, 31),
-							'bday_month'	=> array('num', true, 1, 12),
-							'bday_year'		=> array('num', true, 1901, gmdate('Y', time()) + 50),
-							'user_birthday' => array('date', true),
-						));
-					}
-
-					$error = validate_data($data, $validate_array);
-
-					// validate custom profile fields
-					$cp->submit_cp_field('profile', phpbb::$user->get_iso_lang_id(), $cp_data, $cp_error);
-
-					if (sizeof($cp_error))
-					{
-						$error = array_merge($error, $cp_error);
-					}
-
-					if (!check_form_key('ucp_profile_info'))
-					{
-						$error[] = 'FORM_INVALID';
-					}
-
-					if (!sizeof($error))
-					{
-						$data['notify'] = phpbb::$user->data['user_notify_type'];
-
-						if ($data['notify'] == NOTIFY_IM && (!phpbb::$config['jab_enable'] || !$data['jabber'] || !@extension_loaded('xml')))
-						{
-							// User has not filled in a jabber address (Or one of the modules is disabled or jabber is disabled)
-							// Disable notify by Jabber now for this user.
-							$data['notify'] = NOTIFY_EMAIL;
-						}
-
-						$sql_ary = array(
-							'user_icq'		=> $data['icq'],
-							'user_aim'		=> $data['aim'],
-							'user_msnm'		=> $data['msn'],
-							'user_yim'		=> $data['yim'],
-							'user_jabber'	=> $data['jabber'],
-							'user_website'	=> $data['website'],
-							'user_from'		=> $data['location'],
-							'user_occ'		=> $data['occupation'],
-							'user_interests'=> $data['interests'],
-							'user_notify_type'	=> $data['notify'],
-						);
-
-						if (phpbb::$config['allow_birthdays'])
-						{
-							$sql_ary['user_birthday'] = $data['user_birthday'];
-						}
-
-						$sql = 'UPDATE ' . USERS_TABLE . '
-							SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-							WHERE user_id = ' . phpbb::$user->data['user_id'];
-						phpbb::$db->sql_query($sql);
-
-						// Update Custom Fields
-						if (sizeof($cp_data))
-						{
-							$sql = 'UPDATE ' . PROFILE_FIELDS_DATA_TABLE . '
-								SET ' . phpbb::$db->sql_build_array('UPDATE', $cp_data) . '
-								WHERE user_id = ' . phpbb::$user->data['user_id'];
-							phpbb::$db->sql_query($sql);
-
-							if (!phpbb::$db->sql_affectedrows())
-							{
-								$cp_data['user_id'] = (int) phpbb::$user->data['user_id'];
-
-								phpbb::$db->sql_return_on_error(true);
-
-								$sql = 'INSERT INTO ' . PROFILE_FIELDS_DATA_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $cp_data);
-								phpbb::$db->sql_query($sql);
-
-								phpbb::$db->sql_return_on_error(false);
-							}
-						}
-
-						meta_refresh(3, $this->u_action);
-						$message = phpbb::$user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
-						trigger_error($message);
-					}
-
-					// Replace "error" strings with their real, localised form
-					$error = preg_replace('#^([A-Z_]+)$#e', "phpbb::\$user->lang('\\1')", $error);
-				}
-
-				if (phpbb::$config['allow_birthdays'])
-				{
-					$s_birthday_day_options = '<option value="0"' . ((!$data['bday_day']) ? ' selected="selected"' : '') . '>--</option>';
-					for ($i = 1; $i < 32; $i++)
-					{
-						$selected = ($i == $data['bday_day']) ? ' selected="selected"' : '';
-						$s_birthday_day_options .= "<option value=\"$i\"$selected>$i</option>";
-					}
-
-					$s_birthday_month_options = '<option value="0"' . ((!$data['bday_month']) ? ' selected="selected"' : '') . '>--</option>';
-					for ($i = 1; $i < 13; $i++)
-					{
-						$selected = ($i == $data['bday_month']) ? ' selected="selected"' : '';
-						$s_birthday_month_options .= "<option value=\"$i\"$selected>$i</option>";
-					}
-					$s_birthday_year_options = '';
-
-					$now = getdate();
-					$s_birthday_year_options = '<option value="0"' . ((!$data['bday_year']) ? ' selected="selected"' : '') . '>--</option>';
-					for ($i = $now['year'] - 100; $i <= $now['year']; $i++)
-					{
-						$selected = ($i == $data['bday_year']) ? ' selected="selected"' : '';
-						$s_birthday_year_options .= "<option value=\"$i\"$selected>$i</option>";
-					}
-					unset($now);
-
-					phpbb::$template->assign_vars(array(
-						'S_BIRTHDAY_DAY_OPTIONS'	=> $s_birthday_day_options,
-						'S_BIRTHDAY_MONTH_OPTIONS'	=> $s_birthday_month_options,
-						'S_BIRTHDAY_YEAR_OPTIONS'	=> $s_birthday_year_options,
-						'S_BIRTHDAYS_ENABLED'		=> true,
-					));
-				}
-
-				phpbb::$template->assign_vars(array(
-					'ERROR'		=> (sizeof($error)) ? implode('<br />', $error) : '',
-
-					'ICQ'		=> $data['icq'],
-					'YIM'		=> $data['yim'],
-					'AIM'		=> $data['aim'],
-					'MSN'		=> $data['msn'],
-					'JABBER'	=> $data['jabber'],
-					'WEBSITE'	=> $data['website'],
-					'LOCATION'	=> $data['location'],
-					'OCCUPATION'=> $data['occupation'],
-					'INTERESTS'	=> $data['interests'],
-				));
-
-				// Get additional profile fields and assign them to the template block var 'profile_fields'
-				phpbb::$user->get_profile_fields(phpbb::$user->data['user_id']);
-
-				$cp->generate_profile_fields('profile', phpbb::$user->get_iso_lang_id());
-
-			break;
-
-			case 'signature':
-
-				if (!phpbb::$acl->acl_get('u_sig'))
-				{
-					trigger_error('NO_AUTH_SIGNATURE');
-				}
-
-				include(PHPBB_ROOT_PATH . 'includes/functions_posting.' . PHP_EXT);
-				include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-
-				$enable_bbcode	= (phpbb::$config['allow_sig_bbcode']) ? ((request_var('disable_bbcode', !phpbb::$user->optionget('bbcode'))) ? false : true) : false;
-				$enable_smilies	= (phpbb::$config['allow_sig_smilies']) ? ((request_var('disable_smilies', !phpbb::$user->optionget('smilies'))) ? false : true) : false;
-				$enable_urls	= (phpbb::$config['allow_sig_links']) ? ((request_var('disable_magic_url', false)) ? false : true) : false;
-
-				$signature		= utf8_normalize_nfc(request_var('signature', (string) phpbb::$user->data['user_sig'], true));
-
-				add_form_key('ucp_sig');
-
-				if ($submit || $preview)
-				{
-					include(PHPBB_ROOT_PATH . 'includes/message_parser.' . PHP_EXT);
-
-					if (!sizeof($error))
-					{
-						$message_parser = new parse_message($signature);
-
-						// Allowing Quote BBCode
-						$message_parser->parse($enable_bbcode, $enable_urls, $enable_smilies, phpbb::$config['allow_sig_img'], phpbb::$config['allow_sig_flash'], true, phpbb::$config['allow_sig_links'], true, 'sig');
-
-						if (sizeof($message_parser->warn_msg))
-						{
-							$error[] = implode('<br />', $message_parser->warn_msg);
-						}
-
-						if (!check_form_key('ucp_sig'))
-						{
-							$error[] = 'FORM_INVALID';
-						}
-
-						if (!sizeof($error) && $submit)
-						{
-							$sql_ary = array(
-								'user_sig'					=> (string) $message_parser->message,
-								'user_sig_bbcode_uid'		=> (string) $message_parser->bbcode_uid,
-								'user_sig_bbcode_bitfield'	=> $message_parser->bbcode_bitfield
-							);
-
-							$sql = 'UPDATE ' . USERS_TABLE . '
-								SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . '
-								WHERE user_id = ' . phpbb::$user->data['user_id'];
-							phpbb::$db->sql_query($sql);
-
-							$message = phpbb::$user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
-							trigger_error($message);
-						}
-					}
-
-					// Replace "error" strings with their real, localised form
-					$error = preg_replace('#^([A-Z_]+)$#e', "phpbb::\$user->lang('\\1')", $error);
-				}
-
-				$signature_preview = '';
-				if ($preview)
-				{
-					// Now parse it for displaying
-					$signature_preview = $message_parser->format_display($enable_bbcode, $enable_urls, $enable_smilies, false);
-					unset($message_parser);
-				}
-
-				decode_message($signature, phpbb::$user->data['user_sig_bbcode_uid']);
-
-				phpbb::$template->assign_vars(array(
-					'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
-					'SIGNATURE'			=> $signature,
-					'SIGNATURE_PREVIEW'	=> $signature_preview,
-
-					'S_BBCODE_CHECKED' 		=> (!$enable_bbcode) ? ' checked="checked"' : '',
-					'S_SMILIES_CHECKED' 	=> (!$enable_smilies) ? ' checked="checked"' : '',
-					'S_MAGIC_URL_CHECKED' 	=> (!$enable_urls) ? ' checked="checked"' : '',
-
-					'BBCODE_STATUS'			=> (phpbb::$config['allow_sig_bbcode']) ? sprintf(phpbb::$user->lang['BBCODE_IS_ON'], '<a href="' . append_sid('faq', 'mode=bbcode') . '">', '</a>') : sprintf(phpbb::$user->lang['BBCODE_IS_OFF'], '<a href="' . append_sid('faq', 'mode=bbcode') . '">', '</a>'),
-					'SMILIES_STATUS'		=> (phpbb::$config['allow_sig_smilies']) ? phpbb::$user->lang['SMILIES_ARE_ON'] : phpbb::$user->lang['SMILIES_ARE_OFF'],
-					'IMG_STATUS'			=> (phpbb::$config['allow_sig_img']) ? phpbb::$user->lang['IMAGES_ARE_ON'] : phpbb::$user->lang['IMAGES_ARE_OFF'],
-					'FLASH_STATUS'			=> (phpbb::$config['allow_sig_flash']) ? phpbb::$user->lang['FLASH_IS_ON'] : phpbb::$user->lang['FLASH_IS_OFF'],
-					'URL_STATUS'			=> (phpbb::$config['allow_sig_links']) ? phpbb::$user->lang['URL_IS_ON'] : phpbb::$user->lang['URL_IS_OFF'],
-					'MAX_FONT_SIZE'			=> (int) phpbb::$config['max_sig_font_size'],
-
-					'L_SIGNATURE_EXPLAIN'	=> sprintf(phpbb::$user->lang['SIGNATURE_EXPLAIN'], phpbb::$config['max_sig_chars']),
-
-					'S_BBCODE_ALLOWED'		=> phpbb::$config['allow_sig_bbcode'],
-					'S_SMILIES_ALLOWED'		=> phpbb::$config['allow_sig_smilies'],
-					'S_BBCODE_IMG'			=> (phpbb::$config['allow_sig_img']) ? true : false,
-					'S_BBCODE_FLASH'		=> (phpbb::$config['allow_sig_flash']) ? true : false,
-					'S_LINKS_ALLOWED'		=> (phpbb::$config['allow_sig_links']) ? true : false,
-				));
-
-				// Build custom bbcodes array
-				display_custom_bbcodes();
-
-			break;
-
-			case 'avatar':
-
-				include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-
-				$display_gallery = request_var('display_gallery', '0');
-				$avatar_select = basename(request_var('avatar_select', ''));
-				$category = basename(request_var('category', ''));
-
-				$can_upload = (phpbb::$config['allow_avatar_upload'] && file_exists(PHPBB_ROOT_PATH . phpbb::$config['avatar_path']) && @is_writable(PHPBB_ROOT_PATH . phpbb::$config['avatar_path']) && phpbb::$acl->acl_get('u_chgavatar') && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
-
-				add_form_key('ucp_avatar');
-
-				if ($submit)
-				{
-					if (check_form_key('ucp_avatar'))
-					{
-						if (avatar_process_user($error))
-						{
-							meta_refresh(3, $this->u_action);
-							$message = phpbb::$user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
-							trigger_error($message);
-						}
-					}
-					else
-					{
-						$error[] = 'FORM_INVALID';
-					}
-					// Replace "error" strings with their real, localised form
-					$error = preg_replace('#^([A-Z_]+)$#e', "phpbb::\$user->lang('\\1')", $error);
-				}
-
-				phpbb::$template->assign_vars(array(
-					'ERROR'			=> (sizeof($error)) ? implode('<br />', $error) : '',
-					'AVATAR'		=> get_user_avatar(phpbb::$user->data['user_avatar'], phpbb::$user->data['user_avatar_type'], phpbb::$user->data['user_avatar_width'], phpbb::$user->data['user_avatar_height']),
-					'AVATAR_SIZE'	=> phpbb::$config['avatar_filesize'],
-
-					'U_GALLERY'		=> append_sid('ucp', 'i=profile&amp;mode=avatar&amp;display_gallery=1'),
-
-					'S_FORM_ENCTYPE'	=> ($can_upload) ? ' enctype="multipart/form-data"' : '',
-
-					'L_AVATAR_EXPLAIN'	=> sprintf(phpbb::$user->lang['AVATAR_EXPLAIN'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], phpbb::$config['avatar_filesize'] / 1024),
-				));
-
-				if ($display_gallery && phpbb::$acl->acl_get('u_chgavatar') && phpbb::$config['allow_avatar_local'])
-				{
-					avatar_gallery($category, $avatar_select, 4);
-				}
-				else
-				{
-					$avatars_enabled = ($can_upload || (phpbb::$acl->acl_get('u_chgavatar') && (phpbb::$config['allow_avatar_local'] || phpbb::$config['allow_avatar_remote']))) ? true : false;
-
-					phpbb::$template->assign_vars(array(
-						'AVATAR_WIDTH'	=> request_var('width', phpbb::$user->data['user_avatar_width']),
-						'AVATAR_HEIGHT'	=> request_var('height', phpbb::$user->data['user_avatar_height']),
-
-						'S_AVATARS_ENABLED'		=> $avatars_enabled,
-						'S_UPLOAD_AVATAR_FILE'	=> $can_upload,
-						'S_UPLOAD_AVATAR_URL'	=> $can_upload,
-						'S_LINK_AVATAR'			=> (phpbb::$acl->acl_get('u_chgavatar') && phpbb::$config['allow_avatar_remote']) ? true : false,
-						'S_DISPLAY_GALLERY'		=> (phpbb::$acl->acl_get('u_chgavatar') && phpbb::$config['allow_avatar_local']) ? true : false,
-					));
-				}
-
-			break;
-		}
-
-		phpbb::$template->assign_vars(array(
-			'L_TITLE'	=> phpbb::$user->lang['UCP_PROFILE_' . strtoupper($mode)],
-
-			'S_HIDDEN_FIELDS'	=> $s_hidden_fields,
-			'S_UCP_ACTION'		=> $this->u_action,
-		));
-
-		// Set desired template
-		$this->tpl_name = 'ucp_profile_' . $mode;
-		$this->page_title = 'UCP_PROFILE_' . strtoupper($mode);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/ucp_register.php b/phpBB/modules/ucp/ucp_register.php
deleted file mode 100644
index ee721f4f3a..0000000000
--- a/phpBB/modules/ucp/ucp_register.php
+++ /dev/null
@@ -1,486 +0,0 @@
-<?php
-/**
-*
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* ucp_register
-* Board registration
-* @package ucp
-*/
-class ucp_register
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		//
-		if (phpbb::$config['require_activation'] == USER_ACTIVATION_DISABLE)
-		{
-			trigger_error('UCP_REGISTER_DISABLE');
-		}
-
-		include(PHPBB_ROOT_PATH . 'includes/functions_profile_fields.' . PHP_EXT);
-
-		$coppa			= phpbb_request::is_set('coppa') ? ((request_var('coppa', false)) ? 1 : 0) : false;
-		$agreed			= phpbb_request::variable('agreed', false, false, phpbb_request::POST) ? 1 : 0;
-		$submit			= phpbb_request::is_set_post('submit');
-		$change_lang	= request_var('change_lang', '');
-		$user_lang		= request_var('lang', phpbb::$user->lang_name);
-
-		if ($agreed)
-		{
-			add_form_key('ucp_register');
-		}
-		else
-		{
-			add_form_key('ucp_register_terms');
-		}
-
-		if (phpbb::$config['enable_confirm'])
-		{
-			include(PHPBB_ROOT_PATH . 'includes/captcha/captcha_factory.' . PHP_EXT);
-			$captcha = phpbb_captcha_factory::get_instance(phpbb::$config['captcha_plugin']);
-			$captcha->init(CONFIRM_REG);
-		}
-
-		if ($change_lang || $user_lang != phpbb::$config['default_lang'])
-		{
-			$use_lang = ($change_lang) ? basename($change_lang) : basename($user_lang);
-
-			if (file_exists(phpbb::$user->lang_path . $use_lang . '/'))
-			{
-				if ($change_lang)
-				{
-					$submit = false;
-
-					// Setting back agreed to let the user view the agreement in his/her language
-					$agreed = (phpbb_request::is_set_post('change_lang')) ? 0 : $agreed;
-				}
-
-				phpbb::$user->lang_name = $lang = $use_lang;
-				phpbb::$user->lang = array();
-				phpbb::$user->add_lang(array('common', 'ucp'));
-			}
-			else
-			{
-				$change_lang = '';
-				$user_lang = phpbb::$user->lang_name;
-			}
-		}
-
-		$cp = new custom_profile();
-
-		$error = $cp_data = $cp_error = array();
-
-
-		if (!$agreed || ($coppa === false && phpbb::$config['coppa_enable']) || ($coppa && !phpbb::$config['coppa_enable']))
-		{
-			$add_lang = ($change_lang) ? '&amp;change_lang=' . urlencode($change_lang) : '';
-			$add_coppa = ($coppa !== false) ? '&amp;coppa=' . $coppa : '';
-
-			$s_hidden_fields = array();
-
-			// If we change the language, we want to pass on some more possible parameter.
-			if ($change_lang)
-			{
-				// We do not include the password
-				$s_hidden_fields = array_merge($s_hidden_fields, array(
-					'username'			=> utf8_normalize_nfc(request_var('username', '', true)),
-					'email'				=> strtolower(request_var('email', '')),
-					'email_confirm'		=> strtolower(request_var('email_confirm', '')),
-					'lang'				=> phpbb::$user->lang_name,
-					'tz'				=> request_var('tz', (float) phpbb::$config['board_timezone']),
-				));
-
-				if (phpbb::$config['enable_confirm'])
-				{
-					$s_hidden_fields = array_merge($s_hidden_fields, $captcha->get_hidden_fields());
-				}
-			}
-
-			if ($coppa === false && phpbb::$config['coppa_enable'])
-			{
-				$now = getdate();
-				$coppa_birthday = phpbb::$user->format_date(mktime($now['hours'] + phpbb::$user->data['user_dst'], $now['minutes'], $now['seconds'], $now['mon'], $now['mday'] - 1, $now['year'] - 13), phpbb::$user->lang['DATE_FORMAT']);
-				unset($now);
-
-				phpbb::$template->assign_vars(array(
-					'L_COPPA_NO'		=> sprintf(phpbb::$user->lang['UCP_COPPA_BEFORE'], $coppa_birthday),
-					'L_COPPA_YES'		=> sprintf(phpbb::$user->lang['UCP_COPPA_ON_AFTER'], $coppa_birthday),
-
-					'U_COPPA_NO'		=> append_sid('ucp', 'mode=register&amp;coppa=0' . $add_lang),
-					'U_COPPA_YES'		=> append_sid('ucp', 'mode=register&amp;coppa=1' . $add_lang),
-
-					'S_SHOW_COPPA'		=> true,
-					'S_HIDDEN_FIELDS'	=> build_hidden_fields($s_hidden_fields),
-					'S_UCP_ACTION'		=> append_sid('ucp', 'mode=register' . $add_lang),
-				));
-			}
-			else
-			{
-				phpbb::$template->assign_vars(array(
-					'L_TERMS_OF_USE'	=> sprintf(phpbb::$user->lang['TERMS_OF_USE_CONTENT'], phpbb::$config['sitename'], generate_board_url()),
-
-					'S_SHOW_COPPA'		=> false,
-					'S_REGISTRATION'	=> true,
-					'S_HIDDEN_FIELDS'	=> build_hidden_fields($s_hidden_fields),
-					'S_UCP_ACTION'		=> append_sid('ucp', 'mode=register' . $add_lang . $add_coppa),
-				));
-			}
-
-			$this->tpl_name = 'ucp_agreement';
-			return;
-		}
-
-
-		// Try to manually determine the timezone and adjust the dst if the server date/time complies with the default setting +/- 1
-		$timezone = date('Z') / 3600;
-		$is_dst = date('I');
-
-		if (phpbb::$config['board_timezone'] == $timezone || phpbb::$config['board_timezone'] == ($timezone - 1))
-		{
-			$timezone = ($is_dst) ? $timezone - 1 : $timezone;
-
-			if (!isset(phpbb::$user->lang['tz_zones'][(string) $timezone]))
-			{
-				$timezone = phpbb::$config['board_timezone'];
-			}
-		}
-		else
-		{
-			$is_dst = phpbb::$config['board_dst'];
-			$timezone = phpbb::$config['board_timezone'];
-		}
-
-		$data = array(
-			'username'			=> utf8_normalize_nfc(request_var('username', '', true)),
-			'new_password'		=> request_var('new_password', '', true),
-			'password_confirm'	=> request_var('password_confirm', '', true),
-			'email'				=> strtolower(request_var('email', '')),
-			'email_confirm'		=> strtolower(request_var('email_confirm', '')),
-			'lang'				=> basename(request_var('lang', phpbb::$user->lang_name)),
-			'tz'				=> request_var('tz', (float) $timezone),
-		);
-
-		// Check and initialize some variables if needed
-		if ($submit)
-		{
-			$error = validate_data($data, array(
-				'username'			=> array(
-					array('string', false, phpbb::$config['min_name_chars'], phpbb::$config['max_name_chars']),
-					array('username', '')),
-				'new_password'		=> array(
-					array('string', false, phpbb::$config['min_pass_chars'], phpbb::$config['max_pass_chars']),
-					array('password')),
-				'password_confirm'	=> array('string', false, phpbb::$config['min_pass_chars'], phpbb::$config['max_pass_chars']),
-				'email'				=> array(
-					array('string', false, 6, 60),
-					array('email')),
-				'email_confirm'		=> array('string', false, 6, 60),
-				'tz'				=> array('num', false, -14, 14),
-				'lang'				=> array('match', false, '#^[a-z_\-]{2,}$#i'),
-			));
-			if (!check_form_key('ucp_register'))
-			{
-				$error[] = phpbb::$user->lang['FORM_INVALID'];
-			}
-			// Replace "error" strings with their real, localised form
-			$error = preg_replace('#^([A-Z_]+)$#e', "phpbb::\$user->lang('\\1')", $error);
-
-			if (phpbb::$config['enable_confirm'])
-			{
-				$vc_response = $captcha->validate();
-				if ($vc_response)
-				{
-					$error[] = $vc_response;
-				}
-				else
-				{
-					$captcha->reset();
-				}
-				if (phpbb::$config['max_reg_attempts'] && $captcha->get_attempt_count() > phpbb::$config['max_reg_attempts'])
-				{
-					$error[] = phpbb::$user->lang['TOO_MANY_REGISTERS'];
-				}
-			}
-			// DNSBL check
-			if (phpbb::$config['check_dnsbl'])
-			{
-				if (($dnsbl = phpbb::$user->check_dnsbl('register')) !== false)
-				{
-					$error[] = sprintf(phpbb::$user->lang['IP_BLACKLISTED'], phpbb::$user->ip, $dnsbl[1]);
-				}
-			}
-
-			// validate custom profile fields
-			$cp->submit_cp_field('register', phpbb::$user->get_iso_lang_id(), $cp_data, $error);
-
-			if (!sizeof($error))
-			{
-				if ($data['new_password'] != $data['password_confirm'])
-				{
-					$error[] = phpbb::$user->lang['NEW_PASSWORD_ERROR'];
-				}
-
-				if ($data['email'] != $data['email_confirm'])
-				{
-					$error[] = phpbb::$user->lang['NEW_EMAIL_ERROR'];
-				}
-			}
-
-			if (!sizeof($error))
-			{
-				$server_url = generate_board_url();
-
-				// Which group by default?
-				$group_name = ($coppa) ? 'REGISTERED_COPPA' : 'REGISTERED';
-
-				$sql = 'SELECT group_id
-					FROM ' . GROUPS_TABLE . "
-					WHERE group_name = '" . phpbb::$db->sql_escape($group_name) . "'
-						AND group_type = " . GROUP_SPECIAL;
-				$result = phpbb::$db->sql_query($sql);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$row)
-				{
-					trigger_error('NO_GROUP');
-				}
-
-				$group_id = $row['group_id'];
-
-				if (($coppa ||
-					phpbb::$config['require_activation'] == USER_ACTIVATION_SELF ||
-					phpbb::$config['require_activation'] == USER_ACTIVATION_ADMIN) && phpbb::$config['email_enable'])
-				{
-					$user_actkey = gen_rand_string(10);
-					$key_len = 54 - (strlen($server_url));
-					$key_len = ($key_len < 6) ? 6 : $key_len;
-					$user_actkey = substr($user_actkey, 0, $key_len);
-
-					$user_type = phpbb::USER_INACTIVE;
-					$user_inactive_reason = INACTIVE_REGISTER;
-					$user_inactive_time = time();
-				}
-				else
-				{
-					$user_type = phpbb::USER_NORMAL;
-					$user_actkey = '';
-					$user_inactive_reason = 0;
-					$user_inactive_time = 0;
-				}
-
-				$user_row = array(
-					'username'				=> $data['username'],
-					'user_password'			=> phpbb_hash($data['new_password']),
-					'user_email'			=> $data['email'],
-					'group_id'				=> (int) $group_id,
-					'user_timezone'			=> (float) $data['tz'],
-					'user_dst'				=> $is_dst,
-					'user_lang'				=> $data['lang'],
-					'user_type'				=> $user_type,
-					'user_actkey'			=> $user_actkey,
-					'user_ip'				=> phpbb::$user->ip,
-					'user_regdate'			=> time(),
-					'user_inactive_reason'	=> $user_inactive_reason,
-					'user_inactive_time'	=> $user_inactive_time,
-				);
-
-				// Register user...
-				$user_id = user_add($user_row, $cp_data);
-
-				// This should not happen, because the required variables are listed above...
-				if ($user_id === false)
-				{
-					trigger_error('NO_USER', E_USER_ERROR);
-				}
-
-				if ($coppa && phpbb::$config['email_enable'])
-				{
-					$message = phpbb::$user->lang['ACCOUNT_COPPA'];
-					$email_template = 'coppa_welcome_inactive';
-				}
-				else if (phpbb::$config['require_activation'] == USER_ACTIVATION_SELF && phpbb::$config['email_enable'])
-				{
-					$message = phpbb::$user->lang['ACCOUNT_INACTIVE'];
-					$email_template = 'user_welcome_inactive';
-				}
-				else if (phpbb::$config['require_activation'] == USER_ACTIVATION_ADMIN && phpbb::$config['email_enable'])
-				{
-					$message = phpbb::$user->lang['ACCOUNT_INACTIVE_ADMIN'];
-					$email_template = 'admin_welcome_inactive';
-				}
-				else
-				{
-					$message = phpbb::$user->lang['ACCOUNT_ADDED'];
-					$email_template = 'user_welcome';
-				}
-
-				if (phpbb::$config['email_enable'])
-				{
-					include_once(PHPBB_ROOT_PATH . 'includes/functions_messenger.' . PHP_EXT);
-
-					$messenger = new messenger(false);
-
-					$messenger->template($email_template, $data['lang']);
-
-					$messenger->to($data['email'], $data['username']);
-
-					$messenger->headers('X-AntiAbuse: Board servername - ' . phpbb::$config['server_name']);
-					$messenger->headers('X-AntiAbuse: User_id - ' . phpbb::$user->data['user_id']);
-					$messenger->headers('X-AntiAbuse: Username - ' . phpbb::$user->data['username']);
-					$messenger->headers('X-AntiAbuse: User IP - ' . phpbb::$user->ip);
-
-					$messenger->assign_vars(array(
-						'WELCOME_MSG'	=> htmlspecialchars_decode(sprintf(phpbb::$user->lang['WELCOME_SUBJECT'], phpbb::$config['sitename'])),
-						'USERNAME'		=> htmlspecialchars_decode($data['username']),
-						'PASSWORD'		=> htmlspecialchars_decode($data['new_password']),
-						'U_ACTIVATE'	=> "$server_url/ucp." . PHP_EXT . "?mode=activate&u=$user_id&k=$user_actkey")
-					);
-
-					if ($coppa)
-					{
-						$messenger->assign_vars(array(
-							'FAX_INFO'		=> phpbb::$config['coppa_fax'],
-							'MAIL_INFO'		=> phpbb::$config['coppa_mail'],
-							'EMAIL_ADDRESS'	=> $data['email'],
-						));
-					}
-
-					$messenger->send(NOTIFY_EMAIL);
-
-					if (phpbb::$config['require_activation'] == USER_ACTIVATION_ADMIN)
-					{
-						// Grab an array of user_id's with a_user permissions ... these users can activate a user
-						$admin_ary = phpbb::$acl->acl_get_list(false, 'a_user', false);
-						$admin_ary = (!empty($admin_ary[0]['a_user'])) ? $admin_ary[0]['a_user'] : array();
-
-						// Also include founders
-						$where_sql = ' WHERE user_type = ' . phpbb::USER_FOUNDER;
-
-						if (sizeof($admin_ary))
-						{
-							$where_sql .= ' OR ' . phpbb::$db->sql_in_set('user_id', $admin_ary);
-						}
-
-						$sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type
-							FROM ' . USERS_TABLE . ' ' .
-							$where_sql;
-						$result = phpbb::$db->sql_query($sql);
-
-						while ($row = phpbb::$db->sql_fetchrow($result))
-						{
-							$messenger->template('admin_activate', $row['user_lang']);
-							$messenger->to($row['user_email'], $row['username']);
-							$messenger->im($row['user_jabber'], $row['username']);
-
-							$messenger->assign_vars(array(
-								'USERNAME'			=> htmlspecialchars_decode($data['username']),
-								'U_USER_DETAILS'	=> "$server_url/memberlist." . PHP_EXT . "?mode=viewprofile&u=$user_id",
-								'U_ACTIVATE'		=> "$server_url/ucp." . PHP_EXT . "?mode=activate&u=$user_id&k=$user_actkey")
-							);
-
-							$messenger->send($row['user_notify_type']);
-						}
-						phpbb::$db->sql_freeresult($result);
-					}
-				}
-
-				$message = $message . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_INDEX'], '<a href="' . append_sid('index') . '">', '</a>');
-				trigger_error($message);
-			}
-		}
-
-		$s_hidden_fields = array(
-			'agreed'		=> 'true',
-			'change_lang'	=> 0,
-		);
-
-		if (phpbb::$config['coppa_enable'])
-		{
-			$s_hidden_fields['coppa'] = $coppa;
-		}
-		$s_hidden_fields = build_hidden_fields($s_hidden_fields);
-
-		$confirm_image = '';
-
-		// Visual Confirmation - Show images
-
-		if (phpbb::$config['enable_confirm'])
-		{
-			if ($change_lang)
-			{
-				$str = '&amp;change_lang=' . $change_lang;
-			}
-			else
-			{
-				$str = '';
-			}
-
-			phpbb::$template->assign_vars(array(
-				'L_CONFIRM_EXPLAIN'		=> sprintf(phpbb::$user->lang['CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars(phpbb::$config['board_contact']) . '">', '</a>'),
-				'S_CAPTCHA'				=> $captcha->get_template(),
-			));
-		}
-
-		//
-		$l_reg_cond = '';
-		switch (phpbb::$config['require_activation'])
-		{
-			case USER_ACTIVATION_SELF:
-				$l_reg_cond = phpbb::$user->lang['UCP_EMAIL_ACTIVATE'];
-			break;
-
-			case USER_ACTIVATION_ADMIN:
-				$l_reg_cond = phpbb::$user->lang['UCP_ADMIN_ACTIVATE'];
-			break;
-		}
-
-		phpbb::$template->assign_vars(array(
-			'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
-			'USERNAME'			=> $data['username'],
-			'PASSWORD'			=> $data['new_password'],
-			'PASSWORD_CONFIRM'	=> $data['password_confirm'],
-			'EMAIL'				=> $data['email'],
-			'EMAIL_CONFIRM'		=> $data['email_confirm'],
-
-			'L_REG_COND'				=> $l_reg_cond,
-			'L_USERNAME_EXPLAIN'		=> sprintf(phpbb::$user->lang[phpbb::$config['allow_name_chars'] . '_EXPLAIN'], phpbb::$config['min_name_chars'], phpbb::$config['max_name_chars']),
-			'L_PASSWORD_EXPLAIN'		=> sprintf(phpbb::$user->lang[phpbb::$config['pass_complex'] . '_EXPLAIN'], phpbb::$config['min_pass_chars'], phpbb::$config['max_pass_chars']),
-
-			'S_LANG_OPTIONS'	=> language_select($data['lang']),
-			'S_TZ_OPTIONS'		=> tz_select($data['tz']),
-			'S_CONFIRM_REFRESH'	=> (phpbb::$config['enable_confirm'] && phpbb::$config['confirm_refresh']) ? true : false,
-			'S_COPPA'			=> $coppa,
-			'S_HIDDEN_FIELDS'	=> $s_hidden_fields,
-			'S_UCP_ACTION'		=> append_sid('ucp', 'mode=register'),
-		));
-
-		//
-		phpbb::$user->profile_fields = array();
-
-		// Generate profile fields -> Template Block Variable profile_fields
-		$cp->generate_profile_fields('register', phpbb::$user->get_iso_lang_id());
-
-		//
-		$this->tpl_name = 'ucp_register';
-		$this->page_title = 'UCP_REGISTRATION';
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/ucp_remind.php b/phpBB/modules/ucp/ucp_remind.php
deleted file mode 100644
index 82f8de0af6..0000000000
--- a/phpBB/modules/ucp/ucp_remind.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
-*
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* ucp_remind
-* Sending password reminders
-* @package ucp
-*/
-class ucp_remind
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		$username	= request_var('username', '', true);
-		$email		= strtolower(request_var('email', ''));
-		$submit		= phpbb_request::is_set_post('submit');
-
-		if ($submit)
-		{
-			$sql = 'SELECT user_id, username, user_permissions, user_email, user_jabber, user_notify_type, user_type, user_lang, user_inactive_reason
-				FROM ' . USERS_TABLE . "
-				WHERE user_email = '" . phpbb::$db->sql_escape($email) . "'
-					AND username_clean = '" . phpbb::$db->sql_escape(utf8_clean_string($username)) . "'";
-			$result = phpbb::$db->sql_query($sql);
-			$user_row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$user_row)
-			{
-				trigger_error('NO_EMAIL_USER');
-			}
-
-			if ($user_row['user_type'] == phpbb::USER_IGNORE)
-			{
-				trigger_error('NO_USER');
-			}
-
-			if ($user_row['user_type'] == phpbb::USER_INACTIVE)
-			{
-				if ($user_row['user_inactive_reason'] == INACTIVE_MANUAL)
-				{
-					trigger_error('ACCOUNT_DEACTIVATED');
-				}
-				else
-				{
-					trigger_error('ACCOUNT_NOT_ACTIVATED');
-				}
-			}
-
-			// Check users permissions
-			$auth2 = new auth();
-			$auth2->acl($user_row);
-
-			if (!$auth2->acl_get('u_chgpasswd'))
-			{
-				trigger_error('NO_AUTH_PASSWORD_REMINDER');
-			}
-
-			$server_url = generate_board_url();
-
-			$key_len = 54 - strlen($server_url);
-			$key_len = max(6, $key_len); // we want at least 6
-			$key_len = (phpbb::$config['max_pass_chars']) ? min($key_len, phpbb::$config['max_pass_chars']) : $key_len; // we want at most phpbb::$config['max_pass_chars']
-			$user_actkey = substr(gen_rand_string(10), 0, $key_len);
-			$user_password = gen_rand_string(8);
-
-			$sql = 'UPDATE ' . USERS_TABLE . "
-				SET user_newpasswd = '" . phpbb::$db->sql_escape(phpbb_hash($user_password)) . "', user_actkey = '" . phpbb::$db->sql_escape($user_actkey) . "'
-				WHERE user_id = " . $user_row['user_id'];
-			phpbb::$db->sql_query($sql);
-
-			include_once(PHPBB_ROOT_PATH . 'includes/functions_messenger.' . PHP_EXT);
-
-			$messenger = new messenger(false);
-
-			$messenger->template('user_activate_passwd', $user_row['user_lang']);
-
-			$messenger->to($user_row['user_email'], $user_row['username']);
-			$messenger->im($user_row['user_jabber'], $user_row['username']);
-
-			$messenger->assign_vars(array(
-				'USERNAME'		=> htmlspecialchars_decode($user_row['username']),
-				'PASSWORD'		=> htmlspecialchars_decode($user_password),
-				'U_ACTIVATE'	=> "$server_url/ucp." . PHP_EXT . "?mode=activate&u={$user_row['user_id']}&k=$user_actkey")
-			);
-
-			$messenger->send($user_row['user_notify_type']);
-
-			meta_refresh(3, append_sid('index'));
-
-			$message = phpbb::$user->lang['PASSWORD_UPDATED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_INDEX'], '<a href="' . append_sid('index') . '">', '</a>');
-			trigger_error($message);
-		}
-
-		phpbb::$template->assign_vars(array(
-			'USERNAME'			=> $username,
-			'EMAIL'				=> $email,
-			'S_PROFILE_ACTION'	=> append_sid('ucp', 'mode=sendpassword'),
-		));
-
-		$this->tpl_name = 'ucp_remind';
-		$this->page_title = 'UCP_REMIND';
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/ucp_resend.php b/phpBB/modules/ucp/ucp_resend.php
deleted file mode 100644
index 56579d42ba..0000000000
--- a/phpBB/modules/ucp/ucp_resend.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-/**
-*
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* ucp_resend
-* Resending activation emails
-* @package ucp
-*/
-class ucp_resend
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		$username	= request_var('username', '', true);
-		$email		= strtolower(request_var('email', ''));
-		$submit		= phpbb_request::is_set_post('submit');
-
-		add_form_key('ucp_resend');
-
-		if ($submit)
-		{
-			if (!check_form_key('ucp_resend'))
-			{
-				trigger_error('FORM_INVALID');
-			}
-
-			$sql = 'SELECT user_id, group_id, username, user_email, user_type, user_lang, user_actkey, user_inactive_reason
-				FROM ' . USERS_TABLE . "
-				WHERE user_email = '" . phpbb::$db->sql_escape($email) . "'
-					AND username_clean = '" . phpbb::$db->sql_escape(utf8_clean_string($username)) . "'";
-			$result = phpbb::$db->sql_query($sql);
-			$user_row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$user_row)
-			{
-				trigger_error('NO_EMAIL_USER');
-			}
-
-			if ($user_row['user_type'] == phpbb::USER_IGNORE)
-			{
-				trigger_error('NO_USER');
-			}
-
-			if (!$user_row['user_actkey'] && $user_row['user_type'] != phpbb::USER_INACTIVE)
-			{
-				trigger_error('ACCOUNT_ALREADY_ACTIVATED');
-			}
-
-			if (!$user_row['user_actkey'] || ($user_row['user_type'] == phpbb::USER_INACTIVE && $user_row['user_inactive_reason'] == INACTIVE_MANUAL))
-			{
-				trigger_error('ACCOUNT_DEACTIVATED');
-			}
-
-			// Determine coppa status on group (REGISTERED(_COPPA))
-			$sql = 'SELECT group_name, group_type
-				FROM ' . GROUPS_TABLE . '
-				WHERE group_id = ' . $user_row['group_id'];
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$row)
-			{
-				trigger_error('NO_GROUP');
-			}
-
-			$coppa = ($row['group_name'] == 'REGISTERED_COPPA' && $row['group_type'] == GROUP_SPECIAL) ? true : false;
-
-			include_once(PHPBB_ROOT_PATH . 'includes/functions_messenger.' . PHP_EXT);
-			$messenger = new messenger(false);
-
-			if (phpbb::$config['require_activation'] == USER_ACTIVATION_SELF || $coppa)
-			{
-				$messenger->template(($coppa) ? 'coppa_resend_inactive' : 'user_resend_inactive', $user_row['user_lang']);
-				$messenger->to($user_row['user_email'], $user_row['username']);
-
-				$messenger->headers('X-AntiAbuse: Board servername - ' . phpbb::$config['server_name']);
-				$messenger->headers('X-AntiAbuse: User_id - ' . phpbb::$user->data['user_id']);
-				$messenger->headers('X-AntiAbuse: Username - ' . phpbb::$user->data['username']);
-				$messenger->headers('X-AntiAbuse: User IP - ' . phpbb::$user->ip);
-
-				$messenger->assign_vars(array(
-					'WELCOME_MSG'	=> htmlspecialchars_decode(sprintf(phpbb::$user->lang['WELCOME_SUBJECT'], phpbb::$config['sitename'])),
-					'USERNAME'		=> htmlspecialchars_decode($user_row['username']),
-					'U_ACTIVATE'	=> generate_board_url() . '/ucp.' . PHP_EXT . "?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}")
-				);
-
-				if ($coppa)
-				{
-					$messenger->assign_vars(array(
-						'FAX_INFO'		=> phpbb::$config['coppa_fax'],
-						'MAIL_INFO'		=> phpbb::$config['coppa_mail'],
-						'EMAIL_ADDRESS'	=> $user_row['user_email'],
-					));
-				}
-
-				$messenger->send(NOTIFY_EMAIL);
-			}
-
-			if (phpbb::$config['require_activation'] == USER_ACTIVATION_ADMIN)
-			{
-				// Grab an array of user_id's with a_user permissions ... these users can activate a user
-				$admin_ary = phpbb::$acl->acl_get_list(false, 'a_user', false);
-
-				$sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type
-					FROM ' . USERS_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('user_id', $admin_ary[0]['a_user']);
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$messenger->template('admin_activate', $row['user_lang']);
-					$messenger->to($row['user_email'], $row['username']);
-					$messenger->im($row['user_jabber'], $row['username']);
-
-					$messenger->headers('X-AntiAbuse: Board servername - ' . phpbb::$config['server_name']);
-					$messenger->headers('X-AntiAbuse: User_id - ' . phpbb::$user->data['user_id']);
-					$messenger->headers('X-AntiAbuse: Username - ' . phpbb::$user->data['username']);
-					$messenger->headers('X-AntiAbuse: User IP - ' . phpbb::$user->ip);
-
-					$messenger->assign_vars(array(
-						'USERNAME'			=> htmlspecialchars_decode($user_row['username']),
-						'U_USER_DETAILS'	=> generate_board_url() . '/memberlist.' . PHP_EXT . "?mode=viewprofile&u={$user_row['user_id']}",
-						'U_ACTIVATE'		=> generate_board_url() . '/ucp.' . PHP_EXT . "?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}",
-					));
-
-					$messenger->send($row['user_notify_type']);
-				}
-				phpbb::$db->sql_freeresult($result);
-			}
-
-			meta_refresh(3, append_sid('index'));
-
-			$message = (phpbb::$config['require_activation'] == USER_ACTIVATION_ADMIN) ? phpbb::$user->lang['ACIVATION_EMAIL_SENT_ADMIN'] : phpbb::$user->lang['ACTIVATION_EMAIL_SENT'];
-			$message .= '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_INDEX'], '<a href="' . append_sid('index') . '">', '</a>');
-			trigger_error($message);
-		}
-
-		phpbb::$template->assign_vars(array(
-			'USERNAME'			=> $username,
-			'EMAIL'				=> $email,
-			'S_PROFILE_ACTION'	=> append_sid('ucp', 'mode=resend_act'),
-		));
-
-		$this->tpl_name = 'ucp_resend';
-		$this->page_title = 'UCP_RESEND';
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/modules/ucp/ucp_zebra.php b/phpBB/modules/ucp/ucp_zebra.php
deleted file mode 100644
index f78c0709c0..0000000000
--- a/phpBB/modules/ucp/ucp_zebra.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-/**
-*
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* ucp_zebra
-* @package ucp
-*/
-class ucp_zebra
-{
-	var $u_action;
-
-	function main($id, $mode)
-	{
-		$submit = phpbb_request::is_set_post('submit') || phpbb_request::is_set('add', phpbb_request::GET) || phpbb_request::is_set('remove', phpbb_request::GET);
-		$s_hidden_fields = '';
-
-		$l_mode = strtoupper($mode);
-
-		if ($submit)
-		{
-			$data = $error = array();
-			$updated = false;
-
-			$var_ary = array(
-				'usernames'	=> array(0),
-				'add'		=> '',
-			);
-
-			foreach ($var_ary as $var => $default)
-			{
-				$data[$var] = request_var($var, $default, true);
-			}
-
-			if (!empty($data['add']) || sizeof($data['usernames']))
-			{
-				if (confirm_box(true))
-				{
-					if ($data['add'])
-					{
-						$data['add'] = array_map('trim', array_map('utf8_clean_string', explode("\n", $data['add'])));
-
-						// Do these name/s exist on a list already? If so, ignore ... we could be
-						// 'nice' and automatically handle names added to one list present on
-						// the other (by removing the existing one) ... but I have a feeling this
-						// may lead to complaints
-						$sql = 'SELECT z.*, u.username, u.username_clean
-							FROM ' . ZEBRA_TABLE . ' z, ' . USERS_TABLE . ' u
-							WHERE z.user_id = ' . phpbb::$user->data['user_id'] . '
-								AND u.user_id = z.zebra_id';
-						$result = phpbb::$db->sql_query($sql);
-
-						$friends = $foes = array();
-						while ($row = phpbb::$db->sql_fetchrow($result))
-						{
-							if ($row['friend'])
-							{
-								$friends[] = utf8_clean_string($row['username']);
-							}
-							else
-							{
-								$foes[] = utf8_clean_string($row['username']);
-							}
-						}
-						phpbb::$db->sql_freeresult($result);
-
-						// remove friends from the username array
-						$n = sizeof($data['add']);
-						$data['add'] = array_diff($data['add'], $friends);
-
-						if (sizeof($data['add']) < $n && $mode == 'foes')
-						{
-							$error[] = phpbb::$user->lang['NOT_ADDED_FOES_FRIENDS'];
-						}
-
-						// remove foes from the username array
-						$n = sizeof($data['add']);
-						$data['add'] = array_diff($data['add'], $foes);
-
-						if (sizeof($data['add']) < $n && $mode == 'friends')
-						{
-							$error[] = phpbb::$user->lang['NOT_ADDED_FRIENDS_FOES'];
-						}
-
-						// remove the user himself from the username array
-						$n = sizeof($data['add']);
-						$data['add'] = array_diff($data['add'], array(utf8_clean_string(phpbb::$user->data['username'])));
-
-						if (sizeof($data['add']) < $n)
-						{
-							$error[] = phpbb::$user->lang['NOT_ADDED_' . $l_mode . '_SELF'];
-						}
-
-						unset($friends, $foes, $n);
-
-						if (sizeof($data['add']))
-						{
-							$sql = 'SELECT user_id, user_type
-								FROM ' . USERS_TABLE . '
-								WHERE ' . phpbb::$db->sql_in_set('username_clean', $data['add']) . '
-									AND user_type <> ' . phpbb::USER_INACTIVE;
-							$result = phpbb::$db->sql_query($sql);
-
-							$user_id_ary = array();
-							while ($row = phpbb::$db->sql_fetchrow($result))
-							{
-								if ($row['user_id'] != ANONYMOUS && $row['user_type'] != phpbb::USER_IGNORE)
-								{
-									$user_id_ary[] = $row['user_id'];
-								}
-								else
-								{
-									$error[] = phpbb::$user->lang['NOT_ADDED_' . $l_mode . '_ANONYMOUS'];
-								}
-							}
-							phpbb::$db->sql_freeresult($result);
-
-							if (sizeof($user_id_ary))
-							{
-								// Remove users from foe list if they are admins or moderators
-								if ($mode == 'foes')
-								{
-									$perms = array();
-									foreach (phpbb::$acl->acl_get_list($user_id_ary, array('a_', 'm_')) as $forum_id => $forum_ary)
-									{
-										foreach ($forum_ary as $auth_option => $user_ary)
-										{
-											$perms = array_merge($perms, $user_ary);
-										}
-									}
-
-									$perms = array_unique($perms);
-
-									if (sizeof($perms))
-									{
-										$error[] = phpbb::$user->lang['NOT_ADDED_FOES_MOD_ADMIN'];
-									}
-
-									// This may not be right ... it may yield true when perms equate to deny
-									$user_id_ary = array_diff($user_id_ary, $perms);
-									unset($perms);
-								}
-
-								if (sizeof($user_id_ary))
-								{
-									$sql_mode = ($mode == 'friends') ? 'friend' : 'foe';
-
-									$sql_ary = array();
-									foreach ($user_id_ary as $zebra_id)
-									{
-										$sql_ary[] = array(
-											'user_id'		=> (int) phpbb::$user->data['user_id'],
-											'zebra_id'		=> (int) $zebra_id,
-											$sql_mode		=> 1
-										);
-									}
-
-									phpbb::$db->sql_multi_insert(ZEBRA_TABLE, $sql_ary);
-
-									$updated = true;
-								}
-								unset($user_id_ary);
-							}
-							else if (!sizeof($error))
-							{
-								$error[] = phpbb::$user->lang['USER_NOT_FOUND_OR_INACTIVE'];
-							}
-						}
-					}
-					else if (sizeof($data['usernames']))
-					{
-						// Force integer values
-						$data['usernames'] = array_map('intval', $data['usernames']);
-
-						$sql = 'DELETE FROM ' . ZEBRA_TABLE . '
-							WHERE user_id = ' . phpbb::$user->data['user_id'] . '
-								AND ' . phpbb::$db->sql_in_set('zebra_id', $data['usernames']);
-						phpbb::$db->sql_query($sql);
-
-						$updated = true;
-					}
-
-					if ($updated)
-					{
-						meta_refresh(3, $this->u_action);
-						$message = phpbb::$user->lang[$l_mode . '_UPDATED'] . '<br />' . implode('<br />', $error) . ((sizeof($error)) ? '<br />' : '') . '<br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
-						trigger_error($message);
-					}
-					else
-					{
-						phpbb::$template->assign_var('ERROR', implode('<br />', $error));
-					}
-				}
-				else
-				{
-					confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-						'mode'		=> $mode,
-						'submit'	=> true,
-						'usernames'	=> $data['usernames'],
-						'add'		=> $data['add']))
-					);
-				}
-			}
-		}
-
-		$sql_and = ($mode == 'friends') ? 'z.friend = 1' : 'z.foe = 1';
-		$sql = 'SELECT z.*, u.username, u.username_clean
-			FROM ' . ZEBRA_TABLE . ' z, ' . USERS_TABLE . ' u
-			WHERE z.user_id = ' . phpbb::$user->data['user_id'] . "
-				AND $sql_and
-				AND u.user_id = z.zebra_id
-			ORDER BY u.username_clean ASC";
-		$result = phpbb::$db->sql_query($sql);
-
-		$s_username_options = '';
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$s_username_options .= '<option value="' . $row['zebra_id'] . '">' . $row['username'] . '</option>';
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		phpbb::$template->assign_vars(array(
-			'L_TITLE'			=> phpbb::$user->lang['UCP_ZEBRA_' . $l_mode],
-
-			'U_FIND_USERNAME'	=> append_sid('memberlist', 'mode=searchuser&amp;form=ucp&amp;field=add'),
-
-			'S_USERNAME_OPTIONS'	=> $s_username_options,
-			'S_HIDDEN_FIELDS'		=> $s_hidden_fields,
-			'S_UCP_ACTION'			=> $this->u_action,
-		));
-
-		$this->tpl_name = 'ucp_zebra_' . $mode;
-		$this->page_title = 'UCP_ZEBRA_' . $l_mode;
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/plugins/bootstrap.php b/phpBB/plugins/bootstrap.php
deleted file mode 100644
index 443624bbf9..0000000000
--- a/phpBB/plugins/bootstrap.php
+++ /dev/null
@@ -1,828 +0,0 @@
-<?php
-/**
-*
-* @package plugins
-* @version $Id$
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* Class used by plugins/modules/etc. for installation/uninstallation
-* @package plugins
-*/
-class phpbb_install
-{
-	public function install() {}
-	public function uninstall() {}
-}
-
-/**
-* This class holds plugin information.
-* One instance will be assigned to each plugin.
-* @package plugins
-*/
-class phpbb_plugin_structure
-{
-	/**
-	* @var string The plugins plain phpBB name. This is also the directory name.
-	*/
-	public $phpbb_name;
-
-	/**
-	* @var string The plugins full name as the plugin defines it
-	*/
-	public $name;
-
-	/**
-	* @var string The plugins full description as the plugin defines it
-	*/
-	public $description;
-
-	/**
-	* @var string The plugins author
-	*/
-	public $author;
-
-	/**
-	* @var string The plugins version string
-	*/
-	public $version;
-
-	/**
-	* @var array The plugins defined includes
-	*/
-	public $includes = array();
-
-	/**
-	* @var array The plugins defined objects to plug in
-	*/
-	public $objects = array();
-
-	/**
-	* @var array The plugins defined hooks/functions to plug in
-	*/
-	public $functions = array();
-
-	/**
-	* Set up information object
-	*
-	* @param string	$phpbb_name	The plugins directory/simple/plain name
-	* @access public
-	*/
-	public function __construct($phpbb_name)
-	{
-		$this->phpbb_name = $phpbb_name;
-
-		$class = 'phpbb_' . $phpbb_name . '_info';
-
-		if (!class_exists($class))
-		{
-			trigger_error('Plugin ' . $phpbb_name . ' does not define required ' . $class . ' info class.', E_USER_ERROR);
-		}
-
-		$this->setup = new $class();
-
-		foreach (array('name', 'description', 'author', 'version') as $required_property)
-		{
-			if (!property_exists($this->setup, $required_property))
-			{
-				trigger_error('Plugin ' . $phpbb_name . ' does not define required property ' . $required_property . ' in info class ' . $class . '.', E_USER_ERROR);
-			}
-
-			$this->$required_property = $this->setup->$required_property;
-		}
-	}
-}
-
-/**
-* Main class handling plugins/hooks
-* @package plugins
-*/
-class phpbb_plugins
-{
-	/**
-	* @var array required phpBB objects
-	*/
-	public $phpbb_required = array();
-
-	/**
-	* @var array Optional phpBB objects
-	*/
-	public $phpbb_optional = array();
-
-	/**
-	* @var string Plugin path plugins are searched at.
-	*/
-	public $plugin_path = false;
-
-	/**
-	* @var array Collection of assigned plugins
-	*/
-	private $plugins = array();
-
-	/**
-	* @var array Collection of assigned hooks (functions)
-	*/
-	private $hooks = array();
-
-	/**
-	* Pointer to currently processed plugin.
-	*/
-	private $current_plugin = false;
-
-	/**
-	* Plugins/Functions already set up
-	*/
-	private $already_parsed_plugins = array();
-
-	/**
-	* @var array Collection of assigned functions and their params (merged from plugins and custom additions)
-	*/
-	private $functions = array();
-
-	/**
-	* Init plugins
-	*
-	* Search {@link $plugin_path plugin path} for plugins and include the information for later processing.
-	* Plugins will not be called here, just collected.
-	*
-	* @param string	$plugin_path	The plugin path to search.
-	* @access public
-	*/
-	public function init($plugin_path)
-	{
-		$this->plugin_path = $plugin_path;
-		$this->plugins = array();
-
-		// search for plugin files
-		if ($dh = @opendir($this->plugin_path))
-		{
-			while (($file = readdir($dh)) !== false)
-			{
-				// If is directory and a PHP file with the same name as the directory within this dir?
-				if ($file[0] != '.' && is_readable($this->plugin_path . $file) && is_dir($this->plugin_path . $file) && file_exists($this->plugin_path . $file . '/' . $file . '.' . PHP_EXT))
-				{
-					$this->add_plugin($file);
-				}
-			}
-			closedir($dh);
-		}
-
-		$this->already_parsed_plugins = array('plugin' => array(), 'hook' => array());
-	}
-
-	/**
-	* Add information about specific plugin
-	*
-	* @param string	$name	Plugin directory name
-	* @return bool	False if plugin does not exist
-	* @access public
-	*/
-	public function add_plugin($name)
-	{
-		if (!file_exists($this->plugin_path . $name . '/' . $name . '.' . PHP_EXT))
-		{
-			return false;
-		}
-
-		// Include desired plugin
-		require_once $this->plugin_path . $name . '/' . $name . '.' . PHP_EXT;
-
-		// Create new setup for this plugin
-		$this->plugins[$name] = new phpbb_plugin_structure($name);
-		$this->current_plugin = $this->plugins[$name];
-
-		// Setup plugin
-		$this->current_plugin->setup->setup_plugin($this);
-
-		return true;
-	}
-
-	/**
-	* Setup all previously collected plugins
-	*
-	* @return bool	False if there are no plugins to setup
-	* @access public
-	*/
-	public function setup()
-	{
-		foreach ($this->plugins as $name => $plugin)
-		{
-			if (isset($this->already_parsed_plugins['plugin'][$name]))
-			{
-				continue;
-			}
-
-			// Add includes
-			foreach ($plugin->includes as $file)
-			{
-				include_once $this->plugin_path . $name . '/' . $file . '.' . PHP_EXT;
-			}
-
-			// Setup objects
-			foreach ($plugin->objects as $key => $class)
-			{
-				$object = new $class();
-
-				if (!property_exists($object, 'phpbb_plugin') && !property_exists($object, 'class_plugin'))
-				{
-					trigger_error('Class ' . get_class($object) . ' does not define public $phpbb_plugin and public $class_plugin.', E_USER_ERROR);
-				}
-
-				if (property_exists($object, 'phpbb_plugin') && !empty($object->phpbb_plugin))
-				{
-					// Is the plugin the mod author wants to influence pluggable?
-					if (!is_subclass_of(phpbb::get_instance($object->phpbb_plugin), 'phpbb_plugin_support'))
-					{
-						trigger_error('The phpBB Class ' . get_class(phpbb::get_instance($object->phpbb_plugin)) . ' defined in ' . get_class($object) . ' is not pluggable.', E_USER_ERROR);
-					}
-
-					// Get instance of phpBB Object to pass later
-					$instance = phpbb::get_instance($object->phpbb_plugin);
-				}
-				else
-				{
-					// Assign custom object...
-					$instance = ${$object->class_plugin};
-
-					if (!is_subclass_of($instance, 'phpbb_plugin_support'))
-					{
-						trigger_error('The Class ' . get_class($instance) . ' defined in ' . get_class($object) . ' is not pluggable.', E_USER_ERROR);
-					}
-				}
-
-				// Setup/Register plugin...
-				$object->setup_plugin($instance);
-			}
-		}
-
-		// Now setup hooks... this is a special case...
-		foreach ($this->functions as $key => $params)
-		{
-			if (isset($this->already_parsed_plugins['hook'][$key]))
-			{
-				continue;
-			}
-
-			$function = array_shift($params);
-			$hook = array_shift($params);
-			$mode = (!empty($params)) ? array_shift($params) : phpbb::FUNCTION_INJECT;
-			$action = (!empty($params)) ? array_shift($params) : 'default';
-
-			// Check if the function is already overridden.
-			if ($mode == phpbb::FUNCTION_OVERRIDE && isset($this->hooks[$function][$mode]))
-			{
-				trigger_error('Function ' . $function . ' is already overridden by ' . $this->hooks[$function][$mode] . '.', E_USER_ERROR);
-			}
-
-			if ($mode == phpbb::FUNCTION_OVERRIDE)
-			{
-				$this->hooks[$function][$mode] = $hook;
-			}
-			else
-			{
-				$this->hooks[$function][$mode][$action][] = $hook;
-			}
-
-			$this->already_parsed_plugins['hook'][$key] = true;
-		}
-
-		// Init method call and setting as finished
-		foreach ($this->plugins as $name => $plugin)
-		{
-			if (isset($this->already_parsed_plugins['plugin'][$name]))
-			{
-				continue;
-			}
-
-			// Call plugins init method?
-			if (method_exists($plugin->setup, 'init'))
-			{
-				$plugin->setup->init();
-			}
-
-			$this->already_parsed_plugins['plugin'][$name] = true;
-		}
-	}
-
-	/**
-	* Register files to be included on plugin setup
-	* Used by plugin setup
-	*
-	* @param string	$arguments,...	List of files to include
-	* @access public
-	*/
-	public function register_includes()
-	{
-		$arguments = func_get_args();
-		$this->current_plugin->includes = $arguments;
-	}
-
-	/**
-	* Define the plugins classes registered within the setup process.
-	* Used by plugin setup.
-	*
-	* @param string	$arguments,...	List of classes to instantiate
-	* @access public
-	*/
-	public function register_plugins()
-	{
-		$arguments = func_get_args();
-
-		// Make sure the class names are unique by checking for the phpbb name
-		foreach ($arguments as $class)
-		{
-			if (strpos($class, '_' . $this->current_plugin->phpbb_name . '_') === false)
-			{
-				trigger_error('Class ' . $class . ' has an invalid name in plugin ' . $this->current_plugin->phpbb_name . '. The class must include the name of the plugin.', E_USER_ERROR);
-			}
-		}
-
-		$this->current_plugin->objects = $arguments;
-	}
-
-	/**
-	* Define the hook setup for functions.
-	* Used by plugin setup.
-	*
-	* @param string	$function	The function name to hook into
-	* @param string	$hook		The hooks function name
-	* @param phpbb::FUNCTION_OVERRIDE|phpbb::FUNCTION_INJECT	$mode
-	* 							If set to phpbb::FUNCTION_OVERRIDE, the hook is called instead of the function and returns the result.
-	* 							If set to phpbb::FUNCTION_INJECT (default), then the hook is called based on the $action parameter
-	* @param string	$action		Defines the hooks action. Default parameters are 'default' and 'return'.
-	* 							Other actions are defined within the relevant functions and are documented within the plugins documentation.
-	*							'default':	This is the default action used for the first hook called, usually at the start of the function. Parameter are passed by reference.
-	*							'return':	This is the action used to specify the hook used at the end of the function. Result is passed, returns the result.
-	*
-	* @access public
-	*/
-	public function register_function()
-	{
-		$arguments = func_get_args();
-		$this->current_plugin->functions[] = $this->functions[] = $arguments;
-	}
-
-	/**
-	* Checks if a specific function is overridden by a hook
-	* Called within functions to check if they are overridden.
-	*
-	* @param string	$function	The functions name, usually passed as __FUNCTION__
-	*
-	* @return bool	True if the function is overridden, false if not
-	* @access public
-	*/
-	public function function_override($function)
-	{
-		return isset($this->hooks[$function][phpbb::FUNCTION_OVERRIDE]);
-	}
-
-	/**
-	* Checks if a specific function is injected by a hook
-	* Called within functions to check if they are injected.
-	*
-	* @param string	$function	The functions name, usually passed as __FUNCTION__
-	* @param string	$action		The action to check. Can be 'default', 'return' or any other action defined.
-	*
-	* @return bool	True if the function is injected for the particular action, false if not
-	* @access public
-	*/
-	public function function_inject($function, $action = 'default')
-	{
-		return isset($this->hooks[$function][phpbb::FUNCTION_INJECT][$action]);
-	}
-
-	/**
-	* Call hook function overriding function.
-	* This is called within a function to actually override the function with the hook.
-	*
-	* @param string	$function		The function name, usually passed as __FUNCTION__
-	* @param mixed	$arguments,...	Optional number of arguments passed by the function to the hook
-	*
-	* @return mixed	The hooks result
-	* @access public
-	*/
-	public function call_override()
-	{
-		$arguments = func_get_args();
-		$function = array_shift($arguments);
-
-		return call_user_func_array($this->hooks[$function][phpbb::FUNCTION_OVERRIDE], $arguments);
-	}
-
-	/**
-	* Call injected function.
-	* This is called within functions to call hooks for specific actions.
-	*
-	* @param string	$function		The function name, usually passed as __FUNCTION__
-	* @param array	$arguments		Arguments passed to the hook as an array
-	* 								The first parameter is the action.
-	* 								If the action is 'return', the second parameter is the result
-	* 								The remaining parameter are the functions parameter, passed by reference if action is not 'return'.
-	*
-	* @return mixed	Returns result if action is 'return'
-	* @access public
-	*/
-	public function call_inject($function, $arguments)
-	{
-		$result = NULL;
-
-		if (!is_array($arguments))
-		{
-			$action = $arguments;
-			$arguments = array();
-		}
-		else
-		{
-			$action = array_shift($arguments);
-		}
-
-		// Return action... handle like override
-		if ($action == 'return')
-		{
-			$result = array_shift($arguments);
-
-			foreach ($this->hooks[$function][phpbb::FUNCTION_INJECT][$action] as $key => $hook)
-			{
-				$args = array_merge(array($result), $arguments);
-				$result = call_user_func_array($hook, $args);
-			}
-
-			return $result;
-		}
-
-		foreach ($this->hooks[$function][phpbb::FUNCTION_INJECT][$action] as $key => $hook)
-		{
-			call_user_func_array($hook, $arguments);
-		}
-	}
-}
-
-/**
-* Plugin support class.
-* Objects supporting plugins must extend this class
-* @package plugins
-*/
-abstract class phpbb_plugin_support
-{
-	/**
-	* @var array Methods injected
-	*/
-	private $plugin_methods;
-
-	/**
-	* @var array Attributes injected
-	*/
-	private $plugin_attributes;
-
-	/**
-	* Register a new method, overrides one or inject into one.
-	*
-	* @param string	$name		The method name to inject into. False if a new method is registered.
-	* @param string	$method		The hook name to use.
-	* @param object $object		Always $this
-	* @param phpbb::METHOD_ADD|phpbb::METHOD_OVERRIDE|phpbb::METHOD_INJECT	$mode
-	*							If set to phpbb::METHOD_ADD (default) the $name is added as a new method for the object plugged into.
-	* 							If set to phpbb::METHOD_OVERRIDE the hook is called instead of the method and returns the result.
-	* 							If set to phpbb::METHOD_INJECT, then the hook is called based on the $action parameter
-	* @param string	$action		Defines the hooks action. Default parameters are 'default' and 'return'.
-	* 							Other actions are defined within the relevant methods and are documented within the plugins documentation.
-	*							'default':	This is the default action used for the first hook called, usually at the start of the method. Parameter are passed by reference.
-	*							'return':	This is the action used to specify the hook used at the end of the method. Result is passed, returns the result.
-	*
-	* @access public
-	*/
-	public function register_method($name, $method, $object, $mode = phpbb::METHOD_ADD, $action = 'default')
-	{
-		// Method reachable by:
-		// For plugin_add: plugin_methods[method] = object
-		// For plugin_override: plugin_methods[name][mode][method] = object
-		// For plugin_inject: plugin_methods[name][mode][action][method] = object
-
-		// Set to PLUGIN_ADD if method does not exist
-		if ($name === false || !method_exists($this, $name))
-		{
-			$mode = phpbb::METHOD_ADD;
-		}
-
-		// But if it exists and we try to add one, then print out an error
-		if ($mode == phpbb::METHOD_ADD && (method_exists($this, $method) || isset($this->plugin_methods[$method])))
-		{
-			trigger_error('Method ' . $method. ' in class ' . get_class($object) . ' is not able to be added, because it conflicts with the existing method ' . $method . ' in ' . get_class($this) . '.', E_USER_ERROR);
-		}
-
-		// Check if the same method name is already used for $name for overriding the method.
-		if ($mode == phpbb::METHOD_OVERRIDE && isset($this->plugin_methods[$name][$mode][$method]))
-		{
-			trigger_error('Method ' . $method . ' in class ' . get_class($object) . ' is not able to override . ' . $name . ' in ' . get_class($this) . ', because it is already overridden in ' . get_class($this->plugin_methods[$name][$mode][$method]) . '.', E_USER_ERROR);
-		}
-
-		// Check if another method is already defined...
-		if ($mode == phpbb::METHOD_INJECT && isset($this->plugin_methods[$name][$mode][$action][$method]))
-		{
-			trigger_error('Method ' . $method . ' in class ' . get_class($object) . ' for ' . $name . ' is already defined in class ' . get_class($this->plugin_methods[$name][$mode][$action][$method]), E_USER_ERROR);
-		}
-
-		if (($function_signature = $this->valid_parameter($object, $method, $mode, $action)) !== true)
-		{
-			trigger_error('Method ' . $method . ' in class ' . get_class($object) . ' has invalid function signature. Please use: ' . $function_signature, E_USER_ERROR);
-		}
-
-		if ($mode == phpbb::METHOD_ADD)
-		{
-			$this->plugin_methods[$method] = $object;
-		}
-		else if ($mode == phpbb::METHOD_OVERRIDE)
-		{
-			$this->plugin_methods[$name][$mode][$method] = $object;
-		}
-		else
-		{
-			$this->plugin_methods[$name][$mode][$action][$method] = $object;
-		}
-	}
-
-	/**
-	* Register a new attribute.
-	* If the attribute already exists within the object then it will be overwritten.
-	*
-	* @param string	$name	Attribute name to register.
-	* @param object $object	Always $this
-	*
-	* @access public
-	*/
-	public function register_attribute($name, $object)
-	{
-		if (property_exists($this, $name))
-		{
-			unset($this->$name);
-		}
-
-		if (isset($this->plugin_attributes[$name]))
-		{
-			trigger_error('Attribute ' . $name . ' in class ' . get_class($object) . ' already defined in class ' . get_class($this->plugin_attributes[$name]), E_USER_ERROR);
-		}
-
-		$this->plugin_attributes[$name] = $object;
-	}
-
-	/**#@+
-	* Magic method for attributes. See {@link register_attribute() register_attribute}.
-	* @access public
-	*/
-	public function __get($name)
-	{
-		if (isset($this->plugin_attributes[$name]))
-		{
-			return $this->plugin_attributes[$name]->$name;
-		}
-
-		return $this->$name;
-	}
-
-	public function __set($name, $value)
-	{
-		if (isset($this->plugin_attributes[$name]))
-		{
-			return $this->plugin_attributes[$name]->$name = $value;
-		}
-
-		return $this->$name = $value;
-	}
-
-	public function __isset($name)
-	{
-		if (isset($this->plugin_attributes[$name]))
-		{
-			return isset($this->plugin_attributes[$name]->$name);
-		}
-
-		return isset($this->$name);
-	}
-
-	public function __unset($name)
-	{
-		if (isset($this->plugin_attributes[$name]))
-		{
-			unset($this->plugin_attributes[$name]->$name);
-		}
-
-		unset($this->$name);
-	}
-	/**#@-*/
-
-	/**
-	* Call added method. See {@link register_method() register_method} with phpbb::METHOD_ADD mode.
-	* @access public
-	*/
-	public function __call($name, $arguments)
-	{
-		if (isset($this->plugin_methods[$name]) && !is_array($this->plugin_methods[$name]))
-		{
-			array_unshift($arguments, $this);
-			return call_user_func_array(array($this->plugin_methods[$name], $name), $arguments);
-		}
-
-		trigger_error('Call to undefined method ' . $name . '() in ' . get_class($this) . '.', E_USER_ERROR);
-	}
-
-	/**
-	* Checks if a specific method is overridden by a hook
-	* Called within methods to check if they are overridden.
-	*
-	* @param string	$name	The methods name, usually passed as __FUNCTION__
-	*
-	* @return bool	True if the method is overridden, false if not
-	* @access protected
-	*/
-	protected function method_override($name)
-	{
-		return isset($this->plugin_methods[$name][phpbb::METHOD_OVERRIDE]);
-	}
-
-	/**
-	* Checks if a specific method is injected by a hook
-	* Called within methods to check if they are injected.
-	*
-	* @param string	$name		The methods name, usually passed as __FUNCTION__
-	* @param string	$action		The action to check. Can be 'default', 'return' or any other action defined.
-	*
-	* @return bool	True if the method is injected for the particular action, false if not
-	* @access protected
-	*/
-	protected function method_inject($name, $action = 'default')
-	{
-		return isset($this->plugin_methods[$name][phpbb::METHOD_INJECT][$action]);
-	}
-
-	/**
-	* Call hook method overriding method.
-	* This is called within a method to actually override the method with the hook.
-	*
-	* @param string	$name			The method name, usually passed as __FUNCTION__
-	* @param mixed	$arguments,...	Optional number of arguments passed by the method to the hook
-	*
-	* @return mixed	The hooks result
-	* @access protected
-	*/
-	protected function call_override()
-	{
-		$arguments = func_get_args();
-		$name = array_shift($arguments);
-
-		list($method, $object) = each($this->plugin_methods[$name][phpbb::METHOD_OVERRIDE]);
-		return call_user_func_array(array($object, $method), array_merge(array($this), $arguments));
-	}
-
-	/**
-	* Call injected method.
-	* This is called within methods to call hooks for specific actions.
-	*
-	* @param string	$name			The method name, usually passed as __FUNCTION__
-	* @param array	$arguments		Arguments passed to the hook as an array
-	* 								The first parameter is the action.
-	* 								If the action is 'return', the second parameter is the result
-	* 								The remaining parameter are the methods parameter, passed by reference if action is not 'return'.
-	*
-	* @return mixed	Returns result if action is 'return'
-	* @access protected
-	*/
-	protected function call_inject($name, $arguments)
-	{
-		$result = NULL;
-
-		if (!is_array($arguments))
-		{
-			$action = $arguments;
-			$arguments = array();
-		}
-		else
-		{
-			$action = array_shift($arguments);
-		}
-
-		// Return action... handle like override
-		if ($action == 'return')
-		{
-			$result = array_shift($arguments);
-
-			foreach ($this->plugin_methods[$name][phpbb::METHOD_INJECT][$action] as $method => $object)
-			{
-				$args = array_merge(array($this, $result), $arguments);
-				$result = call_user_func_array(array($object, $method), $args);
-			}
-
-			return $result;
-		}
-
-		foreach ($this->plugin_methods[$name][phpbb::METHOD_INJECT][$action] as $method => $object)
-		{
-			call_user_func_array(array($object, $method), array_merge(array($this), $arguments));
-		}
-	}
-
-	/**
-	* Check function signature for passed methods in {@link register_method() register_method()}.
-	*
-	* @param object	$object		The plugin
-	* @param string	$method		The method name
-	* @param phpbb::METHOD_ADD|phpbb::METHOD_OVERRIDE|phpbb::METHOD_INJECT	$mode	The mode
-	* @param string	$action		The action
-	*
-	* @return mixed	True if the signature is valid, else the correct function signature
-	* @access private
-	*/
-	private function valid_parameter($object, $method, $mode, $action)
-	{
-		// We cache the results... no worry. These checks are quite resource intensive, but will hopefully educate and guide developers
-
-		// Check for correct first parameter. This must be an instance of phpbb_$phpbb_plugin
-		$instance_of = 'phpbb_' . $object->phpbb_plugin;
-
-		// Define the required function layout
-		$function_layout = 'public function ' . $method . '(' . $instance_of . ' $object';
-
-		// Result for METHOD_INJECT and action == 'return'
-		if ($mode == phpbb::METHOD_INJECT && $action == 'return')
-		{
-			$function_layout .= ', $result';
-		}
-
-		// Optional method parameter
-		$function_layout .= ', [...]) { [...] }';
-
-		// Now check the method
-		$reflection = new ReflectionMethod($object, $method);
-		$parameters = $reflection->getParameters();
-
-		// First parameter needs to be defined
-		$first_param = array_shift($parameters);
-
-		// Signature is wrong if first parameter is empty
-		if (empty($first_param))
-		{
-			return $function_layout;
-		}
-
-		// Try to get class from first parameter
-		try
-		{
-			$first_param->getClass()->name;
-		}
-		catch (Exception $e)
-		{
-			return $function_layout;
-		}
-
-		// First parameter needs to be an instance of phpbb_$phpbb_plugin and parameter must be $object
-		if ($first_param->getClass()->name !== $instance_of || $first_param->getName() !== 'object')
-		{
-			return $function_layout;
-		}
-
-		// If the action is 'return' we also check for an existing $result parameter
-		if ($mode == phpbb::METHOD_INJECT && $action == 'return')
-		{
-			$first_param = array_shift($parameters);
-
-			// If no result is passed, or the name not $result or the $result being optional, then the signature is wrong
-			if (empty($first_param) || $first_param->getName() !== 'result' || $first_param->isOptional())
-			{
-				return $function_layout;
-			}
-		}
-
-		// Everything ok
-		return true;
-	}
-}
-
-/**
-* Interface for phpBB plugin info
-*/
-interface phpbb_plugin_info
-{
-	/**
-	* Setup plugin information
-	*
-	* @param phpbb_plugins $object	The {@link phpbb_plugins plugins object} passed
-	*/
-	public function setup_plugin(phpbb_plugins $object);
-}
-
-/**
-* Interface for phpBB plugin setup
-*/
-interface phpbb_plugin_setup
-{
-	/**
-	* Setup specific class within the plugin
-	*
-	* @param phpbb_plugin_support $object	The injected object... supports {@link phpbb_plugin_support plugins}
-	*/
-	function setup_plugin(phpbb_plugin_support $object);
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/posting.php b/phpBB/posting.php
deleted file mode 100644
index 4c0dcc2481..0000000000
--- a/phpBB/posting.php
+++ /dev/null
@@ -1,1453 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-define('IN_PHPBB', true);
-if (!defined('PHPBB_ROOT_PATH')) define('PHPBB_ROOT_PATH', './');
-if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-include(PHPBB_ROOT_PATH . 'common.' . PHP_EXT);
-include(PHPBB_ROOT_PATH . 'includes/functions_posting.' . PHP_EXT);
-include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-include(PHPBB_ROOT_PATH . 'includes/message_parser.' . PHP_EXT);
-
-
-// Start session management
-phpbb::$user->session_begin();
-phpbb::$acl->init(phpbb::$user->data);
-
-
-// Grab only parameters needed here
-$post_id	= request_var('p', 0);
-$topic_id	= request_var('t', 0);
-$forum_id	= request_var('f', 0);
-$draft_id	= request_var('d', 0);
-$lastclick	= request_var('lastclick', 0);
-
-$submit		= phpbb_request::is_set_post('post');
-$preview	= phpbb_request::is_set_post('preview');
-$save		= phpbb_request::is_set_post('save');
-$load		= phpbb_request::is_set_post('load');
-$delete		= phpbb_request::is_set_post('delete');
-$cancel		= (phpbb_request::is_set_post('cancel') && !phpbb_request::is_set_post('save')) ? true : false;
-
-$refresh	= (phpbb_request::is_set_post('add_file') || phpbb_request::is_set_post('delete_file') || phpbb_request::is_set_post('cancel_unglobalise') || $save || $load) ? true : false;
-$mode		= ($delete && !$preview && !$refresh && $submit) ? 'delete' : request_var('mode', '');
-
-$error = $post_data = array();
-$current_time = time();
-
-if (phpbb::$config['enable_post_confirm'] && !phpbb::$user->is_registered)
-{
-	include(PHPBB_ROOT_PATH . 'includes/captcha/captcha_factory.' . PHP_EXT);
-	$captcha = phpbb_captcha_factory::get_instance(phpbb::$config['captcha_plugin']);
-	$captcha->init(CONFIRM_POST);
-}
-
-// Was cancel pressed? If so then redirect to the appropriate page
-if ($cancel || ($current_time - $lastclick < 2 && $submit))
-{
-	$f = ($forum_id) ? 'f=' . $forum_id . '&amp;' : '';
-	$redirect = ($post_id) ? append_sid('viewtopic', $f . 'p=' . $post_id) . '#p' . $post_id : (($topic_id) ? append_sid('viewtopic', $f . 't=' . $topic_id) : (($forum_id) ? append_sid('viewforum', 'f=' . $forum_id) : append_sid('index')));
-	redirect($redirect);
-}
-
-if (in_array($mode, array('post', 'reply', 'quote', 'edit', 'delete')) && !$forum_id)
-{
-	trigger_error('NO_FORUM');
-}
-
-// We need to know some basic information in all cases before we do anything.
-switch ($mode)
-{
-	case 'post':
-		$sql = 'SELECT *
-			FROM ' . FORUMS_TABLE . "
-			WHERE forum_id = $forum_id";
-	break;
-
-	case 'bump':
-	case 'reply':
-		if (!$topic_id)
-		{
-			trigger_error('NO_TOPIC');
-		}
-
-		$sql = 'SELECT f.*, t.*
-			FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f
-			WHERE t.topic_id = $topic_id
-				AND (f.forum_id = t.forum_id
-					OR f.forum_id = $forum_id)";
-	break;
-
-	case 'quote':
-	case 'edit':
-	case 'delete':
-		if (!$post_id)
-		{
-			phpbb::$user->setup('posting');
-			trigger_error('NO_POST');
-		}
-
-		$sql = 'SELECT f.*, t.*, p.*, u.username, u.username_clean, u.user_sig, u.user_sig_bbcode_uid, u.user_sig_bbcode_bitfield
-			FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . ' f, ' . USERS_TABLE . " u
-			WHERE p.post_id = $post_id
-				AND t.topic_id = p.topic_id
-				AND u.user_id = p.poster_id
-				AND (f.forum_id = t.forum_id
-					OR f.forum_id = $forum_id)" .
-				(($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND p.post_approved = 1');
-	break;
-
-	case 'smilies':
-		$sql = '';
-		generate_smilies('window', $forum_id);
-	break;
-
-	case 'popup':
-		if ($forum_id)
-		{
-			$sql = 'SELECT forum_style
-				FROM ' . FORUMS_TABLE . '
-				WHERE forum_id = ' . $forum_id;
-		}
-		else
-		{
-			upload_popup();
-			return;
-		}
-	break;
-
-	default:
-		$sql = '';
-	break;
-}
-
-if (!$sql)
-{
-	phpbb::$user->setup('posting');
-	trigger_error('NO_POST_MODE');
-}
-
-$result = phpbb::$db->sql_query($sql);
-$post_data = phpbb::$db->sql_fetchrow($result);
-phpbb::$db->sql_freeresult($result);
-
-if (!$post_data)
-{
-	if (!($mode == 'post' || $mode == 'bump' || $mode == 'reply'))
-	{
-		phpbb::$user->setup('posting');
-	}
-	trigger_error(($mode == 'post' || $mode == 'bump' || $mode == 'reply') ? 'NO_TOPIC' : 'NO_POST');
-}
-
-if ($mode == 'popup')
-{
-	upload_popup($post_data['forum_style']);
-	return;
-}
-
-phpbb::$user->setup(array('posting', 'mcp', 'viewtopic'), $post_data['forum_style']);
-
-// Use post_row values in favor of submitted ones...
-$forum_id	= (!empty($post_data['forum_id'])) ? (int) $post_data['forum_id'] : (int) $forum_id;
-$topic_id	= (!empty($post_data['topic_id'])) ? (int) $post_data['topic_id'] : (int) $topic_id;
-$post_id	= (!empty($post_data['post_id'])) ? (int) $post_data['post_id'] : (int) $post_id;
-
-// Need to login to passworded forum first?
-if ($post_data['forum_password'])
-{
-	login_forum_box(array(
-		'forum_id'			=> $forum_id,
-		'forum_password'	=> $post_data['forum_password'])
-	);
-}
-
-// Check permissions
-if (phpbb::$user->is_bot)
-{
-	redirect(append_sid('index'));
-}
-
-// Is the user able to read within this forum?
-if (!phpbb::$acl->acl_get('f_read', $forum_id))
-{
-	if (!phpbb::$user->is_guest)
-	{
-		trigger_error('USER_CANNOT_READ');
-	}
-
-	login_box('', phpbb::$user->lang['LOGIN_EXPLAIN_POST']);
-}
-
-// Permission to do the action asked?
-$is_authed = false;
-
-switch ($mode)
-{
-	case 'post':
-		if (phpbb::$acl->acl_get('f_post', $forum_id))
-		{
-			$is_authed = true;
-		}
-	break;
-
-	case 'bump':
-		if (phpbb::$acl->acl_get('f_bump', $forum_id))
-		{
-			$is_authed = true;
-		}
-	break;
-
-	case 'quote':
-
-		$post_data['post_edit_locked'] = 0;
-
-	// no break;
-
-	case 'reply':
-		if (phpbb::$acl->acl_get('f_reply', $forum_id))
-		{
-			$is_authed = true;
-		}
-	break;
-
-	case 'edit':
-		if (phpbb::$user->is_registered && phpbb::$acl->acl_gets('f_edit', 'm_edit', $forum_id))
-		{
-			$is_authed = true;
-		}
-	break;
-
-	case 'delete':
-		if (phpbb::$user->is_registered && phpbb::$acl->acl_gets('f_delete', 'm_delete', $forum_id))
-		{
-			$is_authed = true;
-		}
-	break;
-}
-
-if (!$is_authed)
-{
-	$check_auth = ($mode == 'quote') ? 'reply' : $mode;
-
-	if (phpbb::$user->is_registered)
-	{
-		trigger_error('USER_CANNOT_' . strtoupper($check_auth));
-	}
-
-	login_box('', phpbb::$user->lang['LOGIN_EXPLAIN_' . strtoupper($mode)]);
-}
-
-// Is the user able to post within this forum?
-if ($post_data['forum_type'] != FORUM_POST && in_array($mode, array('post', 'bump', 'quote', 'reply')))
-{
-	trigger_error('USER_CANNOT_FORUM_POST');
-}
-
-// Forum/Topic locked?
-if (($post_data['forum_status'] == ITEM_LOCKED || (isset($post_data['topic_status']) && $post_data['topic_status'] == ITEM_LOCKED)) && !phpbb::$acl->acl_get('m_edit', $forum_id))
-{
-	trigger_error(($post_data['forum_status'] == ITEM_LOCKED) ? 'FORUM_LOCKED' : 'TOPIC_LOCKED');
-}
-
-// Can we edit this post ... if we're a moderator with rights then always yes
-// else it depends on editing times, lock status and if we're the correct user
-if ($mode == 'edit' && !phpbb::$acl->acl_get('m_edit', $forum_id))
-{
-	if (phpbb::$user->data['user_id'] != $post_data['poster_id'])
-	{
-		trigger_error('USER_CANNOT_EDIT');
-	}
-
-	if (!($post_data['post_time'] > time() - (phpbb::$config['edit_time'] * 60) || !phpbb::$config['edit_time']))
-	{
-		trigger_error('CANNOT_EDIT_TIME');
-	}
-
-	if ($post_data['post_edit_locked'])
-	{
-		trigger_error('CANNOT_EDIT_POST_LOCKED');
-	}
-}
-
-// Handle delete mode...
-if ($mode == 'delete')
-{
-	handle_post_delete($forum_id, $topic_id, $post_id, $post_data);
-	return;
-}
-
-// Handle bump mode...
-if ($mode == 'bump')
-{
-	if ($bump_time = bump_topic_allowed($forum_id, $post_data['topic_bumped'], $post_data['topic_last_post_time'], $post_data['topic_poster'], $post_data['topic_last_poster_id'])
-	   && check_link_hash(request_var('hash', ''), "topic_{$post_data['topic_id']}"))
-	{
-		phpbb::$db->sql_transaction('begin');
-
-		$sql = 'UPDATE ' . POSTS_TABLE . "
-			SET post_time = $current_time
-			WHERE post_id = {$post_data['topic_last_post_id']}
-				AND topic_id = $topic_id";
-		phpbb::$db->sql_query($sql);
-
-		$sql = 'UPDATE ' . TOPICS_TABLE . "
-			SET topic_last_post_time = $current_time,
-				topic_bumped = 1,
-				topic_bumper = " . phpbb::$user->data['user_id'] . "
-			WHERE topic_id = $topic_id";
-		phpbb::$db->sql_query($sql);
-
-		update_post_information('forum', $forum_id);
-
-		$sql = 'UPDATE ' . USERS_TABLE . "
-			SET user_lastpost_time = $current_time
-			WHERE user_id = " . phpbb::$user->data['user_id'];
-		phpbb::$db->sql_query($sql);
-
-		phpbb::$db->sql_transaction('commit');
-
-		markread('post', $forum_id, $topic_id, $current_time);
-
-		add_log('mod', $forum_id, $topic_id, 'LOG_BUMP_TOPIC', $post_data['topic_title']);
-
-		$meta_url = append_sid('viewtopic', "f=$forum_id&amp;t=$topic_id&amp;p={$post_data['topic_last_post_id']}") . "#p{$post_data['topic_last_post_id']}";
-		meta_refresh(3, $meta_url);
-
-		$message = phpbb::$user->lang['TOPIC_BUMPED'] . '<br /><br />' . sprintf(phpbb::$user->lang['VIEW_MESSAGE'], '<a href="' . $meta_url . '">', '</a>');
-		$message .= '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_FORUM'], '<a href="' . append_sid('viewforum', 'f=' . $forum_id) . '">', '</a>');
-
-		trigger_error($message);
-	}
-
-	trigger_error('BUMP_ERROR');
-}
-
-// Subject length limiting to 60 characters if first post...
-if ($mode == 'post' || ($mode == 'edit' && $post_data['topic_first_post_id'] == $post_data['post_id']))
-{
-	phpbb::$template->assign_var('S_NEW_MESSAGE', true);
-}
-
-// Determine some vars
-if (isset($post_data['poster_id']) && $post_data['poster_id'] == ANONYMOUS)
-{
-	$post_data['quote_username'] = (!empty($post_data['post_username'])) ? $post_data['post_username'] : phpbb::$user->lang['GUEST'];
-}
-else
-{
-	$post_data['quote_username'] = isset($post_data['username']) ? $post_data['username'] : '';
-}
-
-$post_data['post_edit_locked']	= (isset($post_data['post_edit_locked'])) ? (int) $post_data['post_edit_locked'] : 0;
-$post_data['post_subject']		= (in_array($mode, array('quote', 'edit'))) ? $post_data['post_subject'] : ((isset($post_data['topic_title'])) ? $post_data['topic_title'] : '');
-$post_data['topic_time_limit']	= (isset($post_data['topic_time_limit'])) ? (($post_data['topic_time_limit']) ? (int) $post_data['topic_time_limit'] / 86400 : (int) $post_data['topic_time_limit']) : 0;
-$post_data['poll_length']		= (!empty($post_data['poll_length'])) ? (int) $post_data['poll_length'] / 86400 : 0;
-$post_data['poll_start']		= (!empty($post_data['poll_start'])) ? (int) $post_data['poll_start'] : 0;
-$post_data['icon_id']			= (!isset($post_data['icon_id']) || in_array($mode, array('quote', 'reply'))) ? 0 : (int) $post_data['icon_id'];
-$post_data['poll_options']		= array();
-
-// Get Poll Data
-if ($post_data['poll_start'])
-{
-	$sql = 'SELECT poll_option_text
-		FROM ' . POLL_OPTIONS_TABLE . "
-		WHERE topic_id = $topic_id
-		ORDER BY poll_option_id";
-	$result = phpbb::$db->sql_query($sql);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$post_data['poll_options'][] = trim($row['poll_option_text']);
-	}
-	phpbb::$db->sql_freeresult($result);
-}
-
-$orig_poll_options_size = sizeof($post_data['poll_options']);
-
-$message_parser = new parse_message();
-
-if (isset($post_data['post_text']))
-{
-	$message_parser->message = &$post_data['post_text'];
-	unset($post_data['post_text']);
-}
-
-// Set some default variables
-$uninit = array('post_attachment' => 0, 'poster_id' => phpbb::$user->data['user_id'], 'enable_magic_url' => 0, 'topic_status' => 0, 'topic_type' => POST_NORMAL, 'post_subject' => '', 'topic_title' => '', 'post_time' => 0, 'post_edit_reason' => '', 'notify_set' => 0);
-
-foreach ($uninit as $var_name => $default_value)
-{
-	if (!isset($post_data[$var_name]))
-	{
-		$post_data[$var_name] = $default_value;
-	}
-}
-unset($uninit);
-
-// Always check if the submitted attachment data is valid and belongs to the user.
-// Further down (especially in submit_post()) we do not check this again.
-$message_parser->get_submitted_attachment_data($post_data['poster_id']);
-
-if ($post_data['post_attachment'] && !$submit && !$refresh && !$preview && $mode == 'edit')
-{
-	// Do not change to SELECT *
-	$sql = 'SELECT attach_id, is_orphan, attach_comment, real_filename
-		FROM ' . ATTACHMENTS_TABLE . "
-		WHERE post_msg_id = $post_id
-			AND in_message = 0
-			AND is_orphan = 0
-		ORDER BY filetime DESC";
-	$result = phpbb::$db->sql_query($sql);
-	$message_parser->attachment_data = array_merge($message_parser->attachment_data, phpbb::$db->sql_fetchrowset($result));
-	phpbb::$db->sql_freeresult($result);
-}
-
-if ($post_data['poster_id'] == ANONYMOUS)
-{
-	$post_data['username'] = ($mode == 'quote' || $mode == 'edit') ? trim($post_data['post_username']) : '';
-}
-else
-{
-	$post_data['username'] = ($mode == 'quote' || $mode == 'edit') ? trim($post_data['username']) : '';
-}
-
-$post_data['enable_urls'] = $post_data['enable_magic_url'];
-
-if ($mode != 'edit')
-{
-	$post_data['enable_sig']		= (phpbb::$config['allow_sig'] && phpbb::$user->optionget('attachsig')) ? true: false;
-	$post_data['enable_smilies']	= (phpbb::$config['allow_smilies'] && phpbb::$user->optionget('smilies')) ? true : false;
-	$post_data['enable_bbcode']		= (phpbb::$config['allow_bbcode'] && phpbb::$user->optionget('bbcode')) ? true : false;
-	$post_data['enable_urls']		= true;
-}
-
-$post_data['enable_magic_url'] = $post_data['drafts'] = false;
-
-// User own some drafts?
-if (phpbb::$user->is_registered && phpbb::$acl->acl_get('u_savedrafts') && ($mode == 'reply' || $mode == 'post' || $mode == 'quote'))
-{
-	$sql = 'SELECT draft_id
-		FROM ' . DRAFTS_TABLE . '
-		WHERE user_id = ' . phpbb::$user->data['user_id'] .
-			(($forum_id) ? ' AND forum_id = ' . (int) $forum_id : '') .
-			(($topic_id) ? ' AND topic_id = ' . (int) $topic_id : '') .
-			(($draft_id) ? " AND draft_id <> $draft_id" : '');
-	$result = phpbb::$db->sql_query_limit($sql, 1);
-
-	if (phpbb::$db->sql_fetchrow($result))
-	{
-		$post_data['drafts'] = true;
-	}
-	phpbb::$db->sql_freeresult($result);
-}
-
-$check_value = (($post_data['enable_bbcode']+1) << 8) + (($post_data['enable_smilies']+1) << 4) + (($post_data['enable_urls']+1) << 2) + (($post_data['enable_sig']+1) << 1);
-
-// Check if user is watching this topic
-if ($mode != 'post' && phpbb::$config['allow_topic_notify'] && phpbb::$user->is_registered)
-{
-	$sql = 'SELECT topic_id
-		FROM ' . TOPICS_WATCH_TABLE . '
-		WHERE topic_id = ' . $topic_id . '
-			AND user_id = ' . phpbb::$user->data['user_id'];
-	$result = phpbb::$db->sql_query($sql);
-	$post_data['notify_set'] = (int) phpbb::$db->sql_fetchfield('topic_id');
-	phpbb::$db->sql_freeresult($result);
-}
-
-// Do we want to edit our post ?
-if ($mode == 'edit' && $post_data['bbcode_uid'])
-{
-	$message_parser->bbcode_uid = $post_data['bbcode_uid'];
-}
-
-// HTML, BBCode, Smilies, Images and Flash status
-$bbcode_status	= (phpbb::$config['allow_bbcode'] && phpbb::$acl->acl_get('f_bbcode', $forum_id)) ? true : false;
-$smilies_status	= ($bbcode_status && phpbb::$config['allow_smilies'] && phpbb::$acl->acl_get('f_smilies', $forum_id)) ? true : false;
-$img_status		= ($bbcode_status && phpbb::$acl->acl_get('f_img', $forum_id)) ? true : false;
-$url_status		= (phpbb::$config['allow_post_links']) ? true : false;
-$flash_status	= ($bbcode_status && phpbb::$acl->acl_get('f_flash', $forum_id) && phpbb::$config['allow_post_flash']) ? true : false;
-$quote_status	= (phpbb::$acl->acl_get('f_reply', $forum_id)) ? true : false;
-
-// Save Draft
-if ($save && phpbb::$user->is_registered && phpbb::$acl->acl_get('u_savedrafts') && ($mode == 'reply' || $mode == 'post' || $mode == 'quote'))
-{
-	$subject = utf8_normalize_nfc(request_var('subject', '', true));
-	$subject = (!$subject && $mode != 'post') ? $post_data['topic_title'] : $subject;
-	$message = utf8_normalize_nfc(request_var('message', '', true));
-
-	if ($subject && $message)
-	{
-		if (confirm_box(true))
-		{
-			$sql = 'INSERT INTO ' . DRAFTS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', array(
-				'user_id'		=> (int) phpbb::$user->data['user_id'],
-				'topic_id'		=> (int) $topic_id,
-				'forum_id'		=> (int) $forum_id,
-				'save_time'		=> (int) $current_time,
-				'draft_subject'	=> (string) $subject,
-				'draft_message'	=> (string) $message)
-			);
-			phpbb::$db->sql_query($sql);
-
-			$meta_info = ($mode == 'post') ? append_sid('viewforum', 'f=' . $forum_id) : append_sid('viewtopic', "f=$forum_id&amp;t=$topic_id");
-
-			meta_refresh(3, $meta_info);
-
-			$message = phpbb::$user->lang['DRAFT_SAVED'] . '<br /><br />';
-			$message .= ($mode != 'post') ? sprintf(phpbb::$user->lang['RETURN_TOPIC'], '<a href="' . $meta_info . '">', '</a>') . '<br /><br />' : '';
-			$message .= sprintf(phpbb::$user->lang['RETURN_FORUM'], '<a href="' . append_sid('viewforum', 'f=' . $forum_id) . '">', '</a>');
-
-			trigger_error($message);
-		}
-		else
-		{
-			$s_hidden_fields = build_hidden_fields(array(
-				'mode'		=> $mode,
-				'save'		=> true,
-				'f'			=> $forum_id,
-				't'			=> $topic_id,
-				'subject'	=> $subject,
-				'message'	=> $message,
-				'attachment_data' => $message_parser->attachment_data,
-				)
-			);
-
-			confirm_box(false, 'SAVE_DRAFT', $s_hidden_fields);
-		}
-	}
-	else
-	{
-		if (utf8_clean_string($subject) === '')
-		{
-			$error[] = phpbb::$user->lang['EMPTY_SUBJECT'];
-		}
-
-		if (utf8_clean_string($message) === '')
-		{
-			$error[] = phpbb::$user->lang['TOO_FEW_CHARS'];
-		}
-	}
-	unset($subject, $message);
-}
-
-// Load requested Draft
-if ($draft_id && ($mode == 'reply' || $mode == 'quote' || $mode == 'post') && phpbb::$user->is_registered && phpbb::$acl->acl_get('u_savedrafts'))
-{
-	$sql = 'SELECT draft_subject, draft_message
-		FROM ' . DRAFTS_TABLE . "
-		WHERE draft_id = $draft_id
-			AND user_id = " . phpbb::$user->data['user_id'];
-	$result = phpbb::$db->sql_query_limit($sql, 1);
-	$row = phpbb::$db->sql_fetchrow($result);
-	phpbb::$db->sql_freeresult($result);
-
-	if ($row)
-	{
-		$post_data['post_subject'] = $row['draft_subject'];
-		$message_parser->message = $row['draft_message'];
-
-		phpbb::$template->assign_var('S_DRAFT_LOADED', true);
-	}
-	else
-	{
-		$draft_id = 0;
-	}
-}
-
-// Load draft overview
-if ($load && ($mode == 'reply' || $mode == 'quote' || $mode == 'post') && $post_data['drafts'])
-{
-	load_drafts($topic_id, $forum_id);
-}
-
-$solved_captcha = false;
-
-if ($submit || $preview || $refresh)
-{
-	$edit_reason = utf8_normalize_nfc(request_var('edit_reason', '', true));
-
-	$post_data['topic_cur_post_id']	= request_var('topic_cur_post_id', 0);
-	$post_data['post_subject']		= utf8_normalize_nfc(request_var('subject', '', true));
-	$message_parser->message		= utf8_normalize_nfc(request_var('message', '', true));
-
-	$post_data['username']			= utf8_normalize_nfc(request_var('username', $post_data['username'], true));
-	$post_data['post_edit_reason']	= (!empty($edit_reason) && $mode == 'edit' && phpbb::$acl->acl_get('m_edit', $forum_id)) ? $edit_reason : '';
-
-	$post_data['orig_topic_type']	= $post_data['topic_type'];
-	$post_data['topic_type']		= request_var('topic_type', (($mode != 'post') ? (int) $post_data['topic_type'] : POST_NORMAL));
-	$post_data['topic_time_limit']	= request_var('topic_time_limit', (($mode != 'post') ? (int) $post_data['topic_time_limit'] : 0));
-	$post_data['icon_id']			= request_var('icon', 0);
-
-	$post_data['enable_bbcode']		= (!$bbcode_status || phpbb_request::is_set_post('disable_bbcode')) ? false : true;
-	$post_data['enable_smilies']	= (!$smilies_status || phpbb_request::is_set_post('disable_smilies')) ? false : true;
-	$post_data['enable_urls']		= phpbb_request::is_set_post('disable_magic_url');
-	$post_data['enable_sig']		= (!phpbb::$config['allow_sig'] || !phpbb::$acl->acl_get('f_sigs', $forum_id) || !phpbb::$acl->acl_get('u_sig')) ? false : ((phpbb_request::is_set_post('attach_sig') && phpbb::$user->is_registered) ? true : false);
-
-	if (phpbb::$config['allow_topic_notify'] && phpbb::$user->is_registered)
-	{
-		$notify = phpbb_request::is_set_post('notify');
-	}
-	else
-	{
-		$notify = false;
-	}
-
-	$topic_lock			= phpbb_request::is_set_post('lock_topic');
-	$post_lock			= phpbb_request::is_set_post('lock_post');
-	$poll_delete		= phpbb_request::is_set_post('poll_delete');
-
-	if ($submit)
-	{
-		$status_switch = (($post_data['enable_bbcode']+1) << 8) + (($post_data['enable_smilies']+1) << 4) + (($post_data['enable_urls']+1) << 2) + (($post_data['enable_sig']+1) << 1);
-		$status_switch = ($status_switch != $check_value);
-	}
-	else
-	{
-		$status_switch = 1;
-	}
-
-	// Delete Poll
-	if ($poll_delete && $mode == 'edit' && sizeof($post_data['poll_options']) &&
-		((!$post_data['poll_last_vote'] && $post_data['poster_id'] == phpbb::$user->data['user_id'] && phpbb::$acl->acl_get('f_delete', $forum_id)) || phpbb::$acl->acl_get('m_delete', $forum_id)))
-	{
-		if ($submit && check_form_key('posting'))
-		{
-			$sql = 'DELETE FROM ' . POLL_OPTIONS_TABLE . "
-				WHERE topic_id = $topic_id";
-			phpbb::$db->sql_query($sql);
-
-			$sql = 'DELETE FROM ' . POLL_VOTES_TABLE . "
-				WHERE topic_id = $topic_id";
-			phpbb::$db->sql_query($sql);
-
-			$topic_sql = array(
-				'poll_title'		=> '',
-				'poll_start' 		=> 0,
-				'poll_length'		=> 0,
-				'poll_last_vote'	=> 0,
-				'poll_max_options'	=> 0,
-				'poll_vote_change'	=> 0
-			);
-
-			$sql = 'UPDATE ' . TOPICS_TABLE . '
-				SET ' . phpbb::$db->sql_build_array('UPDATE', $topic_sql) . "
-				WHERE topic_id = $topic_id";
-			phpbb::$db->sql_query($sql);
-		}
-
-		$post_data['poll_title'] = $post_data['poll_option_text'] = '';
-		$post_data['poll_vote_change'] = $post_data['poll_max_options'] = $post_data['poll_length'] = 0;
-	}
-	else
-	{
-		$post_data['poll_title']		= utf8_normalize_nfc(request_var('poll_title', '', true));
-		$post_data['poll_length']		= request_var('poll_length', 0);
-		$post_data['poll_option_text']	= utf8_normalize_nfc(request_var('poll_option_text', '', true));
-		$post_data['poll_max_options']	= request_var('poll_max_options', 1);
-		$post_data['poll_vote_change']	= (phpbb::$acl->acl_get('f_votechg', $forum_id) && phpbb_request::is_set_post('poll_vote_change')) ? 1 : 0;
-	}
-
-	// If replying/quoting and last post id has changed
-	// give user option to continue submit or return to post
-	// notify and show user the post made between his request and the final submit
-	if (($mode == 'reply' || $mode == 'quote') && $post_data['topic_cur_post_id'] && $post_data['topic_cur_post_id'] != $post_data['topic_last_post_id'])
-	{
-		// Only do so if it is allowed forum-wide
-		if ($post_data['forum_flags'] & FORUM_FLAG_POST_REVIEW)
-		{
-			if (topic_review($topic_id, $forum_id, 'post_review', $post_data['topic_cur_post_id']))
-			{
-				phpbb::$template->assign_var('S_POST_REVIEW', true);
-			}
-
-			$submit = false;
-			$refresh = true;
-		}
-	}
-
-	// Parse Attachments - before checksum is calculated
-	$message_parser->parse_attachments('fileupload', $mode, $forum_id, $submit, $preview, $refresh);
-
-	// Grab md5 'checksum' of new message
-	$message_md5 = md5($message_parser->message);
-
-	// Check checksum ... don't re-parse message if the same
-	$update_message = ($mode != 'edit' || $message_md5 != $post_data['post_checksum'] || $status_switch || strlen($post_data['bbcode_uid']) < BBCODE_UID_LEN) ? true : false;
-
-	// Parse message
-	if ($update_message)
-	{
-		if (sizeof($message_parser->warn_msg))
-		{
-			$error[] = implode('<br />', $message_parser->warn_msg);
-			$message_parser->warn_msg = array();
-		}
-
-		$message_parser->parse($post_data['enable_bbcode'], (phpbb::$config['allow_post_links']) ? $post_data['enable_urls'] : false, $post_data['enable_smilies'], $img_status, $flash_status, $quote_status, phpbb::$config['allow_post_links']);
-
-		// On a refresh we do not care about message parsing errors
-		if (sizeof($message_parser->warn_msg) && $refresh)
-		{
-			$message_parser->warn_msg = array();
-		}
-	}
-	else
-	{
-		$message_parser->bbcode_bitfield = $post_data['bbcode_bitfield'];
-	}
-
-	if ($mode != 'edit' && !$preview && !$refresh && phpbb::$config['flood_interval'] && !phpbb::$acl->acl_get('f_ignoreflood', $forum_id))
-	{
-		// Flood check
-		$last_post_time = 0;
-
-		if (phpbb::$user->is_registered)
-		{
-			$last_post_time = phpbb::$user->data['user_lastpost_time'];
-		}
-		else
-		{
-			$sql = 'SELECT post_time AS last_post_time
-				FROM ' . POSTS_TABLE . "
-				WHERE poster_ip = '" . phpbb::$user->ip . "'
-					AND post_time > " . ($current_time - phpbb::$config['flood_interval']);
-			$result = phpbb::$db->sql_query_limit($sql, 1);
-			if ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$last_post_time = $row['last_post_time'];
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		if ($last_post_time && ($current_time - $last_post_time) < intval(phpbb::$config['flood_interval']))
-		{
-			$error[] = phpbb::$user->lang['FLOOD_ERROR'];
-		}
-	}
-
-	// Validate username
-	if (($post_data['username'] && !phpbb::$user->is_registered) || ($mode == 'edit' && $post_data['poster_id'] == ANONYMOUS && $post_data['username'] && $post_data['post_username'] && $post_data['post_username'] != $post_data['username']))
-	{
-		include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-
-		if (($result = validate_username($post_data['username'], (!empty($post_data['post_username'])) ? $post_data['post_username'] : '')) !== false)
-		{
-			phpbb::$user->add_lang('ucp');
-			$error[] = phpbb::$user->lang[$result . '_USERNAME'];
-		}
-	}
-
-	if (phpbb::$config['enable_post_confirm'] && !phpbb::$user->is_registered && in_array($mode, array('quote', 'post', 'reply')))
-	{
-		$vc_response = $captcha->validate();
-		if ($vc_response)
-		{
-			$error[] = $vc_response;
-		}
-		else
-		{
-			$solved_captcha = true;
-		}
-	}
-
-	// check form
-	if (($submit || $preview) && !check_form_key('posting'))
-	{
-		$error[] = phpbb::$user->lang['FORM_INVALID'];
-	}
-
-	// Parse subject
-	if (!$preview && !$refresh && utf8_clean_string($post_data['post_subject']) === '' && ($mode == 'post' || ($mode == 'edit' && $post_data['topic_first_post_id'] == $post_id)))
-	{
-		$error[] = phpbb::$user->lang['EMPTY_SUBJECT'];
-	}
-
-	$post_data['poll_last_vote'] = (isset($post_data['poll_last_vote'])) ? $post_data['poll_last_vote'] : 0;
-
-	if ($post_data['poll_option_text'] &&
-		($mode == 'post' || ($mode == 'edit' && $post_id == $post_data['topic_first_post_id']/* && (!$post_data['poll_last_vote'] || phpbb::$acl->acl_get('m_edit', $forum_id))*/))
-		&& phpbb::$acl->acl_get('f_poll', $forum_id))
-	{
-		$poll = array(
-			'poll_title'		=> $post_data['poll_title'],
-			'poll_length'		=> $post_data['poll_length'],
-			'poll_max_options'	=> $post_data['poll_max_options'],
-			'poll_option_text'	=> $post_data['poll_option_text'],
-			'poll_start'		=> $post_data['poll_start'],
-			'poll_last_vote'	=> $post_data['poll_last_vote'],
-			'poll_vote_change'	=> $post_data['poll_vote_change'],
-			'enable_bbcode'		=> $post_data['enable_bbcode'],
-			'enable_urls'		=> $post_data['enable_urls'],
-			'enable_smilies'	=> $post_data['enable_smilies'],
-			'img_status'		=> $img_status
-		);
-
-		$message_parser->parse_poll($poll);
-
-		$post_data['poll_options'] = (isset($poll['poll_options'])) ? $poll['poll_options'] : '';
-		$post_data['poll_title'] = (isset($poll['poll_title'])) ? $poll['poll_title'] : '';
-
-		/* We reset votes, therefore also allow removing options
-		if ($post_data['poll_last_vote'] && ($poll['poll_options_size'] < $orig_poll_options_size))
-		{
-			$message_parser->warn_msg[] = phpbb::$user->lang['NO_DELETE_POLL_OPTIONS'];
-		}*/
-	}
-	else
-	{
-		$poll = array();
-	}
-
-	// Check topic type
-	if ($post_data['topic_type'] != POST_NORMAL && ($mode == 'post' || ($mode == 'edit' && $post_data['topic_first_post_id'] == $post_id)))
-	{
-		switch ($post_data['topic_type'])
-		{
-			case POST_GLOBAL:
-			case POST_ANNOUNCE:
-				$auth_option = 'f_announce';
-			break;
-
-			case POST_STICKY:
-				$auth_option = 'f_sticky';
-			break;
-
-			default:
-				$auth_option = '';
-			break;
-		}
-
-		if (!phpbb::$acl->acl_get($auth_option, $forum_id))
-		{
-			// There is a special case where a user edits his post whereby the topic type got changed by an admin/mod.
-			// Another case would be a mod not having sticky permissions for example but edit permissions.
-			if ($mode == 'edit')
-			{
-				// To prevent non-authed users messing around with the topic type we reset it to the original one.
-				$post_data['topic_type'] = $post_data['orig_topic_type'];
-			}
-			else
-			{
-				$error[] = phpbb::$user->lang['CANNOT_POST_' . str_replace('F_', '', strtoupper($auth_option))];
-			}
-		}
-	}
-
-	if (sizeof($message_parser->warn_msg))
-	{
-		$error[] = implode('<br />', $message_parser->warn_msg);
-	}
-
-	// DNSBL check
-	if (phpbb::$config['check_dnsbl'] && !$refresh)
-	{
-		if (($dnsbl = phpbb::$user->check_dnsbl('post')) !== false)
-		{
-			$error[] = sprintf(phpbb::$user->lang['IP_BLACKLISTED'], phpbb::$user->ip, $dnsbl[1]);
-		}
-	}
-
-	// Store message, sync counters
-	if (!sizeof($error) && $submit)
-	{
-		// Check if we want to de-globalize the topic... and ask for new forum
-		if ($post_data['topic_type'] != POST_GLOBAL)
-		{
-			$sql = 'SELECT topic_type, forum_id
-				FROM ' . TOPICS_TABLE . "
-				WHERE topic_id = $topic_id";
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if ($row && !$row['forum_id'] && $row['topic_type'] == POST_GLOBAL)
-			{
-				$to_forum_id = request_var('to_forum_id', 0);
-
-				if ($to_forum_id)
-				{
-					$sql = 'SELECT forum_type
-						FROM ' . FORUMS_TABLE . '
-						WHERE forum_id = ' . $to_forum_id;
-					$result = phpbb::$db->sql_query($sql);
-					$forum_type = (int) phpbb::$db->sql_fetchfield('forum_type');
-					phpbb::$db->sql_freeresult($result);
-
-					if ($forum_type != FORUM_POST || !phpbb::$acl->acl_get('f_post', $to_forum_id))
-					{
-						$to_forum_id = 0;
-					}
-				}
-
-				if (!$to_forum_id)
-				{
-					include_once(PHPBB_ROOT_PATH . 'includes/functions_admin.' . PHP_EXT);
-
-					phpbb::$template->assign_vars(array(
-						'S_FORUM_SELECT'	=> make_forum_select(false, false, false, true, true, true),
-						'S_UNGLOBALISE'		=> true,
-					));
-
-					$submit = false;
-					$refresh = true;
-				}
-				else
-				{
-					if (!phpbb::$acl->acl_get('f_post', $to_forum_id))
-					{
-						// This will only be triggered if the user tried to trick the forum.
-						trigger_error('NOT_AUTHORISED');
-					}
-
-					$forum_id = $to_forum_id;
-				}
-			}
-		}
-
-		if ($submit)
-		{
-			// Lock/Unlock Topic
-			$change_topic_status = $post_data['topic_status'];
-			$perm_lock_unlock = (phpbb::$acl->acl_get('m_lock', $forum_id) || (phpbb::$acl->acl_get('f_user_lock', $forum_id) && phpbb::$user->is_registered && !empty($post_data['topic_poster']) && phpbb::$user->data['user_id'] == $post_data['topic_poster'] && $post_data['topic_status'] == ITEM_UNLOCKED)) ? true : false;
-
-			if ($post_data['topic_status'] == ITEM_LOCKED && !$topic_lock && $perm_lock_unlock)
-			{
-				$change_topic_status = ITEM_UNLOCKED;
-			}
-			else if ($post_data['topic_status'] == ITEM_UNLOCKED && $topic_lock && $perm_lock_unlock)
-			{
-				$change_topic_status = ITEM_LOCKED;
-			}
-
-			if ($change_topic_status != $post_data['topic_status'])
-			{
-				$sql = 'UPDATE ' . TOPICS_TABLE . "
-					SET topic_status = $change_topic_status
-					WHERE topic_id = $topic_id
-						AND topic_moved_id = 0";
-				phpbb::$db->sql_query($sql);
-
-				$user_lock = (phpbb::$acl->acl_get('f_user_lock', $forum_id) && phpbb::$user->is_registered && phpbb::$user->data['user_id'] == $post_data['topic_poster']) ? 'USER_' : '';
-
-				add_log('mod', $forum_id, $topic_id, 'LOG_' . $user_lock . (($change_topic_status == ITEM_LOCKED) ? 'LOCK' : 'UNLOCK'), $post_data['topic_title']);
-			}
-
-			// Lock/Unlock Post Edit
-			if ($mode == 'edit' && $post_data['post_edit_locked'] == ITEM_LOCKED && !$post_lock && phpbb::$acl->acl_get('m_edit', $forum_id))
-			{
-				$post_data['post_edit_locked'] = ITEM_UNLOCKED;
-			}
-			else if ($mode == 'edit' && $post_data['post_edit_locked'] == ITEM_UNLOCKED && $post_lock && phpbb::$acl->acl_get('m_edit', $forum_id))
-			{
-				$post_data['post_edit_locked'] = ITEM_LOCKED;
-			}
-
-			$data = array(
-				'topic_title'			=> (empty($post_data['topic_title'])) ? $post_data['post_subject'] : $post_data['topic_title'],
-				'topic_first_post_id'	=> (isset($post_data['topic_first_post_id'])) ? (int) $post_data['topic_first_post_id'] : 0,
-				'topic_last_post_id'	=> (isset($post_data['topic_last_post_id'])) ? (int) $post_data['topic_last_post_id'] : 0,
-				'topic_time_limit'		=> (int) $post_data['topic_time_limit'],
-				'topic_attachment'		=> (isset($post_data['topic_attachment'])) ? (int) $post_data['topic_attachment'] : 0,
-				'post_id'				=> (int) $post_id,
-				'topic_id'				=> (int) $topic_id,
-				'forum_id'				=> (int) $forum_id,
-				'icon_id'				=> (int) $post_data['icon_id'],
-				'poster_id'				=> (int) $post_data['poster_id'],
-				'enable_sig'			=> (bool) $post_data['enable_sig'],
-				'enable_bbcode'			=> (bool) $post_data['enable_bbcode'],
-				'enable_smilies'		=> (bool) $post_data['enable_smilies'],
-				'enable_urls'			=> (bool) $post_data['enable_urls'],
-				'enable_indexing'		=> (bool) $post_data['enable_indexing'],
-				'message_md5'			=> (string) $message_md5,
-				'post_time'				=> (isset($post_data['post_time'])) ? (int) $post_data['post_time'] : $current_time,
-				'post_checksum'			=> (isset($post_data['post_checksum'])) ? (string) $post_data['post_checksum'] : '',
-				'post_edit_reason'		=> $post_data['post_edit_reason'],
-				'post_edit_user'		=> ($mode == 'edit') ? phpbb::$user->data['user_id'] : ((isset($post_data['post_edit_user'])) ? (int) $post_data['post_edit_user'] : 0),
-				'forum_parents'			=> $post_data['forum_parents'],
-				'forum_name'			=> $post_data['forum_name'],
-				'notify'				=> $notify,
-				'notify_set'			=> $post_data['notify_set'],
-				'poster_ip'				=> (isset($post_data['poster_ip'])) ? $post_data['poster_ip'] : phpbb::$user->ip,
-				'post_edit_locked'		=> (int) $post_data['post_edit_locked'],
-				'bbcode_bitfield'		=> $message_parser->bbcode_bitfield,
-				'bbcode_uid'			=> $message_parser->bbcode_uid,
-				'message'				=> $message_parser->message,
-				'attachment_data'		=> $message_parser->attachment_data,
-				'filename_data'			=> $message_parser->filename_data,
-
-				'topic_approved'		=> (isset($post_data['topic_approved'])) ? $post_data['topic_approved'] : false,
-				'post_approved'			=> (isset($post_data['post_approved'])) ? $post_data['post_approved'] : false,
-			);
-
-			if ($mode == 'edit')
-			{
-				$data['topic_replies_real'] = (int) $post_data['topic_replies_real'];
-				$data['topic_replies'] = (int) $post_data['topic_replies'];
-			}
-
-			$redirect_url = submit_post($mode, $post_data['post_subject'], $post_data['username'], $post_data['topic_type'], $poll, $data, $update_message);
-			if (phpbb::$config['enable_post_confirm'] && !phpbb::$user->is_registered && in_array($mode, array('quote', 'post', 'reply')))
-			{
-				$captcha->reset();
-			}
-			// Check the permissions for post approval, as well as the queue trigger where users are put on approval with a post count lower than specified. Moderators are not affected.
-			if (((phpbb::$config['enable_queue_trigger'] && phpbb::$user->data['user_posts'] < phpbb::$config['queue_trigger_posts']) || !phpbb::$acl->acl_get('f_noapprove', $data['forum_id'])) && !phpbb::$acl->acl_get('m_approve', $data['forum_id']))
-			{
-				meta_refresh(10, $redirect_url);
-				$message = ($mode == 'edit') ? phpbb::$user->lang['POST_EDITED_MOD'] : phpbb::$user->lang['POST_STORED_MOD'];
-				$message .= ((phpbb::$user->is_guest) ? '' : ' '. phpbb::$user->lang['POST_APPROVAL_NOTIFY']);
-			}
-			else
-			{
-				meta_refresh(3, $redirect_url);
-
-				$message = ($mode == 'edit') ? 'POST_EDITED' : 'POST_STORED';
-				$message = phpbb::$user->lang[$message] . '<br /><br />' . sprintf(phpbb::$user->lang['VIEW_MESSAGE'], '<a href="' . $redirect_url . '">', '</a>');
-			}
-
-			$message .= '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_FORUM'], '<a href="' . append_sid('viewforum', 'f=' . $data['forum_id']) . '">', '</a>');
-			trigger_error($message);
-		}
-	}
-}
-
-// Preview
-if (!sizeof($error) && $preview)
-{
-	$post_data['post_time'] = ($mode == 'edit') ? $post_data['post_time'] : $current_time;
-
-	$preview_message = $message_parser->format_display($post_data['enable_bbcode'], $post_data['enable_urls'], $post_data['enable_smilies'], false);
-
-	$preview_signature = ($mode == 'edit') ? $post_data['user_sig'] : phpbb::$user->data['user_sig'];
-	$preview_signature_uid = ($mode == 'edit') ? $post_data['user_sig_bbcode_uid'] : phpbb::$user->data['user_sig_bbcode_uid'];
-	$preview_signature_bitfield = ($mode == 'edit') ? $post_data['user_sig_bbcode_bitfield'] : phpbb::$user->data['user_sig_bbcode_bitfield'];
-
-	// Signature
-	if ($post_data['enable_sig'] && phpbb::$config['allow_sig'] && $preview_signature && phpbb::$acl->acl_get('f_sigs', $forum_id))
-	{
-		$parse_sig = new parse_message($preview_signature);
-		$parse_sig->bbcode_uid = $preview_signature_uid;
-		$parse_sig->bbcode_bitfield = $preview_signature_bitfield;
-
-		// Not sure about parameters for bbcode/smilies/urls... in signatures
-		$parse_sig->format_display(phpbb::$config['allow_sig_bbcode'], true, phpbb::$config['allow_sig_smilies']);
-		$preview_signature = $parse_sig->message;
-		unset($parse_sig);
-	}
-	else
-	{
-		$preview_signature = '';
-	}
-
-	$preview_subject = censor_text($post_data['post_subject']);
-
-	// Poll Preview
-	if (!$poll_delete && ($mode == 'post' || ($mode == 'edit' && $post_id == $post_data['topic_first_post_id']/* && (!$post_data['poll_last_vote'] || phpbb::$acl->acl_get('m_edit', $forum_id))*/))
-	&& phpbb::$acl->acl_get('f_poll', $forum_id))
-	{
-		$parse_poll = new parse_message($post_data['poll_title']);
-		$parse_poll->bbcode_uid = $message_parser->bbcode_uid;
-		$parse_poll->bbcode_bitfield = $message_parser->bbcode_bitfield;
-
-		$parse_poll->format_display($post_data['enable_bbcode'], $post_data['enable_urls'], $post_data['enable_smilies']);
-
-		if ($post_data['poll_length'])
-		{
-			$poll_end = ($post_data['poll_length'] * 86400) + (($post_data['poll_start']) ? $post_data['poll_start'] : time());
-		}
-
-		phpbb::$template->assign_vars(array(
-			'S_HAS_POLL_OPTIONS'	=> (sizeof($post_data['poll_options'])),
-			'S_IS_MULTI_CHOICE'		=> ($post_data['poll_max_options'] > 1) ? true : false,
-
-			'POLL_QUESTION'		=> $parse_poll->message,
-
-			'L_POLL_LENGTH'		=> ($post_data['poll_length']) ? sprintf(phpbb::$user->lang['POLL_RUN_TILL'], phpbb::$user->format_date($poll_end)) : '',
-			'L_MAX_VOTES'		=> ($post_data['poll_max_options'] == 1) ? phpbb::$user->lang['MAX_OPTION_SELECT'] : sprintf(phpbb::$user->lang['MAX_OPTIONS_SELECT'], $post_data['poll_max_options']),
-		));
-
-		$parse_poll->message = implode("\n", $post_data['poll_options']);
-		$parse_poll->format_display($post_data['enable_bbcode'], $post_data['enable_urls'], $post_data['enable_smilies']);
-		$preview_poll_options = explode('<br />', $parse_poll->message);
-		unset($parse_poll);
-
-		foreach ($preview_poll_options as $key => $option)
-		{
-			phpbb::$template->assign_block_vars('poll_option', array(
-				'POLL_OPTION_CAPTION'	=> $option,
-				'POLL_OPTION_ID'		=> $key + 1,
-			));
-		}
-		unset($preview_poll_options);
-	}
-
-	// Attachment Preview
-	if (sizeof($message_parser->attachment_data))
-	{
-		phpbb::$template->assign_var('S_HAS_ATTACHMENTS', true);
-
-		$update_count = array();
-		$attachment_data = $message_parser->attachment_data;
-
-		parse_attachments($forum_id, $preview_message, $attachment_data, $update_count, true);
-
-		foreach ($attachment_data as $i => $attachment)
-		{
-			phpbb::$template->assign_block_vars('attachment', array(
-				'DISPLAY_ATTACHMENT'	=> $attachment,
-			));
-		}
-		unset($attachment_data);
-	}
-
-	if (!sizeof($error))
-	{
-		phpbb::$template->assign_vars(array(
-			'PREVIEW_SUBJECT'		=> $preview_subject,
-			'PREVIEW_MESSAGE'		=> $preview_message,
-			'PREVIEW_SIGNATURE'		=> $preview_signature,
-
-			'S_DISPLAY_PREVIEW'		=> true,
-		));
-	}
-}
-
-// Decode text for message display
-$post_data['bbcode_uid'] = ($mode == 'quote' && !$preview && !$refresh && !sizeof($error)) ? $post_data['bbcode_uid'] : $message_parser->bbcode_uid;
-$message_parser->decode_message($post_data['bbcode_uid']);
-
-if ($mode == 'quote' && !$submit && !$preview && !$refresh)
-{
-	$message_parser->message = '[quote=&quot;' . $post_data['quote_username'] . '&quot;]' . censor_text(trim($message_parser->message)) . "[/quote]\n";
-}
-
-if (($mode == 'reply' || $mode == 'quote') && !$submit && !$preview && !$refresh)
-{
-	$post_data['post_subject'] = ((strpos($post_data['post_subject'], 'Re: ') !== 0) ? 'Re: ' : '') . censor_text($post_data['post_subject']);
-}
-
-$attachment_data = $message_parser->attachment_data;
-$filename_data = $message_parser->filename_data;
-$post_data['post_text'] = $message_parser->message;
-
-if (sizeof($post_data['poll_options']) && $post_data['poll_title'])
-{
-	$message_parser->message = $post_data['poll_title'];
-	$message_parser->bbcode_uid = $post_data['bbcode_uid'];
-
-	$message_parser->decode_message();
-	$post_data['poll_title'] = $message_parser->message;
-
-	$message_parser->message = implode("\n", $post_data['poll_options']);
-	$message_parser->decode_message();
-	$post_data['poll_options'] = explode("\n", $message_parser->message);
-}
-
-// MAIN POSTING PAGE BEGINS HERE
-
-// Forum moderators?
-$moderators = array();
-get_moderators($moderators, $forum_id);
-
-// Generate smiley listing
-generate_smilies('inline', $forum_id);
-
-// Generate inline attachment select box
-posting_gen_inline_attachments($attachment_data);
-
-// Do show topic type selection only in first post.
-$topic_type_toggle = false;
-
-if ($mode == 'post' || ($mode == 'edit' && $post_id == $post_data['topic_first_post_id']))
-{
-	$topic_type_toggle = posting_gen_topic_types($forum_id, $post_data['topic_type']);
-}
-
-$s_topic_icons = false;
-if ($post_data['enable_icons'] && phpbb::$acl->acl_get('f_icons', $forum_id))
-{
-	$s_topic_icons = posting_gen_topic_icons($mode, $post_data['icon_id']);
-}
-
-$bbcode_checked		= (isset($post_data['enable_bbcode'])) ? !$post_data['enable_bbcode'] : ((phpbb::$config['allow_bbcode']) ? !phpbb::$user->optionget('bbcode') : 1);
-$smilies_checked	= (isset($post_data['enable_smilies'])) ? !$post_data['enable_smilies'] : ((phpbb::$config['allow_smilies']) ? !phpbb::$user->optionget('smilies') : 1);
-$urls_checked		= (isset($post_data['enable_urls'])) ? !$post_data['enable_urls'] : 0;
-$sig_checked		= $post_data['enable_sig'];
-$lock_topic_checked	= (isset($topic_lock) && $topic_lock) ? $topic_lock : (($post_data['topic_status'] == ITEM_LOCKED) ? 1 : 0);
-$lock_post_checked	= (isset($post_lock)) ? $post_lock : $post_data['post_edit_locked'];
-
-// If the user is replying or posting and not already watching this topic but set to always being notified we need to overwrite this setting
-$notify_set			= ($mode != 'edit' && phpbb::$config['allow_topic_notify'] && phpbb::$user->is_registered && !$post_data['notify_set']) ? phpbb::$user->data['user_notify'] : $post_data['notify_set'];
-$notify_checked		= (isset($notify)) ? $notify : (($mode == 'post') ? phpbb::$user->data['user_notify'] : $notify_set);
-
-// Page title & action URL, include session_id for security purpose
-$s_action = append_sid('posting', "mode=$mode&amp;f=$forum_id", true, phpbb::$user->session_id);
-$s_action .= ($topic_id) ? "&amp;t=$topic_id" : '';
-$s_action .= ($post_id) ? "&amp;p=$post_id" : '';
-
-switch ($mode)
-{
-	case 'post':
-		$page_title = phpbb::$user->lang['POST_TOPIC'];
-	break;
-
-	case 'quote':
-	case 'reply':
-		$page_title = phpbb::$user->lang['POST_REPLY'];
-	break;
-
-	case 'delete':
-	case 'edit':
-		$page_title = phpbb::$user->lang['EDIT_POST'];
-	break;
-}
-
-// Build Navigation Links
-generate_forum_nav($post_data);
-
-// Build Forum Rules
-generate_forum_rules($post_data);
-
-if (phpbb::$config['enable_post_confirm'] && !phpbb::$user->is_registered && $solved_captcha === false && ($mode == 'post' || $mode == 'reply' || $mode == 'quote'))
-{
-	$captcha->reset();
-
-	phpbb::$template->assign_vars(array(
-		'S_CONFIRM_CODE'			=> true,
-		'CONFIRM'					=> $captcha->get_template(),
-	));
-}
-
-$s_hidden_fields = ($mode == 'reply' || $mode == 'quote') ? '<input type="hidden" name="topic_cur_post_id" value="' . $post_data['topic_last_post_id'] . '" />' : '';
-$s_hidden_fields .= '<input type="hidden" name="lastclick" value="' . $current_time . '" />';
-$s_hidden_fields .= ($draft_id || phpbb_request::is_set('draft_loaded')) ? '<input type="hidden" name="draft_loaded" value="' . request_var('draft_loaded', $draft_id) . '" />' : '';
-
-// Add the confirm id/code pair to the hidden fields, else an error is displayed on next submit/preview
-if ($solved_captcha !== false)
-{
-	$s_hidden_fields .= build_hidden_fields($captcha->get_hidden_fields());
-}
-
-$form_enctype = (@ini_get('file_uploads') == '0' || strtolower(@ini_get('file_uploads')) == 'off' || !phpbb::$config['allow_attachments'] || !phpbb::$acl->acl_get('u_attach') || !phpbb::$acl->acl_get('f_attach', $forum_id)) ? '' : ' enctype="multipart/form-data"';
-add_form_key('posting');
-
-
-// Start assigning vars for main posting page ...
-phpbb::$template->assign_vars(array(
-	'L_POST_A'					=> $page_title,
-	'L_ICON'					=> ($mode == 'reply' || $mode == 'quote' || ($mode == 'edit' && $post_id != $post_data['topic_first_post_id'])) ? phpbb::$user->lang['POST_ICON'] : phpbb::$user->lang['TOPIC_ICON'],
-	'L_MESSAGE_BODY_EXPLAIN'	=> (intval(phpbb::$config['max_post_chars'])) ? sprintf(phpbb::$user->lang['MESSAGE_BODY_EXPLAIN'], intval(phpbb::$config['max_post_chars'])) : '',
-
-	'FORUM_NAME'			=> $post_data['forum_name'],
-	'FORUM_DESC'			=> ($post_data['forum_desc']) ? generate_text_for_display($post_data['forum_desc'], $post_data['forum_desc_uid'], $post_data['forum_desc_bitfield'], $post_data['forum_desc_options']) : '',
-	'TOPIC_TITLE'			=> censor_text($post_data['topic_title']),
-	'MODERATORS'			=> (sizeof($moderators)) ? implode(', ', $moderators[$forum_id]) : '',
-	'USERNAME'				=> ((!$preview && $mode != 'quote') || $preview) ? $post_data['username'] : '',
-	'SUBJECT'				=> $post_data['post_subject'],
-	'MESSAGE'				=> $post_data['post_text'],
-	'BBCODE_STATUS'			=> ($bbcode_status) ? sprintf(phpbb::$user->lang['BBCODE_IS_ON'], '<a href="' . append_sid('faq', 'mode=bbcode') . '">', '</a>') : sprintf(phpbb::$user->lang['BBCODE_IS_OFF'], '<a href="' . append_sid('faq', 'mode=bbcode') . '">', '</a>'),
-	'IMG_STATUS'			=> ($img_status) ? phpbb::$user->lang['IMAGES_ARE_ON'] : phpbb::$user->lang['IMAGES_ARE_OFF'],
-	'FLASH_STATUS'			=> ($flash_status) ? phpbb::$user->lang['FLASH_IS_ON'] : phpbb::$user->lang['FLASH_IS_OFF'],
-	'SMILIES_STATUS'		=> ($smilies_status) ? phpbb::$user->lang['SMILIES_ARE_ON'] : phpbb::$user->lang['SMILIES_ARE_OFF'],
-	'URL_STATUS'			=> ($bbcode_status && $url_status) ? phpbb::$user->lang['URL_IS_ON'] : phpbb::$user->lang['URL_IS_OFF'],
-	'MAX_FONT_SIZE'			=> (int) phpbb::$config['max_post_font_size'],
-	'MINI_POST_IMG'			=> phpbb::$user->img('icon_post_target', 'POST'),
-	'POST_DATE'				=> ($post_data['post_time']) ? phpbb::$user->format_date($post_data['post_time']) : '',
-	'ERROR'					=> (sizeof($error)) ? implode('<br />', $error) : '',
-	'TOPIC_TIME_LIMIT'		=> (int) $post_data['topic_time_limit'],
-	'EDIT_REASON'			=> $post_data['post_edit_reason'],
-	'U_VIEW_FORUM'			=> append_sid('viewforum', "f=$forum_id"),
-	'U_VIEW_TOPIC'			=> ($mode != 'post') ? append_sid('viewtopic', "f=$forum_id&amp;t=$topic_id") : '',
-	'U_PROGRESS_BAR'		=> append_sid('posting', "f=$forum_id&amp;mode=popup"),
-	'UA_PROGRESS_BAR'		=> addslashes(append_sid('posting', "f=$forum_id&amp;mode=popup")),
-
-	'S_PRIVMSGS'				=> false,
-	'S_CLOSE_PROGRESS_WINDOW'	=> phpbb_request::is_set_post('add_file'),
-	'S_EDIT_POST'				=> ($mode == 'edit') ? true : false,
-	'S_EDIT_REASON'				=> ($mode == 'edit' && phpbb::$acl->acl_get('m_edit', $forum_id)) ? true : false,
-	'S_DISPLAY_USERNAME'		=> (!phpbb::$user->is_registered || ($mode == 'edit' && $post_data['poster_id'] == ANONYMOUS)) ? true : false,
-	'S_SHOW_TOPIC_ICONS'		=> $s_topic_icons,
-	'S_DELETE_ALLOWED'			=> ($mode == 'edit' && (($post_id == $post_data['topic_last_post_id'] && $post_data['poster_id'] == phpbb::$user->data['user_id'] && phpbb::$acl->acl_get('f_delete', $forum_id) && !$post_data['post_edit_locked'] && ($post_data['post_time'] > time() - (phpbb::$config['edit_time'] * 60) || !phpbb::$config['edit_time'])) || phpbb::$acl->acl_get('m_delete', $forum_id))) ? true : false,
-	'S_BBCODE_ALLOWED'			=> $bbcode_status,
-	'S_BBCODE_CHECKED'			=> ($bbcode_checked) ? ' checked="checked"' : '',
-	'S_SMILIES_ALLOWED'			=> $smilies_status,
-	'S_SMILIES_CHECKED'			=> ($smilies_checked) ? ' checked="checked"' : '',
-	'S_SIG_ALLOWED'				=> (phpbb::$acl->acl_get('f_sigs', $forum_id) && phpbb::$config['allow_sig'] && phpbb::$user->is_registered) ? true : false,
-	'S_SIGNATURE_CHECKED'		=> ($sig_checked) ? ' checked="checked"' : '',
-	'S_NOTIFY_ALLOWED'			=> (!phpbb::$user->is_registered || ($mode == 'edit' && phpbb::$user->data['user_id'] != $post_data['poster_id']) || !phpbb::$config['allow_topic_notify'] || !phpbb::$config['email_enable']) ? false : true,
-	'S_NOTIFY_CHECKED'			=> ($notify_checked) ? ' checked="checked"' : '',
-	'S_LOCK_TOPIC_ALLOWED'		=> (($mode == 'edit' || $mode == 'reply' || $mode == 'quote') && (phpbb::$acl->acl_get('m_lock', $forum_id) || (phpbb::$acl->acl_get('f_user_lock', $forum_id) && phpbb::$user->is_registered && !empty($post_data['topic_poster']) && phpbb::$user->data['user_id'] == $post_data['topic_poster'] && $post_data['topic_status'] == ITEM_UNLOCKED))) ? true : false,
-	'S_LOCK_TOPIC_CHECKED'		=> ($lock_topic_checked) ? ' checked="checked"' : '',
-	'S_LOCK_POST_ALLOWED'		=> ($mode == 'edit' && phpbb::$acl->acl_get('m_edit', $forum_id)) ? true : false,
-	'S_LOCK_POST_CHECKED'		=> ($lock_post_checked) ? ' checked="checked"' : '',
-	'S_LINKS_ALLOWED'			=> $url_status,
-	'S_MAGIC_URL_CHECKED'		=> ($urls_checked) ? ' checked="checked"' : '',
-	'S_TYPE_TOGGLE'				=> $topic_type_toggle,
-	'S_SAVE_ALLOWED'			=> (phpbb::$acl->acl_get('u_savedrafts') && phpbb::$user->is_registered && $mode != 'edit') ? true : false,
-	'S_HAS_DRAFTS'				=> (phpbb::$acl->acl_get('u_savedrafts') && phpbb::$user->is_registered && $post_data['drafts']) ? true : false,
-	'S_FORM_ENCTYPE'			=> $form_enctype,
-
-	'S_BBCODE_IMG'			=> $img_status,
-	'S_BBCODE_URL'			=> $url_status,
-	'S_BBCODE_FLASH'		=> $flash_status,
-	'S_BBCODE_QUOTE'		=> $quote_status,
-
-	'S_POST_ACTION'			=> $s_action,
-	'S_HIDDEN_FIELDS'		=> $s_hidden_fields,
-));
-
-// Build custom bbcodes array
-display_custom_bbcodes();
-
-// Poll entry
-if (($mode == 'post' || ($mode == 'edit' && $post_id == $post_data['topic_first_post_id']/* && (!$post_data['poll_last_vote'] || phpbb::$acl->acl_get('m_edit', $forum_id))*/))
-	&& phpbb::$acl->acl_get('f_poll', $forum_id))
-{
-	phpbb::$template->assign_vars(array(
-		'S_SHOW_POLL_BOX'		=> true,
-		'S_POLL_VOTE_CHANGE'	=> (phpbb::$acl->acl_get('f_votechg', $forum_id)),
-		'S_POLL_DELETE'			=> ($mode == 'edit' && sizeof($post_data['poll_options']) && ((!$post_data['poll_last_vote'] && $post_data['poster_id'] == phpbb::$user->data['user_id'] && phpbb::$acl->acl_get('f_delete', $forum_id)) || phpbb::$acl->acl_get('m_delete', $forum_id))),
-		'S_POLL_DELETE_CHECKED'	=> (!empty($poll_delete)) ? true : false,
-
-		'L_POLL_OPTIONS_EXPLAIN'	=> sprintf(phpbb::$user->lang['POLL_OPTIONS_' . (($mode == 'edit') ? 'EDIT_' : '') . 'EXPLAIN'], phpbb::$config['max_poll_options']),
-
-		'VOTE_CHANGE_CHECKED'	=> (!empty($post_data['poll_vote_change'])) ? ' checked="checked"' : '',
-// 		'POLL_TITLE'			=> (isset($post_data['poll_title'])) ? $post_data['poll_title'] : '',
-		'POLL_OPTIONS'			=> (!empty($post_data['poll_options'])) ? implode("\n", $post_data['poll_options']) : '',
-		'POLL_MAX_OPTIONS'		=> (isset($post_data['poll_max_options'])) ? (int) $post_data['poll_max_options'] : 1,
-		'POLL_LENGTH'			=> $post_data['poll_length'],
-	));
-}
-
-// Show attachment box for adding attachments if true
-$allowed = (phpbb::$acl->acl_get('f_attach', $forum_id) && phpbb::$acl->acl_get('u_attach') && phpbb::$config['allow_attachments'] && $form_enctype);
-
-// Attachment entry
-posting_gen_attachment_entry($attachment_data, $filename_data, $allowed);
-
-// Output page ...
-page_header($page_title);
-
-phpbb::$template->set_filenames(array(
-	'body' => 'posting_body.html',
-));
-
-make_jumpbox(append_sid('viewforum'));
-
-// Topic review
-if ($mode == 'reply' || $mode == 'quote')
-{
-	if (topic_review($topic_id, $forum_id))
-	{
-		phpbb::$template->assign_var('S_DISPLAY_REVIEW', true);
-	}
-}
-
-page_footer();
-
-/**
-* Show upload popup (progress bar)
-*/
-function upload_popup($forum_style = 0)
-{
-	($forum_style) ? phpbb::$user->setup('posting', $forum_style) : phpbb::$user->setup('posting');
-
-	page_header(phpbb::$user->lang['PROGRESS_BAR']);
-
-	phpbb::$template->set_filenames(array(
-		'popup'	=> 'posting_progress_bar.html',
-	));
-
-	phpbb::$template->assign_vars(array(
-		'PROGRESS_BAR'	=> phpbb::$user->img('upload_bar', 'UPLOAD_IN_PROGRESS'),
-	));
-
-	phpbb::$template->display('popup');
-
-	garbage_collection();
-	exit_handler();
-}
-
-/**
-* Do the various checks required for removing posts as well as removing it
-*/
-function handle_post_delete($forum_id, $topic_id, $post_id, &$post_data)
-{
-	// If moderator removing post or user itself removing post, present a confirmation screen
-	if (phpbb::$acl->acl_get('m_delete', $forum_id) || ($post_data['poster_id'] == phpbb::$user->data['user_id'] && phpbb::$user->is_registered && phpbb::$acl->acl_get('f_delete', $forum_id) && $post_id == $post_data['topic_last_post_id'] && !$post_data['post_edit_locked'] && ($post_data['post_time'] > time() - (phpbb::$config['edit_time'] * 60) || !phpbb::$config['edit_time'])))
-	{
-		$s_hidden_fields = build_hidden_fields(array(
-			'p'		=> $post_id,
-			'f'		=> $forum_id,
-			'mode'	=> 'delete')
-		);
-
-		if (confirm_box(true))
-		{
-			$data = array(
-				'topic_first_post_id'	=> $post_data['topic_first_post_id'],
-				'topic_last_post_id'	=> $post_data['topic_last_post_id'],
-				'topic_replies_real'	=> $post_data['topic_replies_real'],
-				'topic_approved'		=> $post_data['topic_approved'],
-				'topic_type'			=> $post_data['topic_type'],
-				'post_approved'			=> $post_data['post_approved'],
-				'post_reported'			=> $post_data['post_reported'],
-				'post_time'				=> $post_data['post_time'],
-				'poster_id'				=> $post_data['poster_id'],
-				'post_postcount'		=> $post_data['post_postcount']
-			);
-
-			$next_post_id = delete_post($forum_id, $topic_id, $post_id, $data);
-
-			if ($next_post_id === false)
-			{
-				add_log('mod', $forum_id, $topic_id, 'LOG_DELETE_TOPIC', $post_data['topic_title']);
-
-				$meta_info = append_sid('viewforum', "f=$forum_id");
-				$message = phpbb::$user->lang['POST_DELETED'];
-			}
-			else
-			{
-				add_log('mod', $forum_id, $topic_id, 'LOG_DELETE_POST', $post_data['post_subject']);
-
-				$meta_info = append_sid('viewtopic', "f=$forum_id&amp;t=$topic_id&amp;p=$next_post_id") . "#p$next_post_id";
-				$message = phpbb::$user->lang['POST_DELETED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_TOPIC'], '<a href="' . $meta_info . '">', '</a>');
-			}
-
-			meta_refresh(3, $meta_info);
-			$message .= '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_FORUM'], '<a href="' . append_sid('viewforum', 'f=' . $forum_id) . '">', '</a>');
-			trigger_error($message);
-		}
-		else
-		{
-			confirm_box(false, 'DELETE_POST', $s_hidden_fields);
-		}
-	}
-
-	// If we are here the user is not able to delete - present the correct error message
-	if ($post_data['poster_id'] != phpbb::$user->data['user_id'] && phpbb::$acl->acl_get('f_delete', $forum_id))
-	{
-		trigger_error('DELETE_OWN_POSTS');
-	}
-
-	if ($post_data['poster_id'] == phpbb::$user->data['user_id'] && phpbb::$acl->acl_get('f_delete', $forum_id) && $post_id != $post_data['topic_last_post_id'])
-	{
-		trigger_error('CANNOT_DELETE_REPLIED');
-	}
-
-	trigger_error('USER_CANNOT_DELETE');
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/report.php b/phpBB/report.php
deleted file mode 100644
index d2cb93d57e..0000000000
--- a/phpBB/report.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-define('IN_PHPBB', true);
-if (!defined('PHPBB_ROOT_PATH')) define('PHPBB_ROOT_PATH', './');
-if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-include(PHPBB_ROOT_PATH . 'common.' . PHP_EXT);
-include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-
-// Start session management
-phpbb::$user->session_begin();
-phpbb::$acl->init(phpbb::$user->data);
-phpbb::$user->setup('mcp');
-
-$forum_id		= request_var('f', 0);
-$post_id		= request_var('p', 0);
-$reason_id		= request_var('reason_id', 0);
-$report_text	= utf8_normalize_nfc(request_var('report_text', '', true));
-$user_notify	= (phpbb::$user->is_registered) ? request_var('notify', 0) : false;
-
-$submit = phpbb_request::is_set_post('submit');
-
-if (!$post_id)
-{
-	trigger_error('NO_POST_SELECTED');
-}
-
-$redirect_url = append_sid('viewtopic', "f=$forum_id&amp;p=$post_id") . "#p$post_id";
-
-// Has the report been cancelled?
-if (phpbb_request::is_set_post('cancel'))
-{
-	redirect($redirect_url);
-}
-
-// Grab all relevant data
-$sql = 'SELECT t.*, p.*
-	FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . " t
-	WHERE p.post_id = $post_id
-		AND p.topic_id = t.topic_id";
-$result = phpbb::$db->sql_query($sql);
-$report_data = phpbb::$db->sql_fetchrow($result);
-phpbb::$db->sql_freeresult($result);
-
-if (!$report_data)
-{
-	trigger_error('POST_NOT_EXIST');
-}
-
-$forum_id = (int) ($report_data['forum_id']) ? $report_data['forum_id'] : $forum_id;
-$topic_id = (int) $report_data['topic_id'];
-
-$sql = 'SELECT *
-	FROM ' . FORUMS_TABLE . '
-	WHERE forum_id = ' . $forum_id;
-$result = phpbb::$db->sql_query($sql);
-$forum_data = phpbb::$db->sql_fetchrow($result);
-phpbb::$db->sql_freeresult($result);
-
-if (!$forum_data)
-{
-	trigger_error('FORUM_NOT_EXIST');
-}
-
-// Check required permissions
-$acl_check_ary = array('f_list' => 'POST_NOT_EXIST', 'f_read' => 'USER_CANNOT_READ', 'f_report' => 'USER_CANNOT_REPORT');
-
-foreach ($acl_check_ary as $acl => $error)
-{
-	if (!phpbb::$acl->acl_get($acl, $forum_id))
-	{
-		trigger_error($error);
-	}
-}
-unset($acl_check_ary);
-
-if ($report_data['post_reported'])
-{
-	$message = phpbb::$user->lang['ALREADY_REPORTED'];
-	$message .= '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_TOPIC'], '<a href="' . $redirect_url . '">', '</a>');
-	trigger_error($message);
-}
-
-// Submit report?
-if ($submit && $reason_id)
-{
-	$sql = 'SELECT *
-		FROM ' . REPORTS_REASONS_TABLE . "
-		WHERE reason_id = $reason_id";
-	$result = phpbb::$db->sql_query($sql);
-	$row = phpbb::$db->sql_fetchrow($result);
-	phpbb::$db->sql_freeresult($result);
-
-	if (!$row || (!$report_text && strtolower($row['reason_title']) == 'other'))
-	{
-		trigger_error('EMPTY_REPORT');
-	}
-
-	$sql_ary = array(
-		'reason_id'		=> (int) $reason_id,
-		'post_id'		=> $post_id,
-		'user_id'		=> (int) phpbb::$user->data['user_id'],
-		'user_notify'	=> (int) $user_notify,
-		'report_closed'	=> 0,
-		'report_time'	=> (int) time(),
-		'report_text'	=> (string) $report_text
-	);
-
-	$sql = 'INSERT INTO ' . REPORTS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary);
-	phpbb::$db->sql_query($sql);
-	$report_id = phpbb::$db->sql_nextid();
-
-	if (!$report_data['post_reported'])
-	{
-		$sql = 'UPDATE ' . POSTS_TABLE . '
-			SET post_reported = 1
-			WHERE post_id = ' . $post_id;
-		phpbb::$db->sql_query($sql);
-	}
-
-	if (!$report_data['topic_reported'])
-	{
-		$sql = 'UPDATE ' . TOPICS_TABLE . '
-			SET topic_reported = 1
-			WHERE topic_id = ' . $report_data['topic_id'] . '
-				OR topic_moved_id = ' . $report_data['topic_id'];
-		phpbb::$db->sql_query($sql);
-	}
-
-	meta_refresh(3, $redirect_url);
-
-	$message = phpbb::$user->lang['POST_REPORTED_SUCCESS'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_TOPIC'], '<a href="' . $redirect_url . '">', '</a>');
-	trigger_error($message);
-}
-
-// Generate the reasons
-display_reasons($reason_id);
-
-phpbb::$template->assign_vars(array(
-	'REPORT_TEXT'		=> $report_text,
-	'S_REPORT_ACTION'	=> append_sid('report', 'f=' . $forum_id . '&amp;p=' . $post_id),
-
-	'S_NOTIFY'			=> $user_notify,
-	'S_CAN_NOTIFY'		=> (phpbb::$user->is_registered) ? true : false,
-));
-
-generate_forum_nav($forum_data);
-
-// Start output of page
-page_header(phpbb::$user->lang['REPORT_POST']);
-
-phpbb::$template->set_filenames(array(
-	'body' => 'report_body.html',
-));
-
-page_footer();
-
-?>
-\ No newline at end of file
diff --git a/phpBB/search.php b/phpBB/search.php
deleted file mode 100644
index 1acdf2fd9c..0000000000
--- a/phpBB/search.php
+++ /dev/null
@@ -1,1106 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-define('IN_PHPBB', true);
-if (!defined('PHPBB_ROOT_PATH')) define('PHPBB_ROOT_PATH', './');
-if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-include(PHPBB_ROOT_PATH . 'common.' . PHP_EXT);
-
-// Start session management
-phpbb::$user->session_begin();
-phpbb::$acl->init(phpbb::$user->data);
-phpbb::$user->setup('search');
-
-// Define initial vars
-$mode			= request_var('mode', '');
-$search_id		= request_var('search_id', '');
-$start			= max(request_var('start', 0), 0);
-$post_id		= request_var('p', 0);
-$topic_id		= request_var('t', 0);
-$view			= request_var('view', '');
-
-$submit			= request_var('submit', false);
-$keywords		= utf8_normalize_nfc(request_var('keywords', '', true));
-$add_keywords	= utf8_normalize_nfc(request_var('add_keywords', '', true));
-$author			= request_var('author', '', true);
-$author_id		= request_var('author_id', 0);
-$show_results	= ($topic_id) ? 'posts' : request_var('sr', 'posts');
-$show_results	= ($show_results == 'posts') ? 'posts' : 'topics';
-$search_terms	= request_var('terms', 'all');
-$search_fields	= request_var('sf', 'all');
-$search_child	= request_var('sc', true);
-
-$sort_days		= request_var('st', 0);
-$sort_key		= request_var('sk', 't');
-$sort_dir		= request_var('sd', 'd');
-
-$return_chars	= request_var('ch', ($topic_id) ? -1 : 300);
-$search_forum	= request_var('fid', array(0));
-
-// Is user able to search? Has search been disabled?
-if (!phpbb::$acl->acl_get('u_search') || !phpbb::$acl->acl_getf_global('f_search') || !phpbb::$config['load_search'])
-{
-	phpbb::$template->assign_var('S_NO_SEARCH', true);
-	trigger_error('NO_SEARCH');
-}
-
-// Check search load limit
-if (phpbb::$user->system['load'] && phpbb::$config['limit_search_load'] && (phpbb::$user->system['load'] > doubleval(phpbb::$config['limit_search_load'])))
-{
-	phpbb::$template->assign_var('S_NO_SEARCH', true);
-	trigger_error('NO_SEARCH_TIME');
-}
-
-// Check flood limit ... if applicable
-$interval = (phpbb::$user->is_guest) ? phpbb::$config['search_anonymous_interval'] : phpbb::$config['search_interval'];
-if ($interval && !phpbb::$acl->acl_get('u_ignoreflood'))
-{
-	if (phpbb::$user->data['user_last_search'] > time() - $interval)
-	{
-		phpbb::$template->assign_var('S_NO_SEARCH', true);
-		trigger_error('NO_SEARCH_TIME');
-	}
-}
-
-// Define some vars
-$limit_days		= array(0 => phpbb::$user->lang['ALL_RESULTS'], 1 => phpbb::$user->lang['1_DAY'], 7 => phpbb::$user->lang['7_DAYS'], 14 => phpbb::$user->lang['2_WEEKS'], 30 => phpbb::$user->lang['1_MONTH'], 90 => phpbb::$user->lang['3_MONTHS'], 180 => phpbb::$user->lang['6_MONTHS'], 365 => phpbb::$user->lang['1_YEAR']);
-$sort_by_text	= array('a' => phpbb::$user->lang['SORT_AUTHOR'], 't' => phpbb::$user->lang['SORT_TIME'], 'f' => phpbb::$user->lang['SORT_FORUM'], 'i' => phpbb::$user->lang['SORT_TOPIC_TITLE'], 's' => phpbb::$user->lang['SORT_POST_SUBJECT']);
-
-$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
-gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
-
-if ($keywords || $author || $author_id || $search_id || $submit)
-{
-	// clear arrays
-	$id_ary = array();
-
-	// egosearch is an author search
-	if ($search_id == 'egosearch')
-	{
-		$author_id = phpbb::$user->data['user_id'];
-
-		if (phpbb::$user->is_guest)
-		{
-			login_box('', phpbb::$user->lang['LOGIN_EXPLAIN_EGOSEARCH']);
-		}
-	}
-
-	// If we are looking for authors get their ids
-	$author_id_ary = array();
-	if ($author_id)
-	{
-		$author_id_ary[] = $author_id;
-	}
-	else if ($author)
-	{
-		if ((strpos($author, '*') !== false) && (utf8_strlen(str_replace(array('*', '%'), '', $author)) < phpbb::$config['min_search_author_chars']))
-		{
-			trigger_error(sprintf(phpbb::$user->lang['TOO_FEW_AUTHOR_CHARS'], phpbb::$config['min_search_author_chars']));
-		}
-
-		$sql_where = (strpos($author, '*') !== false) ? ' username_clean ' . phpbb::$db->sql_like_expression(str_replace('*', phpbb::$db->any_char, utf8_clean_string($author))) : " username_clean = '" . phpbb::$db->sql_escape(utf8_clean_string($author)) . "'";
-
-		$sql = 'SELECT user_id
-			FROM ' . USERS_TABLE . "
-			WHERE $sql_where
-				AND user_type IN (" . phpbb::USER_NORMAL . ', ' . phpbb::USER_FOUNDER . ')';
-		$result = phpbb::$db->sql_query_limit($sql, 100);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$author_id_ary[] = (int) $row['user_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if (!sizeof($author_id_ary))
-		{
-			trigger_error('NO_SEARCH_RESULTS');
-		}
-	}
-
-	// if we search in an existing search result just add the additional keywords. But we need to use "all search terms"-mode
-	// so we can keep the old keywords in their old mode, but add the new ones as required words
-	if ($add_keywords)
-	{
-		if ($search_terms == 'all')
-		{
-			$keywords .= ' ' . $add_keywords;
-		}
-		else
-		{
-			$search_terms = 'all';
-			$keywords = implode(' |', explode(' ', preg_replace('#\s+#u', ' ', $keywords))) . ' ' .$add_keywords;
-		}
-	}
-
-	// Which forums should not be searched? Author searches are also carried out in unindexed forums
-	if (empty($keywords) && sizeof($author_id_ary))
-	{
-		$ex_fid_ary = array_keys(phpbb::$acl->acl_getf('!f_read', true));
-	}
-	else
-	{
-		$ex_fid_ary = array_unique(array_merge(array_keys(phpbb::$acl->acl_getf('!f_read', true)), array_keys(phpbb::$acl->acl_getf('!f_search', true))));
-	}
-
-	$not_in_fid = (sizeof($ex_fid_ary)) ? 'WHERE ' . phpbb::$db->sql_in_set('f.forum_id', $ex_fid_ary, true) . " OR (f.forum_password <> '' AND fa.user_id <> " . (int) phpbb::$user->data['user_id'] . ')' : "";
-
-	$sql = 'SELECT f.forum_id, f.forum_name, f.parent_id, f.forum_type, f.right_id, f.forum_password, fa.user_id
-		FROM ' . FORUMS_TABLE . ' f
-		LEFT JOIN ' . FORUMS_ACCESS_TABLE . " fa ON (fa.forum_id = f.forum_id
-			AND fa.session_id = '" . phpbb::$db->sql_escape(phpbb::$user->session_id) . "')
-		$not_in_fid
-		ORDER BY f.left_id";
-	$result = phpbb::$db->sql_query($sql);
-
-	$right_id = 0;
-	$reset_search_forum = true;
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		if ($row['forum_password'] && $row['user_id'] != phpbb::$user->data['user_id'])
-		{
-			$ex_fid_ary[] = (int) $row['forum_id'];
-			continue;
-		}
-
-		if (sizeof($search_forum))
-		{
-			if ($search_child)
-			{
-				if (in_array($row['forum_id'], $search_forum) && $row['right_id'] > $right_id)
-				{
-					$right_id = (int) $row['right_id'];
-				}
-				else if ($row['right_id'] < $right_id)
-				{
-					continue;
-				}
-			}
-
-			if (!in_array($row['forum_id'], $search_forum))
-			{
-				$ex_fid_ary[] = (int) $row['forum_id'];
-				$reset_search_forum = false;
-			}
-		}
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	// find out in which forums the user is allowed to view approved posts
-	if (phpbb::$acl->acl_get('m_approve'))
-	{
-		$m_approve_fid_ary = array(-1);
-		$m_approve_fid_sql = '';
-	}
-	else if (phpbb::$acl->acl_getf_global('m_approve'))
-	{
-		$m_approve_fid_ary = array_diff(array_keys(phpbb::$acl->acl_getf('!m_approve', true)), $ex_fid_ary);
-		$m_approve_fid_sql = ' AND (p.post_approved = 1' . ((sizeof($m_approve_fid_ary)) ? ' OR ' . phpbb::$db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) : '') . ')';
-	}
-	else
-	{
-		$m_approve_fid_ary = array();
-		$m_approve_fid_sql = ' AND p.post_approved = 1';
-	}
-
-	if ($reset_search_forum)
-	{
-		$search_forum = array();
-	}
-
-	// Select which method we'll use to obtain the post_id or topic_id information
-	$search_type = basename(phpbb::$config['search_type']);
-
-	if (!file_exists(PHPBB_ROOT_PATH . 'includes/search/' . $search_type . '.' . PHP_EXT))
-	{
-		trigger_error('NO_SUCH_SEARCH_MODULE');
-	}
-
-	require(PHPBB_ROOT_PATH . "includes/search/$search_type." . PHP_EXT);
-
-	// We do some additional checks in the module to ensure it can actually be utilised
-	$error = false;
-	$search = new $search_type($error);
-
-	if ($error)
-	{
-		trigger_error($error);
-	}
-
-	// let the search module split up the keywords
-	if ($keywords)
-	{
-		$correct_query = $search->split_keywords($keywords, $search_terms);
-		if (!$correct_query || (empty($search->search_query) && !sizeof($author_id_ary) && !$search_id))
-		{
-			$ignored = (sizeof($search->common_words)) ? sprintf(phpbb::$user->lang['IGNORED_TERMS_EXPLAIN'], implode(' ', $search->common_words)) . '<br />' : '';
-			trigger_error($ignored . sprintf(phpbb::$user->lang['NO_KEYWORDS'], $search->word_length['min'], $search->word_length['max']));
-		}
-	}
-
-	if (!$keywords && sizeof($author_id_ary))
-	{
-		// if it is an author search we want to show topics by default
-		$show_results = ($topic_id) ? 'posts' : request_var('sr', ($search_id == 'egosearch') ? 'topics' : 'posts');
-		$show_results = ($show_results == 'posts') ? 'posts' : 'topics';
-	}
-
-	// define some variables needed for retrieving post_id/topic_id information
-	$sort_by_sql = array('a' => 'u.username_clean', 't' => (($show_results == 'posts') ? 'p.post_time' : 't.topic_last_post_time'), 'f' => 'f.forum_id', 'i' => 't.topic_title', 's' => (($show_results == 'posts') ? 'p.post_subject' : 't.topic_title'));
-
-	// pre-made searches
-	$sql = $field = $l_search_title = '';
-	if ($search_id)
-	{
-		switch ($search_id)
-		{
-			// Oh holy Bob, bring us some activity...
-			case 'active_topics':
-				$l_search_title = phpbb::$user->lang['SEARCH_ACTIVE_TOPICS'];
-				$show_results = 'topics';
-				$sort_key = 't';
-				$sort_dir = 'd';
-				$sort_days = request_var('st', 7);
-				$sort_by_sql['t'] = 't.topic_last_post_time';
-
-				gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
-				$s_sort_key = $s_sort_dir = '';
-
-				$last_post_time_sql = ($sort_days) ? ' AND t.topic_last_post_time > ' . (time() - ($sort_days * 24 * 3600)) : '';
-
-				$sql = 'SELECT t.topic_last_post_time, t.topic_id
-					FROM ' . TOPICS_TABLE . " t
-					WHERE t.topic_moved_id = 0
-						$last_post_time_sql
-						" . str_replace(array('p.', 'post_'), array('t.', 'topic_'), $m_approve_fid_sql) . '
-						' . ((sizeof($ex_fid_ary)) ? ' AND ' . phpbb::$db->sql_in_set('t.forum_id', $ex_fid_ary, true) : '') . '
-					ORDER BY t.topic_last_post_time DESC';
-				$field = 'topic_id';
-			break;
-
-			case 'unanswered':
-				$l_search_title = phpbb::$user->lang['SEARCH_UNANSWERED'];
-				$show_results = request_var('sr', 'topics');
-				$show_results = ($show_results == 'posts') ? 'posts' : 'topics';
-				$sort_by_sql['t'] = ($show_results == 'posts') ? 'p.post_time' : 't.topic_last_post_time';
-				$sort_by_sql['s'] = ($show_results == 'posts') ? 'p.post_subject' : 't.topic_title';
-				$sql_sort = 'ORDER BY ' . $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
-
-				$sort_join = ($sort_key == 'f') ? FORUMS_TABLE . ' f, ' : '';
-				$sql_sort = ($sort_key == 'f') ? ' AND f.forum_id = p.forum_id ' . $sql_sort : $sql_sort;
-
-				if ($sort_days)
-				{
-					$last_post_time = 'AND p.post_time > ' . (time() - ($sort_days * 24 * 3600));
-				}
-				else
-				{
-					$last_post_time = '';
-				}
-
-
-				if ($sort_key == 'a')
-				{
-					$sort_join = USERS_TABLE . ' u, ';
-					$sql_sort = ' AND u.user_id = p.poster_id ' . $sql_sort;
-				}
-				if ($show_results == 'posts')
-				{
-					$sql = "SELECT p.post_id
-						FROM $sort_join" . POSTS_TABLE . ' p, ' . TOPICS_TABLE . " t
-						WHERE t.topic_replies = 0
-							AND p.topic_id = t.topic_id
-							$last_post_time
-							$m_approve_fid_sql
-							" . ((sizeof($ex_fid_ary)) ? ' AND ' . phpbb::$db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '') . "
-							$sql_sort";
-					$field = 'post_id';
-				}
-				else
-				{
-					$sql = 'SELECT DISTINCT ' . $sort_by_sql[$sort_key] . ", p.topic_id
-						FROM $sort_join" . POSTS_TABLE . ' p, ' . TOPICS_TABLE . " t
-						WHERE t.topic_replies = 0
-							AND t.topic_moved_id = 0
-							AND p.topic_id = t.topic_id
-							$last_post_time
-							$m_approve_fid_sql
-							" . ((sizeof($ex_fid_ary)) ? ' AND ' . phpbb::$db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '') . "
-						$sql_sort";
-					$field = 'topic_id';
-				}
-			break;
-
-			case 'newposts':
-				$l_search_title = phpbb::$user->lang['SEARCH_NEW'];
-				// force sorting
-				$show_results = (request_var('sr', 'topics') == 'posts') ? 'posts' : 'topics';
-				$sort_key = 't';
-				$sort_dir = 'd';
-				$sort_by_sql['t'] = ($show_results == 'posts') ? 'p.post_time' : 't.topic_last_post_time';
-				$sql_sort = 'ORDER BY ' . $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
-
-				gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
-				$s_sort_key = $s_sort_dir = $u_sort_param = $s_limit_days = '';
-
-				if ($show_results == 'posts')
-				{
-					$sql = 'SELECT p.post_id
-						FROM ' . POSTS_TABLE . ' p
-						WHERE p.post_time > ' . phpbb::$user->data['user_lastvisit'] . "
-							$m_approve_fid_sql
-							" . ((sizeof($ex_fid_ary)) ? ' AND ' . phpbb::$db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '') . "
-						$sql_sort";
-					$field = 'post_id';
-				}
-				else
-				{
-					$sql = 'SELECT t.topic_id
-						FROM ' . TOPICS_TABLE . ' t
-						WHERE t.topic_last_post_time > ' . phpbb::$user->data['user_lastvisit'] . '
-							AND t.topic_moved_id = 0
-							' . str_replace(array('p.', 'post_'), array('t.', 'topic_'), $m_approve_fid_sql) . '
-							' . ((sizeof($ex_fid_ary)) ? 'AND ' . phpbb::$db->sql_in_set('t.forum_id', $ex_fid_ary, true) : '') . "
-						$sql_sort";
-					$field = 'topic_id';
-				}
-			break;
-
-			case 'egosearch':
-				$l_search_title = phpbb::$user->lang['SEARCH_SELF'];
-			break;
-		}
-	}
-
-	// show_results should not change after this
-	$per_page = ($show_results == 'posts') ? phpbb::$config['posts_per_page'] : phpbb::$config['topics_per_page'];
-	$total_match_count = 0;
-
-	if ($search_id)
-	{
-		if ($sql)
-		{
-			// only return up to 1000 ids (the last one will be removed later)
-			$result = phpbb::$db->sql_query_limit($sql, 1001 - $start, $start);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$id_ary[] = (int) $row[$field];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			$total_match_count = sizeof($id_ary) + $start;
-			$id_ary = array_slice($id_ary, 0, $per_page);
-		}
-		else
-		{
-			$search_id = '';
-		}
-	}
-
-	// make sure that some arrays are always in the same order
-	sort($ex_fid_ary);
-	sort($m_approve_fid_ary);
-	sort($author_id_ary);
-
-	if (!empty($search->search_query))
-	{
-		$total_match_count = $search->keyword_search($show_results, $search_fields, $search_terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_id_ary, $id_ary, $start, $per_page);
-	}
-	else if (sizeof($author_id_ary))
-	{
-		$firstpost_only = ($search_fields === 'firstpost') ? true : false;
-		$total_match_count = $search->author_search($show_results, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_id_ary, $id_ary, $start, $per_page);
-	}
-
-	// For some searches we need to print out the "no results" page directly to allow re-sorting/refining the search options.
-	if (!sizeof($id_ary) && !$search_id)
-	{
-		trigger_error('NO_SEARCH_RESULTS');
-	}
-
-	$sql_where = '';
-
-	if (sizeof($id_ary))
-	{
-		$sql_where .= phpbb::$db->sql_in_set(($show_results == 'posts') ? 'p.post_id' : 't.topic_id', $id_ary);
-		$sql_where .= (sizeof($ex_fid_ary)) ? ' AND (' . phpbb::$db->sql_in_set('f.forum_id', $ex_fid_ary, true) . ' OR f.forum_id IS NULL)' : '';
-		$sql_where .= ($show_results == 'posts') ? $m_approve_fid_sql : str_replace(array('p.post_approved', 'p.forum_id'), array('t.topic_approved', 't.forum_id'), $m_approve_fid_sql);
-	}
-
-	if ($show_results == 'posts')
-	{
-		include(PHPBB_ROOT_PATH . 'includes/functions_posting.' . PHP_EXT);
-	}
-	else
-	{
-		include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-	}
-
-	phpbb::$user->add_lang('viewtopic');
-
-	// Grab icons
-	$icons = phpbb_cache::obtain_icons();
-
-	// Output header
-	if ($search_id && ($total_match_count > 1000))
-	{
-		// limit the number to 1000 for pre-made searches
-		$total_match_count--;
-		$l_search_matches = sprintf(phpbb::$user->lang['FOUND_MORE_SEARCH_MATCHES'], $total_match_count);
-	}
-	else
-	{
-		$l_search_matches = ($total_match_count == 1) ? sprintf(phpbb::$user->lang['FOUND_SEARCH_MATCH'], $total_match_count) : sprintf(phpbb::$user->lang['FOUND_SEARCH_MATCHES'], $total_match_count);
-	}
-
-	// define some vars for urls
-	$hilit = implode('|', explode(' ', preg_replace('#\s+#u', ' ', str_replace(array('+', '-', '|', '(', ')', '&quot;'), ' ', $keywords))));
-	// Do not allow *only* wildcard being used for hilight
-	$hilit = (strspn($hilit, '*') === strlen($hilit)) ? '' : $hilit;
-
-	$u_hilit = urlencode(htmlspecialchars_decode(str_replace('|', ' ', $hilit)));
-	$u_show_results = ($show_results != 'posts') ? '&amp;sr=' . $show_results : '';
-	$u_search_forum = implode('&amp;fid%5B%5D=', $search_forum);
-
-	$u_search = append_sid('search', $u_sort_param . $u_show_results);
-	$u_search .= ($search_id) ? '&amp;search_id=' . $search_id : '';
-	$u_search .= ($u_hilit) ? '&amp;keywords=' . urlencode(htmlspecialchars_decode($search->search_query)) : '';
-	$u_search .= ($search_terms != 'all') ? '&amp;terms=' . $search_terms : '';
-	$u_search .= ($topic_id) ? '&amp;t=' . $topic_id : '';
-	$u_search .= ($author) ? '&amp;author=' . urlencode(htmlspecialchars_decode($author)) : '';
-	$u_search .= ($author_id) ? '&amp;author_id=' . $author_id : '';
-	$u_search .= ($u_search_forum) ? '&amp;fid%5B%5D=' . $u_search_forum : '';
-	$u_search .= (!$search_child) ? '&amp;sc=0' : '';
-	$u_search .= ($search_fields != 'all') ? '&amp;sf=' . $search_fields : '';
-	$u_search .= ($return_chars != 300) ? '&amp;ch=' . $return_chars : '';
-
-	phpbb::$template->assign_vars(array(
-		'SEARCH_TITLE'		=> $l_search_title,
-		'SEARCH_MATCHES'	=> $l_search_matches,
-		'SEARCH_WORDS'		=> $search->search_query,
-		'IGNORED_WORDS'		=> (sizeof($search->common_words)) ? implode(' ', $search->common_words) : '',
-		'PAGINATION'		=> generate_pagination($u_search, $total_match_count, $per_page, $start),
-		'PAGE_NUMBER'		=> on_page($total_match_count, $per_page, $start),
-		'TOTAL_MATCHES'		=> $total_match_count,
-		'SEARCH_IN_RESULTS'	=> ($search_id) ? false : true,
-
-		'S_SELECT_SORT_DIR'		=> $s_sort_dir,
-		'S_SELECT_SORT_KEY'		=> $s_sort_key,
-		'S_SELECT_SORT_DAYS'	=> $s_limit_days,
-		'S_SEARCH_ACTION'		=> $u_search,
-		'S_SHOW_TOPICS'			=> ($show_results == 'posts') ? false : true,
-
-		'GOTO_PAGE_IMG'		=> phpbb::$user->img('icon_post_target', 'GOTO_PAGE'),
-		'NEWEST_POST_IMG'	=> phpbb::$user->img('icon_topic_newest', 'VIEW_NEWEST_POST'),
-		'REPORTED_IMG'		=> phpbb::$user->img('icon_topic_reported', 'TOPIC_REPORTED'),
-		'UNAPPROVED_IMG'	=> phpbb::$user->img('icon_topic_unapproved', 'TOPIC_UNAPPROVED'),
-		'LAST_POST_IMG'		=> phpbb::$user->img('icon_topic_latest', 'VIEW_LATEST_POST'),
-
-		'U_SEARCH_WORDS'	=> $u_search,
-	));
-
-	if ($sql_where)
-	{
-		if ($show_results == 'posts')
-		{
-			// @todo Joining this query to the one below?
-			$sql = 'SELECT zebra_id, friend, foe
-				FROM ' . ZEBRA_TABLE . '
-				WHERE user_id = ' . phpbb::$user->data['user_id'];
-			$result = phpbb::$db->sql_query($sql);
-
-			$zebra = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$zebra[($row['friend']) ? 'friend' : 'foe'][] = $row['zebra_id'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			$sql = 'SELECT p.*, f.forum_id, f.forum_name, t.*, u.username, u.username_clean, u.user_sig, u.user_sig_bbcode_uid, u.user_colour
-				FROM ' . POSTS_TABLE . ' p
-					LEFT JOIN ' . TOPICS_TABLE . ' t ON (p.topic_id = t.topic_id)
-					LEFT JOIN ' . FORUMS_TABLE . ' f ON (p.forum_id = f.forum_id)
-					LEFT JOIN ' . USERS_TABLE . " u ON (p.poster_id = u.user_id)
-				WHERE $sql_where";
-		}
-		else
-		{
-			$sql_from = TOPICS_TABLE . ' t
-				LEFT JOIN ' . FORUMS_TABLE . ' f ON (f.forum_id = t.forum_id)
-				' . (($sort_key == 'a') ? ' LEFT JOIN ' . USERS_TABLE . ' u ON (u.user_id = t.topic_poster) ' : '');
-			$sql_select = 't.*, f.forum_id, f.forum_name';
-
-			if (phpbb::$user->is_registered)
-			{
-				if (phpbb::$config['load_db_track'] && $author_id !== phpbb::$user->data['user_id'])
-				{
-					$sql_from .= ' LEFT JOIN ' . TOPICS_POSTED_TABLE . ' tp ON (tp.user_id = ' . phpbb::$user->data['user_id'] . '
-						AND t.topic_id = tp.topic_id)';
-					$sql_select .= ', tp.topic_posted';
-				}
-
-				if (phpbb::$config['load_db_lastread'])
-				{
-					$sql_from .= ' LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.user_id = ' . phpbb::$user->data['user_id'] . '
-							AND t.topic_id = tt.topic_id)
-						LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.user_id = ' . phpbb::$user->data['user_id'] . '
-							AND ft.forum_id = f.forum_id)';
-					$sql_select .= ', tt.mark_time, ft.mark_time as f_mark_time';
-				}
-			}
-
-			if (phpbb::$config['load_anon_lastread'] || (phpbb::$user->is_registered && !phpbb::$config['load_db_lastread']))
-			{
-				$tracking_topics = phpbb_request::variable(phpbb::$config['cookie_name'] . '_track', '', false, phpbb_request::COOKIE);
-				$tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array();
-			}
-
-			$sql = "SELECT $sql_select
-				FROM $sql_from
-				WHERE $sql_where";
-		}
-		$sql .= ' ORDER BY ' . $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
-		$result = phpbb::$db->sql_query($sql);
-		$result_topic_id = 0;
-
-		$rowset = array();
-
-		if ($show_results == 'topics')
-		{
-			$forums = $rowset = $shadow_topic_list = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				if ($row['topic_status'] == ITEM_MOVED)
-				{
-					$shadow_topic_list[$row['topic_moved_id']] = $row['topic_id'];
-				}
-
-				$rowset[$row['topic_id']] = $row;
-
-				if (!isset($forums[$row['forum_id']]) && phpbb::$user->is_registered && phpbb::$config['load_db_lastread'])
-				{
-					$forums[$row['forum_id']]['mark_time'] = $row['f_mark_time'];
-				}
-				$forums[$row['forum_id']]['topic_list'][] = $row['topic_id'];
-				$forums[$row['forum_id']]['rowset'][$row['topic_id']] = &$rowset[$row['topic_id']];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			// If we have some shadow topics, update the rowset to reflect their topic information
-			if (sizeof($shadow_topic_list))
-			{
-				$sql = 'SELECT *
-					FROM ' . TOPICS_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('topic_id', array_keys($shadow_topic_list));
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$orig_topic_id = $shadow_topic_list[$row['topic_id']];
-
-					// We want to retain some values
-					$row = array_merge($row, array(
-						'topic_moved_id'	=> $rowset[$orig_topic_id]['topic_moved_id'],
-						'topic_status'		=> $rowset[$orig_topic_id]['topic_status'],
-						'forum_name'		=> $rowset[$orig_topic_id]['forum_name'])
-					);
-
-					$rowset[$orig_topic_id] = $row;
-				}
-				phpbb::$db->sql_freeresult($result);
-			}
-			unset($shadow_topic_list);
-
-			foreach ($forums as $forum_id => $forum)
-			{
-				if (phpbb::$user->is_registered && phpbb::$config['load_db_lastread'])
-				{
-					$topic_tracking_info[$forum_id] = get_topic_tracking($forum_id, $forum['topic_list'], $forum['rowset'], array($forum_id => $forum['mark_time']), ($forum_id) ? false : $forum['topic_list']);
-				}
-				else if (phpbb::$config['load_anon_lastread'] || phpbb::$user->is_registered)
-				{
-					$topic_tracking_info[$forum_id] = get_complete_topic_tracking($forum_id, $forum['topic_list'], ($forum_id) ? false : $forum['topic_list']);
-
-					if (!phpbb::$user->is_registered)
-					{
-						phpbb::$user->data['user_lastmark'] = (isset($tracking_topics['l'])) ? (int) (base_convert($tracking_topics['l'], 36, 10) + phpbb::$config['board_startdate']) : 0;
-					}
-				}
-			}
-			unset($forums);
-		}
-		else
-		{
-			$bbcode_bitfield = $text_only_message = '';
-			$attach_list = array();
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				// We pre-process some variables here for later usage
-				$row['post_text'] = censor_text($row['post_text']);
-
-				$text_only_message = $row['post_text'];
-				// make list items visible as such
-				if ($row['bbcode_uid'])
-				{
-					$text_only_message = str_replace('[*:' . $row['bbcode_uid'] . ']', '&sdot;&nbsp;', $text_only_message);
-					// no BBCode in text only message
-					strip_bbcode($text_only_message, $row['bbcode_uid']);
-				}
-
-				if ($return_chars == -1 || utf8_strlen($text_only_message) < ($return_chars + 3))
-				{
-					$row['display_text_only'] = false;
-					$bbcode_bitfield = $bbcode_bitfield | base64_decode($row['bbcode_bitfield']);
-
-					// Does this post have an attachment? If so, add it to the list
-					if ($row['post_attachment'] && phpbb::$config['allow_attachments'])
-					{
-						$attach_list[$row['forum_id']][] = $row['post_id'];
-					}
-				}
-				else
-				{
-					$row['post_text'] = $text_only_message;
-					$row['display_text_only'] = true;
-				}
-
-				$rowset[] = $row;
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			unset($text_only_message);
-
-			// Instantiate BBCode if needed
-			if ($bbcode_bitfield !== '')
-			{
-				include_once(PHPBB_ROOT_PATH . 'includes/bbcode.' . PHP_EXT);
-				$bbcode = new bbcode(base64_encode($bbcode_bitfield));
-			}
-
-			// Pull attachment data
-			if (sizeof($attach_list))
-			{
-				$use_attach_list = $attach_list;
-				$attach_list = array();
-
-				foreach ($use_attach_list as $forum_id => $_list)
-				{
-					if (phpbb::$acl->acl_get('u_download') && phpbb::$acl->acl_get('f_download', $forum_id))
-					{
-						$attach_list = array_merge($attach_list, $_list);
-					}
-				}
-			}
-
-			if (sizeof($attach_list))
-			{
-				$sql = 'SELECT *
-					FROM ' . ATTACHMENTS_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('post_msg_id', $attach_list) . '
-						AND in_message = 0
-					ORDER BY filetime DESC, post_msg_id ASC';
-				$result = phpbb::$db->sql_query($sql);
-
-				while ($row = phpbb::$db->sql_fetchrow($result))
-				{
-					$attachments[$row['post_msg_id']][] = $row;
-				}
-				phpbb::$db->sql_freeresult($result);
-			}
-		}
-
-		if ($hilit)
-		{
-			// Remove bad highlights
-			$hilit_array = array_filter(explode('|', $hilit), 'strlen');
-			foreach ($hilit_array as $key => $value)
-			{
-				$hilit_array[$key] = str_replace('\*', '\w*?', preg_quote($value, '#'));
-				$hilit_array[$key] = preg_replace('#(^|\s)\\\\w\*\?(\s|$)#', '$1\w+?$2', $hilit_array[$key]);
-			}
-			$hilit = implode('|', $hilit_array);
-		}
-
-		foreach ($rowset as $row)
-		{
-			$forum_id = $row['forum_id'];
-			$result_topic_id = $row['topic_id'];
-			$topic_title = censor_text($row['topic_title']);
-
-			// we need to select a forum id for this global topic
-			if (!$forum_id)
-			{
-				if (!isset($g_forum_id))
-				{
-					// Get a list of forums the user cannot read
-					$forum_ary = array_unique(array_keys(phpbb::$acl->acl_getf('!f_read', true)));
-
-					// Determine first forum the user is able to read (must not be a category)
-					$sql = 'SELECT forum_id
-						FROM ' . FORUMS_TABLE . '
-						WHERE forum_type = ' . FORUM_POST;
-
-					if (sizeof($forum_ary))
-					{
-						$sql .= ' AND ' . phpbb::$db->sql_in_set('forum_id', $forum_ary, true);
-					}
-
-					$result = phpbb::$db->sql_query_limit($sql, 1);
-					$g_forum_id = (int) phpbb::$db->sql_fetchfield('forum_id');
-				}
-				$u_forum_id = $g_forum_id;
-			}
-			else
-			{
-				$u_forum_id = $forum_id;
-			}
-
-			$view_topic_url_params = "f=$u_forum_id&amp;t=$result_topic_id" . (($u_hilit) ? "&amp;hilit=$u_hilit" : '');
-			$view_topic_url = append_sid('viewtopic', $view_topic_url_params);
-
-			$replies = (phpbb::$acl->acl_get('m_approve', $forum_id)) ? $row['topic_replies_real'] : $row['topic_replies'];
-
-			if ($show_results == 'topics')
-			{
-				if (phpbb::$config['load_db_track'] && $author_id === phpbb::$user->data['user_id'])
-				{
-					$row['topic_posted'] = 1;
-				}
-
-				$folder_img = $folder_alt = $topic_type = '';
-				topic_status($row, $replies, (isset($topic_tracking_info[$forum_id][$row['topic_id']]) && $row['topic_last_post_time'] > $topic_tracking_info[$forum_id][$row['topic_id']]) ? true : false, $folder_img, $folder_alt, $topic_type);
-
-				$unread_topic = (isset($topic_tracking_info[$forum_id][$row['topic_id']]) && $row['topic_last_post_time'] > $topic_tracking_info[$forum_id][$row['topic_id']]) ? true : false;
-
-				$topic_unapproved = (!$row['topic_approved'] && phpbb::$acl->acl_get('m_approve', $forum_id)) ? true : false;
-				$posts_unapproved = ($row['topic_approved'] && $row['topic_replies'] < $row['topic_replies_real'] && phpbb::$acl->acl_get('m_approve', $forum_id)) ? true : false;
-				$u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? append_sid('mcp', 'i=queue&amp;mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . "&amp;t=$result_topic_id", true, phpbb::$user->session_id) : '';
-
-				$row['topic_title'] = preg_replace('#(?!<.*)(?<!\w)(' . $hilit . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">$1</span>', $row['topic_title']);
-
-				$tpl_ary = array(
-					'TOPIC_AUTHOR'				=> get_username_string('username', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
-					'TOPIC_AUTHOR_COLOUR'		=> get_username_string('colour', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
-					'TOPIC_AUTHOR_FULL'			=> get_username_string('full', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
-					'FIRST_POST_TIME'			=> phpbb::$user->format_date($row['topic_time']),
-					'LAST_POST_SUBJECT'			=> $row['topic_last_post_subject'],
-					'LAST_POST_TIME'			=> phpbb::$user->format_date($row['topic_last_post_time']),
-					'LAST_VIEW_TIME'			=> phpbb::$user->format_date($row['topic_last_view_time']),
-					'LAST_POST_AUTHOR'			=> get_username_string('username', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
-					'LAST_POST_AUTHOR_COLOUR'	=> get_username_string('colour', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
-					'LAST_POST_AUTHOR_FULL'		=> get_username_string('full', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
-
-					'PAGINATION'		=> topic_generate_pagination($replies, $view_topic_url),
-					'TOPIC_TYPE'		=> $topic_type,
-
-					'TOPIC_FOLDER_IMG'		=> phpbb::$user->img($folder_img, $folder_alt),
-					'TOPIC_FOLDER_IMG_SRC'	=> phpbb::$user->img($folder_img, $folder_alt, 'src'),
-					'TOPIC_FOLDER_IMG_ALT'	=> phpbb::$user->lang[$folder_alt],
-					'TOPIC_FOLDER_IMG_WIDTH'=> phpbb::$user->img($folder_img, '', 'width'),
-					'TOPIC_FOLDER_IMG_HEIGHT'	=> phpbb::$user->img($folder_img, '', 'height'),
-
-					'TOPIC_ICON_IMG'		=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['img'] : '',
-					'TOPIC_ICON_IMG_WIDTH'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '',
-					'TOPIC_ICON_IMG_HEIGHT'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['height'] : '',
-					'ATTACH_ICON_IMG'		=> (phpbb::$acl->acl_get('u_download') && phpbb::$acl->acl_get('f_download', $forum_id) && $row['topic_attachment']) ? phpbb::$user->img('icon_topic_attach', phpbb::$user->lang['TOTAL_ATTACHMENTS']) : '',
-					'UNAPPROVED_IMG'		=> ($topic_unapproved || $posts_unapproved) ? phpbb::$user->img('icon_topic_unapproved', ($topic_unapproved) ? 'TOPIC_UNAPPROVED' : 'POSTS_UNAPPROVED') : '',
-
-					'S_TOPIC_GLOBAL'		=> (!$forum_id) ? true : false,
-					'S_TOPIC_TYPE'			=> $row['topic_type'],
-					'S_USER_POSTED'			=> (!empty($row['mark_type'])) ? true : false,
-					'S_UNREAD_TOPIC'		=> $unread_topic,
-
-					'S_TOPIC_REPORTED'		=> (!empty($row['topic_reported']) && phpbb::$acl->acl_get('m_report', $forum_id)) ? true : false,
-					'S_TOPIC_UNAPPROVED'	=> $topic_unapproved,
-					'S_POSTS_UNAPPROVED'	=> $posts_unapproved,
-
-					'U_LAST_POST'			=> append_sid('viewtopic', $view_topic_url_params . '&amp;p=' . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'],
-					'U_LAST_POST_AUTHOR'	=> get_username_string('profile', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
-					'U_TOPIC_AUTHOR'		=> get_username_string('profile', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
-					'U_NEWEST_POST'			=> append_sid('viewtopic', $view_topic_url_params . '&amp;view=unread') . '#unread',
-					'U_MCP_REPORT'			=> append_sid('mcp', 'i=reports&amp;mode=reports&amp;t=' . $result_topic_id, true, phpbb::$user->session_id),
-					'U_MCP_QUEUE'			=> $u_mcp_queue,
-				);
-			}
-			else
-			{
-				if ((isset($zebra['foe']) && in_array($row['poster_id'], $zebra['foe'])) && (!$view || $view != 'show' || $post_id != $row['post_id']))
-				{
-					phpbb::$template->assign_block_vars('searchresults', array(
-						'S_IGNORE_POST' => true,
-
-						'L_IGNORE_POST' => sprintf(phpbb::$user->lang['POST_BY_FOE'], $row['username'], "<a href=\"$u_search&amp;start=$start&amp;p=" . $row['post_id'] . '&amp;view=show#p' . $row['post_id'] . '">', '</a>'),
-					));
-
-					continue;
-				}
-
-				// Replace naughty words such as farty pants
-				$row['post_subject'] = censor_text($row['post_subject']);
-
-				if ($row['display_text_only'])
-				{
-					// now find context for the searched words
-					$row['post_text'] = get_context($row['post_text'], array_filter(explode('|', $hilit), 'strlen'), $return_chars);
-					$row['post_text'] = bbcode_nl2br($row['post_text']);
-				}
-				else
-				{
-					// Second parse bbcode here
-					if ($row['bbcode_bitfield'])
-					{
-						$bbcode->bbcode_second_pass($row['post_text'], $row['bbcode_uid'], $row['bbcode_bitfield']);
-					}
-
-					$row['post_text'] = bbcode_nl2br($row['post_text']);
-					$row['post_text'] = smiley_text($row['post_text']);
-
-					if (!empty($attachments[$row['post_id']]))
-					{
-						parse_attachments($forum_id, $row['post_text'], $attachments[$row['post_id']], $update_count);
-
-						// we only display inline attachments
-						unset($attachments[$row['post_id']]);
-					}
-				}
-
-				if ($hilit)
-				{
-					// post highlighting
-					$row['post_text'] = preg_replace('#(?!<.*)(?<!\w)(' . $hilit . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">$1</span>', $row['post_text']);
-					$row['post_subject'] = preg_replace('#(?!<.*)(?<!\w)(' . $hilit . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">$1</span>', $row['post_subject']);
-				}
-
-				$tpl_ary = array(
-					'POST_AUTHOR_FULL'		=> get_username_string('full', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']),
-					'POST_AUTHOR_COLOUR'	=> get_username_string('colour', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']),
-					'POST_AUTHOR'			=> get_username_string('username', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']),
-					'U_POST_AUTHOR'			=> get_username_string('profile', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']),
-
-					'POST_SUBJECT'		=> $row['post_subject'],
-					'POST_DATE'			=> (!empty($row['post_time'])) ? phpbb::$user->format_date($row['post_time']) : '',
-					'MESSAGE'			=> $row['post_text']
-				);
-			}
-
-			phpbb::$template->assign_block_vars('searchresults', array_merge($tpl_ary, array(
-				'FORUM_ID'			=> $forum_id,
-				'TOPIC_ID'			=> $result_topic_id,
-				'POST_ID'			=> ($show_results == 'posts') ? $row['post_id'] : false,
-
-				'FORUM_TITLE'		=> $row['forum_name'],
-				'TOPIC_TITLE'		=> $topic_title,
-				'TOPIC_REPLIES'		=> $replies,
-				'TOPIC_VIEWS'		=> $row['topic_views'],
-
-				'U_VIEW_TOPIC'		=> $view_topic_url,
-				'U_VIEW_FORUM'		=> append_sid('viewforum', 'f=' . $forum_id),
-				'U_VIEW_POST'		=> (!empty($row['post_id'])) ? append_sid('viewtopic', "f=$forum_id&amp;t=" . $row['topic_id'] . '&amp;p=' . $row['post_id'] . (($u_hilit) ? '&amp;hilit=' . $u_hilit : '')) . '#p' . $row['post_id'] : '')
-			));
-		}
-
-		if ($topic_id && ($topic_id == $result_topic_id))
-		{
-			phpbb::$template->assign_vars(array(
-				'SEARCH_TOPIC'		=> $topic_title,
-				'U_SEARCH_TOPIC'	=> $view_topic_url
-			));
-		}
-	}
-	unset($rowset);
-
-	page_header(($l_search_title) ? $l_search_title : phpbb::$user->lang['SEARCH']);
-
-	phpbb::$template->set_filenames(array(
-		'body' => 'search_results.html',
-	));
-	make_jumpbox(append_sid('viewforum'));
-
-	page_footer();
-}
-
-
-// Search forum
-$s_forums = '';
-$sql = 'SELECT f.forum_id, f.forum_name, f.parent_id, f.forum_type, f.left_id, f.right_id, f.forum_password, f.enable_indexing, fa.user_id
-	FROM ' . FORUMS_TABLE . ' f
-	LEFT JOIN ' . FORUMS_ACCESS_TABLE . " fa ON (fa.forum_id = f.forum_id
-		AND fa.session_id = '" . phpbb::$db->sql_escape(phpbb::$user->session_id) . "')
-	ORDER BY f.left_id ASC";
-$result = phpbb::$db->sql_query($sql);
-
-$right = $cat_right = $padding_inc = 0;
-$padding = $forum_list = $holding = '';
-$pad_store = array('0' => '');
-
-while ($row = phpbb::$db->sql_fetchrow($result))
-{
-	if ($row['forum_type'] == FORUM_CAT && ($row['left_id'] + 1 == $row['right_id']))
-	{
-		// Non-postable forum with no subforums, don't display
-		continue;
-	}
-
-	if ($row['forum_type'] == FORUM_POST && ($row['left_id'] + 1 == $row['right_id']) && !$row['enable_indexing'])
-	{
-		// Postable forum with no subforums and indexing disabled, don't display
-		continue;
-	}
-
-	if ($row['forum_type'] == FORUM_LINK || ($row['forum_password'] && !$row['user_id']))
-	{
-		// if this forum is a link or password protected (user has not entered the password yet) then skip to the next branch
-		continue;
-	}
-
-	if ($row['left_id'] < $right)
-	{
-		$padding .= '&nbsp; &nbsp;';
-		$pad_store[$row['parent_id']] = $padding;
-	}
-	else if ($row['left_id'] > $right + 1)
-	{
-		if (isset($pad_store[$row['parent_id']]))
-		{
-			$padding = $pad_store[$row['parent_id']];
-		}
-		else
-		{
-			continue;
-		}
-	}
-
-	$right = $row['right_id'];
-
-	if (phpbb::$acl->acl_gets('!f_search', '!f_list', $row['forum_id']))
-	{
-		// if the user does not have permissions to search or see this forum skip only this forum/category
-		continue;
-	}
-
-	$selected = (in_array($row['forum_id'], $search_forum)) ? ' selected="selected"' : '';
-
-	if ($row['left_id'] > $cat_right)
-	{
-		// make sure we don't forget anything
-		$s_forums .= $holding;
-		$holding = '';
-	}
-
-	if ($row['right_id'] - $row['left_id'] > 1)
-	{
-		$cat_right = max($cat_right, $row['right_id']);
-
-		$holding .= '<option value="' . $row['forum_id'] . '"' . $selected . '>' . $padding . $row['forum_name'] . '</option>';
-	}
-	else
-	{
-		$s_forums .= $holding . '<option value="' . $row['forum_id'] . '"' . $selected . '>' . $padding . $row['forum_name'] . '</option>';
-		$holding = '';
-	}
-}
-
-if ($holding)
-{
-	$s_forums .= $holding;
-}
-
-phpbb::$db->sql_freeresult($result);
-unset($pad_store);
-
-if (!$s_forums)
-{
-	trigger_error('NO_SEARCH');
-}
-
-// Number of chars returned
-$s_characters = '<option value="-1">' . phpbb::$user->lang['ALL_AVAILABLE'] . '</option>';
-$s_characters .= '<option value="0">0</option>';
-$s_characters .= '<option value="25">25</option>';
-$s_characters .= '<option value="50">50</option>';
-
-for ($i = 100; $i <= 1000 ; $i += 100)
-{
-	$selected = ($i == 300) ? ' selected="selected"' : '';
-	$s_characters .= '<option value="' . $i . '"' . $selected . '>' . $i . '</option>';
-}
-
-$s_hidden_fields = array('t' => $topic_id);
-
-/**
-* @todo get rid of this global $_SID voodoo!
-*/
-if ($_SID)
-{
-	$s_hidden_fields['sid'] = $_SID;
-}
-
-/**
-* @todo get rid of this global $_EXTRA_URL voodoo, too!
-*/
-if (!empty($_EXTRA_URL))
-{
-	foreach ($_EXTRA_URL as $url_param)
-	{
-		$url_param = explode('=', $url_param, 2);
-		$s_hidden_fields[$url_param[0]] = $url_param[1];
-	}
-}
-
-phpbb::$template->assign_vars(array(
-	'S_SEARCH_ACTION'		=> append_sid('search', false, true, 0), // We force no ?sid= appending by using 0
-	'S_HIDDEN_FIELDS'		=> build_hidden_fields($s_hidden_fields),
-	'S_CHARACTER_OPTIONS'	=> $s_characters,
-	'S_FORUM_OPTIONS'		=> $s_forums,
-	'S_SELECT_SORT_DIR'		=> $s_sort_dir,
-	'S_SELECT_SORT_KEY'		=> $s_sort_key,
-	'S_SELECT_SORT_DAYS'	=> $s_limit_days,
-	'S_IN_SEARCH'			=> true,
-));
-
-// only show recent searches to search administrators
-if (phpbb::$acl->acl_get('a_search'))
-{
-	$sql = 'SELECT search_time, search_keywords
-		FROM ' . SEARCH_RESULTS_TABLE . '
-		WHERE ' . phpbb::$db->sql_function('length_text', 'search_keywords') . ' > 0
-		ORDER BY search_time DESC';
-	$result = phpbb::$db->sql_query_limit($sql, 5);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$keywords = $row['search_keywords'];
-
-		phpbb::$template->assign_block_vars('recentsearch', array(
-			'KEYWORDS'	=> $keywords,
-			'TIME'		=> phpbb::$user->format_date($row['search_time']),
-
-			'U_KEYWORDS'	=> append_sid('search', 'keywords=' . urlencode(htmlspecialchars_decode($keywords)))
-		));
-	}
-	phpbb::$db->sql_freeresult($result);
-}
-
-// Output the basic page
-page_header(phpbb::$user->lang['SEARCH']);
-
-phpbb::$template->set_filenames(array(
-	'body' => 'search_body.html',
-));
-make_jumpbox(append_sid('viewforum'));
-
-page_footer();
-
-?>
-\ No newline at end of file
diff --git a/phpBB/store/.htaccess b/phpBB/store/.htaccess
deleted file mode 100644
index aa5afc1640..0000000000
--- a/phpBB/store/.htaccess
+++ /dev/null
@@ -1,4 +0,0 @@
-<Files *>
-	Order Allow,Deny
-	Deny from All
-</Files>
-\ No newline at end of file
diff --git a/phpBB/style.php b/phpBB/style.php
deleted file mode 100644
index 4a26d8ed00..0000000000
--- a/phpBB/style.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-define('IN_PHPBB', true);
-if (!defined('PHPBB_ROOT_PATH')) define('PHPBB_ROOT_PATH', './');
-if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-
-$id = (isset($_GET['id'])) ? intval($_GET['id']) : 0;
-
-// This is a simple script to grab and output the requested CSS data stored in the DB
-// We cache the resulting CSS data for five minutes
-if (!$id)
-{
-	exit;
-}
-
-include(PHPBB_ROOT_PATH . 'common.' . PHP_EXT);
-
-$sql = 'SELECT s.style_id, c.theme_id, c.theme_data, c.theme_path, c.theme_name, c.theme_mtime, i.*, t.template_path
-	FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . ' i
-	WHERE s.style_id = ' . $id . '
-		AND t.template_id = s.template_id
-		AND c.theme_id = s.theme_id
-		AND i.imageset_id = s.imageset_id';
-$result = phpbb::$db->sql_query($sql, 300);
-$theme = phpbb::$db->sql_fetchrow($result);
-phpbb::$db->sql_freeresult($result);
-
-if (!$theme)
-{
-	garbage_collection();
-	exit_handler();
-}
-
-$user_lang = basename(request_var('lang', phpbb::$config['default_lang']));
-$user_image_lang = (file_exists(PHPBB_ROOT_PATH . 'styles/' . $theme['imageset_path'] . '/imageset/' . $user_lang)) ? $user_lang : phpbb::$config['default_lang'];
-
-$sql = 'SELECT *
-	FROM ' . STYLES_IMAGESET_DATA_TABLE . '
-	WHERE imageset_id = ' . $theme['imageset_id'] . "
-	AND image_filename <> ''
-	AND image_lang IN ('" . phpbb::$db->sql_escape($user_image_lang) . "', '')";
-$result = phpbb::$db->sql_query($sql, 3600);
-
-$img_array = array();
-while ($row = phpbb::$db->sql_fetchrow($result))
-{
-	$img_array[$row['image_name']] = $row;
-}
-phpbb::$db->sql_freeresult($result);
-
-// gzip_compression
-if (phpbb::$config['gzip_compress'])
-{
-	if (strpos(strtolower(phpbb::$user->system['browser']), 'msie 6.0') === false && @extension_loaded('zlib') && !headers_sent())
-	{
-		ob_start('ob_gzhandler');
-	}
-}
-
-// Expire time of seven days if not recached
-$expire_time = 7 * 86400;
-$recache = false;
-
-// Re-cache stylesheet data if necessary
-if (phpbb::$config['load_tplcompile'] || empty($theme['theme_data']))
-{
-	$recache = (empty($theme['theme_data'])) ? true : false;
-	$update_time = time();
-
-	// We test for stylesheet.css because it is faster and most likely the only file changed on common themes
-	if (!$recache && $theme['theme_mtime'] < @filemtime(PHPBB_ROOT_PATH . 'styles/' . $theme['theme_path'] . '/theme/stylesheet.css'))
-	{
-		$recache = true;
-		$update_time = @filemtime(PHPBB_ROOT_PATH . 'styles/' . $theme['theme_path'] . '/theme/stylesheet.css');
-	}
-	else if (!$recache)
-	{
-		$last_change = $theme['theme_mtime'];
-		$dir = @opendir(PHPBB_ROOT_PATH . "styles/{$theme['theme_path']}/theme");
-
-		if ($dir)
-		{
-			while (($entry = readdir($dir)) !== false)
-			{
-				if (substr(strrchr($entry, '.'), 1) == 'css' && $last_change < @filemtime(PHPBB_ROOT_PATH . "styles/{$theme['theme_path']}/theme/{$entry}"))
-				{
-					$recache = true;
-					break;
-				}
-			}
-			closedir($dir);
-		}
-	}
-}
-
-// We store new data within database
-if ($recache)
-{
-	if (!class_exists('acp_styles'))
-	{
-		include PHPBB_ROOT_PATH . 'modules/acp/acp_styles.' . PHP_EXT;
-	}
-
-	$theme['theme_data'] = acp_styles::db_theme_data($theme);
-	$theme['theme_mtime'] = $update_time;
-
-	// Save CSS contents
-	$sql_ary = array(
-		'theme_mtime'	=> $theme['theme_mtime'],
-		'theme_data'	=> $theme['theme_data']
-	);
-
-	phpbb::$db->sql_query('UPDATE ' . STYLES_THEME_TABLE . ' SET ' . phpbb::$db->sql_build_array('UPDATE', $sql_ary) . ' WHERE theme_id = ' . $theme['theme_id']);
-	phpbb::$acm->destroy_sql(STYLES_THEME_TABLE);
-}
-
-// Only set the expire time if the theme changed data is older than 30 minutes - to cope with changes from the ACP
-if ($recache || $theme['theme_mtime'] > (time() - 1800))
-{
-	header('Expires: 0');
-}
-else
-{
-	header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + $expire_time));
-}
-
-header('Content-type: text/css; charset=UTF-8');
-
-// Parse Theme Data
-$replace = array(
-	'{T_THEME_PATH}'			=> PHPBB_ROOT_PATH . 'styles/' . $theme['theme_path'] . '/theme',
-	'{T_TEMPLATE_PATH}'			=> PHPBB_ROOT_PATH . 'styles/' . $theme['template_path'] . '/template',
-	'{T_IMAGESET_PATH}'			=> PHPBB_ROOT_PATH . 'styles/' . $theme['imageset_path'] . '/imageset',
-	'{T_IMAGESET_LANG_PATH}'	=> PHPBB_ROOT_PATH . 'styles/' . $theme['imageset_path'] . '/imageset/' . $user_image_lang,
-	'{T_STYLESHEET_NAME}'		=> $theme['theme_name'],
-	'{S_USER_LANG}'				=> $user_lang,
-);
-
-$theme['theme_data'] = str_replace(array_keys($replace), array_values($replace), $theme['theme_data']);
-
-// Replace IMG_*_WIDTH/HEIGHT/SRC tags
-$matches = array();
-preg_match_all('#\{IMG_([A-Za-z0-9_]*?)_(WIDTH|HEIGHT|SRC)\}#', $theme['theme_data'], $matches);
-
-$imgs = $find = $replace = array();
-if (isset($matches[0]) && sizeof($matches[0]))
-{
-	foreach ($matches[1] as $i => $img)
-	{
-		$img = strtolower($img);
-		$find[] = $matches[0][$i];
-
-		if (!isset($img_array[$img]))
-		{
-			$replace[] = '';
-			continue;
-		}
-
-		if (!isset($imgs[$img]))
-		{
-			$img_data = &$img_array[$img];
-			$imgsrc = ($img_data['image_lang'] ? $img_data['image_lang'] . '/' : '') . $img_data['image_filename'];
-
-			$imgs[$img] = array(
-				'src'		=> PHPBB_ROOT_PATH . 'styles/' . $theme['imageset_path'] . '/imageset/' . $imgsrc,
-				'width'		=> $img_data['image_width'],
-				'height'	=> $img_data['image_height'],
-			);
-		}
-
-		switch ($matches[2][$i])
-		{
-			case 'SRC':
-				$replace[] = $imgs[$img]['src'];
-			break;
-
-			case 'WIDTH':
-				$replace[] = $imgs[$img]['width'];
-			break;
-
-			case 'HEIGHT':
-				$replace[] = $imgs[$img]['height'];
-			break;
-
-			default:
-				continue;
-		}
-	}
-
-	if (sizeof($find))
-	{
-		$theme['theme_data'] = str_replace($find, $replace, $theme['theme_data']);
-	}
-}
-
-echo $theme['theme_data'];
-
-garbage_collection();
-exit_handler();
-
-?>
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/imageset/announce_read.gif b/phpBB/styles/prosilver/imageset/announce_read.gif
deleted file mode 100644
index 33e4a5e852..0000000000
--- a/phpBB/styles/prosilver/imageset/announce_read.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/announce_read_locked.gif b/phpBB/styles/prosilver/imageset/announce_read_locked.gif
deleted file mode 100644
index 76ead8a02c..0000000000
--- a/phpBB/styles/prosilver/imageset/announce_read_locked.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/announce_read_locked_mine.gif b/phpBB/styles/prosilver/imageset/announce_read_locked_mine.gif
deleted file mode 100644
index 2105d21f10..0000000000
--- a/phpBB/styles/prosilver/imageset/announce_read_locked_mine.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/announce_read_mine.gif b/phpBB/styles/prosilver/imageset/announce_read_mine.gif
deleted file mode 100644
index ad928330e6..0000000000
--- a/phpBB/styles/prosilver/imageset/announce_read_mine.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/announce_unread.gif b/phpBB/styles/prosilver/imageset/announce_unread.gif
deleted file mode 100644
index 4a789f70f0..0000000000
--- a/phpBB/styles/prosilver/imageset/announce_unread.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/announce_unread_locked.gif b/phpBB/styles/prosilver/imageset/announce_unread_locked.gif
deleted file mode 100644
index 76dcc6ca71..0000000000
--- a/phpBB/styles/prosilver/imageset/announce_unread_locked.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/announce_unread_locked_mine.gif b/phpBB/styles/prosilver/imageset/announce_unread_locked_mine.gif
deleted file mode 100644
index 53782fc3dc..0000000000
--- a/phpBB/styles/prosilver/imageset/announce_unread_locked_mine.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/announce_unread_mine.gif b/phpBB/styles/prosilver/imageset/announce_unread_mine.gif
deleted file mode 100644
index e01e920b59..0000000000
--- a/phpBB/styles/prosilver/imageset/announce_unread_mine.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/en/button_pm_forward.gif b/phpBB/styles/prosilver/imageset/en/button_pm_forward.gif
deleted file mode 100644
index 3384df34be..0000000000
--- a/phpBB/styles/prosilver/imageset/en/button_pm_forward.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/en/button_pm_new.gif b/phpBB/styles/prosilver/imageset/en/button_pm_new.gif
deleted file mode 100644
index cc0381c6b2..0000000000
--- a/phpBB/styles/prosilver/imageset/en/button_pm_new.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/en/button_pm_reply.gif b/phpBB/styles/prosilver/imageset/en/button_pm_reply.gif
deleted file mode 100644
index 3275b06d52..0000000000
--- a/phpBB/styles/prosilver/imageset/en/button_pm_reply.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/en/button_topic_locked.gif b/phpBB/styles/prosilver/imageset/en/button_topic_locked.gif
deleted file mode 100644
index b08918a24f..0000000000
--- a/phpBB/styles/prosilver/imageset/en/button_topic_locked.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/en/button_topic_new.gif b/phpBB/styles/prosilver/imageset/en/button_topic_new.gif
deleted file mode 100644
index 5b7b1e0e60..0000000000
--- a/phpBB/styles/prosilver/imageset/en/button_topic_new.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/en/button_topic_reply.gif b/phpBB/styles/prosilver/imageset/en/button_topic_reply.gif
deleted file mode 100644
index e900c80c70..0000000000
--- a/phpBB/styles/prosilver/imageset/en/button_topic_reply.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/en/icon_contact_pm.gif b/phpBB/styles/prosilver/imageset/en/icon_contact_pm.gif
deleted file mode 100644
index ec190118fe..0000000000
--- a/phpBB/styles/prosilver/imageset/en/icon_contact_pm.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/en/icon_post_edit.gif b/phpBB/styles/prosilver/imageset/en/icon_post_edit.gif
deleted file mode 100644
index 19006f95a7..0000000000
--- a/phpBB/styles/prosilver/imageset/en/icon_post_edit.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/en/icon_post_quote.gif b/phpBB/styles/prosilver/imageset/en/icon_post_quote.gif
deleted file mode 100644
index c3708a1477..0000000000
--- a/phpBB/styles/prosilver/imageset/en/icon_post_quote.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/en/icon_user_online.gif b/phpBB/styles/prosilver/imageset/en/icon_user_online.gif
deleted file mode 100644
index 6b571ffce0..0000000000
--- a/phpBB/styles/prosilver/imageset/en/icon_user_online.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/en/imageset.cfg b/phpBB/styles/prosilver/imageset/en/imageset.cfg
deleted file mode 100644
index a23eb170fb..0000000000
--- a/phpBB/styles/prosilver/imageset/en/imageset.cfg
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# phpBB Imageset Configuration File
-#
-# @package phpBB3
-# @copyright (c) 2006 phpBB Group 
-# @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-#
-#
-# At the left is the name, please do not change this
-# At the right the value is entered
-# For on/off options the valid values are on, off, 1, 0, true and false
-#
-# Values get trimmed, if you want to add a space in front or at the end of
-# the value, then enclose the value with single or double quotes. 
-# Single and double quotes do not need to be escaped.
-#
-# 
-
-# Images
-img_icon_contact_pm = icon_contact_pm.gif*20*28
-
-img_icon_post_edit = icon_post_edit.gif*20*42
-img_icon_post_quote = icon_post_quote.gif*20*54
-
-img_icon_user_online = icon_user_online.gif*58*58
-img_icon_user_offline = 
-img_icon_user_search = 
-
-img_button_pm_forward = button_pm_forward.gif*25*96
-img_button_pm_new = button_pm_new.gif*25*84
-img_button_pm_reply = button_pm_reply.gif*25*96
-
-img_button_topic_locked = button_topic_locked.gif*25*88
-img_button_topic_new = button_topic_new.gif*25*96
-img_button_topic_reply = button_topic_reply.gif*25*96
diff --git a/phpBB/styles/prosilver/imageset/forum_link.gif b/phpBB/styles/prosilver/imageset/forum_link.gif
deleted file mode 100644
index 01fb1c4e1e..0000000000
--- a/phpBB/styles/prosilver/imageset/forum_link.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/forum_read.gif b/phpBB/styles/prosilver/imageset/forum_read.gif
deleted file mode 100644
index 82ceee0784..0000000000
--- a/phpBB/styles/prosilver/imageset/forum_read.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/forum_read_locked.gif b/phpBB/styles/prosilver/imageset/forum_read_locked.gif
deleted file mode 100644
index 450bf28c3c..0000000000
--- a/phpBB/styles/prosilver/imageset/forum_read_locked.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/forum_read_subforum.gif b/phpBB/styles/prosilver/imageset/forum_read_subforum.gif
deleted file mode 100644
index 5e97bc94ce..0000000000
--- a/phpBB/styles/prosilver/imageset/forum_read_subforum.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/forum_unread.gif b/phpBB/styles/prosilver/imageset/forum_unread.gif
deleted file mode 100644
index 5a305d2470..0000000000
--- a/phpBB/styles/prosilver/imageset/forum_unread.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/forum_unread_locked.gif b/phpBB/styles/prosilver/imageset/forum_unread_locked.gif
deleted file mode 100644
index 34f1d46ad7..0000000000
--- a/phpBB/styles/prosilver/imageset/forum_unread_locked.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/forum_unread_subforum.gif b/phpBB/styles/prosilver/imageset/forum_unread_subforum.gif
deleted file mode 100644
index 5ddd1b2cba..0000000000
--- a/phpBB/styles/prosilver/imageset/forum_unread_subforum.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_back_top.gif b/phpBB/styles/prosilver/imageset/icon_back_top.gif
deleted file mode 100644
index 4d2b8f3822..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_back_top.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_contact_aim.gif b/phpBB/styles/prosilver/imageset/icon_contact_aim.gif
deleted file mode 100644
index be039fcde2..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_contact_aim.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_contact_email.gif b/phpBB/styles/prosilver/imageset/icon_contact_email.gif
deleted file mode 100644
index caa3683005..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_contact_email.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_contact_icq.gif b/phpBB/styles/prosilver/imageset/icon_contact_icq.gif
deleted file mode 100644
index 48a09373eb..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_contact_icq.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_contact_jabber.gif b/phpBB/styles/prosilver/imageset/icon_contact_jabber.gif
deleted file mode 100644
index e335433e97..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_contact_jabber.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_contact_msnm.gif b/phpBB/styles/prosilver/imageset/icon_contact_msnm.gif
deleted file mode 100644
index b82253599b..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_contact_msnm.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_contact_www.gif b/phpBB/styles/prosilver/imageset/icon_contact_www.gif
deleted file mode 100644
index 83cee9728d..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_contact_www.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_contact_yahoo.gif b/phpBB/styles/prosilver/imageset/icon_contact_yahoo.gif
deleted file mode 100644
index 305f297fdb..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_contact_yahoo.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_offline.gif b/phpBB/styles/prosilver/imageset/icon_offline.gif
deleted file mode 100644
index c5e41a41db..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_offline.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_online.gif b/phpBB/styles/prosilver/imageset/icon_online.gif
deleted file mode 100644
index 18e43cd0c6..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_online.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_post_delete.gif b/phpBB/styles/prosilver/imageset/icon_post_delete.gif
deleted file mode 100644
index f51ffc24a6..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_post_delete.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_post_info.gif b/phpBB/styles/prosilver/imageset/icon_post_info.gif
deleted file mode 100644
index af089d8656..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_post_info.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_post_report.gif b/phpBB/styles/prosilver/imageset/icon_post_report.gif
deleted file mode 100644
index 72c6ae89d0..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_post_report.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_post_target.gif b/phpBB/styles/prosilver/imageset/icon_post_target.gif
deleted file mode 100644
index a29dbffa35..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_post_target.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_post_target_unread.gif b/phpBB/styles/prosilver/imageset/icon_post_target_unread.gif
deleted file mode 100644
index e97eeb2b2e..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_post_target_unread.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_rate_bad.gif b/phpBB/styles/prosilver/imageset/icon_rate_bad.gif
deleted file mode 100644
index 7901889408..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_rate_bad.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_rate_good.gif b/phpBB/styles/prosilver/imageset/icon_rate_good.gif
deleted file mode 100644
index 6d23034d71..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_rate_good.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_topic_attach.gif b/phpBB/styles/prosilver/imageset/icon_topic_attach.gif
deleted file mode 100644
index 9a70638650..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_topic_attach.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_topic_latest.gif b/phpBB/styles/prosilver/imageset/icon_topic_latest.gif
deleted file mode 100644
index d79d31ac43..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_topic_latest.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_topic_newest.gif b/phpBB/styles/prosilver/imageset/icon_topic_newest.gif
deleted file mode 100644
index 0aa19884b5..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_topic_newest.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_topic_reported.gif b/phpBB/styles/prosilver/imageset/icon_topic_reported.gif
deleted file mode 100644
index 006b1e2291..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_topic_reported.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_topic_unapproved.gif b/phpBB/styles/prosilver/imageset/icon_topic_unapproved.gif
deleted file mode 100644
index 09d8f387a7..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_topic_unapproved.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/icon_user_warn.gif b/phpBB/styles/prosilver/imageset/icon_user_warn.gif
deleted file mode 100644
index 9c4ad98e5c..0000000000
--- a/phpBB/styles/prosilver/imageset/icon_user_warn.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/imageset.cfg b/phpBB/styles/prosilver/imageset/imageset.cfg
deleted file mode 100644
index 3e1ea21dce..0000000000
--- a/phpBB/styles/prosilver/imageset/imageset.cfg
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# phpBB Imageset Configuration File
-#
-# @package phpBB3
-# @copyright (c) 2006 phpBB Group 
-# @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-#
-#
-# At the left is the name, please do not change this
-# At the right the value is entered
-# For on/off options the valid values are on, off, 1, 0, true and false
-#
-# Values get trimmed, if you want to add a space in front or at the end of
-# the value, then enclose the value with single or double quotes. 
-# Single and double quotes do not need to be escaped.
-#
-# 
-
-# General Information about this style
-name = prosilver
-copyright = &copy; phpBB Group, 2007
-version = 3.0.3
-
-# Images
-img_site_logo = site_logo.gif*52*139
-img_poll_left = 
-img_poll_center = 
-img_poll_right = 
-img_icon_friend = 
-img_icon_foe = 
-
-img_forum_link = forum_link.gif*27*27
-img_forum_read = forum_read.gif*27*27
-img_forum_read_locked = forum_read_locked.gif*27*27
-img_forum_read_subforum = forum_read_subforum.gif*27*27
-img_forum_unread = forum_unread.gif*27*27
-img_forum_unread_locked = forum_unread_locked.gif*27*27
-img_forum_unread_subforum = forum_unread_subforum.gif*27*27
-
-img_topic_moved = topic_moved.gif*27*27
-
-img_topic_read = topic_read.gif*27*27
-img_topic_read_mine = topic_read_mine.gif*27*27
-img_topic_read_hot = topic_read_hot.gif*27*27
-img_topic_read_hot_mine = topic_read_hot_mine.gif*27*27
-img_topic_read_locked = topic_read_locked.gif*27*27
-img_topic_read_locked_mine = topic_read_locked_mine.gif*27*27
-
-img_topic_unread = topic_unread.gif*27*27
-img_topic_unread_mine = topic_unread_mine.gif*27*27
-img_topic_unread_hot = topic_unread_hot.gif*27*27
-img_topic_unread_hot_mine = topic_unread_hot_mine.gif*27*27
-img_topic_unread_locked = topic_unread_locked.gif*27*27
-img_topic_unread_locked_mine = topic_unread_locked_mine.gif*27*27
-
-img_sticky_read = sticky_read.gif*27*27
-img_sticky_read_mine = sticky_read_mine.gif*27*27
-img_sticky_read_locked = sticky_read_locked.gif*27*27
-img_sticky_read_locked_mine = sticky_read_locked_mine.gif*27*27
-img_sticky_unread = sticky_unread.gif*27*27
-img_sticky_unread_mine = sticky_unread_mine.gif*27*27
-img_sticky_unread_locked = sticky_unread_locked.gif*27*27
-img_sticky_unread_locked_mine = sticky_unread_locked_mine.gif*27*27
-
-img_announce_read = announce_read.gif*27*27
-img_announce_read_mine = announce_read_mine.gif*27*27
-img_announce_read_locked = announce_read_locked.gif*27*27
-img_announce_read_locked_mine = announce_read_locked_mine.gif*27*27
-img_announce_unread = announce_unread.gif*27*27
-img_announce_unread_mine = announce_unread_mine.gif*27*27
-img_announce_unread_locked = announce_unread_locked.gif*27*27
-img_announce_unread_locked_mine = announce_unread_locked_mine.gif*27*27
-
-img_global_read = announce_read.gif*27*27
-img_global_read_mine = announce_read_mine.gif*27*27
-img_global_read_locked = announce_read_locked.gif*27*27
-img_global_read_locked_mine = announce_read_locked_mine.gif*27*27
-img_global_unread = announce_unread.gif*27*27
-img_global_unread_mine = announce_unread_mine.gif*27*27
-img_global_unread_locked = announce_unread_locked.gif*27*27
-img_global_unread_locked_mine = announce_unread_locked_mine.gif*27*27
-
-img_subforum_read = subforum_read.gif*9*11
-img_subforum_unread = subforum_unread.gif*9*11
-
-img_pm_read = topic_read.gif*27*27
-img_pm_unread = topic_unread.gif*27*27
-
-img_icon_back_top = icon_back_top.gif*11*11
-
-img_icon_contact_aim = icon_contact_aim.gif*20*20
-img_icon_contact_email = icon_contact_email.gif*20*20
-img_icon_contact_icq = icon_contact_icq.gif*20*20
-img_icon_contact_jabber = icon_contact_jabber.gif*20*20
-img_icon_contact_msnm = icon_contact_msnm.gif*20*20
-
-img_icon_contact_www = icon_contact_www.gif*20*20
-img_icon_contact_yahoo = icon_contact_yahoo.gif*20*20
-
-img_icon_post_delete = icon_post_delete.gif*20*20
-
-img_icon_post_info = icon_post_info.gif*20*20
-
-img_icon_post_report = icon_post_report.gif*20*20
-img_icon_post_target = icon_post_target.gif*9*11
-img_icon_post_target_unread = icon_post_target_unread.gif*9*11
-
-img_icon_topic_attach = icon_topic_attach.gif*10*7
-img_icon_topic_latest = icon_topic_latest.gif*9*11
-img_icon_topic_newest = icon_topic_newest.gif*9*11
-img_icon_topic_reported = icon_topic_reported.gif*14*16
-img_icon_topic_unapproved = icon_topic_unapproved.gif*14*16
-
-img_icon_user_profile = 
-
-img_icon_user_warn = icon_user_warn.gif*20*20
diff --git a/phpBB/styles/prosilver/imageset/site_logo.gif b/phpBB/styles/prosilver/imageset/site_logo.gif
deleted file mode 100644
index 909114c377..0000000000
--- a/phpBB/styles/prosilver/imageset/site_logo.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/sticky_read.gif b/phpBB/styles/prosilver/imageset/sticky_read.gif
deleted file mode 100644
index 59e42833db..0000000000
--- a/phpBB/styles/prosilver/imageset/sticky_read.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/sticky_read_locked.gif b/phpBB/styles/prosilver/imageset/sticky_read_locked.gif
deleted file mode 100644
index 79f581be79..0000000000
--- a/phpBB/styles/prosilver/imageset/sticky_read_locked.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/sticky_read_locked_mine.gif b/phpBB/styles/prosilver/imageset/sticky_read_locked_mine.gif
deleted file mode 100644
index ad056086e5..0000000000
--- a/phpBB/styles/prosilver/imageset/sticky_read_locked_mine.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/sticky_read_mine.gif b/phpBB/styles/prosilver/imageset/sticky_read_mine.gif
deleted file mode 100644
index 49e8b3f01c..0000000000
--- a/phpBB/styles/prosilver/imageset/sticky_read_mine.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/sticky_unread.gif b/phpBB/styles/prosilver/imageset/sticky_unread.gif
deleted file mode 100644
index ae6d5954b1..0000000000
--- a/phpBB/styles/prosilver/imageset/sticky_unread.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/sticky_unread_locked.gif b/phpBB/styles/prosilver/imageset/sticky_unread_locked.gif
deleted file mode 100644
index 5792b8649a..0000000000
--- a/phpBB/styles/prosilver/imageset/sticky_unread_locked.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/sticky_unread_locked_mine.gif b/phpBB/styles/prosilver/imageset/sticky_unread_locked_mine.gif
deleted file mode 100644
index 93495770c8..0000000000
--- a/phpBB/styles/prosilver/imageset/sticky_unread_locked_mine.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/sticky_unread_mine.gif b/phpBB/styles/prosilver/imageset/sticky_unread_mine.gif
deleted file mode 100644
index 2580ca0518..0000000000
--- a/phpBB/styles/prosilver/imageset/sticky_unread_mine.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/subforum_read.gif b/phpBB/styles/prosilver/imageset/subforum_read.gif
deleted file mode 100644
index 595595c296..0000000000
--- a/phpBB/styles/prosilver/imageset/subforum_read.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/subforum_unread.gif b/phpBB/styles/prosilver/imageset/subforum_unread.gif
deleted file mode 100644
index b2b661dc78..0000000000
--- a/phpBB/styles/prosilver/imageset/subforum_unread.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/topic_moved.gif b/phpBB/styles/prosilver/imageset/topic_moved.gif
deleted file mode 100644
index 3275cd6ef9..0000000000
--- a/phpBB/styles/prosilver/imageset/topic_moved.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/topic_read.gif b/phpBB/styles/prosilver/imageset/topic_read.gif
deleted file mode 100644
index 0347ffc1e9..0000000000
--- a/phpBB/styles/prosilver/imageset/topic_read.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/topic_read_hot.gif b/phpBB/styles/prosilver/imageset/topic_read_hot.gif
deleted file mode 100644
index dcb6f3bd60..0000000000
--- a/phpBB/styles/prosilver/imageset/topic_read_hot.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/topic_read_hot_mine.gif b/phpBB/styles/prosilver/imageset/topic_read_hot_mine.gif
deleted file mode 100644
index 1e5498a9be..0000000000
--- a/phpBB/styles/prosilver/imageset/topic_read_hot_mine.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/topic_read_locked.gif b/phpBB/styles/prosilver/imageset/topic_read_locked.gif
deleted file mode 100644
index 83bc8bd02f..0000000000
--- a/phpBB/styles/prosilver/imageset/topic_read_locked.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/topic_read_locked_mine.gif b/phpBB/styles/prosilver/imageset/topic_read_locked_mine.gif
deleted file mode 100644
index 360f9d989a..0000000000
--- a/phpBB/styles/prosilver/imageset/topic_read_locked_mine.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/topic_read_mine.gif b/phpBB/styles/prosilver/imageset/topic_read_mine.gif
deleted file mode 100644
index 4972a4e0a5..0000000000
--- a/phpBB/styles/prosilver/imageset/topic_read_mine.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/topic_unread.gif b/phpBB/styles/prosilver/imageset/topic_unread.gif
deleted file mode 100644
index 542a998258..0000000000
--- a/phpBB/styles/prosilver/imageset/topic_unread.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/topic_unread_hot.gif b/phpBB/styles/prosilver/imageset/topic_unread_hot.gif
deleted file mode 100644
index e712f6e827..0000000000
--- a/phpBB/styles/prosilver/imageset/topic_unread_hot.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/topic_unread_hot_mine.gif b/phpBB/styles/prosilver/imageset/topic_unread_hot_mine.gif
deleted file mode 100644
index fa8b167c64..0000000000
--- a/phpBB/styles/prosilver/imageset/topic_unread_hot_mine.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/topic_unread_locked.gif b/phpBB/styles/prosilver/imageset/topic_unread_locked.gif
deleted file mode 100644
index 4fb8fa9517..0000000000
--- a/phpBB/styles/prosilver/imageset/topic_unread_locked.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/topic_unread_locked_mine.gif b/phpBB/styles/prosilver/imageset/topic_unread_locked_mine.gif
deleted file mode 100644
index 4ee6cfe423..0000000000
--- a/phpBB/styles/prosilver/imageset/topic_unread_locked_mine.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/imageset/topic_unread_mine.gif b/phpBB/styles/prosilver/imageset/topic_unread_mine.gif
deleted file mode 100644
index e73da38df7..0000000000
--- a/phpBB/styles/prosilver/imageset/topic_unread_mine.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg
deleted file mode 100644
index 75c7c654ba..0000000000
--- a/phpBB/styles/prosilver/style.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# phpBB Style Configuration File
-#
-# @package phpBB3
-# @copyright (c) 2005 phpBB Group 
-# @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-#
-#
-# At the left is the name, please do not change this
-# At the right the value is entered
-# For on/off options the valid values are on, off, 1, 0, true and false
-#
-# Values get trimmed, if you want to add a space in front or at the end of
-# the value, then enclose the value with single or double quotes. 
-# Single and double quotes do not need to be escaped.
-#
-# 
-
-# General Information about this style
-name = prosilver
-copyright = &copy; phpBB Group, 2007
-version = 3.0.0
-
diff --git a/phpBB/styles/prosilver/template/attachment.html b/phpBB/styles/prosilver/template/attachment.html
deleted file mode 100644
index cc5aacff2f..0000000000
--- a/phpBB/styles/prosilver/template/attachment.html
+++ /dev/null
@@ -1,122 +0,0 @@
-
-<!-- BEGIN _file -->
-	<!-- IF _file.S_DENIED -->
-	<p>[{_file.DENIED_MESSAGE}]</p>
-	<!-- ELSE -->
-
-		<!-- IF _file.S_THUMBNAIL -->
-		<dl class="thumbnail">
-			<dt><a href="{_file.U_DOWNLOAD_LINK}"><img src="{_file.THUMB_IMAGE}" alt="{_file.DOWNLOAD_NAME}" title="{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}" /></a></dt>
-			<!-- IF _file.COMMENT --><dd> {_file.COMMENT}</dd><!-- ENDIF -->
-		</dl>
-		<!-- ENDIF -->
-
-
-		<!-- IF _file.S_IMAGE -->
-		<dl class="file">
-			<dt class="attach-image"><img src="{_file.U_INLINE_LINK}" alt="{_file.DOWNLOAD_NAME}" onclick="viewableArea(this);" /></dt>
-			<!-- IF _file.COMMENT --><dd><em>{_file.COMMENT}</em></dd><!-- ENDIF -->
-			<dd>{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}</dd>
-		</dl>
-		<!-- ENDIF -->
-
-		<!-- IF _file.S_FILE -->
-		<dl class="file">
-			<dt><!-- IF _file.UPLOAD_ICON -->{_file.UPLOAD_ICON} <!-- ENDIF --><a class="postlink" href="{_file.U_DOWNLOAD_LINK}">{_file.DOWNLOAD_NAME}</a></dt>
-			<!-- IF _file.COMMENT --><dd><em>{_file.COMMENT}</em></dd><!-- ENDIF -->
-			<dd>({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}</dd>
-		</dl>
-		<!-- ENDIF -->
-
-
-
-		<!-- IF _file.S_WM_FILE -->
-			<!-- method used here from http://alistapart.com/articles/byebyeembed / autosizing seems to not work always, this will not fix -->
-			<object width="320" height="285" classid="CLSID:6BF52A52-394A-11d3-B153-00C04F79FAA6" id="wmstream_{_file.ATTACH_ID}">
-				<param name="url" value="{_file.U_DOWNLOAD_LINK}" />
-				<param name="showcontrols" value="1" />
-				<param name="showdisplay" value="0" />
-				<param name="showstatusbar" value="0" />
-				<param name="autosize" value="1" />
-				<param name="autostart" value="0" />
-				<param name="visible" value="1" />
-				<param name="animationstart" value="0" />
-				<param name="loop" value="0" />
-				<param name="src" value="{_file.U_DOWNLOAD_LINK}" />
-				<!--[if !IE]>-->
-					<object width="320" height="285" type="video/x-ms-wmv" data="{_file.U_DOWNLOAD_LINK}">
-						<param name="src" value="{_file.U_DOWNLOAD_LINK}" />
-						<param name="controller" value="1" />
-						<param name="showcontrols" value="1" />
-						<param name="showdisplay" value="0" />
-						<param name="showstatusbar" value="0" />
-						<param name="autosize" value="1" />
-						<param name="autostart" value="0" />
-						<param name="visible" value="1" />
-						<param name="animationstart" value="0" />
-						<param name="loop" value="0" />
-					</object>
-				<!--<![endif]-->
-			</object>
-
-		<!-- ELSEIF _file.S_FLASH_FILE -->
-			<object classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000" codebase="http://active.macromedia.com/flash2/cabs/swflash.cab#version=5,0,0,0" width="{_file.WIDTH}" height="{_file.HEIGHT}">
-				<param name="movie" value="{_file.U_VIEW_LINK}" />
-				<param name="play" value="true" />
-				<param name="loop" value="true" />
-				<param name="quality" value="high" />
-				<param name="allowScriptAccess" value="never" />
-				<param name="allowNetworking" value="internal" />
-				<embed src="{_file.U_VIEW_LINK}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{_file.WIDTH}" height="{_file.HEIGHT}" play="true" loop="true" quality="high" allowscriptaccess="never" allownetworking="internal"></embed>
-			</object>
-		<!-- ELSEIF _file.S_QUICKTIME_FILE -->
-			<object id="qtstream_{_file.ATTACH_ID}" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0" width="0" height="16">
-				<param name="src" value="{_file.U_DOWNLOAD_LINK}" />
-				<param name="controller" value="true" />
-				<param name="autoplay" value="false" />
-				<param name="type" value="video/quicktime" />
-				<embed name="qtstream_{_file.ATTACH_ID}" src="{_file.U_DOWNLOAD_LINK}" pluginspage="http://www.apple.com/quicktime/download/" enablejavascript="true" controller="true" width="0" height="16" type="video/quicktime" autoplay="false"></embed>
-			</object>
-		<!-- ELSEIF _file.S_RM_FILE -->
-			<object id="rmstream_{_file.ATTACH_ID}" classid="clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA" width="200" height="50">
-				<param name="src" value="{_file.U_DOWNLOAD_LINK}" />
-				<param name="autostart" value="false" />
-				<param name="controls" value="ImageWindow" />
-				<param name="console" value="ctrls_{_file.ATTACH_ID}" />
-				<param name="prefetch" value="false" />
-				<embed name="rmstream_{_file.ATTACH_ID}" type="audio/x-pn-realaudio-plugin" src="{_file.U_DOWNLOAD_LINK}" width="0" height="0" autostart="false" controls="ImageWindow" console="ctrls_{_file.ATTACH_ID}" prefetch="false"></embed>
-			</object>
-			<br />
-			<object id="ctrls_{_file.ATTACH_ID}" classid="clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA" width="0" height="36">
-				<param name="controls" value="ControlPanel" />
-				<param name="console" value="ctrls_{_file.ATTACH_ID}" />
-				<embed name="ctrls_{_file.ATTACH_ID}" type="audio/x-pn-realaudio-plugin" width="200" height="36" controls="ControlPanel" console="ctrls_{_file.ATTACH_ID}"></embed>
-			</object>
-
-			<script type="text/javascript">
-			// <![CDATA[
-				if (document.rmstream_{_file.ATTACH_ID}.GetClipWidth)
-				{
-					while (!document.rmstream_{_file.ATTACH_ID}.GetClipWidth())
-					{
-					}
-
-					var width = document.rmstream_{_file.ATTACH_ID}.GetClipWidth();
-					var height = document.rmstream_{_file.ATTACH_ID}.GetClipHeight();
-
-					document.rmstream_{_file.ATTACH_ID}.width = width;
-					document.rmstream_{_file.ATTACH_ID}.height = height;
-					document.ctrls_{_file.ATTACH_ID}.width = width;
-				}
-			// ]]>
-			</script>
-		<!-- ENDIF -->
-
-		<!-- IF _file.S_WM_FILE or _file.S_RM_FILE or _file.S_FLASH_FILE or _file.S_QUICKTIME_FILE -->
-			<p>
-			<!-- IF _file.S_QUICKTIME_FILE --><a href="#" onclick="play_qt_file(document.qtstream_{_file.ATTACH_ID}); return false;">[ {L_PLAY_QUICKTIME_FILE} ]</a> <!-- ENDIF -->
-			<a href="{_file.U_DOWNLOAD_LINK}">{_file.DOWNLOAD_NAME}</a> [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ]</p>
-		<!-- ENDIF -->
-
-	<!-- ENDIF -->
-<!-- END _file -->
diff --git a/phpBB/styles/prosilver/template/bbcode.html b/phpBB/styles/prosilver/template/bbcode.html
deleted file mode 100644
index bb90c46ced..0000000000
--- a/phpBB/styles/prosilver/template/bbcode.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- BEGIN ulist_open --><ul style="list-style-type: {LIST_TYPE}"><!-- END ulist_open -->
-<!-- BEGIN ulist_open_default --><ul><!-- END ulist_open_default -->
-<!-- BEGIN ulist_close --></ul><!-- END ulist_close -->
-
-<!-- BEGIN olist_open --><ol style="list-style-type: {LIST_TYPE}"><!-- END olist_open -->
-<!-- BEGIN olist_close --></ol><!-- END olist_close -->
-
-<!-- BEGIN listitem --><li><!-- END listitem -->
-<!-- BEGIN listitem_close --></li><!-- END listitem_close -->
-
-<!-- BEGIN quote_username_open --><blockquote><div><cite>{USERNAME} {L_WROTE}:</cite><!-- END quote_username_open -->
-<!-- BEGIN quote_open --><blockquote class="uncited"><div><!-- END quote_open -->
-<!-- BEGIN quote_close --></div></blockquote><!-- END quote_close -->
-
-<!-- BEGIN code_open --><dl class="codebox"><dt>{L_CODE}: <a href="#" onclick="selectCode(this); return false;">{L_SELECT_ALL_CODE}</a></dt><dd><code><!-- END code_open -->
-<!-- BEGIN code_close --></code></dd></dl><!-- END code_close -->
-
-<!-- BEGIN inline_attachment_open --><div class="inline-attachment"><!-- END inline_attachment_open -->
-<!-- BEGIN inline_attachment_close --></div><!-- END inline_attachment_close -->
-
-<!-- BEGIN b_open --><strong><!-- END b_open -->
-<!-- BEGIN b_close --></strong><!-- END b_close -->
-
-<!-- BEGIN u_open --><span style="text-decoration: underline"><!-- END u_open -->
-<!-- BEGIN u_close --></span><!-- END u_close -->
-
-<!-- BEGIN i_open --><em><!-- END i_open -->
-<!-- BEGIN i_close --></em><!-- END i_close -->
-
-<!-- BEGIN color --><span style="color: {COLOR}">{TEXT}</span><!-- END color -->
-
-<!-- BEGIN size --><span style="font-size: {SIZE}%; line-height: 116%;">{TEXT}</span><!-- END size -->
-
-<!-- BEGIN img --><img src="{URL}" alt="{L_IMAGE}" /><!-- END img -->
-
-<!-- BEGIN url --><a href="{URL}" class="postlink">{DESCRIPTION}</a><!-- END url -->
-
-<!-- BEGIN email --><a href="mailto:{EMAIL}">{DESCRIPTION}</a><!-- END email -->
-
-<!-- BEGIN flash --><object classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000" codebase="http://active.macromedia.com/flash2/cabs/swflash.cab#version=5,0,0,0" width="{WIDTH}" height="{HEIGHT}"><param name="movie" value="{URL}" /><param name="play" value="false" /><param name="loop" value="false" /><param name="quality" value="high" /><param name="allowScriptAccess" value="never" /><param name="allowNetworking" value="internal" /><embed src="{URL}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{WIDTH}" height="{HEIGHT}" play="false" loop="false" quality="high" allowscriptaccess="never" allownetworking="internal"></embed></object><!-- END flash -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/captcha_default.html b/phpBB/styles/prosilver/template/captcha_default.html
deleted file mode 100644
index 2cfc41338d..0000000000
--- a/phpBB/styles/prosilver/template/captcha_default.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	<dl>
-		<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt>
-		<dd><img src="{CONFIRM_IMAGE}" alt="" /></dd>
-		<dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" class="inputbox narrow" title="{L_CONFIRM_CODE}" />
-		<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd>
-		<dd>{L_CONFIRM_CODE_EXPLAIN}</dd>
-	</dl>
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/captcha_recaptcha.html b/phpBB/styles/prosilver/template/captcha_recaptcha.html
deleted file mode 100644
index f325c3727d..0000000000
--- a/phpBB/styles/prosilver/template/captcha_recaptcha.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- IF S_RECAPTCHA_AVAILABLE -->
-	<dl>
-		<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
-		// <![CDATA[
-		var RecaptchaOptions = {
-		   lang : {L_RECAPTCHA_LANG}
-		};
-		// ]]>
-		</script>
-
-	<noscript>
-  		<iframe src="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" height="300" width="500" frameborder="0"></iframe><br/>
-  		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
-  		<input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
-	</noscript>
-	</dl>
-<!-- ELSE -->
-{L_RECAPTCHA_NOT_AVAILABLE}
-<!-- ENDIF -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/confirm_body.html b/phpBB/styles/prosilver/template/confirm_body.html
deleted file mode 100644
index 5b783915a4..0000000000
--- a/phpBB/styles/prosilver/template/confirm_body.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<form id="confirm" action="{S_CONFIRM_ACTION}" method="post">
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h2>{MESSAGE_TITLE}</h2>
-	<p>{MESSAGE_TEXT}</p>
-	
-	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}
-		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp; 
-		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/prosilver/template/custom_profile_fields.html b/phpBB/styles/prosilver/template/custom_profile_fields.html
deleted file mode 100644
index 44c68f532b..0000000000
--- a/phpBB/styles/prosilver/template/custom_profile_fields.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- BEGIN dropdown -->
-<select name="{dropdown.FIELD_IDENT}" id="{dropdown.FIELD_IDENT}">
-	<!-- BEGIN options --><option value="{dropdown.options.OPTION_ID}"{dropdown.options.SELECTED}>{dropdown.options.VALUE}</option><!-- END options -->
-</select>
-<!-- END dropdown -->
-
-<!-- BEGIN text -->
-<textarea name="{text.FIELD_IDENT}" id="{text.FIELD_IDENT}" rows="{text.FIELD_ROWS}" cols="{text.FIELD_COLS}" class="inputbox autowidth">{text.FIELD_VALUE}</textarea>
-<!-- END text -->
-
-<!-- BEGIN string -->
-<input type="text" class="inputbox autowidth" name="{string.FIELD_IDENT}" id="{string.FIELD_IDENT}" size="{string.FIELD_LENGTH}" maxlength="{string.FIELD_MAXLEN}" value="{string.FIELD_VALUE}" />
-<!-- END string -->
-
-<!-- BEGIN bool -->
-<!-- IF bool.FIELD_LENGTH eq 1 -->
-	<!-- BEGIN options --><label for="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}"><input type="radio" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}" value="{bool.options.OPTION_ID}"{bool.options.CHECKED} /> {bool.options.VALUE}</label> <!-- END options -->
-<!-- ELSE -->
-	<input type="checkbox" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}"<!-- IF bool.FIELD_VALUE --> checked="checked"<!-- ENDIF --> />
-<!-- ENDIF -->
-<!-- END bool -->
-
-<!-- BEGIN int -->
-<input type="text" class="inputbox autowidth" name="{int.FIELD_IDENT}" id="{int.FIELD_IDENT}" size="{int.FIELD_LENGTH}" value="{int.FIELD_VALUE}" />
-<!-- END int -->
-
-<!-- BEGIN date -->
-<label for="{date.FIELD_IDENT}_day">{L_DAY}: <select name="{date.FIELD_IDENT}_day" id="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select></label> 
-<label for="{date.FIELD_IDENT}_month">{L_MONTH}: <select name="{date.FIELD_IDENT}_month" id="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select></label> 
-<label for="{date.FIELD_IDENT}_year">{L_YEAR}: <select name="{date.FIELD_IDENT}_year" id="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select></label>
-<!-- END date -->
diff --git a/phpBB/styles/prosilver/template/drafts.html b/phpBB/styles/prosilver/template/drafts.html
deleted file mode 100644
index 4be82f0697..0000000000
--- a/phpBB/styles/prosilver/template/drafts.html
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-<!-- IF .draftrow -->
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h3>{L_LOAD_DRAFT}</h3>
-	<p>{L_LOAD_DRAFT_EXPLAIN}</p>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="forumbg">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<ul class="topiclist">
-		<li class="header">
-			<dl>
-				<dt>{L_LOAD_DRAFT}</dt>
-				<dd class="posted">{L_SAVE_DATE}</dd>
-			</dl>
-		</li>
-	</ul>
-	<ul class="topiclist topics">
-
-	<!-- BEGIN draftrow -->
-	<li class="row<!-- IF draftrow.S_ROW_NUM is even --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-		<dl>
-			<dt>
-				<a href="{draftrow.U_INSERT}" title="{L_LOAD_DRAFT}" class="topictitle">{draftrow.DRAFT_SUBJECT}</a><br />
-				<!-- IF not S_PRIVMSGS --><!-- IF draftrow.S_LINK_TOPIC -->{L_TOPIC}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
-				<!-- ELSEIF draftrow.S_LINK_FORUM -->{L_FORUM}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
-				<!-- ELSE -->{L_NO_TOPIC_FORUM}<!-- ENDIF --><!-- ENDIF -->
-			</dt>
-			<dd class="posted">{draftrow.DATE}</dd>
-		</dl>
-	</li>
-	<!-- END draftrow -->
-
-	</ul>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js
deleted file mode 100644
index 9610cf91d1..0000000000
--- a/phpBB/styles/prosilver/template/editor.js
+++ /dev/null
@@ -1,402 +0,0 @@
-/**
-* bbCode control by subBlue design [ www.subBlue.com ]
-* Includes unixsafe colour palette selector by SHS`
-*/
-
-// Startup variables
-var imageTag = false;
-var theSelection = false;
-
-// Check for Browser & Platform for PC & IE specific bits
-// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
-var clientPC = navigator.userAgent.toLowerCase(); // Get client info
-var clientVer = parseInt(navigator.appVersion); // Get browser version
-
-var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1));
-var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
-
-var baseHeight;
-
-/**
-* Shows the help messages in the helpline window
-*/
-function helpline(help)
-{
-	document.forms[form_name].helpbox.value = help_line[help];
-}
-
-/**
-* Fix a bug involving the TextRange object. From
-* http://www.frostjedi.com/terra/scripts/demo/caretBug.html
-*/ 
-function initInsertions() 
-{
-	var doc;
-
-	if (document.forms[form_name])
-	{
-		doc = document;
-	}
-	else 
-	{
-		doc = opener.document;
-	}
-
-	var textarea = doc.forms[form_name].elements[text_name];
-
-	if (is_ie && typeof(baseHeight) != 'number')
-	{
-		textarea.focus();
-		baseHeight = doc.selection.createRange().duplicate().boundingHeight;
-
-		if (!document.forms[form_name])
-		{
-			document.body.focus();
-		}
-	}
-}
-
-/**
-* bbstyle
-*/
-function bbstyle(bbnumber)
-{	
-	if (bbnumber != -1)
-	{
-		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
-	} 
-	else 
-	{
-		insert_text('[*]');
-		document.forms[form_name].elements[text_name].focus();
-	}
-}
-
-/**
-* Apply bbcodes
-*/
-function bbfontstyle(bbopen, bbclose)
-{
-	theSelection = false;
-
-	var textarea = document.forms[form_name].elements[text_name];
-
-	textarea.focus();
-
-	if ((clientVer >= 4) && is_ie && is_win)
-	{
-		// Get text selection
-		theSelection = document.selection.createRange().text;
-
-		if (theSelection)
-		{
-			// Add tags around selection
-			document.selection.createRange().text = bbopen + theSelection + bbclose;
-			document.forms[form_name].elements[text_name].focus();
-			theSelection = '';
-			return;
-		}
-	}
-	else if (document.forms[form_name].elements[text_name].selectionEnd && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0))
-	{
-		mozWrap(document.forms[form_name].elements[text_name], bbopen, bbclose);
-		document.forms[form_name].elements[text_name].focus();
-		theSelection = '';
-		return;
-	}
-	
-	//The new position for the cursor after adding the bbcode
-	var caret_pos = getCaretPosition(textarea).start;
-	var new_pos = caret_pos + bbopen.length;		
-
-	// Open tag
-	insert_text(bbopen + bbclose);
-
-	// Center the cursor when we don't have a selection
-	// Gecko and proper browsers
-	if (!isNaN(textarea.selectionStart))
-	{
-		textarea.selectionStart = new_pos;
-		textarea.selectionEnd = new_pos;
-	}	
-	// IE
-	else if (document.selection)
-	{
-		var range = textarea.createTextRange(); 
-		range.move("character", new_pos); 
-		range.select();
-		storeCaret(textarea);
-	}
-
-	textarea.focus();
-	return;
-}
-
-/**
-* Insert text at position
-*/
-function insert_text(text, spaces, popup)
-{
-	var textarea;
-	
-	if (!popup) 
-	{
-		textarea = document.forms[form_name].elements[text_name];
-	} 
-	else 
-	{
-		textarea = opener.document.forms[form_name].elements[text_name];
-	}
-	if (spaces) 
-	{
-		text = ' ' + text + ' ';
-	}
-	
-	if (!isNaN(textarea.selectionStart))
-	{
-		var sel_start = textarea.selectionStart;
-		var sel_end = textarea.selectionEnd;
-
-		mozWrap(textarea, text, '')
-		textarea.selectionStart = sel_start + text.length;
-		textarea.selectionEnd = sel_end + text.length;
-	}
-	else if (textarea.createTextRange && textarea.caretPos)
-	{
-		if (baseHeight != textarea.caretPos.boundingHeight) 
-		{
-			textarea.focus();
-			storeCaret(textarea);
-		}
-
-		var caret_pos = textarea.caretPos;
-		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
-	}
-	else
-	{
-		textarea.value = textarea.value + text;
-	}
-	if (!popup) 
-	{
-		textarea.focus();
-	}
-}
-
-/**
-* Add inline attachment at position
-*/
-function attach_inline(index, filename)
-{
-	insert_text('[attachment=' + index + ']' + filename + '[/attachment]');
-	document.forms[form_name].elements[text_name].focus();
-}
-
-/**
-* Add quote text to message
-*/
-function addquote(post_id, username)
-{
-	var message_name = 'message_' + post_id;
-	var theSelection = '';
-	var divarea = false;
-
-	if (document.all)
-	{
-		divarea = document.all[message_name];
-	}
-	else
-	{
-		divarea = document.getElementById(message_name);
-	}
-
-	// Get text selection - not only the post content :(
-	if (window.getSelection)
-	{
-		theSelection = window.getSelection().toString();
-	}
-	else if (document.getSelection)
-	{
-		theSelection = document.getSelection();
-	}
-	else if (document.selection)
-	{
-		theSelection = document.selection.createRange().text;
-	}
-
-	if (theSelection == '' || typeof theSelection == 'undefined' || theSelection == null)
-	{
-		if (divarea.innerHTML)
-		{
-			theSelection = divarea.innerHTML.replace(/<br>/ig, '\n');
-			theSelection = theSelection.replace(/<br\/>/ig, '\n');
-			theSelection = theSelection.replace(/&lt\;/ig, '<');
-			theSelection = theSelection.replace(/&gt\;/ig, '>');
-			theSelection = theSelection.replace(/&amp\;/ig, '&');
-			theSelection = theSelection.replace(/&nbsp\;/ig, ' ');
-		}
-		else if (document.all)
-		{
-			theSelection = divarea.innerText;
-		}
-		else if (divarea.textContent)
-		{
-			theSelection = divarea.textContent;
-		}
-		else if (divarea.firstChild.nodeValue)
-		{
-			theSelection = divarea.firstChild.nodeValue;
-		}
-	}
-
-	if (theSelection)
-	{
-		insert_text('[quote="' + username + '"]' + theSelection + '[/quote]');
-	}
-
-	return;
-}
-
-/**
-* From http://www.massless.org/mozedit/
-*/
-function mozWrap(txtarea, open, close)
-{
-	var selLength = txtarea.textLength;
-	var selStart = txtarea.selectionStart;
-	var selEnd = txtarea.selectionEnd;
-	var scrollTop = txtarea.scrollTop;
-
-	if (selEnd == 1 || selEnd == 2) 
-	{
-		selEnd = selLength;
-	}
-
-	var s1 = (txtarea.value).substring(0,selStart);
-	var s2 = (txtarea.value).substring(selStart, selEnd)
-	var s3 = (txtarea.value).substring(selEnd, selLength);
-
-	txtarea.value = s1 + open + s2 + close + s3;
-	txtarea.selectionStart = selEnd + open.length + close.length;
-	txtarea.selectionEnd = txtarea.selectionStart;
-	txtarea.focus();
-	txtarea.scrollTop = scrollTop;
-
-	return;
-}
-
-/**
-* Insert at Caret position. Code from
-* http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
-*/
-function storeCaret(textEl)
-{
-	if (textEl.createTextRange)
-	{
-		textEl.caretPos = document.selection.createRange().duplicate();
-	}
-}
-
-/**
-* Color pallette
-*/
-function colorPalette(dir, width, height)
-{
-	var r = 0, g = 0, b = 0;
-	var numberList = new Array(6);
-	var color = '';
-
-	numberList[0] = '00';
-	numberList[1] = '40';
-	numberList[2] = '80';
-	numberList[3] = 'BF';
-	numberList[4] = 'FF';
-
-	document.writeln('<table cellspacing="1" cellpadding="0" border="0">');
-
-	for (r = 0; r < 5; r++)
-	{
-		if (dir == 'h')
-		{
-			document.writeln('<tr>');
-		}
-
-		for (g = 0; g < 5; g++)
-		{
-			if (dir == 'v')
-			{
-				document.writeln('<tr>');
-			}
-			
-			for (b = 0; b < 5; b++)
-			{
-				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
-				document.write('<td bgcolor="#' + color + '" style="width: ' + width + 'px; height: ' + height + 'px;">');
-				document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>');
-				document.writeln('</td>');
-			}
-
-			if (dir == 'v')
-			{
-				document.writeln('</tr>');
-			}
-		}
-
-		if (dir == 'h')
-		{
-			document.writeln('</tr>');
-		}
-	}
-	document.writeln('</table>');
-}
-
-
-/**
-* Caret Position object
-*/
-function caretPosition()
-{
-	var start = null;
-	var end = null;
-}
-
-
-/**
-* Get the caret position in an textarea
-*/
-function getCaretPosition(txtarea)
-{
-	var caretPos = new caretPosition();
-	
-	// simple Gecko/Opera way
-	if(txtarea.selectionStart || txtarea.selectionStart == 0)
-	{
-		caretPos.start = txtarea.selectionStart;
-		caretPos.end = txtarea.selectionEnd;
-	}
-	// dirty and slow IE way
-	else if(document.selection)
-	{
-	
-		// get current selection
-		var range = document.selection.createRange();
-
-		// a new selection of the whole textarea
-		var range_all = document.body.createTextRange();
-		range_all.moveToElementText(txtarea);
-		
-		// calculate selection start point by moving beginning of range_all to beginning of range
-		var sel_start;
-		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++)
-		{		
-			range_all.moveStart('character', 1);
-		}
-	
-		txtarea.sel_start = sel_start;
-	
-		// we ignore the end value for IE, this is already dirty enough and we don't need it
-		caretPos.start = txtarea.sel_start;
-		caretPos.end = txtarea.sel_start;			
-	}
-
-	return caretPos;
-}
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/faq_body.html b/phpBB/styles/prosilver/template/faq_body.html
deleted file mode 100644
index 08114e46d4..0000000000
--- a/phpBB/styles/prosilver/template/faq_body.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<h2>{L_FAQ_TITLE}</h2>
-
-
-<div class="panel bg1" id="faqlinks">
-	<div class="inner"><span class="corners-top"><span></span></span>
-		<div class="column1">
-		<!-- BEGIN faq_block -->
-			<!-- IF faq_block.S_ROW_NUM == 4 -->
-				</div>
-
-				<div class="column2">
-			<!-- ENDIF -->
-
-			<dl class="faq">
-				<dt><strong>{faq_block.BLOCK_TITLE}</strong></dt>
-				<!-- BEGIN faq_row -->
-					<dd><a href="#f{faq_block.S_ROW_NUM}r{faq_block.faq_row.S_ROW_NUM}">{faq_block.faq_row.FAQ_QUESTION}</a></dd>
-				<!-- END faq_row -->
-			</dl>
-		<!-- END faq_block -->
-		</div>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-
-
-<div class="clear"></div>
-
-<!-- BEGIN faq_block -->
-	<div class="panel <!-- IF faq_block.S_ROW_NUM is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-			<h2>{faq_block.BLOCK_TITLE}</h2>
-			<!-- BEGIN faq_row -->
-				<dl class="faq">
-					<dt id="f{faq_block.S_ROW_NUM}r{faq_block.faq_row.S_ROW_NUM}"><strong>{faq_block.faq_row.FAQ_QUESTION}</strong></dt>
-					<dd>{faq_block.faq_row.FAQ_ANSWER}</dd>
-					<dd><a href="#faqlinks" class="top2">{L_BACK_TO_TOP}</a></dd>
-				</dl>
-				<!-- IF not faq_block.faq_row.S_LAST_ROW --><hr class="dashed" /><!-- ENDIF -->
-			<!-- END faq_row -->
-		</div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-<!-- END faq_block -->
-
-<!-- INCLUDE jumpbox.html -->
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
deleted file mode 100644
index 06c4d1e785..0000000000
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ /dev/null
@@ -1,264 +0,0 @@
-/**
-* phpBB3 forum functions
-*/
-
-/**
-* Window popup
-*/
-function popup(url, width, height, name)
-{
-	if (!name)
-	{
-		name = '_popup';
-	}
-
-	window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
-	return false;
-}
-
-/**
-* Jump to page
-*/
-function jumpto()
-{
-	var page = prompt(jump_page, on_page);
-
-	if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0)
-	{
-		if (base_url.indexOf('?') == -1)
-		{
-			document.location.href = base_url + '?start=' + ((page - 1) * per_page);
-		}
-		else
-		{
-			document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
-		}
-	}
-}
-
-/**
-* Mark/unmark checklist
-* id = ID of parent container, name = name prefix, state = state [true/false]
-*/
-function marklist(id, name, state)
-{
-	var parent = document.getElementById(id);
-	if (!parent)
-	{
-		eval('parent = document.' + id);
-	}
-
-	if (!parent)
-	{
-		return;
-	}
-
-	var rb = parent.getElementsByTagName('input');
-	
-	for (var r = 0; r < rb.length; r++)
-	{	
-		if (rb[r].name.substr(0, name.length) == name)
-		{
-			rb[r].checked = state;
-		}
-	}
-}
-
-/**
-* Resize viewable area for attached image or topic review panel (possibly others to come)
-* e = element
-*/
-function viewableArea(e, itself)
-{
-	if (!e) return;
-	if (!itself)
-	{
-		e = e.parentNode;
-	}
-	
-	if (!e.vaHeight)
-	{
-		// Store viewable area height before changing style to auto
-		e.vaHeight = e.offsetHeight;
-		e.vaMaxHeight = e.style.maxHeight;
-		e.style.height = 'auto';
-		e.style.maxHeight = 'none';
-		e.style.overflow = 'visible';
-	}
-	else
-	{
-		// Restore viewable area height to the default
-		e.style.height = e.vaHeight + 'px';
-		e.style.overflow = 'auto';
-		e.style.maxHeight = e.vaMaxHeight;
-		e.vaHeight = false;
-	}
-}
-
-/**
-* Set display of page element
-* s[-1,0,1] = hide,toggle display,show
-*/
-function dE(n, s)
-{
-	var e = document.getElementById(n);
-
-	if (!s)
-	{
-		s = (e.style.display == '' || e.style.display == 'block') ? -1 : 1;
-	}
-	e.style.display = (s == 1) ? 'block' : 'none';
-}
-
-/**
-* Alternate display of subPanels
-*/
-function subPanels(p)
-{
-	var i, e, t;
-
-	if (typeof(p) == 'string')
-	{
-		show_panel = p;
-	}
-
-	for (i = 0; i < panels.length; i++)
-	{
-		e = document.getElementById(panels[i]);
-		t = document.getElementById(panels[i] + '-tab');
-
-		if (e)
-		{
-			if (panels[i] == show_panel)
-			{
-				e.style.display = 'block';
-				if (t)
-				{
-					t.className = 'activetab';
-				}
-			}
-			else
-			{
-				e.style.display = 'none';
-				if (t)
-				{
-					t.className = '';
-				}
-			}
-		}
-	}
-}
-
-/**
-* Call print preview
-*/
-function printPage()
-{
-	if (is_ie)
-	{
-		printPreview();
-	}
-	else
-	{
-		window.print();
-	}
-}
-
-/**
-* Show/hide groups of blocks
-* c = CSS style name
-* e = checkbox element
-* t = toggle dispay state (used to show 'grip-show' image in the profile block when hiding the profiles) 
-*/
-function displayBlocks(c, e, t)
-{
-	var s = (e.checked == true) ?  1 : -1;
-
-	if (t)
-	{
-		s *= -1;
-	}
-
-	var divs = document.getElementsByTagName("DIV");
-
-	for (var d = 0; d < divs.length; d++)
-	{
-		if (divs[d].className.indexOf(c) == 0)
-		{
-			divs[d].style.display = (s == 1) ? 'none' : 'block';
-		}
-	}
-}
-
-function selectCode(a)
-{
-	// Get ID of code block
-	var e = a.parentNode.parentNode.getElementsByTagName('CODE')[0];
-
-	// Not IE
-	if (window.getSelection)
-	{
-		var s = window.getSelection();
-		// Safari
-		if (s.setBaseAndExtent)
-		{
-			s.setBaseAndExtent(e, 0, e, e.innerText.length - 1);
-		}
-		// Firefox and Opera
-		else
-		{
-			var r = document.createRange();
-			r.selectNodeContents(e);
-			s.removeAllRanges();
-			s.addRange(r);
-		}
-	}
-	// Some older browsers
-	else if (document.getSelection)
-	{
-		var s = document.getSelection();
-		var r = document.createRange();
-		r.selectNodeContents(e);
-		s.removeAllRanges();
-		s.addRange(r);
-	}
-	// IE
-	else if (document.selection)
-	{
-		var r = document.body.createTextRange();
-		r.moveToElementText(e);
-		r.select();
-	}
-}
-
-/**
-* Play quicktime file by determining it's width/height
-* from the displayed rectangle area
-*/
-function play_qt_file(obj)
-{
-	var rectangle = obj.GetRectangle();
-
-	if (rectangle)
-	{
-		rectangle = rectangle.split(',');
-		var x1 = parseInt(rectangle[0]);
-		var x2 = parseInt(rectangle[2]);
-		var y1 = parseInt(rectangle[1]);
-		var y2 = parseInt(rectangle[3]);
-
-		var width = (x1 < 0) ? (x1 * -1) + x2 : x2 - x1;
-		var height = (y1 < 0) ? (y1 * -1) + y2 : y2 - y1;
-	}
-	else
-	{
-		var width = 200;
-		var height = 0;
-	}
-
-	obj.width = width;
-	obj.height = height + 16;
-
-	obj.SetControllerVisible(true);
-	obj.Play();
-}
diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
deleted file mode 100644
index f19f3c3075..0000000000
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ /dev/null
@@ -1,65 +0,0 @@
-
-<!-- BEGIN forumrow -->
-	<!-- IF (forumrow.S_IS_CAT and not forumrow.S_FIRST_ROW) or forumrow.S_NO_CAT  -->
-			</ul>
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF forumrow.S_IS_CAT or forumrow.S_FIRST_ROW  or forumrow.S_NO_CAT  -->
-		<div class="forabg">
-			<div class="inner"><span class="corners-top"><span></span></span>
-			<ul class="topiclist">
-				<li class="header">
-					<dl class="icon">
-						<dt><!-- IF forumrow.S_IS_CAT --><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a><!-- ELSE -->{L_FORUM}<!-- ENDIF --></dt>
-						<dd class="topics">{L_TOPICS}</dd>
-						<dd class="posts">{L_POSTS}</dd>
-						<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
-					</dl>
-				</li>
-			</ul>
-			<ul class="topiclist forums">
-	<!-- ENDIF -->
-
-	<!-- IF not forumrow.S_IS_CAT -->
-		<li class="row">
-			<dl class="icon" style="background-image: url({forumrow.FORUM_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-				<dt title="{forumrow.FORUM_FOLDER_IMG_ALT}">
-					<!-- IF forumrow.FORUM_IMAGE --><span class="forum-image">{forumrow.FORUM_IMAGE}</span><!-- ENDIF -->
-					<a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a><br />
-					{forumrow.FORUM_DESC}
-					<!-- IF forumrow.MODERATORS -->
-						<br /><strong>{forumrow.L_MODERATOR_STR}:</strong> {forumrow.MODERATORS}
-					<!-- ENDIF -->
-					<!-- IF forumrow.SUBFORUMS and forumrow.S_LIST_SUBFORUMS --><br /><strong>{forumrow.L_SUBFORUM_STR}</strong> {forumrow.SUBFORUMS}<!-- ENDIF -->
-				</dt>
-				<!-- IF forumrow.CLICKS -->
-					<dd class="redirect"><span>{L_REDIRECTS}: {forumrow.CLICKS}</span></dd>
-				<!-- ELSEIF not forumrow.S_IS_LINK -->
-					<dd class="topics">{forumrow.TOPICS} <dfn>{L_TOPICS}</dfn></dd>
-					<dd class="posts">{forumrow.POSTS} <dfn>{L_POSTS}</dfn></dd>
-					<dd class="lastpost"><span>
-						<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn> {L_POST_BY_AUTHOR} {forumrow.LAST_POSTER_FULL}
-						<!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{forumrow.LAST_POST_TIME}<!-- ELSE -->{L_NO_POSTS}<br />&nbsp;<!-- ENDIF --></span>
-					</dd>
-				<!-- ENDIF -->
-			</dl>
-		</li>
-	<!-- ENDIF -->
-
-	<!-- IF forumrow.S_LAST_ROW -->
-			</ul>
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-	<!-- ENDIF -->
-
-<!-- BEGINELSE -->
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-		<strong>{L_NO_FORUMS}</strong>
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-<!-- END forumrow -->
diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html
deleted file mode 100644
index 43d8ad0309..0000000000
--- a/phpBB/styles/prosilver/template/index_body.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<p class="{S_CONTENT_FLOW_END}<!-- IF S_USER_LOGGED_IN --> rightside<!-- ENDIF -->"><!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<!-- ELSE -->{CURRENT_TIME}<!-- ENDIF --></p>
-<!-- IF U_MCP --><p>{CURRENT_TIME} <br />[&nbsp;<a href="{U_MCP}">{L_MCP}</a>&nbsp;]</p><!-- ELSEIF S_USER_LOGGED_IN --><p>{CURRENT_TIME}</p><!-- ENDIF -->
-
-<!-- IF S_DISPLAY_SEARCH or (S_USER_LOGGED_IN and not S_IS_BOT) -->
-<ul class="linklist">
-	<!-- IF S_DISPLAY_SEARCH -->
-		<li><a href="{U_SEARCH_UNANSWERED}">{L_SEARCH_UNANSWERED}</a><!-- IF S_USER_LOGGED_IN --> &bull; <a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a><!-- ENDIF --> &bull; <a href="{U_SEARCH_ACTIVE_TOPICS}">{L_SEARCH_ACTIVE_TOPICS}</a></li>
-	<!-- ENDIF -->
-	<!-- IF not S_IS_BOT and U_MARK_FORUMS --><li class="rightside"><a href="{U_MARK_FORUMS}" accesskey="m">{L_MARK_FORUMS_READ}</a></li><!-- ENDIF -->
-</ul>
-<!-- ENDIF -->
-
-<!-- INCLUDE forumlist_body.html -->
-
-<!-- IF not S_USER_LOGGED_IN and not S_IS_BOT -->
-	<form method="post" action="{S_LOGIN_ACTION}" class="headerspace">
-	<h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED -->&nbsp; &bull; &nbsp;<a href="{U_REGISTER}">{L_REGISTER}</a><!-- ENDIF --></h3>
-		<fieldset class="quick-login">
-			<label for="username">{L_USERNAME}:</label>&nbsp;<input type="text" name="username" id="username" size="10" class="inputbox" title="{L_USERNAME}" />  
-			<label for="password">{L_PASSWORD}:</label>&nbsp;<input type="password" name="password" id="password" size="10" class="inputbox" title="{L_PASSWORD}" />
-			<!-- IF S_AUTOLOGIN_ENABLED -->
-				| <label for="autologin">{L_LOG_ME_IN} <input type="checkbox" name="autologin" id="autologin" /></label>
-			<!-- ENDIF -->
-			<input type="submit" name="login" value="{L_LOGIN}" class="button2" />
-		</fieldset>
-	</form>
-<!-- ENDIF -->
-
-<!-- IF S_DISPLAY_ONLINE_LIST -->
-	<!-- IF U_VIEWONLINE --><h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE --><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF -->
-	<p>{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /> <br />{LOGGED_IN_USER_LIST}
-	<!-- IF LEGEND --><br /><em>{L_LEGEND}: {LEGEND}</em><!-- ENDIF --></p>
-<!-- ENDIF -->
-
-<!-- IF S_DISPLAY_BIRTHDAY_LIST and BIRTHDAY_LIST -->
-	<h3>{L_BIRTHDAYS}</h3>
-	<p><!-- IF BIRTHDAY_LIST -->{L_CONGRATULATIONS}: <strong>{BIRTHDAY_LIST}</strong><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></p>
-<!-- ENDIF -->
-
-<!-- IF NEWEST_USER -->
-	<h3>{L_STATISTICS}</h3>
-	<p>{TOTAL_POSTS} &bull; {TOTAL_TOPICS} &bull; {TOTAL_USERS} &bull; {NEWEST_USER}</p>
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html
deleted file mode 100644
index 3ba7c3666d..0000000000
--- a/phpBB/styles/prosilver/template/jumpbox.html
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<!-- IF S_VIEWTOPIC -->
-	<p></p><p><a href="{U_VIEW_FORUM}" class="left-box {S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO} {FORUM_NAME}</a></p>
-<!-- ELSEIF S_VIEWFORUM -->
-	<p></p><p><a href="{U_INDEX}" class="left-box {S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO} {L_INDEX}</a></p>
-<!-- ELSEIF SEARCH_TOPIC -->
-	<p></p><p><a class="left-box {S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}" accesskey="r">{L_RETURN_TO}: {SEARCH_TOPIC}</a></p>
-<!-- ELSEIF S_SEARCH_ACTION -->
-	<p></p><p><a class="left-box {S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}" accesskey="r">{L_RETURN_TO_SEARCH_ADV}</a></p>
-<!-- ENDIF -->
-
-<!-- IF S_DISPLAY_JUMPBOX -->
-	<form method="post" id="jumpbox" action="{S_JUMPBOX_ACTION}" onsubmit="if(document.jumpbox.f.value == -1){return false;}">
-
-	<!-- IF $CUSTOM_FIELDSET_CLASS -->
-		<fieldset class="{$CUSTOM_FIELDSET_CLASS}">
-	<!-- ELSE -->
-		<fieldset class="jumpbox">
-	<!-- ENDIF -->
-			<label for="f" accesskey="j"><!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->:</label>
-			<select name="f" id="f" onchange="if(this.options[this.selectedIndex].value != -1){ document.forms['jumpbox'].submit() }">
-			<!-- BEGIN jumpbox_forums -->
-				<!-- IF jumpbox_forums.S_FORUM_COUNT == 1 --><option value="-1">------------------</option><!-- ENDIF -->
-				<option value="{jumpbox_forums.FORUM_ID}"{jumpbox_forums.SELECTED}><!-- BEGIN level -->&nbsp; &nbsp;<!-- END level -->{jumpbox_forums.FORUM_NAME}</option>
-			<!-- END jumpbox_forums -->
-			</select>
-			<input type="submit" value="{L_GO}" class="button2" />
-		</fieldset>
-	</form>
-
-<!-- ELSE -->
-	<br />
-<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/login_body.html b/phpBB/styles/prosilver/template/login_body.html
deleted file mode 100644
index a32c2d1e42..0000000000
--- a/phpBB/styles/prosilver/template/login_body.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<form action="{S_LOGIN_ACTION}" method="post" id="login">
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<div class="content">
-		<h2><!-- IF LOGIN_EXPLAIN -->{LOGIN_EXPLAIN}<!-- ELSE -->{L_LOGIN}<!-- ENDIF --></h2>
-		
-		<fieldset <!-- IF not S_CONFIRM_CODE -->class="fields1"<!-- ELSE -->class="fields2"<!-- ENDIF -->>
-		<!-- IF LOGIN_ERROR --><div class="error">{LOGIN_ERROR}</div><!-- ENDIF -->
-		<dl>
-			<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}:</label></dt>
-			<dd><input type="text" tabindex="1" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}:</label></dt>
-			<dd><input type="password" tabindex="2" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd>
-			<!-- IF S_DISPLAY_FULL_LOGIN and (U_SEND_PASSWORD or U_RESEND_ACTIVATION) -->
-				<!-- IF U_SEND_PASSWORD --><dd><a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a></dd><!-- ENDIF -->
-				<!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF -->
-			<!-- ENDIF -->
-		</dl>
-		<!-- IF S_CONFIRM_CODE -->
-		{CONFIRM}
-		<!-- ENDIF -->
-		<!-- IF S_DISPLAY_FULL_LOGIN -->
-		<dl>
-			<!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="4" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
-			<dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="5" /> {L_HIDE_ME}</label></dd>
-		</dl>
-		<!-- ENDIF -->
-
-		<dl>
-			<dt>&nbsp;</dt>
-			<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="6" value="{L_LOGIN}" class="button1" /></dd>
-		</dl>
-	
-		</fieldset>
-	</div>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-
-<!-- IF not S_ADMIN_AUTH and S_REGISTER_ENABLED -->
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-			<h3>{L_REGISTER}</h3>
-			<p>{L_LOGIN_INFO}</p>
-			<p><strong><a href="{U_TERMS_USE}">{L_TERMS_USE}</a> | <a href="{U_PRIVACY}">{L_PRIVACY}</a></strong></p>
-			<hr class="dashed" />
-			<p><a href="{U_REGISTER}" class="button2">{L_REGISTER}</a></p>
-		</div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-<!-- ENDIF -->
-
-</form>
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/login_forum.html b/phpBB/styles/prosilver/template/login_forum.html
deleted file mode 100644
index 1278a2e9a8..0000000000
--- a/phpBB/styles/prosilver/template/login_forum.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<h2 class="solo">{L_LOGIN} {FORUM_NAME}</h2>
-
-<form id="login_forum" method="post" action="{S_LOGIN_ACTION}">
-{S_FORM_TOKEN}
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<p>{L_LOGIN_FORUM}</p>
-
-	<fieldset class="fields2">
-	<!-- IF LOGIN_ERROR -->
-		<dl>
-			<dt>&nbsp;</dt>
-			<dd class="error">{LOGIN_ERROR}</dd>
-		</dl>
-	<!-- ENDIF -->
-	<dl>
-		<dt><label for="password">{L_PASSWORD}:</label></dt>
-		<dd><input class="inputbox narrow" type="password" name="password" id="password" size="25" tabindex="1" /></dd>
-	</dl>
-	<dl class="fields2">
-		<dt>&nbsp;</dt>
-		<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" id="login" class="button1" value="{L_LOGIN}" tabindex="2" /></dd>
-	</dl>
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-</form>
-
-<!-- INCLUDE jumpbox.html -->
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/mcp_approve.html b/phpBB/styles/prosilver/template/mcp_approve.html
deleted file mode 100644
index 329205e2a2..0000000000
--- a/phpBB/styles/prosilver/template/mcp_approve.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<form id="confirm" action="{S_CONFIRM_ACTION}" method="post">
-<div class="panel">
-	{S_FORM_TOKEN}
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<div class="content">
-
-		<h2>{MESSAGE_TITLE}</h2>
-		<!-- IF ADDITIONAL_MSG --><p>{ADDITIONAL_MSG}</p><!-- ENDIF -->
-
-		<fieldset>
-		<!-- IF S_NOTIFY_POSTER -->
-			<dl class="panel">
-				<dt>&nbsp;</dt>
-				<dd><label><input type="checkbox" name="notify_poster" checked="checked" /> <!-- IF S_APPROVE -->{L_NOTIFY_POSTER_APPROVAL}<!-- ELSE -->{L_NOTIFY_POSTER_DISAPPROVAL}<!-- ENDIF --></label></dd>
-			</dl>
-		<!-- ENDIF -->
-
-		<!-- IF not S_APPROVE -->
-			<dl class="fields2 nobg">
-				<dt><label>{L_DISAPPROVE_REASON}:</label></dt>
-				<dd><select name="reason_id">
-					<!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason -->
-					</select>
-				</dd>
-			</dl>
-			<dl class="fields2 nobg">
-				<dt><label for="reason">{L_MORE_INFO}:</label><br /><span>{L_CAN_LEAVE_BLANK}</span></dt>
-				<dd><textarea class="inputbox" name="reason" id="reason" rows="4" cols="40">{REASON}</textarea></dd>
-			</dl>
-		<!-- ENDIF -->
-
-		<dl class="fields2 nobg">
-			<dt>&nbsp;</dt>
-			<dd><strong>{MESSAGE_TEXT}</strong></dd>
-		</dl>
-		</fieldset>
-
-		<fieldset class="submit-buttons">
-			{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="button1" />&nbsp; 
-			<input type="submit" name="cancel" value="{L_NO}" class="button2" />
-		</fieldset>
-
-	</div>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-</form>
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/mcp_ban.html b/phpBB/styles/prosilver/template/mcp_ban.html
deleted file mode 100644
index 460c95e2a1..0000000000
--- a/phpBB/styles/prosilver/template/mcp_ban.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<script type="text/javascript">
-// <![CDATA[
-
-	var ban_length = new Array();
-		ban_length[-1] = '';
-	<!-- BEGIN ban_length -->
-		ban_length['{ban_length.BAN_ID}'] = '{ban_length.A_LENGTH}';
-	<!-- END ban_length -->
-
-	var ban_reason = new Array();
-		ban_reason[-1] = '';
-	<!-- BEGIN ban_reason -->
-		ban_reason['{ban_reason.BAN_ID}'] = '{ban_reason.A_REASON}';
-	<!-- END ban_reason -->
-
-	var ban_give_reason = new Array();
-		ban_give_reason[-1] = '';
-	<!-- BEGIN ban_give_reason -->
-		ban_give_reason['{ban_give_reason.BAN_ID}'] = '{ban_give_reason.A_REASON}';
-	<!-- END ban_give_reason -->
-
-	function display_details(option)
-	{
-		document.getElementById('unbangivereason').innerHTML = ban_give_reason[option];
-		document.getElementById('unbanreason').innerHTML = ban_reason[option];
-		document.getElementById('unbanlength').innerHTML = ban_length[option];
-	}
-
-// ]]>
-</script>
-
-<form id="mcp_ban" method="post" action="{U_ACTION}">
-
-<h2>{L_TITLE}</h2>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h3>{L_TITLE}</h3>
-	<p>{L_EXPLAIN}</p>
-
-	<fieldset>
-	<dl>
-		<dt><label for="ban">{L_BAN_CELL}:</label></dt>
-		<dd><label for="ban"><textarea name="ban" id="ban" class="inputbox" cols="40" rows="3">{BAN_QUANTIFIER}</textarea></label></dd>
-		<!-- IF S_USERNAME_BAN --><dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd><!-- ENDIF -->
-	</dl>
-	<dl>
-		<dt><label for="banlength">{L_BAN_LENGTH}:</label></dt>
-		<dd><label for="banlength"><select name="banlength" id="banlength" onchange="if(this.value==-1){document.getElementById('banlengthother').style.display = 'block';}else{document.getElementById('banlengthother').style.display='none';}">{S_BAN_END_OPTIONS}</select></label></dd>
-		<dd id="banlengthother" style="display: none;"><label><input type="text" name="banlengthother" class="inputbox" /><br /><span>{L_YEAR_MONTH_DAY}</span></label></dd>
-	</dl>
-	<dl>
-		<dt><label for="banreason">{L_BAN_REASON}:</label></dt>
-		<dd><input name="banreason" id="banreason" type="text" class="inputbox" maxlength="255" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="bangivereason">{L_BAN_GIVE_REASON}:</label></dt>
-		<dd><input name="bangivereason" id="bangivereason" type="text" class="inputbox" maxlength="255" /></dd>
-	</dl>
-
-	<hr />
-
-	<dl>
-		<dt><label for="banexclude0">{L_BAN_EXCLUDE}:</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>
-		<dd>
-			<label for="banexclude1"><input type="radio" name="banexclude" id="banexclude1" value="1" /> {L_YES}</label> 
-			<label for="banexclude0"><input type="radio" name="banexclude" id="banexclude0" value="0" checked="checked" /> {L_NO}</label>
-		</dd>
-	</dl>
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="bansubmit" value="{L_SUBMIT}" class="button1" />
-	{S_FORM_TOKEN}
-</fieldset>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h3>{L_UNBAN_TITLE}</h3>
-	<p>{L_UNBAN_EXPLAIN}</p>
-
-	<!-- IF S_BANNED_OPTIONS -->
-		<fieldset>
-		<dl>
-			<dt><label for="unban">{L_BAN_CELL}:</label></dt>
-			<dd><select name="unban[]" id="unban" multiple="multiple" size="5" onchange="if (this.selectedIndex != -1) {display_details(this.options[this.selectedIndex].value);}">{BANNED_OPTIONS}</select></dd>
-		</dl>
-		<dl>
-			<dt>{L_BAN_LENGTH}:</dt>
-			<dd><strong id="unbanlength"></strong></dd>
-		</dl>
-		<dl>
-			<dt>{L_BAN_REASON}:</dt>
-			<dd><strong id="unbanreason"></strong></dd>
-		</dl>
-		<dl>
-			<dt>{L_BAN_GIVE_REASON}:</dt>
-			<dd><strong id="unbangivereason"></strong></dd>
-		</dl>
-		</fieldset>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-		<input type="submit" name="unbansubmit" value="{L_SUBMIT}" class="button1" />
-	</fieldset>
-
-	<!-- ELSE -->
-
-		<p><strong>{L_NO_BAN_CELL}</strong></p>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<!-- ENDIF -->
-</form>
-
-<!-- INCLUDE mcp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/mcp_footer.html b/phpBB/styles/prosilver/template/mcp_footer.html
deleted file mode 100644
index 5a48d95f23..0000000000
--- a/phpBB/styles/prosilver/template/mcp_footer.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
-		</div>
-	<div class="clear"></div>
-
-	</div>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html
deleted file mode 100644
index 15407784e3..0000000000
--- a/phpBB/styles/prosilver/template/mcp_forum.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<!-- DEFINE $CUSTOM_FIELDSET_CLASS = 'forum-selection2' -->
-<!-- INCLUDE jumpbox.html -->
-
-<h2><a href="{U_VIEW_FORUM}">{L_FORUM}: {FORUM_NAME}</a></h2>
-
-<form method="post" id="mcp" action="{S_MCP_ACTION}">
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<!-- IF PAGINATION or TOTAL_TOPICS -->
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS}<!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			</li>
-		</ul>
-	<!-- ENDIF -->
-
-	<!-- IF .topicrow -->
-		<ul class="topiclist">
-			<li class="header">
-				<dl class="icon">
-					<dt>{L_TOPICS}</dt>
-					<dd class="posts">{L_REPLIES}</dd>
-					<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
-					<!-- IF not S_MERGE_SELECT --><dd class="mark">{L_MARK}</dd><!-- ENDIF -->
-				</dl>
-			</li>
-		</ul>
-		<ul class="topiclist cplist">
-
-		<!-- BEGIN topicrow -->
-		<li class="row<!-- IF topicrow.S_ROW_NUM is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ENDIF -->">
-			<dl class="icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-				<dt <!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS -->style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->>
-					<!-- IF topicrow.S_SELECT_TOPIC --><a href="{topicrow.U_SELECT_TOPIC}" class="topictitle">[ {L_SELECT_MERGE} ]</a>&nbsp;&nbsp; <!-- ENDIF -->
-					<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
-					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
-					<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF -->
-					<!-- IF topicrow.S_MOVED_TOPIC and S_CAN_DELETE -->&nbsp;<a href="{topicrow.U_DELETE_TOPIC}" class="topictitle">[ {L_DELETE_SHADOW_TOPIC} ]</a><!-- ENDIF -->
-					<br />
-					<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF -->
-					<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME} </dt>
-				<dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd>
-				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}<br />{topicrow.LAST_POST_TIME}</span>
-				</dd>
-				<!-- IF not S_MERGE_SELECT -->
-				<dd class="mark">
-					<!-- IF not topicrow.S_MOVED_TOPIC --><input type="checkbox" name="topic_id_list[]" value="{topicrow.TOPIC_ID}"<!-- IF topicrow.S_TOPIC_CHECKED --> checked="checked"<!-- ENDIF --> /><!-- ELSE -->&nbsp;<!-- ENDIF -->
-				</dd>
-				<!-- ENDIF -->
-			</dl>
-		</li>
-		<!-- END topicrow -->
-		</ul>
-	<!-- ELSE -->
-		<ul class="topiclist">
-			<li><p class="notopics">{L_NO_TOPICS}</p></li>
-		</ul>
-	<!-- ENDIF -->
-
-	<fieldset class="display-options">
-		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-		<label>{L_DISPLAY_TOPICS}: {S_SELECT_SORT_DAYS}</label>
-		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>
-		<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
-	</fieldset>
-
-	<hr />
-
-	<!-- IF PAGINATION or TOTAL_TOPICS -->
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS}<!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			</li>
-		</ul>
-	<!-- ENDIF -->
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<fieldset class="display-actions">
-	<!-- IF not S_MERGE_SELECT -->
-	<select name="action">
-		<option value="" selected="selected">{L_SELECT_ACTION}</option>
-		<!-- IF S_CAN_DELETE --><option value="delete_topic">{L_DELETE}</option><!-- ENDIF -->
-		<!-- IF S_CAN_MERGE --><option value="merge_topics">{L_MERGE}</option><!-- ENDIF -->
-		<!-- IF S_CAN_MOVE --><option value="move">{L_MOVE}</option><!-- ENDIF -->
-		<!-- IF S_CAN_FORK --><option value="fork">{L_FORK}</option><!-- ENDIF -->
-		<!-- IF S_CAN_LOCK --><option value="lock">{L_LOCK}</option><option value="unlock">{L_UNLOCK}</option><!-- ENDIF -->
-		<!-- IF S_CAN_SYNC --><option value="resync">{L_RESYNC}</option><!-- ENDIF -->
-		<!-- IF S_CAN_MAKE_NORMAL --><option value="make_normal">{L_MAKE_NORMAL}</option><!-- ENDIF -->
-		<!-- IF S_CAN_MAKE_STICKY --><option value="make_sticky">{L_MAKE_STICKY}</option><!-- ENDIF -->
-		<!-- IF S_CAN_MAKE_ANNOUNCE -->
-			<option value="make_announce">{L_MAKE_ANNOUNCE}</option>
-			<option value="make_global">{L_MAKE_GLOBAL}</option>
-		<!-- ENDIF -->
-	</select>
-	<input class="button2" type="submit" value="{L_SUBMIT}" />
-	<div><a href="#" onclick="marklist('mcp', 'topic_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'topic_id_list', false); return false;">{L_UNMARK_ALL}</a></div>
-	<!-- ENDIF -->
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE mcp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html
deleted file mode 100644
index 6f048d1a2d..0000000000
--- a/phpBB/styles/prosilver/template/mcp_front.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<h2>{PAGE_TITLE}</h2>
-
-<!-- IF S_SHOW_UNAPPROVED -->
-
-	<form id="mcp_queue" method="post" action="{S_MCP_QUEUE_ACTION}">
-
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<h3>{L_LATEST_UNAPPROVED}</h3>
-		<!-- IF S_HAS_UNAPPROVED_POSTS --><p>{L_UNAPPROVED_TOTAL}</p><!-- ENDIF -->
-
-		<!-- IF .unapproved -->
-			<ul class="topiclist">
-				<li class="header">
-					<dl>
-						<dt>{L_VIEW_DETAILS}</dt>
-						<dd class="moderation"><span>{L_TOPIC} &amp; {L_FORUM}</span></dd>
-					</dl>
-				</li>
-			</ul>
-			<ul class="topiclist cplist">
-
-			<!-- BEGIN unapproved -->
-			<li class="row<!-- IF unapproved.S_ROW_NUM is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-				<dl>
-					<dt>
-						<a href="{unapproved.U_POST_DETAILS}" class="topictitle">{unapproved.SUBJECT}</a> {unapproved.ATTACH_ICON_IMG}<br />
-						<!-- IF report.PAGINATION --><strong class="pagination"><span>{report.PAGINATION}</span></strong><!-- ENDIF -->
-						{L_POSTED} {L_POST_BY_AUTHOR} {unapproved.AUTHOR_FULL} &raquo; {unapproved.POST_TIME}
-					</dt>
-					<dd class="moderation"><span>
-						{L_TOPIC}: <a href="{unapproved.U_TOPIC}">{unapproved.TOPIC_TITLE}</a> [<a href="{unapproved.U_MCP_TOPIC}">{L_MODERATE}</a>]<br />
-						{L_FORUM}: <!-- IF unapproved.U_FORUM --><a href="{unapproved.U_FORUM}">{unapproved.FORUM_NAME}</a><!-- ELSE -->{unapproved.FORUM_NAME}<!-- ENDIF --><!-- IF unapproved.U_MCP_FORUM --> [<a href="{unapproved.U_MCP_FORUM}">{L_MODERATE}</a>]<!-- ENDIF --></span>
-					</dd>
-
-			 		<dd class="mark"><input type="checkbox" name="post_id_list[]" value="{unapproved.POST_ID}" /></dd>
-				</dl>
-			</li>
-			<!-- END unapproved -->
-			</ul>
-		<!-- ELSE -->
-			<p>{L_UNAPPROVED_POSTS_ZERO_TOTAL}</p>
-		<!-- ENDIF -->
-
-		<span class="corners-bottom"><span></span></span></div>
-	{S_FORM_TOKEN}
-	</div>
-
-	<!-- IF .unapproved -->
-	<fieldset class="display-actions">
-		<input class="button2" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" />&nbsp;
-		<input class="button1" type="submit" name="action[approve]" value="{L_APPROVE}" />
-		<div><a href="#" onclick="marklist('mcp_queue', 'post_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp_queue', 'post_id_list', false); return false;">{L_UNMARK_ALL}</a></div>
-	</fieldset>
-	<!-- ENDIF -->
-		</form>
-<!-- ENDIF -->
-
-<!-- IF S_SHOW_REPORTS -->
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<h3>{L_LATEST_REPORTED}</h3>
-		<!-- IF S_HAS_REPORTS --><p>{L_REPORTS_TOTAL}</p><!-- ENDIF -->
-
-		<!-- IF .report -->
-			<ul class="topiclist">
-				<li class="header">
-					<dl>
-						<dt>{L_VIEW_DETAILS}</dt>
-						<dd class="moderation"><span>{L_REPORTER} &amp; {L_FORUM}</span></dd>
-					</dl>
-				</li>
-			</ul>
-			<ul class="topiclist cplist">
-
-			<!-- BEGIN report -->
-			<li class="row<!-- IF report.S_ROW_NUM is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-				<dl>
-					<dt>
-						<a href="{report.U_POST_DETAILS}#reports" class="topictitle">{report.SUBJECT}</a> {report.ATTACH_ICON_IMG}<br />
-						<span>{L_POSTED} {L_POST_BY_AUTHOR} {report.AUTHOR_FULL} &raquo; {report.POST_TIME}</span>
-					</dt>
-					<dd class="moderation">
-						<span>{L_REPORTED} {L_POST_BY_AUTHOR} {report.REPORTER_FULL} {L_REPORTED_ON_DATE} {report.REPORT_TIME}<br />
-						{L_FORUM}: <a href="{report.U_FORUM}">{report.FORUM_NAME}</a></span>
-					</dd>
-				</dl>
-			</li>
-			<!-- END report -->
-			</ul>
-		<!-- ELSE -->
-			<p>{L_REPORTS_ZERO_TOTAL}</p>
-		<!-- ENDIF -->
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-<!-- ENDIF -->
-
-<!-- IF S_SHOW_LOGS -->
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<h3>{L_LATEST_LOGS}</h3>
-
-		<table class="table1" cellspacing="0">
-		<thead>
-		<tr>
-			<th class="name">{L_ACTION}</th>
-			<th class="name">{L_USERNAME}</th>
-			<th class="name">{L_IP}</th>
-			<th class="name">{L_VIEW_TOPIC}</th>
-			<th class="name">{L_VIEW_TOPIC_LOGS}</th>
-			<th class="name">{L_TIME}</th>
-		</tr>
-		</thead>
-		<tbody>
-	<!-- BEGIN log -->
-		<tr class="<!-- IF log.S_ROW_NUM is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-			<td>{log.ACTION}</td>
-			<td><span>{log.USERNAME}</span></td>
-			<td><span>{log.IP}</span></td>
-			<td><span><!-- IF log.U_VIEW_TOPIC --><a href="{log.U_VIEW_TOPIC}" title="{L_VIEW_TOPIC}">{L_VIEW_TOPIC}</a><!-- ENDIF -->&nbsp;</span></td>
-			<td><span><!-- IF log.U_VIEWLOGS --><a href="{log.U_VIEWLOGS}">{L_VIEW_TOPIC_LOGS}</a><!-- ENDIF -->&nbsp;</span></td>
-			<td><span>{log.TIME}</span></td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td colspan="6">{L_NO_ENTRIES}</td>
-		</tr>
-	<!-- END log -->
-		</tbody>
-		</table>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-<!-- ENDIF -->
-
-<!-- INCLUDE mcp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/mcp_header.html b/phpBB/styles/prosilver/template/mcp_header.html
deleted file mode 100644
index 13cc7e12cf..0000000000
--- a/phpBB/styles/prosilver/template/mcp_header.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<h2>{L_MCP}</h2>
-
-<!-- IF U_MCP -->
-	<p class="linkmcp">
-		[ <a href="{U_MCP}">{L_MCP}</a><!-- IF U_MCP_FORUM --> | <a href="{U_MCP_FORUM}">{L_MODERATE_FORUM}</a><!-- ENDIF -->
-		<!-- IF U_MCP_TOPIC --> | <a href="{U_MCP_TOPIC}">{L_MODERATE_TOPIC}</a><!-- ENDIF -->
-		<!-- IF U_MCP_POST --> | <a href="{U_MCP_POST}">{L_MODERATE_POST}</a><!-- ENDIF --> ]
-	</p>
-<!-- ENDIF -->
-
-<div id="tabs">
-	<ul>
-		<!-- BEGIN l_block1 -->
-		<li<!-- IF l_block1.S_SELECTED --> class="activetab"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li>
-		<!-- END l_block1 -->
-	</ul>
-</div>
-
-<div class="panel bg3">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<div style="width: 100%;">
-
-	<div id="cp-menu">
-		<div id="navigation">
-			<ul>
-			<!-- BEGIN l_block1 -->
-			<!-- IF l_block1.S_SELECTED -->
-				<!-- BEGIN l_block2 -->
-				<!-- IF l_block1.l_block2.S_SELECTED -->
-				<li id="active-subsection"><a href="{l_block1.l_block2.U_TITLE}"><span>{l_block1.l_block2.L_TITLE}<!-- IF l_block1.l_block2.ADD_ITEM --> ({l_block1.l_block2.ADD_ITEM})<!-- ENDIF --></span></a></li>
-				<!-- ELSE -->
-				<li><a href="{l_block1.l_block2.U_TITLE}"><span>{l_block1.l_block2.L_TITLE}<!-- IF l_block1.l_block2.ADD_ITEM --> ({l_block1.l_block2.ADD_ITEM})<!-- ENDIF --></span></a></li>
-				<!-- ENDIF -->
-				<!-- END l_block2 -->
-			<!-- ENDIF -->
-			<!-- END l_block1 -->
-			</ul>
-		</div>
-	</div>
-
-	<div id="cp-main" class="mcp-main">
-		<!-- IF MESSAGE -->
-		<div class="content">
-			<h2>{L_MESSAGE}</h2>
-			<p class="error">{MESSAGE}</p>
-			<p><!-- BEGIN return_links -->{return_links.MESSAGE_LINK}<br /><br /><!-- END return_links --></p>
-		</div>
-		<!-- ENDIF -->
-
-		<!-- IF CONFIRM_MESSAGE -->
-			<form id="confirm" method="post" action="{S_CONFIRM_ACTION}"{S_FORM_ENCTYPE}>
-
-			<div class="content">
-				<h2>{L_PLEASE_CONFIRM}</h2>
-				<p>{CONFIRM_MESSAGE}</p>
-			
-				<fieldset class="submit-buttons">
-					{S_HIDDEN_FIELDS}<input class="button1" type="submit" name="submit" value="{L_YES}" />&nbsp; 
-					<input class="button2" type="cancel" value="{L_NO}" />
-				</fieldset>
-			</div>
-
-			</form>
-		<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/mcp_logs.html b/phpBB/styles/prosilver/template/mcp_logs.html
deleted file mode 100644
index 7407981914..0000000000
--- a/phpBB/styles/prosilver/template/mcp_logs.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<h2>{L_TITLE}</h2>
-
-<form method="post" id="mcp" action="{U_POST_ACTION}">
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<ul class="linklist">
-		<li class="rightside pagination">
-			<!-- IF TOTAL -->{TOTAL} <!-- ENDIF -->
-			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-		</li>
-	</ul>
-
-	<table cellspacing="1" class="table1">
-	<thead>
-	<tr>
-		<th>{L_USERNAME}</th>
-		<th style="text-align: center">{L_IP}</th>
-		<th style="text-align: center">{L_TIME}</th>
-		<th>{L_ACTION}</th>
-		<!-- IF S_CLEAR_ALLOWED --><th>{L_MARK}</th><!-- ENDIF -->
-	</tr>
-	</thead>
-		<tbody>
-	<!-- IF S_LOGS -->
-		<!-- BEGIN log -->
-		<!-- IF log.S_ROW_NUM is even --><tr class="bg1"><!-- ELSE --><tr class="bg2"><!-- ENDIF -->
-			<td>{log.USERNAME}</td>
-			<td style="text-align: center">{log.IP}</td>
-			<td style="text-align: center">{log.DATE}</td>
-			<td>{log.ACTION}<br />
-			{log.DATA}
-		</td>
-			<!-- IF S_CLEAR_ALLOWED --><td style="width: 5%" align="center"><input type="checkbox" name="mark[]" value="{log.ID}" /></td><!-- ENDIF -->
-		</tr>
-		<!-- END log -->
-	<!-- ELSE -->
-		<tr>
-			<td class="bg1" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->" align="center"><span class="gen">{L_NO_ENTRIES}</span></td>
-		</tr>
-	<!-- ENDIF -->
-	</tbody>
-	</table>
-
-	<!-- IF .log -->
-		<fieldset class="display-options">
-			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-			<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label>
-			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>
-			<label>{S_SELECT_SORT_DIR}</label>
-			<input type="submit" name="sort" value="{L_GO}" class="button2" />
-		</fieldset>
-
-		<hr />
-
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL -->{TOTAL} <!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			</li>
-		</ul>
-		{S_FORM_TOKEN}
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-		<!-- IF S_CLEAR_ALLOWED -->
-			<fieldset class="display-actions">
-				<input class="button2" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" />
-				&nbsp;<input class="button1" type="submit" value="{L_DELETE_MARKED}" name="action[del_marked]" />
-	
-				<div><a href="#" onclick="marklist('mcp', 'mark', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'mark', false); return false;">{L_UNMARK_ALL}</a></div>
-			</fieldset>
-		<!-- ENDIF -->
-	<!-- ELSE -->
-			{S_FORM_TOKEN}
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-	<!-- ENDIF -->
-</form>
-
-<br />
-
-<!-- INCLUDE mcp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/mcp_message.html b/phpBB/styles/prosilver/template/mcp_message.html
deleted file mode 100644
index 1fde48b2cc..0000000000
--- a/phpBB/styles/prosilver/template/mcp_message.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<div class="content">
-	<h2>{MESSAGE_TITLE}</h2>
-	<p>{MESSAGE_TEXT}</p>
-</div>
-
-<!-- INCLUDE mcp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/mcp_move.html b/phpBB/styles/prosilver/template/mcp_move.html
deleted file mode 100644
index 804d76b14b..0000000000
--- a/phpBB/styles/prosilver/template/mcp_move.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<form id="confirm" action="{S_CONFIRM_ACTION}" method="post">
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<div class="content">
-		<h2>{MESSAGE_TITLE}</h2>
-		<!-- IF ADDITIONAL_MSG --><p>{ADDITIONAL_MSG}</p><!-- ENDIF -->
-
-		<fieldset>
-		<dl class="fields2">
-			<dt><label>{L_SELECT_DESTINATION_FORUM}:</label></dt>
-			<dd><select name="to_forum_id">{S_FORUM_SELECT}</select></dd>
-			<!-- IF S_CAN_LEAVE_SHADOW --><dd><label for="move_leave_shadow"><input type="checkbox" name="move_leave_shadow" id="move_leave_shadow" checked="checked" />{L_LEAVE_SHADOW}</label></dd><!-- ENDIF -->
-		</dl>
-		<dl class="fields2">
-			<dt>&nbsp;</dt>
-			<dd><strong>{MESSAGE_TEXT}</strong></dd>
-		</dl>
-		</fieldset>
-
-		<fieldset class="submit-buttons">
-			{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="button1" />&nbsp; 
-			<input type="submit" name="cancel" value="{L_NO}" class="button2" />
-			{S_FORM_TOKEN}
-		</fieldset>
-
-	</div>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/mcp_notes_front.html b/phpBB/styles/prosilver/template/mcp_notes_front.html
deleted file mode 100644
index 045a7619ed..0000000000
--- a/phpBB/styles/prosilver/template/mcp_notes_front.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<form method="post" id="mcp" action="{U_POST_ACTION}">
-
-<h2>{L_TITLE}</h2>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<fieldset>
-	<dl>
-		<dt><label for="username">{L_SELECT_USER}:</label></dt>
-		<dd><input name="username" id="username" type="text" class="inputbox" /></dd>
-		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>
-	</dl>
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<fieldset class="submit-buttons">
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="submituser" value="{L_SUBMIT}" class="button1" />
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE mcp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html
deleted file mode 100644
index 60bdbc7b9f..0000000000
--- a/phpBB/styles/prosilver/template/mcp_notes_user.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<form method="post" id="mcp" action="{U_POST_ACTION}">
-
-<h2>{L_TITLE}</h2>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h3>{USERNAME_FULL}</h3>
-
-	<div>
-		<div class="column1">
-			<!-- IF AVATAR_IMG --><div>{AVATAR_IMG}</div><!-- ENDIF -->
-		</div>
-
-		<div class="column2">
-			<dl class="details">
-				<!-- IF RANK_TITLE --><dt>{L_RANK}:</dt><dd>{RANK_TITLE}</dd><!-- ENDIF -->
-				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}:<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF -->
-				<dt>{L_JOINED}:</dt><dd>{JOINED}</dd>
-				<dt>{L_TOTAL_POSTS}:</dt><dd>{POSTS}</dd>
-				<dt>{L_WARNINGS}: </dt><dd>{WARNINGS}</dd>
-			</dl>
-		</div>
-	</div>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h3>{L_ADD_FEEDBACK}</h3>
-	<p>{L_ADD_FEEDBACK_EXPLAIN}</p>
-
-	<fieldset>
-		<textarea name="usernote" id="usernote" class="inputbox" cols="40" rows="3"></textarea>
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="action[add_feedback]" value="{L_SUBMIT}" class="button1" />
-	{S_FORM_TOKEN}
-</fieldset>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>		
-
-	<ul class="linklist">
-		<li class="rightside pagination">
-			<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS} <!-- ENDIF -->
-			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-		</li>
-	</ul>
-
-	<table cellspacing="1" class="table1">
-	<thead>
-	<tr>
-		<th>{L_REPORT_BY}</th>
-		<th style="text-align: center">{L_IP}</th>
-		<th style="text-align: center">{L_TIME}</th>
-		<th>{L_ACTION_NOTE}</th>
-		<!-- IF S_CLEAR_ALLOWED --><th>{L_MARK}</th><!-- ENDIF -->
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN usernotes -->
-	<!-- IF usernotes.S_ROW_NUM is even --><tr class="bg1"><!-- ELSE --><tr class="bg2"><!-- ENDIF -->
-		<td>{usernotes.REPORT_BY}</td>
-		<td style="text-align: center">{usernotes.IP}</td>
-		<td style="text-align: center">{usernotes.REPORT_AT}</td>
-		<td>{usernotes.ACTION}</td>
-
-		<!-- IF S_CLEAR_ALLOWED --><td width="5%" align="center"><input type="checkbox" name="marknote[]" id="note-{usernotes.ID}" value="{usernotes.ID}" /></td><!-- ENDIF -->
-	</tr>
-	<!-- BEGINELSE -->
-	<tr>
-		<td class="bg1" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->" align="center"><span class="gen">{L_NO_ENTRIES}</span></td>
-	</tr>
-	<!-- END usernames -->
-	</tbody>
-	</table>
-
-	<hr />
-
-	<fieldset class="display-options">
-		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-		<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label>
-		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>		
-		<input type="submit" name="sort" value="{L_GO}" class="button2" />
-	</fieldset>
-
-	<hr />
-
-	<ul class="linklist">
-		<li class="rightside pagination">
-			<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS}<!-- ENDIF -->
-			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-		</li>
-	</ul>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>	
-
-<!-- IF S_CLEAR_ALLOWED -->
-<fieldset class="display-actions">
-	<input class="button2" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" />
-	&nbsp;<input class="button1" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}" />
-</fieldset>
-
-<fieldset class="display-actions">
-	<div><a href="#" onclick="marklist('mcp', 'marknote', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('mcp', 'marknote', false); return false;">{L_UNMARK_ALL}</a></div>		
-</fieldset>
-<!-- ENDIF -->
-</form>
-
-<!-- INCLUDE mcp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html
deleted file mode 100644
index 5b25f45fb9..0000000000
--- a/phpBB/styles/prosilver/template/mcp_post.html
+++ /dev/null
@@ -1,284 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<!-- IF S_MCP_REPORT -->
-	<h2>{L_REPORT_DETAILS}</h2>
-
-	<div id="report" class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="postbody">
-			<h3>{L_REPORT_REASON}: {REPORT_REASON_TITLE}</h3>
-			<p class="author">{L_REPORTED} {L_POST_BY_AUTHOR} {REPORTER_FULL} {L_REPORTED_ON_DATE}  {REPORT_DATE}</p>
-		<!-- IF not S_POST_REPORTED -->
-			<p class="rules">{L_REPORT_CLOSED}</p>
-		<!-- ENDIF -->
-			<div class="content">
-			<!-- IF REPORT_TEXT -->
-				{REPORT_TEXT}
-			<!-- ELSE -->
-				{REPORT_REASON_DESCRIPTION}
-			<!-- ENDIF -->
-			</div>
-		</div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<form method="post" id="mcp_report" action="{S_CLOSE_ACTION}">
-
-	<fieldset class="submit-buttons">
-		<!-- IF S_POST_REPORTED -->
-			<input class="button1" type="submit" value="{L_CLOSE_REPORT}" name="action[close]" /> &nbsp;
-		<!-- ENDIF -->
-		<input class="button2" type="submit" value="{L_DELETE_REPORT}" name="action[delete]" />
-		<input type="hidden" name="report_id_list[]" value="{REPORT_ID}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSE -->
-	<h2>{L_POST_DETAILS}</h2>
-<!-- ENDIF -->
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<div class="postbody">
-		<!-- IF U_EDIT -->
-		<ul class="profile-icons">
-			<li class="edit-icon"><a href="{U_EDIT}" title="{L_EDIT_POST}"><span>{L_EDIT_POST}</span></a></li>
-		</ul>
-		<!-- ENDIF -->
-
-		<h3><a href="{U_VIEW_POST}">{POST_SUBJECT}</a></h3>
-		<p class="author">{MINI_POST_IMG} {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} &raquo; {POST_DATE}</p>
-
-		<!-- IF S_POST_UNAPPROVED -->
-			<form method="post" id="mcp_approve" action="{U_APPROVE_ACTION}">
-
-			<p class="rules">
-				<input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" /> &nbsp;
-				<input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" />
-				<input type="hidden" name="post_id_list[]" value="{POST_ID}" />
-				{S_FORM_TOKEN}
-			</p>
-			</form>
-		<!-- ENDIF -->
-
-		<!-- IF S_MESSAGE_REPORTED -->
-			<p class="rules">
-				{REPORTED_IMG} <a href="{U_MCP_REPORT}"><strong>{L_MESSAGE_REPORTED}</strong></a>
-			</p>
-		<!-- ENDIF -->
-
-		<div class="content">
-			{POST_PREVIEW}
-		</div>
-
-		<!-- IF S_HAS_ATTACHMENTS -->
-			<dl class="attachbox">
-				<dt>{L_ATTACHMENTS}</dt>
-				<!-- BEGIN attachment -->
-					<dd>{attachment.DISPLAY_ATTACHMENT}</dd>
-				<!-- END attachment -->
-			</dl>
-		<!-- ENDIF -->
-
-		<!-- IF SIGNATURE -->
-			<div id="sig{POST_ID}" class="signature">{SIGNATURE}</div>
-		<!-- ENDIF -->
-
-		<!-- IF S_MCP_REPORT and S_CAN_VIEWIP -->
-			<hr />
-			<div>{L_THIS_POST_IP}: <!-- IF U_WHOIS -->
-				<a href="{U_WHOIS}"><!-- IF POST_IPADDR -->{POST_IPADDR}<!-- ELSE -->{POST_IP}<!-- ENDIF --></a> (<!-- IF POST_IPADDR -->{POST_IP}<!-- ELSE --><a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a><!-- ENDIF -->)
-			<!-- ELSE -->
-				<!-- IF POST_IPADDR -->{POST_IPADDR} ({POST_IP})<!-- ELSE -->{POST_IP}<!-- IF U_LOOKUP_IP --> (<a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a>)<!-- ENDIF --><!-- ENDIF -->
-			<!-- ENDIF --></div>
-		<!-- ENDIF -->
-
-	</div>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- IF S_CAN_LOCK_POST or S_CAN_DELETE_POST or S_CAN_CHGPOSTER -->
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<h3>{L_MOD_OPTIONS}</h3>
-		<!-- IF S_CAN_CHGPOSTER -->
-			<form method="post" id="mcp_chgposter" action="{U_POST_ACTION}">
-
-			<fieldset>
-			<dl>
-				<dt><label>{L_CHANGE_POSTER}:</label></dt>
-				<!-- IF S_USER_SELECT --><dd><select name="u">{S_USER_SELECT}</select> <input type="submit" class="button2" name="action[chgposter_ip]" value="{L_CONFIRM}" /></dd><!-- ENDIF -->
-				<dd style="margin-top:3px;">
-					<input class="inputbox autowidth" type="text" name="username" value="" />
-					<input type="submit" class="button2" name="action[chgposter]" value="{L_CONFIRM}" />
-					<br />
-					<span>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span>
-				</dd>
-			</dl>
-			{S_FORM_TOKEN}
-			</fieldset>
-			</form>
-		<!-- ENDIF -->
-
-		<!-- IF S_CAN_LOCK_POST or S_CAN_DELETE_POST -->
-			<form method="post" id="mcp" action="{U_MCP_ACTION}">
-
-			<fieldset>
-			<dl>
-				<dt><label>{L_MOD_OPTIONS}:</label></dt>
-				<dd><select name="action">
-					<!-- IF S_CAN_LOCK_POST --><!-- IF S_POST_LOCKED --><option value="unlock_post">{L_UNLOCK_POST} [{L_UNLOCK_POST_EXPLAIN}]</option><!-- ELSE --><option value="lock_post">{L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]</option><!-- ENDIF --><!-- ENDIF -->
-					<!-- IF S_CAN_DELETE_POST --><option value="delete_post">{L_DELETE_POST}</option><!-- ENDIF -->
-					</select> <input class="button2" type="submit" value="{L_SUBMIT}" />
-				</dd>
-			</dl>
-			{S_FORM_TOKEN}
-			</fieldset>
-			</form>
-		<!-- ENDIF -->
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-<!-- ENDIF -->
-
-
-<!-- IF S_MCP_QUEUE or S_MCP_REPORT or RETURN_TOPIC -->
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<p><!-- IF S_MCP_QUEUE -->{RETURN_QUEUE} | {RETURN_TOPIC_SIMPLE} | {RETURN_POST}<!-- ELSEIF S_MCP_REPORT -->{RETURN_REPORTS} | <a href="{U_VIEW_POST}">{L_VIEW_POST}</a> | <a href="{U_VIEW_TOPIC}">{L_VIEW_TOPIC}</a> | <a href="{U_VIEW_FORUM}">{L_VIEW_FORUM}</a><!-- ELSE -->{RETURN_TOPIC}<!-- ENDIF --></p>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-<!-- ENDIF -->
-
-<!-- IF S_MCP_QUEUE -->
-<!-- ELSE -->
-
-	<!-- IF S_SHOW_USER_NOTES -->
-		<div class="panel" id="usernotes">
-			<div class="inner"><span class="corners-top"><span></span></span>
-
-			<form method="post" id="mcp_notes" action="{U_POST_ACTION}">
-
-			<!-- IF S_USER_NOTES -->
-				<h3>{L_FEEDBACK}</h3>
-
-				<!-- BEGIN usernotes -->
-					<span class="small"><strong>{L_REPORTED_BY}: {usernotes.REPORT_BY} {L_REPORTED_ON_DATE} {usernotes.REPORT_AT}</strong></span>
-					<!-- IF S_CLEAR_ALLOWED --><div class="right-box"><input type="checkbox" name="marknote[]" value="{usernotes.ID}" /></div><!-- ENDIF -->
-					<div class="postbody">{usernotes.ACTION}</div>
-
-					<hr class="dashed" />
-				<!-- END usernotes -->
-
-				<!-- IF S_CLEAR_ALLOWED -->
-					<fieldset class="submit-buttons">
-						<input class="button2" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" />&nbsp;
-						<input class="button2" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}" />
-					</fieldset>
-				<!-- ENDIF -->
-			<!-- ENDIF -->
-
-			<h3>{L_ADD_FEEDBACK}</h3>
-			<p>{L_ADD_FEEDBACK_EXPLAIN}</p>
-
-			<fieldset>
-				<textarea name="usernote" rows="4" cols="76" class="inputbox"></textarea>
-			</fieldset>
-
-			<fieldset class="submit-buttons">
-				<input class="button1" type="submit" name="action[add_feedback]" value="{L_SUBMIT}" />&nbsp;
-				<input class="button2" type="reset" value="{L_RESET}" />
-				{S_FORM_TOKEN}
-			</fieldset>
-			</form>
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF S_SHOW_REPORTS -->
-		<div class="panel" id="reports">
-			<div class="inner"><span class="corners-top"><span></span></span>
-
-			<h3>{L_MCP_POST_REPORTS}</h3>
-
-			<!-- BEGIN reports -->
-				<span class="small"><strong>{L_REPORTED_BY}: <!-- IF reports.U_REPORTER --><a href="{reports.U_REPORTER}">{reports.REPORTER}</a><!-- ELSE -->{reports.REPORTER}<!-- ENDIF --> {L_REPORTED_ON_DATE} {reports.REPORT_TIME}</strong></span>
-				<p><em>{reports.REASON_TITLE}: {reports.REASON_DESC}</em><!-- IF reports.REPORT_TEXT --><br />{reports.REPORT_TEXT}<!-- ENDIF --></p>
-			<!-- END reports -->
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF S_CAN_VIEWIP and not S_MCP_REPORT -->
-		<div class="panel" id="ip">
-			<div class="inner"><span class="corners-top"><span></span></span>
-
-			<p>{L_THIS_POST_IP}: <!-- IF U_WHOIS -->
-				<a href="{U_WHOIS}"><!-- IF POST_IPADDR -->{POST_IPADDR}<!-- ELSE -->{POST_IP}<!-- ENDIF --></a> (<!-- IF POST_IPADDR -->{POST_IP}<!-- ELSE --><a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a><!-- ENDIF -->)
-			<!-- ELSE -->
-				<!-- IF POST_IPADDR -->{POST_IPADDR} ({POST_IP})<!-- ELSE -->{POST_IP}<!-- IF U_LOOKUP_IP --> (<a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a>)<!-- ENDIF --><!-- ENDIF -->
-			<!-- ENDIF --></p>
-
-			<table class="table1" cellspacing="1">
-			<thead>
-			<tr>
-				<th class="name">{L_OTHER_USERS}</th>
-				<th class="posts">{L_POSTS}</th>
-			</tr>
-			</thead>
-			<tbody>
-			<!-- BEGIN userrow -->
-			<tr class="<!-- IF userrow.S_ROW_NUM is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-				<td><!-- IF userrow.U_PROFILE --><a href="{userrow.U_PROFILE}">{userrow.USERNAME}</a><!-- ELSE -->{userrow.USERNAME}<!-- ENDIF --></td>
-				<td class="posts"><a href="{userrow.U_SEARCHPOSTS}" title="{L_SEARCH_POSTS_BY} {userrow.USERNAME}">{userrow.NUM_POSTS}</a></td>
-			</tr>
-			<!-- BEGINELSE -->
-				<tr>
-					<td colspan="2">{L_NO_MATCHES_FOUND}</td>
-				</tr>
-			<!-- END userrow -->
-			</tbody>
-			</table>
-
-			<table class="table1" cellspacing="1">
-			<thead>
-			<tr>
-				<th class="name">{L_IPS_POSTED_FROM}</th>
-				<th class="posts">{L_POSTS}</th>
-			</tr>
-			</thead>
-			<tbody>
-			<!-- BEGIN iprow -->
-			<tr class="<!-- IF iprow.S_ROW_NUM is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-				<td><!-- IF iprow.HOSTNAME --><a href="{iprow.U_WHOIS}">{iprow.HOSTNAME}</a> ({iprow.IP})<!-- ELSE --><a href="{iprow.U_WHOIS}">{iprow.IP}</a> (<a href="{iprow.U_LOOKUP_IP}">{L_LOOKUP_IP}</a>)<!-- ENDIF --></td>
-				<td class="posts">{iprow.NUM_POSTS}</td>
-			</tr>
-			<!-- BEGINELSE -->
-				<tr>
-					<td colspan="2">{L_NO_MATCHES_FOUND}</td>
-				</tr>
-			<!-- END iprow -->
-			</tbody>
-			</table>
-
-			<p><a href="{U_LOOKUP_ALL}#ip">{L_LOOKUP_ALL}</a></p>
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-	<!-- ENDIF -->
-
-<!-- ENDIF -->
-
-<!-- IF S_TOPIC_REVIEW --><!-- INCLUDE posting_topic_review.html --><!-- ENDIF -->
-
-<!-- INCLUDE mcp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/mcp_queue.html b/phpBB/styles/prosilver/template/mcp_queue.html
deleted file mode 100644
index 2c860bec5d..0000000000
--- a/phpBB/styles/prosilver/template/mcp_queue.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<form id="mcp" method="post" action="{S_MCP_ACTION}">
-
-<fieldset class="forum-selection">
-	<label for="fo">{L_FORUM}: <select name="f" id="fo">{S_FORUM_OPTIONS}</select></label>
-	<input type="submit" name="sort" value="{L_GO}" class="button2" />
-	{S_FORM_TOKEN}
-</fieldset>
-
-<h2>{L_TITLE}</h2>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<p>{L_EXPLAIN}</p>
-
-	<!-- IF .postrow -->
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL --> {TOTAL}<!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			</li>
-		</ul>
-		<ul class="topiclist">
-			<li class="header">
-				<dl>
-					<dt><!-- IF S_TOPICS -->{L_TOPIC}<!-- ELSE -->{L_POST}<!-- ENDIF --></dt>
-					<dd class="moderation"><span><!-- IF not S_TOPICS -->{L_TOPIC} &amp; <!-- ENDIF -->{L_FORUM}</span></dd>
-					<dd class="mark">{L_MARK}</dd>
-				</dl>
-			</li>
-			</ul>
-			<ul class="topiclist cplist">
-
-		<!-- BEGIN postrow -->
-
-		<!-- IF postrow.S_DELETED_TOPIC -->
-			<li><p class="notopics">{L_DELETED_TOPIC}</p></li>
-		<!-- ELSE -->
-
-		<li class="row<!-- IF postrow.S_ROW_NUM is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-			<dl>
-				<dt>
-					<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a> <br />
-					<span>{L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} &raquo; {postrow.POST_TIME}</span>
-				</dt>
-				<dd class="moderation">
-					<span>
-						<!-- IF S_TOPICS --><br /><!-- ELSE -->{L_TOPIC}: <a href="{postrow.U_TOPIC}">{postrow.TOPIC_TITLE}</a> <br /><!-- ENDIF -->
-						{L_FORUM}: <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a>
-					</span>
-				</dd>
-
-
-		 		<dd class="mark"><input type="checkbox" name="post_id_list[]" value="{postrow.POST_ID}" /></dd>
-			</dl>
-		</li>
-		<!-- ENDIF -->
-		<!-- END postrow -->
-		</ul>
-
-		<fieldset class="display-options">
-			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-			<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label>
-			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>
-			<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />&nbsp; <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->
-			<input type="submit" name="sort" value="{L_GO}" class="button2" />
-		</fieldset>
-
-		<hr />
-
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL -->{TOTAL}<!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			</li>
-		</ul>
-	<!-- ELSE -->
-		<p class="notopics"><strong><!-- IF S_TOPICS -->{L_NO_TOPICS_QUEUE}<!-- ELSE -->{L_UNAPPROVED_POSTS_ZERO_TOTAL}<!-- ENDIF --></strong></p>
-	<!-- ENDIF -->
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- IF .postrow -->
-	<fieldset class="display-actions">
-		<input class="button2" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" />&nbsp;
-		<input class="button1" type="submit" name="action[approve]" value="{L_APPROVE}" />
-		<div><a href="#" onclick="marklist('mcp', 'post_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'post_id_list', false); return false;">{L_UNMARK_ALL}</a></div>
-	</fieldset>
-<!-- ENDIF -->
-</form>
-
-<!-- INCLUDE mcp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/mcp_reports.html b/phpBB/styles/prosilver/template/mcp_reports.html
deleted file mode 100644
index c40070b9ba..0000000000
--- a/phpBB/styles/prosilver/template/mcp_reports.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<form id="mcp" method="post" action="{S_MCP_ACTION}">
-
-<fieldset class="forum-selection">
-	<label for="fo">{L_FORUM}: <select name="f" id="fo">{S_FORUM_OPTIONS}</select></label>
-	<input type="submit" name="sort" value="{L_GO}" class="button2" />
-	{S_FORM_TOKEN}
-</fieldset>
-
-<h2>{L_TITLE}</h2>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<p>{L_EXPLAIN}</p>
-
-	<!-- IF .postrow -->
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL -->{TOTAL_REPORTS}<!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			</li>
-		</ul>
-		<ul class="topiclist">
-			<li class="header">
-				<dl>
-					<dt>{L_VIEW_DETAILS}</dt>
-					<dd class="moderation"><span>{L_REPORTER} &amp; {L_FORUM}</span></dd>
-					<dd class="mark">{L_MARK}</dd>
-				</dl>
-			</li>
-		</ul>
-		<ul class="topiclist cplist">
-
-		<!-- BEGIN postrow -->
-			<li class="row<!-- IF postrow.S_ROW_NUM is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-				<dl>
-					<dt>
-						<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a> {postrow.ATTACH_ICON_IMG}<br />
-						<span>{L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} &raquo; {postrow.POST_TIME}</span>
-					</dt>
-					<dd class="moderation">
-						<span>{postrow.REPORTER_FULL} {L_REPORTED_ON_DATE} {postrow.REPORT_TIME}<br />
-						{L_FORUM}: <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a></span>
-					</dd>
-					<dd class="mark"><input type="checkbox" name="report_id_list[]" value="{postrow.REPORT_ID}" /></dd>
-				</dl>
-			</li>
-		<!-- END postrow -->
-		</ul>
-
-		<fieldset class="display-options">
-			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-			<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label>
-			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>
-			<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />&nbsp; <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->
-			<input type="submit" name="sort" value="{L_GO}" class="button2" />
-		</fieldset>
-		<hr />
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL -->{TOTAL_REPORTS}<!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			</li>
-		</ul>
-
-	<!-- ELSE -->
-		<p><strong>{L_NO_REPORTS}</strong></p>
-	<!-- ENDIF -->
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- IF .postrow -->
-	<fieldset class="display-actions">
-		<input class="button2" type="submit" value="{L_DELETE_REPORTS}" name="action[delete]" />
-		<!-- IF not S_CLOSED -->&nbsp;<input class="button1" type="submit" name="action[close]" value="{L_CLOSE_REPORTS}" /><!-- ENDIF -->
-		<div><a href="#" onclick="marklist('mcp', 'report_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'report_id_list', false); return false;">{L_UNMARK_ALL}</a></div>
-	</fieldset>
-<!-- ENDIF -->
-</form>
-
-<!-- INCLUDE mcp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
deleted file mode 100644
index c95bb923fa..0000000000
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<h2><a href="{U_VIEW_TOPIC}">{L_TOPIC}: {TOPIC_TITLE}</a></h2>
-
-<script type="text/javascript">
-// <![CDATA[
-var panels = new Array('display-panel', 'split-panel', 'merge-panel');
-
-<!-- IF S_MERGE_VIEW -->
-	var show_panel = 'merge-panel';
-<!-- ELSEIF S_SPLIT_VIEW -->
-	var show_panel = 'split-panel';
-<!-- ELSE -->
-	var show_panel = 'display-panel';
-<!-- ENDIF -->
-
-onload_functions.push('subPanels()');
-
-// ]]>
-</script>
-
-<div id="minitabs">
-	<ul>
-		<li id="display-panel-tab"<!-- IF not S_MERGE_VIEW --> class="activetab"<!-- ENDIF -->>
-			<span class="corners-top"><span></span></span>
-			<a href="#minitabs" onclick="subPanels('display-panel'); return false;"><span>{L_DISPLAY_OPTIONS}</span></a>
-		</li>
-		<li id="split-panel-tab">
-			<span class="corners-top"><span></span></span>
-			<a href="#minitabs" onclick="subPanels('split-panel'); return false;"><span>{L_SPLIT_TOPIC}</span></a>
-		</li>
-		<li id="merge-panel-tab"<!-- IF S_MERGE_VIEW --> class="activetab"<!-- ENDIF -->>
-			<span class="corners-top"><span></span></span>
-			<a href="#minitabs" onclick="subPanels('merge-panel'); return false;"><span>{L_MERGE_TOPIC}</span></a>
-		</li>
-	</ul>
-</div>
-
-<form id="mcp" method="post" action="{S_MCP_ACTION}">
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<fieldset id="display-panel" class="fields2">
-	<dl>
-		<dt><label for="posts_per_page">{L_POSTS_PER_PAGE}:</label><br /><span>{L_POSTS_PER_PAGE_EXPLAIN}</span></dt>
-		<dd><input class="inputbox autowidth" type="text" name="posts_per_page" id="posts_per_page" size="6" value="{POSTS_PER_PAGE}" /></dd>
-	</dl>
-	<dl>
-		<dt><label>{L_DISPLAY_POSTS}:</label></dt>
-		<dd>{S_SELECT_SORT_DAYS}&nbsp;&nbsp;<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label> <input type="submit" name="sort" value="{L_GO}" class="button2" /></dd>
-	</dl>
-	</fieldset>
-
-<!-- IF S_CAN_SPLIT -->
-	<fieldset id="split-panel" class="fields2">
-		<p>{L_SPLIT_TOPIC_EXPLAIN}</p>
-
-	<!-- IF S_SHOW_TOPIC_ICONS -->
-		<dl>
-			<dt><label for="icon">{L_TOPIC_ICON}:</label></dt>
-			<dd><label for="icon"><input type="radio" name="icon" id="icon" value="0" checked="checked" /> {L_NO_TOPIC_ICON}</label>
-			<!-- BEGIN topic_icon --><label for="icon-{topic_icon.ICON_ID}"><input type="radio" name="icon" id="icon-{topic_icon.ICON_ID}" value="{topic_icon.ICON_ID}" {topic_icon.S_ICON_CHECKED} /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" /></label> <!-- END topic_icon --></dd>
-		</dl>
-	<!-- ENDIF -->
-
-	<dl>
-		<dt><label for="subject">{L_SPLIT_SUBJECT}:</label></dt>
-		<dd><input type="text" name="subject" id="subject" size="45" maxlength="64" tabindex="2" value="{SPLIT_SUBJECT}" title="{L_SPLIT_SUBJECT}" class="inputbox" /></dd>
-	</dl>
-	<dl>
-		<dt><label>{L_SPLIT_FORUM}:</label></dt>
-		<dd><select name="to_forum_id">{S_FORUM_SELECT}</select></dd>
-	</dl>
-	</fieldset>
-<!-- ENDIF -->
-
-<!-- IF S_CAN_MERGE -->
-	<fieldset id="merge-panel" class="fields2">
-		<p>{L_MERGE_TOPIC_EXPLAIN}</p>
-	<dl>
-		<dt><label for="to_topic_id">{L_MERGE_TOPIC_ID}:</label></dt>
-		<dd>
-			<input class="inputbox autowidth" type="text" size="6" name="to_topic_id" id="to_topic_id" value="{TO_TOPIC_ID}" />
-			<a href="{U_SELECT_TOPIC}" >{L_SELECT_TOPIC}</a>
-		</dd>
-		<!-- IF TO_TOPIC_INFO --><dd>{TO_TOPIC_INFO}</dd><!-- ENDIF -->
-	</dl>
-	</fieldset>
-<!-- ENDIF -->
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h3 id="review">
-		<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span>
-		{L_TOPIC_REVIEW}: {TOPIC_TITLE}
-	</h3>
-
-	<div id="topicreview">
-		<!-- BEGIN postrow -->
-		<div class="post <!-- IF postrow.S_ROW_NUM is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-			<div class="inner"><span class="corners-top"><span></span></span>
-
-			<div class="postbody" id="pr{postrow.POST_ID}">
-				<div class="right-box"><a href="{postrow.U_POST_DETAILS}">{L_POST_DETAILS}</a> | {L_SELECT}: <input type="checkbox" name="post_id_list[]" value="{postrow.POST_ID}"<!-- IF postrow.S_CHECKED --> checked="checked"<!-- ENDIF --> /></div>
-
-				<h3><a href="{postrow.U_POST_DETAILS}">{postrow.POST_SUBJECT}</a></h3>
-				<p class="author"><a href="#pr{postrow.POST_ID}">{postrow.MINI_POST_IMG}</a> {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong><!-- IF postrow.U_MCP_DETAILS --> [ <a href="{postrow.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --></p>
-
-				<!-- IF postrow.S_POST_UNAPPROVED or postrow.S_POST_REPORTED -->
-				<p class="rules">
-					<!-- IF postrow.S_POST_UNAPPROVED -->{UNAPPROVED_IMG} <a href="{postrow.U_MCP_APPROVE}"><strong>{L_POST_UNAPPROVED}</strong></a><!-- ENDIF -->
-					<!-- IF postrow.S_POST_REPORTED -->{REPORTED_IMG} <a href="{postrow.U_MCP_REPORT}"><strong>{L_POST_REPORTED}</strong></a><!-- ENDIF -->
-				</p>
-				<!-- ENDIF -->
-
-				<div class="content" id="message_{postrow.POST_ID}">{postrow.MESSAGE}</div>
-
-				<!-- IF postrow.S_HAS_ATTACHMENTS -->
-					<dl class="attachbox">
-						<dt>{L_ATTACHMENTS}</dt>
-						<!-- BEGIN attachment -->
-							<dd>{postrow.attachment.DISPLAY_ATTACHMENT}</dd>
-						<!-- END attachment -->
-					</dl>
-				<!-- ENDIF -->
-
-			</div>
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-		<!-- END postrow -->
-	</div>
-
-	<hr />
-
-	<!-- IF PAGINATION or TOTAL_POSTS -->
-	<ul class="linklist">
-		<li class="rightside pagination">
-			<!-- IF TOTAL_POSTS --> {TOTAL_POSTS}<!-- ENDIF -->
-			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-		</li>
-	</ul>
-	<!-- ENDIF -->
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<fieldset class="display-actions">
-	<select name="action">
-		<option value="" selected="selected">{L_SELECT_ACTION}</option>
-		<!-- IF S_CAN_APPROVE --><option value="approve">{L_APPROVE_POSTS}</option><!-- ENDIF -->
-		<!-- IF S_CAN_LOCK --><option value="lock_post">{L_LOCK_POST_POSTS} [ {L_LOCK_POST_EXPLAIN} ]</option><option value="unlock_post">{L_UNLOCK_POST_POSTS}</option><!-- ENDIF -->
-		<!-- IF S_CAN_DELETE --><option value="delete_post">{L_DELETE_POSTS}</option><!-- ENDIF -->
-		<!-- IF S_CAN_MERGE --><option value="merge_posts"<!-- IF S_MERGE_VIEW --> selected="selected"<!-- ENDIF -->>{L_MERGE_POSTS}</option><!-- ENDIF -->
-		<!-- IF S_CAN_SPLIT --><option value="split_all"<!-- IF S_SPLIT_VIEW --> selected="selected"<!-- ENDIF -->>{L_SPLIT_POSTS}</option><option value="split_beyond">{L_SPLIT_AFTER}</option><!-- ENDIF -->
-	</select>&nbsp;
-	<input class="button1" type="submit" name="mcp_topic_submit" value="{L_SUBMIT}" />
-	<div><a href="#" onclick="marklist('mcp', 'post', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'post', false); return false;">{L_UNMARK_ALL}</a></div>
-{S_HIDDEN_FIELDS}
-{S_FORM_TOKEN}
-</fieldset>
-
-</form>
-
-<!-- INCLUDE mcp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/mcp_viewlogs.html b/phpBB/styles/prosilver/template/mcp_viewlogs.html
deleted file mode 100644
index 264152d3ae..0000000000
--- a/phpBB/styles/prosilver/template/mcp_viewlogs.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<form method="post" id="mcp" action="{S_MCP_ACTION}">
-
-<table class="tablebg" width="100%" cellspacing="1" cellpadding="2" border="0">
-<tr>
-	<th colspan="<!-- IF S_TOPIC_ID -->4<!-- ELSE -->5<!-- ENDIF -->" height="28" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th>
-</tr>
-<tr>
-	<td colspan="<!-- IF S_TOPIC_ID -->4<!-- ELSE -->5<!-- ENDIF -->" class="cat" height="28" align="center"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td>
-</tr>
-<tr>
-	<th width="15%" height="28" nowrap="nowrap">{L_USERNAME}</th>
-	<th width="12%" nowrap="nowrap">{L_IP}</th>
-	<th width="18%" nowrap="nowrap">{L_TIME}</th>
-	<th width="45%" nowrap="nowrap">{L_ACTION}</th>
-	<!-- IF not S_TOPIC_ID --><th width="8%" nowrap="nowrap"></th><!-- ENDIF -->
-</tr>
-<!-- IF S_TOPIC_ID -->
-	<tr>
-		<td class="bg3" colspan="5"><span class="gensmall">{L_LOGS_CURRENT_TOPIC} <a href="{U_VIEW_TOPIC}"><strong>{TOPIC_NAME}</strong></a></td>
-	</tr>
-<!-- ENDIF -->
-
-<!-- BEGIN log -->
-<tr>
-	<td class="bg1" nowrap="nowrap"><span class="gen">{log.USERNAME}</span></td>
-	<td class="bg1" align="center" nowrap="nowrap"><span class="gen">{log.IP}</span></td>
-	<td class="bg1" align="center" nowrap="nowrap"><span class="gensmall">{log.TIME}</span></td>
-	<td class="bg1"><span class="gen">{log.ACTION}</span></td>
-	<!-- IF not S_TOPIC_ID -->
-		<td class="bg1" align="center" nowrap="nowrap"><span class="gensmall"><!-- IF log.U_VIEW_TOPIC --><a href="{log.U_VIEW_TOPIC}">{L_VIEW_TOPIC}</a><!-- IF log.U_VIEWLOGS --> | <!-- ENDIF --><!-- ENDIF --><!-- IF log.U_VIEWLOGS --><a href="{log.U_VIEWLOGS}">{L_VIEW_TOPIC_LOGS}</a><!-- ENDIF --></span></td>
-	<!-- ENDIF -->
-</tr>
-<!-- BEGINELSE -->
-	<tr>
-		<td class="bg1" colspan="<!-- IF S_TOPIC_ID -->4<!-- ELSE -->5<!-- ENDIF -->" align="center"><span class="gen">{L_NO_ENTRIES}</span></td>
-	</tr>
-<!-- END log -->
-<div>
-	{S_FORM_TOKEN}
-</div>
-</table>
-</form>
-
-<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
-<tr>
-	<td class="nav" align="left" valign="middle">{PAGE_NUMBER}</td>
-	<td align="right" valign="top" nowrap="nowrap"><!-- IF PAGINATION --><strong><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a>&nbsp;&nbsp;<!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE -->&nbsp;&nbsp;<a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></strong><!-- ENDIF --></td>
-</tr>
-</table>
-
-<!-- INCLUDE mcp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/mcp_warn_front.html b/phpBB/styles/prosilver/template/mcp_warn_front.html
deleted file mode 100644
index 6a8983e2a6..0000000000
--- a/phpBB/styles/prosilver/template/mcp_warn_front.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<form method="post" id="mcp" action="{U_POST_ACTION}">
-
-<h2>{L_WARN_USER}</h2>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h3>{L_SELECT_USER}</h3>
-
-	<fieldset>
-	<dl>
-		<dt><label for="username">{L_SELECT_USER}:</label></dt>
-		<dd><input name="username" id="username" type="text" class="inputbox" /></dd>
-		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>
-	</dl>
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<fieldset class="submit-buttons">
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="submituser" value="{L_SUBMIT}" class="button1" />
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h3>{L_MOST_WARNINGS}</h3>
-
-	<!-- IF .highest -->
-		<table class="table1" cellspacing="0">
-		<thead>
-			<tr>
-				<th class="name">{L_USERNAME}</th>
-				<th class="name">{L_WARNINGS}</th>
-				<th class="name">{L_LATEST_WARNING_TIME}</th>
-				<th></th>
-			</tr>
-		</thead>
-		<tbody>
-
-		<!-- BEGIN highest -->
-			<tr class="<!-- IF highest.S_ROW_NUM is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-				<td>{highest.USERNAME_FULL}</td>
-				<td>{highest.WARNINGS}</td>
-				<td>{highest.WARNING_TIME}</td>
-				<td><a href="{highest.U_NOTES}">{L_VIEW_NOTES}</a></td>
-			</tr>
-		<!-- END latest -->
-		</tbody>
-		</table>
-	<!-- ELSE -->
-		<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p>
-	<!-- ENDIF -->
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h3>{L_LATEST_WARNINGS}</h3>
-
-	<!-- IF .latest -->
-		<table class="table1" cellspacing="0">
-		<thead>
-			<tr>
-				<th class="name">{L_USERNAME}</th>
-				<th class="name">{L_TIME}</th>
-				<th class="name">{L_TOTAL_WARNINGS}</th>
-				<th></th>
-			</tr>
-		</thead>
-		<tbody>
-		<!-- BEGIN latest -->
-			<tr class="<!-- IF latest.S_ROW_NUM is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-				<td>{latest.USERNAME_FULL}</td>
-				<td>{latest.WARNING_TIME}</td>
-				<td>{latest.WARNINGS}</td>
-				<td><a href="{latest.U_NOTES}">{L_VIEW_NOTES}</a></td>
-			</tr>
-		<!-- END latest -->
-		</tbody>
-		</table>
-	<!-- ELSE -->
-		<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p>
-	<!-- ENDIF -->
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- INCLUDE mcp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/mcp_warn_list.html b/phpBB/styles/prosilver/template/mcp_warn_list.html
deleted file mode 100644
index 331f8c5f79..0000000000
--- a/phpBB/styles/prosilver/template/mcp_warn_list.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<form method="post" id="mcp" action="{U_POST_ACTION}">
-
-<h2>{L_WARNED_USERS}</h2>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<p>{L_WARNED_USERS_EXPLAIN}</p>
-
-	<!-- IF .user -->
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL_USERS -->{TOTAL_USERS} <!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			</li>
-		</ul>
-		
-		<table class="table1" cellspacing="0">
-		<thead>
-			<tr>
-				<th class="name">{L_USERNAME}</th>
-				<th class="name">{L_WARNINGS}</th>
-				<th class="name">{L_LATEST_WARNING_TIME}</th>
-				<th></th>
-			</tr>
-		</thead>
-		<tbody>
-
-		<!-- BEGIN user -->
-			<tr class="<!-- IF user.S_ROW_NUM is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-				<td>{user.USERNAME_FULL}</td>
-				<td>{user.WARNINGS}</td>
-				<td>{user.WARNING_TIME}</td>
-				<td><a href="{user.U_NOTES}">{L_VIEW_NOTES}</a></td>
-			</tr>
-		<!-- END user -->
-		</tbody>
-		</table>
-
-		<fieldset class="display-options">
-			<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label>
-			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>
-			<input type="submit" name="sort" value="{L_GO}" class="button2" />
-		</fieldset>
-		<hr />
-
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL_USERS -->{TOTAL_USERS} <!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			</li>
-		</ul>
-	<!-- ELSE -->
-		<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p>
-	<!-- ENDIF -->
-
-	<span class="corners-bottom"><span></span></span></div>
-
-{S_FORM_TOKEN}
-</div>
-
-</form>
-
-<!-- INCLUDE mcp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/mcp_warn_post.html b/phpBB/styles/prosilver/template/mcp_warn_post.html
deleted file mode 100644
index d09209f5a4..0000000000
--- a/phpBB/styles/prosilver/template/mcp_warn_post.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<form method="post" id="mcp" action="{U_POST_ACTION}">
-
-<h2>{L_MCP_WARN_POST}</h2>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h3><!-- IF USER_COLOR --><span style="color: #{USER_COLOR}">{USERNAME}</span><!-- ELSE -->{USERNAME}<!-- ENDIF --></h3>
-
-	<div>
-		<div class="column1">
-			<!-- IF AVATAR_IMG --><div>{AVATAR_IMG}</div><!-- ENDIF -->
-		</div>
-
-		<div class="column2">
-			<dl class="details">
-				<!-- IF RANK_TITLE --><dt>{L_RANK}:</dt><dd>{RANK_TITLE}</dd><!-- ENDIF -->
-				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}:<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF -->
-				<dt>{L_JOINED}:</dt><dd>{JOINED}</dd>
-				<dt>{L_TOTAL_POSTS}:</dt><dd>{POSTS}</dd>
-				<dt>{L_WARNINGS}: </dt><dd>{WARNINGS}</dd>
-			</dl>
-		</div>
-	</div>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h3>{L_POST_DETAILS}</h3>
-
-	<div class="postbody">
-
-		<div class="content">
-			{POST}
-		</div>
-
-	</div>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h3>{L_ADD_WARNING}</h3>
-	<p>{L_ADD_WARNING_EXPLAIN}</p>
-
-	<fieldset>
-		<textarea name="warning" id="warning" class="inputbox" cols="40" rows="3">{L_WARNING_POST_DEFAULT}</textarea>
-		<!-- IF S_CAN_NOTIFY -->
-		<br /><br />
-		<dl class="panel">
-			<dt>&nbsp;</dt>
-			<dd><label><input type="checkbox" name="notify_user" checked="checked" /> {L_NOTIFY_USER_WARN}</label></dd>
-		</dl>
-		<!-- ENDIF -->
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<fieldset class="submit-buttons">
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1" />
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE mcp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/mcp_warn_user.html b/phpBB/styles/prosilver/template/mcp_warn_user.html
deleted file mode 100644
index dfc167399f..0000000000
--- a/phpBB/styles/prosilver/template/mcp_warn_user.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<form method="post" id="mcp" action="{U_POST_ACTION}">
-
-<h2>{L_WARN_USER}</h2>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h3>{USERNAME_FULL}</h3>
-
-	<div>
-		<div class="column1">
-			<!-- IF AVATAR_IMG --><div>{AVATAR_IMG}</div><!-- ENDIF -->
-		</div>
-
-		<div class="column2">
-			<dl class="details">
-				<!-- IF RANK_TITLE --><dt>{L_RANK}:</dt><dd>{RANK_TITLE}</dd><!-- ENDIF -->
-				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}:<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF -->
-				<dt>{L_JOINED}:</dt><dd>{JOINED}</dd>
-				<dt>{L_TOTAL_POSTS}:</dt><dd>{POSTS}</dd>
-				<dt>{L_WARNINGS}: </dt><dd>{WARNINGS}</dd>
-			</dl>
-		</div>
-	</div>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h3>{L_ADD_WARNING}</h3>
-	<p>{L_ADD_WARNING_EXPLAIN}</p>
-
-	<fieldset>
-		<textarea name="warning" id="warning" class="inputbox" cols="40" rows="3"></textarea>
-		<!-- IF S_CAN_NOTIFY -->
-		<br /><br />
-		<dl class="panel">
-			<dt>&nbsp;</dt>
-			<dd><label><input type="checkbox" name="notify_user" checked="checked" /> {L_NOTIFY_USER_WARN}</label></dd>
-		</dl>
-		<!-- ENDIF -->
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<fieldset class="submit-buttons">
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1" />
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE mcp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/mcp_whois.html b/phpBB/styles/prosilver/template/mcp_whois.html
deleted file mode 100644
index 5872bd0b91..0000000000
--- a/phpBB/styles/prosilver/template/mcp_whois.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-<h2>{L_WHOIS}</h2>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	
-		<p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_RETURN_POST}">{L_RETURN_POST}</a></p>
-		<div class="postbody"><div class="content">
-			<pre>{WHOIS}</pre>
-		</div></div>
-		<p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_RETURN_POST}">{L_RETURN_POST}</a></p>
-	
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- INCLUDE mcp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
deleted file mode 100644
index 8337703e2c..0000000000
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ /dev/null
@@ -1,198 +0,0 @@
-<!-- IF S_IN_SEARCH_POPUP -->
-	<!-- INCLUDE simple_header.html -->
-	<!-- INCLUDE memberlist_search.html -->
-	<form method="post" id="results" action="{S_MODE_ACTION}" onsubmit="insert_marked(this.user); return false">
-
-<!-- ELSEIF S_SEARCH_USER -->
-	<!-- INCLUDE overall_header.html -->	
-	<!-- INCLUDE memberlist_search.html -->
-	<form method="post" action="{S_MODE_ACTION}">
-
-<!-- ELSE -->
-	<!-- INCLUDE overall_header.html -->
-	<form method="post" action="{S_MODE_ACTION}">
-
-<!-- ENDIF -->
-
-	<!-- IF S_SHOW_GROUP -->
-
-		<h2<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR};"<!-- ENDIF -->>{GROUP_NAME}</h2>
-		<p>{GROUP_DESC} {GROUP_TYPE}</p>
-		<p>
-			<!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ENDIF -->
-			<!-- IF RANK_IMG -->{RANK_IMG}<!-- ENDIF -->
-			<!-- IF GROUP_RANK -->{GROUP_RANK}<!-- ENDIF -->
-		</p>
-
-	<!-- ELSE -->
-		<h2 class="solo">{PAGE_TITLE}<!-- IF SEARCH_WORDS -->: <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2>
-
-		<div class="panel">
-			<div class="inner"><span class="corners-top"><span></span></span>
-
-			<ul class="linklist">
-				<li>
-
-				<!-- IF U_FIND_MEMBER and not S_SEARCH_USER --><a href="{U_FIND_MEMBER}">{L_FIND_USERNAME}</a> &bull; <!-- ELSEIF S_SEARCH_USER and U_HIDE_FIND_MEMBER and not S_IN_SEARCH_POPUP --><a href="{U_HIDE_FIND_MEMBER}">{L_HIDE_MEMBER_SEARCH}</a> &bull; <!-- ENDIF -->
-				<strong style="font-size: 0.95em;"><a href="{S_MODE_ACTION}&amp;first_char=">{L_ALL}</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=a#memberlist">A</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=b#memberlist">B</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=c#memberlist">C</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=d#memberlist">D</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=e#memberlist">E</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=f#memberlist">F</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=g#memberlist">G</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=h#memberlist">H</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=i#memberlist">I</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=j#memberlist">J</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=k#memberlist">K</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=l#memberlist">L</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=m#memberlist">M</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=n#memberlist">N</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=o#memberlist">O</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=p#memberlist">P</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=q#memberlist">Q</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=r#memberlist">R</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=s#memberlist">S</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=t#memberlist">T</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=u#memberlist">U</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=v#memberlist">V</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=w#memberlist">W</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=x#memberlist">X</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=y#memberlist">Y</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=z#memberlist">Z</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=other">#</a></strong>
-				</li>
-				<li class="rightside pagination">
-					{TOTAL_USERS} &bull; 
-					<!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE -->{PAGE_NUMBER}<!-- ENDIF -->
-				</li>
-			</ul>
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-	<!-- ENDIF -->
-	<!-- IF S_LEADERS_SET or not S_SHOW_GROUP -->
-	<div class="forumbg forumbg-table">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<table class="table1" cellspacing="1" id="memberlist">
-		<thead>
-		<tr>
-			<th class="name"><span class="rank-img"><a href="{U_SORT_RANK}">{L_RANK}</a></span><a href="{U_SORT_USERNAME}"><!-- IF S_SHOW_GROUP -->{L_GROUP_LEADER}<!-- ELSE -->{L_USERNAME}<!-- ENDIF --></a></th>
-			<th class="posts"><a href="{U_SORT_POSTS}#memberlist">{L_POSTS}</a></th>
-			<th class="info"><a href="{U_SORT_WEBSITE}#memberlist">{L_WEBSITE}</a>{L_COMMA_SEPARATOR}<a href="{U_SORT_LOCATION}">{L_LOCATION}</a></th>
-			<th class="joined"><a href="{U_SORT_JOINED}#memberlist">{L_JOINED}</a></th>
-			<!-- IF U_SORT_ACTIVE --><th class="active"><a href="{U_SORT_ACTIVE}#memberlist">{L_LAST_ACTIVE}</a></th><!-- ENDIF -->
-		</tr>
-		</thead>
-		<tbody>
-	<!-- ENDIF -->
-		<!-- BEGIN memberrow -->
-			<!-- IF S_SHOW_GROUP -->
-				<!-- IF not memberrow.S_GROUP_LEADER and not $S_MEMBER_HEADER -->
-				<!-- IF memberrow.S_FIRST_ROW -->
-				<tr class="bg1">
-					<td colspan="<!-- IF U_SORT_ACTIVE -->5<!-- ELSE -->4<!-- ENDIF -->">&nbsp;</td>
-				</tr>
-				<!-- ENDIF -->
-<!-- IF S_LEADERS_SET -->
-		</tbody>
-		</table>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-<!-- ENDIF -->
-<div class="forumbg">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<table class="table1" cellspacing="1">
-	<thead>
-	<tr>
-	<!-- IF not S_LEADERS_SET -->
-		<th class="name"><span class="rank-img"><a href="{U_SORT_RANK}">{L_RANK}</a></span><a href="{U_SORT_USERNAME}"><!-- IF S_SHOW_GROUP -->{L_GROUP_MEMBERS}<!-- ELSE -->{L_USERNAME}<!-- ENDIF --></a></th>
-			<th class="posts"><a href="{U_SORT_POSTS}#memberlist">{L_POSTS}</a></th>
-			<th class="info"><a href="{U_SORT_WEBSITE}#memberlist">{L_WEBSITE}</a>{L_COMMA_SEPARATOR}<a href="{U_SORT_LOCATION}">{L_LOCATION}</a></th>
-			<th class="joined"><a href="{U_SORT_JOINED}#memberlist">{L_JOINED}</a></th>
-			<!-- IF U_SORT_ACTIVE --><th class="active"><a href="{U_SORT_ACTIVE}#memberlist">{L_LAST_ACTIVE}</a></th><!-- ENDIF -->
-	<!-- ELSE -->
-		<th class="name">{L_GROUP_MEMBERS}</th>
-		<th class="posts">&nbsp;</th>
-		<th class="info">&nbsp;</th>
-		<th class="joined">&nbsp;</th>
-		<!-- IF U_SORT_ACTIVE --><th class="active">&nbsp;</th><!-- ENDIF -->
-	<!-- ENDIF -->
-	</tr>
-	</thead>
-	<tbody>
-					<!-- DEFINE $S_MEMBER_HEADER = 1 -->
-				<!-- ENDIF -->
-			<!-- ENDIF -->
-
-	<tr class="<!-- IF memberrow.S_ROW_NUM is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-		<td><!-- IF memberrow.RANK_IMG --><span class="rank-img">{memberrow.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{memberrow.RANK_TITLE}</span><!-- ENDIF --><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><input type="checkbox" name="user" value="{memberrow.USERNAME}" /> <!-- ENDIF -->{memberrow.USERNAME_FULL}<!-- IF S_SELECT_SINGLE --><br />[&nbsp;<a href="#" onclick="insert_single('{memberrow.A_USERNAME}'); return false;">{L_SELECT}</a>&nbsp;]<!-- ENDIF --></td>
-		<td class="posts"><!-- IF memberrow.POSTS --><a href="{memberrow.U_SEARCH_USER}" title="{L_SEARCH_USER_POSTS}">{memberrow.POSTS}</a><!-- ELSE -->{memberrow.POSTS}<!-- ENDIF --></td>
-		<td class="info"><!-- IF memberrow.U_WWW or memberrow.LOCATION --><!-- IF memberrow.U_WWW --><div><a href="{memberrow.U_WWW}" title="{L_VISIT_WEBSITE}: {memberrow.U_WWW}">{memberrow.U_WWW}</a></div><!-- ENDIF --><!-- IF memberrow.LOCATION --><div>{memberrow.LOCATION}</div><!-- ENDIF --><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
-		<td>{memberrow.JOINED}</td>
-		<!-- IF S_VIEWONLINE --><td>{memberrow.VISITED}&nbsp;</td><!-- ENDIF -->
-	</tr>
-		<!-- BEGINELSE -->
-	<div class="forumbg">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<table class="table1" cellspacing="1">
-	<thead>
-	<tr>
-		<th class="name">{L_GROUP_MEMBERS}</th>
-		<th class="posts">&nbsp;</th>
-		<th class="info">&nbsp;</th>
-		<th class="joined">&nbsp;</th>
-		<!-- IF U_SORT_ACTIVE --><th class="active">&nbsp;</th><!-- ENDIF -->
-	</tr>
-	</thead>
-	<tbody>
-	<tr class="bg1">
-		<td colspan="<!-- IF S_VIEWONLINE -->5<!-- ELSE -->4<!-- ENDIF -->">{L_NO_MEMBERS}</td>
-	</tr>
-		<!-- END memberrow -->
-	</tbody>
-	</table>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE -->
-<fieldset class="display-actions">
-	<input type="submit" name="submit" value="{L_SELECT_MARKED}" class="button2" />
-	<div><a href="#" onclick="marklist('results', 'user', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('results', 'user', false); return false;">{L_UNMARK_ALL}</a></div>
-</fieldset>
-<!-- ENDIF -->
-
-<!-- IF S_IN_SEARCH_POPUP -->
-</form>
-<form method="post" id="sort-results" action="{S_MODE_ACTION}">
-<!-- ENDIF -->
-
-<!-- IF S_IN_SEARCH_POPUP and not S_SEARCH_USER -->
-<fieldset class="display-options">
-	<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-	<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-	<label for="sk">{L_SELECT_SORT_METHOD}: <select name="sk" id="sk">{S_MODE_SELECT}</select></label> 
-	<label for="sd">{L_ORDER} <select name="sd" id="sd">{S_ORDER_SELECT}</select> <input type="submit" name="sort" value="{L_SUBMIT}" class="button2" /></label>
-</fieldset>
-<!-- ENDIF -->
-
-</form>
-
-<hr />
-
-<ul class="linklist">
-	<li class="rightside pagination">{TOTAL_USERS} &bull; <!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE -->{PAGE_NUMBER}<!-- ENDIF --></li>
-</ul>
-
-<!-- IF S_IN_SEARCH_POPUP -->
-	<!-- INCLUDE simple_footer.html -->
-<!-- ELSE -->
-	<!-- INCLUDE jumpbox.html -->
-	<!-- INCLUDE overall_footer.html -->
-<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/memberlist_email.html b/phpBB/styles/prosilver/template/memberlist_email.html
deleted file mode 100644
index e8870d8921..0000000000
--- a/phpBB/styles/prosilver/template/memberlist_email.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<h2 class="titlespace">{L_SEND_EMAIL_USER} {USERNAME}</h2>
-
-<form method="post" action="{S_POST_ACTION}" id="post">
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<div class="content">
-		<!-- IF ERROR_MESSAGE --><p class="error">{ERROR_MESSAGE}</p><!-- ENDIF -->
-		<fieldset class="fields2">
-		<!-- IF S_SEND_USER -->
-			<dl>
-				<dt><label>{L_RECIPIENT}:</label></dt>
-				<dd><strong>{USERNAME}</strong></dd>
-			</dl>
-			<dl>
-				<dt><label for="subject">{L_SUBJECT}:</label></dt>
-				<dd><input class="inputbox autowidth" type="text" name="subject" id="subject" size="50" tabindex="1" value="{SUBJECT}" /></dd>
-			</dl>
-		<!-- ELSE -->
-			<dl>
-				<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt>
-				<dd><input class="inputbox autowidth" type="text" name="email" id="email" size="50" maxlength="100" tabindex="2" value="{EMAIL}" /></dd>
-			</dl>
-			<dl>
-				<dt><label for="name">{L_REAL_NAME}:</label></dt>
-				<dd><input class="inputbox autowidth" type="text" name="name" id="name" size="50" tabindex="3" value="{NAME}" /></dd>
-			</dl>
-			<dl>
-				<dt><label for="lang">{L_DEST_LANG}:</label><br />
-					<span>{L_DEST_LANG_EXPLAIN}</span></dt>
-				<dd><select name="lang">{S_LANG_OPTIONS}</select></dd>
-			</dl>
-		<!-- ENDIF -->
-		<dl>
-			<dt><label for="message">{L_MESSAGE_BODY}:</label><br />
-			<span>{L_EMAIL_BODY_EXPLAIN}</span></dt>
-			<dd><textarea class="inputbox" name="message" id="message" rows="15" cols="76" tabindex="4">{MESSAGE}</textarea></dd>
-		</dl>
-		<dl>
-			<dt>&nbsp;</dt>
-			<dd><label for="cc_email"><input type="checkbox" name="cc_email" id="cc_email" value="1" checked="checked" tabindex="5" /> {L_CC_EMAIL}</label></dd>
-		</dl>
-		</fieldset>
-	</div>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	<div class="content">
-		<fieldset class="submit-buttons">
-			<input type="submit" tabindex="6" name="submit" class="button1" value="{L_SEND_EMAIL}" />
-		</fieldset>
-	</div>
-	<span class="corners-bottom"><span></span></span></div>
-{S_FORM_TOKEN}
-</div>
-
-</form>
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html
deleted file mode 100644
index 9bb1f90a58..0000000000
--- a/phpBB/styles/prosilver/template/memberlist_im.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-
-<!-- MSNM info from http://www.cdolive.net/ - doesn't seem to work with MSN Messenger -->
-<h2 class="solo">{L_SEND_IM}</h2>
-
-<form method="post" action="{S_IM_ACTION}">
-
-<div class="panel bg2">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	
-	<p>{L_SEND_IM_EXPLAIN}</p>
-
-	<fieldset>
-	<dl class="fields2">
-		<dt><label>{L_IM_RECIPIENT}:</label></dt>
-		<dd><strong>{USERNAME}</strong><!-- IF S_SEND_ICQ or S_SEND_AIM or S_SEND_MSNM --> [ {IM_CONTACT} ]<!-- ENDIF --><!-- IF PRESENCE_IMG --> {PRESENCE_IMG}<!-- ENDIF --></dd>
-	</dl>
-
-	<!-- IF S_SEND_ICQ -->
-		<dl class="fields2">
-			<dt><label for="from">{L_IM_NAME}:</label></dt>
-			<dd><input class="inputbox autowidth" type="text" name="from" id="from" size="20" /></dd>
-		</dl>
-		<dl class="fields2">
-			<dt><label for="body">{L_IM_MESSAGE}:</label></dt>
-			<dd><textarea class="inputbox autowidth" name="body" id="body" rows="5" cols="45"></textarea></dd>
-		</dl>
-		<dl class="fields2">
-			<dt>&nbsp;</dt>
-			<dd><input class="button1" name="submit" type="submit" value="{L_IM_SEND}" /></dd>
-		</dl>
-		<input type="hidden" name="fromemail" value="{EMAIL}" />
-		<input type="hidden" name="subject" value="{SITENAME}" />
-		<input type="hidden" name="to" value="{IM_CONTACT}" />
-	<!-- ENDIF -->
-
-	<!-- IF S_SEND_AIM -->
-		<dl class="fields2">
-			<dt>&nbsp;</dt>
-			<dd><a href="{U_AIM_CONTACT}">{L_IM_ADD_CONTACT}</a></dd>
-			<dd><a href="{U_AIM_MESSAGE}">{L_IM_SEND_MESSAGE}</a></dd>
-			<dd><a href="http://www.aim.com/download.adp">{L_IM_DOWNLOAD_APP}</a> | <a href="http://aimexpress.oscar.aol.com/aimexpress/launch.adp?Brand=AIM">{L_IM_AIM_EXPRESS}</a></dd>
-		</dl>
-	<!-- ENDIF -->
-
-	<!-- IF S_SEND_MSNM -->
-		<dl class="fields2">
-			<dt>&nbsp;</dt>
-			<dd><object classid="clsid:B69003B3-C55E-4B48-836C-BC5946FC3B28" codetype="application/x-oleobject" id="objMessengerApp" width="0" height="0"></object></dd>
-			<dd><a href="#" onclick="add_contact('{A_IM_CONTACT}'); return false;">{L_IM_ADD_CONTACT}</a></dd>
-			<dd><a href="#" onclick="im_contact('{A_IM_CONTACT}'); return false;">{L_IM_SEND_MESSAGE}</a></dd>
-		</dl>
-	<!-- ENDIF -->
-
-	<!-- IF S_SEND_JABBER -->
-		<dl class="fields2">
-			<dt><label for="message">{L_IM_MESSAGE}:</label></dt>
-			<dd><textarea class="inputbox autowidth" name="message" id="message" rows="5" cols="45"></textarea></dd>
-		</dl>
-		<dl class="fields2">
-			<dt>&nbsp;</dt>
-			<dd><input class="button1" name="submit" type="submit" value="{L_IM_SEND}" /></dd>
-		</dl>
-	<!-- ENDIF -->
-
-	<!-- IF S_NO_SEND_JABBER -->
-		<dl class="fields2">
-			<dt>&nbsp;</dt>
-			<dd>{L_IM_NO_JABBER}</dd>
-		</dl>
-	<!-- ENDIF -->
-
-	<!-- IF S_SENT_JABBER -->
-		<dl class="fields2">
-			<dt>&nbsp;</dt>
-			<dd>{L_IM_SENT_JABBER}</dd>
-		</dl>
-	<!-- ENDIF -->
-	{S_FORM_TOKEN}
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-<a  href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>
-</form>
-
-<script type="text/javascript">
-// <![CDATA[
-
-	/** The following will not work with Windows Vista **/
-
-	var app = document.getElementById('objMessengerApp');
-
-	/**
-	* Check whether the browser supports this and whether MSNM is connected
-	*/
-	function msn_supported()
-	{
-		// Does the browser support the MSNM object?
-		if (app.MyStatus)
-		{
-			// Is MSNM connected?
-			if (app.MyStatus == 1)
-			{
-				alert('{LA_IM_MSNM_CONNECT}');
-				return false;
-			}
-		}
-		else
-		{
-			alert('{LA_IM_MSNM_BROWSER}');
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	* Add to your contact list
-	*/
-	function add_contact(address) 
-	{
-		if (msn_supported()) 
-		{
-			// Could return an error while MSNM is connecting, don't want that
-			try
-			{
-				app.AddContact(0, address);
-			}
-			catch (e)
-			{
-				return;
-			}
-	}
-}
-
-/**
-* Write IM to contact
-*/
-function im_contact(address)
-{
-	if (msn_supported())
-	{
-		// Could return an error while MSNM is connecting, don't want that
-		try
-		{
-			app.InstantMessage(address);
-		}
-		catch (e)
-		{
-			return;
-		}
-	}
-}
-// ]]>
-</script>
-
-<!-- INCLUDE simple_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/memberlist_leaders.html b/phpBB/styles/prosilver/template/memberlist_leaders.html
deleted file mode 100644
index 5e8f78b359..0000000000
--- a/phpBB/styles/prosilver/template/memberlist_leaders.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<h2 class="solo">{PAGE_TITLE}</h2>
-
-<form method="post" action="{S_MODE_ACTION}">
-
-<div class="forumbg">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<table class="table1" cellspacing="1">
-	<thead>
-	<tr>
-		<th class="name"><span class="rank-img">{L_RANK}&nbsp;</span>{L_ADMINISTRATORS}</th>
-		<th class="info">{L_PRIMARY_GROUP}</th>
-		<th class="info">{L_FORUMS}</th>
-	</tr>
-	</thead>
-	<tbody>
-<!-- BEGIN admin -->
-	<tr class="<!-- IF admin.S_ROW_NUM is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-		<td><!-- IF admin.RANK_IMG --><span class="rank-img">{admin.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{admin.RANK_TITLE}</span><!-- ENDIF -->{admin.USERNAME_FULL}</td>
-		<td class="info"><!-- IF admin.U_GROUP -->
-			<a<!-- IF admin.GROUP_COLOR --> style="font-weight: bold; color:#{admin.GROUP_COLOR}"<!-- ENDIF --> href="{admin.U_GROUP}">{admin.GROUP_NAME}</a>
-			<!-- ELSE -->
-				{admin.GROUP_NAME}
-			<!-- ENDIF --></td>
-		<td class="info">-</td>
-	</tr>
-<!-- BEGINELSE -->
-	<tr class="bg1">
-		<td colspan="3"><strong>{L_NO_MEMBERS}</strong></td>
-	</tr>
-<!-- END admin -->
-	</tbody>
-	</table>
-	
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="forumbg">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	 
-	<table class="table1" cellspacing="1">
-	<thead>
-	<tr>
-		<th class="name">{L_MODERATORS}</th>
-		<th class="info">&nbsp;</th>
-		<th class="info">&nbsp;</th>
-	</tr>
-	</thead>
-	<tbody>
-<!-- BEGIN mod -->
-	<tr class="<!-- IF mod.S_ROW_NUM is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-		<td><!-- IF mod.RANK_IMG --><span class="rank-img">{mod.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{mod.RANK_TITLE}</span><!-- ENDIF -->{mod.USERNAME_FULL}</td>
-		<td class="info"><!-- IF mod.U_GROUP -->
-			<a<!-- IF mod.GROUP_COLOR --> style="font-weight: bold; color:#{mod.GROUP_COLOR}"<!-- ENDIF --> href="{mod.U_GROUP}">{mod.GROUP_NAME}</a>
-			<!-- ELSE -->
-				{mod.GROUP_NAME}
-			<!-- ENDIF --></td>
-		<td class="info"><!-- IF not mod.FORUMS -->{L_ALL_FORUMS}<!-- ELSE --><select style="width: 100%;">{mod.FORUMS}</select><!-- ENDIF --></td>
-	</tr>
-<!-- BEGINELSE -->
-	<tr class="bg1">
-		<td colspan="3"><strong>{L_NO_MEMBERS}</strong></td>
-	</tr>
-<!-- END mod -->
-	</tbody>
-	</table>
-	
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-	
-</form>
-
-<!-- INCLUDE jumpbox.html -->
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html
deleted file mode 100644
index 6546bee8dd..0000000000
--- a/phpBB/styles/prosilver/template/memberlist_search.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!-- IF S_IN_SEARCH_POPUP -->
-<!-- You should retain this javascript in your own template! -->
-<script type="text/javascript">
-// <![CDATA[
-function insert_user(user)
-{
-	opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value = ( opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value.length && opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.type == "textarea" ) ? opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value + "\n" + user : user;
-}
-
-function insert_marked(users)
-{
-	if (typeof(users.length) == "undefined")
-	{
-		if (users.checked)
-		{
-			insert_user(users.value);
-		}
-	}
-	else if (users.length > 0)
-	{
-		for (i = 0; i < users.length; i++)
-		{
-			if (users[i].checked)
-			{
-				insert_user(users[i].value);
-			}
-		}
-	}
-
-	self.close();
-}
-
-function insert_single(user)
-{
-	opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value = user;
-	self.close();
-}
-// ]]>
-</script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/forum_fn.js"></script>
-<!-- ENDIF -->
-
-<h2 class="solo">{L_FIND_USERNAME}</h2>
-
-<form method="post" action="{S_MODE_ACTION}" id="search_memberlist">
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<p>{L_FIND_USERNAME_EXPLAIN}</p>
-
-	<fieldset class="fields1 column1">
-	<dl>
-		<dt><label for="username">{L_USERNAME}:</label></dt>
-		<dd><input type="text" name="username" id="username" value="{USERNAME}" class="inputbox" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="email">{L_EMAIL}:</label></dt>
-		<dd><input type="text" name="email" id="email" value="{EMAIL}" class="inputbox" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="icq">{L_ICQ}:</label></dt>
-		<dd><input type="text" name="icq" id="icq" value="{ICQ}" class="inputbox" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="aim">{L_AIM}:</label></dt>
-		<dd><input type="text" name="aim" id="aim" value="{AIM}" class="inputbox" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="yahoo">{L_YIM}:</label></dt>
-		<dd><input type="text" name="yahoo" id="yahoo" value="{YAHOO}" class="inputbox" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="msn">{L_MSNM}:</label></dt>
-		<dd><input type="text" name="msn" id="msn" value="{MSNM}" class="inputbox" /></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset class="fields1 column2">
-	<dl>
-		<dt><label for="joined">{L_JOINED}:</label></dt>
-		<dd><select name="joined_select">{S_JOINED_TIME_OPTIONS}</select> <input class="inputbox medium" type="text" name="joined" id="joined" value="{JOINED}" /></dd>
-	</dl>
-<!-- IF S_VIEWONLINE -->
-	<dl>
-		<dt><label for="active">{L_LAST_ACTIVE}:</label></dt>
-		<dd><select name="active_select">{S_ACTIVE_TIME_OPTIONS}</select> <input class="inputbox medium" type="text" name="active" id="active" value="{ACTIVE}" /></dd>
-	</dl>
-<!-- ENDIF -->
-	<dl>
-		<dt><label for="count">{L_POSTS}:</label></dt>
-		<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input class="inputbox medium" type="text" name="count" id="count" value="{COUNT}" /></dd>
-	</dl>
-<!-- IF S_IP_SEARCH_ALLOWED -->
-	<dl>
-		<dt><label for="ip">{L_POST_IP}:</label></dt>
-		<dd><input class="inputbox medium" type="text" name="ip" id="ip" value="{IP}" /></dd>
-	</dl>
-<!-- ENDIF -->
-	<dl>
-		<dt><label for="search_group_id">{L_GROUP}:</label></dt>
-		<dd><select name="search_group_id" id="search_group_id">{S_GROUP_SELECT}</select></dd>
-	</dl>
-	<dl>
-		<dt><label for="sk" class="label3">{L_SORT_BY}:</label></dt>
-		<dd><select name="sk" id="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select></dd>
-	</dl>
-	</fieldset>
-
-	<div class="clear"></div>
-
-	<hr />
-
-	<fieldset class="submit-buttons">
-		<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-		<input type="submit" name="submit" value="{L_SEARCH}" class="button1" />
-		{S_FORM_TOKEN}
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-</form>
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
deleted file mode 100644
index 23f87d6bbe..0000000000
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<h2>{PAGE_TITLE}</h2>
-
-<form method="post" action="{S_PROFILE_ACTION}" id="viewprofile">
-<div class="panel bg1<!-- IF S_ONLINE --> online<!-- ENDIF -->">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<!-- IF AVATAR_IMG -->
-		<dl class="left-box">
-			<dt>{AVATAR_IMG}</dt>
-			<!-- IF RANK_TITLE --><dd style="text-align: center;">{RANK_TITLE}</dd><!-- ENDIF -->
-			<!-- IF RANK_IMG --><dd style="text-align: center;">{RANK_IMG}</dd><!-- ENDIF -->
-		</dl>
-	<!-- ENDIF -->
-
-	<dl class="left-box details" style="width: 80%;">
-		<dt>{L_USERNAME}:</dt>
-		<dd>
-			<!-- IF USER_COLOR --><span style="color: {USER_COLOR}; font-weight: bold;"><!-- ELSE --><span><!-- ENDIF -->{USERNAME}</span>
-			<!-- IF U_USER_ADMIN --> [ <a href="{U_USER_ADMIN}">{L_USER_ADMIN}</a> ]<!-- ENDIF -->
-			<!-- IF U_USER_BAN --> [ <a href="{U_USER_BAN}">{L_USER_BAN}</a> ]<!-- ENDIF -->
-			<!-- IF U_SWITCH_PERMISSIONS --> [ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]<!-- ENDIF -->
-		</dd>
-		<!-- IF not AVATAR_IMG -->
-			<!-- IF RANK_TITLE --><dt>{L_RANK}:</dt> <dd>{RANK_TITLE}</dd><!-- ENDIF -->
-			<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}:<!-- ENDIF --></dt> <dd>{RANK_IMG}</dd><!-- ENDIF -->
-		<!-- ENDIF -->
-		<!-- IF S_USER_INACTIVE --><dt>{L_USER_IS_INACTIVE}:</dt> <dd>{USER_INACTIVE_REASON}</dd><!-- ENDIF -->
-		<!-- IF LOCATION --><dt>{L_LOCATION}:</dt> <dd>{LOCATION}</dd><!-- ENDIF -->
-		<!-- IF AGE --><dt>{L_AGE}:</dt> <dd>{AGE}</dd><!-- ENDIF -->
-		<!-- IF OCCUPATION --><dt>{L_OCCUPATION}:</dt> <dd>{OCCUPATION}</dd><!-- ENDIF -->
-		<!-- IF INTERESTS --><dt>{L_INTERESTS}:</dt> <dd>{INTERESTS}</dd><!-- ENDIF -->
-		<!-- IF S_GROUP_OPTIONS --><dt>{L_USERGROUPS}:</dt> <dd><select name="g">{S_GROUP_OPTIONS}</select> <input type="submit" name="submit" value="{L_GO}" class="button2" /></dd><!-- ENDIF -->
-		<!-- BEGIN custom_fields --><dt>{custom_fields.PROFILE_FIELD_NAME}:</dt> <dd>{custom_fields.PROFILE_FIELD_VALUE}</dd><!-- END custom_fields -->
-		<!-- IF S_USER_LOGGED_IN and S_ZEBRA -->
-			<!-- IF U_ADD_FRIEND and U_ADD_FOE-->
-				<dt>&nbsp;</dt> <dd><a href="{U_ADD_FRIEND}"><strong>{L_ADD_FRIEND}</strong></a></dd>
-				<dt>&nbsp;</dt> <dd><a href="{U_ADD_FOE}"><strong>{L_ADD_FOE}</strong></a></dd>
-			<!-- ELSE -->
-				<!-- IF U_REMOVE_FRIEND -->
-					<dt>&nbsp;</dt> <dd><a href="{U_REMOVE_FRIEND}"><strong>{L_REMOVE_FRIEND}</strong></a></dd>
-				<!-- ELSE -->
-					<dt>&nbsp;</dt> <dd><a href="{U_REMOVE_FOE}"><strong>{L_REMOVE_FOE}</strong></a></dd>
-				<!-- ENDIF -->
-			<!-- ENDIF -->
-		<!-- ENDIF -->
-	</dl>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="panel bg2">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	<div class="column1">
-
-		<h3>{L_CONTACT_USER} {USERNAME}</h3>
-
-		<dl class="details">
-		<!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}:</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL_USER} {USERNAME}</a></dd><!-- ENDIF -->
-		<!-- IF U_WWW --><dt>{L_WEBSITE}:</dt> <dd><a href="{U_WWW}" title="{L_VISIT_WEBSITE}: {U_WWW}">{U_WWW}</a></dd><!-- ENDIF -->
-		<!-- IF U_PM --><dt>{L_PM}:</dt> <dd><a href="{U_PM}">{L_SEND_PRIVATE_MESSAGE}</a></dd>
-		<!-- ENDIF -->
-		<!-- IF U_MSN or USER_MSN --><dt>{L_MSNM}:</dt> <dd><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_MSNM_MESSAGE}</a><!-- ELSE -->{USER_MSN}<!-- ENDIF --></dd><!-- ENDIF -->
-		<!-- IF U_YIM or USER_YIM --><dt>{L_YIM}:</dt> <dd><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false;">{L_SEND_YIM_MESSAGE}</a><!-- ELSE -->{USER_YIM}<!-- ENDIF --></dd><!-- ENDIF -->
-		<!-- IF U_AIM or USER_AIM --><dt>{L_AIM}:</dt> <dd><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_AIM_MESSAGE}</a><!-- ELSE -->{USER_AIM}<!-- ENDIF --></dd><!-- ENDIF -->
-		<!-- IF U_ICQ or USER_ICQ --><dt>{L_ICQ}:</dt> <dd><!-- IF U_ICQ --><a href="{U_ICQ}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_ICQ_MESSAGE}</a><!-- ELSE -->{USER_ICQ}<!-- ENDIF --></dd><!-- ENDIF -->
-		<!-- IF U_JABBER and S_JABBER_ENABLED --><dt>{L_JABBER}:</dt> <dd><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_JABBER_MESSAGE}</a></dd><!-- ELSEIF USER_JABBER --><dt>{L_JABBER}:</dt> <dd>{USER_JABBER}</dd><!-- ENDIF -->
-		<!-- IF S_PROFILE_FIELD_1 -->
-			<!-- NOTE: Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. -->
-			<dt>{postrow.PROFILE_FIELD1_NAME}:</dt> <dd>{postrow.PROFILE_FIELD1_VALUE}</dd>
-		<!-- ENDIF -->
-		</dl>
-	</div>
-
-	<div class="column2">
-		<h3>{L_USER_FORUM}</h3>
-		<dl class="details">
-			<dt>{L_JOINED}:</dt> <dd>{JOINED}</dd>
-			<dt>{L_VISITED}:</dt> <dd>{VISITED}</dd>
-			<!-- IF U_NOTES or U_WARN -->
-			<dt>{L_WARNINGS}: </dt>
-			<dd><strong>{WARNINGS}</strong> [ <a href="{U_NOTES}">{L_VIEW_NOTES}</a> <!-- IF U_WARN --> | <a href="{U_WARN}">{L_WARN_USER}</a> <!-- ENDIF -->]</dd>
-			<!-- ENDIF -->
-			<dt>{L_TOTAL_POSTS}:</dt>
-				<dd>{POSTS} | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a></strong>
-					<!-- IF POSTS_PCT --><br />({POSTS_PCT} / {POSTS_DAY})<!-- ENDIF -->
-					<!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --><br />(<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)<!-- ELSEIF POSTS_IN_QUEUE --><br />({L_POSTS_IN_QUEUE})<!-- ENDIF -->
-				</dd>
-			<!-- IF S_SHOW_ACTIVITY and POSTS -->
-				<dt>{L_ACTIVE_IN_FORUM}:</dt> <dd><!-- IF ACTIVE_FORUM --><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})<!-- ELSE --> - <!-- ENDIF --></dd>
-				<dt>{L_ACTIVE_IN_TOPIC}:</dt> <dd><!-- IF ACTIVE_TOPIC --><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})<!-- ELSE --> - <!-- ENDIF --></dd>
-			<!-- ENDIF -->
-		</dl>
-	</div>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- IF SIGNATURE -->
-<div class="panel bg1">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-		<h3>{L_SIGNATURE}</h3>
-
-		<div class="postbody"><div class="signature" style="border-top:none; margin-top: 0;">{SIGNATURE}</div></div>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-<!-- ENDIF -->
-
-</form>
-
-<!-- INCLUDE jumpbox.html -->
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/message_body.html b/phpBB/styles/prosilver/template/message_body.html
deleted file mode 100644
index 896f0b826e..0000000000
--- a/phpBB/styles/prosilver/template/message_body.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<div class="panel" id="message">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	<h2>{MESSAGE_TITLE}</h2>
-	<p>{MESSAGE_TEXT}</p>
-	<!-- IF SCRIPT_NAME == "search" and not S_BOARD_DISABLED and not S_NO_SEARCH and L_RETURN_TO_SEARCH_ADV --><p><a href="{U_SEARCH}" class="{S_CONTENT_FLOW_BEGIN}">{L_RETURN_TO_SEARCH_ADV}</a></p><!-- ENDIF -->
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
deleted file mode 100644
index 0629bae632..0000000000
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ /dev/null
@@ -1,48 +0,0 @@
-	</div>
-
-<div id="page-footer">
-
-	<div class="navbar">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<ul class="linklist">
-			<li class="icon-home"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a></li>
-				<!-- IF not S_IS_BOT -->
-					<!-- IF S_VIEWFORUM and S_WATCH_FORUM_LINK --><li <!-- IF S_WATCHING_FORUM -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{S_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF -->
-					<!-- IF S_VIEWTOPIC and U_WATCH_TOPIC --><li <!-- IF S_WATCHING_TOPIC -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{U_WATCH_TOPIC}" title="{L_WATCH_TOPIC}">{L_WATCH_TOPIC}</a></li><!-- ENDIF -->
-					<!-- IF S_VIEWTOPIC and U_BOOKMARK_TOPIC --><li class="icon-bookmark"><a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}">{L_BOOKMARK_TOPIC}</a></li><!-- ENDIF -->
-					<!-- IF S_VIEWTOPIC and U_BUMP_TOPIC --><li class="icon-bump"><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}">{L_BUMP_TOPIC}</a></li><!-- ENDIF -->
-				<!-- ENDIF -->
-			<li class="rightside"><!-- IF U_TEAM --><a href="{U_TEAM}">{L_THE_TEAM}</a> &bull; <!-- ENDIF --><!-- IF not S_IS_BOT --><a href="{U_DELETE_COOKIES}">{L_DELETE_COOKIES}</a> &bull; <!-- ENDIF -->{S_TIMEZONE}</li>
-		</ul>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-	
-<!--
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-	forums may be affected.
-
-	The phpBB Group : 2006
-//-->
-
-	<div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; 2000, 2002, 2005, 2007 phpBB Group
-		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
-		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
-		<!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF -->
-	</div>
-</div>
-
-</div>
-
-<div>
-	<a id="bottom" name="bottom" accesskey="z"></a>
-	<!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF -->
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
deleted file mode 100644
index c929f2c128..0000000000
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
-<head>
-
-<meta http-equiv="content-type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="content-style-type" content="text/css" />
-<meta http-equiv="content-language" content="{S_USER_LANG}" />
-<meta http-equiv="imagetoolbar" content="no" />
-<meta name="resource-type" content="document" />
-<meta name="distribution" content="global" />
-<meta name="copyright" content="2000, 2002, 2005, 2007 phpBB Group" />
-<meta name="keywords" content="" />
-<meta name="description" content="" />
-{META}
-<title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
-
-<!--
-	phpBB style name: prosilver
-	Based on style:   prosilver (this is the default phpBB3 style)
-	Original author:  Tom Beddard ( http://www.subBlue.com/ )
-	Modified by:      
-	
-	NOTE: This page was generated by phpBB, the free open-source bulletin board package.
-	      The phpBB Group is not responsible for the content of this page and forum. For more information
-	      about phpBB please visit http://www.phpbb.com
--->
-
-<script type="text/javascript">
-// <![CDATA[
-	var jump_page = '{LA_JUMP_PAGE}:';
-	var on_page = '{ON_PAGE}';
-	var per_page = '{PER_PAGE}';
-	var base_url = '{A_BASE_URL}';
-	var style_cookie = 'phpBBstyle';
-	var style_cookie_settings = '{A_COOKIE_SETTINGS}';
-	var onload_functions = new Array();
-	var onunload_functions = new Array();
-
-	<!-- IF S_USER_PM_POPUP -->
-		if ({S_NEW_PM})
-		{
-			var url = '{UA_POPUP_PM}';
-			window.open(url.replace(/&amp;/g, '&'), '_phpbbprivmsg', 'height=225,resizable=yes,scrollbars=yes, width=400');
-		}
-	<!-- ENDIF -->
-
-	/**
-	* Find a member
-	*/
-	function find_username(url)
-	{
-		popup(url, 760, 570, '_usersearch');
-		return false;
-	}
-
-	/**
-	* New function for handling multiple calls to window.onload and window.unload by pentapenguin
-	*/
-	window.onload = function()
-	{
-		for (var i = 0; i < onload_functions.length; i++)
-		{
-			eval(onload_functions[i]);
-		}
-	}
-
-	window.onunload = function()
-	{
-		for (var i = 0; i < onunload_functions.length; i++)
-		{
-			eval(onunload_functions[i]);
-		}
-	}
-
-// ]]>
-</script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/styleswitcher.js"></script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/forum_fn.js"></script>
-
-<link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" />
-<link href="{T_STYLESHEET_LINK}" rel="stylesheet" type="text/css" media="screen, projection" />
-
-<link href="{T_THEME_PATH}/normal.css" rel="stylesheet" type="text/css" title="A" />
-<link href="{T_THEME_PATH}/medium.css" rel="alternate stylesheet" type="text/css" title="A+" />
-<link href="{T_THEME_PATH}/large.css" rel="alternate stylesheet" type="text/css" title="A++" />
-
-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-	<link href="{T_THEME_PATH}/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
-<!-- ENDIF -->
-
-</head>
-
-<body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
-
-<div id="wrap">
-	<a id="top" name="top" accesskey="t"></a>
-	<div id="page-header">
-		<div class="headerbar">
-			<div class="inner"><span class="corners-top"><span></span></span>
-
-			<div id="site-description">
-				<a href="{U_INDEX}" title="{L_INDEX}" id="logo">{SITE_LOGO_IMG}</a>
-				<h1>{SITENAME}</h1>
-				<p>{SITE_DESCRIPTION}</p>
-				<p style="display: none;"><a href="#start_here">{L_SKIP}</a></p>
-			</div>
-
-		<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH -->
-			<div id="search-box">
-				<form action="{U_SEARCH}" method="post" id="search">
-				<fieldset>
-					<input name="keywords" id="keywords" type="text" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search" value="<!-- IF SEARCH_WORDS-->{SEARCH_WORDS}<!-- ELSE -->{L_SEARCH_MINI}<!-- ENDIF -->" onclick="if(this.value=='{LA_SEARCH_MINI}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_MINI}';" /> 
-					<input class="button2" value="{L_SEARCH}" type="submit" /><br />
-					<a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH_ADV}</a> {S_SEARCH_HIDDEN_FIELDS}
-				</fieldset>
-				</form>
-			</div>
-		<!-- ENDIF -->
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-
-		<div class="navbar">
-			<div class="inner"><span class="corners-top"><span></span></span>
-
-			<ul class="linklist navlinks">
-				<li class="icon-home"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a> <!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
-
-				<li class="rightside"><a href="#" onclick="fontsizeup(); return false;" onkeypress="fontsizeup(); return false;" class="fontsize" title="{L_CHANGE_FONT_SIZE}">{L_CHANGE_FONT_SIZE}</a></li>
-
-			<!-- IF S_VIEWTOPIC -->
-				<!-- IF U_EMAIL_TOPIC --><li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li><!-- ENDIF -->
-				<!-- IF U_EMAIL_PM --><li class="rightside"><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class="sendemail">{L_EMAIL_PM}</a></li><!-- ENDIF -->
-				<!-- IF U_PRINT_TOPIC --><li class="rightside"><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p" class="print">{L_PRINT_TOPIC}</a></li><!-- ENDIF -->
-				<!-- IF U_PRINT_PM --><li class="rightside"><a href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p" class="print">{L_PRINT_PM}</a></li><!-- ENDIF -->
-			<!-- ENDIF -->
-			</ul>
-
-			<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
-			<ul class="linklist leftside">
-				<li class="icon-ucp">
-					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="u">{L_PROFILE}</a>
-						<!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a>)<!-- ENDIF --> &bull; 
-					<a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a>
-					<!-- IF U_RESTORE_PERMISSIONS --> &bull;
-					<a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a>
-					<!-- ENDIF -->
-				</li>
-			</ul>
-			<!-- ENDIF -->
-
-			<ul class="linklist rightside">
-				<li class="icon-faq"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li>
-				<!-- IF not S_IS_BOT -->
-					<!-- IF S_DISPLAY_MEMBERLIST --><li class="icon-members"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF -->
-					<!-- IF not S_USER_LOGGED_IN and S_REGISTER_ENABLED --><li class="icon-register"><a href="{U_REGISTER}">{L_REGISTER}</a></li><!-- ENDIF -->
-					<li class="icon-logout"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="l">{L_LOGIN_LOGOUT}</a></li>
-				<!-- ENDIF -->
-			</ul>
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-
-	</div>
-
-	<a name="start_here"></a>
-	<div id="page-body">
-		
-		 <!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN and (U_MCP or U_ACP) --> 
-		<div id="message" class="rules">
-			<div class="inner"><span class="corners-top"><span></span></span>
-				<strong>{L_INFORMATION}:</strong> {L_BOARD_DISABLED}
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-		<!-- ENDIF -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/posting_attach_body.html b/phpBB/styles/prosilver/template/posting_attach_body.html
deleted file mode 100644
index d39405487d..0000000000
--- a/phpBB/styles/prosilver/template/posting_attach_body.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="panel bg3" id="attach-panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<p>{L_ADD_ATTACHMENT_EXPLAIN}</p>
-	
-	<fieldset class="fields2">
-	<dl>
-		<dt><label for="fileupload">{L_FILENAME}:</label></dt>
-		<dd>
-			<input type="file" name="fileupload" id="fileupload" maxlength="{FILESIZE}" value="" class="inputbox autowidth" /> 
-			<input type="submit" name="add_file" value="{L_ADD_FILE}" class="button2" onclick="upload = true;" />
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="filecomment">{L_FILE_COMMENT}:</label></dt>
-		<dd><textarea name="filecomment" id="filecomment" rows="1" cols="40" class="inputbox autowidth">{FILE_COMMENT}</textarea></dd>
-	</dl>
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
diff --git a/phpBB/styles/prosilver/template/posting_body.html b/phpBB/styles/prosilver/template/posting_body.html
deleted file mode 100644
index 73b82700c5..0000000000
--- a/phpBB/styles/prosilver/template/posting_body.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
-<!-- IF S_PRIVMSGS -->
-	<!-- INCLUDE posting_pm_layout.html -->
-<!-- ELSE -->
-	<!-- INCLUDE posting_layout.html -->
-<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
deleted file mode 100644
index 4d866681f0..0000000000
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ /dev/null
@@ -1,108 +0,0 @@
-
-<script type="text/javascript">
-// <![CDATA[
-	var form_name = 'postform';
-	var text_name = <!-- IF $SIG_EDIT -->'signature'<!-- ELSE -->'message'<!-- ENDIF -->;
-	var load_draft = false;
-	var upload = false;
-
-	// Define the bbCode tags
-	var bbcode = new Array();
-	var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'<!-- BEGIN custom_tags -->, {custom_tags.BBCODE_NAME}<!-- END custom_tags -->);
-	var imageTag = false;
-
-	// Helpline messages
-	var help_line = {
-		b: '{LA_BBCODE_B_HELP}',
-		i: '{LA_BBCODE_I_HELP}',
-		u: '{LA_BBCODE_U_HELP}',
-		q: '{LA_BBCODE_Q_HELP}',
-		c: '{LA_BBCODE_C_HELP}',
-		l: '{LA_BBCODE_L_HELP}',
-		o: '{LA_BBCODE_O_HELP}',
-		p: '{LA_BBCODE_P_HELP}',
-		w: '{LA_BBCODE_W_HELP}',
-		a: '{LA_BBCODE_A_HELP}',
-		s: '{LA_BBCODE_S_HELP}',
-		f: '{LA_BBCODE_F_HELP}',
-		e: '{LA_BBCODE_E_HELP}',
-		d: '{LA_BBCODE_D_HELP}'
-		<!-- BEGIN custom_tags -->
-			,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
-		<!-- END custom_tags -->
-	}
-
-	var panels = new Array('options-panel', 'attach-panel', 'poll-panel');
-	var show_panel = 'options-panel';
-
-
-// ]]>
-</script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
-
-<!-- IF S_BBCODE_ALLOWED -->
-<div id="colour_palette" style="display: none;">
-	<dl style="clear: left;">
-		<dt><label>{L_FONT_COLOR}:</label></dt>
-		<dd>
-		<script type="text/javascript">
-		// <![CDATA[
-			function change_palette()
-			{
-				dE('colour_palette');
-				e = document.getElementById('colour_palette');
-				
-				if (e.style.display == 'block')
-				{
-					document.getElementById('bbpalette').value = '{LA_FONT_COLOR_HIDE}';
-				}
-				else
-				{
-					document.getElementById('bbpalette').value = '{LA_FONT_COLOR}';
-				}
-			}
-
-			colorPalette('h', 15, 10);
-		// ]]>
-		</script>
-		</dd>
-	</dl>
-</div>
-
-<div id="format-buttons">
-	<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" />
-	<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
-	<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" />
-	<!-- IF S_BBCODE_QUOTE -->
-		<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}" />
-	<!-- ENDIF -->
-	<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" />
-	<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" />
-	<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" />
-	<input type="button" class="button2" accesskey="t" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" />
-	<!-- IF S_BBCODE_IMG -->
-		<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" />
-	<!-- ENDIF -->
-	<!-- IF S_LINKS_ALLOWED -->
-		<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" />
-	<!-- ENDIF -->
-	<!-- IF S_BBCODE_FLASH -->
-		<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}" />
-	<!-- ENDIF -->
-	<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
-		<option value="50">{L_FONT_TINY}</option>
-		<option value="85">{L_FONT_SMALL}</option>
-		<option value="100" selected="selected">{L_FONT_NORMAL}</option>
-		<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 150 -->
-			<option value="150">{L_FONT_LARGE}</option>
-			<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 200 -->
-				<option value="200">{L_FONT_HUGE}</option>
-			<!-- ENDIF -->
-		<!-- ENDIF -->
-	</select>
-	<input type="button" class="button2" name="bbpalette" id="bbpalette" value="{L_FONT_COLOR}" onclick="change_palette();" title="{L_BBCODE_S_HELP}" />
-	<!-- BEGIN custom_tags -->
-		<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
-	<!-- END custom_tags -->
-</div>
-<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
deleted file mode 100644
index f9a26ad310..0000000000
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<fieldset class="fields1">
-	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
-
-	<!-- IF S_PRIVMSGS and not S_SHOW_DRAFTS -->
-
-		<div class="column1">
-		<!-- IF S_ALLOW_MASS_PM -->
-			<!-- IF .to_recipient -->
-				<dl>
-					<dt><label>{L_TO}:</label></dt>
-					<dd>
-						<!-- BEGIN to_recipient -->
-							<!-- IF not to_recipient.S_FIRST_ROW and to_recipient.S_ROW_NUM mod 2 eq 0 --></dd><dd><!-- ENDIF -->
-							<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a>&nbsp;<!-- ELSE -->{to_recipient.NAME_FULL}&nbsp;<!-- ENDIF -->
-							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" />&nbsp;<!-- ENDIF -->
-						<!-- END to_recipient -->
-					</dd>
-				</dl>
-			<!-- ENDIF -->
-			<!-- IF .bcc_recipient -->
-				<dl>
-					<dt><label>{L_BCC}:</label></dt>
-					<dd>
-						<!-- BEGIN bcc_recipient -->
-							<!-- IF not bcc_recipient.S_FIRST_ROW and bcc_recipient.S_ROW_NUM mod 2 eq 0 --></dd><dd><!-- ENDIF -->
-							<!-- IF bcc_recipient.IS_GROUP --><a href="{bcc_recipient.U_VIEW}"><strong>{bcc_recipient.NAME}</strong></a><!-- ELSE -->{bcc_recipient.NAME_FULL}&nbsp;<!-- ENDIF -->
-							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{bcc_recipient.TYPE}[{bcc_recipient.UG_ID}]" value="x" class="button2" />&nbsp;<!-- ENDIF -->
-						<!-- END bcc_recipient -->
-					</dd>
-				</dl>
-			<!-- ENDIF -->
-			<!-- IF not S_EDIT_POST -->
-			<dl class="pmlist">
-				<dt><textarea id="username_list" name="username_list" class="inputbox" cols="50" rows="2"></textarea></dt>
-				<dd><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></span></dd>
-				<dd><input type="submit" name="add_to" value="{L_ADD}" class="button2" /></dd>
-				<dd><input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button2" /></dd>
-			</dl>
-			<!-- ENDIF -->
-		<!-- ELSE -->
-			<dl>
-				<dt><label for="username_list">{L_TO}:</label><!-- IF not S_EDIT_POST --><br /><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false">{L_FIND_USERNAME}</a></span><!-- ENDIF --></dt>
-				<!-- IF .to_recipient -->
-					<dd>
-						<!-- BEGIN to_recipient -->
-							<!-- IF not to_recipient.S_FIRST_ROW and to_recipient.S_ROW_NUM mod 2 eq 0 --></dd><dd><!-- ENDIF -->
-							<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}&nbsp;<!-- ENDIF -->
-							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" />&nbsp;<!-- ENDIF -->
-						<!-- END to_recipient -->
-					</dd>
-				<!-- ENDIF -->
-
-				<!-- IF not S_EDIT_POST -->
-				<dd><input class="inputbox" type="text" name="username_list" id="username_list" size="20" value="" /> <input type="submit" name="add_to" value="{L_ADD}" class="button2" /></dd>
-				<!-- ENDIF -->
-			</dl>
-		<!-- ENDIF -->
-
-		</div>
-
-		<!-- IF S_GROUP_OPTIONS -->
-			<div class="column2">
-				<dl>
-					<dd><label for="group_list">{L_USERGROUPS}:</label> <select name="group_list[]" id="group_list "multiple="multiple" size="4" class="inputbox">{S_GROUP_OPTIONS}</select></dd>
-				</dl>
-			</div>
-		<!-- ENDIF -->
-
-		<div class="clear"></div>
-
-	<!-- ENDIF -->
-
-	<!-- IF S_DELETE_ALLOWED -->
-	<dl>
-		<dt><label for="delete">{L_DELETE_POST}:</label></dt>
-		<dd><label for="delete"><input type="checkbox" name="delete" id="delete" /> {L_DELETE_POST_WARN}</label></dd>
-	</dl>
-	<!-- ENDIF -->
-
-	<!-- IF S_SHOW_TOPIC_ICONS or S_SHOW_PM_ICONS -->
-	<dl>
-		<dt><label for="icon">{L_ICON}:</label></dt>
-		<dd>
-			<label for="icon"><input type="radio" name="icon" id="icon" value="0" checked="checked" /> <!-- IF S_SHOW_TOPIC_ICONS -->{L_NO_TOPIC_ICON}<!-- ELSE -->{L_NO_PM_ICON}<!-- ENDIF --></label>
-			<!-- BEGIN topic_icon --><label for="icon-{topic_icon.ICON_ID}"><input type="radio" name="icon" id="icon-{topic_icon.ICON_ID}" value="{topic_icon.ICON_ID}" {topic_icon.S_ICON_CHECKED} /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" /></label> <!-- END topic_icon -->
-		</dd>
-	</dl>
-	<!-- ENDIF -->
-
-	<!-- IF not S_PRIVMSGS and S_DISPLAY_USERNAME -->
-	<dl>
-		<dt><label for="username">{L_USERNAME}:</label></dt>
-		<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox" /></dd>
-	</dl>
-	<!-- ENDIF -->
-
-	<!-- IF S_POST_ACTION or S_PRIVMSGS or S_EDIT_DRAFT -->
-	<dl style="clear: left;">
-		<dt><label for="subject">{L_SUBJECT}:</label></dt>
-		<dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->60<!-- ELSE -->64<!-- ENDIF -->" tabindex="2" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" /></dd>
-	</dl>
-		<!-- IF S_CONFIRM_CODE -->
-		{CONFIRM}
-		<!-- ENDIF -->
-	<!-- ENDIF -->
-
-	<!-- INCLUDE posting_buttons.html -->
-
-	<div id="smiley-box">
-		<!-- IF S_SMILIES_ALLOWED and .smiley -->
-			<strong>{L_SMILIES}</strong><br />
-			<!-- BEGIN smiley -->
-				<a href="#" onclick="insert_text('{smiley.A_SMILEY_CODE}', true); return false;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" /></a>
-			<!-- END smiley -->
-		<!-- ENDIF -->
-		<!-- IF S_SHOW_SMILEY_LINK and S_SMILIES_ALLOWED-->
-			<br /><a href="{U_MORE_SMILIES}" onclick="popup(this.href, 300, 350, '_phpbbsmilies'); return false;">{L_MORE_SMILIES}</a>
-		<!-- ENDIF -->
-
-		<!-- IF BBCODE_STATUS -->
-		<!-- IF .smiley --><hr /><!-- ENDIF -->
-		{BBCODE_STATUS}<br />
-		<!-- IF S_BBCODE_ALLOWED -->
-			{IMG_STATUS}<br />
-			{FLASH_STATUS}<br />
-			{URL_STATUS}<br />
-			{SMILIES_STATUS}
-		<!-- ENDIF -->
-		<!-- ENDIF -->
-		<!-- IF S_EDIT_DRAFT || S_DISPLAY_REVIEW -->
-			<!-- IF S_DISPLAY_REVIEW --><hr /><!-- ENDIF -->
-			<!-- IF S_EDIT_DRAFT --><strong><a href="{S_UCP_ACTION}">{L_BACK_TO_DRAFTS}</a></strong><!-- ENDIF -->
-			<!-- IF S_DISPLAY_REVIEW --><strong><a href="#review">{L_TOPIC_REVIEW}</a></strong><!-- ENDIF -->
-		<!-- ENDIF -->
-	</div>
-
-	<div id="message-box">
-		<textarea <!-- IF S_UCP_ACTION and not S_PRIVMSGS and not S_EDIT_DRAFT -->name="signature" id="signature" style="height: 9em;"<!-- ELSE -->name="message" id="message"<!-- ENDIF --> rows="15" cols="76" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" class="inputbox">{MESSAGE}{DRAFT_MESSAGE}{SIGNATURE}</textarea>
-	</div>
-</fieldset>
-
-<!-- IF $EXTRA_POSTING_OPTIONS eq 1 -->
-
-	<!-- IF not S_SHOW_DRAFTS -->
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-	<!-- ENDIF -->
-
-	<!-- IF S_HAS_ATTACHMENTS -->
-		<div class="panel bg2">
-			<div class="inner"><span class="corners-top"><span></span></span>
-			<h3>{L_POSTED_ATTACHMENTS}</h3>
-
-			<fieldset class="fields2">
-
-			<!-- BEGIN attach_row -->
-			<dl>
-
-				<dt><label for="comment_list_{attach_row.ASSOC_INDEX}">{L_FILE_COMMENT}:</label></dt>
-				<dd><textarea name="comment_list[{attach_row.ASSOC_INDEX}]" id="comment_list_{attach_row.ASSOC_INDEX}" rows="1" cols="35" class="inputbox">{attach_row.FILE_COMMENT}</textarea></dd>
-				<dd><a href="{attach_row.U_VIEW_ATTACHMENT}" class="{S_CONTENT_FLOW_END}">{attach_row.FILENAME}</a></dd>
-				<dd style="margin-top: 5px;">
-					<!-- IF S_INLINE_ATTACHMENT_OPTIONS --><input type="button" value="{L_PLACE_INLINE}" onclick="attach_inline({attach_row.ASSOC_INDEX}, '{attach_row.A_FILENAME}');" class="button2" />&nbsp; <!-- ENDIF -->
-					<input type="submit" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" class="button2" />
-				</dd>
-			</dl>
-			{attach_row.S_HIDDEN}
-				<!-- IF not attach_row.S_LAST_ROW --><hr class="dashed" /><!-- ENDIF -->
-			<!-- END attach_row -->
-
-			</fieldset>
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF not S_SHOW_DRAFTS and not $SIG_EDIT eq 1 -->
-	<div class="panel bg2">
-		<div class="inner"><span class="corners-top"><span></span></span>
-		<fieldset class="submit-buttons">
-			{S_HIDDEN_ADDRESS_FIELD}
-			{S_HIDDEN_FIELDS}
-			<!-- IF S_HAS_DRAFTS --><input type="submit" accesskey="d" tabindex="9" name="load" value="{L_LOAD}" class="button2" onclick="load_draft = true;" />&nbsp; <!-- ENDIF -->
-			<!-- IF S_SAVE_ALLOWED --><input type="submit" accesskey="k" tabindex="8" name="save" value="{L_SAVE}" class="button2" />&nbsp; <!-- ENDIF -->
-			<input type="submit" tabindex="5" name="preview" value="{L_PREVIEW}" class="button1"<!-- IF not S_PRIVMSGS --> onclick="document.getElementById('postform').action += '#preview';"<!-- ENDIF --> />&nbsp;
-			<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />&nbsp;
-
-		</fieldset>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-	<!-- ENDIF -->
-
-	<!-- IF not S_PRIVMSGS and not S_SHOW_DRAFTS and not $SIG_EDIT eq 1 -->
-		<div id="tabs">
-			<ul>
-				<li id="options-panel-tab" class="activetab"><a href="#tabs" onclick="subPanels('options-panel'); return false;"><span>{L_OPTIONS}</span></a></li>
-				<!-- IF S_SHOW_ATTACH_BOX --><li id="attach-panel-tab"><a href="#tabs" onclick="subPanels('attach-panel'); return false;"><span>{L_ADD_ATTACHMENT}</span></a></li><!-- ENDIF -->
-				<!-- IF S_SHOW_POLL_BOX || S_POLL_DELETE --><li id="poll-panel-tab"><a href="#tabs" onclick="subPanels('poll-panel'); return false;"><span>{L_ADD_POLL}</span></a></li><!-- ENDIF -->
-			</ul>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF not S_SHOW_DRAFTS and not $SIG_EDIT eq 1 -->
-	<div class="panel bg3" id="options-panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<fieldset class="fields1">
-			<!-- IF S_BBCODE_ALLOWED -->
-				<div><label for="disable_bbcode"><input type="checkbox" name="disable_bbcode" id="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label></div>
-			<!-- ENDIF -->
-			<!-- IF S_SMILIES_ALLOWED -->
-				<div><label for="disable_smilies"><input type="checkbox" name="disable_smilies" id="disable_smilies"{S_SMILIES_CHECKED} /> {L_DISABLE_SMILIES}</label></div>
-			<!-- ENDIF -->
-			<!-- IF S_LINKS_ALLOWED -->
-				<div><label for="disable_magic_url"><input type="checkbox" name="disable_magic_url" id="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label></div>
-			<!-- ENDIF -->
-			<!-- IF S_SIG_ALLOWED -->
-				<div><label for="attach_sig"><input type="checkbox" name="attach_sig" id="attach_sig"{S_SIGNATURE_CHECKED} /> {L_ATTACH_SIG}</label></div>
-			<!-- ENDIF -->
-			<!-- IF S_NOTIFY_ALLOWED -->
-				<div><label for="notify"><input type="checkbox" name="notify" id="notify"{S_NOTIFY_CHECKED} /> {L_NOTIFY_REPLY}</label></div>
-			<!-- ENDIF -->
-			<!-- IF S_LOCK_TOPIC_ALLOWED -->
-				<div><label for="lock_topic"><input type="checkbox" name="lock_topic" id="lock_topic"{S_LOCK_TOPIC_CHECKED} /> {L_LOCK_TOPIC}</label></div>
-			<!-- ENDIF -->
-			<!-- IF S_LOCK_POST_ALLOWED -->
-				<div><label for="lock_post"><input type="checkbox" name="lock_post" id="lock_post"{S_LOCK_POST_CHECKED} /> {L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]</label></div>
-			<!-- ENDIF -->
-
-			<!-- IF S_TYPE_TOGGLE or S_TOPIC_TYPE_ANNOUNCE or S_TOPIC_TYPE_STICKY -->
-			<hr class="dashed" />
-			<!-- ENDIF -->
-
-			<!-- IF S_TYPE_TOGGLE -->
-			<dl>
-				<dt><label for="topic_type-0"><!-- IF S_EDIT_POST -->{L_CHANGE_TOPIC_TO}<!-- ELSE -->{L_POST_TOPIC_AS}<!-- ENDIF -->:</label></dt>
-				<dd><!-- BEGIN topic_type --><label for="topic_type-{topic_type.VALUE}"><input type="radio" name="topic_type" id="topic_type-{topic_type.VALUE}" value="{topic_type.VALUE}"{topic_type.S_CHECKED} />{topic_type.L_TOPIC_TYPE}</label> <!-- END topic_type --></dd>
-			</dl>
-			<!-- ENDIF -->
-
-			<!-- IF S_TOPIC_TYPE_ANNOUNCE or S_TOPIC_TYPE_STICKY -->
-			<dl>
-				<dt><label for="topic_time_limit">{L_STICK_TOPIC_FOR}:</label></dt>
-				<dd><label for="topic_time_limit"><input type="text" name="topic_time_limit" id="topic_time_limit" size="3" maxlength="3" value="{TOPIC_TIME_LIMIT}" class="inputbox autowidth" /> {L_DAYS}</label></dd>
-				<dd>{L_STICK_TOPIC_FOR_EXPLAIN}</dd>
-			</dl>
-			<!-- ENDIF -->
-
-			<!-- IF S_EDIT_REASON -->
-			<dl>
-				<dt><label for="edit_reason">{L_EDIT_REASON}:</label></dt>
-				<dd><input type="text" name="edit_reason" id="edit_reason" value="{EDIT_REASON}" class="inputbox" /></dd>
-			</dl>
-			<!-- ENDIF -->
-		</fieldset>
-		<!-- ENDIF -->
-
-<!-- ENDIF -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/posting_layout.html b/phpBB/styles/prosilver/template/posting_layout.html
deleted file mode 100644
index b81c8162d7..0000000000
--- a/phpBB/styles/prosilver/template/posting_layout.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<!-- IF TOPIC_TITLE -->
-	<h2><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>
-<!-- ELSE -->
-	<h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
- <!-- ENDIF -->
-
-<!-- IF S_FORUM_RULES -->
-	<div class="rules">
-		<div class="inner"><span class="corners-top"><span></span></span>
-		
-		<!-- IF U_FORUM_RULES -->
-			<a href="{U_FORUM_RULES}">{L_FORUM_RULES}</a>
-		<!-- ELSE -->
-			<strong>{L_FORUM_RULES}</strong><br />
-			{FORUM_RULES}
-		<!-- ENDIF -->
-		
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-<!-- ENDIF -->
-
-<form id="postform" method="post" action="{S_POST_ACTION}"{S_FORM_ENCTYPE}>
-
-<!-- IF S_DRAFT_LOADED -->
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-		
-		<h3>{L_INFORMATION}</h3>
-		<p>{L_DRAFT_LOADED}</p>
-		
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-<!-- ENDIF -->
-
-<!-- IF S_SHOW_DRAFTS --><!-- INCLUDE drafts.html --><!-- ENDIF -->
-
-<!-- IF S_POST_REVIEW --><!-- INCLUDE posting_review.html --><!-- ENDIF -->
-
-<!-- IF S_UNGLOBALISE -->
-	<div class="panel bg3">
-		<div class="inner"><span class="corners-top"><span></span></span>
-		<fieldset class="fields1">
-			<h2>{L_SELECT_DESTINATION_FORUM}</h2>
-			<p>{L_UNGLOBALISE_EXPLAIN}</p>
-			<dl>
-				<dt><label for="to_forum_id">{L_MOVE}:</label></dt>
-				<dd><select id="to_forum_id" name="to_forum_id">{S_FORUM_SELECT}</select></dd>
-			</dl>
-			
-			<dl>
-				<dt>&nbsp;</dt>
-				<dd><input class="button1" type="submit" name="post" value="{L_CONFIRM}" /> <input class="button2" type="submit" name="cancel_unglobalise" value="{L_CANCEL}" /></dd>
-			</dl>
-		</fieldset>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-<!-- ENDIF -->
-
-<!-- IF S_DISPLAY_PREVIEW --><!-- INCLUDE posting_preview.html --><!-- ENDIF -->
-
-<div class="panel" id="postingbox">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	
-	<h3>{L_POST_A}</h3>
-
-	<!-- DEFINE $EXTRA_POSTING_OPTIONS = 1 -->
-	<!-- INCLUDE posting_editor.html -->
-	{S_FORM_TOKEN}
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- IF S_SHOW_ATTACH_BOX --><!-- INCLUDE posting_attach_body.html --><!-- ENDIF -->
-
-<!-- IF S_SHOW_POLL_BOX or S_POLL_DELETE --><!-- INCLUDE posting_poll_body.html --><!-- ENDIF -->
-
-<!-- IF S_DISPLAY_REVIEW --><!-- INCLUDE posting_topic_review.html --><!-- ENDIF -->
-
-</form>
-<!-- IF not S_PRIVMSGS -->
-<script type="text/javascript">
-// <![CDATA[
-	subPanels(show_panel);
-// ]]>
-</script>
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/prosilver/template/posting_pm_layout.html b/phpBB/styles/prosilver/template/posting_pm_layout.html
deleted file mode 100644
index 48812da102..0000000000
--- a/phpBB/styles/prosilver/template/posting_pm_layout.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<!-- IF S_DRAFT_LOADED -->
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-		
-		<h3>{L_INFORMATION}</h3>
-		<p>{L_DRAFT_LOADED_PM}</p>
-		
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-<!-- ENDIF -->
-
-<!-- IF S_SHOW_DRAFTS --><!-- INCLUDE drafts.html --><!-- ENDIF -->
-
-<!-- IF S_DISPLAY_PREVIEW --><!-- INCLUDE posting_preview.html --><!-- ENDIF -->
-
-<h2>{L_TITLE}</h2>
-
-<div class="panel" id="postingbox">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<!-- DEFINE $EXTRA_POSTING_OPTIONS = 1 -->
-	<!-- INCLUDE posting_editor.html -->
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- IF S_SHOW_ATTACH_BOX --><!-- INCLUDE posting_attach_body.html --><!-- ENDIF -->
-
-<!-- IF S_DISPLAY_REVIEW --><!-- INCLUDE posting_topic_review.html --><!-- ENDIF -->
-
-<!-- IF S_DISPLAY_HISTORY --><!-- INCLUDE ucp_pm_history.html --><!-- ENDIF -->
-
-<!-- INCLUDE ucp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/posting_poll_body.html b/phpBB/styles/prosilver/template/posting_poll_body.html
deleted file mode 100644
index ba0014ce57..0000000000
--- a/phpBB/styles/prosilver/template/posting_poll_body.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<div class="panel bg3" id="poll-panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<!-- IF S_SHOW_POLL_BOX -->
-	<p>{L_ADD_POLL_EXPLAIN}</p>
-	<!-- ENDIF -->
-
-	<fieldset class="fields2">
-	<!-- IF S_SHOW_POLL_BOX -->
-		<!-- IF S_POLL_DELETE -->
-			<dl>
-				<dt><label for="poll_delete">{L_POLL_DELETE}:</label></dt>
-				<dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /> </label></dd>
-			</dl>
-		<!-- ENDIF -->
-		<dl>
-			<dt><label for="poll_title">{L_POLL_QUESTION}:</label></dt>
-			<dd><input type="text" name="poll_title" id="poll_title" maxlength="255" value="{POLL_TITLE}" class="inputbox" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="poll_option_text">{L_POLL_OPTIONS}:</label><br /><span>{L_POLL_OPTIONS_EXPLAIN}</span></dt>
-			<dd><textarea name="poll_option_text" id="poll_option_text" rows="5" cols="35" class="inputbox">{POLL_OPTIONS}</textarea></dd>
-		</dl>
-
-		<hr class="dashed" />
-
-		<dl>
-			<dt><label for="poll_max_options">{L_POLL_MAX_OPTIONS}:</label></dt>
-			<dd><input type="text" name="poll_max_options" id="poll_max_options" size="3" maxlength="3" value="{POLL_MAX_OPTIONS}" class="inputbox autowidth" /></dd>
-			<dd>{L_POLL_MAX_OPTIONS_EXPLAIN}</dd>
-		</dl>
-		<dl>
-			<dt><label for="poll_length">{L_POLL_FOR}:</label></dt>
-			<dd><label for="poll_length"><input type="text" name="poll_length" id="poll_length" size="3" maxlength="3" value="{POLL_LENGTH}" class="inputbox autowidth" /> {L_DAYS}</label></dd>
-			<dd>{L_POLL_FOR_EXPLAIN}</dd>
-		</dl>
-
-		<!-- IF S_POLL_VOTE_CHANGE -->
-			<hr class="dashed" />
-			
-			<dl>
-				<dt><label for="poll_vote_change">{L_POLL_VOTE_CHANGE}:</label></dt>
-				<dd><label for="poll_vote_change"><input type="checkbox" id="poll_vote_change" name="poll_vote_change"{VOTE_CHANGE_CHECKED} /> {L_POLL_VOTE_CHANGE_EXPLAIN}</label></dd>
-			</dl>
-		<!-- ENDIF -->
-
-	<!-- ELSEIF S_POLL_DELETE -->
-		<dl class="fields1">
-			<dt><label for="poll_delete">{L_POLL_DELETE}:</label></dt>
-			<dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /> </label></dd>
-		</dl>
-	<!-- ENDIF -->
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
diff --git a/phpBB/styles/prosilver/template/posting_preview.html b/phpBB/styles/prosilver/template/posting_preview.html
deleted file mode 100644
index 7ea1fb063d..0000000000
--- a/phpBB/styles/prosilver/template/posting_preview.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<div class="post bg2" id="preview">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-<!-- IF S_HAS_POLL_OPTIONS -->
-	<div class="content">
-		<h2>{L_PREVIEW}: {POLL_QUESTION}</h2>
-		<p class="author"><!-- IF L_POLL_LENGTH -->{L_POLL_LENGTH}<br /><!-- ENDIF -->{L_MAX_VOTES}</p>
-
-		<fieldset class="polls">
-		<!-- BEGIN poll_option -->
-			<dl>
-				<dt><label for="vote_{poll_option.POLL_OPTION_ID}">{poll_option.POLL_OPTION_CAPTION}</label></dt>
-				<dd style="width: auto;"><!-- IF S_IS_MULTI_CHOICE --><input type="checkbox" name="vote_id[]" id="vote_{poll_option.POLL_OPTION_ID}" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /><!-- ELSE --><input type="radio" name="vote_id[]" id="vote_{poll_option.POLL_OPTION_ID}" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /><!-- ENDIF --></dd>
-			</dl>
-		<!-- END poll_option -->
-		</fieldset>
-	</div>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="post <!-- IF S_PRIVMSGS --> pm<!-- ELSE --> bg2<!-- ENDIF -->">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-<!-- ENDIF -->
-
-	<div class="postbody">
-		<h3>{L_PREVIEW}: {PREVIEW_SUBJECT}</h3>
-		
-		<div class="content">{PREVIEW_MESSAGE}</div>
-		
-		<!-- IF .attachment -->
-		<dl class="attachbox">
-			<dt>{L_ATTACHMENTS}</dt>
-			<!-- BEGIN attachment -->
-			<dd>{attachment.DISPLAY_ATTACHMENT}</dd>
-			<!-- END attachment -->
-		</dl>
-		<!-- ENDIF -->
-		
-		<!-- IF PREVIEW_SIGNATURE --><div class="signature">{PREVIEW_SIGNATURE}</div><!-- ENDIF -->
-	</div>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<hr />
diff --git a/phpBB/styles/prosilver/template/posting_review.html b/phpBB/styles/prosilver/template/posting_review.html
deleted file mode 100644
index 78b994c989..0000000000
--- a/phpBB/styles/prosilver/template/posting_review.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<h3>{L_POST_REVIEW}</h3>
-
-<p>{L_POST_REVIEW_EXPLAIN}</p>
-
-<!-- BEGIN post_review_row -->
-<!-- IF post_review_row.S_IGNORE_POST -->
-<div class="post bg3 post-ignore">
-	<div class="inner"><span class="corners-top"><span></span></span>
-		{post_review_row.L_IGNORE_POST}
-<!-- ELSE -->
-<div class="post <!-- IF post_review_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF post_review_row.ONLINE_STATUS --> online<!-- ENDIF -->">
-	<div class="inner"><span class="corners-top"><span></span></span>
-<!-- ENDIF -->
-
-	<div class="postbody" id="ppr{post_review_row.POST_ID}">
-		<h3><a href="#ppr{post_review_row.POST_ID}">{post_review_row.POST_SUBJECT}</a></h3>
-		<p class="author"><!-- IF S_IS_BOT -->{post_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{post_review_row.U_MINI_POST}">{post_review_row.MINI_POST_IMG}</a><!-- ENDIF --> {L_POST_BY_AUTHOR}<strong>  {post_review_row.POST_AUTHOR_FULL}</strong> &raquo; {post_review_row.POST_DATE}</p>
-		<div class="content">{post_review_row.MESSAGE}</div>
-
-		<!-- IF post_review_row.S_HAS_ATTACHMENTS -->
-			<dl class="attachbox">
-				<dt>{L_ATTACHMENTS}</dt>
-				<!-- BEGIN attachment -->
-					<dd>{post_review_row.attachment.DISPLAY_ATTACHMENT}</dd>
-				<!-- END attachment -->
-			</dl>
-		<!-- ENDIF -->
-
-	</div>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-<!-- END post_review_row -->
-
-<hr />
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/posting_smilies.html b/phpBB/styles/prosilver/template/posting_smilies.html
deleted file mode 100644
index dd0963baf5..0000000000
--- a/phpBB/styles/prosilver/template/posting_smilies.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-
-<script type="text/javascript">
-// <![CDATA[
-	var form_name = 'postform';
-	var text_name = 'message';
-// ]]>
-</script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
-
-<h2>{L_SMILIES}</h2>
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-		<!-- BEGIN smiley --> 
-			<a href="#" onclick="insert_text('{smiley.A_SMILEY_CODE}', true, true); return false;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" /></a> 
-		<!-- END smiley	-->
-	
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-<a  href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>
-
-<!-- INCLUDE simple_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html
deleted file mode 100644
index 428a830ef3..0000000000
--- a/phpBB/styles/prosilver/template/posting_topic_review.html
+++ /dev/null
@@ -1,54 +0,0 @@
-
-<h3 id="review">
-	<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span>
-	{L_TOPIC_REVIEW}: {TOPIC_TITLE}
-</h3>
-
-<div id="topicreview">
-	<!-- BEGIN topic_review_row -->
-
-	<!-- IF topic_review_row.S_IGNORE_POST -->
-	<div class="post bg3 post-ignore">
-		<div class="inner"><span class="corners-top"><span></span></span>
-			{topic_review_row.L_IGNORE_POST}
-	<!-- ELSE -->
-	<div class="post <!-- IF topic_review_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-		<div class="inner"><span class="corners-top"><span></span></span>
-	<!-- ENDIF -->
-
-		<div class="postbody" id="pr{topic_review_row.POST_ID}">
-			<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE -->
-			<ul class="profile-icons">
-				<li class="quote-icon"><a href="#postingbox" onclick="addquote({topic_review_row.POST_ID}, '{topic_review_row.POSTER_QUOTE}');" title="{L_QUOTE} {topic_review_row.POST_AUTHOR}"><span>{L_QUOTE} {topic_review_row.POST_AUTHOR}</span></a></li>
-			</ul>
-			<!-- ENDIF -->
-			<!-- IF topic_review_row.U_MCP_DETAILS --><div class="right-box"><a href="{topic_review_row.U_MCP_DETAILS}">{L_POST_DETAILS}</a></div><!-- ENDIF -->
-			<h3><a href="#pr{topic_review_row.POST_ID}">{topic_review_row.POST_SUBJECT}</a></h3>
-			<p class="author"><!-- IF S_IS_BOT -->{topic_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{topic_review_row.U_MINI_POST}">{topic_review_row.MINI_POST_IMG}</a><!-- ENDIF --> {L_POST_BY_AUTHOR} <strong>{topic_review_row.POST_AUTHOR_FULL}</strong> &raquo; {topic_review_row.POST_DATE}  </p>
-			<div class="content">{topic_review_row.MESSAGE}</div>
-
-			<!-- IF topic_review_row.S_HAS_ATTACHMENTS -->
-				<dl class="attachbox">
-					<dt>{L_ATTACHMENTS}</dt>
-					<!-- BEGIN attachment -->
-						<dd>{topic_review_row.attachment.DISPLAY_ATTACHMENT}</dd>
-					<!-- END attachment -->
-				</dl>
-			<!-- ENDIF -->
-
-			<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE -->
-				<div id="message_{topic_review_row.POST_ID}" style="display: none;">{topic_review_row.DECODED_MESSAGE}</div>
-			<!-- ENDIF -->
-		</div>
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-	<!-- END topic_review_row -->
-</div>
-
-<hr />
-
-<!-- IF S_MCP_REPORT -->
-	<p><a href="#report" class="top2">{L_BACK_TO_TOP}</a></p>
-<!-- ELSE -->
-	<p><a href="#postingbox" class="top2">{L_BACK_TO_TOP}</a></p>
-<!-- ENDIF -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/report_body.html b/phpBB/styles/prosilver/template/report_body.html
deleted file mode 100644
index b0c6e08049..0000000000
--- a/phpBB/styles/prosilver/template/report_body.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<h2 class="titlespace"><!-- IF S_REPORT_POST -->{L_REPORT_POST}<!-- ELSE -->{L_REPORT_MESSAGE}<!-- ENDIF --></h2>
-
-<form method="post" action="{S_REPORT_ACTION}" id="report">
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<div class="content">
-		<p><!-- IF S_REPORT_POST -->{L_REPORT_POST_EXPLAIN}<!-- ELSE -->{L_REPORT_MESSAGE_EXPLAIN}<!-- ENDIF --></p>
-		
-		<fieldset>
-		<dl class="fields2">
-			<dt><label for="reason_id">{L_REASON}:</label></dt>
-			<dd><select name="reason_id" id="reason_id" class="full"><!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason --></select></dd>
-		</dl>
-		<!-- IF S_CAN_NOTIFY -->
-			<dl class="fields2">
-				<dt><label for="notify1">{L_REPORT_NOTIFY}:</label><br /><span>{L_REPORT_NOTIFY_EXPLAIN}</span></dt>
-				<dd>
-					<label for="notify1"><input type="radio" name="notify" id="notify1" value="1" <!-- IF not S_NOTIFY -->checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-					<label for="notify0"><input type="radio" name="notify" id="notify0" value="0" <!-- IF S_NOTIFY -->checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-				</dd>
-			</dl>
-		<!-- ENDIF -->
-		<dl class="fields2">
-			<dt><label for="report_text">{L_MORE_INFO}:</label><br /><span>{L_CAN_LEAVE_BLANK}</span></dt>
-			<dd><textarea name="report_text" id="report_text" rows="10" cols="76" class="inputbox">{REPORT_TEXT}</textarea></dd>
-		</dl>
-		</fieldset>
-	</div>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<div class="content">
-		<fieldset class="submit-buttons">
-			<input type="submit" name="submit" class="button1" value="{L_SUBMIT}" />&nbsp;
-			<input type="submit" name="cancel" class="button2" value="{L_CANCEL}" />
-			{S_FORM_TOKEN}
-		</fieldset>
-	</div>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/search_body.html b/phpBB/styles/prosilver/template/search_body.html
deleted file mode 100644
index 302d56396f..0000000000
--- a/phpBB/styles/prosilver/template/search_body.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<h2 class="solo">{L_SEARCH}</h2>
-
-<form method="get" action="{S_SEARCH_ACTION}">
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	<h3>{L_SEARCH_QUERY}</h3>
-	
-	<fieldset>
-	<dl>
-		<dt><label for="keywords">{L_SEARCH_KEYWORDS}:</label><br /><span>{L_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
-		<dd><input type="text" class="inputbox" name="keywords" id="keywords" size="40" title="{L_SEARCH_KEYWORDS}" /></dd>
-		<dd><label for="terms1"><input type="radio" name="terms" id="terms1" value="all" checked="checked" /> {L_SEARCH_ALL_TERMS}</label></dd>
-		<dd><label for="terms2"><input type="radio" name="terms" id="terms2" value="any" /> {L_SEARCH_ANY_TERMS}</label></dd>
-	</dl>
-	<dl>
-		<dt><label for="author">{L_SEARCH_AUTHOR}:</label><br /><span>{L_SEARCH_AUTHOR_EXPLAIN}</span></dt>
-		<dd><input type="text" class="inputbox" name="author" id="author" size="40" title="{L_SEARCH_AUTHOR}" /></dd>
-	</dl>
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="panel bg2">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h3>{L_SEARCH_OPTIONS}</h3>
-	
-	<fieldset>
-	<dl>
-		<dt><label for="search_forum">{L_SEARCH_FORUMS}:</label><br /><span>{L_SEARCH_FORUMS_EXPLAIN}</span></dt>
-		<dd><select name="fid[]" id="search_forum" multiple="multiple" size="8" title="{L_SEARCH_FORUMS}">{S_FORUM_OPTIONS}</select></dd>
-	</dl>
-	<dl>
-		<dt><label for="search_child1">{L_SEARCH_SUBFORUMS}:</label></dt>
-		<dd>
-			<label for="search_child1"><input type="radio" name="sc" id="search_child1" value="1" checked="checked" /> {L_YES}</label> 
-			<label for="search_child2"><input type="radio" name="sc" id="search_child2" value="0" /> {L_NO}</label>
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="sf1">{L_SEARCH_WITHIN}:</label></dt>
-		<dd><label for="sf1"><input type="radio" name="sf" id="sf1" value="all" checked="checked" /> {L_SEARCH_TITLE_MSG}</label></dd>
-		<dd><label for="sf2"><input type="radio" name="sf" id="sf2" value="msgonly" /> {L_SEARCH_MSG_ONLY}</label></dd>
-		<dd><label for="sf3"><input type="radio" name="sf" id="sf3" value="titleonly" /> {L_SEARCH_TITLE_ONLY}</label></dd>
-		<dd><label for="sf4"><input type="radio" name="sf" id="sf4" value="firstpost" /> {L_SEARCH_FIRST_POST}</label></dd>
-	</dl>
-
-	<hr class="dashed" />
-
-	<dl>
-		<dt><label for="show_results1">{L_DISPLAY_RESULTS}:</label></dt>
-		<dd>
-			<label for="show_results1"><input type="radio" name="sr" id="show_results1" value="posts" checked="checked" /> {L_POSTS}</label> 
-			<label for="show_results2"><input type="radio" name="sr" id="show_results2" value="topics" /> {L_TOPICS}</label>
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="sd">{L_RESULT_SORT}:</label></dt>
-		<dd>{S_SELECT_SORT_KEY}&nbsp;
-			<label for="sa"><input type="radio" name="sd" id="sa" value="a" /> {L_SORT_ASCENDING}</label> 
-			<label for="sd"><input type="radio" name="sd" id="sd" value="d" checked="checked" /> {L_SORT_DESCENDING}</label>
-		</dd>
-	</dl>
-	<dl>
-		<dt><label>{L_RESULT_DAYS}:</label></dt>
-		<dd>{S_SELECT_SORT_DAYS}</dd>
-	</dl>
-	<dl>
-		<dt><label>{L_RETURN_FIRST}:</label></dt>
-		<dd><select name="ch" title="{L_RETURN_FIRST}">{S_CHARACTER_OPTIONS}</select> {L_POST_CHARACTERS}</dd>
-	</dl>
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="panel bg3">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-		<input type="submit" name="submit" value="{L_SEARCH}" class="button1" />
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-</form>
-
-<!-- IF .recentsearch -->
-<div class="forumbg">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<table class="table1" cellspacing="1">
-	<thead>
-	<tr>
-		<th colspan="2" class="name">{L_RECENT_SEARCHES}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN recentsearch -->
-		<tr class="<!-- IF recentsearch.S_ROW_NUM is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-			<td><a href="{recentsearch.U_KEYWORDS}">{recentsearch.KEYWORDS}</a></td>
-			<td class="active"><span>&nbsp;{recentsearch.TIME}</span></td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr class="bg1">
-			<td colspan="2">{L_NO_RECENT_SEARCHES}</td>
-		</tr>
-	<!-- END recentsearch -->
-	</tbody>
-	</table>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
deleted file mode 100644
index 4d306ae6df..0000000000
--- a/phpBB/styles/prosilver/template/search_results.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<h2><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE -->{SEARCH_MATCHES}<!-- ENDIF --><!-- IF SEARCH_WORDS -->: <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2>
-<!-- IF IGNORED_WORDS --> <p>{L_IGNORED_TERMS}: <strong>{IGNORED_WORDS}</strong></p><!-- ENDIF -->
-
-<!-- IF SEARCH_TOPIC -->
-	<p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}">{L_RETURN_TO}: {SEARCH_TOPIC}</a></p>
-<!-- ELSE -->
-	<p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}">{L_RETURN_TO_SEARCH_ADV}</a></p>
-<!-- ENDIF -->
-
-<!-- IF PAGINATION or SEARCH_MATCHES or PAGE_NUMBER -->
-	<form method="post" action="{S_SEARCH_ACTION}">
-
-	<div class="topic-actions">
-
-	<!-- IF SEARCH_MATCHES -->
-		<div class="search-box">
-			<!-- IF SEARCH_IN_RESULTS -->
-				<label for="add_keywords">{L_SEARCH_IN_RESULTS}: <input type="text" name="add_keywords" id="add_keywords" value="" class="inputbox narrow" /></label>
-				<input type="hidden" name="show_results" value="posts" />
-				<input class="button2" type="submit" name="submit" value="{L_SEARCH}" />
-			<!-- ENDIF -->
-		</div>
-	<!-- ENDIF -->
-
-		<div class="rightside pagination">
-			{SEARCH_MATCHES}<!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF -->
-		</div>
-	</div>
-
-	</form>
-<!-- ENDIF -->
-
-<!-- IF S_SHOW_TOPICS -->
-
-	<!-- IF .searchresults -->
-	<div class="forumbg">
-
-		<div class="inner"><span class="corners-top"><span></span></span>
-		<ul class="topiclist">
-			<li class="header">
-				<dl class="icon">
-					<dt>{L_TOPICS}</dt>
-					<dd class="posts">{L_REPLIES}</dd>
-					<dd class="views">{L_VIEWS}</dd>
-					<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
-				</dl>
-			</li>
-		</ul>
-		<ul class="topiclist topics">
-
-		<!-- BEGIN searchresults -->
-			<li class="row<!-- IF searchresults.S_ROW_NUM is even --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-				<dl class="icon" style="background-image: url({searchresults.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-					<dt <!-- IF searchresults.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->>
-						<!-- IF searchresults.S_UNREAD_TOPIC --><a href="{searchresults.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF -->
-						<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a> {searchresults.ATTACH_ICON_IMG}
-						<!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED --><a href="{searchresults.U_MCP_QUEUE}">{searchresults.UNAPPROVED_IMG}</a> <!-- ENDIF -->
-						<!-- IF searchresults.S_TOPIC_REPORTED --><a href="{searchresults.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
-						<!-- IF searchresults.PAGINATION --><strong class="pagination"><span>{searchresults.PAGINATION}</span></strong><!-- ENDIF -->
-						{L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} &raquo; {searchresults.FIRST_POST_TIME}
-						<!-- IF not searchresults.S_TOPIC_GLOBAL -->{L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a><!-- ELSE --> ({L_GLOBAL})<!-- ENDIF -->
-					</dt>
-					<dd class="posts">{searchresults.TOPIC_REPLIES}</dd>
-					<dd class="views">{searchresults.TOPIC_VIEWS}</dd>
-					<dd class="lastpost"><span>
-						{L_POST_BY_AUTHOR} {searchresults.LAST_POST_AUTHOR_FULL}
-						<!-- IF not S_IS_BOT --><a href="{searchresults.U_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{searchresults.LAST_POST_TIME}<br /> </span>
-					</dd>
-				</dl>
-			</li>
-		<!-- END searchresults -->
-		</ul>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-	<!-- ELSE -->
-		<div class="panel">
-			<div class="inner"><span class="corners-top"><span></span></span>
-			<strong>{L_NO_SEARCH_RESULTS}</strong>
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-	<!-- ENDIF -->
-
-<!-- ELSE -->
-
-	<!-- BEGIN searchresults -->
-		<div class="search post <!-- IF searchresults.S_ROW_NUM is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF searchresults.S_POST_REPORTED --> reported<!-- ENDIF -->">
-			<div class="inner"><span class="corners-top"><span></span></span>
-
-	<!-- IF searchresults.S_IGNORE_POST -->
-		<div class="postbody">
-			{searchresults.L_IGNORE_POST}
-		</div>
-	<!-- ELSE -->
-		<div class="postbody">
-			<h3><a href="{searchresults.U_VIEW_POST}">{searchresults.POST_SUBJECT}</a></h3>
-			<div class="content">{searchresults.MESSAGE}</div>
-		</div>
-
-		<dl class="postprofile">
-			<dt class="author">{L_POST_BY_AUTHOR} {searchresults.POST_AUTHOR_FULL}</dt>
-			<dd>{searchresults.POST_DATE}</dd>
-			<dd>&nbsp;</dd>
-			<!-- IF searchresults.FORUM_TITLE -->
-				<dd>{L_FORUM}: <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></dd>
-				<dd>{L_TOPIC}: <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a></dd>
-			<!-- ELSE -->
-				<dd>{L_GLOBAL}: <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a></dd>
-			<!-- ENDIF -->
-			<dd>{L_REPLIES}: <strong>{searchresults.TOPIC_REPLIES}</strong></dd>
-			<dd>{L_VIEWS}: <strong>{searchresults.TOPIC_VIEWS}</strong></dd>
-		</dl>
-	<!-- ENDIF -->
-
-	<!-- IF not searchresults.S_IGNORE_POST -->
-		<ul class="searchresults">
-			<li ><a href="{searchresults.U_VIEW_POST}" class="{S_CONTENT_FLOW_END}">{L_JUMP_TO_POST}</a></li>
-		</ul>
-	<!-- ENDIF -->
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-	<!-- BEGINELSE -->
-		<div class="panel">
-			<div class="inner"><span class="corners-top"><span></span></span>
-			<strong>{L_NO_SEARCH_RESULTS}</strong>
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-	<!-- END searchresults -->
-<!-- ENDIF -->
-
-<!-- IF PAGINATION or .searchresults or S_SELECT_SORT_KEY or S_SELECT_SORT_DAYS -->
-	<form method="post" action="{S_SEARCH_ACTION}">
-
-	<fieldset class="display-options">
-		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-		<!-- IF S_SELECT_SORT_DAYS or S_SELECT_SORT_KEY -->
-			<label><!-- IF S_SHOW_TOPICS -->{L_DISPLAY_POSTS}<!-- ELSE -->{L_SORT_BY}</label><label><!-- ENDIF --> {S_SELECT_SORT_DAYS}<!-- IF S_SELECT_SORT_KEY --></label> <label>{S_SELECT_SORT_KEY}</label>
-			<label>{S_SELECT_SORT_DIR} <!-- ELSE --></label><!-- ENDIF --><input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
-		<!-- ENDIF -->
-	</fieldset>
-
-	</form>
-
-	<hr />
-<!-- ENDIF -->
-
-<!-- IF PAGINATION or .searchresults or PAGE_NUMBER -->
-	<ul class="linklist">
-		<li class="rightside pagination">
-			{SEARCH_MATCHES}<!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF -->
-		</li>
-	</ul>
-<!-- ENDIF -->
-
-<!-- INCLUDE jumpbox.html -->
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html
deleted file mode 100644
index e64e209368..0000000000
--- a/phpBB/styles/prosilver/template/simple_footer.html
+++ /dev/null
@@ -1,20 +0,0 @@
-	</div>
-<!--
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-	forums may be affected.
-
-	The phpBB Group : 2006
-//-->
-
-	<div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; 2000, 2002, 2005, 2007 phpBB Group
-		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
-		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
-	</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html
deleted file mode 100644
index 0e2409586c..0000000000
--- a/phpBB/styles/prosilver/template/simple_header.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
-<head>
-
-<meta http-equiv="content-type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="content-style-type" content="text/css" />
-<meta http-equiv="content-language" content="{S_USER_LANG}" />
-<meta http-equiv="imagetoolbar" content="no" />
-<meta name="resource-type" content="document" />
-<meta name="distribution" content="global" />
-<meta name="copyright" content="2000, 2002, 2005, 2007 phpBB Group" />
-<meta name="keywords" content="" />
-<meta name="description" content="" />
-{META}
-<title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
-
-<script type="text/javascript">
-// <![CDATA[
-
-	var jump_page = '{LA_JUMP_PAGE}:';
-	var on_page = '{ON_PAGE}';
-	var per_page = '{PER_PAGE}';
-	var base_url = '{A_BASE_URL}';
-	var style_cookie = 'phpBBstyle';
-	var onload_functions = new Array();
-	var onunload_functions = new Array();
-	var style_cookie_settings = '{A_COOKIE_SETTINGS}';
-
-	/**
-	* New function for handling multiple calls to window.onload and window.unload by pentapenguin
-	*/
-	window.onload = function()
-	{
-		for (var i = 0; i < onload_functions.length; i++)
-		{
-			eval(onload_functions[i]);
-		}
-	}
-
-	window.onunload = function()
-	{
-		for (var i = 0; i < onunload_functions.length; i++)
-		{
-			eval(onunload_functions[i]);
-		}
-	}
-
-// ]]>
-</script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/styleswitcher.js"></script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/forum_fn.js"></script>
-
-<link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" />
-<link href="{T_STYLESHEET_LINK}" rel="stylesheet" type="text/css" media="screen, projection" />
-
-<link href="{T_THEME_PATH}/normal.css" rel="alternate stylesheet" type="text/css" title="A" />
-<link href="{T_THEME_PATH}/medium.css" rel="alternate stylesheet" type="text/css" title="A+" />
-<link href="{T_THEME_PATH}/large.css" rel="alternate stylesheet" type="text/css" title="A++" />
-
-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-	<link href="{T_THEME_PATH}/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
-<!-- ENDIF -->
-
-<!-- DEFINE $POPUP = 1 -->
-
-</head>
-
-<body id="phpbb" class="{S_CONTENT_DIRECTION}">
-
-<div id="simple-wrap">
-	<a id="top" name="top" accesskey="t"></a>
-	<div id="page-body">
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/styleswitcher.js b/phpBB/styles/prosilver/template/styleswitcher.js
deleted file mode 100644
index 203d8e4c21..0000000000
--- a/phpBB/styles/prosilver/template/styleswitcher.js
+++ /dev/null
@@ -1,161 +0,0 @@
-
-function fontsizeup()
-{
-	var active = getActiveStyleSheet();
-
-	switch (active)
-	{
-		case 'A--':
-			setActiveStyleSheet('A-');
-		break;
-
-		case 'A-':
-			setActiveStyleSheet('A');
-		break;
-
-		case 'A':
-			setActiveStyleSheet('A+');
-		break;
-
-		case 'A+':
-			setActiveStyleSheet('A++');
-		break;
-
-		case 'A++':
-			setActiveStyleSheet('A');
-		break;
-
-		default:
-			setActiveStyleSheet('A');
-		break;
-	}
-}
-
-function fontsizedown()
-{
-	active = getActiveStyleSheet();
-
-	switch (active)
-	{
-		case 'A++' : 
-			setActiveStyleSheet('A+');
-		break;
-
-		case 'A+' : 
-			setActiveStyleSheet('A');
-		break;
-
-		case 'A' : 
-			setActiveStyleSheet('A-');
-		break;
-
-		case 'A-' : 
-			setActiveStyleSheet('A--');
-		break;
-
-		case 'A--' : 
-		break;
-
-		default :
-			setActiveStyleSheet('A--');
-		break;
-	}
-}
-
-function setActiveStyleSheet(title)
-{
-	var i, a, main;
-
-	for (i = 0; (a = document.getElementsByTagName('link')[i]); i++)
-	{
-		if (a.getAttribute('rel').indexOf('style') != -1 && a.getAttribute('title'))
-		{
-			a.disabled = true;
-			if (a.getAttribute('title') == title)
-			{
-				a.disabled = false;
-			}
-		}
-	}
-}
-
-function getActiveStyleSheet()
-{
-	var i, a;
-
-	for (i = 0; (a = document.getElementsByTagName('link')[i]); i++)
-	{
-		if (a.getAttribute('rel').indexOf('style') != -1 && a.getAttribute('title') && !a.disabled)
-		{
-			return a.getAttribute('title');
-		}
-	}
-
-	return null;
-}
-
-function getPreferredStyleSheet()
-{
-	return ('A-');
-}
-
-function createCookie(name, value, days)
-{
-	if (days)
-	{
-		var date = new Date();
-		date.setTime(date.getTime() + (days*24*60*60*1000));
-		var expires = '; expires=' + date.toGMTString();
-	}
-	else
-	{
-		expires = '';
-	}
-
-	document.cookie = name + '=' + value + expires + style_cookie_settings;
-}
-
-function readCookie(name)
-{
-	var nameEQ = name + '=';
-	var ca = document.cookie.split(';');
-
-	for (var i = 0; i < ca.length; i++)
-	{
-		var c = ca[i];
-
-		while (c.charAt(0) == ' ')
-		{
-			c = c.substring(1, c.length);
-		}
-
-		if (c.indexOf(nameEQ) == 0)
-		{
-			return c.substring(nameEQ.length, c.length);
-		}
-	}
-
-	return null;
-}
-
-function load_cookie()
-{
-	var cookie = readCookie('style_cookie');
-	var title = cookie ? cookie : getPreferredStyleSheet();
-	setActiveStyleSheet(title);
-}
-
-function unload_cookie()
-{
-	var title = getActiveStyleSheet();
-	createCookie('style_cookie', title, 365);
-}
-
-onload_functions.push('load_cookie()');
-onunload_functions.push('unload_cookie()');
-
-/*
-var cookie = readCookie("style");
-var title = cookie ? cookie : getPreferredStyleSheet();
-setActiveStyleSheet(title);
-*/
diff --git a/phpBB/styles/prosilver/template/template.cfg b/phpBB/styles/prosilver/template/template.cfg
deleted file mode 100644
index ebfc3f0d6b..0000000000
--- a/phpBB/styles/prosilver/template/template.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# phpBB Template Configuration File
-#
-# @package phpBB3
-# @copyright (c) 2006 phpBB Group 
-# @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-#
-#
-# At the left is the name, please do not change this
-# At the right the value is entered
-# For on/off options the valid values are on, off, 1, 0, true and false
-#
-# Values get trimmed, if you want to add a space in front or at the end of
-# the value, then enclose the value with single or double quotes. 
-# Single and double quotes do not need to be escaped.
-#
-# 
-
-# General Information about this template
-name = prosilver
-copyright = &copy; phpBB Group, 2007
-version = 3.0.3
-
-# Defining a different template bitfield
-template_bitfield = lNg=
diff --git a/phpBB/styles/prosilver/template/ucp_agreement.html b/phpBB/styles/prosilver/template/ucp_agreement.html
deleted file mode 100644
index 67dcb35e7b..0000000000
--- a/phpBB/styles/prosilver/template/ucp_agreement.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-
-<!-- IF S_SHOW_COPPA or S_REGISTRATION -->
-
-	<form method="post" action="{S_UCP_ACTION}" id="agreement">
-
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-		<div class="content">
-			<h2>{SITENAME} - {L_REGISTRATION}</h2>
-			<p><!-- IF S_SHOW_COPPA -->{L_COPPA_BIRTHDAY}<!-- ELSE -->{L_TERMS_OF_USE}<!-- ENDIF --></p>
-		</div>
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-		<fieldset class="submit-buttons">
-			<!-- IF S_SHOW_COPPA -->
-			<strong><a href="{U_COPPA_NO}" class="button1">{L_COPPA_NO}</a></strong>&nbsp; <a href="{U_COPPA_YES}" class="button2">{L_COPPA_YES}</a>
-			<!-- ELSE -->
-			<input type="submit" name="agreed" id="agreed" value="{L_AGREE}" class="button1" />&nbsp;
-			<input type="submit" name="not_agreed" value="{L_NOT_AGREE}" class="button2" />
-			<!-- ENDIF -->
-			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
-		</fieldset>
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-	</form>
-
-<!-- ELSEIF S_AGREEMENT -->
-
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-		<div class="content">
-			<h2>{SITENAME} - {AGREEMENT_TITLE}</h2>
-			<p>{AGREEMENT_TEXT}</p>
-			<hr class="dashed" />
-			<p><a href="{U_BACK}" class="button2">{L_BACK}</a></p>
-		</div>
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_attachments.html b/phpBB/styles/prosilver/template/ucp_attachments.html
deleted file mode 100644
index 4eccfaa69b..0000000000
--- a/phpBB/styles/prosilver/template/ucp_attachments.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
-
-<h2>{L_TITLE}</h2>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	
-	<p>{L_ATTACHMENTS_EXPLAIN}</p>
-
-	<!-- IF .attachrow -->
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL_ATTACHMENTS -->{TOTAL_ATTACHMENTS} {L_TITLE}<!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			</li>
-		</ul>	
-		
-		<ul class="topiclist">
-			<li class="header">
-				<dl>
-					<dt style="width: 40%"><a href="{U_SORT_FILENAME}">{L_FILENAME}</a></dt>
-					<dd class="extra"><a href="{U_SORT_DOWNLOADS}">{L_DOWNLOADS}</a></dd>
-					<dd class="time"><span><a href="{U_SORT_POST_TIME}">{L_POST_TIME}</a></span></dd>
-					<dd class="mark">{L_MARK}</dd>
-				</dl>
-			</li>
-		</ul>
-		<ul class="topiclist cplist">
-
-		<!-- BEGIN attachrow -->
-		<li class="row<!-- IF attachrow.S_ROW_NUM is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-			<dl>
-				<dt style="width: 40%"><a href="{attachrow.U_VIEW_ATTACHMENT}" class="topictitle">{attachrow.FILENAME}</a> ({attachrow.SIZE})<br />
-					<!-- IF attachrow.S_IN_MESSAGE -->{L_PM}: <!-- ELSE -->{L_TOPIC}: <!-- ENDIF --><a href="{attachrow.U_VIEW_TOPIC}">{attachrow.TOPIC_TITLE}</a></dt>
-				<dd class="extra">{attachrow.DOWNLOAD_COUNT}</dd>
-				<dd class="time"><span>{attachrow.POST_TIME}</span></dd>
-				<dd class="mark"><input type="checkbox" name="attachment[{attachrow.ATTACH_ID}]" value="1" /></dd>
-			</dl>
-		</li>
-		<!-- END attachrow -->
-		</ul>
-
-		<fieldset class="display-options">
-			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-			<label for="sk">{L_SORT_BY}: <select name="sk" id="sk">{S_SORT_OPTIONS}</select></label> 
-			<label><select name="sd" id="sd">{S_ORDER_SELECT}</select></label>
-			<input class="button2" type="submit" name="sort" value="{L_SORT}" />
-			{S_FORM_TOKEN}
-		</fieldset>
-
-		<hr />
-		
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL_ATTACHMENTS -->{TOTAL_ATTACHMENTS} {L_TITLE}<!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			</li>
-		</ul>
-	<!-- ELSE -->
-		<p><strong>{L_UCP_NO_ATTACHMENTS}</strong></p>
-	<!-- ENDIF -->
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-	
-<!-- IF S_ATTACHMENT_ROWS -->
-	<fieldset class="display-actions">	
-		<input class="button2" type="submit" name="delete" value="{L_DELETE_MARKED}" />
-		<div><a href="#" onclick="marklist('ucp', 'attachment', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('ucp', 'attachment', false); return false;">{L_UNMARK_ALL}</a></div>
-		{S_FORM_TOKEN}
-	</fieldset>
-<!-- ENDIF -->
-</form>
-
-<!-- INCLUDE ucp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
deleted file mode 100644
index d95166bf4d..0000000000
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ /dev/null
@@ -1,70 +0,0 @@
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	<!-- IF not S_AVATARS_ENABLED -->
-		<p>{L_AVATAR_FEATURES_DISABLED}</p>
-	<!-- ENDIF -->
-
-	<fieldset>
-	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
-	<dl>
-		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-		<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd>
-		<dd><label for="delete"><input type="checkbox" name="delete" id="delete" /> {L_DELETE_AVATAR}</label></dd>
-	</dl>
-
-	<!-- IF S_UPLOAD_AVATAR_FILE or S_CAN_UPLOAD -->
-		<dl>
-			<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
-			<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input type="file" name="uploadfile" id="uploadfile" class="inputbox autowidth" /></dd>
-		</dl>
-	<!-- ENDIF -->
-
-	<!-- IF S_UPLOAD_AVATAR_URL or S_EDIT -->
-		<dl>
-			<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-			<dd><input type="text" name="uploadurl" id="uploadurl" value="{AVATAR_URL}" class="inputbox" /></dd>
-		</dl>
-	<!-- ENDIF -->
-
-	<!-- IF S_LINK_AVATAR or S_EDIT -->
-		<dl>
-			<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-			<dd><input type="text" name="remotelink" id="remotelink" value="{AVATAR_REMOTE}" class="inputbox" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
-			<dd>
-				<label for="width"><input type="text" name="width" id="width" size="3" value="{AVATAR_WIDTH}" class="inputbox autowidth" /> px</label> &times;&nbsp; 
-				<label for="height"><input type="text" name="height" id="height" size="3" value="{AVATAR_HEIGHT}" class="inputbox autowidth" /> px</label>
-			</dd>
-		</dl>
-	<!-- ENDIF -->
-	</fieldset>
-	
-	<!-- IF S_IN_AVATAR_GALLERY -->
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<h3>{L_AVATAR_GALLERY}</h3>
-	
-		<fieldset>
-			<label for="category">{L_AVATAR_CATEGORY}: <select name="category" id="category">{S_CAT_OPTIONS}</select></label>
-			<input type="submit" value="{L_GO}" name="display_gallery" class="button2" />
-			<input type="submit" name="cancel" value="{L_CANCEL}" class="button2" />
-		</fieldset>
-
-		<div id="gallery">
-		<!-- BEGIN avatar_row --><!-- BEGIN avatar_column -->
-			<label for="av-{avatar_row.S_ROW_NUM}-{avatar_row.avatar_column.S_ROW_NUM}"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="" /><br />
-				<input type="radio" name="avatar_select" id="av-{avatar_row.S_ROW_NUM}-{avatar_row.avatar_column.S_ROW_NUM}" value="{avatar_row.avatar_column.AVATAR_FILE}" /></label>
-		<!-- END avatar_column --><!-- END avatar_row -->
-		</div>
-	
-	<!-- ENDIF -->
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
diff --git a/phpBB/styles/prosilver/template/ucp_footer.html b/phpBB/styles/prosilver/template/ucp_footer.html
deleted file mode 100644
index 4b3b14b4b7..0000000000
--- a/phpBB/styles/prosilver/template/ucp_footer.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-		</div>
-	<div class="clear"></div>
-
-	</div>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-<!-- IF S_COMPOSE_PM -->
-<div>{S_FORM_TOKEN}</div>
-</form>
-<!-- ENDIF -->
-
-<!-- INCLUDE jumpbox.html -->
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html
deleted file mode 100644
index b0cfac2e7c..0000000000
--- a/phpBB/styles/prosilver/template/ucp_groups_manage.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<h2<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR};"<!-- ENDIF -->>{L_USERGROUPS}<!-- IF GROUP_NAME --> :: {GROUP_NAME}<!-- ENDIF --></h2>
-
-<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	
-	<p>{L_GROUPS_EXPLAIN}</p>
-
-	<!-- IF S_EDIT -->
-		<h3>{L_GROUP_DETAILS}</h3>
-	
-		<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-		<!-- ENDIF -->
-	
-		<fieldset>
-		<dl>
-			<dt><label for="group_name">{L_GROUP_NAME}:</label></dt>
-			<dd><!-- IF S_SPECIAL_GROUP --><strong<!-- IF GROUP_COLOUR --> style="color: #{GROUP_COLOUR};"<!-- ENDIF -->>{GROUP_NAME}</strong> <input name="group_name" type="hidden" value="{GROUP_INTERNAL_NAME}" />
-				<!-- ELSE --><input name="group_name" type="text" id="group_name" value="{GROUP_INTERNAL_NAME}" class="inputbox" /><!-- ENDIF --></dd>
-		</dl>
-		<dl>
-			<dt><label for="group_desc">{L_GROUP_DESC}:</label></dt>
-			<dd><textarea id="group_desc" name="group_desc" rows="5" cols="45" class="inputbox">{GROUP_DESC}</textarea></dd>
-			<dd><label for="desc_parse_bbcode"><input type="checkbox" class="radio" name="desc_parse_bbcode" id="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>&nbsp;<label for="desc_parse_smilies"><input type="checkbox" class="radio" name="desc_parse_smilies" id="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>&nbsp;<label for="desc_parse_urls"><input type="checkbox" class="radio" name="desc_parse_urls" id="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
-		</dl>
-		<!-- IF not S_SPECIAL_GROUP -->
-		<dl>
-			<dt><label for="group_type1">{L_GROUP_TYPE}:</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
-			<dd>
-				<label for="group_type1"><input type="radio" class="radio" name="group_type" id="group_type1" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}</label> 
-				<label for="group_type2"><input type="radio" class="radio" name="group_type" id="group_type2" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}</label> 
-				<label for="group_type3"><input type="radio" class="radio" name="group_type" id="group_type3" value="{GROUP_TYPE_CLOSED}"{GROUP_CLOSED} /> {L_GROUP_CLOSED}</label> 
-				<label for="group_type4"><input type="radio" class="radio" name="group_type" id="group_type4" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN}</label>
-			</dd>
-		</dl>
-		<!-- ELSE -->
-			<input name="group_type" type="hidden" value="{GROUP_TYPE_SPECIAL}" />
-		<!-- ENDIF -->
-		</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	<h3>{L_GROUP_SETTINGS_SAVE}</h3>
-
-	<fieldset>
-	<dl>
-		<dt><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
-		<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="7" maxlength="7" class="inputbox narrow" /> <span style="background-color: {GROUP_COLOUR};">&nbsp;&nbsp;&nbsp;</span> [ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false;">{L_COLOUR_SWATCH}</a> ]</dd>
-	</dl>
-	<dl>
-		<dt><label for="group_rank">{L_GROUP_RANK}:</label></dt>
-		<dd><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></dd>
-	</dl>
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- INCLUDE ucp_avatar_options.html -->
-
-<fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}
-	<!-- IF S_DISPLAY_GALLERY --><input type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" class="button2" />&nbsp; <!-- ENDIF -->
-	<!-- IF S_IN_AVATAR_GALLERY --><input type="submit" name="cancel" value="{L_CANCEL}" class="button2" />&nbsp; <!-- ELSE -->
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; <!-- ENDIF -->
-	<input type="submit" name="update" value="{L_SUBMIT}" class="button1" />
-	{S_FORM_TOKEN}
-</fieldset>
-
-<!-- ELSEIF S_LIST -->
-
-	<!-- IF .leader -->
-	<table class="table1" cellspacing="1">
-	<thead>
-	<tr>
-		<th class="name">{L_GROUP_LEAD}</th>
-		<th class="info">{L_GROUP_DEFAULT}</th>
-		<th class="posts">{L_POSTS}</th>
-		<th class="joined">{L_JOINED}</th>
-		<th class="mark">{L_MARK}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN leader -->
-		<tr class="<!-- IF leader.S_ROW_NUM is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-			<td class="name">{leader.USERNAME_FULL}</td>
-			<td><!-- IF leader.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
-			<td class="posts">{leader.USER_POSTS}</td>
-			<td class="joined">{leader.JOINED}</td>
-			<td class="mark">&nbsp;</td>
-		</tr>
-	<!-- END leader -->
-	</tbody>
-	</table>
-	<!-- ENDIF -->
-
-	<!-- BEGIN member -->
-		<!-- IF member.S_PENDING -->
-			<table class="table1" cellspacing="1">
-			<thead>
-			<tr>
-				<th class="name">{L_GROUP_PENDING}</th>
-				<th class="info">{L_GROUP_DEFAULT}</th>
-				<th class="posts">{L_POSTS}</th>
-				<th class="joined">{L_JOINED}</th>
-				<th class="mark">{L_MARK}</th>
-			</tr>
-			</thead>
-			<tbody>
-		<!-- ELSEIF member.S_APPROVED -->
-			<!-- IF member.S_PENDING_SET -->
-				</tbody>
-				</table>
-			<!-- ENDIF -->
-			<table class="table1" cellspacing="1">
-			<thead>
-			<tr>
-				<th class="name">{L_GROUP_APPROVED}</th>
-				<th class="info">{L_GROUP_DEFAULT}</th>
-				<th class="posts">{L_POSTS}</th>
-				<th class="joined">{L_JOINED}</th>
-				<th class="mark">{L_MARK}</th>
-			</tr>
-			</thead>
-			<tbody>
-		<!-- ELSE -->
-			<tr class="<!-- IF member.S_ROW_NUM is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-				<td class="name">{member.USERNAME_FULL}</td>
-				<td><!-- IF member.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
-				<td class="posts">{member.USER_POSTS}</td>
-				<td class="joined">{member.JOINED}</td>
-				<td class="mark"><input type="checkbox" name="mark[]" value="{member.USER_ID}" /></td>
-			</tr>
-		<!-- ENDIF -->
-	<!-- BEGINELSE -->
-		<tr>
-			<td class="bg1" colspan="5">{L_GROUPS_NO_MEMBERS}</td>
-		</tr>
-	<!-- END member -->
-	</tbody>
-	</table>
-
-	<ul class="linklist">
-		<li class="leftside pagination">
-			<!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span><!-- ELSE -->{S_ON_PAGE}<!-- ENDIF -->
-		</li>
-	</ul>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<fieldset class="display-actions">	
-	<select name="action"><option value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select>
-	<input class="button2" type="submit" name="update" value="{L_SUBMIT}" />
-	<div><a href="#" onclick="marklist('ucp', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('ucp', 'mark', false); return false;">{L_UNMARK_ALL}</a></div>
-</fieldset>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h3>{L_ADD_USERS}</h3>
-
-	<p>{L_ADD_USERS_EXPLAIN}</p>
-
-	<fieldset>
-	<dl>
-		<dt><label for="default0">{L_USER_GROUP_DEFAULT}:</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt>
-		<dd>
-			<label for="default1"><input type="radio" name="default" id="default1" value="1" /> {L_YES}</label> 
-			<label for="default0"><input type="radio" name="default" id="default0" value="0" checked="checked" /> {L_NO}</label>
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
-		<dd><textarea name="usernames" id="usernames" rows="3" cols="30" class="inputbox"></textarea></dd>
-		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>
-	</dl>
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<fieldset class="submit-buttons">
-	<input class="button1" type="submit" name="addusers" value="{L_SUBMIT}" />
-	{S_FORM_TOKEN}
-</fieldset>
-
-<!-- ELSE -->
-
-	<!-- IF .leader -->
-		<ul class="topiclist">
-			<li class="header">
-				<dl>
-					<dt>{L_GROUP_LEADER}</dt>
-					<dd class="info"><span>{L_OPTIONS}</span></dd>
-				</dl>
-			</li>
-		</ul>
-		<ul class="topiclist cplist">
-
-		<!-- BEGIN leader -->
-		<li class="row<!-- IF attachrow.S_ROW_NUM is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-			<dl>
-				<dt><a href="{leader.U_EDIT}" class="topictitle"<!-- IF leader.GROUP_COLOUR --> style="color: #{leader.GROUP_COLOUR};"<!-- ENDIF -->>{leader.GROUP_NAME}</a>
-					<!-- IF leader.GROUP_DESC --><br />{leader.GROUP_DESC}<!-- ENDIF --></dt>
-				<dd class="option"><span><a href="{leader.U_EDIT}" >{L_EDIT}</a></span></dd>
-				<dd class="option"><span><a href="{leader.U_LIST}">{L_GROUP_LIST}</a></span></dd>
-			</dl>
-		</li>
-		<!-- END leader -->
-		</ul>
-	<!-- ELSE -->
-		<p><strong>{L_NO_LEADERS}</strong></p>
-	<!-- ENDIF -->
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- ENDIF -->
-</form>
-
-<!-- INCLUDE ucp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_groups_membership.html b/phpBB/styles/prosilver/template/ucp_groups_membership.html
deleted file mode 100644
index 79309249cf..0000000000
--- a/phpBB/styles/prosilver/template/ucp_groups_membership.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<h2>{L_USERGROUPS}</h2>
-
-<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<p>{L_GROUPS_EXPLAIN}</p>
-	<!-- DEFINE $SHOW_BUTTONS = 0 -->
-	<!-- IF .leader -->
-		<ul class="topiclist">
-			<li class="header">
-				<dl>
-					<dt>{L_GROUP_LEADER}</dt>
-					<dd class="mark">{L_SELECT}</dd>
-				</dl>
-			</li>
-		</ul>
-		<ul class="topiclist cplist">
-
-		<!-- BEGIN leader -->
-		<!-- IF not leader.GROUP_SPECIAL -->
-			<!-- DEFINE $SHOW_BUTTONS = 1 -->
-		<!-- ENDIF -->
-		<li class="row<!-- IF leader.S_ROW_NUM is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-			<dl>
-				<dt><!-- IF S_CHANGE_DEFAULT --><input title="{L_CHANGE_DEFAULT_GROUP}" type="radio" name="default"<!-- IF leader.S_GROUP_DEFAULT --> checked="checked"<!-- ENDIF --> value="{leader.GROUP_ID}" /> <!-- ENDIF -->
-				<a href="{leader.U_VIEW_GROUP}" class="forumtitle"<!-- IF leader.GROUP_COLOUR --> style="color:#{leader.GROUP_COLOUR}"<!-- ENDIF -->>{leader.GROUP_NAME}</a>
-				<!-- IF leader.GROUP_DESC --><br />{leader.GROUP_DESC}<!-- ENDIF -->
-				<!-- IF not leader.GROUP_SPECIAL --><br /><i>{leader.GROUP_STATUS}</i><!-- ENDIF -->
-				</dt>
-				<dd class="mark"><input type="radio" name="selected" value="{leader.GROUP_ID}" <!-- IF leader.GROUP_SPECIAL -->disabled="disabled"<!-- ENDIF --> /></dd>
-			</dl>
-		</li>
-		<!-- END leader -->
-		</ul>
-	<!-- ENDIF -->
-
-	<!-- IF .member -->
-		<ul class="topiclist">
-			<li class="header">
-				<dl>
-					<dt>{L_GROUP_MEMBER}</dt>
-					<dd class="mark">{L_SELECT}</dd>
-				</dl>
-			</li>
-		</ul>
-		<ul class="topiclist cplist">
-
-		<!-- BEGIN member -->
-		<!-- IF not member.GROUP_SPECIAL -->
-			<!-- DEFINE $SHOW_BUTTONS = 1 -->
-		<!-- ENDIF -->		
-		<li class="row<!-- IF member.S_ROW_NUM is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-			<dl>
-				<dt><!-- IF S_CHANGE_DEFAULT --><input title="{L_CHANGE_DEFAULT_GROUP}" type="radio" name="default"<!-- IF member.S_GROUP_DEFAULT --> checked="checked"<!-- ENDIF --> value="{member.GROUP_ID}" /> <!-- ENDIF -->
-				<a href="{member.U_VIEW_GROUP}" class="forumtitle"<!-- IF member.GROUP_COLOUR --> style="color:#{member.GROUP_COLOUR}"<!-- ENDIF -->>{member.GROUP_NAME}</a>
-				<!-- IF member.GROUP_DESC --><br />{member.GROUP_DESC}<!-- ENDIF -->
-				<!-- IF not member.GROUP_SPECIAL --><br /><i>{member.GROUP_STATUS}</i><!-- ENDIF -->
-				</dt>
-				<dd class="mark"><input type="radio" name="selected" value="{member.GROUP_ID}" <!-- IF member.GROUP_SPECIAL -->disabled="disabled"<!-- ENDIF --> /></dd>
-			</dl>
-		</li>
-		<!-- END member -->
-		</ul>
-	<!-- ENDIF -->
-	<span class="corners-bottom"><span></span></span></div>
-</div>	
-
-<!-- IF .pending -->
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>	
-		<ul class="topiclist">
-			<li class="header">
-				<dl>
-					<dt>{L_GROUP_PENDING}</dt>
-					<dd class="mark">{L_SELECT}</dd>
-				</dl>
-			</li>
-		</ul>
-		<ul class="topiclist cplist">
-
-		<!-- BEGIN pending -->
-		<!-- IF not pending.GROUP_SPECIAL -->
-			<!-- DEFINE $SHOW_BUTTONS = 1 -->
-		<!-- ENDIF -->			
-		<li class="row<!-- IF pending.S_ROW_NUM is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-			<dl>
-				<dt>
-				<a href="{pending.U_VIEW_GROUP}" class="forumtitle"<!-- IF pending.GROUP_COLOUR --> style="color:#{pending.GROUP_COLOUR}"<!-- ENDIF -->>{pending.GROUP_NAME}</a>
-				<!-- IF pending.GROUP_DESC --><br />{pending.GROUP_DESC}<!-- ENDIF -->
-				<!-- IF not pending.GROUP_SPECIAL --><br /><i>{pending.GROUP_STATUS}</i><!-- ENDIF -->
-				</dt>
-				<dd class="mark"><input type="radio" name="selected" value="{pending.GROUP_ID}" <!-- IF pending.GROUP_SPECIAL -->disabled="diabled"<!-- ENDIF --> /></dd>
-			</dl>
-		</li>
-		<!-- END pending -->
-		</ul>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-<!-- ENDIF -->
-<!-- IF .nonmember -->
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-		<ul class="topiclist">
-			<li class="header">
-				<dl>
-					<dt>{L_GROUP_NONMEMBER}</dt>
-					<dd class="mark">{L_SELECT}</dd>
-				</dl>
-			</li>
-		</ul>
-		<ul class="topiclist cplist">
-
-		<!-- BEGIN nonmember -->
-		<!-- IF nonmember.S_CAN_JOIN -->
-			<!-- DEFINE $SHOW_BUTTONS = 1 -->
-		<!-- ENDIF -->		
-		<li class="row<!-- IF nonmember.S_ROW_NUM is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-			<dl>
-				<dt>
-				<a href="{nonmember.U_VIEW_GROUP}" class="forumtitle"<!-- IF nonmember.GROUP_COLOUR --> style="color:#{nonmember.GROUP_COLOUR}"<!-- ENDIF -->>{nonmember.GROUP_NAME}</a>
-				<!-- IF nonmember.GROUP_DESC --><br />{nonmember.GROUP_DESC}<!-- ENDIF -->
-				<!-- IF not nonmember.GROUP_SPECIAL --><br /><i>{nonmember.GROUP_STATUS}</i><!-- ENDIF -->
-				</dt>
-				<dd class="mark"><input type="radio" name="selected" value="{nonmember.GROUP_ID}" <!-- IF not nonmember.S_CAN_JOIN -->disabled="disabled"<!-- ENDIF --> /></dd>
-			</dl>
-		</li>
-		<!-- END nonmember -->
-		</ul>
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-<!-- ENDIF -->
-	
-
-	<!-- IF S_CHANGE_DEFAULT or $SHOW_BUTTONS eq 1 -->
-	<fieldset>
-		<!-- IF S_CHANGE_DEFAULT -->
-		<div class="left-box">
-			<input class="button2" type="submit" name="change_default" value="{L_CHANGE_DEFAULT_GROUP}" />
-			{S_FORM_TOKEN}
-		</div>
-		<!-- ENDIF -->
-
-		<!-- IF $SHOW_BUTTONS eq 1 -->
-		<div class="right-box">
-			<label for="action">{L_SELECT}:</label> 
-			<select name="action" id="action">
-				<option value="join">{L_JOIN_SELECTED}</option>
-				<option value="resign">{L_RESIGN_SELECTED}</option>
-				<option value="demote">{L_DEMOTE_SELECTED}</option>
-			</select>&nbsp;
-			<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
-			{S_FORM_TOKEN}
-		</div>
-		<!-- ENDIF -->
-	</fieldset>
-	<!-- ENDIF -->
-
-</form>
-
-<!-- INCLUDE ucp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_header.html b/phpBB/styles/prosilver/template/ucp_header.html
deleted file mode 100644
index 4d008564c4..0000000000
--- a/phpBB/styles/prosilver/template/ucp_header.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<h2>{L_UCP}</h2>
-
-<div id="tabs">
-	<ul>
-		<!-- BEGIN t_block1 -->
-		<li <!-- IF t_block1.S_SELECTED -->class="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>
-		<!-- END t_block1 -->
-	</ul>
-</div>
-
-<!-- IF S_COMPOSE_PM -->
-<form id="postform" method="post" action="{S_POST_ACTION}"{S_FORM_ENCTYPE}>
-<!-- ENDIF -->
-
-<div class="panel bg3">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<div style="width: 100%;">
-
-	<div id="cp-menu">
-		<div id="navigation">
-
-		<!-- IF S_PRIVMSGS -->
-			<!-- BEGIN t_block2 -->
-				<!-- IF S_PRIVMSGS and not t_block2.S_LAST_ROW -->
-				<ul>
-					<!-- IF t_block2.S_SELECTED -->
-						<li id="active-subsection"><a href="{t_block2.U_TITLE}"><span>{t_block2.L_TITLE}</span></a></li>
-					<!-- ELSE -->
-						<li><a href="{t_block2.U_TITLE}"><span>{t_block2.L_TITLE}</span></a></li>
-					<!-- ENDIF -->
-				</ul>
-				<!-- ENDIF -->
-			<!-- END t_block2 -->
-
-			<hr />
-			<!-- BEGIN folder -->
-				<!-- IF folder.S_FIRST_ROW --><ul><!-- ENDIF -->
-				<!-- IF folder.S_CUR_FOLDER -->
-					<li id="active-subsection"><a href="{folder.U_FOLDER}"><!-- IF folder.UNREAD_MESSAGES > 0 --><strong>{folder.FOLDER_NAME} ({folder.UNREAD_MESSAGES})</strong><!-- ELSE -->{folder.FOLDER_NAME}<!-- ENDIF --></a></li>
-				<!-- ELSE -->
-					<li><a href="{folder.U_FOLDER}"><span><!-- IF folder.UNREAD_MESSAGES > 0 --><strong>{folder.FOLDER_NAME} ({folder.UNREAD_MESSAGES})</strong><!-- ELSE -->{folder.FOLDER_NAME}<!-- ENDIF --></span></a></li>
-				<!-- ENDIF -->
-				<!-- IF folder.S_LAST_ROW --></ul><!-- ENDIF -->
-			<!-- END folder -->
-			<hr />
-		<!-- ENDIF -->
-
-			<ul>
-		<!-- BEGIN t_block2 -->
-			<!-- IF (S_PRIVMSGS and t_block2.S_LAST_ROW) or not S_PRIVMSGS -->
-				<!-- IF t_block2.S_SELECTED -->
-					<li id="active-subsection"><a href="{t_block2.U_TITLE}"><span>{t_block2.L_TITLE}</span></a></li>
-				<!-- ELSE -->
-					<li><a href="{t_block2.U_TITLE}"><span>{t_block2.L_TITLE}</span></a></li>
-				<!-- ENDIF -->
-			<!-- ENDIF -->
-		<!-- END t_block2 -->
-			</ul>
-		</div>
-
-		<!-- IF .friends_online or .friends_offline -->
-		<div class="cp-mini">
-			<div class="inner"><span class="corners-top"><span></span></span>
-
-			<dl class="mini">
-				<dt>{L_FRIENDS}</dt>
-
-				<!-- BEGIN friends_online -->
-					<dd class="friend-online" title="{L_FRIENDS_ONLINE}">{friends_online.USERNAME_FULL} <!-- IF S_SHOW_PM_BOX --> <input type="submit" name="add_to[{friends_online.USER_ID}]" value="{L_ADD}" class="button2" /><!-- ENDIF --><!-- IF friends_online.S_LAST_ROW and .friends_offline --><hr /><!-- ENDIF --></dd>
-				<!-- END friends_online -->
-
-				<!-- BEGIN friends_offline -->
-					<dd class="friend-offline" title="{L_FRIENDS_OFFLINE}">{friends_offline.USERNAME_FULL} <!-- IF S_SHOW_PM_BOX --><input type="submit" name="add_to[{friends_offline.USER_ID}]" value="{L_ADD}" class="button2" /><!-- ENDIF --></dd>
-				<!-- END friends_offline -->
-			</dl>
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-		<!-- ENDIF -->
-
-		<!-- IF S_SHOW_COLOUR_LEGEND -->
-		<div class="cp-mini">
-			<div class="inner"><span class="corners-top"><span></span></span>
-
-			<dl class="mini">
-				<dt>{L_MESSAGE_COLOURS}</dt>
-				<!-- BEGIN pm_colour_info -->
-					<dd class="pm-legend<!-- IF pm_colour_info.CLASS --> {pm_colour_info.CLASS}<!-- ENDIF -->"><!-- IF pm_colour_info.IMG -->{pm_colour_info.IMG} <!-- ENDIF -->{pm_colour_info.LANG}</dd>
-				<!-- END pm_colour_info -->
-			</dl>
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-		<!-- ENDIF -->
-
-	</div>
-
-	<div id="cp-main" class="ucp-main">
diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
deleted file mode 100644
index af3c2398a0..0000000000
--- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
-
-<h2>{L_TITLE}</h2>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<p>{L_BOOKMARKS_EXPLAIN}</p>
-
-<!-- IF S_NO_DISPLAY_BOOKMARKS -->
-	<p class="error">{L_BOOKMARKS_DISABLED}</p>
-<!-- ELSE -->
-
-<!-- IF .topicrow -->
-	<ul class="topiclist">
-		<li class="header">
-			<dl class="icon">
-				<dt>{L_BOOKMARKS}</dt>
-				<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
-			</dl>
-		</li>
-	</ul>
-	<ul class="topiclist cplist">
-
-	<!-- BEGIN topicrow -->
-		<li class="row<!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ELSEIF topicrow.S_ROW_NUM is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-			<!-- IF topicrow.S_DELETED_TOPIC -->
-				<dl><dt><strong>{L_DELETED_TOPIC}</strong></dt>
-				<dd class="mark"><input type="checkbox" name="t[{topicrow.TOPIC_ID}]" id="t{topicrow.TOPIC_ID}" /></dd>
-				</dl>
-			<!-- ELSE -->
-			<dl class="icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-				<dt<!-- IF topicrow.TOPIC_ICON_IMG --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
-					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
-					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
-					<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
-					<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF -->
-					<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
-				</dt>
-				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
-					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span>
-				</dd>
-				<dd class="mark"><input type="checkbox" name="t[{topicrow.TOPIC_ID}]" id="t{topicrow.TOPIC_ID}" /></dd>
-			</dl>
-			<!-- ENDIF -->
-		</li>
-	<!-- END topicrow -->
-	</ul>
-	<ul class="linklist">
-		<li class="rightside pagination">
-			<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS} <!-- ENDIF -->
-			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-		</li>
-	</ul>
-<!-- ELSE -->
-	<p><strong>{L_NO_BOOKMARKS}</strong></p>
-<!-- ENDIF -->
-
-<!-- ENDIF -->
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- IF .topicrow and not S_NO_DISPLAY_BOOKMARKS -->
-	<fieldset class="display-actions">
-		<input type="submit" name="unbookmark" value="{L_REMOVE_BOOKMARK_MARKED}" class="button2" />
-		<div><a href="#" onclick="marklist('ucp', '', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('ucp', '', false); return false;">{L_UNMARK_ALL}</a></div>
-		{S_FORM_TOKEN}
-	</fieldset>
-<!-- ENDIF -->
-</form>
-
-<!-- INCLUDE ucp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_main_drafts.html b/phpBB/styles/prosilver/template/ucp_main_drafts.html
deleted file mode 100644
index 536c47a6a2..0000000000
--- a/phpBB/styles/prosilver/template/ucp_main_drafts.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<form id="postform" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
-
-<h2>{L_TITLE}</h2>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<p>{L_DRAFTS_EXPLAIN}</p>
-
-<!-- IF S_EDIT_DRAFT -->
-
-		<!-- INCLUDE posting_editor.html -->
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-			<fieldset class="submit-buttons">
-				{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-				<input type="submit" name="submit" value="{L_SAVE}" class="button1" />
-				{S_FORM_TOKEN}
-			</fieldset>
-
-<!-- ELSE -->
-
-	<!-- IF .draftrow -->
-		<ul class="topiclist">
-			<li class="header">
-				<dl>
-					<dt>{L_DRAFT_TITLE}</dt>
-					<dd class="info"><span>{L_SAVE_DATE}</span></dd>
-					<dd class="mark">{L_MARK}</dd>
-				</dl>
-			</li>
-		</ul>
-		<ul class="topiclist cplist">
-
-		<!-- BEGIN draftrow -->
-			<li class="row<!-- IF draftrow.S_ROW_NUM is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-				<dl>
-					<dt>
-						<a class="topictitle" href="{draftrow.U_VIEW_EDIT}">{draftrow.DRAFT_SUBJECT}</a><br />
-						<!-- IF draftrow.S_LINK_TOPIC -->{L_TOPIC}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
-						<!-- ELSEIF draftrow.S_LINK_FORUM -->{L_FORUM}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
-						<!-- ELSEIF S_PRIVMSGS -->
-						<!-- ELSE -->{L_NO_TOPIC_FORUM}<!-- ENDIF -->
-					</dt>
-					<dd class="info"><span>{draftrow.DATE}<br /><!-- IF draftrow.U_INSERT --><a href="{draftrow.U_INSERT}">{L_LOAD_DRAFT}</a> &bull; <!-- ENDIF --><a href="{draftrow.U_VIEW_EDIT}">{L_VIEW_EDIT}</a></span></dd>
-					<dd class="mark"><input type="checkbox" name="d[{draftrow.DRAFT_ID}]" id="d{draftrow.DRAFT_ID}" /></dd>
-				</dl>
-			</li>
-		<!-- END draftrow -->
-		</ul>
-	<!-- ELSE -->
-		<p><strong>{L_NO_SAVED_DRAFTS}</strong></p>
-	<!-- ENDIF -->
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<!-- IF .draftrow -->
-		<fieldset class="display-actions">
-			<input class="button2" type="submit" name="delete" value="{L_DELETE_MARKED}" />
-			<div><a href="#" onclick="marklist('postform', '', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('postform', '', false); return false;">{L_UNMARK_ALL}</a></div>
-			{S_FORM_TOKEN}
-		</fieldset>
-	<!-- ENDIF -->
-
-<!-- ENDIF -->
-
-</form>
-
-<!-- INCLUDE ucp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html
deleted file mode 100644
index 11ea7a5843..0000000000
--- a/phpBB/styles/prosilver/template/ucp_main_front.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<h2>{L_TITLE}</h2>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<p>{L_UCP_WELCOME}</p>
-
-<!-- IF .topicrow -->
-	<h3>{L_IMPORTANT_NEWS}</h3>
-
-	<ul class="topiclist cplist">
-	<!-- BEGIN topicrow -->
-		<li class="row<!-- IF topicrow.S_ROW_NUM is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-			<dl class="icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-				<dt <!-- IF topicrow.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->>
-					<!-- IF topicrow.S_UNREAD --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a><br />
-					<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF -->
-					<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
-				</dt>
-				<dd class="lastpost"><span>{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
-					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span>
-				</dd>
-			</dl>
-		</li>
-	<!-- END topicrow -->
-	</ul>
-<!-- ENDIF -->
-
-	<h3>{L_YOUR_DETAILS}</h3>
-
-	<dl class="details">
-		<dt>{L_JOINED}:</dt> <dd>{JOINED}</dd>
-		<dt>{L_VISITED}:</dt> <dd>{LAST_VISIT_YOU}</dd>
-		<dt>{L_TOTAL_POSTS}:</dt> <dd><!-- IF POSTS_PCT -->{POSTS} | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></strong><br />({POSTS_DAY} / {POSTS_PCT})<!-- ELSE -->{POSTS}<!-- ENDIF --></dd>
-		<!-- IF ACTIVE_FORUM --><dt>{L_ACTIVE_IN_FORUM}:</dt> <dd><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})</dd><!-- ENDIF -->
-		<!-- IF ACTIVE_TOPIC --><dt>{L_ACTIVE_IN_TOPIC}:</dt> <dd><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})</dd><!-- ENDIF -->
-		<!-- IF WARNINGS --><dt>{L_YOUR_WARNINGS}:</dt> <dd class="error">{WARNING_IMG} [{WARNINGS}]</dd><!-- ENDIF -->
-	</dl>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- INCLUDE ucp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
deleted file mode 100644
index 89a879847e..0000000000
--- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
-
-<h2>{L_TITLE}</h2>
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<p>{L_WATCHED_EXPLAIN}</p>
-
-<!-- IF .forumrow -->
-	<ul class="topiclist">
-		<li class="header">
-			<dl class="icon">
-				<dt>{L_WATCHED_FORUMS}</dt>
-				<dd class="lastpost">{L_LAST_POST}</dd>
-				<dd class="mark">{L_MARK}</dd>
-			</dl>
-		</li>
-	</ul>
-	<ul class="topiclist cplist">
-
-	<!-- BEGIN forumrow -->
-		<li class="row<!-- IF forumrow.S_ROW_NUM is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-			<dl class="icon" style="background-image: url({forumrow.FORUM_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-				<dt><a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a><br />{forumrow.FORUM_DESC}</dt>
-				<dd class="lastpost"><!-- IF forumrow.LAST_POST_TIME --><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {forumrow.LAST_POST_AUTHOR_FULL}
-					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{forumrow.LAST_POST_TIME}</span>
-					<!-- ELSE -->{L_NO_POSTS}<br />&nbsp;<!-- ENDIF -->
-				</dd>
-				<dd class="mark"><input type="checkbox" name="f[{forumrow.FORUM_ID}]" id="f{forumrow.FORUM_ID}" /></dd>
-			</dl>
-		</li>
-	<!-- END forumrow -->
-	</ul>
-<!-- ELSEIF S_FORUM_NOTIFY -->
-	<p><strong>{L_NO_WATCHED_FORUMS}</strong></p>
-<!-- ENDIF -->
-
-<!-- IF .topicrow -->
-	<ul class="topiclist">
-		<li class="header">
-			<dl class="icon">
-				<dt>{L_WATCHED_TOPICS}</dt>
-				<dd class="lastpost">{L_LAST_POST}</dd>
-				<dd class="mark">{L_MARK}</dd>
-			</dl>
-		</li>
-	</ul>
-	<ul class="topiclist cplist">
-
-	<!-- BEGIN topicrow -->
-		<li class="row<!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ELSEIF topicrow.S_ROW_NUM is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-			<dl class="icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-				<dt<!-- IF topicrow.TOPIC_ICON_IMG --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
-					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
-					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
-					<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
-					<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF -->
-					<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
-				</dt>
-				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
-					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span>
-				</dd>
-				<dd class="mark"><input type="checkbox" name="t[{topicrow.TOPIC_ID}]" id="t{topicrow.TOPIC_ID}" /></dd>
-			</dl>
-		</li>
-	<!-- END topicrow -->
-	</ul>
-	<ul class="linklist">
-		<li class="rightside pagination">
-			<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS} <!-- ENDIF -->
-			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-		</li>
-	</ul>
-<!-- ELSEIF S_TOPIC_NOTIFY -->
-	<p><strong>{L_NO_WATCHED_TOPICS}</strong></p>
-<!-- ENDIF -->
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- IF .topicrow or .forumrow -->
-	<fieldset class="display-actions">
-		<input type="submit" name="unwatch" value="{L_UNWATCH_MARKED}" class="button2" />
-		<div><a href="#" onclick="marklist('ucp', 't', true); marklist('ucp', 'f', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('ucp', 't', false); marklist('ucp', 'f', false); return false;">{L_UNMARK_ALL}</a></div>
-		{S_FORM_TOKEN}
-	</fieldset>
-<!-- ENDIF -->
-</form>
-
-<!-- INCLUDE ucp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html
deleted file mode 100644
index 7dcb199eb5..0000000000
--- a/phpBB/styles/prosilver/template/ucp_pm_history.html
+++ /dev/null
@@ -1,32 +0,0 @@
-
-<h3 id="review">
-	<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span>
-	{L_MESSAGE_HISTORY}: {HISTORY_TITLE}
-</h3>
-
-<div id="topicreview">
-	<!-- BEGIN history_row -->
-	<div class="post <!-- IF history_row.S_ROW_NUM is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="postbody" id="pr{history_row.MSG_ID}">
-			<!-- IF history_row.U_QUOTE or history_row.MESSAGE_AUTHOR_QUOTE -->
-			<ul class="profile-icons">
-				<li class="quote-icon"><a <!-- IF history_row.U_QUOTE -->href="{history_row.U_QUOTE}"<!-- ELSE -->href="#postingbox" onclick="addquote({history_row.MSG_ID}, '{history_row.MESSAGE_AUTHOR_QUOTE}');"<!-- ENDIF --> title="{L_QUOTE} {history_row.MESSAGE_AUTHOR}"><span>{L_QUOTE} {history_row.MESSAGE_AUTHOR}</span></a></li>
-			</ul>
-			<!-- ENDIF -->
-
-			<h3><a href="{history_row.U_VIEW_MESSAGE}" <!-- IF history_row.S_CURRENT_MSG -->class="current"<!-- ENDIF -->>{history_row.SUBJECT}</a></h3>
-			<p class="author<!-- IF history_row.S_CURRENT_MSG --> current<!-- ENDIF -->">{history_row.MINI_POST_IMG} {L_SENT_AT}: <strong>{history_row.SENT_DATE}</strong><br />
-				{L_MESSAGE_BY_AUTHOR} {history_row.MESSAGE_AUTHOR_FULL}</p>
-			<div class="content<!-- IF history_row.S_CURRENT_MSG --> current<!-- ENDIF -->">{history_row.MESSAGE}</div>
-			<div id="message_{history_row.MSG_ID}" style="display: none;">{history_row.DECODED_MESSAGE}</div>
-		</div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-	<!-- END history_row -->
-</div>
-
-<hr />
-<p><a href="#cp-main" class="top2">{L_BACK_TO_TOP}</a></p>
diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_footer.html b/phpBB/styles/prosilver/template/ucp_pm_message_footer.html
deleted file mode 100644
index acf6f24af1..0000000000
--- a/phpBB/styles/prosilver/template/ucp_pm_message_footer.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<div>{S_FORM_TOKEN}</div>
-</form>
diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
deleted file mode 100644
index f9eb1cc102..0000000000
--- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<h2>{L_TITLE}<!-- IF CUR_FOLDER_NAME -->: {CUR_FOLDER_NAME}<!-- ENDIF --></h2>
-
-<form id="viewfolder" method="post" action="{S_PM_ACTION}">
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF -->
-	
-		<!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM -->
-		<div class="buttons">
-			<!-- IF U_POST_REPLY_PM --><div class="pmreply-icon"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_POST_REPLY_PM}</a></div>
-			<!-- ELSEIF U_POST_NEW_TOPIC --><div class="newpm-icon"><a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}"><span></span>{L_UCP_PM_COMPOSE}</a></div><!-- ENDIF -->
-			<!-- IF U_FORWARD_PM --><div class="forwardpm-icon"><a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}"><span></span>{L_FORWARD_PM}</a></div><!-- ENDIF -->
-		</div>
-		<!-- ENDIF -->
-
-		<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
-	<ul class="linklist">
-		<li class="rightside pagination">
-			<!-- IF S_VIEW_MESSAGE --><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO} {CUR_FOLDER_NAME}</a><!-- ENDIF -->
-			<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
-				<!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES}<!-- ENDIF -->
-				<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-			<!-- ENDIF -->
-		</li>
-	</ul>
-		<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_pm_options.html b/phpBB/styles/prosilver/template/ucp_pm_options.html
deleted file mode 100644
index a8693ac9b9..0000000000
--- a/phpBB/styles/prosilver/template/ucp_pm_options.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<h2>{L_TITLE}</h2>
-
-<form id="ucp" method="post" action="{S_UCP_ACTION}">
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<!-- IF ERROR_MESSAGE --><p class="error">{ERROR_MESSAGE}</p><!-- ENDIF -->
-	<!-- IF NOTIFICATION_MESSAGE --><p class="error">{NOTIFICATION_MESSAGE}</p><!-- ENDIF -->
-	
-	<h3>{L_DEFINED_RULES}</h3>
-
-	<ol class="def-rules">
-	<!-- BEGIN rule -->
-		<li><div class="right-box"><input type="submit" name="delete_rule[{rule.RULE_ID}]" value="{L_DELETE_RULE}" class="button2" /></div><strong>{L_IF}</strong> {rule.CHECK} <em>{rule.RULE}</em> <!-- IF rule.STRING --><strong>{rule.STRING}</strong> | <!-- ENDIF -->{rule.ACTION}<!-- IF rule.FOLDER -->: {rule.FOLDER}<!-- ENDIF --><div style="clear: both;"></div></li>
-	<!-- BEGINELSE -->
-		<li><strong>{L_NO_RULES_DEFINED}</strong></li>
-	<!-- END rule -->
-	</ol>
-
-	<h3>{L_ADD_NEW_RULE}</h3>
-
-	<fieldset class="fields2">
-
-	<!-- IF S_CHECK_DEFINED -->
-		<dl>
-			<dt><label<!-- IF S_CHECK_SELECT --> for="check_option"<!-- ENDIF -->>{L_IF}:</label></dt>
-			<dd>
-				<!-- IF S_CHECK_SELECT --><select name="check_option" id="check_option">{S_CHECK_OPTIONS}</select> <input type="submit" name="next" value="{L_NEXT_STEP}" class="button2" /><!-- ELSE -->{CHECK_CURRENT}<input type="hidden" name="check_option" value="{CHECK_OPTION}" /><!-- ENDIF -->
-			</dd>
-		</dl>
-	<!-- ENDIF -->
-
-	<!-- IF S_RULE_DEFINED -->
-		<dl>
-			<dt><!-- IF S_RULE_SELECT --><input type="submit" name="back[rule]" value="{L_PREVIOUS_STEP}" class="button2" /><!-- ELSE --><label>&nbsp;</label><!-- ENDIF --></dt>
-			<dd><!-- IF S_RULE_SELECT --><select name="rule_option" id="rule_option">{S_RULE_OPTIONS}</select> <input type="submit" name="next" value="{L_NEXT_STEP}" class="button2" /><!-- ELSE --><em>{RULE_CURRENT}</em><input type="hidden" name="rule_option" value="{RULE_OPTION}" /><!-- ENDIF --></dd>
-		</dl>
-	<!-- ENDIF -->
-
-	<!-- IF S_COND_DEFINED -->
-		<!-- IF S_COND_SELECT or COND_CURRENT -->
-			<dl>
-				<dt><!-- IF S_COND_SELECT --><input type="submit" name="back[cond]" value="{L_PREVIOUS_STEP}" class="button2" /><!-- ELSE --><label>&nbsp;</label><!-- ENDIF --></dt>
-				<dd>
-					<!-- IF S_COND_SELECT -->
-						<!-- IF S_TEXT_CONDITION -->
-							<input type="text" name="rule_string" value="{CURRENT_STRING}" class="inputbox medium" maxlength="250" />
-						<!-- ELSEIF S_USER_CONDITION -->
-							<input type="text" name="rule_string" value="{CURRENT_STRING}" class="inputbox tiny" />&nbsp;<span>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span>
-						<!-- ELSEIF S_GROUP_CONDITION -->
-							<input type="hidden" name="rule_string" value="{CURRENT_STRING}" /><!-- IF S_GROUP_OPTIONS --><select name="rule_group_id">{S_GROUP_OPTIONS}</select><!-- ELSE -->{L_NO_GROUPS}<!-- ENDIF -->
-						<!-- ENDIF -->
-						<input type="submit" name="next" value="{L_NEXT_STEP}" class="button2" />
-					<!-- ELSE -->
-						<strong>{COND_CURRENT}</strong><input type="hidden" name="rule_string" value="{CURRENT_STRING}" /><input type="hidden" name="rule_user_id" value="{CURRENT_USER_ID}" /><input type="hidden" name="rule_group_id" value="{CURRENT_GROUP_ID}" />
-					<!-- ENDIF -->
-				</dd>
-			</dl>
-		<!-- ENDIF -->
-		<input type="hidden" name="cond_option" value="{COND_OPTION}" />
-	<!-- ENDIF -->
-
-
-	<!-- IF NONE_CONDITION --><input type="hidden" name="cond_option" value="none" /><!-- ENDIF -->
-
-	<!-- IF S_ACTION_DEFINED -->
-		<dl>
-			<dt><!-- IF S_ACTION_SELECT --><input type="submit" name="back[action]" value="{L_PREVIOUS_STEP}" class="button2" /><!-- ELSE --><label>&nbsp;</label><!-- ENDIF --></dt>
-			<dd><!-- IF S_ACTION_SELECT --> <select name="action_option">{S_ACTION_OPTIONS}</select> <input type="submit" name="add_rule" value="{L_ADD_RULE}" class="button1" /><!-- ELSE -->{ACTION_CURRENT}<input type="hidden" name="action_option" value="{ACTION_OPTION}" /><!-- ENDIF --></dd>
-		</dl>
-	<!-- ENDIF -->
-
-	</fieldset>
-
-	<h3>{L_FOLDER_OPTIONS}</h3>
-
-	<fieldset class="fields2">
-
-	<!-- IF not S_MAX_FOLDER_ZERO -->
-	<dl>
-		<dt><label for="foldername">{L_ADD_FOLDER}:</label></dt>
-		<dd><!-- IF S_MAX_FOLDER_REACHED -->{L_MAX_FOLDER_REACHED}<!-- ELSE --><input type="text" class="inputbox medium" name="foldername" id="foldername" size="30" maxlength="30" /> <input class="button2" type="submit" name="addfolder" value="{L_ADD}" /><!-- ENDIF --></dd>
-	</dl>
-	<!-- IF S_FOLDER_OPTIONS --><hr class="dashed" /><!-- ENDIF -->
-	<!-- ENDIF -->
-
-	
-
-	<!-- IF S_FOLDER_OPTIONS -->
-		<dl>
-			<dt><label for="rename_folder_id">{L_RENAME_FOLDER}:</label></dt>
-			<dd><select name="rename_folder_id" id="rename_folder_id">{S_FOLDER_OPTIONS}</select></dd>
-			<dt><label for="new_folder_name">{L_NEW_FOLDER_NAME}:</label></dt>
-			<dd><input type="text" class="inputbox tiny" name="new_folder_name" id="new_folder_name" maxlength="30" /> <input class="button2" type="submit" name="rename_folder" value="{L_RENAME}" /></dd>
-		</dl>
-		<hr class="dashed" />
-		<dl>
-			<dt><label for="remove_folder_id">{L_REMOVE_FOLDER}:</label></dt>
-			<dd><select name="remove_folder_id" id="remove_folder_id">{S_FOLDER_OPTIONS}</select></dd>
-			<dd style="margin-top: 3px;"><label for="remove_action1"><input type="radio" name="remove_action" id="remove_action1" value="1" checked="checked" /> {L_MOVE_DELETED_MESSAGES_TO}:</label> <select name="move_to">{S_TO_FOLDER_OPTIONS}</select></dd>
-			<dd style="margin-top: 3px;"><label for="remove_action2"><input type="radio" name="remove_action" id="remove_action2" value="2" /> {L_DELETE_MESSAGES_IN_FOLDER}</label></dd>
-			<dd style="margin-top: 3px;"><input class="button2" type="submit" name="remove_folder" value="{L_REMOVE}" /></dd>
-		</dl>
-	<!-- ENDIF -->
-
-	<hr class="dashed" />
-
-	<dl>
-		<dt><label for="full_action1">{L_IF_FOLDER_FULL}:</label></dt>
-		<dd style="margin-top: 3px;"><label for="full_action1"><input type="radio" name="full_action" id="full_action1" value="1"{S_DELETE_CHECKED} /> {L_DELETE_OLDEST_MESSAGES}</label></dd>
-		<dd style="margin-top: 3px;"><label for="full_action2"><input type="radio" name="full_action" id="full_action2" value="2"{S_MOVE_CHECKED} /> {L_MOVE_TO_FOLDER}:</label> <select name="full_move_to">{S_FULL_FOLDER_OPTIONS}</select></dd>
-		<dd style="margin-top: 3px;"><label for="full_action3" style="white-space:normal;"><input type="radio" name="full_action" id="full_action3" value="3"{S_HOLD_CHECKED} /> {L_HOLD_NEW_MESSAGES}</label></dd>
-	</dl>
-
-
-	<dl>
-		<dt><label>{L_DEFAULT_ACTION}:</label><br /><span>{L_DEFAULT_ACTION_EXPLAIN}</span></dt>
-		<dd>{DEFAULT_ACTION}</dd>
-		<dd><input class="button2" type="submit" name="fullfolder" value="{L_CHANGE}" /></dd>
-	</dl>
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-	{S_FORM_TOKEN}
-</div>
-</form>
-
-<!-- INCLUDE ucp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_pm_popup.html b/phpBB/styles/prosilver/template/ucp_pm_popup.html
deleted file mode 100644
index 325362dc4d..0000000000
--- a/phpBB/styles/prosilver/template/ucp_pm_popup.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-
-<script type="text/javascript">
-// <![CDATA[
-/**
-* Jump to inbox
-*/
-function jump_to_inbox(url)
-{
-	opener.document.location.href = url.replace(/&amp;/g, '&');
-	window.close();
-}
-// ]]>
-</script>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	<div class="content">
-		<p><!-- IF S_NOT_LOGGED_IN -->{L_LOGIN_CHECK_PM}<!-- ELSE -->{MESSAGE}<br /><br />{CLICK_TO_VIEW}<!-- ENDIF --></p>
-		<p class="small"><a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a></p>
-	</div>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- INCLUDE simple_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
deleted file mode 100644
index 1a8c1e5aa1..0000000000
--- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<!-- IF not PROMPT -->
-	<!-- INCLUDE ucp_pm_message_header.html -->
-<!-- ENDIF -->
-
-
-<!-- IF PROMPT -->
-	<h2>{L_EXPORT_AS_CSV}</h2>
-	<form id="viewfolder" method="post" action="{S_PM_ACTION}">
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>				
-		<h3>{L_OPTIONS}</h3>
-		<fieldset>
-			<dl>
-				<dt><label for="delimiter">{L_DELIMITER}:</label></dt>
-				<dd><input class="inputbox" type="text" id="delimiter" name="delimiter" value="," /></dd>
-			</dl>
-			<dl>
-				<dt><label for="enclosure">{L_ENCLOSURE}:</label></dt>
-				<dd><input class="inputbox" type="text" id="enclosure" name="enclosure" value="&#034;" /></dd>
-			</dl>	
-		</fieldset>
-		<span class="corners-bottom"><span></span></span></div>	
-	</div>	
-	<fieldset class="submit-buttons">
-		<input type="hidden" name="export_option" value="CSV" />
-		<input class="button1" type="submit" name="submit_export" value="{L_EXPORT_FOLDER}" />&nbsp;
-		<input class="button2" type="reset" value="Reset" name="reset" />&nbsp;
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSE -->
-
-	<!-- IF NUM_REMOVED -->
-		<div class="notice">
-			<p>{RULE_REMOVED_MESSAGES}</p>
-		</div>
-	<!-- ENDIF -->
-	
-	<!-- IF NUM_NOT_MOVED -->
-		<div class="notice">
-			<p>{NOT_MOVED_MESSAGES}<br />{RELEASE_MESSAGE_INFO}</p>
-		</div>	
-	<!-- ENDIF -->
-	
-	<!-- IF .messagerow -->
-		<ul class="topiclist">
-			<li class="header">
-				<dl>
-					<dt>{L_MESSAGE}</dt>
-					<dd class="mark">{L_MARK}</dd>
-				</dl>
-			</li>
-		</ul>
-		<ul class="topiclist cplist pmlist">
-	
-		<!-- BEGIN messagerow -->
-			<li class="row<!-- IF messagerow.S_ROW_NUM is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF messagerow.PM_CLASS --> {messagerow.PM_CLASS}<!-- ENDIF -->">
-				<dl class="icon" style="background-image: url({messagerow.FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-					<dt<!-- IF messagerow.PM_ICON_URL and S_PM_ICONS --> style="background-image: url({messagerow.PM_ICON_URL}); background-repeat: no-repeat;"<!-- ENDIF -->>
-
-						<!-- IF messagerow.S_PM_DELETED -->
-							<a href="{messagerow.U_REMOVE_PM}" class="topictitle">{L_DELETE_MESSAGE}</a><br />
-							<span class="error">{L_MESSAGE_REMOVED_FROM_OUTBOX}</span>
-						<!-- ELSE -->
-							<a href="{messagerow.U_VIEW_PM}" class="topictitle">{messagerow.SUBJECT}</a>
-						<!-- ENDIF -->
-						<!-- IF messagerow.S_AUTHOR_DELETED -->
-							<br /><em class="small">{L_PM_FROM_REMOVED_AUTHOR}</em>
-						<!-- ENDIF -->
-
-						<!-- IF messagerow.S_TOPIC_REPORTED --><a href="{messagerow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --> {messagerow.ATTACH_ICON_IMG}<br />
-						<!-- IF S_SHOW_RECIPIENTS -->{L_MESSAGE_TO} {messagerow.RECIPIENTS}<!-- ELSE -->{L_MESSAGE_BY_AUTHOR} {messagerow.MESSAGE_AUTHOR_FULL} {L_MESSAGE_SENT_ON} {messagerow.SENT_TIME}<!-- ENDIF -->
-					</dt>
-					<!-- IF S_SHOW_RECIPIENTS --><dd class="info"><span>{L_SENT_AT}: {messagerow.SENT_TIME}</span></dd><!-- ENDIF -->
-					<!-- IF S_UNREAD --><dd class="info"><!-- IF messagerow.FOLDER --><a href="{messagerow.U_FOLDER}">{messagerow.FOLDER}</a><!-- ELSE -->{L_UNKNOWN_FOLDER}<!-- ENDIF --></dd><!-- ENDIF -->
-					<dd class="mark"><input type="checkbox" name="marked_msg_id[]" value="{messagerow.MESSAGE_ID}" /></dd>
-				</dl>
-			</li>
-		<!-- END messagerow -->
-	
-		</ul>
-	<!-- ELSE -->
-		<p><strong>{L_NO_MESSAGES}</strong></p>
-	<!-- ENDIF -->
-	
-	<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
-	<fieldset class="display-actions">
-		<div class="left-box"><label for="export_option">{L_EXPORT_FOLDER}: <select name="export_option" id="export_option"><option value="CSV">{L_EXPORT_AS_CSV}</option><option value="CSV_EXCEL">{L_EXPORT_AS_CSV_EXCEL}</option><option value="XML">{L_EXPORT_AS_XML}</option></select></label> <input class="button2" type="submit" name="submit_export" value="{L_GO}" /><br /></div>
-		<select name="mark_option">{S_MARK_OPTIONS}{S_MOVE_MARKED_OPTIONS}</select> <input class="button2" type="submit" name="submit_mark" value="{L_GO}" />
-		<div><a href="#" onclick="marklist('viewfolder', 'marked_msg', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('viewfolder', 'marked_msg', false); return false;">{L_UNMARK_ALL}</a></div>			
-	</fieldset>
-
-	<hr />
-	
-	<ul class="linklist">
-		<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
-		<li class="rightside pagination">
-			<!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES}<!-- ENDIF -->
-			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-		</li>
-		<!-- ENDIF -->
-	</ul>
-	<!-- ENDIF -->
-	
-		<span class="corners-bottom"><span></span></span></div>	
-	</div>
-
-	<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
-	<fieldset class="display-options">
-		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-		<label>{L_DISPLAY}: {S_SELECT_SORT_DAYS}</label> 
-		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> 
-		<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
-		<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
-	</fieldset>
-	<!-- ENDIF -->
-
-	<!-- INCLUDE ucp_pm_message_footer.html -->
-<!-- ENDIF -->
-<!-- INCLUDE ucp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
deleted file mode 100644
index d7f0608c8c..0000000000
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<!-- INCLUDE ucp_pm_message_header.html -->
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- IF S_DISPLAY_HISTORY and (U_VIEW_PREVIOUS_HISTORY or U_VIEW_NEXT_HISTORY) -->
-	<fieldset class="display-options clearfix">
-		<!-- IF U_VIEW_PREVIOUS_HISTORY --><a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_HISTORY}</a><!-- ENDIF -->
-		<!-- IF U_VIEW_NEXT_HISTORY --><a href="{U_VIEW_NEXT_HISTORY}" class="right-box {S_CONTENT_FLOW_END}">{L_VIEW_NEXT_HISTORY}</a><!-- ENDIF -->
-	</fieldset>
-<!-- ENDIF -->
-
-
-<div id="post-{MESSAGE_ID}" class="post pm<!-- IF S_POST_UNAPPROVED or S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF S_ONLINE --> online<!-- ENDIF -->">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<div class="postbody">
-
-		<!-- IF U_DELETE or U_EDIT or U_QUOTE -->
-		<ul class="profile-icons">
-			<!-- IF U_EDIT --><li class="edit-icon"><a href="{U_EDIT}" title="{L_POST_EDIT_PM}"><span>{L_POST_EDIT_PM}</span></a></li><!-- ENDIF -->
-			<!-- IF U_DELETE --><li class="delete-icon"><a href="{U_DELETE}" title="{L_DELETE_MESSAGE}"><span>{L_DELETE_MESSAGE}</span></a></li><!-- ENDIF -->
-			<!-- IF U_QUOTE --><li class="quote-icon"><a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}"><span>{L_POST_QUOTE_PM}</span></a></li><!-- ENDIF -->
-		</ul>
-		<!-- ENDIF -->
-
-		<h3 class="first">{SUBJECT}</h3>
-
-		<p class="author">
-			<strong>{L_SENT_AT}:</strong> {SENT_DATE}
-			<br /><strong>{L_PM_FROM}:</strong> {MESSAGE_AUTHOR_FULL}
-			<!-- IF S_TO_RECIPIENT --><br /><strong>{L_TO}:</strong> <!-- BEGIN to_recipient --><!-- IF to_recipient.NAME_FULL -->{to_recipient.NAME_FULL}<!-- ELSE --><a href="{to_recipient.U_VIEW}" style="color:<!-- IF to_recipient.COLOUR -->{to_recipient.COLOUR}<!-- ELSEIF to_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{to_recipient.NAME}</a><!-- ENDIF -->&nbsp;<!-- END to_recipient --><!-- ENDIF -->
-			<!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}:</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}" style="color:<!-- IF bcc_recipient.COLOUR -->{bcc_recipient.COLOUR}<!-- ELSEIF bcc_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{bcc_recipient.NAME}</a><!-- ENDIF -->&nbsp;<!-- END bcc_recipient --><!-- ENDIF -->
-		</p>
-
-
-		<div class="content">{MESSAGE}</div>
-
-		<!-- IF S_HAS_ATTACHMENTS -->
-		<dl class="attachbox">
-			<dt>{L_ATTACHMENTS}</dt>
-			<!-- BEGIN attachment -->
-			<dd>{attachment.DISPLAY_ATTACHMENT}</dd>
-			<!-- END attachment -->
-		</dl>
-		<!-- ENDIF -->
-
-		<!-- IF S_DISPLAY_NOTICE -->
-			<div class="rules">{L_DOWNLOAD_NOTICE}</div>
-		<!-- ENDIF -->
-
-		<!-- IF EDITED_MESSAGE or EDIT_REASON -->
-		<div class="notice">{EDITED_MESSAGE}
-			<!-- IF EDIT_REASON --><br /><strong>{L_REASON}:</strong> <em>{EDIT_REASON}</em><!-- ENDIF -->
-		</div>
-		<!-- ENDIF -->
-
-		<!-- IF SIGNATURE -->
-			<div id="sig{MESSAGE_ID}" class="signature">{SIGNATURE}</div>
-		<!-- ENDIF -->
-	</div>
-
-	<dl class="postprofile" id="profile{MESSAGE_ID}">
-		<dt><!-- IF AUTHOR_AVATAR --><a href="{U_MESSAGE_AUTHOR}">{AUTHOR_AVATAR}</a><br /><!-- ENDIF -->{MESSAGE_AUTHOR_FULL}</dt>
-		<!-- IF RANK_TITLE --><dd>{RANK_TITLE}</dd><!-- ENDIF -->
-		<!-- IF RANK_IMG --><dd>{RANK_IMG}</dd><!-- ENDIF -->
-		<dd>&nbsp;</dd>
-		<!-- IF AUTHOR_POSTS --><dd><strong>{L_POSTS}:</strong> {AUTHOR_POSTS}</dd><!-- ENDIF -->
-		<!-- IF AUTHOR_JOINED --><dd><strong>{L_JOINED}:</strong> {AUTHOR_JOINED}</dd><!-- ENDIF -->
-		<!-- IF AUTHOR_FROM --><dd><strong>{L_LOCATION}:</strong> {AUTHOR_FROM}</dd><!-- ENDIF -->
-
-		<!-- IF U_PM or U_EMAIL or U_WWW or U_MSN or U_ICQ or U_YIM or U_AIM or U_JABBER -->
-		<dd>
-			<ul class="profile-icons">
-			<!-- IF U_PM --><li class="pm-icon"><a href="{U_PM}" title="{L_PRIVATE_MESSAGE}"><span>{L_PRIVATE_MESSAGE}</span></a></li><!-- ENDIF -->
-			<!-- IF U_EMAIL --><li class="email-icon"><a href="{U_EMAIL}" title="{L_SEND_EMAIL_USER} {MESSAGE_AUTHOR}"><span>{L_SEND_EMAIL_USER} {MESSAGE_AUTHOR}</span></a></li><!-- ENDIF -->
-			<!-- IF U_WWW --><li class="web-icon"><a href="{U_WWW}" title="{L_VISIT_WEBSITE}: {U_WWW}"><span>{L_WEBSITE}</span></a></li><!-- ENDIF -->
-			<!-- IF U_MSN --><li class="msnm-icon"><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false;" title="{L_MSNM}"><span>{L_MSNM}</span></a></li><!-- ENDIF -->
-			<!-- IF U_ICQ --><li class="icq-icon"><a href="{U_ICQ}" onclick="popup(this.href, 550, 320); return false;" title="{L_ICQ}"><span>{L_ICQ}</span></a></li><!-- ENDIF -->
-			<!-- IF U_YIM --><li class="yahoo-icon"><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false;" title="{L_YIM}"><span>{L_YIM}</span></a></li><!-- ENDIF -->
-			<!-- IF U_AIM --><li class="aim-icon"><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false;" title="{L_AIM}"><span>{L_AIM}</span></a></li><!-- ENDIF -->
-			<!-- IF U_JABBER --><li class="jabber-icon"><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false;" title="{L_JABBER}"><span>{L_JABBER}</span></a></li><!-- ENDIF -->
-			</ul>
-		</dd>
-		<!-- ENDIF -->
-	</dl>
-
-	<div class="back2top"><a href="#top" class="top" title="{L_BACK_TO_TOP}">{L_BACK_TO_TOP}</a></div>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- IF S_VIEW_MESSAGE -->
-<fieldset class="display-options">
-	<!-- IF U_PREVIOUS_PM --><a href="{U_PREVIOUS_PM}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_PM}</a><!-- ENDIF -->
-	<!-- IF U_NEXT_PM --><a href="{U_NEXT_PM}" class="right-box {S_CONTENT_FLOW_END}">{L_VIEW_NEXT_PM}</a><!-- ENDIF -->
-
-	<!-- IF S_MARK_OPTIONS --><label for="mark_option"><select name="mark_option" id="mark_option">{S_MARK_OPTIONS}</select></label>&nbsp;<input class="button2" type="submit" name="submit_mark" value="{L_GO}" /><!-- ENDIF -->
-	<!-- IF not S_UNREAD and not S_SPECIAL_FOLDER --><label for="dest_folder"><!-- IF S_VIEW_MESSAGE -->{L_MOVE_TO_FOLDER}: <!-- ELSE -->{L_MOVE_MARKED_TO_FOLDER}<!-- ENDIF --> <select name="dest_folder" id="dest_folder">{S_TO_FOLDER_OPTIONS}</select></label> <input class="button2" type="submit" name="move_pm" value="{L_GO}" /><!-- ENDIF -->
-	<input type="hidden" name="marked_msg_id[]" value="{MSG_ID}" />
-	<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
-	<input type="hidden" name="p" value="{MSG_ID}" />
-</fieldset>
-<!-- ENDIF -->
-
-<!-- INCLUDE ucp_pm_message_footer.html -->
-
-<!-- IF S_DISPLAY_HISTORY --><!-- INCLUDE ucp_pm_history.html --><!-- ENDIF -->
-
-<!-- INCLUDE ucp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
deleted file mode 100644
index 2f2778f496..0000000000
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
+++ /dev/null
@@ -1,130 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
-<head>
-<meta http-equiv="content-type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="content-style-type" content="text/css" />
-<meta http-equiv="content-language" content="{S_USER_LANG}" />
-<title>{SITENAME} :: {PAGE_TITLE}</title>
-
-<style type="text/css">
-/* <![CDATA[ */
-body {
-	font-family: Verdana,serif;
-	font-size: 10pt;
-}
-
-td {
-	font-family: Verdana,serif;
-	font-size: 10pt;
-	line-height: 150%;
-}
-
-.code, .quote {
-	font-size: smaller;
-	border: black solid 1px;
-}
-
-.forum {
-	font-family: Arial,Helvetica,sans-serif;
-	font-weight: bold;
-	font-size: 18pt;
-}
-
-.topic {
-	font-family: Arial,Helvetica,sans-serif;
-	font-size: 14pt;
-	font-weight: bold;
-}
-
-.gensmall {
-	font-size: 8pt;
-}
-
-hr {
-	color: #888888;
-	height: 3px;
-	border-style: solid;
-}
-
-hr.sep	{
-	color: #AAAAAA;
-	height: 1px;
-	border-style: dashed;
-}
-/* ]]> */
-</style>
-
-</head>
-<body>
-
-<table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-<tr>
-	<td colspan="2" align="center"><span class="forum">{SITENAME}</span><br /><span class="gensmall">{L_PRIVATE_MESSAGING}</a></span></td>
-</tr>
-<tr>
-	<td colspan="2"><br /></td>
-</tr>
-<tr>
-	<td><span class="topic">{SUBJECT}</span><br /></td>
-	<td align="right" valign="bottom"><span class="gensmall">{PAGE_NUMBER}</span></td>
-</tr>
-</table>
-
-<hr width="85%" />
-
-<table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-<tr>
-	<td width="10%" nowrap="nowrap">{L_PM_FROM}:&nbsp;</td>
-	<td><strong>{MESSAGE_AUTHOR}</strong> [ {SENT_DATE} ]</td>
-</tr>
-
-<!-- IF S_TO_RECIPIENT -->
-	<tr>
-		<td width="10%" nowrap="nowrap">{L_TO}:</td>
-		<td>
-		<!-- BEGIN to_recipient -->
-			<!-- IF to_recipient.COLOUR --><span style="color:{to_recipient.COLOUR}"><!-- ELSE --><span<!-- IF to_recipient.IS_GROUP --> class="sep"<!-- ENDIF -->><!-- ENDIF -->{to_recipient.NAME}</span>&nbsp;
-		<!-- END to_recipient -->
-		</td>
-	</tr>
-<!-- ENDIF -->
-
-<!-- IF S_BCC_RECIPIENT -->
-	<tr>
-		<td width="10%" nowrap="nowrap">{L_BCC}:</td>
-		<td>
-		<!-- BEGIN bcc_recipient -->
-			<!-- IF bcc_recipient.COLOUR --><span style="color:{bcc_recipient.COLOUR}"><!-- ELSE --><span<!-- IF bcc_recipient.IS_GROUP --> class="sep"<!-- ENDIF -->><!-- ENDIF -->{bcc_recipient.NAME}</span>&nbsp;
-		<!-- END bcc_recipient -->
-		</td>
-	</tr>
-<!-- ENDIF -->
-<tr>
-	<td colspan="2"><hr class="sep" />{MESSAGE}</td>
-</tr>
-</table>
-
-<hr width="85%" />
-<!--
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-	forums may be affected.
-
-	The phpBB Group : 2006
-//-->
-
-<table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-<tr>
-	<td><span class="gensmall">{PAGE_NUMBER}</span></td>
-	<td align="{S_CONTENT_FLOW_END}"><span class="gensmall">{S_TIMEZONE}</span></td>
-</tr>
-<tr>
-	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB &copy; 2000, 2002, 2005, 2007 phpBB Group<br />http://www.phpbb.com/</span></td>
-</tr>
-</table>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
deleted file mode 100644
index 9022346627..0000000000
--- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
-
-<h2>{L_TITLE}</h2>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<fieldset>
-	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
-	<dl>
-		<dt><label for="viewemail0">{L_SHOW_EMAIL}:</label></dt>
-		<dd>
-			<label for="viewemail1"><input type="radio" name="viewemail" id="viewemail1" value="1"<!-- IF S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-			<label for="viewemail0"><input type="radio" name="viewemail" id="viewemail0" value="0"<!-- IF not S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="massemail1">{L_ADMIN_EMAIL}:</label></dt>
-		<dd>
-			<label for="massemail1"><input type="radio" name="massemail" id="massemail1" value="1"<!-- IF S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-			<label for="massemail0"><input type="radio" name="massemail" id="massemail0" value="0"<!-- IF not S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="allowpm1">{L_ALLOW_PM}:</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt>
-		<dd>
-			<label for="allowpm1"><input type="radio" name="allowpm" id="allowpm1" value="1"<!-- IF S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-			<label for="allowpm0"><input type="radio" name="allowpm" id="allowpm0" value="0"<!-- IF not S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-		</dd>
-	</dl>
-	<!-- IF S_CAN_HIDE_ONLINE -->
-		<dl>
-			<dt><label for="hideonline0">{L_HIDE_ONLINE}:</label><br /><span>{L_HIDE_ONLINE_EXPLAIN}</span></dt>
-			<dd>
-				<label for="hideonline1"><input type="radio" name="hideonline" id="hideonline1" value="1"<!-- IF S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-				<label for="hideonline0"><input type="radio" name="hideonline" id="hideonline0" value="0"<!-- IF not S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-			</dd>
-		</dl>
-	<!-- ENDIF -->		
-	<!-- IF S_SELECT_NOTIFY -->
-		<dl>
-			<dt><label for="notifymethod0">{L_NOTIFY_METHOD}:</label></dt>
-			<dd>
-				<label for="notifymethod0"><input type="radio" name="notifymethod" id="notifymethod0" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label> 
-				<label for="notifymethod1"><input type="radio" name="notifymethod" id="notifymethod1" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label> 
-				<label for="notifymethod2"><input type="radio" name="notifymethod" id="notifymethod2" value="2"<!-- IF S_NOTIFY_BOTH --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label>
-			</dd>
-		</dl>
-	<!-- ENDIF -->
-	<dl>
-		<dt><label for="notifypm1">{L_NOTIFY_ON_PM}:</label></dt>
-		<dd>
-			<label for="notifypm1"><input type="radio" name="notifypm" id="notifypm1" value="1"<!-- IF S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-			<label for="notifypm0"><input type="radio" name="notifypm" id="notifypm0" value="0"<!-- IF not S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="popuppm0">{L_POPUP_ON_PM}:</label></dt>
-		<dd>
-			<label for="popuppm1"><input type="radio" name="popuppm" id="popuppm1" value="1"<!-- IF S_POPUP_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-			<label for="popuppm0"><input type="radio" name="popuppm" id="popuppm0" value="0"<!-- IF not S_POPUP_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt>
-		<dd><select name="lang" id="lang">{S_LANG_OPTIONS}</select></dd>
-	</dl>
-	<!-- IF S_STYLE_OPTIONS -->
-		<dl>
-			<dt><label for="style">{L_BOARD_STYLE}:</label></dt>
-			<dd><select name="style" id="style">{S_STYLE_OPTIONS}</select></dd>
-		</dl>
-	<!-- ENDIF -->
-	<dl>
-		<dt><label for="timezone">{L_BOARD_TIMEZONE}:</label></dt>
-		<dd><select name="tz" id="timezone" class="autowidth">{S_TZ_OPTIONS}</select></dd>
-	</dl>
-	<dl>
-		<dt><label for="dst1">{L_BOARD_DST}:</label></dt>
-		<dd>
-			<label for="dst1"><input type="radio" name="dst" id="dst1" value="1"<!-- IF S_DST --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-			<label for="dst0"><input type="radio" name="dst" id="dst0" value="0"<!-- IF not S_DST --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="dateformat">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
-		<dd>
-			<select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">
-				{S_DATEFORMAT_OPTIONS}
-			</select>
-		</dd>
-		<dd id="custom_date" style="display:none;"><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" class="inputbox narrow" style="margin-top: 3px;" /></dd>
-	</dl>
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-	
-<fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<script type="text/javascript">
-// <![CDATA[
-	var date_format = '{A_DATE_FORMAT}';
-	var default_dateformat = '{A_DEFAULT_DATEFORMAT}';
-
-	function customDates()
-	{
-		var e = document.getElementById('dateoptions');
-	
-		e.selectedIndex = e.length - 1;
-	
-		// Loop and match date_format in menu
-		for (var i = 0; i < e.length; i++)
-		{
-			if (e.options[i].value == date_format)
-			{
-				e.selectedIndex = i;
-				break;
-			}
-		}
-	
-		// Show/hide custom field
-		if (e.selectedIndex == e.length - 1)
-		{
-			dE('custom_date',1);
-		}
-		else
-		{
-			dE('custom_date',-1);
-		}
-	}
-
-	customDates();
-// ]]>
-</script>
-
-<!-- INCLUDE ucp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_prefs_post.html b/phpBB/styles/prosilver/template/ucp_prefs_post.html
deleted file mode 100644
index 74af90ca5a..0000000000
--- a/phpBB/styles/prosilver/template/ucp_prefs_post.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
-
-<h2>{L_TITLE}</h2>
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<fieldset>
-	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
-	<dl>
-		<dt><label for="bbcode1">{L_DEFAULT_BBCODE}:</label></dt>
-		<dd>
-			<label for="bbcode1"><input type="radio" name="bbcode" id="bbcode1" value="1"<!-- IF S_BBCODE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-			<label for="bbcode0"><input type="radio" name="bbcode" id="bbcode0" value="0"<!-- IF not S_BBCODE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="smilies1">{L_DEFAULT_SMILIES}:</label></dt>
-		<dd>
-			<label for="smilies1"><input type="radio" name="smilies" id="smilies1" value="1"<!-- IF S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-			<label for="smilies0"><input type="radio" name="smilies" id="smilies0" value="0"<!-- IF not S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="sig1">{L_DEFAULT_ADD_SIG}:</label></dt>
-		<dd>
-			<label for="sig1"><input type="radio" name="sig" id="sig1" value="1"<!-- IF S_SIG --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-			<label for="sig0"><input type="radio" name="sig" id="sig0" value="0"<!-- IF not S_SIG --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="notify1">{L_DEFAULT_NOTIFY}:</label></dt>
-		<dd>
-			<label for="notify1"><input type="radio" name="notify" id="notify1" value="1"<!-- IF S_NOTIFY --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-			<label for="notify0"><input type="radio" name="notify" id="notify0" value="0"<!-- IF not S_NOTIFY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-		</dd>
-	</dl>
-	</fieldset>
-	
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE ucp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_prefs_view.html b/phpBB/styles/prosilver/template/ucp_prefs_view.html
deleted file mode 100644
index dc773584df..0000000000
--- a/phpBB/styles/prosilver/template/ucp_prefs_view.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
-
-<h2>{L_TITLE}</h2>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-		<fieldset>
-		<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
-		<dl>
-			<dt><label for="images1">{L_VIEW_IMAGES}:</label></dt>
-			<dd>
-				<label for="images1"><input type="radio" name="images" id="images1" value="1"<!-- IF S_IMAGES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-				<label for="images0"><input type="radio" name="images" id="images0" value="0"<!-- IF not S_IMAGES --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-			</dd>
-		</dl>
-		<dl>
-			<dt><label for="flash0">{L_VIEW_FLASH}:</label></dt>
-			<dd>
-				<label for="flash1"><input type="radio" name="flash" id="flash1" value="1"<!-- IF S_FLASH --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-				<label for="flash0"><input type="radio" name="flash" id="flash0" value="0"<!-- IF not S_FLASH --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-			</dd>
-		</dl>
-		<dl>
-			<dt><label for="smilies1">{L_VIEW_SMILIES}:</label></dt>
-			<dd>
-				<label for="smilies1"><input type="radio" name="smilies" id="smilies1" value="1"<!-- IF S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-				<label for="smilies0"><input type="radio" name="smilies" id="smilies0" value="0"<!-- IF not S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-			</dd>
-		</dl>
-		<dl>
-			<dt><label for="sigs1">{L_VIEW_SIGS}:</label></dt>
-			<dd>
-				<label for="sigs1"><input type="radio" name="sigs" id="sigs1" value="1"<!-- IF S_SIGS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-				<label for="sigs0"><input type="radio" name="sigs" id="sigs0" value="0"<!-- IF not S_SIGS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-			</dd>
-		</dl>
-		<dl>
-			<dt><label for="avatars1">{L_VIEW_AVATARS}:</label></dt>
-			<dd>
-				<label for="avatars1"><input type="radio" name="avatars" id="avatars1" value="1"<!-- IF S_AVATARS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-				<label for="avatars0"><input type="radio" name="avatars" id="avatars0" value="0"<!-- IF not S_AVATARS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-			</dd>
-		</dl>
-		<!-- IF S_CHANGE_CENSORS -->
-			<dl>
-				<dt><label for="wordcensor1">{L_DISABLE_CENSORS}:</label></dt>
-				<dd>
-					<label for="wordcensor1"><input type="radio" name="wordcensor" id="wordcensor1" value="1"<!-- IF S_DISABLE_CENSORS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-					<label for="wordcensor0"><input type="radio" name="wordcensor" id="wordcensor0" value="0"<!-- IF not S_DISABLE_CENSORS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-				</dd>
-			</dl>
-		<!-- ENDIF -->
-		<hr />
-		<dl>
-			<dt><label>{L_VIEW_TOPICS_DAYS}:</label></dt>
-			<dd>{S_TOPIC_SORT_DAYS}</dd>
-		</dl>
-		<dl>
-			<dt><label>{L_VIEW_TOPICS_KEY}:</label></dt>
-			<dd>{S_TOPIC_SORT_KEY}</dd>
-		</dl>
-		<dl>
-			<dt><label>{L_VIEW_TOPICS_DIR}:</label></dt>
-			<dd>{S_TOPIC_SORT_DIR}</dd>
-		</dl>
-		<hr />
-		<dl>
-			<dt><label>{L_VIEW_POSTS_DAYS}:</label></dt>
-			<dd>{S_POST_SORT_DAYS}</dd>
-		</dl>
-		<dl>
-			<dt><label>{L_VIEW_POSTS_KEY}:</label></dt>
-			<dd>{S_POST_SORT_KEY}</dd>
-		</dl>
-		<dl>
-			<dt><label>{L_VIEW_POSTS_DIR}:</label></dt>
-			<dd>{S_POST_SORT_DIR}</dd>
-		</dl>
-		</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE ucp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_profile_avatar.html b/phpBB/styles/prosilver/template/ucp_profile_avatar.html
deleted file mode 100644
index 2669ed3c22..0000000000
--- a/phpBB/styles/prosilver/template/ucp_profile_avatar.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
-
-<h2>{L_TITLE}</h2>
-
-<!-- INCLUDE ucp_avatar_options.html -->
-
-<fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}
-	<!-- IF S_DISPLAY_GALLERY --><input type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" class="button2" />&nbsp; <!-- ENDIF -->
-	<!-- IF S_IN_AVATAR_GALLERY --><input type="submit" name="cancel" value="{L_CANCEL}" class="button2" />&nbsp; <!-- ELSE -->
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; <!-- ENDIF -->
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE ucp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
deleted file mode 100644
index 1bd54619b9..0000000000
--- a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
-
-<h2>{L_TITLE}</h2>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	<p>{L_PROFILE_INFO_NOTICE}</p>
-
-	<fieldset>
-	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
-	<dl>
-		<dt><label for="icq">{L_UCP_ICQ}:</label></dt>
-		<dd><input type="text" name="icq" id="icq" maxlength="15" value="{ICQ}" class="inputbox" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="aim">{L_UCP_AIM}:</label></dt>
-		<dd><input type="text" name="aim" id="aim" maxlength="255" value="{AIM}" class="inputbox" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="msn">{L_UCP_MSNM}:</label></dt>
-		<dd><input type="text" name="msn" id="msn" maxlength="255" value="{MSN}" class="inputbox" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="yim">{L_UCP_YIM}:</label></dt>
-		<dd><input type="text" name="yim" id="yim" maxlength="255" value="{YIM}" class="inputbox" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="jabber">{L_UCP_JABBER}:</label></dt>
-		<dd><input type="text" name="jabber" id="jabber" maxlength="255" value="{JABBER}" class="inputbox" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="website">{L_WEBSITE}:</label></dt>
-		<dd><input type="text" name="website" id="website" maxlength="255" value="{WEBSITE}" class="inputbox" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="location">{L_LOCATION}:</label></dt>
-		<dd><input type="text" name="location" id="location" maxlength="255" value="{LOCATION}" class="inputbox" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="occupation">{L_OCCUPATION}:</label></dt>
-		<dd><textarea name="occupation" id="occupation" class="inputbox" rows="3" cols="30">{OCCUPATION}</textarea></dd>
-	</dl>
-	<dl>
-		<dt><label for="interests">{L_INTERESTS}:</label></dt>
-		<dd><textarea name="interests" id="interests" class="inputbox" rows="3" cols="30">{INTERESTS}</textarea></dd>
-	</dl>
-	<!-- IF S_BIRTHDAYS_ENABLED -->
-		<dl>
-			<dt><label for="bday_day">{L_BIRTHDAY}:</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
-			<dd>
-				<label for="bday_day">{L_DAY}: <select name="bday_day" id="bday_day" style="width: 4em;">{S_BIRTHDAY_DAY_OPTIONS}</select></label> 
-				<label for="bday_month">{L_MONTH}: <select name="bday_month" id="bday_month" style="width: 4em;">{S_BIRTHDAY_MONTH_OPTIONS}</select></label> 
-				<label for="bday_year">{L_YEAR}: <select name="bday_year" id="bday_year" style="width: 6em;">{S_BIRTHDAY_YEAR_OPTIONS}</select></label>
-			</dd>
-		</dl>
-	<!-- ENDIF -->
-	<!-- BEGIN profile_fields -->
-		<dl>
-			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}:<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label>
-			<!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></dt>
-			<!-- IF profile_fields.ERROR --><dd class="error">{profile_fields.ERROR}</dd><!-- ENDIF -->
-			<dd>{profile_fields.FIELD}</dd>
-		</dl>
-	<!-- END profile_fields -->
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE ucp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html
deleted file mode 100644
index edd58d5e25..0000000000
--- a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
-
-<h2>{L_TITLE}</h2>
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<!-- IF S_FORCE_PASSWORD -->
-		<p>{L_FORCE_PASSWORD_EXPLAIN}</p>
-	<!-- ENDIF -->
-
-	<fieldset>
-	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
-	<dl>
-		<dt><label <!-- IF S_CHANGE_USERNAME -->for="username"<!-- ENDIF -->>{L_USERNAME}:</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>
-		<dd><!-- IF S_CHANGE_USERNAME --><input type="text" name="username" id="username" value="{USERNAME}" class="inputbox" title="{L_USERNAME}" /><!-- ELSE --><strong>{USERNAME}</strong><!-- ENDIF --></dd>
-	</dl>
-	<dl>
-		<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt>
-		<dd><!-- IF S_CHANGE_EMAIL --><input type="text" name="email" id="email" maxlength="100" value="{EMAIL}" class="inputbox" title="{L_EMAIL_ADDRESS}" /><!-- ELSE --><strong>{EMAIL}</strong><!-- ENDIF --></dd>
-	</dl>
-	<!-- IF S_CHANGE_EMAIL -->
-		<dl>
-			<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label><br /><span>{L_CONFIRM_EMAIL_EXPLAIN}</span></dt>
-			<dd><input type="text" name="email_confirm" id="email_confirm" maxlength="100" value="{CONFIRM_EMAIL}" class="inputbox" title="{L_CONFIRM_EMAIL}" /></dd>
-		</dl>
-	<!-- ENDIF -->
-	<!-- IF S_CHANGE_PASSWORD -->
-		<dl>
-			<dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
-			<dd><input type="password" name="new_password" id="new_password" maxlength="255" value="{NEW_PASSWORD}" class="inputbox" title="{L_CHANGE_PASSWORD}" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
-			<dd><input type="password" name="password_confirm" id="password_confirm" maxlength="255" value="{PASSWORD_CONFIRM}" class="inputbox" title="{L_CONFIRM_PASSWORD}" /></dd>
-		</dl>
-	<!-- ENDIF -->
-	</fieldset>
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<fieldset>
-	<dl>
-		<dt><label for="cur_password">{L_CURRENT_PASSWORD}:</label><br /><span>{L_CURRENT_PASSWORD_EXPLAIN}</span></dt>
-		<dd><input type="password" name="cur_password" id="cur_password" maxlength="255" value="{CUR_PASSWORD}" class="inputbox" title="{L_CURRENT_PASSWORD}" /></dd>
-	</dl>
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE ucp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_profile_signature.html b/phpBB/styles/prosilver/template/ucp_profile_signature.html
deleted file mode 100644
index dbaeac3254..0000000000
--- a/phpBB/styles/prosilver/template/ucp_profile_signature.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<form id="postform" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
-
-<h2>{L_TITLE}</h2>
-
-<!-- IF SIGNATURE_PREVIEW -->
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-		<h3>{L_SIGNATURE_PREVIEW}</h3>
-		<div class="postbody pm">
-			<div class="signature" style="border-top:none; margin-top: 0; ">{SIGNATURE_PREVIEW}</div>
-		</div>
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-<!-- ENDIF -->
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<p>{L_SIGNATURE_EXPLAIN}</p>
-
-	<!-- DEFINE $SIG_EDIT = 1 -->
-	<!-- INCLUDE posting_editor.html -->
-	<h3>{L_OPTIONS}</h3>
-	<fieldset>
-		<!-- IF S_BBCODE_ALLOWED -->
-			<div><label for="disable_bbcode"><input type="checkbox" name="disable_bbcode" id="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label></div>
-		<!-- ENDIF -->
-		<!-- IF S_SMILIES_ALLOWED -->
-			<div><label for="disable_smilies"><input type="checkbox" name="disable_smilies" id="disable_smilies"{S_SMILIES_CHECKED} /> {L_DISABLE_SMILIES}</label></div>
-		<!-- ENDIF -->
-		<!-- IF S_LINKS_ALLOWED -->
-			<div><label for="disable_magic_url"><input type="checkbox" name="disable_magic_url" id="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label></div>
-		<!-- ENDIF -->
-	
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}
-	<input type="reset" name="reset" value="{L_RESET}" class="button2" />&nbsp; 
-	<input type="submit" name="preview" value="{L_PREVIEW}" class="button2" />&nbsp; 
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE ucp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html
deleted file mode 100644
index 458d50a197..0000000000
--- a/phpBB/styles/prosilver/template/ucp_register.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<script type="text/javascript">
-// <![CDATA[
-	/**
-	* Change language
-	*/
-	function change_language(lang_iso)
-	{
-		document.forms['register'].change_lang.value = lang_iso;
-		document.forms['register'].submit.click();
-	}
-
-// ]]>
-</script>
-
-<form method="post" action="{S_UCP_ACTION}" id="register">
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h2>{SITENAME} - {L_REGISTRATION}</h2>
-
-	<fieldset class="fields2">
-	<!-- IF ERROR --><dl><dd class="error">{ERROR}</dd></dl><!-- ENDIF -->
-	<!-- IF L_REG_COND -->
-		<dl><dd><strong>{L_REG_COND}</strong></dd></dl>
-	<!-- ENDIF -->
-	<!-- IF .profile_fields -->
-		<dl><dd><strong>{L_ITEMS_REQUIRED}</strong></dd></dl>
-	<!-- ENDIF -->
-
-	<dl>
-		<dt><label for="username">{L_USERNAME}:</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>
-		<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" title="{L_USERNAME}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt>
-		<dd><input type="text" tabindex="2" name="email" id="email" size="25" maxlength="100" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label></dt>
-		<dd><input type="text" tabindex="3" name="email_confirm" id="email_confirm" size="25" maxlength="100" value="{EMAIL_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_EMAIL}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="new_password">{L_PASSWORD}:</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt>
-		<dd><input type="password" tabindex="4" name="new_password" id="new_password" size="25" value="{PASSWORD}" class="inputbox autowidth" title="{L_NEW_PASSWORD}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label></dt>
-		<dd><input type="password" tabindex="5" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" /></dd>
-	</dl>
-
-	<hr />
-
-	<dl>
-		<dt><label for="lang">{L_LANGUAGE}:</label></dt>
-		<dd><select name="lang" id="lang" onchange="change_language(this.value); return false;" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select></dd>
-	</dl>
-	<dl>
-		<dt><label for="tz">{L_TIMEZONE}:</label></dt>
-		<dd><select name="tz" id="tz" class="autowidth">{S_TZ_OPTIONS}</select></dd>
-	</dl>
-
-	<!-- BEGIN profile_fields -->
-		<dl>
-			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}:<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label>
-			<!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF -->
-			<!-- IF profile_fields.ERROR --><br /><span class="error">{profile_fields.ERROR}</span><!-- ENDIF --></dt>
-			<dd>{profile_fields.FIELD}</dd>
-		</dl>
-	<!-- END profile_fields -->
-	</fieldset>
-<!-- IF S_CAPTCHA -->
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h3>{L_CONFIRMATION}</h3>
-	<p>{L_CONFIRM_EXPLAIN}</p>
-
-	<fieldset class="fields2">
-	<dl>
-		<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt>
-		<dd>{CONFIRM_IMG}</dd>
-		<dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" class="inputbox narrow" title="{L_CONFIRM_CODE}" /></dd>
-		<dd>{L_CONFIRM_CODE_EXPLAIN}<!-- IF S_CONFIRM_REFRESH --> {L_VC_REFRESH_EXPLAIN}<!-- ENDIF --></dd>
-		<!-- IF S_CONFIRM_REFRESH --><dd><input type="submit" value="{L_VC_REFRESH}" class="button2" /></dd> <!-- ENDIF -->
-	</dl>
-	</fieldset>
-
-<!-- ENDIF -->
-<!-- IF S_COPPA -->
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h4>{L_COPPA_COMPLIANCE}</h4>
-
-	<p>{L_COPPA_EXPLAIN}</p>
-<!-- ENDIF -->
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}
-		<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-		<input type="submit" name="submit" id="submit" value="{L_SUBMIT}" class="button1" />
-		{S_FORM_TOKEN}
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_remind.html b/phpBB/styles/prosilver/template/ucp_remind.html
deleted file mode 100644
index 7dbc23b733..0000000000
--- a/phpBB/styles/prosilver/template/ucp_remind.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<form action="{S_PROFILE_ACTION}" method="post" id="remind">
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<div class="content">
-		<h2>{L_SEND_PASSWORD}</h2>
-
-		<fieldset>
-		<dl>
-			<dt><label for="username">{L_USERNAME}:</label></dt>
-			<dd><input class="inputbox narrow" type="text" name="username" id="username" size="25" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="email">{L_EMAIL_ADDRESS}:</label><br /><span>{L_EMAIL_REMIND}</span></dt>
-			<dd><input class="inputbox narrow" type="text" name="email" id="email" size="25" maxlength="100" /></dd>
-		</dl>
-		<dl>
-			<dt>&nbsp;</dt>
-			<dd>{S_HIDDEN_FIELDS}<input type="submit" name="submit" id="submit" class="button1" value="{L_SUBMIT}" tabindex="2" />&nbsp; <input type="reset" value="{L_RESET}" name="reset" class="button2" /></dd>
-		</dl>
-		{S_FORM_TOKEN}
-		</fieldset>
-	</div>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_resend.html b/phpBB/styles/prosilver/template/ucp_resend.html
deleted file mode 100644
index 840e972995..0000000000
--- a/phpBB/styles/prosilver/template/ucp_resend.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-
-<form action="{S_PROFILE_ACTION}" method="post" id="resend">
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<div class="content">
-		<h2>{L_UCP_RESEND}</h2>
-
-		<fieldset>
-		<dl>
-			<dt><label for="username">{L_USERNAME}:</label></dt>
-			<dd><input class="inputbox narrow" type="text" name="username" id="username" size="25" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="email">{L_EMAIL_ADDRESS}:</label><br /><span>{L_EMAIL_REMIND}</span></dt>
-			<dd><input class="inputbox narrow" type="text" name="email" id="email" size="25" maxlength="100" /></dd>
-		</dl>
-		<dl>
-			<dt>&nbsp;</dt>
-			<dd>{S_HIDDEN_FIELDS}{S_FORM_TOKEN}<input type="submit" name="submit" id="submit" class="button1" value="{L_SUBMIT}" tabindex="2" />&nbsp; <input type="reset" value="{L_RESET}" name="reset" class="button2" /></dd>
-		</dl>
-		</fieldset>
-	</div>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_zebra_foes.html b/phpBB/styles/prosilver/template/ucp_zebra_foes.html
deleted file mode 100644
index 3c1b1cddce..0000000000
--- a/phpBB/styles/prosilver/template/ucp_zebra_foes.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
-
-<h2>{L_TITLE}</h2>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<p>{L_FOES_EXPLAIN}</p>
-
-	<fieldset class="fields2">
-	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
-	<dl>
-		<dt><label <!-- IF S_USERNAME_OPTIONS -->for="usernames"<!-- ENDIF -->>{L_YOUR_FOES}:</label><br /><span>{L_YOUR_FOES_EXPLAIN}</span></dt>
-		<dd>
-			<!-- IF S_USERNAME_OPTIONS -->
-				<select name="usernames[]" id="usernames" multiple="multiple" size="5">{S_USERNAME_OPTIONS}</select>
-			<!-- ELSE -->
-				<strong>{L_NO_FOES}</strong>
-			<!-- ENDIF -->
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="add">{L_ADD_FOES}:</label><br /><span>{L_ADD_FOES_EXPLAIN}</span></dt>
-		<dd><textarea name="add" id="add" rows="3" cols="30" class="inputbox">{USERNAMES}</textarea></dd>
-		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>
-	</dl>
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE ucp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/ucp_zebra_friends.html b/phpBB/styles/prosilver/template/ucp_zebra_friends.html
deleted file mode 100644
index 1e0efbfdf8..0000000000
--- a/phpBB/styles/prosilver/template/ucp_zebra_friends.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!-- INCLUDE ucp_header.html -->
-
-<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
-
-<h2>{L_TITLE}</h2>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<p>{L_FRIENDS_EXPLAIN}</p>
-
-	<fieldset class="fields2">
-	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
-	<dl>
-		<dt><label <!-- IF S_USERNAME_OPTIONS -->for="usernames"<!-- ENDIF -->>{L_YOUR_FRIENDS}:</label><br /><span>{L_YOUR_FRIENDS_EXPLAIN}</span></dt>
-		<dd>
-			<!-- IF S_USERNAME_OPTIONS -->
-				<select name="usernames[]" id="usernames" multiple="multiple" size="5">{S_USERNAME_OPTIONS}</select>
-			<!-- ELSE -->
-				<strong>{L_NO_FRIENDS}</strong>
-			<!-- ENDIF -->
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="add">{L_ADD_FRIENDS}:</label><br /><span>{L_ADD_FRIENDS_EXPLAIN}</span></dt>
-		<dd><textarea name="add" id="add" rows="3" cols="30" class="inputbox">{USERNAMES}</textarea></dd>
-		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>
-	</dl>
-	</fieldset>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-	{S_FORM_TOKEN}
-</fieldset>
-</form>
-
-<!-- INCLUDE ucp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
deleted file mode 100644
index 1bee179715..0000000000
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ /dev/null
@@ -1,216 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-<!-- IF U_MCP --><p>[&nbsp;<a href="{U_MCP}">{L_MCP}</a>&nbsp;]</p><!-- ENDIF -->
-<h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
-
-<!-- IF FORUM_DESC or MODERATORS or U_MCP -->
-<p>
-	<!-- NOTE: remove the style="display: none" when you want to have the forum description on the forum body -->
-	<!-- IF FORUM_DESC --><span style="display: none">{FORUM_DESC}<br /></span><!-- ENDIF -->
-	<!-- IF MODERATORS --><strong><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->:</strong> {MODERATORS}<!-- ENDIF -->
-</p>
-<!-- ENDIF -->
-
-<!-- IF S_FORUM_RULES -->
-	<div class="rules">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<!-- IF U_FORUM_RULES -->
-			<a href="{U_FORUM_RULES}">{L_FORUM_RULES}</a>
-		<!-- ELSE -->
-			<strong>{L_FORUM_RULES}</strong><br />
-			{FORUM_RULES}
-		<!-- ENDIF -->
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-<!-- ENDIF -->
-
-<!-- IF S_HAS_SUBFORUM -->
-<!-- IF not S_IS_BOT and U_MARK_FORUMS -->
-<ul class="linklist">
-	<li class="rightside"><a href="{U_MARK_FORUMS}">{L_MARK_FORUMS_READ}</a></li>
-</ul>
-<!-- ENDIF -->
-	<!-- INCLUDE forumlist_body.html -->
-<!-- ENDIF -->
-
-<!-- IF S_DISPLAY_POST_INFO or PAGINATION or TOTAL_POSTS or TOTAL_TOPICS -->
-	<div class="topic-actions" <!-- IF S_HAS_SUBFORUM -->style="margin-top: 2em;"<!-- ENDIF -->>
-
-	<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
-		<div class="buttons">
-			<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->"><a href="{U_POST_NEW_TOPIC}" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"><span></span><!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF --></a></div>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF S_DISPLAY_SEARCHBOX -->
-		<div class="search-box">
-			<form method="post" id="forum-search" action="{S_SEARCHBOX_ACTION}">
-			<fieldset>
-				<input class="inputbox search tiny" type="text" name="keywords" id="search_keywords" size="20" value="{L_SEARCH_FORUM}" onclick="if (this.value == '{LA_SEARCH_FORUM}') this.value = '';" onblur="if (this.value == '') this.value = '{LA_SEARCH_FORUM}';" />
-				<input class="button2" type="submit" value="{L_SEARCH}" />
-				<input type="hidden" value="{FORUM_ID}" name="fid[]" />
-			</fieldset>
-			</form>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF PAGINATION or TOTAL_POSTS or TOTAL_TOPICS -->
-		<div class="pagination">
-			<!-- IF not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}" accesskey="m">{L_MARK_TOPICS_READ}</a> &bull; <!-- ENDIF --><!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF -->
-			<!-- IF PAGE_NUMBER -->
-				<!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF -->
-			<!-- ENDIF -->
-		</div>
-	<!-- ENDIF -->
-
-	</div>
-<!-- ENDIF -->
-
-<!-- IF S_NO_READ_ACCESS -->
-
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-		<strong>{L_NO_READ_ACCESS}</strong>
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<!-- IF not S_USER_LOGGED_IN and not S_IS_BOT -->
-
-		<form action="{S_LOGIN_ACTION}" method="post">
-
-		<div class="panel">
-			<div class="inner"><span class="corners-top"><span></span></span>
-
-			<div class="content">
-				<h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED -->&nbsp; &bull; &nbsp;<a href="{U_REGISTER}">{L_REGISTER}</a><!-- ENDIF --></h3>
-
-				<fieldset class="fields1">
-				<dl>
-					<dt><label for="username">{L_USERNAME}:</label></dt>
-					<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
-				</dl>
-				<dl>
-					<dt><label for="password">{L_PASSWORD}:</label></dt>
-					<dd><input type="password" tabindex="2" id="password" name="password" size="25" class="inputbox autowidth" /></dd>
-					<!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="3" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
-					<dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="4" /> {L_HIDE_ME}</label></dd>
-				</dl>
-				<dl>
-					<dt>&nbsp;</dt>
-					<dd><input type="submit" name="login" tabindex="5" value="{L_LOGIN}" class="button1" /></dd>
-				</dl>
-				</fieldset>
-			</div>
-
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-
-	<!-- ENDIF -->
-
-<!-- ENDIF -->
-
-<!-- BEGIN topicrow -->
-
-	<!-- IF not topicrow.S_TOPIC_TYPE_SWITCH and not topicrow.S_FIRST_ROW -->
-		</ul>
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-	<!-- ENDIF -->
-
-	<!-- IF topicrow.S_FIRST_ROW or not topicrow.S_TOPIC_TYPE_SWITCH -->
-		<div class="forumbg<!-- IF topicrow.S_TOPIC_TYPE_SWITCH --> announcement<!-- ENDIF -->">
-		<div class="inner"><span class="corners-top"><span></span></span>
-		<ul class="topiclist">
-			<li class="header">
-				<dl class="icon">
-					<dt><!-- IF S_DISPLAY_ACTIVE -->{L_ACTIVE_TOPICS}<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH and topicrow.S_TOPIC_TYPE gt 1 -->{L_ANNOUNCEMENTS}<!-- ELSE -->{L_TOPICS}<!-- ENDIF --></dt>
-					<dd class="posts">{L_REPLIES}</dd>
-					<dd class="views">{L_VIEWS}</dd>
-					<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
-				</dl>
-			</li>
-		</ul>
-		<ul class="topiclist topics">
-	<!-- ENDIF -->
-
-		<li class="row<!-- IF topicrow.S_ROW_NUM is even --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF topicrow.S_POST_ANNOUNCE --> announce<!-- ENDIF --><!-- IF topicrow.S_POST_STICKY --> sticky<!-- ENDIF --><!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ENDIF -->">
-			<dl class="icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-				<dt<!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
-					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
-					<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
-					<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF -->
-					<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
-				</dt>
-				<dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd>
-				<dd class="views">{topicrow.VIEWS} <dfn>{L_VIEWS}</dfn></dd>
-				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
-					<!-- IF not S_IS_BOT --><a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{topicrow.LAST_POST_TIME}</span>
-				</dd>
-			</dl>
-		</li>
-
-	<!-- IF topicrow.S_LAST_ROW -->
-			</ul>
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-	<!-- ENDIF -->
-
-<!-- BEGINELSE -->
-	<!-- IF S_IS_POSTABLE -->
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-		<strong>{L_NO_TOPICS}</strong>
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-	<!-- ENDIF -->
-<!-- END topicrow -->
-
-<!-- IF S_SELECT_SORT_DAYS and not S_DISPLAY_ACTIVE -->
-	<form method="post" action="{S_FORUM_ACTION}">
-		<fieldset class="display-options">
-			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-	<!-- IF not S_IS_BOT -->
-			<label>{L_DISPLAY_TOPICS}: {S_SELECT_SORT_DAYS}</label>
-			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>
-			<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
-	<!-- ENDIF -->
-		</fieldset>
-	</form>
-	<hr />
-<!-- ENDIF -->
-
-<!-- IF .topicrow and not S_DISPLAY_ACTIVE -->
-	<div class="topic-actions">
-		<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
-		<div class="buttons">
-			<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"><a href="{U_POST_NEW_TOPIC}"><span></span><!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF --></a></div>
-		</div>
-		<!-- ENDIF -->
-
-		<!-- IF PAGINATION or TOTAL_POSTS or TOTAL_TOPICS -->
-		<div class="pagination">
-			<!-- IF TOTAL_TOPICS and not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}">{L_MARK_TOPICS_READ}</a> &bull;  <!-- ENDIF -->
-			<!-- IF TOTAL_POSTS and not NEWEST_USER --> {TOTAL_POSTS}<!-- ELSEIF TOTAL_TOPICS and not NEWEST_USER --> {TOTAL_TOPICS}<!-- ENDIF -->
-			<!-- IF TOTAL_USERS -->{TOTAL_USERS}<!-- ENDIF -->
-			<!-- IF PAGINATION --> &bull;  <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a>
-			 &bull;  <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF -->
-		</div>
-		<!-- ENDIF -->
-	</div>
-<!-- ENDIF -->
-
-<!-- INCLUDE jumpbox.html -->
-
-<!-- IF S_DISPLAY_ONLINE_LIST -->
-	<h3><!-- IF U_VIEWONLINE --><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a><!-- ELSE -->{L_WHO_IS_ONLINE}<!-- ENDIF --></h3>
-	<p>{LOGGED_IN_USER_LIST}</p>
-<!-- ENDIF -->
-
-<!-- IF S_DISPLAY_POST_INFO -->
-	<h3>{L_FORUM_PERMISSIONS}</h3>
-	<p><!-- BEGIN rules -->{rules.RULE}<br /><!-- END rules --></p>
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html
deleted file mode 100644
index 5bcd069d04..0000000000
--- a/phpBB/styles/prosilver/template/viewonline_body.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<h2>{TOTAL_REGISTERED_USERS_ONLINE}</h2>
-<p>{TOTAL_GUEST_USERS_ONLINE}<!-- IF S_SWITCH_GUEST_DISPLAY --> &bull; <a href="{U_SWITCH_GUEST_DISPLAY}">{L_SWITCH_GUEST_DISPLAY}</a><!-- ENDIF --></p>
-
-<ul class="linklist">
-	<li class="rightside pagination"><!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE -->{PAGE_NUMBER}<!-- ENDIF --></li>
-</ul>
-
-<div class="forumbg">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	
-	<table class="table1" cellspacing="1">
-
-	<!-- IF .user_row -->
-		<thead>
-		<tr>
-			<th class="name"><a href="{U_SORT_USERNAME}">{L_USERNAME}</a></th>
-			<th class="info"><a href="{U_SORT_LOCATION}">{L_FORUM_LOCATION}</a></th>
-			<th class="active"><a href="{U_SORT_UPDATED}">{L_LAST_UPDATED}</a></th>
-		</tr>
-		</thead>
-		<tbody>
-		<!-- BEGIN user_row -->
-		<tr class="<!-- IF user_row.S_ROW_NUM is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-			<td>{user_row.USERNAME_FULL}<!-- IF user_row.USER_IP --> <span style="margin-left: 30px;">{L_IP}: <a href="{user_row.U_USER_IP}">{user_row.USER_IP}</a> &#187; <a href="{user_row.U_WHOIS}" onclick="popup(this.href, 750, 500); return false;">{L_WHOIS}</a></span><!-- ENDIF -->
-				<!-- IF user_row.USER_BROWSER --><br />{user_row.USER_BROWSER}<!-- ENDIF --></td>
-			<td class="info"><a href="{user_row.U_FORUM_LOCATION}">{user_row.FORUM_LOCATION}</a></td>
-			<td class="active">{user_row.LASTUPDATE}</td>
-		</tr>
-		<!-- END user_row -->
-	<!-- ELSE -->
-		<tbody>
-		<tr class="bg1">
-			<td colspan="3">{L_NO_ONLINE_USERS}<!-- IF S_SWITCH_GUEST_DISPLAY --> &bull; <a href="{U_SWITCH_GUEST_DISPLAY}">{L_SWITCH_GUEST_DISPLAY}</a><!-- ENDIF --></td>
-		</tr>
-	<!-- ENDIF -->
-	</tbody>
-	</table>
-	
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-
-<!-- IF PREVIOUS_PAGE or NEXT_PAGE -->
-<fieldset class="display-options right-box">
-	<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ELSE -->{L_PREVIOUS}<!-- ENDIF --> &bull; <!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ELSE -->{L_NEXT}<!-- ENDIF -->
-</fieldset>
-<!-- ENDIF -->
-
-<!-- IF LEGEND --><p><em>{L_LEGEND}: {LEGEND}</em></p><!-- ENDIF -->
-
-<ul class="linklist">
-	<li class="rightside pagination"><!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE -->{PAGE_NUMBER}<!-- ENDIF --></li>
-</ul>
-
-<!-- INCLUDE jumpbox.html -->
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/prosilver/template/viewonline_whois.html b/phpBB/styles/prosilver/template/viewonline_whois.html
deleted file mode 100644
index a9c6473727..0000000000
--- a/phpBB/styles/prosilver/template/viewonline_whois.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-
-<h2>{L_WHOIS}</h2>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<div class="postbody"><div class="content">
-		<pre>{WHOIS}</pre>
-	</div></div>
-
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-<a  href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>
-
-<!-- INCLUDE simple_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
deleted file mode 100644
index ecd9d5295a..0000000000
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ /dev/null
@@ -1,273 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-<!-- IF U_MCP --><p>[&nbsp;<a href="{U_MCP}">{L_MCP}</a>&nbsp;]</p><!-- ENDIF -->
-<h2><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>
-<!-- NOTE: remove the style="display: none" when you want to have the forum description on the topic body -->
-<!-- IF FORUM_DESC --><span style="display: none">{FORUM_DESC}<br /></span><!-- ENDIF -->
-
-<!-- IF MODERATORS or U_MCP -->
-	<p>
-		<!-- IF MODERATORS -->
-			<strong><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->:</strong> {MODERATORS}
-		<!-- ENDIF -->
-
-	</p>
-<!-- ENDIF -->
-
-<!-- IF S_FORUM_RULES -->
-	<div class="rules">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<!-- IF U_FORUM_RULES -->
-			<a href="{U_FORUM_RULES}">{L_FORUM_RULES}</a>
-		<!-- ELSE -->
-			<strong>{L_FORUM_RULES}</strong><br />
-			{FORUM_RULES}
-		<!-- ENDIF -->
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-<!-- ENDIF -->
-
-<div class="topic-actions">
-
-	<div class="buttons">
-	<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
-		<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->"><a href="{U_POST_REPLY_TOPIC}" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->"><span></span><!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED_SHORT}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF --></a></div>
-	<!-- ENDIF -->
-	</div>
-
-	<!-- IF S_DISPLAY_SEARCHBOX -->
-		<div class="search-box">
-			<form method="post" id="topic-search" action="{S_SEARCHBOX_ACTION}">
-			<fieldset>
-				<input class="inputbox search tiny"  type="text" name="keywords" id="search_keywords" size="20" value="{L_SEARCH_TOPIC}" onclick="if(this.value=='{LA_SEARCH_TOPIC}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_TOPIC}';" />
-				<input class="button2" type="submit" value="{L_SEARCH}" />
-				<input type="hidden" value="{TOPIC_ID}" name="t" />
-				<input type="hidden" value="msgonly" name="sf" />
-			</fieldset>
-			</form>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF PAGINATION or TOTAL_POSTS -->
-		<div class="pagination">
-			<!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> &bull; <!-- ENDIF -->{TOTAL_POSTS}
-			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-		</div>
-	<!-- ENDIF -->
-
-</div>
-<div class="clear"></div>
-
-<!-- IF S_HAS_POLL -->
-	<form method="post" action="{S_POLL_ACTION}">
-
-	<div class="panel">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-			<h2>{POLL_QUESTION}</h2>
-			<p class="author">{L_POLL_LENGTH}<!-- IF S_CAN_VOTE and L_POLL_LENGTH --><br /><!-- ENDIF --><!-- IF S_CAN_VOTE -->{L_MAX_VOTES}<!-- ENDIF --></p>
-
-			<fieldset class="polls">
-			<!-- BEGIN poll_option -->
-				<dl class="<!-- IF poll_option.POLL_OPTION_VOTED -->voted<!-- ENDIF -->"<!-- IF poll_option.POLL_OPTION_VOTED --> title="{L_POLL_VOTED_OPTION}"<!-- ENDIF -->>
-					<dt><!-- IF S_CAN_VOTE --><label for="vote_{poll_option.POLL_OPTION_ID}">{poll_option.POLL_OPTION_CAPTION}</label><!-- ELSE -->{poll_option.POLL_OPTION_CAPTION}<!-- ENDIF --></dt>
-					<!-- IF S_CAN_VOTE --><dd style="width: auto;"><!-- IF S_IS_MULTI_CHOICE --><input type="checkbox" name="vote_id[]" id="vote_{poll_option.POLL_OPTION_ID}" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /><!-- ELSE --><input type="radio" name="vote_id[]" id="vote_{poll_option.POLL_OPTION_ID}" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /><!-- ENDIF --></dd><!-- ENDIF -->
-					<!-- IF S_DISPLAY_RESULTS --><dd class="resultbar"><div class="<!-- IF poll_option.POLL_OPTION_PCT < 20 -->pollbar1<!-- ELSEIF poll_option.POLL_OPTION_PCT < 40 -->pollbar2<!-- ELSEIF poll_option.POLL_OPTION_PCT < 60 -->pollbar3<!-- ELSEIF poll_option.POLL_OPTION_PCT < 80 -->pollbar4<!-- ELSE -->pollbar5<!-- ENDIF -->" style="width:{poll_option.POLL_OPTION_PERCENT};">{poll_option.POLL_OPTION_RESULT}</div></dd>
-					<dd><!-- IF poll_option.POLL_OPTION_RESULT == 0 -->{L_NO_VOTES}<!-- ELSE -->{poll_option.POLL_OPTION_PERCENT}<!-- ENDIF --></dd><!-- ENDIF -->
-				</dl>
-			<!-- END poll_option -->
-
-			<!-- IF S_DISPLAY_RESULTS -->
-				<dl>
-					<dt>&nbsp;</dt>
-					<dd class="resultbar">{L_TOTAL_VOTES} : {TOTAL_VOTES}</dd>
-				</dl>
-			<!-- ENDIF -->
-
-			<!-- IF S_CAN_VOTE -->
-				<dl style="border-top: none;">
-					<dt>&nbsp;</dt>
-					<dd class="resultbar"><input type="submit" name="update" value="{L_SUBMIT_VOTE}" class="button1" /></dd>
-				</dl>
-			<!-- ENDIF -->
-
-			<!-- IF not S_DISPLAY_RESULTS -->
-				<dl style="border-top: none;">
-					<dt>&nbsp;</dt>
-					<dd class="resultbar"><a href="{U_VIEW_RESULTS}">{L_VIEW_RESULTS}</a></dd>
-				</dl>
-			<!-- ENDIF -->
-			</fieldset>
-		</div>
-
-		<span class="corners-bottom"><span></span></span></div>
-		{S_FORM_TOKEN}
-		{S_HIDDEN_FIELDS}
-	</div>
-
-
-	</form>
-	<hr />
-<!-- ENDIF -->
-
-<!-- BEGIN postrow -->
-	<!-- IF postrow.S_FIRST_UNREAD --><a id="unread"></a><!-- ENDIF -->
-	<div id="p{postrow.POST_ID}" class="post <!-- IF postrow.S_ROW_NUM is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF postrow.S_UNREAD_POST --> unreadpost<!-- ENDIF --><!-- IF postrow.S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF postrow.S_ONLINE --> online<!-- ENDIF -->">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="postbody">
-			<!-- IF postrow.S_IGNORE_POST -->
-				<div class="ignore">{postrow.L_IGNORE_POST}</div>
-			<!-- ELSE -->
-
-		<!-- IF not S_IS_BOT -->
-			<!-- IF postrow.U_QUOTE or postrow.U_INFO or postrow.U_DELETE or postrow.U_EDIT -->
-				<ul class="profile-icons">
-					<!-- IF postrow.U_EDIT --><li class="edit-icon"><a href="{postrow.U_EDIT}" title="{L_EDIT_POST}"><span>{L_EDIT_POST}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_DELETE --><li class="delete-icon"><a href="{postrow.U_DELETE}" title="{L_DELETE_POST}"><span>{L_DELETE_POST}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_REPORT --><li class="report-icon"><a href="{postrow.U_REPORT}" title="{L_REPORT_POST}"><span>{L_REPORT_POST}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_WARN --><li class="warn-icon"><a href="{postrow.U_WARN}" title="{L_WARN_USER}"><span>{L_WARN_USER}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_INFO --><li class="info-icon"><a href="{postrow.U_INFO}" title="{L_INFORMATION}"><span>{L_INFORMATION}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_QUOTE --><li class="quote-icon"><a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}"><span>{L_REPLY_WITH_QUOTE}</span></a></li><!-- ENDIF -->
-				</ul>
-			<!-- ENDIF -->
-		<!-- ENDIF -->
-
-			<h3 <!-- IF postrow.S_FIRST_ROW -->class="first"<!-- ENDIF -->><!-- IF postrow.POST_ICON_IMG --><img src="{T_ICONS_PATH}{postrow.POST_ICON_IMG}" width="{postrow.POST_ICON_IMG_WIDTH}" height="{postrow.POST_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="#p{postrow.POST_ID}">{postrow.POST_SUBJECT}</a></h3>
-			<p class="author"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><!-- ENDIF -->{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong> &raquo; {postrow.POST_DATE} </p>
-
-			<!-- IF postrow.S_POST_UNAPPROVED or postrow.S_POST_REPORTED -->
-				<p class="rules">
-					<!-- IF postrow.S_POST_UNAPPROVED -->{UNAPPROVED_IMG} <a href="{postrow.U_MCP_APPROVE}"><strong>{L_POST_UNAPPROVED}</strong></a><!-- ENDIF -->
-					<!-- IF postrow.S_POST_REPORTED -->{REPORTED_IMG} <a href="{postrow.U_MCP_REPORT}"><strong>{L_POST_REPORTED}</strong></a><!-- ENDIF -->
-				</p>
-			<!-- ENDIF -->
-
-			<div class="content">{postrow.MESSAGE}</div>
-
-			<!-- IF postrow.S_HAS_ATTACHMENTS -->
-				<dl class="attachbox">
-					<dt>{L_ATTACHMENTS}</dt>
-					<!-- BEGIN attachment -->
-						<dd>{postrow.attachment.DISPLAY_ATTACHMENT}</dd>
-					<!-- END attachment -->
-				</dl>
-			<!-- ENDIF -->
-
-			<!-- IF postrow.S_DISPLAY_NOTICE --><div class="rules">{L_DOWNLOAD_NOTICE}</div><!-- ENDIF -->
-			<!-- IF postrow.EDITED_MESSAGE or postrow.EDIT_REASON -->
-				<div class="notice">{postrow.EDITED_MESSAGE}
-					<!-- IF postrow.EDIT_REASON --><br /><strong>{L_REASON}:</strong> <em>{postrow.EDIT_REASON}</em><!-- ENDIF -->
-				</div>
-			<!-- ENDIF -->
-
-			<!-- IF postrow.BUMPED_MESSAGE --><div class="notice">{postrow.BUMPED_MESSAGE}</div><!-- ENDIF -->
-			<!-- IF postrow.SIGNATURE --><div id="sig{postrow.POST_ID}" class="signature">{postrow.SIGNATURE}</div><!-- ENDIF -->
-		<!-- ENDIF -->
-
-		</div>
-
-		<!-- IF not postrow.S_IGNORE_POST -->
-			<dl class="postprofile" id="profile{postrow.POST_ID}">
-			<dt>
-				<!-- IF postrow.POSTER_AVATAR -->
-					<!-- IF postrow.U_POST_AUTHOR --><a href="{postrow.U_POST_AUTHOR}">{postrow.POSTER_AVATAR}</a><!-- ELSE -->{postrow.POSTER_AVATAR}<!-- ENDIF --><br />
-				<!-- ENDIF -->
-				<!-- IF not postrow.U_POST_AUTHOR --><strong>{postrow.POST_AUTHOR_FULL}</strong><!-- ELSE -->{postrow.POST_AUTHOR_FULL}<!-- ENDIF -->
-			</dt>
-
-			<!-- IF postrow.RANK_TITLE or postrow.RANK_IMG --><dd>{postrow.RANK_TITLE}<!-- IF postrow.RANK_TITLE and postrow.RANK_IMG --><br /><!-- ENDIF -->{postrow.RANK_IMG}</dd><!-- ENDIF -->
-
-		<dd>&nbsp;</dd>
-
-		<!-- IF postrow.POSTER_POSTS != '' --><dd><strong>{L_POSTS}:</strong> {postrow.POSTER_POSTS}</dd><!-- ENDIF -->
-		<!-- IF postrow.POSTER_JOINED --><dd><strong>{L_JOINED}:</strong> {postrow.POSTER_JOINED}</dd><!-- ENDIF -->
-		<!-- IF postrow.POSTER_FROM --><dd><strong>{L_LOCATION}:</strong> {postrow.POSTER_FROM}</dd><!-- ENDIF -->
-
-		<!-- IF postrow.S_PROFILE_FIELD1 -->
-			<!-- Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. -->
-			<dd><strong>{postrow.PROFILE_FIELD1_NAME}:</strong> {postrow.PROFILE_FIELD1_VALUE}</dd>
-		<!-- ENDIF -->
-
-		<!-- BEGIN custom_fields -->
-			<dd><strong>{postrow.custom_fields.PROFILE_FIELD_NAME}:</strong> {postrow.custom_fields.PROFILE_FIELD_VALUE}</dd>
-		<!-- END custom_fields -->
-
-		<!-- IF not S_IS_BOT -->
-		<!-- IF postrow.U_PM or postrow.U_EMAIL or postrow.U_WWW or postrow.U_MSN or postrow.U_ICQ or postrow.U_YIM or postrow.U_AIM or postrow.U_JABBER -->
-			<dd>
-				<ul class="profile-icons">
-					<!-- IF postrow.U_PM --><li class="pm-icon"><a href="{postrow.U_PM}" title="{L_PRIVATE_MESSAGE}"><span>{L_PRIVATE_MESSAGE}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_EMAIL --><li class="email-icon"><a href="{postrow.U_EMAIL}" title="{L_SEND_EMAIL_USER} {postrow.POST_AUTHOR}"><span>{L_SEND_EMAIL_USER} {postrow.POST_AUTHOR}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_WWW --><li class="web-icon"><a href="{postrow.U_WWW}" title="{L_VISIT_WEBSITE}: {postrow.U_WWW}"><span>{L_WEBSITE}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_MSN --><li class="msnm-icon"><a href="{postrow.U_MSN}" onclick="popup(this.href, 550, 320); return false;" title="{L_MSNM}"><span>{L_MSNM}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_ICQ --><li class="icq-icon"><a href="{postrow.U_ICQ}" onclick="popup(this.href, 550, 320); return false;" title="{L_ICQ}"><span>{L_ICQ}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_YIM --><li class="yahoo-icon"><a href="{postrow.U_YIM}" onclick="popup(this.href, 780, 550); return false;" title="{L_YIM}"><span>{L_YIM}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_AIM --><li class="aim-icon"><a href="{postrow.U_AIM}" onclick="popup(this.href, 550, 320); return false;" title="{L_AIM}"><span>{L_AIM}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_JABBER --><li class="jabber-icon"><a href="{postrow.U_JABBER}" onclick="popup(this.href, 550, 320); return false;" title="{L_JABBER}"><span>{L_JABBER}</span></a></li><!-- ENDIF -->
-				</ul>
-			</dd>
-		<!-- ENDIF -->
-		<!-- ENDIF -->
-
-		</dl>
-	<!-- ENDIF -->
-
-		<div class="back2top"><a href="#wrap" class="top" title="{L_BACK_TO_TOP}">{L_BACK_TO_TOP}</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr class="divider" />
-<!-- END postrow -->
-
-<!-- IF S_NUM_POSTS > 1 or PREVIOUS_PAGE -->
-	<form id="viewtopic" method="post" action="{S_TOPIC_ACTION}">
-
-	<fieldset class="display-options" style="margin-top: 0; ">
-		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-		<!-- IF not S_IS_BOT -->
-		<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label>
-		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> <label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
-		<!-- ENDIF -->
-	</fieldset>
-
-	</form>
-	<hr />
-<!-- ENDIF -->
-
-<div class="topic-actions">
-	<div class="buttons">
-	<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
-		<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->"><a href="{U_POST_REPLY_TOPIC}" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->"><span></span><!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED_SHORT}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF --></a></div>
-	<!-- ENDIF -->
-	</div>
-
-	<!-- IF PAGINATION or TOTAL_POSTS -->
-		<div class="pagination">
-			{TOTAL_POSTS}
-			<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
-		</div>
-	<!-- ENDIF -->
-</div>
-
-<!-- INCLUDE jumpbox.html -->
-
-<!-- IF S_TOPIC_MOD -->
-	<form method="post" action="{S_MOD_ACTION}">
-	<fieldset class="quickmod">
-		<label for="quick-mod-select">{L_QUICK_MOD}:</label> {S_TOPIC_MOD} <input type="submit" value="{L_GO}" class="button2" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-<!-- ENDIF -->
-
-<!-- IF S_DISPLAY_ONLINE_LIST -->
-	<h3><!-- IF U_VIEWONLINE --><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a><!-- ELSE -->{L_WHO_IS_ONLINE}<!-- ENDIF --></h3>
-	<p>{LOGGED_IN_USER_LIST}</p>
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html
deleted file mode 100644
index 2946d7645c..0000000000
--- a/phpBB/styles/prosilver/template/viewtopic_print.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
-<head>
-
-<meta http-equiv="content-type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="content-style-type" content="text/css" />
-<meta http-equiv="content-language" content="{S_USER_LANG}" />
-<meta http-equiv="imagetoolbar" content="no" />
-<meta name="resource-type" content="document" />
-<meta name="distribution" content="global" />
-<meta name="copyright" content="2000, 2002, 2005, 2007 phpBB Group" />
-<meta name="keywords" content="" />
-<meta name="description" content="" />
-<meta name="robots" content="noindex" />
-{META}
-<title>{SITENAME} &bull; {PAGE_TITLE}</title>
-
-<link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
-</head>
-
-<body id="phpbb">
-<div id="wrap">
-	<a id="top" name="top" accesskey="t"></a>
-
-	<div id="page-header">
-		<h1>{SITENAME}</h1>
-		<p>{SITE_DESCRIPTION}<br /><a href="{U_FORUM}">{U_FORUM}</a></p>
-		
-		<h2>{TOPIC_TITLE}</h2>
-		<p><a href="{U_TOPIC}">{U_TOPIC}</a></p>
-	</div>
-
-	<div id="page-body">
-		<div class="page-number">{PAGE_NUMBER}</div>
-		<!-- BEGIN postrow -->
-			<div class="post">
-				<h3>{postrow.POST_SUBJECT}</h3>
-				<div class="date">{postrow.MINI_POST_IMG}{L_POSTED}: <strong>{postrow.POST_DATE}</strong></div>
-				<div class="author">{L_POST_BY_AUTHOR} <strong<!-- IF postrow.POST_AUTHOR_COLOUR --> style="color: {postrow.POST_AUTHOR_COLOUR}"<!-- ENDIF -->>{postrow.POST_AUTHOR}</strong></div>
-				<div class="content">{postrow.MESSAGE}</div>
-			</div>
-			<hr />
-		<!-- END postrow -->
-	</div>
-
-<!--
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-	forums may be affected.
-
-	The phpBB Group : 2006
-//-->
-	<div id="page-footer">
-		<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div>
-		<div class="copyright">Powered by phpBB &copy; 2000, 2002, 2005, 2007 phpBB Group<br />http://www.phpbb.com/</div>
-	</div>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
deleted file mode 100644
index 561bba0717..0000000000
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ /dev/null
@@ -1,725 +0,0 @@
-/* proSilver RTL definitions
----------------------------------------- */
-
-/**
-* common.css 
-*/
-.rtl h1 {
-	margin-right: 0;
-	margin-left: 200px;
-}
-
-.rtl p.right {
-	text-align: left;
-}
-
-.rtl div.rules ul {
-	margin-left: 0;
-	margin-right: 20px;
-}
-
-/* Main blocks
----------------------------------------- */
-.rtl #logo {
-	float: right;
-	padding: 10px 10px 0 13px;
-}
-
-/* Search box
---------------------------------------------- */
-.rtl #search-box {
-	float: left;
-	text-align: left;
-	margin-right: 0;
-	margin-left: 5px;
-}
-
-.rtl #search-box li {
-	text-align: left;
-}
-
-.rtl #search-box img {
-	margin-right: 0;
-	margin-left: 3px;
-}
-
-.rtl #site-description {
-	float: right;
-}
-
-.rtl #site-description h1 {
-	margin-left: 0;
-}
-
-/* Round cornered boxes and backgrounds
----------------------------------------- */
-.rtl .post {
-	background-position: 0 0;
-}
-
-/* Horizontal lists
-----------------------------------------*/
-.rtl ul.linklist li {
-	float: right;
-	margin-right: 0;
-	margin-left: 5px;
-}
-
-.rtl ul.linklist li.rightside, .rtl p.rightside {
-	float: left;
-	margin-right: 5px;
-	margin-left: 0;
-	text-align: left;
-}
-
-.rtl ul.leftside li, .rtl ul.rightside li {
-	float: left;
-}
-
-.rtl ul.leftside {
-	float: right;
-	margin-left: 5px;
-	margin-right: 0;
-	text-align: right;
-}
-
-.rtl ul.rightside {
-	float: left;
-	margin-left: -5px;
-	margin-right: 5px;
-	text-align: left;
-}
-
-/* Table styles
-----------------------------------------*/
-.rtl table.table1 thead th {
-	padding: 0 3px 4px 0;
-}
-
-.rtl table.table1 thead th span {
-	padding-left: 0;
-	padding-right: 7px;
-}
-
-.rtl table.table1 tbody th {
-	text-align: right;
-}
-
-/* Specific column styles */
-.rtl table.table1 .name		{ text-align: right; }
-.rtl table.table1 .joined	{ text-align: right; }
-.rtl table.table1 .active	{ text-align: right; }
-.rtl table.table1 .info		{ text-align: right; }
-.rtl table.table1 thead .autocol { padding-left: 0; padding-right: 1em; }
-
-.rtl table.table1 span.rank-img {
-	float: left;
-}
-
-.rtl table.info tbody th {
-	text-align: left;
-}
-
-.rtl .forumbg table.table1 {
-	margin: 0 -1px -1px -2px;
-}
-
-/* Misc layout styles
----------------------------------------- */
-/* column[1-2] styles are containers for two column layouts 
-   Also see tweaks.css */
-.rtl .column1 {
-	float: right;
-	clear: right;
-}
-
-.rtl .column2 {
-	float: left;
-	clear: left;
-}
-
-/* General classes for placing floating blocks */
-.rtl .left-box {
-	float: right;
-	text-align: right;
-}
-
-.rtl .right-box {
-	float: left;
-	text-align: left;
-}
-
-.rtl dl.details dt {
-	float: right;
-	clear: right;
-	text-align: left;
-}
-
-.rtl dl.details dd {
-	margin-right: 0;
-	margin-left: 0;
-	padding-right: 5px;
-	padding-left: 0;
-	float: right;
-}
-
-*:first-child+html dl.details dd {
-	margin-right: 30%;
-	float: none;
-}
-
-* html dl.details dd {
-	margin-right: 30%;
-	float: none;
-}
-
-/* Pagination
----------------------------------------- */
-.rtl .pagination {
-	text-align: left;
-	float: left;
-	padding-left: 5px;
-}
-
-/* Pagination in viewforum for multipage topics */
-.rtl .row .pagination {
-	float: left;
-	padding: 1px 0 1px 15px;
-}
-
-.rtl .pagination span {
-	direction: ltr;
-}
-
-.rtl .pagination span.page-sep {
-	display: inline;
-	visibility: hidden;
-	position: absolute;
-}
-
-/* Miscellaneous styles
----------------------------------------- */
-.rtl #forum-permissions {
-	float: left;
-	padding-right: 5px;
-	padding-left: 0;
-	margin-right: 5px;
-	margin-left: 0;
-	text-align: left;
-}
-
-.rtl .forabg {
-	width: 99%;	/* fix for IE6 */
-}
-
-.rtl .forumbg {
-	width: 99%;	/* fix for IE6 */
-}
-
-/**
-* links.css
-*/
-
-/* Back to top of page */
-.rtl .back2top {
-	text-align: left;
-}
-
-.rtl a.top {
-	float: left;
-}
-
-.rtl a.top2 {
-	padding-left: 0;
-	padding-right: 15px;
-}
-
-/**
-* content.css
-*/
-.rtl ul.topiclist dt {
-	float: right;
-}
-
-.rtl ul.topiclist dl {
-	position: static;	/* fix for IE6 */
-}
-
-.rtl ul.topiclist dd {
-	float: right;
-	border-right-width: 1px;
-	border-right-style: solid;
-	border-left: none;
-}
-
-.rtl ul.topiclist li.row dt a.subforum {
-	padding-right: 12px;
-	background-position: right;
-	position: static;
-}
-
-.rtl .forum-image {
-	float: right;
-	margin-right: 0;
-	margin-left: 5px;
-}
-
-.rtl li.header dt, .rtl li.header dd {
-	border-right-width: 0;
-}
-
-.rtl li.header dd {
-	margin-left: 0;
-	margin-right: 1px;
-}
-
-.rtl dl.icon {
-	background-position: 99.5% 50%;
-}
-
-.rtl li.header dl.icon dt {
-	/* Tweak for headers alignment when folder icon used */
-	padding-right: 0;
-	padding-left: 50px;
-}
-
-.rtl dl.icon dt {
-	padding-left: 0;
-	padding-right: 45px;					/* Space for folder icon */
-	background-position: 99.5% 95%;			/* Position of topic icon */
-}
-
-.rtl dd.lastpost span, .rtl ul.topiclist dd.searchby span, .rtl ul.topiclist dd.info span, .rtl ul.topiclist dd.time span, .rtl dd.redirect span, .rtl dd.moderation span {
-	padding-left: 0;
-	padding-right: 5px;
-}
-
-.rtl dd.mark {
-	float: left !important;
-}
-
-.rtl ul.topiclist dd.searchextra {
-	margin-left: 0;
-	margin-right: 5px;
-	border-right: none;
-}
-
-/* Post body styles
-----------------------------------------*/
-.rtl .postbody {
-	float: right;
-}
-
-/* Topic review panel
-----------------------------------------*/
-.rtl #topicreview {
-	padding-right: 0;
-	padding-left: 5px;
-}
-
-/* Content container styles
-----------------------------------------*/
-.rtl .content ul, .rtl .content ol {
-	margin-right: 3em;
-	margin-left: 0;
-}
-
-/* Post author */
-.rtl p.author {
-	margin: 0 0 0.6em 15em;
-}
-
-.rtl .signature {
-	clear: right;
-}
-
-.rtl .notice {
-	clear: right;
-}
-
-/* Jump to post link for now */
-.rtl ul.searchresults {
-	text-align: left;
-}
-
-/* BB Code styles
-----------------------------------------*/
-/* Quote block */
-.rtl blockquote {
-	margin: 0.5em 25px 0 1px;
-}
-
-.rtl blockquote blockquote {
-	/* Nested quotes */
-	margin: 0.5em 15px 0 1px;	
-}
-
-.rtl blockquote cite {
-	/* Username/source of quoter */
-	margin-right: 20px;
-	margin-left: 0;
-}
-
-.rtl blockquote dl.codebox {
-	margin-right: 0;
-}
-
-.rtl code {
-	direction: ltr;
-}
-
-/* Attachments
-----------------------------------------*/
-.rtl .attachbox {
-	float: right;
-	margin: 5px 0 5px 5px;
-	clear: right;
-}
-
-.rtl .attachbox dd {
-	clear: right;
-}
-
-.rtl .attachbox p {
-	clear: right;
-}
-
-.rtl .attachbox p.stats {
-	clear: right;
-}
-
-/* Post poll styles
-----------------------------------------*/
-.rtl fieldset.polls dt {
-	text-align: right;
-	float: right;
-	border-left: none;
-}
-
-.rtl fieldset.polls dd {
-	float: right;
-	border-right: none;
-	margin-right: 0;
-}
-
-.rtl fieldset.polls dd div {
-	text-align: left;
-}
-
-.rtl .pollbar1, .rtl .pollbar2, .rtl .pollbar3, .rtl .pollbar4, .rtl .pollbar5 {
-	border-left-width: 1px;
-	border-left-style: solid;
-	border-right: none;
-}
-
-/* Poster profile block
-----------------------------------------*/
-.rtl .postprofile {
-	border-left: none;
-	border-right-width: 1px;
-	border-right-style: solid;
-	float: left;
-/*	text-align: right; */
-}
-
-.rtl .pm .postprofile {
-	border-right-width: 1px;
-	border-right-style: solid;
-	border-left: none;
-}
-
-.rtl .postprofile dd, .rtl .postprofile dt {
-	margin-left: 0;
-	margin-right: 8px;
-}
-
-.rtl .online {
-	background-position: 0 0;
-}
-
-.rtl dl.pmlist dd {
-	margin-right: 61% !important;
-	margin-left: 0 !important;
-}
-
-/**
-* buttons.css
-*/
-/* Rollover buttons
-   Based on: http://wellstyled.com/css-nopreload-rollovers.html
-----------------------------------------*/
-.rtl .buttons {
-	float: right;
-}
-
-/* Rollover state */
-.rtl .buttons div {
-	margin: 0 1px 0 5px;
-}
-
-/* Sub-header (navigation bar)
---------------------------------------------- */
-.rtl a.print, .rtl a.sendemail, .rtl a.fontsize {
-	text-align: right;
-}
-
-/* Icon images
----------------------------------------- */
-.rtl .sitehome, .rtl .icon-faq, .rtl .icon-members, .rtl .icon-home, .rtl .icon-ucp, .rtl .icon-register, .rtl .icon-logout,
-.rtl .icon-bookmark, .rtl .icon-bump, .rtl .icon-subscribe, .rtl .icon-unsubscribe, .rtl .icon-pages, .rtl .icon-search {
-	background-position: 100% 50%;
-	padding: 1px 17px 0 0;
-}
-
-/* Poster profile icons
-----------------------------------------*/
-/* Rollover state */
-.rtl .postprofile ul.profile-icons li {
-	float: right;
-	margin: 0 0 3px 6px;
-}
-
-/* Positioning of moderator icons */
-.rtl .postbody ul.profile-icons {
-	float: left;
-}
-
-/**
-* cp.css
-*/
-/* proSilver Control Panel Styles
----------------------------------------- */
-
-
-/* Main CP box
-----------------------------------------*/
-.rtl #cp-menu {
-	float: right;
-}
-
-.rtl #cp-main {
-	float: right;
-}
-
-.rtl #cp-main .panel ol {
-	margin-right: 2em;
-	margin-left: 0;
-}
-
-.rtl #cp-main .pagination {
-	float: left;
-}
-
-.rtl #cp-main .buttons {
-	margin-right: 0;
-	margin-left: 0;
-}
-
-/* CP tabbed menu
-----------------------------------------*/
-.rtl #tabs {
-	margin: 20px 7px -1px 0;
-}
-
-.rtl #tabs a {
-	float: right;
-}
-
-/*.rtl #tabs a span {
-	float: right;
-}*/
-
-/* Mini tabbed menu used in MCP
-----------------------------------------*/
-.rtl #minitabs {
-	margin: -20px 0 0 7px;
-}
-
-.rtl #minitabs li {
-	float: left;
-	margin-right: 2px;
-	margin-left: 0;
-}
-
-/* UCP navigation menu
-----------------------------------------*/
-
-/* Preferences pane layout
-----------------------------------------*/
-.rtl #cp-main h2 {
-	margin-left: 0;
-	margin-right: 10px;
-}
-
-/* Friends list */
-.rtl .cp-mini {
-	margin: 10px 5px 10px 15px;
-}
-
-/* PM Styles
-----------------------------------------*/
-
-/* Defined rules list for PM options */
-.rtl ol.def-rules {
-	padding-right: 0;
-}
-
-/* PM marking colours */
-.rtl .pm-legend {
-	border-right-width: 10px;
-	border-right-style: solid;
-	border-left-width: 0;
-	padding-left: 0;
-	padding-right: 3px;
-}
-
-/* Avatar gallery */
-.rtl #gallery label {
-	float: right;
-}
-
-/**
-* forms.css
-*/
-
-/* General form styles
-----------------------------------------*/
-
-.rtl option {
-	padding-right: 0;
-	padding-left: 1em;
-}
-
-.rtl label {
-	padding-right: 0;
-	padding-left: 5px;
-}
-
-/* Definition list layout for forms
----------------------------------------- */
-.rtl fieldset dt {
-	float: right;
-	text-align: right;
-}
-
-.rtl fieldset dd {
-	margin-left: 0;
-	margin-right: 41%;
-}
-
-/* Specific layout 1 */
-.rtl fieldset.fields1 dt {
-	border-left-width: 0;
-	border-right-width: 1px;
-}
-
-.rtl fieldset.fields1 dd {
-	margin-right: 10em;
-	margin-left: 0;
-	border-right-width: 0;
-	border-left-width: 1px;
-}
-
-/* Specific layout 2 */
-.rtl fieldset.fields2 dt {
-	border-right-width: 1px;
-	border-left-width: 0;
-}
-
-.rtl fieldset.fields2 dd {
-	margin-right: 16em;
-	margin-left: 0;
-	border-left-width: 1px;
-	border-right-width: 0;
-}
-
-/* Form elements */
-.rtl dt label {
-	text-align: right;
-}
-
-.rtl dd input, .rtl dd textarea {
-	margin-left: 3px;
-	margin-right: 0;
-}
-
-/* Quick-login on index page */
-.rtl fieldset.quick-login input.inputbox {
-	margin-left: 5px;
-	margin-right: 0;
-}
-
-.rtl fieldset.quick-login label {
-	padding-left: 2px;
-	padding-right: 0;
-}
-
-/* Display options on viewtopic/viewforum pages  */
-.rtl fieldset.display-options label {
-	padding-left: 2px;
-	padding-right: 0;
-}
-
-/* Display actions for ucp and mcp pages */
-.rtl fieldset.display-actions {
-	text-align: left;
-	padding-left: 1em;
-	padding-right: 0;
-}
-
-.rtl fieldset.display-actions label {
-	padding-left: 2px;
-	padding-right: 0;
-}
-
-/* MCP forum selection*/
-.rtl fieldset.forum-selection {
-	float: left;
-}
-
-.rtl fieldset.forum-selection2 {
-	float: left;
-}
-
-/* Jumpbox */
-.rtl fieldset.jumpbox {
-	text-align: left;
-}
-
-.rtl fieldset.quickmod {
-	float: left;
-	text-align: left;
-}
-
-/* Posting page styles
-----------------------------------------*/
-
-/* Emoticons panel */
-.rtl #smiley-box {
-	float: left;
-}
-
-/* Form button styles
----------------------------------------- */
-
-/* Topic and forum Search */
-.rtl .search-box {
-	margin-right: 5px;
-	margin-left: 0;
-	float: right;
-}
-
-.rtl input.search {
-	background-position: right 1px;
-	padding-right: 17px;
-	padding-left: 0;
-}
-
-/**
-* tweaks.css
-*/
-
-/** Reference: Bug #27155 */
-.rtl #wrap, .rtl .headerbar, .rtl #site-description, .rtl .navbar {
-	position: relative;
-}
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
deleted file mode 100644
index 6cffdc5930..0000000000
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ /dev/null
@@ -1,169 +0,0 @@
-/* proSilver Button Styles
----------------------------------------- */
-
-/* Rollover buttons
-   Based on: http://wellstyled.com/css-nopreload-rollovers.html
-----------------------------------------*/
-.buttons {
-	float: left;
-	width: auto;
-	height: auto;
-}
-
-/* Rollover state */
-.buttons div {
-	float: left;
-	margin: 0 5px 0 0;
-	background-position: 0 100%;
-}
-
-/* Rolloff state */
-.buttons div a {
-	display: block;
-	width: 100%;
-	height: 100%;
-	background-position: 0 0;
-	position: relative;
-	overflow: hidden;
-}
-
-/* Hide <a> text and hide off-state image when rolling over (prevents flicker in IE) */
-/*.buttons div span		{ display: none; }*/
-/*.buttons div a:hover	{ background-image: none; }*/
-.buttons div span			{ position: absolute; width: 100%; height: 100%; cursor: pointer;}
-.buttons div a:hover span	{ background-position: 0 100%; }
-
-/* Big button images */
-.reply-icon span	{ background: transparent none 0 0 no-repeat; }
-.post-icon span		{ background: transparent none 0 0 no-repeat; }
-.locked-icon span	{ background: transparent none 0 0 no-repeat; }
-.pmreply-icon span	{ background: none 0 0 no-repeat; }
-.newpm-icon span 	{ background: none 0 0 no-repeat; }
-.forwardpm-icon span 	{ background: none 0 0 no-repeat; }
-
-/* Set big button dimensions */
-.buttons div.reply-icon		{ width: {IMG_BUTTON_TOPIC_REPLY_WIDTH}px; height: {IMG_BUTTON_TOPIC_REPLY_HEIGHT}px; }
-.buttons div.post-icon		{ width: {IMG_BUTTON_TOPIC_NEW_WIDTH}px; height: {IMG_BUTTON_TOPIC_NEW_HEIGHT}px; }
-.buttons div.locked-icon	{ width: {IMG_BUTTON_TOPIC_LOCKED_WIDTH}px; height: {IMG_BUTTON_TOPIC_LOCKED_HEIGHT}px; }
-.buttons div.pmreply-icon	{ width: {IMG_BUTTON_PM_REPLY_WIDTH}px; height: {IMG_BUTTON_PM_REPLY_HEIGHT}px; }
-.buttons div.newpm-icon		{ width: {IMG_BUTTON_PM_NEW_WIDTH}px; height: {IMG_BUTTON_PM_NEW_HEIGHT}px; }
-.buttons div.forwardpm-icon	{ width: {IMG_BUTTON_PM_FORWARD_WIDTH}px; height: {IMG_BUTTON_PM_FORWARD_HEIGHT}px; }
-
-/* Sub-header (navigation bar)
---------------------------------------------- */
-a.print, a.sendemail, a.fontsize {
-	display: block;
-	overflow: hidden;
-	height: 18px;
-	text-indent: -5000px;
-	text-align: left;
-	background-repeat: no-repeat;
-}
-
-a.print {
-	background-image: none;
-	width: 22px;
-}
-
-a.sendemail {
-	background-image: none;
-	width: 22px;
-}
-
-a.fontsize {
-	background-image: none;
-	background-position: 0 -1px;
-	width: 29px;
-}
-
-a.fontsize:hover {
-	background-position: 0 -20px;
-	text-decoration: none;
-}
-
-/* Icon images
----------------------------------------- */
-.sitehome, .icon-faq, .icon-members, .icon-home, .icon-ucp, .icon-register, .icon-logout,
-.icon-bookmark, .icon-bump, .icon-subscribe, .icon-unsubscribe, .icon-pages, .icon-search {
-	background-position: 0 50%;
-	background-repeat: no-repeat;
-	background-image: none;
-	padding: 1px 0 0 17px;
-}
-
-/* Poster profile icons
-----------------------------------------*/
-ul.profile-icons {
-	padding-top: 10px;
-	list-style: none;
-}
-
-/* Rollover state */
-ul.profile-icons li {
-	float: left;
-	margin: 0 6px 3px 0;
-	background-position: 0 100%;
-}
-
-/* Rolloff state */
-ul.profile-icons li a {
-	display: block;
-	width: 100%;
-	height: 100%;
-	background-position: 0 0;
-}
-
-/* Hide <a> text and hide off-state image when rolling over (prevents flicker in IE) */
-ul.profile-icons li span { display:none; }
-ul.profile-icons li a:hover { background: none; }
-
-/* Positioning of moderator icons */
-.postbody ul.profile-icons {
-	float: right;
-	width: auto;
-	padding: 0;
-}
-
-.postbody ul.profile-icons li {
-	margin: 0 3px;
-}
-
-/* Profile & navigation icons */
-.email-icon, .email-icon a		{ background: none top left no-repeat; }
-.aim-icon, .aim-icon a			{ background: none top left no-repeat; }
-.yahoo-icon, .yahoo-icon a		{ background: none top left no-repeat; }
-.web-icon, .web-icon a			{ background: none top left no-repeat; }
-.msnm-icon, .msnm-icon a			{ background: none top left no-repeat; }
-.icq-icon, .icq-icon a			{ background: none top left no-repeat; }
-.jabber-icon, .jabber-icon a		{ background: none top left no-repeat; }
-.pm-icon, .pm-icon a				{ background: none top left no-repeat; }
-.quote-icon, .quote-icon a		{ background: none top left no-repeat; }
-
-/* Moderator icons */
-.report-icon, .report-icon a		{ background: none top left no-repeat; }
-.warn-icon, .warn-icon a			{ background: none top left no-repeat; }
-.edit-icon, .edit-icon a			{ background: none top left no-repeat; }
-.delete-icon, .delete-icon a		{ background: none top left no-repeat; }
-.info-icon, .info-icon a			{ background: none top left no-repeat; }
-
-/* Set profile icon dimensions */
-ul.profile-icons li.email-icon		{ width: {IMG_ICON_CONTACT_EMAIL_WIDTH}px; height: {IMG_ICON_CONTACT_EMAIL_HEIGHT}px; }
-ul.profile-icons li.aim-icon	{ width: {IMG_ICON_CONTACT_AIM_WIDTH}px; height: {IMG_ICON_CONTACT_AIM_HEIGHT}px; }
-ul.profile-icons li.yahoo-icon	{ width: {IMG_ICON_CONTACT_YAHOO_WIDTH}px; height: {IMG_ICON_CONTACT_YAHOO_HEIGHT}px; }
-ul.profile-icons li.web-icon	{ width: {IMG_ICON_CONTACT_WWW_WIDTH}px; height: {IMG_ICON_CONTACT_WWW_HEIGHT}px; }
-ul.profile-icons li.msnm-icon	{ width: {IMG_ICON_CONTACT_MSNM_WIDTH}px; height: {IMG_ICON_CONTACT_MSNM_HEIGHT}px; }
-ul.profile-icons li.icq-icon	{ width: {IMG_ICON_CONTACT_ICQ_WIDTH}px; height: {IMG_ICON_CONTACT_ICQ_HEIGHT}px; }
-ul.profile-icons li.jabber-icon	{ width: {IMG_ICON_CONTACT_JABBER_WIDTH}px; height: {IMG_ICON_CONTACT_JABBER_HEIGHT}px; }
-ul.profile-icons li.pm-icon		{ width: {IMG_ICON_CONTACT_PM_WIDTH}px; height: {IMG_ICON_CONTACT_PM_HEIGHT}px; }
-ul.profile-icons li.quote-icon	{ width: {IMG_ICON_POST_QUOTE_WIDTH}px; height: {IMG_ICON_POST_QUOTE_HEIGHT}px; }
-ul.profile-icons li.report-icon	{ width: {IMG_ICON_POST_REPORT_WIDTH}px; height: {IMG_ICON_POST_REPORT_HEIGHT}px; }
-ul.profile-icons li.edit-icon	{ width: {IMG_ICON_POST_EDIT_WIDTH}px; height: {IMG_ICON_POST_EDIT_HEIGHT}px; }
-ul.profile-icons li.delete-icon	{ width: {IMG_ICON_POST_DELETE_WIDTH}px; height: {IMG_ICON_POST_DELETE_HEIGHT}px; }
-ul.profile-icons li.info-icon	{ width: {IMG_ICON_POST_INFO_WIDTH}px; height: {IMG_ICON_POST_INFO_HEIGHT}px; }
-ul.profile-icons li.warn-icon	{ width: {IMG_ICON_USER_WARN_WIDTH}px; height: {IMG_ICON_USER_WARN_HEIGHT}px; }
-
-/* Fix profile icon default margins */
-ul.profile-icons li.edit-icon	{ margin: 0 0 0 3px; }
-ul.profile-icons li.quote-icon	{ margin: 0 0 0 10px; }
-ul.profile-icons li.info-icon, ul.profile-icons li.report-icon	{ margin: 0 3px 0 0; }
-
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
deleted file mode 100644
index 815ccb9f13..0000000000
--- a/phpBB/styles/prosilver/theme/colours.css
+++ /dev/null
@@ -1,1002 +0,0 @@
-/*  	
---------------------------------------------------------------
-Colours and backgrounds for common.css
--------------------------------------------------------------- */
-
-html, body {
-	color: #536482;
-	background-color: #FFFFFF;
-}
-
-h1 {
-	color: #FFFFFF;
-}
-
-h2 {
-	color: #28313F;
-}
-
-h3 {
-	border-bottom-color: #CCCCCC;
-	color: #115098;
-}
-
-hr {
-	border-color: #FFFFFF;
-	border-top-color: #CCCCCC;
-}
-
-hr.dashed {
-	border-top-color: #CCCCCC;
-}
-
-/* Search box
---------------------------------------------- */
-
-#search-box {
-	color: #FFFFFF;
-}
-
-#search-box #keywords {
-	background-color: #FFF;
-}
-
-#search-box input {
-	border-color: #0075B0;
-}
-
-/* Round cornered boxes and backgrounds
----------------------------------------- */
-.headerbar {
-	background-color: #12A3EB;
-	background-image: url("{T_THEME_PATH}/images/bg_header.gif");
-	color: #FFFFFF;
-}
-
-.navbar {
-	background-color: #cadceb;
-}
-
-.forabg {
-	background-color: #0076b1;
-	background-image: url("{T_THEME_PATH}/images/bg_list.gif");
-}
-
-.forumbg {
-	background-color: #12A3EB;
-	background-image: url("{T_THEME_PATH}/images/bg_header.gif");
-}
-
-.panel {
-	background-color: #ECF1F3;
-	color: #28313F;
-}
-
-.post:target .content {
-	color: #000000;
-}
-
-.post:target h3 a {
-	color: #000000;
-}
-
-.bg1	{ background-color: #ECF3F7; }
-.bg2	{ background-color: #e1ebf2;  }
-.bg3	{ background-color: #cadceb; }
-
-.ucprowbg {
-	background-color: #DCDEE2;
-}
-
-.fieldsbg {
-	background-color: #E7E8EA;
-}
-
-span.corners-top {
-	background-image: url("{T_THEME_PATH}/images/corners_left.png");
-}
-
-span.corners-top span {
-	background-image: url("{T_THEME_PATH}/images/corners_right.png");
-}
-
-span.corners-bottom {
-	background-image: url("{T_THEME_PATH}/images/corners_left.png");
-}
-
-span.corners-bottom span {
-	background-image: url("{T_THEME_PATH}/images/corners_right.png");
-}
-
-/* Horizontal lists
-----------------------------------------*/
-
-ul.navlinks {
-	border-bottom-color: #FFFFFF;
-}
-
-/* Table styles
-----------------------------------------*/
-table.table1 thead th {
-	color: #FFFFFF;
-}
-
-table.table1 tbody tr {
-	border-color: #BFC1CF;
-}
-
-table.table1 tbody tr:hover, table.table1 tbody tr.hover {
-	background-color: #CFE1F6;
-	color: #000;
-}
-
-table.table1 td {
-	color: #536482;
-}
-
-table.table1 tbody td {
-	border-top-color: #FAFAFA;
-}
-
-table.table1 tbody th {
-	border-bottom-color: #000000;
-	color: #333333;
-	background-color: #FFFFFF;
-}
-
-table.info tbody th {
-	color: #000000;
-}
-
-/* Misc layout styles
----------------------------------------- */
-dl.details dt {
-	color: #000000;
-}
-
-dl.details dd {
-	color: #536482;
-}
-
-.sep {
-	color: #1198D9;
-}
-
-/* Pagination
----------------------------------------- */
-
-.pagination span strong {
-	color: #FFFFFF;
-	background-color: #4692BF;
-	border-color: #4692BF;
-}
-
-.pagination span a, .pagination span a:link, .pagination span a:visited, .pagination span a:active {
-	color: #5C758C;
-	background-color: #ECEDEE;
-	border-color: #B4BAC0;
-}
-
-.pagination span a:hover {
-	border-color: #368AD2;
-	background-color: #368AD2;
-	color: #FFF;
-}
-
-/* Pagination in viewforum for multipage topics */
-.row .pagination {
-	background-image: url("{T_THEME_PATH}/images/icon_pages.gif");
-}
-
-.row .pagination span a, li.pagination span a {
-	background-color: #FFFFFF;
-}
-
-.row .pagination span a:hover, li.pagination span a:hover {
-	background-color: #368AD2;
-}
-
-/* Miscellaneous styles
----------------------------------------- */
-
-.copyright {
-	color: #555555;
-}
-
-.error {
-	color: #BC2A4D;
-}
-
-.reported {
-	background-color: #F7ECEF;
-}
-
-li.reported:hover {
-	background-color: #ECD5D8 !important;
-}
-.sticky, .announce {
-	/* you can add a background for stickies and announcements*/
-}
-
-div.rules {
-	background-color: #ECD5D8;
-	color: #BC2A4D;
-}
-
-p.rules {
-	background-color: #ECD5D8;
-	background-image: none;
-}
-
-/*  	
---------------------------------------------------------------
-Colours and backgrounds for links.css
--------------------------------------------------------------- */
-
-a:link	{ color: #105289; }
-a:visited	{ color: #105289; }
-a:hover	{ color: #D31141; }
-a:active	{ color: #368AD2; }
-
-/* Links on gradient backgrounds */
-#search-box a:link, .navbg a:link, .forumbg .header a:link, .forabg .header a:link, th a:link {
-	color: #FFFFFF;
-}
-
-#search-box a:visited, .navbg a:visited, .forumbg .header a:visited, .forabg .header a:visited, th a:visited {
-	color: #FFFFFF;
-}
-
-#search-box a:hover, .navbg a:hover, .forumbg .header a:hover, .forabg .header a:hover, th a:hover {
-	color: #A8D8FF;
-}
-
-#search-box a:active, .navbg a:active, .forumbg .header a:active, .forabg .header a:active, th a:active {
-	color: #C8E6FF;
-}
-
-/* Links for forum/topic lists */
-a.forumtitle {
-	color: #105289;
-}
-
-/* a.forumtitle:visited { color: #105289; } */
-
-a.forumtitle:hover {
-	color: #BC2A4D;
-}
-
-a.forumtitle:active {
-	color: #105289;
-}
-
-a.topictitle {
-	color: #105289;
-}
-
-/* a.topictitle:visited { color: #368AD2; } */
-
-a.topictitle:hover {
-	color: #BC2A4D;
-}
-
-a.topictitle:active {
-	color: #105289;
-}
-
-/* Post body links */
-.postlink {
-	color: #368AD2;
-	border-bottom-color: #368AD2;
-}
-
-.postlink:visited {
-	color: #5D8FBD;
-	border-bottom-color: #666666;
-}
-
-.postlink:active {
-	color: #368AD2;
-}
-
-.postlink:hover {
-	background-color: #D0E4F6;
-	color: #0D4473;
-}
-
-.signature a, .signature a:visited, .signature a:active, .signature a:hover {
-	background-color: transparent;
-}
-
-/* Profile links */
-.postprofile a:link, .postprofile a:active, .postprofile a:visited, .postprofile dt.author a {
-	color: #105289;
-}
-
-.postprofile a:hover, .postprofile dt.author a:hover {
-	color: #D31141;
-}
-
-/* Profile searchresults */	
-.search .postprofile a {
-	color: #105289;
-}
-
-.search .postprofile a:hover {
-	color: #D31141;
-}
-
-/* Back to top of page */
-a.top {
-	background-image: url("{IMG_ICON_BACK_TOP_SRC}");
-}
-
-a.top2 {
-	background-image: url("{IMG_ICON_BACK_TOP_SRC}");
-}
-
-/* Arrow links  */
-a.up		{ background-image: url("{T_THEME_PATH}/images/arrow_up.gif") }
-a.down		{ background-image: url("{T_THEME_PATH}/images/arrow_down.gif") }
-a.left		{ background-image: url("{T_THEME_PATH}/images/arrow_left.gif") }
-a.right		{ background-image: url("{T_THEME_PATH}/images/arrow_right.gif") }
-
-a.up:hover {
-	background-color: transparent;
-}
-
-a.left:hover {
-	color: #368AD2;
-}
-
-a.right:hover {
-	color: #368AD2;
-}
-
-
-/*  	
---------------------------------------------------------------
-Colours and backgrounds for content.css
--------------------------------------------------------------- */
-
-ul.forums {
-	background-color: #eef5f9;
-	background-image: url("{T_THEME_PATH}/images/gradient.gif");
-}
-
-ul.topiclist li {
-	color: #4C5D77;
-}
-
-ul.topiclist dd {
-	border-left-color: #FFFFFF;
-}
-
-.rtl ul.topiclist dd {
-	border-right-color: #fff;
-	border-left-color: transparent;
-}
-
-ul.topiclist li.row dt a.subforum.read {
-	background-image: url("{IMG_SUBFORUM_READ_SRC}");
-}
-
-ul.topiclist li.row dt a.subforum.unread {
-	background-image: url("{IMG_SUBFORUM_UNREAD_SRC}");
-}
-
-li.row {
-	border-top-color:  #FFFFFF;
-	border-bottom-color: #00608F;
-}
-
-li.row strong {
-	color: #000000;
-}
-
-li.row:hover {
-	background-color: #F6F4D0;
-}
-
-li.row:hover dd {
-	border-left-color: #CCCCCC;
-}
-
-.rtl li.row:hover dd {
-	border-right-color: #CCCCCC;
-	border-left-color: transparent;
-}
-
-li.header dt, li.header dd {
-	color: #FFFFFF;
-}
-
-/* Forum list column styles */
-ul.topiclist dd.searchextra {
-	color: #333333;
-}
-
-/* Post body styles
-----------------------------------------*/
-.postbody {
-	color: #333333;
-}
-
-/* Content container styles
-----------------------------------------*/
-.content {
-	color: #333333;
-}
-
-.content h2, .panel h2 {
-	color: #115098;
-	border-bottom-color:  #CCCCCC;
-}
-
-dl.faq dt {
-	color: #333333;
-}
-
-.posthilit {
-	background-color: #F3BFCC;
-	color: #BC2A4D;
-}
-
-/* Post signature */
-.signature {
-	border-top-color: #CCCCCC;
-}
-
-/* Post noticies */
-.notice {
-	border-top-color:  #CCCCCC;
-}
-
-/* BB Code styles
-----------------------------------------*/
-/* Quote block */
-blockquote {
-	background-color: #EBEADD;
-	background-image: url("{T_THEME_PATH}/images/quote.gif");
-	border-color:#DBDBCE;
-}
-
-blockquote blockquote {
-	/* Nested quotes */
-	background-color:#EFEED9;
-}
-
-blockquote blockquote blockquote {
-	/* Nested quotes */
-	background-color: #EBEADD;
-}
-
-/* Code block */
-dl.codebox {
-	background-color: #FFFFFF;
-	border-color: #C9D2D8;
-}
-
-dl.codebox dt {
-	border-bottom-color:  #CCCCCC;
-}
-
-dl.codebox code {
-	color: #2E8B57;
-}
-
-.syntaxbg		{ color: #FFFFFF; }
-.syntaxcomment	{ color: #FF8000; }
-.syntaxdefault	{ color: #0000BB; }
-.syntaxhtml		{ color: #000000; }
-.syntaxkeyword	{ color: #007700; }
-.syntaxstring	{ color: #DD0000; }
-
-/* Attachments
-----------------------------------------*/
-.attachbox {
-	background-color: #FFFFFF;
-	border-color:  #C9D2D8;
-}
-
-.pm-message .attachbox {
-	background-color: #F2F3F3;
-}
-
-.attachbox dd {
-	border-top-color: #C9D2D8;
-}
-
-.attachbox p {
-	color: #666666;
-}
-
-.attachbox p.stats {
-	color: #666666;
-}
-
-.attach-image img {
-	border-color: #999999;
-}
-
-/* Inline image thumbnails */
-
-dl.file dd {
-	color: #666666;
-}
-
-dl.thumbnail img {
-	border-color: #666666;
-	background-color: #FFFFFF;
-}
-
-dl.thumbnail dd {
-	color: #666666;
-}
-
-dl.thumbnail dt a:hover {
-	background-color: #EEEEEE;
-}
-
-dl.thumbnail dt a:hover img {
-	border-color: #368AD2;
-}
-
-/* Post poll styles
-----------------------------------------*/
-
-fieldset.polls dl {
-	border-top-color: #DCDEE2;
-	color: #666666;
-}
-
-fieldset.polls dl.voted {
-	color: #000000;
-}
-
-fieldset.polls dd div {
-	color: #FFFFFF;
-}
-
-.rtl .pollbar1, .rtl .pollbar2, .rtl .pollbar3, .rtl .pollbar4, .rtl .pollbar5 {
-	border-right-color: transparent;
-}
-
-.pollbar1 {
-	background-color: #AA2346;
-	border-bottom-color: #74162C;
-	border-right-color: #74162C;
-}
-
-.rtl .pollbar1 {
-	border-left-color: #74162C;
-}
-
-.pollbar2 {
-	background-color: #BE1E4A;
-	border-bottom-color: #8C1C38;
-	border-right-color: #8C1C38;
-}
-
-.rtl .pollbar2 {
-	border-left-color: #8C1C38;
-}
-
-.pollbar3 {
-	background-color: #D11A4E;
-	border-bottom-color: #AA2346;
-	border-right-color: #AA2346;
-}
-
-.rtl .pollbar3 {
-	border-left-color: #AA2346;
-}
-
-.pollbar4 {
-	background-color: #E41653;
-	border-bottom-color: #BE1E4A;
-	border-right-color: #BE1E4A;
-}
-
-.rtl .pollbar4 {
-	border-left-color: #BE1E4A;
-}
-
-.pollbar5 {
-	background-color: #F81157;
-	border-bottom-color: #D11A4E;
-	border-right-color: #D11A4E;
-}
-
-.rtl .pollbar5 {
-	border-left-color: #D11A4E;
-}
-
-/* Poster profile block
-----------------------------------------*/
-.postprofile {
-	color: #666666;
-	border-left-color: #FFFFFF;
-}
-
-.rtl .postprofile {
-	border-right-color: #FFFFFF;
-	border-left-color: transparent;
-}
-
-.pm .postprofile {
-	border-left-color: #DDDDDD;
-}
-
-.rtl .pm .postprofile {
-	border-right-color: #DDDDDD;
-	border-left-color: transparent;
-}
-
-.postprofile strong {
-	color: #000000;
-}
-
-.online {
-	background-image: url("{T_IMAGESET_LANG_PATH}/icon_user_online.gif");
-}
-
-/*  	
---------------------------------------------------------------
-Colours and backgrounds for buttons.css
--------------------------------------------------------------- */
-
-/* Big button images */
-.reply-icon span	{ background-image: url("{IMG_BUTTON_TOPIC_REPLY_SRC}"); }
-.post-icon span		{ background-image: url("{IMG_BUTTON_TOPIC_NEW_SRC}"); }
-.locked-icon span	{ background-image: url("{IMG_BUTTON_TOPIC_LOCKED_SRC}"); }
-.pmreply-icon span	{ background-image: url("{IMG_BUTTON_PM_REPLY_SRC}") ;}
-.newpm-icon span 	{ background-image: url("{IMG_BUTTON_PM_NEW_SRC}") ;}
-.forwardpm-icon span	{ background-image: url("{IMG_BUTTON_PM_FORWARD_SRC}") ;}
-
-a.print {
-	background-image: url("{T_THEME_PATH}/images/icon_print.gif");
-}
-
-a.sendemail {
-	background-image: url("{T_THEME_PATH}/images/icon_sendemail.gif");
-}
-
-a.fontsize {
-	background-image: url("{T_THEME_PATH}/images/icon_fontsize.gif");
-}
-
-/* Icon images
----------------------------------------- */
-.sitehome						{ background-image: url("{T_THEME_PATH}/images/icon_home.gif"); }
-.icon-faq						{ background-image: url("{T_THEME_PATH}/images/icon_faq.gif"); }
-.icon-members					{ background-image: url("{T_THEME_PATH}/images/icon_members.gif"); }
-.icon-home						{ background-image: url("{T_THEME_PATH}/images/icon_home.gif"); }
-.icon-ucp						{ background-image: url("{T_THEME_PATH}/images/icon_ucp.gif"); }
-.icon-register					{ background-image: url("{T_THEME_PATH}/images/icon_register.gif"); }
-.icon-logout					{ background-image: url("{T_THEME_PATH}/images/icon_logout.gif"); }
-.icon-bookmark					{ background-image: url("{T_THEME_PATH}/images/icon_bookmark.gif"); }
-.icon-bump						{ background-image: url("{T_THEME_PATH}/images/icon_bump.gif"); }
-.icon-subscribe					{ background-image: url("{T_THEME_PATH}/images/icon_subscribe.gif"); }
-.icon-unsubscribe				{ background-image: url("{T_THEME_PATH}/images/icon_unsubscribe.gif"); }
-.icon-pages						{ background-image: url("{T_THEME_PATH}/images/icon_pages.gif"); }
-.icon-search					{ background-image: url("{T_THEME_PATH}/images/icon_search.gif"); }
-
-/* Profile & navigation icons */
-.email-icon, .email-icon a		{ background-image: url("{IMG_ICON_CONTACT_EMAIL_SRC}"); }
-.aim-icon, .aim-icon a			{ background-image: url("{IMG_ICON_CONTACT_AIM_SRC}"); }
-.yahoo-icon, .yahoo-icon a		{ background-image: url("{IMG_ICON_CONTACT_YAHOO_SRC}"); }
-.web-icon, .web-icon a			{ background-image: url("{IMG_ICON_CONTACT_WWW_SRC}"); }
-.msnm-icon, .msnm-icon a			{ background-image: url("{IMG_ICON_CONTACT_MSNM_SRC}"); }
-.icq-icon, .icq-icon a			{ background-image: url("{IMG_ICON_CONTACT_ICQ_SRC}"); }
-.jabber-icon, .jabber-icon a		{ background-image: url("{IMG_ICON_CONTACT_JABBER_SRC}"); }
-.pm-icon, .pm-icon a				{ background-image: url("{IMG_ICON_CONTACT_PM_SRC}"); }
-.quote-icon, .quote-icon a		{ background-image: url("{IMG_ICON_POST_QUOTE_SRC}"); }
-
-/* Moderator icons */
-.report-icon, .report-icon a		{ background-image: url("{IMG_ICON_POST_REPORT_SRC}"); }
-.edit-icon, .edit-icon a			{ background-image: url("{IMG_ICON_POST_EDIT_SRC}"); }
-.delete-icon, .delete-icon a		{ background-image: url("{IMG_ICON_POST_DELETE_SRC}"); }
-.info-icon, .info-icon a			{ background-image: url("{IMG_ICON_POST_INFO_SRC}"); }
-.warn-icon, .warn-icon a			{ background-image: url("{IMG_ICON_USER_WARN_SRC}"); } /* Need updated warn icon */
-
-/*  	
---------------------------------------------------------------
-Colours and backgrounds for cp.css
--------------------------------------------------------------- */
-
-/* Main CP box
-----------------------------------------*/
-
-#cp-main h3, #cp-main hr, #cp-menu hr {
-	border-color: #A4B3BF;
-}
-
-#cp-main .panel li.row {
-	border-bottom-color: #B5C1CB;
-	border-top-color: #F9F9F9;
-}
-
-ul.cplist {
-	border-top-color: #B5C1CB;
-}
-
-#cp-main .panel li.header dd, #cp-main .panel li.header dt {
-	color: #000000;
-}
-
-#cp-main table.table1 thead th {
-	color: #333333;
-	border-bottom-color: #333333;
-}
-
-#cp-main .pm-message {
-	border-color: #DBDEE2;
-	background-color: #FFFFFF;
-}
-
-/* CP tabbed menu
-----------------------------------------*/
-#tabs a {
-	background-image: url("{T_THEME_PATH}/images/bg_tabs1.gif");
-}
-
-#tabs a span {
-	background-image: url("{T_THEME_PATH}/images/bg_tabs2.gif");
-	color: #536482;
-}
-
-#tabs a:hover span {
-	color: #BC2A4D;
-}
-
-#tabs .activetab a {
-	border-bottom-color: #CADCEB;
-}
-
-#tabs .activetab a span {
-	color: #333333;
-}
-
-#tabs .activetab a:hover span {
-	color: #000000;
-}
-
-/* Mini tabbed menu used in MCP
-----------------------------------------*/
-#minitabs li {
-	background-color: #E1EBF2;
-}
-
-#minitabs li.activetab {
-	background-color: #F9F9F9;
-}
-
-#minitabs li.activetab a, #minitabs li.activetab a:hover {
-	color: #333333;
-}
-
-/* UCP navigation menu
-----------------------------------------*/
-
-/* Link styles for the sub-section links */
-#navigation a {
-	color: #333;
-	background-color: #B2C2CF;
-	background-image: url("{T_THEME_PATH}/images/bg_menu.gif");
-}
-
-#navigation a:hover {
-	background-color: #aabac6;
-	color: #BC2A4D;
-}
-
-#navigation #active-subsection a {
-	color: #D31141;
-	background-color: #F9F9F9;
-	background-image: none;
-}
-
-#navigation #active-subsection a:hover {
-	color: #D31141;
-}
-
-/* Preferences pane layout
-----------------------------------------*/
-#cp-main h2 {
-	color: #333333;
-}
-
-#cp-main .panel {
-	background-color: #F9F9F9;
-}
-
-#cp-main .pm {
-	background-color: #FFFFFF;
-}
-
-#cp-main span.corners-top, #cp-menu span.corners-top {
-	background-image: url("{T_THEME_PATH}/images/corners_left2.gif");
-}
-
-#cp-main span.corners-top span, #cp-menu span.corners-top span {
-	background-image: url("{T_THEME_PATH}/images/corners_right2.gif");
-}
-
-#cp-main span.corners-bottom, #cp-menu span.corners-bottom {
-	background-image: url("{T_THEME_PATH}/images/corners_left2.gif");
-}
-
-#cp-main span.corners-bottom span, #cp-menu span.corners-bottom span {
-	background-image: url("{T_THEME_PATH}/images/corners_right2.gif");
-}
-
-/* Topicreview */
-#cp-main .panel #topicreview span.corners-top, #cp-menu .panel #topicreview span.corners-top {
-	background-image: url("{T_THEME_PATH}/images/corners_left.gif");
-}
-
-#cp-main .panel #topicreview span.corners-top span, #cp-menu .panel #topicreview span.corners-top span {
-	background-image: url("{T_THEME_PATH}/images/corners_right.gif");
-}
-
-#cp-main .panel #topicreview span.corners-bottom, #cp-menu .panel #topicreview span.corners-bottom {
-	background-image: url("{T_THEME_PATH}/images/corners_left.gif");
-}
-
-#cp-main .panel #topicreview span.corners-bottom span, #cp-menu .panel #topicreview span.corners-bottom span {
-	background-image: url("{T_THEME_PATH}/images/corners_right.gif");
-}
-
-/* Friends list */
-.cp-mini {
-	background-color: #eef5f9;
-}
-
-dl.mini dt {
-	color: #425067;
-}
-
-/* PM Styles
-----------------------------------------*/
-/* PM Message history */
-.current {
-	color: #999999 !important;
-}
-
-/* PM marking colours */
-.pmlist li.pm_message_reported_colour, .pm_message_reported_colour {
-	border-left-color: #BC2A4D;
-	border-right-color: #BC2A4D;
-}
-
-.pmlist li.pm_marked_colour, .pm_marked_colour {
-	border-color: #FF6600;
-}
-
-.pmlist li.pm_replied_colour, .pm_replied_colour {
-	border-color: #A9B8C2;
-}
-
-.pmlist li.pm_friend_colour, .pm_friend_colour {
-	border-color: #5D8FBD;
-}
-
-.pmlist li.pm_foe_colour, .pm_foe_colour {
-	border-color: #000000;
-}
-
-/* Avatar gallery */
-#gallery label {
-	background-color: #FFFFFF;
-	border-color: #CCC;
-}
-
-#gallery label:hover {
-	background-color: #EEE;
-}
-
-/*  	
---------------------------------------------------------------
-Colours and backgrounds for forms.css
--------------------------------------------------------------- */
-
-/* General form styles
-----------------------------------------*/
-select {
-	border-color: #666666;
-	background-color: #FAFAFA;
-}
-
-label {
-	color: #425067;
-}
-
-option.disabled-option {
-	color: graytext;
-}
-
-/* Definition list layout for forms
----------------------------------------- */
-dd label {
-	color: #333;
-}
-
-/* Hover effects */
-fieldset dl:hover dt label {
-	color: #000000;
-}
-
-fieldset.fields2 dl:hover dt label {
-	color: inherit;
-}
-
-/* Quick-login on index page */
-fieldset.quick-login input.inputbox {
-	background-color: #F2F3F3;
-}
-
-/* Posting page styles
-----------------------------------------*/
-
-#message-box textarea {
-	color: #333333;
-}
-
-/* Input field styles
----------------------------------------- */
-.inputbox {
-	background-color: #FFFFFF; 
-	border-color: #B4BAC0;
-	color: #333333;
-}
-
-.inputbox:hover {
-	border-color: #11A3EA;
-}
-
-.inputbox:focus {
-	border-color: #11A3EA;
-	color: #0F4987;
-}
-
-/* Form button styles
----------------------------------------- */
-
-a.button1, input.button1, input.button3, a.button2, input.button2 {
-	color: #000;
-	background-color: #FAFAFA;
-	background-image: url("{T_THEME_PATH}/images/bg_button.gif");
-}
-
-a.button1, input.button1 {
-	border-color: #666666;
-}
-
-input.button3 {
-	background-image: none;
-}
-
-/* Alternative button */
-a.button2, input.button2, input.button3 {
-	border-color: #666666;
-}
-
-/* <a> button in the style of the form buttons */
-a.button1, a.button1:link, a.button1:visited, a.button1:active, a.button2, a.button2:link, a.button2:visited, a.button2:active {
-	color: #000000;
-}
-
-/* Hover states */
-a.button1:hover, input.button1:hover, a.button2:hover, input.button2:hover, input.button3:hover {
-	border-color: #BC2A4D;
-	color: #BC2A4D;
-}
-
-input.search {
-	background-image: url("{T_THEME_PATH}/images/icon_textbox_search.gif");
-}
-
-input.disabled {
-	color: #666666;
-}
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
deleted file mode 100644
index 7178fa6e42..0000000000
--- a/phpBB/styles/prosilver/theme/common.css
+++ /dev/null
@@ -1,632 +0,0 @@
-/* General proSilver Markup Styles
----------------------------------------- */
-
-* {
-	/* Reset browsers default margin, padding and font sizes */
-	margin: 0;
-	padding: 0;
-}
-
-html {
-	font-size: 100%;
-	/* Always show a scrollbar for short pages - stops the jump when the scrollbar appears. non-IE browsers */
-	height: 100%;
-	margin-bottom: 1px;
-}
-
-body {
-	/* Text-Sizing with ems: http://www.clagnut.com/blog/348/ */
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	color: #828282;
-	background-color: #FFFFFF;
-	/*font-size: 62.5%;			 This sets the default font size to be equivalent to 10px */
-	font-size: 10px;
-	margin: 0;
-	padding: 12px 0;
-}
-
-h1 {
-	/* Forum name */
-	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	margin-right: 200px;
-	color: #FFFFFF;
-	margin-top: 15px;
-	font-weight: bold;
-	font-size: 2em;
-}
-
-h2 {
-	/* Forum header titles */
-	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	font-weight: normal;
-	color: #3f3f3f;
-	font-size: 2em;
-	margin: 0.8em 0 0.2em 0;
-}
-
-h2.solo {
-	margin-bottom: 1em;
-}
-
-h3 {
-	/* Sub-headers (also used as post headers, but defined later) */
-	font-family: Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	text-transform: uppercase;
-	border-bottom: 1px solid #CCCCCC;
-	margin-bottom: 3px;
-	padding-bottom: 2px;
-	font-size: 1.05em;
-	color: #989898;
-	margin-top: 20px;
-}
-
-h4 {
-	/* Forum and topic list titles */
-	font-family: "Trebuchet MS", Verdana, Helvetica, Arial, Sans-serif;
-	font-size: 1.3em;
-}
-
-p {
-	line-height: 1.3em;
-	font-size: 1.1em;
-	margin-bottom: 1.5em;
-}
-
-img {
-	border-width: 0;
-}
-
-hr {
-	/* Also see tweaks.css */
-	border: 0 none #FFFFFF;
-	border-top: 1px solid #CCCCCC;
-	height: 1px;
-	margin: 5px 0;
-	display: block;
-	clear: both;
-}
-
-hr.dashed {
-	border-top: 1px dashed #CCCCCC;
-	margin: 10px 0;
-}
-
-hr.divider {
-	display: none;
-}
-
-p.right {
-	text-align: right;
-}
-
-/* Main blocks
----------------------------------------- */
-#wrap {
-	padding: 0 20px;
-	min-width: 650px;
-}
-
-#simple-wrap {
-	padding: 6px 10px;
-}
-
-#page-body {
-	margin: 4px 0;
-	clear: both;
-}
-
-#page-footer {
-	clear: both;
-}
-
-#page-footer h3 {
-	margin-top: 20px;
-}
-
-#logo {
-	float: left;
-	width: auto;
-	padding: 10px 13px 0 10px;
-}
-
-a#logo:hover {
-	text-decoration: none;
-}
-
-/* Search box
---------------------------------------------- */
-#search-box {
-	color: #FFFFFF;
-	position: relative;
-	margin-top: 30px;
-	margin-right: 5px;
-	display: block;
-	float: right;
-	text-align: right;
-	white-space: nowrap; /* For Opera */
-}
-
-#search-box #keywords {
-	width: 95px;
-	background-color: #FFF;
-}
-
-#search-box input {
-	border: 1px solid #b0b0b0;
-}
-
-/* .button1 style defined later, just a few tweaks for the search button version */
-#search-box input.button1 {
-	padding: 1px 5px;
-}
-
-#search-box li {
-	text-align: right;
-	margin-top: 4px;
-}
-
-#search-box img {
-	vertical-align: middle;
-	margin-right: 3px;
-}
-
-/* Site description and logo */
-#site-description {
-	float: left;
-	width: 70%;
-}
-
-#site-description h1 {
-	margin-right: 0;
-}
-
-/* Round cornered boxes and backgrounds
----------------------------------------- */
-.headerbar {
-	background: #ebebeb none repeat-x 0 0;
-	color: #FFFFFF;
-	margin-bottom: 4px;
-	padding: 0 5px;
-}
-
-.navbar {
-	background-color: #ebebeb;
-	padding: 0 10px;
-}
-
-.forabg {
-	background: #b1b1b1 none repeat-x 0 0;
-	margin-bottom: 4px;
-	padding: 0 5px;
-	clear: both;
-}
-
-.forumbg {
-	background: #ebebeb none repeat-x 0 0;
-	margin-bottom: 4px;
-	padding: 0 5px;
-	clear: both;
-}
-
-.panel {
-	margin-bottom: 4px;
-	padding: 0 10px;
-	background-color: #f3f3f3;
-	color: #3f3f3f;
-}
-
-.post {
-	padding: 0 10px;
-	margin-bottom: 4px;
-	background-repeat: no-repeat;
-	background-position: 100% 0;
-}
-
-.post:target .content {
-	color: #000000;
-}
-
-.post:target h3 a {
-	color: #000000;
-}
-
-.bg1	{ background-color: #f7f7f7;}
-.bg2	{ background-color: #f2f2f2; }
-.bg3	{ background-color: #ebebeb; }
-
-.rowbg {
-	margin: 5px 5px 2px 5px;
-}
-
-.ucprowbg {
-	background-color: #e2e2e2;
-}
-
-.fieldsbg {
-	/*border: 1px #DBDEE2 solid;*/
-	background-color: #eaeaea;
-}
-
-span.corners-top, span.corners-bottom, span.corners-top span, span.corners-bottom span {
-	font-size: 1px;
-	line-height: 1px;
-	display: block;
-	height: 5px;
-	background-repeat: no-repeat;
-}
-
-span.corners-top {
-	background-image: none;
-	background-position: 0 0;
-	margin: 0 -5px;
-}
-
-span.corners-top span {
-	background-image: none;
-	background-position: 100% 0;
-}
-
-span.corners-bottom {
-	background-image: none;
-	background-position: 0 100%;
-	margin: 0 -5px;
-	clear: both;
-}
-
-span.corners-bottom span {
-	background-image: none;
-	background-position: 100% 100%;
-}
-
-.headbg span.corners-bottom {
-	margin-bottom: -1px;
-}
-
-.post span.corners-top, .post span.corners-bottom, .panel span.corners-top, .panel span.corners-bottom, .navbar span.corners-top, .navbar span.corners-bottom {
-	margin: 0 -10px;
-}
-
-.rules span.corners-top {
-	margin: 0 -10px 5px -10px;
-}
-
-.rules span.corners-bottom {
-	margin: 5px -10px 0 -10px;
-}
-
-/* Horizontal lists
-----------------------------------------*/
-ul.linklist {
-	display: block;
-	margin: 0;
-}
-
-ul.linklist li {
-	display: block;
-	list-style-type: none;
-	float: left;
-	width: auto;
-	margin-right: 5px;
-	font-size: 1.1em;
-	line-height: 2.2em;
-}
-
-ul.linklist li.rightside, p.rightside {
-	float: right;
-	margin-right: 0;
-	margin-left: 5px;
-	text-align: right;
-}
-
-ul.navlinks {
-	padding-bottom: 1px;
-	margin-bottom: 1px;
-	border-bottom: 1px solid #FFFFFF;
-	font-weight: bold;
-}
-
-ul.leftside {
-	float: left;
-	margin-left: 0;
-	margin-right: 5px;
-	text-align: left;
-}
-
-ul.rightside {
-	float: right;
-	margin-left: 5px;
-	margin-right: -5px;
-	text-align: right;
-}
-
-/* Table styles
-----------------------------------------*/
-table.table1 {
-	/* See tweaks.css */
-}
-
-#ucp-main table.table1 {
-	padding: 2px;
-}
-
-table.table1 thead th {
-	font-weight: normal;
-	text-transform: uppercase;
-	color: #FFFFFF;
-	line-height: 1.3em;
-	font-size: 1em;
-	padding: 0 0 4px 3px;
-}
-
-table.table1 thead th span {
-	padding-left: 7px;
-}
-
-table.table1 tbody tr {
-	border: 1px solid #cfcfcf;
-}
-
-table.table1 tbody tr:hover, table.table1 tbody tr.hover {
-	background-color: #f6f6f6;
-	color: #000;
-}
-
-table.table1 td {
-	color: #6a6a6a;
-	font-size: 1.1em;
-}
-
-table.table1 tbody td {
-	padding: 5px;
-	border-top: 1px solid #FAFAFA;
-}
-
-table.table1 tbody th {
-	padding: 5px;
-	border-bottom: 1px solid #000000;
-	text-align: left;
-	color: #333333;
-	background-color: #FFFFFF;
-}
-
-/* Specific column styles */
-table.table1 .name		{ text-align: left; }
-table.table1 .posts		{ text-align: center !important; width: 7%; }
-table.table1 .joined	{ text-align: left; width: 15%; }
-table.table1 .active	{ text-align: left; width: 15%; }
-table.table1 .mark		{ text-align: center; width: 7%; }
-table.table1 .info		{ text-align: left; width: 30%; }
-table.table1 .info div	{ width: 100%; white-space: normal; overflow: hidden; }
-table.table1 .autocol	{ line-height: 2em; white-space: nowrap; }
-table.table1 thead .autocol { padding-left: 1em; }
-
-table.table1 span.rank-img {
-	float: right;
-	width: auto;
-}
-
-table.info td {
-	padding: 3px;
-}
-
-table.info tbody th {
-	padding: 3px;
-	text-align: right;
-	vertical-align: top;
-	color: #000000;
-	font-weight: normal;
-}
-
-.forumbg table.table1 {
-	margin: 0 -2px -1px -1px;
-}
-
-/* Misc layout styles
----------------------------------------- */
-/* column[1-2] styles are containers for two column layouts 
-   Also see tweaks.css */
-.column1 {
-	float: left;
-	clear: left;
-	width: 49%;
-}
-
-.column2 {
-	float: right;
-	clear: right;
-	width: 49%;
-}
-
-/* General classes for placing floating blocks */
-.left-box {
-	float: left;
-	width: auto;
-	text-align: left;
-}
-
-.right-box {
-	float: right;
-	width: auto;
-	text-align: right;
-}
-
-dl.details {
-	/*font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;*/
-	font-size: 1.1em;
-}
-
-dl.details dt {
-	float: left;
-	clear: left;
-	width: 30%;
-	text-align: right;
-	color: #000000;
-	display: block;
-}
-
-dl.details dd {
-	margin-left: 0;
-	padding-left: 5px;
-	margin-bottom: 5px;
-	color: #828282;
-	float: left;
-	width: 65%;
-}
-
-/* Pagination
----------------------------------------- */
-.pagination {
-	height: 1%; /* IE tweak (holly hack) */
-	width: auto;
-	text-align: right;
-	margin-top: 5px;
-	float: right;
-}
-
-.pagination span.page-sep {
-	display: none;
-}
-
-li.pagination {
-	margin-top: 0;
-}
-
-.pagination strong, .pagination b {
-	font-weight: normal;
-}
-
-.pagination span strong {
-	padding: 0 2px;
-	margin: 0 2px;
-	font-weight: normal;
-	color: #FFFFFF;
-	background-color: #bfbfbf;
-	border: 1px solid #bfbfbf;
-	font-size: 0.9em;
-}
-
-.pagination span a, .pagination span a:link, .pagination span a:visited, .pagination span a:active {
-	font-weight: normal;
-	text-decoration: none;
-	color: #747474;
-	margin: 0 2px;
-	padding: 0 2px;
-	background-color: #eeeeee;
-	border: 1px solid #bababa;
-	font-size: 0.9em;
-	line-height: 1.5em;
-}
-
-.pagination span a:hover {
-	border-color: #d2d2d2;
-	background-color: #d2d2d2;
-	color: #FFF;
-	text-decoration: none;
-}
-
-.pagination img {
-	vertical-align: middle;
-}
-
-/* Pagination in viewforum for multipage topics */
-.row .pagination {
-	display: block;
-	float: right;
-	width: auto;
-	margin-top: 0;
-	padding: 1px 0 1px 15px;
-	font-size: 0.9em;
-	background: none 0 50% no-repeat;
-}
-
-.row .pagination span a, li.pagination span a {
-	background-color: #FFFFFF;
-}
-
-.row .pagination span a:hover, li.pagination span a:hover {
-	background-color: #d2d2d2;
-}
-
-/* Miscellaneous styles
----------------------------------------- */
-#forum-permissions {
-	float: right;
-	width: auto;
-	padding-left: 5px;
-	margin-left: 5px;
-	margin-top: 10px;
-	text-align: right;
-}
-
-.copyright {
-	padding: 5px;
-	text-align: center;
-	color: #555555;
-}
-
-.small {
-	font-size: 0.9em !important;
-}
-
-.titlespace {
-	margin-bottom: 15px;
-}
-
-.headerspace {
-	margin-top: 20px;
-}
-
-.error {
-	color: #bcbcbc;
-	font-weight: bold;
-	font-size: 1em;
-}
-
-.reported {
-	background-color: #f7f7f7;
-}
-
-li.reported:hover {
-	background-color: #ececec;
-}
-
-div.rules {
-	background-color: #ececec;
-	color: #bcbcbc;
-	padding: 0 10px;
-	margin: 10px 0;
-	font-size: 1.1em;
-}
-
-div.rules ul, div.rules ol {
-	margin-left: 20px;
-}
-
-p.rules {
-	background-color: #ececec;
-	background-image: none;
-	padding: 5px;
-}
-
-p.rules img {
-	vertical-align: middle;
-}
-
-p.rules a {
-	vertical-align: middle;
-	clear: both;
-}
-
-#top {
-	position: absolute;
-	top: -20px;
-}
-
-.clear {
-	display: block;
-	clear: both;
-	font-size: 1px;
-	line-height: 1px;
-	background: transparent;
-}
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
deleted file mode 100644
index b6d3efa8a3..0000000000
--- a/phpBB/styles/prosilver/theme/content.css
+++ /dev/null
@@ -1,757 +0,0 @@
-/* proSilver Content Styles
----------------------------------------- */
-
-ul.topiclist {
-	display: block;
-	list-style-type: none;
-	margin: 0;
-}
-
-ul.forums {
-	background: #f9f9f9 none repeat-x 0 0;
-}
-
-ul.topiclist li {
-	display: block;
-	list-style-type: none;
-	color: #777777;
-	margin: 0;
-}
-
-ul.topiclist dl {
-	position: relative;
-}
-
-ul.topiclist li.row dl {
-	padding: 2px 0;
-}
-
-ul.topiclist dt {
-	display: block;
-	float: left;
-	width: 50%;
-	font-size: 1.1em;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-ul.topiclist dd {
-	display: block;
-	float: left;
-	border-left: 1px solid #FFFFFF;
-	padding: 4px 0;
-}
-
-ul.topiclist dfn {
-	/* Labels for post/view counts */
-	display: none;
-}
-
-ul.topiclist li.row dt a.subforum {
-	background-image: none;
-	background-position: 0 50%;
-	background-repeat: no-repeat;
-	position: relative;
-	white-space: nowrap;
-	padding: 0 0 0 12px;
-}
-
-.forum-image {
-	float: left;
-	padding-top: 5px;
-	margin-right: 5px;
-}
-
-li.row {
-	border-top: 1px solid #FFFFFF;
-	border-bottom: 1px solid #8f8f8f;
-}
-
-li.row strong {
-	font-weight: normal;
-	color: #000000;
-}
-
-li.row:hover {
-	background-color: #f6f6f6;
-}
-
-li.row:hover dd {
-	border-left-color: #CCCCCC;
-}
-
-li.header dt, li.header dd {
-	line-height: 1em;
-	border-left-width: 0;
-	margin: 2px 0 4px 0;
-	color: #FFFFFF;
-	padding-top: 2px;
-	padding-bottom: 2px;
-	font-size: 1em;
-	font-family: Arial, Helvetica, sans-serif;
-	text-transform: uppercase;
-}
-
-li.header dt {
-	font-weight: bold;
-}
-
-li.header dd {
-	margin-left: 1px;
-}
-
-li.header dl.icon {
-	min-height: 0;
-}
-
-li.header dl.icon dt {
-	/* Tweak for headers alignment when folder icon used */
-	padding-left: 0;
-	padding-right: 50px;
-}
-
-/* Forum list column styles */
-dl.icon {
-	min-height: 35px;
-	background-position: 10px 50%;		/* Position of folder icon */
-	background-repeat: no-repeat;
-}
-
-dl.icon dt {
-	padding-left: 45px;					/* Space for folder icon */
-	background-repeat: no-repeat;
-	background-position: 5px 95%;		/* Position of topic icon */
-}
-
-dd.posts, dd.topics, dd.views {
-	width: 8%;
-	text-align: center;
-	line-height: 2.2em;
-	font-size: 1.2em;
-}
-
-dd.lastpost {
-	width: 25%;
-	font-size: 1.1em;
-}
-
-dd.redirect {
-	font-size: 1.1em;
-	line-height: 2.5em;
-}
-
-dd.moderation {
-	font-size: 1.1em;
-}
-
-dd.lastpost span, ul.topiclist dd.searchby span, ul.topiclist dd.info span, ul.topiclist dd.time span, dd.redirect span, dd.moderation span {
-	display: block;
-	padding-left: 5px;
-}
-
-dd.time {
-	width: auto;
-	line-height: 200%;
-	font-size: 1.1em;
-}
-
-dd.extra {
-	width: 12%;
-	line-height: 200%;
-	text-align: center;
-	font-size: 1.1em;
-}
-
-dd.mark {
-	float: right !important;
-	width: 9%;
-	text-align: center;
-	line-height: 200%;
-	font-size: 1.2em;
-}
-
-dd.info {
-	width: 30%;
-}
-
-dd.option {
-	width: 15%;
-	line-height: 200%;
-	text-align: center;
-	font-size: 1.1em;
-}
-
-dd.searchby {
-	width: 47%;
-	font-size: 1.1em;
-	line-height: 1em;
-}
-
-ul.topiclist dd.searchextra {
-	margin-left: 5px;
-	padding: 0.2em 0;
-	font-size: 1.1em;
-	color: #333333;
-	border-left: none;
-	clear: both;
-	width: 98%;
-	overflow: hidden;
-}
-
-/* Container for post/reply buttons and pagination */
-.topic-actions {
-	margin-bottom: 3px;
-	font-size: 1.1em;
-	height: 28px;
-	min-height: 28px;
-}
-div[class].topic-actions {
-	height: auto;
-}
-
-/* Post body styles
-----------------------------------------*/
-.postbody {
-	padding: 0;
-	line-height: 1.48em;
-	color: #333333;
-	width: 76%;
-	float: left;
-	clear: both;
-}
-
-.postbody .ignore {
-	font-size: 1.1em;
-}
-
-.postbody h3.first {
-	/* The first post on the page uses this */
-	font-size: 1.7em;
-}
-
-.postbody h3 {
-	/* Postbody requires a different h3 format - so change it here */
-	font-size: 1.5em;
-	padding: 2px 0 0 0;
-	margin: 0 0 0.3em 0 !important;
-	text-transform: none;
-	border: none;
-	font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
-	line-height: 125%;
-}
-
-.postbody h3 img {
-	/* Also see tweaks.css */
-	vertical-align: bottom;
-}
-
-.postbody .content {
-	font-size: 1.3em;
-}
-
-.search .postbody {
-	width: 68%
-}
-
-/* Topic review panel
-----------------------------------------*/
-#review {
-	margin-top: 2em;
-}
-
-#topicreview {
-	padding-right: 5px;
-	overflow: auto;
-	height: 300px;
-}
-
-#topicreview .postbody {
-	width: auto;
-	float: none;
-	margin: 0;
-	height: auto;
-}
-
-#topicreview .post {
-	height: auto;
-}
-
-#topicreview h2 {
-	border-bottom-width: 0;
-}
-
-.post-ignore .postbody {
-	display: none;
-}
-
-/* Content container styles
-----------------------------------------*/
-.content {
-	min-height: 3em;
-	overflow: hidden;
-	line-height: 1.4em;
-	font-family: "Lucida Grande", "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
-	font-size: 1em;
-	color: #333333;
-}
-
-.content h2, .panel h2 {
-	font-weight: normal;
-	color: #989898;
-	border-bottom: 1px solid #CCCCCC;
-	font-size: 1.6em;
-	margin-top: 0.5em;
-	margin-bottom: 0.5em;
-	padding-bottom: 0.5em;
-}
-
-.panel h3 {
-	margin: 0.5em 0;
-}
-
-.panel p {
-	font-size: 1.2em;
-	margin-bottom: 1em;
-	line-height: 1.4em;
-}
-
-.content p {
-	font-family: "Lucida Grande", "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
-	font-size: 1.2em;
-	margin-bottom: 1em;
-	line-height: 1.4em;
-}
-
-dl.faq {
-	font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
-	font-size: 1.1em;
-	margin-top: 1em;
-	margin-bottom: 2em;
-	line-height: 1.4em;
-}
-
-dl.faq dt {
-	font-weight: bold;
-	color: #333333;
-}
-
-.content dl.faq {
-	font-size: 1.2em;
-	margin-bottom: 0.5em;
-}
-
-.content li {
-	list-style-type: inherit;
-}
-
-.content ul, .content ol {
-	margin-bottom: 1em;
-	margin-left: 3em;
-}
-
-.posthilit {
-	background-color: #f3f3f3;
-	color: #BCBCBC;
-	padding: 0 2px 1px 2px;
-}
-
-.announce, .unreadpost {
-	/* Highlight the announcements & unread posts box */
-	border-left-color: #BCBCBC;
-	border-right-color: #BCBCBC;
-}
-
-/* Post author */
-p.author {
-	margin: 0 15em 0.6em 0;
-	padding: 0 0 5px 0;
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 1em;
-	line-height: 1.2em;
-}
-
-/* Post signature */
-.signature {
-	margin-top: 1.5em;
-	padding-top: 0.2em;
-	font-size: 1.1em;
-	border-top: 1px solid #CCCCCC;
-	clear: left;
-	line-height: 140%;
-	overflow: hidden;
-	width: 100%;
-}
-
-dd .signature {
-	margin: 0;
-	padding: 0;
-	clear: none;
-	border: none;
-}
-
-.signature li {
-	list-style-type: inherit;
-}
-
-.signature ul, .signature ol {
-	margin-bottom: 1em;
-	margin-left: 3em;
-}
-
-/* Post noticies */
-.notice {
-	font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
-	width: auto;
-	margin-top: 1.5em;
-	padding-top: 0.2em;
-	font-size: 1em;
-	border-top: 1px dashed #CCCCCC;
-	clear: left;
-	line-height: 130%;
-}
-
-/* Jump to post link for now */
-ul.searchresults {
-	list-style: none;
-	text-align: right;
-	clear: both;
-}
-
-/* BB Code styles
-----------------------------------------*/
-/* Quote block */
-blockquote {
-	background: #ebebeb none 6px 8px no-repeat;
-	border: 1px solid #dbdbdb;
-	font-size: 0.95em;
-	margin: 0.5em 1px 0 25px;
-	overflow: hidden;
-	padding: 5px;
-}
-
-blockquote blockquote {
-	/* Nested quotes */
-	background-color: #bababa;
-	font-size: 1em;
-	margin: 0.5em 1px 0 15px;	
-}
-
-blockquote blockquote blockquote {
-	/* Nested quotes */
-	background-color: #e4e4e4;
-}
-
-blockquote cite {
-	/* Username/source of quoter */
-	font-style: normal;
-	font-weight: bold;
-	margin-left: 20px;
-	display: block;
-	font-size: 0.9em;
-}
-
-blockquote cite cite {
-	font-size: 1em;
-}
-
-blockquote.uncited {
-	padding-top: 25px;
-}
-
-/* Code block */
-dl.codebox {
-	padding: 3px;
-	background-color: #FFFFFF;
-	border: 1px solid #d8d8d8;
-	font-size: 1em;
-}
-
-dl.codebox dt {
-	text-transform: uppercase;
-	border-bottom: 1px solid #CCCCCC;
-	margin-bottom: 3px;
-	font-size: 0.8em;
-	font-weight: bold;
-	display: block;
-}
-
-blockquote dl.codebox {
-	margin-left: 0;
-}
-
-dl.codebox code {
-	/* Also see tweaks.css */
-	overflow: auto;
-	display: block;
-	height: auto;
-	max-height: 200px;
-	white-space: normal;
-	padding-top: 5px;
-	font: 0.9em Monaco, "Andale Mono","Courier New", Courier, mono;
-	line-height: 1.3em;
-	color: #8b8b8b;
-	margin: 2px 0;
-}
-
-.syntaxbg		{ color: #FFFFFF; }
-.syntaxcomment	{ color: #000000; }
-.syntaxdefault	{ color: #bcbcbc; }
-.syntaxhtml		{ color: #000000; }
-.syntaxkeyword	{ color: #585858; }
-.syntaxstring	{ color: #a7a7a7; }
-
-/* Attachments
-----------------------------------------*/
-.attachbox {
-	float: left;
-	width: auto; 
-	margin: 5px 5px 5px 0;
-	padding: 6px;
-	background-color: #FFFFFF;
-	border: 1px dashed #d8d8d8;
-	clear: left;
-}
-
-.pm-message .attachbox {
-	background-color: #f3f3f3;
-}
-
-.attachbox dt {
-	font-family: Arial, Helvetica, sans-serif;
-	text-transform: uppercase;
-}
-
-.attachbox dd {
-	margin-top: 4px;
-	padding-top: 4px;
-	clear: left;
-	border-top: 1px solid #d8d8d8;
-}
-
-.attachbox dd dd {
-	border: none;
-}
-
-.attachbox p {
-	line-height: 110%;
-	color: #666666;
-	font-weight: normal;
-	clear: left;
-}
-
-.attachbox p.stats
-{
-	line-height: 110%;
-	color: #666666;
-	font-weight: normal;
-	clear: left;
-}
-
-.attach-image {
-	margin: 3px 0;
-	width: 100%;
-	max-height: 350px;
-	overflow: auto;
-}
-
-.attach-image img {
-	border: 1px solid #999999;
-/*	cursor: move; */
-	cursor: default;
-}
-
-/* Inline image thumbnails */
-div.inline-attachment dl.thumbnail, div.inline-attachment dl.file {
-	display: block;
-	margin-bottom: 4px;
-}
-
-div.inline-attachment p {
-	font-size: 100%;
-}
-
-dl.file {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	display: block;
-}
-
-dl.file dt {
-	text-transform: none;
-	margin: 0;
-	padding: 0;
-	font-weight: bold;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-dl.file dd {
-	color: #666666;
-	margin: 0;
-	padding: 0;	
-}
-
-dl.thumbnail img {
-	padding: 3px;
-	border: 1px solid #666666;
-	background-color: #FFF;
-}
-
-dl.thumbnail dd {
-	color: #666666;
-	font-style: italic;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-.attachbox dl.thumbnail dd {
-	font-size: 100%;
-}
-
-dl.thumbnail dt a:hover {
-	background-color: #EEEEEE;
-}
-
-dl.thumbnail dt a:hover img {
-	border: 1px solid #d2d2d2;
-}
-
-/* Post poll styles
-----------------------------------------*/
-fieldset.polls {
-	font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
-}
-
-fieldset.polls dl {
-	margin-top: 5px;
-	border-top: 1px solid #e2e2e2;
-	padding: 5px 0 0 0;
-	line-height: 120%;
-	color: #666666;
-}
-
-fieldset.polls dl.voted {
-	font-weight: bold;
-	color: #000000;
-}
-
-fieldset.polls dt {
-	text-align: left;
-	float: left;
-	display: block;
-	width: 30%;
-	border-right: none;
-	padding: 0;
-	margin: 0;
-	font-size: 1.1em;
-}
-
-fieldset.polls dd {
-	float: left;
-	width: 10%;
-	border-left: none;
-	padding: 0 5px;
-	margin-left: 0;
-	font-size: 1.1em;
-}
-
-fieldset.polls dd.resultbar {
-	width: 50%;
-}
-
-fieldset.polls dd input {
-	margin: 2px 0;
-}
-
-fieldset.polls dd div {
-	text-align: right;
-	font-family: Arial, Helvetica, sans-serif;
-	color: #FFFFFF;
-	font-weight: bold;
-	padding: 0 2px;
-	overflow: visible;
-	min-width: 2%;
-}
-
-.pollbar1 {
-	background-color: #aaaaaa;
-	border-bottom: 1px solid #747474;
-	border-right: 1px solid #747474;
-}
-
-.pollbar2 {
-	background-color: #bebebe;
-	border-bottom: 1px solid #8c8c8c;
-	border-right: 1px solid #8c8c8c;
-}
-
-.pollbar3 {
-	background-color: #D1D1D1;
-	border-bottom: 1px solid #aaaaaa;
-	border-right: 1px solid #aaaaaa;
-}
-
-.pollbar4 {
-	background-color: #e4e4e4;
-	border-bottom: 1px solid #bebebe;
-	border-right: 1px solid #bebebe;
-}
-
-.pollbar5 {
-	background-color: #f8f8f8;
-	border-bottom: 1px solid #D1D1D1;
-	border-right: 1px solid #D1D1D1;
-}
-
-/* Poster profile block
-----------------------------------------*/
-.postprofile {
-	/* Also see tweaks.css */
-	margin: 5px 0 10px 0;
-	min-height: 80px;
-	color: #666666;
-	border-left: 1px solid #FFFFFF;
-	width: 22%;
-	float: right;
-	display: inline;
-}
-.pm .postprofile {
-	border-left: 1px solid #DDDDDD;
-}
-
-.postprofile dd, .postprofile dt {
-	line-height: 1.2em;
-	margin-left: 8px;
-}
-
-.postprofile strong {
-	font-weight: normal;
-	color: #000000;
-}
-
-.avatar {
-	border: none;
-	margin-bottom: 3px;
-}
-
-.online {
-	background-image: none;
-	background-position: 100% 0;
-	background-repeat: no-repeat;
-}
-
-/* Poster profile used by search*/
-.search .postprofile {
-	width: 30%;
-}
-
-/* pm list in compose message if mass pm is enabled */
-dl.pmlist dt {
-	width: 60% !important;
-}
-
-dl.pmlist dt textarea {
-	width: 95%;
-}
-
-dl.pmlist dd {
-	margin-left: 61% !important;
-	margin-bottom: 2px;
-}
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
deleted file mode 100644
index fa8899bae8..0000000000
--- a/phpBB/styles/prosilver/theme/cp.css
+++ /dev/null
@@ -1,424 +0,0 @@
-/* proSilver Control Panel Styles
----------------------------------------- */
-
-
-/* Main CP box
-----------------------------------------*/
-#cp-menu {
-	float:left;
-	width: 19%;
-	margin-top: 1em;
-	margin-bottom: 5px;
-}
-
-#cp-main {
-	float: left;
-	width: 81%;
-}
-
-#cp-main .content {
-	padding: 0;
-}
-
-#cp-main h3, #cp-main hr, #cp-menu hr {
-	border-color: #bfbfbf;
-}
-
-#cp-main .panel p {
-	font-size: 1.1em;
-}
-
-#cp-main .panel ol {
-	margin-left: 2em;
-	font-size: 1.1em;
-}
-
-#cp-main .panel li.row {
-	border-bottom: 1px solid #cbcbcb;
-	border-top: 1px solid #F9F9F9;
-}
-
-ul.cplist {
-	margin-bottom: 5px;
-	border-top: 1px solid #cbcbcb;
-}
-
-#cp-main .panel li.header dd, #cp-main .panel li.header dt {
-	color: #000000;
-	margin-bottom: 2px;
-}
-
-#cp-main table.table1 {
-	margin-bottom: 1em;
-}
-
-#cp-main table.table1 thead th {
-	color: #333333;
-	font-weight: bold;
-	border-bottom: 1px solid #333333;
-	padding: 5px;
-}
-
-#cp-main table.table1 tbody th {
-	font-style: italic;
-	background-color: transparent !important;
-	border-bottom: none;
-}
-
-#cp-main .pagination {
-	float: right;
-	width: auto;
-	padding-top: 1px;
-}
-
-#cp-main .postbody p {
-	font-size: 1.1em;
-}
-
-#cp-main .pm-message {
-	border: 1px solid #e2e2e2;
-	margin: 10px 0;
-	background-color: #FFFFFF;
-	width: auto;
-	float: none;
-}
-
-.pm-message h2 {
-	padding-bottom: 5px;
-}
-
-#cp-main .postbody h3, #cp-main .box2 h3 {
-	margin-top: 0;
-}
-
-#cp-main .buttons {
-	margin-left: 0;
-}
-
-#cp-main ul.linklist {
-	margin: 0;
-}
-
-/* MCP Specific tweaks */
-.mcp-main .postbody {
-	width: 100%;
-}
-
-/* CP tabbed menu
-----------------------------------------*/
-#tabs {
-	line-height: normal;
-	margin: 20px 0 -1px 7px;
-	min-width: 570px;
-}
-
-#tabs ul {
-	margin:0;
-	padding: 0;
-	list-style: none;
-}
-
-#tabs li {
-	display: inline;
-	margin: 0;
-	padding: 0;
-	font-size: 1em;
-	font-weight: bold;
-}
-
-#tabs a {
-	float: left;
-	background: none no-repeat 0% -35px;
-	margin: 0 1px 0 0;
-	padding: 0 0 0 5px;
-	text-decoration: none;
-	position: relative;
-	cursor: pointer;
-}
-
-#tabs a span {
-	float: left;
-	display: block;
-	background: none no-repeat 100% -35px;
-	padding: 6px 10px 6px 5px;
-	color: #828282;
-	white-space: nowrap;
-}
-
-#tabs a:hover span {
-	color: #bcbcbc;
-}
-
-#tabs .activetab a {
-	background-position: 0 0;
-	border-bottom: 1px solid #ebebeb;
-}
-
-#tabs .activetab a span {
-	background-position: 100% 0;
-	padding-bottom: 7px;
-	color: #333333;
-}
-
-#tabs a:hover {
-	background-position: 0 -70px;
-}
-
-#tabs a:hover span {
-	background-position:100% -70px;
-}
-
-#tabs .activetab a:hover {
-	background-position: 0 0;
-}
-
-#tabs .activetab a:hover span {
-	color: #000000;
-	background-position: 100% 0;
-}
-
-/* Mini tabbed menu used in MCP
-----------------------------------------*/
-#minitabs {
-	line-height: normal;
-	margin: -20px 7px 0 0;
-}
-
-#minitabs ul {
-	margin:0;
-	padding: 0;
-	list-style: none;
-}
-
-#minitabs li {
-	display: block;
-	float: right;
-	padding: 0 10px 4px 10px;
-	font-size: 1em;
-	font-weight: bold;
-	background-color: #f2f2f2;
-	margin-left: 2px;
-}
-
-#minitabs a {
-}
-
-#minitabs a:hover {
-	text-decoration: none;
-}
-
-#minitabs li.activetab {
-	background-color: #F9F9F9;
-}
-
-#minitabs li.activetab a, #minitabs li.activetab a:hover {
-	color: #333333;
-}
-
-/* UCP navigation menu
-----------------------------------------*/
-/* Container for sub-navigation list */
-#navigation {
-	width: 100%;
-	padding-top: 36px;
-}
-
-#navigation ul {
-	list-style:none;
-}
-
-/* Default list state */
-#navigation li {
-	margin: 1px 0;
-	padding: 0;
-	font-weight: bold;
-	display: inline;
-}
-
-/* Link styles for the sub-section links */
-#navigation a {
-	display: block;
-	padding: 5px;
-	margin: 1px 0;
-	text-decoration: none;
-	font-weight: bold;
-	color: #333;
-	background: #cfcfcf none repeat-y 100% 0;
-}
-
-#navigation a:hover {
-	text-decoration: none;
-	background-color: #c6c6c6;
-	color: #bcbcbc;
-	background-image: none;
-}
-
-#navigation #active-subsection a {
-	display: block;
-	color: #d3d3d3;
-	background-color: #F9F9F9;
-	background-image: none;
-}
-
-#navigation #active-subsection a:hover {
-	color: #d3d3d3;
-}
-
-/* Preferences pane layout
-----------------------------------------*/
-#cp-main h2 {
-	border-bottom: none;
-	padding: 0;
-	margin-left: 10px;
-	color: #333333;
-}
-
-#cp-main .panel {
-	background-color: #F9F9F9;
-}
-
-#cp-main .pm {
-	background-color: #FFFFFF;
-}
-
-#cp-main span.corners-top, #cp-menu span.corners-top {
-	background-image: none;
-}
-
-#cp-main span.corners-top span, #cp-menu span.corners-top span {
-	background-image: none;
-}
-
-#cp-main span.corners-bottom, #cp-menu span.corners-bottom {
-	background-image: none;
-}
-
-#cp-main span.corners-bottom span, #cp-menu span.corners-bottom span {
-	background-image: none;
-}
-
-/* Topicreview */
-#cp-main .panel #topicreview span.corners-top, #cp-menu .panel #topicreview span.corners-top {
-	background-image: none;
-}
-
-#cp-main .panel #topicreview span.corners-top span, #cp-menu .panel #topicreview span.corners-top span {
-	background-image: none;
-}
-
-#cp-main .panel #topicreview span.corners-bottom, #cp-menu .panel #topicreview span.corners-bottom {
-	background-image: none;
-}
-
-#cp-main .panel #topicreview span.corners-bottom span, #cp-menu .panel #topicreview span.corners-bottom span {
-	background-image: none;
-}
-
-/* Friends list */
-.cp-mini {
-	background-color: #f9f9f9;
-	padding: 0 5px;
-	margin: 10px 15px 10px 5px;
-}
-
-.cp-mini span.corners-top, .cp-mini span.corners-bottom {
-	margin: 0 -5px;
-}
-
-dl.mini dt {
-	font-weight: bold;
-	color: #676767;
-}
-
-dl.mini dd {
-	padding-top: 4px;
-}
-
-.friend-online {
-	font-weight: bold;
-}
-
-.friend-offline {
-	font-style: italic;
-}
-
-/* PM Styles
-----------------------------------------*/
-#pm-menu {
-	line-height: 2.5em;
-}
-
-/* PM Message history */
-.current {
-	color: #999999;
-}
-
-/* Defined rules list for PM options */
-ol.def-rules {
-	padding-left: 0;
-}
-
-ol.def-rules li {
-	line-height: 180%;
-	padding: 1px;
-}
-
-/* PM marking colours */
-.pmlist li.bg1 {
-	border: solid 3px transparent;
-	border-width: 0 3px;
-}
-
-.pmlist li.bg2 {
-	border: solid 3px transparent;
-	border-width: 0 3px;
-}
-
-.pmlist li.pm_message_reported_colour, .pm_message_reported_colour {
-	border-left-color: #bcbcbc;
-	border-right-color: #bcbcbc;
-}
-
-.pmlist li.pm_marked_colour, .pm_marked_colour {
-	border: solid 3px #ffffff;
-	border-width: 0 3px;
-}
-
-.pmlist li.pm_replied_colour, .pm_replied_colour {
-	border: solid 3px #c2c2c2;
-	border-width: 0 3px;	
-}
-
-.pmlist li.pm_friend_colour, .pm_friend_colour {
-	border: solid 3px #bdbdbd;
-	border-width: 0 3px;
-}
-
-.pmlist li.pm_foe_colour, .pm_foe_colour {
-	border: solid 3px #000000;
-	border-width: 0 3px;
-}
-
-.pm-legend {
-	border-left-width: 10px;
-	border-left-style: solid;
-	border-right-width: 0;
-	margin-bottom: 3px;
-	padding-left: 3px;
-}
-
-/* Avatar gallery */
-#gallery label {
-	position: relative;
-	float: left;
-	margin: 10px;
-	padding: 5px;
-	width: auto;
-	background: #FFFFFF;
-	border: 1px solid #CCC;
-	text-align: center;
-}
-
-#gallery label:hover {
-	background-color: #EEE;
-}
diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
deleted file mode 100644
index a280218e75..0000000000
--- a/phpBB/styles/prosilver/theme/forms.css
+++ /dev/null
@@ -1,384 +0,0 @@
-/* proSilver Form Styles
----------------------------------------- */
-
-/* General form styles
-----------------------------------------*/
-fieldset {
-	border-width: 0;
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 1.1em;
-}
-
-input {
-	font-weight: normal;
-	cursor: pointer;
-	vertical-align: middle;
-	padding: 0 3px;
-	font-size: 1em;
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-}
-
-select {
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-weight: normal;
-	cursor: pointer;
-	vertical-align: middle;
-	border: 1px solid #666666;
-	padding: 1px;
-	background-color: #FAFAFA;
-}
-
-option {
-	padding-right: 1em;
-}
-
-option.disabled-option {
-	color: graytext;
-}
-
-textarea {
-	font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
-	width: 60%;
-	padding: 2px;
-	font-size: 1em;
-	line-height: 1.4em;
-}
-
-label {
-	cursor: default;
-	padding-right: 5px;
-	color: #676767;
-}
-
-label input {
-	vertical-align: middle;
-}
-
-label img {
-	vertical-align: middle;
-}
-
-/* Definition list layout for forms
----------------------------------------- */
-fieldset dl {
-	padding: 4px 0;
-}
-
-fieldset dt {
-	float: left;	
-	width: 40%;
-	text-align: left;
-	display: block;
-}
-
-fieldset dd {
-	margin-left: 41%;
-	vertical-align: top;
-	margin-bottom: 3px;
-}
-
-/* Specific layout 1 */
-fieldset.fields1 dt {
-	width: 15em;
-	border-right-width: 0;
-}
-
-fieldset.fields1 dd {
-	margin-left: 15em;
-	border-left-width: 0;
-}
-
-fieldset.fields1 {
-	background-color: transparent;
-}
-
-fieldset.fields1 div {
-	margin-bottom: 3px;
-}
-
-/* Specific layout 2 */
-fieldset.fields2 dt {
-	width: 15em;
-	border-right-width: 0;
-}
-
-fieldset.fields2 dd {
-	margin-left: 16em;
-	border-left-width: 0;
-}
-
-/* Form elements */
-dt label {
-	font-weight: bold;
-	text-align: left;
-}
-
-dd label {
-	white-space: nowrap;
-	color: #333;
-}
-
-dd input, dd textarea {
-	margin-right: 3px;
-}
-
-dd select {
-	width: auto;
-}
-
-dd textarea {
-	width: 85%;
-}
-
-/* Hover effects */
-fieldset dl:hover dt label {
-	color: #000000;
-}
-
-fieldset.fields2 dl:hover dt label {
-	color: inherit;
-}
-
-#timezone {
-	width: 95%;
-}
-
-* html #timezone {
-	width: 50%;
-}
-
-/* Quick-login on index page */
-fieldset.quick-login {
-	margin-top: 5px;
-}
-
-fieldset.quick-login input {
-	width: auto;
-}
-
-fieldset.quick-login input.inputbox {
-	width: 15%;
-	vertical-align: middle;
-	margin-right: 5px;
-	background-color: #f3f3f3;
-}
-
-fieldset.quick-login label {
-	white-space: nowrap;
-	padding-right: 2px;
-}
-
-/* Display options on viewtopic/viewforum pages  */
-fieldset.display-options {
-	text-align: center;
-	margin: 3px 0 5px 0;
-}
-
-fieldset.display-options label {
-	white-space: nowrap;
-	padding-right: 2px;
-}
-
-fieldset.display-options a {
-	margin-top: 3px;
-}
-
-/* Display actions for ucp and mcp pages */
-fieldset.display-actions {
-	text-align: right;
-	line-height: 2em;
-	white-space: nowrap;
-	padding-right: 1em;
-}
-
-fieldset.display-actions label {
-	white-space: nowrap;
-	padding-right: 2px;
-}
-
-fieldset.sort-options {
-	line-height: 2em;
-}
-
-/* MCP forum selection*/
-fieldset.forum-selection {
-	margin: 5px 0 3px 0;
-	float: right;
-}
-
-fieldset.forum-selection2 {
-	margin: 13px 0 3px 0;
-	float: right;
-}
-
-/* Jumpbox */
-fieldset.jumpbox {
-	text-align: right;
-	margin-top: 15px;
-	height: 2.5em;
-}
-
-fieldset.quickmod {
-	width: 50%;
-	float: right;
-	text-align: right;
-	height: 2.5em;
-}
-
-/* Submit button fieldset */
-fieldset.submit-buttons {
-	text-align: center;
-	vertical-align: middle;
-	margin: 5px 0;
-}
-
-fieldset.submit-buttons input {
-	vertical-align: middle;
-	padding-top: 3px;
-	padding-bottom: 3px;
-}
-
-/* Posting page styles
-----------------------------------------*/
-
-/* Buttons used in the editor */
-#format-buttons {
-	margin: 15px 0 2px 0;
-}
-
-#format-buttons input, #format-buttons select {
-	vertical-align: middle;
-}
-
-/* Main message box */
-#message-box {
-	width: 80%;
-}
-
-#message-box textarea {
-	font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
-	width: 100%;
-	font-size: 1.2em;
-	color: #333333;
-}
-
-/* Emoticons panel */
-#smiley-box {
-	width: 18%;
-	float: right;
-}
-
-#smiley-box img {
-	margin: 3px;
-}
-
-/* Input field styles
----------------------------------------- */
-.inputbox {
-	background-color: #FFFFFF;
-	border: 1px solid #c0c0c0;
-	color: #333333;
-	padding: 2px;
-	cursor: text;
-}
-
-.inputbox:hover {
-	border: 1px solid #eaeaea;
-}
-
-.inputbox:focus {
-	border: 1px solid #eaeaea;
-	color: #4b4b4b;
-}
-
-input.inputbox	{ width: 85%; }
-input.medium	{ width: 50%; }
-input.narrow	{ width: 25%; }
-input.tiny		{ width: 125px; }
-
-textarea.inputbox {
-	width: 85%;
-}
-
-.autowidth {
-	width: auto !important;
-}
-
-/* Form button styles
----------------------------------------- */
-input.button1, input.button2 {
-	font-size: 1em;
-}
-
-a.button1, input.button1, input.button3, a.button2, input.button2 {
-	width: auto !important;
-	padding-top: 1px;
-	padding-bottom: 1px;
-	font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
-	color: #000;
-	background: #FAFAFA none repeat-x top;
-}
-
-a.button1, input.button1 {
-	font-weight: bold;
-	border: 1px solid #666666;
-}
-
-input.button3 {
-	padding: 0;
-	margin: 0;
-	line-height: 5px;
-	height: 12px;
-	background-image: none;
-	font-variant: small-caps;
-}
-
-/* Alternative button */
-a.button2, input.button2, input.button3 {
-	border: 1px solid #666666;
-}
-
-/* <a> button in the style of the form buttons */
-a.button1, a.button1:link, a.button1:visited, a.button1:active, a.button2, a.button2:link, a.button2:visited, a.button2:active {
-	text-decoration: none;
-	color: #000000;
-	padding: 2px 8px;
-	line-height: 250%;
-	vertical-align: text-bottom;
-	background-position: 0 1px;
-}
-
-/* Hover states */
-a.button1:hover, input.button1:hover, a.button2:hover, input.button2:hover, input.button3:hover {
-	border: 1px solid #BCBCBC;
-	background-position: 0 100%;
-	color: #BCBCBC;
-}
-
-input.disabled {
-	font-weight: normal;
-	color: #666666;
-}
-
-/* Topic and forum Search */
-.search-box {
-	margin-top: 3px;
-	margin-left: 5px;
-	float: left;
-}
-
-.search-box input {
-}
-
-input.search {
-	background-image: none;
-	background-repeat: no-repeat;
-	background-position: left 1px;
-	padding-left: 17px;
-}
-
-.full { width: 95%; }
-.medium { width: 50%;}
-.narrow { width: 25%;}
-.tiny { width: 10%;}
-
diff --git a/phpBB/styles/prosilver/theme/images/arrow_down.gif b/phpBB/styles/prosilver/theme/images/arrow_down.gif
deleted file mode 100644
index e45c365ecc..0000000000
--- a/phpBB/styles/prosilver/theme/images/arrow_down.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/arrow_left.gif b/phpBB/styles/prosilver/theme/images/arrow_left.gif
deleted file mode 100644
index 076a5596f1..0000000000
--- a/phpBB/styles/prosilver/theme/images/arrow_left.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/arrow_right.gif b/phpBB/styles/prosilver/theme/images/arrow_right.gif
deleted file mode 100644
index c5827a401f..0000000000
--- a/phpBB/styles/prosilver/theme/images/arrow_right.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/arrow_up.gif b/phpBB/styles/prosilver/theme/images/arrow_up.gif
deleted file mode 100644
index 38b5a62c17..0000000000
--- a/phpBB/styles/prosilver/theme/images/arrow_up.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/bg_button.gif b/phpBB/styles/prosilver/theme/images/bg_button.gif
deleted file mode 100644
index 03172ff5c6..0000000000
--- a/phpBB/styles/prosilver/theme/images/bg_button.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/bg_header.gif b/phpBB/styles/prosilver/theme/images/bg_header.gif
deleted file mode 100644
index 351de9f46a..0000000000
--- a/phpBB/styles/prosilver/theme/images/bg_header.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/bg_list.gif b/phpBB/styles/prosilver/theme/images/bg_list.gif
deleted file mode 100644
index 89f8963fde..0000000000
--- a/phpBB/styles/prosilver/theme/images/bg_list.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/bg_menu.gif b/phpBB/styles/prosilver/theme/images/bg_menu.gif
deleted file mode 100644
index 4a9f5a9174..0000000000
--- a/phpBB/styles/prosilver/theme/images/bg_menu.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/bg_tabs1.gif b/phpBB/styles/prosilver/theme/images/bg_tabs1.gif
deleted file mode 100644
index 335a72c711..0000000000
--- a/phpBB/styles/prosilver/theme/images/bg_tabs1.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/bg_tabs2.gif b/phpBB/styles/prosilver/theme/images/bg_tabs2.gif
deleted file mode 100644
index a2142d5432..0000000000
--- a/phpBB/styles/prosilver/theme/images/bg_tabs2.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/corners_left.gif b/phpBB/styles/prosilver/theme/images/corners_left.gif
deleted file mode 100644
index 206e50368d..0000000000
--- a/phpBB/styles/prosilver/theme/images/corners_left.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/corners_left.png b/phpBB/styles/prosilver/theme/images/corners_left.png
deleted file mode 100644
index 256bde3daa..0000000000
--- a/phpBB/styles/prosilver/theme/images/corners_left.png
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/corners_left2.gif b/phpBB/styles/prosilver/theme/images/corners_left2.gif
deleted file mode 100644
index fa27ce3ba2..0000000000
--- a/phpBB/styles/prosilver/theme/images/corners_left2.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/corners_right.gif b/phpBB/styles/prosilver/theme/images/corners_right.gif
deleted file mode 100644
index 0ba66d50b2..0000000000
--- a/phpBB/styles/prosilver/theme/images/corners_right.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/corners_right.png b/phpBB/styles/prosilver/theme/images/corners_right.png
deleted file mode 100644
index df41823b4c..0000000000
--- a/phpBB/styles/prosilver/theme/images/corners_right.png
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/corners_right2.gif b/phpBB/styles/prosilver/theme/images/corners_right2.gif
deleted file mode 100644
index 2d689446ee..0000000000
--- a/phpBB/styles/prosilver/theme/images/corners_right2.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/created_by.jpg b/phpBB/styles/prosilver/theme/images/created_by.jpg
deleted file mode 100644
index 68d56e2013..0000000000
--- a/phpBB/styles/prosilver/theme/images/created_by.jpg
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/gradient.gif b/phpBB/styles/prosilver/theme/images/gradient.gif
deleted file mode 100644
index 21dc11f13b..0000000000
--- a/phpBB/styles/prosilver/theme/images/gradient.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/icon_bookmark.gif b/phpBB/styles/prosilver/theme/images/icon_bookmark.gif
deleted file mode 100644
index 2644293f7d..0000000000
--- a/phpBB/styles/prosilver/theme/images/icon_bookmark.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/icon_bump.gif b/phpBB/styles/prosilver/theme/images/icon_bump.gif
deleted file mode 100644
index 014cd9bd15..0000000000
--- a/phpBB/styles/prosilver/theme/images/icon_bump.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/icon_faq.gif b/phpBB/styles/prosilver/theme/images/icon_faq.gif
deleted file mode 100644
index 4e26460629..0000000000
--- a/phpBB/styles/prosilver/theme/images/icon_faq.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/icon_fontsize.gif b/phpBB/styles/prosilver/theme/images/icon_fontsize.gif
deleted file mode 100644
index 1c7d83527c..0000000000
--- a/phpBB/styles/prosilver/theme/images/icon_fontsize.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/icon_home.gif b/phpBB/styles/prosilver/theme/images/icon_home.gif
deleted file mode 100644
index 8ae9004534..0000000000
--- a/phpBB/styles/prosilver/theme/images/icon_home.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/icon_logout.gif b/phpBB/styles/prosilver/theme/images/icon_logout.gif
deleted file mode 100644
index b8ad5c4e5c..0000000000
--- a/phpBB/styles/prosilver/theme/images/icon_logout.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/icon_members.gif b/phpBB/styles/prosilver/theme/images/icon_members.gif
deleted file mode 100644
index 48e3e5f5f3..0000000000
--- a/phpBB/styles/prosilver/theme/images/icon_members.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/icon_pages.gif b/phpBB/styles/prosilver/theme/images/icon_pages.gif
deleted file mode 100644
index 44cc34500e..0000000000
--- a/phpBB/styles/prosilver/theme/images/icon_pages.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/icon_print.gif b/phpBB/styles/prosilver/theme/images/icon_print.gif
deleted file mode 100644
index a71dfdde70..0000000000
--- a/phpBB/styles/prosilver/theme/images/icon_print.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/icon_register.gif b/phpBB/styles/prosilver/theme/images/icon_register.gif
deleted file mode 100644
index 9ecf126c4f..0000000000
--- a/phpBB/styles/prosilver/theme/images/icon_register.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/icon_search.gif b/phpBB/styles/prosilver/theme/images/icon_search.gif
deleted file mode 100644
index 8492cd308c..0000000000
--- a/phpBB/styles/prosilver/theme/images/icon_search.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/icon_sendemail.gif b/phpBB/styles/prosilver/theme/images/icon_sendemail.gif
deleted file mode 100644
index f6b8aa10e1..0000000000
--- a/phpBB/styles/prosilver/theme/images/icon_sendemail.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/icon_subscribe.gif b/phpBB/styles/prosilver/theme/images/icon_subscribe.gif
deleted file mode 100644
index 5ca18af80a..0000000000
--- a/phpBB/styles/prosilver/theme/images/icon_subscribe.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/icon_textbox_search.gif b/phpBB/styles/prosilver/theme/images/icon_textbox_search.gif
deleted file mode 100644
index b3b51d8425..0000000000
--- a/phpBB/styles/prosilver/theme/images/icon_textbox_search.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/icon_ucp.gif b/phpBB/styles/prosilver/theme/images/icon_ucp.gif
deleted file mode 100644
index 2a5fcc3f0c..0000000000
--- a/phpBB/styles/prosilver/theme/images/icon_ucp.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/icon_unsubscribe.gif b/phpBB/styles/prosilver/theme/images/icon_unsubscribe.gif
deleted file mode 100644
index 27013fc1cb..0000000000
--- a/phpBB/styles/prosilver/theme/images/icon_unsubscribe.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/no_avatar.gif b/phpBB/styles/prosilver/theme/images/no_avatar.gif
deleted file mode 100644
index 80539c8c71..0000000000
--- a/phpBB/styles/prosilver/theme/images/no_avatar.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/images/quote.gif b/phpBB/styles/prosilver/theme/images/quote.gif
deleted file mode 100644
index d1992273e6..0000000000
--- a/phpBB/styles/prosilver/theme/images/quote.gif
+++ /dev/null
diff --git a/phpBB/styles/prosilver/theme/large.css b/phpBB/styles/prosilver/theme/large.css
deleted file mode 100644
index dfb1d2c2e6..0000000000
--- a/phpBB/styles/prosilver/theme/large.css
+++ /dev/null
@@ -1,3 +0,0 @@
-body {
-	font-size: 12px;
-}
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css
deleted file mode 100644
index 9f3b7e3ae7..0000000000
--- a/phpBB/styles/prosilver/theme/links.css
+++ /dev/null
@@ -1,200 +0,0 @@
-/* proSilver Link Styles
----------------------------------------- */
-
-a:link	{ color: #898989; text-decoration: none; }
-a:visited	{ color: #898989; text-decoration: none; }
-a:hover	{ color: #d3d3d3; text-decoration: underline; }
-a:active	{ color: #d2d2d2; text-decoration: none; }
-
-/* Coloured usernames */
-.username-coloured {
-	font-weight: bold;
-	display: inline !important;
-	padding: 0 !important;
-}
-
-/* Links on gradient backgrounds */
-#search-box a:link, .navbg a:link, .forumbg .header a:link, .forabg .header a:link, th a:link {
-	color: #FFFFFF;
-	text-decoration: none;
-}
-
-#search-box a:visited, .navbg a:visited, .forumbg .header a:visited, .forabg .header a:visited, th a:visited {
-	color: #FFFFFF;
-	text-decoration: none;
-}
-
-#search-box a:hover, .navbg a:hover, .forumbg .header a:hover, .forabg .header a:hover, th a:hover {
-	color: #ffffff;
-	text-decoration: underline;
-}
-
-#search-box a:active, .navbg a:active, .forumbg .header a:active, .forabg .header a:active, th a:active {
-	color: #ffffff;
-	text-decoration: none;
-}
-
-/* Links for forum/topic lists */
-a.forumtitle {
-	font-family: "Trebuchet MS", Helvetica, Arial, Sans-serif;
-	font-size: 1.2em;
-	font-weight: bold;
-	color: #898989;
-	text-decoration: none;
-}
-
-/* a.forumtitle:visited { color: #898989; } */
-
-a.forumtitle:hover {
-	color: #bcbcbc;
-	text-decoration: underline;
-}
-
-a.forumtitle:active {
-	color: #898989;
-}
-
-a.topictitle {
-	font-family: "Trebuchet MS", Helvetica, Arial, Sans-serif;
-	font-size: 1.2em;
-	font-weight: bold;
-	color: #898989;
-	text-decoration: none;
-}
-
-/* a.topictitle:visited { color: #d2d2d2; } */
-
-a.topictitle:hover {
-	color: #bcbcbc;
-	text-decoration: underline;
-}
-
-a.topictitle:active {
-	color: #898989;
-}
-
-/* Post body links */
-.postlink {
-	text-decoration: none;
-	color: #d2d2d2;
-	border-bottom: 1px solid #d2d2d2;
-	padding-bottom: 0;
-}
-
-.postlink:visited {
-	color: #bdbdbd;
-	border-bottom-style: dotted;
-	border-bottom-color: #666666;
-}
-
-.postlink:active {
-	color: #d2d2d2;
-}
-
-.postlink:hover {
-	background-color: #f6f6f6;
-	text-decoration: none;
-	color: #404040;
-}
-
-.signature a, .signature a:visited, .signature a:active, .signature a:hover {
-	border: none;
-	text-decoration: underline;
-	background-color: transparent;
-}
-
-/* Profile links */
-.postprofile a:link, .postprofile a:active, .postprofile a:visited, .postprofile dt.author a {
-	font-weight: bold;
-	color: #898989;
-	text-decoration: none;
-}
-
-.postprofile a:hover, .postprofile dt.author a:hover {
-	text-decoration: underline;
-	color: #d3d3d3;
-}
-
-
-/* Profile searchresults */	
-.search .postprofile a {
-	color: #898989;
-	text-decoration: none; 
-	font-weight: normal;
-}
-
-.search .postprofile a:hover {
-	color: #d3d3d3;
-	text-decoration: underline; 
-}
-
-/* Back to top of page */
-.back2top {
-	clear: both;
-	height: 11px;
-	text-align: right;
-}
-
-a.top {
-	background: none no-repeat top left;
-	text-decoration: none;
-	width: {IMG_ICON_BACK_TOP_WIDTH}px;
-	height: {IMG_ICON_BACK_TOP_HEIGHT}px;
-	display: block;
-	float: right;
-	overflow: hidden;
-	letter-spacing: 1000px;
-	text-indent: 11px;
-}
-
-a.top2 {
-	background: none no-repeat 0 50%;
-	text-decoration: none;
-	padding-left: 15px;
-}
-
-/* Arrow links  */
-a.up		{ background: none no-repeat left center; }
-a.down		{ background: none no-repeat right center; }
-a.left		{ background: none no-repeat 3px 60%; }
-a.right		{ background: none no-repeat 95% 60%; }
-
-a.up, a.up:link, a.up:active, a.up:visited {
-	padding-left: 10px;
-	text-decoration: none;
-	border-bottom-width: 0;
-}
-
-a.up:hover {
-	background-position: left top;
-	background-color: transparent;
-}
-
-a.down, a.down:link, a.down:active, a.down:visited {
-	padding-right: 10px;
-}
-
-a.down:hover {
-	background-position: right bottom;
-	text-decoration: none;
-}
-
-a.left, a.left:active, a.left:visited {
-	padding-left: 12px;
-}
-
-a.left:hover {
-	color: #d2d2d2;
-	text-decoration: none;
-	background-position: 0 60%;
-}
-
-a.right, a.right:active, a.right:visited {
-	padding-right: 12px;
-}
-
-a.right:hover {
-	color: #d2d2d2;
-	text-decoration: none;
-	background-position: 100% 60%;
-}
diff --git a/phpBB/styles/prosilver/theme/medium.css b/phpBB/styles/prosilver/theme/medium.css
deleted file mode 100644
index 4c992f9fd8..0000000000
--- a/phpBB/styles/prosilver/theme/medium.css
+++ /dev/null
@@ -1,3 +0,0 @@
-body {
-	font-size: 11px;
-}
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/theme/normal.css b/phpBB/styles/prosilver/theme/normal.css
deleted file mode 100644
index d0783d1882..0000000000
--- a/phpBB/styles/prosilver/theme/normal.css
+++ /dev/null
@@ -1,3 +0,0 @@
-body {
-	font-size: 10px;
-}
-\ No newline at end of file
diff --git a/phpBB/styles/prosilver/theme/print.css b/phpBB/styles/prosilver/theme/print.css
deleted file mode 100644
index 3143b3cf9b..0000000000
--- a/phpBB/styles/prosilver/theme/print.css
+++ /dev/null
@@ -1,129 +0,0 @@
-/* proSilver Print Style Sheet
--------------------------------------------------
-	Author: subBlue  ( http://www.subBlue.com/ )
-	Version: 25 August 2004
-
-	Copyright 2004 phpBB Group
--------------------------------------------------*/
-
-
-/* Lots still TODO here! */
-
-/* General markup styles */
-* {
-	padding: 0;
-	margin: 0;
-}
-
-body {
-	font: 11pt Verdana, Arial, Helvetica, sans-serif;
-	color:#000000;
-}
-
-a:link		{ color: #000000; text-decoration: none; }
-a:visited	{ color: #000000; text-decoration: none; }
-a:active	{ color: #000000; text-decoration: none; }
-
-img, .noprint, #sub-header, #sub-footer, .navbar, .box1, .divider, .signature { display: none; }
-
-/* Container for the main body */
-#wrap {
-	margin: 0 2em;
-}
-
-p { font-size: 85%; }
-.copyright { font-size: 75%; }
-.page-number { float:right; width: auto; text-align: right; font-size: 75%; }
-
-h1, h2, h3, h1 a, h2 a, h3 a {
-	font-family: "Trebuchet MS",georgia,Verdana,Sans-serif;
-	color: #000000;
-	background: none;
-	text-decoration: none;
-	font-weight: bold;
-}
-
-h1 { font-size: 20pt; }
-h2 { font-size: 16pt; margin-top: 1em; }
-h3 { font-size: 14pt; margin-top: 1em; }
-
-.content {
-	font-size: 11pt;
-	line-height: 14pt;
-	margin-bottom: 1em;
-	font-family: "Lucida Grande", "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
-	overflow: hidden;
-}
-
-/* CSS2 Print tip from: http://www.alistapart.com/articles/goingtoprint/ */
-.postbody a:link, .postbody a:visited, .postbody a:active, .postbody a:hover {
-	text-decoration: underline;
-	padding: 0.1em 0.2em;
-	margin: -0.1em -0.2em;
-	color: #666;
-	background: none;
-	font-size: 100%;
-}
-
-html>body .postbody a:link:after, html>body .postbody a:visited:after {
-	content: " (" attr(href) ") ";
-	font-size: 90%;
-	text-decoration: none;
-}
-
-hr {
-	height: 1px;
-	background-color: #999999;
-	border-width: 0;
-}
-
-.author {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 75%;
-	margin-bottom: 0.6em;
-}
-
-.date {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	float: right;
-	position: relative;
-	text-align: right;
-	font-size: 75%;
-}
-
-/* Dont want to print url for names or titles in content area */
-.postbody .author a:link, .postbody .author a:visited, 
-html>body .postbody .author a:link:after, 
-html>body .postbody .author a:visited:after,
-.postquote .quote-by a:link, .postquote .quote-by a:visited, 
-html>body .postquote .quote-by a:link:after, 
-html>body .postquote .quote-by a:visited:after,
-html>body .postbody h1 a:link:after, html>body .postbody h2 a:link:after {
-	text-decoration: none;
-	content: "";
-}
-
-/* Poster profile */
-.postprofile { display: none; }
-.grip-show { display:none; }
-
-/* Quote */
-.postquote {
-	font-size: 85%;
-	margin: 1em 18% 1em 4%;
-	padding: 0.5em;
-	position: relative;
-	line-height: 1.5em;
-	border: 1px #999999 solid;
-}
-
-.postquote img { display: none; }
-.postquote span { display: block; }
-.postquote span .postquote { font-size: 100%; }
-.quote-by { font-weight: bold; }
-
-/* Misc page elements */
-div.spacer { clear: both; }
-
-/* Accessibility tweaks: Mozilla.org */
-.skip_link { display: none; }
diff --git a/phpBB/styles/prosilver/theme/stylesheet.css b/phpBB/styles/prosilver/theme/stylesheet.css
deleted file mode 100644
index c7db605bbb..0000000000
--- a/phpBB/styles/prosilver/theme/stylesheet.css
+++ /dev/null
@@ -1,19 +0,0 @@
-/*  phpBB 3.0 Style Sheet
-    --------------------------------------------------------------
-	Style name:		proSilver
-	Based on style:	proSilver (this is the default phpBB 3 style)
-	Original author:	subBlue ( http://www.subBlue.com/ )
-	Modified by:		
-	
-	Copyright 2006 phpBB Group ( http://www.phpbb.com/ )
-    --------------------------------------------------------------
-*/
-
-@import url("common.css");
-@import url("links.css");
-@import url("content.css");
-@import url("buttons.css");
-@import url("cp.css");
-@import url("forms.css");
-@import url("tweaks.css");
-@import url("colours.css");
diff --git a/phpBB/styles/prosilver/theme/theme.cfg b/phpBB/styles/prosilver/theme/theme.cfg
deleted file mode 100644
index efed06babb..0000000000
--- a/phpBB/styles/prosilver/theme/theme.cfg
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# phpBB Theme Configuration File
-#
-# @package phpBB3
-# @copyright (c) 2006 phpBB Group 
-# @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-#
-#
-# At the left is the name, please do not change this
-# At the right the value is entered
-# For on/off options the valid values are on, off, 1, 0, true and false
-#
-# Values get trimmed, if you want to add a space in front or at the end of
-# the value, then enclose the value with single or double quotes. 
-# Single and double quotes do not need to be escaped.
-#
-# Available and used values:
-# parse_css_file
-# 
-
-# General Information about this theme
-name = prosilver
-copyright = &copy; phpBB Group, 2007
-version = 3.0.3
-
-# Some configuration options
-
-#
-# You have to turn this option on if you want to use the 
-# path template variables ({T_IMAGESET_PATH} for example) within
-# your css file.
-# This is mostly the case if you want to use language specific
-# images within your css file.
-#
-parse_css_file = 1
diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css
deleted file mode 100644
index 6d169f58e0..0000000000
--- a/phpBB/styles/prosilver/theme/tweaks.css
+++ /dev/null
@@ -1,84 +0,0 @@
-/* proSilver Style Sheet Tweaks
-
-These style definitions are mainly IE specific 
-tweaks required due to its poor CSS support.
--------------------------------------------------*/
-
-* html table, * html select, * html input { font-size: 100%; }
-* html hr { margin: 0; }
-* html span.corners-top, * html span.corners-bottom { background-image: url("{T_THEME_PATH}/images/corners_left.gif"); }
-* html span.corners-top span, * html span.corners-bottom span { background-image: url("{T_THEME_PATH}/images/corners_right.gif"); }
-
-table.table1 {
-	width: 99%;		/* IE < 6 browsers */
-	/* Tantek hack */
-	voice-family: "\"}\"";
-	voice-family: inherit;
-	width: 100%;
-}
-html>body table.table1 { width: 100%; }	/* Reset 100% for opera */
-
-* html ul.topiclist li { position: relative; }
-* html .postbody h3 img { vertical-align: middle; }
-
-/* Form styles */
-html>body dd label input { vertical-align: text-bottom; }	/* Align checkboxes/radio buttons nicely */
-
-* html input.button1, * html input.button2 {
-	padding-bottom: 0;
-	margin-bottom: 1px;
-}
-
-/* Misc layout styles */
-* html .column1, * html .column2 { width: 45%; }
-
-/* Nice method for clearing floated blocks without having to insert any extra markup (like spacer above)
-   From http://www.positioniseverything.net/easyclearing.html 
-#tabs:after, #minitabs:after, .post:after, .navbar:after, fieldset dl:after, ul.topiclist dl:after, ul.linklist:after, dl.polls:after {
-	content: "."; 
-	display: block; 
-	height: 0; 
-	clear: both; 
-	visibility: hidden;
-}*/
-
-.clearfix, #tabs, #minitabs, fieldset dl, ul.topiclist dl, dl.polls {
-	height: 1%;
-	overflow: hidden;
-}
-
-/* viewtopic fix */
-* html .post {
-	height: 25%;
-	overflow: hidden;
-}
-
-/* navbar fix */
-* html .clearfix, * html .navbar, ul.linklist {
-	height: 4%;
-	overflow: hidden;
-}
-
-/* Simple fix so forum and topic lists always have a min-height set, even in IE6
-	From http://www.dustindiaz.com/min-height-fast-hack */
-dl.icon {
-	min-height: 35px;
-	height: auto !important;
-	height: 35px;
-}
-
-* html #search-box {
-	width: 25%;
-}
-
-/* Correctly clear floating for details on profile view */
-*:first-child+html dl.details dd {
-	margin-left: 30%;
-	float: none;
-}
-
-* html dl.details dd {
-	margin-left: 30%;
-	float: none;
-}
-
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
deleted file mode 100644
index 3b519dcfa6..0000000000
--- a/phpBB/ucp.php
+++ /dev/null
@@ -1,347 +0,0 @@
-<?php
-/**
-*
-* @package ucp
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-define('IN_PHPBB', true);
-if (!defined('PHPBB_ROOT_PATH')) define('PHPBB_ROOT_PATH', './');
-if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-include PHPBB_ROOT_PATH . 'common.' . PHP_EXT;
-require PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT;
-require PHPBB_ROOT_PATH . 'includes/functions_module.' . PHP_EXT;
-
-// Basic parameter data
-$id 	= request_var('i', '');
-$mode	= request_var('mode', '');
-
-if ($mode == 'login' || $mode == 'logout' || $mode == 'confirm')
-{
-	define('IN_LOGIN', true);
-}
-
-// Start session management
-phpbb::$user->session_begin();
-phpbb::$acl->init(phpbb::$user->data);
-phpbb::$user->setup('ucp');
-
-// Setting a variable to let the style designer know where he is...
-phpbb::$template->assign_var('S_IN_UCP', true);
-
-$module = new p_master();
-
-// Go through basic "global" modes
-switch ($mode)
-{
-	case 'activate':
-		$module->load('ucp', 'activate');
-		$module->display(phpbb::$user->lang['UCP_ACTIVATE']);
-
-		redirect(append_sid('index'));
-	break;
-
-	case 'resend_act':
-		$module->load('ucp', 'resend');
-		$module->display(phpbb::$user->lang['UCP_RESEND']);
-	break;
-
-	case 'sendpassword':
-		$module->load('ucp', 'remind');
-		$module->display(phpbb::$user->lang['UCP_REMIND']);
-	break;
-
-	case 'register':
-		if (phpbb::$user->is_registered || phpbb_request::is_set('not_agreed'))
-		{
-			redirect(append_sid('index'));
-		}
-
-		$module->load('ucp', 'register');
-		$module->display(phpbb::$user->lang['REGISTER']);
-	break;
-
-	case 'confirm':
-		$module->load('ucp', 'confirm');
-	break;
-
-	case 'login':
-		if (phpbb::$user->is_registered)
-		{
-			phpbb::$url->redirect(phpbb::$url->append_sid('index'));
-		}
-
-		login_box(request_var('redirect', 'index'));
-	break;
-
-	case 'logout':
-		if (!phpbb::$user->is_guest && phpbb_request::variable('sid', '', false, phpbb_request::GET) === phpbb::$user->session_id)
-		{
-			phpbb::$user->session_kill();
-			phpbb::$user->session_begin();
-			$message = phpbb::$user->lang['LOGOUT_REDIRECT'];
-		}
-		else
-		{
-			$message = (phpbb::$user->is_guest) ? phpbb::$user->lang['LOGOUT_REDIRECT'] : phpbb::$user->lang['LOGOUT_FAILED'];
-		}
-		phpbb::$url->meta_refresh(3, phpbb::$url->append_sid('index'));
-
-		$message = $message . '<br /><br />' . phpbb::$user->lang('RETURN_INDEX', '<a href="' . phpbb::$url->append_sid('index') . '">', '</a> ');
-		trigger_error($message);
-
-	break;
-
-	case 'terms':
-	case 'privacy':
-
-		$message = ($mode == 'terms') ? 'TERMS_OF_USE_CONTENT' : 'PRIVACY_POLICY';
-		$title = ($mode == 'terms') ? 'TERMS_USE' : 'PRIVACY';
-
-		if (empty(phpbb::$user->lang[$message]))
-		{
-			if (phpbb::$user->is_registered)
-			{
-				redirect(append_sid('index'));
-			}
-
-			login_box();
-		}
-
-		phpbb::$template->set_filenames(array(
-			'body'		=> 'ucp_agreement.html',
-		));
-
-		// Disable online list
-		page_header(phpbb::$user->lang[$title], false);
-
-		phpbb::$template->assign_vars(array(
-			'S_AGREEMENT'			=> true,
-			'AGREEMENT_TITLE'		=> phpbb::$user->lang[$title],
-			'AGREEMENT_TEXT'		=> sprintf(phpbb::$user->lang[$message], phpbb::$config['sitename'], generate_board_url()),
-			'U_BACK'				=> append_sid('ucp', 'mode=login'),
-			'L_BACK'				=> phpbb::$user->lang['BACK_TO_LOGIN'],
-		));
-
-		page_footer();
-
-	break;
-
-	case 'delete_cookies':
-
-		// Delete Cookies with dynamic names (do NOT delete poll cookies)
-		if (confirm_box(true))
-		{
-			$set_time = time() - 31536000;
-
-			$cookies = phpbb_request::variable_names(phpbb_request::COOKIE);
-			foreach ($cookies as $cookie_name)
-			{
-				$cookie_name = str_replace(phpbb::$config['cookie_name'] . '_', '', $cookie_name);
-
-				// Polls are stored as {cookie_name}_poll_{topic_id}, cookie_name_ got removed, therefore checking for poll_
-				if (strpos($cookie_name, 'poll_') !== 0)
-				{
-					phpbb::$user->set_cookie($cookie_name, '', $set_time);
-				}
-			}
-
-			phpbb::$user->set_cookie('track', '', $set_time);
-			phpbb::$user->set_cookie('u', '', $set_time);
-			phpbb::$user->set_cookie('k', '', $set_time);
-			phpbb::$user->set_cookie('sid', '', $set_time);
-
-			// We destroy the session here, the user will be logged out nevertheless
-			phpbb::$user->session_kill();
-			phpbb::$user->session_begin();
-
-			meta_refresh(3, append_sid('index'));
-
-			$message = phpbb::$user->lang['COOKIES_DELETED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_INDEX'], '<a href="' . append_sid('index') . '">', '</a>');
-			trigger_error($message);
-		}
-		else
-		{
-			confirm_box(false, 'DELETE_COOKIES', '');
-		}
-
-		redirect(append_sid('index'));
-
-	break;
-
-	case 'switch_perm':
-
-		$user_id = request_var('u', 0);
-
-		$sql = 'SELECT *
-			FROM ' . USERS_TABLE . '
-			WHERE user_id = ' . (int) $user_id;
-		$result = phpbb::$db->sql_query($sql);
-		$user_row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!phpbb::$acl->acl_get('a_switchperm') || !$user_row || $user_id == phpbb::$user->data['user_id'])
-		{
-			redirect(append_sid('index'));
-		}
-
-		include(PHPBB_ROOT_PATH . 'includes/acp/auth.' . PHP_EXT);
-
-		$auth_admin = new auth_admin();
-		if (!$auth_admin->ghost_permissions($user_id, phpbb::$user->data['user_id']))
-		{
-			redirect(append_sid('index'));
-		}
-
-		add_log('admin', 'LOG_ACL_TRANSFER_PERMISSIONS', $user_row['username']);
-
-		$message = sprintf(phpbb::$user->lang['PERMISSIONS_TRANSFERRED'], $user_row['username']) . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_INDEX'], '<a href="' . append_sid('index') . '">', '</a>');
-		trigger_error($message);
-
-	break;
-
-	case 'restore_perm':
-
-		if (!phpbb::$user->data['user_perm_from'] || !phpbb::$acl->acl_get('a_switchperm'))
-		{
-			redirect(append_sid('index'));
-		}
-
-		phpbb::$acl->acl_cache(phpbb::$user->data);
-
-		$sql = 'UPDATE ' . USERS_TABLE . "
-			SET user_perm_from = 0
-			WHERE user_id = " . phpbb::$user->data['user_id'];
-		phpbb::$db->sql_query($sql);
-
-		$sql = 'SELECT username
-			FROM ' . USERS_TABLE . '
-			WHERE user_id = ' . phpbb::$user->data['user_perm_from'];
-		$result = phpbb::$db->sql_query($sql);
-		$username = phpbb::$db->sql_fetchfield('username');
-		phpbb::$db->sql_freeresult($result);
-
-		add_log('admin', 'LOG_ACL_RESTORE_PERMISSIONS', $username);
-
-		$message = phpbb::$user->lang['PERMISSIONS_RESTORED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_INDEX'], '<a href="' . append_sid('index') . '">', '</a>');
-		trigger_error($message);
-
-	break;
-
-	default:
-
-		// Only registered users can go beyond this point
-		if (!phpbb::$user->is_registered)
-		{
-			if (phpbb::$user->is_bot)
-			{
-				redirect(append_sid('index'));
-			}
-
-			login_box('', phpbb::$user->lang['LOGIN_EXPLAIN_UCP']);
-		}
-
-		// Instantiate module system and generate list of available modules
-		$module->list_modules('ucp');
-
-		// Check if the zebra module is set
-		if ($module->is_active('zebra', 'friends'))
-		{
-			_display_friends();
-		}
-
-		// Do not display subscribed topics/forums if not allowed
-		if (!phpbb::$config['allow_topic_notify'] && !phpbb::$config['allow_forum_notify'])
-		{
-			$module->set_display('main', 'subscribed', false);
-		}
-
-		// Select the active module
-		$module->set_active($id, $mode);
-
-		// Load and execute the relevant module
-		$module->load_active();
-
-		// Assign data to the template engine for the list of modules
-		$module->assign_tpl_vars(append_sid('ucp'));
-
-		// Generate the page, do not display/query online list
-		$module->display($module->get_page_title(), false);
-
-	break;
-}
-
-/**
-* Output listing of friends online
-*/
-function _display_friends()
-{
-	$update_time = phpbb::$config['load_online_time'] * 60;
-
-	$sql = phpbb::$db->sql_build_query('SELECT_DISTINCT', array(
-		'SELECT'	=> 'u.user_id, u.username, u.username_clean, u.user_colour, MAX(s.session_time) as online_time, MIN(s.session_viewonline) AS viewonline',
-
-		'FROM'		=> array(
-			USERS_TABLE		=> 'u',
-			ZEBRA_TABLE		=> 'z'
-		),
-
-		'LEFT_JOIN'	=> array(
-			array(
-				'FROM'	=> array(SESSIONS_TABLE => 's'),
-				'ON'	=> 's.session_user_id = z.zebra_id'
-			)
-		),
-
-		'WHERE'		=> 'z.user_id = ' . phpbb::$user->data['user_id'] . '
-			AND z.friend = 1
-			AND u.user_id = z.zebra_id',
-
-		'GROUP_BY'	=> 'z.zebra_id, u.user_id, u.username_clean, u.user_colour, u.username',
-
-		'ORDER_BY'	=> 'u.username_clean ASC',
-	));
-
-	$result = phpbb::$db->sql_query($sql);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$which = (time() - $update_time < $row['online_time'] && ($row['viewonline'] || phpbb::$acl->acl_get('u_viewonline'))) ? 'online' : 'offline';
-
-		phpbb::$template->assign_block_vars("friends_{$which}", array(
-			'USER_ID'		=> $row['user_id'],
-
-			'U_PROFILE'		=> get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']),
-			'USER_COLOUR'	=> get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']),
-			'USERNAME'		=> get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']),
-			'USERNAME_FULL'	=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
-		));
-	}
-	phpbb::$db->sql_freeresult($result);
-}
-
-/**
-* Function for assigning a template var if the zebra module got included
-*/
-function _module_zebra($mode, &$module_row)
-{
-	phpbb::$template->assign_var('S_ZEBRA_ENABLED', true);
-
-	if ($mode == 'friends')
-	{
-		phpbb::$template->assign_var('S_ZEBRA_FRIENDS_ENABLED', true);
-	}
-
-	if ($mode == 'foes')
-	{
-		phpbb::$template->assign_var('S_ZEBRA_FOES_ENABLED', true);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
deleted file mode 100644
index bb337e95ba..0000000000
--- a/phpBB/viewforum.php
+++ /dev/null
@@ -1,701 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-define('IN_PHPBB', true);
-if (!defined('PHPBB_ROOT_PATH')) define('PHPBB_ROOT_PATH', './');
-if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-include(PHPBB_ROOT_PATH . 'common.' . PHP_EXT);
-include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-
-// Start session
-phpbb::$user->session_begin();
-phpbb::$acl->init(phpbb::$user->data);
-
-// Start initial var setup
-$forum_id	= request_var('f', 0);
-$mark_read	= request_var('mark', '');
-$start		= request_var('start', 0);
-
-$default_sort_days	= (!empty(phpbb::$user->data['user_topic_show_days'])) ? phpbb::$user->data['user_topic_show_days'] : 0;
-$default_sort_key	= (!empty(phpbb::$user->data['user_topic_sortby_type'])) ? phpbb::$user->data['user_topic_sortby_type'] : 't';
-$default_sort_dir	= (!empty(phpbb::$user->data['user_topic_sortby_dir'])) ? phpbb::$user->data['user_topic_sortby_dir'] : 'd';
-
-$sort_days	= request_var('st', $default_sort_days);
-$sort_key	= request_var('sk', $default_sort_key);
-$sort_dir	= request_var('sd', $default_sort_dir);
-
-// Check if the user has actually sent a forum ID with his/her request
-// If not give them a nice error page.
-if (!$forum_id)
-{
-	trigger_error('NO_FORUM');
-}
-
-$sql_from = FORUMS_TABLE . ' f';
-$lastread_select = '';
-
-// Grab appropriate forum data
-if (phpbb::$config['load_db_lastread'] && phpbb::$user->is_registered)
-{
-	$sql_from .= ' LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.user_id = ' . phpbb::$user->data['user_id'] . '
-		AND ft.forum_id = f.forum_id)';
-	$lastread_select .= ', ft.mark_time';
-}
-
-if (phpbb::$user->is_registered)
-{
-	$sql_from .= ' LEFT JOIN ' . FORUMS_WATCH_TABLE . ' fw ON (fw.forum_id = f.forum_id AND fw.user_id = ' . phpbb::$user->data['user_id'] . ')';
-	$lastread_select .= ', fw.notify_status';
-}
-
-$sql = "SELECT f.* $lastread_select
-	FROM $sql_from
-	WHERE f.forum_id = $forum_id";
-$result = phpbb::$db->sql_query($sql);
-$forum_data = phpbb::$db->sql_fetchrow($result);
-phpbb::$db->sql_freeresult($result);
-
-if (!$forum_data)
-{
-	trigger_error('NO_FORUM');
-}
-
-
-// Configure style, language, etc.
-phpbb::$user->setup('viewforum', $forum_data['forum_style']);
-
-// Redirect to login upon emailed notification links
-if (phpbb_request::is_set('e', phpbb_request::GET) && !phpbb::$user->is_registered)
-{
-	login_box('', phpbb::$user->lang['LOGIN_NOTIFY_FORUM']);
-}
-
-// Permissions check
-if (!phpbb::$acl->acl_gets('f_list', 'f_read', $forum_id) || ($forum_data['forum_type'] == FORUM_LINK && $forum_data['forum_link'] && !phpbb::$acl->acl_get('f_read', $forum_id)))
-{
-	if (!phpbb::$user->is_guest)
-	{
-		trigger_error('SORRY_AUTH_READ');
-	}
-
-	login_box('', phpbb::$user->lang['LOGIN_VIEWFORUM']);
-}
-
-// Forum is passworded ... check whether access has been granted to this
-// user this session, if not show login box
-if ($forum_data['forum_password'])
-{
-	login_forum_box($forum_data);
-}
-
-// Is this forum a link? ... User got here either because the
-// number of clicks is being tracked or they guessed the id
-if ($forum_data['forum_type'] == FORUM_LINK && $forum_data['forum_link'])
-{
-	// Does it have click tracking enabled?
-	if ($forum_data['forum_flags'] & FORUM_FLAG_LINK_TRACK)
-	{
-		$sql = 'UPDATE ' . FORUMS_TABLE . '
-			SET forum_posts = forum_posts + 1
-			WHERE forum_id = ' . $forum_id;
-		phpbb::$db->sql_query($sql);
-	}
-
-	// We redirect to the url. The third parameter indicates that external redirects are allowed.
-	redirect($forum_data['forum_link'], false, true);
-	return;
-}
-
-// Build navigation links
-generate_forum_nav($forum_data);
-
-// Forum Rules
-if (phpbb::$acl->acl_get('f_read', $forum_id))
-{
-	generate_forum_rules($forum_data);
-}
-
-// Do we have subforums?
-$active_forum_ary = $moderators = array();
-
-if ($forum_data['left_id'] != $forum_data['right_id'] - 1)
-{
-	list($active_forum_ary, $moderators) = display_forums($forum_data, phpbb::$config['load_moderators'], phpbb::$config['load_moderators']);
-}
-else
-{
-	phpbb::$template->assign_var('S_HAS_SUBFORUM', false);
-	get_moderators($moderators, $forum_id);
-}
-
-// Dump out the page header and load viewforum template
-page_header(phpbb::$user->lang['VIEW_FORUM'] . ' - ' . $forum_data['forum_name']);
-
-phpbb::$template->set_filenames(array(
-	'body' => 'viewforum_body.html',
-));
-
-make_jumpbox(append_sid('viewforum'), $forum_id);
-
-phpbb::$template->assign_vars(array(
-	'U_VIEW_FORUM'			=> append_sid('viewforum', "f=$forum_id&amp;start=$start"),
-));
-
-// Not postable forum or showing active topics?
-if (!($forum_data['forum_type'] == FORUM_POST || (($forum_data['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS) && $forum_data['forum_type'] == FORUM_CAT)))
-{
-	page_footer();
-}
-
-// Ok, if someone has only list-access, we only display the forum list.
-// We also make this circumstance available to the template in case we want to display a notice. ;)
-if (!phpbb::$acl->acl_get('f_read', $forum_id))
-{
-	phpbb::$template->assign_vars(array(
-		'S_NO_READ_ACCESS'		=> true,
-		'S_AUTOLOGIN_ENABLED'	=> (phpbb::$config['allow_autologin']) ? true : false,
-		'S_LOGIN_ACTION'		=> append_sid('ucp', 'mode=login') . '&amp;redirect=' . urlencode(str_replace('&amp;', '&', build_url(array('_f_')))),
-	));
-
-	page_footer();
-}
-
-// Handle marking posts
-if ($mark_read == 'topics')
-{
-	$token = request_var('hash', '');
-	if (check_link_hash($token, 'global'))
-	{
-		markread('topics', $forum_id);
-	}
-	$redirect_url = append_sid('viewforum', 'f=' . $forum_id);
-	meta_refresh(3, $redirect_url);
-
-	trigger_error(phpbb::$user->lang['TOPICS_MARKED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_FORUM'], '<a href="' . $redirect_url . '">', '</a>'));
-}
-
-// Is a forum specific topic count required?
-if ($forum_data['forum_topics_per_page'])
-{
-	phpbb::$config['topics_per_page'] = $forum_data['forum_topics_per_page'];
-}
-
-// Do the forum Prune thang - cron type job ...
-if ($forum_data['prune_next'] < time() && $forum_data['enable_prune'])
-{
-	phpbb::$template->assign_var('RUN_CRON_TASK', '<img src="' . append_sid('cron', 'cron_type=prune_forum&amp;f=' . $forum_id) . '" alt="cron" width="1" height="1" />');
-}
-
-// Forum rules and subscription info
-$s_watching_forum = array(
-	'link'			=> '',
-	'title'			=> '',
-	'is_watching'	=> false,
-);
-
-if ((phpbb::$config['email_enable'] || phpbb::$config['jab_enable']) && phpbb::$config['allow_forum_notify'] && $forum_data['forum_type'] == FORUM_POST && phpbb::$acl->acl_get('f_subscribe', $forum_id))
-{
-	$notify_status = (isset($forum_data['notify_status'])) ? $forum_data['notify_status'] : NULL;
-	watch_topic_forum('forum', $s_watching_forum, phpbb::$user->data['user_id'], $forum_id, 0, $notify_status);
-}
-
-$s_forum_rules = '';
-gen_forum_auth_level('forum', $forum_id, $forum_data['forum_status']);
-
-// Topic ordering options
-$limit_days = array(0 => phpbb::$user->lang['ALL_TOPICS'], 1 => phpbb::$user->lang['1_DAY'], 7 => phpbb::$user->lang['7_DAYS'], 14 => phpbb::$user->lang['2_WEEKS'], 30 => phpbb::$user->lang['1_MONTH'], 90 => phpbb::$user->lang['3_MONTHS'], 180 => phpbb::$user->lang['6_MONTHS'], 365 => phpbb::$user->lang['1_YEAR']);
-
-$sort_by_text = array('a' => phpbb::$user->lang['AUTHOR'], 't' => phpbb::$user->lang['POST_TIME'], 'r' => phpbb::$user->lang['REPLIES'], 's' => phpbb::$user->lang['SUBJECT'], 'v' => phpbb::$user->lang['VIEWS']);
-$sort_by_sql = array('a' => 't.topic_first_poster_name', 't' => 't.topic_last_post_time', 'r' => 't.topic_replies', 's' => 't.topic_title', 'v' => 't.topic_views');
-
-$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
-gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param, $default_sort_days, $default_sort_key, $default_sort_dir);
-
-// Limit topics to certain time frame, obtain correct topic count
-// global announcements must not be counted, normal announcements have to
-// be counted, as forum_topics(_real) includes them
-if ($sort_days)
-{
-	$min_post_time = time() - ($sort_days * 86400);
-
-	$sql = 'SELECT COUNT(topic_id) AS num_topics
-		FROM ' . TOPICS_TABLE . "
-		WHERE forum_id = $forum_id
-			AND ((topic_type <> " . POST_GLOBAL . " AND topic_last_post_time >= $min_post_time)
-				OR topic_type = " . POST_ANNOUNCE . ")
-		" . ((phpbb::$acl->acl_get('m_approve', $forum_id)) ? '' : 'AND topic_approved = 1');
-	$result = phpbb::$db->sql_query($sql);
-	$topics_count = (int) phpbb::$db->sql_fetchfield('num_topics');
-	phpbb::$db->sql_freeresult($result);
-
-	if (phpbb_request::is_set_post('sort'))
-	{
-		$start = 0;
-	}
-	$sql_limit_time = "AND t.topic_last_post_time >= $min_post_time";
-
-	// Make sure we have information about day selection ready
-	phpbb::$template->assign_var('S_SORT_DAYS', true);
-}
-else
-{
-	$topics_count = (phpbb::$acl->acl_get('m_approve', $forum_id)) ? $forum_data['forum_topics_real'] : $forum_data['forum_topics'];
-	$sql_limit_time = '';
-}
-
-// Make sure $start is set to the last page if it exceeds the amount
-if ($start < 0 || $start > $topics_count)
-{
-	$start = ($start < 0) ? 0 : floor(($topics_count - 1) / phpbb::$config['topics_per_page']) * phpbb::$config['topics_per_page'];
-}
-
-// Basic pagewide vars
-$post_alt = ($forum_data['forum_status'] == ITEM_LOCKED) ? phpbb::$user->lang['FORUM_LOCKED'] : phpbb::$user->lang['POST_NEW_TOPIC'];
-
-// Display active topics?
-$s_display_active = ($forum_data['forum_type'] == FORUM_CAT && ($forum_data['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS)) ? true : false;
-
-phpbb::$template->assign_vars(array(
-	'MODERATORS'	=> (!empty($moderators[$forum_id])) ? implode(', ', $moderators[$forum_id]) : '',
-
-	'POST_IMG'					=> ($forum_data['forum_status'] == ITEM_LOCKED) ? phpbb::$user->img('button_topic_locked', $post_alt) : phpbb::$user->img('button_topic_new', $post_alt),
-	'NEWEST_POST_IMG'			=> phpbb::$user->img('icon_topic_newest', 'VIEW_NEWEST_POST'),
-	'LAST_POST_IMG'				=> phpbb::$user->img('icon_topic_latest', 'VIEW_LATEST_POST'),
-	'FOLDER_IMG'				=> phpbb::$user->img('topic_read', 'NO_NEW_POSTS'),
-	'FOLDER_NEW_IMG'			=> phpbb::$user->img('topic_unread', 'NEW_POSTS'),
-	'FOLDER_HOT_IMG'			=> phpbb::$user->img('topic_read_hot', 'NO_NEW_POSTS_HOT'),
-	'FOLDER_HOT_NEW_IMG'		=> phpbb::$user->img('topic_unread_hot', 'NEW_POSTS_HOT'),
-	'FOLDER_LOCKED_IMG'			=> phpbb::$user->img('topic_read_locked', 'NO_NEW_POSTS_LOCKED'),
-	'FOLDER_LOCKED_NEW_IMG'		=> phpbb::$user->img('topic_unread_locked', 'NEW_POSTS_LOCKED'),
-	'FOLDER_STICKY_IMG'			=> phpbb::$user->img('sticky_read', 'POST_STICKY'),
-	'FOLDER_STICKY_NEW_IMG'		=> phpbb::$user->img('sticky_unread', 'POST_STICKY'),
-	'FOLDER_ANNOUNCE_IMG'		=> phpbb::$user->img('announce_read', 'POST_ANNOUNCEMENT'),
-	'FOLDER_ANNOUNCE_NEW_IMG'	=> phpbb::$user->img('announce_unread', 'POST_ANNOUNCEMENT'),
-	'FOLDER_MOVED_IMG'			=> phpbb::$user->img('topic_moved', 'TOPIC_MOVED'),
-	'REPORTED_IMG'				=> phpbb::$user->img('icon_topic_reported', 'TOPIC_REPORTED'),
-	'UNAPPROVED_IMG'			=> phpbb::$user->img('icon_topic_unapproved', 'TOPIC_UNAPPROVED'),
-	'GOTO_PAGE_IMG'				=> phpbb::$user->img('icon_post_target', 'GOTO_PAGE'),
-
-	'L_NO_TOPICS' 			=> ($forum_data['forum_status'] == ITEM_LOCKED) ? phpbb::$user->lang['POST_FORUM_LOCKED'] : phpbb::$user->lang['NO_TOPICS'],
-
-	'S_DISPLAY_POST_INFO'	=> ($forum_data['forum_type'] == FORUM_POST && (phpbb::$acl->acl_get('f_post', $forum_id) || phpbb::$user->is_guest)) ? true : false,
-
-	'S_IS_POSTABLE'			=> ($forum_data['forum_type'] == FORUM_POST) ? true : false,
-	'S_USER_CAN_POST'		=> (phpbb::$acl->acl_get('f_post', $forum_id)) ? true : false,
-	'S_DISPLAY_ACTIVE'		=> $s_display_active,
-	'S_SELECT_SORT_DIR'		=> $s_sort_dir,
-	'S_SELECT_SORT_KEY'		=> $s_sort_key,
-	'S_SELECT_SORT_DAYS'	=> $s_limit_days,
-	'S_TOPIC_ICONS'			=> ($s_display_active && sizeof($active_forum_ary)) ? max($active_forum_ary['enable_icons']) : (($forum_data['enable_icons']) ? true : false),
-	'S_WATCH_FORUM_LINK'	=> $s_watching_forum['link'],
-	'S_WATCH_FORUM_TITLE'	=> $s_watching_forum['title'],
-	'S_WATCHING_FORUM'		=> $s_watching_forum['is_watching'],
-	'S_FORUM_ACTION'		=> append_sid('viewforum', "f=$forum_id&amp;start=$start"),
-	'S_DISPLAY_SEARCHBOX'	=> (phpbb::$acl->acl_get('u_search') && phpbb::$acl->acl_get('f_search', $forum_id) && phpbb::$config['load_search']) ? true : false,
-	'S_SEARCHBOX_ACTION'	=> append_sid('search', 'fid[]=' . $forum_id),
-	'S_SINGLE_MODERATOR'	=> (!empty($moderators[$forum_id]) && sizeof($moderators[$forum_id]) > 1) ? false : true,
-	'S_IS_LOCKED'			=> ($forum_data['forum_status'] == ITEM_LOCKED) ? true : false,
-	'S_VIEWFORUM'			=> true,
-
-	'U_MCP'				=> (phpbb::$acl->acl_get('m_', $forum_id)) ? append_sid('mcp', "f=$forum_id&amp;i=main&amp;mode=forum_view", true, phpbb::$user->session_id) : '',
-	'U_POST_NEW_TOPIC'	=> (phpbb::$acl->acl_get('f_post', $forum_id) || phpbb::$user->is_guest) ? append_sid('posting', 'mode=post&amp;f=' . $forum_id) : '',
-	'U_VIEW_FORUM'		=> append_sid('viewforum', "f=$forum_id" . ((strlen($u_sort_param)) ? "&amp;$u_sort_param" : '') . "&amp;start=$start"),
-	'U_MARK_TOPICS'		=> (phpbb::$user->is_registered || phpbb::$config['load_anon_lastread']) ? append_sid('viewforum', 'hash=' . generate_link_hash('global') . "&amp;f=$forum_id&amp;mark=topics") : '',
-));
-
-// Grab icons
-$icons = phpbb_cache::obtain_icons();
-
-// Grab all topic data
-$rowset = $announcement_list = $topic_list = $global_announce_list = array();
-
-$sql_array = array(
-	'SELECT'	=> 't.*',
-	'FROM'		=> array(
-		TOPICS_TABLE		=> 't'
-	),
-	'LEFT_JOIN'	=> array(),
-);
-
-$sql_approved = (phpbb::$acl->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1';
-
-if (phpbb::$user->is_registered)
-{
-	if (phpbb::$config['load_db_track'])
-	{
-		$sql_array['LEFT_JOIN'][] = array('FROM' => array(TOPICS_POSTED_TABLE => 'tp'), 'ON' => 'tp.topic_id = t.topic_id AND tp.user_id = ' . phpbb::$user->data['user_id']);
-		$sql_array['SELECT'] .= ', tp.topic_posted';
-	}
-
-	if (phpbb::$config['load_db_lastread'])
-	{
-		$sql_array['LEFT_JOIN'][] = array('FROM' => array(TOPICS_TRACK_TABLE => 'tt'), 'ON' => 'tt.topic_id = t.topic_id AND tt.user_id = ' . phpbb::$user->data['user_id']);
-		$sql_array['SELECT'] .= ', tt.mark_time';
-
-		if ($s_display_active && sizeof($active_forum_ary))
-		{
-			$sql_array['LEFT_JOIN'][] = array('FROM' => array(FORUMS_TRACK_TABLE => 'ft'), 'ON' => 'ft.forum_id = t.forum_id AND ft.user_id = ' . phpbb::$user->data['user_id']);
-			$sql_array['SELECT'] .= ', ft.mark_time AS forum_mark_time';
-		}
-	}
-}
-
-if ($forum_data['forum_type'] == FORUM_POST)
-{
-	// Obtain announcements ... removed sort ordering, sort by time in all cases
-	$sql = phpbb::$db->sql_build_query('SELECT', array(
-		'SELECT'	=> $sql_array['SELECT'],
-		'FROM'		=> $sql_array['FROM'],
-		'LEFT_JOIN'	=> $sql_array['LEFT_JOIN'],
-
-		'WHERE'		=> 't.forum_id IN (' . $forum_id . ', 0)
-			AND t.topic_type IN (' . POST_ANNOUNCE . ', ' . POST_GLOBAL . ')',
-
-		'ORDER_BY'	=> 't.topic_time DESC',
-	));
-	$result = phpbb::$db->sql_query($sql);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$rowset[$row['topic_id']] = $row;
-		$announcement_list[] = $row['topic_id'];
-
-		if ($row['topic_type'] == POST_GLOBAL)
-		{
-			$global_announce_list[$row['topic_id']] = true;
-		}
-		else
-		{
-			$topics_count--;
-		}
-	}
-	phpbb::$db->sql_freeresult($result);
-}
-
-// If the user is trying to reach late pages, start searching from the end
-$store_reverse = false;
-$sql_limit = phpbb::$config['topics_per_page'];
-if ($start > $topics_count / 2)
-{
-	$store_reverse = true;
-
-	if ($start + phpbb::$config['topics_per_page'] > $topics_count)
-	{
-		$sql_limit = min(phpbb::$config['topics_per_page'], max(1, $topics_count - $start));
-	}
-
-	// Select the sort order
-	$sql_sort_order = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'ASC' : 'DESC');
-	$sql_start = max(0, $topics_count - $sql_limit - $start);
-}
-else
-{
-	// Select the sort order
-	$sql_sort_order = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
-	$sql_start = $start;
-}
-
-if ($forum_data['forum_type'] == FORUM_POST || !sizeof($active_forum_ary))
-{
-	$sql_where = 't.forum_id = ' . $forum_id;
-}
-else if (empty($active_forum_ary['exclude_forum_id']))
-{
-	$sql_where = phpbb::$db->sql_in_set('t.forum_id', $active_forum_ary['forum_id']);
-}
-else
-{
-	$get_forum_ids = array_diff($active_forum_ary['forum_id'], $active_forum_ary['exclude_forum_id']);
-	$sql_where = (sizeof($get_forum_ids)) ? phpbb::$db->sql_in_set('t.forum_id', $get_forum_ids) : 't.forum_id = ' . $forum_id;
-}
-
-// Grab just the sorted topic ids
-$sql = 'SELECT t.topic_id
-	FROM ' . TOPICS_TABLE . " t
-	WHERE $sql_where
-		AND t.topic_type IN (" . POST_NORMAL . ', ' . POST_STICKY . ")
-		$sql_approved
-		$sql_limit_time
-	ORDER BY t.topic_type " . ((!$store_reverse) ? 'DESC' : 'ASC') . ', ' . $sql_sort_order;
-$result = phpbb::$db->sql_query_limit($sql, $sql_limit, $sql_start);
-
-while ($row = phpbb::$db->sql_fetchrow($result))
-{
-	$topic_list[] = (int) $row['topic_id'];
-}
-phpbb::$db->sql_freeresult($result);
-
-// For storing shadow topics
-$shadow_topic_list = array();
-
-if (sizeof($topic_list))
-{
-	// SQL array for obtaining topics/stickies
-	$sql_array = array(
-		'SELECT'		=> $sql_array['SELECT'],
-		'FROM'			=> $sql_array['FROM'],
-		'LEFT_JOIN'		=> $sql_array['LEFT_JOIN'],
-
-		'WHERE'			=> phpbb::$db->sql_in_set('t.topic_id', $topic_list),
-	);
-
-	// If store_reverse, then first obtain topics, then stickies, else the other way around...
-	// Funnily enough you typically save one query if going from the last page to the middle (store_reverse) because
-	// the number of stickies are not known
-	$sql = phpbb::$db->sql_build_query('SELECT', $sql_array);
-	$result = phpbb::$db->sql_query($sql);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		if ($row['topic_status'] == ITEM_MOVED)
-		{
-			$shadow_topic_list[$row['topic_moved_id']] = $row['topic_id'];
-		}
-
-		$rowset[$row['topic_id']] = $row;
-	}
-	phpbb::$db->sql_freeresult($result);
-}
-
-// If we have some shadow topics, update the rowset to reflect their topic information
-if (sizeof($shadow_topic_list))
-{
-	$sql = 'SELECT *
-		FROM ' . TOPICS_TABLE . '
-		WHERE ' . phpbb::$db->sql_in_set('topic_id', array_keys($shadow_topic_list));
-	$result = phpbb::$db->sql_query($sql);
-
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$orig_topic_id = $shadow_topic_list[$row['topic_id']];
-
-		// If the shadow topic is already listed within the rowset (happens for active topics for example), then do not include it...
-		if (isset($rowset[$row['topic_id']]))
-		{
-			// We need to remove any trace regarding this topic. :)
-			unset($rowset[$orig_topic_id]);
-			unset($topic_list[array_search($orig_topic_id, $topic_list)]);
-			$topics_count--;
-
-			continue;
-		}
-
-		// Do not include those topics the user has no permission to access
-		if (!phpbb::$acl->acl_get('f_read', $row['forum_id']))
-		{
-			// We need to remove any trace regarding this topic. :)
-			unset($rowset[$orig_topic_id]);
-			unset($topic_list[array_search($orig_topic_id, $topic_list)]);
-			$topics_count--;
-
-			continue;
-		}
-
-		// We want to retain some values
-		$row = array_merge($row, array(
-			'topic_moved_id'	=> $rowset[$orig_topic_id]['topic_moved_id'],
-			'topic_status'		=> $rowset[$orig_topic_id]['topic_status'],
-			'topic_type'		=> $rowset[$orig_topic_id]['topic_type'],
-		));
-
-		// Shadow topics are never reported
-		$row['topic_reported'] = 0;
-
-		$rowset[$orig_topic_id] = $row;
-	}
-	phpbb::$db->sql_freeresult($result);
-}
-unset($shadow_topic_list);
-
-// Ok, adjust topics count for active topics list
-if ($s_display_active)
-{
-	$topics_count = 1;
-}
-
-phpbb::$template->assign_vars(array(
-	'PAGINATION'	=> generate_pagination(append_sid('viewforum', "f=$forum_id" . ((strlen($u_sort_param)) ? "&amp;$u_sort_param" : '')), $topics_count, phpbb::$config['topics_per_page'], $start),
-	'PAGE_NUMBER'	=> on_page($topics_count, phpbb::$config['topics_per_page'], $start),
-	'TOTAL_TOPICS'	=> ($s_display_active) ? false : (($topics_count == 1) ? phpbb::$user->lang['VIEW_FORUM_TOPIC'] : sprintf(phpbb::$user->lang['VIEW_FORUM_TOPICS'], $topics_count)),
-));
-
-$topic_list = ($store_reverse) ? array_merge($announcement_list, array_reverse($topic_list)) : array_merge($announcement_list, $topic_list);
-$topic_tracking_info = $tracking_topics = array();
-
-// Okay, lets dump out the page ...
-if (sizeof($topic_list))
-{
-	$mark_forum_read = true;
-	$mark_time_forum = 0;
-
-	// Active topics?
-	if ($s_display_active && sizeof($active_forum_ary))
-	{
-		// Generate topic forum list...
-		$topic_forum_list = array();
-		foreach ($rowset as $t_id => $row)
-		{
-			$topic_forum_list[$row['forum_id']]['forum_mark_time'] = (phpbb::$config['load_db_lastread'] && phpbb::$user->is_registered && isset($row['forum_mark_time'])) ? $row['forum_mark_time'] : 0;
-			$topic_forum_list[$row['forum_id']]['topics'][] = $t_id;
-		}
-
-		if (phpbb::$config['load_db_lastread'] && phpbb::$user->is_registered)
-		{
-			foreach ($topic_forum_list as $f_id => $topic_row)
-			{
-				$topic_tracking_info += get_topic_tracking($f_id, $topic_row['topics'], $rowset, array($f_id => $topic_row['forum_mark_time']), false);
-			}
-		}
-		else if (phpbb::$config['load_anon_lastread'] || phpbb::$user->is_registered)
-		{
-			foreach ($topic_forum_list as $f_id => $topic_row)
-			{
-				$topic_tracking_info += get_complete_topic_tracking($f_id, $topic_row['topics'], false);
-			}
-		}
-
-		unset($topic_forum_list);
-	}
-	else
-	{
-		if (phpbb::$config['load_db_lastread'] && phpbb::$user->is_registered)
-		{
-			$topic_tracking_info = get_topic_tracking($forum_id, $topic_list, $rowset, array($forum_id => $forum_data['mark_time']), $global_announce_list);
-			$mark_time_forum = (!empty($forum_data['mark_time'])) ? $forum_data['mark_time'] : phpbb::$user->data['user_lastmark'];
-		}
-		else if (phpbb::$config['load_anon_lastread'] || phpbb::$user->is_registered)
-		{
-			$topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_list, $global_announce_list);
-
-			if (!phpbb::$user->is_registered)
-			{
-				phpbb::$user->data['user_lastmark'] = (isset($tracking_topics['l'])) ? (int) (base_convert($tracking_topics['l'], 36, 10) + phpbb::$config['board_startdate']) : 0;
-			}
-			$mark_time_forum = (isset($tracking_topics['f'][$forum_id])) ? (int) (base_convert($tracking_topics['f'][$forum_id], 36, 10) + phpbb::$config['board_startdate']) : phpbb::$user->data['user_lastmark'];
-		}
-	}
-
-	$s_type_switch = 0;
-	foreach ($topic_list as $topic_id)
-	{
-		$row = &$rowset[$topic_id];
-
-		// This will allow the style designer to output a different header
-		// or even separate the list of announcements from sticky and normal topics
-		$s_type_switch_test = ($row['topic_type'] == POST_ANNOUNCE || $row['topic_type'] == POST_GLOBAL) ? 1 : 0;
-
-		// Replies
-		$replies = (phpbb::$acl->acl_get('m_approve', $forum_id)) ? $row['topic_replies_real'] : $row['topic_replies'];
-
-		if ($row['topic_status'] == ITEM_MOVED)
-		{
-			$topic_id = $row['topic_moved_id'];
-			$unread_topic = false;
-		}
-		else
-		{
-			$unread_topic = (isset($topic_tracking_info[$topic_id]) && $row['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false;
-		}
-
-		// Get folder img, topic status/type related information
-		$folder_img = $folder_alt = $topic_type = '';
-		topic_status($row, $replies, $unread_topic, $folder_img, $folder_alt, $topic_type);
-
-		// Generate all the URIs ...
-		$view_topic_url_params = 'f=' . (($row['forum_id']) ? $row['forum_id'] : $forum_id) . '&amp;t=' . $topic_id;
-		$view_topic_url = append_sid('viewtopic', $view_topic_url_params);
-
-		$topic_unapproved = (!$row['topic_approved'] && phpbb::$acl->acl_get('m_approve', $forum_id)) ? true : false;
-		$posts_unapproved = ($row['topic_approved'] && $row['topic_replies'] < $row['topic_replies_real'] && phpbb::$acl->acl_get('m_approve', $forum_id)) ? true : false;
-		$u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? append_sid('mcp', 'i=queue&amp;mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . "&amp;t=$topic_id", true, phpbb::$user->session_id) : '';
-
-		// Send vars to template
-		phpbb::$template->assign_block_vars('topicrow', array(
-			'FORUM_ID'					=> $forum_id,
-			'TOPIC_ID'					=> $topic_id,
-			'TOPIC_AUTHOR'				=> get_username_string('username', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
-			'TOPIC_AUTHOR_COLOUR'		=> get_username_string('colour', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
-			'TOPIC_AUTHOR_FULL'			=> get_username_string('full', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
-			'FIRST_POST_TIME'			=> phpbb::$user->format_date($row['topic_time']),
-			'LAST_POST_SUBJECT'			=> censor_text($row['topic_last_post_subject']),
-			'LAST_POST_TIME'			=> phpbb::$user->format_date($row['topic_last_post_time']),
-			'LAST_VIEW_TIME'			=> phpbb::$user->format_date($row['topic_last_view_time']),
-			'LAST_POST_AUTHOR'			=> get_username_string('username', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
-			'LAST_POST_AUTHOR_COLOUR'	=> get_username_string('colour', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
-			'LAST_POST_AUTHOR_FULL'		=> get_username_string('full', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
-
-			'PAGINATION'		=> topic_generate_pagination($replies, $view_topic_url),
-			'REPLIES'			=> $replies,
-			'VIEWS'				=> $row['topic_views'],
-			'TOPIC_TITLE'		=> censor_text($row['topic_title']),
-			'TOPIC_TYPE'		=> $topic_type,
-
-			'TOPIC_FOLDER_IMG'		=> phpbb::$user->img($folder_img, $folder_alt),
-			'TOPIC_FOLDER_IMG_SRC'	=> phpbb::$user->img($folder_img, $folder_alt, 'src'),
-			'TOPIC_FOLDER_IMG_ALT'	=> phpbb::$user->lang[$folder_alt],
-			'TOPIC_FOLDER_IMG_WIDTH'=> phpbb::$user->img($folder_img, '', 'width'),
-			'TOPIC_FOLDER_IMG_HEIGHT'	=> phpbb::$user->img($folder_img, '', 'height'),
-
-			'TOPIC_ICON_IMG'		=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['img'] : '',
-			'TOPIC_ICON_IMG_WIDTH'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '',
-			'TOPIC_ICON_IMG_HEIGHT'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['height'] : '',
-			'ATTACH_ICON_IMG'		=> (phpbb::$acl->acl_get('u_download') && phpbb::$acl->acl_get('f_download', $forum_id) && $row['topic_attachment']) ? phpbb::$user->img('icon_topic_attach', 'TOTAL_ATTACHMENTS') : '',
-			'UNAPPROVED_IMG'		=> ($topic_unapproved || $posts_unapproved) ? phpbb::$user->img('icon_topic_unapproved', ($topic_unapproved) ? 'TOPIC_UNAPPROVED' : 'POSTS_UNAPPROVED') : '',
-
-			'S_TOPIC_TYPE'			=> $row['topic_type'],
-			'S_USER_POSTED'			=> (isset($row['topic_posted']) && $row['topic_posted']) ? true : false,
-			'S_UNREAD_TOPIC'		=> $unread_topic,
-			'S_TOPIC_REPORTED'		=> (!empty($row['topic_reported']) && phpbb::$acl->acl_get('m_report', $forum_id)) ? true : false,
-			'S_TOPIC_UNAPPROVED'	=> $topic_unapproved,
-			'S_POSTS_UNAPPROVED'	=> $posts_unapproved,
-			'S_HAS_POLL'			=> ($row['poll_start']) ? true : false,
-			'S_POST_ANNOUNCE'		=> ($row['topic_type'] == POST_ANNOUNCE) ? true : false,
-			'S_POST_GLOBAL'			=> ($row['topic_type'] == POST_GLOBAL) ? true : false,
-			'S_POST_STICKY'			=> ($row['topic_type'] == POST_STICKY) ? true : false,
-			'S_TOPIC_LOCKED'		=> ($row['topic_status'] == ITEM_LOCKED) ? true : false,
-			'S_TOPIC_MOVED'			=> ($row['topic_status'] == ITEM_MOVED) ? true : false,
-
-			'U_NEWEST_POST'			=> append_sid('viewtopic', $view_topic_url_params . '&amp;view=unread') . '#unread',
-			'U_LAST_POST'			=> append_sid('viewtopic', $view_topic_url_params . '&amp;p=' . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'],
-			'U_LAST_POST_AUTHOR'	=> get_username_string('profile', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
-			'U_TOPIC_AUTHOR'		=> get_username_string('profile', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
-			'U_VIEW_TOPIC'			=> $view_topic_url,
-			'U_MCP_REPORT'			=> append_sid('mcp', 'i=reports&amp;mode=reports&amp;f=' . $forum_id . '&amp;t=' . $topic_id, true, phpbb::$user->session_id),
-			'U_MCP_QUEUE'			=> $u_mcp_queue,
-
-			'S_TOPIC_TYPE_SWITCH'	=> ($s_type_switch == $s_type_switch_test) ? -1 : $s_type_switch_test,
-		));
-
-		$s_type_switch = ($row['topic_type'] == POST_ANNOUNCE || $row['topic_type'] == POST_GLOBAL) ? 1 : 0;
-
-		if ($unread_topic)
-		{
-			$mark_forum_read = false;
-		}
-
-		unset($rowset[$topic_id]);
-	}
-}
-
-// This is rather a fudge but it's the best I can think of without requiring information
-// on all topics (as we do in 2.0.x). It looks for unread or new topics, if it doesn't find
-// any it updates the forum last read cookie. This requires that the user visit the forum
-// after reading a topic
-if ($forum_data['forum_type'] == FORUM_POST && sizeof($topic_list) && $mark_forum_read)
-{
-	update_forum_tracking_info($forum_id, $forum_data['forum_last_post_time'], false, $mark_time_forum);
-}
-
-page_footer();
-
-?>
-\ No newline at end of file
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php
deleted file mode 100644
index 5d0192dd13..0000000000
--- a/phpBB/viewonline.php
+++ /dev/null
@@ -1,445 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-define('IN_PHPBB', true);
-if (!defined('PHPBB_ROOT_PATH')) define('PHPBB_ROOT_PATH', './');
-if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-include(PHPBB_ROOT_PATH . 'common.' . PHP_EXT);
-
-// Start session management
-phpbb::$user->session_begin();
-phpbb::$acl->init(phpbb::$user->data);
-phpbb::$user->setup('memberlist');
-
-// Get and set some variables
-$mode		= request_var('mode', '');
-$session_id	= request_var('s', '');
-$start		= request_var('start', 0);
-$sort_key	= request_var('sk', 'b');
-$sort_dir	= request_var('sd', 'd');
-$show_guests= (phpbb::$config['load_online_guests']) ? request_var('sg', 0) : 0;
-
-// Can this user view profiles/memberlist?
-if (!phpbb::$acl->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel'))
-{
-	if (!phpbb::$user->is_guest)
-	{
-		trigger_error('NO_VIEW_USERS');
-	}
-
-	login_box('', phpbb::$user->lang['LOGIN_EXPLAIN_VIEWONLINE']);
-}
-
-$sort_key_text = array('a' => phpbb::$user->lang['SORT_USERNAME'], 'b' => phpbb::$user->lang['SORT_JOINED'], 'c' => phpbb::$user->lang['SORT_LOCATION']);
-$sort_key_sql = array('a' => 'u.username_clean', 'b' => 's.session_time', 'c' => 's.session_page');
-
-// Sorting and order
-if (!isset($sort_key_text[$sort_key]))
-{
-	$sort_key = 'b';
-}
-
-$order_by = $sort_key_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC');
-
-// Whois requested
-if ($mode == 'whois' && phpbb::$acl->acl_get('a_') && $session_id)
-{
-	include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT);
-
-	$sql = 'SELECT u.user_id, u.username, u.user_type, s.session_ip
-		FROM ' . USERS_TABLE . ' u, ' . SESSIONS_TABLE . " s
-		WHERE s.session_id = '" . phpbb::$db->sql_escape($session_id) . "'
-			AND	u.user_id = s.session_user_id";
-	$result = phpbb::$db->sql_query($sql);
-
-	if ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		phpbb::$template->assign_var('WHOIS', user_ipwhois($row['session_ip']));
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	// Output the page
-	page_header(phpbb::$user->lang['WHO_IS_ONLINE']);
-
-	phpbb::$template->set_filenames(array(
-		'body' => 'viewonline_whois.html',
-	));
-	make_jumpbox(append_sid('viewforum'));
-
-	page_footer();
-}
-
-// Forum info
-$sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id
-	FROM ' . FORUMS_TABLE . '
-	ORDER BY left_id ASC';
-$result = phpbb::$db->sql_query($sql, 600);
-
-$forum_data = array();
-while ($row = phpbb::$db->sql_fetchrow($result))
-{
-	$forum_data[$row['forum_id']] = $row;
-}
-phpbb::$db->sql_freeresult($result);
-
-$guest_counter = 0;
-
-// Get number of online guests (if we do not display them)
-if (!$show_guests)
-{
-	if (phpbb::$db->features['count_distinct'])
-	{
-		$sql = 'SELECT COUNT(DISTINCT session_ip) as num_guests
-				FROM ' . SESSIONS_TABLE . '
-				WHERE session_user_id = ' . ANONYMOUS . '
-					AND session_time >= ' . (time() - (phpbb::$config['load_online_time'] * 60));
-	}
-	else
-	{
-		$sql = 'SELECT COUNT(session_ip) as num_guests
-			FROM (
-				SELECT DISTINCT session_ip
-					FROM ' . SESSIONS_TABLE . '
-					WHERE session_user_id = ' . ANONYMOUS . '
-						AND session_time >= ' . (time() - (phpbb::$config['load_online_time'] * 60)) .
-			')';
-		break;
-	}
-	$result = phpbb::$db->sql_query($sql);
-	$guest_counter = (int) phpbb::$db->sql_fetchfield('num_guests');
-	phpbb::$db->sql_freeresult($result);
-}
-
-// Get user list
-$sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_type, u.user_colour, s.session_id, s.session_time, s.session_page, s.session_ip, s.session_browser, s.session_viewonline
-	FROM ' . USERS_TABLE . ' u, ' . SESSIONS_TABLE . ' s
-	WHERE u.user_id = s.session_user_id
-		AND s.session_time >= ' . (time() - (phpbb::$config['load_online_time'] * 60)) .
-		((!$show_guests) ? ' AND s.session_user_id <> ' . ANONYMOUS : '') . '
-	ORDER BY ' . $order_by;
-$result = phpbb::$db->sql_query($sql);
-
-$prev_id = $prev_ip = $user_list = array();
-$logged_visible_online = $logged_hidden_online = $counter = 0;
-
-while ($row = phpbb::$db->sql_fetchrow($result))
-{
-	if ($row['user_id'] != ANONYMOUS && !isset($prev_id[$row['user_id']]))
-	{
-		$view_online = $s_user_hidden = false;
-		$user_colour = ($row['user_colour']) ? ' style="color:#' . $row['user_colour'] . '" class="username-coloured"' : '';
-
-		$username_full = ($row['user_type'] != phpbb::USER_IGNORE) ? get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']) : '<span' . $user_colour . '>' . $row['username'] . '</span>';
-
-		if (!$row['session_viewonline'])
-		{
-			$view_online = (phpbb::$acl->acl_get('u_viewonline')) ? true : false;
-			$logged_hidden_online++;
-
-			$username_full = '<em>' . $username_full . '</em>';
-			$s_user_hidden = true;
-		}
-		else
-		{
-			$view_online = true;
-			$logged_visible_online++;
-		}
-
-		$prev_id[$row['user_id']] = 1;
-
-		if ($view_online)
-		{
-			$counter++;
-		}
-
-		if (!$view_online || $counter > $start + phpbb::$config['topics_per_page'] || $counter <= $start)
-		{
-			continue;
-		}
-	}
-	else if ($show_guests && $row['user_id'] == ANONYMOUS && !isset($prev_ip[$row['session_ip']]))
-	{
-		$prev_ip[$row['session_ip']] = 1;
-		$guest_counter++;
-		$counter++;
-
-		if ($counter > $start + phpbb::$config['topics_per_page'] || $counter <= $start)
-		{
-			continue;
-		}
-
-		$s_user_hidden = false;
-		$username_full = get_username_string('full', $row['user_id'], phpbb::$user->lang['GUEST']);
-	}
-	else
-	{
-		continue;
-	}
-
-	preg_match('#^([a-z/_]+)#i', $row['session_page'], $on_page);
-	if (!sizeof($on_page))
-	{
-		$on_page[1] = '';
-	}
-
-	switch ($on_page[1])
-	{
-		case 'index':
-			$location = phpbb::$user->lang['INDEX'];
-			$location_url = append_sid('index');
-		break;
-
-		case 'adm/index':
-			$location = phpbb::$user->lang['ACP'];
-			$location_url = append_sid('index');
-		break;
-
-		case 'posting':
-		case 'viewforum':
-		case 'viewtopic':
-			preg_match('#_f_=([0-9]+)x#i', $row['session_page'], $forum_id);
-			$forum_id = (sizeof($forum_id)) ? (int) $forum_id[1] : 0;
-
-			if ($forum_id && phpbb::$acl->acl_get('f_list', $forum_id))
-			{
-				$location = '';
-				$location_url = append_sid('viewforum', 'f=' . $forum_id);
-
-				if ($forum_data[$forum_id]['forum_type'] == FORUM_LINK)
-				{
-					$location = sprintf(phpbb::$user->lang['READING_LINK'], $forum_data[$forum_id]['forum_name']);
-					break;
-				}
-
-				switch ($on_page[1])
-				{
-					case 'posting':
-						preg_match('#mode=([a-z]+)#', $row['session_page'], $on_page);
-						$posting_mode = (!empty($on_page[1])) ? $on_page[1] : '';
-
-						switch ($posting_mode)
-						{
-							case 'reply':
-							case 'quote':
-								$location = sprintf(phpbb::$user->lang['REPLYING_MESSAGE'], $forum_data[$forum_id]['forum_name']);
-							break;
-
-							default:
-								$location = sprintf(phpbb::$user->lang['POSTING_MESSAGE'], $forum_data[$forum_id]['forum_name']);
-							break;
-						}
-					break;
-
-					case 'viewtopic':
-						$location = sprintf(phpbb::$user->lang['READING_TOPIC'], $forum_data[$forum_id]['forum_name']);
-					break;
-
-					case 'viewforum':
-						$location = sprintf(phpbb::$user->lang['READING_FORUM'], $forum_data[$forum_id]['forum_name']);
-					break;
-				}
-			}
-			else
-			{
-				$location = phpbb::$user->lang['INDEX'];
-				$location_url = append_sid('index');
-			}
-		break;
-
-		case 'search':
-			$location = phpbb::$user->lang['SEARCHING_FORUMS'];
-			$location_url = append_sid('search');
-		break;
-
-		case 'faq':
-			$location = phpbb::$user->lang['VIEWING_FAQ'];
-			$location_url = append_sid('faq');
-		break;
-
-		case 'viewonline':
-			$location = phpbb::$user->lang['VIEWING_ONLINE'];
-			$location_url = append_sid('viewonline');
-		break;
-
-		case 'memberlist':
-			$location = (strpos($row['session_page'], 'mode=viewprofile') !== false) ? phpbb::$user->lang['VIEWING_MEMBER_PROFILE'] : phpbb::$user->lang['VIEWING_MEMBERS'];
-			$location_url = append_sid('memberlist');
-		break;
-
-		case 'mcp':
-			$location = phpbb::$user->lang['VIEWING_MCP'];
-			$location_url = append_sid('index');
-		break;
-
-		case 'ucp':
-			$location = phpbb::$user->lang['VIEWING_UCP'];
-
-			// Grab some common modules
-			$url_params = array(
-				'mode=register'		=> 'VIEWING_REGISTER',
-				'i=pm&mode=compose'	=> 'POSTING_PRIVATE_MESSAGE',
-				'i=pm&'				=> 'VIEWING_PRIVATE_MESSAGES',
-				'i=profile&'		=> 'CHANGING_PROFILE',
-				'i=prefs&'			=> 'CHANGING_PREFERENCES',
-			);
-
-			foreach ($url_params as $param => $lang)
-			{
-				if (strpos($row['session_page'], $param) !== false)
-				{
-					$location = phpbb::$user->lang[$lang];
-					break;
-				}
-			}
-
-			$location_url = append_sid('index');
-		break;
-
-		case 'download/file':
-			$location = phpbb::$user->lang['DOWNLOADING_FILE'];
-			$location_url = append_sid('index');
-		break;
-
-		case 'report':
-			$location = phpbb::$user->lang['REPORTING_POST'];
-			$location_url = append_sid('index');
-		break;
-
-		default:
-			$location = phpbb::$user->lang['INDEX'];
-			$location_url = append_sid('index');
-		break;
-	}
-
-	phpbb::$template->assign_block_vars('user_row', array(
-		'USERNAME' 			=> $row['username'],
-		'USERNAME_COLOUR'	=> $row['user_colour'],
-		'USERNAME_FULL'		=> $username_full,
-		'LASTUPDATE'		=> phpbb::$user->format_date($row['session_time']),
-		'FORUM_LOCATION'	=> $location,
-		'USER_IP'			=> (phpbb::$acl->acl_get('a_')) ? (($mode == 'lookup' && $session_id == $row['session_id']) ? gethostbyaddr($row['session_ip']) : $row['session_ip']) : '',
-		'USER_BROWSER'		=> (phpbb::$acl->acl_get('a_user')) ? $row['session_browser'] : '',
-
-		'U_USER_PROFILE'	=> ($row['user_type'] != phpbb::USER_IGNORE) ? get_username_string('profile', $row['user_id'], '') : '',
-		'U_USER_IP'			=> append_sid('viewonline', 'mode=lookup' . (($mode != 'lookup' || $row['session_id'] != $session_id) ? '&amp;s=' . $row['session_id'] : '') . "&amp;sg=$show_guests&amp;start=$start&amp;sk=$sort_key&amp;sd=$sort_dir"),
-		'U_WHOIS'			=> append_sid('viewonline', 'mode=whois&amp;s=' . $row['session_id']),
-		'U_FORUM_LOCATION'	=> $location_url,
-
-		'S_USER_HIDDEN'		=> $s_user_hidden,
-		'S_GUEST'			=> ($row['user_id'] == ANONYMOUS) ? true : false,
-		'S_USER_TYPE'		=> $row['user_type'],
-	));
-}
-phpbb::$db->sql_freeresult($result);
-unset($prev_id, $prev_ip);
-
-// Generate reg/hidden/guest online text
-$vars_online = array(
-	'REG'	=> array('logged_visible_online', 'l_r_user_s'),
-	'HIDDEN'=> array('logged_hidden_online', 'l_h_user_s'),
-	'GUEST'	=> array('guest_counter', 'l_g_user_s')
-);
-
-foreach ($vars_online as $l_prefix => $var_ary)
-{
-	switch ($$var_ary[0])
-	{
-		case 0:
-			$$var_ary[1] = phpbb::$user->lang[$l_prefix . '_USERS_ZERO_ONLINE'];
-		break;
-
-		case 1:
-			$$var_ary[1] = phpbb::$user->lang[$l_prefix . '_USER_ONLINE'];
-		break;
-
-		default:
-			$$var_ary[1] = phpbb::$user->lang[$l_prefix . '_USERS_ONLINE'];
-		break;
-	}
-}
-unset($vars_online);
-
-$pagination = generate_pagination(append_sid('viewonline', "sg=$show_guests&amp;sk=$sort_key&amp;sd=$sort_dir"), $counter, phpbb::$config['topics_per_page'], $start);
-
-// Grab group details for legend display
-if (phpbb::$acl->acl_gets('a_group', 'a_groupadd', 'a_groupdel'))
-{
-	$sql = 'SELECT group_id, group_name, group_colour, group_type
-		FROM ' . GROUPS_TABLE . '
-		WHERE group_legend = 1
-		ORDER BY group_name ASC';
-}
-else
-{
-	$sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_type
-		FROM ' . GROUPS_TABLE . ' g
-		LEFT JOIN ' . USER_GROUP_TABLE . ' ug
-			ON (
-				g.group_id = ug.group_id
-				AND ug.user_id = ' . phpbb::$user->data['user_id'] . '
-				AND ug.user_pending = 0
-			)
-		WHERE g.group_legend = 1
-			AND (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . phpbb::$user->data['user_id'] . ')
-		ORDER BY g.group_name ASC';
-}
-$result = phpbb::$db->sql_query($sql);
-
-$legend = '';
-while ($row = phpbb::$db->sql_fetchrow($result))
-{
-	if ($row['group_name'] == 'BOTS')
-	{
-		$legend .= (($legend != '') ? ', ' : '') . '<span style="color:#' . $row['group_colour'] . '">' . phpbb::$user->lang['G_BOTS'] . '</span>';
-	}
-	else
-	{
-		$legend .= (($legend != '') ? ', ' : '') . '<a style="color:#' . $row['group_colour'] . '" href="' . append_sid('memberlist', 'mode=group&amp;g=' . $row['group_id']) . '">' . (($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name']) . '</a>';
-	}
-}
-phpbb::$db->sql_freeresult($result);
-
-// Refreshing the page every 60 seconds...
-meta_refresh(60, append_sid('viewonline', "sg=$show_guests&amp;sk=$sort_key&amp;sd=$sort_dir&amp;start=$start"));
-
-// Send data to template
-phpbb::$template->assign_vars(array(
-	'TOTAL_REGISTERED_USERS_ONLINE'	=> sprintf($l_r_user_s, $logged_visible_online) . sprintf($l_h_user_s, $logged_hidden_online),
-	'TOTAL_GUEST_USERS_ONLINE'		=> sprintf($l_g_user_s, $guest_counter),
-	'LEGEND'						=> $legend,
-	'PAGINATION'					=> $pagination,
-	'PAGE_NUMBER'					=> on_page($counter, phpbb::$config['topics_per_page'], $start),
-
-	'U_SORT_USERNAME'		=> append_sid('viewonline', 'sk=a&amp;sd=' . (($sort_key == 'a' && $sort_dir == 'a') ? 'd' : 'a') . '&amp;sg=' . ((int) $show_guests)),
-	'U_SORT_UPDATED'		=> append_sid('viewonline', 'sk=b&amp;sd=' . (($sort_key == 'b' && $sort_dir == 'a') ? 'd' : 'a') . '&amp;sg=' . ((int) $show_guests)),
-	'U_SORT_LOCATION'		=> append_sid('viewonline', 'sk=c&amp;sd=' . (($sort_key == 'c' && $sort_dir == 'a') ? 'd' : 'a') . '&amp;sg=' . ((int) $show_guests)),
-
-	'U_SWITCH_GUEST_DISPLAY'	=> append_sid('viewonline', 'sg=' . ((int) !$show_guests)),
-	'L_SWITCH_GUEST_DISPLAY'	=> ($show_guests) ? phpbb::$user->lang['HIDE_GUESTS'] : phpbb::$user->lang['DISPLAY_GUESTS'],
-	'S_SWITCH_GUEST_DISPLAY'	=> (phpbb::$config['load_online_guests']) ? true : false,
-));
-
-// We do not need to load the who is online box here. ;)
-phpbb::$config['load_online'] = false;
-
-// Output the page
-page_header(phpbb::$user->lang['WHO_IS_ONLINE']);
-
-phpbb::$template->set_filenames(array(
-	'body' => 'viewonline_body.html',
-));
-make_jumpbox(append_sid('viewforum'));
-
-page_footer();
-
-?>
-\ No newline at end of file
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
deleted file mode 100644
index e66e1a7021..0000000000
--- a/phpBB/viewtopic.php
+++ /dev/null
@@ -1,1606 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-define('IN_PHPBB', true);
-if (!defined('PHPBB_ROOT_PATH')) define('PHPBB_ROOT_PATH', './');
-if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
-include(PHPBB_ROOT_PATH . 'common.' . PHP_EXT);
-include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
-include(PHPBB_ROOT_PATH . 'includes/bbcode.' . PHP_EXT);
-
-// Start session management
-phpbb::$user->session_begin();
-phpbb::$acl->init(phpbb::$user->data);
-
-// Initial var setup
-$forum_id	= request_var('f', 0);
-$topic_id	= request_var('t', 0);
-$post_id	= request_var('p', 0);
-$voted_id	= request_var('vote_id', array('' => 0));
-
-$start		= request_var('start', 0);
-$view		= request_var('view', '');
-
-$default_sort_days	= (!empty(phpbb::$user->data['user_post_show_days'])) ? phpbb::$user->data['user_post_show_days'] : 0;
-$default_sort_key	= (!empty(phpbb::$user->data['user_post_sortby_type'])) ? phpbb::$user->data['user_post_sortby_type'] : 't';
-$default_sort_dir	= (!empty(phpbb::$user->data['user_post_sortby_dir'])) ? phpbb::$user->data['user_post_sortby_dir'] : 'a';
-
-$sort_days	= request_var('st', $default_sort_days);
-$sort_key	= request_var('sk', $default_sort_key);
-$sort_dir	= request_var('sd', $default_sort_dir);
-
-$update		= request_var('update', false);
-
-/**
-* @todo normalize?
-*/
-$hilit_words	= request_var('hilit', '', true);
-
-// Do we have a topic or post id?
-if (!$topic_id && !$post_id)
-{
-	trigger_error('NO_TOPIC');
-}
-
-// Find topic id if user requested a newer or older topic
-if ($view && !$post_id)
-{
-	if (!$forum_id)
-	{
-		$sql = 'SELECT forum_id
-			FROM ' . TOPICS_TABLE . "
-			WHERE topic_id = $topic_id";
-		$result = phpbb::$db->sql_query($sql);
-		$forum_id = (int) phpbb::$db->sql_fetchfield('forum_id');
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$forum_id)
-		{
-			trigger_error('NO_TOPIC');
-		}
-	}
-
-	if ($view == 'unread')
-	{
-		// Get topic tracking info
-		$topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_id);
-
-		$topic_last_read = (isset($topic_tracking_info[$topic_id])) ? $topic_tracking_info[$topic_id] : 0;
-
-		$sql = 'SELECT post_id, topic_id, forum_id
-			FROM ' . POSTS_TABLE . "
-			WHERE topic_id = $topic_id
-				" . ((phpbb::$acl->acl_get('m_approve', $forum_id)) ? '' : 'AND post_approved = 1') . "
-				AND post_time > $topic_last_read
-			ORDER BY post_time ASC";
-		$result = phpbb::$db->sql_query_limit($sql, 1);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$row)
-		{
-			$sql = 'SELECT topic_last_post_id as post_id, topic_id, forum_id
-				FROM ' . TOPICS_TABLE . '
-				WHERE topic_id = ' . $topic_id;
-			$result = phpbb::$db->sql_query($sql);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		if (!$row)
-		{
-			// Setup user environment so we can process lang string
-			phpbb::$user->setup('viewtopic');
-
-			trigger_error('NO_TOPIC');
-		}
-
-		$post_id = $row['post_id'];
-		$topic_id = $row['topic_id'];
-	}
-	else if ($view == 'next' || $view == 'previous')
-	{
-		$sql_condition = ($view == 'next') ? '>' : '<';
-		$sql_ordering = ($view == 'next') ? 'ASC' : 'DESC';
-
-		$sql = 'SELECT forum_id, topic_last_post_time
-			FROM ' . TOPICS_TABLE . '
-			WHERE topic_id = ' . $topic_id;
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$row)
-		{
-			phpbb::$user->setup('viewtopic');
-			// OK, the topic doesn't exist. This error message is not helpful, but technically correct.
-			trigger_error(($view == 'next') ? 'NO_NEWER_TOPICS' : 'NO_OLDER_TOPICS');
-		}
-		else
-		{
-			$sql = 'SELECT topic_id, forum_id
-				FROM ' . TOPICS_TABLE . '
-				WHERE forum_id = ' . $row['forum_id'] . "
-					AND topic_moved_id = 0
-					AND topic_last_post_time $sql_condition {$row['topic_last_post_time']}
-					" . ((phpbb::$acl->acl_get('m_approve', $row['forum_id'])) ? '' : 'AND topic_approved = 1') . "
-				ORDER BY topic_last_post_time $sql_ordering";
-			$result = phpbb::$db->sql_query_limit($sql, 1);
-			$row = phpbb::$db->sql_fetchrow($result);
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$row)
-			{
-				phpbb::$user->setup('viewtopic');
-				trigger_error(($view == 'next') ? 'NO_NEWER_TOPICS' : 'NO_OLDER_TOPICS');
-			}
-			else
-			{
-				$topic_id = $row['topic_id'];
-
-				// Check for global announcement correctness?
-				if (!$row['forum_id'] && !$forum_id)
-				{
-					trigger_error('NO_TOPIC');
-				}
-				else if ($row['forum_id'])
-				{
-					$forum_id = $row['forum_id'];
-				}
-			}
-		}
-	}
-
-	// Check for global announcement correctness?
-	if ((!isset($row) || !$row['forum_id']) && !$forum_id)
-	{
-		trigger_error('NO_TOPIC');
-	}
-	else if (isset($row) && $row['forum_id'])
-	{
-		$forum_id = $row['forum_id'];
-	}
-}
-
-// This rather complex gaggle of code handles querying for topics but
-// also allows for direct linking to a post (and the calculation of which
-// page the post is on and the correct display of viewtopic)
-$sql_array = array(
-	'SELECT'	=> 't.*, f.*',
-
-	'FROM'		=> array(FORUMS_TABLE => 'f'),
-);
-
-// The FROM-Order is quite important here, else t.* columns can not be correctly bound.
-if ($post_id)
-{
-	$sql_array['FROM'][POSTS_TABLE] = 'p';
-}
-
-// Topics table need to be the last in the chain
-$sql_array['FROM'][TOPICS_TABLE] = 't';
-
-if (phpbb::$user->is_registered)
-{
-	$sql_array['SELECT'] .= ', tw.notify_status';
-	$sql_array['LEFT_JOIN'] = array();
-
-	$sql_array['LEFT_JOIN'][] = array(
-		'FROM'	=> array(TOPICS_WATCH_TABLE => 'tw'),
-		'ON'	=> 'tw.user_id = ' . phpbb::$user->data['user_id'] . ' AND t.topic_id = tw.topic_id'
-	);
-
-	if (phpbb::$config['allow_bookmarks'])
-	{
-		$sql_array['SELECT'] .= ', bm.topic_id as bookmarked';
-		$sql_array['LEFT_JOIN'][] = array(
-			'FROM'	=> array(BOOKMARKS_TABLE => 'bm'),
-			'ON'	=> 'bm.user_id = ' . phpbb::$user->data['user_id'] . ' AND t.topic_id = bm.topic_id'
-		);
-	}
-
-	if (phpbb::$config['load_db_lastread'])
-	{
-		$sql_array['SELECT'] .= ', tt.mark_time, ft.mark_time as forum_mark_time';
-
-		$sql_array['LEFT_JOIN'][] = array(
-			'FROM'	=> array(TOPICS_TRACK_TABLE => 'tt'),
-			'ON'	=> 'tt.user_id = ' . phpbb::$user->data['user_id'] . ' AND t.topic_id = tt.topic_id'
-		);
-
-		$sql_array['LEFT_JOIN'][] = array(
-			'FROM'	=> array(FORUMS_TRACK_TABLE => 'ft'),
-			'ON'	=> 'ft.user_id = ' . phpbb::$user->data['user_id'] . ' AND t.forum_id = ft.forum_id'
-		);
-	}
-}
-
-if (!$post_id)
-{
-	$sql_array['WHERE'] = "t.topic_id = $topic_id";
-}
-else
-{
-	$sql_array['WHERE'] = "p.post_id = $post_id AND t.topic_id = p.topic_id" . ((!phpbb::$acl->acl_get('m_approve', $forum_id)) ? ' AND p.post_approved = 1' : '');
-}
-
-$sql_array['WHERE'] .= ' AND (f.forum_id = t.forum_id';
-
-if (!$forum_id)
-{
-	// If it is a global announcement make sure to set the forum id to a postable forum
-	$sql_array['WHERE'] .= ' OR (t.topic_type = ' . POST_GLOBAL . '
-		AND f.forum_type = ' . FORUM_POST . ')';
-}
-else
-{
-	$sql_array['WHERE'] .= ' OR (t.topic_type = ' . POST_GLOBAL . "
-		AND f.forum_id = $forum_id)";
-}
-
-$sql_array['WHERE'] .= ')';
-
-// Join to forum table on topic forum_id unless topic forum_id is zero
-// whereupon we join on the forum_id passed as a parameter ... this
-// is done so navigation, forum name, etc. remain consistent with where
-// user clicked to view a global topic
-$sql = phpbb::$db->sql_build_query('SELECT', $sql_array);
-$result = phpbb::$db->sql_query($sql);
-$topic_data = phpbb::$db->sql_fetchrow($result);
-phpbb::$db->sql_freeresult($result);
-
-if (!$topic_data)
-{
-	// If post_id was submitted, we try at least to display the topic as a last resort...
-	if ($post_id && $topic_id)
-	{
-		redirect(append_sid('viewtopic', "t=$topic_id" . (($forum_id) ? "&amp;f=$forum_id" : '')));
-	}
-
-	trigger_error('NO_TOPIC');
-}
-
-// This is for determining where we are (page)
-if ($post_id)
-{
-	if ($post_id == $topic_data['topic_first_post_id'] || $post_id == $topic_data['topic_last_post_id'])
-	{
-		$check_sort = ($post_id == $topic_data['topic_first_post_id']) ? 'd' : 'a';
-
-		if ($sort_dir == $check_sort)
-		{
-			$topic_data['prev_posts'] = (phpbb::$acl->acl_get('m_approve', $forum_id)) ? $topic_data['topic_replies_real'] : $topic_data['topic_replies'];
-		}
-		else
-		{
-			$topic_data['prev_posts'] = 0;
-		}
-	}
-	else
-	{
-		$sql = 'SELECT COUNT(p1.post_id) AS prev_posts
-			FROM ' . POSTS_TABLE . ' p1, ' . POSTS_TABLE . " p2
-			WHERE p1.topic_id = {$topic_data['topic_id']}
-				AND p2.post_id = {$post_id}
-				" . ((!phpbb::$acl->acl_get('m_approve', $forum_id)) ? 'AND p1.post_approved = 1' : '') . '
-				AND ' . (($sort_dir == 'd') ? 'p1.post_time >= p2.post_time' : 'p1.post_time <= p2.post_time');
-
-		$result = phpbb::$db->sql_query($sql);
-		$row = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		$topic_data['prev_posts'] = $row['prev_posts'] - 1;
-	}
-}
-
-$forum_id = (int) $topic_data['forum_id'];
-$topic_id = (int) $topic_data['topic_id'];
-
-//
-$topic_replies = (phpbb::$acl->acl_get('m_approve', $forum_id)) ? $topic_data['topic_replies_real'] : $topic_data['topic_replies'];
-
-// Check sticky/announcement time limit
-if (($topic_data['topic_type'] == POST_STICKY || $topic_data['topic_type'] == POST_ANNOUNCE) && $topic_data['topic_time_limit'] && ($topic_data['topic_time'] + $topic_data['topic_time_limit']) < time())
-{
-	$sql = 'UPDATE ' . TOPICS_TABLE . '
-		SET topic_type = ' . POST_NORMAL . ', topic_time_limit = 0
-		WHERE topic_id = ' . $topic_id;
-	phpbb::$db->sql_query($sql);
-
-	$topic_data['topic_type'] = POST_NORMAL;
-	$topic_data['topic_time_limit'] = 0;
-}
-
-// Setup look and feel
-phpbb::$user->setup('viewtopic', $topic_data['forum_style']);
-
-if (!$topic_data['topic_approved'] && !phpbb::$acl->acl_get('m_approve', $forum_id))
-{
-	trigger_error('NO_TOPIC');
-}
-
-// Start auth check
-if (!phpbb::$acl->acl_get('f_read', $forum_id))
-{
-	if (!phpbb::$user->is_guest)
-	{
-		trigger_error('SORRY_AUTH_READ');
-	}
-
-	login_box('', phpbb::$user->lang['LOGIN_VIEWFORUM']);
-}
-
-// Forum is passworded ... check whether access has been granted to this
-// user this session, if not show login box
-if ($topic_data['forum_password'])
-{
-	login_forum_box($topic_data);
-}
-
-// Redirect to login or to the correct post upon emailed notification links
-if (phpbb_request::is_set('e', phpbb_request::GET))
-{
-	$jump_to = request_var('e', 0);
-
-	$redirect_url = append_sid('viewtopic', "f=$forum_id&amp;t=$topic_id");
-
-	if (phpbb::$user->is_guest)
-	{
-		login_box($redirect_url . "&amp;p=$post_id&amp;e=$jump_to", phpbb::$user->lang['LOGIN_NOTIFY_TOPIC']);
-	}
-
-	if ($jump_to > 0)
-	{
-		// We direct the already logged in user to the correct post...
-		redirect($redirect_url . ((!$post_id) ? "&amp;p=$jump_to" : "&amp;p=$post_id") . "#p$jump_to");
-	}
-}
-
-// What is start equal to?
-if ($post_id)
-{
-	$start = floor(($topic_data['prev_posts']) / phpbb::$config['posts_per_page']) * phpbb::$config['posts_per_page'];
-}
-
-// Get topic tracking info
-if (!isset($topic_tracking_info))
-{
-	$topic_tracking_info = array();
-
-	// Get topic tracking info
-	if (phpbb::$config['load_db_lastread'] && phpbb::$user->is_registered)
-	{
-		$tmp_topic_data = array($topic_id => $topic_data);
-		$topic_tracking_info = get_topic_tracking($forum_id, $topic_id, $tmp_topic_data, array($forum_id => $topic_data['forum_mark_time']));
-		unset($tmp_topic_data);
-	}
-	else if (phpbb::$config['load_anon_lastread'] || phpbb::$user->is_registered)
-	{
-		$topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_id);
-	}
-}
-
-// Post ordering options
-$limit_days = array(0 => phpbb::$user->lang['ALL_POSTS'], 1 => phpbb::$user->lang['1_DAY'], 7 => phpbb::$user->lang['7_DAYS'], 14 => phpbb::$user->lang['2_WEEKS'], 30 => phpbb::$user->lang['1_MONTH'], 90 => phpbb::$user->lang['3_MONTHS'], 180 => phpbb::$user->lang['6_MONTHS'], 365 => phpbb::$user->lang['1_YEAR']);
-
-$sort_by_text = array('a' => phpbb::$user->lang['AUTHOR'], 't' => phpbb::$user->lang['POST_TIME'], 's' => phpbb::$user->lang['SUBJECT']);
-$sort_by_sql = array('a' => 'u.username_clean', 't' => 'p.post_time', 's' => 'p.post_subject');
-
-$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
-
-gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param, $default_sort_days, $default_sort_key, $default_sort_dir);
-
-// Obtain correct post count and ordering SQL if user has
-// requested anything different
-if ($sort_days)
-{
-	$min_post_time = time() - ($sort_days * 86400);
-
-	$sql = 'SELECT COUNT(post_id) AS num_posts
-		FROM ' . POSTS_TABLE . "
-		WHERE topic_id = $topic_id
-			AND post_time >= $min_post_time
-		" . ((phpbb::$acl->acl_get('m_approve', $forum_id)) ? '' : 'AND post_approved = 1');
-	$result = phpbb::$db->sql_query($sql);
-	$total_posts = (int) phpbb::$db->sql_fetchfield('num_posts');
-	phpbb::$db->sql_freeresult($result);
-
-	$limit_posts_time = "AND p.post_time >= $min_post_time ";
-
-	if (phpbb_request::is_set_post('sort'))
-	{
-		$start = 0;
-	}
-}
-else
-{
-	$total_posts = $topic_replies + 1;
-	$limit_posts_time = '';
-}
-
-// Was a highlight request part of the URI?
-$highlight_match = $highlight = '';
-if ($hilit_words)
-{
-	foreach (explode(' ', trim($hilit_words)) as $word)
-	{
-		if (trim($word))
-		{
-			$word = str_replace('\*', '\w+?', preg_quote($word, '#'));
-			$word = preg_replace('#(^|\s)\\\\w\*\?(\s|$)#', '$1\w+?$2', $word);
-			$highlight_match .= (($highlight_match != '') ? '|' : '') . $word;
-		}
-	}
-
-	$highlight = urlencode($hilit_words);
-}
-
-// Make sure $start is set to the last page if it exceeds the amount
-if ($start < 0 || $start >= $total_posts)
-{
-	$start = ($start < 0) ? 0 : floor(($total_posts - 1) / phpbb::$config['posts_per_page']) * phpbb::$config['posts_per_page'];
-}
-
-// General Viewtopic URL for return links
-$viewtopic_url = append_sid('viewtopic', "f=$forum_id&amp;t=$topic_id&amp;start=$start" . ((strlen($u_sort_param)) ? "&amp;$u_sort_param" : '') . (($highlight_match) ? "&amp;hilit=$highlight" : ''));
-
-// Are we watching this topic?
-$s_watching_topic = array(
-	'link'			=> '',
-	'title'			=> '',
-	'is_watching'	=> false,
-);
-
-if ((phpbb::$config['email_enable'] || phpbb::$config['jab_enable']) && phpbb::$config['allow_topic_notify'] && phpbb::$user->is_registered)
-{
-	watch_topic_forum('topic', $s_watching_topic, phpbb::$user->data['user_id'], $forum_id, $topic_id, $topic_data['notify_status'], $start);
-
-	// Reset forum notification if forum notify is set
-	if (phpbb::$config['allow_forum_notify'] && phpbb::$acl->acl_get('f_subscribe', $forum_id))
-	{
-		$s_watching_forum = $s_watching_topic;
-		watch_topic_forum('forum', $s_watching_forum, phpbb::$user->data['user_id'], $forum_id, 0);
-	}
-}
-
-// Bookmarks
-if (phpbb::$config['allow_bookmarks'] && phpbb::$user->is_registered && request_var('bookmark', 0))
-{
-	if (check_link_hash(request_var('hash', ''), "topic_$topic_id"))
-	{
-		if (!$topic_data['bookmarked'])
-		{
-			$sql = 'INSERT INTO ' . BOOKMARKS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', array(
-				'user_id'	=> phpbb::$user->data['user_id'],
-				'topic_id'	=> $topic_id,
-			));
-			phpbb::$db->sql_query($sql);
-		}
-		else
-		{
-			$sql = 'DELETE FROM ' . BOOKMARKS_TABLE . '
-				WHERE user_id = ' . phpbb::$user->data['user_id'] . '
-					AND topic_id = ' . $topic_id;
-			phpbb::$db->sql_query($sql);
-		}
-		$message = (($topic_data['bookmarked']) ? phpbb::$user->lang['BOOKMARK_REMOVED'] : phpbb::$user->lang['BOOKMARK_ADDED']) . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_TOPIC'], '<a href="' . $viewtopic_url . '">', '</a>');
-	}
-	else
-	{
-		$message = phpbb::$user->lang['BOOKMARK_ERR'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_TOPIC'], '<a href="' . $viewtopic_url . '">', '</a>');
-	}
-	meta_refresh(3, $viewtopic_url);
-
-	trigger_error($message);
-}
-
-// Grab ranks
-$ranks = phpbb_cache::obtain_ranks();
-
-// Grab icons
-$icons = phpbb_cache::obtain_icons();
-
-// Grab extensions
-$extensions = array();
-if ($topic_data['topic_attachment'])
-{
-	$extensions = phpbb_cache::obtain_extensions_forum($forum_id);
-}
-
-// Forum rules listing
-$s_forum_rules = '';
-gen_forum_auth_level('topic', $forum_id, $topic_data['forum_status']);
-
-// Quick mod tools
-$allow_change_type = (phpbb::$acl->acl_get('m_', $forum_id) || (phpbb::$user->is_registered && phpbb::$user->data['user_id'] == $topic_data['topic_poster'])) ? true : false;
-
-$topic_mod = '';
-$topic_mod .= (phpbb::$acl->acl_get('m_lock', $forum_id) || (phpbb::$acl->acl_get('f_user_lock', $forum_id) && phpbb::$user->is_registered && phpbb::$user->data['user_id'] == $topic_data['topic_poster'] && $topic_data['topic_status'] == ITEM_UNLOCKED)) ? (($topic_data['topic_status'] == ITEM_UNLOCKED) ? '<option value="lock">' . phpbb::$user->lang['LOCK_TOPIC'] . '</option>' : '<option value="unlock">' . phpbb::$user->lang['UNLOCK_TOPIC'] . '</option>') : '';
-$topic_mod .= (phpbb::$acl->acl_get('m_delete', $forum_id)) ? '<option value="delete_topic">' . phpbb::$user->lang['DELETE_TOPIC'] . '</option>' : '';
-$topic_mod .= (phpbb::$acl->acl_get('m_move', $forum_id) && $topic_data['topic_status'] != ITEM_MOVED) ? '<option value="move">' . phpbb::$user->lang['MOVE_TOPIC'] . '</option>' : '';
-$topic_mod .= (phpbb::$acl->acl_get('m_split', $forum_id)) ? '<option value="split">' . phpbb::$user->lang['SPLIT_TOPIC'] . '</option>' : '';
-$topic_mod .= (phpbb::$acl->acl_get('m_merge', $forum_id)) ? '<option value="merge">' . phpbb::$user->lang['MERGE_POSTS'] . '</option>' : '';
-$topic_mod .= (phpbb::$acl->acl_get('m_merge', $forum_id)) ? '<option value="merge_topic">' . phpbb::$user->lang['MERGE_TOPIC'] . '</option>' : '';
-$topic_mod .= (phpbb::$acl->acl_get('m_move', $forum_id)) ? '<option value="fork">' . phpbb::$user->lang['FORK_TOPIC'] . '</option>' : '';
-$topic_mod .= ($allow_change_type && phpbb::$acl->acl_gets('f_sticky', 'f_announce', $forum_id) && $topic_data['topic_type'] != POST_NORMAL) ? '<option value="make_normal">' . phpbb::$user->lang['MAKE_NORMAL'] . '</option>' : '';
-$topic_mod .= ($allow_change_type && phpbb::$acl->acl_get('f_sticky', $forum_id) && $topic_data['topic_type'] != POST_STICKY) ? '<option value="make_sticky">' . phpbb::$user->lang['MAKE_STICKY'] . '</option>' : '';
-$topic_mod .= ($allow_change_type && phpbb::$acl->acl_get('f_announce', $forum_id) && $topic_data['topic_type'] != POST_ANNOUNCE) ? '<option value="make_announce">' . phpbb::$user->lang['MAKE_ANNOUNCE'] . '</option>' : '';
-$topic_mod .= ($allow_change_type && phpbb::$acl->acl_get('f_announce', $forum_id) && $topic_data['topic_type'] != POST_GLOBAL) ? '<option value="make_global">' . phpbb::$user->lang['MAKE_GLOBAL'] . '</option>' : '';
-$topic_mod .= (phpbb::$acl->acl_get('m_', $forum_id)) ? '<option value="topic_logs">' . phpbb::$user->lang['VIEW_TOPIC_LOGS'] . '</option>' : '';
-
-// If we've got a hightlight set pass it on to pagination.
-$pagination = generate_pagination(append_sid('viewtopic', "f=$forum_id&amp;t=$topic_id" . ((strlen($u_sort_param)) ? "&amp;$u_sort_param" : '') . (($highlight_match) ? "&amp;hilit=$highlight" : '')), $total_posts, phpbb::$config['posts_per_page'], $start);
-
-// Navigation links
-generate_forum_nav($topic_data);
-
-// Forum Rules
-generate_forum_rules($topic_data);
-
-// Moderators
-$forum_moderators = array();
-get_moderators($forum_moderators, $forum_id);
-
-// This is only used for print view so ...
-$server_path = (!$view) ? PHPBB_ROOT_PATH : generate_board_url() . '/';
-
-// Replace naughty words in title
-$topic_data['topic_title'] = censor_text($topic_data['topic_title']);
-
-// Send vars to template
-phpbb::$template->assign_vars(array(
-	'FORUM_ID' 		=> $forum_id,
-	'FORUM_NAME' 	=> $topic_data['forum_name'],
-	'FORUM_DESC'	=> generate_text_for_display($topic_data['forum_desc'], $topic_data['forum_desc_uid'], $topic_data['forum_desc_bitfield'], $topic_data['forum_desc_options']),
-	'TOPIC_ID' 		=> $topic_id,
-	'TOPIC_TITLE' 	=> $topic_data['topic_title'],
-	'TOPIC_POSTER'	=> $topic_data['topic_poster'],
-
-	'TOPIC_AUTHOR_FULL'		=> get_username_string('full', $topic_data['topic_poster'], $topic_data['topic_first_poster_name'], $topic_data['topic_first_poster_colour']),
-	'TOPIC_AUTHOR_COLOUR'	=> get_username_string('colour', $topic_data['topic_poster'], $topic_data['topic_first_poster_name'], $topic_data['topic_first_poster_colour']),
-	'TOPIC_AUTHOR'			=> get_username_string('username', $topic_data['topic_poster'], $topic_data['topic_first_poster_name'], $topic_data['topic_first_poster_colour']),
-
-	'PAGINATION' 	=> $pagination,
-	'PAGE_NUMBER' 	=> on_page($total_posts, phpbb::$config['posts_per_page'], $start),
-	'TOTAL_POSTS'	=> ($total_posts == 1) ? phpbb::$user->lang['VIEW_TOPIC_POST'] : sprintf(phpbb::$user->lang['VIEW_TOPIC_POSTS'], $total_posts),
-	'U_MCP' 		=> (phpbb::$acl->acl_get('m_', $forum_id)) ? append_sid('mcp', "i=main&amp;mode=topic_view&amp;f=$forum_id&amp;t=$topic_id&amp;start=$start" . ((strlen($u_sort_param)) ? "&amp;$u_sort_param" : ''), true, phpbb::$user->session_id) : '',
-
-	'MODERATORS'	=> (isset($forum_moderators[$forum_id]) && sizeof($forum_moderators[$forum_id])) ? implode(', ', $forum_moderators[$forum_id]) : '',
-
-	'POST_IMG' 			=> ($topic_data['forum_status'] == ITEM_LOCKED) ? phpbb::$user->img('button_topic_locked', 'FORUM_LOCKED') : phpbb::$user->img('button_topic_new', 'POST_NEW_TOPIC'),
-	'QUOTE_IMG' 		=> phpbb::$user->img('icon_post_quote', 'REPLY_WITH_QUOTE'),
-	'REPLY_IMG'			=> ($topic_data['forum_status'] == ITEM_LOCKED || $topic_data['topic_status'] == ITEM_LOCKED) ? phpbb::$user->img('button_topic_locked', 'TOPIC_LOCKED') : phpbb::$user->img('button_topic_reply', 'REPLY_TO_TOPIC'),
-	'EDIT_IMG' 			=> phpbb::$user->img('icon_post_edit', 'EDIT_POST'),
-	'DELETE_IMG' 		=> phpbb::$user->img('icon_post_delete', 'DELETE_POST'),
-	'INFO_IMG' 			=> phpbb::$user->img('icon_post_info', 'VIEW_INFO'),
-	'PROFILE_IMG'		=> phpbb::$user->img('icon_user_profile', 'READ_PROFILE'),
-	'SEARCH_IMG' 		=> phpbb::$user->img('icon_user_search', 'SEARCH_USER_POSTS'),
-	'PM_IMG' 			=> phpbb::$user->img('icon_contact_pm', 'SEND_PRIVATE_MESSAGE'),
-	'EMAIL_IMG' 		=> phpbb::$user->img('icon_contact_email', 'SEND_EMAIL'),
-	'WWW_IMG' 			=> phpbb::$user->img('icon_contact_www', 'VISIT_WEBSITE'),
-	'ICQ_IMG' 			=> phpbb::$user->img('icon_contact_icq', 'ICQ'),
-	'AIM_IMG' 			=> phpbb::$user->img('icon_contact_aim', 'AIM'),
-	'MSN_IMG' 			=> phpbb::$user->img('icon_contact_msnm', 'MSNM'),
-	'YIM_IMG' 			=> phpbb::$user->img('icon_contact_yahoo', 'YIM'),
-	'JABBER_IMG'		=> phpbb::$user->img('icon_contact_jabber', 'JABBER') ,
-	'REPORT_IMG'		=> phpbb::$user->img('icon_post_report', 'REPORT_POST'),
-	'REPORTED_IMG'		=> phpbb::$user->img('icon_topic_reported', 'POST_REPORTED'),
-	'UNAPPROVED_IMG'	=> phpbb::$user->img('icon_topic_unapproved', 'POST_UNAPPROVED'),
-	'WARN_IMG'			=> phpbb::$user->img('icon_user_warn', 'WARN_USER'),
-
-	'S_IS_LOCKED'			=>($topic_data['topic_status'] == ITEM_UNLOCKED) ? false : true,
-	'S_SELECT_SORT_DIR' 	=> $s_sort_dir,
-	'S_SELECT_SORT_KEY' 	=> $s_sort_key,
-	'S_SELECT_SORT_DAYS' 	=> $s_limit_days,
-	'S_SINGLE_MODERATOR'	=> (!empty($forum_moderators[$forum_id]) && sizeof($forum_moderators[$forum_id]) > 1) ? false : true,
-	'S_TOPIC_ACTION' 		=> append_sid('viewtopic', "f=$forum_id&amp;t=$topic_id&amp;start=$start"),
-	'S_TOPIC_MOD' 			=> ($topic_mod != '') ? '<select name="action" id="quick-mod-select">' . $topic_mod . '</select>' : '',
-	'S_MOD_ACTION' 			=> append_sid('mcp', "f=$forum_id&amp;t=$topic_id&amp;start=$start&amp;quickmod=1&amp;redirect=" . urlencode(str_replace('&amp;', '&', $viewtopic_url)), true, $user->session_id),
-
-	'S_VIEWTOPIC'			=> true,
-	'S_DISPLAY_SEARCHBOX'	=> (phpbb::$acl->acl_get('u_search') && phpbb::$acl->acl_get('f_search', $forum_id) && phpbb::$config['load_search']) ? true : false,
-	'S_SEARCHBOX_ACTION'	=> append_sid('search', 't=' . $topic_id),
-
-	'S_DISPLAY_POST_INFO'	=> ($topic_data['forum_type'] == FORUM_POST && (phpbb::$acl->acl_get('f_post', $forum_id) || phpbb::$user->is_guest)) ? true : false,
-	'S_DISPLAY_REPLY_INFO'	=> ($topic_data['forum_type'] == FORUM_POST && (phpbb::$acl->acl_get('f_reply', $forum_id) || phpbb::$user->is_guest)) ? true : false,
-
-	'U_TOPIC'				=> "{$server_path}viewtopic." . PHP_EXT . "?f=$forum_id&amp;t=$topic_id",
-	'U_FORUM'				=> $server_path,
-	'U_VIEW_TOPIC' 			=> $viewtopic_url,
-	'U_VIEW_FORUM' 			=> append_sid('viewforum', 'f=' . $forum_id),
-	'U_VIEW_OLDER_TOPIC'	=> append_sid('viewtopic', "f=$forum_id&amp;t=$topic_id&amp;view=previous"),
-	'U_VIEW_NEWER_TOPIC'	=> append_sid('viewtopic', "f=$forum_id&amp;t=$topic_id&amp;view=next"),
-	'U_PRINT_TOPIC'			=> (phpbb::$acl->acl_get('f_print', $forum_id)) ? $viewtopic_url . '&amp;view=print' : '',
-	'U_EMAIL_TOPIC'			=> (phpbb::$acl->acl_get('f_email', $forum_id) && phpbb::$config['email_enable']) ? append_sid('memberlist', "mode=email&amp;t=$topic_id") : '',
-
-	'U_WATCH_TOPIC' 		=> $s_watching_topic['link'],
-	'L_WATCH_TOPIC' 		=> $s_watching_topic['title'],
-	'S_WATCHING_TOPIC'		=> $s_watching_topic['is_watching'],
-
-	'U_BOOKMARK_TOPIC'		=> (phpbb::$user->is_registered && phpbb::$config['allow_bookmarks']) ? $viewtopic_url . '&amp;bookmark=1&amp;hash=' . generate_link_hash("topic_$topic_id") : '',
-	'L_BOOKMARK_TOPIC'		=> (phpbb::$user->is_registered && phpbb::$config['allow_bookmarks'] && $topic_data['bookmarked']) ? phpbb::$user->lang['BOOKMARK_TOPIC_REMOVE'] : phpbb::$user->lang['BOOKMARK_TOPIC'],
-
-	'U_POST_NEW_TOPIC' 		=> (phpbb::$acl->acl_get('f_post', $forum_id) || phpbb::$user->is_guest) ? append_sid('posting', "mode=post&amp;f=$forum_id") : '',
-	'U_POST_REPLY_TOPIC' 	=> (phpbb::$acl->acl_get('f_reply', $forum_id) || phpbb::$user->is_guest) ? append_sid('posting', "mode=reply&amp;f=$forum_id&amp;t=$topic_id") : '',
-	'U_BUMP_TOPIC'			=> (bump_topic_allowed($forum_id, $topic_data['topic_bumped'], $topic_data['topic_last_post_time'], $topic_data['topic_poster'], $topic_data['topic_last_poster_id'])) ? append_sid('posting', "mode=bump&amp;f=$forum_id&amp;t=$topic_id&amp;hash=" . generate_link_hash("topic_$topic_id")) : '',
-));
-
-// Does this topic contain a poll?
-if (!empty($topic_data['poll_start']))
-{
-	$sql = 'SELECT o.*, p.bbcode_bitfield, p.bbcode_uid
-		FROM ' . POLL_OPTIONS_TABLE . ' o, ' . POSTS_TABLE . " p
-		WHERE o.topic_id = $topic_id
-			AND p.post_id = {$topic_data['topic_first_post_id']}
-			AND p.topic_id = o.topic_id
-		ORDER BY o.poll_option_id";
-	$result = phpbb::$db->sql_query($sql);
-
-	$poll_info = array();
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$poll_info[] = $row;
-	}
-	phpbb::$db->sql_freeresult($result);
-
-	$cur_voted_id = array();
-	if (phpbb::$user->is_registered)
-	{
-		$sql = 'SELECT poll_option_id
-			FROM ' . POLL_VOTES_TABLE . '
-			WHERE topic_id = ' . $topic_id . '
-				AND vote_user_id = ' . phpbb::$user->data['user_id'];
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$cur_voted_id[] = $row['poll_option_id'];
-		}
-		phpbb::$db->sql_freeresult($result);
-	}
-	else
-	{
-		// Cookie based guest tracking ... I don't like this but hum ho
-		// it's oft requested. This relies on "nice" users who don't feel
-		// the need to delete cookies to mess with results.
-		$cur_voted_list = phpbb_request::variable(phpbb::$config['cookie_name'] . '_poll_' . $topic_id, '', false, phpbb_request::COOKIE);
-		if (!empty($cur_voted_list))
-		{
-			$cur_voted_id = array_map('intval', explode(',', $cur_voted_list));
-		}
-	}
-
-	$s_can_vote = (((!sizeof($cur_voted_id) && phpbb::$acl->acl_get('f_vote', $forum_id)) ||
-		(phpbb::$acl->acl_get('f_votechg', $forum_id) && $topic_data['poll_vote_change'])) &&
-		(($topic_data['poll_length'] != 0 && $topic_data['poll_start'] + $topic_data['poll_length'] > time()) || $topic_data['poll_length'] == 0) &&
-		$topic_data['topic_status'] != ITEM_LOCKED &&
-		$topic_data['forum_status'] != ITEM_LOCKED) ? true : false;
-	$s_display_results = (!$s_can_vote || ($s_can_vote && sizeof($cur_voted_id)) || $view == 'viewpoll') ? true : false;
-
-	if ($update && $s_can_vote)
-	{
-
-		if (!sizeof($voted_id) || sizeof($voted_id) > $topic_data['poll_max_options'] || in_array(VOTE_CONVERTED, $cur_voted_id))
-		{
-			$redirect_url = append_sid('viewtopic', "f=$forum_id&amp;t=$topic_id&amp;start=$start");
-
-			meta_refresh(5, $redirect_url);
-			if (!sizeof($voted_id))
-			{
-				$message = 'NO_VOTE_OPTION';
-			}
-			else if (sizeof($voted_id) > $topic_data['poll_max_options'])
-			{
-				$message = 'TOO_MANY_VOTE_OPTIONS';
-			}
-			else
-			{
-				$message = 'VOTE_CONVERTED';
-			}
-
-			$message = phpbb::$user->lang[$message] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_TOPIC'], '<a href="' . $redirect_url . '">', '</a>');
-			trigger_error($message);
-		}
-
-		foreach ($voted_id as $option)
-		{
-			if (in_array($option, $cur_voted_id))
-			{
-				continue;
-			}
-
-			$sql = 'UPDATE ' . POLL_OPTIONS_TABLE . '
-				SET poll_option_total = poll_option_total + 1
-				WHERE poll_option_id = ' . (int) $option . '
-					AND topic_id = ' . (int) $topic_id;
-			phpbb::$db->sql_query($sql);
-
-			if (phpbb::$user->is_registered)
-			{
-				$sql_ary = array(
-					'topic_id'			=> (int) $topic_id,
-					'poll_option_id'	=> (int) $option,
-					'vote_user_id'		=> (int) phpbb::$user->data['user_id'],
-					'vote_user_ip'		=> (string) phpbb::$user->ip,
-				);
-
-				$sql = 'INSERT INTO ' . POLL_VOTES_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary);
-				phpbb::$db->sql_query($sql);
-			}
-		}
-
-		foreach ($cur_voted_id as $option)
-		{
-			if (!in_array($option, $voted_id))
-			{
-				$sql = 'UPDATE ' . POLL_OPTIONS_TABLE . '
-					SET poll_option_total = poll_option_total - 1
-					WHERE poll_option_id = ' . (int) $option . '
-						AND topic_id = ' . (int) $topic_id;
-				phpbb::$db->sql_query($sql);
-
-				if (phpbb::$user->is_registered)
-				{
-					$sql = 'DELETE FROM ' . POLL_VOTES_TABLE . '
-						WHERE topic_id = ' . (int) $topic_id . '
-							AND poll_option_id = ' . (int) $option . '
-							AND vote_user_id = ' . (int) phpbb::$user->data['user_id'];
-					phpbb::$db->sql_query($sql);
-				}
-			}
-		}
-
-		if (phpbb::$user->is_guest)
-		{
-			phpbb::$user->set_cookie('poll_' . $topic_id, implode(',', $voted_id), time() + 31536000);
-		}
-
-		$sql = 'UPDATE ' . TOPICS_TABLE . '
-			SET poll_last_vote = ' . time() . "
-			WHERE topic_id = $topic_id";
-		//, topic_last_post_time = ' . time() . " -- for bumping topics with new votes, ignore for now
-		phpbb::$db->sql_query($sql);
-
-		$redirect_url = append_sid('viewtopic', "f=$forum_id&amp;t=$topic_id&amp;start=$start");
-
-		meta_refresh(5, $redirect_url);
-		trigger_error(phpbb::$user->lang['VOTE_SUBMITTED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_TOPIC'], '<a href="' . $redirect_url . '">', '</a>'));
-	}
-
-	$poll_total = 0;
-	foreach ($poll_info as $poll_option)
-	{
-		$poll_total += $poll_option['poll_option_total'];
-	}
-
-	if ($poll_info[0]['bbcode_bitfield'])
-	{
-		$poll_bbcode = new bbcode();
-	}
-	else
-	{
-		$poll_bbcode = false;
-	}
-
-	for ($i = 0, $size = sizeof($poll_info); $i < $size; $i++)
-	{
-		$poll_info[$i]['poll_option_text'] = censor_text($poll_info[$i]['poll_option_text']);
-
-		if ($poll_bbcode !== false)
-		{
-			$poll_bbcode->bbcode_second_pass($poll_info[$i]['poll_option_text'], $poll_info[$i]['bbcode_uid'], $poll_option['bbcode_bitfield']);
-		}
-
-		$poll_info[$i]['poll_option_text'] = bbcode_nl2br($poll_info[$i]['poll_option_text']);
-		$poll_info[$i]['poll_option_text'] = smiley_text($poll_info[$i]['poll_option_text']);
-	}
-
-	$topic_data['poll_title'] = censor_text($topic_data['poll_title']);
-
-	if ($poll_bbcode !== false)
-	{
-		$poll_bbcode->bbcode_second_pass($topic_data['poll_title'], $poll_info[0]['bbcode_uid'], $poll_info[0]['bbcode_bitfield']);
-	}
-
-	$topic_data['poll_title'] = bbcode_nl2br($topic_data['poll_title']);
-	$topic_data['poll_title'] = smiley_text($topic_data['poll_title']);
-
-	unset($poll_bbcode);
-
-	foreach ($poll_info as $poll_option)
-	{
-		$option_pct = ($poll_total > 0) ? $poll_option['poll_option_total'] / $poll_total : 0;
-		$option_pct_txt = sprintf("%.1d%%", round($option_pct * 100));
-
-		phpbb::$template->assign_block_vars('poll_option', array(
-			'POLL_OPTION_ID' 		=> $poll_option['poll_option_id'],
-			'POLL_OPTION_CAPTION' 	=> $poll_option['poll_option_text'],
-			'POLL_OPTION_RESULT' 	=> $poll_option['poll_option_total'],
-			'POLL_OPTION_PERCENT' 	=> $option_pct_txt,
-			'POLL_OPTION_PCT'		=> round($option_pct * 100),
-			'POLL_OPTION_IMG' 		=> phpbb::$user->img('poll_center', $option_pct_txt, '', round($option_pct * 250)),
-			'POLL_OPTION_VOTED'		=> (in_array($poll_option['poll_option_id'], $cur_voted_id)) ? true : false,
-		));
-	}
-
-	$poll_end = $topic_data['poll_length'] + $topic_data['poll_start'];
-
-	phpbb::$template->assign_vars(array(
-		'POLL_QUESTION'		=> $topic_data['poll_title'],
-		'TOTAL_VOTES' 		=> $poll_total,
-		'POLL_LEFT_CAP_IMG'	=> phpbb::$user->img('poll_left'),
-		'POLL_RIGHT_CAP_IMG'=> phpbb::$user->img('poll_right'),
-
-		'L_MAX_VOTES'		=> ($topic_data['poll_max_options'] == 1) ? phpbb::$user->lang['MAX_OPTION_SELECT'] : sprintf(phpbb::$user->lang['MAX_OPTIONS_SELECT'], $topic_data['poll_max_options']),
-		'L_POLL_LENGTH'		=> ($topic_data['poll_length']) ? sprintf(phpbb::$user->lang[($poll_end > time()) ? 'POLL_RUN_TILL' : 'POLL_ENDED_AT'], phpbb::$user->format_date($poll_end)) : '',
-
-		'S_HAS_POLL'		=> true,
-		'S_CAN_VOTE'		=> $s_can_vote,
-		'S_DISPLAY_RESULTS'	=> $s_display_results,
-		'S_IS_MULTI_CHOICE'	=> ($topic_data['poll_max_options'] > 1) ? true : false,
-		'S_POLL_ACTION'		=> $viewtopic_url,
-
-		'U_VIEW_RESULTS'	=> $viewtopic_url . '&amp;view=viewpoll',
-	));
-
-	unset($poll_end, $poll_info, $voted_id);
-}
-
-// If the user is trying to reach the second half of the topic, fetch it starting from the end
-$store_reverse = false;
-$sql_limit = phpbb::$config['posts_per_page'];
-
-if ($start > $total_posts / 2)
-{
-	$store_reverse = true;
-
-	if ($start + phpbb::$config['posts_per_page'] > $total_posts)
-	{
-		$sql_limit = min(phpbb::$config['posts_per_page'], max(1, $total_posts - $start));
-	}
-
-	// Select the sort order
-	$sql_sort_order = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'ASC' : 'DESC');
-	$sql_start = max(0, $total_posts - $sql_limit - $start);
-}
-else
-{
-	// Select the sort order
-	$sql_sort_order = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
-	$sql_start = $start;
-}
-
-// Container for user details, only process once
-$post_list = $user_cache = $id_cache = $attachments = $attach_list = $rowset = $update_count = $post_edit_list = array();
-$has_attachments = $display_notice = false;
-$bbcode_bitfield = '';
-$i = $i_total = 0;
-
-// Go ahead and pull all data for this topic
-$sql = 'SELECT p.post_id
-	FROM ' . POSTS_TABLE . ' p' . (($sort_by_sql[$sort_key][0] == 'u') ? ', ' . USERS_TABLE . ' u': '') . "
-	WHERE p.topic_id = $topic_id
-		" . ((!phpbb::$acl->acl_get('m_approve', $forum_id)) ? 'AND p.post_approved = 1' : '') . "
-		" . (($sort_by_sql[$sort_key][0] == 'u') ? 'AND u.user_id = p.poster_id': '') . "
-		$limit_posts_time
-	ORDER BY $sql_sort_order";
-$result = phpbb::$db->sql_query_limit($sql, $sql_limit, $sql_start);
-
-$i = ($store_reverse) ? $sql_limit - 1 : 0;
-while ($row = phpbb::$db->sql_fetchrow($result))
-{
-	$post_list[$i] = (int) $row['post_id'];
-	($store_reverse) ? $i-- : $i++;
-}
-phpbb::$db->sql_freeresult($result);
-
-if (!sizeof($post_list))
-{
-	if ($sort_days)
-	{
-		trigger_error('NO_POSTS_TIME_FRAME');
-	}
-	else
-	{
-		trigger_error('NO_TOPIC');
-	}
-}
-
-// Holding maximum post time for marking topic read
-// We need to grab it because we do reverse ordering sometimes
-$max_post_time = 0;
-
-$sql = phpbb::$db->sql_build_query('SELECT', array(
-	'SELECT'	=> 'u.*, z.friend, z.foe, p.*',
-
-	'FROM'		=> array(
-		USERS_TABLE		=> 'u',
-		POSTS_TABLE		=> 'p',
-	),
-
-	'LEFT_JOIN'	=> array(
-		array(
-			'FROM'	=> array(ZEBRA_TABLE => 'z'),
-			'ON'	=> 'z.user_id = ' . phpbb::$user->data['user_id'] . ' AND z.zebra_id = p.poster_id'
-		)
-	),
-
-	'WHERE'		=> phpbb::$db->sql_in_set('p.post_id', $post_list) . '
-		AND u.user_id = p.poster_id'
-));
-
-$result = phpbb::$db->sql_query($sql);
-
-$now = getdate(time() + phpbb::$user->timezone + phpbb::$user->dst - date('Z'));
-
-// Posts are stored in the $rowset array while $attach_list, $user_cache
-// and the global bbcode_bitfield are built
-while ($row = phpbb::$db->sql_fetchrow($result))
-{
-	// Set max_post_time
-	if ($row['post_time'] > $max_post_time)
-	{
-		$max_post_time = $row['post_time'];
-	}
-
-	$poster_id = (int) $row['poster_id'];
-
-	// Does post have an attachment? If so, add it to the list
-	if ($row['post_attachment'] && phpbb::$config['allow_attachments'])
-	{
-		$attach_list[] = (int) $row['post_id'];
-
-		if ($row['post_approved'])
-		{
-			$has_attachments = true;
-		}
-	}
-
-	$rowset[$row['post_id']] = array(
-		'hide_post'			=> ($row['foe'] && ($view != 'show' || $post_id != $row['post_id'])) ? true : false,
-
-		'post_id'			=> $row['post_id'],
-		'post_time'			=> $row['post_time'],
-		'user_id'			=> $row['user_id'],
-		'username'			=> $row['username'],
-		'user_colour'		=> $row['user_colour'],
-		'topic_id'			=> $row['topic_id'],
-		'forum_id'			=> $row['forum_id'],
-		'post_subject'		=> $row['post_subject'],
-		'post_edit_count'	=> $row['post_edit_count'],
-		'post_edit_time'	=> $row['post_edit_time'],
-		'post_edit_reason'	=> $row['post_edit_reason'],
-		'post_edit_user'	=> $row['post_edit_user'],
-		'post_edit_locked'	=> $row['post_edit_locked'],
-
-		// Make sure the icon actually exists
-		'icon_id'			=> (isset($icons[$row['icon_id']]['img'], $icons[$row['icon_id']]['height'], $icons[$row['icon_id']]['width'])) ? $row['icon_id'] : 0,
-		'post_attachment'	=> $row['post_attachment'],
-		'post_approved'		=> $row['post_approved'],
-		'post_reported'		=> $row['post_reported'],
-		'post_username'		=> $row['post_username'],
-		'post_text'			=> $row['post_text'],
-		'bbcode_uid'		=> $row['bbcode_uid'],
-		'bbcode_bitfield'	=> $row['bbcode_bitfield'],
-		'enable_smilies'	=> $row['enable_smilies'],
-		'enable_sig'		=> $row['enable_sig'],
-		'friend'			=> $row['friend'],
-		'foe'				=> $row['foe'],
-	);
-
-	// Define the global bbcode bitfield, will be used to load bbcodes
-	$bbcode_bitfield = $bbcode_bitfield | base64_decode($row['bbcode_bitfield']);
-
-	// Is a signature attached? Are we going to display it?
-	if ($row['enable_sig'] && phpbb::$config['allow_sig'] && phpbb::$user->optionget('viewsigs'))
-	{
-		$bbcode_bitfield = $bbcode_bitfield | base64_decode($row['user_sig_bbcode_bitfield']);
-	}
-
-	// Cache various user specific data ... so we don't have to recompute
-	// this each time the same user appears on this page
-	if (!isset($user_cache[$poster_id]))
-	{
-		if ($poster_id == ANONYMOUS)
-		{
-			$user_cache[$poster_id] = array(
-				'joined'		=> '',
-				'posts'			=> '',
-				'from'			=> '',
-
-				'sig'					=> '',
-				'sig_bbcode_uid'		=> '',
-				'sig_bbcode_bitfield'	=> '',
-
-				'online'			=> false,
-				'avatar'			=> (phpbb::$user->optionget('viewavatars')) ? get_user_avatar($row['user_avatar'], $row['user_avatar_type'], $row['user_avatar_width'], $row['user_avatar_height']) : '',
-				'rank_title'		=> '',
-				'rank_image'		=> '',
-				'rank_image_src'	=> '',
-				'sig'				=> '',
-				'profile'			=> '',
-				'pm'				=> '',
-				'email'				=> '',
-				'www'				=> '',
-				'icq_status_img'	=> '',
-				'icq'				=> '',
-				'aim'				=> '',
-				'msn'				=> '',
-				'yim'				=> '',
-				'jabber'			=> '',
-				'search'			=> '',
-				'age'				=> '',
-
-				'username'			=> $row['username'],
-				'user_colour'		=> $row['user_colour'],
-
-				'warnings'			=> 0,
-				'allow_pm'			=> 0,
-			);
-
-			get_user_rank($poster_id, $row['user_rank'], $row['user_posts'], $user_cache[$poster_id]['rank_title'], $user_cache[$poster_id]['rank_image'], $user_cache[$poster_id]['rank_image_src']);
-		}
-		else
-		{
-			$user_sig = '';
-
-			// We add the signature to every posters entry because enable_sig is post dependant
-			if ($row['user_sig'] && phpbb::$config['allow_sig'] && phpbb::$user->optionget('viewsigs'))
-			{
-				$user_sig = $row['user_sig'];
-			}
-
-			$id_cache[] = $poster_id;
-
-			$user_cache[$poster_id] = array(
-				'joined'		=> phpbb::$user->format_date($row['user_regdate']),
-				'posts'			=> $row['user_posts'],
-				'warnings'		=> (isset($row['user_warnings'])) ? $row['user_warnings'] : 0,
-				'from'			=> (!empty($row['user_from'])) ? $row['user_from'] : '',
-
-				'sig'					=> $user_sig,
-				'sig_bbcode_uid'		=> (!empty($row['user_sig_bbcode_uid'])) ? $row['user_sig_bbcode_uid'] : '',
-				'sig_bbcode_bitfield'	=> (!empty($row['user_sig_bbcode_bitfield'])) ? $row['user_sig_bbcode_bitfield'] : '',
-
-				'viewonline'	=> $row['user_allow_viewonline'],
-				'allow_pm'		=> $row['user_allow_pm'],
-
-				'avatar'		=> (phpbb::$user->optionget('viewavatars')) ? get_user_avatar($row['user_avatar'], $row['user_avatar_type'], $row['user_avatar_width'], $row['user_avatar_height']) : '',
-				'age'			=> '',
-
-				'rank_title'		=> '',
-				'rank_image'		=> '',
-				'rank_image_src'	=> '',
-
-				'username'			=> $row['username'],
-				'user_colour'		=> $row['user_colour'],
-
-				'online'		=> false,
-				'profile'		=> append_sid('memberlist', "mode=viewprofile&amp;u=$poster_id"),
-				'www'			=> $row['user_website'],
-				'aim'			=> ($row['user_aim'] && phpbb::$acl->acl_get('u_sendim')) ? append_sid('memberlist', "mode=contact&amp;action=aim&amp;u=$poster_id") : '',
-				'msn'			=> ($row['user_msnm'] && phpbb::$acl->acl_get('u_sendim')) ? append_sid('memberlist', "mode=contact&amp;action=msnm&amp;u=$poster_id") : '',
-				'yim'			=> ($row['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($row['user_yim']) . '&amp;.src=pg' : '',
-				'jabber'		=> ($row['user_jabber'] && phpbb::$acl->acl_get('u_sendim')) ? append_sid('memberlist', "mode=contact&amp;action=jabber&amp;u=$poster_id") : '',
-				'search'		=> (phpbb::$acl->acl_get('u_search')) ? append_sid('search', "author_id=$poster_id&amp;sr=posts") : '',
-			);
-
-			get_user_rank($poster_id, $row['user_rank'], $row['user_posts'], $user_cache[$poster_id]['rank_title'], $user_cache[$poster_id]['rank_image'], $user_cache[$poster_id]['rank_image_src']);
-
-			if (!empty($row['user_allow_viewemail']) || phpbb::$acl->acl_get('a_email'))
-			{
-				$user_cache[$poster_id]['email'] = (phpbb::$config['board_email_form'] && phpbb::$config['email_enable']) ? append_sid('memberlist', "mode=email&amp;u=$poster_id") : ((phpbb::$config['board_hide_emails'] && !phpbb::$acl->acl_get('a_email')) ? '' : 'mailto:' . $row['user_email']);
-			}
-			else
-			{
-				$user_cache[$poster_id]['email'] = '';
-			}
-
-			if (!empty($row['user_icq']))
-			{
-				$user_cache[$poster_id]['icq'] = 'http://www.icq.com/people/webmsg.php?to=' . $row['user_icq'];
-				$user_cache[$poster_id]['icq_status_img'] = '<img src="http://web.icq.com/whitepages/online?icq=' . $row['user_icq'] . '&amp;img=5" width="18" height="18" alt="" />';
-			}
-			else
-			{
-				$user_cache[$poster_id]['icq_status_img'] = '';
-				$user_cache[$poster_id]['icq'] = '';
-			}
-
-			if (phpbb::$config['allow_birthdays'] && !empty($row['user_birthday']))
-			{
-				list($bday_day, $bday_month, $bday_year) = array_map('intval', explode('-', $row['user_birthday']));
-
-				if ($bday_year)
-				{
-					$diff = $now['mon'] - $bday_month;
-					if ($diff == 0)
-					{
-						$diff = ($now['mday'] - $bday_day < 0) ? 1 : 0;
-					}
-					else
-					{
-						$diff = ($diff < 0) ? 1 : 0;
-					}
-
-					$user_cache[$poster_id]['age'] = (int) ($now['year'] - $bday_year - $diff);
-				}
-			}
-		}
-	}
-}
-phpbb::$db->sql_freeresult($result);
-
-// Load custom profile fields
-if (phpbb::$config['load_cpf_viewtopic'])
-{
-	if (!class_exists('custom_profile'))
-	{
-		include(PHPBB_ROOT_PATH . 'includes/functions_profile_fields.' . PHP_EXT);
-	}
-	$cp = new custom_profile();
-
-	// Grab all profile fields from users in id cache for later use - similar to the poster cache
-	$profile_fields_cache = $cp->generate_profile_fields_template('grab', $id_cache);
-}
-
-// Generate online information for user
-if (phpbb::$config['load_onlinetrack'] && sizeof($id_cache))
-{
-	$sql = 'SELECT session_user_id, MAX(session_time) as online_time, MIN(session_viewonline) AS viewonline
-		FROM ' . SESSIONS_TABLE . '
-		WHERE ' . phpbb::$db->sql_in_set('session_user_id', $id_cache) . '
-		GROUP BY session_user_id';
-	$result = phpbb::$db->sql_query($sql);
-
-	$update_time = phpbb::$config['load_online_time'] * 60;
-	while ($row = phpbb::$db->sql_fetchrow($result))
-	{
-		$user_cache[$row['session_user_id']]['online'] = (time() - $update_time < $row['online_time'] && (($row['viewonline']) || phpbb::$acl->acl_get('u_viewonline'))) ? true : false;
-	}
-	phpbb::$db->sql_freeresult($result);
-}
-unset($id_cache);
-
-// Pull attachment data
-if (sizeof($attach_list))
-{
-	if (phpbb::$acl->acl_get('u_download') && phpbb::$acl->acl_get('f_download', $forum_id))
-	{
-		$sql = 'SELECT *
-			FROM ' . ATTACHMENTS_TABLE . '
-			WHERE ' . phpbb::$db->sql_in_set('post_msg_id', $attach_list) . '
-				AND in_message = 0
-			ORDER BY filetime DESC, post_msg_id ASC';
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$attachments[$row['post_msg_id']][] = $row;
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// No attachments exist, but post table thinks they do so go ahead and reset post_attach flags
-		if (!sizeof($attachments))
-		{
-			$sql = 'UPDATE ' . POSTS_TABLE . '
-				SET post_attachment = 0
-				WHERE ' . phpbb::$db->sql_in_set('post_id', $attach_list);
-			phpbb::$db->sql_query($sql);
-
-			// We need to update the topic indicator too if the complete topic is now without an attachment
-			if (sizeof($rowset) != $total_posts)
-			{
-				// Not all posts are displayed so we query the db to find if there's any attachment for this topic
-				$sql = 'SELECT a.post_msg_id as post_id
-					FROM ' . ATTACHMENTS_TABLE . ' a, ' . POSTS_TABLE . " p
-					WHERE p.topic_id = $topic_id
-						AND p.post_approved = 1
-						AND p.topic_id = a.topic_id";
-				$result = phpbb::$db->sql_query_limit($sql, 1);
-				$row = phpbb::$db->sql_fetchrow($result);
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$row)
-				{
-					$sql = 'UPDATE ' . TOPICS_TABLE . "
-						SET topic_attachment = 0
-						WHERE topic_id = $topic_id";
-					phpbb::$db->sql_query($sql);
-				}
-			}
-			else
-			{
-				$sql = 'UPDATE ' . TOPICS_TABLE . "
-					SET topic_attachment = 0
-					WHERE topic_id = $topic_id";
-				phpbb::$db->sql_query($sql);
-			}
-		}
-		else if ($has_attachments && !$topic_data['topic_attachment'])
-		{
-			// Topic has approved attachments but its flag is wrong
-			$sql = 'UPDATE ' . TOPICS_TABLE . "
-				SET topic_attachment = 1
-				WHERE topic_id = $topic_id";
-			phpbb::$db->sql_query($sql);
-
-			$topic_data['topic_attachment'] = 1;
-		}
-	}
-	else
-	{
-		$display_notice = true;
-	}
-}
-
-// Instantiate BBCode if need be
-if ($bbcode_bitfield !== '')
-{
-	$bbcode = new bbcode(base64_encode($bbcode_bitfield));
-}
-
-$i_total = sizeof($rowset) - 1;
-$prev_post_id = '';
-
-phpbb::$template->assign_vars(array(
-	'S_NUM_POSTS' => sizeof($post_list),
-));
-
-// Output the posts
-$first_unread = $post_unread = false;
-for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
-{
-	// A non-existing rowset only happens if there was no user present for the entered poster_id
-	// This could be a broken posts table.
-	if (!isset($rowset[$post_list[$i]]))
-	{
-		continue;
-	}
-
-	$row =& $rowset[$post_list[$i]];
-	$poster_id = $row['user_id'];
-
-	// End signature parsing, only if needed
-	if ($user_cache[$poster_id]['sig'] && $row['enable_sig'] && empty($user_cache[$poster_id]['sig_parsed']))
-	{
-		$user_cache[$poster_id]['sig'] = censor_text($user_cache[$poster_id]['sig']);
-
-		if ($user_cache[$poster_id]['sig_bbcode_bitfield'])
-		{
-			$bbcode->bbcode_second_pass($user_cache[$poster_id]['sig'], $user_cache[$poster_id]['sig_bbcode_uid'], $user_cache[$poster_id]['sig_bbcode_bitfield']);
-		}
-
-		$user_cache[$poster_id]['sig'] = bbcode_nl2br($user_cache[$poster_id]['sig']);
-		$user_cache[$poster_id]['sig'] = smiley_text($user_cache[$poster_id]['sig']);
-		$user_cache[$poster_id]['sig_parsed'] = true;
-	}
-
-	// Parse the message and subject
-	$message = censor_text($row['post_text']);
-
-	// Second parse bbcode here
-	if ($row['bbcode_bitfield'])
-	{
-		$bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']);
-	}
-
-	$message = bbcode_nl2br($message);
-	$message = smiley_text($message);
-
-	if (!empty($attachments[$row['post_id']]))
-	{
-		parse_attachments($forum_id, $message, $attachments[$row['post_id']], $update_count);
-	}
-
-	// Replace naughty words such as farty pants
-	$row['post_subject'] = censor_text($row['post_subject']);
-
-	// Highlight active words (primarily for search)
-	if ($highlight_match)
-	{
-		$message = preg_replace('#(?!<.*)(?<!\w)(' . $highlight_match . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">\1</span>', $message);
-		$row['post_subject'] = preg_replace('#(?!<.*)(?<!\w)(' . $highlight_match . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">\1</span>', $row['post_subject']);
-	}
-
-	// Editing information
-	if (($row['post_edit_count'] && phpbb::$config['display_last_edited']) || $row['post_edit_reason'])
-	{
-		// Get usernames for all following posts if not already stored
-		if (!sizeof($post_edit_list) && ($row['post_edit_reason'] || ($row['post_edit_user'] && !isset($user_cache[$row['post_edit_user']]))))
-		{
-			// Remove all post_ids already parsed (we do not have to check them)
-			$post_storage_list = (!$store_reverse) ? array_slice($post_list, $i) : array_slice(array_reverse($post_list), $i);
-
-			$sql = 'SELECT DISTINCT u.user_id, u.username, u.user_colour
-				FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
-				WHERE ' . phpbb::$db->sql_in_set('p.post_id', $post_storage_list) . '
-					AND p.post_edit_count <> 0
-					AND p.post_edit_user <> 0
-					AND p.post_edit_user = u.user_id';
-			$result2 = phpbb::$db->sql_query($sql);
-			while ($user_edit_row = phpbb::$db->sql_fetchrow($result2))
-			{
-				$post_edit_list[$user_edit_row['user_id']] = $user_edit_row;
-			}
-			phpbb::$db->sql_freeresult($result2);
-
-			unset($post_storage_list);
-		}
-
-		$l_edit_time_total = ($row['post_edit_count'] == 1) ? phpbb::$user->lang['EDITED_TIME_TOTAL'] : phpbb::$user->lang['EDITED_TIMES_TOTAL'];
-
-		if ($row['post_edit_reason'])
-		{
-			// User having edited the post also being the post author?
-			if (!$row['post_edit_user'] || $row['post_edit_user'] == $poster_id)
-			{
-				$display_username = get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']);
-			}
-			else
-			{
-				$display_username = get_username_string('full', $row['post_edit_user'], $post_edit_list[$row['post_edit_user']]['username'], $post_edit_list[$row['post_edit_user']]['user_colour']);
-			}
-
-			$l_edited_by = sprintf($l_edit_time_total, $display_username, phpbb::$user->format_date($row['post_edit_time'], false, true), $row['post_edit_count']);
-		}
-		else
-		{
-			if ($row['post_edit_user'] && !isset($user_cache[$row['post_edit_user']]))
-			{
-				$user_cache[$row['post_edit_user']] = $post_edit_list[$row['post_edit_user']];
-			}
-
-			// User having edited the post also being the post author?
-			if (!$row['post_edit_user'] || $row['post_edit_user'] == $poster_id)
-			{
-				$display_username = get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']);
-			}
-			else
-			{
-				$display_username = get_username_string('full', $row['post_edit_user'], $user_cache[$row['post_edit_user']]['username'], $user_cache[$row['post_edit_user']]['user_colour']);
-			}
-
-			$l_edited_by = sprintf($l_edit_time_total, $display_username, phpbb::$user->format_date($row['post_edit_time'], false, true), $row['post_edit_count']);
-		}
-	}
-	else
-	{
-		$l_edited_by = '';
-	}
-
-	// Bump information
-	if ($topic_data['topic_bumped'] && $row['post_id'] == $topic_data['topic_last_post_id'] && isset($user_cache[$topic_data['topic_bumper']]) )
-	{
-		// It is safe to grab the username from the user cache array, we are at the last
-		// post and only the topic poster and last poster are allowed to bump.
-		// Admins and mods are bound to the above rules too...
-		$l_bumped_by = '<br /><br />' . sprintf(phpbb::$user->lang['BUMPED_BY'], $user_cache[$topic_data['topic_bumper']]['username'], phpbb::$user->format_date($topic_data['topic_last_post_time'], false, false));
-	}
-	else
-	{
-		$l_bumped_by = '';
-	}
-
-	$cp_row = array();
-
-	//
-	if (phpbb::$config['load_cpf_viewtopic'])
-	{
-		$cp_row = (isset($profile_fields_cache[$poster_id])) ? $cp->generate_profile_fields_template('show', false, $profile_fields_cache[$poster_id]) : array();
-	}
-
-	$post_unread = (isset($topic_tracking_info[$topic_id]) && $row['post_time'] > $topic_tracking_info[$topic_id]) ? true : false;
-
-	$s_first_unread = false;
-	if (!$first_unread && $post_unread)
-	{
-		$s_first_unread = $first_unread = true;
-	}
-
-	//
-	$postrow = array(
-		'POST_AUTHOR_FULL'		=> get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
-		'POST_AUTHOR_COLOUR'	=> get_username_string('colour', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
-		'POST_AUTHOR'			=> get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
-		'U_POST_AUTHOR'			=> get_username_string('profile', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
-
-		'RANK_TITLE'		=> $user_cache[$poster_id]['rank_title'],
-		'RANK_IMG'			=> $user_cache[$poster_id]['rank_image'],
-		'RANK_IMG_SRC'		=> $user_cache[$poster_id]['rank_image_src'],
-		'POSTER_JOINED'		=> $user_cache[$poster_id]['joined'],
-		'POSTER_POSTS'		=> $user_cache[$poster_id]['posts'],
-		'POSTER_FROM'		=> $user_cache[$poster_id]['from'],
-		'POSTER_AVATAR'		=> $user_cache[$poster_id]['avatar'],
-		'POSTER_WARNINGS'	=> $user_cache[$poster_id]['warnings'],
-		'POSTER_AGE'		=> $user_cache[$poster_id]['age'],
-
-		'POST_DATE'			=> phpbb::$user->format_date($row['post_time'], false, ($view == 'print') ? true : false),
-		'POST_SUBJECT'		=> $row['post_subject'],
-		'MESSAGE'			=> $message,
-		'SIGNATURE'			=> ($row['enable_sig']) ? $user_cache[$poster_id]['sig'] : '',
-		'EDITED_MESSAGE'	=> $l_edited_by,
-		'EDIT_REASON'		=> $row['post_edit_reason'],
-		'BUMPED_MESSAGE'	=> $l_bumped_by,
-
-		'MINI_POST_IMG'			=> ($post_unread) ? phpbb::$user->img('icon_post_target_unread', 'NEW_POST') : phpbb::$user->img('icon_post_target', 'POST'),
-		'POST_ICON_IMG'			=> ($topic_data['enable_icons'] && !empty($row['icon_id'])) ? $icons[$row['icon_id']]['img'] : '',
-		'POST_ICON_IMG_WIDTH'	=> ($topic_data['enable_icons'] && !empty($row['icon_id'])) ? $icons[$row['icon_id']]['width'] : '',
-		'POST_ICON_IMG_HEIGHT'	=> ($topic_data['enable_icons'] && !empty($row['icon_id'])) ? $icons[$row['icon_id']]['height'] : '',
-		'ICQ_STATUS_IMG'		=> $user_cache[$poster_id]['icq_status_img'],
-		'ONLINE_IMG'			=> ($poster_id == ANONYMOUS || !phpbb::$config['load_onlinetrack']) ? '' : (($user_cache[$poster_id]['online']) ? phpbb::$user->img('icon_user_online', 'ONLINE') : phpbb::$user->img('icon_user_offline', 'OFFLINE')),
-		'S_ONLINE'				=> ($poster_id == ANONYMOUS || !phpbb::$config['load_onlinetrack']) ? false : (($user_cache[$poster_id]['online']) ? true : false),
-
-		'U_EDIT'			=> (!phpbb::$user->is_registered) ? '' : (((phpbb::$user->data['user_id'] == $poster_id && phpbb::$acl->acl_get('f_edit', $forum_id) && ($row['post_time'] > time() - (phpbb::$config['edit_time'] * 60) || !phpbb::$config['edit_time'])) || phpbb::$acl->acl_get('m_edit', $forum_id)) ? append_sid('posting', "mode=edit&amp;f=$forum_id&amp;p={$row['post_id']}") : ''),
-		'U_QUOTE'			=> (phpbb::$acl->acl_get('f_reply', $forum_id)) ? append_sid('posting', "mode=quote&amp;f=$forum_id&amp;p={$row['post_id']}") : '',
-		'U_INFO'			=> (phpbb::$acl->acl_get('m_info', $forum_id)) ? append_sid('mcp', "i=main&amp;mode=post_details&amp;f=$forum_id&amp;p=" . $row['post_id'], true, phpbb::$user->session_id) : '',
-		'U_DELETE'			=> (!phpbb::$user->is_registered) ? '' : (((phpbb::$user->data['user_id'] == $poster_id && phpbb::$acl->acl_get('f_delete', $forum_id) && $topic_data['topic_last_post_id'] == $row['post_id'] && !$row['post_edit_locked'] && ($row['post_time'] > time() - (phpbb::$config['edit_time'] * 60) || !phpbb::$config['edit_time'])) || phpbb::$acl->acl_get('m_delete', $forum_id)) ? append_sid('posting', "mode=delete&amp;f=$forum_id&amp;p={$row['post_id']}") : ''),
-
-		'U_PROFILE'		=> $user_cache[$poster_id]['profile'],
-		'U_SEARCH'		=> $user_cache[$poster_id]['search'],
-		'U_PM'			=> ($poster_id != ANONYMOUS && phpbb::$config['allow_privmsg'] && phpbb::$acl->acl_get('u_sendpm') && ($user_cache[$poster_id]['allow_pm'] || phpbb::$acl->acl_gets('a_', 'm_') || phpbb::$acl->acl_getf_global('m_'))) ? append_sid('ucp', 'i=pm&amp;mode=compose&amp;action=quotepost&amp;p=' . $row['post_id']) : '',
-		'U_EMAIL'		=> $user_cache[$poster_id]['email'],
-		'U_WWW'			=> $user_cache[$poster_id]['www'],
-		'U_ICQ'			=> $user_cache[$poster_id]['icq'],
-		'U_AIM'			=> $user_cache[$poster_id]['aim'],
-		'U_MSN'			=> $user_cache[$poster_id]['msn'],
-		'U_YIM'			=> $user_cache[$poster_id]['yim'],
-		'U_JABBER'		=> $user_cache[$poster_id]['jabber'],
-
-		'U_REPORT'			=> (phpbb::$acl->acl_get('f_report', $forum_id)) ? append_sid('report', 'f=' . $forum_id . '&amp;p=' . $row['post_id']) : '',
-		'U_MCP_REPORT'		=> (phpbb::$acl->acl_get('m_report', $forum_id)) ? append_sid('mcp', 'i=reports&amp;mode=report_details&amp;f=' . $forum_id . '&amp;p=' . $row['post_id'], true, phpbb::$user->session_id) : '',
-		'U_MCP_APPROVE'		=> (phpbb::$acl->acl_get('m_approve', $forum_id)) ? append_sid('mcp', 'i=queue&amp;mode=approve_details&amp;f=' . $forum_id . '&amp;p=' . $row['post_id'], true, phpbb::$user->session_id) : '',
-		'U_MINI_POST'		=> append_sid('viewtopic', 'p=' . $row['post_id']) . (($topic_data['topic_type'] == POST_GLOBAL) ? '&amp;f=' . $forum_id : '') . '#p' . $row['post_id'],
-		'U_NEXT_POST_ID'	=> ($i < $i_total && isset($rowset[$post_list[$i + 1]])) ? $rowset[$post_list[$i + 1]]['post_id'] : '',
-		'U_PREV_POST_ID'	=> $prev_post_id,
-		'U_NOTES'			=> (phpbb::$acl->acl_getf_global('m_')) ? append_sid('mcp', 'i=notes&amp;mode=user_notes&amp;u=' . $poster_id, true, phpbb::$user->session_id) : '',
-		'U_WARN'			=> (phpbb::$acl->acl_get('m_warn') && $poster_id != phpbb::$user->data['user_id'] && $poster_id != ANONYMOUS) ? append_sid('mcp', 'i=warn&amp;mode=warn_post&amp;f=' . $forum_id . '&amp;p=' . $row['post_id'], true, phpbb::$user->session_id) : '',
-
-		'POST_ID'			=> $row['post_id'],
-		'POSTER_ID'			=> $poster_id,
-
-		'S_HAS_ATTACHMENTS'	=> (!empty($attachments[$row['post_id']])) ? true : false,
-		'S_POST_UNAPPROVED'	=> ($row['post_approved']) ? false : true,
-		'S_POST_REPORTED'	=> ($row['post_reported'] && phpbb::$acl->acl_get('m_report', $forum_id)) ? true : false,
-		'S_DISPLAY_NOTICE'	=> $display_notice && $row['post_attachment'],
-		'S_FRIEND'			=> ($row['friend']) ? true : false,
-		'S_UNREAD_POST'		=> $post_unread,
-		'S_FIRST_UNREAD'	=> $s_first_unread,
-		'S_CUSTOM_FIELDS'	=> (isset($cp_row['row']) && sizeof($cp_row['row'])) ? true : false,
-		'S_TOPIC_POSTER'	=> ($topic_data['topic_poster'] == $poster_id) ? true : false,
-
-		'S_IGNORE_POST'		=> ($row['hide_post']) ? true : false,
-		'L_IGNORE_POST'		=> ($row['hide_post']) ? sprintf(phpbb::$user->lang['POST_BY_FOE'], get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), '<a href="' . $viewtopic_url . "&amp;p={$row['post_id']}&amp;view=show#p{$row['post_id']}" . '">', '</a>') : '',
-	);
-
-	if (isset($cp_row['row']) && sizeof($cp_row['row']))
-	{
-		$postrow = array_merge($postrow, $cp_row['row']);
-	}
-
-	// Dump vars into template
-	phpbb::$template->assign_block_vars('postrow', $postrow);
-
-	if (!empty($cp_row['blockrow']))
-	{
-		foreach ($cp_row['blockrow'] as $field_data)
-		{
-			phpbb::$template->assign_block_vars('postrow.custom_fields', $field_data);
-		}
-	}
-
-	// Display not already displayed Attachments for this post, we already parsed them. ;)
-	if (!empty($attachments[$row['post_id']]))
-	{
-		foreach ($attachments[$row['post_id']] as $attachment)
-		{
-			phpbb::$template->assign_block_vars('postrow.attachment', array(
-				'DISPLAY_ATTACHMENT'	=> $attachment,
-			));
-		}
-	}
-
-	$prev_post_id = $row['post_id'];
-
-	unset($rowset[$post_list[$i]]);
-	unset($attachments[$row['post_id']]);
-}
-unset($rowset, $user_cache);
-
-// Update topic view and if necessary attachment view counters ... but only for humans and if this is the first 'page view'
-if (isset(phpbb::$user->data['session_page']) && !phpbb::$user->is_bot && (strpos(phpbb::$user->data['session_page'], '&t=' . $topic_id) === false || isset(phpbb::$user->data['session_created'])))
-{
-	$sql = 'UPDATE ' . TOPICS_TABLE . '
-		SET topic_views = topic_views + 1, topic_last_view_time = ' . time() . "
-		WHERE topic_id = $topic_id";
-	phpbb::$db->sql_query($sql);
-
-	// Update the attachment download counts
-	if (sizeof($update_count))
-	{
-		$sql = 'UPDATE ' . ATTACHMENTS_TABLE . '
-			SET download_count = download_count + 1
-			WHERE ' . phpbb::$db->sql_in_set('attach_id', array_unique($update_count));
-		phpbb::$db->sql_query($sql);
-	}
-}
-
-// Only mark topic if it's currently unread. Also make sure we do not set topic tracking back if earlier pages are viewed.
-if (isset($topic_tracking_info[$topic_id]) && $topic_data['topic_last_post_time'] > $topic_tracking_info[$topic_id] && $max_post_time > $topic_tracking_info[$topic_id])
-{
-	markread('topic', $forum_id, $topic_id, $max_post_time);
-
-	// Update forum info
-	$all_marked_read = update_forum_tracking_info($forum_id, $topic_data['forum_last_post_time'], (isset($topic_data['forum_mark_time'])) ? $topic_data['forum_mark_time'] : false, false);
-}
-else
-{
-	$all_marked_read = true;
-}
-
-// If there are absolutely no more unread posts in this forum and unread posts shown, we can savely show the #unread link
-if ($all_marked_read)
-{
-	if ($post_unread)
-	{
-		phpbb::$template->assign_vars(array(
-			'U_VIEW_UNREAD_POST'	=> '#unread',
-		));
-	}
-	else if (isset($topic_tracking_info[$topic_id]) && $topic_data['topic_last_post_time'] > $topic_tracking_info[$topic_id])
-	{
-		phpbb::$template->assign_vars(array(
-			'U_VIEW_UNREAD_POST'	=> append_sid('viewtopic', "f=$forum_id&amp;t=$topic_id&amp;view=unread") . '#unread',
-		));
-	}
-}
-else if (!$all_marked_read)
-{
-	$last_page = ((floor($start / phpbb::$config['posts_per_page']) + 1) == max(ceil($total_posts / phpbb::$config['posts_per_page']), 1)) ? true : false;
-
-	// What can happen is that we are at the last displayed page. If so, we also display the #unread link based in $post_unread
-	if ($last_page && $post_unread)
-	{
-		phpbb::$template->assign_vars(array(
-			'U_VIEW_UNREAD_POST'	=> '#unread',
-		));
-	}
-	else if (!$last_page)
-	{
-		phpbb::$template->assign_vars(array(
-			'U_VIEW_UNREAD_POST'	=> append_sid('viewtopic', "f=$forum_id&amp;t=$topic_id&amp;view=unread") . '#unread',
-		));
-	}
-}
-
-/**
-* @todo Do NOT overwrite a request variable.
-*/
-// We overwrite the 'f' request variable if there is no forum specified to be able to display the correct online list.
-// One downside is that the user currently viewing this topic/post is not taken into account.
-if (!phpbb_request::variable('f', 0))
-{
-	phpbb_request::overwrite('f', $forum_id);
-}
-
-// Output the page
-page_header(phpbb::$user->lang['VIEW_TOPIC'] . ' - ' . $topic_data['topic_title']);
-
-phpbb::$template->set_filenames(array(
-	'body' => ($view == 'print') ? 'viewtopic_print.html' : 'viewtopic_body.html',
-));
-make_jumpbox(append_sid('viewforum'), $forum_id);
-
-page_footer();
-
-?>
-\ No newline at end of file
author	Meik Sievertsen <acydburn@phpbb.com>	2009-10-04 18:13:59 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2009-10-04 18:13:59 +0000
commit	bf8ac19eaa8d74f9dfd6d597190f5664e7339382 (patch)
tree	c3ad876736748e36cb9176a0248cc43badfc1d9a
parent	3215bbf88864139dc8c7e9ac5773b1ea8a7e96c1 (diff)
download	forums-bf8ac19eaa8d74f9dfd6d597190f5664e7339382.tar forums-bf8ac19eaa8d74f9dfd6d597190f5664e7339382.tar.gz forums-bf8ac19eaa8d74f9dfd6d597190f5664e7339382.tar.bz2 forums-bf8ac19eaa8d74f9dfd6d597190f5664e7339382.tar.xz forums-bf8ac19eaa8d74f9dfd6d597190f5664e7339382.zip