tag release 3.0.1

git-svn-id: file:///svn/phpbb/tags/release_3.0.1@8498 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/adm/index.php

@@ -10,12 +10,12 @@
 
 /**
 */
-define('IN_PHPBB', 1);
-define('ADMIN_START', 1);
+define('IN_PHPBB', true);
+define('ADMIN_START', true);
 define('NEED_SID', true);
 
 // Include files
-$phpbb_root_path = './../';
+$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 require($phpbb_root_path . 'common.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
@@ -27,12 +27,6 @@ $auth->acl($user->data);
 $user->setup('acp/common');
 // End session management
 
-// Did user forget to login? Give 'em a chance to here ...
-if ($user->data['user_id'] == ANONYMOUS)
-{
-	login_box('', $user->lang['LOGIN_ADMIN'], $user->lang['LOGIN_ADMIN_SUCCESS'], true);
-}
-
 // Have they authenticated (again) as an admin for this session?
 if (!isset($user->data['session_admin']) || !$user->data['session_admin'])
 {
@@ -43,16 +37,16 @@ if (!isset($user->data['session_admin']) || !$user->data['session_admin'])
 // check specific permissions but this is a catchall
 if (!$auth->acl_get('a_'))
 {
-	trigger_error($user->lang['NO_ADMIN']);
+	trigger_error('NO_ADMIN');
 }
 
 // We define the admin variables now, because the user is now able to use the admin related features...
 define('IN_ADMIN', true);
-$phpbb_admin_path = './';
+$phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : './';
 
 // Some oft used variables
-$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;
+$safe_mode		= (@ini_get('safe_mode') == '1' || @strtolower(ini_get('safe_mode')) === 'on') ? true : false;
+$file_uploads	= (@ini_get('file_uploads') == '1' || strtolower(@ini_get('file_uploads')) === 'on') ? true : false;
 $module_id		= request_var('i', '');
 $mode			= request_var('mode', '');
 
@@ -63,9 +57,6 @@ $template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
 // the acp template is never stored in the database
 $user->theme['template_storedb'] = false;
 
-// Force pagination seperation for admin style
-$user->theme['pagination_sep'] = '';
-
 // Instantiate new module
 $module = new p_master();
 
@@ -86,8 +77,8 @@ $module->load_active();
 adm_page_header($module->get_page_title());
 
 $template->set_filenames(array(
-	'body' => $module->get_tpl_name())
-);
+	'body' => $module->get_tpl_name(),
+));
 
 adm_page_footer();
 
@@ -150,6 +141,8 @@ function adm_page_header($page_title)
 		'S_USER_LANG'			=> $user->lang['USER_LANG'],
 		'S_CONTENT_DIRECTION'	=> $user->lang['DIRECTION'],
 		'S_CONTENT_ENCODING'	=> 'UTF-8',
+		'S_CONTENT_FLOW_BEGIN'	=> ($user->lang['DIRECTION'] == 'ltr') ? 'left' : 'right',
+		'S_CONTENT_FLOW_END'	=> ($user->lang['DIRECTION'] == 'ltr') ? 'right' : 'left',
 	));
 
 	// application/xhtml+xml not used because of IE
@@ -191,7 +184,7 @@ function adm_page_footer($copyright_html = true)
 				{
 					global $base_memory_usage;
 					$memory_usage -= $base_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']);
+					$memory_usage = get_formatted_filesize($memory_usage);
 
 					$debug_output .= ' | Memory Usage: ' . $memory_usage;
 				}
@@ -211,8 +204,7 @@ function adm_page_footer($copyright_html = true)
 	$template->display('body');
 
 	garbage_collection();
-
-	exit;
+	exit_handler();
 }
 
 /**
@@ -253,8 +245,7 @@ function h_radio($name, &$input_ary, $input_default = false, $id = false, $key =
 	foreach ($input_ary as $value => $title)
 	{
 		$selected = ($input_default !== false && $value == $input_default) ? ' checked="checked"' : '';
-		$html .= ($html) ? '   ' : '';
-		$html .= '<input type="radio" name="' . $name . '"' . (($id && !$id_assigned) ? ' id="' . $id . '"' : '') . ' value="' . $value . '"' . $selected . (($key) ? ' accesskey="' . $key . '"' : '') . ' class="radio" /> ' . $user->lang[$title];
+		$html .= '<label><input type="radio" name="' . $name . '"' . (($id && !$id_assigned) ? ' id="' . $id . '"' : '') . ' value="' . $value . '"' . $selected . (($key) ? ' accesskey="' . $key . '"' : '') . ' class="radio" /> ' . $user->lang[$title] . '</label>';
 		$id_assigned = true;
 	}
 
@@ -285,7 +276,7 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 			$size = (int) $tpl_type[1];
 			$maxlength = (int) $tpl_type[2];
 
-			$tpl = '<input id="' . $key . '" type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" /> x <input type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '" />';
+			$tpl = '<input id="' . $key . '" type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '" /> x <input type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" />';
 		break;
 
 		case 'textarea':
@@ -302,10 +293,10 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 			$tpl_type_cond = explode('_', $tpl_type[1]);
 			$type_no = ($tpl_type_cond[0] == 'disabled' || $tpl_type_cond[0] == 'enabled') ? false : true;
 
-			$tpl_no = '<input type="radio" name="' . $name . '" value="0"' . $key_no . ' class="radio" />&nbsp;' . (($type_no) ? $user->lang['NO'] : $user->lang['DISABLED']);
-			$tpl_yes = '<input type="radio" id="' . $key . '" name="' . $name . '" value="1"' . $key_yes . ' class="radio" />&nbsp;' . (($type_no) ? $user->lang['YES'] : $user->lang['ENABLED']);
+			$tpl_no = '<label><input type="radio" name="' . $name . '" value="0"' . $key_no . ' class="radio" /> ' . (($type_no) ? $user->lang['NO'] : $user->lang['DISABLED']) . '</label>';
+			$tpl_yes = '<label><input type="radio" id="' . $key . '" name="' . $name . '" value="1"' . $key_yes . ' class="radio" /> ' . (($type_no) ? $user->lang['YES'] : $user->lang['ENABLED']) . '</label>';
 
-			$tpl = ($tpl_type_cond[0] == 'yes' || $tpl_type_cond[0] == 'enabled') ? $tpl_yes . '&nbsp;&nbsp;' . $tpl_no : $tpl_no . '&nbsp;&nbsp;' . $tpl_yes;
+			$tpl = ($tpl_type_cond[0] == 'yes' || $tpl_type_cond[0] == 'enabled') ? $tpl_yes . $tpl_no : $tpl_no . $tpl_yes;
 		break;
 
 		case 'select':
@@ -376,11 +367,15 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 }
 
 /**
-* Going through a config array and validate values, writing errors to $error.
+* Going through a config array and validate values, writing errors to $error. The validation method  accepts parameters separated by ':' for string and int.
+* The first parameter defines the type to be used, the second the lower bound and the third the upper bound. Only the type is required.
 */
 function validate_config_vars($config_vars, &$cfg_array, &$error)
 {
 	global $phpbb_root_path, $user;
+	$type	= 0;
+	$min	= 1;
+	$max	= 2;
 	
 	foreach ($config_vars as $config_name => $config_definition)
 	{
@@ -394,15 +389,42 @@ function validate_config_vars($config_vars, &$cfg_array, &$error)
 			continue;
 		}
 		
-		// Validate a bit. ;) String is already checked through request_var(), therefore we do not check this again
-		switch ($config_definition['validate'])
+		$validator = explode(':', $config_definition['validate']);
+
+		// Validate a bit. ;) (0 = type, 1 = min, 2= max)
+		switch ($validator[$type])
 		{
+			case 'string':
+				$length = strlen($cfg_array[$config_name]);
+
+				// the column is a VARCHAR
+				$validator[$max] = (isset($validator[$max])) ? min(255, $validator[$max]) : 255;
+
+				if (isset($validator[$min]) && $length < $validator[$min])
+				{
+					$error[] = sprintf($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
@@ -434,6 +456,21 @@ function validate_config_vars($config_vars, &$cfg_array, &$error)
 
 			break;
 
+			// Absolute path
+			case 'lang':
+				if (!$cfg_array[$config_name])
+				{
+					break;
+				}
+
+				$cfg_array[$config_name] = basename($cfg_array[$config_name]);
+
+				if (!file_exists($phpbb_root_path . 'language/' . $cfg_array[$config_name] . '/'))
+				{
+					$error[] = $user->lang['WRONG_DATA_LANG'];
+				}
+			break;
+
 			// Relative path (appended $phpbb_root_path)
 			case 'rpath':
 			case 'rwpath':
@@ -470,7 +507,7 @@ function validate_config_vars($config_vars, &$cfg_array, &$error)
 				$cfg_array[$config_name] = trim($cfg_array[$config_name]);
 
 				// Make sure no NUL byte is present...
-				if (strpos($cfg_array[$config_name], '\0') !== false || strpos($cfg_array[$config_name], '%00') !== false)
+				if (strpos($cfg_array[$config_name], "\0") !== false || strpos($cfg_array[$config_name], '%00') !== false)
 				{
 					$cfg_array[$config_name] = '';
 					break;
@@ -486,12 +523,12 @@ function validate_config_vars($config_vars, &$cfg_array, &$error)
 					$error[] = sprintf($user->lang['DIRECTORY_NOT_DIR'], $cfg_array[$config_name]);
 				}
 
-				// Check if the path is writeable
+				// Check if the path is writable
 				if ($config_definition['validate'] == 'wpath' || $config_definition['validate'] == 'rwpath')
 				{
-					if (file_exists($phpbb_root_path . $cfg_array[$config_name]) && !is_writeable($phpbb_root_path . $cfg_array[$config_name]))
+					if (file_exists($phpbb_root_path . $cfg_array[$config_name]) && !@is_writable($phpbb_root_path . $cfg_array[$config_name]))
 					{
-						$error[] = sprintf($user->lang['DIRECTORY_NOT_WRITEABLE'], $cfg_array[$config_name]);
+						$error[] = sprintf($user->lang['DIRECTORY_NOT_WRITABLE'], $cfg_array[$config_name]);
 					}
 				}
 
@@ -502,4 +539,62 @@ 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;
+		}
+	}
+}
+
 ?>

phpBB/adm/style/acp_attachments.html

@@ -3,7 +3,7 @@
 <a name="maincontent"></a>
 
 <!-- IF U_BACK -->
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 <!-- ENDIF -->
 
 <h1>{L_TITLE}</h1>
@@ -83,7 +83,8 @@
 	</dl>
 	<dl>
 		<dt><label for="exclude">{L_IP_EXCLUDE}:</label><br /><span>{L_EXCLUDE_ENTERED_IP}</span></dt>
-		<dd><input type="radio" id="exclude" name="ipexclude" value="1" class="radio" /> {L_YES} &nbsp; <input type="radio" name="ipexclude" value="0" checked="checked" class="radio" /> {L_NO}</dd>
+		<dd><label><input type="radio" id="exclude" name="ipexclude" value="1" class="radio" /> {L_YES}</label>
+			<label><input type="radio" name="ipexclude" value="0" checked="checked" class="radio" /> {L_NO}</label></dd>
 	</dl>
 
 	<p class="quick">
@@ -108,25 +109,24 @@
 	<!-- ELSE -->
 		<p>{L_NO_IPS_DEFINED}</p>
 	<!-- ENDIF -->
+	{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 <!-- ELSEIF S_EXTENSION_GROUPS -->
 
 	<!-- IF S_EDIT_GROUP -->
 		<script type="text/javascript" defer="defer">
-		<!--
-
+		// <![CDATA[
 			function update_image(newimage)
 			{
 				if (newimage == 'no_image')
 				{
-					document.image_upload_icon.src = "{PHPBB_ROOT_PATH}images/spacer.gif";
+					document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}images/spacer.gif";
 				}
 				else
 				{
-					document.image_upload_icon.src = "{PHPBB_ROOT_PATH}{IMG_PATH}/" + newimage;
+					document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}{IMG_PATH}/" + newimage;
 				}
 			}
 
@@ -162,7 +162,7 @@
 				}
 			}
 
-		//-->
+		// ]]>
 		</script>
 
 		<form id="extgroups" method="post" action="{U_ACTION}">
@@ -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 --> name="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 --> id="image_upload_icon" alt="" title="" />&nbsp;</dd>
 		</dl>
 		<dl>
 			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}:</label></dt>
@@ -205,7 +205,8 @@
 		</dl>
 		<dl>
 			<dt><label for="allowed_forums">{L_ALLOWED_FORUMS}:</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt>
-			<dd><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> />&nbsp;{L_ALLOW_ALL_FORUMS}&nbsp;&nbsp;<input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> />&nbsp;{L_ALLOW_SELECTED_FORUMS}</dd>
+			<dd><label><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_ALL_FORUMS}</label>
+				<label><input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_SELECTED_FORUMS}</label></dd>
 			<dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd>
 		</dl>
 
@@ -213,7 +214,7 @@
 			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 		</p>
-
+		{S_FORM_TOKEN}
 		</fieldset>
 
 		</form>
@@ -241,8 +242,10 @@
 			<!-- ENDIF -->
 			<tr>
 				<td><strong>{groups.GROUP_NAME}</strong>
-					<!-- IF groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>&raquo; {L_NOT_ALLOWED_IN_PM}</span><!-- ENDIF -->
-					<!-- IF groups.S_ALLOWED_IN_PM and not groups.S_GROUP_ALLOWED --><br /><span>&raquo; {L_ONLY_ALLOWED_IN_PM}</span><!-- ENDIF -->
+					<!-- IF groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>&raquo; {L_NOT_ALLOWED_IN_PM}</span>
+					<!-- ELSEIF groups.S_ALLOWED_IN_PM and not groups.S_GROUP_ALLOWED --><br /><span>&raquo; {L_ONLY_ALLOWED_IN_PM}</span>
+					<!-- ELSEIF not groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>&raquo; {L_NOT_ALLOWED_IN_PM_POST}</span>
+					<!-- ELSE --><br /><span>&raquo; {L_ALLOWED_IN_PM_POST}</span><!-- ENDIF -->
 				</td>
 				<td>{groups.CATEGORY}</td>
 				<td align="center" valign="middle" style="white-space: nowrap;">&nbsp;<a href="{groups.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{groups.U_DELETE}">{ICON_DELETE}</a>&nbsp;</td>
@@ -254,6 +257,7 @@
 				{L_CREATE_GROUP}: <input type="text" name="group_name" maxlength="30" />
 				<input class="button2" name="add" type="submit" value="{L_SUBMIT}" />
 		</p>
+		{S_FORM_TOKEN}
 		</fieldset>
 		</form>
 
@@ -276,8 +280,8 @@
 	<p class="quick">
 		<input type="submit" id="add_extension_check" name="add_extension_check" class="button2" value="{L_SUBMIT}" />
 	</p>
+	{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 	<br />
@@ -304,7 +308,7 @@
 		</tr>
 		<!-- ENDIF -->
 		<tr>
-			<td><b>{extensions.EXTENSION}</b></td>
+			<td><strong>{extensions.EXTENSION}</strong></td>
 			<td>{extensions.GROUP_OPTIONS}</td>
 			<td><input type="checkbox" class="radio" name="extension_id_list[]" value="{extensions.EXTENSION_ID}" /><input type="hidden" name="extension_change_list[]" value="{extensions.EXTENSION_ID}" /></td>
 		</tr>
@@ -316,8 +320,8 @@
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 	</p>
+	{S_FORM_TOKEN}
 	</fieldset>
-	
 	</form>
 
 <!-- ELSEIF S_ORPHAN -->
@@ -344,7 +348,7 @@
 			<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>
 			<td>{orphan.FILETIME}</td>
 			<td>{orphan.FILESIZE}</td>
-			<td><b>ID: </b><input type="text" name="post_id[{orphan.ATTACH_ID}]" size="7" maxlength="10" value="{orphan.POST_ID}" /></td>
+			<td><strong>{L_ATTACH_ID}: </strong><input type="text" name="post_id[{orphan.ATTACH_ID}]" size="7" maxlength="10" value="{orphan.POST_ID}" /></td>
 			<td><input type="checkbox" class="radio" name="add[{orphan.ATTACH_ID}]" /></td>
 			<td><input type="checkbox" class="radio" name="delete[{orphan.ATTACH_ID}]" /></td>
 		</tr>
@@ -363,9 +367,8 @@
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 	</p>
-
+	{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 <!-- ENDIF -->

phpBB/adm/style/acp_ban.html

@@ -9,34 +9,34 @@
 <p>{L_EXPLAIN}</p>
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 
 	var ban_length = new Array();
 		ban_length[-1] = '';
 	<!-- BEGIN ban_length -->
-		ban_length['{ban_length.BAN_ID}'] = "{ban_length.A_LENGTH}";
+		ban_length['{ban_length.BAN_ID}'] = '{ban_length.A_LENGTH}';
 	<!-- END ban_length -->
 
 	var ban_reason = new Array();
 		ban_reason[-1] = '';
 	<!-- BEGIN ban_reason -->
-		ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.A_REASON}";
+		ban_reason['{ban_reason.BAN_ID}'] = '{ban_reason.A_REASON}';
 	<!-- END ban_reason -->
 
 	var ban_give_reason = new Array();
 		ban_give_reason[-1] = '';
 	<!-- BEGIN ban_give_reason -->
-		ban_give_reason['{ban_give_reason.BAN_ID}'] = "{ban_give_reason.A_REASON}";
+		ban_give_reason['{ban_give_reason.BAN_ID}'] = '{ban_give_reason.A_REASON}';
 	<!-- END ban_give_reason -->
 
 	function display_details(option)
 	{
-		document.getElementById('acp_ban').unbangivereason.value = ban_give_reason[option];
-		document.getElementById('acp_ban').unbanreason.value = ban_reason[option];
-		document.getElementById('acp_ban').unbanlength.value = ban_length[option];
+		document.getElementById('acp_unban').unbangivereason.value = ban_give_reason[option];
+		document.getElementById('acp_unban').unbanreason.value = ban_reason[option];
+		document.getElementById('acp_unban').unbanlength.value = ban_length[option];
 	}
 
-//-->
+// ]]>
 </script>
 
 <form id="acp_ban" method="post" action="{U_ACTION}">
@@ -46,31 +46,34 @@
 <dl>
 	<dt><label for="ban">{L_BAN_CELL}:</label></dt>
 	<dd><textarea name="ban" cols="40" rows="3" id="ban"></textarea></dd>
-	<!-- IF S_USERNAME_BAN --><dd>[ <a href="#" onclick="window.open('{U_FIND_USER}', '_phpbbsearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF -->
+	<!-- IF S_USERNAME_BAN --><dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF -->
 </dl>
 <dl>
 	<dt><label for="banlength">{L_BAN_LENGTH}:</label></dt>
-	<dd><select name="banlength" id="banlength">{S_BAN_END_OPTIONS}</select></dd>
-	<dd><input type="text" name="banlengthother" maxlength="10" /> (YYYY-MM-DD)</dd>
+	<dd><label for="banlength"><select name="banlength" id="banlength" onchange="if(this.value==-1){document.getElementById('banlengthother').style.display = 'block';}else{document.getElementById('banlengthother').style.display='none';}">{S_BAN_END_OPTIONS}</select></label></dd>
+	<dd id="banlengthother" style="display: none;"><label><input type="text" name="banlengthother" class="inputbox" /><br /><span>{L_YEAR_MONTH_DAY}</span></label></dd>
 </dl>
 <dl>
 	<dt><label for="banexclude">{L_BAN_EXCLUDE}:</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>
-	<dd><input type="radio" name="banexclude" value="1" class="radio" /> {L_YES} &nbsp; <input type="radio" name="banexclude" id="banexclude" value="0" checked="checked" class="radio" /> {L_NO}</dd>
+	<dd><label><input type="radio" name="banexclude" value="1" class="radio" /> {L_YES}</label>
+		<label><input type="radio" name="banexclude" id="banexclude" value="0" checked="checked" class="radio" /> {L_NO}</label></dd>
 </dl>
 <dl>
 	<dt><label for="banreason">{L_BAN_REASON}:</label></dt>
-	<dd><input name="banreason" type="text" id="banreason" class="medium" maxlength="3000" /></dd>
+	<dd><input name="banreason" type="text" class="text medium" maxlength="255" id="banreason" /></dd>
 </dl>
 <dl>
 	<dt><label for="bangivereason">{L_BAN_GIVE_REASON}:</label></dt>
-	<dd><input name="bangivereason" type="text" id="bangivereason" class="medium" maxlength="3000" /></dd>
+	<dd><input name="bangivereason" type="text" class="text medium" maxlength="255" id="bangivereason" /></dd>
 </dl>
 
 <p class="submit-buttons">
 	<input class="button1" type="submit" id="bansubmit" name="bansubmit" value="{L_SUBMIT}" />&nbsp;
 	<input class="button2" type="reset" id="banreset" name="banreset" value="{L_RESET}" />
 </p>
+{S_FORM_TOKEN}
 </fieldset>
+</form>
 
 <br /><br />
 
@@ -78,6 +81,8 @@
 
 <p>{L_UNBAN_EXPLAIN}</p>
 
+<form id="acp_unban" method="post" action="{U_ACTION}">
+
 <fieldset>
 	<legend>{L_UNBAN_TITLE}</legend>
 
@@ -88,26 +93,28 @@
 	</dl>
 	<dl>
 		<dt><label for="unbanlength">{L_BAN_LENGTH}:</label></dt>
-		<dd><input style="border: 0px;" type="text" name="unbanlength" id="unbanlength" class="full" disabled="disabled" /></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><input style="border: 0px;" type="text" name="unbanreason" id="unbanreason" class="full" disabled="disabled" /></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><input style="border: 0px;" type="text" name="unbangivereason" id="unbangivereason" class="full" disabled="disabled" /></dd>
+		<dd><input style="border: 0;" type="text" class="text full" disabled="disabled" name="unbangivereason" id="unbangivereason" /></dd>
 	</dl>
 
 	<p class="submit-buttons">
 		<input class="button1" type="submit" id="unbansubmit" name="unbansubmit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="unbanreset" name="unbanreset" value="{L_RESET}" />
 	</p>
+	{S_FORM_TOKEN}
 	</fieldset>
 
 <!-- ELSE -->
 
 	<p>{L_NO_BAN_CELL}</p>
+	{S_FORM_TOKEN}
 </fieldset>
 
 <!-- ENDIF -->

phpBB/adm/style/acp_bbcodes.html

@@ -4,7 +4,7 @@
 
 <!-- IF S_EDIT_BBCODE -->
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_ACP_BBCODES}</h1>
 
@@ -51,6 +51,7 @@
 		<legend>{L_SUBMIT}</legend>
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
 	</fieldset>
 	
 	<br />
@@ -77,7 +78,6 @@
 	<!-- END token -->
 	</tbody>
 	</table>
-
 	</form>
 
 <!-- ELSE -->
@@ -103,6 +103,10 @@
 			<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>
@@ -110,6 +114,7 @@
 	<p class="quick">
 		<input class="button2" name="submit" type="submit" value="{L_ADD_BBCODE}" />
 	</p>
+	{S_FORM_TOKEN}
 	</fieldset>
 
 	</form>

phpBB/adm/style/acp_board.html

@@ -37,14 +37,13 @@
 		{auth_tpl.TPL}
 	<!-- END auth_tpl -->
 <!-- ENDIF -->
-</fieldset>
 
-<fieldset class="submit-buttons">
-	<legend>{L_SUBMIT}</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}" />
+	</p>
+	{S_FORM_TOKEN}
 </fieldset>
-
 </form>
 
 <!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_bots.html

@@ -4,7 +4,7 @@
 
 <!-- IF S_EDIT_BOT -->
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE}</h1>
 
@@ -49,9 +49,9 @@
 	<p class="submit-buttons">
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
 	</p>
 	</fieldset>
-
 	</form>
 
 <!-- ELSE -->
@@ -85,15 +85,16 @@
 	</tbody>
 	</table>
 
-	<fieldset class="quick" style="float: left;">
+	<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
 		<input class="button2" name="add" type="submit" value="{L_BOT_ADD}" />
 	</fieldset>
 
-	<fieldset class="quick" style="float: right;">
+	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
 		<select name="action">{S_BOT_OPTIONS}</select>
 		<input class="button2" name="submit" type="submit" value="{L_SUBMIT}" />
+		<p class="small"><a href="#" onclick="marklist('acp_bots', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('acp_bots', 'mark', false);">{L_UNMARK_ALL}</a></p>
+		{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 <!-- ENDIF -->

phpBB/adm/style/acp_captcha.html

@@ -6,36 +6,65 @@
 
 <p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
 
+
 <form id="acp_captcha" method="post" action="{U_ACTION}">
 
 <fieldset>
 <legend>{L_GENERAL_OPTIONS}</legend>
+
 <dl>
 	<dt><label for="enable_confirm">{L_VISUAL_CONFIRM_REG}:</label><br /><span>{L_VISUAL_CONFIRM_REG_EXPLAIN}</span></dt>
-	<dd><input type="radio" class="radio" id="enable_confirm" name="enable_confirm" value="1"<!-- IF REG_ENABLE --> checked="checked"<!-- ENDIF --> />&nbsp;{L_ENABLED}&nbsp; &nbsp;<input type="radio" class="radio" name="enable_confirm" value="0"<!-- IF not REG_ENABLE --> checked="checked"<!-- ENDIF --> />&nbsp;{L_DISABLED}</dd>
+	<dd><label><input type="radio" class="radio" id="enable_confirm" name="enable_confirm" value="1"<!-- IF REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
+		<label><input type="radio" class="radio" name="enable_confirm" value="0"<!-- IF not REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
 </dl>
 <dl>
 	<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}:</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt>
-	<dd><input type="radio" class="radio" id="enable_post_confirm" name="enable_post_confirm" value="1"<!-- IF POST_ENABLE --> checked="checked"<!-- ENDIF --> />&nbsp;{L_ENABLED}&nbsp; &nbsp;<input type="radio" class="radio" name="enable_post_confirm" value="0"<!-- IF not POST_ENABLE --> checked="checked"<!-- ENDIF --> />&nbsp;{L_DISABLED}</dd>
+	<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="captcha_gd">{L_CAPTCHA_GD}:</label><br /><span>{L_CAPTCHA_GD_EXPLAIN}</span></dt>
-	<dd><input id="captcha_gd" name="captcha_gd" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD --> checked="checked"<!-- ENDIF --> />&nbsp;{L_YES}&nbsp;&nbsp;<input name="captcha_gd" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD --> checked="checked"<!-- ENDIF --> />&nbsp;{L_NO}</dd>
+	<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>
 <dl>
-	<dt><label for="captcha_gd_noise">{L_CAPTCHA_GD_NOISE}:</label><br /><span>{L_CAPTCHA_GD_NOISE_EXPLAIN}</span></dt>
-	<dd><input id="captcha_gd_noise" name="captcha_gd_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_NOISE --> checked="checked"<!-- ENDIF --> />&nbsp;{L_YES}&nbsp;&nbsp;<input name="captcha_gd_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_NOISE --> checked="checked"<!-- ENDIF --> />&nbsp;{L_NO}</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>
+<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>
 <!-- ENDIF -->
 
 </fieldset>
+<fieldset>
+	<legend>{L_PREVIEW}</legend>
+<!-- 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 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}" />
+	<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>
 
 <!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_database.html

@@ -7,6 +7,7 @@
 
 	<p>{L_ACP_RESTORE_EXPLAIN}</p>
 
+	<!-- IF .files -->
 	<form id="acp_backup" method="post" action="{U_ACTION}">
 
 	<fieldset>
@@ -16,16 +17,19 @@
 		<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>
 
-	<!-- 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>
@@ -33,7 +37,7 @@
 	<p>{L_ACP_BACKUP_EXPLAIN}</p>
 
 	<script type="text/javascript">
-	<!--
+	// <![CDATA[
 
 		function selector(bool)
 		{
@@ -45,7 +49,7 @@
 			}
 		}
 
-	//-->
+	// ]]>
 	</script>
 
 	<form id="acp_backup" method="post" action="{U_ACTION}">
@@ -54,17 +58,21 @@
 		<legend>{L_BACKUP_OPTIONS}</legend>
 	<dl>
 		<dt><label for="type">{L_BACKUP_TYPE}:</label></dt>
-		<dd><input type="radio" class="radio" name="type" value="full" id="type" checked="checked" />&nbsp;{L_FULL_BACKUP}&nbsp;&nbsp;<input type="radio" name="type" class="radio" value="structure" />&nbsp;{L_STRUCTURE_ONLY}&nbsp;&nbsp;<input type="radio" class="radio" name="type" value="data" />&nbsp;{L_DATA_ONLY}</dd>
+		<dd><label><input type="radio" class="radio" name="type" value="full" id="type" checked="checked" /> {L_FULL_BACKUP}</label>
+			<label><input type="radio" name="type" class="radio" value="structure" /> {L_STRUCTURE_ONLY}</label>
+			<label><input type="radio" class="radio" name="type" value="data" /> {L_DATA_ONLY}</label></dd>
 	</dl>
 	<dl>
 		<dt><label for="method">{L_FILE_TYPE}:</label></dt>
 		<dd><!-- BEGIN methods -->
-		<input name="method"<!-- IF methods.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> type="radio" class="radio" value="{methods.TYPE}" />&nbsp;{methods.TYPE}
+		<label><input name="method"<!-- IF methods.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> type="radio" class="radio" value="{methods.TYPE}" /> {methods.TYPE}</label>
 		<!-- END methods --></dd>
 	</dl>
 	<dl>
 		<dt><label for="where">{L_ACTION}:</label></dt>
-		<dd><input type="radio" class="radio" name="where" value="store_and_download" id="where" checked="checked" />&nbsp;{L_STORE_AND_DOWNLOAD}&nbsp;&nbsp;<input type="radio" class="radio" name="where" value="store" />&nbsp;{L_STORE_LOCAL}&nbsp;&nbsp;<input type="radio" class="radio" name="where" value="download" />&nbsp;{L_DOWNLOAD}</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>
@@ -73,15 +81,15 @@
 			<option value="{tables.TABLE}">{tables.TABLE}</option>
 		<!-- END tables -->
 		</select></dd>
-		<dd><a href="#" onclick="selector(true)">{L_SELECT_ALL}</a> :: <a href="#" onclick="selector(false)">{L_DESELECT_ALL}</a></dd>
+		<dd><a href="#" onclick="selector(true); return false;">{L_SELECT_ALL}</a> :: <a href="#" onclick="selector(false); return false;">{L_DESELECT_ALL}</a></dd>
 	</dl>
 
 	<p class="submit-buttons">
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 	</p>
+	{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 <!-- ENDIF -->

phpBB/adm/style/acp_disallow.html

@@ -4,7 +4,7 @@
 
 <h1>{L_ACP_DISALLOW_USERNAMES}</h1>
 
-<p>{L_ADD_DISALLOW_EXPLAIN}</p>
+<p>{L_ACP_DISALLOW_EXPLAIN}</p>
 
 <form id="acp_disallow" method="post" action="{U_ACTION}">
 
@@ -12,7 +12,7 @@
 	<legend>{L_ADD_DISALLOW_TITLE}</legend>
 <dl>
 	<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_ADD_DISALLOW_EXPLAIN}</span></dt>
-	<dd><input id="user" type="text" name="disallowed_user" class="medium" maxlength="255" /></dd>
+	<dd><input id="user" type="text" class="text medium" maxlength="255" name="disallowed_user" /></dd>
 </dl>
 
 <p class="quick">
@@ -38,8 +38,8 @@
 <!-- ELSE -->
 	<p>{L_NO_DISALLOWED}</p>
 <!-- ENDIF -->
+	{S_FORM_TOKEN}
 </fieldset>
-
 </form>
 
 <!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_email.html

@@ -24,7 +24,7 @@
 <dl>
 	<dt><label for="usernames">{L_SEND_TO_USERS}:</label><br /><span>{L_SEND_TO_USERS_EXPLAIN}</span></dt>
 	<dd><textarea name="usernames" id="usernames" rows="5" cols="40">{USERNAMES}</textarea></dd>
-	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd>
+	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 </dl>
 <dl>
 	<dt><label for="subject">{L_SUBJECT}:</label></dt>
@@ -47,8 +47,8 @@
 	<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}
 </fieldset>
-
 </form>
 
 <!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_forums.html

@@ -5,8 +5,7 @@
 <!-- IF S_EDIT_FORUM -->
 
 	<script type="text/javascript">
-	<!--
-
+	// <![CDATA[
 		/**
 		* Handle displaying/hiding several options based on the forum type
 		*/
@@ -92,10 +91,10 @@
 			<!-- ENDIF -->
 		}
 
-	//-->
+	// ]]>
 	</script>
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE} :: {FORUM_NAME}</h1>
 
@@ -120,8 +119,8 @@
 	<div id="type_actions">
 		<dl>
 			<dt><label for="type_action">{L_DECIDE_MOVE_DELETE_CONTENT}:</label></dt>
-			<dd><input type="radio" class="radio" id="type_action" name="type_action" value="delete" checked="checked" /> {L_DELETE_ALL_POSTS}</dd>
-			<!-- IF S_MOVE_FORUM_OPTIONS --><dd><input type="radio" class="radio" name="type_action" value="move" /> {L_MOVE_POSTS_TO} <select name="to_forum_id">{S_MOVE_FORUM_OPTIONS}</select></dd><!-- ENDIF -->
+			<dd><label><input type="radio" class="radio" name="type_action" value="delete"<!-- IF not S_MOVE_FORUM_OPTIONS --> checked="checked" id="type_action"<!-- ENDIF --> /> {L_DELETE_ALL_POSTS}</label></dd>
+			<!-- IF S_MOVE_FORUM_OPTIONS --><dd><label><input type="radio" class="radio" name="type_action" id="type_action" value="move" checked="checked" /> {L_MOVE_POSTS_TO}</label> <select name="to_forum_id">{S_MOVE_FORUM_OPTIONS}</select></dd><!-- ENDIF -->
 		</dl>
 	</div>
 	<!-- ENDIF -->
@@ -130,9 +129,9 @@
 		<dl>
 			<dt><label for="action_subforums">{L_DECIDE_MOVE_DELETE_SUBFORUMS}:</label></dt>
 			<!-- IF S_FORUMS_LIST -->
-				<dd><input type="radio" class="radio" name="action_subforums" value="move" checked="checked" /> {L_MOVE_SUBFORUMS_TO} <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
+				<dd><label><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="move" checked="checked" /> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
 			<!-- ELSE -->
-				<dd><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</dd>
+				<dd><label><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</label></dd>
 			<!-- ENDIF -->
 		</dl>
 	</div>
@@ -143,36 +142,46 @@
 	</dl>
 	<dl>
 		<dt><label for="forum_name">{L_FORUM_NAME}:</label></dt>
-		<dd><input class="medium" type="text" id="forum_name" name="forum_name" value="{FORUM_NAME}" maxlength="255" /></dd>
+		<dd><input class="text medium" type="text" id="forum_name" name="forum_name" value="{FORUM_NAME}" maxlength="255" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="forum_desc">{L_FORUM_DESC}:</label><br /><span>{L_FORUM_DESC_EXPLAIN}</span></dt>
-		<dd><textarea id="forum_desc" name="forum_desc" rows="5" cols="45" maxlength="255">{FORUM_DESC}</textarea></dd>
-		<dd><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE} &nbsp; <input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES} &nbsp; <input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</dd>
+		<dd><textarea id="forum_desc" name="forum_desc" rows="5" cols="45">{FORUM_DESC}</textarea></dd>
+		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
+			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
+			<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
 	</dl>
 	<dl>
 		<dt><label for="forum_image">{L_FORUM_IMAGE}:</label><br /><span>{L_FORUM_IMAGE_EXPLAIN}</span></dt>
-		<dd><input class="medium" type="text" id="forum_image" name="forum_image" value="{FORUM_IMAGE}" maxlength="255" /></dd>
+		<dd><input class="text medium" type="text" id="forum_image" name="forum_image" value="{FORUM_IMAGE}" maxlength="255" /></dd>
 		<!-- IF FORUM_IMAGE_SRC -->
 			<dd><img src="{FORUM_IMAGE_SRC}" alt="{L_FORUM_IMAGE}" /></dd>
 		<!-- ENDIF -->
 	</dl>
 	<dl>
 		<dt><label for="forum_password">{L_FORUM_PASSWORD}:</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt>
-		<dd><input type="password" id="forum_password" name="forum_password" value="{FORUM_PASSWORD}" maxlength="40" /></dd>
+		<dd><input type="password" id="forum_password" name="forum_password" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}:</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt>
-		<dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="{FORUM_PASSWORD_CONFIRM}" /></dd>
+		<dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" /></dd>
 	</dl>
+	<!-- IF S_FORUM_PASSWORD_SET -->
+	<dl>
+		<dt><label for="forum_password_unset">{L_FORUM_PASSWORD_UNSET}:</label><br /><span>{L_FORUM_PASSWORD_UNSET_EXPLAIN}</span></dt>
+		<dd><input id="forum_password_unset" name="forum_password_unset" type="checkbox" /></dd>
+	</dl>
+	<!-- ENDIF -->
 	<dl>
 		<dt><label for="forum_style">{L_FORUM_STYLE}:</label></dt>
 		<dd><select id="forum_style" name="forum_style"><option value="0">{L_DEFAULT_STYLE}</option>{S_STYLES_OPTIONS}</select></dd>
 	</dl>
+	<!-- IF S_CAN_COPY_PERMISSIONS -->
 		<dl>
 			<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
 			<dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>
 		</dl>
+	<!-- ENDIF -->
 	</fieldset>
 
 	<div id="forum_cat_options">
@@ -180,7 +189,8 @@
 			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
 		<dl>
 			<dt><label for="display_active">{L_DISPLAY_ACTIVE_TOPICS}:</label><br /><span>{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}</span></dt>
-			<dd><input type="radio" class="radio" name="display_active" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="display_active" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><label><input type="radio" class="radio" name="display_active" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="display_active" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		</fieldset>
 	</div>
@@ -192,25 +202,35 @@
 			<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><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} &nbsp; <input type="radio" class="radio" name="display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><label><input type="radio" class="radio" name="display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
 			<dt><label for="enable_post_review">{L_ENABLE_POST_REVIEW}:</label><br /><span>{L_ENABLE_POST_REVIEW_EXPLAIN}</span></dt>
-			<dd><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} &nbsp; <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}</dd>
+			<dd><label><input type="radio" class="radio" name="enable_post_review" value="1"<!-- IF S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_post_review" value="0"<!-- IF not S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
 			<dt><label for="enable_indexing">{L_ENABLE_INDEXING}:</label><br /><span>{L_ENABLE_INDEXING_EXPLAIN}</span></dt>
-			<dd><input type="radio" class="radio" name="enable_indexing" value="1"<!-- IF S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="enable_indexing" value="0"<!-- IF not S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><label><input type="radio" class="radio" name="enable_indexing" value="1"<!-- IF S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_indexing" value="0"<!-- IF not S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
 			<dt><label for="enable_icons">{L_ENABLE_TOPIC_ICONS}:</label></dt>
