This commit was manufactured by cvs2svn to create tag

'release_3_0_0'. git-svn-id: file:///svn/phpbb/tags/release_3_0_0@8279 89ea8834-ac86-4346-8a33-228a782c2dd0
2025-09-11 00:30:53 +02:00 · 2007-12-12 16:46:54 +00:00
438 changed files with 9229 additions and 32553 deletions
--- a/build/build_diff.php
+++ b/build/build_diff.php
@@ -1,408 +0,0 @@
-#!/usr/bin/env php
-<?php
-/**
-*
-* @package build
-* @version $Id$
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-// CONFIG - Begin
-$substitute_old = '3.0.6';
-$substitute_new = '3.0.7-RC2';
-$simple_name_old = 'phpbb306';
-$simple_name_new = 'phpbb307-RC2';
-$echo_changes = false;
-// Set this to true to just compress the changes and do not build them again
-// This should be used for building custom modified txt file. ;)
-$package_changed_files = false;
-// CONFIG - End
-
-//$debug_file = 'includes/functions_user.php'; //'styles/prosilver/style.cfg';
-$debug_file = false;
-
-if ($debug_file !== false)
-{
-	$echo_changes = false;
-}
-
-$s_name = 'save_' . $substitute_old . '_to_' . $substitute_new;
-
-$location = dirname(__FILE__);
-
-if (!$package_changed_files)
-{
-	if (!$echo_changes)
-	{
-		// Cleanup...
-		run_command("rm -R $location/save/*");
-
-		// Create directory...
-		run_command("mkdir $location/save/{$s_name}");
-		run_command("mkdir $location/save/{$s_name}/language");
-		run_command("mkdir $location/save/{$s_name}/prosilver");
-		run_command("mkdir $location/save/{$s_name}/subsilver2");
-	}
-}
-
-// Build code changes and place them into 'save'
-if (!$package_changed_files)
-{
-	build_code_changes('language');
-	build_code_changes('prosilver');
-	build_code_changes('subsilver2');
-}
-
-// Package code changes
-$code_changes_filename = 'phpBB-' . $substitute_old . '_to_' . $substitute_new . '-codechanges';
-
-if (!$echo_changes)
-{
-	// Now compress the files...
-	// Build Main phpBB Release
-	$compress_programs = array(
-//		'tar.gz'	=> 'tar -czf',
-		'tar.bz2'	=> 'tar -cjf',
-		'zip'		=> 'zip -r'
-	);
-
-	chdir($location . '/save/' . $s_name);
-	foreach ($compress_programs as $extension => $compress_command)
-	{
-		echo "Packaging code changes for $extension\n";
-		run_command("rm ./../../release_files/{$code_changes_filename}.{$extension}");
-		flush();
-
-		// Build Package
-		run_command("$compress_command ./../../release_files/{$code_changes_filename}.{$extension} *");
-
-		// Build MD5 Sum
-		run_command("md5sum ./../../release_files/{$code_changes_filename}.{$extension} > ./../../release_files/{$code_changes_filename}.{$extension}.md5");
-		flush();
-	}
-}
-
-/**
-* $output_format can be: language, prosilver and subsilver2
-*/
-function build_code_changes($output_format)
-{
-	global $substitute_new, $substitute_old, $simple_name_old, $simple_name_new, $echo_changes, $package_changed_files, $location, $debug_file, $s_name;
-
-	// Global array holding the data entries
-	$data = array(
-		'header'		=> array(),
-		'diff'			=> array(),
-	);
-
-	// Read diff file and prepare the output filedata...
-	//$patch_filename = '../new_version/patches/phpBB-' . $substitute_old . '_to_' . $substitute_new . '.patch';
-	$release_filename = 'phpbb-' . $substitute_old . '_to_' . $substitute_new . '_' . $output_format . '.txt';
-
-	if (!$package_changed_files)
-	{
-		if (!$echo_changes)
-		{
-			$fp = fopen('save/' . $s_name . '/' . $output_format . '/' . $release_filename, 'wb');
-
-			if (!$fp)
-			{
-				die('Unable to create ' . $release_filename);
-			}
-		}
-	}
-
-	include_once($location . '/build_helper.php');
-	$package = new build_package(array($substitute_old, $substitute_new), false);
-
-	$titles = array(
-		'language'		=> 'phpBB ' . $substitute_old . ' to phpBB ' . $substitute_new . ' Language Pack Changes',
-		'prosilver'		=> 'phpBB ' . $substitute_old . ' to phpBB ' . $substitute_new . ' prosilver Changes',
-		'subsilver2'	=> 'phpBB ' . $substitute_old . ' to phpBB ' . $substitute_new . ' subsilver2 Changes',
-	);
-
-	$data['header'] = array(
-		'title'		=> $titles[$output_format],
-		'intro'		=> '
-
-These are the ' . $titles[$output_format] . ' summed up into a little Mod. These changes are only partial and do not include any code changes, therefore not meant for updating phpBB.
-
-	',
-		'included_files'	=> array(),
-	);
-
-	// We collect the files we want to diff first (ironically we grab this from a diff file)
-	if (!$echo_changes)
-	{
-		echo "\n\nCollecting Filenames:";
-	}
-
-	// We re-create the patch file
-	foreach ($package->old_packages as $_package_name => $dest_package_filename)
-	{
-		chdir($package->locations['old_versions']);
-
-		if (!$echo_changes)
-		{
-			echo "\n\n" . 'Creating patch/diff files for phpBB-' . $dest_package_filename . $package->get('new_version_number');
-		}
-
-		$dest_package_filename = $location . '/save/' . $s_name . '/phpBB-' . $dest_package_filename . $package->get('new_version_number') . '.patch';
-		$package->run_command('diff ' . $package->diff_options . ' ' . $_package_name . ' ' . $package->get('simple_name') . ' > ' . $dest_package_filename);
-
-		// Parse this diff to determine file changes from the checked versions and save them
-		$result = $package->collect_diff_files($dest_package_filename, $_package_name);
-		$package->run_command('rm ' . $dest_package_filename);
-	}
-
-	chdir($location);
-
-	$filenames = array();
-	foreach ($result['files'] as $filename)
-	{
-		if ($debug_file !== false && $filename != $debug_file)
-		{
-			continue;
-		}
-
-		// Decide which files to compare...
-		switch ($output_format)
-		{
-			case 'language':
-				if (strpos($filename, 'language/en/') !== 0)
-				{
-					continue 2;
-				}
-			break;
-
-			case 'prosilver':
-				if (strpos($filename, 'styles/prosilver/') !== 0)
-				{
-					continue 2;
-				}
-			break;
-
-			case 'subsilver2':
-				if (strpos($filename, 'styles/subsilver2/') !== 0)
-				{
-					continue 2;
-				}
-			break;
-		}
-
-		if (!file_exists($location . '/old_versions/' . $simple_name_old . '/' . $filename))
-		{
-			// New file... include it
-			$data['header']['included_files'][] = array(
-				'old'				=> $location . '/old_versions/' . $simple_name_old . '/' . $filename,
-				'new'				=> $location . '/old_versions/' . $simple_name_new . '/' . $filename,
-				'phpbb_filename'	=> $filename,
-			);
-			continue;
-		}
-
-		$filenames[] = array(
-			'old'				=> $location . '/old_versions/' . $simple_name_old . '/' . $filename,
-			'new'				=> $location . '/old_versions/' . $simple_name_new . '/' . $filename,
-			'phpbb_filename'	=> $filename,
-		);
-	}
-
-	// Now let us go through the filenames list and create a more comprehensive diff
-	if (!$echo_changes)
-	{
-		fwrite($fp, build_header($output_format, $filenames, $data['header']));
-	}
-	else
-	{
-		//echo build_header('text', $filenames, $data['header']);
-	}
-
-	// Copy files...
-	$files_to_copy = array();
-
-	foreach ($data['header']['included_files'] as $filename)
-	{
-		$files_to_copy[] = $filename['phpbb_filename'];
-	}
-
-	// First step is to copy the new version over (clean structure)
-	if (!$echo_changes && sizeof($files_to_copy))
-	{
-		foreach ($files_to_copy as $file)
-		{
-			// Create directory?
-			$dirname = dirname($file);
-
-			if ($dirname)
-			{
-				$dirname = explode('/', $dirname);
-				$__dir = array();
-
-				foreach ($dirname as $i => $dir)
-				{
-					$__dir[] = $dir;
-					run_command("mkdir -p $location/save/" . $s_name . '/' . $output_format . '/' . implode('/', $__dir));
-				}
-			}
-
-			$source_file = $location . '/new_version/phpBB3/' . $file;
-			$dest_file = $location . '/save/' . $s_name . '/' . $output_format . '/';
-			$dest_file .= $file;
-
-			$command = "cp -p $source_file $dest_file";
-			$result = trim(`$command`);
-			echo "- Copied File: " . $source_file . " -> " . $dest_file . "\n";
-		}
-	}
-
-	include_once('diff_class.php');
-
-	if (!$echo_changes)
-	{
-		echo "\n\nDiffing Codebases:";
-	}
-
-	foreach ($filenames as $file_ary)
-	{
-		if (!file_exists($file_ary['old']))
-		{
-			$lines1 = array();
-		}
-		else
-		{
-			$lines1 = file($file_ary['old']);
-		}
-		$lines2 = file($file_ary['new']);
-
-		if (!sizeof($lines1))
-		{
-			// New File
-		}
-		else
-		{
-			$diff = new Diff($lines1, $lines2);
-			$fmt = new BBCodeDiffFormatter(false, 5, $debug_file);
-
-			if (!$echo_changes)
-			{
-				fwrite($fp, $fmt->format_open($file_ary['phpbb_filename']));
-				fwrite($fp, $fmt->format($diff, $lines1));
-				fwrite($fp, $fmt->format_close($file_ary['phpbb_filename']));
-			}
-			else
-			{
-				echo $fmt->format_open($file_ary['phpbb_filename']);
-				echo $fmt->format($diff, $lines1);
-				echo $fmt->format_close($file_ary['phpbb_filename']);
-			}
-
-			if ($debug_file !== false)
-			{
-				echo $fmt->format_open($file_ary['phpbb_filename']);
-				echo $fmt->format($diff, $lines1);
-				echo $fmt->format_close($file_ary['phpbb_filename']);
-				exit;
-			}
-		}
-	}
-
-	if (!$echo_changes)
-	{
-		fwrite($fp, build_footer($output_format));
-
-		// Close file
-		fclose($fp);
-
-		chmod('save/' . $s_name . '/' . $output_format . '/' . $release_filename, 0666);
-	}
-	else
-	{
-		echo build_footer($output_format);
-	}
-}
-
-/**
-* Build Footer
-*/
-function build_footer($mode)
-{
-	$html = '';
-
-	$html .= "# \n";
-	$html .= "#-----[ SAVE/CLOSE ALL FILES ]------------------------------------------ \n";
-	$html .= "# \n";
-	$html .= "# EoM";
-
-	return $html;
-}
-
-/**
-* Build Header
-*/
-function build_header($mode, $filenames, $header)
-{
-	global $substitute_old;
-
-	$html = '';
-
-	$html .= "############################################################## \n";
-	$html .= "## Title: " . $header['title'] . "\n";
-	$html .= "## Author: naderman < naderman@phpbb.com > (Nils Adermann) http://www.phpbb.com \n";
-	$html .= "## Description: \n";
-
-	$intr = explode("\n", $header['intro']);
-	$introduction = '';
-	foreach ($intr as $_line)
-	{
-		$introduction .= wordwrap($_line, 80) . "\n";
-	}
-	$intr = explode("\n", $introduction);
-
-	foreach ($intr as $_line)
-	{
-		$html .= "##		" . $_line . "\n";
-	}
-	$html .= "## \n";
-	$html .= "## Files To Edit: \n";
-
-	foreach ($filenames as $file_ary)
-	{
-		$html .= "##		" . $file_ary['phpbb_filename'] . "\n";
-	}
-	$html .= "##\n";
-	if (sizeof($header['included_files']))
-	{
-		$html .= "## Included Files: \n";
-		foreach ($header['included_files'] as $filename)
-		{
-			$html .= "##		{$filename['phpbb_filename']}\n";
-		}
-	}
-	$html .= "## License: http://opensource.org/licenses/gpl-license.php GNU General Public License v2 \n";
-	$html .= "############################################################## \n";
-	$html .= "\n";
-
-	// COPY Statement?
-	if (sizeof($header['included_files']))
-	{
-		$html .= "#\n#-----[ COPY ]------------------------------------------\n#\n";
-		foreach ($header['included_files'] as $filename)
-		{
-			$html .= "copy {$filename['phpbb_filename']} to {$filename['phpbb_filename']}\n";
-		}
-		$html .= "\n";
-	}
-
-	return $html;
-}
-
-function run_command($command)
-{
-	$result = trim(`$command`);
-	echo "\n- Command Run: " . $command . "\n";
-}
-
-?>
--- a/build/build_helper.php
+++ b/build/build_helper.php
@@ -1,485 +0,0 @@
-<?php
-/**
-*
-* @package build
-* @version $Id$
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-class build_package
-{
-	var $package_infos;
-	var $old_packages;
-	var $versions;
-	var $locations;
-	var $clean_directory_structure;
-	var $files_to_copy;
-	var $files_to_remove;
-	var $remove_from_diff_structure;
-
-	// -c - context diff
-	// -r - compare recursive
-	// -N - Treat missing files as empty
-	// -E - Ignore tab expansions
-	//		not used: -b - Ignore space changes.
-	// -w - Ignore all whitespace
-	// -B - Ignore blank lines
-	// -d - Try to find smaller set of changes
-	var $diff_options = '-crNEBwd';
-	var $diff_options_long = '-x images -crNEB'; // -x fonts -x imageset //imageset not used here, because it includes the imageset.cfg file. ;)
-
-	var $verbose = false;
-	var $status_begun = false;
-	var $num_dots = 0;
-
-	function build_package($versions, $verbose = false)
-	{
-		$this->versions = $versions;
-		$this->verbose = $verbose;
-
-		// Get last two entries
-		$_latest = $this->versions[sizeof($this->versions) - 1];
-		$_before = $this->versions[sizeof($this->versions) - 2];
-
-		$this->locations = array(
-			'new_version'	=> dirname(dirname(__FILE__)) . '/phpBB/',
-			'old_versions'	=> dirname(__FILE__) . '/old_versions/',
-			'root'			=> dirname(__FILE__) . '/',
-			'package_dir'	=> dirname(__FILE__) . '/new_version/'
-		);
-
-		$this->package_infos = array(
-			'package_name'			=> 'phpBB3',
-			'name_prefix'			=> 'phpbb',
-			'simple_name'			=> 'phpbb' . str_replace('.', '', $_latest),
-			'new_version_number'	=> $_latest,
-			'short_version_number'	=> str_replace('.', '', $_latest),
-			'release_filename'		=> 'phpBB-' . $_latest,
-			'last_version'			=> 'phpbb' . str_replace('.', '', $_before),
-			'last_version_number'	=> $_before,
-		);
-
-		$this->package_infos['dest_dir'] = $this->locations['package_dir'] . $this->package_infos['package_name'];
-		$this->package_infos['diff_dir'] = $this->locations['old_versions'] . $this->package_infos['simple_name'];
-		$this->package_infos['patch_directory'] = $this->locations['package_dir'] . 'patches';
-		$this->package_infos['files_directory'] = $this->locations['package_dir'] . 'files';
-		$this->package_infos['update_directory'] = $this->locations['package_dir'] . 'update';
-		$this->package_infos['release_directory'] = $this->locations['package_dir'] . 'release_files';
-
-		// Old packages always exclude the latest version. ;)
-		$this->old_packages = array();
-
-		foreach ($this->versions as $package_version)
-		{
-			if ($package_version == $_latest)
-			{
-				continue;
-			}
-
-			$this->old_packages['phpbb' . str_replace('.', '', $package_version)] = $package_version . '_to_';
-		}
-
-		// We need to make sure this is up to date with the latest version
-		$this->clean_directory_structure = array(
-			'adm'		=> array(
-				'images'	=> '',
-				'style'		=> '',
-			),
-			'cache'		=> '',
-			'docs'		=> '',
-			'download'	=> '',
-			'files'		=> '',
-			'images'	=> array(
-				'avatars'	=> array(
-					'gallery'	=> '',
-					'upload'	=> '',
-				),
-				'icons'		=> array(
-					'misc'	=> '',
-					'smile'	=> '',
-				),
-				'ranks'			=> '',
-				'smilies'		=> '',
-				'upload_icons'	=> '',
-			),
-			'includes'		=> array(
-				'acm'		=> '',
-				'acp'		=> array(
-					'info'	=> '',
-				),
-				'auth'		=> '',
-				'captcha'	=> array(
-					'plugins'	=> '',
-				),
-				'diff'		=> '',
-				'db'		=> '',
-				'hooks'		=> '',
-				'mcp'		=> array(
-					'info'	=> '',
-				),
-				'questionnaire' => '',
-				'search'	=> '',
-				'ucp'		=> array(
-					'info'	=> '',
-				),
-				'utf'		=> array(
-					'data'	=> '',
-				),
-			),
-			'install'		=> array(
-				'convertors'=> '',
-				'schemas'	=> '',
-//				'data'		=> '',
-			),
-			'language'		=> array(
-				'en'		=> array(
-					'acp'		=> '',
-					'email'		=> '',
-					'mods'		=> '',
-				),
-			),
-			'store'			=> '',
-			'styles'		=> array(
-				'subsilver2'	=> array(
-					'imageset'		=> array(
-						'en'	=> '',
-					),
-					'template'	=> '',
-					'theme'		=> array(
-						'images'	=> '',
-					),
-				),
-				'prosilver'	=> array(
-					'imageset'		=> array(
-						'en'	=> '',
-					),
-					'template'	=> '',
-					'theme'		=> array(
-						'images'	=> '',
-					),
-				),
-			),
-		);
-
-		// Files to remove (not include within package)
-		$this->files_to_remove = array(); //array('includes/utf/data/recode_cjk.php');
-
-		// Files within the main directory to copy - do not include config.php
-		$this->files_to_copy = array(
-			'.htaccess', 'common.php', 'cron.php', 'faq.php', 'feed.php', 'index.php', 'mcp.php', 'memberlist.php', 'posting.php', 'report.php',
-			'search.php', 'style.php', 'ucp.php', 'viewforum.php', 'viewonline.php', 'viewtopic.php'
-		);
-
-		// These files/directories will be removed and not used for creating the patch files
-		$this->remove_from_diff_structure = array(
-			'config.php', 'cache', 'docs', 'files', 'install', 'store', 'develop'
-		);
-
-		// Writeable directories
-		$this->writeable = array('cache', 'store', 'images/avatars/upload', 'files');
-
-		// Fill the rest of the files_to_copy array
-		foreach ($this->clean_directory_structure as $cur_dir => $dir_struct)
-		{
-			$this->_fill_files_to_copy($this->locations['new_version'] . $cur_dir, $cur_dir, $dir_struct);
-		}
-	}
-
-	function get($var)
-	{
-		return $this->package_infos[$var];
-	}
-
-	function _fill_files_to_copy($directory, $cur_dir, $dir_struct)
-	{
-		$dh = opendir($directory);
-
-		while ($file = readdir($dh))
-		{
-			if (is_file($directory . '/' . $file) && $file != '.' && $file != '..')
-			{
-				$_loc = str_replace($this->locations['new_version'], '', $directory . '/' . $file);
-
-				if (in_array($_loc, $this->files_to_remove))
-				{
-					continue;
-				}
-
-				$this->files_to_copy[] = $cur_dir . '/' . $file;
-			}
-		}
-		closedir($dh);
-
-		if (is_array($dir_struct))
-		{
-			foreach ($dir_struct as $_cur_dir => $_dir_struct)
-			{
-				$this->_fill_files_to_copy($directory . '/' . $_cur_dir, $cur_dir . '/' . $_cur_dir, $_dir_struct);
-			}
-		}
-	}
-
-	function adjust_permissions($directory)
-	{
-		$dh = opendir($directory);
-
-		while ($file = readdir($dh))
-		{
-			if ($file == '.' || $file == '..' || $file == '.svn')
-			{
-				continue;
-			}
-
-			// If file, then 644
-			if (is_file($directory . '/' . $file))
-			{
-				chmod($directory . '/' . $file, 0644);
-			}
-			else if (is_dir($directory . '/' . $file))
-			{
-				$_loc = str_replace($this->package_infos['dest_dir'] . '/', '', $directory . '/' . $file);
-
-				// If directory is within the writeable chmod to 777, else 755
-				$mode = (in_array($_loc, $this->writeable)) ? 0777 : 0755;
-				chmod($directory . '/' . $file, $mode);
-
-				// Now traverse to the directory
-				$this->adjust_permissions($directory . '/' . $file);
-			}
-		}
-		closedir($dh);
-	}
-
-	function begin_status($headline)
-	{
-		if ($this->status_begun)
-		{
-			echo "\nDone.\n\n";
-		}
-
-		$this->num_dots = 0;
-
-		echo $headline . "\n    ";
-
-		$this->status_begun = true;
-	}
-
-	function run_command($command)
-	{
-		$result = trim(`$command`);
-
-		if ($this->verbose)
-		{
-			echo "    command : " . getcwd() . '$ ' . $command . "\n";
-			echo "    result  : " . $result . "\n";
-		}
-		else
-		{
-			if ($this->num_dots > 70)
-			{
-				echo "\n";
-				$this->num_dots = 0;
-			}
-			echo '.';
-			$this->num_dots++;
-		}
-
-		flush();
-	}
-
-	function create_directory($directory, $dir_struct)
-	{
-		if (!file_exists($directory))
-		{
-			$this->run_command("mkdir $directory");
-		}
-
-		if (is_array($dir_struct))
-		{
-			foreach ($dir_struct as $_dir => $_dir_struct)
-			{
-				$this->create_directory($directory . '/' . $_dir, $_dir_struct);
-			}
-		}
-	}
-
-	function collect_diff_files($diff_filename, $package_name)
-	{
-		$diff_result = $binary = array();
-		$diff_contents = file($diff_filename);
-
-		$special_diff_contents = array();
-
-		foreach ($diff_contents as $num => $line)
-		{
-			$line = trim($line);
-
-			if (!$line)
-			{
-				continue;
-			}
-
-			// Special diff content?
-			if (strpos($line, 'diff ' . $this->diff_options . ' ') === 0 || strpos($line, '*** ') === 0 || strpos($line, '--- ') === 0 || (strpos($line, ' Exp $') !== false && strpos($line, '$Id:') !== false))
-			{
-				$special_diff_contents[] = $line;
-			}
-			else if (strpos($line, 'diff ' . $this->diff_options . ' ') === 0 || strpos($line, '*** ') === 0 || strpos($line, '--- ') === 0 || (strpos($line, ' Exp $') !== false && strpos($line, '$Id:') !== false) || (strpos($line, ' $') !== false && strpos($line, '$Id:') !== false))
-			{
-				$special_diff_contents[] = $line;
-			}
-
-			// Is diffing line?
-			if (strstr($line, 'diff ' . $this->diff_options . ' '))
-			{
-				$next_line = $diff_contents[$num+1];
-				if (strpos($next_line, '***') === 0)
-				{
-	//			*** phpbb208/admin/admin_board.php	Sat Jul 10 20:16:26 2004
-					$next_line = explode("\t", $next_line);
-					$next_line = trim($next_line[0]);
-					$next_line = str_replace('*** ' . $package_name . '/', '', $next_line);
-					$diff_result[] = $next_line;
-				}
-			}
-
-			// Is binary?
-			if (preg_match('/^Binary files ' . $package_name . '\/(.*) and [a-z0-9_-]+\/\1 differ/i', $line, $match))
-			{
-				$binary[] = trim($match[1]);
-			}
-		}
-
-		// Now go through the list again and find out which files have how many changes...
-		$num_changes = array();
-
-	/*  [1070] => diff -crN phpbb200/includes/usercp_avatar.php phpbb2023/includes/usercp_avatar.php
-		[1071] => *** phpbb200/includes/usercp_avatar.php	Sat Jul 10 20:16:13 2004
-		[1072] => --- phpbb2023/includes/usercp_avatar.php	Wed Feb  6 22:28:04 2008
-		[1073] => *** 6,12 ****
-		[1074] => !  *   $Id$
-		[1075] => --- 6,12 ----
-		[1076] => *** 51,59 ****
-		[1077] => --- 51,60 ----
-		[1078] => *** 62,80 ****
-		[1079] => --- 63,108 ----
-		[1080] => *** 87,97 ****
-	*/
-		while (($line = array_shift($special_diff_contents)) !== NULL)
-		{
-			$line = trim($line);
-
-			if (!$line)
-			{
-				continue;
-			}
-
-			// Is diffing line?
-			if (strstr($line, 'diff ' . $this->diff_options . ' '))
-			{
-				$next_line = array_shift($special_diff_contents);
-				if (strpos($next_line, '*** ') === 0)
-				{
-	//			*** phpbb208/admin/admin_board.php	Sat Jul 10 20:16:26 2004
-					$next_line = explode("\t", $next_line);
-					$next_line = trim($next_line[0]);
-					$next_line = str_replace('*** ' . $package_name . '/', '', $next_line);
-
-					$is_reached = false;
-					$prev_line = '';
-
-					while (!$is_reached)
-					{
-						$line = array_shift($special_diff_contents);
-
-						if (strpos($line, 'diff ' . $this->diff_options) === 0 || empty($special_diff_contents))
-						{
-							$is_reached = true;
-							array_unshift($special_diff_contents, $line);
-							continue;
-						}
-
-						if (strpos($line, '*** ') === 0 && strpos($line, ' ****') !== false)
-						{
-							$is_comment = false;
-							while (!(strpos($line, '--- ') === 0 && strpos($line, ' ----') !== false))
-							{
-								$line = array_shift($special_diff_contents);
-								if (strpos($line, ' Exp $') !== false || strpos($line, '$Id:') !== false)
-								{
-									$is_comment = true;
-								}
-							}
-
-							if (!$is_comment)
-							{
-								if (!isset($num_changes[$next_line]))
-								{
-									$num_changes[$next_line] = 1;
-								}
-								else
-								{
-									$num_changes[$next_line]++;
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-		// Now remove those results not having changes
-		$return = array();
-
-		foreach ($diff_result as $key => $value)
-		{
-			if (isset($num_changes[$value]))
-			{
-				$return[] = $value;
-			}
-		}
-
-		foreach ($binary as $value)
-		{
-			$return[] = $value;
-		}
-
-		$diff_result = $return;
-		unset($return);
-		unset($special_diff_contents);
-
-		$result = array(
-			'files'		=> array(),
-			'binary'	=> array(),
-			'all'		=> $diff_result,
-		);
-
-		$binary_extensions = array('gif', 'jpg', 'jpeg', 'png', 'ttf');
-
-		// Split into file and binary
-		foreach ($diff_result as $filename)
-		{
-			if (strpos($filename, '.') === false)
-			{
-				$result['files'][] = $filename;
-				continue;
-			}
-
-			$extension = explode('.', $filename);
-			$extension = array_pop($extension);
-
-			if (in_array($extension, $binary_extensions))
-			{
-				$result['binary'][] = $filename;
-			}
-			else
-			{
-				$result['files'][] = $filename;
-			}
-		}
-
-		return $result;
-	}
-}
--- a/build/diff_class.php
+++ b/build/diff_class.php
--- a/build/package.php
+++ b/build/package.php
@@ -1,521 +0,0 @@
-#!/usr/bin/env php
-<?php
-/**
-*
-* @package build
-* @version $Id$
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-// The only thing i need to adjust. ;)
-// Please always add the latest version number to the end
-// Only have 5 releases here...
-// If RC8 drops remove the install/data directory
-//$versions = array('3.0.2', '3.0.3-RC1', '3.0.3', '3.0.4-RC1', '3.0.4', '3.0.5-RC1', '3.0.5', '3.0.6-RC1', '3.0.6-RC2', '3.0.6-RC3');
-//$versions = array('3.0.2', '3.0.3', '3.0.4', '3.0.5', '3.0.6', '3.0.7-RC1', '3.0.7');
-$versions = array('3.0.2', '3.0.3-RC1', '3.0.3', '3.0.4-RC1', '3.0.4', '3.0.5-RC1', '3.0.5', '3.0.6-RC1', '3.0.6-RC2', '3.0.6-RC3', '3.0.6-RC4', '3.0.6', '3.0.7-RC1', '3.0.7-RC2');
-$verbose = false;
-
-require('build_helper.php');
-
-$package = new build_package($versions, $verbose);
-
-echo "Building Release Packages\n";
-echo "Now all three package types (patch, files, release) are built as well as the update package (update).\n";
-
-$package->begin_status('Remove temporary files');
-
-// Cleanup...
-$package->run_command('rm -Rv ' . $package->get('dest_dir'));
-$package->run_command('rm -Rv ' . $package->get('diff_dir'));
-$package->run_command('rm -Rv ' . $package->get('patch_directory'));
-$package->run_command('rm -Rv ' . $package->get('files_directory'));
-$package->run_command('rm -Rv ' . $package->get('update_directory'));
-$package->run_command('rm -Rv ' . $package->get('release_directory'));
-
-$package->begin_status('Create new directories');
-
-// Make sure the directories got removed
-while (file_exists($package->get('update_directory')))
-{
-	sleep(1);
-}
-
-if (!file_exists($package->get('dest_dir')))
-{
-	$package->run_command('mkdir ' . $package->get('dest_dir'));
-}
-
-if (!file_exists($package->get('diff_dir')))
-{
-	$package->run_command('mkdir ' . $package->get('diff_dir'));
-}
-
-if (!file_exists($package->get('patch_directory')))
-{
-	$package->run_command('mkdir ' . $package->get('patch_directory'));
-}
-
-if (!file_exists($package->get('files_directory')))
-{
-	$package->run_command('mkdir ' . $package->get('files_directory'));
-}
-
-if (!file_exists($package->get('update_directory')))
-{
-	$package->run_command('mkdir ' . $package->get('update_directory'));
-}
-
-if (!file_exists($package->get('release_directory')))
-{
-	$package->run_command('mkdir ' . $package->get('release_directory'));
-}
-
-$package->begin_status('Copy release files to clean release directory');
-
-// Create config.php file
-$package->run_command('touch ' . $package->get('dest_dir') . '/config.php');
-//$package->run_command('sudo chown www-data:www-data ' . $package->get('dest_dir') . '/config.php');
-
-// Create new directory structure
-foreach ($package->clean_directory_structure as $dir => $dir_struct)
-{
-	$package->create_directory($package->get('dest_dir') . '/' . $dir, $dir_struct);
-}
-
-// First step is to copy the new version over (clean structure)
-foreach ($package->files_to_copy as $file)
-{
-	$source_file = $package->locations['new_version'] . $file;
-	$dest_file = $package->get('dest_dir') . '/' . $file;
-
-	$package->run_command("cp -p $source_file $dest_file");
-}
-
-// fix line endings
-chdir($package->get('dest_dir'));
-$package->run_command($package->locations['new_version'] . 'develop/fix_files.sh');
-
-// Now clean up the permissions
-$package->begin_status('Adjust permissions');
-
-$package->adjust_permissions($package->get('dest_dir'));
-
-// Now create a version for diffing the version - copy the tree over to old_versions...
-$package->begin_status('Create diff directory for obtaining file differences');
-
-$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/* ' . $package->get('diff_dir'));
-$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/.htaccess ' . $package->get('diff_dir'));
-
-// Cleanup diff directory (only contents to diff)
-foreach ($package->remove_from_diff_structure as $remove_dir)
-{
-	$package->run_command('rm -Rv ' . $package->get('diff_dir') . '/' . $remove_dir);
-}
-
-// Now, first of all we need to rebuild all old packages we want to support
-foreach ($package->old_packages as $package_name => $tag_name)
-{
-	$package->begin_status('Create old packages directory for diffing to ' . $package_name);
-
-	chdir($package->locations['old_versions']);
-
-	if (is_dir($package->locations['old_versions'] . $package_name))
-	{
-		$package->run_command('rm -Rv ' . $package->locations['old_versions'] . $package_name);
-	}
-
-	// Now, create a new one...
-	$tag_name = 'release_' . str_replace(array('.', '_to_'), array('_', ''), $tag_name);
-
-	$package->run_command('svn export --non-interactive http://code.phpbb.com/svn/phpbb/tags/' . $tag_name . '/phpBB/ ' . $package_name);
-
-	$location = $package->locations['old_versions'] . $package_name;
-	chdir($location . '/');
-
-	$package->run_command($package->locations['new_version'] . 'develop/fix_files.sh');
-
-	// Now clean up the permissions
-	$package->begin_status('Adjust permissions for package ' . $package_name);
-
-	$package->adjust_permissions($location);
-
-	// Cleanup diff directory (only contents to diff)
-	foreach ($package->remove_from_diff_structure as $remove_dir)
-	{
-		$package->run_command('rm -Rv ' . $location . '/' . $remove_dir);
-	}
-}
-
-// Go trough all versions making a diff if we even have old versions
-// For phpBB 3.0.x we might choose a different update method, rendering the things below useless...
-if (sizeof($package->old_packages))
-{
-	chdir($package->locations['old_versions']);
-
-	// This array is for holding the filenames change
-	$diff_file_changes = array();
-
-	foreach ($package->old_packages as $_package_name => $dest_package_filename)
-	{
-		$package->begin_status('Creating patch/diff files for phpBB-' . $dest_package_filename . $package->get('new_version_number'));
-
-		$dest_package_filename = $package->get('patch_directory') . '/phpBB-' . $dest_package_filename . $package->get('new_version_number') . '.patch';
-		$package->run_command('diff ' . $package->diff_options . ' ' . $_package_name . ' ' . $package->get('simple_name') . ' > ' . $dest_package_filename);
-
-		// Parse this diff to determine file changes from the checked versions and save them
-		$diff_file_changes[$_package_name] = $package->collect_diff_files($dest_package_filename, $_package_name);
-	}
-
-	// Now put those files determined within the correct directories
-	foreach ($diff_file_changes as $_package_name => $file_contents)
-	{
-		$package->begin_status('Creating files-only informations for ' . $package->old_packages[$_package_name] . $package->get('new_version_number'));
-
-		$dest_filename_dir = $package->get('files_directory') . '/' . $package->old_packages[$_package_name] . $package->get('new_version_number');
-
-		if (!file_exists($dest_filename_dir))
-		{
-			$package->run_command('mkdir ' . $dest_filename_dir);
-		}
-
-		// Now copy the file contents
-		foreach ($file_contents['all'] as $file)
-		{
-			$source_filename = $package->get('dest_dir') . '/' . $file;
-			$dest_filename = $dest_filename_dir . '/' . $file;
-
-			// Create Directories along the way?
-			$file = explode('/', $file);
-			// Remove filename portion
-			$file[sizeof($file)-1] = '';
-
-			chdir($dest_filename_dir);
-			foreach ($file as $entry)
-			{
-				$entry = trim($entry);
-				if ($entry)
-				{
-					if (!file_exists('./' . $entry))
-					{
-						$package->run_command('mkdir ' . $entry);
-					}
-					chdir('./' . $entry);
-				}
-			}
-
-			$package->run_command('cp ' . $source_filename . ' ' . $dest_filename);
-		}
-	}
-
-	// Because there might be binary changes, we re-create the patch files... without parsing file differences.
-	$package->run_command('rm -Rv ' . $package->get('patch_directory'));
-
-	if (!file_exists($package->get('patch_directory')))
-	{
-		$package->run_command('mkdir ' . $package->get('patch_directory'));
-	}
-
-	chdir($package->locations['old_versions']);
-
-	foreach ($package->old_packages as $_package_name => $dest_package_filename)
-	{
-		$package->begin_status('Creating patch/diff files for phpBB-' . $dest_package_filename . $package->get('new_version_number'));
-
-		$dest_package_filename = $package->get('patch_directory') . '/phpBB-' . $dest_package_filename . $package->get('new_version_number') . '.patch';
-		$package->run_command('diff ' . $package->diff_options_long . ' ' . $_package_name . ' ' . $package->get('simple_name') . ' > ' . $dest_package_filename);
-	}
-
-	$packages = $diff_file_changes;
-
-	foreach ($packages as $_package_name => $file_contents)
-	{
-		$package->begin_status('Building specific update files for ' . $package->old_packages[$_package_name] . $package->get('new_version_number'));
-
-		$dest_filename_dir = $package->get('update_directory') . '/' . $package->old_packages[$_package_name] . $package->get('new_version_number');
-
-		if (!file_exists($dest_filename_dir))
-		{
-			$package->run_command('mkdir ' . $dest_filename_dir);
-		}
-
-		$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/docs ' . $dest_filename_dir);
-		$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/install ' . $dest_filename_dir);
-
-		$package->run_command('mkdir ' . $dest_filename_dir . '/install/update');
-		$package->run_command('mkdir ' . $dest_filename_dir . '/install/update/old');
-		$package->run_command('mkdir ' . $dest_filename_dir . '/install/update/new');
-
-		// Remove some files
-		$package->run_command('rm -v ' . $dest_filename_dir . '/install/install_install.php');
-		$package->run_command('rm -v ' . $dest_filename_dir . '/install/install_convert.php');
-		$package->run_command('rm -Rv ' . $dest_filename_dir . '/install/schemas');
-		$package->run_command('rm -Rv ' . $dest_filename_dir . '/install/convertors');
-
-		foreach ($file_contents['all'] as $index => $file)
-		{
-			if (strpos($file, 'recode_cjk') !== false)
-			{
-				unset($file_contents['all'][$index]);
-			}
-		}
-
-		// First of all, fill the 'old' directory
-		foreach ($file_contents['all'] as $file)
-		{
-			$source_filename = $package->locations['old_versions'] . $_package_name . '/' . $file;
-			$dest_filename = $dest_filename_dir . '/install/update/old/' . $file;
-
-			if (!file_exists($source_filename))
-			{
-				continue;
-			}
-
-			// Create Directories along the way?
-			$file = explode('/', $file);
-			// Remove filename portion
-			$file[sizeof($file)-1] = '';
-
-			chdir($dest_filename_dir . '/install/update/old');
-			foreach ($file as $entry)
-			{
-				$entry = trim($entry);
-				if ($entry)
-				{
-					if (!file_exists('./' . $entry))
-					{
-						$package->run_command('mkdir ' . $entry);
-					}
-					chdir('./' . $entry);
-				}
-			}
-
-			$package->run_command('cp ' . $source_filename . ' ' . $dest_filename);
-		}
-
-		// Then fill the 'new' directory
-		foreach ($file_contents['all'] as $file)
-		{
-			$source_filename = $package->locations['old_versions'] . $package->get('simple_name') . '/' . $file;
-			$dest_filename = $dest_filename_dir . '/install/update/new/' . $file;
-
-			if (!file_exists($source_filename))
-			{
-				continue;
-			}
-
-			// Create Directories along the way?
-			$file = explode('/', $file);
-			// Remove filename portion
-			$file[sizeof($file)-1] = '';
-
-			chdir($dest_filename_dir . '/install/update/new');
-			foreach ($file as $entry)
-			{
-				$entry = trim($entry);
-				if ($entry)
-				{
-					if (!file_exists('./' . $entry))
-					{
-						$package->run_command('mkdir ' . $entry);
-					}
-					chdir('./' . $entry);
-				}
-			}
-
-			$package->run_command('cp ' . $source_filename . ' ' . $dest_filename);
-		}
-
-		// Build index.php file for holding the file structure
-		$index_contents = '<?php
-
-if (!defined(\'IN_PHPBB\'))
-{
-	exit;
-}
-
-// Set update info with file structure to update
-$update_info = array(
-	\'version\'	=> array(\'from\' => \'' . str_replace('_to_', '', $package->old_packages[$_package_name]) . '\', \'to\' => \'' . $package->get('new_version_number') . '\'),
-';
-
-		if (sizeof($file_contents['all']))
-		{
-			$index_contents .= '\'files\'		=> array(\'' . implode("',\n\t'", $file_contents['all']) . '\'),
-';
-		}
-		else
-		{
-			$index_contents .= '\'files\'		=> array(),
-';
-		}
-
-		if (sizeof($file_contents['binary']))
-		{
-			$index_contents .= '\'binary\'		=> array(\'' . implode("',\n\t'", $file_contents['binary']) . '\'),
-';
-		}
-		else
-		{
-			$index_contents .= '\'binary\'		=> array(),
-';
-		}
-
-		$index_contents .= ');
-
-?' . '>';
-
-		$fp = fopen($dest_filename_dir . '/install/update/index.php', 'wt');
-		fwrite($fp, $index_contents);
-		fclose($fp);
-	}
-	unset($diff_file_changes);
-
-	$package->begin_status('Clean up all install files');
-
-	// Copy the install files to their respective locations
-	$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/docs ' . $package->get('patch_directory'));
-	$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/install ' . $package->get('patch_directory'));
-
-	// Remove some files
-	chdir($package->get('patch_directory') . '/install');
-
-	$package->run_command('rm -v install_install.php');
-	$package->run_command('rm -v install_update.php');
-	$package->run_command('rm -v install_convert.php');
-	$package->run_command('rm -Rv schemas');
-	$package->run_command('rm -Rv convertors');
-}
-
-// Build Main phpBB Release
-$compress_programs = array(
-//	'tar.gz'	=> 'tar -czf',
-	'tar.bz2'	=> 'tar -cjf',
-	'zip'		=> 'zip -r'
-);
-
-if (sizeof($package->old_packages))
-{
-	// Build Patch Files
-	chdir($package->get('patch_directory'));
-
-	foreach ($compress_programs as $extension => $compress_command)
-	{
-		$package->begin_status('Packaging phpBB Patch Files for ' . $extension);
-		$package->run_command('rm -v ../release_files/' . $package->get('release_filename') . '-patch.' . $extension);
-
-		// Build Package
-		$package->run_command($compress_command . ' ../release_files/' . $package->get('release_filename') . '-patch.' . $extension . ' *');
-
-		// Build MD5 Sum
-		$package->run_command('md5sum ../release_files/' . $package->get('release_filename') . '-patch.' . $extension . ' > ../release_files/' . $package->get('release_filename') . '-patch.' . $extension . '.md5');
-	}
-
-	// Build Files Package
-	chdir($package->get('files_directory'));
-
-	foreach ($compress_programs as $extension => $compress_command)
-	{
-		$package->begin_status('Packaging phpBB Files for ' . $extension);
-
-		$package->run_command('rm -v ../release_files/' . $package->get('release_filename') . '-files.' . $extension);
-		$package->run_command('mkdir ' . $package->get('files_directory') . '/release');
-		$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/docs ' . $package->get('files_directory') . '/release');
-		$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/install ' . $package->get('files_directory') . '/release');
-
-		$package->run_command('rm -v ' . $package->get('files_directory') . '/release/install/install_install.php');
-		$package->run_command('rm -v ' . $package->get('files_directory') . '/release/install/install_update.php');
-		$package->run_command('rm -v ' . $package->get('files_directory') . '/release/install/install_convert.php');
-		$package->run_command('rm -Rv ' . $package->get('files_directory') . '/release/install/schemas');
-		$package->run_command('rm -Rv ' . $package->get('files_directory') . '/release/install/convertors');
-
-		// Pack files
-		foreach ($package->old_packages as $_package_name => $package_path)
-		{
-			chdir($package_path . $package->get('new_version_number'));
-			$command = ($extension == 'zip') ? 'zip -r' : 'tar cf';
-			$_ext = ($extension == 'zip') ? 'zip' : 'tar';
-			$package->run_command("$command ../release/phpBB-$package_path" . $package->get('new_version_number') . ".$_ext *");
-			chdir('..');
-		}
-
-		chdir('./release');
-		$package->run_command("$compress_command ../../release_files/" . $package->get('release_filename') . '-files.' . $extension . ' *');
-		// Build MD5 Sum
-		$package->run_command('md5sum ../../release_files/' . $package->get('release_filename') . '-files.' . $extension . ' > ../../release_files/' . $package->get('release_filename') . '-files.' . $extension . '.md5');
-		chdir('..');
-
-		$package->run_command('rm -Rv ' . $package->get('files_directory') . '/release');
-	}
-
-	// Build Update Package
-	foreach ($compress_programs as $extension => $compress_command)
-	{
-		chdir($package->get('update_directory'));
-
-		$package->begin_status('Packaging phpBB Update for ' . $extension);
-
-		$package->run_command('rm -v ../release_files/' . $package->get('release_filename') . '-update.' . $extension);
-		$package->run_command('mkdir ' . $package->get('update_directory') . '/release');
-
-		// Pack update files
-		$packages = $package->old_packages;
-
-		foreach ($packages as $_package_name => $package_path)
-		{
-			chdir($package_path . $package->get('new_version_number'));
-
-			$package->run_command('rm -v install/install_install.php');
-			$package->run_command('rm -v install/install_convert.php');
-			$package->run_command('rm -v includes/utf/data/recode_cjk.php');
-			$package->run_command('rm -Rv install/schemas');
-			$package->run_command('rm -Rv install/convertors');
-
-			$command = ($extension == 'zip') ? 'zip -r' : 'tar cf';
-			$_ext = ($extension == 'zip') ? 'zip' : 'tar';
-			$package->run_command("$command ../release/$package_path" . $package->get('new_version_number') . ".$_ext *");
-			chdir('..');
-
-			$last_version = $package_path . $package->get('new_version_number');
-
-//			chdir('./release');
-//			$package->run_command("$compress_command ../../release_files/" . $package->get('release_filename') . '-update.' . $extension . ' *');
-//			chdir('..');
-
-			chdir('./' . $last_version);
-			// Copy last package over...
-			$package->run_command('rm -v ../release_files/phpBB-' . $last_version . ".$extension");
-			$package->run_command("$compress_command ../../release_files/phpBB-$last_version.$extension *");
-
-			// Build MD5 Sum
-			$package->run_command("md5sum ../../release_files/phpBB-$last_version.$extension > ../../release_files/phpBB-$last_version.$extension.md5");
-			chdir('..');
-		}
-
-		$package->run_command('rm -Rv ' . $package->get('update_directory') . '/release');
-	}
-
-}
-
-// Delete updater and convertor from main archive
-chdir($package->get('dest_dir') . '/install');
-
-// $package->run_command('rm -v database_update.php');
-$package->run_command('rm -v install_update.php');
-
-chdir($package->locations['package_dir']);
-foreach ($compress_programs as $extension => $compress_command)
-{
-	$package->begin_status('Packaging phpBB for ' . $extension);
-	$package->run_command('rm -v ./release_files/' . $package->get('release_filename') . ".{$extension}");
-
-	// Build Package
-	$package->run_command("$compress_command ./release_files/" . $package->get('release_filename') . '.' . $extension . ' ' . $package->get('package_name'));
-
-	// Build MD5 Sum
-	$package->run_command('md5sum ./release_files/' . $package->get('release_filename') . '.' . $extension . ' > ./release_files/' . $package->get('release_filename') . '.' . $extension . '.md5');
-}
-
-echo "Done.\n";
--- a/phpBB/.htaccess
+++ b/phpBB/.htaccess
@@ -1,13 +1,3 @@
-#
-# Uncomment the statement below if you want to make use of
-# HTTP authentication and it does not already work.
-# This could be required if you are for example using PHP via Apache CGI.
-#
-#<IfModule mod_rewrite.c>
-#RewriteEngine on
-#RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
-#</IfModule>
-
 <Files "config.php">
 Order Allow,Deny
 Deny from All
--- a/phpBB/adm/images/progress_bar.gif
+++ b/phpBB/adm/images/progress_bar.gif
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -45,8 +45,8 @@ define('IN_ADMIN', true);
 $phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : './';

 // 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;
+$safe_mode		= (@ini_get('safe_mode') || @strtolower(ini_get('safe_mode')) == 'on') ? true : false;
+$file_uploads	= (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on') ? true : false;
 $module_id		= request_var('i', '');
 $mode			= request_var('mode', '');

@@ -116,7 +116,6 @@ function adm_page_header($page_title)
 		'ROOT_PATH'				=> $phpbb_admin_path,

 		'U_LOGOUT'				=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout'),
-		'U_ADM_LOGOUT'			=> append_sid("{$phpbb_admin_path}index.$phpEx", 'action=admlogout'),
 		'U_ADM_INDEX'			=> append_sid("{$phpbb_admin_path}index.$phpEx"),
 		'U_INDEX'				=> append_sid("{$phpbb_root_path}index.$phpEx"),

@@ -131,7 +130,7 @@ function adm_page_header($page_title)
 		'ICON_MOVE_UP'				=> '<img src="' . $phpbb_admin_path . 'images/icon_up.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />',
 		'ICON_MOVE_UP_DISABLED'		=> '<img src="' . $phpbb_admin_path . 'images/icon_up_disabled.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />',
 		'ICON_MOVE_DOWN'			=> '<img src="' . $phpbb_admin_path . 'images/icon_down.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />',
-		'ICON_MOVE_DOWN_DISABLED'	=> '<img src="' . $phpbb_admin_path . 'images/icon_down_disabled.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />',
+		'ICON_MOVE_DOWN_DISABLED'	=> '<img src="' . $phpbb_admin_path . 'images/icon_down_disabled.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />',		
 		'ICON_EDIT'					=> '<img src="' . $phpbb_admin_path . 'images/icon_edit.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />',
 		'ICON_EDIT_DISABLED'		=> '<img src="' . $phpbb_admin_path . 'images/icon_edit_disabled.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />',
 		'ICON_DELETE'				=> '<img src="' . $phpbb_admin_path . 'images/icon_delete.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />',
@@ -185,7 +184,7 @@ function adm_page_footer($copyright_html = true)
 				{
 					global $base_memory_usage;
 					$memory_usage -= $base_memory_usage;
-					$memory_usage = get_formatted_filesize($memory_usage);
+					$memory_usage = ($memory_usage >= 1048576) ? round((round($memory_usage / 1048576 * 100) / 100), 2) . ' ' . $user->lang['MB'] : (($memory_usage >= 1024) ? round((round($memory_usage / 1024 * 100) / 100), 2) . ' ' . $user->lang['KB'] : $memory_usage . ' ' . $user->lang['BYTES']);

 					$debug_output .= ' | Memory Usage: ' . $memory_usage;
 				}
@@ -263,12 +262,6 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 	$tpl = '';
 	$name = 'config[' . $config_key . ']';

-	// Make sure there is no notice printed out for non-existent config options (we simply set them)
-	if (!isset($new[$config_key]))
-	{
-		$new[$config_key] = '';
-	}
-
 	switch ($tpl_type[0])
 	{
 		case 'text':
@@ -308,7 +301,7 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)

 		case 'select':
 		case 'custom':
-
+			
 			$return = '';

 			if (isset($vars['method']))
@@ -347,7 +340,7 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 			{
 				$args = array($new[$config_key], $key);
 			}
-
+			
 			$return = call_user_func_array($call, $args);

 			if ($tpl_type[0] == 'select')
@@ -374,15 +367,11 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 }

 /**
-* 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.
+* Going through a config array and validate values, writing errors to $error.
 */
 function validate_config_vars($config_vars, &$cfg_array, &$error)
 {
 	global $phpbb_root_path, $user;
-	$type	= 0;
-	$min	= 1;
-	$max	= 2;

 	foreach ($config_vars as $config_name => $config_definition)
 	{
@@ -396,42 +385,15 @@ function validate_config_vars($config_vars, &$cfg_array, &$error)
 			continue;
 		}

-		$validator = explode(':', $config_definition['validate']);
-
-		// Validate a bit. ;) (0 = type, 1 = min, 2= max)
-		switch ($validator[$type])
+		// Validate a bit. ;) String is already checked through request_var(), therefore we do not check this again
+		switch ($config_definition['validate'])
 		{
-			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($user->lang['SETTING_TOO_SHORT'], $user->lang[$config_definition['lang']], $validator[$min]);
-				}
-				else if (isset($validator[$max]) && $length > $validator[2])
-				{
-					$error[] = sprintf($user->lang['SETTING_TOO_LONG'], $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($user->lang['SETTING_TOO_LOW'], $user->lang[$config_definition['lang']], $validator[$min]);
-				}
-				else if (isset($validator[$max]) && $cfg_array[$config_name] > $validator[$max])
-				{
-					$error[] = sprintf($user->lang['SETTING_TOO_BIG'], $user->lang[$config_definition['lang']], $validator[$max]);
-				}
 			break;

 			// Absolute path
@@ -546,62 +508,4 @@ function validate_config_vars($config_vars, &$cfg_array, &$error)
 	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)
-{
-	global $user;
-
-	$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($user->lang['SETTING_TOO_LONG'], $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($user->lang['SETTING_TOO_LOW'], $user->lang[$value['lang']], $min);
-				}
-				else if ($value['value'] > $max)
-				{
-					$error[] = sprintf($user->lang['SETTING_TOO_BIG'], $user->lang[$value['lang']], $max);
-				}
-			break;
-		}
-	}
-}
-
 ?>
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -122,11 +122,11 @@
 			{
 				if (newimage == 'no_image')
 				{
-					document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}images/spacer.gif";
+					document.image_upload_icon.src = "{PHPBB_ROOT_PATH}images/spacer.gif";
 				}
 				else
 				{
-					document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}{IMG_PATH}/" + newimage;
+					document.image_upload_icon.src = "{PHPBB_ROOT_PATH}{IMG_PATH}/" + newimage;
 				}
 			}

@@ -192,7 +192,7 @@
 			<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>
+			<dd>&nbsp;<img <!-- IF S_NO_IMAGE -->src="{PHPBB_ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> name="image_upload_icon" alt="" title="" />&nbsp;</dd>
 		</dl>
 		<dl>
 			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}:</label></dt>
--- a/phpBB/adm/style/acp_ban.html
+++ b/phpBB/adm/style/acp_ban.html
@@ -93,15 +93,15 @@
 	</dl>
 	<dl>
 		<dt><label for="unbanlength">{L_BAN_LENGTH}:</label></dt>
-		<dd><input style="border: 0;" type="text" class="text full" readonly="readonly" name="unbanlength" id="unbanlength" /></dd>
+		<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" readonly="readonly" name="unbanreason" id="unbanreason" rows="5" cols="80">&nbsp;</textarea></dd>
+		<dd><input style="border: 0;" type="text" class="text full" disabled="disabled" name="unbanreason" id="unbanreason" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="unbangivereason">{L_BAN_GIVE_REASON}:</label></dt>
-		<dd><textarea style="border: 0;" class="text full" readonly="readonly" name="unbangivereason" id="unbangivereason" rows="5" cols="80">&nbsp;</textarea></dd>
+		<dd><input style="border: 0;" type="text" class="text full" disabled="disabled" name="unbangivereason" id="unbangivereason" /></dd>
 	</dl>

 	<p class="submit-buttons">
--- a/phpBB/adm/style/acp_bbcodes.html
+++ b/phpBB/adm/style/acp_bbcodes.html
@@ -103,10 +103,6 @@
 			<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>
--- a/phpBB/adm/style/acp_captcha.html
+++ b/phpBB/adm/style/acp_captcha.html
@@ -17,53 +17,52 @@
 	<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="max_reg_attempts">{L_REG_LIMIT}:</label><br /><span>{L_REG_LIMIT_EXPLAIN}</span></dt>
-	<dd><input id="max_reg_attempts" type="text" size="4" maxlength="4" name="max_reg_attempts" value="{REG_LIMIT}" /></dd>
-</dl>
-<dl>
-	<dt><label for="max_login_attempts">{L_MAX_LOGIN_ATTEMPTS}:</label><br /><span>{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}</span></dt>
-	<dd><input id="max_login_attempts" type="text" size="4" maxlength="4" name="max_login_attempts" value="{MAX_LOGIN_ATTEMPTS}" /></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>
+<!-- IF GD -->
 <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>
+	<dt><label for="captcha_gd">{L_CAPTCHA_GD}:</label><br /><span>{L_CAPTCHA_GD_EXPLAIN}</span></dt>
+	<dd><label><input id="captcha_gd" name="captcha_gd" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+		<label><input name="captcha_gd" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 </dl>
-</fieldset>
-
-<fieldset>
-<legend>{L_AVAILABLE_CAPTCHAS}</legend>
 <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>
+	<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>
- <!-- IF S_CAPTCHA_HAS_CONFIG -->
 <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>
+	<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>
 <!-- ENDIF -->
-</fieldset>

-<!-- IF CAPTCHA_PREVIEW_TPL -->
+</fieldset>
 <fieldset>
 	<legend>{L_PREVIEW}</legend>
-<!-- INCLUDE {CAPTCHA_PREVIEW_TPL} -->
-</fieldset>
+<!-- IF PREVIEW -->
+	<div class="successbox">
+		<h3>{L_WARNING}</h3>
+		<p>{L_CAPTCHA_PREVIEW_MSG}</p>
+	</div>
 <!-- ENDIF -->
+<dl>
+	<dt><label for="captcha_preview">{L_PREVIEW}:</label><br /><span>{L_CAPTCHA_PREVIEW_EXPLAIN}</span></dt>
+	<dd><img src="{CAPTCHA_PREVIEW}" alt="{L_PREVIEW}" <!-- IF CAPTCHA_GD_PREVIEWED -->width="360" height="96"<!-- ELSE --> width="320" height="50"<!-- ENDIF --> id="captcha_preview" /></dd>
+</dl>
+</fieldset>

-<fieldset>
-	<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-	<p class="submit-buttons">
-		<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;
-	</p>
+<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 class="button2" type="submit" id="preview" name="preview" value="{L_PREVIEW}" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
--- a/phpBB/adm/style/acp_database.html
+++ b/phpBB/adm/style/acp_database.html
@@ -7,9 +7,8 @@

 	<p>{L_ACP_RESTORE_EXPLAIN}</p>

-	<!-- IF .files -->
 	<form id="acp_backup" method="post" action="{U_ACTION}">
-
+	
 	<fieldset>
 		<legend>{L_RESTORE_OPTIONS}</legend>
 	<dl>
@@ -17,19 +16,16 @@
 		<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}
+	<!-- IF .files -->
+		<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>
+	<!-- ENDIF -->
+		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
-	<!-- ELSE -->
-		<div class="errorbox">
-			<p>{L_ACP_NO_ITEMS}</p>
-		</div>
-	<!-- ENDIF -->

 <!-- ELSE -->
 	<h1>{L_ACP_BACKUP}</h1>
@@ -70,10 +66,9 @@
 	</dl>
 	<dl>
 		<dt><label for="where">{L_ACTION}:</label></dt>
-		<dd>
-			<label><input id="where" 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>
+		<dd><label><input type="radio" class="radio" name="where" value="store_and_download" id="where" checked="checked" /> {L_STORE_AND_DOWNLOAD}</label>
+			<label><input type="radio" class="radio" name="where" value="store" /> {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>
@@ -82,7 +77,7 @@
 			<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>
+		<dd><a href="#" onclick="selector(true)">{L_SELECT_ALL}</a> :: <a href="#" onclick="selector(false)">{L_DESELECT_ALL}</a></dd>
 	</dl>

 	<p class="submit-buttons">
--- a/phpBB/adm/style/acp_email.html
+++ b/phpBB/adm/style/acp_email.html
@@ -44,7 +44,7 @@
 </dl>

 <p class="submit-buttons">
-	<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_EMAIL}" />&nbsp;
+	<input class="button1" type="submit" id="submit" name="submit" value="{L_EMAIL}" />&nbsp;
 	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 </p>
 {S_FORM_TOKEN}
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -96,7 +96,7 @@

 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>

-	<h1>{L_TITLE} <!-- IF FORUM_NAME -->:: {FORUM_NAME}<!-- ENDIF --></h1>
+	<h1>{L_TITLE} :: {FORUM_NAME}</h1>

 	<p>{L_FORUM_EDIT_EXPLAIN}</p>

@@ -202,11 +202,6 @@
 			<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>
@@ -217,11 +212,6 @@
 			<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_quick_reply">{L_ENABLE_QUICK_REPLY}:</label><br /><span>{L_ENABLE_QUICK_REPLY_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="enable_quick_reply" value="1"<!-- IF S_ENABLE_QUICK_REPLY --> id="enable_quick_reply" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_quick_reply" value="0"<!-- IF not S_ENABLE_QUICK_REPLY --> id="enable_quick_reply" 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>
@@ -449,13 +439,13 @@
 					<!-- 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 -->
+					<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}: <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}: <b>{forums.FORUM_POSTS}</b></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 -->
+					<!-- 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/phpBB/adm/style/acp_forums_copy_perm.html
+++ b/phpBB/adm/style/acp_forums_copy_perm.html
@@ -1,22 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<h1>{L_COPY_PERMISSIONS}</h1>
-
-<p>{L_COPY_PERMISSIONS_EXPLAIN}</p>
-<p>{L_ACL_LINK}</p>
-
-<form id="confirm" method="post" action="{S_COPY_ACTION}">
-
-<fieldset>
-	<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>
-	<div style="text-align: center;">{S_FORM_TOKEN}{S_HIDDEN_FIELDS}
-		<input type="submit" name="update" value="{L_CONTINUE}" class="button2" />&nbsp;
-	</div>
-</fieldset>
-
-</form>
-
-<!-- INCLUDE overall_footer.html -->
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -55,40 +55,28 @@
 	</fieldset>

 	<fieldset>
-		<legend>{L_GROUP_OPTIONS_SAVE}</legend>
+		<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" value="1" class="radio" id="group_founder_manage"{GROUP_FOUNDER_MANAGE} /></dd>
+		<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_skip_auth">{L_GROUP_SKIP_AUTH}:</label><br /><span>{L_GROUP_SKIP_AUTH_EXPLAIN}</span></dt>
-		<dd><input name="group_skip_auth" type="checkbox" value="1" class="radio" id="group_skip_auth"{GROUP_SKIP_AUTH} /></dd>
-	</dl>
 	<dl>
 		<dt><label for="group_legend">{L_GROUP_LEGEND}:</label></dt>
-		<dd><input name="group_legend" type="checkbox" value="1" class="radio" id="group_legend"{GROUP_LEGEND} /></dd>
+		<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" value="1" class="radio" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd>
+		<dd><input name="group_receive_pm" type="checkbox" class="radio" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd>
 	</dl>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_GROUP_SETTINGS_SAVE}</legend>
 	<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" /><!-- IF GROUP_COLOUR -->&nbsp;<span style="background-color: #{GROUP_COLOUR}">&nbsp; &nbsp;</span><!-- ENDIF -->&nbsp;&nbsp;<span>[ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>
+		<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>
@@ -105,7 +93,7 @@
 	</dl>
 	<!-- IF not S_IN_AVATAR_GALLERY -->
 		<!-- IF S_CAN_UPLOAD -->
-			<dl>
+			<dl> 
 				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
 				<dd><input type="file" id="uploadfile" name="uploadfile" /></dd>
 			</dl>
@@ -120,10 +108,10 @@
 		</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>{L_PIXEL} &times; </span> <input type="text" name="height" size="3" value="{AVATAR_HEIGHT}" /> <span>{L_PIXEL}</span></dd>
+			<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>
+			<dl> 
 				<dt><label>{L_AVATAR_GALLERY}:</label></dt>
 				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd>
 			</dl>