-			<dd><input type="radio" class="radio" name="enable_icons" value="1"<!-- IF S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="enable_icons" value="0"<!-- IF not S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><label><input type="radio" class="radio" name="enable_icons" value="1"<!-- IF S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_icons" value="0"<!-- IF not S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
 			<dt><label for="display_recent">{L_ENABLE_RECENT}:</label><br /><span>{L_ENABLE_RECENT_EXPLAIN}</span></dt>
-			<dd><input type="radio" class="radio" name="display_recent" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="display_recent" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><label><input type="radio" class="radio" name="display_recent" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="display_recent" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
 			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}:</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
@@ -222,7 +242,8 @@
 			<legend>{L_FORUM_PRUNE_SETTINGS}</legend>
 		<dl>
 			<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}:</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt>
-			<dd><input type="radio" class="radio" name="enable_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="enable_prune" value="0"<!-- IF not S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><label><input type="radio" class="radio" name="enable_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_prune" value="0"<!-- IF not S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}:</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
@@ -238,15 +259,18 @@
 		</dl>
 		<dl>
 			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
-			<dd><input type="radio" class="radio" name="prune_old_polls" value="1"<!-- IF S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="prune_old_polls" value="0"<!-- IF not S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><label><input type="radio" class="radio" name="prune_old_polls" value="1"<!-- IF S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="prune_old_polls" value="0"<!-- IF not S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_announce">{L_PRUNE_ANNOUNCEMENTS}:</label></dt>
-			<dd><input type="radio" class="radio" name="prune_announce" value="1"<!-- IF S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="prune_announce" value="0"<!-- IF not S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><label><input type="radio" class="radio" name="prune_announce" value="1"<!-- IF S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="prune_announce" value="0"<!-- IF not S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_sticky">{L_PRUNE_STICKY}:</label></dt>
-			<dd><input type="radio" class="radio" name="prune_sticky" value="1"<!-- IF S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="prune_sticky" value="0"<!-- IF not S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><label><input type="radio" class="radio" name="prune_sticky" value="1"<!-- IF S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="prune_sticky" value="0"<!-- IF not S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		</fieldset>
 	</div>
@@ -256,15 +280,17 @@
 			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
 		<dl>
 			<dt><label for="link_display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
-			<dd><input type="radio" class="radio" name="link_display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="link_display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><label><input type="radio" class="radio" name="link_display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="link_display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
 			<dt><label for="forum_link">{L_FORUM_LINK}:</label><br /><span>{L_FORUM_LINK_EXPLAIN}</span></dt>
-			<dd><input class="medium" type="text" id="forum_link" name="forum_link" value="{FORUM_DATA_LINK}" maxlength="255" /></dd>
+			<dd><input class="text medium" type="text" id="forum_link" name="forum_link" value="{FORUM_DATA_LINK}" maxlength="255" /></dd>
 		</dl>
 		<dl>
 			<dt><label for="forum_link_track">{L_FORUM_LINK_TRACK}:</label><br /><span>{L_FORUM_LINK_TRACK_EXPLAIN}</span></dt>
-			<dd><input type="radio" class="radio" name="forum_link_track" value="1"<!-- IF S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="forum_link_track" value="0"<!-- IF not S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><label><input type="radio" class="radio" name="forum_link_track" value="1"<!-- IF S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="forum_link_track" value="0"<!-- IF not S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		</fieldset>
 	</div>
@@ -274,7 +300,7 @@
 			<legend>{L_FORUM_RULES}</legend>
 		<dl>
 			<dt><label for="forum_rules_link">{L_FORUM_RULES_LINK}:</label><br /><span>{L_FORUM_RULES_LINK_EXPLAIN}</span></dt>
-			<dd><input class="medium" type="text" id="forum_rules_link" name="forum_rules_link" value="{FORUM_RULES_LINK}" maxlength="255" /></dd>
+			<dd><input class="text medium" type="text" id="forum_rules_link" name="forum_rules_link" value="{FORUM_RULES_LINK}" maxlength="255" /></dd>
 		</dl>
 	<!-- IF FORUM_RULES_PREVIEW -->
 		<dl>
@@ -285,7 +311,9 @@
 		<dl>
 			<dt><label for="forum_rules">{L_FORUM_RULES}:</label><br /><span>{L_FORUM_RULES_EXPLAIN}</span></dt>
 			<dd><textarea id="forum_rules" name="forum_rules" rows="4" cols="70">{FORUM_RULES_PLAIN}</textarea></dd>
-			<dd><input type="checkbox" class="radio" name="rules_parse_bbcode"<!-- IF S_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE} &nbsp; <input type="checkbox" class="radio" name="rules_parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES} &nbsp; <input type="checkbox" class="radio" name="rules_parse_urls"<!-- IF S_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</dd>
+			<dd><label><input type="checkbox" class="radio" name="rules_parse_bbcode"<!-- IF S_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
+				<label><input type="checkbox" class="radio" name="rules_parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
+				<label><input type="checkbox" class="radio" name="rules_parse_urls"<!-- IF S_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
 		</dl>
 		</fieldset>
 	</div>
@@ -294,13 +322,13 @@
 		<legend>{L_SUBMIT}</legend>
 		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 <!-- ELSEIF S_DELETE_FORUM -->
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_FORUM_DELETE}</h1>
 
@@ -319,23 +347,23 @@
 		<legend>{L_FORUM_DELETE}</legend>
 	<dl>
 		<dt><label>{L_FORUM_NAME}:</label></dt>
-		<dd><b>{FORUM_NAME}</b></dd>
+		<dd><strong>{FORUM_NAME}</strong></dd>
 	</dl>
 	<!-- IF S_FORUM_POST -->
 		<dl>
 			<dt><label for="delete_action">{L_ACTION}:</label></dt>
-			<dd><input type="radio" class="radio" id="delete_action" name="action_posts" value="delete" checked="checked" /> {L_DELETE_ALL_POSTS}</dd>
+			<dd><label><input type="radio" class="radio" id="delete_action" name="action_posts" value="delete" checked="checked" /> {L_DELETE_ALL_POSTS}</label></dd>
 			<!-- IF S_MOVE_FORUM_OPTIONS -->
-				<dd><input type="radio" class="radio" name="action_posts" value="move" /> {L_MOVE_POSTS_TO} <select name="posts_to_id">{S_MOVE_FORUM_OPTIONS}</select></dd>
+				<dd><label><input type="radio" class="radio" name="action_posts" value="move" /> {L_MOVE_POSTS_TO}</label> <select name="posts_to_id">{S_MOVE_FORUM_OPTIONS}</select></dd>
 			<!-- ENDIF -->
 		</dl>
 	<!-- ENDIF -->
 	<!-- IF S_HAS_SUBFORUMS -->
 		<dl>
 			<dt><label for="sub_delete_action">{L_ACTION}:</label></dt>
-			<dd><input type="radio" class="radio" id="sub_delete_action" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</dd>
+			<dd><label><input type="radio" class="radio" id="sub_delete_action" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</label></dd>
 			<!-- IF S_FORUMS_LIST -->
-				<dd><input type="radio" class="radio" name="action_subforums" value="move" /> {L_MOVE_SUBFORUMS_TO} <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
+				<dd><label><input type="radio" class="radio" name="action_subforums" value="move" /> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
 			<!-- ENDIF -->
 		</dl>
 	<!-- ENDIF -->
@@ -343,19 +371,18 @@
 	<p class="quick">
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
 	</p>
+	{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 <!-- ELSEIF S_CONTINUE_SYNC -->
 
 	<script type="text/javascript">
-	<!--
-
+	// <![CDATA[
 		var close_waitscreen = 0;
-		window.open('{UA_PROGRESS_BAR}', '_sync', 'height=240, resizable=yes, scrollbars=no, width=400');
-
-	//-->
+		// no scrollbars...
+		popup('{UA_PROGRESS_BAR}', 400, 240, '_sync');
+	// ]]>
 	</script>
 
 	<h1>{L_FORUM_ADMIN}</h1>
@@ -367,18 +394,17 @@
 <!-- ELSE -->
 
 	<script type="text/javascript">
-	<!--
-
+	// <![CDATA[
 		/**
 		* Popup search progress bar
 		*/
 		function popup_progress_bar()
 		{
 			var close_waitscreen = 0;
-			window.open('{UA_PROGRESS_BAR}', '_sync', 'height=240, resizable=yes, scrollbars=no, width=400');
+			// no scrollbars...
+			popup('{UA_PROGRESS_BAR}', 400, 240, '_sync');
 		}
-
-	//-->
+	// ]]>
 	</script>
 
 	<h1>{L_FORUM_ADMIN}</h1>
@@ -394,9 +420,9 @@
 
 	<!-- IF S_RESYNCED -->
 		<script type="text/javascript">
-		<!--
+		// <![CDATA[
 			var close_waitscreen = 1;
-		//-->
+		// ]]>
 		</script>
 
 		<div class="successbox">
@@ -413,12 +439,12 @@
 		<tbody>
 		<!-- BEGIN forums -->
 			<tr>
-				<td style="width: 5%;">{forums.FOLDER_IMAGE}</td>
+				<td style="width: 5%; text-align: center;">{forums.FOLDER_IMAGE}</td>
 				<td>
-					<!-- IF forums.FORUM_IMAGE --><div style="float: left; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF -->
+					<!-- 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}: <b>{forums.FORUM_TOPICS}</b> / {L_POSTS}: <b>{forums.FORUM_POSTS}</b></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 -->
@@ -454,8 +480,8 @@
 		{L_SELECT_FORUM}: <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select>
 
 		<input class="button2" type="submit" value="{L_GO}" />
+		{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 	<form id="forums" method="post" action="{U_ACTION}">
@@ -465,8 +491,8 @@
 
 		<input type="text" name="forum_name" value="" maxlength="255" />
 		<input class="button2" name="addforum" type="submit" value="{L_CREATE_FORUM}" />
+		{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 <!-- ENDIF -->

phpBB/adm/style/acp_groups.html

@@ -4,7 +4,7 @@
 
 <!-- IF S_EDIT -->
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_ACP_GROUPS_MANAGE}</h1>
 
@@ -23,21 +23,23 @@
 		<legend>{L_GROUP_DETAILS}</legend>
 	<dl>
 		<dt><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}:</label></dt>
-		<dd><!-- IF S_SPECIAL_GROUP --><b>{GROUP_NAME}</b><!-- ENDIF --><input name="group_name" type="<!-- IF S_SPECIAL_GROUP -->hidden<!-- ELSE -->text<!-- ENDIF -->" id="group_name" value="{GROUP_INTERNAL_NAME}" /></dd>
+		<dd><!-- IF S_SPECIAL_GROUP --><strong>{GROUP_NAME}</strong><!-- ENDIF --><input name="group_name" type="<!-- IF S_SPECIAL_GROUP -->hidden<!-- ELSE -->text<!-- ENDIF -->" id="group_name" value="{GROUP_INTERNAL_NAME}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="group_desc">{L_GROUP_DESC}:</label></dt>
 		<dd><textarea id="group_desc" name="group_desc" rows="5" cols="45">{GROUP_DESC}</textarea></dd>
-		<dd><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE} &nbsp; <input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES} &nbsp; <input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</dd>
+		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
+			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
+			<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
 	</dl>
 	<!-- IF not S_SPECIAL_GROUP -->
 		<dl>
 			<dt><label for="group_type">{L_GROUP_TYPE}:</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
 			<dd>
-				<input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN} &nbsp;
-				<input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST} &nbsp;
-				<input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_CLOSED}"{GROUP_CLOSED} /> {L_GROUP_CLOSED} &nbsp;
-				<input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN}
+				<label><input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}</label>
+				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}</label>
+				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_CLOSED}"{GROUP_CLOSED} /> {L_GROUP_CLOSED}</label>
+				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN}</label>
 			</dd>
 		</dl>
 	<!-- ELSE -->
@@ -65,7 +67,7 @@
 		<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></dt>
+		<dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}:</label><br /><span>{L_GROUP_RECEIVE_PM_EXPLAIN}</span></dt>
 		<dd><input name="group_receive_pm" type="checkbox" class="radio" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd>
 	</dl>
 	<dl>
@@ -74,7 +76,7 @@
 	</dl>
 	<dl>
 		<dt><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
-		<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />&nbsp;&nbsp;<span>[ <a href="#" onclick="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>
@@ -87,7 +89,7 @@
 	<dl>
 		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
 		<dd>{AVATAR_IMAGE}</dd>
-		<dd><input type="checkbox" class="radio" name="delete" />&nbsp;<span>{L_DELETE_AVATAR}</span></dd>
+		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd>
 	</dl>
 	<!-- IF not S_IN_AVATAR_GALLERY -->
 		<!-- IF S_CAN_UPLOAD -->
@@ -106,7 +108,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="{GROUP_AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{GROUP_AVATAR_HEIGHT}" /> <span>px</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> 
@@ -152,13 +154,13 @@
 		<legend>{L_SUBMIT}</legend>
 		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 <!-- ELSEIF S_LIST -->
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_GROUP_MEMBERS} :: {GROUP_NAME}</h1>
 
@@ -182,7 +184,7 @@
 	</thead>
 	<tbody>
 	<tr>
-		<td class="row3" colspan="5"><b>{L_GROUP_LEAD}</b></td>
+		<td class="row3" colspan="5"><strong>{L_GROUP_LEAD}</strong></td>
 	</tr>
 	<!-- BEGIN leader -->
 		<!-- IF leader.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
@@ -198,12 +200,12 @@
 		</tr>
 	<!-- END leader -->
 	<tr>
-		<td class="row3" colspan="5"><b>{L_GROUP_APPROVED}</b></td>
+		<td class="row3" colspan="5"><strong>{L_GROUP_APPROVED}</strong></td>
 	</tr>
 	<!-- BEGIN member -->
 		<!-- IF member.S_PENDING -->
 		<tr>
-			<td class="row3" colspan="5"><b>{L_GROUP_PENDING}</b></td>
+			<td class="row3" colspan="5"><strong>{L_GROUP_PENDING}</strong></td>
 		</tr>
 		<!-- ELSE -->
 			<!-- IF member.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
@@ -241,23 +243,25 @@
 		<legend>{L_ADD_USERS}</legend>
 	<dl>
 		<dt><label for="leader">{L_USER_GROUP_LEADER}:</label></dt>
-		<dd><input name="leader" type="radio" class="radio" value="1" /> {L_YES} &nbsp; <input name="leader" type="radio" class="radio" id="leader" value="0" checked="checked" /> {L_NO}</dd>
+		<dd><label><input name="leader" type="radio" class="radio" value="1" /> {L_YES}</label>
+			<label><input name="leader" type="radio" class="radio" id="leader" value="0" checked="checked" /> {L_NO}</label></dd>
 	</dl>
 	<dl>
 		<dt><label for="default">{L_USER_GROUP_DEFAULT}:</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt>
-		<dd><input name="default" type="radio" class="radio" value="1" /> {L_YES} &nbsp; <input name="default" type="radio" class="radio" id="default" value="0" checked="checked" /> {L_NO}</dd>
+		<dd><label><input name="default" type="radio" class="radio" value="1" /> {L_YES}</label>
+			<label><input name="default" type="radio" class="radio" id="default" value="0" checked="checked" /> {L_NO}</label></dd>
 	</dl>
 	<dl>
 		<dt><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
 		<dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd>
-		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd>
+		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 	</dl>
 
 	<p class="quick">
 		<input class="button2" type="submit" name="addusers" value="{L_SUBMIT}" />
 	</p>
+	{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 <!-- ELSE -->
@@ -305,8 +309,8 @@
 			{L_CREATE_GROUP}: <input type="text" name="group_name" value="" /> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
 			<input type="hidden" name="add" value="1" />
 		<!-- ENDIF -->
+		{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 	<h1>{L_SPECIAL_GROUPS}</h1>

phpBB/adm/style/acp_icons.html

@@ -4,7 +4,66 @@
 
 <!-- IF S_EDIT -->
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<script type="text/javascript" defer="defer">
+	// <![CDATA[
+	<!-- IF S_ADD_CODE -->
+	
+			var smiley = Array();
+			<!-- BEGIN smile -->
+				smiley['{smile.SMILEY_URL}'] = Array();
+				smiley['{smile.SMILEY_URL}']['code'] = '{smile.CODE}';
+				smiley['{smile.SMILEY_URL}']['emotion'] = '{smile.EMOTION}';
+				smiley['{smile.SMILEY_URL}']['width'] = {smile.WIDTH};
+				smiley['{smile.SMILEY_URL}']['height'] = {smile.HEIGHT};
+				smiley['{smile.SMILEY_URL}']['order'] = {smile.ORDER};
+			<!-- END smile -->
+
+			function update_image(newimage)
+			{
+				var use_element = smiley[newimage];
+
+				document.getElementById('add_image_src').src = '{PHPBB_ROOT_PATH}{IMG_PATH}/' + encodeURI(newimage);
+				document.getElementById('add_code').value = use_element['code'];
+				document.getElementById('add_emotion').value = use_element['emotion'];
+				document.getElementById('add_width').value = use_element['width'];
+				document.getElementById('add_height').value = use_element['height'];
+
+				element = document.getElementById('add_order');
+				for (var i = 0; i < element.length; i++)
+				{
+					if (element.options[i].value == use_element['order'])
+					{
+						document.getElementById('add_order').options.selectedIndex = i;
+					}
+				}
+			}
+		
+	<!-- ENDIF -->
+
+	
+	function toggle_select(icon, display, select)
+	{
+		var disp = document.getElementById('order_disp_' + select);
+		var nodisp = document.getElementById('order_no_disp_' + select);
+		disp.disabled = !display;
+		nodisp.disabled = display;
+		if (display)
+		{
+			document.getElementById('order_' + select).selectedIndex = 0;
+			nodisp.className = 'disabled-options';
+			disp.className = '';
+		}
+		else
+		{
+			document.getElementById('order_' + select).selectedIndex = {S_ORDER_LIST_DISPLAY_COUNT};
+			disp.className = 'disabled-options';
+			nodisp.className = '';
+		}
+	}
+	// ]]>
+	</script>
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE}</h1>
 
@@ -20,6 +79,7 @@
 	<tr>
 		<th colspan="{COLSPAN}">{L_CONFIG}</th>
 	</tr>
+	<!-- IF .items or S_ADD_CODE -->
 	<tr class="row3">
 		<td>{L_URL}</td>
 		<td>{L_LOCATION}</td>
@@ -45,25 +105,52 @@
 		<td style="text-align: center;"><img src="{items.IMG_SRC}" alt="" title="" /><input type="hidden" name="image[{items.IMG}]" value="1" /></td>
 		<td style="vertical-align: top;">[{items.IMG}]</td>
 		<!-- IF S_SMILIES -->
-			<td><input class="post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" maxlength="50" /></td>
-			<td><input class="post" type="text" name="emotion[{items.IMG}]" value="{items.EMOTION}" size="10" maxlength="50" /></td>
+			<td><input class="text post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" maxlength="50" /></td>
+			<td><input class="text post" type="text" name="emotion[{items.IMG}]" value="{items.EMOTION}" size="10" maxlength="50" /></td>
 		<!-- ENDIF -->
-		<td><input class="post" type="text" size="3" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
-		<td><input class="post" type="text" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
+		<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} />
+			<input type="checkbox" class="radio" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} onclick="toggle_select('{items.A_IMG}', this.checked, '{items.S_ROW_COUNT}');"/>
 			<!-- IF items.S_ID -->
 				<input type="hidden" name="id[{items.IMG}]" value="{items.ID}" />
 			<!-- ENDIF -->
 		</td>
 		<!-- IF ID or S_ADD -->
-			<td><select name="order[{items.IMG}]">{S_ORDER_LIST}</select></td>
+			<td><select id="order_{items.S_ROW_COUNT}" name="order[{items.IMG}]">
+				<optgroup id="order_disp_{items.S_ROW_COUNT}" label="{L_DISPLAY_POSTING}" <!-- IF not items.POSTING_CHECKED -->disabled="disabled" class="disabled-options" <!-- ENDIF -->>{S_ORDER_LIST_DISPLAY}</optgroup>
+				<optgroup id="order_no_disp_{items.S_ROW_COUNT}" label="{L_DISPLAY_POSTING_NO}" <!-- IF  items.POSTING_CHECKED -->disabled="disabled" class="disabled-options" <!-- ENDIF -->>{S_ORDER_LIST_UNDISPLAY}</optgroup>
+			</select></td>
 		<!-- ENDIF -->	
 		<!-- IF S_ADD -->
 			<td><input type="checkbox" class="radio" name="add_img[{items.IMG}]" value="1" /></td>
 		<!-- ENDIF -->
 		</tr>
 	<!-- END items -->
+	<!-- IF S_ADD_CODE -->
+	<tr>
+		<th colspan="{COLSPAN}">{L_ADD_SMILEY_CODE}</th>
+	</tr>
+	<tr class="row1">
+		<td style="text-align: center;"><select name="add_image" id="add_image" onchange="update_image(this.options[selectedIndex].value);">{S_IMG_OPTIONS}</select></td>
+		<td style="vertical-align: top;"><img src="{IMG_SRC}" id="add_image_src" alt="" title="" /></td>
+		<td><input class="text post" type="text" name="add_code" id="add_code" value="{CODE}" size="10" maxlength="50" /></td>
+		<td><input class="text post" type="text" name="add_emotion" id="add_emotion" value="{EMOTION}" size="10" maxlength="50" /></td>
+		<td><input class="text post" type="text" size="3" name="add_width" id="add_width" value="{WIDTH}" /></td>
+		<td><input class="text post" type="text" size="3" name="add_height" id="add_height" value="{HEIGHT}" /></td>
+		<td><input type="checkbox" class="radio" name="add_display_on_posting" checked="checked" onclick="toggle_select('add', this.checked, 'add_order');"/></td>
+ 		<td><select id="add_order" name="add_order">
+				<optgroup id="order_disp[add]" label="{L_DISPLAY_POSTING}">{S_ADD_ORDER_LIST_DISPLAY}</optgroup>
+				<optgroup id="order_no_disp[add]" label="{L_DISPLAY_POSTING_NO}" disabled="disabled" class="disabled-options" >{S_ADD_ORDER_LIST_UNDISPLAY}</optgroup>
+		</select></td>
+		<td><input type="checkbox" class="radio" name="add_additional_code" value="1" /></td>
+	</tr>
+	<!-- ENDIF -->
+	<!-- ELSE -->
+	<tr class="row3">
+		<td colspan="{COLSPAN}">{L_NO_ICONS}</td>
+	</tr>
+	<!-- ENDIF -->
 	</tbody>
 	</table>
 
@@ -71,13 +158,13 @@
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 	</p>
+	{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 <!-- ELSEIF S_CHOOSE_PAK -->
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE}</h1>
 
@@ -97,15 +184,17 @@
 			<dd><select id="pak" name="pak">{S_PAK_OPTIONS}</select></dd>
 		</dl>
 			<dt><label for="current">{L_CURRENT}</label><br /><span>{L_CURRENT_EXPLAIN}</span></dt>
-			<dd><input type="radio" class="radio" id="current" name="current" value="keep" checked="checked" /> {L_KEEP_ALL}&nbsp; &nbsp;<input type="radio" class="radio" name="current" value="replace" /> {L_REPLACE_MATCHES}&nbsp; &nbsp;<input type="radio" class="radio" name="current" value="delete" /> {L_DELETE_ALL}&nbsp;</dd>
+			<dd><label><input type="radio" class="radio" id="current" name="current" value="keep" checked="checked" /> {L_KEEP_ALL}</label>
+				<label><input type="radio" class="radio" name="current" value="replace" /> {L_REPLACE_MATCHES}</label>
+				<label><input type="radio" class="radio" name="current" value="delete" /> {L_DELETE_ALL}</label></dd>
 		</dl>
 
 	<p class="quick">
 		<input class="button1" type="submit" id="import" name="import" value="{L_IMPORT_SUBMIT}" />
 	</p>
 	<!-- ENDIF -->
+	{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 <!-- ELSE -->
@@ -159,6 +248,10 @@
 				&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>
@@ -166,8 +259,8 @@
 	<p class="quick">
 		<input class="button2" name="add" type="submit" value="{L_ICON_ADD}" />&nbsp; &nbsp;<input class="button2" type="submit" name="edit" value="{L_ICON_EDIT}" />
 	</p>
+	{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 <!-- ENDIF -->

phpBB/adm/style/acp_inactive.html

@@ -61,11 +61,11 @@
 		<select name="action">{S_INACTIVE_OPTIONS}</select>
 		<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
 		<p class="small"><a href="#" onclick="marklist('inactive', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('inactive', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>		
+		{S_FORM_TOKEN}
 	</fieldset>
 
 
 
-
 </form>
 
 <!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_jabber.html

@@ -17,9 +17,13 @@
 
 <fieldset>
 	<legend>{L_ACP_JABBER_SETTINGS}</legend>
+<!-- IF S_GTALK_NOTE -->
+	<p>{L_JAB_GTALK_NOTE}</p>
+<!-- ENDIF -->
 <dl>
 	<dt><label for="jab_enable">{L_JAB_ENABLE}:</label><br /><span>{L_JAB_ENABLE_EXPLAIN}</span></dt>
-	<dd><input type="radio" class="radio" id="jab_enable" name="jab_enable" value="1"<!-- IF JAB_ENABLE --> checked="checked"<!-- ENDIF --> />&nbsp;{L_ENABLED}&nbsp; &nbsp;<input type="radio" class="radio" name="jab_enable" value="0"<!-- IF not JAB_ENABLE --> checked="checked"<!-- ENDIF --> />&nbsp;{L_DISABLED}</dd>
+	<dd><label><input type="radio" class="radio" id="jab_enable" name="jab_enable" value="1"<!-- IF JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
+		<label><input type="radio" class="radio" name="jab_enable" value="0"<!-- IF not JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
 </dl>
 <dl>
 	<dt><label for="jab_host">{L_JAB_SERVER}:</label><br /><span>{L_JAB_SERVER_EXPLAIN}</span></dt>
@@ -37,22 +41,25 @@
 	<dt><label for="jab_password">{L_JAB_PASSWORD}:</label></dt>
 	<dd><input type="password" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd>
 </dl>
+<!-- IF S_CAN_USE_SSL -->
 <dl>
-	<dt><label for="jab_resource">{L_JAB_RESOURCE}:</label><br /><span>{L_JAB_RESOURCE_EXPLAIN}</span></dt>
-	<dd><input type="text" id="jab_resource" name="jab_resource" value="{JAB_RESOURCE}" /></dd>
+	<dt><label for="jab_use_ssl">{L_JAB_USE_SSL}:</label><br /><span>{L_JAB_USE_SSL_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" id="jab_use_ssl" name="jab_use_ssl" value="1"<!-- IF JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+		<label><input type="radio" class="radio" name="jab_use_ssl" value="0"<!-- IF not JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 </dl>
+<!-- ENDIF -->
 <dl>
 	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}:</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt>
 	<dd><input type="text" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" maxlength="5" size="5" /></dd>
 </dl>
 
-<p class="submit-buttons">
-	<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-</p>
-
 </fieldset>
 
+<fieldset class="submit-buttons">
+	<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	{S_FORM_TOKEN}
+</fieldset>
 </form>
 
 <!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_language.html

@@ -4,7 +4,7 @@
 
 <!-- IF S_SELECT_METHOD -->
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_SELECT_DOWNLOAD_FORMAT}</h1>
 
@@ -26,7 +26,7 @@
 
 <!-- ELSEIF S_DETAILS -->
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_LANGUAGE_PACK_DETAILS}</h1>
 
@@ -54,8 +54,8 @@
 	<p class="quick" style="margin-top: -15px;">
 		<input type="submit" name="update_details" class="button2" value="{L_SUBMIT}" />
 	</p>
+	{S_FORM_TOKEN}
 	</fieldset>
-	
 	</form>
 
 	<br /><br />
@@ -92,7 +92,7 @@
 		<!-- END missing -->
 		</tbody>
 		</table>
-
+		<div>{S_FORM_TOKEN}</div>
 		</form>
 
 		<br /><br />
@@ -107,23 +107,25 @@
 	<form id="lang_entries" method="post" action="{U_ENTRY_ACTION}">
 
 	<!-- IF S_FROM_STORE -->
-		<fieldset class="quick" style="float: left;">
+		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
 			<input type="submit" name="remove_store" value="{L_REMOVE_FROM_STORAGE_FOLDER}" class="button2" /> 
 		</fieldset>
 	<!-- ENDIF -->
 
-	<fieldset class="quick" style="float: right;">
+	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
 		<select name="language_file">{S_LANG_OPTIONS}</select>&nbsp;<input type="submit" class="button2" name="change" value="{L_SELECT}" />
 	</fieldset>
 
-	<br /><br /><br />
+	<p>&nbsp;<br />&nbsp;</p>
+
 
-	<!-- DIRTY DIRTY DIRTY IE -->
 	<!--[if lt IE 8]>
 	<style type="text/css">
+	/* <![CDATA[ */
 		input.langvalue, textarea.langvalue {
 		width: 450px;
 		}
+	/* ]]> */
 	</style>
 	<![endif]-->
 
@@ -157,19 +159,15 @@
 		{TPL}
 	<!-- ENDIF -->
 	<tr>
-		<td class="row3" colspan="3" style="text-align: right;"><!-- IF ALLOW_UPLOAD -->&nbsp;&nbsp;{L_UPLOAD_METHOD}:&nbsp;<!-- BEGIN buttons--><input type="radio" class="radio" value="{buttons.VALUE}" name="method" />&nbsp;{buttons.VALUE}&nbsp;<!-- END buttons --><input type="submit" name="upload_file" class="button2" value="{L_SUBMIT_AND_UPLOAD}" /><!-- ENDIF --></td>
-	</tr>
-	<tr>
-		<td class="row3" colspan="3" style="text-align: right;"><input type="submit" name="download_file" class="button2" value="{L_SUBMIT_AND_DOWNLOAD}" />&nbsp;&nbsp;<input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /></td>
+		<td class="row3" colspan="3" style="text-align: right;">{S_FORM_TOKEN}<input type="submit" name="download_file" class="button2" value="{L_SUBMIT_AND_DOWNLOAD}" />&nbsp;&nbsp;<input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /></td>
 	</tr>
 	</tbody>
 	</table>
-
 	</form>
 
 <!-- ELSEIF S_UPLOAD -->
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_UPLOAD_SETTINGS}</h1>
 
@@ -201,10 +199,10 @@
 	
 	<fieldset class="quick">
 		{HIDDEN}
+		{S_FORM_TOKEN}
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
 		<input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}" />
 	</fieldset>
-
 	</form>
 
 <!-- ELSE -->

phpBB/adm/style/acp_logs.html

@@ -56,6 +56,7 @@
 <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 -->
@@ -72,14 +73,13 @@
 
 <!-- IF S_CLEARLOGS -->
 	<fieldset class="quick">
-		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />&nbsp;
-		<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" /><br />
+		<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
+		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" /><br />
 		<p class="small"><a href="#" onclick="marklist('list', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>
 	</fieldset>
 <!-- ENDIF -->
 
 
-
 </form>
 
 <!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_main.html

@@ -35,67 +35,110 @@
 	<tbody>
 	<tr>
 		<td>{L_NUMBER_POSTS}: </td>
-		<td><b>{TOTAL_POSTS}</b></td>
+		<td><strong>{TOTAL_POSTS}</strong></td>
 		<td>{L_POSTS_PER_DAY}: </td>
-		<td><b>{POSTS_PER_DAY}</b></td>
+		<td><strong>{POSTS_PER_DAY}</strong></td>
 	</tr>
 	<tr>
 		<td>{L_NUMBER_TOPICS}: </td>
-		<td><b>{TOTAL_TOPICS}</b></td>
+		<td><strong>{TOTAL_TOPICS}</strong></td>
 		<td>{L_TOPICS_PER_DAY}: </td>
-		<td><b>{TOPICS_PER_DAY}</b></td>
+		<td><strong>{TOPICS_PER_DAY}</strong></td>
 	</tr>
 	<tr>
 		<td>{L_NUMBER_USERS}: </td>
-		<td><b>{TOTAL_USERS}</b></td>
+		<td><strong>{TOTAL_USERS}</strong></td>
 		<td>{L_USERS_PER_DAY}: </td>
-		<td><b>{USERS_PER_DAY}</b></td>
+		<td><strong>{USERS_PER_DAY}</strong></td>
 	</tr>
 	<tr>
 		<td>{L_NUMBER_FILES}: </td>
-		<td><b>{TOTAL_FILES}</b></td>
+		<td><strong>{TOTAL_FILES}</strong></td>
 		<td>{L_FILES_PER_DAY}: </td>
-		<td><b>{FILES_PER_DAY}</b></td>
+		<td><strong>{FILES_PER_DAY}</strong></td>
 	</tr>
 
 
 	<tr>
 		<td>{L_BOARD_STARTED}: </td>
-		<td><b>{START_DATE}</b></td>
+		<td><strong>{START_DATE}</strong></td>
 		<td>{L_AVATAR_DIR_SIZE}: </td>
-		<td><b>{AVATAR_DIR_SIZE}</b></td>
+		<td><strong>{AVATAR_DIR_SIZE}</strong></td>
 	</tr>
 	<tr>
 		<td>{L_DATABASE_SIZE}: </td>
-		<td><b>{DBSIZE}</b></td>
+		<td><strong>{DBSIZE}</strong></td>
 		<td>{L_UPLOAD_DIR_SIZE}: </td>
-		<td><b>{UPLOAD_DIR_SIZE}</b></td>
+		<td><strong>{UPLOAD_DIR_SIZE}</strong></td>
 	</tr>
 	<tr>
 		<td>{L_DATABASE_SERVER_INFO}: </td>
-		<td><b>{DATABASE_INFO}</b></td>
+		<td><strong>{DATABASE_INFO}</strong></td>
 		<td>{L_GZIP_COMPRESSION}: </td>
-		<td><b>{GZIP_COMPRESSION}</b></td>
+		<td><strong>{GZIP_COMPRESSION}</strong></td>
 	</tr>
-	<!-- IF S_TOTAL_ORPHAN -->
 	<tr>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
+		<td>{L_BOARD_VERSION}: </td>
+		<td><strong>{BOARD_VERSION}</strong></td>
+	<!-- IF S_TOTAL_ORPHAN -->
 		<td>{L_NUMBER_ORPHAN}: </td>
-		<td><b>{TOTAL_ORPHAN}</b></td>
-	</tr>
+		<td><strong>{TOTAL_ORPHAN}</strong></td>
+	<!-- ELSE -->
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
 	<!-- ENDIF -->
+	</tr>
 	</tbody>
 	</table>
 
 	<!-- IF S_ACTION_OPTIONS -->
-		<form id="stats" method="post" action="{U_ACTION}">
-		<fieldset class="quick">
-			<select name="action">{S_ACTION_OPTIONS}</select>
+		<fieldset>
+			<legend>{L_STATISTIC_RESYNC_OPTIONS}</legend>
 
-			<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
-		</fieldset>
+			<form id="action_online_form" method="post" action="{U_ACTION}">
+				<dl>
+					<dt><label for="action_online">{L_RESET_ONLINE}</label><br /><span>&nbsp;</span></dt>
+					<dd><input type="hidden" name="action" value="online" /><input class="button2" type="submit" id="action_online" name="action_online" value="{L_RUN}" /></dd>
+				</dl>
 			</form>
+
+			<form id="action_date_form" method="post" action="{U_ACTION}">
+				<dl>
+					<dt><label for="action_date">{L_RESET_DATE}</label><br /><span>&nbsp;</span></dt>
+					<dd><input type="hidden" name="action" value="date" /><input class="button2" type="submit" id="action_date" name="action_date" value="{L_RUN}" /></dd>
+				</dl>
+			</form>
+
+			<form id="action_stats_form" method="post" action="{U_ACTION}">
+				<dl>
+					<dt><label for="action_stats">{L_RESYNC_STATS}</label><br /><span>{L_RESYNC_STATS_EXPLAIN}</span></dt>
+					<dd><input type="hidden" name="action" value="stats" /><input class="button2" type="submit" id="action_stats" name="action_stats" value="{L_RUN}" /></dd>
+				</dl>
+			</form>
+
+			<form id="action_user_form" method="post" action="{U_ACTION}">
+				<dl>
+					<dt><label for="action_user">{L_RESYNC_POSTCOUNTS}</label><br /><span>{L_RESYNC_POSTCOUNTS_EXPLAIN}</span></dt>
+					<dd><input type="hidden" name="action" value="user" /><input class="button2" type="submit" id="action_user" name="action_user" value="{L_RUN}" /></dd>
+				</dl>
+			</form>
+
+			<form id="action_db_track_form" method="post" action="{U_ACTION}">
+				<dl>
+					<dt><label for="action_db_track">{L_RESYNC_POST_MARKING}</label><br /><span>{L_RESYNC_POST_MARKING_EXPLAIN}</span></dt>
+					<dd><input type="hidden" name="action" value="db_track" /><input class="button2" type="submit" id="action_db_track" name="action_db_track" value="{L_RUN}" /></dd>
+				</dl>
+			</form>
+
+			<!-- IF S_FOUNDER -->
+			<form id="action_purge_cache_form" method="post" action="{U_ACTION}">
+				<dl>
+					<dt><label for="action_purge_cache">{L_PURGE_CACHE}</label><br /><span>{L_PURGE_CACHE_EXPLAIN}</span></dt>
+					<dd><input type="hidden" name="action" value="purge_cache" /><input class="button2" type="submit" id="action_purge_cache" name="action_purge_cache" value="{L_RUN}" /></dd>
+				</dl>
+			</form>
+			<!-- ENDIF -->
+  		</fieldset>
 	<!-- ENDIF -->
 
 	<!-- IF .log -->
@@ -103,6 +146,8 @@
 
 		<p>{L_ADMIN_LOG_INDEX_EXPLAIN}</p>
 
+		<div style="text-align: right;"><a href="{U_ADMIN_LOG}">&raquo; {L_VIEW_ADMIN_LOG}</a></div>
+
 		<table cellspacing="1">
 		<thead>
 		<tr>
@@ -126,7 +171,6 @@
 		</table>
 
 		<br />
-		<div style="text-align: right;"><a href="{U_ADMIN_LOG}">&raquo; {L_VIEW_ADMIN_LOG}</a></div>
 
 	<!-- ENDIF -->
 

phpBB/adm/style/acp_modules.html

@@ -5,8 +5,7 @@
 <!-- IF S_EDIT_MODULE -->
 
 	<script type="text/javascript">
-	<!--
-
+	// <![CDATA[
 		function display_options(value)
 		{
 			if (value == 'category')
@@ -38,7 +37,7 @@
 			var j = 0;
 <!-- BEGIN m_names -->
 		
-			if (value == '{m_names.NAME}')
+			if (value == '{m_names.A_NAME}')
 			{
 	<!-- BEGIN modes -->
 				item.options[j] = new Option('{m_names.modes.A_VALUE}');
@@ -52,10 +51,10 @@
 			item.options[0].selected = true;
 		}
 
-	//-->
+	// ]]>
 	</script>
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE} :: {MODULENAME}</h1>
 
@@ -75,7 +74,7 @@
 	<dl>
 		<dt><label for="module_langname">{L_MODULE_LANGNAME}:</label><br />
 		<span>{L_MODULE_LANGNAME_EXPLAIN}</span></dt>
-		<dd><input name="module_langname" type="text" id="module_langname" value="{MODULE_LANGNAME}" class="medium" /></dd>
+		<dd><input name="module_langname" type="text" class="text medium" id="module_langname" value="{MODULE_LANGNAME}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="module_type">{L_MODULE_TYPE}:</label></dt>
@@ -116,8 +115,8 @@
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 	</p>
+	{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 <!-- ELSE -->
@@ -147,7 +146,7 @@
 		<tbody>
 		<!-- BEGIN modules -->
 			<tr>
-				<td style="width: 5%;">{modules.MODULE_IMAGE}</td>
+				<td style="width: 5%; text-align: center;">{modules.MODULE_IMAGE}</td>
 				<td><a href="{modules.U_MODULE}">{modules.MODULE_TITLE}</a><!-- IF not modules.MODULE_DISPLAYED --> <span class="small">[{L_HIDDEN_MODULE}]</span><!-- ENDIF --></td>
 				<td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;">&nbsp;<!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->&nbsp;</td>
 				<td style="width:90px; white-space: nowrap; text-align: right; vertical-align: middle;">
@@ -177,7 +176,7 @@
 
 	<form id="quick" method="post" action="{U_ACTION}">
 
-	<fieldset class="quick" style="float: right;">
+	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
 		<input type="hidden" name="action" value="quickadd" />
 
 		<select name="quick_install">{S_INSTALL_OPTIONS}</select>
@@ -188,7 +187,7 @@
 
 	<form id="module" method="post" action="{U_ACTION}">
 
-	<fieldset class="quick" style="float: left;">
+	<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
 		<input type="hidden" name="action" value="add" />
 		<input type="hidden" name="module_parent_id" value="{PARENT_ID}" />
 
@@ -198,7 +197,7 @@
 
 	</form>
 
-	<div class="clearfix">&nbsp;</div>
+	<div class="clearfix">&nbsp;</div><br style="clear: both;" />
 	
 	<form id="mselect" method="post" action="{U_SEL_ACTION}">
 	<fieldset class="quick">

phpBB/adm/style/acp_permission_roles.html

@@ -5,7 +5,7 @@
 <!-- IF S_EDIT -->
 
 	<script type="text/javascript">
-	<!--
+	// <![CDATA[
 		var active_pmask = '0';
 		var active_fmask = '0';
 		var active_cat = '0';
@@ -17,22 +17,22 @@
 		<!-- IF S_ROLE_JS_ARRAY -->
 			{S_ROLE_JS_ARRAY}
 		<!-- ENDIF -->
-	//-->
+	// ]]>
 	</script>
 
 	<script type="text/javascript" src="style/permissions.js"></script>
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE}</h1>
 
 	<p>{L_EXPLAIN}</p>
 
-	<form id="acp_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,6 +46,7 @@
 
 	<p class="quick">
 		<input type="submit" class="button1" name="submit" value="{L_SUBMIT}" />
+		{S_FORM_TOKEN}
 	</p>
 	</fieldset>
 
@@ -57,63 +58,63 @@
 
 	<!-- ENDIF -->
 
+	<p>
+
 	<a name="acl"></a>
 
 	<a href="#maincontent">&raquo; {L_BACK_TO_TOP}</a><br />
 	<br /><br />
 
-	<h1>{L_ACL_TYPE}</h1>
+	</p>
 
-	<fieldset class="quick">
-		<a href="#" onclick="mark_options('advanced00', 'y'); init_colours('00'); return false;">{L_ALL_YES}</a> &bull; <a href="#" onclick="mark_options('advanced00', 'n'); init_colours('00'); return false;">{L_ALL_NEVER}</a> &bull; <a href="#" onclick="mark_options('advanced00', 'u'); init_colours('00'); return false;">{L_ALL_NO}</a>
-	</fieldset>
+	<h1>{L_ACL_TYPE}</h1>
 
 	<fieldset class="perm nolegend">
 
 		<div id="advanced00">
-			<div class="perm_cat">
+			<div class="permissions-category">
 				<ul>
 				<!-- BEGIN auth -->
 					<!-- IF auth.S_YES -->
-						<li class="perm_preset_yes<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
+						<li class="permissions-preset-yes<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
 					<!-- ELSEIF auth.S_NEVER -->
-						<li class="perm_preset_never<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
+						<li class="permissions-preset-never<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
 					<!-- ELSEIF auth.S_NO -->
-						<li class="perm_preset_no<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
+						<li class="permissions-preset-no<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
 					<!-- ELSE -->
-						<li class="perm_preset_custom<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
+						<li class="permissions-preset-custom<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
 					<!-- ENDIF -->
 						<a href="#" onclick="swap_options('0','0','{auth.S_ROW_COUNT}'); return false;"><span class="tabbg"><span class="colour"></span>{auth.CAT_NAME}</span></a></li>	
 				<!-- END auth -->
 				</ul>
 			</div>
 			<!-- BEGIN auth -->
-			<div class="perm_panel" id="options00{auth.S_ROW_COUNT}"<!-- IF auth.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
+			<div class="permissions-panel" id="options00{auth.S_ROW_COUNT}"<!-- IF auth.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
 				<span class="corners-top"><span></span></span>
 				<div class="tablewrap">
 					<table id="table00{auth.S_ROW_COUNT}" cellspacing="1">
 					<colgroup>
-						<col class="permissions_name" />
-						<col class="permissions_yes" />
-						<col class="permissions_no" />
-						<col class="permissions_never" />
+						<col class="permissions-name" />
+						<col class="permissions-yes" />
+						<col class="permissions-no" />
+						<col class="permissions-never" />
 					</colgroup>
 					<thead>
 					<tr>
 						<th class="name" scope="col"><strong>{L_ACL_SETTING}</strong></th>
-						<th class="value" scope="col"><a href="#" onclick="mark_options('options00{auth.S_ROW_COUNT}', 'y'); set_colours('00{auth.S_ROW_COUNT}', false, 'yes'); return false;">{L_ACL_YES}</a></th>
-						<th class="value" scope="col"><a href="#" onclick="mark_options('options00{auth.S_ROW_COUNT}', 'u'); set_colours('00{auth.S_ROW_COUNT}', false, 'no'); return false;">{L_ACL_NO}</a></th>
-						<th class="value" scope="col"><a href="#" onclick="mark_options('options00{auth.S_ROW_COUNT}', 'n'); set_colours('00{auth.S_ROW_COUNT}', false, 'never'); return false;">{L_ACL_NEVER}</a></th>
+						<th class="value permissions-yes" scope="col"><a href="#" onclick="mark_options('options00{auth.S_ROW_COUNT}', 'y'); set_colours('00{auth.S_ROW_COUNT}', false, 'yes'); return false;">{L_ACL_YES}</a></th>
+						<th class="value permissions-no" scope="col"><a href="#" onclick="mark_options('options00{auth.S_ROW_COUNT}', 'u'); set_colours('00{auth.S_ROW_COUNT}', false, 'no'); return false;">{L_ACL_NO}</a></th>
+						<th class="value permissions-never" scope="col"><a href="#" onclick="mark_options('options00{auth.S_ROW_COUNT}', 'n'); set_colours('00{auth.S_ROW_COUNT}', false, 'never'); return false;">{L_ACL_NEVER}</a></th>
 					</tr>
 					</thead>
 					<tbody>
 					<!-- BEGIN mask -->
 						<!-- IF auth.mask.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
-						<th class="permission_name<!-- IF auth.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->">{auth.mask.PERMISSION}</th>
+						<th class="permissions-name<!-- IF auth.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->">{auth.mask.PERMISSION}</th>
 							
-						<td><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><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><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>
+						<td class="permissions-yes"><label for="setting_{auth.mask.FIELD_NAME}_y"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_y" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></label></td>
+						<td class="permissions-no"><label for="setting_{auth.mask.FIELD_NAME}_u"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_u" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NO --> checked="checked"<!-- ENDIF --> value="-1" /></label></td>
+						<td class="permissions-never"><label for="setting_{auth.mask.FIELD_NAME}_n"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_n" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NEVER --> checked="checked"<!-- ENDIF --> value="0" /></label></td>
 					</tr>
 					<!-- END mask -->
 					</tbody>
@@ -128,8 +129,8 @@
 
 	<fieldset class="quick">
 		<input type="submit" class="button1" name="submit" value="{L_SUBMIT}" />
+		{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 	<a href="#maincontent">&raquo; {L_BACK_TO_TOP}</a><br />
@@ -154,7 +155,7 @@
 	<tbody>
 	<!-- BEGIN roles -->
 	<tr>
-		<td style="vertical-align: top;"><b>{roles.ROLE_NAME}</b>
+		<td style="vertical-align: top;"><strong>{roles.ROLE_NAME}</strong>
 			<!-- IF roles.ROLE_DESCRIPTION --><br /><span>{roles.ROLE_DESCRIPTION}</span><!-- ENDIF -->
 		</td>
 		<td style="width: 30%; text-align: center; vertical-align: top; white-space: nowrap;"><!-- IF roles.U_DISPLAY_ITEMS --><a href="{roles.U_DISPLAY_ITEMS}">{L_VIEW_ASSIGNED_ITEMS}</a><!-- ELSE -->{L_VIEW_ASSIGNED_ITEMS}<!-- ENDIF --></td>
@@ -182,8 +183,8 @@
 
 	<fieldset class="quick">
 		{L_CREATE_ROLE}: <input type="text" name="role_name" value="" maxlength="255" /><!-- IF S_ROLE_OPTIONS --> <select name="options_from"><option value="0" selected="selected">{L_CREATE_ROLE_FROM}</option>{S_ROLE_OPTIONS}</select><!-- ENDIF --> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" /><br />
+		{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 	<!-- IF S_DISPLAY_ROLE_MASK -->

phpBB/adm/style/acp_permissions.html

@@ -17,7 +17,7 @@
 	<p>{L_EXPLAIN}</p>
 	
 	<!-- IF S_FORUM_NAMES -->
-		<p><b>{L_FORUMS}:</b> {FORUM_NAMES}</p>
+		<p><strong>{L_FORUMS}:</strong> {FORUM_NAMES}</p>
 	<!-- ENDIF -->
 
 	<!-- IF S_SELECT_FORUM -->
@@ -30,15 +30,16 @@
 		<dl>
 			<dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt>
 			<dd><select id="forum" name="forum_id[]"<!-- IF S_FORUM_MULTIPLE --> multiple="multiple"<!-- ENDIF --> size="10">{S_FORUM_OPTIONS}</select></dd>
-			<!-- IF S_FORUM_ALL --><dd><input type="checkbox" class="radio" name="all_forums" value="1" />&nbsp; {L_ALL_FORUMS}</dd><!-- ENDIF -->
+			<!-- IF S_FORUM_ALL --><dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd><!-- ENDIF -->
 		</dl>
-		</fieldset>
 
-		<fieldset class="quick">
+		<p class="quick">
 			{S_HIDDEN_FIELDS}
+			{S_FORM_TOKEN}
 			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-		</fieldset>
+		</p>
 
+		</fieldset>
 		</form>
 
 		<!-- IF S_FORUM_MULTIPLE -->
@@ -52,13 +53,14 @@
 				<dt><label for="sforum">{L_LOOK_UP_FORUM}:</label></dt>
 				<dd><select id="sforum" name="subforum_id">{S_SUBFORUM_OPTIONS}</select></dd>
 			</dl>
-			</fieldset>
 
-			<fieldset class="quick">
+			<p class="quick">
 				{S_HIDDEN_FIELDS}
+				{S_FORM_TOKEN}
 				<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-			</fieldset>
+			</p>
 
+			</fieldset>
 			</form>
 			
 		<!-- ENDIF -->
@@ -71,17 +73,17 @@
 			<legend>{L_LOOK_UP_USER}</legend>
 		<dl>
 			<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
-			<dd><input class="medium" type="text" id="username" name="username[]" /></dd>
-			<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd>
-			<dd class="full" style="text-align: left;"><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> &nbsp;{L_SELECT_ANONYMOUS}</dd>
+			<dd><input class="text medium" type="text" id="username" name="username[]" /></dd>
+			<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+			<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
 		</dl>
-		</fieldset>
 
-		<fieldset class="quick">
+		<p class="quick">
 			{S_HIDDEN_FIELDS}
+			{S_FORM_TOKEN}
 			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+		</p>
 		</fieldset>
-
 		</form>
 
 	<!-- ELSEIF S_SELECT_GROUP and S_CAN_SELECT_GROUP -->
@@ -94,18 +96,19 @@
 			<dt><label for="group">{L_LOOK_UP_GROUP}:</label></dt>
 			<dd><select name="group_id[]" id="group">{S_GROUP_OPTIONS}</select></dd>
 		</dl>
-		</fieldset>
 
-		<fieldset class="quick">
+		<p class="quick">
 			{S_HIDDEN_FIELDS}
+			{S_FORM_TOKEN}
 			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-		</fieldset>
+		</p>
 
+		</fieldset>
 		</form>
 
 		<!-- ELSEIF S_SELECT_USERGROUP -->
 
-		<div style="float: left; width: 48%;">
+		<div style="float: {S_CONTENT_FLOW_BEGIN}; width: 48%;">
 
 		<!-- IF S_CAN_SELECT_USER -->
 
@@ -117,15 +120,15 @@
 				<legend>{L_MANAGE_USERS}</legend>
 			<dl>
 				<dd class="full"><select style="width: 100%;" name="user_id[]" multiple="multiple" size="5">{S_DEFINED_USER_OPTIONS}</select></dd>
-				<!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><input type="checkbox" class="radio" name="all_users" value="1" />&nbsp; {L_ALL_USERS}</dd><!-- ENDIF -->
+				<!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_users" value="1" /> {L_ALL_USERS}</label></dd><!-- ENDIF -->
 			</dl>
 			</fieldset>
 			
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
+				{S_FORM_TOKEN}
 				<input type="submit" class="button2" name="action[delete]" value="{L_REMOVE_PERMISSIONS}" style="width: 46% !important;" /> &nbsp; <input class="button1" type="submit" name="submit_edit_options" value="{L_EDIT_PERMISSIONS}" style="width: 46% !important;" />
 			</fieldset>
-			
 			</form>
 
 			<form id="add_user" method="post" action="{U_ACTION}">
@@ -135,22 +138,22 @@
 				<p>{L_USERNAMES_EXPLAIN}</p>
 			<dl>
 				<dd class="full"><textarea id="username" name="usernames" rows="5" cols="5" style="width: 100%; height: 60px;"></textarea></dd>
-				<dd class="full" style="text-align: left;"><div style="float: right;">[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</div><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> &nbsp;{L_SELECT_ANONYMOUS}</dd>
+				<dd class="full" style="text-align: left;"><div style="float: {S_CONTENT_FLOW_END};">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</div><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
 			</dl>
 			</fieldset>
 
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
+				{S_FORM_TOKEN}
 				<input class="button1" type="submit" name="submit_add_options" value="{L_ADD_PERMISSIONS}" />
 			</fieldset>
-			
 			</form>
 
 		<!-- ENDIF -->
 
 		</div>
 
-		<div style="float: right; width: 48%">
+		<div style="float: {S_CONTENT_FLOW_END}; width: 48%">
 			
 		<!-- IF S_CAN_SELECT_GROUP -->
 
@@ -162,15 +165,15 @@
 				<legend>{L_MANAGE_GROUPS}</legend>
 			<dl>
 				<dd class="full"><select style="width: 100%;" name="group_id[]" multiple="multiple" size="5">{S_DEFINED_GROUP_OPTIONS}</select></dd>
-				<!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><input type="checkbox" class="radio" name="all_groups" value="1" />&nbsp; {L_ALL_GROUPS}</dd><!-- ENDIF -->
+				<!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_groups" value="1" /> {L_ALL_GROUPS}</label></dd><!-- ENDIF -->
 			</dl>
 			</fieldset>
 			
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
+				{S_FORM_TOKEN}
 				<input class="button2" type="submit" name="action[delete]" value="{L_REMOVE_PERMISSIONS}" style="width: 46% !important;" /> &nbsp; <input class="button1" type="submit" name="submit_edit_options" value="{L_EDIT_PERMISSIONS}" style="width: 46% !important;" />
 			</fieldset>
-			
 			</form>
 
 			<form id="add_groups" method="post" action="{U_ACTION}">
@@ -184,9 +187,9 @@
 
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
+				{S_FORM_TOKEN}
 				<input type="submit" class="button1" name="submit_add_options" value="{L_ADD_PERMISSIONS}" />
 			</fieldset>
-			
 			</form>
 
 		<!-- ENDIF -->
@@ -195,7 +198,7 @@
 
 	<!-- ELSEIF S_SELECT_USERGROUP_VIEW -->
 
-		<div style="float: left; width: 48%;">
+		<div style="float: {S_CONTENT_FLOW_BEGIN}; width: 48%;">
 		
 			<h1>{L_USERS}</h1>
 
@@ -210,9 +213,9 @@
 			
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
+				{S_FORM_TOKEN}
 				<input class="button1" type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" />
 			</fieldset>
-			
 			</form>
 
 			<form id="add_user" method="post" action="{U_ACTION}">
@@ -222,21 +225,21 @@
 			<dl>
 				<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
 				<dd><input type="text" id="username" name="username[]" /></dd>
-				<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd>
-				<dd class="full" style="text-align: left;"><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> &nbsp;{L_SELECT_ANONYMOUS}</dd>
+				<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+				<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
 			</dl>
 			</fieldset>
 
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
+				{S_FORM_TOKEN}
 				<input type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" class="button1" />
 			</fieldset>
-
 			</form>
 
 		</div>
 
-		<div style="float: right; width: 48%">
+		<div style="float: {S_CONTENT_FLOW_END}; width: 48%">
 			
 			<h1>{L_USERGROUPS}</h1>
 
@@ -251,9 +254,9 @@
 			
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
+				{S_FORM_TOKEN}
 				<input class="button1" type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" />
 			</fieldset>
-			
 			</form>
 
 			<form id="group" method="post" action="{U_ACTION}">
@@ -269,9 +272,9 @@
 
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
+				{S_FORM_TOKEN}
 				<input type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" class="button1" />
 			</fieldset>
-
 			</form>
 
 		</div>
@@ -287,7 +290,7 @@
 	<p>{L_ACL_VIEW_EXPLAIN}</p>
 
 	<fieldset class="quick">
-		<b>&raquo; {L_PERMISSION_TYPE}</b>
+		<strong>&raquo; {L_PERMISSION_TYPE}</strong>
 	</fieldset>
 
 	<!-- INCLUDE permission_mask.html -->
@@ -302,20 +305,20 @@
 
 	<br />
 
-	<fieldset class="quick" style="float: right;">
-		<b>&raquo; {L_PERMISSION_TYPE}</b>
+	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
+		<strong>&raquo; {L_PERMISSION_TYPE}</strong>
 	</fieldset>
 
 	<!-- IF S_PERMISSION_DROPDOWN -->
 		<form id="pselect" method="post" action="{U_ACTION}">
 	
-		<fieldset class="quick" style="float: left;">
+		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
 			{S_HIDDEN_FIELDS}
+			{S_FORM_TOKEN}
 			{L_SELECT_TYPE}: <select name="type">{S_PERMISSION_DROPDOWN}</select> 
 
 			<input class="button2" type="submit" name="submit" value="{L_GO}" />
 		</fieldset>
-	
 		</form>
 	<!-- ENDIF -->
 
@@ -324,12 +327,12 @@
 	<!-- include tooltip file -->
 	<script type="text/javascript" src="style/tooltip.js"></script>
 	<script type="text/javascript">
-	<!--
-		window.onload = function(){enable_tooltips_select('set_permissions', '{LA_ROLE_DESCRIPTION}', 'role')};
-	//-->
+	// <![CDATA[
+		window.onload = function(){enable_tooltips_select('set-permissions', '{LA_ROLE_DESCRIPTION}', 'role')};
+	// ]]>
 	</script>
 
-	<form id="set_permissions" method="post" action="{U_ACTION}">
+	<form id="set-permissions" method="post" action="{U_ACTION}">
 
 	{S_HIDDEN_FIELDS}
 
@@ -337,9 +340,10 @@
 
 	<br /><br />
 
-	<fieldset class="quick" style="float: right;">
+	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
 		<input class="button1" type="submit" name="action[apply_all_permissions]" value="{L_APPLY_ALL_PERMISSIONS}" />
-		<input class="button2" type="button" name="cancel" value="{L_RESET}" onclick="document.forms['set_permissions'].reset(); init_colours(active_pmask + active_fmask);" />
+		<input class="button2" type="button" name="cancel" value="{L_RESET}" onclick="document.forms['set-permissions'].reset(); init_colours(active_pmask + active_fmask);" />
+		{S_FORM_TOKEN}
 	</fieldset>
 
 	<br /><br />

phpBB/adm/style/acp_php_info.html

@@ -6,7 +6,7 @@
 
 <p>{L_ACP_PHP_INFO_EXPLAIN}</p>
 
-<div style="overflow: auto; width: 99%;">
+<div class="phpinfo">
 	{PHPINFO}
 </div>
 

phpBB/adm/style/acp_profile.html

@@ -4,7 +4,7 @@
 
 <!-- IF S_EDIT -->
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE}</h1>
 
@@ -25,7 +25,7 @@
 			<legend>{L_TITLE}</legend>
 		<dl>
 			<dt><label>{L_FIELD_TYPE}:</label><br /><span>{L_FIELD_TYPE_EXPLAIN}</span></dt>
-			<dd><b>{FIELD_TYPE}</b></dd>
+			<dd><strong>{FIELD_TYPE}</strong></dd>
 		</dl>
 		<!-- IF S_EDIT_MODE -->
 		<dl>
@@ -35,12 +35,13 @@
 		<!-- ELSE -->
 		<dl>
 			<dt><label for="field_ident">{L_FIELD_IDENT}:</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
-			<dd><input class="medium" type="text" id="field_ident" name="field_ident" value="{FIELD_IDENT}" /></dd>
+			<dd><input class="text medium" type="text" id="field_ident" name="field_ident" value="{FIELD_IDENT}" /></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
 			<dt><label for="field_no_view">{L_DISPLAY_PROFILE_FIELD}:</label><br /><span>{L_DISPLAY_PROFILE_FIELD_EXPLAIN}</span></dt>
-			<dd><input type="radio" class="radio" id="field_no_view" name="field_no_view" value="0"<!-- IF not S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_YES} <input type="radio" class="radio" name="field_no_view" value="1"<!-- IF S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+			<dd><label><input type="radio" class="radio" id="field_no_view" name="field_no_view" value="0"<!-- IF not S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="field_no_view" value="1"<!-- IF S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		</fieldset>
 
@@ -74,7 +75,7 @@
 			<legend>{L_LANG_SPECIFIC}</legend>
 		<dl>
 			<dt><label for="lang_name">{L_USER_FIELD_NAME}:</label></dt>
-			<dd><input class="medium" type="text" id="lang_name" name="lang_name" value="{LANG_NAME}" /></dd>
+			<dd><input class="text medium" type="text" id="lang_name" name="lang_name" value="{LANG_NAME}" /></dd>
 		</dl>
 		<dl>
 			<dt><label for="lang_explain">{L_FIELD_DESCRIPTION}:</label><br /><span>{L_FIELD_DESCRIPTION_EXPLAIN}</span></dt>
@@ -83,7 +84,7 @@
 		<!-- IF S_TEXT or S_STRING -->
 			<dl>
 				<dt><label for="lang_default_value">{L_DEFAULT_VALUE}:</label><br /><span>{L_DEFAULT_VALUE_EXPLAIN}</span></dt>
-				<dd><!-- IF S_STRING --><input class="medium" type="text" id="lang_default_value" name="lang_default_value" value="{LANG_DEFAULT_VALUE}" /><!-- ELSE --><textarea id="lang_default_value" name="lang_default_value" rows="5" cols="80">{LANG_DEFAULT_VALUE}</textarea><!-- ENDIF --></dd>
+				<dd><!-- IF S_STRING --><input class="text medium" type="text" id="lang_default_value" name="lang_default_value" value="{LANG_DEFAULT_VALUE}" /><!-- ELSE --><textarea id="lang_default_value" name="lang_default_value" rows="5" cols="80">{LANG_DEFAULT_VALUE}</textarea><!-- ENDIF --></dd>
 			</dl>
 		<!-- ENDIF -->
 		<!-- IF S_BOOL or S_DROPDOWN -->
@@ -107,6 +108,7 @@
 
 		<fieldset class="quick">
 			{S_HIDDEN_FIELDS}
+			{S_FORM_TOKEN}
 			<input class="button1" type="submit" name="next" value="{L_PROFILE_TYPE_OPTIONS}" />
 		</fieldset>
 
@@ -122,13 +124,14 @@
 		<!-- END option -->
 		</fieldset>
 
-		<fieldset class="quick" style="float: left;">
+		<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: right">
+		<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
 			{S_HIDDEN_FIELDS}
-			<input class="button1" type="submit" name="next" value="{L_NEXT}" />
+			{S_FORM_TOKEN}
+			<input class="button1" type="submit" name="next" value="{L_NEXT_STEP}" />
 		</fieldset>
 
 	<!-- ELSEIF S_STEP_THREE -->
@@ -145,13 +148,14 @@
 			</fieldset>
 		<!-- END options -->
 
-		<fieldset class="quick" style="float: left;">
+		<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: right;">
+		<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 -->
@@ -212,11 +216,11 @@
 	<form id="profile_fields" method="post" action="{U_ACTION}">
 	
 	<fieldset class="quick">
-		<input class="small" type="text" name="field_ident" /> <select name="field_type">{S_TYPE_OPTIONS}</select>
+		<input class="text small" type="text" name="field_ident" /> <select name="field_type">{S_TYPE_OPTIONS}</select>
 		<input class="button1" type="submit" name="submit" value="{L_CREATE_NEW_FIELD}" />
 		<input type="hidden" name="create" value="1" />
+		{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 <!-- ENDIF -->

phpBB/adm/style/acp_prune_forums.html

@@ -41,8 +41,11 @@
 	
 	<fieldset>
 		<legend>{L_SELECT_FORUM}</legend>
+		<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
 	<dl>
-		<dd class="full"><select name="f[]" multiple="multiple" size="5">{S_FORUM_OPTIONS}</select></dd>
+		<dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt>
+		<dd><select id="forum" name="f[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
+		<dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd>
 	</dl>
 	
 	<p class="quick">
@@ -54,7 +57,7 @@
 
 <!-- ELSE -->
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_ACP_PRUNE_FORUMS}</h1>
 
@@ -78,24 +81,26 @@
 	</dl>
 	<dl>
 		<dt><label for="polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
-		<dd><input type="radio" class="radio" name="prune_old_polls" value="1" /> {L_YES} &nbsp; <input type="radio" class="radio" id="polls" name="prune_old_polls" value="0" checked="checked" /> {L_NO}</dd>
+		<dd><label><input type="radio" class="radio" name="prune_old_polls" value="1" /> {L_YES}</label>
+			<label><input type="radio" class="radio" id="polls" name="prune_old_polls" value="0" checked="checked" /> {L_NO}</label></dd>
 	</dl>
 	<dl>
 		<dt><label for="announce">{L_PRUNE_ANNOUNCEMENTS}:</label></dt>
-		<dd><input type="radio" class="radio" name="prune_announce" value="1" /> {L_YES} &nbsp; <input type="radio" class="radio" id="announce" name="prune_announce" value="0" checked="checked" /> {L_NO}</dd>
+		<dd><label><input type="radio" class="radio" name="prune_announce" value="1" /> {L_YES}</label>
+			<label><input type="radio" class="radio" id="announce" name="prune_announce" value="0" checked="checked" /> {L_NO}</label></dd>
 	</dl>
 	<dl>
 		<dt><label for="sticky">{L_PRUNE_STICKY}:</label></dt>
-		<dd><input type="radio" class="radio" name="prune_sticky" value="1" /> {L_YES} &nbsp; <input type="radio" class="radio" id="sticky" name="prune_sticky" value="0" checked="checked" /> {L_NO}</dd>
+		<dd><label><input type="radio" class="radio" name="prune_sticky" value="1" /> {L_YES}</label>
+			<label><input type="radio" class="radio" id="sticky" name="prune_sticky" value="0" checked="checked" /> {L_NO}</label></dd>
 	</dl>
 	
 	<p class="quick">
 		{S_HIDDEN_FIELDS}
-
+		{S_FORM_TOKEN}
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
 	</p>
 	</fieldset>
-
 	</form>
 
 <!-- ENDIF -->

phpBB/adm/style/acp_prune_users.html

@@ -33,15 +33,17 @@
 <dl>
 	<dt><label for="users">{L_ACP_PRUNE_USERS}:</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt>
 	<dd><textarea id="users" name="users" cols="40" rows="5"></textarea></dd>
-	<dd>[ <a href="#" onclick="window.open('{U_FIND_USER}', '_phpbbsearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a> ]</dd>
+	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 </dl>
 <dl>
 	<dt><label for="deleteposts">{L_DELETE_USER_POSTS}:</label><br /><span>{L_DELETE_USER_POSTS_EXPLAIN}</span></dt>
-	<dd><input type="radio" class="radio" name="deleteposts" value="1" /> {L_YES}&nbsp;&nbsp;<input type="radio" class="radio" id="deleteposts" name="deleteposts" value="0" checked="checked" /> {L_NO}</dd>
+	<dd><label><input type="radio" class="radio" name="deleteposts" value="1" /> {L_YES}</label>
+		<label><input type="radio" class="radio" id="deleteposts" name="deleteposts" value="0" checked="checked" /> {L_NO}</label></dd>
 </dl>
 <dl>
 	<dt><label for="deactivate">{L_DEACTIVATE_DELETE}:</label><br /><span>{L_DEACTIVATE_DELETE_EXPLAIN}</span></dt>
-	<dd><input type="radio" class="radio" name="action" value="delete" /> {L_DELETE_USERS}&nbsp;&nbsp;<input type="radio" class="radio" id="deactivate" name="action" value="deactivate" checked="checked" /> {L_DEACTIVATE}</dd>
+	<dd><label><input type="radio" class="radio" name="action" value="delete" /> {L_DELETE_USERS}</label>
+		<label><input type="radio" class="radio" id="deactivate" name="action" value="deactivate" checked="checked" /> {L_DEACTIVATE}</label></dd>
 </dl>
 
 <p class="submit-buttons">
@@ -49,9 +51,9 @@
 
 	<input class="button1" type="submit" id="update" name="update" value="{L_SUBMIT}" />&nbsp;
 	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	{S_FORM_TOKEN}
 </p>
 </fieldset>
-
 </form>
 
 <!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_ranks.html

@@ -4,16 +4,16 @@
 
 <!-- IF S_EDIT -->
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<script type="text/javascript">
-	<!--
+	// <![CDATA[
 		function update_image(newimage)
 		{
-			document.getElementById('image').src = (newimage) ? "{RANKS_PATH}/" + newimage : "./images/spacer.gif";
+			document.getElementById('image').src = (newimage) ? "{RANKS_PATH}/" + encodeURI(newimage) : "./images/spacer.gif";
 		}
 
-	//-->
+	// ]]>
 	</script>
 
 	<h1>{L_ACP_MANAGE_RANKS}</h1>
@@ -35,7 +35,8 @@
 	</dl>
 	<dl>
 		<dt><label for="special_rank">{L_RANK_SPECIAL}:</label></dt>
-		<dd><input onchange="dE('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> />{L_YES} &nbsp;&nbsp;<input onchange="dE('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+		<dd><label><input onchange="dE('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
+			<label><input onchange="dE('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<!-- IF S_SPECIAL_RANK --><div id="posts" style="display: none;"><!-- ELSE --><div id="posts"><!-- ENDIF -->
 	<dl>
@@ -49,9 +50,9 @@
 
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
 	</p>
 	</fieldset>
-
 	</form>
 
 <!-- ELSE -->
@@ -87,9 +88,9 @@
 
 	<p class="quick">
 		<input class="button2" name="add" type="submit" value="{L_ADD_RANK}" />
+		{S_FORM_TOKEN}
 	</p>
 	</fieldset>
-
 	</form>
 
 <!-- ENDIF -->

phpBB/adm/style/acp_reasons.html

@@ -4,7 +4,7 @@
 
 <!-- IF S_EDIT_REASON -->
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE}</h1>
 
@@ -40,7 +40,7 @@
 	<!-- ENDIF -->
 	<dl>
 		<dt><label for="reason_description">{L_REASON_DESCRIPTION}:</label></dt>
-		<dd><textarea name="reason_description" id="reason_description" rows="8">{REASON_DESCRIPTION}</textarea></dd>
+		<dd><textarea name="reason_description" id="reason_description" rows="8" cols="80">{REASON_DESCRIPTION}</textarea></dd>
 	</dl>
 	<!-- IF S_TRANSLATED -->
 	<dl>
@@ -52,9 +52,9 @@
 	<p class="submit-buttons">
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
 	</p>
 	</fieldset>
-
 	</form>
 
 <!-- ELSE -->
@@ -81,7 +81,7 @@
 		<!-- BEGIN reasons -->
 			<tr>
 				<td>
-					<i style="float: right; font-size: .9em;"><!-- IF reasons.S_TRANSLATED -->{L_IS_TRANSLATED}<!-- ELSE -->{L_IS_NOT_TRANSLATED}<!-- ENDIF --></i>
+					<i style="float: {S_CONTENT_FLOW_END}; font-size: .9em;"><!-- IF reasons.S_TRANSLATED -->{L_IS_TRANSLATED}<!-- ELSE -->{L_IS_NOT_TRANSLATED}<!-- ENDIF --></i>
 					<strong>{reasons.REASON_TITLE}<!-- IF reasons.S_OTHER_REASON --> *<!-- ENDIF --></strong>
 					<br /><span>{reasons.REASON_DESCRIPTION}</span>
 				</td>
@@ -116,6 +116,7 @@
 
 		<input type="text" name="reason_title" /> 
 		<input class="button2" name="addreason" type="submit" value="{L_ADD_NEW_REASON}" />
+		{S_FORM_TOKEN}
 	</p>
 	</fieldset>
 	

phpBB/adm/style/acp_search.html

@@ -13,7 +13,8 @@
 		<legend>{L_GENERAL_SEARCH_SETTINGS}</legend>
 	<dl>
 		<dt><label for="load_search">{L_YES_SEARCH}:</label><br /><span>{L_YES_SEARCH_EXPLAIN}</span></dt>
-		<dd><input type="radio" class="radio" id="load_search" name="config[load_search]" value="1"<!-- IF S_YES_SEARCH --> checked="checked"<!-- ENDIF --> />&nbsp;{L_YES}&nbsp;&nbsp;<input type="radio" class="radio" name="config[load_search]" value="0"<!-- IF not S_YES_SEARCH --> checked="checked"<!-- ENDIF --> />&nbsp;{L_NO}</dd>
+		<dd><label><input type="radio" class="radio" id="load_search" name="config[load_search]" value="1"<!-- IF S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="config[load_search]" value="0"<!-- IF not S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl>
 		<dt><label for="search_interval">{L_SEARCH_INTERVAL}:</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt>
@@ -58,36 +59,43 @@
 		<legend>{L_SUBMIT}</legend>
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 <!-- ELSEIF S_INDEX -->
 
 	<script type="text/javascript">
-	<!--
-
+	// <![CDATA[
 		/**
 		* Popup search progress bar
 		*/
 		function popup_progress_bar(progress_type)
 		{
 			close_waitscreen = 0;
-			window.open('{UA_PROGRESS_BAR}&type=' + progress_type, '_index', 'HEIGHT=240,resizable=yes,scrollbars=no,WIDTH=400');
+			// no scrollbars
+			popup('{UA_PROGRESS_BAR}&amp;type=' + progress_type, 400, 240, '_index');
 		}
-	//-->
+	// ]]>
 	</script>
 
 	<h1>{L_ACP_SEARCH_INDEX}</h1>
 
-	<p>{L_ACP_SEARCH_INDEX_EXPLAIN}</p>
-
 	<!-- IF S_CONTINUE_INDEXING -->
-		<a href="{U_CONTINUE_INDEXING}" onclick="popup_progress_bar('{S_CONTINUE_INDEXING}');">{L_CONTINUE}</a>
-
 		<p>{L_CONTINUE_EXPLAIN}</p>
+
+		<form id="acp_search_continue" method="post" action="{U_CONTINUE_INDEXING}">
+			<fieldset class="submit-buttons">
+				<legend>{L_SUBMIT}</legend>
+				<input class="button1" type="submit" id="continue" name="continue" value="{L_CONTINUE}" onclick="popup_progress_bar('{S_CONTINUE_INDEXING}');" />&nbsp;
+				<input class="button2" type="submit" id="cancel" name="cancel" value="{L_CANCEL}" />
+				{S_FORM_TOKEN}
+			</fieldset>
+		</form>
 	<!-- ELSE -->
 
+		<p>{L_ACP_SEARCH_INDEX_EXPLAIN}</p>
+
 		<!-- BEGIN backend -->
 
 			<!-- IF backend.S_STATS -->
@@ -132,6 +140,7 @@
 				<input class="button2" type="submit" name="action[create]" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');" />
 			<!-- ENDIF -->
 			</p>
+			{S_FORM_TOKEN}
 			</fieldset>
 			
 			</form>

phpBB/adm/style/acp_styles.html

@@ -4,7 +4,7 @@
 
 <!-- IF S_DELETE -->
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE}</h1>
 
@@ -16,7 +16,7 @@
 		<legend>{L_TITLE}</legend>
 	<dl>
 		<dt><label>{L_NAME}:</label></dt>
-		<dd><b>{NAME}</b></dd>
+		<dd><strong>{NAME}</strong></dd>
 	</dl>
 	<dl>
 		<dt><label for="new_id">{L_REPLACE}:</label><br /><span>{L_REPLACE_EXPLAIN}</span></dt>
@@ -25,14 +25,14 @@
 
 	<p class="quick">
 		<input class="button1" type="submit" name="update" value="{L_DELETE}" />
+		{S_FORM_TOKEN}
 	</p>
 	</fieldset>
-
 	</form>
 
 <!-- ELSEIF S_EDIT_IMAGESET -->
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE}</h1>
 
@@ -51,12 +51,41 @@
 	<!-- ENDIF -->
 
 	<script type="text/javascript" defer="defer">
-	<!--
+	// <![CDATA[
 		function update_image(newimage)
 		{
-			document.getElementById('newimg').src = (newimage) ? "../styles/{NAME}/imageset/" + newimage : "images/no_image.png";
+			document.getElementById('newimg').src = (newimage) ? '../styles/{A_NAME}/imageset/' + encodeURI(newimage) : 'images/no_image.png';
 		}
-	//-->
+	// ]]>
+	</script>
+	<script type="text/javascript">
+	// <![CDATA[
+		/**
+		* Handle displaying/hiding the dimension fields
+		*/
+		function display_options(value)
+		{
+			if (value == 0)
+			{
+				dE('img_dimensions', -1);
+			}
+			else
+			{
+				dE('img_dimensions', 1);
+			}
+		}
+
+		/**
+		* Init the wanted display functionality if javascript is enabled.
+		* If javascript is not available, the user is still able to properly administrate.
+		*/
+		onload = function()
+		{
+			<!-- IF not IMAGE_SIZE -->
+				dE('img_dimensions', -1);
+			<!-- ENDIF -->
+		}
+	// ]]>
 	</script>
 
 	<form method="post" action="{U_ACTION}">