@@ -140,7 +128,7 @@
 		<dl>
 			<table cellspacing="1">
 			<!-- BEGIN avatar_row -->
-			<tr>
+			<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 -->
@@ -154,11 +142,11 @@
 			</table>
 		</dl>
 		</fieldset>
-
+		
 		<fieldset class="quick" style="margin-top: -15px;">
 			<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
 		</fieldset>
-
+	
 	<!-- ENDIF -->
 	</fieldset>

@@ -200,7 +188,7 @@
 	</tr>
 	<!-- BEGIN leader -->
 		<!-- IF leader.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td><!-- IF leader.USERNAME_COLOUR --><a href="{leader.U_USER_EDIT}" style="color: #{leader.USERNAME_COLOUR};" class="username-coloured">{leader.USERNAME}</a><!-- ELSE --><a href="{leader.U_USER_EDIT}">{leader.USERNAME}</a><!-- ENDIF --></td>
+			<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>
@@ -221,7 +209,7 @@
 		</tr>
 		<!-- ELSE -->
 			<!-- IF member.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td><!-- IF member.USERNAME_COLOUR --><a href="{member.U_USER_EDIT}" style="color: #{member.USERNAME_COLOUR};" class="username-coloured">{member.USERNAME}</a><!-- ELSE --><a href="{member.U_USER_EDIT}">{member.USERNAME}</a><!-- ENDIF --></td>
+			<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>
@@ -239,12 +227,12 @@
 	<div class="pagination">
 			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
 	</div>
-	<!-- ENDIF -->
+	<!-- 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>
+		<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>
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -43,19 +43,19 @@
 	
 	function toggle_select(icon, display, select)
 	{
-		var disp = document.getElementById('order_disp_' + select);
-		var nodisp = document.getElementById('order_no_disp_' + select);
+		var disp = document.getElementById('order_disp[' + icon + ']');
+		var nodisp = document.getElementById('order_no_disp[' + icon + ']');
 		disp.disabled = !display;
 		nodisp.disabled = display;
 		if (display)
 		{
-			document.getElementById('order_' + select).selectedIndex = 0;
+			document.getElementById(select).selectedIndex = 0;
 			nodisp.className = 'disabled-options';
 			disp.className = '';
 		}
 		else
 		{
-			document.getElementById('order_' + select).selectedIndex = {S_ORDER_LIST_DISPLAY_COUNT};
+			document.getElementById(select).selectedIndex = {S_ORDER_LIST_DISPLAY_COUNT};
 			disp.className = 'disabled-options';
 			nodisp.className = '';
 		}
@@ -111,15 +111,15 @@
 		<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}');"/>
+			<input type="checkbox" class="radio" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} onclick="toggle_select('{items.A_IMG}', this.checked, 'order[{items.A_IMG}]');"/>
 			<!-- 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>
+			<td><select id="order[{items.IMG}]" name="order[{items.IMG}]">
+				<optgroup id="order_disp[{items.IMG}]" 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.IMG}]" 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 -->
@@ -139,9 +139,9 @@
 		<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="order_add_order" name="add_order">
-				<optgroup id="order_disp_add_order" label="{L_DISPLAY_POSTING}">{S_ADD_ORDER_LIST_DISPLAY}</optgroup>
-				<optgroup id="order_no_disp_add_order" label="{L_DISPLAY_POSTING_NO}" disabled="disabled" class="disabled-options" >{S_ADD_ORDER_LIST_UNDISPLAY}</optgroup>
+ 		<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>
@@ -243,19 +243,15 @@
 				<td style="text-align: center;">{items.EMOTION}</td>
 			<!-- ENDIF -->
 			<td style="text-align: right; white-space: nowrap;">
-				<!-- IF items.S_FIRST_ROW and not PREVIOUS_PAGE -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF -->&nbsp;
-				<!-- IF items.S_LAST_ROW and not NEXT_PAGE -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF -->
+				<!-- 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>
-	<div>{PAGINATION}</div>
+
 	<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>
--- a/phpBB/adm/style/acp_inactive.html
+++ b/phpBB/adm/style/acp_inactive.html
@@ -12,7 +12,7 @@

 <!-- IF PAGINATION -->
 <div class="pagination">
-	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
 </div>
 <!-- ENDIF -->

@@ -22,8 +22,8 @@
 	<th>{L_USERNAME}</th>
 	<th>{L_JOINED}</th>
 	<th>{L_INACTIVE_DATE}</th>
-	<th>{L_LAST_VISIT}</th>
 	<th>{L_INACTIVE_REASON}</th>
+	<th>{L_LAST_VISIT}</th>
 	<th>{L_MARK}</th>
 </tr>
 </thead>
@@ -31,17 +31,11 @@
 <!-- BEGIN inactive -->
 	<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->

-		<td style="vertical-align: top;">
-			{inactive.USERNAME_FULL}
-			<!-- IF inactive.POSTS --><br />{L_POSTS}: <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
-		</td>
-		<td style="vertical-align: top;">{inactive.JOINED}</td>
-		<td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td>
-		<td style="vertical-align: top;">{inactive.LAST_VISIT}</td>
-		<td style="vertical-align: top;">
-			{inactive.REASON}
-			<!-- IF inactive.REMINDED --><br />{inactive.REMINDED_EXPLAIN}<!-- ENDIF -->
-		</td>
+		<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 -->
@@ -52,25 +46,25 @@
 </tbody>
 </table>

-<fieldset class="display-options">
-	{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}<!-- IF PAGINATION -->&nbsp;Users per page: <input class="inputbox autowidth" type="text" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
-	<input class="button2" type="submit" value="{L_GO}" name="sort" />
-</fieldset>
-
-<hr />
-
-<!-- IF PAGINATION -->
+	<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>
+			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
 	</div>
-<!-- ENDIF -->
+	<!-- 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>
+

-<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>

--- a/phpBB/adm/style/acp_jabber.html
+++ b/phpBB/adm/style/acp_jabber.html
@@ -38,7 +38,7 @@
 	<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><br /><span>{L_JAB_PASSWORD_EXPLAIN}</span></dt>
+	<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 -->
--- a/phpBB/adm/style/acp_language.html
+++ b/phpBB/adm/style/acp_language.html
@@ -121,11 +121,9 @@

 	<!--[if lt IE 8]>
 	<style type="text/css">
-	/* <![CDATA[ */
 		input.langvalue, textarea.langvalue {
 		width: 450px;
 		}
-	/* ]]> */
 	</style>
 	<![endif]-->

--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -8,19 +8,12 @@

 <form id="list" method="post" action="{U_ACTION}">

-<fieldset class="display-options" style="float: left">
-	{L_SEARCH_KEYWORDS}: <input type="text" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
-</fieldset>
-
 <!-- IF PAGINATION -->
-<div class="pagination" style="float: right; margin: 15px 0 2px 0">
-	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+<div class="pagination">
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
 </div>
 <!-- ENDIF -->

-<div class="clearfix">&nbsp;</div>
-<div><br style="clear: both;" /></div>
-
 <!-- IF .log -->
 	<table cellspacing="1">
 	<thead>
@@ -29,14 +22,13 @@
 		<th>{L_IP}</th>
 		<th>{L_TIME}</th>
 		<th>{L_ACTION}</th>
-		<!-- IF S_CLEARLOGS -->
-			<th>{L_MARK}</th>
-		<!-- ENDIF -->
+		<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 -->
@@ -46,33 +38,32 @@
 			<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>
-			<!-- IF S_CLEARLOGS -->
-				<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td>
-			<!-- ENDIF -->
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td>
 		</tr>
 	<!-- END log -->
 	</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 -->
-
 <!-- 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>
@@ -80,7 +71,7 @@
 	</fieldset>
 <!-- ENDIF -->

-<!-- IF .log and S_CLEARLOGS -->
+<!-- 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 />
@@ -88,6 +79,7 @@
 	</fieldset>
 <!-- ENDIF -->

+
 </form>

-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -14,19 +14,6 @@

 	<p>{L_ADMIN_INTRO}</p>

-	<!-- IF S_VERSIONCHECK_FAIL -->
-		<div class="errorbox notice">
-			<p>{L_VERSIONCHECK_FAIL}</p>
-			<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> &middot; <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
-		</div>
-	<!-- ELSEIF not S_VERSION_UP_TO_DATE -->
-		<div class="errorbox">
-			<p>{L_VERSION_NOT_UP_TO_DATE_TITLE}</p>
-			<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> &middot; <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
-		</div>
-	<!-- ENDIF -->
-
-
 	<!-- IF S_REMOVE_INSTALL -->
 		<div class="errorbox">
 			<h3>{L_WARNING}</h3>
@@ -34,18 +21,6 @@
 		</div>
 	<!-- ENDIF -->

-	<!-- IF S_WRITABLE_CONFIG -->
-		<div class="errorbox notice">
-			<p>{L_WRITABLE_CONFIG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF S_PHP_VERSION_OLD -->
-		<div class="errorbox notice">
-			<p>{L_PHP_VERSION_OLD}</p>
-		</div>
-	<!-- ENDIF -->
-
 	<table cellspacing="1">
 		<caption>{L_FORUM_STATS}</caption>
 		<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
@@ -104,9 +79,7 @@
 	</tr>
 	<tr>
 		<td>{L_BOARD_VERSION}: </td>
-		<td>
-			<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF --> title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
-		</td>
+		<td><strong>{BOARD_VERSION}</strong></td>
 	<!-- IF S_TOTAL_ORPHAN -->
 		<td>{L_NUMBER_ORPHAN}: </td>
 		<td><strong>{TOTAL_ORPHAN}</strong></td>
@@ -158,12 +131,6 @@
 			</form>

 			<!-- IF S_FOUNDER -->
-			<form id="action_purge_sessions_form" method="post" action="{U_ACTION}">
-				<dl>
-					<dt><label for="action_purge_sessions">{L_PURGE_SESSIONS}</label><br /><span>{L_PURGE_SESSIONS_EXPLAIN}</span></dt>
-					<dd><input type="hidden" name="action" value="purge_sessions" /><input class="button2" type="submit" id="action_purge_sessions" name="action_purge_sessions" value="{L_RUN}" /></dd>
-				</dl>
-			</form>
 			<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>
@@ -220,25 +187,19 @@
 			<th>{L_USERNAME}</th>
 			<th>{L_JOINED}</th>
 			<th>{L_INACTIVE_DATE}</th>
-			<th>{L_LAST_VISIT}</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 style="vertical-align: top;">
-					{inactive.USERNAME_FULL}
-					<!-- IF inactive.POSTS --><br />{L_POSTS}: <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
-				</td>
-				<td style="vertical-align: top;">{inactive.JOINED}</td>
-				<td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td>
-				<td style="vertical-align: top;">{inactive.LAST_VISIT}</td>
-				<td style="vertical-align: top;">
-					{inactive.REASON}
-					<!-- IF inactive.REMINDED --><br />{inactive.REMINDED_EXPLAIN}<!-- ENDIF -->
-				</td>
+				<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>
--- a/phpBB/adm/style/acp_permission_roles.html
+++ b/phpBB/adm/style/acp_permission_roles.html
@@ -28,11 +28,11 @@

 	<p>{L_EXPLAIN}</p>

+	<form id="acp_roles" method="post" action="{U_ACTION}">
+
 	<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>
@@ -46,7 +46,6 @@

 	<p class="quick">
 		<input type="submit" class="button1" name="submit" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
 	</p>
 	</fieldset>

@@ -58,15 +57,11 @@

 	<!-- 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">
@@ -112,9 +107,9 @@
 						<!-- 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>
+						<td class="permissions-yes"><label for="{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="{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="{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>
--- a/phpBB/adm/style/acp_permissions.html
+++ b/phpBB/adm/style/acp_permissions.html
@@ -3,7 +3,7 @@
 <a name="maincontent"></a>

 <!-- IF S_INTRO -->
-
+	
 	<h1>{L_ACP_PERMISSIONS}</h1>

 	{L_ACP_PERMISSIONS_EXPLAIN}
@@ -12,12 +12,10 @@

 <!-- 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 -->
@@ -64,7 +62,7 @@

 			</fieldset>
 			</form>
-
+			
 		<!-- ENDIF -->

 	<!-- ELSEIF S_SELECT_USER and S_CAN_SELECT_USER -->
@@ -125,7 +123,7 @@
 				<!-- 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}
@@ -156,7 +154,7 @@
 		</div>

 		<div style="float: {S_CONTENT_FLOW_END}; width: 48%">
-
+			
 		<!-- IF S_CAN_SELECT_GROUP -->

 			<h1>{L_USERGROUPS}</h1>
@@ -170,7 +168,7 @@
 				<!-- 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}
@@ -179,7 +177,7 @@
 			</form>

 			<form id="add_groups" method="post" action="{U_ACTION}">
-
+			
 			<fieldset>
 				<legend>{L_ADD_GROUPS}</legend>
 			<dl>
@@ -201,7 +199,7 @@
 	<!-- 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}">
@@ -212,7 +210,7 @@
 				<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}
@@ -242,7 +240,7 @@
 		</div>

 		<div style="float: {S_CONTENT_FLOW_END}; width: 48%">
-
+			
 			<h1>{L_USERGROUPS}</h1>

 			<form id="groups" method="post" action="{U_ACTION}">
@@ -253,7 +251,7 @@
 				<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}
@@ -313,11 +311,11 @@

 	<!-- 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>
+			{L_SELECT_TYPE}: <select name="type">{S_PERMISSION_DROPDOWN}</select> 

 			<input class="button2" type="submit" name="submit" value="{L_GO}" />
 		</fieldset>
@@ -349,7 +347,7 @@
 	</fieldset>

 	<br /><br />
-
+	
 	</form>

 <!-- ENDIF -->
--- a/phpBB/adm/style/acp_profile.html
+++ b/phpBB/adm/style/acp_profile.html
@@ -48,24 +48,20 @@
 		<fieldset>
 			<legend>{L_VISIBILITY_OPTION}</legend>
 		<dl>
-			<dt><label for="field_show_profile">{L_DISPLAY_AT_PROFILE}:</label><br /><span>{L_DISPLAY_AT_PROFILE_EXPLAIN}</span></dt>
-			<dd><input type="checkbox" class="radio" id="field_show_profile" name="field_show_profile" value="1"<!-- IF S_SHOW_PROFILE --> checked="checked"<!-- ENDIF --> /></dd>
+			<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="checkbox" class="radio" id="field_show_on_reg" name="field_show_on_reg" value="1"<!-- IF S_SHOW_ON_REG --> checked="checked"<!-- ENDIF --> /></dd>
-		</dl>
-		<dl>
-			<dt><label for="field_show_on_vt">{L_DISPLAY_ON_VT}:</label><br /><span>{L_DISPLAY_ON_VT_EXPLAIN}</span></dt>
-			<dd><input type="checkbox" class="radio" id="field_show_on_vt" name="field_show_on_vt" value="1"<!-- IF S_SHOW_ON_VT --> checked="checked"<!-- ENDIF --> /></dd>
+			<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="checkbox" class="radio" id="field_required" name="field_required" value="1"<!-- IF S_FIELD_REQUIRED --> checked="checked"<!-- ENDIF --> /></dd>
+			<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="checkbox" class="radio" id="field_hide" name="field_hide" value="1"<!-- IF S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd>
+			<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>

@@ -131,7 +127,7 @@
 		<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}
@@ -155,15 +151,15 @@
 		<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 -->
@@ -198,14 +194,14 @@
 				{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>
+				<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}
+				{ICON_MOVE_DOWN_DISABLED}	
 			<!-- ENDIF -->
 			<!-- IF not fields.S_NEED_EDIT -->
-				<a href="{fields.U_EDIT}">{ICON_EDIT}</a>
+				<a href="{fields.U_EDIT}">{ICON_EDIT}</a> 
 			<!-- ELSE -->
 				{ICON_EDIT_DISABLED}
 			<!-- ENDIF -->
@@ -213,16 +209,12 @@
 		</td>

 	</tr>
-	<!-- BEGINELSE -->
-	<tr class="row3">
-		<td colspan="4">{L_ACP_NO_ITEMS}</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}" />
--- a/phpBB/adm/style/acp_prune_forums.html
+++ b/phpBB/adm/style/acp_prune_forums.html
@@ -44,7 +44,7 @@
 		<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><select 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>
 	
--- a/phpBB/adm/style/acp_search.html
+++ b/phpBB/adm/style/acp_search.html
@@ -32,10 +32,6 @@
 		<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>
@@ -134,9 +130,9 @@
 				<!-- 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');" />
@@ -146,7 +142,7 @@
 			</p>
 			{S_FORM_TOKEN}
 			</fieldset>
-
+			
 			</form>
 		<!-- END backend -->

--- a/phpBB/adm/style/acp_send_statistics.html
+++ b/phpBB/adm/style/acp_send_statistics.html
@@ -1,71 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-<h1>{L_SEND_STATISTICS}</h1>
-
-<p>{L_EXPLAIN_SEND_STATISTICS}</p>
-
-<script type="text/javascript">
-//<![CDATA[
-var iframect = 0;
-
-function iframe_updated()
-{
-	if (iframect++ == 0)
-	{
-		return;
-	}
-
-	dE('questionnaire-form', -1);
-	dE('questionnaire-thanks', 1);
-}
-//]]>
-</script>
-
-<iframe onload="iframe_updated();" name="questionaire_result" style="display: none;"></iframe>
-
-<form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form">
-
-	<p><a href="{U_ACP_MAIN}">{L_DONT_SEND_STATISTICS}</a></p>
-
-	<p>{L_EXPLAIN_SHOW_STATISTICS}</p>
-
-	<p id="show-button"><input type="button" class="button2" onclick="dE('configlist', 1); dE('show-button', -1);" value="{L_SHOW_STATISTICS}" /></p>
-
-	<div id="configlist">
-		<input type="button" class="button2" onclick="dE('show-button', 1); dE('configlist', -1);" value="{L_HIDE_STATISTICS}" />
-		<p class="submit-buttons">
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_STATISTICS}" />
-		</p>
-
-		<!-- BEGIN providers -->
-		<fieldset>
-			<legend>{providers.NAME}</legend>
-			<!-- BEGIN values -->
-			<dl>
-				<dt>{providers.values.KEY}</dt>
-				<dd>{providers.values.VALUE}</dd>
-			</dl>
-			<!-- END values -->
-		</fieldset>
-		<!-- END providers -->
-	</div>
-	<p class="submit-buttons">
-		<input type="hidden" name="systemdata" value="{RAW_DATA}" />
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_STATISTICS}" />
-	</p>
-</form>
-
-<div id="questionnaire-thanks" class="successbox">
-	<p><strong>{L_THANKS_SEND_STATISTICS}</strong><br /><br /><a href="{U_ACP_MAIN}">&laquo; {L_GO_ACP_MAIN}</a></p>
-</div>
-
-<script type="text/javascript">
-//<![CDATA[
-	dE('configlist', -1);
-	dE('questionnaire-thanks', -1);
-//]]>
-</script>
-
-<!-- INCLUDE overall_footer.html -->
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -20,7 +20,7 @@
 	</dl>
 	<dl>
 		<dt><label for="new_id">{L_REPLACE}:</label><br /><span>{L_REPLACE_EXPLAIN}</span></dt>
-		<dd><select id="new_id" name="new_id">{S_REPLACE_OPTIONS}</select></dd>
+		<dd><select name="new_id">{S_REPLACE_OPTIONS}</select></dd>
 	</dl>

 	<p class="quick">
@@ -54,7 +54,7 @@
 	// <![CDATA[
 		function update_image(newimage)
 		{
-			document.getElementById('newimg').src = (newimage) ? '../styles/{A_PATH}/imageset/' + encodeURI(newimage) : 'images/no_image.png';
+			document.getElementById('newimg').src = (newimage) ? '../styles/{A_NAME}/imageset/' + encodeURI(newimage) : 'images/no_image.png';
 		}
 	// ]]>
 	</script>
@@ -135,11 +135,11 @@
 	<div id="img_dimensions">
 		<dl>
 			<dt><label for="imgwidth">{L_IMAGE_WIDTH}:</label><br /><span>{L_AUTOMATIC_EXPLAIN}</span></dt>
-			<dd><input id="imgwidth" type="text" name="imgwidth" value="{IMAGE_SIZE}" /></dd>
+			<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 id="imgheight" type="text" name="imgheight" value="{IMAGE_HEIGHT}" /></dd>
+			<dd><input type="text" name="imgheight" value="{IMAGE_HEIGHT}" /></dd>
 		</dl>
 	</div>
 	</fieldset>
@@ -261,12 +261,12 @@
 <!-- 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 id="acp_styles" method="post" action="{U_ACTION}">
+	
+	<form name="acp_styles" method="post" action="{U_ACTION}">
 	<fieldset class="tabulated">
 	<legend>{L_TEMPLATE_CACHE}</legend>

@@ -283,7 +283,7 @@
 	<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_PATH}</a></td>
+			<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>
@@ -361,7 +361,7 @@
 	</p>
 	</fieldset>

-
+	
 	</form>

 <!-- ELSEIF S_FRONTEND -->
@@ -455,37 +455,31 @@
 		<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>
+		<dd><!-- IF S_INSTALL --><b id="name">{NAME}</b><!-- 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>
+		<dd><!-- IF S_INSTALL --><b id="name">{COPYRIGHT}</b><!-- 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>
+			<dd><!-- IF S_INSTALL --><b id="template_id">{TEMPLATE_NAME}</b><!-- 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>
+			<dd><!-- IF S_INSTALL --><b id="theme_id">{THEME_NAME}</b><!-- 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>
+			<dd><!-- IF S_INSTALL --><b id="imageset_id">{IMAGESET_NAME}</b><!-- ELSE --><select id="imageset_id" name="imageset_id">{S_IMAGESET_OPTIONS}</select><!-- ENDIF --></dd>
 		</dl>
 	<!-- ENDIF -->
-	<!-- IF (S_TEMPLATE or S_THEME) and (S_LOCATION or not S_INSTALL) -->
+	<!-- IF S_TEMPLATE or S_THEME -->
 		<dl>