@@ -65,8 +94,8 @@
 		<legend>{L_SELECT_IMAGE}</legend>
 		{L_SELECT_IMAGE}: <select name="imgname" onchange="this.form.submit();">
 		<!-- BEGIN category -->
-			<option class="sep" value="">{category.NAME}</option>
-				<!-- BEGIN images --><option value="{category.images.VALUE}"<!-- IF category.images.SELECTED--> selected="selected"<!-- ENDIF -->>{category.images.TEXT}</option>
+			<option class="sep" value="" disabled="disabled">{category.NAME}</option>
+				<!-- BEGIN images --><option value="{category.images.VALUE}"<!-- IF category.images.SELECTED--> selected="selected"<!-- ENDIF -->>&nbsp;&nbsp;&nbsp;&nbsp;{category.images.TEXT}</option>
 				<!-- END images -->
 			<!-- END category -->
 		</select>&nbsp; <input class="button1" type="submit" value="{L_SELECT}" tabindex="100" />
@@ -80,7 +109,7 @@
 	</dl>
 	<dl>
 		<dt><label>{L_SELECTED_IMAGE}:</label></dt>
-		<dd><img src="images/no_image.png" id="newimg" alt="" /></dd>
+		<dd><img src="{IMG_SRC}" id="newimg" alt="" /></dd>
 	</dl>
 	</fieldset>
 
@@ -100,74 +129,65 @@
 	</dl>
 	<dl>
 		<dt><label for="imgsize">{L_INCLUDE_DIMENSIONS}:</label><br /><span>{L_DIMENSIONS_EXPLAIN}</span></dt>
-		<dd><input type="radio" class="radio" name="imgsize" id="imgsize" value="1"<!-- IF IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_YES}&nbsp;&nbsp;<input type="radio" class="radio" name="imgsize" value="0"<!-- IF not IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+		<dd><label><input type="radio" class="radio" name="imgsize" id="imgsize" onclick="display_options(1);" value="1"<!-- IF IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="imgsize" onclick="display_options(0);" value="0"<!-- IF not IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
+	<div id="img_dimensions">
+		<dl>
+			<dt><label for="imgwidth">{L_IMAGE_WIDTH}:</label><br /><span>{L_AUTOMATIC_EXPLAIN}</span></dt>
+			<dd><input type="text" name="imgwidth" value="{IMAGE_SIZE}" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="imgheight">{L_IMAGE_HEIGHT}:</label><br /><span>{L_AUTOMATIC_EXPLAIN}</span></dt>
+			<dd><input type="text" name="imgheight" value="{IMAGE_HEIGHT}" /></dd>
+		</dl>
+	</div>
 	</fieldset>
 
 	<fieldset class="submit-buttons">
 		<legend>{L_SUBMIT}</legend>
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="button2" type="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 <!-- ELSEIF S_EDIT_TEMPLATE or S_EDIT_THEME -->
 
-	<script type="text/javascript" defer="defer">
-	<!--
-		function append_text_rows(form_name, value)
-		{
-			url = document.getElementById(form_name).action;
-			var_start = url.indexOf('&text_rows=');
-			if (var_start == -1)
-			{
-				document.getElementById(form_name).action = url + "&text_rows=" + value;
-			}
-			else
-			{
-				url_start = url.substring(0, var_start + 1);
-				var_end = url.substring(var_start + 1).indexOf('&');
-				if (var_end == -1)
-				{
-					document.getElementById(form_name).action = url_start + "text_rows=" + value;
-				}
-				else
-				{
-					document.getElementById(form_name).action = url_start + url.substring(var_end + var_start + 2) + "&text_rows=" + value;
-				}
-			}
-		}
-	//-->
-	</script>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
-	<!-- IF S_EDIT_TEMPLATE -->
+	<h1>{L_EDIT}</h1>
 
-		<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<p>{L_EDIT_EXPLAIN}</p>
 
-		<h1>{L_EDIT_TEMPLATE}</h1>
-
-		<p>{L_EDIT_TEMPLATE_EXPLAIN}</p>
-
-		<p>{L_SELECTED_TEMPLATE}: <b>{SELECTED_TEMPLATE}</b></p>
+	<p>{L_SELECTED}: <strong>{SELECTED_TEMPLATE}</strong></p>
 
 	<form id="acp_styles" method="post" action="{U_ACTION}">
 
+	<!-- IF S_EDIT_TEMPLATE or (S_EDIT_THEME and not S_THEME_IN_DB) -->
 	<fieldset>
-			<legend>{L_SELECT_TEMPLATE}</legend>
+		<legend>{L_SELECT}</legend>
 	<dl>
-			<dt><label for="template_file">{L_TEMPLATE_FILE}:</label></dt>
+		<dt><label for="template_file">{L_FILE}:</label></dt>
 		<dd><select id="template_file" name="template_file" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_TEMPLATES}</select> <input class="button2" type="submit" value="{L_SELECT}" /></dd>
 	</dl>
+	{S_FORM_TOKEN}
 	</fieldset>
-
+	<!-- ENDIF -->
 	</form>
 
-		<!-- IF TEMPLATE_FILE -->
+	<!-- IF TEMPLATE_FILE or (S_EDIT_THEME and S_THEME_IN_DB) -->
 		<script type="text/javascript" defer="defer">
-			<!--
+		// <![CDATA[
 
 			function change_editor_height(height)
 			{
+				height = Number(height);
+
+				if (isNaN(height))
+				{
+					return;
+				}
+
 				editor = document.getElementById('template_data');
 				editor.rows = Math.max(5, Math.min(height, 999));
 
@@ -177,7 +197,18 @@
 
 			function append_text_rows(form_name, value)
 			{
+				value = Number(value);
+
+				if (isNaN(value))
+				{
+					return;
+				}
+
 				url = document.getElementById(form_name).action;
+
+				// Make sure &amp; is actually... &
+				url = url.replace(/&amp;/g, '&');
+
 				var_start = url.indexOf('&text_rows=');
 				if (var_start == -1)
 				{
@@ -197,19 +228,22 @@
 					}
 				}
 			}
-			//-->
+
+		// ]]>
 		</script>
 
 		<form id="acp_template" method="post" action="{U_ACTION}">
 
 		<fieldset>
-				<legend>{L_TEMPLATE_EDITOR}</legend>
+			<legend>{L_EDITOR}</legend>
+		<!-- IF S_EDIT_TEMPLATE or (S_EDIT_THEME and not S_THEME_IN_DB) -->
 		<dl>
-				<dt><label>{L_SELECTED_TEMPLATE_FILE}:</label></dt>
+			<dt><label>{L_SELECTED_FILE}:</label></dt>
 			<dd>{TEMPLATE_FILE}</dd>
 		</dl>
+		<!-- ENDIF -->
 		<dl>
-				<dt><label for="text_rows">{L_TEMPLATE_EDITOR_HEIGHT}:</label></dt>
+			<dt><label for="text_rows">{L_EDITOR_HEIGHT}:</label></dt>
 			<dd><input id="text_rows" type="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="button2" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd>
 		</dl>
 		<textarea id="template_data" name="template_data" style="font-family:'Courier New', monospace;font-size:9pt;line-height:125%;width:100%;" cols="80" rows="{TEXT_ROWS}">{TEMPLATE_DATA}</textarea>
@@ -218,182 +252,15 @@
 		<fieldset class="submit-buttons">
 			<legend>{L_SUBMIT}</legend>
 			{S_HIDDEN_FIELDS}
+			{S_FORM_TOKEN}
 			<input class="button1" id="save" type="submit" name="save" value="{L_SUBMIT}" />
 		</fieldset>
-
 		</form>
 	<!-- ENDIF -->
 
-	<!-- ELSEIF S_EDIT_THEME -->
-
-		<script type="text/javascript">
-		<!--
-
-			function change_editor_height(height)
-			{
-				editor = document.getElementById('css_data');
-				editor.rows = Math.max(5, Math.min(height, 999));
-
-				append_text_rows('acp_styles', height);
-				append_text_rows('acp_theme', height);
-				append_text_rows('acp_custom_class', height);
-			}
-
-		//-->
-		</script>
-
-		<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
-
-		<h1>{L_EDIT_THEME}</h1>
-
-		<p>{L_EDIT_THEME_EXPLAIN}</p>
-
-		<p>{L_SELECTED_THEME}: <strong>{SELECTED_THEME}</strong></p>
-
-		<!-- IF S_SHOWCSS -->
-			<h3>{L_SHOW_CSS_NOTE}</h3>
-			<p>{L_SHOW_CSS_EXPLAIN}</p>
-		<!-- ENDIF -->
-		<form id="acp_styles" method="post" action="{U_ACTION}">
-
-		<fieldset>
-			<legend>{L_SELECT_CLASS}</legend>
-		<dl>
-			<dt><label for="css_class">{L_SELECT_CLASS}:</label></dt>
-			<dd><select id="css_class" name="css_class" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_CLASSES}</select></dd>
-			<dd><input class="button1" type="submit" id="select_class" name="select_class" value="{L_SELECT}" /></dd>
-		</dl>
-		<!-- IF S_CLASS -->
-			<dl>
-				<dt><label>{L_SELECTED_CLASS}:</label></dt>
-				<dd>{S_CLASS}</dd>
-			</dl>
-		<!-- ENDIF -->
-		</fieldset>
-	
-		</form>
-
-		<!-- IF S_CLASS -->
-
-			<form id="acp_theme" method="post" action="{U_ACTION}">
-
-			<!-- IF S_SHOWCSS -->
-
-				<fieldset>
-					<legend>{L_THEME_EDITOR}</legend>
-				<dl>
-					<dt><label for="text_rows">{L_THEME_EDITOR_HEIGHT}:</label></dt>
-					<dd><input id="text_rows" type="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="button1" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd>
-				</dl>
-				<textarea id="css_data" name="css_data" style="font-family:'Courier New', monospace;font-size:9pt;line-height:125%;width:100%;" cols="80" rows="{TEXT_ROWS}">{CSS_DATA}</textarea>
-				</fieldset>
-
-			<!-- ELSE -->
-
-				<fieldset>
-					<legend>{L_BACKGROUND}</legend>
-				<dl>
-					<dt><label for="background_color">{L_BACKGROUND_COLOUR}:</label><br /><span>{L_CSS_COLOUR_EXPLAIN}</span></dt>
-					<dd><input id="background_color" name="background_color" type="text" value="{BACKGROUND_COLOR}" size="6" />&nbsp;&nbsp;<span>[ <a href="#" onclick="swatch('background_color'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>
-				</dl>
-				<dl>
-					<dt><label for="backround_image">{L_BACKGROUND_IMAGE}:</label></dt>
-					<dd><select id="background_image" name="background_image">{S_BACKGROUND_IMAGE}</select></dd>
-				</dl>
-				<dl>
-					<dt><label for="background_repeat">{L_BACKGROUND_REPEAT}:</label></dt>
-					<dd><select id="background_repeat" name="background_repeat">{S_BACKGROUND_REPEAT}</select></dd>
-				</dl>
-				</fieldset>
-
-				<fieldset>
-					<legend>{L_FOREGROUND}</legend>
-				<dl>
-					<dt><label for="color">{L_FONT_COLOUR}:</label><br /><span>{L_CSS_COLOUR_EXPLAIN}</span></dt>
-					<dd><input id="color" name="color" type="text" value="{COLOR}" size="6" />&nbsp;&nbsp;<span>[ <a href="#" onclick="swatch('color'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>
-				</dl>
-				<dl>
-					<dt><label for="font_family">{L_FONT_FACE}:</label><br /><span>{L_FONT_FACE_EXPLAIN}</span></dt>
-					<dd><input id="font_family" name="font_family" type="text" value="{FONT_FAMILY}" size="40" maxlength="255" /></dd>
-				</dl>
-				<dl>
-					<dt><label for="font_size">{L_FONT_SIZE}:</label></dt>
-					<dd><input id="font_size" name="font_size" type="text" value="{FONT_SIZE}" size="5" maxlength="5" /> <select id="font_size_unit" name="font_size_unit">{S_FONT_SIZE_UNITS}</select></dd>
-				</dl>
-				<dl>
-					<dt><label for="font_weight">{L_BOLD}:</label></dt>
-					<dd><input id="font_weight" type="radio" class="radio" name="font_weight" value="bold"<!-- IF FONT_WEIGHT eq "bold" --> checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="font_weight" value="none"<!-- IF FONT_WEIGHT eq "none" --> checked="checked"<!-- ENDIF --> /> {L_NO} &nbsp; <input type="radio" class="radio" name="font_weight" value=""<!-- IF not FONT_WEIGHT --> checked="checked"<!-- ENDIF --> /> {L_UNSET}</dd>
-				</dl>
-				<dl>
-					<dt><label for="font_style">{L_ITALIC}:</label></dt>
-					<dd><input id="font_style" type="radio" class="radio" name="font_style" value="italic"<!-- IF FONT_STYLE eq "italic" --> checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="font_style" value="none"<!-- IF FONT_STYLE eq "none" --> checked="checked"<!-- ENDIF --> /> {L_NO} &nbsp; <input type="radio" class="radio" name="font_style" value=""<!-- IF not FONT_STYLE --> checked="checked"<!-- ENDIF --> /> {L_UNSET}</dd>
-				</dl>
-				<dl>
-					<dt><label for="text_decoration">{L_UNDERLINE}:</label></dt>
-					<dd><input id="text_decoration" type="radio" class="radio" name="text_decoration" value="underline"<!-- IF TEXT_DECORATION eq "underline" --> checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="text_decoration" value="none"<!-- IF TEXT_DECORATION eq "none" --> checked="checked"<!-- ENDIF --> /> {L_NO} &nbsp; <input type="radio" class="radio" name="text_decoration" value=""<!-- IF not TEXT_DECORATION --> checked="checked"<!-- ENDIF --> /> {L_UNSET}</dd>
-				</dl>
-				<dl>
-					<dt><label for="line_height">{L_LINE_SPACING}</label></dt>
-					<dd><input id="line_height" name="line_height" type="text" value="{LINE_HEIGHT}" size="3" maxlength="3" /> <select id="line_height_unit" name="line_height_unit">{S_LINE_HEIGHT_UNITS}</select></dd>
-				</dl>
-				</fieldset>
-
-			<!-- ENDIF -->
-
-			<fieldset class="submit-buttons">
-				<legend>{L_SUBMIT}</legend>
-				{S_HIDDEN_FIELDS}
-				<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-				<!-- IF S_SHOWCSS -->
-					<input class="button2" type="submit" id="hidecss" name="hidecss" value="{L_HIDE_CSS}" />&nbsp;
-				<!-- ELSE -->
-					<input class="button2" type="submit" id="showcss" name="showcss" value="{L_SHOW_CSS}" />&nbsp;
-				<!-- ENDIF -->
-				<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-			</fieldset>
-
-			</form>
-
-		<!-- ENDIF -->
-
-		<br />
-		<h1>{L_CUSTOM_CLASS}</h1>
-
-		<p>{L_CUSTOM_CLASS_EXPLAIN}</p>
-
-		<form id="acp_custom_class" method="post" action="{U_ACTION}">
-
-		<fieldset>
-			<legend>{L_CUSTOM_CLASS}</legend>
-		<dl>
-			<dt><label for="custom_class">{L_CSS_CLASS_NAME}:</label></dt>
-			<dd><input id="custom_class" name="custom_class" type="text" value="" maxlength="40" size="40" /></dd>
-		</dl>
-
-		<p class="quick">
-			<input class="button1" type="submit" id="add_custom" name="add_custom" value="{L_SUBMIT}" />
-		</p>
-		</fieldset>
-
-		</form>
-	
-	<!-- ENDIF -->
-
 <!-- ELSEIF S_CACHE -->
 
-	<script type="text/javascript">
-	<!--
-
-		function viewsource(url)
-		{
-			window.open(url, '_source', 'HEIGHT=550,resizable=yes,scrollbars=yes,WIDTH=750');
-			return false;
-		}
-	
-	//-->
-	</script>
-
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 	
 	<h1>{L_TEMPLATE_CACHE}</h1>
 	
@@ -416,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="viewsource('{file.UA_VIEWSOURCE}');return false">{file.FILENAME}</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>
@@ -432,16 +299,15 @@
 
 	<p class="quick">
 		<span class="small"><a href="#" onclick="marklist('acp_styles', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('acp_styles', 'delete', false); return false;">{L_UNMARK_ALL}</a></span><br />
-
+		{S_FORM_TOKEN}
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_DELETE_MARKED}" />
 	</p>
 	</fieldset>
-
 	</form>
 
 <!-- ELSEIF S_EXPORT -->
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE}</h1>
 
@@ -460,25 +326,29 @@
 		<legend>{L_TITLE}</legend>
 	<dl>
 		<dt><label>{L_NAME}:</label></dt>
-		<dd><b>{NAME}</b></dd>
+		<dd><strong>{NAME}</strong></dd>
 	</dl>
 	<!-- IF S_STYLE -->
 		<dl>
 			<dt><label for="inc_template">{L_INCLUDE_TEMPLATE}:</label></dt>
-			<dd><input type="radio" class="radio" id="inc_template" name="inc_template" value="1" checked="checked" />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="inc_template" value="0" />&nbsp; {L_NO}</dd>
+			<dd><label><input type="radio" class="radio" id="inc_template" name="inc_template" value="1" checked="checked" /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="inc_template" value="0" /> {L_NO}</label></dd>
 		</dl>
 		<dl>
 			<dt><label for="inc_theme">{L_INCLUDE_THEME}:</label></dt>
-			<dd><input type="radio" class="radio" id="inc_theme" name="inc_theme" value="1" checked="checked" />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="inc_theme" value="0" />&nbsp; {L_NO}</dd>
+			<dd><label><input type="radio" class="radio" id="inc_theme" name="inc_theme" value="1" checked="checked" /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="inc_theme" value="0" /> {L_NO}</label></dd>
 		</dl>
 		<dl>
 			<dt><label for="inc_imageset">{L_INCLUDE_IMAGESET}:</label></dt>
-			<dd><input type="radio" class="radio" id="inc_imageset" name="inc_imageset" value="1" checked="checked" />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="inc_imageset" value="0" />&nbsp; {L_NO}</dd>
+			<dd><label><input type="radio" class="radio" id="inc_imageset" name="inc_imageset" value="1" checked="checked" /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="inc_imageset" value="0" /> {L_NO}</label></dd>
 		</dl>
 	<!-- ENDIF -->
 	<dl>
 		<dt><label for="store">{L_DOWNLOAD_STORE}:</label><br /><span>{L_DOWNLOAD_STORE_EXPLAIN}</span></dt>
-		<dd><input type="radio" class="radio" id="store" name="store" value="1" checked="checked" />&nbsp; {L_EXPORT_STORE} &nbsp;<input type="radio" class="radio" name="store" value="0" />&nbsp; {L_EXPORT_DOWNLOAD}</dd>
+		<dd><label><input type="radio" class="radio" id="store" name="store" value="1" checked="checked" /> {L_EXPORT_STORE}</label>
+			<label><input type="radio" class="radio" name="store" value="0" /> {L_EXPORT_DOWNLOAD}</label></dd>
 	</dl>
 	<dl>
 		<dt><label for="format">{L_ARCHIVE_FORMAT}:</label></dt>
@@ -486,10 +356,12 @@
 	</dl>
 
 	<p class="quick">
+		{S_FORM_TOKEN}
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
 	</p>
 	</fieldset>
 
+	
 	</form>
 
 <!-- ELSEIF S_FRONTEND -->
@@ -512,7 +384,7 @@
 	</thead>
 	<tbody>
 	<tr>
-		<td class="row3" colspan="{$COLSPAN}"><b>{L_INSTALLED}</b></td>
+		<td class="row3" colspan="{$COLSPAN}"><strong>{L_INSTALLED}</strong></td>
 	</tr>
 	<!-- BEGIN installed -->
 	<tr>
@@ -532,9 +404,10 @@
 				| <a href="{installed.U_PREVIEW}">{L_PREVIEW}</a>
 			<!-- ENDIF -->
 		</td>
+	</tr>
 	<!-- END installed -->
 	<tr>
-		<td class="row3" colspan="{$COLSPAN}"><b>{L_UNINSTALLED}</b></td>
+		<td class="row3" colspan="{$COLSPAN}"><strong>{L_UNINSTALLED}</strong></td>
 	</tr>
 	<!-- IF not .uninstalled -->
 		<tr>
@@ -543,7 +416,7 @@
 	<!-- ENDIF -->
 	<!-- BEGIN uninstalled -->
 		<tr>
-			<td<!-- IF S_STYLE --> colspan="2"<!-- ENDIF -->><b>{uninstalled.NAME}</b><br /><span>{L_COPYRIGHT}: {uninstalled.COPYRIGHT}</span></td>
+			<td<!-- IF S_STYLE --> colspan="2"<!-- ENDIF -->><strong>{uninstalled.NAME}</strong><br /><span>{L_COPYRIGHT}: {uninstalled.COPYRIGHT}</span></td>
 			<td style="text-align: center;" colspan="2"><a href="{uninstalled.U_INSTALL}">{L_INSTALL}</a></td>
 		</tr>
 	<!-- END uninstalled -->
@@ -563,7 +436,7 @@
 
 <!-- ELSEIF S_DETAILS -->
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE}</h1>
 
@@ -586,7 +459,7 @@
 	</dl>
 	<dl>
 		<dt><label for="copyright">{L_COPYRIGHT}:</label></dt>
-		<dd><!-- IF S_INSTALL --><b id="name">{COPYRIGHT}</b><!-- ELSE --><input type="text" id="copyright" name="copyright" value="{COPYRIGHT}" /><!-- ENDIF --></dd>
+		<dd><!-- IF S_INSTALL --><b id="copyright">{COPYRIGHT}</b><!-- ELSE --><input type="text" id="copyright" name="copyright" value="{COPYRIGHT}" /><!-- ENDIF --></dd>
 	</dl>
 	<!-- IF S_STYLE and not S_BASIS -->
 		<dl>
@@ -605,7 +478,8 @@
 	<!-- IF S_TEMPLATE or S_THEME -->
 		<dl>
 			<dt><label for="store_db">{L_LOCATION}:</label><br /><span>{L_LOCATION_EXPLAIN}</span></dt>
-			<dd><input type="radio" class="radio" name="store_db" value="0"<!-- IF not S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> />&nbsp; {L_STORE_FILESYSTEM} &nbsp;<input type="radio" class="radio" name="store_db" value="1"<!-- IF S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> />&nbsp; {L_STORE_DATABASE}</dd>
+			<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 -->
@@ -615,12 +489,14 @@
 			<legend>{L_OPTIONS}</legend>
 		<dl>
 			<dt><label for="style_active">{L_STYLE_ACTIVE}:</label></dt>
-			<dd><input type="radio" class="radio" name="style_active" value="1"<!-- IF S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="style_active" value="0"<!-- IF not S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
+			<dd><label><input type="radio" class="radio" name="style_active" value="1"<!-- IF S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="style_active" value="0"<!-- IF not S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<!-- IF not S_STYLE_DEFAULT -->
 			<dl>
 				<dt><label for="style_default">{L_STYLE_DEFAULT}:</label></dt>
-				<dd><input type="radio" class="radio" name="style_default" value="1" />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" id="style_default" name="style_default" value="0" checked="checked" />&nbsp; {L_NO}</dd>
+				<dd><label><input type="radio" class="radio" name="style_default" value="1" /> {L_YES}</label>
+					<label><input type="radio" class="radio" id="style_default" name="style_default" value="0" checked="checked" /> {L_NO}</label></dd>
 			</dl>
 		<!-- ENDIF -->
 	<!-- ENDIF -->
@@ -629,6 +505,7 @@
 	<fieldset class="submit-buttons">
 		<legend>{L_SUBMIT}</legend>
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+		{S_FORM_TOKEN}
 	</fieldset>
 	
 	</form>

phpBB/adm/style/acp_update.html

@@ -8,7 +8,7 @@
 
 	<p>{L_VERSION_CHECK_EXPLAIN}</p>
 
-	<!-- IF S_UP_TO_DATE -->
+	<!-- IF S_UP_TO_DATE and S_UP_TO_DATE_AUTO -->
 		<div class="successbox">
 			<p>{L_VERSION_UP_TO_DATE_ACP}</p>
 		</div>
@@ -22,14 +22,20 @@
 		<legend></legend>
 	<dl>
 		<dt><label>{L_CURRENT_VERSION}</label></dt>
-		<dd><b>{CURRENT_VERSION}</b></dd>
+		<dd><strong><!-- IF S_UP_TO_DATE and not S_UP_TO_DATE_AUTO -->{AUTO_VERSION}<!-- ELSE -->{CURRENT_VERSION}<!-- ENDIF --></strong></dd>
 	</dl>
 	<dl>
 		<dt><label>{L_LATEST_VERSION}</label></dt>
-		<dd><b>{LATEST_VERSION}</b></dd>
+		<dd><strong>{LATEST_VERSION}</strong></dd>
 	</dl>
 	</fieldset>
 
+	<!-- IF S_UP_TO_DATE and not S_UP_TO_DATE_AUTO -->
+		{L_UPDATE_INSTRUCTIONS_INCOMPLETE}
+		<br /><br />
+		{UPDATE_INSTRUCTIONS}
+		<br /><br />
+	<!-- ENDIF -->
 	<!-- IF not S_UP_TO_DATE -->
 		{UPDATE_INSTRUCTIONS}
 		<br /><br />

phpBB/adm/style/acp_users.html

@@ -14,9 +14,9 @@
 		<legend>{L_SELECT_USER}</legend>
 	<dl>
 		<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
-		<dd><input class="medium" type="text" id="username" name="username" /></dd>
-		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd>
-		<dd class="full" style="text-align: left;"><input type="checkbox" class="radio" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}" /> &nbsp;{L_SELECT_ANONYMOUS}</dd>
+		<dd><input class="text medium" type="text" id="username" name="username" /></dd>
+		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+		<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
 	</dl>
 
 	<p class="quick">
@@ -28,7 +28,7 @@
 
 <!-- ELSEIF S_SELECT_FORUM -->
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_USER_ADMIN}</h1>
 
@@ -46,15 +46,15 @@
 
 	<fieldset class="quick">
 		<input type="submit" name="update" value="{L_SUBMIT}" class="button1" />
+		{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 <!-- ELSE -->
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
-	<h1>{L_USER_ADMIN}</h1>
+	<h1>{L_USER_ADMIN} :: {MANAGED_USERNAME}</h1>
 
 	<p>{L_USER_ADMIN_EXPLAIN}</p>
 
@@ -69,457 +69,31 @@
 
 	<fieldset class="quick">
 		{L_SELECT_FORM}: <select name="mode" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_FORM_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" />
+		{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 <!-- ENDIF -->
 
 <!-- IF S_OVERVIEW -->
 
-	<form id="user_overview" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_ACP_USER_OVERVIEW}</legend>
-	<dl>
-		<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_NAME_CHARS_EXPLAIN}</span></dt>
-		<dd><input type="text" id="user" name="user" value="{USER}" /></dd>
-		<!-- IF U_SWITCH_PERMISSIONS --><dd>[ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]</dd><!-- ENDIF -->
-	</dl>
-	<!-- IF S_USER_INACTIVE -->
-	<dl>
-		<dt><label>{L_USER_IS_INACTIVE}:</label></dt>
-		<dd><strong>{USER_INACTIVE_REASON}</strong></dd>
-	</dl>
-	<!-- ENDIF -->
-	<dl>
-		<dt><label>{L_REGISTERED}:</label></dt>
-		<dd><strong>{USER_REGISTERED}</strong></dd>
-	</dl>
-	<!-- IF S_USER_IP -->
-	<dl>
-		<dt><label>{L_REGISTERED_IP}:</label></dt>
-		<dd><a href="{U_SHOW_IP}">{REGISTERED_IP}</a></dd>
-		<dd>[ <a href="#" onclick="window.open('{U_WHOIS}', '_whois', 'height=500, resizable=yes, scrollbars=yes, width=700'); return false;">{L_WHOIS}</a> ]</dd>
-	</dl>
-	<!-- ENDIF -->
-	<dl>
-		<dt><label>{L_LAST_ACTIVE}:</label></dt>
-		<dd><strong>{USER_LASTACTIVE}</strong></dd>
-	</dl>
-	<dl>
-		<dt><label>{L_POSTS}:</label></dt>
-		<dd><strong>{USER_POSTS}</strong></dd>
-	</dl>
-	<dl>
-		<dt><label>{L_WARNINGS}:</label></dt>
-		<dd><strong>{USER_WARNINGS}</strong></dd>
-	</dl>
-	<dl>
-		<dt><label for="user_founder">{L_FOUNDER}:</label><br /><span>{L_FOUNDER_EXPLAIN}</span></dt>
-		<dd><input type="radio" class="radio" name="user_founder" value="1"<!-- IF S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> />&nbsp;{L_YES}&nbsp; <input type="radio" class="radio" name="user_founder" value="0"<!-- IF not S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> />&nbsp;{L_NO}&nbsp;</dd>
-	</dl>
-	<dl>
-		<dt><label for="user_email">{L_EMAIL}:</label></dt>
-		<dd><input class="medium" type="text" id="user_email" name="user_email" value="{USER_EMAIL}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label><br /><span>{L_CONFIRM_EMAIL_EXPLAIN}</span></dt>
-		<dd><input class="medium" type="text" id="email_confirm" name="email_confirm" value="" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="user_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
-		<dd><input type="password" id="user_password" name="user_password" value="" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
-		<dd><input type="password" id="password_confirm" name="password_confirm" value="" /></dd>
-	</dl>
-	<!-- IF not S_USER_FOUNDER or S_FOUNDER -->
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_USER_TOOLS}</legend>
-	<dl>
-		<dt><label for="quicktools">{L_QUICK_TOOLS}:</label></dt>
-		<dd><select id="quicktools" name="action">{S_ACTION_OPTIONS}</select></dd>
-	</dl>
-		<!-- 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 -->
-	<!-- ENDIF -->
-	</fieldset>
-
-	<fieldset class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-	</fieldset>
-
-	</form>
+<!-- INCLUDE acp_users_overview.html -->
 
 <!-- ELSEIF S_FEEDBACK -->
 
-	<form id="list" method="post" action="{U_ACTION}">
-
-	<!-- IF PAGINATION -->
-	<div class="pagination">
-			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-	</div>
-	<!-- ENDIF -->
-
-	<!-- IF .log -->
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_REPORT_BY}</th>
-		<th>{L_IP}</th>
-		<th>{L_TIME}</th>
-		<th>{L_FEEDBACK}</th>
-		<th>{L_MARK}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN log -->
-		<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-			<td>{log.USERNAME}</td>
-			<td style="text-align: center;">{log.IP}</td>
-			<td style="text-align: center;">{log.DATE}</td>
-			<td>
-				{log.ACTION}
-				<!-- IF log.DATA --><br />&#187; <span class="gensmall">[ {log.DATA} ]</span><!-- ENDIF -->
-			</td>
-			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td>
-		</tr>
-	<!-- END log -->
-	</tbody>
-	</table>
-	<!-- ELSE -->
-		<div class="errorbox">
-			<p>{L_NO_ENTRIES}</p>
-		</div>
-	<!-- ENDIF -->
-	
-	<fieldset class="display-options">
-		{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
-		<input class="button2" type="submit" value="{L_GO}" name="sort" />
-	</fieldset>
-	<hr />
-	<!-- IF PAGINATION -->
-	<div class="pagination">
-			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-	</div>
-	<!-- ENDIF -->
-
-	<!-- IF S_CLEARLOGS -->
-		<fieldset class="quick">
-			<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />&nbsp;
-			<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />
-			<p class="small"><a href="#" onclick="marklist('list', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false);">{L_UNMARK_ALL}</a></p>
-		</fieldset>
-	<!-- ENDIF -->
-
-	<h1>{L_ADD_FEEDBACK}</h1>
-
-	<p>{L_ADD_FEEDBACK_EXPLAIN}</p>
-
-	<fieldset>
-		<legend>{L_ACP_USER_FEEDBACK}</legend>
-		<dl>
-			<dd class="full"><textarea name="message" id="message" rows="10" cols="76"></textarea></dd>
-		</dl>
-	</fieldset>
-
-	<fieldset class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-	</fieldset>
-
-	</form>
+<!-- INCLUDE acp_users_feedback.html -->
 
 <!-- ELSEIF S_PROFILE -->
 
-	<form id="user_profile" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_USER_PROFILE}</legend>
-	<dl>
-		<dt><label for="icq">{L_UCP_ICQ}:</label></dt>
-		<dd><input type="text" id="icq" name="icq" value="{ICQ}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="aim">{L_UCP_AIM}:</label></dt>
-		<dd><input type="text" id="aim" name="aim" value="{AIM}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="msn">{L_UCP_MSNM}:</label></dt>
-		<dd><input type="text" id="msn" name="msn" value="{MSN}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="yim">{L_UCP_YIM}:</label></dt>
-		<dd><input type="text" id="yim" name="yim" value="{YIM}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="jabber">{L_UCP_JABBER}:</label></dt>
-		<dd><input type="text" id="jabber" name="jabber" value="{JABBER}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="website">{L_WEBSITE}:</label></dt>
-		<dd><input type="text" id="website" name="website" value="{WEBSITE}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="location">{L_LOCATION}:</label></dt>
-		<dd><input type="text" id="location" name="location" value="{LOCATION}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="occupation">{L_OCCUPATION}:</label></dt>
-		<dd><textarea id="occupation" name="occupation" rows="3" cols="30">{OCCUPATION}</textarea></dd>
-	</dl>
-	<dl>
-		<dt><label for="interests">{L_INTERESTS}:</label></dt>
-		<dd><textarea id="interests" name="interests" rows="3" cols="30">{INTERESTS}</textarea></dd>
-	</dl>
-	<dl> 
-		<dt><label for="birthday">{L_BIRTHDAY}:</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
-		<dd>{L_DAY}: <select id="birthday" name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> {L_MONTH}: <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> {L_YEAR}: <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></dd>
-	</dl>
-	</fieldset>
-
-	<!-- IF .profile_fields -->
-		<fieldset>
-			<legend>{L_USER_CUSTOM_PROFILE_FIELDS}</legend>
-		<!-- BEGIN profile_fields -->
-		<dl> 
-			<dt><label>{profile_fields.LANG_NAME}:</label><!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></dt>
-			<dd>{profile_fields.FIELD}</dd>
-			<!-- IF profile_fields.ERROR -->
-				<dd><span class="small" style="color: red;">{profile_fields.ERROR}</span></dd>
-			<!-- ENDIF -->
-		</dl>
-		<!-- END profile_fields -->
-		</fieldset>
-	<!-- ENDIF -->
-
-	<fieldset class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-	</fieldset>
-
-	</form>
+<!-- INCLUDE acp_users_profile.html -->
 
 <!-- ELSEIF S_PREFS -->
 
-	<form id="user_prefs" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_UCP_PREFS_PERSONAL}</legend>
-	<dl> 
-		<dt><label for="viewemail">{L_SHOW_EMAIL}:</label></dt>
-		<dd><input type="radio" class="radio" name="viewemail" value="1"<!-- IF VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="viewemail" value="0"<!-- IF not VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
-	</dl>
-	<dl> 
-		<dt><label for="massemail">{L_ADMIN_EMAIL}:</label></dt>
-		<dd><input type="radio" class="radio" name="massemail" value="1"<!-- IF MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="massemail" value="0"<!-- IF not MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
-	</dl>
-	<dl> 
-		<dt><label for="allowpm">{L_ALLOW_PM}:</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt>
-		<dd><input type="radio" class="radio" name="allowpm" value="1"<!-- IF ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="allowpm" value="0"<!-- IF not ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
-	</dl>
-	<dl> 
-		<dt><label for="hideonline">{L_HIDE_ONLINE}:</label></dt>
-		<dd><input type="radio" class="radio" name="hideonline" value="1"<!-- IF HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="hideonline" value="0"<!-- IF not HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
-	</dl>
-	<dl> 
-		<dt><label for="notifymethod">{L_NOTIFY_METHOD}:</label><br /><span>{L_NOTIFY_METHOD_EXPLAIN}</span></dt>
-		<dd><input type="radio" class="radio" name="notifymethod" value="0"<!-- IF NOTIFY_EMAIL --> id="notifymethod" checked="checked"<!-- ENDIF --> />&nbsp; {L_NOTIFY_METHOD_EMAIL} &nbsp;<input type="radio" class="radio" name="notifymethod" value="1"<!-- IF NOTIFY_IM --> id="notifymethod" checked="checked"<!-- ENDIF --><!-- IF S_JABBER_DISABLED --> disabled="disabled"<!-- ENDIF --> />&nbsp; {L_NOTIFY_METHOD_IM} &nbsp;<input type="radio" class="radio" name="notifymethod" value="2"<!-- IF NOTIFY_BOTH --> id="notifymethod" checked="checked"<!-- ENDIF --> />&nbsp; {L_NOTIFY_METHOD_BOTH}</dd>
-	</dl>
-	<dl> 
-		<dt><label for="notifypm">{L_NOTIFY_ON_PM}:</label></dt>
-		<dd><input type="radio" class="radio" name="notifypm" value="1"<!-- IF NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="notifypm" value="0"<!-- IF not NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
-	</dl>
-	<dl> 
-		<dt><label for="popuppm">{L_POPUP_ON_PM}:</label></dt>
-		<dd><input type="radio" class="radio" name="popuppm" value="1"<!-- IF POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="popuppm" value="0"<!-- IF not POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> />{L_NO}</dd>
-	</dl>
-	<dl> 
-		<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt>
-		<dd><select id="lang" name="lang">{S_LANG_OPTIONS}</select></dd>
-	</dl>
-	<dl> 
-		<dt><label for="style">{L_BOARD_STYLE}:</label></dt>
-		<dd><select id="style" name="style">{S_STYLE_OPTIONS}</select></dd>
-	</dl>
-	<dl> 
-		<dt><label for="tz">{L_BOARD_TIMEZONE}:</label></dt>
-		<dd><select id="tz" name="tz" style="width: 100%;">{S_TZ_OPTIONS}</select></dd>
-	</dl>
-	<dl> 
-		<dt><label for="dst">{L_BOARD_DST}:</label></dt>
-		<dd><input type="radio" class="radio" name="dst" value="1"<!-- IF DST --> id="dst" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="dst" value="0"<!-- IF not DST --> id="dst" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
-	</dl>
-	<dl> 
-		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
-		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = '{A_DEFAULT_DATEFORMAT}'; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
-		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" /></div></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_UCP_PREFS_POST}</legend>
-	<dl> 
-		<dt><label for="bbcode">{L_DEFAULT_BBCODE}:</label></dt>
-		<dd><input type="radio" class="radio" name="bbcode" value="1"<!-- IF BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="bbcode" value="0"<!-- IF not BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
-	</dl>
-	<dl> 
-		<dt><label for="smilies">{L_DEFAULT_SMILIES}:</label></dt>
-		<dd><input type="radio" class="radio" name="smilies" value="1"<!-- IF SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="smilies" value="0"<!-- IF not SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
-	</dl>
-	<dl> 
-		<dt><label for="sig">{L_DEFAULT_ADD_SIG}:</label></dt>
-		<dd><input type="radio" class="radio" name="sig" value="1"<!-- IF ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="sig" value="0"<!-- IF not ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
-	</dl>
-	<dl> 
-		<dt><label for="notify">{L_DEFAULT_NOTIFY}:</label></dt>
-		<dd><input type="radio" class="radio" name="notify" value="1"<!-- IF NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="notify" value="0"<!-- IF not NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
-	</dl>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_UCP_PREFS_VIEW}</legend>
-	<dl> 
-		<dt><label for="view_images">{L_VIEW_IMAGES}:</label></dt>
-		<dd><input type="radio" class="radio" name="view_images" value="1"<!-- IF VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="view_images" value="0"<!-- IF not VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
-	</dl>
-	<dl> 
-		<dt><label for="view_flash">{L_VIEW_FLASH}:</label></dt>
-		<dd><input type="radio" class="radio" name="view_flash" value="1"<!-- IF VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="view_flash" value="0"<!-- IF not VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
-	</dl>
-	<dl> 
-		<dt><label for="view_smilies">{L_VIEW_SMILIES}:</label></dt>
-		<dd><input type="radio" class="radio" name="view_smilies" value="1"<!-- IF VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="view_smilies" value="0"<!-- IF not VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
-	</dl>
-	<dl> 
-		<dt><label for="view_sigs">{L_VIEW_SIGS}:</label></dt>
-		<dd><input type="radio" class="radio" name="view_sigs" value="1"<!-- IF VIEW_SIGS --> id="view_sigs" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="view_sigs" value="0"<!-- IF not VIEW_SIGS --> id="view_sigss" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
-	</dl>
-	<dl> 
-		<dt><label for="view_avatars">{L_VIEW_AVATARS}:</label></dt>
-		<dd><input type="radio" class="radio" name="view_avatars" value="1"<!-- IF VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="view_avatars" value="0"<!-- IF not VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
-	</dl>
-	<dl> 
-		<dt><label for="view_wordcensor">{L_DISABLE_CENSORS}:</label></dt>
-		<dd><input type="radio" class="radio" name="view_wordcensor" value="1"<!-- IF VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="view_wordcensor" value="0"<!-- IF not VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
-	</dl>
-	<dl> 
-		<dt><label>{L_VIEW_TOPICS_DAYS}:</label></dt>
-		<dd>{S_TOPIC_SORT_DAYS}</dd>
-	</dl>
-	<dl> 
-		<dt><label>{L_VIEW_TOPICS_KEY}:</label></dt>
-		<dd>{S_TOPIC_SORT_KEY}</dd>
-	</dl>
-	<dl> 
-		<dt><label>{L_VIEW_TOPICS_DIR}:</label></dt>
-		<dd>{S_TOPIC_SORT_DIR}</dd>
-	</dl>
-	<dl> 
-		<dt><label>{L_VIEW_POSTS_DAYS}:</label></dt>
-		<dd>{S_POST_SORT_DAYS}</dd>
-	</dl>
-	<dl> 
-		<dt><label>{L_VIEW_POSTS_KEY}:</label></dt>
-		<dd>{S_POST_SORT_KEY}</dd>
-	</dl>
-	<dl> 
-		<dt><label>{L_VIEW_POSTS_DIR}:</label></dt>
-		<dd>{S_POST_SORT_DIR}</dd>
-	</dl>
-	</fieldset>
-
-	<fieldset class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-	</fieldset>
-
-	</form>
+<!-- INCLUDE acp_users_prefs.html -->
 
 <!-- ELSEIF S_AVATAR -->
 