-			<dt><label for="store_db">{L_LOCATION}:</label><br /><span><!-- IF S_STORE_DB_DISABLED -->{L_LOCATION_DISABLED_EXPLAIN}<!-- ELSE -->{L_LOCATION_EXPLAIN}<!-- ENDIF --></span></dt>
-			<dd><label><input type="radio" class="radio" name="store_db" value="0"<!-- IF not S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> <!-- IF S_STORE_DB_DISABLED -->disabled="disabled" <!-- ENDIF --> />{L_STORE_FILESYSTEM}</label>
-				<label><input type="radio" class="radio" name="store_db" value="1"<!-- IF S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> <!-- IF S_STORE_DB_DISABLED -->disabled="disabled" <!-- ENDIF -->/> {L_STORE_DATABASE}</label></dd>
+			<dt><label for="store_db">{L_LOCATION}:</label><br /><span>{L_LOCATION_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="store_db" value="0"<!-- IF not S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> /> {L_STORE_FILESYSTEM}</label>
+				<label><input type="radio" class="radio" name="store_db" value="1"<!-- IF S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> /> {L_STORE_DATABASE}</label></dd>
 		</dl>
 	<!-- ENDIF -->
 	<!-- IF S_STYLE -->
@@ -513,7 +507,7 @@
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
 		{S_FORM_TOKEN}
 	</fieldset>
-
+	
 	</form>

 <!-- ENDIF -->
--- a/phpBB/adm/style/acp_update.html
+++ b/phpBB/adm/style/acp_update.html
@@ -10,11 +10,11 @@

 	<!-- IF S_UP_TO_DATE and S_UP_TO_DATE_AUTO -->
 		<div class="successbox">
-			<p>{L_VERSION_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
+			<p>{L_VERSION_UP_TO_DATE_ACP}</p>
 		</div>
 	<!-- ELSE -->
 		<div class="errorbox">
-			<p>{L_VERSION_NOT_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
+			<p>{L_VERSION_NOT_UP_TO_DATE_ACP}</p>
 		</div>
 	<!-- ENDIF -->

--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -83,10 +83,6 @@

 <!-- INCLUDE acp_users_feedback.html -->

-<!-- ELSEIF S_WARNINGS -->
-
-<!-- INCLUDE acp_users_warnings.html -->
-
 <!-- ELSEIF S_PROFILE -->

 <!-- INCLUDE acp_users_profile.html -->
@@ -135,8 +131,8 @@
 		<!-- 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_IS_MEMBER --><!-- IF group.S_NO_DEFAULT --><a href="{group.U_DEFAULT}">{L_GROUP_DEFAULT}</a><!-- ELSE --><strong>{L_GROUP_DEFAULT}</strong><!-- ENDIF --><!-- ELSEIF not group.S_IS_MEMBER and group.U_APPROVE --><a href="{group.U_APPROVE}">{L_GROUP_APPROVE}</a><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
-				<td><!-- IF group.S_IS_MEMBER and not group.S_SPECIAL_GROUP --><a href="{group.U_DEMOTE_PROMOTE}">{group.L_DEMOTE_PROMOTE}</a><!-- ELSE -->&nbsp;<!-- ENDIF --></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 -->
@@ -201,7 +197,7 @@
 		<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>
@@ -219,7 +215,7 @@
 	<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>
+			{L_SELECT_FORUM}: <select name="f">{S_FORUM_OPTIONS}</select> 
 			<input class="button2" type="submit" value="{L_GO}" name="select" />
 			{S_FORM_TOKEN}
 		</fieldset>
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -8,13 +8,11 @@
 		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd>
 	</dl>
 	<!-- IF not S_IN_AVATAR_GALLERY -->
-		<!-- IF S_UPLOAD_FILE -->
+		<!-- 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>
-		<!-- ENDIF -->
-		<!-- IF S_REMOTE_UPLOAD -->
 			<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>
@@ -27,7 +25,7 @@
 			</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>{L_PIXEL} &times; </span> <input type="text" name="height" size="3" value="{USER_AVATAR_HEIGHT}" /> <span>{L_PIXEL}</span></dd>
+				<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 -->
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -30,7 +30,7 @@
 </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>
+	<dd><strong>{USER_POSTS}</strong></dd>
 </dl>
 <dl>
 	<dt><label>{L_WARNINGS}:</label></dt>
@@ -124,6 +124,13 @@
 			<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}" />
@@ -131,23 +138,7 @@
 	</p>

 	</fieldset>
-
+	
 	</form>

-	<!-- IF not S_OWN_ACCOUNT -->
-	<form id="user_delete" method="post" action="{U_ACTION}">
-	<fieldset>
-		<legend>{L_DELETE_USER}</legend>
-		<dl>
-			<dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
-			<dd><select id="delete_type" name="delete_type"><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd>
-		</dl>
-		<p class="quick">
-			<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-			<input type="hidden" name="delete" value="1" />
-			{S_FORM_TOKEN}
-		</p>
-	</fieldset>
-	<!-- ENDIF -->
-	</form>
 <!-- ENDIF -->
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -93,7 +93,7 @@
 				// ]]>
 				</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);" onfocus="initInsertions();">{SIGNATURE}</textarea></dd>
+			<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>
--- a/phpBB/adm/style/acp_users_warnings.html
+++ b/phpBB/adm/style/acp_users_warnings.html
@@ -1,36 +0,0 @@
-	<form id="list" method="post" action="{U_ACTION}">
-
-	<!-- IF .warn -->
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_REPORT_BY}</th>
-		<th>{L_TIME}</th>
-		<th>{L_FEEDBACK}</th>
-		<th>{L_MARK}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN warn -->
-		<!-- IF warn.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td>{warn.USERNAME}</td>
-			<td style="text-align: center; nowrap: nowrap;">{warn.DATE}</td>
-			<td>{warn.ACTION}</td>
-			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{warn.ID}" /></td>
-		</tr>
-	<!-- END warn -->
-	</tbody>
-	</table>
-	<!-- ELSE -->
-		<div class="errorbox">
-			<p>{L_NO_WARNINGS}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<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>
-	{S_FORM_TOKEN}
-	</form>
--- a/phpBB/adm/style/acp_words.html
+++ b/phpBB/adm/style/acp_words.html
@@ -62,10 +62,6 @@
 		<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>
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -69,8 +69,8 @@ h2, caption {
 h3, h4 {
 	font-family: "Trebuchet MS", Helvetica, sans-serif;
 	font-size: 1.20em;
-	text-decoration: none;
-	line-height: 1.20em;
+	text-decoration: none; 
+	line-height: 1.20em; 
 	margin-top: 25px;
 }

@@ -97,8 +97,8 @@ hr {
 	height: 1px;
 }

-.small {
-	font-size: 0.85em;
+.small { 
+	font-size: 0.85em; 
 }

 /* General links  */
@@ -121,17 +121,6 @@ a:active {
 	font-weight: bold;
 }

-/* List items */
-ul, ol {
-	list-style-position: inside;
-	margin-left: 1em;
-}
-
-li {
-	display: list-item;
-	list-style-type: inherit;
-}
-
 /* Main blocks
 ---------------------------------------- */
 #wrap {
@@ -202,8 +191,8 @@ li {
 	margin: 0 3% 0 0;
 }

-* html #main {
-	height: 350px;
+* html #main { 
+	height: 350px; 
 }

 #page-body.simple-page-body {
@@ -315,7 +304,7 @@ li {
 	padding: 0;
 }

-span.corners-top, span.corners-bottom,
+span.corners-top, span.corners-bottom, 
 span.corners-top span, span.corners-bottom span {
 	font-size: 1px;
 	line-height: 1px;
@@ -794,7 +783,7 @@ label img {

 fieldset.quick, p.quick {
 	margin: 0 0 5px;
-	padding: 5px 0 0;
+	padding: 5px 0 0; 
 	border: none;
 	background-color: transparent;
 	text-align: right;
@@ -847,7 +836,7 @@ select option.disabled {
 }

 /* Special case inputs */
-select#board_timezone,
+select#board_timezone, 
 select#full_folder_action {
 	width: 95%;
 }
@@ -1186,10 +1175,6 @@ input.disabled {
 	font-weight: bold;
 }

-.notice {
-	background-color: #62A5CC;
-}
-
 /* Special cases for the error page */
 #errorpage #page-header a {
 	font-weight: bold;
@@ -1244,12 +1229,12 @@ input.disabled {
 }

 /* Nice method for clearing floated blocks without having to insert any extra markup
-	From http://www.positioniseverything.net/easyclearing.html
+	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;
+	content: "."; 
+	display: block; 
+	height: 0; 
+	clear: both; 
 	visibility: hidden;
 }*/

@@ -1316,7 +1301,7 @@ fieldset.permissions legend input{
 	height: 1.1em;
 }

-/* Permission sections */
+/* Permission sections */ 
 fieldset.permissions .permissions-simple {
 	text-align: left;
 	padding-top: 3px;
@@ -1348,21 +1333,18 @@ fieldset.permissions .permissions-switch {
 fieldset.permissions .padding {
 }

-.permissions-switch {
-	margin-top: -6px;
-	font-size: .9em;
-}
-
 .permissions-switch a {
 	text-decoration: underline;
+	font-size: 0.90em;
 }

 .permissions-reset {
+	margin-top: -6px;
 	padding-bottom: 10px;
 }

 .permissions-reset a {
-	font-size: .85em;
+	font-size: .8em;
 }

 /* Tabbed menu */
@@ -1527,7 +1509,7 @@ fieldset.permissions .padding {
 	background-image: url("../images/corners_right2.gif");
 }

-.permissions-panel span.corners-top, .permissions-panel span.corners-bottom,
+.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;
@@ -1605,7 +1587,7 @@ fieldset.permissions .padding {
 }

 .permissions-panel th.row4 {
-	background-image: none;
+	background-image: none;	
 	background-color: #E4E8EB;
 	color: #536482;
 	border: none;
@@ -1613,8 +1595,8 @@ fieldset.permissions .padding {

 .permissions-panel th a:link, .permissions-panel th a:hover, .permissions-panel th a:visited {
 	display: block;
-	color: #FFFFFF;
-	text-decoration: underline;
+	color: #FFFFFF; 
+	text-decoration: underline; 
 }

 .permissions-panel td.permissions-yes label:hover {
--- a/phpBB/adm/style/captcha_default_acp_demo.html
+++ b/phpBB/adm/style/captcha_default_acp_demo.html
@@ -1,4 +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>
--- a/phpBB/adm/style/captcha_gd_acp.html
+++ b/phpBB/adm/style/captcha_gd_acp.html
@@ -1,74 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-	<a href="{U_ACTION}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</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>
-<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>
-
-</fieldset>
-<fieldset>
-	<legend>{L_PREVIEW}</legend>
-	<!-- IF CAPTCHA_PREVIEW -->
-	<!-- INCLUDE {CAPTCHA_PREVIEW} -->
-	<!-- ENDIF -->
-
-</fieldset>
-
-<fieldset>
-	<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-	<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}" />&nbsp;
-		<input class="button2" type="submit" id="preview" name="preview" value="{L_PREVIEW}" />&nbsp;
-	</p>
-
-	<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 -->
--- a/phpBB/adm/style/captcha_qa_acp.html
+++ b/phpBB/adm/style/captcha_qa_acp.html
@@ -1,92 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-
-	<a href="<!-- IF U_LIST -->{U_LIST}<!-- ELSE -->{U_ACTION}<!-- ENDIF -->" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_QUESTIONS}</h1>
-
-	<p>{L_QUESTIONS_EXPLAIN}</p>
-<!-- IF S_LIST -->
-	<form id="captcha_qa" method="post" action="{U_ACTION}">
-
-	<fieldset class="tabulated">
-	<legend>{L_QUESTIONS}</legend>
-
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th colspan="3">{L_QUESTIONS}</th>
-	</tr>
-	<tr class="row3">
-		<td style="text-align: center;">{L_QUESTION_TEXT}</td>
-		<td style="width: 5%; text-align: center;">{L_QUESTION_LANG}</td>
-		<td style="vertical-align: top; width: 50px; text-align: center; white-space: nowrap;">{L_ACTION}</td>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN questions -->
-
-		<!-- IF questions.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-		<td style="text-align: left;">{questions.QUESTION_TEXT}</td>
-		<td style="text-align: center;">{questions.QUESTION_LANG}</td>
-		<td style="text-align: center;"><a href="{questions.U_EDIT}">{ICON_EDIT}</a>&nbsp;<a href="{questions.U_DELETE}">{ICON_DELETE}</a></td>
-		</tr>
-		<!-- END questions -->
-	</tbody>
-	</table>
-	<fieldset class="quick">
-		<input class="button1" type="submit" name="add" value="{L_ADD}" />
-		<input  type="hidden" name="action" value="add" />
-		<input  type="hidden" name="configure" value="1" />
-		<input  type="hidden" name="select_captcha" value="{CLASS}" />
-
-		{S_FORM_TOKEN}
-	</fieldset>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-<!-- ELSE -->
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{L_QA_ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-	<form id="captcha_qa" method="post" action="{U_ACTION}">
-	<fieldset>
-		<legend>{L_EDIT_QUESTION}</legend>
-	<dl>
-		<dt><label for="strict">{L_QUESTION_STRICT}:</label><br /><span>{L_QUESTION_STRICT_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" name="strict" value="1"<!-- IF STRICT --> id="strict" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="strict" value="0"<!-- IF not STRICT --> id="strict" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-
-	<dl>
-		<dt><label for="lang_iso">{L_QUESTION_LANG}</label><br /><span>{L_QUESTION_LANG_EXPLAIN}</span></dt>
-		<dd><select id="lang_iso" name="lang_iso"><!-- BEGIN langs --><option value="{langs.ISO}" <!-- IF langs.ISO == LANG_ISO --> selected="selected" <!-- ENDIF -->>{langs.NAME}</option><!-- END langs --></select></dd>
-	</dl>
-	<dl>
-		<dt><label for="question_text">{L_QUESTION_TEXT}</label><br /><span>{L_QUESTION_TEXT_EXPLAIN}</span></dt>
-		<dd><input id="question_text" maxlength="255" size="60" name="question_text" type="text" value="{QUESTION_TEXT}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="answers">{L_QUESTION_ANSWERS}</label><br /><span>{L_ANSWERS_EXPLAIN}</span></dt>
-		<dd><textarea id="answers" style="word-wrap: normal; overflow-x: scroll;" name="answers" rows="15" cols="800" >{ANSWERS}</textarea></dd>
-	</dl>
-	</fieldset>
-	<fieldset class="quick">
-		<input class="button1" type="submit" name="submit" value="{L_SUBMIT}" />
-		<input type="hidden" name="question_id" value="{QUESTION_ID}" />
-		<input type="hidden" name="action" value="add" />
-		<input  type="hidden" name="configure" value="1" />
-		<input  type="hidden" name="select_captcha" value="{CLASS}" />
-
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
--- a/phpBB/adm/style/captcha_qa_acp_demo.html
+++ b/phpBB/adm/style/captcha_qa_acp_demo.html
@@ -1,7 +0,0 @@
-<dl>
-	<dt><label for="answer"><!-- IF QA_CONFIRM_QUESTION --> {QA_CONFIRM_QUESTION} <!-- ELSE --> {L_CONFIRM_QUESTION} <!-- ENDIF -->:</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
-
-	<dd>
-		<input type="text" tabindex="10" name="answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}"  />
-	</dd>
-</dl>
--- a/phpBB/adm/style/captcha_recaptcha.html
+++ b/phpBB/adm/style/captcha_recaptcha.html
@@ -1,33 +0,0 @@
-<!-- IF S_RECAPTCHA_AVAILABLE -->
-	<dl>
-	<dd>
-		<script type="text/javascript">
-		// <![CDATA[
-		var RecaptchaOptions = {
-			lang : '{LA_RECAPTCHA_LANG}'
-		};
-		// ]]>
-		</script>
-		<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}"></script>
-		<script type="text/javascript">
-		// <![CDATA[
-		<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-			document.getElementById('recaptcha_table').style.direction = 'ltr';
-		<!-- ENDIF -->
-		// ]]>
-		</script>
-
-
-	<noscript>
-	<div>
-		<object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br />
-		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
-		<input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
-	</div>
-	</noscript>
-
-	</dd>
-	</dl>
-<!-- ELSE -->
-{L_RECAPTCHA_NOT_AVAILABLE}
-<!-- ENDIF -->
--- a/phpBB/adm/style/captcha_recaptcha_acp.html
+++ b/phpBB/adm/style/captcha_recaptcha_acp.html
@@ -1,50 +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 -->
-<!-- INCLUDE {CAPTCHA_PREVIEW} -->
-</fieldset>
-
-<fieldset>
-	<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-	<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}" />&nbsp;
-	</p>
-	<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 -->
--- a/phpBB/adm/style/colour_swatch.html
+++ b/phpBB/adm/style/colour_swatch.html
@@ -8,7 +8,7 @@
 <title>{L_COLOUR_SWATCH}</title>

 <style type="text/css">
-/* <![CDATA[ */
+<!--
 	body {
 		background-color: #404040;
 		color: #fff;
@@ -29,7 +29,7 @@
 	img {
 		border: 0;
 	}
-/* ]]> */
+//-->
 </style>
 </head>

--- a/phpBB/adm/style/confirm_bbcode.html
+++ b/phpBB/adm/style/confirm_bbcode.html
@@ -1,22 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<form id="confirm" method="post" action="{S_CONFIRM_ACTION}">
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{MESSAGE_TEXT}</p>
-	</div>
-<fieldset>
-
-
-	{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_CANCEL}" class="button2" />
-	</div>
-
-</fieldset>
-		
-</form>
-
-<!-- INCLUDE overall_footer.html -->
--- a/phpBB/adm/style/editor.js
+++ b/phpBB/adm/style/editor.js
@@ -16,6 +16,7 @@ var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -
 var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));

 var baseHeight;
+window.onload = initInsertions;

 /**
 * Shows the help messages in the helpline window
@@ -258,7 +259,7 @@ function addquote(post_id, username)
 */
 function mozWrap(txtarea, open, close)
 {
-	var selLength = (typeof(txtarea.textLength) == 'undefined') ? txtarea.value.length : txtarea.textLength;
+	var selLength = txtarea.textLength;
 	var selStart = txtarea.selectionStart;
 	var selEnd = txtarea.selectionEnd;
 	var scrollTop = txtarea.scrollTop;
--- a/phpBB/adm/style/install_convert.html
+++ b/phpBB/adm/style/install_convert.html
--- a/phpBB/adm/style/install_error.html
+++ b/phpBB/adm/style/install_error.html
--- a/phpBB/adm/style/install_footer.html
+++ b/phpBB/adm/style/install_footer.html
@@ -2,7 +2,6 @@
 					</div>
 				</div>
 			<span class="corners-bottom"><span></span></span>
-			<div class="clear"></div>
 		</div>
 		</div>
 	</div>
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
--- a/phpBB/adm/style/install_install.html
+++ b/phpBB/adm/style/install_install.html
--- a/phpBB/adm/style/install_main.html
+++ b/phpBB/adm/style/install_main.html
--- a/phpBB/adm/style/install_update.html
+++ b/phpBB/adm/style/install_update.html
@@ -63,7 +63,7 @@
 	<p>{L_UPDATE_SUCCESS_EXPLAIN}</p>

 	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="check_again" value="{L_CONTINUE_UPDATE}" />
+		<input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
 	</fieldset>

 	</form>
@@ -186,174 +186,100 @@
 				<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>
+		<!-- IF .files -->
+			<!-- BEGIN files -->
+				<!-- IF files.S_STATUS -->
+					<!-- IF not files.S_FIRST_ROW -->
+						</fieldset></div>
 					<!-- ENDIF -->
-				</dl>
-			<!-- END not_modified -->
-			</fieldset>

-		<!-- ENDIF -->
+					<h2>{files.TITLE}</h2>

-		<!-- IF .modified -->
-			<h2>{L_FILES_MODIFIED}</h2>
-			<p>{L_FILES_MODIFIED_EXPLAIN}</p>
+					<!-- IF files.STATUS eq 'not_modified' --><div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="dE('not_modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div><!-- ENDIF -->
+					<p>{files.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 -->
+					<div style="display: <!-- IF files.STATUS neq 'not_modified' -->block<!-- ELSE -->none<!-- ENDIF -->;" id="{files.STATUS}">

-		<!-- 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>
+					<fieldset>
+						<legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
 				<!-- 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 -->
+						<!-- IF files.STATUS eq 'up_to_date' -->
+							<dd class="full" style="text-align: left;"><strong>{files.FILENAME}</strong></dd>
+						<!-- ELSE -->
+							<dt style="width: 60%;">
+								<strong><!-- IF files.DIR_PART -->{files.DIR_PART}<br /><!-- ENDIF -->{files.FILE_PART}</strong>
+								<!-- IF files.S_CUSTOM -->
+								<br /><span><em>{L_FILE_USED}: </em>{files.CUSTOM_ORIGINAL}</span>
+								<!-- ENDIF -->
+								<!-- IF files.NUM_CONFLICTS -->
+								<br /><span>{L_NUM_CONFLICTS}: {files.NUM_CONFLICTS}</span>
+								<!-- ENDIF -->
+							</dt>
+							<dd style="margin-left: 60%;"><!-- IF files.STATUS eq 'modified' -->&nbsp;<!-- ELSE --><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --><!-- ENDIF --></dd>
+							<!-- IF files.S_CUSTOM -->
+								<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+							<!-- ENDIF -->
+							
+							<!-- IF files.STATUS eq 'modified' -->
+							</dl>
+							<dl>
+								<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt>
+								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
+							</dl>
+							<dl>
+								<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
+								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.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[{files.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
+								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
+							</dl>
+							<!-- IF not files.S_LAST_ROW -->
+							</fieldset>

+							<fieldset>
+								<legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
+							<!-- ENDIF -->
+
+							<!-- ENDIF -->
+
+							<!-- IF files.STATUS eq 'conflict' -->
+							</dl>
+							<dl>
+								<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
+								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
+							</dl>
+								<!-- IF not files.S_BINARY -->
+									<dl>
+										<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="3" /> {L_MERGE_NEW_FILE_OPTION}</label></dt>
+										<dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NEW_FILE}" 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[{files.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt>
+										<dd style="margin-left: 60%;">[<a href="{files.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
+									</dl>
+								<!-- ENDIF -->
+							<!-- IF not files.S_LAST_ROW -->
+							</fieldset>
+
+							<fieldset>
+								<legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
+							<!-- ENDIF -->
+
+							<!-- ENDIF -->
+						<!-- ENDIF -->
+					<!-- IF files.STATUS neq 'conflict' and files.STATUS neq 'modified' --></dl><!-- ENDIF -->
+				<!-- ENDIF -->
+			<!-- END files -->
+
+			</fieldset></div>
 		<!-- ENDIF -->

 		<br />
@@ -369,7 +295,7 @@
 		<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}" />
+			<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}" />
 		</fieldset>

 		</form>
@@ -394,7 +320,7 @@

 	<fieldset class="submit-buttons">
 		{S_HIDDEN_FIELDS}
-		<input type="submit" class="button2" value="{L_CONTINUE_UPDATE}" name="check_again" />&nbsp; &nbsp;<input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" />
+		<input type="submit" class="button2" value="{L_CHECK_FILES_AGAIN}" name="check_again" />&nbsp; &nbsp;<input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" />
 	</fieldset>

 	</form>
@@ -434,14 +360,6 @@
 			<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>
@@ -460,7 +378,7 @@
 	</dl>
 	<!-- END data -->
 	</fieldset>
-
+	
 	<fieldset class="submit-buttons">
 		{S_HIDDEN_FIELDS}
 		<input class="button2" type="submit" name="check_again" value="{L_BACK}" />
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -15,9 +15,9 @@
 // <![CDATA[
 function resize_panel()
 {
-	var block = document.getElementById('codepanel');
+	var block = document.getElementById('codepanel');	
 	var height;
-
+	
 	if (window.innerHeight)
 	{
 		height = window.innerHeight - 150;
@@ -26,16 +26,13 @@ function resize_panel()
 	else
 	{
 		//whatever IE needs to do this
-	}
+	}	
 }
-
-window.onresize = resize_panel;
-
 // ]]>
 </script>

 <style type="text/css">
-/* <![CDATA[ */
+<!--

 #main {
 	font-size: 1em;
@@ -51,30 +48,23 @@ window.onresize = resize_panel;

 <!-- 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 {
+div#codepanel {	
 	background-color: #eee;
 }
 <!-- ENDIF -->

-<!-- IF DIFF_MODE neq 'unified' and DIFF_MODE neq 'side_by_side'  -->
-div#diff_content pre {
-	overflow: auto;
-	height: 414px;
-	width: 100% !important;
-}
-<!-- ENDIF -->
-
 <!-- IF not S_DIFF_NEW_FILE -->
 /**
 * Unified Diff
 */
 .file {
 	line-height: .7em;
-	overflow: auto;
-	height: 414px;
 }

 .diff {
@@ -149,10 +139,10 @@ table.hrdiff tbody th {

 table.hrdiff tbody td.old {
 	border-left: 1px solid #999;
-	border-right: 1px solid #999;
+	border-right: 1px solid #999;	
 }
 table.hrdiff tbody td.new {
-	border-right: 1px solid #999;
+	border-right: 1px solid #999;	
 }

 table.hrdiff td pre {
@@ -208,13 +198,14 @@ table.hrdiff caption span {

 <!-- ENDIF -->

-/* ]]> */
+//-->
 </style>

 </head>

+
 <!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
-<body onload="resize_panel();">
+<body onresize="resize_panel();" onload="resize_panel();">
 <!-- ELSE -->
 <body>
 <!-- ENDIF -->
@@ -229,7 +220,7 @@ table.hrdiff caption span {
 <!-- ENDIF -->
 <!-- IF not S_DIFF_NEW_FILE -->
 		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
-		<form method="post" action="">
+		<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>
@@ -237,19 +228,19 @@ table.hrdiff caption span {
 			<input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" />
 		</fieldset>
 		</form>
-<!-- ENDIF -->
-<!-- IF S_DIFF_CONFLICT_FILE -->
-		<div style="float: {S_CONTENT_FLOW_BEGIN};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
-		<br style="clear: both;" />
 <!-- 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>
@@ -257,6 +248,6 @@ table.hrdiff caption span {
 		</div>
 		</div>
 	</div>
-
+	

 <!-- INCLUDE simple_footer.html -->
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -2,7 +2,6 @@
 					</div>
 				</div>
 			<span class="corners-bottom"><span></span></span>
-			<div class="clear"></div>
 		</div>
 		</div>
 	</div>
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -28,16 +28,9 @@ function jumpto()
 {
 	var page = prompt(jump_page, on_page);

-	if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0)
+	if (page !== null && !isNaN(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);
-		}
+		document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
 	}
 }

@@ -188,33 +181,27 @@ function switch_menu()
 			<span class="corners-top"><span></span></span>
 				<div id="content">
 					<!-- IF not S_USER_NOTICE --> 
-					<div id="toggle">
+					<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>{L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [&nbsp;<a href="{U_LOGOUT}">{L_LOGOUT}</a>&nbsp;][&nbsp;<a href="{U_ADM_LOGOUT}">{L_ADM_LOGOUT}</a>&nbsp;]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
+						<p>{L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [&nbsp;<a href="{U_LOGOUT}">{L_LOGOUT}</a>&nbsp;]</p>
 						<ul>
-						<!-- DEFINE $LI_USED = 0 -->
 						<!-- 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>
-							<!-- DEFINE $LI_USED = 1 -->
 							<!-- 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>
-								<!-- DEFINE $LI_USED = 1 -->
 							<!-- END l_block3 -->
 						<!-- END l_block2 -->
 						
 							<!-- ENDIF -->
 						<!-- END l_block1 -->
-						<!-- IF not $LI_USED -->
-							<li></li>
-						<!-- ENDIF -->
 						</ul>
 					</div>
 	
--- a/phpBB/adm/style/permission_forum_copy.html
+++ b/phpBB/adm/style/permission_forum_copy.html
@@ -1,40 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a name="maincontent"></a>
-
-	<h1>{L_ACP_FORUM_PERMISSIONS_COPY}</h1>
-
-	{L_ACP_FORUM_PERMISSIONS_COPY_EXPLAIN}
-
-	<form id="forum_perm_copy" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_LOOK_UP_FORUM}</legend>
-
-		<dl>
-			<dt><label for="src_forum">{L_COPY_PERMISSIONS_FROM}:</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span></dt>
-			<dd><select id="src_forum" name="src_forum_id"><option value="0">{L_SELECT_FORUM}</option><option value="-1">------------------</option>{S_FORUM_OPTIONS}</select></dd>
-		</dl>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_LOOK_UP_FORUM}</legend>
-		<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
-
-		<dl>
-			<dt><label for="dest_forums">{L_COPY_PERMISSIONS_TO}:</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span></dt>
-			<dd><select id="dest_forums" name="dest_forum_ids[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></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_HIDDEN_FIELDS}
-		{S_FORM_TOKEN}
-	</fieldset>
-
-	</form>
-
-<!-- INCLUDE overall_footer.html -->
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -68,7 +68,7 @@
 		<!-- 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>
+		<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>{category.CAT_NAME}</span></a></li>
 	<!-- END category -->
 				</ul>
 			</div>
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -39,16 +39,9 @@ function jumpto()
 {
 	var page = prompt(jump_page, on_page);

-	if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0)
+	if (page !== null && !isNaN(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);
-		}
+		document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
 	}
 }

--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -19,12 +19,8 @@ if (!defined('IN_PHPBB'))
 $starttime = explode(' ', microtime());
 $starttime = $starttime[1] + $starttime[0];

-// Report all errors, except notices and deprecation messages
-if (!defined('E_DEPRECATED'))
-{
-	define('E_DEPRECATED', 8192);
-}
-error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
+// Report all errors, except notices
+error_reporting(E_ALL ^ E_NOTICE);

 /*
 * Remove variables created by register_globals from the global scope
@@ -107,7 +103,7 @@ if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
 }
 else
 {
-	@set_magic_quotes_runtime(0);
+	set_magic_quotes_runtime(0);

 	// Be paranoid with passed vars
 	if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' || !function_exists('ini_get'))
@@ -135,7 +131,7 @@ if (!defined('PHPBB_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_name = (!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;

@@ -154,11 +150,7 @@ if (!defined('PHPBB_INSTALLED'))

 	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 .= ':' . $server_port;
 	}

 	$url .= $script_path;
@@ -176,8 +168,7 @@ if (defined('DEBUG_EXTRA'))
 }

 // Load Extensions
-// dl() is deprecated and disabled by default as of PHP 5.3.
-if (!empty($load_extensions) && function_exists('dl'))
+if (!empty($load_extensions))
 {
 	$load_extensions = explode(',', $load_extensions);

--- a/phpBB/develop/adjust_avatars.php
+++ b/phpBB/develop/adjust_avatars.php
--- a/phpBB/develop/adjust_uids.php
+++ b/phpBB/develop/adjust_uids.php
--- a/phpBB/develop/collect_cache_stats.sh
+++ b/phpBB/develop/collect_cache_stats.sh
@@ -1,3 +0,0 @@
-#!/bin/sh
-DIR=$(dirname "$0")/../cache;
-cat "$DIR/sql_*.php" | grep '/* SELECT' | sed 's,/\* ,,;s, \*/,,' | sort
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -674,7 +674,7 @@ foreach ($supported_dbms as $dbms)
 						}

 						$line .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : '';
-
+						
 						$line .= " {$table_name}_{$key_name} ON {$table_name} (" . implode(', ', $key_data[1]) . ")\n";
 						$line .= "/\n";
 					break;
@@ -855,7 +855,7 @@ function get_schema_struct()
 		),
 		'PRIMARY_KEY'	=> 'auth_option_id',
 		'KEYS'			=> array(
-			'auth_option'		=> array('UNIQUE', 'auth_option'),
+			'auth_option'		=> array('INDEX', 'auth_option'),
 		),
 	);

@@ -983,7 +983,6 @@ function get_schema_struct()
 			'confirm_type'		=> array('TINT:3', 0),
 			'code'				=> array('VCHAR:8', ''),
 			'seed'				=> array('UINT:10', 0),
-			'attempts'			=> array('UINT', 0),
 		),
 		'PRIMARY_KEY'	=> array('session_id', 'confirm_id'),
 		'KEYS'			=> array(
@@ -1006,7 +1005,7 @@ function get_schema_struct()
 			'topic_id'			=> array('UINT', 0),
 			'forum_id'			=> array('UINT', 0),
 			'save_time'			=> array('TIMESTAMP', 0),
-			'draft_subject'		=> array('STEXT_UNI', ''),
+			'draft_subject'		=> array('XSTEXT_UNI', ''),
 			'draft_message'		=> array('MTEXT_UNI', ''),
 		),
 		'PRIMARY_KEY'	=> 'draft_id',
@@ -1053,7 +1052,7 @@ function get_schema_struct()
 			'forum_desc_uid'		=> array('VCHAR:8', ''),
 			'forum_link'			=> array('VCHAR_UNI', ''),
 			'forum_password'		=> array('VCHAR_UNI:40', ''),
-			'forum_style'			=> array('UINT', 0),
+			'forum_style'			=> array('USINT', 0),
 			'forum_image'			=> array('VCHAR', ''),
 			'forum_rules'			=> array('TEXT_UNI', ''),
 			'forum_rules_link'		=> array('VCHAR_UNI', ''),
@@ -1068,13 +1067,11 @@ function get_schema_struct()
 			'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_subject' => array('XSTEXT_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),
-			'forum_options'			=> array('UINT:20', 0),
-			'display_subforum_list'	=> array('BOOL', 1),
 			'display_on_index'		=> array('BOOL', 1),
 			'enable_indexing'		=> array('BOOL', 1),
 			'enable_icons'			=> array('BOOL', 1),
@@ -1127,7 +1124,6 @@ function get_schema_struct()
 			'group_id'				=> array('UINT', NULL, 'auto_increment'),
 			'group_type'			=> array('TINT:4', 1),
 			'group_founder_manage'	=> array('BOOL', 0),
-			'group_skip_auth'		=> array('BOOL', 0),
 			'group_name'			=> array('VCHAR_CI', ''),
 			'group_desc'			=> array('TEXT_UNI', ''),
 			'group_desc_bitfield'	=> array('VCHAR:255', ''),
@@ -1143,12 +1139,11 @@ function get_schema_struct()
 			'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')),
+			'group_legend'			=> array('INDEX', 'group_legend'),
 		),
 	);

@@ -1285,7 +1280,7 @@ function get_schema_struct()
 			'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_subject'			=> array('XSTEXT_UNI', '', 'true_sort'),
 			'post_text'				=> array('MTEXT_UNI', ''),
 			'post_checksum'			=> array('VCHAR:32', ''),
 			'post_attachment'		=> array('BOOL', 0),
@@ -1305,7 +1300,6 @@ function get_schema_struct()
 			'poster_ip'				=> array('INDEX', 'poster_ip'),
 			'poster_id'				=> array('INDEX', 'poster_id'),
 			'post_approved'			=> array('INDEX', 'post_approved'),
-			'post_username'			=> array('INDEX', 'post_username'),
 			'tid_post_time'			=> array('INDEX', array('topic_id', 'post_time')),
 		),
 	);
@@ -1322,7 +1316,7 @@ function get_schema_struct()
 			'enable_smilies'		=> array('BOOL', 1),
 			'enable_magic_url'		=> array('BOOL', 1),
 			'enable_sig'			=> array('BOOL', 1),
-			'message_subject'		=> array('STEXT_UNI', ''),
+			'message_subject'		=> array('XSTEXT_UNI', ''),
 			'message_text'			=> array('MTEXT_UNI', ''),
 			'message_edit_reason'	=> array('STEXT_UNI', ''),
 			'message_edit_user'		=> array('UINT', 0),
@@ -1333,7 +1327,6 @@ function get_schema_struct()
 			'message_edit_count'	=> array('USINT', 0),
 			'to_address'			=> array('TEXT_UNI', ''),
 			'bcc_address'			=> array('TEXT_UNI', ''),
-			'message_reported'		=> array('BOOL', 0),
 		),
 		'PRIMARY_KEY'	=> 'msg_id',
 		'KEYS'			=> array(
@@ -1409,8 +1402,6 @@ function get_schema_struct()
 			'field_validation'		=> array('VCHAR_UNI:20', ''),
 			'field_required'		=> array('BOOL', 0),
 			'field_show_on_reg'		=> array('BOOL', 0),
-			'field_show_on_vt'		=> 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),
@@ -1468,7 +1459,6 @@ function get_schema_struct()
 			'report_id'				=> array('UINT', NULL, 'auto_increment'),
 			'reason_id'				=> array('USINT', 0),
 			'post_id'				=> array('UINT', 0),
-			'pm_id'					=> array('UINT', 0),
 			'user_id'				=> array('UINT', 0),
 			'user_notify'			=> array('BOOL', 0),
 			'report_closed'			=> array('BOOL', 0),
@@ -1476,10 +1466,6 @@ function get_schema_struct()
 			'report_text'			=> array('MTEXT_UNI', ''),
 		),
 		'PRIMARY_KEY'	=> 'report_id',
-		'KEYS'			=> array(
-			'post_id'			=> array('INDEX', 'post_id'),
-			'pm_id'				=> array('INDEX', 'pm_id'),
-		),
 	);

 	$schema_data['phpbb_reports_reasons'] = array(
@@ -1533,7 +1519,6 @@ function get_schema_struct()
 		'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),
@@ -1549,7 +1534,6 @@ function get_schema_struct()
 		'KEYS'			=> array(
 			'session_time'		=> array('INDEX', 'session_time'),
 			'session_user_id'	=> array('INDEX', 'session_user_id'),
-			'session_fid'		=> array('INDEX', 'session_forum_id'),
 		),
 	);