-	<form id="avatar_settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>
-
-	<fieldset>
-		<legend>{L_ACP_USER_AVATAR}</legend>
-	<dl>
-		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-		<dd>{AVATAR_IMAGE}</dd>
-		<dd><input type="checkbox" class="radio" name="delete" />&nbsp;<span>{L_DELETE_AVATAR}</span></dd>
-	</dl>
-	<!-- IF not S_IN_AVATAR_GALLERY -->
-		<!-- IF S_CAN_UPLOAD -->
-			<dl> 
-				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
-				<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_MAX_FILESIZE}" /><input type="file" id="uploadfile" name="uploadfile" /></dd>
-			</dl>
-			<dl>
-				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd>
-			</dl>
-		<!-- ENDIF -->
-		<!-- IF S_ALLOW_REMOTE -->
-			<dl>
-				<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-				<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd>
-			</dl>
-			<dl>
-				<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
-				<dd><input name="width" type="text" id="width" size="3" value="{USER_AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{USER_AVATAR_HEIGHT}" /> <span>px</span></dd>
-			</dl>
-		<!-- ENDIF -->
-		<!-- IF S_DISPLAY_GALLERY -->
-			<dl> 
-				<dt><label>{L_AVATAR_GALLERY}:</label></dt>
-				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd>
-			</dl>
-		<!-- ENDIF -->
-	<!-- ELSE -->
-		</fieldset>
-
-		<fieldset>
-			<legend>{L_AVATAR_GALLERY}</legend>
-		<dl>
-			<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt>
-			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>
-		</dl>
-		<dl>
-			<table cellspacing="1">
-			<!-- BEGIN avatar_row -->
-			<tr> 
-				<!-- BEGIN avatar_column -->
-					<td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td>
-				<!-- END avatar_column -->
-			</tr>
-			<tr>
-				<!-- BEGIN avatar_option_column -->
-					<td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
-				<!-- END avatar_option_column -->
-			</tr>
-			<!-- END avatar_row -->
-			</table>
-		</dl>
-		</fieldset>
-		
-		<fieldset class="quick" style="margin-top: -15px;">
-			<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
-		</fieldset>
-	
-	<!-- ENDIF -->
-	</fieldset>
-
-	<fieldset class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-	</fieldset>
-
-	</form>
+<!-- INCLUDE acp_users_avatar.html -->
 
 <!-- ELSEIF S_RANK -->
 
@@ -535,118 +109,13 @@
 
 	<fieldset class="quick">
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+		{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 <!-- ELSEIF S_SIGNATURE -->
 
-	<script type="text/javascript">
-	<!--
-
-	var form_name = 'user_signature';
-	var text_name = 'signature';
-
-	// Define the bbCode tags
-	bbcode = new Array();
-	bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'<!-- BEGIN custom_tags -->, {custom_tags.BBCODE_NAME}<!-- END custom_tags -->);
-	imageTag = false;
-
-	// Helpline messages
-	var help_line = {
-		b: '{LA_BBCODE_B_HELP}',
-		i: '{LA_BBCODE_I_HELP}',
-		u: '{LA_BBCODE_U_HELP}',
-		q: '{LA_BBCODE_Q_HELP}',
-		c: '{LA_BBCODE_C_HELP}',
-		l: '{LA_BBCODE_L_HELP}',
-		o: '{LA_BBCODE_O_HELP}',
-		p: '{LA_BBCODE_P_HELP}',
-		w: '{LA_BBCODE_W_HELP}',
-		s: '{LA_BBCODE_S_HELP}',
-		f: '{LA_BBCODE_F_HELP}',
-		e: '{LA_BBCODE_E_HELP}',
-		d: '{LA_BBCODE_D_HELP}',
-		t: '{LA_BBCODE_T_HELP}',
-		tip: '{L_STYLES_TIP}'
-		<!-- BEGIN custom_tags -->
-			,cb_{custom_tags.BBCODE_ID}: '{custom_tags.BBCODE_HELPLINE}'
-		<!-- END custom_tags -->
-	}
-
-	//-->
-	</script>
-	<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
-
-	<form id="user_signature" method="post" action="{U_ACTION}">
-
-	<!-- IF SIGNATURE_PREVIEW -->
-		<fieldset>
-			<legend>{L_ADMIN_SIG_PREVIEW}</legend>
-			<p>{SIGNATURE_PREVIEW}</p>
-		</fieldset>
-	<!-- ENDIF -->
-
-	<fieldset>
-		<legend>{L_SIGNATURE}</legend>
-		<p>{L_SIGNATURE_EXPLAIN}</p>
-		<div id="format-buttons">
-			<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px;" onclick="bbstyle(2)" onmouseover="helpline('i')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px;" onclick="bbstyle(4)" onmouseover="helpline('u')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" onmouseover="helpline('q')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="t" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" />
-			<!-- IF S_BBCODE_IMG -->
-				<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" onmouseout="helpline('tip')" />
-			<!-- ENDIF -->
-			<!-- IF S_LINKS_ALLOWED -->
-				<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" onmouseover="helpline('w')" onmouseout="helpline('tip')" />
-			<!-- ENDIF -->
-			<!-- IF S_BBCODE_FLASH -->
-				<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" onmouseover="helpline('d')" onmouseout="helpline('tip')" />
-			<!-- ENDIF -->
-
-			{L_FONT_SIZE}: <select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" onmouseover="helpline('f')" onmouseout="helpline('tip')">
-				<option value="7">{L_FONT_TINY}</option>
-				<option value="9">{L_FONT_SMALL}</option>
-				<option value="12" selected="selected">{L_FONT_NORMAL}</option>
-				<option value="18">{L_FONT_LARGE}</option>
-				<option value="24">{L_FONT_HUGE}</option>
-			</select>
-		<!-- IF .custom_tags -->
-			<br /><br />
-			<!-- BEGIN custom_tags -->
-				<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})"<!-- IF custom_tags.BBCODE_HELPLINE !== '' --> onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')"<!-- ENDIF --> />
-			<!-- END custom_tags -->
-		<!-- ENDIF -->
-
-		</div>
-		<p><input type="text" name="helpbox" value="{L_STYLES_TIP}" class="full" style="border: 0; background: none;" /></p>
-		<div style="text-align: left;"><textarea name="signature" rows="10" cols="60" style="width: 80%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{SIGNATURE}</textarea></div>
-
-		<div>
-			<!-- IF S_BBCODE_ALLOWED -->
-				<input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} />&nbsp; {L_DISABLE_BBCODE} &nbsp;
-			<!-- ENDIF -->
-			<!-- IF S_SMILIES_ALLOWED -->
-				<input type="checkbox" class="radio" name="disable_smilies"{S_SMILIES_CHECKED} />&nbsp; {L_DISABLE_SMILIES} &nbsp;
-			<!-- ENDIF -->
-			<!-- IF S_LINKS_ALLOWED -->
-				<input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} />&nbsp; {L_DISABLE_MAGIC_URL} &nbsp;
-			<!-- ENDIF -->
-			<br /><br /><strong>{L_OPTIONS}: </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}
-		</div>
-	</fieldset>
-
-	<fieldset class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />
-	</fieldset>
-
-	</form>
+<!-- INCLUDE acp_users_signature.html -->
 
 <!-- ELSEIF S_GROUPS -->
 
@@ -657,23 +126,26 @@
 	<!-- BEGIN group -->
 		<!-- IF group.S_NEW_GROUP_TYPE -->
 		<tr>
-			<td class="row3" colspan="4"><b>{group.GROUP_TYPE}</b></td>
+			<td class="row3" colspan="4"><strong>{group.GROUP_TYPE}</strong></td>
 		</tr>
 		<!-- ELSE -->
 			<!-- IF group.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 				<td><a href="{group.U_EDIT_GROUP}">{group.GROUP_NAME}</a></td>
 				<td><!-- IF group.S_NO_DEFAULT --><a href="{group.U_DEFAULT}">{L_GROUP_DEFAULT}</a><!-- ELSE --><strong>{L_GROUP_DEFAULT}</strong><!-- ENDIF --></td>
-			<td><!-- IF not group.S_SPECIAL_GROUP --><a href="{group.U_DEMOTE_PROMOTE}">{group.L_DEMOTE_PROMOTE}</a><!-- ENDIF --></td>
+				<td><!-- IF not group.S_SPECIAL_GROUP --><a href="{group.U_DEMOTE_PROMOTE}">{group.L_DEMOTE_PROMOTE}</a><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
 				<td><a href="{group.U_DELETE}">{L_GROUP_DELETE}</a></td>
+			</tr>
 		<!-- ENDIF -->
 	<!-- END group -->
 	</tbody>
 	</table>
 
+	<!-- IF S_GROUP_OPTIONS -->
 		<fieldset class="quick">
 			{L_USER_GROUP_ADD}: <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+			{S_FORM_TOKEN}
 		</fieldset>
-
+	<!-- ENDIF -->
 	</form>
 
 <!-- ELSEIF S_ATTACHMENTS -->
@@ -701,7 +173,7 @@
 	<tbody>
 	<!-- BEGIN attach -->
 		<!-- IF attach.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td><a href="{attach.U_DOWNLOAD}">{attach.REAL_FILENAME}</a><br /><span class="small"><!-- IF attach.S_IN_MESSAGE --><b>{L_PM}: </b><!-- ELSE --><b>{L_TOPIC}: </b><!-- ENDIF --><a href="{attach.U_VIEW_TOPIC}">{attach.TOPIC_TITLE}</a></span></td>
+		<td><a href="{attach.U_DOWNLOAD}">{attach.REAL_FILENAME}</a><br /><span class="small"><!-- IF attach.S_IN_MESSAGE --><strong>{L_PM}: </strong><!-- ELSE --><strong>{L_POST}: </strong><!-- ENDIF --><a href="{attach.U_VIEW_TOPIC}">{attach.TOPIC_TITLE}</a></span></td>
 		<td style="text-align: center">{attach.POST_TIME}</td>
 		<td style="text-align: center">{attach.SIZE}</td>
 		<td style="text-align: center">{attach.DOWNLOAD_COUNT}</td>
@@ -712,7 +184,7 @@
 	</table>
 	<!-- ELSE -->
 	<div class="errorbox">
-		<p>{L_NO_ENTRIES}</p>
+		<p>{L_USER_NO_ATTACHMENTS}</p>
 	</div>
 	<!-- ENDIF -->
 	<fieldset class="display-options">
@@ -729,13 +201,13 @@
 	<fieldset class="quick">
 		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
 		<p class="small"><a href="#" onclick="marklist('user_attachments', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('user_attachments', 'mark', false);">{L_UNMARK_ALL}</a></p>
+		{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 
 <!-- ELSEIF S_PERMISSIONS -->
 
-	<div style="float: right;">
+	<div style="float: {S_CONTENT_FLOW_END};">
 		<a href="{U_USER_PERMISSIONS}">&raquo; {L_SET_USERS_PERMISSIONS}</a><br />
 		<a href="{U_USER_FORUM_PERMISSIONS}">&raquo; {L_SET_USERS_FORUM_PERMISSIONS}</a>
 	</div>
@@ -745,11 +217,11 @@
 		<fieldset class="quick" style="text-align: left;">
 			{L_SELECT_FORUM}: <select name="f">{S_FORUM_OPTIONS}</select> 
 			<input class="button2" type="submit" value="{L_GO}" name="select" />
+			{S_FORM_TOKEN}
 		</fieldset>
-
 	</form>
 
-	<br clear="all" />
+	<div class="clearfix">&nbsp;</div>
 
 	<!-- INCLUDE permission_mask.html -->
 

phpBB/adm/style/acp_users_avatar.html

@@ -0,0 +1,76 @@
+	<form id="avatar_settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>
+
+	<fieldset>
+		<legend>{L_ACP_USER_AVATAR}</legend>
+	<dl>
+		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
+		<dd>{AVATAR_IMAGE}</dd>
+		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd>
+	</dl>
+	<!-- IF not S_IN_AVATAR_GALLERY -->
+		<!-- IF S_CAN_UPLOAD -->
+			<dl> 
+				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
+				<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_MAX_FILESIZE}" /><input type="file" id="uploadfile" name="uploadfile" /></dd>
+			</dl>
+			<dl>
+				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd>
+			</dl>
+		<!-- ENDIF -->
+		<!-- IF S_ALLOW_REMOTE -->
+			<dl>
+				<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+				<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd>
+			</dl>
+			<dl>
+				<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+				<dd><input name="width" type="text" id="width" size="3" value="{USER_AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{USER_AVATAR_HEIGHT}" /> <span>px</span></dd>
+			</dl>
+		<!-- ENDIF -->
+		<!-- IF S_DISPLAY_GALLERY -->
+			<dl> 
+				<dt><label>{L_AVATAR_GALLERY}:</label></dt>
+				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd>
+			</dl>
+		<!-- ENDIF -->
+	<!-- ELSE -->
+		</fieldset>
+
+		<fieldset>
+			<legend>{L_AVATAR_GALLERY}</legend>
+		<dl>
+			<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt>
+			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>
+		</dl>
+		<dl>
+			<table cellspacing="1">
+			<!-- BEGIN avatar_row -->
+			<tr> 
+				<!-- BEGIN avatar_column -->
+					<td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td>
+				<!-- END avatar_column -->
+			</tr>
+			<tr>
+				<!-- BEGIN avatar_option_column -->
+					<td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
+				<!-- END avatar_option_column -->
+			</tr>
+			<!-- END avatar_row -->
+			</table>
+		</dl>
+		</fieldset>
+		
+		<fieldset class="quick" style="margin-top: -15px;">
+			<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
+		</fieldset>
+	
+	<!-- ENDIF -->
+	</fieldset>
+
+	<fieldset class="quick">
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	
+	</form>

phpBB/adm/style/acp_users_feedback.html

@@ -0,0 +1,76 @@
+	<form id="list" method="post" action="{U_ACTION}">
+
+	<!-- IF PAGINATION -->
+	<div class="pagination">
+			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+	</div>
+	<!-- ENDIF -->
+
+	<!-- IF .log -->
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_REPORT_BY}</th>
+		<th>{L_IP}</th>
+		<th>{L_TIME}</th>
+		<th>{L_FEEDBACK}</th>
+		<th>{L_MARK}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN log -->
+		<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
+			<td>{log.USERNAME}</td>
+			<td style="text-align: center;">{log.IP}</td>
+			<td style="text-align: center;">{log.DATE}</td>
+			<td>
+				{log.ACTION}
+				<!-- IF log.DATA --><br />&#187; <span class="gensmall">[ {log.DATA} ]</span><!-- ENDIF -->
+			</td>
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td>
+		</tr>
+	<!-- END log -->
+	</tbody>
+	</table>
+	<!-- ELSE -->
+		<div class="errorbox">
+			<p>{L_NO_ENTRIES}</p>
+		</div>
+	<!-- ENDIF -->
+	
+	<fieldset class="display-options">
+		{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
+		<input class="button2" type="submit" value="{L_GO}" name="sort" />
+	</fieldset>
+	<hr />
+	<!-- IF PAGINATION -->
+	<div class="pagination">
+			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+	</div>
+	<!-- ENDIF -->
+
+	<!-- IF S_CLEARLOGS -->
+		<fieldset class="quick">
+			<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
+			<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
+			<p class="small"><a href="#" onclick="marklist('list', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false);">{L_UNMARK_ALL}</a></p>
+		</fieldset>
+	<!-- ENDIF -->
+
+	<h1>{L_ADD_FEEDBACK}</h1>
+
+	<p>{L_ADD_FEEDBACK_EXPLAIN}</p>
+
+	<fieldset>
+		<legend>{L_ACP_USER_FEEDBACK}</legend>
+		<dl>
+			<dd class="full"><textarea name="message" id="message" rows="10" cols="76"></textarea></dd>
+		</dl>
+	</fieldset>
+
+	<fieldset class="quick">
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+	</fieldset>
+	{S_FORM_TOKEN}
+	</form>

phpBB/adm/style/acp_users_overview.html

@@ -0,0 +1,144 @@
+<form id="user_overview" method="post" action="{U_ACTION}">
+
+<fieldset>
+	<legend>{L_ACP_USER_OVERVIEW}</legend>
+<dl>
+	<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_NAME_CHARS_EXPLAIN}</span></dt>
+	<dd><input type="text" id="user" name="user" value="{USER}" /></dd>
+	<!-- IF U_SWITCH_PERMISSIONS --><dd>[ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]</dd><!-- ENDIF -->
+</dl>
+<!-- IF S_USER_INACTIVE -->
+<dl>
+	<dt><label>{L_USER_IS_INACTIVE}:</label></dt>
+	<dd><strong>{USER_INACTIVE_REASON}</strong></dd>
+</dl>
+<!-- ENDIF -->
+<dl>
+	<dt><label>{L_REGISTERED}:</label></dt>
+	<dd><strong>{USER_REGISTERED}</strong></dd>
+</dl>
+<!-- IF S_USER_IP -->
+<dl>
+	<dt><label>{L_REGISTERED_IP}:</label></dt>
+	<dd><a href="{U_SHOW_IP}">{REGISTERED_IP}</a></dd>
+	<dd>[ <a href="{U_WHOIS}" onclick="popup(this.href, 700, 500, '_whois'); return false;">{L_WHOIS}</a> ]</dd>
+</dl>
+<!-- ENDIF -->
+<dl>
+	<dt><label>{L_LAST_ACTIVE}:</label></dt>
+	<dd><strong>{USER_LASTACTIVE}</strong></dd>
+</dl>
+<dl>
+	<dt><label>{L_POSTS}:</label></dt>
+	<dd><strong>{USER_POSTS}</strong></dd>
+</dl>
+<dl>
+	<dt><label>{L_WARNINGS}:</label></dt>
+	<dd><strong>{USER_WARNINGS}</strong></dd>
+</dl>
+<dl>
+	<dt><label for="user_founder">{L_FOUNDER}:</label><br /><span>{L_FOUNDER_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" name="user_founder" value="1"<!-- IF S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> /> {L_YES}</label>
+		<label><input type="radio" class="radio" name="user_founder" value="0"<!-- IF not S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> /> {L_NO}</label></dd>
+</dl>
+<dl>
+	<dt><label for="user_email">{L_EMAIL}:</label></dt>
+	<dd><input class="text medium" type="text" id="user_email" name="user_email" value="{USER_EMAIL}" /></dd>
+</dl>
+<dl>
+	<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label><br /><span>{L_CONFIRM_EMAIL_EXPLAIN}</span></dt>
+	<dd><input class="text medium" type="text" id="email_confirm" name="email_confirm" value="" /></dd>
+</dl>
+<dl>
+	<dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
+	<dd><input type="password" id="new_password" name="new_password" value="" /></dd>
+</dl>
+<dl>
+	<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
+	<dd><input type="password" id="password_confirm" name="password_confirm" value="" /></dd>
+</dl>
+
+<p class="quick">
+	<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+	<input type="hidden" name="action" value="" />
+	{S_FORM_TOKEN}
+</p>
+
+</fieldset>
+</form>
+
+<!-- IF not S_USER_FOUNDER or S_FOUNDER -->
+
+	<script type="text/javascript">
+	// <![CDATA[
+
+		function display_reason(option)
+		{
+			if (option != 'banuser' && option != 'banemail' && option != 'banip')
+			{
+				dE('reasons', -1);
+				return;
+			}
+
+			dE('reasons', 1);
+
+			element = document.getElementById('user_quick_tools').ban_reason;
+
+			if (element.value && element.value != '{LA_USER_ADMIN_BAN_NAME_REASON}' && element.value != '{LA_USER_ADMIN_BAN_EMAIL_REASON}' && element.value != '{LA_USER_ADMIN_BAN_IP_REASON}')
+			{
+				return;
+			}
+
+			if (option == 'banuser')
+			{
+				element.value = '{LA_USER_ADMIN_BAN_NAME_REASON}';
+			}
+			else if (option == 'banemail')
+			{
+				element.value = '{LA_USER_ADMIN_BAN_EMAIL_REASON}';
+			}
+			else if (option == 'banip')
+			{
+				element.value = '{LA_USER_ADMIN_BAN_IP_REASON}';
+			}
+		}
+
+	// ]]>
+	</script>
+
+	<form id="user_quick_tools" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_USER_TOOLS}</legend>
+	<dl>
+		<dt><label for="quicktools">{L_QUICK_TOOLS}:</label></dt>
+		<dd><select id="quicktools" name="action" onchange="display_reason(this.options[this.selectedIndex].value);">{S_ACTION_OPTIONS}</select></dd>
+	</dl>
+	<div style="display: none;" id="reasons">
+		<dl>
+			<dt><label for="ban_reason">{L_BAN_REASON}:</label></dt>
+			<dd><input name="ban_reason" type="text" class="text medium" maxlength="3000" id="ban_reason" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="ban_give_reason">{L_BAN_GIVE_REASON}:</label></dt>
+			<dd><input name="ban_give_reason" type="text" class="text medium" maxlength="3000" id="ban_give_reason" /></dd>
+		</dl>
+	</div>
+		<!-- IF not S_OWN_ACCOUNT -->
+			<dl>
+				<dt><label for="delete_user">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
+				<dd><input type="checkbox" class="radio" name="delete" value="1" /></dd>
+				<dd><select id="delete_user" name="delete_type"><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd>
+			</dl>
+		<!-- ENDIF -->
+
+	<p class="quick">
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+		{S_FORM_TOKEN}
+	</p>
+
+	</fieldset>
+	
+	</form>
+
+<!-- ENDIF -->

phpBB/adm/style/acp_users_prefs.html

@@ -0,0 +1,158 @@
+<script type="text/javascript">
+// <![CDATA[
+	var default_dateformat = '{A_DEFAULT_DATEFORMAT}';
+// ]]>
+</script>
+
+	<form id="user_prefs" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_UCP_PREFS_PERSONAL}</legend>
+	<dl> 
+		<dt><label for="viewemail">{L_SHOW_EMAIL}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="viewemail" value="1"<!-- IF VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="viewemail" value="0"<!-- IF not VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="massemail">{L_ADMIN_EMAIL}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="massemail" value="1"<!-- IF MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="massemail" value="0"<!-- IF not MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="allowpm">{L_ALLOW_PM}:</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt>
+		<dd><label><input type="radio" class="radio" name="allowpm" value="1"<!-- IF ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="allowpm" value="0"<!-- IF not ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="hideonline">{L_HIDE_ONLINE}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="hideonline" value="1"<!-- IF HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="hideonline" value="0"<!-- IF not HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="notifymethod">{L_NOTIFY_METHOD}:</label><br /><span>{L_NOTIFY_METHOD_EXPLAIN}</span></dt>
+		<dd><label><input type="radio" class="radio" name="notifymethod" value="0"<!-- IF NOTIFY_EMAIL --> id="notifymethod" checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label>
+			<label><input type="radio" class="radio" name="notifymethod" value="1"<!-- IF NOTIFY_IM --> id="notifymethod" checked="checked"<!-- ENDIF --><!-- IF S_JABBER_DISABLED --> disabled="disabled"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label>
+			<label><input type="radio" class="radio" name="notifymethod" value="2"<!-- IF NOTIFY_BOTH --> id="notifymethod" checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="notifypm">{L_NOTIFY_ON_PM}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="notifypm" value="1"<!-- IF NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="notifypm" value="0"<!-- IF not NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="popuppm">{L_POPUP_ON_PM}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="popuppm" value="1"<!-- IF POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="popuppm" value="0"<!-- IF not POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt>
+		<dd><select id="lang" name="lang">{S_LANG_OPTIONS}</select></dd>
+	</dl>
+	<dl> 
+		<dt><label for="style">{L_BOARD_STYLE}:</label></dt>
+		<dd><select id="style" name="style">{S_STYLE_OPTIONS}</select></dd>
+	</dl>
+	<dl> 
+		<dt><label for="tz">{L_BOARD_TIMEZONE}:</label></dt>
+		<dd><select id="tz" name="tz" style="width: 100%;">{S_TZ_OPTIONS}</select></dd>
+	</dl>
+	<dl> 
+		<dt><label for="dst">{L_BOARD_DST}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="dst" value="1"<!-- IF DST --> id="dst" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="dst" value="0"<!-- IF not DST --> id="dst" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
+		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
+		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" /></div></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_UCP_PREFS_POST}</legend>
+	<dl> 
+		<dt><label for="bbcode">{L_DEFAULT_BBCODE}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="bbcode" value="1"<!-- IF BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="bbcode" value="0"<!-- IF not BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="smilies">{L_DEFAULT_SMILIES}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="smilies" value="1"<!-- IF SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="smilies" value="0"<!-- IF not SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="sig">{L_DEFAULT_ADD_SIG}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="sig" value="1"<!-- IF ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="sig" value="0"<!-- IF not ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="notify">{L_DEFAULT_NOTIFY}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="notify" value="1"<!-- IF NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="notify" value="0"<!-- IF not NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_UCP_PREFS_VIEW}</legend>
+	<dl> 
+		<dt><label for="view_images">{L_VIEW_IMAGES}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="view_images" value="1"<!-- IF VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="view_images" value="0"<!-- IF not VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="view_flash">{L_VIEW_FLASH}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="view_flash" value="1"<!-- IF VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="view_flash" value="0"<!-- IF not VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="view_smilies">{L_VIEW_SMILIES}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="view_smilies" value="1"<!-- IF VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="view_smilies" value="0"<!-- IF not VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="view_sigs">{L_VIEW_SIGS}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="view_sigs" value="1"<!-- IF VIEW_SIGS --> id="view_sigs" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="view_sigs" value="0"<!-- IF not VIEW_SIGS --> id="view_sigss" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="view_avatars">{L_VIEW_AVATARS}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="view_avatars" value="1"<!-- IF VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="view_avatars" value="0"<!-- IF not VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="view_wordcensor">{L_DISABLE_CENSORS}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="view_wordcensor" value="1"<!-- IF VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="view_wordcensor" value="0"<!-- IF not VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label>{L_VIEW_TOPICS_DAYS}:</label></dt>
+		<dd>{S_TOPIC_SORT_DAYS}</dd>
+	</dl>
+	<dl> 
+		<dt><label>{L_VIEW_TOPICS_KEY}:</label></dt>
+		<dd>{S_TOPIC_SORT_KEY}</dd>
+	</dl>
+	<dl> 
+		<dt><label>{L_VIEW_TOPICS_DIR}:</label></dt>
+		<dd>{S_TOPIC_SORT_DIR}</dd>
+	</dl>
+	<dl> 
+		<dt><label>{L_VIEW_POSTS_DAYS}:</label></dt>
+		<dd>{S_POST_SORT_DAYS}</dd>
+	</dl>
+	<dl> 
+		<dt><label>{L_VIEW_POSTS_KEY}:</label></dt>
+		<dd>{S_POST_SORT_KEY}</dd>
+	</dl>
+	<dl> 
+		<dt><label>{L_VIEW_POSTS_DIR}:</label></dt>
+		<dd>{S_POST_SORT_DIR}</dd>
+	</dl>
+	</fieldset>
+
+	<fieldset class="quick">
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+
+	</form>

phpBB/adm/style/acp_users_profile.html

@@ -0,0 +1,66 @@
+	<form id="user_profile" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_USER_PROFILE}</legend>
+	<dl>
+		<dt><label for="icq">{L_UCP_ICQ}:</label></dt>
+		<dd><input type="text" id="icq" name="icq" value="{ICQ}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="aim">{L_UCP_AIM}:</label></dt>
+		<dd><input type="text" id="aim" name="aim" value="{AIM}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="msn">{L_UCP_MSNM}:</label></dt>
+		<dd><input type="text" id="msn" name="msn" value="{MSN}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="yim">{L_UCP_YIM}:</label></dt>
+		<dd><input type="text" id="yim" name="yim" value="{YIM}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="jabber">{L_UCP_JABBER}:</label></dt>
+		<dd><input type="text" id="jabber" name="jabber" value="{JABBER}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="website">{L_WEBSITE}:</label></dt>
+		<dd><input type="text" id="website" name="website" value="{WEBSITE}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="location">{L_LOCATION}:</label></dt>
+		<dd><input type="text" id="location" name="location" value="{LOCATION}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="occupation">{L_OCCUPATION}:</label></dt>
+		<dd><textarea id="occupation" name="occupation" rows="3" cols="30">{OCCUPATION}</textarea></dd>
+	</dl>
+	<dl>
+		<dt><label for="interests">{L_INTERESTS}:</label></dt>
+		<dd><textarea id="interests" name="interests" rows="3" cols="30">{INTERESTS}</textarea></dd>
+	</dl>
+	<dl> 
+		<dt><label for="birthday">{L_BIRTHDAY}:</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
+		<dd>{L_DAY}: <select id="birthday" name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> {L_MONTH}: <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> {L_YEAR}: <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></dd>
+	</dl>
+	</fieldset>
+
+	<!-- IF .profile_fields -->
+		<fieldset>
+			<legend>{L_USER_CUSTOM_PROFILE_FIELDS}</legend>
+		<!-- BEGIN profile_fields -->
+		<dl> 
+			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}:</label><!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></dt>
+			<dd>{profile_fields.FIELD}</dd>
+			<!-- IF profile_fields.ERROR -->
+				<dd><span class="small" style="color: red;">{profile_fields.ERROR}</span></dd>
+			<!-- ENDIF -->
+		</dl>
+		<!-- END profile_fields -->
+		</fieldset>
+	<!-- ENDIF -->
+
+	<fieldset class="quick">
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>

phpBB/adm/style/acp_users_signature.html

@@ -0,0 +1,117 @@
+<script type="text/javascript">
+// <![CDATA[
+
+	var form_name = 'user_signature';
+	var text_name = 'signature';
+
+	// Define the bbCode tags
+	var bbcode = new Array();
+	var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'<!-- BEGIN custom_tags -->, {custom_tags.BBCODE_NAME}<!-- END custom_tags -->);
+	var imageTag = false;
+
+	// Helpline messages
+	var help_line = {
+		b: '{LA_BBCODE_B_HELP}',
+		i: '{LA_BBCODE_I_HELP}',
+		u: '{LA_BBCODE_U_HELP}',
+		q: '{LA_BBCODE_Q_HELP}',
+		c: '{LA_BBCODE_C_HELP}',
+		l: '{LA_BBCODE_L_HELP}',
+		o: '{LA_BBCODE_O_HELP}',
+		p: '{LA_BBCODE_P_HELP}',
+		w: '{LA_BBCODE_W_HELP}',
+		s: '{LA_BBCODE_S_HELP}',
+		f: '{LA_BBCODE_F_HELP}',
+		e: '{LA_BBCODE_E_HELP}',
+		d: '{LA_BBCODE_D_HELP}',
+		t: '{LA_BBCODE_T_HELP}',
+		tip: '{L_STYLES_TIP}'
+		<!-- BEGIN custom_tags -->
+			,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
+		<!-- END custom_tags -->
+	}
+
+// ]]>
+</script>
+<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
+
+<form id="user_signature" method="post" action="{U_ACTION}">
+
+	<!-- IF SIGNATURE_PREVIEW -->
+		<fieldset>
+			<legend>{L_ADMIN_SIG_PREVIEW}</legend>
+			<p>{SIGNATURE_PREVIEW}</p>
+		</fieldset>
+	<!-- ENDIF -->
+
+	<fieldset>
+		<legend>{L_SIGNATURE}</legend>
+		<p>{L_SIGNATURE_EXPLAIN}</p>
+
+		<div id="format-buttons">
+			<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px;" onclick="bbstyle(2)" onmouseover="helpline('i')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px;" onclick="bbstyle(4)" onmouseover="helpline('u')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" onmouseover="helpline('q')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="t" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" />
+			<!-- IF S_BBCODE_IMG -->
+				<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" onmouseout="helpline('tip')" />
+			<!-- ENDIF -->
+			<!-- IF S_LINKS_ALLOWED -->
+				<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" onmouseover="helpline('w')" onmouseout="helpline('tip')" />
+			<!-- ENDIF -->
+			<!-- IF S_BBCODE_FLASH -->
+				<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" onmouseover="helpline('d')" onmouseout="helpline('tip')" />
+			<!-- ENDIF -->
+
+			{L_FONT_SIZE}: <select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_FONT_SIZE}" onmouseover="helpline('f')" onmouseout="helpline('tip')">
+				<option value="50">{L_FONT_TINY}</option>
+				<option value="85">{L_FONT_SMALL}</option>
+				<option value="100" selected="selected">{L_FONT_NORMAL}</option>
+				<option value="150">{L_FONT_LARGE}</option>
+				<option value="200">{L_FONT_HUGE}</option>
+			</select>
+		<!-- IF .custom_tags -->
+			<br /><br />
+			<!-- BEGIN custom_tags -->
+				<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})"<!-- IF custom_tags.BBCODE_HELPLINE !== '' --> onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')"<!-- ENDIF --> />
+			<!-- END custom_tags -->
+		<!-- ENDIF -->
+
+		</div>
+
+		<p><input type="text" class="text full" style="border: 0; background: none;" name="helpbox" value="{L_STYLES_TIP}" /></p>
+
+		<dl>
+			<dt style="width: 90px;">
+				<script type="text/javascript">
+				// <![CDATA[
+					colorPalette('v', 12, 10);
+				// ]]>
+				</script>
+			</dt>
+			<dd style="margin-left: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{SIGNATURE}</textarea></dd>
+			<dd style="margin-left: 90px; margin-top: 5px;">
+			<!-- IF S_BBCODE_ALLOWED -->
+				<label><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label>
+			<!-- ENDIF -->
+			<!-- IF S_SMILIES_ALLOWED -->
+				<label><input type="checkbox" class="radio" name="disable_smilies"{S_SMILIES_CHECKED} /> {L_DISABLE_SMILIES}</label>
+			<!-- ENDIF -->
+			<!-- IF S_LINKS_ALLOWED -->
+				<label><input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label>
+			<!-- ENDIF -->
+			</dd>
+			<dd style="margin-left: 90px; margin-top: 10px;"><strong>{L_OPTIONS}: </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>
+		</dl>
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+</form>

phpBB/adm/style/acp_words.html

@@ -4,7 +4,7 @@
 
 <!-- IF S_EDIT_WORD -->
 
-	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
 	<h1>{L_ACP_WORDS}</h1>
 
@@ -27,9 +27,9 @@
 	<p class="submit-buttons">
 		<input class="button1" type="submit" id="submit" name="save" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
 	</p>
 	</fieldset>
-
 	</form>
 
 <!-- ELSE -->
@@ -62,12 +62,15 @@
 		<td style="text-align: center;">{words.REPLACEMENT}</td>
 		<td>&nbsp;<a href="{words.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{words.U_DELETE}">{ICON_DELETE}</a>&nbsp;</td>
 	</tr>
+	<!-- BEGINELSE -->
+	<tr class="row3">
+		<td colspan="3">{L_ACP_NO_ITEMS}</td>
+	</tr>
 	<!-- END words -->
 	</tbody>
 	</table>
-
+	{S_FORM_TOKEN}
 	</fieldset>
-
 	</form>
 <!-- ENDIF -->
 

phpBB/adm/style/colour_swatch.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
@@ -8,7 +8,7 @@
 <title>{L_COLOUR_SWATCH}</title>
 
 <style type="text/css">
-<!--
+/* <![CDATA[ */
 	body {
 		background-color: #404040;
 		color: #fff;
@@ -29,14 +29,14 @@
 	img {
 		border: 0;
 	}
-//-->
+/* ]]> */
 </style>
 </head>
 
 <body>
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 	var r = 0, g = 0, b = 0;
 
 	var numberList = new Array(6);
@@ -71,7 +71,7 @@
 	{
 		opener.document.forms["{OPENER}"].{NAME}.value = color;
 	}
-//-->
+// ]]>
 </script>
 
 </body>

phpBB/adm/style/confirm_body.html

@@ -3,7 +3,7 @@
 <form id="confirm" method="post" action="{S_CONFIRM_ACTION}">
 
 <fieldset>
-	<h2>{MESSAGE_TITLE}</h2>
+	<h1>{MESSAGE_TITLE}</h1>
 	<p>{MESSAGE_TEXT}</p>
 
 	{S_HIDDEN_FIELDS}

phpBB/adm/style/confirm_body_prune.html

@@ -0,0 +1,30 @@
+<!-- INCLUDE overall_header.html -->
+
+<form id="confirm" method="post" action="{S_CONFIRM_ACTION}">
+
+<fieldset>
+	<h1>{MESSAGE_TITLE}</h1>
+	<p>{MESSAGE_TEXT}</p>
+
+	{S_HIDDEN_FIELDS}
+
+	<div style="text-align: center;">
+		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp; 
+		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
+	</div>
+
+	<h2>{L_PRUNE_USERS_LIST}</h2>
+	<!-- IF S_DEACTIVATE --><p>{L_PRUNE_USERS_LIST_DEACTIVATE}</p><!-- ELSE --><p>{L_PRUNE_USERS_LIST_DELETE}</p><!-- ENDIF -->
+
+	<br />
+	<!-- BEGIN users -->
+	&raquo; <a href="{users.U_PROFILE}">{users.USERNAME}</a><!-- IF users.U_USER_ADMIN --> [<a href="{users.U_USER_ADMIN}">{L_USER_ADMIN}</a>]<!-- ENDIF --><br />
+	<!-- END users -->
+
+	<br /><br />
+
+</fieldset>
+
+</form>
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/custom_profile_fields.html

@@ -1,32 +1,32 @@
 
 <!-- BEGIN dropdown -->
-	<select name="{dropdown.FIELD_IDENT}">
+	<select name="{dropdown.FIELD_IDENT}" id="{dropdown.FIELD_IDENT}">
 		<!-- BEGIN options --><option value="{dropdown.options.OPTION_ID}"{dropdown.options.SELECTED}>{dropdown.options.VALUE}</option><!-- END options -->
 	</select>
 <!-- END dropdown -->
 
 <!-- BEGIN text -->
-	<textarea name="{text.FIELD_IDENT}" rows="{text.FIELD_ROWS}" cols="{text.FIELD_COLS}">{text.FIELD_VALUE}</textarea>
+	<textarea name="{text.FIELD_IDENT}" id="{text.FIELD_IDENT}" rows="{text.FIELD_ROWS}" cols="{text.FIELD_COLS}">{text.FIELD_VALUE}</textarea>
 <!-- END text -->
 
 <!-- BEGIN string -->
-	<input type="text" name="{string.FIELD_IDENT}" size="{string.FIELD_LENGTH}" maxlength="{string.FIELD_MAXLEN}" value="{string.FIELD_VALUE}" />
+	<input type="text" name="{string.FIELD_IDENT}" id="{string.FIELD_IDENT}" size="{string.FIELD_LENGTH}" maxlength="{string.FIELD_MAXLEN}" value="{string.FIELD_VALUE}" />
 <!-- END string -->
 
 <!-- BEGIN bool -->
 	<!-- IF bool.FIELD_LENGTH eq 1 -->
-		<!-- BEGIN options --><input type="radio" class="radio" name="{bool.FIELD_IDENT}" value="{bool.options.OPTION_ID}"{bool.options.CHECKED} /> {bool.options.VALUE}&nbsp; &nbsp;<!-- END options -->
+		<!-- BEGIN options --><label for="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}"><input type="radio" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}" value="{bool.options.OPTION_ID}"{bool.options.CHECKED} /> {bool.options.VALUE}</label> <!-- END options -->
 	<!-- ELSE -->
-		<input type="checkbox" class="radio" name="{bool.FIELD_IDENT}" value="1"<!-- IF bool.FIELD_VALUE --> checked="checked"<!-- ENDIF --> />
+		<input type="checkbox" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}" value="1"<!-- IF bool.FIELD_VALUE --> checked="checked"<!-- ENDIF --> />
 	<!-- ENDIF -->
 <!-- END bool -->
 
 <!-- BEGIN int -->
-	<input type="text" name="{int.FIELD_IDENT}" size="{int.FIELD_LENGTH}" value="{int.FIELD_VALUE}" />
+	<input type="text" name="{int.FIELD_IDENT}" id="{int.FIELD_IDENT}" size="{int.FIELD_LENGTH}" value="{int.FIELD_VALUE}" />
 <!-- END int -->
 
 <!-- BEGIN date -->
-	<span>{L_DAY}:</span> <select name="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select>
-	<span>{L_MONTH}:</span> <select name="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select>
-	<span>{L_YEAR}:</span> <select name="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select>
+	<span>{L_DAY}:</span> <select name="{date.FIELD_IDENT}_day" id="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select>
+	<span>{L_MONTH}:</span> <select name="{date.FIELD_IDENT}_month" id="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select>
+	<span>{L_YEAR}:</span> <select name="{date.FIELD_IDENT}_year" id="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select>
 <!-- END date -->

phpBB/adm/style/editor.js

@@ -32,11 +32,22 @@ function helpline(help)
 */ 
 function initInsertions() 
 {
-	var textarea = document.forms[form_name].elements[text_name];
-	textarea.focus();
+	var doc;
+	if(document.forms[form_name])
+	{
+		doc = document;
+	}
+	else
+	{
+		doc = opener.document;
+	}
+
+	var textarea = doc.forms[form_name].elements[text_name];
 	if (is_ie && typeof(baseHeight) != 'number')
 	{
-		baseHeight = document.selection.createRange().duplicate().boundingHeight;
+		textarea.focus();
+		baseHeight = doc.selection.createRange().duplicate().boundingHeight;
+		// document.body.focus();
 	}
 }
 
@@ -48,7 +59,9 @@ function bbstyle(bbnumber)
 	if (bbnumber != -1)
 	{
 		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
-	} else {
+	}
+	else
+	{
 		insert_text('[*]');
 		document.forms[form_name].elements[text_name].focus();		
 	}
@@ -62,6 +75,7 @@ function bbfontstyle(bbopen, bbclose)
 	theSelection = false;
 		
 	var textarea = document.forms[form_name].elements[text_name];
+
 	textarea.focus();
 
 	if ((clientVer >= 4) && is_ie && is_win)
@@ -87,7 +101,8 @@ function bbfontstyle(bbopen, bbclose)
 	}
 	
 	//The new position for the cursor after adding the bbcode
-	var new_pos = getCaretPosition(textarea).start + bbopen.length;
+	var caret_pos = getCaretPosition(textarea).start;
+	var new_pos = caret_pos + bbopen.length;		
 
 	// Open tag
 	insert_text(bbopen + bbclose);
@@ -105,10 +120,10 @@ function bbfontstyle(bbopen, bbclose)
 		var range = textarea.createTextRange(); 
 		range.move("character", new_pos); 
 		range.select();
-		storeCaret(document.forms[form_name].elements[text_name]);		
+		storeCaret(textarea);
 	}
 
-	document.forms[form_name].elements[text_name].focus();
+	textarea.focus();
 	return;
 }
 
@@ -122,10 +137,12 @@ function insert_text(text, spaces, popup)
 	if (!popup)
 	{
 		textarea = document.forms[form_name].elements[text_name];
-	} else 
+	}
+	else
 	{
 		textarea = opener.document.forms[form_name].elements[text_name];
 	}
+
 	if (spaces)
 	{
 		text = ' ' + text + ' ';
@@ -152,12 +169,16 @@ function insert_text(text, spaces, popup)
 		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
 		
 	}
-
 	else
 	{
 		textarea.value = textarea.value + text;
 	}
-	document.forms[form_name].elements[text_name].focus();
+
+	if (!popup)
+	{
+		textarea.focus();
+	}
+
 }
 
 /**
@@ -280,6 +301,7 @@ function colorPalette(dir, width, height)
 {
 	var r = 0, g = 0, b = 0;
 	var numberList = new Array(6);
+	var color = '';
 
 	numberList[0] = '00';
 	numberList[1] = '40';
@@ -287,7 +309,7 @@ function colorPalette(dir, width, height)
 	numberList[3] = 'BF';
 	numberList[4] = 'FF';
 
-	document.writeln('<table cellspacing="1" cellpadding="0" border="0">');
+	document.writeln('<table class="type2">');
 
 	for (r = 0; r < 5; r++)
 	{

phpBB/adm/style/install_convert.html

@@ -11,8 +11,16 @@
 	<form id="install_convert" method="post" action="{U_ACTION}">
 
 	<h1>{TITLE}</h1>
+
 	<p>{BODY}</p>
 
+	<!-- IF S_ERROR_BOX -->
+	<div class="errorbox">
+		<h3>{ERROR_TITLE}</h3>
+		<p>{ERROR_MSG}</p>
+	</div>
+	<!-- ENDIF -->
+
 	<!-- IF S_LIST -->
 		<table cellspacing="1">
 			<caption>{L_AVAILABLE_CONVERTORS}</caption>
@@ -78,7 +86,7 @@
 			<!-- ELSE -->
 
 				<dl>
-					<dt>{checks.TITLE}:</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+					<dt><label>{checks.TITLE}:</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 					<dd>{checks.RESULT}</dd>
 				</dl>
 			<!-- ENDIF -->
@@ -112,8 +120,9 @@
 	<!-- ENDIF -->
 
 	<!-- IF L_SUBMIT -->
-		<fieldset class="submit-buttons">
 		<!-- IF L_MESSAGE --><p>{L_MESSAGE}</p><!-- ENDIF -->
+
+		<fieldset class="submit-buttons">
 			{S_HIDDEN}
 			<!-- IF L_SUBMIT --><input class="button1<!-- IF S_REFRESH --> disabled<!-- ENDIF -->" type="submit" id="submit" <!-- IF S_REFRESH -->disabled="disabled" <!-- ELSE --> onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" <!-- ENDIF -->name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
 		</fieldset>

phpBB/adm/style/install_footer.html

@@ -4,6 +4,7 @@
 			<span class="corners-bottom"><span></span></span>
 		</div>
 		</div>
+	</div>
 	
 	<!--
 		We request you retain the full copyright notice below including the link to www.phpbb.com.
@@ -17,7 +18,7 @@
 	// -->
 	
 	<div id="page-footer">
-		Powered by phpBB {VERSION} &copy; 2006 <a href="http://www.phpbb.com/">phpBB Group</a>
+		Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
 	</div>
 </div>
 

phpBB/adm/style/install_header.html

@@ -11,18 +11,45 @@
 
 <link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
+<script type="text/javascript">
+// <![CDATA[
+
+/**
+* Set display of page element
+* s[-1,0,1] = hide,toggle display,show
+*/
+function dE(n, s, type)
+{
+	if (!type)
+	{
+		type = 'block';
+	}
+
+	var e = document.getElementById(n);
+	if (!s)
+	{
+		s = (e.style.display == '' || e.style.display == 'block') ? -1 : 1;
+	}
+	e.style.display = (s == 1) ? type : 'none';
+}
+
+// ]]>
+</script>
+
 </head>
 
-<body>
+<body class="{S_CONTENT_DIRECTION}">
 <div id="wrap">
 	<div id="page-header">
 		<h1>{L_INSTALL_PANEL}</h1>
+		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
 		<!-- IF S_LANG_SELECT -->
-		<br />
-		<form method="post">
+		<form method="post" action="">
+			<fieldset class="nobg">
 				<label for="language">{L_SELECT_LANG}:</label>
 				{S_LANG_SELECT}
 				<input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" />
+			</fieldset>
 		</form>
 		<!-- ENDIF -->
 	</div>
@@ -36,6 +63,7 @@
 			</ul>
 		</div>
 
+		<div id="acp">
 		<div class="panel">
 			<span class="corners-top"><span></span></span>
 				<div id="content">
@@ -50,4 +78,4 @@
 						</ul>
 					</div>
 	
-					<div id="main">
+					<div id="main" class="install-body">

phpBB/adm/style/install_install.html

@@ -1,6 +1,6 @@
 <!-- INCLUDE install_header.html -->
 
-<form id="install_install" method="post" action="{U_ACTION}">
+<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
 
 <!-- IF TITLE --><h1>{TITLE}</h1><!-- ENDIF -->
 <!-- IF BODY --><p>{BODY}</p><!-- ENDIF -->
@@ -68,7 +68,7 @@
 	<fieldset class="submit-buttons">
 		<legend>{L_SUBMIT}</legend>
 		{S_HIDDEN}
-		<!-- IF L_SUBMIT --><input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
+		<!-- IF L_SUBMIT --><input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
 	</fieldset>
 <!-- ENDIF -->
 

phpBB/adm/style/install_update.html

@@ -1,28 +1,56 @@
 <!-- INCLUDE install_header.html -->
 
 <script type="text/javascript">
-<!--
-	function popup(url, width, height)
+// <![CDATA[
+	function popup(url, width, height, name)
 	{
-		window.open(url.replace(/&amp;/g, '&'), 'diff', 'height=' + height + ',resizable=yes,scrollbars=yes,width=' + width);
+		if (!name)
+		{
+			name = '_popup';
+		}
+
+		window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
 		return false;
 	}
-//-->
+
+	function diff_popup(url)
+	{
+		popup(url, 950, 600, '_diff');
+		return false;
+	}
+// ]]>
 </script>
 
 <!-- IF S_ERROR -->
-	<h1>{L_NOTICE}</h1>
-	<p style="color: red;">{ERROR_MSG}</p>
+	<div class="errorbox" style="margin-top: 0;">
+		<h3>{L_NOTICE}</h3>
+		<p>{ERROR_MSG}</p>
+	</div>
+<!-- ENDIF -->
+
+<!-- IF S_IN_PROGRESS -->
+
+	<div class="successbox" style="margin-top: 0;">
+		<h3>{L_IN_PROGRESS}</h3>
+		<p>{L_IN_PROGRESS_EXPLAIN}</p>
+	</div>
+
+<!-- ELSEIF S_INTRO -->
+
+	<!-- IF S_WARNING -->
+	<div class="successbox" style="margin-top: 0;">
+		<h3>{L_NOTICE}</h3>
+		<p>{WARNING_MSG}</p>
+	</div>
 	<!-- ENDIF -->
 
-<!-- IF S_INTRO -->
 	<form id="install_update" method="post" action="{U_ACTION}">
 
 	<h1>{L_UPDATE_INSTALLATION}</h1>
 	<p>{L_UPDATE_INSTALLATION_EXPLAIN}</p>
 
 	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="submit" value="{L_NEXT}" />
+		<input class="button1" type="submit" name="submit" value="{L_NEXT_STEP}" />
 	</fieldset>
 
 	</form>
@@ -35,7 +63,7 @@
 	<p>{L_UPDATE_SUCCESS_EXPLAIN}</p>
 
 	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES_AGAIN}" />
+		<input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
 	</fieldset>
 
 	</form>
@@ -62,12 +90,18 @@
 		<legend></legend>
 	<dl>
 		<dt><label>{L_CURRENT_VERSION}</label></dt>
-		<dd><b>{CURRENT_VERSION}</b></dd>
+		<dd><strong>{CURRENT_VERSION}</strong></dd>
 	</dl>
 	<dl>
 		<dt><label>{L_LATEST_VERSION}</label></dt>
-		<dd><b>{LATEST_VERSION}</b></dd>
+		<dd><strong>{LATEST_VERSION}</strong></dd>
 	</dl>
+	<!-- IF PACKAGE_VERSION and not S_UP_TO_DATE -->
+	<dl>
+		<dt><label>{L_PACKAGE_UPDATES_TO}</label></dt>
+		<dd><strong>{PACKAGE_VERSION}</strong></dd>
+	</dl>
+	<!-- ENDIF -->
 	</fieldset>
 
 	<!-- IF not S_UP_TO_DATE -->
@@ -100,8 +134,6 @@
 
 		<p>
 			{L_PERFORM_DATABASE_UPDATE_EXPLAIN}<br />
-			<br />
-			<a href="{U_DB_UPDATE}" target="update"><strong>&raquo; {L_RUN_DATABASE_SCRIPT} &laquo;</strong></a>
 		</p>
 
 		<br /><br />
@@ -109,7 +141,9 @@
 		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
 
 		<fieldset class="submit-buttons">
-			<input class="button1" type="submit" name="db_update" value="{L_CHECK_UPDATE_DATABASE}" />
+			<a href="{U_DB_UPDATE}" class="button1">{L_RUN_DATABASE_SCRIPT}</a>
+
+			<!-- input class="button1" type="submit" name="db_update" value="{L_CHECK_UPDATE_DATABASE}" / -->
 		</fieldset>
 
 		</form>
@@ -162,13 +196,16 @@
 			<!-- BEGIN files -->
 				<!-- IF files.S_STATUS -->
 					<!-- IF not files.S_FIRST_ROW -->
-						</fieldset>
+						</fieldset></div>
 					<!-- ENDIF -->
 
 					<h2>{files.TITLE}</h2>
 
+					<!-- 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>
 
+					<div style="display: <!-- IF files.STATUS neq 'not_modified' -->block<!-- ELSE -->none<!-- ENDIF -->;" id="{files.STATUS}">
+
 					<fieldset>
 						<legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
 				<!-- ELSE -->
@@ -185,28 +222,48 @@
 								<br /><span>{L_NUM_CONFLICTS}: {files.NUM_CONFLICTS}</span>
 								<!-- ENDIF -->
 							</dt>
-							<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="popup('{files.U_SHOW_DIFF}', 700, 500); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
+							<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%;"><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" />&nbsp; {L_DO_NOT_UPDATE}</dd>
+								<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%"><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="1" checked="checked" />&nbsp; {L_MERGE_NO_MERGE_NEW_OPTION}</dt>
-								<dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="popup('{files.U_VIEW_NO_MERGE_NEW}', 700, 500); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
-							</dl>
-							<dl>
-								<dt style="width: 60%"><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="2" />&nbsp; {L_MERGE_NO_MERGE_MOD_OPTION}</dt>
-								<dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NO_MERGE_MOD}" onclick="popup('{files.U_VIEW_NO_MERGE_MOD}', 700, 500); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
+								<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%"><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="3" />&nbsp; {L_MERGE_NEW_FILE_OPTION}</dt>
-										<dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NEW_FILE}" onclick="popup('{files.U_VIEW_NEW_FILE}', 700, 500); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
+										<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%"><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="4" />&nbsp; {L_MERGE_MOD_FILE_OPTION}</dt>
-										<dd style="margin-left: 60%;">[<a href="{files.U_VIEW_MOD_FILE}" onclick="popup('{files.U_VIEW_MOD_FILE}', 700, 500); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
+										<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 -->
@@ -218,11 +275,11 @@
 
 							<!-- ENDIF -->
 						<!-- ENDIF -->
-					<!-- IF files.STATUS neq 'conflict' --></dl><!-- ENDIF -->
+					<!-- IF files.STATUS neq 'conflict' and files.STATUS neq 'modified' --></dl><!-- ENDIF -->
 				<!-- ENDIF -->
 			<!-- END files -->
 
-			</fieldset>
+			</fieldset></div>
 		<!-- ENDIF -->
 
 		<br />
@@ -247,14 +304,14 @@
 
 <!-- ELSEIF S_DOWNLOAD_FILES -->
 
-	<h1>{L_SELECT_DOWNLOAD_FORMAT}</h1>
+	<h1>{L_DOWNLOAD_UPDATE_METHOD}</h1>
 
 	<p>{L_DOWNLOAD_UPDATE_METHOD_EXPLAIN}</p>
 
 	<form id="install_update" method="post" action="{U_ACTION}">
 
 	<fieldset>
-		<legend>{L_DOWNLOAD_AS}</legend>
+		<legend>{L_SELECT_DOWNLOAD_FORMAT}</legend>
 	<dl>
 		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
 		<dd>{RADIO_BUTTONS}</dd>
@@ -312,7 +369,7 @@
 		<legend>{L_FTP_SETTINGS}</legend>
 	<dl>
 		<dt><label>{L_UPLOAD_METHOD}:</label></dt>
-		<dd><b>{UPLOAD_METHOD}</b></dd>
+		<dd><strong>{UPLOAD_METHOD}</strong></dd>
 	</dl>
 	<!-- BEGIN data -->
 	<dl>

phpBB/adm/style/install_update_diff.html

@@ -12,7 +12,7 @@
 <link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 function resize_panel()
 {
 	var block = document.getElementById('codepanel');	
@@ -28,25 +28,30 @@ function resize_panel()
 		//whatever IE needs to do this
 	}	
 }
--->
+// ]]>
 </script>
 
 <style type="text/css">
-<!--
+/* <![CDATA[ */
 
 #main {
-	font-size: 1.25em;
+	font-size: 1em;
 	line-height: 0.7em;
 	margin: 0;
 	padding: 0;
 	width: 99%;
 }
 
+#diff_content {
+	padding: 30px 10px 10px;
+}
+
 <!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
 div#codepanel {
 	overflow: auto;
 	width: 100%;
 	height: 350px;
+	display: inline-block;
 }
 <!-- ELSE -->
 div#codepanel {	
@@ -54,7 +59,7 @@ div#codepanel {
 }
 <!-- ENDIF -->
 
-<!-- IF not IS_DIFF_NEW_FILE -->
+<!-- IF not S_DIFF_NEW_FILE -->
 /**
 * Unified Diff
 */