@@ -1596,13 +1580,13 @@ function get_schema_struct()

 	$schema_data['phpbb_styles'] = array(
 		'COLUMNS'		=> array(
-			'style_id'				=> array('UINT', NULL, 'auto_increment'),
+			'style_id'				=> array('USINT', NULL, 'auto_increment'),
 			'style_name'			=> array('VCHAR_UNI:255', ''),
 			'style_copyright'		=> array('VCHAR_UNI', ''),
 			'style_active'			=> array('BOOL', 1),
-			'template_id'			=> array('UINT', 0),
-			'theme_id'				=> array('UINT', 0),
-			'imageset_id'			=> array('UINT', 0),
+			'template_id'			=> array('USINT', 0),
+			'theme_id'				=> array('USINT', 0),
+			'imageset_id'			=> array('USINT', 0),
 		),
 		'PRIMARY_KEY'	=> 'style_id',
 		'KEYS'			=> array(
@@ -1615,14 +1599,12 @@ function get_schema_struct()

 	$schema_data['phpbb_styles_template'] = array(
 		'COLUMNS'		=> array(
-			'template_id'			=> array('UINT', NULL, 'auto_increment'),
+			'template_id'			=> array('USINT', NULL, 'auto_increment'),
 			'template_name'			=> array('VCHAR_UNI:255', ''),
 			'template_copyright'	=> array('VCHAR_UNI', ''),
 			'template_path'			=> array('VCHAR:100', ''),
 			'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(
@@ -1632,7 +1614,7 @@ function get_schema_struct()

 	$schema_data['phpbb_styles_template_data'] = array(
 		'COLUMNS'		=> array(
-			'template_id'			=> array('UINT', 0),
+			'template_id'			=> array('USINT', 0),
 			'template_filename'		=> array('VCHAR:100', ''),
 			'template_included'		=> array('TEXT', ''),
 			'template_mtime'		=> array('TIMESTAMP', 0),
@@ -1646,7 +1628,7 @@ function get_schema_struct()

 	$schema_data['phpbb_styles_theme'] = array(
 		'COLUMNS'		=> array(
-			'theme_id'				=> array('UINT', NULL, 'auto_increment'),
+			'theme_id'				=> array('USINT', NULL, 'auto_increment'),
 			'theme_name'			=> array('VCHAR_UNI:255', ''),
 			'theme_copyright'		=> array('VCHAR_UNI', ''),
 			'theme_path'			=> array('VCHAR:100', ''),
@@ -1662,7 +1644,7 @@ function get_schema_struct()

 	$schema_data['phpbb_styles_imageset'] = array(
 		'COLUMNS'		=> array(
-			'imageset_id'				=> array('UINT', NULL, 'auto_increment'),
+			'imageset_id'				=> array('USINT', NULL, 'auto_increment'),
 			'imageset_name'				=> array('VCHAR_UNI:255', ''),
 			'imageset_copyright'		=> array('VCHAR_UNI', ''),
 			'imageset_path'				=> array('VCHAR:100', ''),
@@ -1675,13 +1657,13 @@ function get_schema_struct()

 	$schema_data['phpbb_styles_imageset_data'] = array(
 		'COLUMNS'		=> array(
-			'image_id'				=> array('UINT', NULL, 'auto_increment'),
+			'image_id'				=> array('USINT', 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),
+			'imageset_id'			=> array('USINT', 0),
 		),
 		'PRIMARY_KEY'		=> 'image_id',
 		'KEYS'				=> array(
@@ -1697,7 +1679,7 @@ function get_schema_struct()
 			'topic_attachment'			=> array('BOOL', 0),
 			'topic_approved'			=> array('BOOL', 1),
 			'topic_reported'			=> array('BOOL', 0),
-			'topic_title'				=> array('STEXT_UNI', '', 'true_sort'),
+			'topic_title'				=> array('XSTEXT_UNI', '', 'true_sort'),
 			'topic_poster'				=> array('UINT', 0),
 			'topic_time'				=> array('TIMESTAMP', 0),
 			'topic_time_limit'			=> array('TIMESTAMP', 0),
@@ -1713,7 +1695,7 @@ function get_schema_struct()
 			'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_subject'	=> array('XSTEXT_UNI', ''),
 			'topic_last_post_time'		=> array('TIMESTAMP', 0),
 			'topic_last_view_time'		=> array('TIMESTAMP', 0),
 			'topic_moved_id'			=> array('UINT', 0),
@@ -1746,7 +1728,6 @@ function get_schema_struct()
 		),
 		'PRIMARY_KEY'	=> array('user_id', 'topic_id'),
 		'KEYS'			=> array(
-			'topic_id'			=> array('INDEX', 'topic_id'),
 			'forum_id'			=> array('INDEX', 'forum_id'),
 		),
 	);
@@ -1820,7 +1801,7 @@ function get_schema_struct()
 			'user_timezone'				=> array('DECIMAL', 0),
 			'user_dst'					=> array('BOOL', 0),
 			'user_dateformat'			=> array('VCHAR_UNI:30', 'd M Y H:i'),
-			'user_style'				=> array('UINT', 0),
+			'user_style'				=> array('USINT', 0),
 			'user_rank'					=> array('UINT', 0),
 			'user_colour'				=> array('VCHAR:6', ''),
 			'user_new_privmsg'			=> array('INT:4', 0),
@@ -1842,7 +1823,7 @@ function get_schema_struct()
 			'user_allow_viewonline'		=> array('BOOL', 1),
 			'user_allow_viewemail'		=> array('BOOL', 1),
 			'user_allow_massemail'		=> array('BOOL', 1),
-			'user_options'				=> array('UINT:11', 230271),
+			'user_options'				=> array('UINT:11', 895),
 			'user_avatar'				=> array('VCHAR', ''),
 			'user_avatar_type'			=> array('TINT:2', 0),
 			'user_avatar_width'			=> array('USINT', 0),
@@ -1862,9 +1843,7 @@ function get_schema_struct()
 			'user_actkey'				=> array('VCHAR:32', ''),
 			'user_newpasswd'			=> array('VCHAR_UNI:40', ''),
 			'user_form_salt'			=> array('VCHAR_UNI:32', ''),
-			'user_new'					=> array('BOOL', 1),
-			'user_reminded'				=> array('TINT:4', 0),
-			'user_reminded_time'		=> array('TIMESTAMP', 0),
+
 		),
 		'PRIMARY_KEY'	=> 'user_id',
 		'KEYS'			=> array(
--- a/phpBB/develop/fix_files.sh
+++ b/phpBB/develop/fix_files.sh
@@ -21,9 +21,9 @@ rm FILELIST.$$

 for i in $(cat FILELIST); do
 	if [ -f $i ]; then  	 
-		cat $i | tr -d '\r' > $i.tmp
-		mv $i.tmp $i
+		sed -e s/
+//g $i > $i.tmp
+  		mv $i.tmp $i
 	fi	
 done
 rm FILELIST
-
--- a/phpBB/develop/generate_utf_confusables.php
+++ b/phpBB/develop/generate_utf_confusables.php
@@ -114,14 +114,10 @@ $uniarray = array(

 $copy = $uniarray;

-/**
-* @todo we need to check that the $uniarray does not reverse any of the mappings defined in the unicode definition
-*/
-
 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 = '';
--- a/phpBB/develop/mysql_upgrader.php
+++ b/phpBB/develop/mysql_upgrader.php
@@ -1,10 +1,10 @@
 <?php
-/**
+/** 
 *
 * @package phpBB3
 * @version $Id$
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2006 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
 *
 * This file creates SQL statements to upgrade phpBB on MySQL 3.x/4.0.x to 4.1.x/5.x
 *
@@ -40,18 +40,13 @@ $row = $db->sql_fetchrow($result);

 $db->sql_freeresult($result);

-$mysql_indexer = $drop_index = false;
+$mysql_indexer = false;

 if (strtolower($row['Type']) === 'mediumtext')
 {
 	$mysql_indexer = true;
 }

-if (strtolower($row['Key']) === 'mul')
-{
-	$drop_index = true;
-}
-
 echo "USE $dbname;$newline$newline";


@@ -129,17 +124,10 @@ foreach ($schema_data as $table_name => $table_data)
 	// Create Table statement
 	$generator = $textimage = false;

-	// Do we need to DROP a fulltext index before we alter the table?
-	if ($table_name == ($prefix . 'posts') && $drop_index)
-	{
-		echo "ALTER TABLE {$table_name}{$newline}";
-		echo "DROP INDEX post_text,{$newline}DROP INDEX post_subject,{$newline}DROP INDEX post_content;{$newline}{$newline}";
-	}
-
 	$line = "ALTER TABLE {$table_name} $newline";

 	// Table specific so we don't get overlap
-	$modded_array = array();
+	$modded_array = array(); 

 	// Write columns one by one...
 	foreach ($table_data['COLUMNS'] as $column_name => $column_data)
@@ -248,12 +236,6 @@ foreach ($schema_data as $table_name => $table_data)
 	$line .= "\tDEFAULT CHARSET=utf8 COLLATE=utf8_bin;$newline$newline";

 	echo $line . "$newline";
-
-	// Do we now need to re-add the fulltext index? ;)
-	if ($table_name == ($prefix . 'posts') && $drop_index)
-	{
-		echo "ALTER TABLE $table_name ADD FULLTEXT (post_subject), ADD FULLTEXT (post_text), ADD FULLTEXT post_content (post_subject, post_text){$newline}";
-	}
 }

 /**
@@ -345,7 +327,7 @@ function get_schema_struct()
 		),
 		'PRIMARY_KEY'	=> 'auth_option_id',
 		'KEYS'			=> array(
-			'auth_option'		=> array('UNIQUE', 'auth_option'),
+			'auth_option'		=> array('INDEX', 'auth_option'),
 		),
 	);

@@ -473,7 +455,6 @@ function get_schema_struct()
 			'confirm_type'		=> array('TINT:3', 0),
 			'code'				=> array('VCHAR:8', ''),
 			'seed'				=> array('UINT:10', 0),
-			'attempts'			=> array('UINT', 0),
 		),
 		'PRIMARY_KEY'	=> array('session_id', 'confirm_id'),
 		'KEYS'			=> array(
@@ -496,7 +477,7 @@ function get_schema_struct()
 			'topic_id'			=> array('UINT', 0),
 			'forum_id'			=> array('UINT', 0),
 			'save_time'			=> array('TIMESTAMP', 0),
-			'draft_subject'		=> array('STEXT_UNI', ''),
+			'draft_subject'		=> array('XSTEXT_UNI', ''),
 			'draft_message'		=> array('MTEXT_UNI', ''),
 		),
 		'PRIMARY_KEY'	=> 'draft_id',
@@ -543,7 +524,7 @@ function get_schema_struct()
 			'forum_desc_uid'		=> array('VCHAR:8', ''),
 			'forum_link'			=> array('VCHAR_UNI', ''),
 			'forum_password'		=> array('VCHAR_UNI:40', ''),
-			'forum_style'			=> array('UINT', 0),
+			'forum_style'			=> array('USINT', 0),
 			'forum_image'			=> array('VCHAR', ''),
 			'forum_rules'			=> array('TEXT_UNI', ''),
 			'forum_rules_link'		=> array('VCHAR_UNI', ''),
@@ -558,13 +539,11 @@ function get_schema_struct()
 			'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_subject' => array('XSTEXT_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),
-			'forum_options'			=> array('UINT:20', 0),
-			'display_subforum_list'	=> array('BOOL', 1),
 			'display_on_index'		=> array('BOOL', 1),
 			'enable_indexing'		=> array('BOOL', 1),
 			'enable_icons'			=> array('BOOL', 1),
@@ -617,7 +596,6 @@ function get_schema_struct()
 			'group_id'				=> array('UINT', NULL, 'auto_increment'),
 			'group_type'			=> array('TINT:4', 1),
 			'group_founder_manage'	=> array('BOOL', 0),
-			'group_skip_auth'		=> array('BOOL', 0),
 			'group_name'			=> array('VCHAR_CI', ''),
 			'group_desc'			=> array('TEXT_UNI', ''),
 			'group_desc_bitfield'	=> array('VCHAR:255', ''),
@@ -633,12 +611,11 @@ function get_schema_struct()
 			'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')),
+			'group_legend'			=> array('INDEX', 'group_legend'),
 		),
 	);

@@ -775,8 +752,8 @@ function get_schema_struct()
 			'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_subject'			=> array('XSTEXT_UNI', '', 'true_sort'),
+			'post_text'				=> array('MTEXT_UNI', '', ($GLOBALS['mysql_indexer']) ? 'true_sort' : 'no_sort'),
 			'post_checksum'			=> array('VCHAR:32', ''),
 			'post_attachment'		=> array('BOOL', 0),
 			'bbcode_bitfield'		=> array('VCHAR:255', ''),
@@ -795,7 +772,6 @@ function get_schema_struct()
 			'poster_ip'				=> array('INDEX', 'poster_ip'),
 			'poster_id'				=> array('INDEX', 'poster_id'),
 			'post_approved'			=> array('INDEX', 'post_approved'),
-			'post_username'			=> array('INDEX', 'post_username'),
 			'tid_post_time'			=> array('INDEX', array('topic_id', 'post_time')),
 		),
 	);
@@ -812,7 +788,7 @@ function get_schema_struct()
 			'enable_smilies'		=> array('BOOL', 1),
 			'enable_magic_url'		=> array('BOOL', 1),
 			'enable_sig'			=> array('BOOL', 1),
-			'message_subject'		=> array('STEXT_UNI', ''),
+			'message_subject'		=> array('XSTEXT_UNI', ''),
 			'message_text'			=> array('MTEXT_UNI', ''),
 			'message_edit_reason'	=> array('STEXT_UNI', ''),
 			'message_edit_user'		=> array('UINT', 0),
@@ -823,7 +799,6 @@ function get_schema_struct()
 			'message_edit_count'	=> array('USINT', 0),
 			'to_address'			=> array('TEXT_UNI', ''),
 			'bcc_address'			=> array('TEXT_UNI', ''),
-			'message_reported'		=> array('BOOL', 0),
 		),
 		'PRIMARY_KEY'	=> 'msg_id',
 		'KEYS'			=> array(
@@ -899,8 +874,6 @@ function get_schema_struct()
 			'field_validation'		=> array('VCHAR_UNI:20', ''),
 			'field_required'		=> array('BOOL', 0),
 			'field_show_on_reg'		=> array('BOOL', 0),
-			'field_show_on_vt'		=> 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),
@@ -958,7 +931,6 @@ function get_schema_struct()
 			'report_id'				=> array('UINT', NULL, 'auto_increment'),
 			'reason_id'				=> array('USINT', 0),
 			'post_id'				=> array('UINT', 0),
-			'pm_id'					=> array('UINT', 0),
 			'user_id'				=> array('UINT', 0),
 			'user_notify'			=> array('BOOL', 0),
 			'report_closed'			=> array('BOOL', 0),
@@ -966,10 +938,6 @@ function get_schema_struct()
 			'report_text'			=> array('MTEXT_UNI', ''),
 		),
 		'PRIMARY_KEY'	=> 'report_id',
-		'KEYS'			=> array(
-			'post_id'			=> array('INDEX', 'post_id'),
-			'pm_id'				=> array('INDEX', 'pm_id'),
-		),
 	);

 	$schema_data['phpbb_reports_reasons'] = array(
@@ -1023,7 +991,6 @@ function get_schema_struct()
 		'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),
@@ -1039,7 +1006,6 @@ function get_schema_struct()
 		'KEYS'			=> array(
 			'session_time'		=> array('INDEX', 'session_time'),
 			'session_user_id'	=> array('INDEX', 'session_user_id'),
-			'session_fid'		=> array('INDEX', 'session_forum_id'),
 		),
 	);

@@ -1086,13 +1052,13 @@ function get_schema_struct()

 	$schema_data['phpbb_styles'] = array(
 		'COLUMNS'		=> array(
-			'style_id'				=> array('UINT', NULL, 'auto_increment'),
+			'style_id'				=> array('USINT', NULL, 'auto_increment'),
 			'style_name'			=> array('VCHAR_UNI:255', ''),
 			'style_copyright'		=> array('VCHAR_UNI', ''),
 			'style_active'			=> array('BOOL', 1),
-			'template_id'			=> array('UINT', 0),
-			'theme_id'				=> array('UINT', 0),
-			'imageset_id'			=> array('UINT', 0),
+			'template_id'			=> array('USINT', 0),
+			'theme_id'				=> array('USINT', 0),
+			'imageset_id'			=> array('USINT', 0),
 		),
 		'PRIMARY_KEY'	=> 'style_id',
 		'KEYS'			=> array(
@@ -1105,14 +1071,12 @@ function get_schema_struct()

 	$schema_data['phpbb_styles_template'] = array(
 		'COLUMNS'		=> array(
-			'template_id'			=> array('UINT', NULL, 'auto_increment'),
+			'template_id'			=> array('USINT', NULL, 'auto_increment'),
 			'template_name'			=> array('VCHAR_UNI:255', ''),
 			'template_copyright'	=> array('VCHAR_UNI', ''),
 			'template_path'			=> array('VCHAR:100', ''),
 			'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(
@@ -1122,7 +1086,7 @@ function get_schema_struct()

 	$schema_data['phpbb_styles_template_data'] = array(
 		'COLUMNS'		=> array(
-			'template_id'			=> array('UINT', 0),
+			'template_id'			=> array('USINT', 0),
 			'template_filename'		=> array('VCHAR:100', ''),
 			'template_included'		=> array('TEXT', ''),
 			'template_mtime'		=> array('TIMESTAMP', 0),
@@ -1136,7 +1100,7 @@ function get_schema_struct()

 	$schema_data['phpbb_styles_theme'] = array(
 		'COLUMNS'		=> array(
-			'theme_id'				=> array('UINT', NULL, 'auto_increment'),
+			'theme_id'				=> array('USINT', NULL, 'auto_increment'),
 			'theme_name'			=> array('VCHAR_UNI:255', ''),
 			'theme_copyright'		=> array('VCHAR_UNI', ''),
 			'theme_path'			=> array('VCHAR:100', ''),
@@ -1152,7 +1116,7 @@ function get_schema_struct()

 	$schema_data['phpbb_styles_imageset'] = array(
 		'COLUMNS'		=> array(
-			'imageset_id'				=> array('UINT', NULL, 'auto_increment'),
+			'imageset_id'				=> array('USINT', NULL, 'auto_increment'),
 			'imageset_name'				=> array('VCHAR_UNI:255', ''),
 			'imageset_copyright'		=> array('VCHAR_UNI', ''),
 			'imageset_path'				=> array('VCHAR:100', ''),
@@ -1165,13 +1129,13 @@ function get_schema_struct()

 	$schema_data['phpbb_styles_imageset_data'] = array(
 		'COLUMNS'		=> array(
-			'image_id'				=> array('UINT', NULL, 'auto_increment'),
+			'image_id'				=> array('USINT', 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),
+			'imageset_id'			=> array('USINT', 0),
 		),
 		'PRIMARY_KEY'		=> 'image_id',
 		'KEYS'				=> array(
@@ -1187,7 +1151,7 @@ function get_schema_struct()
 			'topic_attachment'			=> array('BOOL', 0),
 			'topic_approved'			=> array('BOOL', 1),
 			'topic_reported'			=> array('BOOL', 0),
-			'topic_title'				=> array('STEXT_UNI', '', 'true_sort'),
+			'topic_title'				=> array('XSTEXT_UNI', '', 'true_sort'),
 			'topic_poster'				=> array('UINT', 0),
 			'topic_time'				=> array('TIMESTAMP', 0),
 			'topic_time_limit'			=> array('TIMESTAMP', 0),
@@ -1203,7 +1167,7 @@ function get_schema_struct()
 			'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_subject'	=> array('XSTEXT_UNI', ''),
 			'topic_last_post_time'		=> array('TIMESTAMP', 0),
 			'topic_last_view_time'		=> array('TIMESTAMP', 0),
 			'topic_moved_id'			=> array('UINT', 0),
@@ -1236,7 +1200,6 @@ function get_schema_struct()
 		),
 		'PRIMARY_KEY'	=> array('user_id', 'topic_id'),
 		'KEYS'			=> array(
-			'topic_id'			=> array('INDEX', 'topic_id'),
 			'forum_id'			=> array('INDEX', 'forum_id'),
 		),
 	);
@@ -1310,7 +1273,7 @@ function get_schema_struct()
 			'user_timezone'				=> array('DECIMAL', 0),
 			'user_dst'					=> array('BOOL', 0),
 			'user_dateformat'			=> array('VCHAR_UNI:30', 'd M Y H:i'),
-			'user_style'				=> array('UINT', 0),
+			'user_style'				=> array('USINT', 0),
 			'user_rank'					=> array('UINT', 0),
 			'user_colour'				=> array('VCHAR:6', ''),
 			'user_new_privmsg'			=> array('INT:4', 0),
@@ -1332,7 +1295,7 @@ function get_schema_struct()
 			'user_allow_viewonline'		=> array('BOOL', 1),
 			'user_allow_viewemail'		=> array('BOOL', 1),
 			'user_allow_massemail'		=> array('BOOL', 1),
-			'user_options'				=> array('UINT:11', 230271),
+			'user_options'				=> array('UINT:11', 895),
 			'user_avatar'				=> array('VCHAR', ''),
 			'user_avatar_type'			=> array('TINT:2', 0),
 			'user_avatar_width'			=> array('USINT', 0),
@@ -1352,9 +1315,7 @@ function get_schema_struct()
 			'user_actkey'				=> array('VCHAR:32', ''),
 			'user_newpasswd'			=> array('VCHAR_UNI:40', ''),
 			'user_form_salt'			=> array('VCHAR_UNI:32', ''),
-			'user_new'					=> array('BOOL', 1),
-			'user_reminded'				=> array('TINT:4', 0),
-			'user_reminded_time'		=> array('TIMESTAMP', 0),
+
 		),
 		'PRIMARY_KEY'	=> 'user_id',
 		'KEYS'			=> array(
--- a/phpBB/develop/repair_bots.php
+++ b/phpBB/develop/repair_bots.php
--- a/phpBB/develop/update_email_hash.php
+++ b/phpBB/develop/update_email_hash.php
@@ -1,57 +0,0 @@
-<?php
-/**
-* Corrects user_email_hash values if DB moved from 32-bit system to 64-bit system or vice versa.
-* The CRC32 function in PHP generates different results for both systems.
-* @PHP dev team: no, a hexdec() applied to it does not solve the issue. And please document it.
-*
-*/
-die("Please read the first lines of this script for instructions on how to enable it");
-
-set_time_limit(0);
-
-define('IN_PHPBB', true);
-$phpbb_root_path = './../';
-$phpEx = substr(strrchr(__FILE__, '.'), 1);
-include($phpbb_root_path . 'common.' . $phpEx);
-
-// Start session management
-$user->session_begin();
-$auth->acl($user->data);
-$user->setup();
-
-$start = request_var('start', 0);
-$num_items = 1000;
-
-echo '<br />Updating user email hashes' . "\n";
-
-$sql = 'SELECT user_id, user_email
-	FROM ' . USERS_TABLE . '
-	ORDER BY user_id ASC';
-$result = $db->sql_query($sql);
-
-$echos = 0;
-while ($row = $db->sql_fetchrow($result))
-{
-	$echos++;
-
-	$sql = 'UPDATE ' . USERS_TABLE . "
-		SET user_email_hash = '" . $db->sql_escape(phpbb_email_hash($row['user_email'])) . "'
-		WHERE user_id = " . (int) $row['user_id'];
-	$db->sql_query($sql);
-
-	if ($echos == 200)
-	{
-		echo '<br />';
-		$echos = 0;
-	}
-
-	echo '.';
-	flush();
-}
-$db->sql_freeresult($result);
-
-echo 'FINISHED';
-
-// Done
-$db->sql_close();
-?>
--- a/phpBB/docs/AUTHORS
+++ b/phpBB/docs/AUTHORS
@@ -1,6 +1,6 @@
 /**
 *
-* phpBB3 © Copyright 2000, 2002, 2005, 2007 phpBB Group
+* phpBB3 <EFBFBD> Copyright 2000, 2002, 2005, 2007 phpBB Group
 * http://www.phpbb.com
 *
 * This program is free software: you can redistribute it and/or modify
@@ -20,41 +20,30 @@
 Please see: http://www.phpbb.com/about/team/ for a list of all the people currently
 involved in phpBB.

-phpBB Lead Developer:  naderman (Nils Adermann)
+phpBB Lead Developer  : Acyd Burn (Meik Sievertsen)

-phpBB Developers:      A_Jelly_Doughnut (Josh Woody)
-                       Acyd Burn (Meik Sievertsen) [Lead 09/2005 - 01/2010]
-                       APTX (Marek A. R.)
-                       bantu (Andreas Fischer)
-                       DavidMJ (David M.)
-                       dhn (Dominik Dröscher)
-                       kellanved (Henry Sudhof)
-                       Terrafrost (Jim Wigginton)
-                       ToonArmy (Chris Smith)
+phpBB Developers      : DavidMJ (David M.)
+                        dhn (Dominik Dr<44>scher)
+                        kellanved (Henry Sudhof)
+                        naderman (Nils Adermann)
+                        subBlue (Tom Beddard)
+                        Vic D'Elfant (Vic D'Elfant)

-Contributions by:      Brainy (Cullen Walsh)
-                       leviatan21 (Gabriel Vazquez)
-                       nickvergessen (Joas Schilling)
-                       Raimon (Raimon Meuldijk)
-                       rxu (Ruslan Uzdenov)
-                       Xore (Robert Hetzler)
+-- Previous Contributors --

+phpBB Project Manager : theFinn (James Atkinson) [Founder - 04/2007]
+			SHS` (Jonathan Stanley)

-- Former Contributors --
+phpBB Lead Developer  : psoTFX (Paul S. Owen) [2001 - 09/2005]

-phpBB Project Manager: theFinn (James Atkinson) [Founder - 04/2007]
-                       SHS` (Jonathan Stanley)
+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]

-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]
-                       Vic D'Elfant (Vic D'Elfant) [04/2007 - 04/2009]

 -- Copyrights --

-Visual Confirmation:   Xore (Robert Hetzler)
+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
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -53,13 +53,6 @@
 <ol>
 	<li><a href="#changelog">Changelog</a>
 	<ol style="list-style-type: lower-roman;">
-		<li><a href="#v306">Changes since 3.0.6</a></li>
-		<li><a href="#v305">Changes since 3.0.5</a></li>
-		<li><a href="#v304">Changes since 3.0.4</a></li>
-		<li><a href="#v303">Changes since 3.0.3</a></li>
-		<li><a href="#v302">Changes since 3.0.2</a></li>
-		<li><a href="#v301">Changes since 3.0.1</a></li>
-		<li><a href="#v300">Changes since 3.0.0</a></li>
 		<li><a href="#v30rc8">Changes since RC-8</a></li>
 		<li><a href="#v30rc7">Changes since RC-7</a></li>
 		<li><a href="#v30rc6">Changes since RC-6</a></li>
@@ -86,672 +79,8 @@
 		<div class="inner"><span class="corners-top"><span></span></span>

 		<div class="content">
-	<a name="v306"></a><h3>1.i. Changes since 3.0.6</h3>

-	<ul>
-		<li>[Fix] Allow ban reason and length to be selected and copied in ACP and subsilver2 MCP. (Bug #51095)</li>
-		<li>[Fix] Force full date for board online record date.</li>
-		<li>[Fix] Correctly reset login keys if passed value is the current user. (Bug #54125)</li>
-		<li>[Fix] Correctly set last modified headers. (Bug #54245, thanks Paul.J.Murphy)</li>
-		<li>[Fix] Show correct HTML title when reporting private messages. (Bug #54375)</li>
-		<li>[Fix] Correctly exclude subforums from ATOM Feeds. (Bug #54285)</li>
-		<li>[Fix] Do not link to user profile in ATOM feed entry if post has been made by the guest user. (Bug #54275)</li>
-		<li>[Fix] Make word censoring case insensitive. (Bug #54265)</li>
-		<li>[Fix] Fulltext-MySQL search for keywords and username at the same time. (Bug #54325)</li>
-		<li>[Fix] Various XHTML and CSS mistakes in prosilver and subsilver2. (Bugs #54705, #55895, #57505)</li>
-		<li>[Fix] Correctly show topic ATOM feed link when only post id is specified. (Bug #53025)</li>
-		<li>[Fix] Cleanly handle forum/topic not found in ATOM Feeds. (Bug #54295)</li>
-		<li>[Fix] PHP 5.3 compatibility: Check if function dl() exists before calling it. (Bug #54665)</li>
-		<li>[Fix] PHP 5.3 compatibility: Disable E_DEPRECATED on startup to keep set_magic_quotes_runtime(0) quiet. (Bug #54495)</li>
-		<li>[Fix] Correctly replace table prefix before inserting schema data into the database. (Bug #54815)</li>
-		<li>[Fix] Correctly take post time instead of topic time for the overall forum feed statistics row. (Bug #55005)</li>
-		<li>[Fix] Posting errors with CAPTCHAs using user::add_lang(). (Bug #55245)</li>
-		<li>[Fix] Use memcache::replace() instead of memcache::set() for existing keys to prevent problems.</li>
-		<li>[Fix] Check for required functions in eAccelerator. (Bug #54465)</li>
-		<li>[Fix] Use correct RFC 3339 date format in ATOM feed. (Bug #55005)</li>
-		<li>[Fix] Do not deliver topics from unreadable or passworded forums in the news feed. (Bug #54345)</li>
-		<li>[Fix] Restore user language choice to compiled stylesheets. (Bug #54035)</li>
-		<li>[Fix] Add missing language entries. (Bug #55095)</li>
-		<li>[Fix] Do not permit unauthorised users to delete private messages from folder listing. (Bug #54355)</li>
-		<li>[Fix] Correctly check for empty strings in custom profile fields. (Bug #55335)</li>
-		<li>[Fix] Use correct options to parse BBCodes in signatures when previewing PMs.</li>
-		<li>[Fix] Correct rendering of prosilver quick reply under IE6. (Bug #54115 - Patch by Raimon)</li>
-		<li>[Fix] Correct wording for &quot;How do I show an image below my username&quot; question answer in FAQ. (Bug #23935)</li>
-		<li>[Fix] Handle export of private messages where all recipients were deleted. (Bug #50985)</li>
-		<li>[Fix] Correctly get unread status information for global announcements in search results.</li>
-		<li>[Fix] Correctly handle global announcements in ATOM feeds.</li>
-		<li>[Fix] Use correct limit config parameter in the News feed.</li>
-		<li>[Fix] Restrict search for styles/../style.cfg to folders. (Bug #55665)</li>
-		<li>[Fix] Add ability to disable overall (aka board-wide) feed.</li>
-		<li>[Fix] Do not pass new_link parameter when creating a persistent connection with mysql. (Bug #55785)</li>
-		<li>[Fix] Improved search query performance through sorting words by their occurance. (Bug #21555)</li>
-		<li>[Fix] Correctly move sql_row_pointer forward when calling sql_fetchfield() on cached queries. (Bug #55865)</li>
-		<li>[Fix] Remove item limit from &quot;All forums&quot; feed.</li>
-		<li>[Fix] Do not use group colours for usernames on print view. (Bug #30315 - Patch by Pasqualle)</li>
-		<li>[Fix] Pagination of User Notes in MCP uses two different config values. (Bug #56025)</li>
-		<li>[Fix] List hidden groups on viewprofile where the viewing user is also a member. (Bug #31845)</li>
-		<li>[Fix] Sort viewprofile group list by group name.</li>
-		<li>[Fix] Strictly check whether a moderator can post in the destination forum when moving topic. (Bug #56255)</li>
-		<li>[Fix] Added some error handling to the compress class.</li>
-		<li>[Fix] Correctly determine permissions to show quick reply button. (Bug #56555)</li>
-		<li>[Fix] Do not unsubscribe users from topics replying with quickreply. (Bug #56235)</li>
-		<li>[Fix] Don't submit when pressing enter on preview button. (Bug #54395)</li>
-		<li>[Fix] Load reCAPTCHA over https when using a secure connection to the board. (Bug #55755)</li>
-		<li>[Fix] Clarify explanation of bump feature setting. (Bug #56075)</li>
-		<li>[Fix] Properly paginate unapproved posts in the MCP. (Bug #56285)</li>
-		<li>[Fix] Do not duplicate previous/next links in pagination text of moderator logs and user notes in MCP for subsilver2. (Bug #55045)</li>
-		<li>[Fix] Do not automatically unsubscribe users from topics, when email and jabber is disabled.</li>
-		<li>[Fix] Don't send activation email when user tries to change email without permission. (Bug #56335 - Fix by nrohler)</li>
-		<li>[Fix] Replace hard coded &quot;px&quot; with translated language-string. (Bug #52495)</li>
-		<li>[Fix] Correctly hover list menu in UCP and MCP for RTL languages. (Bug #49945)</li>
-		<li>[Fix] Correctly orientate quoted text image on RTL languages. (Bug #33745)</li>
-		<li>[Fix] Deprecate $allow_reply parameter to truncate_string() (Bug #56675)</li>
-		<li>[Fix] Fall back to default language email template if specified file does not exist. (Bug #35595)</li>
-		<li>[Fix] Update users last visit field correctly when changing activation status. (Bug #56185)</li>
-		<li>[Fix] Database updater now separates ADD COLUMN from SET NOT NULL and SET DEFAULT, when using PostgreSQL &lt;= 7.4 (Bug #54435)</li>
-		<li>[Fix] Styles adjustment to correctly display an order of rtl/ltr mixed content. (Bugs #55485, #55545)</li>
-		<li>[Fix] Fix language string for PM-Reports refering to post-data. (Bug #54745)</li>
-		<li>[Fix] Do not store email templates in database. (Bug #54505)</li>
-		<li>[Fix] Fix javascript bug in the smilies ACP. (Bug #55725)</li>
-		<li>[Fix] Unify BBCode Selection across browsers. (Bug #38765)</li>
-		<li>[Fix] Allow convertors to read in configuration from files. (Bug #57265 - Patch by Dicky)</li>
-		<li>[Fix] Fix problems with firebird by no longer using 'count' as a column alias. (Bug #57455)</li>
-		<li>[Fix] Small language correction for the FAQ page. (Bug #57825)</li>
-		<li>[Fix] Restrict search for language/../iso.txt to folders. (Bug #57795)</li>
-		<li>[Fix] Make user_email_hash() function independent from system's architecture. (Bug #57755)</li>
-		<li>[Fix] Correct behavior of &quot;force_approved_state&quot; when value is false. (Bug #57715)</li>
-		<li>[Fix] Global announcements could not be accessed on a board using Firebird as the database server. (Bug #57525)</li>
-		<li>[Fix] BBCode parser now uses the user object for all settings rather than taking some from the template object (Bug #57365)</li>
-		<li>[Fix] Ensure a database connection is available before logging general errors. (Bug #57975)</li>
-		<li>[Fix] Do not delete unrelated attachments when deleting empty forums. (Bug #57375)</li>
-		<li>[Fix] Update: Store expected resulting file contents in cache and do not suggest further merges if the contents match, also fixes infinite merge loop (Bug #54075)</li>
-		<li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li>
-		<li>[Change] Log activation through inactive users ACP. (Bug #30145)</li>
-		<li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li>
-		<li>[Change] Use em dash instead of hyphen/minus as separator in ATOM Feeds item statistics. (Bug #53565)</li>
-		<li>[Change] Alter ACP user quick tools interface to reduce confusion with the delete operation.</li>
-		<li>[Change] Send statistics now check for IPv6 and send private network status as a boolean.</li>
-		<li>[Change] Split &quot;All topics&quot; feed into &quot;New Topics&quot; and &quot;Active Topics&quot; feeds.</li>
-		<li>[Change] Forum feed no longer includes posts of subforums.</li>
-		<li>[Change] Show login attempt CAPTCHA option in the captcha plugin module.</li>
-		<li>[Change] It is no longer possible to persist a solution for the login CAPTCHA.</li>
-		<li>[Change] SQLite is no longer autoloaded by the installer. (Bug #56105)</li>
-		<li>[Change] Friends and foes will not show up as private message rule options if their respective UCP modules are disabled. (Bug #51155)</li>
-		<li>[Change] Offer for guests to log in for egosearch and unreadposts search before the search permissions check. (Bug #51585)</li>
-		<li>[Change] Show warning box for users of PHP &lt; 5.2.0 about phpBB ending support.</li>
-		<li>[Change] Disallow deleting the last question of the Q&amp;A CAPTCHA.</li>
-		<li>[Change] Tweak Q&amp;A CAPTCHA garbage collection.</li>
-		<li>[Change] Show a proper preview for the Q&amp;A CAPTCHA. (Bug #56365)</li>
-		<li>[Change] Speed up topic move operation by adding an index for topic_id on the topics track table. (Bug #56545)</li>
-		<li>[Change] Warn users about potentially dangerous BBcodes.</li>
-		<li>[Feature] Ability to use HTTP authentication in ATOM feeds by passing the GET parameter &quot;auth=http&quot;.</li>
-		<li>[Feature] Add INTTEXT token type to custom bbcodes to allow non-ASCII letters in html attributes.</li>
-		<li>[Feature] Add ability to enable quick reply in all forums.</li>
-
-	</ul>
-
-	<a name="v305"></a><h3>1.ii. Changes since 3.0.5</h3>
-
-	<ul>
-		<li>[Fix] Allow whitespaces in avatar gallery names. (Bug #44955)</li>
-		<li>[Fix] Sorting by author or subject on viewtopic now preserves the order. (Bug #44875)</li>
-		<li>[Fix] Correctly determine writable status of files on Windows operating systems. (Bug #39035)</li>
-		<li>[Fix] Show report button in prosilver for guests who are allowed to report posts. (Bug #45695)</li>
-		<li>[Fix] Correctly show private message history. (Bug #46065)</li>
-		<li>[Fix] Various XHTML mistakes in prosilver, subsilver2 and the ACP. (Bugs #25545, #26315, #38555, #45505 - Patch by Raimon, #45785, #45865, #47085 - Patch by Raimon)</li>
-		<li>[Fix] Fix some ACP style issues. (Bug #16109 - Patch by prototech)</li>
-		<li>[Fix] Move post bump information markup to the template. (Bug #34295)</li>
-		<li>[Fix] Show error in the ACP when template folder is not readable. (Bug #45705)</li>
-		<li>[Fix] Adjust viewonline filename regular expression to be less strict. (Bug #46215)</li>
-		<li>[Fix] Correctly apply the &quot;can change vote&quot; permission again. Regression introduced in r9470. (Bug #45895)</li>
-		<li>[Fix] Remove data from friend/foe table when deleting user. (Bug #45345)</li>
-		<li>[Fix] Correctly hide skiplink in prosilver right-to-left mode. (Bug #45765 - Patch by prototech and bantu)</li>
-		<li>[Fix] Fix dynamic config update routine error if firebird is used. (Bug #46315)</li>
-		<li>[Fix] Allow friends/foes to be added and removed at the same time. (Bug #46255)</li>
-		<li>[Fix] Only change topic/post icon on edit if icons are enabled and user is allowed to use icons. (Bug #46355)</li>
-		<li>[Fix] Fix saving custom profile fields in ACP if Oracle is used. (Bug #46015)</li>
-		<li>[Fix] Make view_log() more resilient to corrupt serialized data. (Bug #46545)</li>
-		<li>[Fix] Show error if hostname lookup doesn't return a valid IP address when banning. (Bug #45585)</li>
-		<li>[Fix] Fix incorrect layout when loading private message draft. (Bug #38435 - Patch by nickvergessen)</li>
-		<li>[Fix] Show proper error message when trying to add bots to friends/foes list. (Bug #40205)</li>
-		<li>[Fix] Fixed database backup and restore with Oracle DBMS. (Bug #46715)</li>
-		<li>[Fix] Update attachments table when deleting user and retaining his posts. (Bug #40245)</li>
-		<li>[Fix] Correctly detect files in subfolders when viewing cached template files. (Bug #46145)</li>
-		<li>[Fix] Display user's jabber address in popup if jabber functionality is disabled. (Bug #20775)</li>
-		<li>[Fix] Correctly exclude forums from active topics list. (Bug #19135)</li>
-		<li>[Fix] Do not display banned users in birthday list. (Bug #20625)</li>
-		<li>[Fix] Fix function to recalculate nested sets. (Bug #41555 - Patch by EXreaction)</li>
-		<li>[Fix] Display but also highlight already used rank images while assigning new ranks. (Bug #22665)</li>
-		<li>[Fix] Correctly orientate quoted text image on RTL languages. (Bug #33745)</li>
-		<li>[Fix] Do not display &quot;View user notes&quot; and &quot;Warn user&quot; links in user profile if corresponding MCP modules are disabled. (Bug #10519)</li>
-		<li>[Fix] Show proper error message when trying to create a private messages folder with an empty name. (Bug #39875)</li>
-		<li>[Fix] No longer state that it is possible to manage group leaders from the UCP. (Bug #19945)</li>
-		<li>[Fix] Do not throw an error when PDO is a shared module and not loaded preventing SQLite from being loaded.</li>
-		<li>[Fix] Fix censoring of unicode words. (Bug #16555)</li>
-		<li>[Fix] Display coloured usernames in ACP groups management screens.</li>
-		<li>[Fix] Correctly describe founder permissions on trace-information. (Bug #37235)</li>
-		<li>[Fix] Correct the width value for poll_center.gif omitted in imageset.cfg for subsilver2. (Bug #43005)</li>
-		<li>[Fix] Correctly load complex language variable using acp_language. (Bug #45735 - Patch by leviatan21)</li>
-		<li>[Fix] Fix reapply_sid() to correctly strip session id in certain circumstances. (Bug #43125 - Patch by leviatan21)</li>
-		<li>[Fix] Correctly state why one language pack is marked with an asterisk in the ACP. (Bug #37565)</li>
-		<li>[Fix] Correctly check if install directory is still present. (Bug #46965)</li>
-		<li>[Fix] Correct banned user behaviour when &quot;force password change&quot; is enabled. (Bug #47145 - Patch by nickvergessen and leviatan21)</li>
-		<li>[Fix] Correctly display ACP logs options, without permission to clear logs. (Bug #24155 - Patch by leviatan21)</li>
-		<li>[Fix] Display topic icons in MCP forum view again (only prosilver).</li>
-		<li>[Fix] Properly display post status messages in topic when post is reported and unapproved (Bug #44455 - Patch by leviatan21)</li>
-		<li>[Fix] Do not remove recipients when loading private message draft. (Bug #38395)</li>
-		<li>[Fix] Add author name to moderator log when deleting post/topic. (Bug #46225)</li>
-		<li>[Fix] Fix broken &quot;Report details&quot; link in the MCP. (Bug #46975)</li>
-		<li>[Fix] Resolve accesskey conflicts in prosilver. (Bug #44685)</li>
-		<li>[Fix] Check if template file is empty before trying to read from it. (Bug #47345)</li>
-		<li>[Fix] More descriptive descriptions for permissions to use BBCode, smilies, images and flash. (Bug #36065)</li>
-		<li>[Fix] Fix style issues in print mode. (Bug #26375 - Patch by leviatan21)</li>
-		<li>[Fix] Fix minor issue with L_QUOTE language string missing in several PM composing modes. (Bug #39625)</li>
-		<li>[Fix] Also fetch posts of guests and deleted or deactivated users while searching for author names. (Bug #36565, #47765)</li>
-		<li>[Fix] Show end of ban in MCP and ACP when user is banned by duration. (Bug #47815 - Patch by Pyramide)</li>
-		<li>[Fix] Correctly count posts awaiting approval in the MCP. (Bug #47685)</li>
-		<li>[Fix] Display user's posts count in private message when it is equal to 0 (prosilver). (Bug #40155)</li>
-		<li>[Fix] Only allow users to disable word censor if globally allowed. (Bug #47575 - Patch by 00mohgta7)</li>
-		<li>[Fix] Fix database updater and db tools to support multiple column changes/additions/removals with SQLite.</li>
-		<li>[Fix] Correctly detect GZIP status in debug mode. (Bug #24075)</li>
-		<li>[Fix] Posting smilies in view more smilies screen now works again in IE. (Bug #46025 - Patch by leviatan21)</li>
-		<li>[Fix] Properly convert and show filesize information. (Bug #47775)</li>
-		<li>[Fix] Add ability to prune users who never logged in. (Bug #44295)</li>
-		<li>[Fix] Show smilies and images in topic print view. (Bug #47265)</li>
-		<li>[Fix] Force full date in private message print view.</li>
-		<li>[Fix] Fix &quot;Always show a scrollbar for short pages&quot; for IE8 and Firefox 3.5. (Bug #47865 - Patch by stokerpiller)</li>
-		<li>[Fix] Do not allow setting group as default group for pending users. (Bug #45675)</li>
-		<li>[Fix] Fail gracefully if store folder is not writable during update. (Bugs #46615, #46945)</li>
-		<li>[Fix] Hide profile-icon from viewtopic page if user has no permissions (subsilver2 only). (Bug #37635 - Patch by leviatan21)</li>
-		<li>[Fix] Correct escaping/unescaping in the LDAP authentication plugin. (Bug #48175)</li>
-		<li>[Fix] Add hard limit for smilies.</li>
-		<li>[Fix] Remove redundant SQL query from ucp.php. (Bug #40305)</li>
-		<li>[Fix] Reorder frame order of animated subsilver2 topic icons to be useful when animations are disabled. (Bug #29385 - Patch by prototech)</li>
-		<li>[Fix] Ensure user errors are displayed regardless of PHP settings. (Bug #47505)</li>
-		<li>[Fix] Permit null values for non-required integer custom profile fields and ensure zero complies with the range limits. (Bug #40925)</li>
-		<li>[Fix] Allow changing forum from select box under certain circumstances. (Bug #37525)</li>
-		<li>[Fix] Display required fields notice on registration above the custom profile fields. (Bug #39665)</li>
-		<li>[Fix] Copy poll options properly when copying topic. (Bug #39065)</li>
-		<li>[Fix] Fix error with disapproval of topics having several queued posts only. (Bug #47705)</li>
-		<li>[Fix] Preserve newlines in template files (one newline had been always dropped after a template variable due to PHP's handling of closing tags).</li>
-		<li>[Fix] Be less strict with FTP daemons for getting directory filelists. (Bug #46295)</li>
-		<li>[Fix] Fix set_custom_template for database-stored styles. (Bug #40515)</li>
-		<li>[Fix] Banning an already banned user states to be successful, but has no effect. (Bug #47825 - Patch by Pyramide)</li>
-		<li>[Fix] Do not add style parameter again to URL after admin re-authentification. (Bug #18005 - Patch by leviatan21)</li>
-		<li>[Fix] Do not cut post-message in between HTML-Entities on search.php. (Bug #31505 - Patch by leviatan21)</li>
-		<li>[Fix] Correctly set attachment flag for topics, posts and pms after deleting attachments. (Bug #48265 - Patch by MarcoDM and nickvergessen)</li>
-		<li>[Fix] Display &quot;Locked&quot; button instead of &quot;Reply&quot; one for locked forum in viewtopic (prosilver). (Bug #38055 - Patch by Raimon)</li>
-		<li>[Fix] Correctly propagate umlauts over search result pages. (Bug #33755)</li>
-		<li>[Fix] Preserve post options when refusing to save the post as a draft. (Bug #39115)</li>
-		<li>[Fix] Do not send private message back to sender if sender is in the same group the private message was sent to.</li>
-		<li>[Fix] Correctly add user to a group making it a default one. (Bug #48345)</li>
-		<li>[Fix] Add log entry when copying forum permissions.</li>
-		<li>[Fix] Min/max characters per posts no longer affects poll options. (Bug #47295)</li>
-		<li>[Fix] Correctly log action when users request to join a group. (Bug #37585)</li>
-		<li>[Fix] Do not try to create thumbnails for images we cannot open properly. (Bug #48695)</li>
-		<li>[Fix] Apply locale-independent basename() to attachment filenames. New function added: utf8_basename(). (Bug #43335 - Patch by ocean=Yohsuke)</li>
-		<li>[Fix] Adjust build_url() to not prepend $phpbb_root_path if path returned from redirect() is an URL. This fixes redirect issues with some installations and bridges. (Bug #47535)</li>
-		<li>[Fix] Do not mark global announcements as read if all topics in a forum become read (Bug #15729).</li>
-		<li>[Fix] Fix general error in registration, caused by an undefined $config variable in validate_referer(). (Bug #49035 - Patch by wjvriend)</li>
-		<li>[Fix] Correctly extract column default value when exporting PostgreSQL tables. (Bug #48955)</li>
-		<li>[Fix] Allow updater to work correctly with PHP filename extensions other than &quot;.php&quot;. (Bugs #15809, #49215)</li>
-		<li>[Fix] Update search index if only post subject changed. (Bug #49435)</li>
-		<li>[Fix] Fix who is online displaying incorrect data. (Bug #49485, thanks Brainy)</li>
-		<li>[Fix] Fixed incorrect &quot;topic does not exist&quot; if unapproved posts were visited without global moderator permissions. (Bug #47795)</li>
-		<li>[Fix] Prevent style switcher from blocking the tab key. (Bug #49335)</li>
-		<li>[Fix] Correctly redirect back to MCP main page after posts approval/disapproval from it. (Bug #49625)</li>
-		<li>[Fix] Do not display topic approval status image for shadow topic if a user is not a moderator in the forum the topic has been moved to. (Bug #43295)</li>
-		<li>[Fix] Fix email problems on servers with PHP installations not accepting RFC-compliant subject string passed to the mail()-function. (Bug #46725)</li>
-		<li>[Fix] Correctly orientate control panel navigation background-image on RTL languages. (Bug #49945)</li>
-		<li>[Fix] Sort private messages by message time and not message id. (Bug #50015)</li>
-		<li>[Fix] Make sure only logs for existing users are displayed and user-specific logs removed on user deletion. (Bug #49855)</li>
-		<li>[Fix] Only show &quot;Add friend&quot; and &quot;Add foe&quot; links if the specific module is enabled. (Bug #50475)</li>
-		<li>[Fix] Correctly display list items in forum description in prosilver and administration. (Bug #48055 - Patch by leviatan21)</li>
-		<li>[Fix] Only embed cron.php if there is no cron lock present to reduce overhead. (Bug #45725 - Patch by TerryE)</li>
-		<li>[Fix] Add header gradient back into subsilver2 but keep site logo easily replaceable with smaller and bigger ones. (Bug #11142 - Patch by dark/Rain and Raimon)</li>
-		<li>[Fix] Send activation email when activating user from user settings. (Bug #43145)</li>
-		<li>[Fix] Do not show resend activation email link when using admin activation. (Bug #44375 - Patch by bbrunnrman)</li>
-		<li>[Fix] Do not display links to user/post search if search is disabled. (Bug #50685 - Patch by HardStyle)</li>
-		<li>[Fix] Fix icon alignment for forums with large descriptions in subsilver2. (Bug #50445)</li>
-		<li>[Fix] Correctly display underlined links placed in last line in viewtopic. (Bug #14811 - Patch by primehalo)</li>
-		<li>[Fix] Only check whether forum image exists if forum image is specified. (Bug #51905)</li>
-		<li>[Fix] Fixed database updater for changes to columns having default value in MSSQL (adding/dropping constraints).</li>
-		<li>[Fix] Jabber SASL PLAIN authentication failures. (Bug #52995)</li>
-		<li>[Fix] Check sort options on memberlist to avoid a general error. (Bug #53655)</li>
-		<li>[Fix] Fix sql error in cache_moderators() if using postgresql. (Bug #53765)</li>
-		<li>[Change] Database updater now supports checking for existing/missing indexes.</li>
-		<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
-		<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
-		<li>[Change] Template engine now permits variable includes to a limited extent.</li>
-		<li>[Change] Quote BBCode no longer requires the f_reply permission. (Bug #16079)</li>
-		<li>[Change] Banning/unbanning users now generates an entry in their user notes. (Bug #21825)</li>
-		<li>[Change] Smilies no longer require the f_bbcode permission. (Bug #26545)</li>
-		<li>[Change] Ability to define column split in FAQ/BBCode help. (Bug #31405)</li>
-		<li>[Change] Changed behaviour of group_create() function to support specifying additional group columns.</li>
-		<li>[Change] Hide avatar when avatar-type is not allowed. (Bug #46785 - Patch by cYbercOsmOnauT and nickvergessen)</li>
-		<li>[Change] INCLUDEPHP paths are now relative to $phpbb_root_path. (Bug #45805)</li>
-		<li>[Change] Ability to fetch moderators with get_moderators() even if load_moderators setting is off. (Bug #35955)</li>
-		<li>[Change] &quot;Post details&quot; links with image in MCP. (Bug #39845 - Patch by leviatan21)</li>
-		<li>[Change] PM history now only shows PMs of users you currently reply to. (Bug #39505)</li>
-		<li>[Change] Show quote button for own PMs in PM history. (Bug #37285)</li>
-		<li>[Change] Fetch requested cookie variables directly from cookie super global. (Bug #47785)</li>
-		<li>[Change] Add confirmation for deactivating styles. (Bug #14304 - Patch by leviatan21)</li>
-		<li>[Change] Add confirmation for deactivating language packs. (Patch by leviatan21)</li>
-		<li>[Change] Add confirmation for deleting permissions. (Bug #13673)</li>
-		<li>[Change] Add pagination for icons and smilies in the ACP and smilies in the smiley popup.</li>
-		<li>[Change] Cache get_username_string() function calls on viewtopic.</li>
-		<li>[Change] Cache version check.</li>
-		<li>[Change] When creating a new forum without copying permissions, ask again.</li>
-		<li>[Change] Introduce new parameter to page_header() for forum specific who is online listings.</li>
-		<li>[Change] Changed minimum requirement for Firebird DBMS from 2.0+ to 2.1+.</li>
-		<li>[Change] Unapproved topics can no longer be replied to. (Bug #44005, #47675, #23605)</li>
-		<li>[Change] Require user to be registered and logged in to search for unread posts if topic read tracking is disabled for guests. (Bug #49525)</li>
-		<li>[Change] Allow three-digit hex notation in color BBcode. (Bug #39965 - Patch by m0rpha)</li>
-		<li>[Change] Simplified login_box() and redirection after login. S_LOGIN_ACTION can now be used on every page. (Bug #50285)</li>
-		<li>[Change] Do not take edit post time into account for determining permission to delete last post in topic. (Bug #48615)</li>
-		<li>[Change] Resize oversized topic icons. (Bug #44415)</li>
-		<li>[Change] Banned IPs are now sorted. (Bug #43045 - Patch by DavidIQ)</li>
-		<li>[Change] phpBB updater now skips sole whitespace/tab changes while computing differences. This reduces the chance of conflicts tremendously.</li>
-		<li>[Change] phpBB updater now solves common conflicts on its own. This further reduces the chance of conflicts.</li>
-		<li>[Feature] Add language selection to the registration terms page. (Bug #15085 - Patch by leviatan21)</li>
-		<li>[Feature] Backported 3.2 captcha plugins:
-			<ul>
-				<li>Classic and GD CAPTCHA</li>
-				<li>reCaptcha (based on API from recaptcha.net by Mike Crawford and Ben Maurer)</li>
-				<li>Q&amp;A CAPTCHA</li>
-				<li>3D Wave (by Robert &quot;Xore&quot; Hetzler)</li>
-			</ul>
-		</li>
-		<li>[Feature] Introduced new ACM (Cache) plugins:
-			<ul>
-				<li>null (to disable caching completely)</li>
-				<li><a href="http://pecl.php.net/package/memcache">memcache</a></li>
-				<li><a href="http://pecl.php.net/package/APC">APC</a></li>
-				<li><a href="http://xcache.lighttpd.net/">XCache</a></li>
-				<li><a href="http://eaccelerator.net/">eAccelerator</a></li>
-			</ul>
-		</li>
-		<li>[Feature] ATOM Feeds (Idea from RSS Feed 2.0 MOD (Version 1.0.8/9) by leviatan21)</li>
-		<li>[Feature] New groups option to excempt group leaders from group permissions.</li>
-		<li>[Feature] New &quot;Newly Registered Users&quot; group for assigning permissions to newly registered users. They will be removed from this group once they reach a defineable amount of posts.</li>
-		<li>[Feature] Ability to define if the &quot;Newly Registered Users&quot; group will be assigned as the default group to newly registered users.</li>
-		<li>[Feature] Add new option to disable avatars board-wide. (Bug #46785 - Patch by cYbercOsmOnauT and nickvergessen)</li>
-		<li>[Feature] Enhance obtain_users_online_string to be able to return user-lists for other session items. (Bug #31975)</li>
-		<li>[Feature] Add unapproved topic icon for moderators on forum list. (Bug #46865)</li>
-		<li>[Feature] Ability to define minimum number of characters for posts/pms.</li>
-		<li>[Feature] Store signature configuration options in database. (Bug #45115)</li>
-		<li>[Feature] Add bare-bones quick-reply editor to viewtopic.</li>
-		<li>[Feature] Detect if a post has been altered by someone else while editing.</li>
-		<li>[Feature] Add unread posts quick search option. (Bug #46765)</li>
-		<li>[Feature] Add option to disable avatar uploads from remote locations. (Bug #45375)</li>
-		<li>[Feature] Ability to delete warnings and keep warnings permanently. (Bug #43375)</li>
-		<li>[Feature] Ability to empty a user's outbox from the user ACP quick tools.</li>
-		<li>[Feature] Ability to search ACP/MCP logs.</li>
-		<li>[Feature] Users can report PMs to moderators which are then visible in a new MCP module.</li>
-		<li>[Feature] Parse email text files with the template engine.</li>
-		<li>[Feature] Use email-style quoting when bbcodes are disabled.</li>
-		<li>[Feature] Added new functionality to inactive users module:
-			<ul>
-				<li>Ability to set users per page.</li>
-				<li>Ability to sort by posts/number of reminders/last reminded date.</li>
-				<li>Show number of posts and ability to search posts.</li>
-				<li>Show number of reminders sent to user.</li>
-				<li>Show date of last reminder sent to user.</li>
-			</ul>
-		</li>
-		<li>[Feature] Display version check on ACP main page.</li>
-		<li>[Feature] Ability to copy permissions from one forum to several other forums.</li>
-		<li>[Feature] Ability to control the display of custom profile fields on viewtopic. (Bug #48985)</li>
-		<li>[Feature] Fallback options for missing language files. (Bug #38575 - Patch by EXreaction)</li>
-		<li>[Feature] Separate &quot;PM Reply&quot; and &quot;PM Reply to all&quot; in prosilver.</li>
-		<li>[Feature] Place debug notices during captcha rendering in the error log - useful for debugging output already started errors.</li>
-		<li>[Feature] Ability to define constant PHPBB_USE_BOARD_URL_PATH to use board url for images/avatars/ranks/imageset (useful for bridges and applications using phpBB).</li>
-		<li>[Feature] Added function to generate email hash. (Bug #49195)</li>
-		<li>[Feature] Style authors are now able to define the default submit button used for form submission on ENTER keypress on forms using more than one submit button. Prosilver uses this for the posting page(s) and registration screen.</li>
-		<li>[Feature] Ability to specify amount of time user is able to delete his last post in topic.</li>
-		<li>[Feature] Send anonymous statistical information to phpBB on installation and update (optional).</li>
-	</ul>
-
-	<a name="v304"></a><h3>1.iii. Changes since 3.0.4</h3>
-
-	<ul>
-		<li>[Fix] Delete user entry from ban list table upon user deletion (Bug #40015 - Patch by TerraFrost)</li>
-		<li>[Fix] Posts incremented for multiple approval of the same topic (Bug #40495 - Patch by TerraFrost)</li>
-		<li>[Fix] Missing end &quot; in quote bb tag deletes text (Bug #40565 - Patch by TerraFrost)</li>
-		<li>[Fix] Friend/foe system displays posts made by foes while composing (Bug #40325 - Patch by TerraFrost and Highway of Life)</li>
-		<li>[Fix] Check forum_image whether it exists (Bug #39005 - Patch by TerraFrost)</li>
-		<li>[Fix] The sql query in acp_users.php lacks a condition (Bug #40275 - Patch by grimskies)</li>
-		<li>[Fix] Added missing read permission information for some phpbb_chmod() calls</li>
-		<li>[Fix] Correctly display future dates (Bug #38755)</li>
-		<li>[Fix] Fix guest/bot session problems with apache authentication plugin (Bug #41085)</li>
-		<li>[Fix] Whois now works reliably for RIRs other than APNIC and RIPE. (Bug #40085)</li>
-		<li>[Fix] Correctly convert Niels' Birthday MOD to the date format used in phpBB3. (Bug #32895)</li>
-		<li>[Fix] Changed the success message when requesting a new password to be more accurate. (Bug #41405)</li>
-		<li>[Fix] Add missing anti-abuse email headers to acp_inactive.php and ucp_resend.php.</li>
-		<li>[Fix] Only remind users in the correct inactive states depending on the board account activation level.</li>
-		<li>[Fix] Various XHTML mistakes in prosilver, subsilver2 and the ACP. (Bugs #41745, #42265 - Patch by nickvergessen, #38465, #43015, #46585 - Patch by Raimon)</li>
-		<li>[Fix] Log password changes via password reset function. (Bug #41365)</li>
-		<li>[Fix] Poll, negative durations generate error (Bug #41295 - Patch by TerraFrost)</li>
-		<li>[Fix] Visibility of custom field on registration is incorrectly controlled by setting &quot;display&quot; (Bug #41385 - Patch by Eelke and fade2gray)</li>
-		<li>[Fix] Smilies in username are misparsed on [quote=&quot;&quot;] (Bug #41955 - Patch by TerraFrost)</li>
-		<li>[Fix] Deleting all posts in a topic - bad redirect (Bug #41705 - Patch by TerraFrost)</li>
-		<li>[Fix] Deleted users still appear logged in (Bug #41985 - Patch by TerraFrost)</li>
-		<li>[Fix] Removed redundant code and unnecessary queries in forum management. (Bug #42265 - Patch by nickvergessen)</li>
-		<li>[Fix] Correct mbstring regular expression for the allowable username characters, only affects <code>USERNAME_LETTER_NUM_SPACERS</code>. (Bug #42325)</li>
-		<li>[Fix] Fix infinite loop in message handler if cache directory is not writable. (Bug #38675)</li>
-		<li>[Fix] While post is awaiting approval it can still be edited even though it can not be seen (Bug #41435 - Patch by TerraFrost)</li>
-		<li>[Fix] Fix imageset editing for retaining and correctly setting dimensions for images, as well as displaying correct settings for first page load.</li>
-		<li>[Fix] Use OS-specific line endings for mail headers. (related to Bug #42755)</li>
-		<li>[Fix] Hide font size options which are bigger than the allowed size in the editor. (Bug #42615 - Patch by nickvergessen)</li>
-		<li>[Fix] Better thumbnail quality with imagemagick. (Bug #42565)</li>
-		<li>[Fix] Fix download count increments for image attachments without corresponding thumbnails. (Bug #42505)</li>
-		<li>[Fix] Fix wrong bot ip check if bot ip was wrongly entered by admin. (Bug #42485)</li>
-		<li>[Fix] Fix javascript errors in simple header (prosilver) by adding forum_fn.js and the corresponding variables. (Bug #42135)</li>
-		<li>[Fix] Set connection encoding for MySQL versions 4.1.0 to 4.1.2. This may fix some conversion issues with special characters. (Bug #41805)</li>
-		<li>[Fix] Deleting private message attachments could delete post attachments. (Bug #42815)</li>
-		<li>[Fix] Do not suppress PHP notices/errors in language packs if DEBUG_EXTRA mode enabled. (Bug #41485)</li>
-		<li>[Fix] Flash files do not display anymore after update to flash player 10 (Bug #41315)</li>
-		<li>[Fix] Use FQDN for SMTP EHLO/HELO command. (Bug #41025)</li>
-		<li>[Fix] Mass Email works again for users with empty jabber address but notification set to 'both'. (Bug #39755)</li>
-		<li>[Fix] Fix race condition for updating post/topic/etc. counter. (Reported by BartVB)</li>
-		<li>[Fix] Fix duplicate creation of acl options in acl_add_options() under certain conditions. (Bug #38385, #40225)</li>
-		<li>[Fix] Cancel when replying to global announcement redirects to first forum - not to the current forum (Bug #41225 - Patch by TerraFrost)</li>
-		<li>[Fix] Cursor Jumps on New Topic in IE (Bug #42455 - Patch by TerraFrost)</li>
-		<li>[Fix] Add indicator to be used in code if session was created (user visits the site for the first time).</li>
-		<li>[Fix] Correctly count topic views for guests visiting the website the first time by entering the topic directly (Bug #43445)</li>
-		<li>[Fix] Fix bug in postgresql db layer for LIMIT ALL clauses (Reported by JRSweets)</li>
-		<li>[Fix] Sort backups by date, newest first (Bug #14818)</li>
-		<li>[Fix] Prevent incomplete backups stored if option &quot;store and download&quot; is selected and admin cancel download by removing the option. (Bug #20325)</li>
-		<li>[Fix] Enforce correct case for template variables</li>
-		<li>[Fix] Set topic_last_view_time on post/reply/edit to circumvent race conditions in auto prune and false removal of topics for manual forum prune (Bug #18055, #43515)</li>
-		<li>[Fix] Correctly split long subject lines according to the used RFC. This fixes extra spaces within long subjects. (Bug #43715)</li>
-		<li>[Fix] Fix skipping messages if using next/prev PM in history links. (Bug #22205)</li>
-		<li>[Fix] Messenger now also able to use a custom language path. (Bug #36545)</li>
-		<li>[Fix] PM Export uses ISO 8601 date now. (Bug #32645)</li>
-		<li>[Fix] Apply append_sid() to newest/latest post links in viewforum/search and UCP main module. (Bug #26815)</li>
-		<li>[Fix] Do not create thumbnail if thumbnail would've the same size as the original image. (Bug #30725)</li>
-		<li>[Fix] Ability to vote in poll is now required for the ability to change existing vote. (Bug #38925)</li>
-		<li>[Fix] Search for 'topic title only' and 'first post' should work again for non-mysql dbms. (Bug #40605)</li>
-		<li>[Fix] Make sure additional information for accessibility is always exposed to screen readers (Bug #44335 - Patch by MarcoZ)</li>
-		<li>[Fix] Approving a topic when some of the posts within that topic have already been approved (Bug #42585 - Patch by TerraFrost)</li>
-		<li>[Fix] Online status shown when post hidden (Bug #35505 - Patch by Raimon)</li>
-		<li>[Fix] memberlist.php display formating can be distorted by posting long URL for website (Bug #36675 - Patch by TerraFrost)</li>
-		<li>[Fix] Display the online status of hidden users to users with the u_viewonline permission when viewing PMs.</li>
-		<li>[Fix] &quot;Select all&quot; selects much too much in Opera (Bug #42885 - Patch by TerraFrost and ToonArmy)</li>
-		<li>[Fix] Correct calculation of source/target forum statistics if mass moving topics with global announcements (Bug #44545)</li>
-		<li>[Fix] Fix column handling in db updater, custom profile fields an db tools for firebird DBMS (Bug #44555)</li>
-		<li>[Fix] IE8 textarea issues (Bug #43305)</li>
-		<li>[Fix] Prevent accounts from being activated by users when admin activation is turned on and the correct activation key is known.</li>
-		<li>[Fix] Allow the installer to operate under PHP 5.3. (Bug #45255)</li>
-		<li>[Change] Default difference view is now 'inline' instead of 'side by side'</li>
-		<li>[Change] Added new option for merging differences to conflicting files in automatic updater</li>
-		<li>[Change] Add link to user profile in the MCP for user notes and warn user.</li>
-		<li>[Change] Add IN_PHPBB check to generated cache files. (Reported by bantu)</li>
-		<li>[Change] Add topic icons to prosilver UCP main and subscribed templates (Bug #42735 - Patch by Raimon)</li>
-		<li>[Change] Add unique key to ACL options table to prevent duplicate permission options. (Bug #41835)</li>
-		<li>[Change] Redirect to relevant MCP page of multi-page topic if accessing quickmod tools (Split option for example)</li>
-		<li>[Change] Performance improvements for native fulltext search (Patch by Paul)</li>
-		<li>[Change] Changed jumpto() JS function to be more fail-safe. (But #27635 - Patch by peterkclee)</li>
-		<li>[Feature] Added new options for visual confirmation.</li>
-		<li>[Feature] Allow download of conflicting file for later reference in automatic updater</li>
-		<li>[Feature] Allow translation of custom BBCode help messages. (Patch by bantu)</li>
-		<li>[Feature] db_tools now support create table and drop table.</li>
-		<li>[Feature] Database updater checks for incompatible db schema (MySQL 3.x/4.x against MySQL 4.1.x/5.x/6.x)</li>
-		<li>[Feature] New search option: Maximum number of words allowed to search for.</li>
-		<li>[Sec] Only use forum id supplied for posting if global announcement detected. (Reported by nickvergessen)</li>
-	</ul>
-
-	<a name="v303"></a><h3>1.iv. Changes since 3.0.3</h3>
-
-	<ul>
-		<li>[Fix] Allow mixed-case template directories to be inherited (Bug #36725)</li>
-		<li>[Fix] Regression bug from revision #8908 regarding log display in ACP</li>
-		<li>[Fix] Allow the UCP group management to work for groups with avatars. (Bug #37375)</li>
-		<li>[Fix] Fix header list build for replying oldest PM in PM history (Bug #37275)</li>
-		<li>[Fix] Do not display COPPA group in memberlist find member dialog if COPPA disabled (Bug #37175)</li>
-		<li>[Fix] Do not try to send jabber notifications if no jid entered (Bug #36775)</li>
-		<li>[Fix] Only display special ranks to guests; no longer display normal ranks for guests (Bug #36735)</li>
-		<li>[Fix] Properly treat punctuation marks after local urls (Bug #37055)</li>
-		<li>[Fix] Make searching for members by YIM address work in prosilver</li>
-		<li>[Fix] Tell users to recreate the search index after changing the common word threshold for fulltext_native (Bug #36345)</li>
-		<li>[Fix] Adjusted phpbb_chmod() to always set permissions for group bit.</li>
-		<li>[Fix] Do not increment users post count after post approval if post had been posted in a forum with no post count increasing set (Bug #37865)</li>
-		<li>[Fix] Extend vertical line for last post column if no posts in forum (Bug #37125)</li>
-		<li>[Fix] correctly update last topic/forum information if changing guest usernames through editing posts (Bug #38095)</li>
-		<li>[Fix] fix postcount resync for situations where low and high post ids are higher than step value, resulting in users having 0 posts. (Bug #38195)</li>
-		<li>[Fix] Use a left join for the topics table on search to avoid trouble with FROM syntax on some databases (Bug #37005)</li>
-		<li>[Fix] Do not show 'Forward' button if the user cannot send PM's</li>
-		<li>[Change] Alllow applications to set custom module inclusion path (idea by HoL)</li>
-		<li>[Change] Handle checking for duplicate usernames in chunks (Bug #17285 - Patch by A_Jelly_Doughnut)</li>
-		<li>[Change] Better handling and finer control for custom profile fields visibility options. (Patch by Highway of Life)</li>
-		<li>[Change] Performance increase for format_date() (Bug #37575 - Patch by BartVB)</li>
-		<li>[Change] Changed prosilver date separator from 'on' to '&raquo;'</li>
-		<li>[Change] Performance increase for get_username_string() (Bug #37545 - Patch by BartVB)</li>
-		<li>[Change] Slight performance increase for common parameter calls to append_sid() (Bug #37555 - Patch by BartVB)</li>
-		<li>[Feature] Added 'AGO' setting to relative date strings. For example: posted 14 minutes ago. (Patch by BartVB)</li>
-		<li>[Sec] Fixed an issue where deactivated accounts could be re-activated without the required privileges. (Reported by Jorick)</li>
-		<li>[Sec] Ask for forum password if post within passworded forum quoted in private message. (Reported by nickvergessen)</li>
-	</ul>
-
-	<a name="v302"></a><h3>1.v. Changes since 3.0.2</h3>
-
-	<ul>
-		<li>[Fix] Correctly set topic starter if first post in topic removed (Bug #30575 - Patch by blueray2048)</li>
-		<li>[Fix] Delete avatar files (Bug #29985).</li>
-		<li>[Fix] Preserve selection in the MCP. (Bug #31265).</li>
-		<li>[Fix] Added VST - Venezuela Standard Time (Bug #30545).</li>
-		<li>[Fix] Close DB connections in file.php.</li>
-		<li>[Fix] Correctly return results for nested cached queries (Bug #31445 - Patch by faw).</li>
-		<li>[Fix] Allow export of PM pages greater one. (#33155)</li>
-		<li>[Fix] Display coloured username of last poster in list of subscribed forums (prosilver).</li>
-		<li>[Fix] Added missing UCP language string <em>NO_AUTH_READ_HOLD_MESSAGE</em>.</li>
-		<li>[Fix] Do not jump back to page 1 when hiding member search in memberlist. (Bug #32515)</li>
-		<li>[Fix] Correctly limit input of the users location to 100 characters in the UCP and ACP. (Bug #32655)</li>
-		<li>[Fix] Sync reports when using the move all users posts tool in the ACP. (Bug #31165)</li>
-		<li>[Fix] Extra slash is included in the redirect url when redirecting to the forum root directory. (Bug #33605)</li>
-		<li>[Fix] Remove reported flag from shadow topics when closing reports. (Bug #19765)</li>
-		<li>[Fix] Do not show non indexed forums on the search page if they contain no subforums. (Bug #33125)</li>
-		<li>[Fix] Stop search bots incrementing topic views. (Bug #32675 - Patch by eviL&lt;3)</li>
-		<li>[Fix] Use correct link for post author search. (Bug #32595)</li>
-		<li>[Fix] Do not decrease topics counter when deleting shadow topics. (Bug #26495)</li>
-		<li>[Fix] Send localised disapproval reasons in the recipients local language. (Bug #31645)</li>
-		<li>[Fix] Language typos/fixes. (Bugs #27625, #30755, #34185, #32795)</li>
-		<li>[Fix] Added missing terms parameter to search pagination. (Bug #34085)</li>
-		<li>[Fix] Wrong table order in query obtaining posts if post id given.</li>
-		<li>[Fix] Do not display reported topic icon for shadow topics. (Bug #13970)</li>
-		<li>[Fix] Display popular topic based on posts within topic instead of replies within topic. (Bug #16099)</li>
-		<li>[Fix] Expand shown ban reason in unban screen to fully show long entries. (Bug #16234)</li>
-		<li>[Fix] Preserve alpha transparency for created thumbnails. (Bug #16575)</li>
-		<li>[Fix] Use correct port delimiter for MSSQL connections in windows. (Bug #16615)</li>
-		<li>[Fix] Do not allow setting forums parent to the forum itself. (Bug #18855)</li>
-		<li>[Fix] Display assigned rank/avatar for guests. (Bug #19155)</li>
-		<li>[Fix] Set secure cookie for style switcher if required. (Bug #19625)</li>
-		<li>[Fix] Fix native full text search on postgresql while using excluding keyword matches. (Bug #19195)</li>
-		<li>[Fix] Pass S_SEARCH_ACTION through append_sid() in search.php. (Bug #21585)</li>
-		<li>[Fix] Correctly delete message attachments. (Bug #23755)</li>
-		<li>[Fix] Correctly handle unread status of subforums (that are not shown on the index) of forums that are shown on the index. (Bug #14589)</li>
-		<li>[Fix] Stop users from deleting posts after the edit time has passed or they have been locked. (Bug #19115)</li>
-		<li>[Fix] Split posts target forum requires 'f_post' now instead of 'm_split'. (Bug #31015)</li>
-		<li>[Fix] Duplicate log messages for deleting a topic ('LOG_TOPIC_DELETED' has been deprecated in favour of 'LOG_DELETE_TOPIC').</li>
-		<li>[Fix] Use a distinct log message for shadow topic deletions to differentiate between normal topic deletions. (Bug #34635)</li>
-		<li>[Fix] Fix problems with styles using an underscore within the filename. (Bug #34315)</li>
-		<li>[Fix] Better return links when deleting topics through the MCP. (Bug #34655)</li>
-		<li>[Fix] Add quoting support to PM history when composing a reply. (Bug #34285)</li>
-		<li>[Fix] Use phpBB 3.1.x method for storing cached data to prevent PHP bug with our usage of var_export(). (Thanks to Techie-Micheal and HoL for pointing out possible problems)</li>
-		<li>[Fix] Check users pm preferences for pm's sent to groups. (Bug #33245)</li>
-		<li>[Fix] Do not allow password reminders if u_passchg permission is not given. (Bug #14806)</li>
-		<li>[Fix] Implemented strict check for cached user permissions and existing ACL options. This fix makes sure cached permissions are valid, even if they got already cached.</li>
-		<li>[Fix] Do not show link to user/group profiles if user has no permission to view the linked page and gets a denied message anyway. (Bug #15088)</li>
-		<li>[Fix] Do not display last post link and sort display options for search engines. (Bug #15088)</li>
-		<li>[Fix] Make sure users still get notifications if they set to only be notified by Jabber, but Jabber service disabled. (Bug #29715 - Patch by Paul)</li>
-		<li>[Fix] Don't show forum subscription link on categories. (Bug #34895)</li>
-		<li>[Fix] Display a message if no topics or forums are selected when unsubscribing. (Bug #34855)</li>
-		<li>[Fix] Mark/unmark all links in UCP now select/unselect both subscribed topics and forums.</li>
-		<li>[Fix] Increase board topic counter when splitting topics. (Bug #32125)</li>
-		<li>[Fix] Display profile icons when viewing a topic, or PM when only the jabber icon is to be visible. (Bug #34755)</li>
-		<li>[Fix] Do not send PMs with warnings if the user cannot read PMs or they are disabled. (Bug #30815)</li>
-		<li>[Fix] Correctly convert Niels' Birthday MOD to the date format used in phpBB3. (Bug #32895)</li>
-		<li>[Fix] Parse BBCode lists of type square, circle and disc. (Bug #35295)</li>
-		<li>[Fix] Round the displayed percentages in polls. (Bug #32375)</li>
-		<li>[Fix] Disable mass e-mail when e-mail is disabled. (Bug #27385)</li>
-		<li>[Fix] Display coloured poster username of queued posts displayed on the front of the MCP.</li>
-		<li>[Fix] Moderators can only see reports/queue/logs from forums they can actually read. (Bug #31085)</li>
-		<li>[Fix] Correctly display topic when start parameter is equal to the number of posts.</li>
-		<li>[Fix] Correctly display topic in MCP when start parameter is equal to or greater than the number of posts. (Bug #30525)</li>
-
-		<li>[Change] No longer allow the direct use of MULTI_INSERT in sql_build_array. sql_multi_insert() must be used.</li>
-		<li>[Change] Display warning in ACP if config.php file is left writable.</li>
-		<li>[Change] More restrictive chmod to new files being created. (phpbb_chmod() function mostly by faw)</li>
-		<li>[Change] Set headers to allow browsers to better cache attachments (Mylek pointed this out)</li>
-		<li>[Change] Hide parameters if they equal the default in viewforum/viewtopic (Bug #31185)</li>
-		<li>[Change] Various improvements to group listings (Bugs #32155, #32145, #32085, #26675, #26265)</li>
-		<li>[Change] Set headers for IE 8 in file.php</li>
-		<li>[Change] Do not count queued posts to user_posts.</li>
-		<li>[Change] Allow setting birth year to current year.</li>
-		<li>[Change] Do not use the topics posted table when performing an egosearch.</li>
-		<li>[Change] Log the forum name that topics are moved into.</li>
-		<li>[Change] Automatically add users/groups to the PM recipient list, if entered or selected.</li>
-		<li>[Change] Reply to PM now includes all previous recipients and not only the original sender.</li>
-		<li>[Change] Make topic selection for merge less confusing by removing unneeded controls. (Bug #21925)</li>
-		<li>[Change] MCP topic view checkboxes now default to unchecked.</li>
-		<li>[Change] Adjust language key <em>SPLIT_AFTER</em> to make the action clearer.</li>
-		<li>[Change] Add links to the post and forum when viewing a report from the MCP. (Bugs #33795, #33805)</li>
-		<li>[Change] Added CSRF protection to GET-only actions like marking forums.</li>
-		<li>[Change] Remove NUL-Bytes directly in request_var() for strings and within the custom DBAL sql_escape() functions (MSSQL, Firebird, Oracle) (reported by AdhostMikeSw)</li>
-
-		<li>[Feature] Allow limited inheritance for template sets.</li>
-		<li>[Feature] Allow hard disabling of the template editor.</li>
-		<li>[Feature] Allow setting custom language path through $user-&gt;set_custom_lang_path(). $user-&gt;lang_path now also do not include the user language, but only the path.</li>
-		<li>[Feature] Ability to define nullar/singular/plural language entries</li>
-		<li>[Feature] Ability to mimic sprintf() calls with $user-&gt;lang() with the ability to correctly assign nullar/singular/plural language entries.</li>
-		<li>[Feature] Added the possibility to force user posts put in queue if post count is lower than an admin defined value. Guest posting is not affected by this setting.</li>
-		<li>[Feature] Added 'max_recipients' setting for private messages. This setting allows admins to define the maximum number of recipients per private message with a board-wide setting and a group-specific setting.</li>
-		<li>[Feature] Added new permission setting for sending private messages to groups. Now there are two permissions to define sending private messages to multiple recipients and private messages to groups.</li>
-		<li>[Feature] Allow specific connection to different server for jabber functionality by providing a valid JID as username. This also allows the use of talk.google.com as jabber server with gmail.com JIDs. (Bug #14989)</li>
-
-		<li>[Sec Precaution] Stricter validation of the HTTP_HOST header (Thanks to Techie-Micheal et al for pointing out possible issues in derived code)</li>
-	</ul>
-
-	<a name="v301"></a><h3>1.vi. Changes since 3.0.1</h3>
-
-	<ul>
-		<li>[Fix] Ability to set permissions on non-mysql dbms (Bug #24955)</li>
-		<li>[Fix] Fixed blank style on setups having no username defined within config.php (Bug #25065)</li>
-		<li>[Fix] Made the compress_tar class tolerate archives that do not properly have their archived contents listed (Bug #14429 / thanks to JRSweets for his patch)</li>
-		<li>[Fix] Moved topics should not count towards the number of topics in a forum (Bug #14648 / thanks to Schumi for his patch)</li>
-		<li>[Fix] Properly check for invalid characters in MySQL DB prefixes during install (Bug #18775)</li>
-		<li>[Fix] Bring the PostgreSQL backup system back to working order (Bug #22385)</li>
-		<li>[Fix] Update correct theme for cached styles in style.php (Bug #25805)</li>
-		<li>[Fix] Also add PHPBB_INSTALLED check to download/file.php for inline avatar delivery</li>
-		<li>[Fix] Unable to login to some jabber server, reverted previous change (Bug #25095)</li>
-		<li>[Fix] Do not return BMP as valid image type for GD image manipulation (Bug #25925)</li>
-		<li>[Fix] Correctly determine safe mode for temp file creation in functions_upload.php (Bug #23525)</li>
-		<li>[Fix] Correctly sort by rank in memberlist (Bug #24435)</li>
-		<li>[Fix] Purge cache after database restore (Bug #24245)</li>
-		<li>[Fix] Correctly display subforum read/unread icons from RTL in FF3, Konqueror and Safari3+. (thanks arod-1 for the fix, related to Bug #14830)</li>
-		<li>[Fix] Added missing form token in acp (thanks NBBN).</li>
-		<li>[Fix] Do not remove whitespace in front of url containing the boards url and no relative path appended (Bug #27355)</li>
-		<li>[Fix] reset forum notifications in viewtopic (Bug #28025)</li>
-		<li>[Fix] corrected link for searching post author's other posts (Bug #26455)</li>
-		<li>[Fix] HTTP Authentication supports UTF-8 usernames now (Bug #21135)</li>
-		<li>[Fix] Topic searches by author no longer return invalid results (Bug #11777)</li>
-		<li>[Fix] Delete drafts and bookmarks when deleting an user. (#27585, thanks Schumi for the fix)</li>
-		<li>[Fix] Set last_post_subject for new topics. (#23945)</li>
-		<li>[Fix] Allow moving posts to invisible forums. (#27325)</li>
-		<li>[Fix] Don't allow promoting unapproved group members (#16124)</li>
-		<li>[Fix] Correctly fetch server name if using non-standard port (#27395)</li>
-		<li>[Fix] Regular expression for email matching in posts will no longer die on long words.</li>
-		<li>[Fix] Do not display ban message if direct call to cron. (thanks Dog Cow for reporting)</li>
-		<li>[Fix] Correctly display double-colon on special conditions within highlighted php source (Bug #26795)</li>
-		<li>[Fix] Increase storage capacity of titles/subjects due to specialchared content (Bug #25235)</li>
-		<li>[Fix] Catch invalid username wildcard ban (we do not support these) (Bug #29305)</li>
-		<li>[Fix] Fix (email)-domain checks for those having DNS prefixes set (Bug #29635)</li>
-		<li>[Change] Adjust truncate_string() to be able to adjust the maximum storage length.</li>
-		<li>[Change] Generalize load check (Bug #21255 / thanks to Xipher)</li>
-		<li>[Change] Make utf8_htmlspecialchars not pass its argument by reference (Bug #21885)</li>
-		<li>[Change] Sort the tables at the database table backup screen</li>
-		<li>[Change] For determining the maximum number of private messages in one box, use the biggest value from all groups the user is a member of (Bug #24665)</li>
-		<li>[Change] Show email ban reason on registration. Additionally allow custom errors properly returned if using validate_data(). (Bug #26885)</li>
-		<li>[Change] Don't allow redirects to different domains. (thanks nookieman)</li>
-		<li>[Feature] Added optional referer validation of POST requests as additional CSRF protection.</li>
-		<li>[Feature] Added optional stricter upload validation to avoid mime sniffing in addition to the safeguards provided by file.php. (thanks to Nicolas Grekas for compiling the list).</li>
-		<li>[Feature] Streamlined banning via the MCP by adding a ban link to the user profile. Also pre-fills ban fields as far as possible.</li>
-		<li>[Feature] Added ACP logout to reset an admin session.</li>
-		<li>[Sec] Only allow urls gone through redirect() being used within login_box(). (thanks nookieman)</li>
-	</ul>
-
-	<a name="v300"></a><h3>1.vii Changes since 3.0.0</h3>
-
-	<ul>
-		<li>[Change] Validate birthdays (Bug #15004)</li>
-		<li>[Fix] Allow correct avatar caching for CGI installations. (thanks wildbill)</li>
-		<li>[Fix] Fix disabling of word censor, now possible again</li>
-		<li>[Fix] Allow single quotes in db password to be stored within config.php in installer</li>
-		<li>[Fix] Correctly quote db password for re-display in installer (Bug #16695 / thanks to m313 for reporting too - #s17235)</li>
-		<li>[Fix] Correctly handle empty imageset entries (Bug #16865)</li>
-		<li>[Fix] Correctly check empty subjects/messages (Bug #17915)</li>
-		<li>[Change] Do not check usernames against word censor list. Disallowed usernames is already checked and word censor belong to posts. (Bug #17745)</li>
-		<li>[Fix] Additionally include non-postable forums for moderators forums shown within the teams list. (Bug #17265)</li>
-		<li>[Change] Sped up viewforum considerably (also goes towards mcp_forum)</li>
-		<li>[Fix] Do not split topic list for topics being promoted to announcements after been moved to another forum (Bug #18635)</li>
-		<li>[Fix] Allow editing usernames within database_update on username cleanup (Bug #18415)</li>
-		<li>[Fix] Fixing wrong sync() calls if moving all posts by a member in ACP (Bug #18385)</li>
-		<li>[Fix] Check entered imagemagick path for trailing slash (Bug #18205)</li>
-		<li>[Fix] Use proper title on index for new/unread posts (Bug #13101) - patch provided by Pyramide</li>
-		<li>[Fix] Allow calls to $user-&gt;set_cookie() define no cookie time for setting session cookies (Bug #18025)</li>
-		<li>[Fix] Stricter checks on smilie packs (Bug #19675)</li>
-		<li>[Fix] Gracefully return from cancelling pm drafts (Bug #19675)</li>
-		<li>[Fix] Possible login problems with IE7 if browser check is activated (Bug #20135)</li>
-		<li>[Fix] Fix possible database transaction errors if code returns on error and rollback happened (Bug #17025)</li>
-		<li>[Change] Allow numbers in permission names for modifications, as well as uppercase letters for the request_ part (Bug #20125)</li>
-		<li>[Fix] Use HTTP_HOST in favor of SERVER_NAME for determining server url for redirection and installation (Bug #19955)</li>
-		<li>[Fix] Removing s_watching_img from watch_topic_forum() function (Bug #20445)</li>
-		<li>[Fix] Changing order for post review if more than one post affected (Bug #15249)</li>
-		<li>[Fix] Language typos/fixes (Bug #20425, #15719, #15429, #14669, #13479, #20795, #21095, #21405, #21715, #21725, #21755, #21865, #15689)</li>
-		<li>[Fix] Style/Template fixes (Bug #20065, #19405, #19205, #15028, #14934, #14821, #14752, #14497, #13707, #14738, #19725)</li>
-		<li>[Fix] Tiny code fixes (Bug #20165, #20025, #19795, #14804)</li>
-		<li>[Fix] Prepend phpbb_root_path to ranks path for displaying ranks (Bug #19075)</li>
-		<li>[Fix] Allow forum notifications if topic notifications are disabled but forum notifications enabled (Bug #14765)</li>
-		<li>[Fix] Fixing realpath issues for provider returning the passed value instead of disabling it. This fixes issues with confirm boxes for those hosted on Network Solutions for example. (Bug #20435)</li>
-		<li>[Fix] Try to sort last active date on memberlist correctly at least on current page (Bug #18665)</li>
-		<li>[Fix] Handle generation of form tokens when maximum time is set to -1</li>
-		<li>[Fix] Correctly delete unapproved posts without deleting the topic (Bug #15120)</li>
-		<li>[Fix] Respect signature permissions in posting (Bug #16029)</li>
-		<li>[Fix] Users allowed to resign only from open and freely open groups (Bug #19355)</li>
-		<li>[Fix] Assign a last viewed date to converted topics (Bug #16565)</li>
-		<li>[Fix] Many minor and/or cosmetic fixes (Including, but not limited to: #21315, #18575, #18435, #21215)</li>
-		<li>[Feature] New option to hide the entire list of subforums on listforums</li>
-		<li>[Fix] Custom BBCode {EMAIL}-Token usage (Bug #21155)</li>
-		<li>[Fix] Do not rely on parameter returned by unlink() for verifying cache directory write permission (Bug #19565)</li>
-		<li>[Change] Use correct string for filesize (MiB instead of MB for example)</li>
-		<li>[Change] Remove left join for query used to retrieve already assigned users and groups within permission panel (Bug #20235)</li>
-		<li>[Fix] Correctly return sole whitespaces if used with BBCodes (Bug #19535)</li>
-		<li>[Fix] Quote bbcode parsing adding too much closing tags on special conditions (Bug #20735)</li>
-		<li>[Change] Added sanity checks to various ACP settings</li>
-		<li>[Change] Removed minimum form times</li>
-		<li>[Fix] Check topics_per_page value in acp_forums (Bug #15539)</li>
-		<li>[Fix] Custom profile fields with date type should be timezone independend (Bug #15003)</li>
-		<li>[Fix] Fixing some XHTML errors/warnings within the ACP (Bug #22875)</li>
-		<li>[Fix] Warnings if poll title/options exceed maximum characters per post (Bug #22865)</li>
-		<li>[Fix] Do not allow selecting non-authorized groups within memberlist by adjusting URL (Bug #22805 - patch provided by ToonArmy)</li>
-		<li>[Fix] Correctly specify &quot;close report action&quot; (Bug #22685)</li>
-		<li>[Fix] Display &quot;empty password error&quot; within the login box instead of issuing a general error (Bug #22525)</li>
-		<li>[Fix] Clean up who is online code in page_header (Bug #22715, thanks HighwayofLife)</li>
-		<li>[Fix] Pertain select single link on memberlist (Bug #23235 - patch provided by Schumi)</li>
-		<li>[Fix] Allow &amp; and | in local part of email addresses (Bug #22995)</li>
-		<li>[Fix] Do not error out if php_uname function disabled / Authenticating on SMTP Server (Bug #22235 - patch by HoL)</li>
-		<li>[Fix] Correctly obtain to be ignored users within topic/forum notification (Bug #21795 - patch provided by dr.death)</li>
-		<li>[Fix] Correctly update board statistics for attaching orphaned files to existing posts (Bug #20185)</li>
-		<li>[Fix] Do not detect the board URL as a link twice in posts (Bug #19215)</li>
-		<li>[Fix] Set correct error reporting in style.php to avoid blank pages after CSS changes (Bug #23885)</li>
-		<li>[Fix] If pruning users based on last activity, do not include users never logged in before (Bug #18105)</li>
-		<li>[Sec] Only allow searching by email address in memberlist for users having the a_user permission (reported by evil&lt;3)</li>
-		<li>[Sec] Limit private message attachments to be viewable only by the recipient(s)/sender (Report #s23535) - reported by AlleyKat</li>
-		<li>[Sec] Check for non-empty config.php within style.php (Report #s24575) - reported by bantu</li>
-		<li>[Fix] Find and display colliding usernames correctly when converting from one database to another (Bug #23925)</li>
-	</ul>
-
-	<a name="v30rc8"></a><h3>1.viii. Changes since 3.0.RC8</h3>
+	<a name="v30rc8"></a><h3>1.i. Changes since 3.0.RC8</h3>

 	<ul>
 		<li>[Fix] Cleaned usernames contain only single spaces, so &quot;a_name&quot; and &quot;a__name&quot; are treated as the same name (Bug #15634)</li>
@@ -760,7 +89,7 @@
 		<li>[Fix] Call garbage_collection() within database updater to correctly close connections (affects Oracle for example)</li>
 	</ul>

-	<a name="v30rc7"></a><h3>1.ix. Changes since 3.0.RC7</h3>
+	<a name="v30rc7"></a><h3>1.ii. Changes since 3.0.RC7</h3>

 	<ul>
 		<li>[Fix] Fixed MSSQL related bug in the update system</li>
@@ -795,7 +124,7 @@
 		<li>[Fix] No duplication of active topics (Bug #15474)</li>
 	</ul>

-	<a name="v30rc6"></a><h3>1.x. Changes since 3.0.RC6</h3>
+	<a name="v30rc6"></a><h3>1.iii. Changes since 3.0.RC6</h3>

 	<ul>
 		<li>[Fix] Submitting language changes using acp_language (Bug #14736)</li>
@@ -805,7 +134,7 @@
 		<li>[Fix] Able to request new password (Bug #14743)</li>
 	</ul>

-	<a name="v30rc5"></a><h3>1.xi. Changes since 3.0.RC5</h3>
+	<a name="v30rc5"></a><h3>1.iv. Changes since 3.0.RC5</h3>

 	<ul>
 		<li>[Feature] Removing constant PHPBB_EMBEDDED in favor of using an exit_handler(); the constant was meant to achive this more or less.</li>
@@ -868,7 +197,7 @@
 		<li>[Sec] New password hashing mechanism for storing passwords (#i42)</li>
 	</ul>

-	<a name="v30rc4"></a><h3>1.xii. Changes since 3.0.RC4</h3>
+	<a name="v30rc4"></a><h3>1.v. Changes since 3.0.RC4</h3>

 	<ul>
 		<li>[Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)</li>
@@ -919,7 +248,7 @@
 		<li>[Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)</li>
 	</ul>

-	<a name="v30rc3"></a><h3>1.xiii. Changes since 3.0.RC3</h3>
+	<a name="v30rc3"></a><h3>1.vi. Changes since 3.0.RC3</h3>

 	<ul>
 		<li>[Fix] Fixing some subsilver2 and prosilver style issues</li>
@@ -1028,7 +357,7 @@

 	</ul>

-	<a name="v30rc2"></a><h3>1.xiv. Changes since 3.0.RC2</h3>
+	<a name="v30rc2"></a><h3>1.vii. Changes since 3.0.RC2</h3>

 	<ul>
 		<li>[Fix] Re-allow searching within the memberlist</li>
@@ -1053,7 +382,7 @@
 		<li>[Fix] Use our global expression for checking email syntax in memberlist (Bug #12827)</li>
 		<li>[Fix] Correctly retrieve/refresh templates stored in database if using subdirectories within template directory (Bug #12839)</li>
 		<li>[Fix] Correctly translate special group names in ucp_groups.php (Bug #12597)</li>
-		<li>[Fix] Search boxes not losing session id (changing method from get to post) (Bug #12643)</li>
+		<li>[Fix] Search boxes not loosing session id (changing method from get to post) (Bug #12643)</li>
 		<li>[Fix] Make sure the automatic update is also working for those having fsockopen disabled</li>
 		<li>[Fix] Simulate recache of theme data on automatic update finished page - recaching it if css data changed</li>
 		<li>[Feature] Allow dropping in custom &quot;info_[module class]_*.php&quot; files to language/*/mods directory for inclusion into the menu structure without the need to modify phpBB language files for menu placements</li>
@@ -1070,11 +399,11 @@
 		<li>[Fix] Some jabber related bugs (Bug #12989, #11805, #11809)</li>
 		<li>[Fix] Added UTF-8 support for banning via the MCP (Bug #13013)</li>
 		<li>[Fix] Properly detect the script name in session::extract_current_page() if PHP_SELF is not defined (Bug #12705) - patch provided by ToonArmy</li>
-		<li>[Fix] Show role mask for global permission class under Permissions-&gt;Permission Roles (Bug #13057)</li>
+		<li>[Fix] Show role mask for global permission class under Permissions->Permission Roles (Bug #13057)</li>

 	</ul>

-	<a name="v30rc1"></a><h3>1.xv. Changes since 3.0.RC1</h3>
+	<a name="v30rc1"></a><h3>1.viii. Changes since 3.0.RC1</h3>

 	<ul>
 		<li>[Fix] (X)HTML issues within the templates (Bug #11255, #11255)</li>
@@ -1230,4 +559,4 @@
 </div>

 </body>
-</html>
+</html>
--- a/phpBB/docs/FAQ.html
+++ b/phpBB/docs/FAQ.html
@@ -53,7 +53,7 @@

 <!-- 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="#install">I cannot install this it is too difficult! Will you do it?</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>
@@ -62,7 +62,7 @@
 	<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="#avatars">No matter what I set the uploadable avatars to I cannot upload one from my computer!</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>
@@ -78,7 +78,7 @@

 	<hr />

-	<a name="install"></a><h2>I am finding phpBB too difficult to install. Will you do it for me?</h2>
+	<a name="install"></a><h2>I cannot install this it is too difficult! Will you do it?</h2>

 	<div class="paragraph">
 		<div class="inner"><span class="corners-top"><span></span></span>
@@ -205,7 +205,7 @@ I want to sue you because i think you host an illegal board!</h2>

 	<hr />

-<a name="avatars"></a><h2>I am unable to upload avatars from my computer, regardless of the settings.</h2>
+<a name="avatars"></a><h2>No matter what I set the uploadable avatars to I cannot upload one from my computer!</h2>

 	<div class="paragraph">
 		<div class="inner"><span class="corners-top"><span></span></span>
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -139,7 +139,7 @@
 			<li>MySQL 3.23 or above (MySQLi supported)</li>
 			<li>PostgreSQL 7.3+</li>
 			<li>SQLite 2.8.2+</li>
-			<li>Firebird 2.1+</li>
+			<li>Firebird 2.0+</li>
 			<li>MS SQL Server 2000 or above (directly or via ODBC)</li>
 			<li>Oracle</li>
 		</ul>
@@ -273,7 +273,7 @@

 	<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.6</samp> you should select the phpBB-3.0.6_to_3.0.7.zip/tar.gz file.</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.0</samp> you should select the phpBB-3.0.0_to_3.0.1.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>

@@ -281,11 +281,11 @@

 <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 package is for those wanting to update through the patch application, and being compfortable 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 recommended update method.</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.5 you need the phpBB-3.0.6_to_3.0.7.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>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.0 you need the phpBB-3.0.0_to_3.0.1.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>

@@ -293,9 +293,9 @@

 <a name="update_auto"></a><h3>4.iv. Automatic update package</h3>

-	<p>This update method is the recommended method for updating. This package allows detecting changed files automatically and merges changes if needed.</p>
+	<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>The automatic update package is holding - contrary to the others - only the update informations for updating the last released version to the latest available version. These package is 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>

@@ -369,11 +369,11 @@

 	<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>Path to your former board</strong> The converter expects the relative path to your old board's files. So, -for instance - if the new board is located at <code>http://www.yourdomain.com/forum</code> and the phpBB3 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>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>
+	<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>
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -57,7 +57,6 @@
 		<li><a href="#editorsettings">Editor Settings</a></li>
 		<li><a href="#fileheader">File Header</a></li>
 		<li><a href="#locations">File Locations</a></li>
-		<li><a href="#constants">Special Constants</a></li>
 	</ol>
 	</li>
 	<li><a href="#code">Code Layout/Guidelines</a>
@@ -69,16 +68,8 @@
 		<li><a href="#general">General Guidelines</a></li>
 	</ol>
 	</li>
-	<li><a href="#styling">Styling</a>
-	<ol style="list-style-type: lower-roman;">
-		<li><a href="#cfgfiles">Style Config Files</a></li>
-		<li><a href="#genstyling">General Styling Rules</a></li>
-	</ol></li>
-	<li><a href="#templating">Templating</a>
-	<ol style="list-style-type: lower-roman;">
-		<li><a href="#templates">General Templating</a></li>
-		<li><a href="#inheritance">Template Inheritance</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;">
@@ -87,12 +78,6 @@
 		<li><a href="#writingstyle">Writing Style</a></li>
 	</ol>
 	</li>
-	<li><a href="#vcs">VCS Guidelines</a>
-	<ol style="list-style-type: lower-roman;">
-		<li><a href="#repostruct">Repository structure</a></li>
-		<li><a href="#commitmessage">Commit messages</a></li>
-	</ol>
-	</li>
 	<li><a href="#changes">Guidelines Changelog</a></li>
 	<li><a href="#disclaimer">Copyright and disclaimer</a></li>
 </ol>
@@ -125,7 +110,7 @@
 	<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.</p>
+	<p>Ensure that your editor is saving files in the UNIX format. This means lines are terminated with a newline, not with a CR/LF combo as they are on Win32, or whatever the Mac uses. Any decent editor should be able to do this, but it might not always be the default. Know your editor. If you want advice on Windows text editors, just ask one of the developers. Some of them do their editing on Win32.</p>

 	<a name="fileheader"></a><h3>1.ii. File Header</h3>

@@ -203,7 +188,8 @@ class ...
 				<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>
+				<li><code>/includes/db/mysql.php</code><br />MySQL Database Abstraction Layer for MySQL 3.x/4.0.x</li>
+				<li><code>/includes/db/mysql4.php</code><br />MySQL4 Database Abstraction Layer for MySQL 4.1.x/5.x</li>
 				<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>
@@ -224,54 +210,6 @@ class ...
 		<li><strong>styles</strong><br /><code>/styles</code>, <code>style.php</code><br />phpBB Styles/Templates/Themes/Imagesets</li>
 	</ul>

-	<a name="constants"></a><h3>1.iv. Special Constants</h3>
-
-	<p>There are some special constants application developers are able to utilize to bend some of phpBB's internal functionality to suit their needs.</p>
-
-	<div class="codebox"><pre>
-PHPBB_MSG_HANDLER          (overwrite message handler)
-PHPBB_DB_NEW_LINK          (overwrite new_link parameter for sql_connect)
-PHPBB_ROOT_PATH            (overwrite $phpbb_root_path)
-PHPBB_ADMIN_PATH           (overwrite $phpbb_admin_path)
-PHPBB_USE_BOARD_URL_PATH   (use generate_board_url() for image paths instead of $phpbb_root_path)
-PHPBB_DISABLE_ACP_EDITOR   (disable ACP style editor for templates)
-PHPBB_DISABLE_CONFIG_CHECK (disable ACP config.php writeable check)
-
-PHPBB_ACM_MEMCACHE_PORT     (overwrite memcached port, default is 11211)
-PHPBB_ACM_MEMCACHE_COMPRESS (overwrite memcached compress setting, default is disabled)
-PHPBB_ACM_MEMCACHE_HOST     (overwrite memcached host name, default is localhost)
-
-PHPBB_QA                   (Set board to QA-Mode, which means the updater also checks for RC-releases)
-</pre></div>
-
-<h4>PHPBB_USE_BOARD_URL_PATH</h4>
-
-<p>If the <code>PHPBB_USE_BOARD_URL_PATH</code> constant is set to true, phpBB uses generate_board_url() (this will return the boards url with the script path included) on all instances where web-accessible images are loaded. The exact locations are:</p>
-
-<ul>
-	<li>/includes/session.php - user::img()</li>
-	<li>/includes/functions_content.php - smiley_text()</li>
-</ul>
-
-<p>Path locations for the following template variables are affected by this too:</p>
-
-<ul>
-	<li>{T_THEME_PATH} - styles/xxx/theme</li>
-	<li>{T_TEMPLATE_PATH} - styles/xxx/template</li>
-	<li>{T_SUPER_TEMPLATE_PATH} - styles/xxx/template</li>
-	<li>{T_IMAGESET_PATH} - styles/xxx/imageset</li>
-	<li>{T_IMAGESET_LANG_PATH} - styles/xxx/imageset/yy</li>
-	<li>{T_IMAGES_PATH} - images/</li>
-	<li>{T_SMILIES_PATH} - $config['smilies_path']/</li>
-	<li>{T_AVATAR_PATH} - $config['avatar_path']/</li>
-	<li>{T_AVATAR_GALLERY_PATH} - $config['avatar_gallery_path']/</li>
-	<li>{T_ICONS_PATH} - $config['icons_path']/</li>
-	<li>{T_RANKS_PATH} - $config['ranks_path']/</li>
-	<li>{T_UPLOAD_PATH} - $config['upload_path']/</li>
-	<li>{T_STYLESHEET_LINK} - styles/xxx/theme/stylesheet.css (or link to style.php if css is parsed dynamically)</li>
-	<li>New template variable {BOARD_URL} for the board url + script path.</li>
-</ul>
-
 		</div>

 		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
@@ -580,7 +518,7 @@ switch ($mode)
 	break;

 	default:
-		// Always assume that a case was not caught
+		// Always assume that the case got not catched
 	break;
 }
 	</pre></div>
@@ -603,7 +541,7 @@ switch ($mode)

 	default:

-		// Always assume that a case was not caught
+		// Always assume that the case got not catched

 	break;
 }
@@ -631,7 +569,7 @@ switch ($mode)

 	default:

-		// Always assume that a case was not caught
+		// Always assume that the case got not catched

 	break;
 }
@@ -752,29 +690,7 @@ $sql = 'UPDATE ' . SOME_TABLE . '
 $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>
+	<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>MULTI_INSERT</code> (for returning extended inserts), <code>UPDATE</code> (example above) and <code>SELECT</code> (for building WHERE statement [AND logic]).</p>

 	<h4>sql_in_set():</h4>

@@ -1057,18 +973,8 @@ append_sid(&quot;{$phpbb_root_path}memberlist.$phpEx&quot;, 'mode=group&amp;amp;
 		<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>
+
+<h4>General things</h4>
 <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>
@@ -1135,7 +1041,6 @@ append_sid(&quot;{$phpbb_root_path}memberlist.$phpEx&quot;, 'mode=group&amp;amp;
 		<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>
@@ -1154,7 +1059,7 @@ append_sid(&quot;{$phpbb_root_path}memberlist.$phpEx&quot;, 'mode=group&amp;amp;
 <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>
+<p>A bit later loops will be explained further. To not irretate 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>
@@ -1165,18 +1070,6 @@ append_sid(&quot;{$phpbb_root_path}memberlist.$phpEx&quot;, 'mode=group&amp;amp;

 <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>

-<p>Added in <strong>3.0.6</strong> is the ability to include a file using a template variable to specify the file, this functionality only works for root variables (i.e. not block variables).</p>
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- INCLUDE {FILE_VAR} --&gt;</span>
-</pre></div>
-
-<p>Template defined variables can also be utilised.</p>
-
-<div class="codebox"><pre>
-<span class="comment">&lt;!-- DEFINE $SOME_VAR = 'my_file.html' --&gt;</span>
-<span class="comment">&lt;!-- INCLUDE {$SOME_VAR} --&gt;</span>
-</pre></div>
-
 <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>

@@ -1530,35 +1423,12 @@ div
 &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;
+		&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;
+	&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>
@@ -1580,7 +1450,7 @@ div


 <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>
+<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 compatability 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>
@@ -2319,86 +2189,12 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))

 	<hr />

-<a name="vcs"></a><h2>7. VCS Guidelines</h2>
-
+<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">

-	<p>The version control system for phpBB3 is subversion. The repository is available at <a href="http://code.phpbb.com/svn/phpbb" title="repository">http://code.phpbb.com/svn/phpbb</a>.</p>
-
-	<a name="repostruct"></a><h3>7.i. Repository Structure</h3>
-
-	<ul>
-		<li><strong>trunk</strong><br />The latest unstable development version with new features etc. Contains the actual board in <code>/trunk/phpBB</code></li>
-		<li><strong>branches</strong><br />Development branches of stable phpBB releases. Copied from <code>/trunk</code> at the time of release.
-			<ul>
-				<li><strong>phpBB3.0</strong><code>/branches/phpBB-3_0_0/phpBB</code><br />Development branch of the stable 3.0 line. Bug fixes are applied here.</li>
-				<li><strong>phpBB2</strong><code>/branches/phpBB-2_0_0/phpBB</code><br />Old phpBB2 development branch.</li>
-			</ul>
-		</li>
-		<li><strong>tags</strong><br />Released versions. Copies of trunk or the respective branch, made at the time of release.
-			<ul>
-				<li><code>/tags/release_3_0_BX</code><br />Beta release X of the 3.0 line.</li>
-				<li><code>/tags/release_3_0_RCX</code><br />Release candidate X of the 3.0 line.</li>
-				<li><code>/tags/release_3_0_X-RCY</code><br />Release candidate Y of the stable 3.0.X release.</li>
-				<li><code>/tags/release_3_0_X</code><br />Stable <strong>3.0.X</strong> release.</li>
-				<li><code>/tags/release_2_0_X</code><br />Old stable 2.0.X release.</li>
-			</ul>
-		</li>
-	</ul>
-
-	<a name="commitmessage"></a><h3>7.ii. Commit Messages</h3>
-
-	<p>The commit message should contain a brief explanation of all changes made within the commit. Often identical to the changelog entry. A bug ticket can be referenced by specifying the ticket ID with a hash, e.g. #12345. A reference to another revision should simply be prefixed with r, e.g. r12345.</p>
-
-	<p>Junior Developers need to have their patches approved by a development team member first. The commit message must end in a line with the following format:</p>
-
-	<div class="codebox"><pre>
-Authorised by: developer1[, developer2[, ...]]
-	</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="changes"></a><h2>8. Guidelines Changelog</h2>
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-<h3>Revision 10007</h3>
-
-<ul>
-	<li>Added <a href="#constants">Special Constants</a> section.</li>
-</ul>
-
-<h3>Revision 9817</h3>
-
-<ul>
-	<li>Added VCS section.</li>
-</ul>
-
-<h3>Revision 8732</h3>
-
-<ul>
-	<li>Added cfg files.</li>
-	<li>Added template <a href="#inheritance">inheritance</a>.</li>
-</ul>
-
-<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>
@@ -2456,7 +2252,7 @@ Authorised by: developer1[, developer2[, ...]]

 	<hr />

-<a name="disclaimer"></a><h2>9. Copyright and disclaimer</h2>
+<a name="disclaimer"></a><h2>8. Copyright and disclaimer</h2>

 	<div class="paragraph">
 		<div class="inner"><span class="corners-top"><span></span></span>
--- a/phpBB/docs/hook_system.html
+++ b/phpBB/docs/hook_system.html
@@ -14,7 +14,7 @@
 <title>phpBB3 &bull; Hook System</title>

 <style type="text/css">
-/* <![CDATA[ */
+<!--

 /*
 	The original "prosilver" theme for phpBB3
@@ -104,14 +104,14 @@ h3 {
 	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;
+code { 
+	color: #006600; 
+	font-weight: normal; 
+	font-family: 'Courier New', monospace; 
+	border-color: #D1D7DC; 
+	border-width: 1px; 
+	border-style: solid; 
+	background-color: #FAFAFA; 
 }

 #wrap {
@@ -309,7 +309,7 @@ a:active	{ color: #368AD2; }
 	margin-left: 25px;
 }

-/* ]]> */
+//-->
 </style>

 </head>
@@ -387,36 +387,8 @@ PHPBB_MSG_HANDLER (overwrite message handler)
 PHPBB_DB_NEW_LINK (overwrite new_link parameter for sql_connect)
 PHPBB_ROOT_PATH   (overwrite $phpbb_root_path)
 PHPBB_ADMIN_PATH  (overwrite $phpbb_admin_path)
-PHPBB_USE_BOARD_URL_PATH (use generate_board_url() for image paths instead of $phpbb_root_path)
 </pre></div>

-<p>If the <code>PHPBB_USE_BOARD_URL_PATH</code> constant is set to true, phpBB uses generate_board_url() (this will return the boards url with the script path included) on all instances where web-accessible images are loaded. The exact locations are:</p>
-
-<ul>
-	<li>/includes/session.php - user::img()</li>
-	<li>/includes/functions_content.php - smiley_text()</li>
-</ul>
-
-<p>Path locations for the following template variables are affected by this too:</p>
-
-<ul>
-	<li>{T_THEME_PATH} - styles/xxx/theme</li>
-	<li>{T_TEMPLATE_PATH} - styles/xxx/template</li>
-	<li>{T_SUPER_TEMPLATE_PATH} - styles/xxx/template</li>
-	<li>{T_IMAGESET_PATH} - styles/xxx/imageset</li>
-	<li>{T_IMAGESET_LANG_PATH} - styles/xxx/imageset/yy</li>
-	<li>{T_IMAGES_PATH} - images/</li>
-	<li>{T_SMILIES_PATH} - $config['smilies_path']/</li>
-	<li>{T_AVATAR_PATH} - $config['avatar_path']/</li>
-	<li>{T_AVATAR_GALLERY_PATH} - $config['avatar_gallery_path']/</li>
-	<li>{T_ICONS_PATH} - $config['icons_path']/</li>
-	<li>{T_RANKS_PATH} - $config['ranks_path']/</li>
-	<li>{T_UPLOAD_PATH} - $config['upload_path']/</li>
-	<li>{T_STYLESHEET_LINK} - styles/xxx/theme/stylesheet.css (or link to style.php if css is parsed dynamically)</li>
-	<li>New template variable {BOARD_URL} for the board url + script path.</li>
-</ul>
-
-
 		</div>

 		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
@@ -644,7 +616,7 @@ echo $second_object-&gt;hook_me('first', 'second') . '&lt;br /&gt;';

 <div class="codebox"><pre>
 not hooked
-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>
@@ -698,7 +670,7 @@ echo $second_object-&gt;hook_me('first', 'second') . '&lt;br /&gt;';

 		<div class="codebox"><pre>
 not hooked
-hooked
+hooked 
 		</pre></div>

 		</div>
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -15,29 +15,9 @@ define('IN_PHPBB', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);

-
-// 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 (isset($_GET['avatar']))
 {
 	require($phpbb_root_path . 'config.' . $phpEx);
-
-	if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type))
-	{
-		exit;
-	}
-
 	require($phpbb_root_path . 'includes/acm/acm_' . $acm_type . '.' . $phpEx);
 	require($phpbb_root_path . 'includes/cache.' . $phpEx);
 	require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);
@@ -52,56 +32,85 @@ if (isset($_GET['avatar']))
 		exit;
 	}
 	unset($dbpasswd);
-
+	
 	// worst-case default
 	$browser = (!empty($_SERVER['HTTP_USER_AGENT'])) ? htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT']) : 'msie 6.0';

 	$config = $cache->obtain_config();
 	$filename = $_GET['avatar'];
 	$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)
+		header('HTTP/1.0 403 forbidden');
+		if (!empty($cache))
 		{
-			// no way such an avatar could exist. They are not following the rules, stop the show.
-			header("HTTP/1.0 403 Forbidden");
+			$cache->unload();
 		}
+		$db->sql_close();
+		exit;
+	}
+	
+	$ext		= substr(strrchr($filename, '.'), 1);
+	$stamp		= (int) substr(stristr($filename, '_'), 1);
+	$filename	= (int) $filename;
+	
+	// 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)
+	{
+		if ($last_load !== false && $last_load <= $stamp)
+		{
+			header('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));
+			exit();
+		} 
 		else
 		{
-			send_avatar_to_browser(($avatar_group ? 'g' : '') . $filename . '.' . $ext, $browser);
+			header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $stamp) . ' GMT');
 		}
 	}
-	file_gc();
+	
+	if (!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");
+		if (!empty($cache))
+		{
+			$cache->unload();
+		}
+		$db->sql_close();
+		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");
+		if (!empty($cache))
+		{
+			$cache->unload();
+		}
+		$db->sql_close();
+		exit;
+	}
+
+	send_avatar_to_browser(($avatar_group ? 'g' : '') . $filename . '.' . $ext, $browser);
+
+	if (!empty($cache))
+	{
+		$cache->unload();
+	}
+	$db->sql_close();
+	exit;
 }

 // implicit else: we are not in avatar mode
@@ -126,7 +135,7 @@ if (!$config['allow_attachments'] && !$config['allow_pm_attach'])
 	trigger_error('ATTACHMENT_FUNCTIONALITY_DISABLED');
 }

-$sql = 'SELECT attach_id, in_message, post_msg_id, extension, is_orphan, poster_id, filetime
+$sql = 'SELECT attach_id, in_message, post_msg_id, extension, is_orphan, poster_id
 	FROM ' . ATTACHMENTS_TABLE . "
 	WHERE attach_id = $download_id";
 $result = $db->sql_query_limit($sql, 1);
@@ -192,32 +201,8 @@ else
 		$row['forum_id'] = false;
 		if (!$auth->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 = $db->sql_query($sql);
-
-		$allowed = false;
-		while ($user_row = $db->sql_fetchrow($result))
-		{
-			if ($user->data['user_id'] == $user_row['user_id'] || $user->data['user_id'] == $user_row['author_id'])
-			{
-				$allowed = true;
-				break;
-			}
-		}
-		$db->sql_freeresult($result);
-
-		if (!$allowed)
-		{
-			header('HTTP/1.0 403 Forbidden');
-			trigger_error('ERROR_NO_ATTACHMENT');
-		}
 	}

 	// disallowed?
@@ -230,14 +215,13 @@ else

 if (!download_allowed())
 {
-	header('HTTP/1.0 403 Forbidden');
 	trigger_error($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
+$sql = 'SELECT attach_id, is_orphan, in_message, post_msg_id, extension, physical_filename, real_filename, mimetype
 	FROM ' . ATTACHMENTS_TABLE . "
 	WHERE attach_id = $download_id";
 $result = $db->sql_query_limit($sql, 1);
@@ -249,7 +233,7 @@ if (!$attachment)
 	trigger_error('ERROR_NO_ATTACHMENT');
 }

-$attachment['physical_filename'] = utf8_basename($attachment['physical_filename']);
+$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) && !$user->optionget('viewimg'))
@@ -266,7 +250,7 @@ if ($thumbnail)
 {
 	$attachment['physical_filename'] = 'thumb_' . $attachment['physical_filename'];
 }
-else if (($display_cat == ATTACHMENT_CATEGORY_NONE/* || $display_cat == ATTACHMENT_CATEGORY_IMAGE*/) && !$attachment['is_orphan'])
+else if (($display_cat == ATTACHMENT_CATEGORY_NONE || $display_cat == ATTACHMENT_CATEGORY_IMAGE) && !$attachment['is_orphan'])
 {
 	// Update download count
 	$sql = 'UPDATE ' . ATTACHMENTS_TABLE . '
@@ -275,10 +259,9 @@ else if (($display_cat == ATTACHMENT_CATEGORY_NONE/* || $display_cat == ATTACHME
 	$db->sql_query($sql);
 }

-if ($display_cat == ATTACHMENT_CATEGORY_IMAGE && $mode === 'view' && (strpos($attachment['mimetype'], 'image') === 0) && ((strpos(strtolower($user->browser), 'msie') !== false) && (strpos(strtolower($user->browser), 'msie 8.0') === false)))
+if ($display_cat == ATTACHMENT_CATEGORY_IMAGE && $mode === 'view' && (strpos($attachment['mimetype'], 'image') === 0) && strpos(strtolower($user->browser), 'msie') !== false)
 {
 	wrap_img_in_html(append_sid($phpbb_root_path . 'download/file.' . $phpEx, 'id=' . $attachment['attach_id']), $attachment['real_filename']);
-	file_gc();
 }
 else
 {
@@ -290,14 +273,14 @@ else
 		{
 			trigger_error($user->lang['PHYSICAL_DOWNLOAD_NOT_POSSIBLE']);
 		}
-
+		
 		redirect($phpbb_root_path . $config['upload_path'] . '/' . $attachment['physical_filename']);
-		file_gc();
+		exit;
 	}
 	else
 	{
 		send_file_to_browser($attachment, $config['upload_path'], $display_cat);
-		file_gc();
+		exit;
 	}
 }

@@ -333,7 +316,7 @@ function send_avatar_to_browser($file, $browser)
 		$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)
+		if (strpos(strtolower($browser), 'msie') !== false)
 		{
 			header('Content-Disposition: attachment; ' . header_filename($file));

@@ -358,7 +341,7 @@ function send_avatar_to_browser($file, $browser)
 			header("Content-Length: $size");
 		}

-		if (@readfile($file_path) == false)
+		if (@readfile($file_path) === false)
 		{
 			$fp = @fopen($file_path, 'rb');

@@ -376,7 +359,7 @@ function send_avatar_to_browser($file, $browser)
 	}
 	else
 	{
-		header('HTTP/1.0 404 Not Found');
+		header('HTTP/1.0 404 not found');
 	}
 }

@@ -463,70 +446,46 @@ function send_file_to_browser($attachment, $upload_dir, $category)
 	*/

 	// 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($user->browser), 'msie 8.0') !== false);
 	header('Content-Type: ' . $attachment['mimetype']);

-	if ($is_ie8)
+	if (empty($user->browser) || (strpos(strtolower($user->browser), 'msie') !== false))
 	{
-		header('X-Content-Type-Options: nosniff');
-	}
-
-	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');
+		header('Content-Disposition: attachment; ' . header_filename(htmlspecialchars_decode($attachment['real_filename'])));
+		if (empty($user->browser) || (strpos(strtolower($user->browser), 'msie 6.0') !== false))
+		{
+			header('expires: -1');
+		}
 	}
 	else
 	{
-		if (empty($user->browser) || (!$is_ie8 && (strpos(strtolower($user->browser), 'msie') !== false)))
-		{
-			header('Content-Disposition: attachment; ' . header_filename(htmlspecialchars_decode($attachment['real_filename'])));
-			if (empty($user->browser) || (strpos(strtolower($user->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');
-			}
-		}
+		header('Content-Disposition: ' . ((strpos($attachment['mimetype'], 'image') === 0) ? 'inline' : 'attachment') . '; ' . header_filename(htmlspecialchars_decode($attachment['real_filename'])));
 	}
-
+	
 	if ($size)
 	{
 		header("Content-Length: $size");
 	}

-	// Close the db connection before sending the file
-	$db->sql_close();
+	// Try to deliver in chunks
+	@set_time_limit(0);

-	if (!set_modified_headers($attachment['filetime'], $user->browser))
+	$fp = @fopen($filename, 'rb');
+
+	if ($fp !== false)
 	{
-		// Try to deliver in chunks
-		@set_time_limit(0);
-
-		$fp = @fopen($filename, 'rb');
-
-		if ($fp !== false)
+		while (!feof($fp))
 		{
-			while (!feof($fp))
-			{
-				echo fread($fp, 8192);
-			}
-			fclose($fp);
+			echo fread($fp, 8192);
 		}
-		else
-		{
-			@readfile($filename);
-		}
-
-		flush();
+		fclose($fp);
 	}
-	file_gc();
+	else
+	{
+		@readfile($filename);
+	}
+
+	flush();
+	exit;
 }

 /**
@@ -590,9 +549,9 @@ function download_allowed()
 			}
 		}
 	}
-
+	
 	// Check for own server...
-	$server_name = $user->host;
+	$server_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME');

 	// Forcing server vars is the only way to specify/override the protocol
 	if ($config['force_server_vars'] || !$server_name)
@@ -604,7 +563,7 @@ function download_allowed()
 	{
 		$allowed = true;
 	}
-
+	
 	// Get IP's and Hostnames
 	if (!$allowed)
 	{
@@ -654,53 +613,8 @@ function download_allowed()
 		}
 		$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()
-{
-	global $cache, $db;
-	if (!empty($cache))
-	{
-		$cache->unload();
-	}
-	$db->sql_close();
-	exit;
-}
-
 ?>
--- a/phpBB/download/index.htm
+++ b/phpBB/download/index.htm
--- a/phpBB/faq.php
+++ b/phpBB/faq.php
@@ -38,28 +38,15 @@ switch ($mode)
 }

 // Pull the array data from the lang pack
-$switch_column = $found_switch = false;
 $help_blocks = array();
 foreach ($user->help as $help_ary)
 {
 	if ($help_ary[0] == '--')
 	{
-		if ($help_ary[1] == '--')
-		{
-			$switch_column = true;
-			$found_switch = true;
-			continue;
-		}
-
 		$template->assign_block_vars('faq_block', array(
-			'BLOCK_TITLE'		=> $help_ary[1],
-			'SWITCH_COLUMN'		=> $switch_column,
-		));
+			'BLOCK_TITLE'		=> $help_ary[1])
+		);

-		if ($switch_column)
-		{
-			$switch_column = false;
-		}
 		continue;
 	}

@@ -71,13 +58,11 @@ foreach ($user->help as $help_ary)

 // Lets build a page ...
 $template->assign_vars(array(
-	'L_FAQ_TITLE'				=> $l_title,
-	'L_BACK_TO_TOP'				=> $user->lang['BACK_TO_TOP'],
+	'L_FAQ_TITLE'	=> $l_title,
+	'L_BACK_TO_TOP'	=> $user->lang['BACK_TO_TOP'])
+);

-	'SWITCH_COLUMN_MANUALLY'	=> (!$found_switch) ? true : false,
-));
-
-page_header($l_title, false);
+page_header($l_title);

 $template->set_filenames(array(
 	'body' => 'faq_body.html')
--- a/phpBB/feed.php
+++ b/phpBB/feed.php
--- a/phpBB/images/avatars/upload/.htaccess
+++ b/phpBB/images/avatars/upload/.htaccess
--- a/phpBB/images/smilies/icon_arrow.gif
+++ b/phpBB/images/smilies/icon_arrow.gif
--- a/phpBB/images/smilies/icon_cool.gif
+++ b/phpBB/images/smilies/icon_cool.gif
--- a/phpBB/images/smilies/icon_cry.gif
+++ b/phpBB/images/smilies/icon_cry.gif
--- a/phpBB/images/smilies/icon_e_biggrin.gif
+++ b/phpBB/images/smilies/icon_e_biggrin.gif
--- a/phpBB/images/smilies/icon_e_confused.gif
+++ b/phpBB/images/smilies/icon_e_confused.gif
--- a/phpBB/images/smilies/icon_e_geek.gif
+++ b/phpBB/images/smilies/icon_e_geek.gif
--- a/phpBB/images/smilies/icon_e_sad.gif
+++ b/phpBB/images/smilies/icon_e_sad.gif
--- a/phpBB/images/smilies/icon_e_smile.gif
+++ b/phpBB/images/smilies/icon_e_smile.gif
--- a/phpBB/images/smilies/icon_e_surprised.gif
+++ b/phpBB/images/smilies/icon_e_surprised.gif
--- a/phpBB/images/smilies/icon_e_ugeek.gif
+++ b/phpBB/images/smilies/icon_e_ugeek.gif
--- a/phpBB/images/smilies/icon_e_wink.gif
+++ b/phpBB/images/smilies/icon_e_wink.gif
--- a/phpBB/images/smilies/icon_eek.gif
+++ b/phpBB/images/smilies/icon_eek.gif
--- a/phpBB/images/smilies/icon_evil.gif
+++ b/phpBB/images/smilies/icon_evil.gif
--- a/phpBB/images/smilies/icon_exclaim.gif
+++ b/phpBB/images/smilies/icon_exclaim.gif
--- a/phpBB/images/smilies/icon_idea.gif
+++ b/phpBB/images/smilies/icon_idea.gif
--- a/phpBB/images/smilies/icon_lol.gif
+++ b/phpBB/images/smilies/icon_lol.gif
--- a/phpBB/images/smilies/icon_mad.gif
+++ b/phpBB/images/smilies/icon_mad.gif
--- a/phpBB/images/smilies/icon_mrgreen.gif
+++ b/phpBB/images/smilies/icon_mrgreen.gif
--- a/phpBB/images/smilies/icon_neutral.gif
+++ b/phpBB/images/smilies/icon_neutral.gif
--- a/phpBB/images/smilies/icon_question.gif
+++ b/phpBB/images/smilies/icon_question.gif
--- a/Show More
+++ b/Show More