@@ -193,7 +198,7 @@ table.hrdiff caption span {
 
 <!-- ENDIF -->
 
-//-->
+/* ]]> */
 </style>
 
 </head>
@@ -214,24 +219,27 @@ table.hrdiff caption span {
 		<h1>{L_VIEWING_FILE_DIFF}</h1>
 <!-- ENDIF -->
 <!-- IF not S_DIFF_NEW_FILE -->
-		<br />
+		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
 		<form method="post">
+		<fieldset class="quick">
 			<label for="diff_mode">{L_SELECT_DIFF_MODE}:</label>
 			<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>
 
 			<input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" />
+		</fieldset>
 		</form>
 <!-- ENDIF -->
 	</div>
 	
 	<div id="page-body">
+		<div id="acp">
 		<div class="panel" id="codepanel">
 			<span class="corners-top"><span></span></span>
-				<div id="content">
+				<div id="diff_content">
 					<div id="main">
 
 <!-- IF S_DIFF_CONFLICT_FILE -->
-		<div style="float: right;"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
+		<div style="float: {S_CONTENT_FLOW_END};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
 <!-- ENDIF -->
 						{DIFF_CONTENT}
 					</div>
@@ -239,6 +247,7 @@ table.hrdiff caption span {
 			<span class="corners-bottom"><span></span></span>
 		</div>
 		</div>
+	</div>
 	
 
 <!-- INCLUDE simple_footer.html -->

phpBB/adm/style/overall_footer.html

@@ -4,11 +4,12 @@
 			<span class="corners-bottom"><span></span></span>
 		</div>
 		</div>
+	</div>
 	
 	<!--
 		We request you retain the full copyright notice below including the link to www.phpbb.com.
 		This not only gives respect to the large amount of time given freely by the developers
-		but also helps build interest, traffic and use of phpBB2. If you (honestly) cannot retain
+		but also helps build interest, traffic and use of phpBB. If you (honestly) cannot retain
 		the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
 		"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
 		forums may be affected.
@@ -18,7 +19,7 @@
 	
 	<div id="page-footer">
 		<!-- IF S_COPYRIGHT_HTML -->
-			Powered by phpBB {VERSION} &copy; 2006 <a href="http://www.phpbb.com/">phpBB Group</a>
+			Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
 			<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 		<!-- ENDIF -->
 

phpBB/adm/style/overall_header.html

@@ -12,11 +12,14 @@
 <link href="style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 var jump_page = '{LA_JUMP_PAGE}:';
 var on_page = '{ON_PAGE}';
 var per_page = '{PER_PAGE}';
-var base_url = '{BASE_URL}';
+var base_url = '{A_BASE_URL}';
+
+var menu_state = 'shown';
+
 
 /**
 * Jump to page
@@ -78,46 +81,90 @@ function marklist(id, name, state)
 	}
 }
 
-/**
-* Open trace popup
-*/
-function trace(link)
-{
-	window.open(link.replace(/&amp;/g, '&'), '_trace', 'height=515, resizable=yes, scrollbars=yes, width=680');
-	return false;
-}
-
 /**
 * Find a member
 */
-function find_username()
+function find_username(url)
 {
-	<!-- IF UA_FIND_USERNAME -->
-	window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=570, resizable=yes, scrollbars=yes, width=760');
-	<!-- ENDIF -->
+	popup(url, 760, 570, '_usersearch');
 	return false;
 }
 
 /**
-* Color swatch
+* Window popup
 */
-function swatch(field)
+function popup(url, width, height, name)
 {
-	<!-- IF UA_SWATCH -->
-	window.open('{UA_SWATCH}' + field, '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636');
-	<!-- ENDIF -->
+	if (!name)
+	{
+		name = '_popup';
+	}
+
+	window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
 	return false;
 }
 
-//-->
+/**
+* Hiding/Showing the side menu
+*/
+function switch_menu()
+{
+	var menu = document.getElementById('menu');
+	var main = document.getElementById('main');
+	var toggle = document.getElementById('toggle');
+	var handle = document.getElementById('toggle-handle');
+
+	switch (menu_state)
+	{
+		// hide
+		case 'shown':
+			main.style.width = '93%';
+			menu_state = 'hidden';
+			menu.style.display = 'none';
+			toggle.style.width = '20px';
+			handle.style.backgroundImage = 'url(images/toggle.gif)';
+			handle.style.backgroundRepeat = 'no-repeat';
+
+			<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
+				handle.style.backgroundPosition = '0% 50%';
+				toggle.style.left = '96%';
+			<!-- ELSE -->
+				handle.style.backgroundPosition = '100% 50%';
+				toggle.style.left = '0';
+			<!-- ENDIF -->
+		break;
+
+		// show
+		case 'hidden':
+			main.style.width = '76%';
+			menu_state = 'shown';
+			menu.style.display = 'block';
+			toggle.style.width = '5%';
+			handle.style.backgroundImage = 'url(images/toggle.gif)';
+			handle.style.backgroundRepeat = 'no-repeat';
+
+			<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
+				handle.style.backgroundPosition = '100% 50%';
+				toggle.style.left = '75%';
+			<!-- ELSE -->
+				handle.style.backgroundPosition = '0% 50%';
+				toggle.style.left = '15%';
+			<!-- ENDIF -->
+		break;
+	}
+}
+
+// ]]>
 </script>
 </head>
 
 <body class="{S_CONTENT_DIRECTION}">
+
 <div id="wrap">
 	<div id="page-header">
 		<h1>{L_ADMIN_PANEL}</h1>
 		<p><a href="{U_ADM_INDEX}">{L_ADMIN_INDEX}</a> &bull; <a href="{U_INDEX}">{L_FORUM_INDEX}</a></p>
+		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
 	</div>
 	
 	<div id="page-body">
@@ -129,9 +176,14 @@ function swatch(field)
 			</ul>
 		</div>
 
+		<div id="acp">
 		<div class="panel">
 			<span class="corners-top"><span></span></span>
 				<div id="content">
+					<!-- IF not S_USER_NOTICE --> 
+					<div id="toggle">						
+						<a id="toggle-handle" accesskey="m" title="{L_MENU_TOGGLE}" onclick="switch_menu(); return false;" href="#"></a></div>
+					<!-- ENDIF -->
 					<div id="menu">
 						<p>{L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [&nbsp;<a href="{U_LOGOUT}">{L_LOGOUT}</a>&nbsp;]</p>
 						<ul>

phpBB/adm/style/permission_mask.html

@@ -1,6 +1,6 @@
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 	var active_pmask = '0';
 	var active_fmask = '0';
 	var active_cat = '0';
@@ -12,32 +12,32 @@
 	<!-- IF S_ROLE_JS_ARRAY -->
 		{S_ROLE_JS_ARRAY}
 	<!-- ENDIF -->
-//-->
+// ]]>
 </script>
 <script type="text/javascript" src="style/permissions.js"></script>
 
-
 <!-- BEGIN p_mask -->
-
 <div class="clearfix"></div>
 <h3>{p_mask.NAME}<!-- IF p_mask.S_LOCAL --> <span class="small"> [{p_mask.L_ACL_TYPE}]</span><!-- ENDIF --></h3>
 
 <!-- BEGIN f_mask -->
-
-<fieldset class="perm" id="perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
+<div class="clearfix"></div>
+<fieldset class="permissions" id="perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
 	<legend id="legend{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
 		<!-- IF not p_mask.S_VIEW -->
-			<input type="checkbox" style="display: none;" class="perm_cb" name="inherit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" id="checkbox{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" value="1" onclick="toggle_opacity('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')" /> 
+			<input type="checkbox" style="display: none;" class="permissions-checkbox" name="inherit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" id="checkbox{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" value="1" onclick="toggle_opacity('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')" /> 
 		<!-- ELSE -->
 		<!-- ENDIF -->
-		
-		{p_mask.f_mask.NAME}
+		<!-- IF p_mask.f_mask.PADDING --><span class="padding">{p_mask.f_mask.PADDING}{p_mask.f_mask.PADDING}</span><!-- ENDIF -->{p_mask.f_mask.NAME}
 	</legend>
 	<!-- IF not p_mask.S_VIEW -->
-		<div class="perm_switch">
-			<a href="#" onclick="swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '0', true); return false;">{L_ADVANCED_PERMISSIONS}</a>
+		<div class="permissions-switch">
+			<div class="permissions-reset">
+				<a href="#" onclick="mark_options('perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}', 'y'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_ALL_YES}</a> &middot; <a href="#" onclick="mark_options('perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}', 'u'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_ALL_NO}</a> &middot; <a href="#" onclick="mark_options('perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}', 'n'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_ALL_NEVER}</a>
 			</div>
-		<dl class="perm_simple">
+			<a href="#" onclick="swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '0', true); return false;">{L_ADVANCED_PERMISSIONS}</a><!-- IF not p_mask.S_VIEW and p_mask.f_mask.S_CUSTOM --> *<!-- ENDIF -->
+		</div>
+		<dl class="permissions-simple">
 			<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}:</label></dt>
 			<!-- IF p_mask.f_mask.S_ROLE_OPTIONS -->
 				<dd style="margin-left: 20%"><select id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" onchange="set_role_settings(this.options[selectedIndex].value, 'advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')">{p_mask.f_mask.S_ROLE_OPTIONS}</select></dd>
@@ -49,20 +49,24 @@
 
 	<!-- BEGIN category -->
 		<!-- IF p_mask.f_mask.category.S_FIRST_ROW -->
-			<div class="perm_advanced" id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}"<!-- IF not p_mask.S_VIEW --> style="display: none;"<!-- ENDIF -->>
+			<!-- IF not p_mask.S_VIEW -->
+				<div class="permissions-advanced" id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" style="display: none;">
+			<!-- ELSE -->
+				<div class="permissions-advanced" id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
+			<!-- ENDIF -->
 
-			<div class="perm_cat">
+			<div class="permissions-category">
 				<ul>
 		<!-- ENDIF -->
  		
 		<!-- IF p_mask.f_mask.category.S_YES -->
-			<li class="perm_preset_yes<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
+			<li class="permissions-preset-yes<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
 		<!-- ELSEIF p_mask.f_mask.category.S_NEVER -->
-			<li class="perm_preset_never<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
+			<li class="permissions-preset-never<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
 		<!-- ELSEIF p_mask.f_mask.category.S_NO -->
-			<li class="perm_preset_no<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
+			<li class="permissions-preset-no<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
 		<!-- ELSE -->
-			<li class="perm_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}">
+			<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>{category.CAT_NAME}</span></a></li>
 	<!-- END category -->
@@ -70,59 +74,64 @@
 			</div>
 
 	<!-- BEGIN category -->
-		<div class="perm_panel" id="options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" <!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
+		<div class="permissions-panel" id="options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" <!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
 			<span class="corners-top"><span></span></span>
 			<div class="tablewrap">
 				<table id="table{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" cellspacing="1">
 				<colgroup>
-					<col class="permissions_name" />
-					<col class="permissions_yes" />
-					<col class="permissions_no" />
+					<col class="permissions-name" />
+					<col class="permissions-yes" />
+					<col class="permissions-no" />
 					<!-- IF not p_mask.S_VIEW -->
-						<col class="permissions_never" />
+						<col class="permissions-never" />
 					<!-- ENDIF -->
 				</colgroup>
 				<thead>
 				<tr>
 					<th class="name" scope="col"><strong>{L_ACL_SETTING}</strong></th>
 				<!-- IF p_mask.S_VIEW -->
-					<th style="width: 40px;" class="value" scope="col">{L_ACL_YES}</th>
-					<th style="width: 40px;" class="value" scope="col">{L_ACL_NEVER}</th>
+					<th class="value" scope="col">{L_ACL_YES}</th>
+					<th class="value" scope="col">{L_ACL_NEVER}</th>
 				<!-- ELSE -->
-					<th class="value" scope="col"><a href="#" onclick="mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'y'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false, 'yes'); return false;">{L_ACL_YES}</a></th>
-					<th class="value" scope="col"><a href="#" onclick="mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'u'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false, 'no'); return false;">{L_ACL_NO}</a></th>
-					<th class="value" scope="col"><a href="#" onclick="mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'n'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false, 'never'); return false;">{L_ACL_NEVER}</a></th>
+					<th class="value permissions-yes" scope="col"><a href="#" onclick="mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'y'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false, 'yes'); return false;">{L_ACL_YES}</a></th>
+					<th class="value permissions-no" scope="col"><a href="#" onclick="mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'u'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false, 'no'); return false;">{L_ACL_NO}</a></th>
+					<th class="value permissions-never" scope="col"><a href="#" onclick="mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'n'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false, 'never'); return false;">{L_ACL_NEVER}</a></th>
 				<!-- ENDIF -->
 				</tr>
 				</thead>
 				<tbody>
 				<!-- BEGIN mask -->
 					<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
-					<th class="permission_name<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->"><!-- IF p_mask.f_mask.category.mask.U_TRACE --><a href="#" class="trace" onclick="trace('{p_mask.f_mask.category.mask.U_TRACE}'); return false;" title="{L_TRACE_SETTING}"><img src="images/icon_trace.gif" alt="{L_TRACE_SETTING}" /></a> <!-- ENDIF -->{p_mask.f_mask.category.mask.PERMISSION}</th>
+					<th class="permissions-name<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->"><!-- IF p_mask.f_mask.category.mask.U_TRACE --><a href="{p_mask.f_mask.category.mask.U_TRACE}" class="trace" onclick="popup(this.href, 750, 515, '_trace'); return false;" title="{L_TRACE_SETTING}"><img src="images/icon_trace.gif" alt="{L_TRACE_SETTING}" /></a> <!-- ENDIF -->{p_mask.f_mask.category.mask.PERMISSION}</th>
 					<!-- IF p_mask.S_VIEW -->
 						<td<!-- IF p_mask.f_mask.category.mask.S_YES --> class="yes"<!-- ENDIF -->>&nbsp;</td>
 						<td<!-- IF p_mask.f_mask.category.mask.S_NEVER --> class="never"<!-- ENDIF -->></td>
 					<!-- ELSE -->
-						<td><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_y"><input onchange="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_y" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></label></td>
-						<td><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_u"><input onchange="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_u" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_NO --> checked="checked"<!-- ENDIF --> value="-1" /></label></td>
-						<td><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_n"><input onchange="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_n" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_NEVER --> checked="checked"<!-- ENDIF --> value="0" /></label></td>
+						<td class="permissions-yes"><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_y"><input onclick="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_y" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></label></td>
+						<td class="permissions-no"><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_u"><input onclick="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_u" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_NO --> checked="checked"<!-- ENDIF --> value="-1" /></label></td>
+						<td class="permissions-never"><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_n"><input onclick="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_n" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_NEVER --> checked="checked"<!-- ENDIF --> value="0" /></label></td>
 					<!-- ENDIF -->
 				</tr>
 				<!-- END mask -->
 				</tbody>
 				</table>
 			</div>
+			
 			<!-- IF not p_mask.S_VIEW -->
 			<fieldset class="quick" style="margin-right: 11px;">
 				<p class="small">{L_APPLY_PERMISSIONS_EXPLAIN}</p>
 				<input class="button1" type="submit" name="psubmit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" value="{L_APPLY_PERMISSIONS}" />
+				<!-- IF .p_mask.f_mask gt 1 or .p_mask gt 1 -->
 					<p class="small"><a href="#" onclick="reset_opacity(0, '{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="reset_opacity(1, '{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_UNMARK_ALL}</a></p>
+				<!-- ENDIF -->
 			</fieldset>
 		
 			<!-- ENDIF -->
+
 			<span class="corners-bottom"><span></span></span>
 		</div>
 	<!-- END category -->
+			<div class="clearfix"></div>
 	</div>
 </fieldset>
 <!-- END f_mask -->

phpBB/adm/style/permission_trace.html

@@ -2,7 +2,7 @@
 
 <div style="background-color: #fff; padding: 10px; margin-top: 10px;" class="permissions">
 
-	<!-- IF U_BACK --><a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a><!-- ENDIF -->
+	<!-- IF U_BACK --><a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a><!-- ENDIF -->
 
 	<h3>{L_TRACE_FOR}: {PERMISSION_USERNAME} / <!-- IF FORUM_NAME -->{FORUM_NAME} / <!-- ENDIF -->{PERMISSION} </h3>
 
@@ -41,11 +41,18 @@
 		<td>{trace.INFORMATION}</td>
 	</tr>
 	<!-- END trace -->
+	<tr class="row2">
+		<td style="white-space: nowrap;"><strong>{L_TRACE_RESULT}</strong></td>
+		<td colspan="2" style="text-align: center;" class="<!-- IF S_RESULT_NEVER -->never<!-- ELSEIF S_RESULT_YES -->yes<!-- ELSE -->no<!-- ENDIF -->">
+		<!-- IF S_RESULT_NEVER -->{L_ACL_NEVER}<!-- ELSEIF S_RESULT_YES -->{L_ACL_YES}<!-- ELSE -->{L_ACL_NO}<!-- ENDIF -->
+		</td>
+		<td>{L_RESULTING_PERMISSION}</td>
+	</tr>
 	</tbody>
 	</table>
 
 	<br />
 
-<!-- INCLUDE simple_footer.html -->
-
 </div>
+
+<!-- INCLUDE simple_footer.html -->

phpBB/adm/style/permissions.js

@@ -4,7 +4,7 @@
 */
 function display_checkboxes(status) 
 {
-	var form = document.getElementById('set_permissions');
+	var form = document.getElementById('set-permissions');
 	var cb = document.getElementsByTagName('input');
 	var display;
 
@@ -21,7 +21,7 @@ function display_checkboxes(status)
 	
 	for (var i = 0; i < cb.length; i++ )
 	{
-		if (cb[i].className == 'perm_cb')
+		if (cb[i].className == 'permissions-checkbox')
 		{
 			cb[i].style.display = display;
 		}
@@ -67,7 +67,7 @@ function toggle_opacity(block_id) {
 * except_id = id of the element not to hide
 */
 function reset_opacity(status, except_id) {
-	var perm = document.getElementById('set_permissions');
+	var perm = document.getElementById('set-permissions');
 	var fs = perm.getElementsByTagName('fieldset');
 	var opacity = 5;
 
@@ -90,7 +90,7 @@ function reset_opacity(status, except_id) {
 	}
 
 	//reset checkboxes too
-	marklist('set_permissions', 'inherit', !status);
+	marklist('set-permissions', 'inherit', !status);
 }
 
 
@@ -132,7 +132,7 @@ function set_colours(id, init, quick)
 
 	if (typeof(quick) != 'undefined') 
 	{
-		tab.className = 'perm_preset_' + quick + ' activetab';
+		tab.className = 'permissions-preset-' + quick + ' activetab';
 		return;
 	}
 
@@ -168,11 +168,11 @@ function set_colours(id, init, quick)
 
 	if (init)
 	{
-		tab.className = 'perm_preset_' + colour;
+		tab.className = 'permissions-preset-' + colour;
 	}
 	else
 	{
-		tab.className = 'perm_preset_' + colour + ' activetab';
+		tab.className = 'permissions-preset-' + colour + ' activetab';
 	}
 }
 
@@ -188,7 +188,7 @@ function init_colours(block_id)
 
 	for (var i = 0; i < panels.length; i++)
 	{
-		if(panels[i].className == 'perm_panel')
+		if(panels[i].className == 'permissions-panel')
 		{
 			set_colours(panels[i].id.replace(/options/, ''), true);
 		}

phpBB/adm/style/progress_bar.html

@@ -1,7 +1,7 @@
 <!-- INCLUDE simple_header.html -->
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 	/**
 	* Close previously opened popup
 	*/
@@ -22,7 +22,7 @@
 		setTimeout("close_popup()", 1000);
 		return 0;
 	}
-//-->
+// ]]>
 </script>
 
 <div class="successbox">
@@ -32,9 +32,9 @@
 </div>
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 	close_popup();
-//-->
+// ]]>
 </script>
 
 <!-- INCLUDE simple_footer.html -->

phpBB/adm/style/simple_footer.html

@@ -1,11 +1,11 @@
-		<div style="text-align: right;"><a href="#" onclick="self.close(); return false;">{L_CLOSE_WINDOW}</a></div>
+		<div style="text-align: {S_CONTENT_FLOW_END};"><a href="#" onclick="self.close(); return false;">{L_CLOSE_WINDOW}</a></div>
 	<br /><br />
 </div>
 
 <!--
 	We request you retain the full copyright notice below including the link to www.phpbb.com.
 	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB2. If you (honestly) cannot retain
+	but also helps build interest, traffic and use of phpBB. If you (honestly) cannot retain
 	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
 	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
 	forums may be affected.
@@ -16,7 +16,7 @@
 <div id="page-footer">
 
 	<!-- IF S_COPYRIGHT_HTML -->
-		<br />Powered by phpBB {VERSION} &copy; 2006 <a href="http://www.phpbb.com/">phpBB Group</a>
+		<br />Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 	<!-- ENDIF -->
 

phpBB/adm/style/simple_header.html

@@ -12,11 +12,25 @@
 <link href="style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
 <script type="text/javascript">
-<!--
+// <![CDATA[
 var jump_page = '{LA_JUMP_PAGE}:';
 var on_page = '{ON_PAGE}';
 var per_page = '{PER_PAGE}';
-var base_url = '{BASE_URL}';
+var base_url = '{A_BASE_URL}';
+
+/**
+* Window popup
+*/
+function popup(url, width, height, name)
+{
+	if (!name)
+	{
+		name = '_popup';
+	}
+
+	window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
+	return false;
+}
 
 /**
 * Jump to page
@@ -76,29 +90,16 @@ function marklist(id, name, state)
 /**
 * Find a member
 */
-function find_username()
+function find_username(url)
 {
-	<!-- IF UA_FIND_USERNAME -->
-	window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=570, resizable=yes, scrollbars=yes, width=760');
-	<!-- ENDIF -->
+	popup(url, 760, 570, '_usersearch');
 	return false;
 }
 
-/**
-* Color swatch
-*/
-function swatch(field)
-{
-	<!-- IF UA_SWATCH -->
-	window.open('{UA_SWATCH}' + field, '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636');
-	<!-- ENDIF -->
-	return false;
-}
-
-//-->
+// ]]>
 </script>
 </head>
 
 <body class="{S_CONTENT_DIRECTION}">
 
-<div id="page-body" style="padding: 0 10px;">
+<div id="page-body" class="simple-page-body">

phpBB/adm/style/viewsource.html

@@ -1,10 +1,10 @@
 <!-- INCLUDE simple_header.html -->
-
+<div id="acp" style="padding: 0;">
 <div class="panel" style="padding: 10px;">
-
+<div style="overflow: auto;">
 	<h1>{FILENAME}</h1>
 
-	<table>
+	<table class="type2">
 	<tbody>
 	<!-- BEGIN source -->
 		<tr valign="top">
@@ -16,5 +16,6 @@
 	</table>
 
 </div>
-
+</div>
+</div>
 <!-- INCLUDE simple_footer.html -->

phpBB/adm/swatch.php

@@ -12,7 +12,8 @@
 * @ignore
 */
 define('IN_PHPBB', true);
-$phpbb_root_path = './../';
+define('ADMIN_START', true);
+$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 include($phpbb_root_path . 'common.' . $phpEx);
 
@@ -28,9 +29,16 @@ $template->set_filenames(array(
 	'body' => 'colour_swatch.html')
 );
 
+$form = request_var('form', '');
+$name = request_var('name', '');
+
+// We validate form and name here, only id/class allowed
+$form = (!preg_match('/^[a-z0-9_-]+$/i', $form)) ? '' : $form;
+$name = (!preg_match('/^[a-z0-9_-]+$/i', $name)) ? '' : $name;
+
 $template->assign_vars(array(
-	'OPENER'		=> addslashes(request_var('form', '')),
-	'NAME'			=> request_var('name', ''),
+	'OPENER'		=> $form,
+	'NAME'			=> $name,
 	'T_IMAGES_PATH'	=> "{$phpbb_root_path}images/",
 
 	'S_USER_LANG'			=> $user->lang['USER_LANG'],

phpBB/cache/.htaccess

@@ -1,4 +1,4 @@
-<Limit GET POST PUT>
+<Files *>
 	Order Allow,Deny
 	Deny from All
-</Limit>
+</Files>

phpBB/cache/index.htm

@@ -0,0 +1,10 @@
+<html>
+<head>
+<title></title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body bgcolor="#FFFFFF" text="#000000">
+
+</body>
+</html>

phpBB/common.php

@@ -65,9 +65,27 @@ function deregister_globals()
 	{
 		if (isset($not_unset[$varname]))
 		{
-			// Hacking attempt. No point in continuing.
+			// Hacking attempt. No point in continuing unless it's a COOKIE
+			if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS']))
+			{
 				exit;
 			}
+			else
+			{
+				$cookie = &$_COOKIE;
+				while (isset($cookie['GLOBALS']))
+				{
+					foreach ($cookie['GLOBALS'] as $registered_var => $value)
+					{
+						if (!isset($not_unset[$registered_var]))
+						{
+							unset($GLOBALS[$registered_var]);
+						}
+					}
+					$cookie = &$cookie['GLOBALS'];
+				}
+			}
+		}
 
 		unset($GLOBALS[$varname]);
 	}
@@ -88,7 +106,7 @@ else
 	set_magic_quotes_runtime(0);
 
 	// Be paranoid with passed vars
-	if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
+	if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' || !function_exists('ini_get'))
 	{
 		deregister_globals();
 	}
@@ -98,16 +116,7 @@ else
 
 if (defined('IN_CRON'))
 {
-	chdir($phpbb_root_path);
-	if (@function_exists('getcwd'))
-	{
-		$phpbb_root_path = getcwd() . '/';
-	}
-	else
-	{
-		// This is a best guess
-		$phpbb_root_path = pathinfo($_SERVER['SCRIPT_FILENAME'], PATHINFO_DIRNAME) . '/';
-	}
+	$phpbb_root_path = dirname(__FILE__) . DIRECTORY_SEPARATOR;
 }
 
 if (!file_exists($phpbb_root_path . 'config.' . $phpEx))
@@ -122,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['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME');
+	$server_name = (!empty($_SERVER['HTTP_HOST'])) ? strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'));
 	$server_port = (!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT');
 	$secure = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 1 : 0;
 
@@ -140,9 +149,13 @@ if (!defined('PHPBB_INSTALLED'))
 	$url = (($secure) ? 'https://' : 'http://') . $server_name;
 
 	if ($server_port && (($secure && $server_port <> 443) || (!$secure && $server_port <> 80)))
+	{
+		// HTTP HOST can carry a port number...
+		if (strpos($server_name, ':') === false)
 		{
 			$url .= ':' . $server_port;
 		}
+	}
 
 	$url .= $script_path;
 	header('Location: ' . $url);
@@ -175,13 +188,16 @@ require($phpbb_root_path . 'includes/cache.' . $phpEx);
 require($phpbb_root_path . 'includes/template.' . $phpEx);
 require($phpbb_root_path . 'includes/session.' . $phpEx);
 require($phpbb_root_path . 'includes/auth.' . $phpEx);
+
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
+require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
+
 require($phpbb_root_path . 'includes/constants.' . $phpEx);
 require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);
 require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 
 // Set PHP error handler to ours
-set_error_handler('msg_handler');
+set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
 
 // Instantiate some basic classes
 $user		= new user();
@@ -191,7 +207,7 @@ $cache		= new cache();
 $db			= new $sql_db();
 
 // Connect to DB
-$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false);
+$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, defined('PHPBB_DB_NEW_LINK') ? PHPBB_DB_NEW_LINK : false);
 
 // We do not need this any longer, unset for safety purposes
 unset($dbpasswd);
@@ -199,4 +215,13 @@ unset($dbpasswd);
 // Grab global variables, re-cache if necessary
 $config = $cache->obtain_config();
 
+// Add own hook handler
+require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
+$phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display')));
+
+foreach ($cache->obtain_hooks() as $hook)
+{
+	@include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx);
+}
+
 ?>

phpBB/cron.php

@@ -12,7 +12,7 @@
 */
 define('IN_PHPBB', true);
 define('IN_CRON', true);
-$phpbb_root_path = './';
+$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 include($phpbb_root_path . 'common.' . $phpEx);
 
@@ -30,7 +30,41 @@ header('Content-length: 43');
 
 echo base64_decode('R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==');
 
-flush();
+// test without flush ;)
+// flush();
+
+//
+if (!isset($config['cron_lock']))
+{
+	set_config('cron_lock', '0', true);
+}
+
+// make sure cron doesn't run multiple times in parallel
+if ($config['cron_lock'])
+{
+	// if the other process is running more than an hour already we have to assume it
+	// aborted without cleaning the lock
+	$time = explode(' ', $config['cron_lock']);
+	$time = $time[0];
+
+	if ($time + 3600 >= time())
+	{
+		exit;
+	}
+}
+
+define('CRON_ID', time() . ' ' . unique_id());
+
+$sql = 'UPDATE ' . CONFIG_TABLE . "
+	SET config_value = '" . $db->sql_escape(CRON_ID) . "'
+	WHERE config_name = 'cron_lock' AND config_value = '" . $db->sql_escape($config['cron_lock']) . "'";
+$db->sql_query($sql);
+
+// another cron process altered the table between script start and UPDATE query so exit
+if ($db->sql_affectedrows() != 1)
+{
+	exit;
+}
 
 /**
 * Run cron-like action
@@ -45,6 +79,12 @@ switch ($cron_type)
 			break;
 		}
 
+		// A user reported using the mail() function while using shutdown does not work. We do not want to risk that.
+		if ($use_shutdown_function && !$config['smtp_delivery'])
+		{
+			$use_shutdown_function = false;
+		}
+
 		include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
 		$queue = new queue();
 
@@ -219,13 +259,29 @@ switch ($cron_type)
 // Unloading cache and closing db after having done the dirty work.
 if ($use_shutdown_function)
 {
+	register_shutdown_function('unlock_cron');
 	register_shutdown_function('garbage_collection');
 }
 else
 {
+	unlock_cron();
 	garbage_collection();
 }
 
 exit;
 
+
+/**
+* Unlock cron script
+*/
+function unlock_cron()
+{
+	global $db;
+
+	$sql = 'UPDATE ' . CONFIG_TABLE . "
+		SET config_value = '0'
+		WHERE config_name = 'cron_lock' AND config_value = '" . $db->sql_escape(CRON_ID) . "'";
+	$db->sql_query($sql);
+}
+
 ?>

phpBB/develop/add_permissions.php

@@ -227,7 +227,7 @@ foreach ($prefixes as $prefix)
 $sql = 'UPDATE ' . USERS_TABLE . " SET user_permissions = ''";
 $db->sql_query($sql);
 
-$cache->destroy('acl_options');
+$cache->destroy('_acl_options');
 
 echo "<p><b>Done</b></p>\n";
  

phpBB/develop/adjust_avatars.php

@@ -0,0 +1,147 @@
+<?php
+/**
+* Corrects avatar filenames to match the new avatar delivery method.
+*
+* You should make a backup from your users table and the avatar directory in case something goes wrong
+*/
+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();
+
+$echos = 0;
+ 
+if (!isset($config['avatar_salt']))
+{
+	$cache->purge();
+	if (!isset($config['avatar_salt']))
+	{
+		die('database not up to date');
+	}
+	die('database not up to date');
+}
+
+// let's start with the users using a group_avatar.
+$sql = 'SELECT group_id, group_avatar
+	FROM ' . GROUPS_TABLE . '
+	WHERE group_avatar_type = ' . AVATAR_UPLOAD;
+
+// We'll skip these, so remember them
+$group_avatars = array();
+
+echo '<br /> Updating groups' . "\n";
+
+$result = $db->sql_query($sql);
+
+while ($row = $db->sql_fetchrow($result))
+{
+	$new_avatar_name = adjust_avatar($row['group_avatar'], 'g' . $row['group_id']);
+	$group_avatars[] = $new_avatar_name;
+	
+	// failure is probably due to the avatar name already being adjusted
+	if ($new_avatar_name !== false)
+	{
+		$sql = 'UPDATE ' . USERS_TABLE . "
+			SET user_avatar = '" . $db->sql_escape($new_avatar_name) . "'
+			WHERE user_avatar = '" . $db->sql_escape($row['group_avatar']) . "' 
+			AND user_avatar_type = " . AVATAR_UPLOAD;
+		$db->sql_query($sql);
+		
+		$sql = 'UPDATE ' . GROUPS_TABLE . "
+			SET group_avatar = '" . $db->sql_escape($new_avatar_name) . "'
+			WHERE group_id = {$row['group_id']}";
+		$db->sql_query($sql);
+	}
+	else
+	{
+		echo '<br /> Failed updating group ' . $row['group_id'] . "\n";
+	}
+
+	if ($echos > 200)
+	{
+		echo '<br />' . "\n";
+		$echos = 0;
+	}
+
+	echo '.';
+	$echos++;
+
+	flush();
+}
+$db->sql_freeresult($result);
+
+$sql = 'SELECT user_id, username, user_avatar, user_avatar_type
+	FROM ' . USERS_TABLE . ' 
+	WHERE user_avatar_type = ' . AVATAR_UPLOAD . ' 
+	AND ' . $db->sql_in_set('user_avatar', $group_avatars, true, true);
+$result = $db->sql_query($sql);
+
+echo '<br /> Updating users' . "\n";
+
+while ($row = $db->sql_fetchrow($result))
+{
+	$new_avatar_name = adjust_avatar($row['user_avatar'], $row['user_id']);
+
+	// failure is probably due to the avatar name already being adjusted
+	if ($new_avatar_name !== false)
+	{
+		$sql = 'UPDATE ' . USERS_TABLE . "
+			SET user_avatar = '" . $db->sql_escape($new_avatar_name) . "'
+			WHERE user_id = {$row['user_id']}";
+		$db->sql_query($sql);
+	}
+	else
+	{
+		// nuke this avatar
+		$sql = 'UPDATE ' . USERS_TABLE . "
+			SET user_avatar = '', user_avatar_type = 0
+			WHERE user_id = {$row['user_id']}";
+		$db->sql_query($sql);
+		echo '<br /> Failed updating user ' . $row['user_id'] . "\n";
+	}
+	
+	if ($echos > 200)
+	{
+		echo '<br />' . "\n";
+		$echos = 0;
+	}
+
+	echo '.';
+	$echos++;
+
+	flush();
+}
+
+$db->sql_freeresult($result);
+
+echo 'FINISHED';
+
+// Done
+$db->sql_close();
+
+function adjust_avatar($old_name, $midfix)
+{
+	global $config, $phpbb_root_path;
+	
+	$avatar_path = $phpbb_root_path . $config['avatar_path'];
+	$extension = strtolower(substr(strrchr($old_name, '.'), 1));
+	$new_name = $config['avatar_salt'] . '_' . $midfix . '.' . $extension;
+
+	if (@file_exists($avatar_path . '/' . $old_name) && @is_writable($avatar_path . '/' . $old_name) && @is_writable($avatar_path . '/' . $new_name))
+	{
+		@rename($avatar_path . '/' . $old_name, $avatar_path . '/' . $new_name);
+		return $midfix . '.' . $extension;
+	}
+	return false;
+}
+
+?>

phpBB/develop/adjust_magic_urls.php

@@ -0,0 +1,126 @@
+<?php
+/**
+* Adds class="postlink" to magic urls
+*
+* You should make a backup from your users, posts and privmsgs table in case something goes wrong
+* Forum descriptions and rules need to be re-submitted manually.
+*/
+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();
+
+$echos = 0;
+
+$replace = array(
+	'<!-- l --><a href="',
+	'<!-- m --><a href="',
+	'<!-- w --><a href="',
+);
+$with = array(
+	'<!-- l --><a class="postlink-local" href="',
+	'<!-- m --><a class="postlink" href="',
+	'<!-- w --><a class="postlink" href="',
+);
+
+// Adjust user signatures
+$sql = 'SELECT user_id, user_sig
+	FROM ' . USERS_TABLE;
+$result = $db->sql_query($sql);
+
+while ($row = $db->sql_fetchrow($result))
+{
+	$new_content = str_replace($replace, $with, $row['user_sig']);
+
+	if ($new_content != $row['user_sig'])
+	{
+		$sql = 'UPDATE ' . USERS_TABLE . " SET user_sig = '" . $db->sql_escape($new_content) . "'
+			WHERE user_id = " . $row['user_id'];
+		$db->sql_query($sql);
+
+		if ($echos > 200)
+		{
+			echo '<br />' . "\n";
+			$echos = 0;
+		}
+
+		echo '.';
+		$echos++;
+
+		flush();
+	}
+}
+$db->sql_freeresult($result);
+
+
+// Now adjust posts
+$sql = 'SELECT post_id, post_text
+	FROM ' . POSTS_TABLE;
+$result = $db->sql_query($sql);
+
+while ($row = $db->sql_fetchrow($result))
+{
+	$new_content = str_replace($replace, $with, $row['post_text']);
+
+	if ($row['post_text'] != $new_content)
+	{
+		$sql = 'UPDATE ' . POSTS_TABLE . " SET post_text = '" . $db->sql_escape($new_content) . "'
+			WHERE post_id = " . $row['post_id'];
+		$db->sql_query($sql);
+
+		if ($echos > 200)
+		{
+			echo '<br />' . "\n";
+			$echos = 0;
+		}
+
+		echo '.';
+		$echos++;
+
+		flush();
+	}
+}
+$db->sql_freeresult($result);
+
+// Now to the private messages
+$sql = 'SELECT msg_id, message_text
+	FROM ' . PRIVMSGS_TABLE;
+$result = $db->sql_query($sql);
+
+while ($row = $db->sql_fetchrow($result))
+{
+	$new_content = str_replace($replace, $with, $row['message_text']);
+
+	if ($row['message_text'] != $new_content)
+	{
+		$sql = 'UPDATE ' . PRIVMSGS_TABLE . " SET bbcode_bitfield = '" . $db->sql_escape($new_content) . "'
+			WHERE msg_id = " . $row['msg_id'];
+		$db->sql_query($sql);
+
+		if ($echos > 200)
+		{
+			echo '<br />' . "\n";
+			$echos = 0;
+		}
+
+		echo '.';
+		$echos++;
+
+		flush();
+	}
+}
+$db->sql_freeresult($result);
+
+// Done
+$db->sql_close();
+
+?>

phpBB/develop/adjust_sizes.php

@@ -0,0 +1,132 @@
+<?php
+/**
+* Only adjust the [size] bbcode tag from pc to percent.
+*
+* You should make a backup from your users, posts and privmsgs table in case something goes wrong
+* Forum descriptions and rules need to be re-submitted manually if they use the [size] tag.
+*
+* Since we limit the match to the sizes from 0 to 29 no newly applied sizes should be affected...
+*/
+die("Please read the first lines of this script for instructions on how to enable it");
+
+set_time_limit(0);
+@ini_set('memory_limit', '128M');
+
+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();
+
+$echos = 0;
+
+function replace_size($matches)
+{
+	return '[size=' . ceil(100.0 * (((double) $matches[1])/12.0)) . ':' . $matches[2] . ']';
+}
+
+// Adjust user signatures
+$sql = 'SELECT user_id, user_sig, user_sig_bbcode_uid
+	FROM ' . USERS_TABLE;
+$result = $db->sql_query($sql);
+
+while ($row = $db->sql_fetchrow($result))
+{
+	$bbcode_uid = $row['user_sig_bbcode_uid'];
+
+	// Only if a bbcode uid is present, the signature present and a size tag used...
+	if ($bbcode_uid && $row['user_sig'] && strpos($row['user_sig'], '[size=') !== false)
+	{
+		$row['user_sig'] = preg_replace_callback('/\[size=(\d*):(' . $bbcode_uid . ')\]/', 'replace_size', $row['user_sig']);
+
+		$sql = 'UPDATE ' . USERS_TABLE . " SET user_sig = '" . $db->sql_escape($row['user_sig']) . "'
+			WHERE user_id = " . $row['user_id'];
+		$db->sql_query($sql);
+
+		if ($echos > 200)
+		{
+			echo '<br />' . "\n";
+			$echos = 0;
+		}
+
+		echo '.';
+		$echos++;
+
+		flush();
+	}
+}
+$db->sql_freeresult($result);
+
+
+// Now adjust posts
+$sql = 'SELECT post_id, post_text, bbcode_uid, enable_bbcode
+	FROM ' . POSTS_TABLE;
+$result = $db->sql_query($sql);
+
+while ($row = $db->sql_fetchrow($result))
+{
+	$bbcode_uid = $row['bbcode_uid'];
+
+	// Only if a bbcode uid is present, bbcode enabled and a size tag used...
+	if ($row['enable_bbcode'] && $bbcode_uid && strpos($row['post_text'], '[size=') !== false)
+	{
+		$row['post_text'] = preg_replace_callback('/\[size=(\d*):' . $bbcode_uid . '\]/', 'replace_size', $row['post_text']);
+
+		$sql = 'UPDATE ' . POSTS_TABLE . " SET post_text = '" . $db->sql_escape($row['post_text']) . "'
+			WHERE post_id = " . $row['post_id'];
+		$db->sql_query($sql);
+
+		if ($echos > 200)
+		{
+			echo '<br />' . "\n";
+			$echos = 0;
+		}
+
+		echo '.';
+		$echos++;
+
+		flush();
+	}
+}
+$db->sql_freeresult($result);
+
+// Now to the private messages
+$sql = 'SELECT msg_id, message_text, bbcode_uid, enable_bbcode
+	FROM ' . PRIVMSGS_TABLE;
+$result = $db->sql_query($sql);
+
+while ($row = $db->sql_fetchrow($result))
+{
+	$bbcode_uid = $row['bbcode_uid'];
+
+	// Only if a bbcode uid is present, bbcode enabled and a size tag used...
+	if ($row['enable_bbcode'] && $bbcode_uid && strpos($row['message_text'], '[size=') !== false)
+	{
+		$row['message_text'] = preg_replace_callback('/\[size=(\d*):' . $bbcode_uid . '\]/', 'replace_size', $row['message_text']);
+
+		$sql = 'UPDATE ' . PRIVMSGS_TABLE . " SET message_text = '" . $db->sql_escape($row['message_text']) . "'
+			WHERE msg_id = " . $row['msg_id'];
+		$db->sql_query($sql);
+
+		if ($echos > 200)
+		{
+			echo '<br />' . "\n";
+			$echos = 0;
+		}
+
+		echo '.';
+		$echos++;
+
+		flush();
+	}
+}
+$db->sql_freeresult($result);
+
+// Done
+$db->sql_close();
+
+?>

phpBB/develop/adjust_smilies.php

@@ -0,0 +1,130 @@
+<?php
+/**
+* Updates smilies that were changed to the new ones
+*/
+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();
+
+$echos = 0;
+
+$replace = array(
+	'<img src="{SMILIES_PATH}/icon_biggrin.gif',
+	'<img src="{SMILIES_PATH}/icon_confused.gif',
+	'<img src="{SMILIES_PATH}/icon_sad.gif',
+	'<img src="{SMILIES_PATH}/icon_smile.gif',
+	'<img src="{SMILIES_PATH}/icon_surprised.gif',
+	'<img src="{SMILIES_PATH}/icon_wink.gif',
+);
+
+$with = array(
+	'<img src="{SMILIES_PATH}/icon_e_biggrin.gif',
+	'<img src="{SMILIES_PATH}/icon_e_confused.gif',
+	'<img src="{SMILIES_PATH}/icon_e_sad.gif',
+	'<img src="{SMILIES_PATH}/icon_e_smile.gif',
+	'<img src="{SMILIES_PATH}/icon_e_surprised.gif',
+	'<img src="{SMILIES_PATH}/icon_e_wink.gif',
+);
+
+// Adjust user signatures
+$sql = 'SELECT user_id, user_sig
+	FROM ' . USERS_TABLE;
+$result = $db->sql_query($sql);
+
+while ($row = $db->sql_fetchrow($result))
+{
+	$new_content = str_replace($replace, $with, $row['user_sig']);
+
+	if ($new_content != $row['user_sig'])
+	{
+		$sql = 'UPDATE ' . USERS_TABLE . " SET user_sig = '" . $db->sql_escape($new_content) . "'
+			WHERE user_id = " . $row['user_id'];
+		$db->sql_query($sql);
+
+		if ($echos > 200)
+		{
+			echo '<br />' . "\n";
+			$echos = 0;
+		}
+
+		echo '.';
+		$echos++;
+
+		flush();
+	}
+}
+$db->sql_freeresult($result);
+
+
+// Now adjust posts
+$sql = 'SELECT post_id, post_text
+	FROM ' . POSTS_TABLE;
+$result = $db->sql_query($sql);
+
+while ($row = $db->sql_fetchrow($result))
+{
+	$new_content = str_replace($replace, $with, $row['post_text']);
+
+	if ($row['post_text'] != $new_content)
+	{
+		$sql = 'UPDATE ' . POSTS_TABLE . " SET post_text = '" . $db->sql_escape($new_content) . "'
+			WHERE post_id = " . $row['post_id'];
+		$db->sql_query($sql);
+
+		if ($echos > 200)
+		{
+			echo '<br />' . "\n";
+			$echos = 0;
+		}
+
+		echo '.';
+		$echos++;
+
+		flush();
+	}
+}
+$db->sql_freeresult($result);
+
+// Now to the private messages
+$sql = 'SELECT msg_id, message_text
+	FROM ' . PRIVMSGS_TABLE;
+$result = $db->sql_query($sql);
+
+while ($row = $db->sql_fetchrow($result))
+{
+	$new_content = str_replace($replace, $with, $row['message_text']);
+
+	if ($row['message_text'] != $new_content)
+	{
+		$sql = 'UPDATE ' . PRIVMSGS_TABLE . " SET bbcode_bitfield = '" . $db->sql_escape($new_content) . "'
+			WHERE msg_id = " . $row['msg_id'];
+		$db->sql_query($sql);
+
+		if ($echos > 200)
+		{
+			echo '<br />' . "\n";
+			$echos = 0;
+		}
+
+		echo '.';
+		$echos++;
+
+		flush();
+	}
+}
+$db->sql_freeresult($result);
+
+// Done
+$db->sql_close();
+
+?>

phpBB/develop/adjust_uids.php

@@ -0,0 +1,129 @@
+<?php
+/**
+* Repair bbcodes converted with RC6
+*
+* You should make a backup from your users, posts and privmsgs table in case something goes wrong
+* Forum descriptions and rules need to be re-submitted manually
+*
+*/
+die("Please read the first lines of this script for instructions on how to enable it");
+
+set_time_limit(0);
+@ini_set('memory_limit', '512M');
+
+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();
+
+$echos = 0;
+
+
+// Adjust user signatures
+$sql = 'SELECT user_id, user_sig, user_sig_bbcode_uid
+	FROM ' . USERS_TABLE . '
+	ORDER BY user_id ASC';
+$result = $db->sql_query($sql);
+
+while ($row = $db->sql_fetchrow($result))
+{
+	$bbcode_uid = $row['user_sig_bbcode_uid'];
+
+	// Only if a bbcode uid is present, the signature present and a size tag used...
+	if (!empty($bbcode_uid) && strpos($row['user_sig'], $bbcode_uid) === false)
+	{
+		$row['user_sig'] = preg_replace('/\:[0-9a-z]{8}\]/', ":$bbcode_uid]", $row['user_sig']);
+
+		$sql = 'UPDATE ' . USERS_TABLE . " SET user_sig = '" . $db->sql_escape($row['user_sig']) . "'
+			WHERE user_id = " . $row['user_id'];
+		$db->sql_query($sql);
+
+		if ($echos > 200)
+		{
+			echo '<br />User: ' . "{$row['user_id']}\n";
+			$echos = 0;
+		}
+
+		echo '.';
+		$echos++;
+
+		flush();
+	}
+}
+$db->sql_freeresult($result);
+
+
+// Now adjust posts
+$sql = 'SELECT post_id, post_text, bbcode_uid, enable_bbcode
+	FROM ' . POSTS_TABLE . '
+	ORDER BY post_id ASC';
+$result = $db->sql_query($sql);
+
+while ($row = $db->sql_fetchrow($result))
+{
+	$bbcode_uid = $row['bbcode_uid'];
+
+	// Only if a bbcode uid is present, bbcode enabled and a size tag used...
+	if ($row['enable_bbcode'] && !empty($bbcode_uid) && strpos($row['post_text'], $bbcode_uid) === false)
+	{
+		$row['post_text'] = preg_replace('/\:[0-9a-z]{8}\]/', ":$bbcode_uid]", $row['post_text']);
+		
+		$sql = 'UPDATE ' . POSTS_TABLE . " SET post_text = '" . $db->sql_escape($row['post_text']) . "'
+			WHERE post_id = " . $row['post_id'];
+		$db->sql_query($sql);
+
+		if ($echos > 200)
+		{
+			echo '<br />Post: ' . "{$row['post_id']} \n";
+			$echos = 0;
+		}
+
+		echo '.';
+		$echos++;
+
+		flush();
+	}
+}
+$db->sql_freeresult($result);
+
+// Now to the private messages
+$sql = 'SELECT msg_id, message_text, bbcode_uid, enable_bbcode
+	FROM ' . PRIVMSGS_TABLE;
+$result = $db->sql_query($sql);
+
+while ($row = $db->sql_fetchrow($result))
+{
+	$bbcode_uid = $row['bbcode_uid'];
+
+	// Only if a bbcode uid is present, bbcode enabled and a size tag used...
+	if ($row['enable_bbcode'] && !empty($bbcode_uid) && strpos($row['message_text'], $bbcode_uid) === false)
+	{
+		$row['message_text'] = preg_replace('/\:[0-9a-z]{8}\]/', ":$bbcode_uid]", $row['message_text']);
+		
+		$sql = 'UPDATE ' . PRIVMSGS_TABLE . " SET message_text = '" . $db->sql_escape($row['message_text']) . "'
+			WHERE msg_id = " . $row['msg_id'];
+		$db->sql_query($sql);
+
+		if ($echos > 200)
+		{
+			echo '<br />' . "\n";
+			$echos = 0;
+		}
+
+		echo '.';
+		$echos++;
+
+		flush();
+	}
+}
+$db->sql_freeresult($result);
+
+// Done
+$db->sql_close();
+echo 'done';
+?>

phpBB/develop/create_schema_files.php

@@ -14,13 +14,13 @@
 
 die("Please read the first lines of this script for instructions on how to enable it");
 
-set_time_limit(0);
+@set_time_limit(0);
 
 $schema_path = './../install/schemas/';
 
-if (!is_writeable($schema_path))
+if (!is_writable($schema_path))
 {
-	die('Schema path not writeable');
+	die('Schema path not writable');
 }
 
 $schema_data = get_schema_struct();
@@ -46,6 +46,9 @@ $dbms_type_map = array(
 		'MTEXT_UNI'	=> 'mediumtext',
 		'TIMESTAMP'	=> 'int(11) UNSIGNED',
 		'DECIMAL'	=> 'decimal(5,2)',
+		'DECIMAL:'	=> 'decimal(%d,2)',
+		'PDECIMAL'	=> 'decimal(6,3)',
+		'PDECIMAL:'	=> 'decimal(%d,3)',
 		'VCHAR_UNI'	=> 'varchar(255)',
 		'VCHAR_UNI:'=> 'varchar(%d)',
 		'VCHAR_CI'	=> 'varchar(255)',
@@ -60,22 +63,25 @@ $dbms_type_map = array(
 		'TINT:'		=> 'tinyint(%d)',
 		'USINT'		=> 'smallint(4) UNSIGNED',
 		'BOOL'		=> 'tinyint(1) UNSIGNED',
-		'VCHAR'		=> 'varchar(255)',
-		'VCHAR:'	=> 'varchar(%d)',
-		'CHAR:'		=> 'char(%d)',
-		'XSTEXT'	=> 'text',
-		'XSTEXT_UNI'=> 'text',
-		'STEXT'		=> 'text',
-		'STEXT_UNI'	=> 'text',
-		'TEXT'		=> 'text',
-		'TEXT_UNI'	=> 'text',
-		'MTEXT'		=> 'mediumtext',
-		'MTEXT_UNI'	=> 'mediumtext',
+		'VCHAR'		=> 'varbinary(255)',
+		'VCHAR:'	=> 'varbinary(%d)',
+		'CHAR:'		=> 'binary(%d)',
+		'XSTEXT'	=> 'blob',
+		'XSTEXT_UNI'=> 'blob',
+		'STEXT'		=> 'blob',
+		'STEXT_UNI'	=> 'blob',
+		'TEXT'		=> 'blob',
+		'TEXT_UNI'	=> 'blob',
+		'MTEXT'		=> 'mediumblob',
+		'MTEXT_UNI'	=> 'mediumblob',
 		'TIMESTAMP'	=> 'int(11) UNSIGNED',
 		'DECIMAL'	=> 'decimal(5,2)',
-		'VCHAR_UNI'	=> 'text',
-		'VCHAR_UNI:'=> array('varchar(%d)', 'limit' => array('mult', 3, 255, 'text')),
-		'VCHAR_CI'	=> 'text',
+		'DECIMAL:'	=> 'decimal(%d,2)',
+		'PDECIMAL'	=> 'decimal(6,3)',
+		'PDECIMAL:'	=> 'decimal(%d,3)',
+		'VCHAR_UNI'	=> 'blob',
+		'VCHAR_UNI:'=> array('varbinary(%d)', 'limit' => array('mult', 3, 255, 'blob')),
+		'VCHAR_CI'	=> 'blob',
 		'VARBINARY'	=> 'varbinary(255)',
 	),
 
@@ -100,6 +106,9 @@ $dbms_type_map = array(
 		'MTEXT_UNI'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8',
 		'TIMESTAMP'	=> 'INTEGER',
 		'DECIMAL'	=> 'DOUBLE PRECISION',
+		'DECIMAL:'	=> 'DOUBLE PRECISION',
+		'PDECIMAL'	=> 'DOUBLE PRECISION',
+		'PDECIMAL:'	=> 'DOUBLE PRECISION',
 		'VCHAR_UNI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
 		'VCHAR_UNI:'=> 'VARCHAR(%d) CHARACTER SET UTF8',
 		'VCHAR_CI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
@@ -127,6 +136,9 @@ $dbms_type_map = array(
 		'MTEXT_UNI'	=> '[text]',
 		'TIMESTAMP'	=> '[int]',
 		'DECIMAL'	=> '[float]',
+		'DECIMAL:'	=> '[float]',
+		'PDECIMAL'	=> '[float]',
+		'PDECIMAL:'	=> '[float]',
 		'VCHAR_UNI'	=> '[varchar] (255)',
 		'VCHAR_UNI:'=> '[varchar] (%d)',
 		'VCHAR_CI'	=> '[varchar] (255)',
@@ -154,6 +166,9 @@ $dbms_type_map = array(
 		'MTEXT_UNI'	=> 'clob',
 		'TIMESTAMP'	=> 'number(11)',
 		'DECIMAL'	=> 'number(5, 2)',
+		'DECIMAL:'	=> 'number(%d, 2)',
+		'PDECIMAL'	=> 'number(6, 3)',
+		'PDECIMAL:'	=> 'number(%d, 3)',
 		'VCHAR_UNI'	=> 'varchar2(765)',
 		'VCHAR_UNI:'=> array('varchar2(%d)', 'limit' => array('mult', 3, 765, 'clob')),
 		'VCHAR_CI'	=> 'varchar2(255)',
@@ -181,6 +196,9 @@ $dbms_type_map = array(
 		'MTEXT_UNI'	=> 'mediumtext(16777215)',
 		'TIMESTAMP'	=> 'INTEGER UNSIGNED', //'int(11) UNSIGNED',
 		'DECIMAL'	=> 'decimal(5,2)',
+		'DECIMAL:'	=> 'decimal(%d,2)',
+		'PDECIMAL'	=> 'decimal(6,3)',
+		'PDECIMAL:'	=> 'decimal(%d,3)',
 		'VCHAR_UNI'	=> 'varchar(255)',
 		'VCHAR_UNI:'=> 'varchar(%d)',
 		'VCHAR_CI'	=> 'varchar(255)',
@@ -208,6 +226,9 @@ $dbms_type_map = array(
 		'MTEXT_UNI'	=> 'TEXT',
 		'TIMESTAMP'	=> 'INT4', // unsigned
 		'DECIMAL'	=> 'decimal(5,2)',
+		'DECIMAL:'	=> 'decimal(%d,2)',
+		'PDECIMAL'	=> 'decimal(6,3)',
+		'PDECIMAL:'	=> 'decimal(%d,3)',
 		'VCHAR_UNI'	=> 'varchar(255)',
 		'VCHAR_UNI:'=> 'varchar(%d)',
 		'VCHAR_CI'	=> 'varchar_ci',
@@ -230,31 +251,31 @@ foreach ($supported_dbms as $dbms)
 	{
 		case 'mysql_40':
 		case 'mysql_41':
-			$line = "#\n# MySQL Schema for phpBB 3.x - (c) phpBB Group, 2005\n#\n# \$I" . "d: $\n#\n\n";
+			$line = "#\n# \$I" . "d: $\n#\n\n";
 		break;
 
 		case 'firebird':
-			$line = "#\n# Firebird Schema for phpBB 3.x - (c) phpBB Group, 2005\n#\n# \$I" . "d: $\n#\n\n";
+			$line = "#\n# \$I" . "d: $\n#\n\n";
 			$line .= custom_data('firebird') . "\n";
 		break;
 
 		case 'sqlite':
-			$line = "#\n# SQLite Schema for phpBB 3.x - (c) phpBB Group, 2005\n#\n# \$I" . "d: $\n#\n\n";
+			$line = "#\n# \$I" . "d: $\n#\n\n";
 			$line .= "BEGIN TRANSACTION;\n\n";
 		break;
 
 		case 'mssql':
-			$line = "/*\n MSSQL Schema for phpBB 3.x - (c) phpBB Group, 2005\n\n \$I" . "d: $\n\n*/\n\n";
+			$line = "/*\n\n \$I" . "d: $\n\n*/\n\n";
 			$line .= "BEGIN TRANSACTION\nGO\n\n";
 		break;
 
 		case 'oracle':
-			$line = "/*\n Oracle Schema for phpBB 3.x - (c) phpBB Group, 2005\n\n \$I" . "d: $\n\n*/\n\n";
+			$line = "/*\n\n \$I" . "d: $\n\n*/\n\n";
 			$line .= custom_data('oracle') . "\n";
 		break;
 
 		case 'postgres':
-			$line = "/*\n PostgreSQL Schema for phpBB 3.x - (c) phpBB Group, 2005\n\n \$I" . "d: $\n\n*/\n\n";
+			$line = "/*\n\n \$I" . "d: $\n\n*/\n\n";
 			$line .= "BEGIN;\n\n";
 			$line .= custom_data('postgres') . "\n";
 		break;
@@ -354,7 +375,7 @@ foreach ($supported_dbms as $dbms)
 			{
 				$orig_column_type = $column_data[0];
 				$column_type = $dbms_type_map[$dbms][$column_data[0]];
-				if ($column_type == 'text')
+				if ($column_type == 'text' || $column_type == 'blob')
 				{
 					$modded_array[$column_name] = $column_type;
 				}
@@ -373,16 +394,23 @@ foreach ($supported_dbms as $dbms)
 					$line .= "\t{$column_name} {$column_type} ";
 
 					// For hexadecimal values do not use single quotes
-					if (!is_null($column_data[1]) && substr($column_type, -4) !== 'text')
+					if (!is_null($column_data[1]) && substr($column_type, -4) !== 'text' && substr($column_type, -4) !== 'blob')
 					{
 						$line .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' ";
 					}
 					$line .= 'NOT NULL';
 
-					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+					if (isset($column_data[2]))
+					{
+						if ($column_data[2] == 'auto_increment')
 						{
 							$line .= ' auto_increment';
 						}
+						else if ($dbms === 'mysql_41' && $column_data[2] == 'true_sort')
+						{
+							$line .= ' COLLATE utf8_unicode_ci';
+						}
+					}
 
 					$line .= ",\n";
 				break;
@@ -616,6 +644,7 @@ foreach ($supported_dbms as $dbms)
 								switch ($modded_array[$col_name])
 								{
 									case 'text':
+									case 'blob':
 										$key_data[1][$key] = $col_name . '(255)';
 									break;
 								}
@@ -756,13 +785,16 @@ foreach ($supported_dbms as $dbms)
 *	BOOL		=> tinyint(1) UNSIGNED
 *	VCHAR		=> varchar(255)
 *	CHAR:x		=> char(x)
-*	XSTEXT		=> text for storing 1000 characters (topic_title for example)
-*	STEXT		=> text for storing 3000 characters (normal input field with a max of 255 single-byte chars)
-*	TEXT		=> text for storing 8000 characters (short text, descriptions, comments, etc.)
-*	MTEXT		=> mediumtext (post text, large text)
+*	XSTEXT_UNI	=> text for storing 100 characters (topic_title for example)
+*	STEXT_UNI	=> text for storing 255 characters (normal input field with a max of 255 single-byte chars) - same as VCHAR_UNI
+*	TEXT_UNI	=> text for storing 3000 characters (short text, descriptions, comments, etc.)
+*	MTEXT_UNI	=> mediumtext (post text, large text)
 *	VCHAR:x		=> varchar(x)
 *	TIMESTAMP	=> int(11) UNSIGNED
 *	DECIMAL		=> decimal number (5,2)
+*	DECIMAL:	=> decimal number (x,2)
+*	PDECIMAL	=> precision decimal number (6,3)
+*	PDECIMAL:	=> precision decimal number (x,3)
 *	VCHAR_UNI	=> varchar(255) BINARY
 *	VCHAR_CI	=> varchar_ci for postgresql, others VCHAR
 */
@@ -809,6 +841,7 @@ function get_schema_struct()
 		'KEYS'			=> array(
 			'group_id'		=> array('INDEX', 'group_id'),
 			'auth_opt_id'	=> array('INDEX', 'auth_option_id'),
+			'auth_role_id'	=> array('INDEX', 'auth_role_id'),
 		),
 	);
 
@@ -848,6 +881,9 @@ function get_schema_struct()
 			'auth_setting'		=> array('TINT:2', 0),
 		),
 		'PRIMARY_KEY'	=> array('role_id', 'auth_option_id'),
+		'KEYS'			=> array(
+			'ath_op_id'			=> array('INDEX', 'auth_option_id'),
+		),
 	);
 
 	$schema_data['phpbb_acl_users'] = array(
@@ -861,6 +897,7 @@ function get_schema_struct()
 		'KEYS'			=> array(
 			'user_id'			=> array('INDEX', 'user_id'),
 			'auth_option_id'	=> array('INDEX', 'auth_option_id'),
+			'auth_role_id'		=> array('INDEX', 'auth_role_id'),
 		),
 	);
 
@@ -873,8 +910,8 @@ function get_schema_struct()
 			'ban_start'			=> array('TIMESTAMP', 0),
 			'ban_end'			=> array('TIMESTAMP', 0),
 			'ban_exclude'		=> array('BOOL', 0),
-			'ban_reason'		=> array('STEXT', ''),
-			'ban_give_reason'	=> array('STEXT', ''),
+			'ban_reason'		=> array('VCHAR_UNI', ''),
+			'ban_give_reason'	=> array('VCHAR_UNI', ''),
 		),
 		'PRIMARY_KEY'			=> 'ban_id',
 		'KEYS'			=> array(
@@ -908,12 +945,8 @@ function get_schema_struct()
 		'COLUMNS'		=> array(
 			'topic_id'			=> array('UINT', 0),
 			'user_id'			=> array('UINT', 0),
-			'order_id'			=> array('UINT', 0),
-		),
-		'KEYS'			=> array(
-			'order_id'			=> array('INDEX', 'order_id'),
-			'topic_user_id'		=> array('INDEX', array('topic_id', 'user_id')),
 		),
+		'PRIMARY_KEY'			=> array('topic_id', 'user_id'),
 	);
 
 	$schema_data['phpbb_bots'] = array(
@@ -1016,16 +1049,16 @@ function get_schema_struct()
 			'forum_desc'			=> array('TEXT_UNI', ''),
 			'forum_desc_bitfield'	=> array('VCHAR:255', ''),
 			'forum_desc_options'	=> array('UINT:11', 7),
-			'forum_desc_uid'		=> array('VCHAR:5', ''),
+			'forum_desc_uid'		=> array('VCHAR:8', ''),
 			'forum_link'			=> array('VCHAR_UNI', ''),
 			'forum_password'		=> array('VCHAR_UNI:40', ''),
-			'forum_style'			=> array('TINT:4', 0),
+			'forum_style'			=> array('USINT', 0),
 			'forum_image'			=> array('VCHAR', ''),
 			'forum_rules'			=> array('TEXT_UNI', ''),
 			'forum_rules_link'		=> array('VCHAR_UNI', ''),
 			'forum_rules_bitfield'	=> array('VCHAR:255', ''),
 			'forum_rules_options'	=> array('UINT:11', 7),
-			'forum_rules_uid'		=> array('VCHAR:5', ''),
+			'forum_rules_uid'		=> array('VCHAR:8', ''),
 			'forum_topics_per_page'	=> array('TINT:4', 0),
 			'forum_type'			=> array('TINT:4', 0),
 			'forum_status'			=> array('TINT:4', 0),
@@ -1039,6 +1072,7 @@ function get_schema_struct()
 			'forum_last_poster_name'=> array('VCHAR_UNI', ''),
 			'forum_last_poster_colour'=> array('VCHAR:6', ''),
 			'forum_flags'			=> array('TINT:4', 32),
+			'display_subforum_list'	=> array('BOOL', 1),
 			'display_on_index'		=> array('BOOL', 1),
 			'enable_indexing'		=> array('BOOL', 1),
 			'enable_icons'			=> array('BOOL', 1),
@@ -1095,12 +1129,12 @@ function get_schema_struct()
 			'group_desc'			=> array('TEXT_UNI', ''),
 			'group_desc_bitfield'	=> array('VCHAR:255', ''),
 			'group_desc_options'	=> array('UINT:11', 7),
-			'group_desc_uid'		=> array('VCHAR:5', ''),
+			'group_desc_uid'		=> array('VCHAR:8', ''),
 			'group_display'			=> array('BOOL', 0),
 			'group_avatar'			=> array('VCHAR', ''),
-			'group_avatar_type'		=> array('TINT:4', 0),
-			'group_avatar_width'	=> array('TINT:4', 0),
-			'group_avatar_height'	=> array('TINT:4', 0),
+			'group_avatar_type'		=> array('TINT:2', 0),
+			'group_avatar_width'	=> array('USINT', 0),
+			'group_avatar_height'	=> array('USINT', 0),
 			'group_rank'			=> array('UINT', 0),
 			'group_colour'			=> array('VCHAR:6', ''),
 			'group_sig_chars'		=> array('UINT', 0),
@@ -1110,7 +1144,7 @@ function get_schema_struct()
 		),
 		'PRIMARY_KEY'	=> 'group_id',
 		'KEYS'			=> array(
-			'group_legend'			=> array('INDEX', 'group_legend'),
+			'group_legend_name'		=> array('INDEX', array('group_legend', 'group_name')),
 		),
 	);
 
@@ -1247,12 +1281,12 @@ function get_schema_struct()
 			'enable_magic_url'		=> array('BOOL', 1),
 			'enable_sig'			=> array('BOOL', 1),
 			'post_username'			=> array('VCHAR_UNI:255', ''),
-			'post_subject'			=> array('XSTEXT_UNI', ''),
+			'post_subject'			=> array('XSTEXT_UNI', '', 'true_sort'),
 			'post_text'				=> array('MTEXT_UNI', ''),
 			'post_checksum'			=> array('VCHAR:32', ''),
 			'post_attachment'		=> array('BOOL', 0),
 			'bbcode_bitfield'		=> array('VCHAR:255', ''),
-			'bbcode_uid'			=> array('VCHAR:5', ''),
+			'bbcode_uid'			=> array('VCHAR:8', ''),
 			'post_postcount'		=> array('BOOL', 1),
 			'post_edit_time'		=> array('TIMESTAMP', 0),
 			'post_edit_reason'		=> array('STEXT_UNI', ''),
@@ -1289,7 +1323,7 @@ function get_schema_struct()
 			'message_edit_user'		=> array('UINT', 0),
 			'message_attachment'	=> array('BOOL', 0),
 			'bbcode_bitfield'		=> array('VCHAR:255', ''),
-			'bbcode_uid'			=> array('VCHAR:5', ''),
+			'bbcode_uid'			=> array('VCHAR:8', ''),
 			'message_edit_time'		=> array('TIMESTAMP', 0),
 			'message_edit_count'	=> array('USINT', 0),
 			'to_address'			=> array('TEXT_UNI', ''),
@@ -1460,10 +1494,12 @@ function get_schema_struct()
 			'word_id'			=> array('UINT', NULL, 'auto_increment'),
 			'word_text'			=> array('VCHAR_UNI', ''),
 			'word_common'		=> array('BOOL', 0),
+			'word_count'		=> array('UINT', 0),
 		),
 		'PRIMARY_KEY'	=> 'word_id',
 		'KEYS'			=> array(
 			'wrd_txt'			=> array('UNIQUE', 'word_text'),
+			'wrd_cnt'			=> array('INDEX', 'word_count'),
 		),
 	);
 
@@ -1474,6 +1510,7 @@ function get_schema_struct()
 			'title_match'		=> array('BOOL', 0),
 		),
 		'KEYS'			=> array(
+			'unq_mtch'			=> array('UNIQUE', array('word_id', 'post_id', 'title_match')),
 			'word_id'			=> array('INDEX', 'word_id'),
 			'post_id'			=> array('INDEX', 'post_id'),
 		),
@@ -1483,6 +1520,7 @@ 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),
@@ -1498,6 +1536,7 @@ function get_schema_struct()
 		'KEYS'			=> array(
 			'session_time'		=> array('INDEX', 'session_time'),
 			'session_user_id'	=> array('INDEX', 'session_user_id'),
+			'session_forum_id'	=> array('INDEX', 'session_forum_id'),
 		),
 	);
 
@@ -1527,6 +1566,7 @@ function get_schema_struct()
 	$schema_data['phpbb_smilies'] = array(
 		'COLUMNS'		=> array(
 			'smiley_id'			=> array('UINT', NULL, 'auto_increment'),
+			// We may want to set 'code' to VCHAR:50 or check if unicode support is possible... at the moment only ASCII characters are allowed.
 			'code'				=> array('VCHAR_UNI:50', ''),
 			'emotion'			=> array('VCHAR_UNI:50', ''),
 			'smiley_url'		=> array('VCHAR:50', ''),
@@ -1543,13 +1583,13 @@ function get_schema_struct()
 
 	$schema_data['phpbb_styles'] = array(
 		'COLUMNS'		=> array(
-			'style_id'				=> array('TINT:4', NULL, 'auto_increment'),
+			'style_id'				=> array('USINT', NULL, 'auto_increment'),
 			'style_name'			=> array('VCHAR_UNI:255', ''),
 			'style_copyright'		=> array('VCHAR_UNI', ''),
 			'style_active'			=> array('BOOL', 1),
-			'template_id'			=> array('TINT:4', 0),
-			'theme_id'				=> array('TINT:4', 0),
-			'imageset_id'			=> array('TINT:4', 0),
+			'template_id'			=> array('USINT', 0),
+			'theme_id'				=> array('USINT', 0),
+			'imageset_id'			=> array('USINT', 0),
 		),
 		'PRIMARY_KEY'	=> 'style_id',
 		'KEYS'			=> array(
@@ -1562,7 +1602,7 @@ function get_schema_struct()
 
 	$schema_data['phpbb_styles_template'] = array(
 		'COLUMNS'		=> array(
-			'template_id'			=> array('TINT:4', NULL, 'auto_increment'),
+			'template_id'			=> array('USINT', NULL, 'auto_increment'),
 			'template_name'			=> array('VCHAR_UNI:255', ''),
 			'template_copyright'	=> array('VCHAR_UNI', ''),
 			'template_path'			=> array('VCHAR:100', ''),
@@ -1577,7 +1617,7 @@ function get_schema_struct()
 
 	$schema_data['phpbb_styles_template_data'] = array(
 		'COLUMNS'		=> array(
-			'template_id'			=> array('TINT:4', NULL, 'auto_increment'),
+			'template_id'			=> array('USINT', 0),
 			'template_filename'		=> array('VCHAR:100', ''),
 			'template_included'		=> array('TEXT', ''),
 			'template_mtime'		=> array('TIMESTAMP', 0),
@@ -1591,7 +1631,7 @@ function get_schema_struct()
 
 	$schema_data['phpbb_styles_theme'] = array(
 		'COLUMNS'		=> array(
-			'theme_id'				=> array('TINT:4', NULL, 'auto_increment'),
+			'theme_id'				=> array('USINT', NULL, 'auto_increment'),
 			'theme_name'			=> array('VCHAR_UNI:255', ''),
 			'theme_copyright'		=> array('VCHAR_UNI', ''),
 			'theme_path'			=> array('VCHAR:100', ''),
@@ -1607,119 +1647,10 @@ function get_schema_struct()
 
 	$schema_data['phpbb_styles_imageset'] = array(
 		'COLUMNS'		=> array(
-			'imageset_id'				=> array('TINT:4', NULL, 'auto_increment'),
+			'imageset_id'				=> array('USINT', NULL, 'auto_increment'),
 			'imageset_name'				=> array('VCHAR_UNI:255', ''),
 			'imageset_copyright'		=> array('VCHAR_UNI', ''),
 			'imageset_path'				=> array('VCHAR:100', ''),
-
-			'site_logo'					=> array('VCHAR:200', ''),
-			'upload_bar'				=> array('VCHAR:200', ''),
-			'poll_left'					=> array('VCHAR:200', ''),
-			'poll_center'				=> array('VCHAR:200', ''),
-			'poll_right'				=> array('VCHAR:200', ''),
-			'icon_friend'				=> array('VCHAR:200', ''),
-			'icon_foe'					=> array('VCHAR:200', ''),
-
-			'forum_link'				=> array('VCHAR:200', ''),
-			'forum_read'				=> array('VCHAR:200', ''),
-			'forum_read_locked'			=> array('VCHAR:200', ''),
-			'forum_read_subforum'		=> array('VCHAR:200', ''),
-			'forum_unread'				=> array('VCHAR:200', ''),
-			'forum_unread_locked'		=> array('VCHAR:200', ''),
-			'forum_unread_subforum'		=> array('VCHAR:200', ''),
-
-			'topic_moved'				=> array('VCHAR:200', ''),
-
-			'topic_read'				=> array('VCHAR:200', ''),
-			'topic_read_mine'			=> array('VCHAR:200', ''),
-			'topic_read_hot'			=> array('VCHAR:200', ''),
-			'topic_read_hot_mine'		=> array('VCHAR:200', ''),
-			'topic_read_locked'			=> array('VCHAR:200', ''),
-			'topic_read_locked_mine'	=> array('VCHAR:200', ''),
-
-			'topic_unread'				=> array('VCHAR:200', ''),
-			'topic_unread_mine'			=> array('VCHAR:200', ''),
-			'topic_unread_hot'			=> array('VCHAR:200', ''),
-			'topic_unread_hot_mine'		=> array('VCHAR:200', ''),
-			'topic_unread_locked'		=> array('VCHAR:200', ''),
-			'topic_unread_locked_mine'	=> array('VCHAR:200', ''),
-
-			'sticky_read'				=> array('VCHAR:200', ''),
-			'sticky_read_mine'			=> array('VCHAR:200', ''),
-			'sticky_read_locked'		=> array('VCHAR:200', ''),
-			'sticky_read_locked_mine'	=> array('VCHAR:200', ''),
-			'sticky_unread'				=> array('VCHAR:200', ''),
-			'sticky_unread_mine'		=> array('VCHAR:200', ''),
-			'sticky_unread_locked'		=> array('VCHAR:200', ''),
-			'sticky_unread_locked_mine'	=> array('VCHAR:200', ''),
-
-			'announce_read'				=> array('VCHAR:200', ''),
-			'announce_read_mine'		=> array('VCHAR:200', ''),
-			'announce_read_locked'		=> array('VCHAR:200', ''),
-			'announce_read_locked_mine'	=> array('VCHAR:200', ''),
-			'announce_unread'			=> array('VCHAR:200', ''),
-			'announce_unread_mine'		=> array('VCHAR:200', ''),
-			'announce_unread_locked'	=> array('VCHAR:200', ''),
-			'announce_unread_locked_mine'	=> array('VCHAR:200', ''),
-
-			'global_read'				=> array('VCHAR:200', ''),
-			'global_read_mine'			=> array('VCHAR:200', ''),
-			'global_read_locked'		=> array('VCHAR:200', ''),
-			'global_read_locked_mine'	=> array('VCHAR:200', ''),
-			'global_unread'				=> array('VCHAR:200', ''),
-			'global_unread_mine'		=> array('VCHAR:200', ''),
-			'global_unread_locked'		=> array('VCHAR:200', ''),
-			'global_unread_locked_mine'	=> array('VCHAR:200', ''),
-
-			'pm_read'					=> array('VCHAR:200', ''),
-			'pm_unread'					=> array('VCHAR:200', ''),
-
-			'icon_contact_aim'			=> array('VCHAR:200', ''),
-			'icon_contact_email'		=> array('VCHAR:200', ''),
-			'icon_contact_icq'			=> array('VCHAR:200', ''),
-			'icon_contact_jabber'		=> array('VCHAR:200', ''),
-			'icon_contact_msnm'			=> array('VCHAR:200', ''),
-			'icon_contact_pm'			=> array('VCHAR:200', ''),
-			'icon_contact_yahoo'		=> array('VCHAR:200', ''),
-			'icon_contact_www'			=> array('VCHAR:200', ''),
-
-			'icon_post_delete'			=> array('VCHAR:200', ''),
-			'icon_post_edit'			=> array('VCHAR:200', ''),
-			'icon_post_info'			=> array('VCHAR:200', ''),
-			'icon_post_quote'			=> array('VCHAR:200', ''),
-			'icon_post_report'			=> array('VCHAR:200', ''),
-			'icon_post_target'			=> array('VCHAR:200', ''),
-			'icon_post_target_unread'	=> array('VCHAR:200', ''),
-
-			'icon_topic_attach'			=> array('VCHAR:200', ''),
-			'icon_topic_latest'			=> array('VCHAR:200', ''),
-			'icon_topic_newest'			=> array('VCHAR:200', ''),
-			'icon_topic_reported'		=> array('VCHAR:200', ''),
-			'icon_topic_unapproved'		=> array('VCHAR:200', ''),
-
-			'icon_user_online'			=> array('VCHAR:200', ''),
-			'icon_user_offline'			=> array('VCHAR:200', ''),
-			'icon_user_profile'			=> array('VCHAR:200', ''),
-			'icon_user_search'			=> array('VCHAR:200', ''),
-			'icon_user_warn'			=> array('VCHAR:200', ''),
-
-			'button_pm_forward'			=> array('VCHAR:200', ''),
-			'button_pm_new'				=> array('VCHAR:200', ''),
-			'button_pm_reply'			=> array('VCHAR:200', ''),
-			'button_topic_locked'		=> array('VCHAR:200', ''),
-			'button_topic_new'			=> array('VCHAR:200', ''),
-			'button_topic_reply'		=> array('VCHAR:200', ''),
-
-			'user_icon1'				=> array('VCHAR:200', ''),
-			'user_icon2'				=> array('VCHAR:200', ''),
-			'user_icon3'				=> array('VCHAR:200', ''),
-			'user_icon4'				=> array('VCHAR:200', ''),
-			'user_icon5'				=> array('VCHAR:200', ''),
-			'user_icon6'				=> array('VCHAR:200', ''),
-			'user_icon7'				=> array('VCHAR:200', ''),
-			'user_icon8'				=> array('VCHAR:200', ''),
-			'user_icon9'				=> array('VCHAR:200', ''),
-			'user_icon10'				=> array('VCHAR:200', ''),
 		),
 		'PRIMARY_KEY'		=> 'imageset_id',
 		'KEYS'				=> array(
@@ -1727,6 +1658,22 @@ function get_schema_struct()
 		),
 	);
 
+	$schema_data['phpbb_styles_imageset_data'] = array(
+		'COLUMNS'		=> array(
+			'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('USINT', 0),
+		),
+		'PRIMARY_KEY'		=> 'image_id',
+		'KEYS'				=> array(
+			'i_d'			=> array('INDEX', 'imageset_id'),
+		),
+	);
+
 	$schema_data['phpbb_topics'] = array(
 		'COLUMNS'		=> array(
 			'topic_id'					=> array('UINT', NULL, 'auto_increment'),
@@ -1735,7 +1682,7 @@ function get_schema_struct()
 			'topic_attachment'			=> array('BOOL', 0),
 			'topic_approved'			=> array('BOOL', 1),
 			'topic_reported'			=> array('BOOL', 0),
-			'topic_title'				=> array('XSTEXT_UNI', ''),
+			'topic_title'				=> array('XSTEXT_UNI', '', 'true_sort'),
 			'topic_poster'				=> array('UINT', 0),
 			'topic_time'				=> array('TIMESTAMP', 0),
 			'topic_time_limit'			=> array('TIMESTAMP', 0),
@@ -1757,7 +1704,7 @@ function get_schema_struct()
 			'topic_moved_id'			=> array('UINT', 0),
 			'topic_bumped'				=> array('BOOL', 0),
 			'topic_bumper'				=> array('UINT', 0),
-			'poll_title'				=> array('XSTEXT_UNI', ''),
+			'poll_title'				=> array('STEXT_UNI', ''),
 			'poll_start'				=> array('TIMESTAMP', 0),
 			'poll_length'				=> array('TIMESTAMP', 0),
 			'poll_max_options'			=> array('TINT:4', 1),
@@ -1770,6 +1717,7 @@ function get_schema_struct()
 			'forum_id_type'		=> array('INDEX', array('forum_id', 'topic_type')),
 			'last_post_time'	=> array('INDEX', 'topic_last_post_time'),
 			'topic_approved'	=> array('INDEX', 'topic_approved'),
+			'forum_appr_last'	=> array('INDEX', array('forum_id', 'topic_approved', 'topic_last_post_id')),
 			'fid_time_moved'	=> array('INDEX', array('forum_id', 'topic_last_post_time', 'topic_moved_id')),
 		),
 	);
@@ -1856,11 +1804,11 @@ function get_schema_struct()
 			'user_timezone'				=> array('DECIMAL', 0),
 			'user_dst'					=> array('BOOL', 0),
 			'user_dateformat'			=> array('VCHAR_UNI:30', 'd M Y H:i'),
-			'user_style'				=> array('TINT:4', 0),
+			'user_style'				=> array('USINT', 0),
 			'user_rank'					=> array('UINT', 0),
 			'user_colour'				=> array('VCHAR:6', ''),
-			'user_new_privmsg'			=> array('TINT:4', 0),
-			'user_unread_privmsg'		=> array('TINT:4', 0),
+			'user_new_privmsg'			=> array('INT:4', 0),
+			'user_unread_privmsg'		=> array('INT:4', 0),
 			'user_last_privmsg'			=> array('TIMESTAMP', 0),
 			'user_message_rules'		=> array('BOOL', 0),
 			'user_full_folder'			=> array('INT:11', -3),
@@ -1884,7 +1832,7 @@ function get_schema_struct()
 			'user_avatar_width'			=> array('USINT', 0),
 			'user_avatar_height'		=> array('USINT', 0),
 			'user_sig'					=> array('MTEXT_UNI', ''),
-			'user_sig_bbcode_uid'		=> array('VCHAR:5', ''),
+			'user_sig_bbcode_uid'		=> array('VCHAR:8', ''),
 			'user_sig_bbcode_bitfield'	=> array('VCHAR:255', ''),
 			'user_from'					=> array('VCHAR_UNI:100', ''),
 			'user_icq'					=> array('VCHAR:15', ''),
@@ -1896,14 +1844,16 @@ function get_schema_struct()
 			'user_occ'					=> array('TEXT_UNI', ''),
 			'user_interests'			=> array('TEXT_UNI', ''),
 			'user_actkey'				=> array('VCHAR:32', ''),
-			'user_newpasswd'			=> array('VCHAR_UNI:32', ''),
+			'user_newpasswd'			=> array('VCHAR_UNI:40', ''),
+			'user_form_salt'			=> array('VCHAR_UNI:32', ''),
+
 		),
 		'PRIMARY_KEY'	=> 'user_id',
 		'KEYS'			=> array(
 			'user_birthday'				=> array('INDEX', 'user_birthday'),
 			'user_email_hash'			=> array('INDEX', 'user_email_hash'),
 			'user_type'					=> array('INDEX', 'user_type'),
-			'username_clean'			=> array('INDEX', 'username_clean'),
+			'username_clean'			=> array('UNIQUE', 'username_clean'),
 		),
 	);
 
@@ -2075,4 +2025,6 @@ EOF;
 	return '';
 }
 
+echo 'done';
+
 ?>

phpBB/develop/create_variable_overview.php

@@ -35,7 +35,7 @@ $merge = array('gcp', 'login', 'mcp', 'memberlist', 'posting', 'ucp');
 
 if (!is_writable($store_dir))
 {
-	die("Directory $store_dir is not writeable!");
+	die("Directory $store_dir is not writable!");
 }
 
 $contents = implode('', file('../adm/subSilver.css', filesize('../adm/subSilver.css')));

phpBB/develop/fill.php

@@ -10,6 +10,15 @@
 // LICENCE   : GPL vs2.0 [ see /docs/COPYING ]
 //
 // -------------------------------------------------------------
+//
+// Security message:
+//
+// This script is potentially dangerous.
+// Remove or comment the next line (die(".... ) to enable this script.
+// Do NOT FORGET to either remove this script or disable it after you have used it.
+//
+die("Please read the first lines of this script for instructions on how to enable it");
+
 
 define('IN_PHPBB', true);
 $phpbb_root_path = './../';

phpBB/develop/generate_utf_casefold.php

@@ -13,6 +13,15 @@ if (php_sapi_name() != 'cli')
 	die("This program must be run from the command line.\n");
 }
 
+//
+// Security message:
+//
+// This script is potentially dangerous.
+// Remove or comment the next line (die(".... ) to enable this script.
+// Do NOT FORGET to either remove this script or disable it after you have used it.
+//
+die("Please read the first lines of this script for instructions on how to enable it");
+
 set_time_limit(0);
 
 define('IN_PHPBB', true);

phpBB/develop/generate_utf_confusables.php

@@ -0,0 +1,240 @@
+<?php
+/**
+*
+* @package phpBB3
+* @version $Id$
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+if (php_sapi_name() != 'cli')
+{
+	die("This program must be run from the command line.\n");
+}
+
+//
+// Security message:
+//
+// This script is potentially dangerous.
+// Remove or comment the next line (die(".... ) to enable this script.
+// Do NOT FORGET to either remove this script or disable it after you have used it.
+//
+die("Please read the first lines of this script for instructions on how to enable it");
+
+set_time_limit(0);
+
+define('IN_PHPBB', true);
+$phpbb_root_path = '../';
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
+
+echo "Checking for required files\n";
+download('http://unicode.org/reports/tr39/data/confusables.txt');
+download('http://unicode.org/Public/UNIDATA/CaseFolding.txt');
+echo "\n";
+
+
+/**
+* Load the confusables table
+*/
+echo "Loading confusables\n";
+$unidata = file_get_contents('confusables.txt');
+
+/**
+* Load the CaseFolding table
+*/
+echo "Loading CaseFolding\n";
+$casefolds = file_get_contents('CaseFolding.txt');
+
+
+function utf8_chr($cp)
+{
+    if ($cp > 0xFFFF)
+    {
+        return chr(0xF0 | ($cp >> 18)) . chr(0x80 | (($cp >> 12) & 0x3F)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
+    }
+    else if ($cp > 0x7FF)
+    {
+        return chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
+    }
+    else if ($cp > 0x7F)
+    {
+        return chr(0xC0 | ($cp >> 6)) . chr(0x80 | ($cp & 0x3F));
+    }
+    else
+    {
+        return chr($cp);
+    }
+}
+
+preg_match_all('/^([0-9A-F]+) ;\s((?:[0-9A-F]+ )*);.*?$/im', $unidata, $array, PREG_SET_ORDER);
+preg_match_all('/^([0-9A-F]+); ([CFS]); ([0-9A-F]+(?: [0-9A-F]+)*);/im', $casefolds, $casefold_array);
+
+// some that we defined ourselves
+$uniarray = array(
+		"\xC2\xA1"			=>	"\x69",	// EXCLAMATION MARK, INVERTED => LATIN SMALL LETTER I
+		"\xC7\x83"			=>	"\x21",	// LATIN LETTER RETROFLEX CLICK => EXCLAMATION MARK
+		"\xCE\xB1"			=>	"\x61",	// GREEK SMALL LETTER ALPHA => LATIN SMALL LETTER A
+		"\xE1\x9A\x80"		=>	"\x20",	// OGHAM SPACE MARK
+
+		"\xC2\xAD"			=>	'',		// HYPHEN, SOFT => empty string
+		"\xDB\x9D"			=>	'',		// ARABIC END OF AYAH
+		"\xDC\x8F"			=>	'',		// SYRIAC ABBREVIATION MARK
+		"\xE1\xA0\x86"		=>	'',		// MONGOLIAN TODO SOFT HYPHEN
+		"\xE1\xA0\x8E"		=>	'',		// MONGOLIAN VOWEL SEPARATOR
+		"\xE2\x80\x8B"		=>	'',		// ZERO WIDTH SPACE
+		"\xE2\x80\x8C"		=>	'',		// ZERO WIDTH NON-JOINER
+		"\xE2\x80\x8D"		=>	'',		// ZERO WIDTH JOINER
+		"\xE2\x80\xA8"		=>	'',		// LINE SEPARATOR
+		"\xE2\x80\xA9"		=>	'',		// PARAGRAPH SEPARATOR
+		"\xE2\x81\xA0"		=>	'',		// WORD JOINER
+		"\xE2\x81\xA1"		=>	'',		// FUNCTION APPLICATION
+		"\xE2\x81\xA2"		=>	'',		// INVISIBLE TIMES
+		"\xE2\x81\xA3"		=>	'',		// INVISIBLE SEPARATOR
+		"\xE2\x81\xAA"		=>	'',		// [CONTROL CHARACTERS]
+		"\xE2\x81\xAB"		=>	'',		// [CONTROL CHARACTERS]
+		"\xE2\x81\xAC"		=>	'',		// [CONTROL CHARACTERS]
+		"\xE2\x81\xAD"		=>	'',		// [CONTROL CHARACTERS]
+		"\xE2\x81\xAE"		=>	'',		// [CONTROL CHARACTERS]
+		"\xE2\x81\xAF"		=>	'',		// [CONTROL CHARACTERS]
+		"\xEF\xBB\xBF"		=>	'',		// ZERO WIDTH NO-BREAK SPACE
+		"\xEF\xBF\xB9"		=>	'',		// [CONTROL CHARACTERS]
+		"\xEF\xBF\xBA"		=>	'',		// [CONTROL CHARACTERS]
+		"\xEF\xBF\xBB"		=>	'',		// [CONTROL CHARACTERS]
+		"\xEF\xBF\xBC"		=>	'',		// [CONTROL CHARACTERS]
+		"\xF0\x9D\x85\xB3"	=>	'',		// [MUSICAL CONTROL CHARACTERS]
+		"\xF0\x9D\x85\xB4"	=>	'',		// [MUSICAL CONTROL CHARACTERS]
+		"\xF0\x9D\x85\xB5"	=>	'',		// [MUSICAL CONTROL CHARACTERS]
+		"\xF0\x9D\x85\xB6"	=>	'',		// [MUSICAL CONTROL CHARACTERS]
+		"\xF0\x9D\x85\xB7"	=>	'',		// [MUSICAL CONTROL CHARACTERS]
+		"\xF0\x9D\x85\xB8"	=>	'',		// [MUSICAL CONTROL CHARACTERS]
+		"\xF0\x9D\x85\xB9"	=>	'',		// [MUSICAL CONTROL CHARACTERS]
+		"\xF0\x9D\x85\xBA"	=>	'',		// [MUSICAL CONTROL CHARACTERS]
+);
+
+$copy = $uniarray;
+
+foreach ($array as $value)
+{
+	$temp_hold = implode(array_map('utf8_chr', array_map('hexdec', explode(' ', trim($value[2])))));
+	
+	if (isset($copy[utf8_chr(hexdec((string)$value[1]))]))
+	{
+		$num = '';
+		$string = utf8_chr(hexdec((string)$value[1]));
+		for ($i = 0; $i < strlen($string); $i++)
+		{
+			$num .= '\x' . str_pad(base_convert(ord($string[$i]), 10, 16), 2, '0', STR_PAD_LEFT);
+		}
+		echo $num . "\n";
+		if ($uniarray[$string] != $temp_hold)
+		{
+			echo "  --> $string\n";
+			echo "  --> " . $temp_hold . "\n";
+		}
+	}
+
+	// do some tests for things that transform into something with the number one
+	if (strpos($temp_hold, utf8_chr(0x0031)) !== false)
+	{
+		// any kind of letter L?
+		if (strpos($value[0], 'LETTER L') !== false || strpos($value[0], 'IOTA') !== false || strpos($value[0], 'SMALL L ') !== false || preg_match('/SMALL LIGATURE [^L]*L /', $value[0]))
+		{
+			// replace all of the mappings that transform some sort of letter l to number one instead to some sort of letter l to latin small letter l
+			$temp_hold = str_replace(utf8_chr(0x0031), utf8_chr(0x006C), $temp_hold);
+		}
+	}
+
+	// uppercased chars that were folded do not exist in this universe,
+	// no amount of normalization could ever "trick" this into not working
+	if (in_array($value[1], $casefold_array[1]))
+	{
+		continue;
+	}
+
+	$uniarray[utf8_chr(hexdec((string)$value[1]))] = $temp_hold;
+}
+
+echo "Writing to confusables.$phpEx\n";
+
+$fp = fopen($phpbb_root_path . 'includes/utf/data/confusables.' . $phpEx, 'wb');
+fwrite($fp, '<?php return ' . my_var_export($uniarray) . ';');
+fclose($fp);
+
+/**
+* Return a parsable string representation of a variable
+*
+* This is function is limited to array/strings/integers
+*
+* @param	mixed	$var		Variable
+* @return	string				PHP code representing the variable
+*/
+function my_var_export($var)
+{
+	if (is_array($var))
+	{
+		$lines = array();
+
+		foreach ($var as $k => $v)
+		{
+			$lines[] = my_var_export($k) . '=>' . my_var_export($v);
+		}
+
+		return 'array(' . implode(',', $lines) . ')';
+	}
+	else if (is_string($var))
+	{
+		return "'" . str_replace(array('\\', "'"), array('\\\\', "\\'"), $var) . "'";
+	}
+	else
+	{
+		return $var;
+	}
+}
+
+/**
+* Download a file to the develop/ dir
+*
+* @param	string	$url		URL of the file to download
+* @return	void
+*/
+function download($url)
+{
+	global $phpbb_root_path;
+
+	if (file_exists($phpbb_root_path . 'develop/' . basename($url)))
+	{
+		return;
+	}
+
+	echo 'Downloading from ', $url, ' ';
+
+	if (!$fpr = fopen($url, 'rb'))
+	{
+		die("Can't download from $url\nPlease download it yourself and put it in the develop/ dir, kthxbai");
+	}
+
+	if (!$fpw = fopen($phpbb_root_path . 'develop/' . basename($url), 'wb'))
+	{
+		die("Can't open develop/" . basename($url) . " for output... please check your permissions or something");
+	}
+
+	$i = 0;
+	$chunk = 32768;
+	$done = '';
+
+	while (!feof($fpr))
+	{
+		$i += fwrite($fpw, fread($fpr, $chunk));
+		echo str_repeat("\x08", strlen($done));
+
+		$done = ($i >> 10) . ' KiB';
+		echo $done;
+	}
+	fclose($fpr);
+	fclose($fpw);
+
+	echo "\n";
+}
+
+?>