This commit was manufactured by cvs2svn to create tag

'release_3_0_B3'.

git-svn-id: file:///svn/phpbb/tags/release_3_0_B3@6579 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/adm/index.php

@@ -1,21 +1,21 @@
 <?php
-/**
+/** 
 *
 * @package acp
 * @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
 *
 */
 
 /**
 */
-define('IN_PHPBB', true);
-define('ADMIN_START', true);
+define('IN_PHPBB', 1);
+define('ADMIN_START', 1);
 define('NEED_SID', true);
 
 // Include files
-$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? 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,6 +27,12 @@ $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'])
 {
@@ -37,16 +43,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('NO_ADMIN');
+	trigger_error($user->lang['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 = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : './';
+$phpbb_admin_path = './';
 
 // Some oft used variables
-$safe_mode		= (@ini_get('safe_mode') == '1' || strtolower(@ini_get('safe_mode')) === 'on') ? true : false;
-$file_uploads	= (@ini_get('file_uploads') == '1' || strtolower(@ini_get('file_uploads')) === 'on') ? true : false;
+$safe_mode		= (@ini_get('safe_mode') || @strtolower(ini_get('safe_mode')) == 'on') ? true : false;
+$file_uploads 	= (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on') ? true : false;
 $module_id		= request_var('i', '');
 $mode			= request_var('mode', '');
 
@@ -57,6 +63,9 @@ $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();
 
@@ -77,8 +86,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();
 
@@ -116,7 +125,6 @@ function adm_page_header($page_title)
 		'ROOT_PATH'				=> $phpbb_admin_path,
 
 		'U_LOGOUT'				=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout'),
-		'U_ADM_LOGOUT'			=> append_sid("{$phpbb_admin_path}index.$phpEx", 'action=admlogout'),
 		'U_ADM_INDEX'			=> append_sid("{$phpbb_admin_path}index.$phpEx"),
 		'U_INDEX'				=> append_sid("{$phpbb_root_path}index.$phpEx"),
 
@@ -142,13 +150,14 @@ 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
-	header('Content-type: text/html; charset=UTF-8');
+		'S_CONTENT_DIR_LEFT'	=> $user->lang['LEFT'],
+		'S_CONTENT_DIR_RIGHT'	=> $user->lang['RIGHT'])
+	);
 
+	if ($config['send_encoding'])
+	{
+		header('Content-type: text/html; charset=UTF-8');
+	}
 	header('Cache-Control: private, no-cache="set-cookie"');
 	header('Expires: 0');
 	header('Pragma: no-cache');
@@ -175,7 +184,7 @@ function adm_page_footer($copyright_html = true)
 			$db->sql_report('display');
 		}
 
-		$debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . (($config['gzip_compress']) ? 'On' : 'Off') . (($user->load) ? ' | Load : ' . $user->load : ''), $totaltime);
+		$debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' .  (($config['gzip_compress']) ? 'On' : 'Off') . (($user->load) ? ' | Load : ' . $user->load : ''), $totaltime);
 
 		if ($auth->acl_get('a_') && defined('DEBUG_EXTRA'))
 		{
@@ -185,7 +194,7 @@ function adm_page_footer($copyright_html = true)
 				{
 					global $base_memory_usage;
 					$memory_usage -= $base_memory_usage;
-					$memory_usage = get_formatted_filesize($memory_usage);
+					$memory_usage = ($memory_usage >= 1048576) ? round((round($memory_usage / 1048576 * 100) / 100), 2) . ' ' . $user->lang['MB'] : (($memory_usage >= 1024) ? round((round($memory_usage / 1024 * 100) / 100), 2) . ' ' . $user->lang['KB'] : $memory_usage . ' ' . $user->lang['BYTES']);
 
 					$debug_output .= ' | Memory Usage: ' . $memory_usage;
 				}
@@ -197,7 +206,6 @@ function adm_page_footer($copyright_html = true)
 
 	$template->assign_vars(array(
 		'DEBUG_OUTPUT'		=> (defined('DEBUG')) ? $debug_output : '',
-		'TRANSLATION_INFO'	=> (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '',
 		'S_COPYRIGHT_HTML'	=> $copyright_html,
 		'VERSION'			=> $config['version'])
 	);
@@ -205,7 +213,8 @@ function adm_page_footer($copyright_html = true)
 	$template->display('body');
 
 	garbage_collection();
-	exit_handler();
+
+	exit;
 }
 
 /**
@@ -246,7 +255,8 @@ 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 .= '<label><input type="radio" name="' . $name . '"' . (($id && !$id_assigned) ? ' id="' . $id . '"' : '') . ' value="' . $value . '"' . $selected . (($key) ? ' accesskey="' . $key . '"' : '') . ' class="radio" /> ' . $user->lang[$title] . '</label>';
+		$html .= ($html) ? ' &nbsp; ' : '';
+		$html .= '<input type="radio" name="' . $name . '"' . (($id && !$id_assigned) ? ' id="' . $id . '"' : '') . ' value="' . $value . '"' . $selected . (($key) ? ' accesskey="' . $key . '"' : '') . ' class="radio" /> ' . $user->lang[$title];
 		$id_assigned = true;
 	}
 
@@ -277,7 +287,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 . '_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'] . '" />';
+			$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'] . '" />';
 		break;
 
 		case 'textarea':
@@ -294,10 +304,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 = '<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_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 = ($tpl_type_cond[0] == 'yes' || $tpl_type_cond[0] == 'enabled') ? $tpl_yes . $tpl_no : $tpl_no . $tpl_yes;
+			$tpl = ($tpl_type_cond[0] == 'yes' || $tpl_type_cond[0] == 'enabled') ? $tpl_yes . '&nbsp;&nbsp;' . $tpl_no : $tpl_no . '&nbsp;&nbsp;' . $tpl_yes;
 		break;
 
 		case 'select':
@@ -368,108 +378,33 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 }
 
 /**
-* Going through a config array and validate values, writing errors to $error. The validation method  accepts parameters separated by ':' for string and int.
-* The first parameter defines the type to be used, the second the lower bound and the third the upper bound. Only the type is required.
+* Going through a config array and validate values, writing errors to $error.
 */
 function validate_config_vars($config_vars, &$cfg_array, &$error)
 {
 	global $phpbb_root_path, $user;
-	$type	= 0;
-	$min	= 1;
-	$max	= 2;
-	
+
 	foreach ($config_vars as $config_name => $config_definition)
 	{
 		if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false)
 		{
 			continue;
 		}
-	
+
 		if (!isset($config_definition['validate']))
 		{
 			continue;
 		}
-		
-		$validator = explode(':', $config_definition['validate']);
 
-		// Validate a bit. ;) (0 = type, 1 = min, 2= max)
-		switch ($validator[$type])
+		// Validate a bit. ;) String is already checked through request_var(), therefore we do not check this again
+		switch ($config_definition['validate'])
 		{
-			case 'string':
-				$length = strlen($cfg_array[$config_name]);
-
-				// the column is a VARCHAR
-				$validator[$max] = (isset($validator[$max])) ? min(255, $validator[$max]) : 255;
-
-				if (isset($validator[$min]) && $length < $validator[$min])
-				{
-					$error[] = sprintf($user->lang['SETTING_TOO_SHORT'], $user->lang[$config_definition['lang']], $validator[$min]);
-				}
-				else if (isset($validator[$max]) && $length > $validator[2])
-				{
-					$error[] = sprintf($user->lang['SETTING_TOO_LONG'], $user->lang[$config_definition['lang']], $validator[$max]);
-				}
-			break;
-
 			case 'bool':
 				$cfg_array[$config_name] = ($cfg_array[$config_name]) ? 1 : 0;
 			break;
 
 			case 'int':
 				$cfg_array[$config_name] = (int) $cfg_array[$config_name];
-
-				if (isset($validator[$min]) && $cfg_array[$config_name] < $validator[$min])
-				{
-					$error[] = sprintf($user->lang['SETTING_TOO_LOW'], $user->lang[$config_definition['lang']], $validator[$min]);
-				}
-				else if (isset($validator[$max]) && $cfg_array[$config_name] > $validator[$max])
-				{
-					$error[] = sprintf($user->lang['SETTING_TOO_BIG'], $user->lang[$config_definition['lang']], $validator[$max]);
-				}
-			break;
-
-			// Absolute path
-			case 'script_path':
-				if (!$cfg_array[$config_name])
-				{
-					break;
-				}
-
-				$destination = str_replace('\\', '/', $cfg_array[$config_name]);
-
-				if ($destination !== '/')
-				{
-					// Adjust destination path (no trailing slash)
-					if (substr($destination, -1, 1) == '/')
-					{
-						$destination = substr($destination, 0, -1);
-					}
-
-					$destination = str_replace(array('../', './'), '', $destination);
-
-					if ($destination[0] != '/')
-					{
-						$destination = '/' . $destination;
-					}
-				}
-
-				$cfg_array[$config_name] = trim($destination);
-
-			break;
-
-			// Absolute path
-			case 'lang':
-				if (!$cfg_array[$config_name])
-				{
-					break;
-				}
-
-				$cfg_array[$config_name] = basename($cfg_array[$config_name]);
-
-				if (!file_exists($phpbb_root_path . 'language/' . $cfg_array[$config_name] . '/'))
-				{
-					$error[] = $user->lang['WRONG_DATA_LANG'];
-				}
 			break;
 
 			// Relative path (appended $phpbb_root_path)
@@ -483,9 +418,9 @@ function validate_config_vars($config_vars, &$cfg_array, &$error)
 				$destination = $cfg_array[$config_name];
 
 				// Adjust destination path (no trailing slash)
-				if (substr($destination, -1, 1) == '/' || substr($destination, -1, 1) == '\\')
+				if ($destination{(sizeof($destination)-1)} == '/' || $destination{(sizeof($destination)-1)} == '\\')
 				{
-					$destination = substr($destination, 0, -1);
+					$destination = substr($destination, 0, sizeof($destination)-2);
 				}
 
 				$destination = str_replace(array('../', '..\\', './', '.\\'), '', $destination);
@@ -508,7 +443,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;
@@ -524,12 +459,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 writable
+				// Check if the path is writeable
 				if ($config_definition['validate'] == 'wpath' || $config_definition['validate'] == 'rwpath')
 				{
-					if (file_exists($phpbb_root_path . $cfg_array[$config_name]) && !@is_writable($phpbb_root_path . $cfg_array[$config_name]))
+					if (file_exists($phpbb_root_path . $cfg_array[$config_name]) && !is_writeable($phpbb_root_path . $cfg_array[$config_name]))
 					{
-						$error[] = sprintf($user->lang['DIRECTORY_NOT_WRITABLE'], $cfg_array[$config_name]);
+						$error[] = sprintf($user->lang['DIRECTORY_NOT_WRITEABLE'], $cfg_array[$config_name]);
 					}
 				}
 
@@ -540,62 +475,4 @@ function validate_config_vars($config_vars, &$cfg_array, &$error)
 	return;
 }
 
-/**
-* Checks whatever or not a variable is OK for use in the Database
-* param mixed $value_ary An array of the form array(array('lang' => ..., 'value' => ..., 'column_type' =>))'
-* param mixed $error The error array
-*/
-function validate_range($value_ary, &$error)
-{
-	global $user;
-	
-	$column_types = array(
-		'BOOL'	=> array('php_type' => 'int', 		'min' => 0, 				'max' => 1),
-		'USINT'	=> array('php_type' => 'int',		'min' => 0, 				'max' => 65535),
-		'UINT'	=> array('php_type' => 'int', 		'min' => 0, 				'max' => (int) 0x7fffffff),
-		'INT'	=> array('php_type' => 'int', 		'min' => (int) 0x80000000, 	'max' => (int) 0x7fffffff),
-		'TINT'	=> array('php_type' => 'int',		'min' => -128,				'max' => 127),
-		
-		'VCHAR'	=> array('php_type' => 'string', 	'min' => 0, 				'max' => 255),
-	);
-	foreach ($value_ary as $value)
-	{
-		$column = explode(':', $value['column_type']);
-		$max = $min = 0;
-		$type = 0;
-		if (!isset($column_types[$column[0]]))
-		{
-			continue;
-		}
-		else
-		{
-			$type = $column_types[$column[0]];
-		}
-
-		switch ($type['php_type'])
-		{
-			case 'string' :
-				$max = (isset($column[1])) ? min($column[1],$type['max']) : $type['max'];
-				if (strlen($value['value']) > $max)
-				{
-					$error[] = sprintf($user->lang['SETTING_TOO_LONG'], $user->lang[$value['lang']], $max);
-				}
-			break;
-
-			case 'int': 
-				$min = (isset($column[1])) ? max($column[1],$type['min']) : $type['min'];
-				$max = (isset($column[2])) ? min($column[2],$type['max']) : $type['max'];
-				if ($value['value'] < $min)
-				{
-					$error[] = sprintf($user->lang['SETTING_TOO_LOW'], $user->lang[$value['lang']], $min);
-				}
-				else if ($value['value'] > $max)
-				{
-					$error[] = sprintf($user->lang['SETTING_TOO_BIG'], $user->lang[$value['lang']], $max);
-				}
-			break;
-		}
-	}
-}
-
 ?>

phpBB/adm/style/acp_attachments.html

@@ -2,10 +2,6 @@
 
 <a name="maincontent"></a>
 
-<!-- IF U_BACK -->
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-<!-- ENDIF -->
-
 <h1>{L_TITLE}</h1>
 
 <p>{L_TITLE_EXPLAIN}</p>
@@ -16,7 +12,7 @@
 		<p>{WARNING_MSG}</p>
 	</div>
 <!-- ENDIF -->
-
+	
 <!-- IF S_NOTIFY -->
 	<div class="successbox">
 		<h3>{L_NOTIFY}</h3>
@@ -63,7 +59,6 @@
 	</fieldset>
 
 	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 	</fieldset>
@@ -83,13 +78,12 @@
 	</dl>
 	<dl>
 		<dt><label for="exclude">{L_IP_EXCLUDE}:</label><br /><span>{L_EXCLUDE_ENTERED_IP}</span></dt>
-		<dd><label><input type="radio" id="exclude" name="ipexclude" value="1" class="radio" /> {L_YES}</label>
-			<label><input type="radio" name="ipexclude" value="0" checked="checked" class="radio" /> {L_NO}</label></dd>
+		<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>
 	</dl>
+	</fieldset>
 
-	<p class="quick">
+	<fieldset class="quick">
 		<input class="button1" type="submit" id="securesubmit" name="securesubmit" value="{L_SUBMIT}" />
-	</p>
 	</fieldset>
 
 	<fieldset>
@@ -100,33 +94,34 @@
 			<dt><label for="remove_ip_hostname">{L_IP_HOSTNAME}:</label></dt>
 			<dd><select name="unip[]" id="remove_ip_hostname" multiple="multiple" size="10">{DEFINED_IPS}</select></dd>
 		</dl>
+		</fieldset>
 
-		<p class="quick">
+		<fieldset class="quick">
 			<input class="button1" type="submit" id="unsecuresubmit" name="unsecuresubmit" value="{L_SUBMIT}" />
-		</p>
 		</fieldset>
 
 	<!-- ELSE -->
 		<p>{L_NO_IPS_DEFINED}</p>
 	<!-- ENDIF -->
-	{S_FORM_TOKEN}
 	</fieldset>
+
 	</form>
 
 <!-- ELSEIF S_EXTENSION_GROUPS -->
 
 	<!-- IF S_EDIT_GROUP -->
 		<script type="text/javascript" defer="defer">
-		// <![CDATA[
+		<!--
+
 			function update_image(newimage)
 			{
 				if (newimage == 'no_image')
 				{
-					document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}images/spacer.gif";
+					document.image_upload_icon.src = "{PHPBB_ROOT_PATH}images/spacer.gif";
 				}
 				else
 				{
-					document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}{IMG_PATH}/" + newimage;
+					document.image_upload_icon.src = "{PHPBB_ROOT_PATH}{IMG_PATH}/" + newimage;
 				}
 			}
 
@@ -162,7 +157,7 @@
 				}
 			}
 
-		// ]]>
+		//-->
 		</script>
 
 		<form id="extgroups" method="post" action="{U_ACTION}">
@@ -187,12 +182,16 @@
 			<dt><label for="allow_in_pm">{L_ALLOW_IN_PM}:</label></dt>
 			<dd><input type="checkbox" class="radio" id="allow_in_pm" name="allow_in_pm" value="1"<!-- IF ALLOW_IN_PM --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
+		<dl>
+			<dt><label for="download_mode">{L_DOWNLOAD_MODE}:</label><br /><span>{L_DOWNLOAD_MODE_EXPLAIN}</span></dt>
+			<dd>{S_DOWNLOAD_SELECT}</dd>
+		</dl>
 		<dl>
 			<dt><label for="upload_icon">{L_UPLOAD_ICON}:</label></dt>
 			<dd><select name="upload_icon" id="upload_icon" onchange="update_image(this.options[selectedIndex].value);">
 					<option value="no_image"<!-- IF S_NO_IMAGE --> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>{S_FILENAME_LIST}
 			</select></dd>
-			<dd>&nbsp;<img <!-- IF S_NO_IMAGE -->src="{PHPBB_ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> id="image_upload_icon" alt="" title="" />&nbsp;</dd>
+			<dd>&nbsp;<img <!-- IF S_NO_IMAGE -->src="{PHPBB_ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> name="image_upload_icon" alt="" title="" />&nbsp;</dd>
 		</dl>
 		<dl>
 			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}:</label></dt>
@@ -205,25 +204,19 @@
 		</dl>
 		<dl>
 			<dt><label for="allowed_forums">{L_ALLOWED_FORUMS}:</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_ALL_FORUMS}</label>
-				<label><input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_SELECTED_FORUMS}</label></dd>
+			<dd><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><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd>
 		</dl>
+		</fieldset>
 
-		<p class="submit-buttons">
+		<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}" />
-		</p>
-		{S_FORM_TOKEN}
 		</fieldset>
 
 		</form>
 	<!-- ELSE -->
 
-		<form id="extgroups" method="post" action="{U_ACTION}">
-		<fieldset class="tabulated">
-		<legend>{L_TITLE}</legend>
-
 		<table cellspacing="1">
 			<col class="row1" /><col class="row1" /><col class="row2" />
 		<thead>
@@ -235,30 +228,27 @@
 		</thead>
 		<tbody>
 		<!-- BEGIN groups -->
-			<!-- IF groups.S_ADD_SPACER and not groups.S_FIRST_ROW -->
+			<!-- IF groups.S_ADD_SPACER -->
 			<tr>
 				<td class="spacer" colspan="3">&nbsp;</td>
 			</tr>
 			<!-- ENDIF -->
 			<tr>
-				<td><strong>{groups.GROUP_NAME}</strong>
-					<!-- IF groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>&raquo; {L_NOT_ALLOWED_IN_PM}</span>
-					<!-- ELSEIF groups.S_ALLOWED_IN_PM and not groups.S_GROUP_ALLOWED --><br /><span>&raquo; {L_ONLY_ALLOWED_IN_PM}</span>
-					<!-- ELSEIF not groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>&raquo; {L_NOT_ALLOWED_IN_PM_POST}</span>
-					<!-- ELSE --><br /><span>&raquo; {L_ALLOWED_IN_PM_POST}</span><!-- ENDIF -->
+				<td><a href="{groups.U_EDIT}">{groups.GROUP_NAME}</a>
+					<!-- IF groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>&raquo; {L_NOT_ALLOWED_IN_PM}</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>
+				<td align="center" valign="middle" style="white-space: nowrap;">&nbsp;<a href="{groups.U_EDIT}">{L_EDIT}</a> | <a href="{groups.U_DELETE}">{L_DELETE}</a> | <a href="{groups.U_ACT_DEACT}">{groups.L_ACT_DEACT}</a>&nbsp;</td>
 			</tr>
 		<!-- END groups -->
 		</tbody>
 		</table>
-		<p class="quick">
-				{L_CREATE_GROUP}: <input type="text" name="group_name" maxlength="30" />
+
+		<form id="extgroups" method="post" action="{U_ACTION}">
+			<fieldset class="quick">
+				{L_CREATE_GROUP}: <input type="text" name="group_name" maxlength="30" /> 
 				<input class="button2" name="add" type="submit" value="{L_SUBMIT}" />
-		</p>
-		{S_FORM_TOKEN}
-		</fieldset>
+			</fieldset>
 		</form>
 
 	<!-- ENDIF -->
@@ -276,21 +266,18 @@
 		<dt><label for="extension_group">{L_EXTENSION_GROUP}</label></dt>
 		<dd>{GROUP_SELECT_OPTIONS}</dd>
 	</dl>
-
-	<p class="quick">
-		<input type="submit" id="add_extension_check" name="add_extension_check" class="button2" value="{L_SUBMIT}" />
-	</p>
-	{S_FORM_TOKEN}
 	</fieldset>
-	</form>
 
+	<fieldset class="quick">
+		<input type="submit" id="add_extension_check" name="add_extension_check" class="button2" value="{L_SUBMIT}" />
+	</fieldset>
+
+	</form>
+	
 	<br />
 
 	<form id="change_ext" method="post" action="{U_ACTION}">
 
-	<fieldset class="tabulated">
-	<legend>{L_TITLE}</legend>
-
 	<table cellspacing="1">
 		<col class="row1" /><col class="row1" /><col class="row2" />
 	<thead>
@@ -307,8 +294,8 @@
 			<td class="spacer" colspan="3">&nbsp;</td>
 		</tr>
 		<!-- ENDIF -->
-		<tr>
-			<td><strong>{extensions.EXTENSION}</strong></td>
+		<tr> 
+			<td><b>{extensions.EXTENSION}</b></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,21 +303,17 @@
 	</tbody>
 	</table>
 
-	<p class="submit-buttons">
+	<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}" />
-	</p>
-	{S_FORM_TOKEN}
 	</fieldset>
+	
 	</form>
 
 <!-- ELSEIF S_ORPHAN -->
 
 	<form id="orphan" method="post" action="{U_ACTION}">
 
-	<fieldset class="tabulated">
-	<legend>{L_TITLE}</legend>
-
 	<table cellspacing="1">
 	<thead>
 	<tr>
@@ -348,7 +331,7 @@
 			<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>
 			<td>{orphan.FILETIME}</td>
 			<td>{orphan.FILESIZE}</td>
-			<td><strong>{L_ATTACH_ID}: </strong><input type="text" name="post_id[{orphan.ATTACH_ID}]" size="7" maxlength="10" value="{orphan.POST_ID}" /></td>
+			<td><b>ID: </b><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,12 +346,11 @@
 
 	<br />
 
-	<p class="submit-buttons">
+	<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}" />
-	</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_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];
+		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];
 	}
 
-// ]]>
+//-->
 </script>
 
 <form id="acp_ban" method="post" action="{U_ACTION}">
@@ -46,34 +46,31 @@
 <dl>
 	<dt><label for="ban">{L_BAN_CELL}:</label></dt>
 	<dd><textarea name="ban" cols="40" rows="3" id="ban"></textarea></dd>
-	<!-- IF S_USERNAME_BAN --><dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF -->
+	<!-- 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 -->
 </dl>
 <dl>
 	<dt><label for="banlength">{L_BAN_LENGTH}:</label></dt>
-	<dd><label for="banlength"><select name="banlength" id="banlength" onchange="if(this.value==-1){document.getElementById('banlengthother').style.display = 'block';}else{document.getElementById('banlengthother').style.display='none';}">{S_BAN_END_OPTIONS}</select></label></dd>
-	<dd id="banlengthother" style="display: none;"><label><input type="text" name="banlengthother" class="inputbox" /><br /><span>{L_YEAR_MONTH_DAY}</span></label></dd>
+	<dd><select name="banlength" id="banlength">{S_BAN_END_OPTIONS}</select></dd>
+	<dd><input type="text" name="banlengthother" /> (YYYY-MM-DD)</dd>
 </dl>
 <dl>
 	<dt><label for="banexclude">{L_BAN_EXCLUDE}:</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" name="banexclude" value="1" class="radio" /> {L_YES}</label>
-		<label><input type="radio" name="banexclude" id="banexclude" value="0" checked="checked" class="radio" /> {L_NO}</label></dd>
+	<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>
 </dl>
 <dl>
 	<dt><label for="banreason">{L_BAN_REASON}:</label></dt>
-	<dd><input name="banreason" type="text" class="text medium" maxlength="255" id="banreason" /></dd>
+	<dd><input name="banreason" type="text" id="banreason" class="medium" /></dd>
 </dl>
 <dl>
 	<dt><label for="bangivereason">{L_BAN_GIVE_REASON}:</label></dt>
-	<dd><input name="bangivereason" type="text" class="text medium" maxlength="255" id="bangivereason" /></dd>
+	<dd><input name="bangivereason" type="text" id="bangivereason" class="medium" /></dd>
 </dl>
+</fieldset>
 
-<p class="submit-buttons">
+<fieldset 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 />
 
@@ -81,8 +78,6 @@
 
 <p>{L_UNBAN_EXPLAIN}</p>
 
-<form id="acp_unban" method="post" action="{U_ACTION}">
-
 <fieldset>
 	<legend>{L_UNBAN_TITLE}</legend>
 
@@ -93,28 +88,26 @@
 	</dl>
 	<dl>
 		<dt><label for="unbanlength">{L_BAN_LENGTH}:</label></dt>
-		<dd><input style="border: 0;" type="text" class="text full" disabled="disabled" name="unbanlength" id="unbanlength" /></dd>
+		<dd><input style="border: 0px;" type="text" name="unbanlength" id="unbanlength" class="full" disabled="disabled" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="unbanreason">{L_BAN_REASON}:</label></dt>
-		<dd><input style="border: 0;" type="text" class="text full" disabled="disabled" name="unbanreason" id="unbanreason" /></dd>
+		<dd><input style="border: 0px;" type="text" name="unbanreason" id="unbanreason" class="full" disabled="disabled" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="unbangivereason">{L_BAN_GIVE_REASON}:</label></dt>
-		<dd><input style="border: 0;" type="text" class="text full" disabled="disabled" name="unbangivereason" id="unbangivereason" /></dd>
+		<dd><input style="border: 0px;" type="text" name="unbangivereason" id="unbangivereason" class="full" disabled="disabled" /></dd>
 	</dl>
+	</fieldset>
 
-	<p class="submit-buttons">
+	<fieldset 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: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
 	<h1>{L_ACP_BBCODES}</h1>
 
@@ -48,10 +48,8 @@
 	</fieldset>
 
 	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
 	</fieldset>
 	
 	<br />
@@ -78,6 +76,7 @@
 	<!-- END token -->
 	</tbody>
 	</table>
+
 	</form>
 
 <!-- ELSE -->
@@ -86,10 +85,6 @@
 
 	<p>{L_ACP_BBCODES_EXPLAIN}</p>
 	
-	<form id="acp_bbcodes" method="post" action="{U_ACTION}">
-	<fieldset class="tabulated">
-	<legend>{L_ACP_BBCODES}</legend>
-
 	<table cellspacing="1" id="down">
 	<thead>
 	<tr>
@@ -103,22 +98,18 @@
 			<td style="text-align: center;">{bbcodes.BBCODE_TAG}</td>
 			<td style="text-align: right; width: 40px;"><a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}">{ICON_DELETE}</a></td>
 		</tr>
-	<!-- BEGINELSE -->
-		<tr class="row3">
-			<td colspan="2">{L_ACP_NO_ITEMS}</td>
-		</tr>
 	<!-- END bbcodes -->
 	</tbody>
 	</table>
 
-	<p class="quick">
+	<form id="acp_bbcodes" method="post" action="{U_ACTION}">
+
+	<fieldset class="quick">
 		<input class="button2" name="submit" type="submit" value="{L_ADD_BBCODE}" />
-	</p>
-	{S_FORM_TOKEN}
 	</fieldset>
 
 	</form>
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_board.html

@@ -37,13 +37,13 @@
 		{auth_tpl.TPL}
 	<!-- END auth_tpl -->
 <!-- ENDIF -->
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</p>
-	{S_FORM_TOKEN}
 </fieldset>
+
+<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}" />
+</fieldset>
+
 </form>
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_bots.html

@@ -4,7 +4,7 @@
 
 <!-- IF S_EDIT_BOT -->
 
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE}</h1>
 
@@ -23,7 +23,7 @@
 		<legend>{L_TITLE}</legend>
 	<dl>
 		<dt><label for="bot_name">{L_BOT_NAME}:</label><br /><span>{L_BOT_NAME_EXPLAIN}</span></dt>
-		<dd><input name="bot_name" type="text" id="bot_name" value="{BOT_NAME}" maxlength="255" /></dd>
+		<dd><input name="bot_name" type="text" id="bot_name" value="{BOT_NAME}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="bot_style">{L_BOT_STYLE}:</label><br /><span>{L_BOT_STYLE_EXPLAIN}</span></dt>
@@ -39,19 +39,19 @@
 	</dl>
 	<dl>
 		<dt><label for="bot_agent">{L_BOT_AGENT}:</label><br /><span>{L_BOT_AGENT_EXPLAIN}</span></dt>
-		<dd><input name="bot_agent" type="text" id="bot_agent" value="{BOT_AGENT}" maxlength="255" /></dd>
+		<dd><input name="bot_agent" type="text" id="bot_agent" value="{BOT_AGENT}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="bot_ip">{L_BOT_IP}:</label><br /><span>{L_BOT_IP_EXPLAIN}</span></dt>
-		<dd><input name="bot_ip" type="text" id="bot_ip" value="{BOT_IP}" maxlength="255" /></dd>
+		<dd><input name="bot_ip" type="text" id="bot_ip" value="{BOT_IP}" /></dd>
 	</dl>
+	</fieldset>
 
-	<p class="submit-buttons">
+	<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}
-	</p>
 	</fieldset>
+
 	</form>
 
 <!-- ELSE -->
@@ -85,18 +85,17 @@
 	</tbody>
 	</table>
 
-	<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
+	<fieldset class="quick" style="float: left;">
 		<input class="button2" name="add" type="submit" value="{L_BOT_ADD}" />
 	</fieldset>
 
-	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
+	<fieldset class="quick" style="float: right;">
 		<select name="action">{S_BOT_OPTIONS}</select>
 		<input class="button2" name="submit" type="submit" value="{L_SUBMIT}" />
-		<p class="small"><a href="#" onclick="marklist('acp_bots', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('acp_bots', 'mark', false);">{L_UNMARK_ALL}</a></p>
-		{S_FORM_TOKEN}
 	</fieldset>
+
 	</form>
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_captcha.html

@@ -6,65 +6,35 @@
 
 <p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
 
-
 <form id="acp_captcha" method="post" action="{U_ACTION}">
 
 <fieldset>
-<legend>{L_GENERAL_OPTIONS}</legend>
-
+	<legend>{L_GENERAL_OPTIONS}</legend>
 <dl>
 	<dt><label for="enable_confirm">{L_VISUAL_CONFIRM_REG}:</label><br /><span>{L_VISUAL_CONFIRM_REG_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="enable_confirm" name="enable_confirm" value="1"<!-- IF REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
-		<label><input type="radio" class="radio" name="enable_confirm" value="0"<!-- IF not REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
+	<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>
 </dl>
 <dl>
 	<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}:</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="enable_post_confirm" name="enable_post_confirm" value="1"<!-- IF POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
-		<label><input type="radio" class="radio" name="enable_post_confirm" value="0"<!-- IF not POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
+	<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>
 </dl>
 <!-- IF GD -->
 <dl>
 	<dt><label for="captcha_gd">{L_CAPTCHA_GD}:</label><br /><span>{L_CAPTCHA_GD_EXPLAIN}</span></dt>
-	<dd><label><input id="captcha_gd" name="captcha_gd" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input name="captcha_gd" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	<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>
 </dl>
 <dl>
-	<dt><label for="captcha_gd_foreground_noise">{L_CAPTCHA_GD_FOREGROUND_NOISE}:</label><br /><span>{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}</span></dt>
-	<dd><label><input id="captcha_gd_foreground_noise" name="captcha_gd_foreground_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input name="captcha_gd_foreground_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
-<dl>
-	<dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}:</label><br /><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt>
-	<dd><input id="captcha_gd_x_grid" name="captcha_gd_x_grid" value="{CAPTCHA_GD_X_GRID}" type="text" /></dd>
-</dl>
-<dl>
-	<dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}:</label><br /><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt>
-	<dd><input id="captcha_gd_y_grid" name="captcha_gd_y_grid" value="{CAPTCHA_GD_Y_GRID}" type="text" /></dd>
+	<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>
 </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}" />&nbsp;
-	<input class="button2" type="submit" id="preview" name="preview" value="{L_PREVIEW}" />
-	{S_FORM_TOKEN}
+	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 </fieldset>
+
 </form>
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_database.html

@@ -7,37 +7,33 @@
 
 	<p>{L_ACP_RESTORE_EXPLAIN}</p>
 
-	<!-- IF .files -->
 	<form id="acp_backup" method="post" action="{U_ACTION}">
-
+	
 	<fieldset>
 		<legend>{L_RESTORE_OPTIONS}</legend>
 	<dl>
-		<dt><label for="file">{L_SELECT_FILE}:</label></dt>
+		<dt><label for="user">{L_SELECT_FILE}:</label></dt>
 		<dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_LAST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd>
 	</dl>
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_START_RESTORE}" />&nbsp;
-		<input class="button2" type="submit" id="delete" name="delete" value="{L_DELETE_BACKUP}" />&nbsp;
-		<input class="button2" type="submit" id="download" name="download" value="{L_DOWNLOAD_BACKUP}" />
-	</p>
-	{S_FORM_TOKEN}
 	</fieldset>
-	</form>
-	<!-- ELSE -->
-		<div class="errorbox">
-			<p>{L_ACP_NO_ITEMS}</p>
-		</div>
+
+	<!-- IF EXISTS -->
+		<fieldset 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}" />
+		</fieldset>
 	<!-- ENDIF -->
 
+	</form>
+
 <!-- ELSE -->
 	<h1>{L_ACP_BACKUP}</h1>
 
 	<p>{L_ACP_BACKUP_EXPLAIN}</p>
 
 	<script type="text/javascript">
-	// <![CDATA[
+	<!--
 
 		function selector(bool)
 		{
@@ -49,7 +45,7 @@
 			}
 		}
 
-	// ]]>
+	//-->
 	</script>
 
 	<form id="acp_backup" method="post" action="{U_ACTION}">
@@ -57,41 +53,36 @@
 	<fieldset>
 		<legend>{L_BACKUP_OPTIONS}</legend>
 	<dl>
-		<dt><label for="type">{L_BACKUP_TYPE}:</label></dt>
-		<dd><label><input type="radio" class="radio" name="type" value="full" id="type" checked="checked" /> {L_FULL_BACKUP}</label>
-			<label><input type="radio" name="type" class="radio" value="structure" /> {L_STRUCTURE_ONLY}</label>
-			<label><input type="radio" class="radio" name="type" value="data" /> {L_DATA_ONLY}</label></dd>
+		<dt><label for="user">{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" id="type" />&nbsp;{L_STRUCTURE_ONLY}&nbsp;&nbsp;<input type="radio" class="radio" name="type" value="data" id="type" />&nbsp;{L_DATA_ONLY}</dd>
 	</dl>
 	<dl>
-		<dt><label for="method">{L_FILE_TYPE}:</label></dt>
+		<dt><label for="user">{L_FILE_TYPE}:</label></dt>
 		<dd><!-- BEGIN methods -->
-		<label><input name="method"<!-- IF methods.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> type="radio" class="radio" value="{methods.TYPE}" /> {methods.TYPE}</label>
+		<input name="method" id="method" type="radio" class="radio" value="{methods.TYPE}"<!-- IF methods.S_FIRST_ROW -->checked="checked"<!-- ENDIF --> />&nbsp;{methods.TYPE}
 		<!-- END methods --></dd>
 	</dl>
 	<dl>
-		<dt><label for="where">{L_ACTION}:</label></dt>
-		<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>
+		<dt><label for="user">{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" id="where" />&nbsp;{L_STORE_LOCAL}&nbsp;&nbsp;<input type="radio" class="radio" name="where" value="download" id="where" />&nbsp;{L_DOWNLOAD}</dd>
 	</dl>
 	<dl>
-		<dt><label for="table">{L_TABLE_SELECT}:</label></dt>
-		<dd><select id="table" name="table[]" size="10" multiple="multiple">
+		<dt><label for="user">{L_TABLE_SELECT}:</label></dt>
+		<dd><select id="table" name="table[]" size="10" multiple="true">
 		<!-- BEGIN tables -->
 			<option value="{tables.TABLE}">{tables.TABLE}</option>
 		<!-- END tables -->
-		</select></dd>
-		<dd><a href="#" onclick="selector(true); return false;">{L_SELECT_ALL}</a> :: <a href="#" onclick="selector(false); return false;">{L_DESELECT_ALL}</a></dd>
+		</select><br /><br /><div align="right"><a href="#" onclick="selector(true)">{L_SELECT_ALL}</a><br /><a href="#" onclick="selector(false)">{L_DESELECT_ALL}</a></div></dd>
 	</dl>
+	</fieldset>
 
-	<p class="submit-buttons">
+	<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}" />
-	</p>
-	{S_FORM_TOKEN}
 	</fieldset>
+
 	</form>
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_disallow.html

@@ -4,7 +4,7 @@
 
 <h1>{L_ACP_DISALLOW_USERNAMES}</h1>
 
-<p>{L_ACP_DISALLOW_EXPLAIN}</p>
+<p>{L_ADD_DISALLOW_EXPLAIN}</p>
 
 <form id="acp_disallow" method="post" action="{U_ACTION}">
 
@@ -12,12 +12,12 @@
 	<legend>{L_ADD_DISALLOW_TITLE}</legend>
 <dl>
 	<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_ADD_DISALLOW_EXPLAIN}</span></dt>
-	<dd><input id="user" type="text" class="text medium" maxlength="255" name="disallowed_user" /></dd>
+	<dd><input id="user" type="text" name="disallowed_user" class="medium" /></dd>
 </dl>
+</fieldset>
 
-<p class="quick">
+<fieldset class="quick">
 	<input class="button1" type="submit" name="disallow" value="{L_SUBMIT}" />
-</p>
 </fieldset>
 
 <h1>{L_DELETE_DISALLOW_TITLE}</h1>
@@ -31,15 +31,15 @@
 		<dt><label for="disallowed">{L_USERNAME}:</label></dt>
 		<dd><select name="disallowed_id" id="disallowed">{S_DISALLOWED_NAMES}</select></dd>
 	</dl>
+	</fieldset>
 
-	<p class="quick">
+	<fieldset class="quick">
 		<input class="button1" type="submit" name="allow" value="{L_SUBMIT}" />
-	</p>
 <!-- ELSE -->
 	<p>{L_NO_DISALLOWED}</p>
 <!-- ENDIF -->
-	{S_FORM_TOKEN}
 </fieldset>
+
 </form>
 
-<!-- INCLUDE overall_footer.html -->
+<!-- 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(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+	<dd>[ <a href="{U_FIND_USERNAME}" onclick="window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a> ]</dd>
 </dl>
 <dl>
 	<dt><label for="subject">{L_SUBJECT}:</label></dt>
@@ -39,16 +39,16 @@
 	<dd><select id="priority" name="mail_priority_flag">{S_PRIORITY_OPTIONS}</select></dd>
 </dl>
 <dl>
-	<dt><label for="send">{L_SEND_IMMEDIATELY}:</label></dt>
-	<dd><input id="send" type="checkbox" class="radio" name="send_immediately" checked="checked" /></dd>
+	<dt><label for="send">{L_SEND_IMMEDIATLY}:</label></dt>
+	<dd><input id="send" type="checkbox" class="radio" name="send_immediatly" checked="checked" /></dd>
 </dl>
+</fieldset>
 
-<p class="submit-buttons">
+<fieldset class="submit-buttons">
 	<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 -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_forums.html

@@ -5,10 +5,8 @@
 <!-- IF S_EDIT_FORUM -->
 
 	<script type="text/javascript">
-	// <![CDATA[
-		/**
-		* Handle displaying/hiding several options based on the forum type
-		*/
+	<!--
+
 		function display_options(value)
 		{
 			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
@@ -22,17 +20,6 @@
 				}
 			<!-- ENDIF -->
 
-			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
-				if (value == {FORUM_LINK})
-				{
-					dE('cat_to_link_actions', 1);
-				}
-				else
-				{
-					dE('cat_to_link_actions', -1);
-				}
-			<!-- ENDIF -->
-
 			if (value == {FORUM_POST})
 			{
 				dE('forum_post_options', 1);
@@ -56,47 +43,12 @@
 			}
 		}
 
-		/**
-		* Init the wanted display functionality if javascript is enabled.
-		* If javascript is not available, the user is still able to properly administrate.
-		*/
-		onload = function()
-		{
-			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
-				<!-- IF S_FORUM_POST -->
-					dE('type_actions', -1);
-				<!-- ENDIF -->
-			<!-- ENDIF -->
-
-			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
-				<!-- IF S_FORUM_CAT -->
-					dE('cat_to_link_actions', -1);
-				<!-- ENDIF -->
-			<!-- ENDIF -->
-
-			<!-- IF not S_FORUM_POST -->
-				dE('forum_post_options', -1);
-			<!-- ENDIF -->
-
-			<!-- IF not S_FORUM_CAT -->
-				dE('forum_cat_options', -1);
-			<!-- ENDIF -->
-
-			<!-- IF not S_FORUM_LINK -->
-				dE('forum_link_options', -1);
-			<!-- ENDIF -->
-
-			<!-- IF S_FORUM_LINK -->
-			dE('forum_rules_options', -1);
-			<!-- ENDIF -->
-		}
-
-	// ]]>
+	//-->
 	</script>
 
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
-	<h1>{L_TITLE} <!-- IF FORUM_NAME -->:: {FORUM_NAME}<!-- ENDIF --></h1>
+	<h1>{L_TITLE} :: {FORUM_NAME}</h1>
 
 	<p>{L_FORUM_EDIT_EXPLAIN}</p>
 
@@ -116,23 +68,11 @@
 		<dd><select id="forum_type" name="forum_type" onchange="display_options(this.options[this.selectedIndex].value);">{S_FORUM_TYPE_OPTIONS}</select></dd>
 	</dl>
 	<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
-	<div id="type_actions">
+	<div id="type_actions"<!-- IF S_FORUM_POST --> style="display: none;"<!-- ENDIF -->>
 		<dl>
 			<dt><label for="type_action">{L_DECIDE_MOVE_DELETE_CONTENT}:</label></dt>
-			<dd><label><input type="radio" class="radio" name="type_action" value="delete"<!-- IF not S_MOVE_FORUM_OPTIONS --> checked="checked" id="type_action"<!-- ENDIF --> /> {L_DELETE_ALL_POSTS}</label></dd>
-			<!-- IF S_MOVE_FORUM_OPTIONS --><dd><label><input type="radio" class="radio" name="type_action" id="type_action" value="move" checked="checked" /> {L_MOVE_POSTS_TO}</label> <select name="to_forum_id">{S_MOVE_FORUM_OPTIONS}</select></dd><!-- ENDIF -->
-		</dl>
-	</div>
-	<!-- ENDIF -->
-	<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
-	<div id="cat_to_link_actions">
-		<dl>
-			<dt><label for="action_subforums">{L_DECIDE_MOVE_DELETE_SUBFORUMS}:</label></dt>
-			<!-- IF S_FORUMS_LIST -->
-				<dd><label><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="move" checked="checked" /> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
-			<!-- ELSE -->
-				<dd><label><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</label></dd>
-			<!-- ENDIF -->
+			<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 -->
 		</dl>
 	</div>
 	<!-- ENDIF -->
@@ -142,99 +82,80 @@
 	</dl>
 	<dl>
 		<dt><label for="forum_name">{L_FORUM_NAME}:</label></dt>
-		<dd><input class="text medium" type="text" id="forum_name" name="forum_name" value="{FORUM_NAME}" maxlength="255" /></dd>
+		<dd><input class="medium" type="text" id="forum_name" name="forum_name" value="{FORUM_NAME}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="forum_desc">{L_FORUM_DESC}:</label><br /><span>{L_FORUM_DESC_EXPLAIN}</span></dt>
 		<dd><textarea id="forum_desc" name="forum_desc" rows="5" cols="45">{FORUM_DESC}</textarea></dd>
-		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
-			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
-			<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
+		<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>
 	</dl>
 	<dl>
 		<dt><label for="forum_image">{L_FORUM_IMAGE}:</label><br /><span>{L_FORUM_IMAGE_EXPLAIN}</span></dt>
-		<dd><input class="text medium" type="text" id="forum_image" name="forum_image" value="{FORUM_IMAGE}" maxlength="255" /></dd>
+		<dd><input class="medium" type="text" id="forum_image" name="forum_image" value="{FORUM_IMAGE}" /></dd>
 		<!-- IF FORUM_IMAGE_SRC -->
 			<dd><img src="{FORUM_IMAGE_SRC}" alt="{L_FORUM_IMAGE}" /></dd>
 		<!-- ENDIF -->
 	</dl>
 	<dl>
 		<dt><label for="forum_password">{L_FORUM_PASSWORD}:</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt>
-		<dd><input type="password" id="forum_password" name="forum_password" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" /></dd>
+		<dd><input type="password" id="forum_password" name="forum_password" value="{FORUM_PASSWORD}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}:</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt>
-		<dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" /></dd>
+		<dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="{FORUM_PASSWORD_CONFIRM}" /></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 -->
+	<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>
 	</fieldset>
 
-	<div id="forum_cat_options">
+	<div id="forum_cat_options"<!-- IF not S_FORUM_CAT --> style="display: none;"<!-- ENDIF -->>
 		<fieldset>
 			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
 		<dl>
 			<dt><label for="display_active">{L_DISPLAY_ACTIVE_TOPICS}:</label><br /><span>{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="display_active" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="display_active" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<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>
 		</dl>
-		</fieldset>
+		</fieldset>	
 	</div>
 
-	<div id="forum_post_options">
+	<div id="forum_post_options"<!-- IF not S_FORUM_POST --> style="display: none;"<!-- ENDIF -->>
 		<fieldset>
 			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
 		<dl>
 			<dt><label for="forum_status">{L_FORUM_STATUS}:</label></dt>
 			<dd><select id="forum_status" name="forum_status">{S_STATUS_OPTIONS}</select></dd>
 		</dl>
-		<dl>
-			<dt><label for="display_subforum_list">{L_LIST_SUBFORUMS}:</label><br /><span>{L_LIST_SUBFORUMS_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="display_subforum_list" value="1"<!-- IF S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="display_subforum_list" value="0"<!-- IF not S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
+	<!-- IF S_SHOW_DISPLAY_ON_INDEX -->
 		<dl>
 			<dt><label for="display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<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>
 		</dl>
+	<!-- ENDIF -->
 		<dl>
 			<dt><label for="enable_post_review">{L_ENABLE_POST_REVIEW}:</label><br /><span>{L_ENABLE_POST_REVIEW_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="enable_post_review" value="1"<!-- IF S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_post_review" value="0"<!-- IF not S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<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>
 		</dl>
 		<dl>
 			<dt><label for="enable_indexing">{L_ENABLE_INDEXING}:</label><br /><span>{L_ENABLE_INDEXING_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="enable_indexing" value="1"<!-- IF S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_indexing" value="0"<!-- IF not S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<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>
 		</dl>
 		<dl>
 			<dt><label for="enable_icons">{L_ENABLE_TOPIC_ICONS}:</label></dt>
-			<dd><label><input type="radio" class="radio" name="enable_icons" value="1"<!-- IF S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_icons" value="0"<!-- IF not S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<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>
 		</dl>
 		<dl>
 			<dt><label for="display_recent">{L_ENABLE_RECENT}:</label><br /><span>{L_ENABLE_RECENT_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="display_recent" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="display_recent" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<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>
 		</dl>
 		<dl>
 			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}:</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
-			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>
+			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" /></dd>
 		</dl>
 		</fieldset>
 
@@ -242,65 +163,55 @@
 			<legend>{L_FORUM_PRUNE_SETTINGS}</legend>
 		<dl>
 			<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}:</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="enable_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_prune" value="0"<!-- IF not S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<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>
 		</dl>
 		<dl>
 			<dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}:</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
-			<dd><input type="text" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" /> {L_DAYS}</dd>
+			<dd><input type="text" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_days">{L_AUTO_PRUNE_DAYS}:</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
-			<dd><input type="text" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" maxlength="4" size="4" /> {L_DAYS}</dd>
+			<dd><input type="text" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_viewed">{L_AUTO_PRUNE_VIEWED}:</label><br /><span>{L_AUTO_PRUNE_VIEWED_EXPLAIN}</span></dt>
-			<dd><input type="text" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" maxlength="4" size="4" /> {L_DAYS}</dd>
+			<dd><input type="text" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="prune_old_polls" value="1"<!-- IF S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="prune_old_polls" value="0"<!-- IF not S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<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>
 		</dl>
 		<dl>
 			<dt><label for="prune_announce">{L_PRUNE_ANNOUNCEMENTS}:</label></dt>
-			<dd><label><input type="radio" class="radio" name="prune_announce" value="1"<!-- IF S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="prune_announce" value="0"<!-- IF not S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<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>
 		</dl>
 		<dl>
 			<dt><label for="prune_sticky">{L_PRUNE_STICKY}:</label></dt>
-			<dd><label><input type="radio" class="radio" name="prune_sticky" value="1"<!-- IF S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="prune_sticky" value="0"<!-- IF not S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<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>
 		</dl>
 		</fieldset>
 	</div>
 
-	<div id="forum_link_options">
+	<div id="forum_link_options"<!-- IF not S_FORUM_LINK --> style="display: none;"<!-- ENDIF -->>
 		<fieldset>
 			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
-		<dl>
-			<dt><label for="link_display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="link_display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="link_display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
 		<dl>
 			<dt><label for="forum_link">{L_FORUM_LINK}:</label><br /><span>{L_FORUM_LINK_EXPLAIN}</span></dt>
-			<dd><input class="text medium" type="text" id="forum_link" name="forum_link" value="{FORUM_DATA_LINK}" maxlength="255" /></dd>
+			<dd><input class="medium" type="text" id="forum_link" name="forum_link" value="{FORUM_DATA_LINK}" /></dd>
 		</dl>
 		<dl>
 			<dt><label for="forum_link_track">{L_FORUM_LINK_TRACK}:</label><br /><span>{L_FORUM_LINK_TRACK_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="forum_link_track" value="1"<!-- IF S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="forum_link_track" value="0"<!-- IF not S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<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>
 		</dl>
 		</fieldset>
 	</div>
 
-	<div id="forum_rules_options">
+	<div id="forum_rules_options"<!-- IF S_FORUM_LINK --> style="display: none;"<!-- ENDIF -->>
 		<fieldset>
 			<legend>{L_FORUM_RULES}</legend>
 		<dl>
 			<dt><label for="forum_rules_link">{L_FORUM_RULES_LINK}:</label><br /><span>{L_FORUM_RULES_LINK_EXPLAIN}</span></dt>
-			<dd><input class="text medium" type="text" id="forum_rules_link" name="forum_rules_link" value="{FORUM_RULES_LINK}" maxlength="255" /></dd>
+			<dd><input class="medium" type="text" id="forum_rules_link" name="forum_rules_link" value="{FORUM_RULES_LINK}" /></dd>
 		</dl>
 	<!-- IF FORUM_RULES_PREVIEW -->
 		<dl>
@@ -311,24 +222,21 @@
 		<dl>
 			<dt><label for="forum_rules">{L_FORUM_RULES}:</label><br /><span>{L_FORUM_RULES_EXPLAIN}</span></dt>
 			<dd><textarea id="forum_rules" name="forum_rules" rows="4" cols="70">{FORUM_RULES_PLAIN}</textarea></dd>
-			<dd><label><input type="checkbox" class="radio" name="rules_parse_bbcode"<!-- IF S_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
-				<label><input type="checkbox" class="radio" name="rules_parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
-				<label><input type="checkbox" class="radio" name="rules_parse_urls"<!-- IF S_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
+			<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>
 		</dl>
 		</fieldset>
 	</div>
 
 	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
 		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
 	</fieldset>
+
 	</form>
 
 <!-- ELSEIF S_DELETE_FORUM -->
 
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
 	<h1>{L_FORUM_DELETE}</h1>
 
@@ -347,42 +255,43 @@
 		<legend>{L_FORUM_DELETE}</legend>
 	<dl>
 		<dt><label>{L_FORUM_NAME}:</label></dt>
-		<dd><strong>{FORUM_NAME}</strong></dd>
+		<dd><b>{FORUM_NAME}</b></dd>
 	</dl>
 	<!-- IF S_FORUM_POST -->
 		<dl>
 			<dt><label for="delete_action">{L_ACTION}:</label></dt>
-			<dd><label><input type="radio" class="radio" id="delete_action" name="action_posts" value="delete" checked="checked" /> {L_DELETE_ALL_POSTS}</label></dd>
+			<dd><input type="radio" class="radio" id="delete_action" name="action_posts" value="delete" checked="checked" /> {L_DELETE_ALL_POSTS}</dd>
 			<!-- IF S_MOVE_FORUM_OPTIONS -->
-				<dd><label><input type="radio" class="radio" name="action_posts" value="move" /> {L_MOVE_POSTS_TO}</label> <select name="posts_to_id">{S_MOVE_FORUM_OPTIONS}</select></dd>
+				<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>
 			<!-- ENDIF -->
 		</dl>
 	<!-- ENDIF -->
 	<!-- IF S_HAS_SUBFORUMS -->
 		<dl>
 			<dt><label for="sub_delete_action">{L_ACTION}:</label></dt>
-			<dd><label><input type="radio" class="radio" id="sub_delete_action" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</label></dd>
+			<dd><input type="radio" class="radio" id="sub_delete_action" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</dd>
 			<!-- IF S_FORUMS_LIST -->
-				<dd><label><input type="radio" class="radio" name="action_subforums" value="move" /> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
+				<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>
 			<!-- ENDIF -->
 		</dl>
 	<!-- ENDIF -->
-
-	<p class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-	</p>
-	{S_FORM_TOKEN}
 	</fieldset>
+
+	<fieldset class="quick">
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+	</fieldset>
+
 	</form>
 
 <!-- ELSEIF S_CONTINUE_SYNC -->
 
 	<script type="text/javascript">
-	// <![CDATA[
+	<!--
+
 		var close_waitscreen = 0;
-		// no scrollbars...
-		popup('{UA_PROGRESS_BAR}', 400, 240, '_sync');
-	// ]]>
+		window.open('{UA_PROGRESS_BAR}', '_sync', 'height=240, resizable=yes, scrollbars=no, width=400');
+
+	//-->
 	</script>
 
 	<h1>{L_FORUM_ADMIN}</h1>
@@ -394,17 +303,18 @@
 <!-- ELSE -->
 
 	<script type="text/javascript">
-	// <![CDATA[
+	<!--
+
 		/**
 		* Popup search progress bar
 		*/
 		function popup_progress_bar()
 		{
 			var close_waitscreen = 0;
-			// no scrollbars...
-			popup('{UA_PROGRESS_BAR}', 400, 240, '_sync');
+			window.open('{UA_PROGRESS_BAR}', '_sync', 'height=240, resizable=yes, scrollbars=no, width=400');
 		}
-	// ]]>
+
+	//-->
 	</script>
 
 	<h1>{L_FORUM_ADMIN}</h1>
@@ -419,10 +329,10 @@
 	<!-- ENDIF -->
 
 	<!-- IF S_RESYNCED -->
-		<script type="text/javascript">
-		// <![CDATA[
+		<script language="javascript" type="text/javascript">
+		<!--
 			var close_waitscreen = 1;
-		// ]]>
+		//-->
 		</script>
 
 		<div class="successbox">
@@ -439,30 +349,30 @@
 		<tbody>
 		<!-- BEGIN forums -->
 			<tr>
-				<td style="width: 5%; text-align: center;">{forums.FOLDER_IMAGE}</td>
+				<td style="width: 5%;">{forums.FOLDER_IMAGE}</td>
 				<td>
-					<!-- IF forums.FORUM_IMAGE --><div style="float: {S_CONTENT_FLOW_BEGIN}; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF -->
+					<!-- IF forums.FORUM_IMAGE --><div style="float: left;">{forums.FORUM_IMAGE}</div><!-- ENDIF -->
 					<strong><!-- IF forums.S_FORUM_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF --></strong>
 					<!-- IF forums.FORUM_DESCRIPTION --><br /><span>{forums.FORUM_DESCRIPTION}</span><!-- ENDIF -->
-					<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}: <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}: <b>{forums.FORUM_POSTS}</b></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 -->
 				</td>
 				<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
 					<!-- IF forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
 						{ICON_MOVE_UP_DISABLED}
 						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-					<!-- ELSEIF not forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
-						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a>
-						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<!-- ELSEIF not forums.S_FIRST_ROW && not forums.S_LAST_ROW-->
+						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
+						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
 					<!-- ELSEIF forums.S_LAST_ROW && not forums.S_FIRST_ROW -->
-						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a>
+						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
 						{ICON_MOVE_DOWN_DISABLED}
 					<!-- ELSE -->
 						{ICON_MOVE_UP_DISABLED}
 						{ICON_MOVE_DOWN_DISABLED}
-					<!-- ENDIF -->
-					<a href="{forums.U_EDIT}">{ICON_EDIT}</a>
+					<!-- ENDIF -->	
+					<a href="{forums.U_EDIT}">{ICON_EDIT}</a> 
 					<!-- IF not forums.S_FORUM_LINK -->
-						<a href="{forums.U_SYNC}" onclick="popup_progress_bar();">{ICON_SYNC}</a>
+						<a href="{forums.U_SYNC}" onclick="popup_progress_bar();">{ICON_SYNC}</a> 
 					<!-- ELSE -->
 						{ICON_SYNC_DISABLED}
 					<!-- ENDIF -->
@@ -477,11 +387,11 @@
 	<form id="fselect" method="post" action="{U_SEL_ACTION}">
 
 	<fieldset class="quick">
-		{L_SELECT_FORUM}: <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select>
+		{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}">
@@ -489,10 +399,10 @@
 	<fieldset class="quick">
 		<input type="hidden" name="action" value="add" />
 
-		<input type="text" name="forum_name" value="" maxlength="255" />
+		<input type="text" name="forum_name" value="" /> 
 		<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: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
 	<h1>{L_ACP_GROUPS_MANAGE}</h1>
 
@@ -23,30 +23,28 @@
 		<legend>{L_GROUP_DETAILS}</legend>
 	<dl>
 		<dt><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}:</label></dt>
-		<dd><!-- IF S_SPECIAL_GROUP --><strong>{GROUP_NAME}</strong><!-- ENDIF --><input name="group_name" type="<!-- IF S_SPECIAL_GROUP -->hidden<!-- ELSE -->text<!-- ENDIF -->" id="group_name" value="{GROUP_INTERNAL_NAME}" /></dd>
+		<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>
 	</dl>
 	<dl>
 		<dt><label for="group_desc">{L_GROUP_DESC}:</label></dt>
 		<dd><textarea id="group_desc" name="group_desc" rows="5" cols="45">{GROUP_DESC}</textarea></dd>
-		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
-			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
-			<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
+		<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>
 	</dl>
 	<!-- IF not S_SPECIAL_GROUP -->
 		<dl>
 			<dt><label for="group_type">{L_GROUP_TYPE}:</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
 			<dd>
-				<label><input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}</label>
-				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}</label>
-				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_CLOSED}"{GROUP_CLOSED} /> {L_GROUP_CLOSED}</label>
-				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN}</label>
+				<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}
 			</dd>
 		</dl>
 	<!-- ELSE -->
 		<input name="group_type" type="hidden" value="{GROUP_TYPE_SPECIAL}" />
 	<!-- ENDIF -->
 
-	<!-- IF S_ADD_GROUP and S_GROUP_PERM -->
+	<!-- IF S_ADD_GROUP -->
 		<dl>
 			<dt><label for="group_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
 			<dd><select id="group_perm_from" name="group_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_GROUP_OPTIONS}</select></dd>
@@ -56,18 +54,12 @@
 
 	<fieldset>
 		<legend>{L_GROUP_SETTINGS_SAVE}</legend>
-	<!-- IF S_USER_FOUNDER -->
-	<dl>
-		<dt><label for="group_founder_manage">{L_GROUP_FOUNDER_MANAGE}:</label><br /><span>{L_GROUP_FOUNDER_MANAGE_EXPLAIN}</span></dt>
-		<dd><input name="group_founder_manage" type="checkbox" class="radio" id="group_founder_manage"{GROUP_FOUNDER_MANAGE} /></dd>
-	</dl>
-	<!-- ENDIF -->
 	<dl>
 		<dt><label for="group_legend">{L_GROUP_LEGEND}:</label></dt>
 		<dd><input name="group_legend" type="checkbox" class="radio" id="group_legend"{GROUP_LEGEND} /></dd>
 	</dl>
 	<dl>
-		<dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}:</label><br /><span>{L_GROUP_RECEIVE_PM_EXPLAIN}</span></dt>
+		<dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}:</label></dt>
 		<dd><input name="group_receive_pm" type="checkbox" class="radio" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd>
 	</dl>
 	<dl>
@@ -76,7 +68,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="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>
+		<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />&nbsp;&nbsp;<span>[ <a href="#" onclick="swatch(); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>
 	</dl>
 	<dl>
 		<dt><label for="group_rank">{L_GROUP_RANK}:</label></dt>
@@ -89,7 +81,7 @@
 	<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>
+		<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 -->
@@ -108,7 +100,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="{AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{AVATAR_HEIGHT}" /> <span>px</span></dd>
+			<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>
 		</dl>
 		<!-- IF S_DISPLAY_GALLERY -->
 			<dl> 
@@ -151,16 +143,15 @@
 	</fieldset>
 
 	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
 		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
 	</fieldset>
+
 	</form>
 
 <!-- ELSEIF S_LIST -->
 
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
 	<h1>{L_GROUP_MEMBERS} :: {GROUP_NAME}</h1>
 
@@ -184,7 +175,7 @@
 	</thead>
 	<tbody>
 	<tr>
-		<td class="row3" colspan="5"><strong>{L_GROUP_LEAD}</strong></td>
+		<td class="row3" colspan="5"><b>{L_GROUP_LEAD}</b></td>
 	</tr>
 	<!-- BEGIN leader -->
 		<!-- IF leader.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
@@ -200,12 +191,12 @@
 		</tr>
 	<!-- END leader -->
 	<tr>
-		<td class="row3" colspan="5"><strong>{L_GROUP_APPROVED}</strong></td>
+		<td class="row3" colspan="5"><b>{L_GROUP_APPROVED}</b></td>
 	</tr>
 	<!-- BEGIN member -->
 		<!-- IF member.S_PENDING -->
 		<tr>
-			<td class="row3" colspan="5"><strong>{L_GROUP_PENDING}</strong></td>
+			<td class="row3" colspan="5"><b>{L_GROUP_PENDING}</b></td>
 		</tr>
 		<!-- ELSE -->
 			<!-- IF member.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
@@ -223,16 +214,20 @@
 	<!-- END member -->
 	</tbody>
 	</table>
-	<!-- IF PAGINATION -->
-	<div class="pagination">
+
+	<div class="pagination" style="float: left;">
+		<!-- IF PAGINATION -->
 			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+		<!-- ELSE -->
+			{S_ON_PAGE}
+		<!-- ENDIF -->
 	</div>
-	<!-- ENDIF -->	
 
 	<fieldset class="quick">
+		<span class="small"><a href="#" onclick="marklist('list', 'mark', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></span><br />
+
 		<select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select>
 		<input class="button2" type="submit" name="update" value="{L_SUBMIT}" />
-		<p class="small"><a href="#" onclick="marklist('list', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>		
 	</fieldset>
 
 	<h1>{L_ADD_USERS}</h1>
@@ -243,25 +238,23 @@
 		<legend>{L_ADD_USERS}</legend>
 	<dl>
 		<dt><label for="leader">{L_USER_GROUP_LEADER}:</label></dt>
-		<dd><label><input name="leader" type="radio" class="radio" value="1" /> {L_YES}</label>
-			<label><input name="leader" type="radio" class="radio" id="leader" value="0" checked="checked" /> {L_NO}</label></dd>
+		<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>
 	</dl>
 	<dl>
 		<dt><label for="default">{L_USER_GROUP_DEFAULT}:</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt>
-		<dd><label><input name="default" type="radio" class="radio" value="1" /> {L_YES}</label>
-			<label><input name="default" type="radio" class="radio" id="default" value="0" checked="checked" /> {L_NO}</label></dd>
+		<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>
 	</dl>
 	<dl>
 		<dt><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
 		<dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd>
-		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+		<dd>[ <a href="{U_FIND_USERNAME}" onclick="window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); 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>
+
+	<fieldset class="quick">
+		<input class="button2" type="submit" name="addusers" value="{L_SUBMIT}" />
+	</fieldset>
+
 	</form>
 
 <!-- ELSE -->
@@ -296,11 +289,6 @@
 	<tbody>
 	<!-- BEGIN groups -->
 		<!-- IF groups.S_SPECIAL -->
-		<!-- IF groups.S_FIRST_ROW -->
-			<tr>
-				<td colspan="5" class="row3">{L_NO_GROUPS_CREATED}</td>
-			</tr>
-		<!-- ENDIF -->
 	</tbody>
 	</table>
 
@@ -309,8 +297,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>
@@ -343,4 +331,4 @@
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_icons.html

@@ -4,66 +4,7 @@
 
 <!-- IF S_EDIT -->
 
-	<script type="text/javascript" defer="defer">
-	// <![CDATA[
-	<!-- IF S_ADD_CODE -->
-	
-			var smiley = Array();
-			<!-- BEGIN smile -->
-				smiley['{smile.SMILEY_URL}'] = Array();
-				smiley['{smile.SMILEY_URL}']['code'] = '{smile.CODE}';
-				smiley['{smile.SMILEY_URL}']['emotion'] = '{smile.EMOTION}';
-				smiley['{smile.SMILEY_URL}']['width'] = {smile.WIDTH};
-				smiley['{smile.SMILEY_URL}']['height'] = {smile.HEIGHT};
-				smiley['{smile.SMILEY_URL}']['order'] = {smile.ORDER};
-			<!-- END smile -->
-
-			function update_image(newimage)
-			{
-				var use_element = smiley[newimage];
-
-				document.getElementById('add_image_src').src = '{PHPBB_ROOT_PATH}{IMG_PATH}/' + encodeURI(newimage);
-				document.getElementById('add_code').value = use_element['code'];
-				document.getElementById('add_emotion').value = use_element['emotion'];
-				document.getElementById('add_width').value = use_element['width'];
-				document.getElementById('add_height').value = use_element['height'];
-
-				element = document.getElementById('add_order');
-				for (var i = 0; i < element.length; i++)
-				{
-					if (element.options[i].value == use_element['order'])
-					{
-						document.getElementById('add_order').options.selectedIndex = i;
-					}
-				}
-			}
-		
-	<!-- ENDIF -->
-
-	
-	function toggle_select(icon, display, select)
-	{
-		var disp = document.getElementById('order_disp_' + select);
-		var nodisp = document.getElementById('order_no_disp_' + select);
-		disp.disabled = !display;
-		nodisp.disabled = display;
-		if (display)
-		{
-			document.getElementById('order_' + select).selectedIndex = 0;
-			nodisp.className = 'disabled-options';
-			disp.className = '';
-		}
-		else
-		{
-			document.getElementById('order_' + select).selectedIndex = {S_ORDER_LIST_DISPLAY_COUNT};
-			disp.className = 'disabled-options';
-			nodisp.className = '';
-		}
-	}
-	// ]]>
-	</script>
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE}</h1>
 
@@ -71,15 +12,11 @@
 
 	<form id="acp_icons" method="post" action="{U_ACTION}">
 
-	<fieldset class="tabulated">
-	<legend>{L_TITLE}</legend>
-
 	<table cellspacing="1">
 	<thead>
 	<tr>
 		<th colspan="{COLSPAN}">{L_CONFIG}</th>
 	</tr>
-	<!-- IF .items or S_ADD_CODE -->
 	<tr class="row3">
 		<td>{L_URL}</td>
 		<td>{L_LOCATION}</td>
@@ -105,66 +42,38 @@
 		<td style="text-align: center;"><img src="{items.IMG_SRC}" alt="" title="" /><input type="hidden" name="image[{items.IMG}]" value="1" /></td>
 		<td style="vertical-align: top;">[{items.IMG}]</td>
 		<!-- IF S_SMILIES -->
-			<td><input class="text post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" maxlength="50" /></td>
-			<td><input class="text post" type="text" name="emotion[{items.IMG}]" value="{items.EMOTION}" size="10" maxlength="50" /></td>
+			<td><input class="post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" /></td>
+			<td><input class="post" type="text" name="emotion[{items.IMG}]" value="{items.EMOTION}" size="10" /></td>
 		<!-- ENDIF -->
-		<td><input class="text post" type="text" size="3" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
-		<td><input class="text post" type="text" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
+		<td><input 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 type="checkbox" class="radio" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} onclick="toggle_select('{items.A_IMG}', this.checked, '{items.S_ROW_COUNT}');"/>
+			<input type="checkbox" class="radio" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} />
 			<!-- IF items.S_ID -->
 				<input type="hidden" name="id[{items.IMG}]" value="{items.ID}" />
 			<!-- ENDIF -->
 		</td>
 		<!-- IF ID or S_ADD -->
-			<td><select id="order_{items.S_ROW_COUNT}" name="order[{items.IMG}]">
-				<optgroup id="order_disp_{items.S_ROW_COUNT}" label="{L_DISPLAY_POSTING}" <!-- IF not items.POSTING_CHECKED -->disabled="disabled" class="disabled-options" <!-- ENDIF -->>{S_ORDER_LIST_DISPLAY}</optgroup>
-				<optgroup id="order_no_disp_{items.S_ROW_COUNT}" label="{L_DISPLAY_POSTING_NO}" <!-- IF  items.POSTING_CHECKED -->disabled="disabled" class="disabled-options" <!-- ENDIF -->>{S_ORDER_LIST_UNDISPLAY}</optgroup>
-			</select></td>
+			<td><select name="order[{items.IMG}]">{S_ORDER_LIST}</select></td>
 		<!-- ENDIF -->	
 		<!-- IF S_ADD -->
 			<td><input type="checkbox" class="radio" name="add_img[{items.IMG}]" value="1" /></td>
 		<!-- ENDIF -->
 		</tr>
 	<!-- END items -->
-	<!-- IF S_ADD_CODE -->
-	<tr>
-		<th colspan="{COLSPAN}">{L_ADD_SMILEY_CODE}</th>
-	</tr>
-	<tr class="row1">
-		<td style="text-align: center;"><select name="add_image" id="add_image" onchange="update_image(this.options[selectedIndex].value);">{S_IMG_OPTIONS}</select></td>
-		<td style="vertical-align: top;"><img src="{IMG_SRC}" id="add_image_src" alt="" title="" /></td>
-		<td><input class="text post" type="text" name="add_code" id="add_code" value="{CODE}" size="10" maxlength="50" /></td>
-		<td><input class="text post" type="text" name="add_emotion" id="add_emotion" value="{EMOTION}" size="10" maxlength="50" /></td>
-		<td><input class="text post" type="text" size="3" name="add_width" id="add_width" value="{WIDTH}" /></td>
-		<td><input class="text post" type="text" size="3" name="add_height" id="add_height" value="{HEIGHT}" /></td>
-		<td><input type="checkbox" class="radio" name="add_display_on_posting" checked="checked" onclick="toggle_select('add', this.checked, 'add_order');"/></td>
- 		<td><select id="add_order" name="add_order">
-				<optgroup id="order_disp[add]" label="{L_DISPLAY_POSTING}">{S_ADD_ORDER_LIST_DISPLAY}</optgroup>
-				<optgroup id="order_no_disp[add]" label="{L_DISPLAY_POSTING_NO}" disabled="disabled" class="disabled-options" >{S_ADD_ORDER_LIST_UNDISPLAY}</optgroup>
-		</select></td>
-		<td><input type="checkbox" class="radio" name="add_additional_code" value="1" /></td>
-	</tr>
-	<!-- ENDIF -->
-	<!-- ELSE -->
-	<tr class="row3">
-		<td colspan="{COLSPAN}">{L_NO_ICONS}</td>
-	</tr>
-	<!-- ENDIF -->
 	</tbody>
 	</table>
 
-	<p class="submit-buttons">
+	<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}" />
-	</p>
-	{S_FORM_TOKEN}
 	</fieldset>
+
 	</form>
 
 <!-- ELSEIF S_CHOOSE_PAK -->
 
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE}</h1>
 
@@ -177,6 +86,7 @@
 	
 	<!-- IF not S_PAK_OPTIONS -->
 		<p>{L_NO_PAK_OPTIONS}</p>
+	</fieldset>
 
 	<!-- ELSE -->
 		<dl>
@@ -184,17 +94,15 @@
 			<dd><select id="pak" name="pak">{S_PAK_OPTIONS}</select></dd>
 		</dl>
 			<dt><label for="current">{L_CURRENT}</label><br /><span>{L_CURRENT_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" id="current" name="current" value="keep" checked="checked" /> {L_KEEP_ALL}</label>
-				<label><input type="radio" class="radio" name="current" value="replace" /> {L_REPLACE_MATCHES}</label>
-				<label><input type="radio" class="radio" name="current" value="delete" /> {L_DELETE_ALL}</label></dd>
+			<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>
 		</dl>
-
-	<p class="quick">
-		<input class="button1" type="submit" id="import" name="import" value="{L_IMPORT_SUBMIT}" />
-	</p>
-	<!-- ENDIF -->
-	{S_FORM_TOKEN}
 	</fieldset>
+
+	<fieldset class="quick">
+		<input class="button1" type="submit" id="import" name="import" value="{L_IMPORT_SUBMIT}" />
+	</fieldset>
+	<!-- ENDIF -->
+
 	</form>
 
 <!-- ELSE -->
@@ -210,14 +118,8 @@
 		</div>
 	<!-- ENDIF -->
 
-	<form id="acp_icons" method="post" action="{U_ACTION}">
-
 	<div style="text-align: right;"><a href="{U_IMPORT}">{L_IMPORT}</a> | <a href="{U_EXPORT}">{L_EXPORT}</a></div>
 
-	<fieldset class="tabulated">
-
-	<legend>{L_TITLE}</legend>
-
 	<table cellspacing="1">
 	<thead>
 	<tr>
@@ -242,27 +144,33 @@
 				<td style="text-align: center;">{items.CODE}</td>
 				<td style="text-align: center;">{items.EMOTION}</td>
 			<!-- ENDIF -->
-			<td style="text-align: right; white-space: nowrap;">
-				<!-- IF items.S_FIRST_ROW -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF -->&nbsp;
-				<!-- IF items.S_LAST_ROW -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF -->
-				&nbsp;<a href="{items.U_EDIT}">{ICON_EDIT}</a> <a href="{items.U_DELETE}">{ICON_DELETE}</a>
+			<td style="width: 80px; text-align: right; white-space: nowrap;">
+				<!-- IF items.S_FIRST_ROW && not items.S_LAST_ROW -->
+					{ICON_MOVE_UP_DISABLED}
+					<a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>					 	
+				<!-- ELSEIF not items.S_FIRST_ROW && not items.S_LAST_ROW-->
+					<a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
+					<a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
+				<!-- ELSEIF items.S_LAST_ROW && not items.S_FIRST_ROW -->						
+					<a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
+					{ICON_MOVE_DOWN_DISABLED}
+				<!-- ENDIF -->
+				<a href="{items.U_EDIT}">{ICON_EDIT}</a> 
+				<a href="{items.U_DELETE}">{ICON_DELETE}</a>
 			</td>
 		</tr>
-	<!-- BEGINELSE -->
-		<tr class="row3">
-			<td colspan="{COLSPAN}">{L_ACP_NO_ITEMS}</td>
-		</tr>
 	<!-- END items -->
 	</tbody>
 	</table>
 
-	<p class="quick">
+	<form id="acp_icons" method="post" action="{U_ACTION}">
+
+	<fieldset class="quick">
 		<input class="button2" name="add" type="submit" value="{L_ICON_ADD}" />&nbsp; &nbsp;<input class="button2" type="submit" name="edit" value="{L_ICON_EDIT}" />
-	</p>
-	{S_FORM_TOKEN}
 	</fieldset>
+
 	</form>
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_inactive.html

@@ -10,11 +10,13 @@
 
 <div class="clearfix"></div>
 
-<!-- IF PAGINATION -->
 <div class="pagination">
+	<!-- IF PAGINATION -->
 		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+	<!-- ELSE -->
+		{S_ON_PAGE}
+	<!-- ENDIF -->
 </div>
-<!-- ENDIF -->
 
 <table cellspacing="1">
 <thead>
@@ -46,25 +48,27 @@
 </tbody>
 </table>
 
-	<fieldset class="display-options">
+<!-- IF .inactive -->
+	<fieldset class="quick" style="float: left;">
 		{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
 		<input class="button2" type="submit" value="{L_GO}" name="sort" />
 	</fieldset>
-	<hr />
-	<!-- IF PAGINATION -->
-	<div class="pagination">
-			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-	</div>
-	<!-- ENDIF -->
 
 	<fieldset class="quick">
+		<p><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>
 		<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>
+<!-- ENDIF -->
 
-
+<div class="pagination">
+	<!-- IF PAGINATION -->
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+	<!-- ELSE -->
+		{S_ON_PAGE}
+	<!-- ENDIF -->
+</div>
 
 </form>
 

phpBB/adm/style/acp_jabber.html

@@ -17,13 +17,9 @@
 
 <fieldset>
 	<legend>{L_ACP_JABBER_SETTINGS}</legend>
-<!-- IF S_GTALK_NOTE -->
-	<p>{L_JAB_GTALK_NOTE}</p>
-<!-- ENDIF -->
 <dl>
 	<dt><label for="jab_enable">{L_JAB_ENABLE}:</label><br /><span>{L_JAB_ENABLE_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="jab_enable" name="jab_enable" value="1"<!-- IF JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
-		<label><input type="radio" class="radio" name="jab_enable" value="0"<!-- IF not JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
+	<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>
 </dl>
 <dl>
 	<dt><label for="jab_host">{L_JAB_SERVER}:</label><br /><span>{L_JAB_SERVER_EXPLAIN}</span></dt>
@@ -31,7 +27,7 @@
 </dl>
 <dl>
 	<dt><label for="jab_port">{L_JAB_PORT}:</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt>
-	<dd><input type="text" id="jab_port" name="jab_port" value="{JAB_PORT}" maxlength="5" size="5" /></dd>
+	<dd><input type="text" id="jab_port" name="jab_port" value="{JAB_PORT}" /></dd>
 </dl>
 <dl>
 	<dt><label for="jab_username">{L_JAB_USERNAME}:</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt>
@@ -39,27 +35,23 @@
 </dl>
 <dl>
 	<dt><label for="jab_password">{L_JAB_PASSWORD}:</label></dt>
-	<dd><input type="password" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd>
+	<dd><input type="text" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd>
 </dl>
-<!-- IF S_CAN_USE_SSL -->
 <dl>
-	<dt><label for="jab_use_ssl">{L_JAB_USE_SSL}:</label><br /><span>{L_JAB_USE_SSL_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="jab_use_ssl" name="jab_use_ssl" value="1"<!-- IF JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input type="radio" class="radio" name="jab_use_ssl" value="0"<!-- IF not JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	<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>
 </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>
+	<dd><input type="text" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" /></dd>
 </dl>
-
 </fieldset>
 
 <fieldset class="submit-buttons">
 	<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	{S_FORM_TOKEN}
 </fieldset>
+
 </form>
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_language.html

@@ -4,10 +4,10 @@
 
 <!-- IF S_SELECT_METHOD -->
 
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
 	<h1>{L_SELECT_DOWNLOAD_FORMAT}</h1>
-
+			
 	<form id="selectmethod" method="post" action="{U_ACTION}">
 
 	<fieldset>
@@ -16,17 +16,17 @@
 		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
 		<dd>{RADIO_BUTTONS}</dd>
 	</dl>
+	</fieldset>
 
-	<p class="quick">
+	<fieldset class="quick">
 		<input type="submit" class="button2" value="{L_DOWNLOAD}" name="download" />
-	</p>
 	</fieldset>
 
 	</form>
 
 <!-- ELSEIF S_DETAILS -->
 
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
 	<h1>{L_LANGUAGE_PACK_DETAILS}</h1>
 
@@ -36,11 +36,11 @@
 		<legend>{LANG_LOCAL_NAME}</legend>
 	<dl>
 		<dt><label for="lang_english_name">{L_LANG_ENGLISH_NAME}:</label></dt>
-		<dd><input type="text" id="lang_english_name" name="lang_english_name" value="{LANG_ENGLISH_NAME}" maxlength="100" /></dd>
+		<dd><input type="text" id="lang_english_name" name="lang_english_name" value="{LANG_ENGLISH_NAME}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="lang_local_name">{L_LANG_LOCAL_NAME}:</label></dt>
-		<dd><input type="text" id="lang_local_name" name="lang_local_name" value="{LANG_LOCAL_NAME}" maxlength="255" /></dd>
+		<dd><input type="text" id="lang_local_name" name="lang_local_name" value="{LANG_LOCAL_NAME}" /></dd>
 	</dl>
 	<dl>
 		<dt><label>{L_LANG_ISO_CODE}:</label></dt>
@@ -48,14 +48,14 @@
 	</dl>
 	<dl>
 		<dt><label for="lang_author">{L_LANG_AUTHOR}:</label></dt>
-		<dd><input type="text" id="lang_author" name="lang_author" value="{LANG_AUTHOR}" maxlength="255" /></dd>
+		<dd><input type="text" id="lang_author" name="lang_author" value="{LANG_AUTHOR}" /></dd>
 	</dl>
-
-	<p class="quick" style="margin-top: -15px;">
-		<input type="submit" name="update_details" class="button2" value="{L_SUBMIT}" />
-	</p>
-	{S_FORM_TOKEN}
 	</fieldset>
+
+	<fieldset class="quick" style="margin-top: -15px;">
+		<input type="submit" name="update_details" class="button2" value="{L_SUBMIT}" />
+	</fieldset>
+	
 	</form>
 
 	<br /><br />
@@ -72,7 +72,7 @@
 		<h1>{L_MISSING_LANG_VARIABLES}</h1>
 
 		<p>{L_MISSING_VARS_EXPLAIN}</p>
-
+						
 		<form id="missing" method="post" action="{U_MISSING_ACTION}">
 
 		<table cellspacing="1">
@@ -92,7 +92,7 @@
 		<!-- END missing -->
 		</tbody>
 		</table>
-		<div>{S_FORM_TOKEN}</div>
+
 		</form>
 
 		<br /><br />
@@ -104,30 +104,19 @@
 
 	<p>{L_LANGUAGE_ENTRIES_EXPLAIN}</p>
 
-	<form id="lang_entries" method="post" action="{U_ENTRY_ACTION}">
+	<form id="entries" method="post" action="{U_ENTRY_ACTION}">
 
 	<!-- IF S_FROM_STORE -->
-		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
+		<fieldset class="quick" style="float: left;">
 			<input type="submit" name="remove_store" value="{L_REMOVE_FROM_STORAGE_FOLDER}" class="button2" /> 
 		</fieldset>
 	<!-- ENDIF -->
-
-	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
+	
+	<fieldset class="quick" style="float: right;">
 		<select name="language_file">{S_LANG_OPTIONS}</select>&nbsp;<input type="submit" class="button2" name="change" value="{L_SELECT}" />
 	</fieldset>
 
-	<p>&nbsp;<br />&nbsp;</p>
-
-
-	<!--[if lt IE 8]>
-	<style type="text/css">
-	/* <![CDATA[ */
-		input.langvalue, textarea.langvalue {
-		width: 450px;
-		}
-	/* ]]> */
-	</style>
-	<![endif]-->
+	<br /><br /><br />
 
 	<table cellspacing="1">
 	<thead>
@@ -159,15 +148,19 @@
 		{TPL}
 	<!-- ENDIF -->
 	<tr>
-		<td class="row3" colspan="3" style="text-align: right;">{S_FORM_TOKEN}<input type="submit" name="download_file" class="button2" value="{L_SUBMIT_AND_DOWNLOAD}" />&nbsp;&nbsp;<input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /></td>
+		<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>
 	</tr>
 	</tbody>
 	</table>
+
 	</form>
 
 <!-- ELSEIF S_UPLOAD -->
 
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
 	<h1>{L_UPLOAD_SETTINGS}</h1>
 
@@ -192,17 +185,17 @@
 	<!-- BEGIN data -->
 	<dl>
 		<dt><label for="{data.DATA}">{data.NAME}:</label><br /><span>{data.EXPLAIN}</span></dt>
-		<dd><input type="<!-- IF data.DATA == 'password' -->password<!-- ELSE -->text<!-- ENDIF -->" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" /></dd>
+		<dd><input type="text" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" /></dd>
 	</dl>
 	<!-- END data -->
 	</fieldset>
 	
 	<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 -->
@@ -252,4 +245,4 @@
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_logs.html

@@ -8,11 +8,20 @@
 
 <form id="list" method="post" action="{U_ACTION}">
 
-<!-- IF PAGINATION -->
+<fieldset class="quick" style="float: left;">
+	{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>
+
+<div class="clearfix"></div>
+
 <div class="pagination">
+	<!-- IF PAGINATION -->
 		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+	<!-- ELSE -->
+		{S_ON_PAGE}
+	<!-- ENDIF -->
 </div>
-<!-- ENDIF -->
 
 <!-- IF .log -->
 	<table cellspacing="1">
@@ -37,7 +46,7 @@
 			</td>
 			<td style="text-align: center;">{log.IP}</td>
 			<td style="text-align: center;">{log.DATE}</td>
-			<td>{log.ACTION}<!-- IF log.DATA --><br /><span>{log.DATA}</span><!-- ENDIF --></td>
+			<td>{log.ACTION}<!-- IF log.DATA --><br />{log.DATA}</span><!-- ENDIF --></td>
 			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td>
 		</tr>
 	<!-- END log -->
@@ -52,20 +61,8 @@
 
 <!-- ENDIF -->
 
-
-<fieldset class="display-options">
-	{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
-	<input class="button2" type="submit" value="{L_GO}" name="sort" />
-	{S_FORM_TOKEN}
-</fieldset>
-<hr />
-<!-- IF PAGINATION -->
-<div class="pagination">
-	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-</div>
-<!-- ENDIF -->
 <!-- IF S_SHOW_FORUMS -->
-	<fieldset class="quick">
+	<fieldset class="quick" style="float: left;">
 		{L_SELECT_FORUM}: <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select>
 		<input class="button2" type="submit" value="{L_GO}" />
 	</fieldset>
@@ -73,12 +70,19 @@
 
 <!-- IF S_CLEARLOGS -->
 	<fieldset class="quick">
+		<b class="small"><a href="#" onclick="marklist('list', 'mark', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></b><br />
+		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />&nbsp;
 		<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 -->
 
+<div class="pagination">
+	<!-- IF PAGINATION -->
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+	<!-- ELSE -->
+		{S_ON_PAGE}
+	<!-- ENDIF -->
+</div>
 
 </form>
 

phpBB/adm/style/acp_main.html

@@ -4,9 +4,9 @@
 
 <!-- IF S_RESTORE_PERMISSIONS -->
 
-	<h1>{L_PERMISSIONS_TRANSFERRED}</h1>
+	<h1>{L_PERMISSIONS_TRANSFERED}</h1>
 
-	<p>{L_PERMISSIONS_TRANSFERRED_EXPLAIN}</p>
+	<p>{L_PERMISSIONS_TRANSFERED_EXPLAIN}</p>
 
 <!-- ELSE -->
 
@@ -35,110 +35,67 @@
 	<tbody>
 	<tr>
 		<td>{L_NUMBER_POSTS}: </td>
-		<td><strong>{TOTAL_POSTS}</strong></td>
+		<td><b>{TOTAL_POSTS}</b></td>
 		<td>{L_POSTS_PER_DAY}: </td>
-		<td><strong>{POSTS_PER_DAY}</strong></td>
+		<td><b>{POSTS_PER_DAY}</b></td>
 	</tr>
 	<tr>
 		<td>{L_NUMBER_TOPICS}: </td>
-		<td><strong>{TOTAL_TOPICS}</strong></td>
+		<td><b>{TOTAL_TOPICS}</b></td>
 		<td>{L_TOPICS_PER_DAY}: </td>
-		<td><strong>{TOPICS_PER_DAY}</strong></td>
+		<td><b>{TOPICS_PER_DAY}</b></td>
 	</tr>
 	<tr>
 		<td>{L_NUMBER_USERS}: </td>
-		<td><strong>{TOTAL_USERS}</strong></td>
+		<td><b>{TOTAL_USERS}</b></td>
 		<td>{L_USERS_PER_DAY}: </td>
-		<td><strong>{USERS_PER_DAY}</strong></td>
+		<td><b>{USERS_PER_DAY}</b></td>
 	</tr>
 	<tr>
 		<td>{L_NUMBER_FILES}: </td>
-		<td><strong>{TOTAL_FILES}</strong></td>
+		<td><b>{TOTAL_FILES}</b></td>
 		<td>{L_FILES_PER_DAY}: </td>
-		<td><strong>{FILES_PER_DAY}</strong></td>
+		<td><b>{FILES_PER_DAY}</b></td>
 	</tr>
 
 
 	<tr>
 		<td>{L_BOARD_STARTED}: </td>
-		<td><strong>{START_DATE}</strong></td>
+		<td><b>{START_DATE}</b></td>
 		<td>{L_AVATAR_DIR_SIZE}: </td>
-		<td><strong>{AVATAR_DIR_SIZE}</strong></td>
+		<td><b>{AVATAR_DIR_SIZE}</b></td>
 	</tr>
 	<tr>
 		<td>{L_DATABASE_SIZE}: </td>
-		<td><strong>{DBSIZE}</strong></td>
+		<td><b>{DBSIZE}</b></td>
 		<td>{L_UPLOAD_DIR_SIZE}: </td>
-		<td><strong>{UPLOAD_DIR_SIZE}</strong></td>
+		<td><b>{UPLOAD_DIR_SIZE}</b></td>
 	</tr>
 	<tr>
 		<td>{L_DATABASE_SERVER_INFO}: </td>
-		<td><strong>{DATABASE_INFO}</strong></td>
+		<td><b>{DATABASE_INFO}</b></td>
 		<td>{L_GZIP_COMPRESSION}: </td>
-		<td><strong>{GZIP_COMPRESSION}</strong></td>
+		<td><b>{GZIP_COMPRESSION}</b></td>
 	</tr>
-	<tr>
-		<td>{L_BOARD_VERSION}: </td>
-		<td><strong>{BOARD_VERSION}</strong></td>
 	<!-- IF S_TOTAL_ORPHAN -->
+	<tr>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
 		<td>{L_NUMBER_ORPHAN}: </td>
-		<td><strong>{TOTAL_ORPHAN}</strong></td>
-	<!-- ELSE -->
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-	<!-- ENDIF -->
+		<td><b>{TOTAL_ORPHAN}</b></td>
 	</tr>
+	<!-- ENDIF -->
 	</tbody>
 	</table>
 
 	<!-- IF S_ACTION_OPTIONS -->
-		<fieldset>
-			<legend>{L_STATISTIC_RESYNC_OPTIONS}</legend>
+		<form id="stats" method="post" action="{U_ACTION}">
+		<fieldset class="quick">
+			<select name="action">{S_ACTION_OPTIONS}</select>
 
-			<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>
+			<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
+		</fieldset>
+		</form>
 	<!-- ENDIF -->
 
 	<!-- IF .log -->
@@ -146,8 +103,6 @@
 
 		<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>
@@ -171,6 +126,7 @@
 		</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,7 +5,8 @@
 <!-- IF S_EDIT_MODULE -->
 
 	<script type="text/javascript">
-	// <![CDATA[
+	<!--
+
 		function display_options(value)
 		{
 			if (value == 'category')
@@ -26,7 +27,6 @@
 			// Create the new select tag
 			var new_node = document.createElement('select');
 			new_node.setAttribute('id', 'module_mode');
-			new_node.setAttribute('name', 'module_mode');
 
 			// Substitute it for the old one
 			item.parentNode.replaceChild(new_node, item);
@@ -37,7 +37,7 @@
 			var j = 0;
 <!-- BEGIN m_names -->
 		
-			if (value == '{m_names.A_NAME}')
+			if (value == '{m_names.NAME}')
 			{
 	<!-- BEGIN modes -->
 				item.options[j] = new Option('{m_names.modes.A_VALUE}');
@@ -51,10 +51,10 @@
 			item.options[0].selected = true;
 		}
 
-	// ]]>
+	//-->
 	</script>
 
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE} :: {MODULENAME}</h1>
 
@@ -74,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" class="text medium" id="module_langname" value="{MODULE_LANGNAME}" /></dd>
+		<dd><input name="module_langname" type="text" id="module_langname" value="{MODULE_LANGNAME}" class="medium" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="module_type">{L_MODULE_TYPE}:</label></dt>
@@ -88,13 +88,13 @@
 	<dl>
 		<dt><label for="module_enabled">{L_MODULE_ENABLED}:</label></dt>
 		<dd><label><input type="radio" class="radio" name="module_enabled" id="module_enabled" value="1"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="module_enabled" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<label><input type="radio" class="radio" name="module_enabled" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<div id="modoptions"<!-- IF S_IS_CAT --> style="display: none;"<!-- ENDIF -->>
 		<dl>
 			<dt><label for="module_display">{L_MODULE_DISPLAYED}:</label><br /><span>{L_MODULE_DISPLAYED_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="module_display" id="module_display" value="1"<!-- IF MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="module_display" value="0"<!-- IF not MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<label><input type="radio" class="radio" name="module_display" value="0"<!-- IF not MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
 			<dt><label for="module_basename">{L_CHOOSE_MODULE}:</label><br />
@@ -107,16 +107,16 @@
 			<dd><select name="module_mode" id="module_mode">{S_MODULE_MODES}</select></dd>
 		</dl>
 	</div>
+	</fieldset>
 
-	<p class="submit-buttons">
+	<fieldset class="submit-buttons">
 		<input type="hidden" name="action" value="{ACTION}" />
 		<input type="hidden" name="m" value="{MODULE_ID}" />
 		
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</p>
-	{S_FORM_TOKEN}
 	</fieldset>
+
 	</form>
 
 <!-- ELSE -->
@@ -146,7 +146,7 @@
 		<tbody>
 		<!-- BEGIN modules -->
 			<tr>
-				<td style="width: 5%; text-align: center;">{modules.MODULE_IMAGE}</td>
+				<td style="width: 5%;">{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;">
@@ -176,7 +176,7 @@
 
 	<form id="quick" method="post" action="{U_ACTION}">
 
-	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
+	<fieldset class="quick" style="float: right;">
 		<input type="hidden" name="action" value="quickadd" />
 
 		<select name="quick_install">{S_INSTALL_OPTIONS}</select>
@@ -187,17 +187,17 @@
 
 	<form id="module" method="post" action="{U_ACTION}">
 
-	<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
+	<fieldset class="quick" style="float: left;">
 		<input type="hidden" name="action" value="add" />
 		<input type="hidden" name="module_parent_id" value="{PARENT_ID}" />
 
-		<input type="text" name="module_langname" maxlength="255" /> 
+		<input type="text" name="module_langname" /> 
 		<input class="button2" name="addmodule" type="submit" value="{L_CREATE_MODULE}" />
 	</fieldset>
 
 	</form>
 
-	<div class="clearfix">&nbsp;</div><br style="clear: both;" />
+	<div class="clearfix">&nbsp;</div>
 	
 	<form id="mselect" method="post" action="{U_SEL_ACTION}">
 	<fieldset class="quick">
@@ -209,4 +209,4 @@
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_permission_roles.html

@@ -5,49 +5,79 @@
 <!-- IF S_EDIT -->
 
 	<script type="text/javascript">
-	// <![CDATA[
-		var active_pmask = '0';
-		var active_fmask = '0';
-		var active_cat = '0';
+	<!--
+		var active_option = 'options0';
 
-		var id = '000';
+		/**
+		* Show/hide option panels
+		* value = suffix for ID to show
+		*/
+		function swap_options(id)
+		{
+			if (id == active_option)
+			{
+				return;
+			}
+			
+			// Hide active options and display container
+			dE(active_option, -1);
+			dE(id, 1);
 
-		var role_options = new Array();
+			active_option = id;
+		}
 
-		<!-- IF S_ROLE_JS_ARRAY -->
-			{S_ROLE_JS_ARRAY}
-		<!-- ENDIF -->
-	// ]]>
+		/**
+		* Mark all radio buttons in one panel
+		* id = table ID container, s = status ['y'/'u'/'n']
+		*/
+		function mark_options(id, s)
+		{
+			var t = document.getElementById(id);
+			
+			if (!t)
+			{
+				return;
+			}
+		
+			var rb = t.getElementsByTagName('input');
+		
+			for (var r = 0; r < rb.length; r++ )
+			{
+				if (rb[r].id.substr(rb[r].id.length-1) == s)
+				{
+					rb[r].checked = true;
+				}
+			}
+		}
+
+	//-->
 	</script>
 
-	<script type="text/javascript" src="style/permissions.js"></script>
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&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>
 		<dt><label for="role_name">{L_ROLE_NAME}:</label></dt>
-		<dd><input name="role_name" type="text" id="role_name" value="{ROLE_NAME}" maxlength="255" /></dd>
+		<dd><input name="role_name" type="text" id="role_name" value="{ROLE_NAME}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="role_description">{L_ROLE_DESCRIPTION}:</label><br /><span>{L_ROLE_DESCRIPTION_EXPLAIN}</span></dt>
 		<dd><textarea id="role_description" name="role_description" rows="3" cols="45">{ROLE_DESCRIPTION}</textarea></dd>
 	</dl>
+	</fieldset>
 
-	<p class="quick">
+	<fieldset class="quick">
 		<input type="submit" class="button1" name="submit" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
-	</p>
 	</fieldset>
 
 	<!-- IF S_DISPLAY_ROLE_MASK -->
@@ -58,79 +88,77 @@
 
 	<!-- ENDIF -->
 
-	<p>
-
 	<a name="acl"></a>
 
 	<a href="#maincontent">&raquo; {L_BACK_TO_TOP}</a><br />
 	<br /><br />
 
-	</p>
-
 	<h1>{L_ACL_TYPE}</h1>
 
-	<fieldset class="perm nolegend">
+	<fieldset class="quick">
+		<a href="#" onclick="mark_options('a_options', 'y'); return false;">{L_ALL_YES}</a> &bull; <a href="#" onclick="mark_options('a_options', 'n'); return false;">{L_ALL_NEVER}</a> &bull; <a href="#" onclick="mark_options('a_options', 'u'); return false;">{L_ALL_NO}</a>
+	</fieldset>
 
-		<div id="advanced00">
-			<div class="permissions-category">
-				<ul>
-				<!-- BEGIN auth -->
-					<!-- IF auth.S_YES -->
-						<li class="permissions-preset-yes<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
-					<!-- ELSEIF auth.S_NEVER -->
-						<li class="permissions-preset-never<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
-					<!-- ELSEIF auth.S_NO -->
-						<li class="permissions-preset-no<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
-					<!-- ELSE -->
-						<li class="permissions-preset-custom<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
-					<!-- ENDIF -->
-						<a href="#" onclick="swap_options('0','0','{auth.S_ROW_COUNT}'); return false;"><span class="tabbg"><span class="colour"></span>{auth.CAT_NAME}</span></a></li>	
-				<!-- END auth -->
-				</ul>
-			</div>
+	<fieldset class="permissions">
+
+		<table cellspacing="1" class="pmask">
+		<thead>
+		<tr>
+		<!-- BEGIN auth -->
+			<th>{auth.CAT_NAME}</th>
+		<!-- END auth -->
+		</tr>
+		</thead>
+		<tbody>
+		<tr>
+		<!-- BEGIN auth -->
+			<!-- IF auth.S_YES -->
+				<td class="preset preset_yes">
+			<!-- ELSEIF auth.S_NEVER -->
+				<td class="preset preset_never">
+			<!-- ELSEIF auth.S_NO -->
+				<td class="preset preset_no">
+			<!-- ELSE -->
+				<td class="preset preset_custom">
+			<!-- ENDIF -->
+				<a href="#" onclick="swap_options('options{auth.S_ROW_COUNT}'); return false;"><span></span></a></td>
+		<!-- END auth -->
+		</tr>
+		<tr class="row3">
+			<td colspan="{S_NUM_PERM_COLS}" id="a_options" style="vertical-align: top; text-align: left; width: 100%;">
 			<!-- BEGIN auth -->
-			<div class="permissions-panel" id="options00{auth.S_ROW_COUNT}"<!-- IF auth.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
-				<span class="corners-top"><span></span></span>
-				<div class="tablewrap">
-					<table id="table00{auth.S_ROW_COUNT}" cellspacing="1">
-					<colgroup>
-						<col class="permissions-name" />
-						<col class="permissions-yes" />
-						<col class="permissions-no" />
-						<col class="permissions-never" />
-					</colgroup>
-					<thead>
-					<tr>
-						<th class="name" scope="col"><strong>{L_ACL_SETTING}</strong></th>
-						<th class="value permissions-yes" scope="col"><a href="#" onclick="mark_options('options00{auth.S_ROW_COUNT}', 'y'); set_colours('00{auth.S_ROW_COUNT}', false, 'yes'); return false;">{L_ACL_YES}</a></th>
-						<th class="value permissions-no" scope="col"><a href="#" onclick="mark_options('options00{auth.S_ROW_COUNT}', 'u'); set_colours('00{auth.S_ROW_COUNT}', false, 'no'); return false;">{L_ACL_NO}</a></th>
-						<th class="value permissions-never" scope="col"><a href="#" onclick="mark_options('options00{auth.S_ROW_COUNT}', 'n'); set_colours('00{auth.S_ROW_COUNT}', false, 'never'); return false;">{L_ACL_NEVER}</a></th>
-					</tr>
-					</thead>
-					<tbody>
-					<!-- BEGIN mask -->
-						<!-- IF auth.mask.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
-						<th class="permissions-name<!-- IF auth.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->">{auth.mask.PERMISSION}</th>
-							
-						<td class="permissions-yes"><label for="setting_{auth.mask.FIELD_NAME}_y"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_y" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></label></td>
-						<td class="permissions-no"><label for="setting_{auth.mask.FIELD_NAME}_u"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_u" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NO --> checked="checked"<!-- ENDIF --> value="-1" /></label></td>
-						<td class="permissions-never"><label for="setting_{auth.mask.FIELD_NAME}_n"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_n" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NEVER --> checked="checked"<!-- ENDIF --> value="0" /></label></td>
-					</tr>
-					<!-- END mask -->
-					</tbody>
-					</table>
-				</div>
-				<span class="corners-bottom"><span></span></span>
-			</div>
+				<table cellspacing="1" id="options{auth.S_ROW_COUNT}" class="type3" style="width: 100%; text-align: left;<!-- IF auth.S_FIRST_ROW --><!-- ELSE --> display: none;<!-- ENDIF -->">
+				<thead>
+				<tr>
+					<th scope="col" style="text-align: left; padding-left: 0;"><strong>{L_ACL_SETTING} [{auth.CAT_NAME}]</strong></th>
+					<th scope="col"><a href="#" onclick="mark_options('options{auth.S_ROW_COUNT}', 'y'); return false;">{L_ACL_YES}</a></th>
+					<th scope="col"><a href="#" onclick="mark_options('options{auth.S_ROW_COUNT}', 'u'); return false;">{L_ACL_NO}</a></th>
+					<th scope="col"><a href="#" onclick="mark_options('options{auth.S_ROW_COUNT}', 'n'); 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>{auth.mask.PERMISSION}</th>
+					<td class="no"><input 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" /></td>
+					<td class="no"><input 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" /></td>
+					<td class="no"><input 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" /></td>
+				</tr>
+				<!-- END mask -->
+				</tbody>
+				</table>
 			<!-- END auth -->
-		</div>
+			</td>
+		</tr>
+		</tbody>
+		</table>
 
 	</fieldset>
 
 	<fieldset class="quick">
 		<input type="submit" class="button1" name="submit" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
 	</fieldset>
+
 	</form>
 
 	<a href="#maincontent">&raquo; {L_BACK_TO_TOP}</a><br />
@@ -155,18 +183,18 @@
 	<tbody>
 	<!-- BEGIN roles -->
 	<tr>
-		<td style="vertical-align: top;"><strong>{roles.ROLE_NAME}</strong>
+		<td style="vertical-align: top;"><b>{roles.ROLE_NAME}</b>
 			<!-- IF roles.ROLE_DESCRIPTION --><br /><span>{roles.ROLE_DESCRIPTION}</span><!-- ENDIF -->
 		</td>
 		<td style="width: 30%; text-align: center; vertical-align: top; white-space: nowrap;"><!-- IF roles.U_DISPLAY_ITEMS --><a href="{roles.U_DISPLAY_ITEMS}">{L_VIEW_ASSIGNED_ITEMS}</a><!-- ELSE -->{L_VIEW_ASSIGNED_ITEMS}<!-- ENDIF --></td>
 		<td style="width: 80px; text-align: right; vertical-align: top; white-space: nowrap;">
 			<!-- IF roles.S_FIRST_ROW && not roles.S_LAST_ROW -->
 				{ICON_MOVE_UP_DISABLED}
-				<a href="{roles.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+				<a href="{roles.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>					 	
 			<!-- ELSEIF not roles.S_FIRST_ROW && not roles.S_LAST_ROW-->
 				<a href="{roles.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
 				<a href="{roles.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
-			<!-- ELSEIF roles.S_LAST_ROW && not roles.S_FIRST_ROW -->
+			<!-- ELSEIF roles.S_LAST_ROW && not roles.S_FIRST_ROW -->						
 				<a href="{roles.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
 				{ICON_MOVE_DOWN_DISABLED}
 			<!-- ELSE -->
@@ -182,13 +210,13 @@
 	</table>
 
 	<fieldset class="quick">
-		{L_CREATE_ROLE}: <input type="text" name="role_name" value="" maxlength="255" /><!-- IF S_ROLE_OPTIONS --> <select name="options_from"><option value="0" selected="selected">{L_CREATE_ROLE_FROM}</option>{S_ROLE_OPTIONS}</select><!-- ENDIF --> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" /><br />
-		{S_FORM_TOKEN}
+		{L_CREATE_ROLE}: <input type="text" name="role_name" value="" /><!-- 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 />
 	</fieldset>
+
 	</form>
 
 	<!-- IF S_DISPLAY_ROLE_MASK -->
-
+		
 		<a name="assigned_to"></a>
 
 		<h1>{L_ROLE_ASSIGNED_TO}</h1>
@@ -197,6 +225,8 @@
 
 	<!-- ENDIF -->
 
+
 <!-- ENDIF -->
 
+
 <!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_permissions.html

@@ -17,7 +17,7 @@
 	<p>{L_EXPLAIN}</p>
 	
 	<!-- IF S_FORUM_NAMES -->
-		<p><strong>{L_FORUMS}:</strong> {FORUM_NAMES}</p>
+		<p><b>{L_FORUMS}:</b> {FORUM_NAMES}</p>
 	<!-- ENDIF -->
 
 	<!-- IF S_SELECT_FORUM -->
@@ -30,16 +30,15 @@
 		<dl>
 			<dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt>
 			<dd><select id="forum" name="forum_id[]"<!-- IF S_FORUM_MULTIPLE --> multiple="multiple"<!-- ENDIF --> size="10">{S_FORUM_OPTIONS}</select></dd>
-			<!-- IF S_FORUM_ALL --><dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd><!-- ENDIF -->
+			<!-- IF S_FORUM_ALL --><dd><input type="checkbox" class="radio" name="all_forums" value="1" />&nbsp; {L_ALL_FORUMS}</dd><!-- ENDIF -->
 		</dl>
-
-		<p class="quick">
-			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
-			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-		</p>
-
 		</fieldset>
+
+		<fieldset class="quick">
+			{S_HIDDEN_FIELDS}
+			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+		</fieldset>
+
 		</form>
 
 		<!-- IF S_FORUM_MULTIPLE -->
@@ -53,16 +52,32 @@
 				<dt><label for="sforum">{L_LOOK_UP_FORUM}:</label></dt>
 				<dd><select id="sforum" name="subforum_id">{S_SUBFORUM_OPTIONS}</select></dd>
 			</dl>
-
-			<p class="quick">
-				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
-				<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-			</p>
-
 			</fieldset>
+
+			<fieldset class="quick">
+				{S_HIDDEN_FIELDS}
+				<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+			</fieldset>
+
 			</form>
 			
+			<form id="select_single_forum" method="post" action="{U_ACTION}">
+
+			<fieldset>
+				<legend>{L_LOOK_UP_FORUM}</legend>
+			<dl>
+				<dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt>
+				<dd><select id="forum" name="forum_id[]">{S_FORUM_OPTIONS}</select></dd>
+			</dl>
+			</fieldset>
+
+			<fieldset class="quick">
+				{S_HIDDEN_FIELDS}
+				<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+			</fieldset>
+
+			</form>
+
 		<!-- ENDIF -->
 
 	<!-- ELSEIF S_SELECT_USER and S_CAN_SELECT_USER -->
@@ -73,17 +88,17 @@
 			<legend>{L_LOOK_UP_USER}</legend>
 		<dl>
 			<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
-			<dd><input class="text medium" type="text" id="username" name="username[]" /></dd>
-			<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
-			<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
+			<dd><input class="medium" type="text" id="username" name="username[]" /></dd>
+			<dd>[ <a href="{U_FIND_USERNAME}" onclick="window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); 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>
 		</dl>
-
-		<p class="quick">
-			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
-			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-		</p>
 		</fieldset>
+
+		<fieldset class="quick">
+			{S_HIDDEN_FIELDS}
+			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+		</fieldset>
+
 		</form>
 
 	<!-- ELSEIF S_SELECT_GROUP and S_CAN_SELECT_GROUP -->
@@ -96,20 +111,19 @@
 			<dt><label for="group">{L_LOOK_UP_GROUP}:</label></dt>
 			<dd><select name="group_id[]" id="group">{S_GROUP_OPTIONS}</select></dd>
 		</dl>
-
-		<p class="quick">
-			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
-			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
-		</p>
-
 		</fieldset>
+
+		<fieldset class="quick">
+			{S_HIDDEN_FIELDS}
+			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+		</fieldset>
+
 		</form>
 
 		<!-- ELSEIF S_SELECT_USERGROUP -->
 
-		<div style="float: {S_CONTENT_FLOW_BEGIN}; width: 48%;">
-
+		<div style="float: left; width: 48%;">
+		
 		<!-- IF S_CAN_SELECT_USER -->
 
 			<h1>{L_USERS}</h1>
@@ -120,40 +134,40 @@
 				<legend>{L_MANAGE_USERS}</legend>
 			<dl>
 				<dd class="full"><select style="width: 100%;" name="user_id[]" multiple="multiple" size="5">{S_DEFINED_USER_OPTIONS}</select></dd>
-				<!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_users" value="1" /> {L_ALL_USERS}</label></dd><!-- ENDIF -->
+				<!-- 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 -->
 			</dl>
 			</fieldset>
 			
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
 				<input type="submit" class="button2" name="action[delete]" value="{L_REMOVE_PERMISSIONS}" style="width: 46% !important;" /> &nbsp; <input class="button1" type="submit" name="submit_edit_options" value="{L_EDIT_PERMISSIONS}" style="width: 46% !important;" />
 			</fieldset>
+			
 			</form>
 
 			<form id="add_user" method="post" action="{U_ACTION}">
-
+			
 			<fieldset>
 				<legend>{L_ADD_USERS}</legend>
 				<p>{L_USERNAMES_EXPLAIN}</p>
 			<dl>
 				<dd class="full"><textarea id="username" name="usernames" rows="5" cols="5" style="width: 100%; height: 60px;"></textarea></dd>
-				<dd class="full" style="text-align: left;"><div style="float: {S_CONTENT_FLOW_END};">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</div><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
+				<dd class="full" style="text-align: left;"><div style="float: right;">[ <a href="{U_FIND_USERNAME}" onclick="window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); 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>
 			</dl>
 			</fieldset>
 
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
 				<input class="button1" type="submit" name="submit_add_options" value="{L_ADD_PERMISSIONS}" />
 			</fieldset>
+			
 			</form>
 
 		<!-- ENDIF -->
 
 		</div>
 
-		<div style="float: {S_CONTENT_FLOW_END}; width: 48%">
+		<div style="float: right; width: 48%">
 			
 		<!-- IF S_CAN_SELECT_GROUP -->
 
@@ -165,15 +179,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;"><label><input type="checkbox" class="radio" name="all_groups" value="1" /> {L_ALL_GROUPS}</label></dd><!-- ENDIF -->
+				<!-- 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 -->
 			</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}">
@@ -187,9 +201,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 -->
@@ -198,7 +212,7 @@
 
 	<!-- ELSEIF S_SELECT_USERGROUP_VIEW -->
 
-		<div style="float: {S_CONTENT_FLOW_BEGIN}; width: 48%;">
+		<div style="float: left; width: 48%;">
 		
 			<h1>{L_USERS}</h1>
 
@@ -213,9 +227,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}">
@@ -225,21 +239,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(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>
+				<dd>[ <a href="{U_FIND_USERNAME}" onclick="window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); 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>
 			</dl>
 			</fieldset>
 
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
 				<input type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" class="button1" />
 			</fieldset>
+
 			</form>
 
 		</div>
 
-		<div style="float: {S_CONTENT_FLOW_END}; width: 48%">
+		<div style="float: right; width: 48%">
 			
 			<h1>{L_USERGROUPS}</h1>
 
@@ -254,9 +268,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}">
@@ -264,17 +278,17 @@
 			<fieldset>
 				<legend>{L_LOOK_UP_GROUP}</legend>
 			<dl>
-				<dt><label for="group_select">{L_LOOK_UP_GROUP}:</label></dt>
-				<dd><select name="group_id[]" id="group_select">{S_ADD_GROUP_OPTIONS}</select></dd>
+				<dt><label for="group">{L_LOOK_UP_GROUP}:</label></dt>
+				<dd><select name="group_id[]" id="group">{S_ADD_GROUP_OPTIONS}</select></dd>
 				<dd>&nbsp;</dd>
 			</dl>
 			</fieldset>
 
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
-				{S_FORM_TOKEN}
 				<input type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" class="button1" />
 			</fieldset>
+
 			</form>
 
 		</div>
@@ -290,7 +304,7 @@
 	<p>{L_ACL_VIEW_EXPLAIN}</p>
 
 	<fieldset class="quick">
-		<strong>&raquo; {L_PERMISSION_TYPE}</strong>
+		<b>&raquo; {L_PERMISSION_TYPE}</b>
 	</fieldset>
 
 	<!-- INCLUDE permission_mask.html -->
@@ -305,20 +319,20 @@
 
 	<br />
 
-	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
-		<strong>&raquo; {L_PERMISSION_TYPE}</strong>
+	<fieldset class="quick" style="float: right;">
+		<b>&raquo; {L_PERMISSION_TYPE}</b>
 	</fieldset>
 
 	<!-- IF S_PERMISSION_DROPDOWN -->
 		<form id="pselect" method="post" action="{U_ACTION}">
 	
-		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
+		<fieldset class="quick" style="float: left;">
 			{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 -->
 
@@ -327,12 +341,12 @@
 	<!-- include tooltip file -->
 	<script type="text/javascript" src="style/tooltip.js"></script>
 	<script type="text/javascript">
-	// <![CDATA[
-		window.onload = function(){enable_tooltips_select('set-permissions', '{LA_ROLE_DESCRIPTION}', 'role')};
-	// ]]>
+	<!--
+		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}
 
@@ -340,14 +354,18 @@
 
 	<br /><br />
 
-	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
+	<fieldset class="quick" style="float: left; text-align: left;">
+		{L_PERMISSION_APPLIED_TO_ALL}<br />
+		<a href="#" onclick="marklist('set_permissions', 'inherit', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('set_permissions', 'inherit', false); return false;">{L_UNMARK_ALL}</a>
+	</fieldset>
+
+	<fieldset class="quick" style="float: right;">
 		<input class="button1" type="submit" name="action[apply_all_permissions]" value="{L_APPLY_ALL_PERMISSIONS}" />
-		<input class="button2" type="button" name="cancel" value="{L_RESET}" onclick="document.forms['set-permissions'].reset(); init_colours(active_pmask + active_fmask);" />
-		{S_FORM_TOKEN}
+		<input class="button2" type="reset" name="cancel" value="{L_RESET}" />
 	</fieldset>
 
 	<br /><br />
-	
+
 	</form>
 
 <!-- ENDIF -->

phpBB/adm/style/acp_php_info.html

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

phpBB/adm/style/acp_profile.html

@@ -4,7 +4,7 @@
 
 <!-- IF S_EDIT -->
 
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&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><strong>{FIELD_TYPE}</strong></dd>
+			<dd><b>{FIELD_TYPE}</b></dd>
 		</dl>
 		<!-- IF S_EDIT_MODE -->
 		<dl>
@@ -35,13 +35,12 @@
 		<!-- ELSE -->
 		<dl>
 			<dt><label for="field_ident">{L_FIELD_IDENT}:</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
-			<dd><input class="text medium" type="text" id="field_ident" name="field_ident" value="{FIELD_IDENT}" /></dd>
+			<dd><input class="medium" type="text" id="field_ident" name="field_ident" value="{FIELD_IDENT}" /></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
 			<dt><label for="field_no_view">{L_DISPLAY_PROFILE_FIELD}:</label><br /><span>{L_DISPLAY_PROFILE_FIELD_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" id="field_no_view" name="field_no_view" value="0"<!-- IF not S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="field_no_view" value="1"<!-- IF S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<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>
 		</dl>
 		</fieldset>
 
@@ -75,7 +74,7 @@
 			<legend>{L_LANG_SPECIFIC}</legend>
 		<dl>
 			<dt><label for="lang_name">{L_USER_FIELD_NAME}:</label></dt>
-			<dd><input class="text medium" type="text" id="lang_name" name="lang_name" value="{LANG_NAME}" /></dd>
+			<dd><input class="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>
@@ -84,7 +83,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="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>
+				<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>
 			</dl>
 		<!-- ENDIF -->
 		<!-- IF S_BOOL or S_DROPDOWN -->
@@ -108,7 +107,6 @@
 
 		<fieldset class="quick">
 			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
 			<input class="button1" type="submit" name="next" value="{L_PROFILE_TYPE_OPTIONS}" />
 		</fieldset>
 
@@ -124,14 +122,13 @@
 		<!-- END option -->
 		</fieldset>
 
-		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
+		<fieldset class="quick" style="float: left;">
 			<input class="button1" type="submit" name="prev" value="{L_PROFILE_BASIC_OPTIONS}" />
 		</fieldset>
 		
-		<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
+		<fieldset class="quick" style="float: right">
 			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
-			<input class="button1" type="submit" name="next" value="{L_NEXT_STEP}" />
+			<input class="button1" type="submit" name="next" value="{L_NEXT}" />
 		</fieldset>
 
 	<!-- ELSEIF S_STEP_THREE -->
@@ -148,18 +145,17 @@
 			</fieldset>
 		<!-- END options -->
 
-		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
+		<fieldset class="quick" style="float: left;">
 			<input class="button1" type="submit" name="prev" value="{L_PROFILE_TYPE_OPTIONS}" />
 		</fieldset>
 		
-		<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
+		<fieldset class="quick" style="float: right;">
 			{S_HIDDEN_FIELDS}
 			<input class="button1" type="submit" name="save" value="{L_SAVE}" />
-			{S_FORM_TOKEN}
 		</fieldset>
 	
 	<!-- ENDIF -->
-	
+
 	</form>
 
 <!-- ELSE -->
@@ -216,13 +212,13 @@
 	<form id="profile_fields" method="post" action="{U_ACTION}">
 	
 	<fieldset class="quick">
-		<input class="text small" type="text" name="field_ident" /> <select name="field_type">{S_TYPE_OPTIONS}</select>
+		<input class="small" type="text" name="field_ident" /> <select name="field_type">{S_TYPE_OPTIONS}</select>
 		<input class="button1" type="submit" name="submit" value="{L_CREATE_NEW_FIELD}" />
 		<input type="hidden" name="create" value="1" />
-		{S_FORM_TOKEN}
 	</fieldset>
+
 	</form>
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_prune_forums.html

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

phpBB/adm/style/acp_prune_users.html

@@ -33,27 +33,25 @@
 <dl>
 	<dt><label for="users">{L_ACP_PRUNE_USERS}:</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt>
 	<dd><textarea id="users" name="users" cols="40" rows="5"></textarea></dd>
-	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+	<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>
 </dl>
 <dl>
 	<dt><label for="deleteposts">{L_DELETE_USER_POSTS}:</label><br /><span>{L_DELETE_USER_POSTS_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" name="deleteposts" value="1" /> {L_YES}</label>
-		<label><input type="radio" class="radio" id="deleteposts" name="deleteposts" value="0" checked="checked" /> {L_NO}</label></dd>
+	<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>
 </dl>
 <dl>
 	<dt><label for="deactivate">{L_DEACTIVATE_DELETE}:</label><br /><span>{L_DEACTIVATE_DELETE_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" name="action" value="delete" /> {L_DELETE_USERS}</label>
-		<label><input type="radio" class="radio" id="deactivate" name="action" value="deactivate" checked="checked" /> {L_DEACTIVATE}</label></dd>
+	<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>
 </dl>
+</fieldset>
 
-<p class="submit-buttons">
+<fieldset class="submit-buttons">
 	<input type="hidden" name="prune" value="1" />
 
 	<input class="button1" type="submit" id="update" name="update" value="{L_SUBMIT}" />&nbsp;
 	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	{S_FORM_TOKEN}
-</p>
 </fieldset>
+
 </form>
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_ranks.html

@@ -4,16 +4,16 @@
 
 <!-- IF S_EDIT -->
 
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
 	<script type="text/javascript">
-	// <![CDATA[
+	<!--
 		function update_image(newimage)
 		{
-			document.getElementById('image').src = (newimage) ? "{RANKS_PATH}/" + encodeURI(newimage) : "./images/spacer.gif";
+			document.getElementById('image').src = (newimage) ? "{RANKS_PATH}/" + newimage : "./images/spacer.gif";
 		}
 
-	// ]]>
+	//-->
 	</script>
 
 	<h1>{L_ACP_MANAGE_RANKS}</h1>
@@ -26,7 +26,7 @@
 		<legend>{L_ACP_RANKS}</legend>
 	<dl>
 		<dt><label for="title">{L_RANK_TITLE}:</label></dt>
-		<dd><input name="title" type="text" id="title" value="{RANK_TITLE}" maxlength="255" /></dd>
+		<dd><input name="title" type="text" id="title" value="{RANK_TITLE}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="rank_image">{L_RANK_IMAGE}:</label></dt>
@@ -35,8 +35,7 @@
 	</dl>
 	<dl>
 		<dt><label for="special_rank">{L_RANK_SPECIAL}:</label></dt>
-		<dd><label><input onchange="dE('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
-			<label><input onchange="dE('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<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>
 	</dl>
 	<!-- IF S_SPECIAL_RANK --><div id="posts" style="display: none;"><!-- ELSE --><div id="posts"><!-- ENDIF -->
 	<dl>
@@ -44,15 +43,15 @@
 		<dd><input name="min_posts" type="text" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd>
 	</dl>
 	</div>
+	</fieldset>
 
-	<p class="submit-buttons">
+	<fieldset class="submit-buttons">
 		<input type="hidden" name="action" value="save" />
 
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</p>
 	</fieldset>
+
 	</form>
 
 <!-- ELSE -->
@@ -61,10 +60,6 @@
 
 	<p>{L_ACP_RANKS_EXPLAIN}</p>
 
-	<form id="acp_ranks" method="post" action="{U_ACTION}">
-	<fieldset class="tabulated">
-	<legend>{L_ACP_MANAGE_RANKS}</legend>
-
 	<table cellspacing="1">
 	<thead>
 	<tr>
@@ -86,13 +81,14 @@
 	</tbody>
 	</table>
 
-	<p class="quick">
+	<form id="acp_ranks" method="post" action="{U_ACTION}">
+
+	<fieldset class="quick">
 		<input class="button2" name="add" type="submit" value="{L_ADD_RANK}" />
-		{S_FORM_TOKEN}
-	</p>
 	</fieldset>
+
 	</form>
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_reasons.html

@@ -4,7 +4,7 @@
 
 <!-- IF S_EDIT_REASON -->
 
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE}</h1>
 
@@ -30,7 +30,7 @@
 		<p><!-- IF S_TRANSLATED -->{L_IS_TRANSLATED_EXPLAIN}<!-- ELSE -->{L_IS_NOT_TRANSLATED_EXPLAIN}<!-- ENDIF --></p>
 	<dl>
 		<dt><label for="reason_title">{L_REASON_TITLE}:</label></dt>
-		<dd><input name="reason_title" type="text" id="reason_title" value="{REASON_TITLE}" maxlength="255" /></dd>
+		<dd><input name="reason_title" type="text" id="reason_title" value="{REASON_TITLE}" /></dd>
 	</dl>
 	<!-- IF S_TRANSLATED -->
 	<dl>
@@ -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" cols="80">{REASON_DESCRIPTION}</textarea></dd>
+		<dd><textarea name="reason_description" id="reason_description" rows="8">{REASON_DESCRIPTION}</textarea></dd>
 	</dl>
 	<!-- IF S_TRANSLATED -->
 	<dl>
@@ -48,13 +48,13 @@
 		<dd>{TRANSLATED_DESCRIPTION}</dd>
 	</dl>
 	<!-- ENDIF -->
+	</fieldset>
 
-	<p class="submit-buttons">
+	<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}
-	</p>
 	</fieldset>
+
 	</form>
 
 <!-- ELSE -->
@@ -63,10 +63,6 @@
 
 	<p>{L_ACP_REASONS_EXPLAIN}</p>
 
-	<form id="reasons" method="post" action="{U_ACTION}">
-	<fieldset class="tabulated">
-	<legend>{L_ACP_REASONS}</legend>
-
 	<!-- IF .reasons -->
 		<table cellspacing="1">
 			<col class="row1" /><col class="row1" /><col class="row2" />
@@ -81,7 +77,7 @@
 		<!-- BEGIN reasons -->
 			<tr>
 				<td>
-					<i style="float: {S_CONTENT_FLOW_END}; font-size: .9em;"><!-- IF reasons.S_TRANSLATED -->{L_IS_TRANSLATED}<!-- ELSE -->{L_IS_NOT_TRANSLATED}<!-- ENDIF --></i>
+					<i style="float: right; 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>
@@ -111,17 +107,17 @@
 
 	<!-- ENDIF -->
 
-	<p class="quick">
+	<form id="reasons" method="post" action="{U_ACTION}">
+
+	<fieldset class="quick">
 		<input type="hidden" name="action" value="add" />
 
 		<input type="text" name="reason_title" /> 
 		<input class="button2" name="addreason" type="submit" value="{L_ADD_NEW_REASON}" />
-		{S_FORM_TOKEN}
-	</p>
 	</fieldset>
-	
+
 	</form>
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_search.html

@@ -13,16 +13,15 @@
 		<legend>{L_GENERAL_SEARCH_SETTINGS}</legend>
 	<dl>
 		<dt><label for="load_search">{L_YES_SEARCH}:</label><br /><span>{L_YES_SEARCH_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" id="load_search" name="config[load_search]" value="1"<!-- IF S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="config[load_search]" value="0"<!-- IF not S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dd><input type="radio" class="radio" id="load_search" name="config[load_search]" value="1"<!-- IF S_YES_SEARCH --> checked="checked"<!-- ENDIF --> class="radio" />&nbsp;{L_YES}&nbsp;&nbsp;<input type="radio" class="radio" name="config[load_search]" value="0"<!-- IF not S_YES_SEARCH --> checked="checked"<!-- ENDIF --> class="radio" />&nbsp;{L_NO}</dd>
 	</dl>
 	<dl>
 		<dt><label for="search_interval">{L_SEARCH_INTERVAL}:</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt>
-		<dd><input id="search_interval" type="text" size="4" maxlength="4" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>
+		<dd><input id="search_interval" type="text" size="4" maxlength="4" name="config[search_interval]" value="{SEARCH_INTERVAL}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}:</label><br /><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt>
-		<dd><input id="search_anonymous_interval" type="text" size="4" maxlength="4" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>
+		<dd><input id="search_anonymous_interval" type="text" size="4" maxlength="4" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}:</label><br /><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt>
@@ -34,7 +33,7 @@
 	</dl>
 	<dl>
 		<dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}:</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt>
-		<dd><input id="search_store_results" type="text" size="4" maxlength="6" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>
+		<dd><input id="search_store_results" type="text" size="4" maxlength="6" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /></dd>
 	</dl>
 	</fieldset>
 
@@ -56,60 +55,44 @@
 	<!-- END backend -->
 
 	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
 	</fieldset>
+
 	</form>
 
 <!-- ELSEIF S_INDEX -->
 
 	<script type="text/javascript">
-	// <![CDATA[
+	<!--
+
 		/**
 		* Popup search progress bar
 		*/
 		function popup_progress_bar(progress_type)
 		{
 			close_waitscreen = 0;
-			// no scrollbars
-			popup('{UA_PROGRESS_BAR}&amp;type=' + progress_type, 400, 240, '_index');
+			window.open('{UA_PROGRESS_BAR}&type=' + progress_type, '_index', 'HEIGHT=240,resizable=yes,scrollbars=no,WIDTH=400');
 		}
-	// ]]>
+	//-->
 	</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 -->
-
-			<form id="acp_search_index_{backend.NAME}" method="post" action="{U_ACTION}">
-
-				<fieldset class="tabulated">
-
-				{backend.S_HIDDEN_FIELDS}
-
-				<legend>{L_INDEX_STATS}: {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></legend>
-
+			
 				<table cellspacing="1">
-					<caption>{backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></caption>
+					<caption>&raquo; {L_INDEX_STATS}: {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></caption>
 					<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
 				<thead>
 				<tr>
@@ -133,14 +116,15 @@
 			
 			<!-- ENDIF -->
 			
-			<p class="quick">
+			<form id="acp_search_index_{backend.NAME}" method="post" action="{U_ACTION}">
+				{backend.S_HIDDEN_FIELDS}
+		
+			<fieldset class="quick">
 			<!-- IF backend.S_INDEXED -->
 				<input class="button2" type="submit" name="action[delete]" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');" />
 			<!-- ELSE -->
 				<input class="button2" type="submit" name="action[create]" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');" />
 			<!-- ENDIF -->
-			</p>
-			{S_FORM_TOKEN}
 			</fieldset>
 			
 			</form>
@@ -150,4 +134,4 @@
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_styles.html

@@ -4,7 +4,7 @@
 
 <!-- IF S_DELETE -->
 
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE}</h1>
 
@@ -16,259 +16,401 @@
 		<legend>{L_TITLE}</legend>
 	<dl>
 		<dt><label>{L_NAME}:</label></dt>
-		<dd><strong>{NAME}</strong></dd>
+		<dd><b>{NAME}</b></dd>
 	</dl>
 	<dl>
 		<dt><label for="new_id">{L_REPLACE}:</label><br /><span>{L_REPLACE_EXPLAIN}</span></dt>
 		<dd><select name="new_id">{S_REPLACE_OPTIONS}</select></dd>
 	</dl>
-
-	<p class="quick">
-		<input class="button1" type="submit" name="update" value="{L_DELETE}" />
-		{S_FORM_TOKEN}
-	</p>
 	</fieldset>
+
+	<fieldset class="quick">
+		<input class="button1" type="submit" name="update" value="{L_DELETE}" />
+	</fieldset>
+
 	</form>
 
 <!-- ELSEIF S_EDIT_IMAGESET -->
 
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE}</h1>
 
 	<p>{L_EXPLAIN}</p>
-
-	<!-- IF SUCCESS -->
-		<div class="successbox">
-			<p>{L_IMAGESET_UPDATED}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF ERROR -->
-		<div class="errorbox">
-			<p>{L_NO_IMAGE}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<script type="text/javascript" defer="defer">
-	// <![CDATA[
+	<script language="javascript" type="text/javascript" defer="defer">
+	<!--
 		function update_image(newimage)
 		{
-			document.getElementById('newimg').src = (newimage) ? '../styles/{A_NAME}/imageset/' + encodeURI(newimage) : 'images/no_image.png';
+			document.newimg.src = (newimage) ? "../styles/{NAME}/imageset/" + newimage : "images/no_image.png";
 		}
-	// ]]>
+	//-->
 	</script>
-	<script type="text/javascript">
-	// <![CDATA[
-		/**
-		* Handle displaying/hiding the dimension fields
-		*/
-		function display_options(value)
-		{
-			if (value == 0)
-			{
-				dE('img_dimensions', -1);
-			}
-			else
-			{
-				dE('img_dimensions', 1);
-			}
-		}
-
-		/**
-		* Init the wanted display functionality if javascript is enabled.
-		* If javascript is not available, the user is still able to properly administrate.
-		*/
-		onload = function()
-		{
-			<!-- IF not IMAGE_SIZE -->
-				dE('img_dimensions', -1);
-			<!-- ENDIF -->
-		}
-	// ]]>
-	</script>
-
 	<form method="post" action="{U_ACTION}">
-
-	<fieldset class="quick" style="text-align: left;">
-		<legend>{L_SELECT_IMAGE}</legend>
-		{L_SELECT_IMAGE}: <select name="imgname" onchange="this.form.submit();">
+	
+	<table width="95%" cellspacing="1" cellpadding="1" border="0" align="center">
+	<tr>
+		<td align="right">{L_SELECT_IMAGE}: <select name="imgname" onchange="this.form.submit(); ">
 		<!-- BEGIN category -->
-			<option class="sep" value="" disabled="disabled">{category.NAME}</option>
-				<!-- BEGIN images --><option value="{category.images.VALUE}"<!-- IF category.images.SELECTED--> selected="selected"<!-- ENDIF -->>&nbsp;&nbsp;&nbsp;&nbsp;{category.images.TEXT}</option>
+			<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>
 				<!-- END images -->
 			<!-- END category -->
-		</select>&nbsp; <input class="button1" type="submit" value="{L_SELECT}" tabindex="100" />
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_EDIT_IMAGESET}</legend>
-	<dl>
-		<dt><label>{L_CURRENT_IMAGE}:</label></dt>
-		<dd><img src="<!-- IF IMAGE_REQUEST -->{IMAGE_REQUEST}<!-- ELSE -->images/no_image.png<!-- ENDIF -->" alt="" /></dd>
-	</dl>
-	<dl>
-		<dt><label>{L_SELECTED_IMAGE}:</label></dt>
-		<dd><img src="{IMG_SRC}" id="newimg" alt="" /></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset>
-	<legend>{L_IMAGE}</legend>
-	<dl>
-		<dt><label for="imgpath">{L_IMAGE}:</label></dt>
-		<dd><select id="imgpath" name="imgpath" onchange="update_image(this.options[selectedIndex].value);"><option value=""<!-- IF not IMAGE_SELECT--> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>
-			<!-- BEGIN imagesetlist -->
-			<option class="sep" value=""><!-- IF imagesetlist.TYPE -->{L_LOCALISED_IMAGES}<!-- ELSE -->{L_GLOBAL_IMAGES}<!-- ENDIF --></option>
-				<!-- BEGIN images -->
-				<option value="{imagesetlist.images.VALUE}"<!-- IF imagesetlist.images.SELECTED--> selected="selected"<!-- ENDIF -->>{imagesetlist.images.TEXT}</option>
-				<!-- END images -->
-			<!-- END imagesetlist -->
-			</select>
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="imgsize">{L_INCLUDE_DIMENSIONS}:</label><br /><span>{L_DIMENSIONS_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" name="imgsize" id="imgsize" onclick="display_options(1);" value="1"<!-- IF IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="imgsize" onclick="display_options(0);" value="0"<!-- IF not IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<div id="img_dimensions">
-		<dl>
-			<dt><label for="imgwidth">{L_IMAGE_WIDTH}:</label><br /><span>{L_AUTOMATIC_EXPLAIN}</span></dt>
-			<dd><input type="text" name="imgwidth" value="{IMAGE_SIZE}" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="imgheight">{L_IMAGE_HEIGHT}:</label><br /><span>{L_AUTOMATIC_EXPLAIN}</span></dt>
-			<dd><input type="text" name="imgheight" value="{IMAGE_HEIGHT}" /></dd>
-		</dl>
-	</div>
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="button2" type="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</fieldset>
+			</select>&nbsp; <input class="btnlite" type="submit" value="{L_SELECT}" tabindex="100" />
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center">
+			<tr>
+				<th colspan="2">{L_EDIT_IMAGESET}</th>
+			</tr>
+			<!-- IF SUCCESS -->
+			<tr>
+				<td class="row1" colspan="2" align="center"><span style="color: green">{L_IMAGESET_UPDATED}</span><br /></td>
+			</tr>
+			<!-- ENDIF -->
+			<!-- IF ERROR -->
+			<tr>
+				<td class="row1" colspan="2" align="center"><span style="color: red">{L_NO_IMAGE}</span><br /></td>
+			</tr>
+			<!-- ENDIF -->
+			<tr>
+				<td class="row1" colspan="2" align="center">
+					<table width="100%" cellspacing="2" cellpadding="2" border="0">
+					<tr>
+						<td width="50%" align="center"><img src="<!-- IF IMAGE_REQUEST -->{IMAGE_REQUEST}<!-- ELSE -->images/no_image.png<!-- ENDIF -->"/></td>
+						<td width="50%" align="center"><img src="images/no_image.png" name="newimg" /></td>
+					</tr>
+					<tr>
+						<td class="gensmall" align="center">{L_CURRENT_IMAGE}</td>
+						<td class="gensmall" align="center">{L_SELECTED_IMAGE}</td>
+					</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<th width="40%">{L_IMAGE_PARAMETER}</th>
+				<th>{L_IMAGE_VALUE}</th>
+			</tr>
+			<tr>
+				<td class="row1" width="40%"><b>{L_IMAGE}: </b></td>
+				<td class="row2"><select name="imgpath" onchange="update_image(this.options[selectedIndex].value);"><option value=""<!-- IF not IMAGE_SELECT--> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>
+					<!-- BEGIN imagesetlist -->
+					<option class="sep" value=""><!-- IF imagesetlist.TYPE -->{L_LOCALISED_IMAGES}<!-- ELSE -->{L_GLOBAL_IMAGES}<!-- ENDIF --></option>
+						<!-- BEGIN images -->
+						<option value="{imagesetlist.images.VALUE}"<!-- IF imagesetlist.images.SELECTED--> selected="selected"<!-- ENDIF -->>{imagesetlist.images.TEXT}</option>
+						<!-- END images -->
+					<!-- END imagesetlist -->
+					</select>
+				</td>
+			</tr>
+			<tr>
+				<td class="row1" width="40%"><b>{L_INCLUDE_DIMENSIONS}: </b><br /><span class="gensmall">{L_DIMENSIONS_EXPLAIN}</span></td>
+				<td class="row2"><input type="radio" class="radio" name="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}</td>
+			</tr>
+			<tr>
+				<td class="cat" colspan="2" align="center"><input class="btnmain" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnmain" type="reset" value="{L_RESET}" /></td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</table>
+	
 	</form>
 
 <!-- ELSEIF S_EDIT_TEMPLATE or S_EDIT_THEME -->
 
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_EDIT}</h1>
-
-	<p>{L_EDIT_EXPLAIN}</p>
-
-	<p>{L_SELECTED}: <strong>{SELECTED_TEMPLATE}</strong></p>
-
-	<form id="acp_styles" method="post" action="{U_ACTION}">
-
-	<!-- IF S_EDIT_TEMPLATE or (S_EDIT_THEME and not S_THEME_IN_DB) -->
-	<fieldset>
-		<legend>{L_SELECT}</legend>
-	<dl>
-		<dt><label for="template_file">{L_FILE}:</label></dt>
-		<dd><select id="template_file" name="template_file" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_TEMPLATES}</select> <input class="button2" type="submit" value="{L_SELECT}" /></dd>
-	</dl>
-	{S_FORM_TOKEN}
-	</fieldset>
-	<!-- ENDIF -->
-	</form>
-
-	<!-- IF TEMPLATE_FILE or (S_EDIT_THEME and S_THEME_IN_DB) -->
-		<script type="text/javascript" defer="defer">
-		// <![CDATA[
-
-			function change_editor_height(height)
+	<script language="javascript" 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)
 			{
-				height = Number(height);
-
-				if (isNaN(height))
-				{
-					return;
-				}
-
-				editor = document.getElementById('template_data');
-				editor.rows = Math.max(5, Math.min(height, 999));
-
-				append_text_rows('acp_styles', height);
-				append_text_rows('acp_template', height);
+				document.getElementById(form_name).action = url + "&text_rows=" + value;
 			}
-
-			function append_text_rows(form_name, value)
+			else
 			{
-				value = Number(value);
-
-				if (isNaN(value))
+				url_start = url.substring(0, var_start + 1);
+				var_end = url.substring(var_start + 1).indexOf('&');
+				if (var_end == -1)
 				{
-					return;
-				}
-
-				url = document.getElementById(form_name).action;
-
-				// Make sure &amp; is actually... &
-				url = url.replace(/&amp;/g, '&');
-
-				var_start = url.indexOf('&text_rows=');
-				if (var_start == -1)
-				{
-					document.getElementById(form_name).action = url + "&text_rows=" + value;
+					document.getElementById(form_name).action = url_start + "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 + url.substring(var_end + var_start + 2) + "&text_rows=" + value;
+				}
+			}
+		}
+	//-->
+	</script>
+
+	<!-- IF S_EDIT_TEMPLATE -->
+
+		<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+
+		<h1>{L_EDIT_TEMPLATE}</h1>
+
+		<p>{L_EDIT_TEMPLATE_EXPLAIN}</p>
+
+		<p>{L_SELECTED_TEMPLATE}: <b>{SELECTED_TEMPLATE}</b></p>
+
+		<form id="acp_styles" method="post" action="{U_ACTION}">
+
+		<fieldset>
+			<legend>{L_SELECT_TEMPLATE}</legend>
+		<dl>
+			<dt><label for="template_file">{L_TEMPLATE_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="btnlite" type="submit" value="{L_SELECT}" /></dd>
+		</dl>
+		</fieldset>
+
+		</form>
+
+		<!-- IF TEMPLATE_FILE -->
+			<script language="javascript" type="text/javascript" defer="defer">
+			<!--
+
+				function change_editor_height(height)
+				{
+					editor = document.getElementById('template_data');
+					editor.rows = Math.max(5, Math.min(height, 999));
+
+					append_text_rows('acp_styles', height);
+					append_text_rows('acp_template', height);
+				}
+
+				function append_text_rows(form_name, value)
+				{
+					url = document.getElementById(form_name).action;
+					var_start = url.indexOf('&text_rows=');
+					if (var_start == -1)
 					{
-						document.getElementById(form_name).action = url_start + "text_rows=" + value;
+						document.getElementById(form_name).action = url + "&text_rows=" + value;
 					}
 					else
 					{
-						document.getElementById(form_name).action = url_start + url.substring(var_end + var_start + 2) + "&text_rows=" + value;
+						url_start = url.substring(0, var_start + 1);
+						var_end = url.substring(var_start + 1).indexOf('&');
+						if (var_end == -1)
+						{
+							document.getElementById(form_name).action = url_start + "text_rows=" + value;
+						}
+						else
+						{
+							document.getElementById(form_name).action = url_start + url.substring(var_end + var_start + 2) + "&text_rows=" + value;
+						}
 					}
 				}
+			//-->
+			</script>
+
+			<form id="acp_template" method="post" action="{U_ACTION}">
+
+			<fieldset>
+				<legend>{L_TEMPLATE_EDITOR}</legend>
+			<dl>
+				<dt><label>{L_SELECTED_TEMPLATE_FILE}:</label></dt>
+				<dd>{TEMPLATE_FILE}</dd>
+			</dl>
+			<dl>
+				<dt><label for="text_rows">{L_TEMPLATE_EDITOR_HEIGHT}:</label></dt>
+				<dd><input id="text_rows" type="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="btnlite" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd>
+			</dl>
+			<textarea id="template_data" name="template_data" style="font-family:'Courier New', monospace;font-size:9pt;line-height:125%;width:100%;" cols="80" rows="{TEXT_ROWS}">{TEMPLATE_DATA}</textarea>
+			</fieldset>
+
+			<fieldset class="submit-buttons">
+				{S_HIDDEN_FIELDS}
+				<input class="button1" id="save" type="submit" name="save" value="{L_SUBMIT}" />
+			</fieldset>
+
+			</form>
+		<!-- ENDIF -->
+
+	<!-- ELSEIF S_EDIT_THEME -->
+
+		<script language="javascript" type="text/javascript">
+		<!--
+
+			function swatch(field)
+			{
+				window.open('{UA_SWATCH}' + field, '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636');
+				return false;
 			}
 
-		// ]]>
+			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>
 
-		<form id="acp_template" method="post" action="{U_ACTION}">
+		<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}: <b>{SELECTED_THEME}</b></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_EDITOR}</legend>
-		<!-- IF S_EDIT_TEMPLATE or (S_EDIT_THEME and not S_THEME_IN_DB) -->
+			<legend>{L_SELECT_CLASS}</legend>
 		<dl>
-			<dt><label>{L_SELECTED_FILE}:</label></dt>
-			<dd>{TEMPLATE_FILE}</dd>
+			<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> <input class="btnlite" 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="btnlite" 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></td>
+					<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="normal"<!-- IF FONT_WEIGHT eq "normal" --> 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="normal"<!-- IF FONT_STYLE eq "normal" --> 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="normal"<!-- IF TEXT_DECORATION eq "normal" --> 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">
+				{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="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>
+			<dt><label for="custom_class">{L_CSS_CLASS_NAME}:</label></dt></dt>
+			<dd><input id="custom_class" name="custom_class" type="text" value="" maxlength="40" size="40" /></dd>
 		</dl>
-		<textarea id="template_data" name="template_data" style="font-family:'Courier New', monospace;font-size:9pt;line-height:125%;width:100%;" cols="80" rows="{TEXT_ROWS}">{TEMPLATE_DATA}</textarea>
 		</fieldset>
 
-		<fieldset class="submit-buttons">
-			<legend>{L_SUBMIT}</legend>
-			{S_HIDDEN_FIELDS}
-			{S_FORM_TOKEN}
-			<input class="button1" id="save" type="submit" name="save" value="{L_SUBMIT}" />
+		<fieldset class="quick">
+			<input class="button1" type="submit" id="add_custom" name="add_custom" value="{L_SUBMIT}" />
 		</fieldset>
+
 		</form>
+	
 	<!-- ENDIF -->
 
 <!-- ELSEIF S_CACHE -->
 
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<script language="Javascript" 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>
 	
 	<h1>{L_TEMPLATE_CACHE}</h1>
 	
 	<p>{L_TEMPLATE_CACHE_EXPLAIN}</p>
 	
 	<form name="acp_styles" method="post" action="{U_ACTION}">
-	<fieldset class="tabulated">
-	<legend>{L_TEMPLATE_CACHE}</legend>
 
 	<table cellspacing="1">
 	<thead>
@@ -283,7 +425,7 @@
 	<tbody>
 	<!-- BEGIN file -->
 		<!-- IF file.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td><a href="{file.U_VIEWSOURCE}" onclick="popup(this.href, 750, 550, '_source'); return false;">{file.FILENAME}</a></td>
+			<td><a href="{file.U_VIEWSOURCE}" onclick="viewsource('{file.UA_VIEWSOURCE}');return false">{file.FILENAME}</a></td>
 			<td>{file.FILESIZE}</td>
 			<td>{file.CACHED}</td>
 			<td>{file.MODIFIED}</td>
@@ -297,17 +439,17 @@
 	</tbody>
 	</table>
 
-	<p class="quick">
+	<fieldset class="quick">
 		<span class="small"><a href="#" onclick="marklist('acp_styles', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('acp_styles', 'delete', false); return false;">{L_UNMARK_ALL}</a></span><br />
-		{S_FORM_TOKEN}
+
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_DELETE_MARKED}" />
-	</p>
 	</fieldset>
+
 	</form>
 
 <!-- ELSEIF S_EXPORT -->
 
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE}</h1>
 
@@ -326,42 +468,36 @@
 		<legend>{L_TITLE}</legend>
 	<dl>
 		<dt><label>{L_NAME}:</label></dt>
-		<dd><strong>{NAME}</strong></dd>
+		<dd><b>{NAME}</b></dd>
 	</dl>
 	<!-- IF S_STYLE -->
 		<dl>
 			<dt><label for="inc_template">{L_INCLUDE_TEMPLATE}:</label></dt>
-			<dd><label><input type="radio" class="radio" id="inc_template" name="inc_template" value="1" checked="checked" /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="inc_template" value="0" /> {L_NO}</label></dd>
+			<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>
 		</dl>
 		<dl>
 			<dt><label for="inc_theme">{L_INCLUDE_THEME}:</label></dt>
-			<dd><label><input type="radio" class="radio" id="inc_theme" name="inc_theme" value="1" checked="checked" /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="inc_theme" value="0" /> {L_NO}</label></dd>
+			<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>
 		</dl>
 		<dl>
 			<dt><label for="inc_imageset">{L_INCLUDE_IMAGESET}:</label></dt>
-			<dd><label><input type="radio" class="radio" id="inc_imageset" name="inc_imageset" value="1" checked="checked" /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="inc_imageset" value="0" /> {L_NO}</label></dd>
+			<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>
 		</dl>
 	<!-- ENDIF -->
 	<dl>
 		<dt><label for="store">{L_DOWNLOAD_STORE}:</label><br /><span>{L_DOWNLOAD_STORE_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" id="store" name="store" value="1" checked="checked" /> {L_EXPORT_STORE}</label>
-			<label><input type="radio" class="radio" name="store" value="0" /> {L_EXPORT_DOWNLOAD}</label></dd>
+		<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>
 	</dl>
 	<dl>
 		<dt><label for="format">{L_ARCHIVE_FORMAT}:</label></dt>
 		<dd>{FORMAT_BUTTONS}</dd>
 	</dl>
-
-	<p class="quick">
-		{S_FORM_TOKEN}
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-	</p>
 	</fieldset>
 
-	
+	<fieldset class="quick">
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+	</fieldset>
+
 	</form>
 
 <!-- ELSEIF S_FRONTEND -->
@@ -384,11 +520,11 @@
 	</thead>
 	<tbody>
 	<tr>
-		<td class="row3" colspan="{$COLSPAN}"><strong>{L_INSTALLED}</strong></td>
+		<td class="row3" colspan="{$COLSPAN}"><b>{L_INSTALLED}</b></td>
 	</tr>
 	<!-- BEGIN installed -->
 	<tr>
-		<td><strong>{installed.NAME}</strong><!-- IF installed.S_DEFAULT_STYLE --> *<!-- ENDIF --></td>
+		<td><strong>{installed.NAME}</strong></a><!-- IF installed.S_DEFAULT_STYLE --> *<!-- ENDIF --></td>
 		<!-- IF S_STYLE -->
 			<td style="text-align: center;">{installed.STYLE_COUNT}</td>
 		<!-- ENDIF -->
@@ -404,10 +540,9 @@
 				| <a href="{installed.U_PREVIEW}">{L_PREVIEW}</a>
 			<!-- ENDIF -->
 		</td>
-	</tr>
 	<!-- END installed -->
 	<tr>
-		<td class="row3" colspan="{$COLSPAN}"><strong>{L_UNINSTALLED}</strong></td>
+		<td class="row3" colspan="{$COLSPAN}"><b>{L_UNINSTALLED}</b></td>
 	</tr>
 	<!-- IF not .uninstalled -->
 		<tr>
@@ -416,7 +551,7 @@
 	<!-- ENDIF -->
 	<!-- BEGIN uninstalled -->
 		<tr>
-			<td<!-- IF S_STYLE --> colspan="2"<!-- ENDIF -->><strong>{uninstalled.NAME}</strong><br /><span>{L_COPYRIGHT}: {uninstalled.COPYRIGHT}</span></td>
+			<td<!-- IF S_STYLE --> colspan="2"<!-- ENDIF -->><b>{uninstalled.NAME}</b><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 -->
@@ -427,7 +562,6 @@
 		<form id="acp_styles" method="post" action="{U_ACTION}">
 
 		<fieldset class="quick">
-			<legend>{L_CREATE}</legend>
 			{L_CREATE}: <input type="text" name="name" value="" /> {L_FROM} <select name="basis">{S_BASIS_OPTIONS}</select> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" />
 		</fieldset>
 
@@ -436,7 +570,7 @@
 
 <!-- ELSEIF S_DETAILS -->
 
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE}</h1>
 
@@ -459,7 +593,7 @@
 	</dl>
 	<dl>
 		<dt><label for="copyright">{L_COPYRIGHT}:</label></dt>
-		<dd><!-- IF S_INSTALL --><b id="copyright">{COPYRIGHT}</b><!-- ELSE --><input type="text" id="copyright" name="copyright" value="{COPYRIGHT}" /><!-- ENDIF --></dd>
+		<dd><!-- IF S_INSTALL --><b id="name">{COPYRIGHT}</b><!-- ELSE --><input type="text" id="copyright" name="copyright" value="{COPYRIGHT}" /><!-- ENDIF --></dd>
 	</dl>
 	<!-- IF S_STYLE and not S_BASIS -->
 		<dl>
@@ -478,8 +612,7 @@
 	<!-- IF S_TEMPLATE or S_THEME -->
 		<dl>
 			<dt><label for="store_db">{L_LOCATION}:</label><br /><span>{L_LOCATION_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="store_db" value="0"<!-- IF not S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> /> {L_STORE_FILESYSTEM}</label>
-				<label><input type="radio" class="radio" name="store_db" value="1"<!-- IF S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> /> {L_STORE_DATABASE}</label></dd>
+			<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>
 		</dl>
 	<!-- ENDIF -->
 	<!-- IF S_STYLE -->
@@ -489,27 +622,23 @@
 			<legend>{L_OPTIONS}</legend>
 		<dl>
 			<dt><label for="style_active">{L_STYLE_ACTIVE}:</label></dt>
-			<dd><label><input type="radio" class="radio" name="style_active" value="1"<!-- IF S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="style_active" value="0"<!-- IF not S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<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>
 		</dl>
 		<!-- IF not S_STYLE_DEFAULT -->
 			<dl>
 				<dt><label for="style_default">{L_STYLE_DEFAULT}:</label></dt>
-				<dd><label><input type="radio" class="radio" name="style_default" value="1" /> {L_YES}</label>
-					<label><input type="radio" class="radio" id="style_default" name="style_default" value="0" checked="checked" /> {L_NO}</label></dd>
+				<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>
 			</dl>
 		<!-- ENDIF -->
 	<!-- ENDIF -->
 	</fieldset>
 
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
+	<fieldset class="quick">
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
 	</fieldset>
-	
+
 	</form>
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_update.html

@@ -8,7 +8,7 @@
 
 	<p>{L_VERSION_CHECK_EXPLAIN}</p>
 
-	<!-- IF S_UP_TO_DATE and S_UP_TO_DATE_AUTO -->
+	<!-- IF S_UP_TO_DATE -->
 		<div class="successbox">
 			<p>{L_VERSION_UP_TO_DATE_ACP}</p>
 		</div>
@@ -22,20 +22,14 @@
 		<legend></legend>
 	<dl>
 		<dt><label>{L_CURRENT_VERSION}</label></dt>
-		<dd><strong><!-- IF S_UP_TO_DATE and not S_UP_TO_DATE_AUTO -->{AUTO_VERSION}<!-- ELSE -->{CURRENT_VERSION}<!-- ENDIF --></strong></dd>
+		<dd><b>{CURRENT_VERSION}</b></dd>
 	</dl>
 	<dl>
 		<dt><label>{L_LATEST_VERSION}</label></dt>
-		<dd><strong>{LATEST_VERSION}</strong></dd>
+		<dd><b>{LATEST_VERSION}</b></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,21 +14,21 @@
 		<legend>{L_SELECT_USER}</legend>
 	<dl>
 		<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
-		<dd><input class="text medium" type="text" id="username" name="username" /></dd>
-		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
-		<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
+		<dd><input class="medium" type="text" id="username" name="username" /></dd>
+		<dd>[ <a href="{U_FIND_USERNAME}" onclick="window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); 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>
 	</dl>
+	</fieldset>
 
-	<p class="quick">
+	<fieldset class="quick">
 		<input type="submit" name="submituser" value="{L_SUBMIT}" class="button1" />
-	</p>
 	</fieldset>
 
 	</form>
 
 <!-- ELSEIF S_SELECT_FORUM -->
 
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&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: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
-	<h1>{L_USER_ADMIN} :: {MANAGED_USERNAME}</h1>
+	<h1>{L_USER_ADMIN}</h1>
 
 	<p>{L_USER_ADMIN_EXPLAIN}</p>
 
@@ -69,31 +69,451 @@
 
 	<fieldset class="quick">
 		{L_SELECT_FORM}: <select name="mode" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_FORM_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" />
-		{S_FORM_TOKEN}
 	</fieldset>
+
 	</form>
 
 <!-- ENDIF -->
 
 <!-- IF S_OVERVIEW -->
 
-<!-- INCLUDE acp_users_overview.html -->
+	<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}" /><!-- IF S_USER_INACTIVE --> [{L_USER_IS_INACTIVE}]<!-- ENDIF --></dd>
+		<!-- IF U_SWITCH_PERMISSIONS --><dd>[ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]</dd><!-- ENDIF -->
+	</dl>
+	<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> ]</strong></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 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="warnings">{L_WARNINGS}:</label><br /><span>{L_WARNINGS_EXPLAIN}</span></dt>
+		<dd><input type="text" id="warnings" name="warnings" value="{USER_WARNINGS}" size="2" /></dd>
+	</dl>
+	<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>
 
 <!-- ELSEIF S_FEEDBACK -->
 
-<!-- INCLUDE acp_users_feedback.html -->
+	<form id="list" method="post" action="{U_ACTION}">
+
+	<fieldset class="quick" style="float: left;">
+		{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>
+
+	<div class="clearfix"></div>
+
+	<!-- IF PAGINATION -->
+	<div class="pagination">
+		<!-- IF PAGINATION -->
+			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+		<!-- ELSE -->
+			{S_ON_PAGE}
+		<!-- ENDIF -->
+	</div>
+	<!-- ENDIF -->
+
+	<!-- IF .log -->
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_REPORT_BY}</th>
+		<th>{L_IP}</th>
+		<th>{L_TIME}</th>
+		<th>{L_ACTION}</th>
+		<th>{L_MARK}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN log -->
+		<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
+			<td>{log.USERNAME}</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 -->
+
+	<!-- IF S_CLEARLOGS -->
+		<fieldset class="quick">
+			<b class="small"><a href="#" onclick="marklist('list', 'mark', true);">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('list', 'mark', false);">{L_UNMARK_ALL}</a></b><br />
+			<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />&nbsp;
+			<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
+		</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>
 
 <!-- ELSEIF S_PROFILE -->
 
-<!-- INCLUDE acp_users_profile.html -->
+	<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>
 
 <!-- ELSEIF S_PREFS -->
 
-<!-- INCLUDE acp_users_prefs.html -->
+	<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>
 
 <!-- ELSEIF S_AVATAR -->
 
-<!-- INCLUDE acp_users_avatar.html -->
+	<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>
 
 <!-- ELSEIF S_RANK -->
 
@@ -109,13 +529,122 @@
 
 	<fieldset class="quick">
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		{S_FORM_TOKEN}
 	</fieldset>
+
 	</form>
 
 <!-- ELSEIF S_SIGNATURE -->
 
-<!-- INCLUDE acp_users_signature.html -->
+	<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}',
+	a: '{LA_BBCODE_A_HELP}',
+	s: '{LA_BBCODE_S_HELP}',
+	f: '{LA_BBCODE_F_HELP}',
+	e: '{LA_BBCODE_E_HELP}',
+	d: '{LA_BBCODE_D_HELP}'
+	<!-- BEGIN custom_tags -->
+		,cb_{custom_tags.BBCODE_ID}: '{custom_tags.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')" />
+			<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px;" onclick="bbstyle(2)" onmouseover="helpline('i')" />
+			<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px;" onclick="bbstyle(4)" onmouseover="helpline('u')" />
+			<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" onmouseover="helpline('q')" />
+			<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" />
+			<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" />
+			<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" />
+			<!-- IF S_BBCODE_IMG -->
+				<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px"  onclick="bbstyle(14)" onmouseover="helpline('p')" />
+			<!-- 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')" onmouseover="helpline('d')" />
+			<!-- ENDIF -->
+			<!-- IF S_BBCODE_FLASH -->
+				<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" onmouseover="helpline('d')" />
+			<!-- 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')">
+				<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>
+			<a href="#" onclick="bbstyle(-1); return false;" onmouseover="helpline('a')">{L_CLOSE_TAGS}</a>
+		<!-- 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>
+	<dl>
+		<dt style="width: 95px;"><script type="text/javascript"><!-- 
+			colorPalette('v', 17, 13); 
+			//--></script>
+		</dt>
+		<dd style="text-align: left; margin-left: 95px;"><textarea name="signature" rows="10" cols="60" style="width: 80%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{SIGNATURE}</textarea></dd>
+		<dd style="text-align: left; margin-left: 95px;">
+			<!-- 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}
+		</dd>
+	</dl>
+	</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>
 
 <!-- ELSEIF S_GROUPS -->
 
@@ -126,38 +655,43 @@
 	<!-- BEGIN group -->
 		<!-- IF group.S_NEW_GROUP_TYPE -->
 		<tr>
-			<td class="row3" colspan="4"><strong>{group.GROUP_TYPE}</strong></td>
+			<td class="row3" colspan="4"><b>{group.GROUP_TYPE}</b></td>
 		</tr>
 		<!-- ELSE -->
 			<!-- IF group.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-				<td><a href="{group.U_EDIT_GROUP}">{group.GROUP_NAME}</a></td>
-				<td><!-- IF group.S_NO_DEFAULT --><a href="{group.U_DEFAULT}">{L_GROUP_DEFAULT}</a><!-- ELSE --><strong>{L_GROUP_DEFAULT}</strong><!-- ENDIF --></td>
-				<td><!-- IF not group.S_SPECIAL_GROUP --><a href="{group.U_DEMOTE_PROMOTE}">{group.L_DEMOTE_PROMOTE}</a><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
-				<td><a href="{group.U_DELETE}">{L_GROUP_DELETE}</a></td>
-			</tr>
+			<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><a href="{group.U_DELETE}">{L_GROUP_DELETE}</a></td>
 		<!-- 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 -->
+	<fieldset class="quick">
+		{L_USER_GROUP_ADD}: <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+	</fieldset>
+
 	</form>
 
 <!-- ELSEIF S_ATTACHMENTS -->
 
 	<form id="user_attachments" method="post" action="{U_ACTION}">
 
+	<fieldset class="quick" style="float: left;">
+		{L_SORT_BY}: <select name="sk">{S_SORT_KEY}</select> <select name="sd">{S_SORT_DIR}</select>
+		<input class="button2" type="submit" value="{L_GO}" name="sort" />
+	</fieldset>
 
-	<!-- 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 class="pagination" style="float: right;">
+		<!-- IF PAGINATION -->
+			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+		<!-- ELSE -->
+			{S_ON_PAGE}
+		<!-- ENDIF -->
 	</div>
-	<!-- ENDIF -->
+
+	<div class="clearfix"></div>
 
 	<!-- IF .attach -->
 	<table cellspacing="1">
@@ -167,64 +701,43 @@
 		<th>{L_POST_TIME}</th>
 		<th>{L_FILESIZE}</th>
 		<th>{L_DOWNLOADS}</th>
-		<th>{L_MARK}</th>
+		<th>{L_DELETE}</th>
 	</tr>
 	</thead>
 	<tbody>
 	<!-- BEGIN attach -->
 		<!-- IF attach.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td><a href="{attach.U_DOWNLOAD}">{attach.REAL_FILENAME}</a><br /><span class="small"><!-- IF attach.S_IN_MESSAGE --><strong>{L_PM}: </strong><!-- ELSE --><strong>{L_POST}: </strong><!-- ENDIF --><a href="{attach.U_VIEW_TOPIC}">{attach.TOPIC_TITLE}</a></span></td>
-		<td style="text-align: center">{attach.POST_TIME}</td>
-		<td style="text-align: center">{attach.SIZE}</td>
-		<td style="text-align: center">{attach.DOWNLOAD_COUNT}</td>
-		<td style="text-align: center"><input type="checkbox" class="radio" name="mark[]" value="{attach.ATTACH_ID}" /></td>
+		<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>{attach.POST_TIME}</td>
+		<td>{attach.SIZE}</td>
+		<td>{attach.DOWNLOAD_COUNT}</td>
+		<td><input type="checkbox" class="radio" name="mark[]" value="{attach.ATTACH_ID}" /></td>
 	</tr>
 	<!-- END attach -->
 	</tbody>
 	</table>
 	<!-- ELSE -->
 	<div class="errorbox">
-		<p>{L_USER_NO_ATTACHMENTS}</p>
+		<p>{L_NO_ENTRIES}</p>
 	</div>
 	<!-- ENDIF -->
-	<fieldset class="display-options">
-		{L_SORT_BY}: <select name="sk">{S_SORT_KEY}</select> <select name="sd">{S_SORT_DIR}</select>
-		<input class="button2" type="submit" value="{L_GO}" name="sort" />
-	</fieldset>
-	<hr />
-	<!-- IF PAGINATION -->
-	<div class="pagination">
-		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-	</div>
-	<!-- ENDIF -->
-	
+
 	<fieldset class="quick">
+		<b class="small"><a href="#" onclick="marklist('user_attachments', 'mark', true);">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('user_attachments', 'mark', false);">{L_UNMARK_ALL}</a></b><br />
 		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
-		<p class="small"><a href="#" onclick="marklist('user_attachments', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('user_attachments', 'mark', false);">{L_UNMARK_ALL}</a></p>
-		{S_FORM_TOKEN}
 	</fieldset>
+
 	</form>
 
 <!-- ELSEIF S_PERMISSIONS -->
 
-	<div style="float: {S_CONTENT_FLOW_END};">
+	<fieldset class="quick">
 		<a href="{U_USER_PERMISSIONS}">&raquo; {L_SET_USERS_PERMISSIONS}</a><br />
 		<a href="{U_USER_FORUM_PERMISSIONS}">&raquo; {L_SET_USERS_FORUM_PERMISSIONS}</a>
-	</div>
-
-	<form id="select_forum" method="post" action="{U_ACTION}">
-
-		<fieldset class="quick" style="text-align: left;">
-			{L_SELECT_FORUM}: <select name="f">{S_FORUM_OPTIONS}</select> 
-			<input class="button2" type="submit" value="{L_GO}" name="select" />
-			{S_FORM_TOKEN}
-		</fieldset>
-	</form>
-
-	<div class="clearfix">&nbsp;</div>
+	</fieldset>
 
 	<!-- INCLUDE permission_mask.html -->
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_users_avatar.html

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

phpBB/adm/style/acp_users_feedback.html

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

phpBB/adm/style/acp_users_overview.html

@@ -1,144 +0,0 @@
-<form id="user_overview" method="post" action="{U_ACTION}">
-
-<fieldset>
-	<legend>{L_ACP_USER_OVERVIEW}</legend>
-<dl>
-	<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_NAME_CHARS_EXPLAIN}</span></dt>
-	<dd><input type="text" id="user" name="user" value="{USER}" /></dd>
-	<!-- IF U_SWITCH_PERMISSIONS --><dd>[ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]</dd><!-- ENDIF -->
-</dl>
-<!-- IF S_USER_INACTIVE -->
-<dl>
-	<dt><label>{L_USER_IS_INACTIVE}:</label></dt>
-	<dd><strong>{USER_INACTIVE_REASON}</strong></dd>
-</dl>
-<!-- ENDIF -->
-<dl>
-	<dt><label>{L_REGISTERED}:</label></dt>
-	<dd><strong>{USER_REGISTERED}</strong></dd>
-</dl>
-<!-- IF S_USER_IP -->
-<dl>
-	<dt><label>{L_REGISTERED_IP}:</label></dt>
-	<dd><a href="{U_SHOW_IP}">{REGISTERED_IP}</a></dd>
-	<dd>[ <a href="{U_WHOIS}" onclick="popup(this.href, 700, 500, '_whois'); return false;">{L_WHOIS}</a> ]</dd>
-</dl>
-<!-- ENDIF -->
-<dl>
-	<dt><label>{L_LAST_ACTIVE}:</label></dt>
-	<dd><strong>{USER_LASTACTIVE}</strong></dd>
-</dl>
-<dl>
-	<dt><label>{L_POSTS}:</label></dt>
-	<dd><strong>{USER_POSTS}</strong></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

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

phpBB/adm/style/acp_users_profile.html

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

phpBB/adm/style/acp_users_signature.html

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

phpBB/adm/style/acp_words.html

@@ -4,7 +4,7 @@
 
 <!-- IF S_EDIT_WORD -->
 
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
 	<h1>{L_ACP_WORDS}</h1>
 
@@ -16,20 +16,20 @@
 		<legend>{L_EDIT_WORD}</legend>
 		<dl>
 			<dt><label for="word">{L_WORD}</label></dt>
-			<dd><input id="word" type="text" name="word" value="{WORD}" maxlength="255" /></dd>
+			<dd><input id="word" type="text" name="word" value="{WORD}" /></dd>
 		</dl>
 		<dl>
 			<dt><label for="replacement">{L_REPLACEMENT}</label></dt>
-			<dd><input id="replacement" type="text" name="replacement" value="{REPLACEMENT}" maxlength="255" /></dd>
+			<dd><input id="replacement" type="text" name="replacement" value="{REPLACEMENT}" /></dd>
 		</dl>
 		{S_HIDDEN_FIELDS}
+	</fieldset>
 
-	<p class="submit-buttons">
+	<fieldset 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 -->
@@ -40,19 +40,19 @@
 
 	<form id="acp_words" method="post" action="{U_ACTION}">
 
-	<fieldset class="tabulated">
-	<legend>{L_ACP_WORDS}</legend>
-	<p class="quick">
+	<fieldset class="quick">
 		{S_HIDDEN_FIELDS}
 		<input class="button2" name="add" type="submit" value="{L_ADD_WORD}" />
-	</p>
+	</fieldset>
+
+	</form>
 
 	<table cellspacing="1">
 	<thead>
 	<tr>
 		<th>{L_WORD}</th>
 		<th>{L_REPLACEMENT}</th>
-		<th>{L_ACTION}</th>
+		<th colspan="2">{L_ACTION}</th>
 	</tr>
 	</thead>
 	<tbody>
@@ -60,18 +60,13 @@
 		<!-- IF words.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 		<td style="text-align: center;">{words.WORD}</td>
 		<td style="text-align: center;">{words.REPLACEMENT}</td>
-		<td>&nbsp;<a href="{words.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{words.U_DELETE}">{ICON_DELETE}</a>&nbsp;</td>
-	</tr>
-	<!-- BEGINELSE -->
-	<tr class="row3">
-		<td colspan="3">{L_ACP_NO_ITEMS}</td>
+		<td>&nbsp;<a href="{words.U_EDIT}">{L_EDIT}</a>&nbsp;</td>
+		<td>&nbsp;<a href="{words.U_DELETE}">{L_DELETE}</a>&nbsp;</td>
 	</tr>
 	<!-- END words -->
 	</tbody>
 	</table>
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
+
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

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="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" 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>
-	<h1>{MESSAGE_TITLE}</h1>
+	<h2>{MESSAGE_TITLE}</h2>
 	<p>{MESSAGE_TEXT}</p>
 
 	{S_HIDDEN_FIELDS}

phpBB/adm/style/confirm_body_prune.html

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

phpBB/adm/style/custom_profile_fields.html

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

phpBB/adm/style/editor.js

@@ -13,57 +13,80 @@ var clientPC = navigator.userAgent.toLowerCase(); // Get client info
 var clientVer = parseInt(navigator.appVersion); // Get browser version
 
 var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1));
-var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
+var is_nav = ((clientPC.indexOf('mozilla') != -1) && (clientPC.indexOf('spoofer') == -1) && (clientPC.indexOf('compatible') == -1) && (clientPC.indexOf('opera') == -1) && (clientPC.indexOf('webtv') == -1) && (clientPC.indexOf('hotjava') == -1));
 
-var baseHeight;
-window.onload = initInsertions;
+var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
+var is_mac = (clientPC.indexOf('mac') != -1);
 
 /**
 * Shows the help messages in the helpline window
 */
 function helpline(help)
 {
-	document.forms[form_name].helpbox.value = help_line[help];
+	document.forms[form_name].helpbox.value = eval(help + '_help');
 }
 
 /**
-* Fix a bug involving the TextRange object. From
-* http://www.frostjedi.com/terra/scripts/demo/caretBug.html
-*/ 
-function initInsertions() 
-{
-	var doc;
-	if(document.forms[form_name])
-	{
-		doc = document;
-	}
-	else
-	{
-		doc = opener.document;
-	}
-
-	var textarea = doc.forms[form_name].elements[text_name];
-	if (is_ie && typeof(baseHeight) != 'number')
-	{
-		textarea.focus();
-		baseHeight = doc.selection.createRange().duplicate().boundingHeight;
-		// document.body.focus();
-	}
-}
-
-/**
-* bbstyle
+* Replacement for arrayname.length property
 */
-function bbstyle(bbnumber)
+function getarraysize(thearray)
 {
-	if (bbnumber != -1)
+	for (i = 0; i < thearray.length; i++)
 	{
-		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
+		if (typeof thearray[i] == 'undefined' || thearray[i] == '' || thearray[i] == null)
+		{
+			return i;
+		}
+	}
+
+	return thearray.length;
+}
+
+/**
+* Replacement for arrayname.push(value) not implemented in IE until version 5.5
+* Appends element to the array
+*/
+function arraypush(thearray,value)
+{
+	thearray[getarraysize(thearray)] = value;
+}
+
+/**
+* Replacement for arrayname.pop() not implemented in IE until version 5.5
+* Removes and returns the last element of an array
+*/
+function arraypop(thearray)
+{
+	thearraysize = getarraysize(thearray);
+	retval = thearray[thearraysize - 1];
+	delete thearray[thearraysize - 1];
+
+	return retval;
+}
+
+/**
+* Insert emoticon
+*/
+function smiley(text) 
+{
+	text = ' ' + text + ' ';
+
+	if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos)
+	{
+		var caretPos = document.forms[form_name].elements[text_name].caretPos;
+
+		caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? caretPos.text + text + ' ' : caretPos.text + text;
+		document.forms[form_name].elements[text_name].focus();
 	}
 	else
 	{
-		insert_text('[*]');
-		document.forms[form_name].elements[text_name].focus();		
+		var selStart = document.forms[form_name].elements[text_name].selectionStart;
+		var selEnd = document.forms[form_name].elements[text_name].selectionEnd;
+
+		mozWrap(document.forms[form_name].elements[text_name], text, '')
+		document.forms[form_name].elements[text_name].focus();
+		document.forms[form_name].elements[text_name].selectionStart = selStart + text.length;
+		document.forms[form_name].elements[text_name].selectionEnd = selEnd + text.length;
 	}
 }
 
@@ -73,10 +96,7 @@ function bbstyle(bbnumber)
 function bbfontstyle(bbopen, bbclose)
 {
 	theSelection = false;
-		
-	var textarea = document.forms[form_name].elements[text_name];
-
-	textarea.focus();
+	document.forms[form_name].elements[text_name].focus();
 
 	if ((clientVer >= 4) && is_ie && is_win)
 	{
@@ -99,94 +119,60 @@ function bbfontstyle(bbopen, bbclose)
 		theSelection = '';
 		return;
 	}
-	
-	//The new position for the cursor after adding the bbcode
-	var caret_pos = getCaretPosition(textarea).start;
-	var new_pos = caret_pos + bbopen.length;		
+
+	// Close image tag before adding
+	if (imageTag)
+	{
+		insert_text(bbtags[15]);
+
+		// Remove the close image tag from the list
+		lastValue = arraypop(bbcode) - 1;
+
+		// Return button back to normal state
+		document.forms[form_name].addbbcode14.value = 'Img';
+		imageTag = false;
+	}
 
 	// Open tag
 	insert_text(bbopen + bbclose);
 
-	// Center the cursor when we don't have a selection
-	// Gecko and proper browsers
-	if (!isNaN(textarea.selectionStart))
-	{
-		textarea.selectionStart = new_pos;
-		textarea.selectionEnd = new_pos;
-	}	
-	// IE
-	else if (document.selection)
-	{
-		var range = textarea.createTextRange(); 
-		range.move("character", new_pos); 
-		range.select();
-		storeCaret(textarea);
-	}
+	document.forms[form_name].elements[text_name].focus();
 
-	textarea.focus();
+	storeCaret(document.forms[form_name].elements[text_name]);
 	return;
 }
 
 /**
 * Insert text at position
 */
-function insert_text(text, spaces, popup)
+function insert_text(text)
 {
-	var textarea;
-	
-	if (!popup)
+	if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos)
 	{
-		textarea = document.forms[form_name].elements[text_name];
+		var caretPos = document.forms[form_name].elements[text_name].caretPos;
+		caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? caretPos.text + text + ' ' : caretPos.text + text;
+	}
+	else if (document.forms[form_name].elements[text_name].selectionStart)
+	{
+		var selStart = document.forms[form_name].elements[text_name].selectionStart;
+		var selEnd = document.forms[form_name].elements[text_name].selectionEnd;
+
+		mozWrap(document.forms[form_name].elements[text_name], text, '')
+		document.forms[form_name].elements[text_name].selectionStart = selStart + text.length;
+		document.forms[form_name].elements[text_name].selectionEnd = selEnd + text.length;
 	}
 	else
 	{
-		textarea = opener.document.forms[form_name].elements[text_name];
+		document.forms[form_name].elements[text_name].value = document.forms[form_name].elements[text_name].value + text;
 	}
-
-	if (spaces)
-	{
-		text = ' ' + text + ' ';
-	}
-
-	if (!isNaN(textarea.selectionStart))
-	{
-		var sel_start = textarea.selectionStart;
-		var sel_end = textarea.selectionEnd;
-
-		mozWrap(textarea, text, '')
-		textarea.selectionStart = sel_start + text.length;
-		textarea.selectionEnd = sel_end + text.length;
-	}	
-	
-	else if (textarea.createTextRange && textarea.caretPos)
-	{
-		if (baseHeight != textarea.caretPos.boundingHeight) 
-		{
-			textarea.focus();
-			storeCaret(textarea);
-		}
-		var caret_pos = textarea.caretPos;
-		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
-		
-	}
-	else
-	{
-		textarea.value = textarea.value + text;
-	}
-
-	if (!popup)
-	{
-		textarea.focus();
-	}
-
 }
 
 /**
 * Add inline attachment at position
 */
-function attach_inline(index, filename)
+function attach_inline()
 {
-	insert_text('[attachment=' + index + ']' + filename + '[/attachment]');
+	insert_text('[attachment=' + document.forms[form_name].elements['attachments'].value + ']' + document.forms[form_name].elements['attachments'].options[document.forms[form_name].elements['attachments'].selectedIndex].text + '[/attachment]');
 	document.forms[form_name].elements[text_name].focus();
 }
 
@@ -201,11 +187,11 @@ function addquote(post_id, username)
 
 	if (document.all)
 	{
-		divarea = document.all[message_name];
+		eval('divarea = document.all.' + message_name + ';');
 	}
 	else
 	{
-		divarea = document.getElementById(message_name);
+		eval("divarea = document.getElementById('" + message_name + "');");
 	}
 
 	// Get text selection - not only the post content :(
@@ -224,15 +210,7 @@ function addquote(post_id, username)
 
 	if (theSelection == '' || typeof theSelection == 'undefined' || theSelection == null)
 	{
-		if (divarea.innerHTML)
-		{
-			theSelection = divarea.innerHTML.replace(/<br>/ig, '\n');
-			theSelection = theSelection.replace(/<br\/>/ig, '\n');
-			theSelection = theSelection.replace(/&lt\;/ig, '<');
-			theSelection = theSelection.replace(/&gt\;/ig, '>');
-			theSelection = theSelection.replace(/&amp\;/ig, '&');			
-		}
-		else if (document.all)
+		if (document.all)
 		{
 			theSelection = divarea.innerText;
 		}
@@ -254,6 +232,185 @@ function addquote(post_id, username)
 	return;
 }
 
+/**
+* bbstyle
+*/
+function bbstyle(bbnumber)
+{
+	donotinsert = false;
+	theSelection = false;
+	bblast = 0;
+	document.forms[form_name].elements[text_name].focus();
+
+	// Close all open tags & default button names
+	if (bbnumber == -1)
+	{
+		while (bbcode[0])
+		{
+			butnumber = arraypop(bbcode) - 1;
+			document.forms[form_name].elements[text_name].value += bbtags[butnumber + 1];
+			buttext = eval('document.forms[form_name].addbbcode' + butnumber + '.value');
+		
+			if (buttext != '[*]')
+			{
+				eval('document.forms[form_name].addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"');
+			}
+		}
+
+		document.forms[form_name].addbbcode10.value = 'List';
+		bbtags[10] = '[list]';
+
+		document.forms[form_name].addbbcode12.value = 'List=';
+		bbtags[12] = '[list=]';
+		
+		// All tags are closed including image tags :D
+		imageTag = false;
+		document.forms[form_name].elements[text_name].focus();
+
+		return;
+	}
+
+	// [*] doesn't have an end tag
+	noEndTag = (bbtags[bbnumber] == '[*]')
+
+	if ((clientVer >= 4) && is_ie && is_win)
+	{
+		// Get text selection
+		theSelection = document.selection.createRange().text;
+
+		if (theSelection) 
+		{
+			// Add tags around selection
+			document.selection.createRange().text = bbtags[bbnumber] + theSelection + ((!noEndTag) ? bbtags[bbnumber+1] : '');
+			document.forms[form_name].elements[text_name].focus();
+			theSelection = '';
+			return;
+		}
+	}
+	else if (document.forms[form_name].elements[text_name].selectionEnd && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0))
+	{
+		mozWrap(document.forms[form_name].elements[text_name], bbtags[bbnumber], ((!noEndTag) ? bbtags[bbnumber+1] : ''));
+		document.forms[form_name].elements[text_name].focus();
+		theSelection = '';
+		return;
+	}
+
+	// Find last occurance of an open tag the same as the one just clicked
+	for (i = 0; i < bbcode.length; i++)
+	{
+		if (bbcode[i] == bbnumber+1)
+		{
+			bblast = i;
+			donotinsert = true;
+		}
+	}
+
+	if (bbnumber == 10 && bbtags[10] != '[*]')
+	{
+		if (donotinsert)
+		{
+			document.forms[form_name].addbbcode12.value = 'List=';
+			tmp_help = o_help;
+			o_help = e_help;
+			e_help = tmp_help;
+			bbtags[12] = '[list=]';
+		}
+		else
+		{
+			document.forms[form_name].addbbcode12.value = '[*]';
+			tmp_help = o_help;
+			o_help = e_help;
+			e_help = tmp_help;
+			bbtags[12] = '[*]';
+		}
+	}
+
+	if (bbnumber == 12 && bbtags[12] != '[*]')
+	{
+		if (donotinsert)
+		{
+			document.forms[form_name].addbbcode10.value = 'List';
+			tmp_help = l_help;
+			l_help = e_help;
+			e_help = tmp_help;
+			bbtags[10] = '[list]';
+		}
+		else
+		{
+			document.forms[form_name].addbbcode10.value = '[*]';
+			tmp_help = l_help;
+			l_help = e_help;
+			e_help = tmp_help;
+			bbtags[10] = '[*]';
+		}
+	}
+
+	// Close all open tags up to the one just clicked & default button names
+	if (donotinsert)
+	{
+		while (bbcode[bblast])
+		{
+			butnumber = arraypop(bbcode) - 1;
+
+			if (bbtags[butnumber] != '[*]')
+			{
+				insert_text(bbtags[butnumber + 1]);
+			}
+			else
+			{
+				insert_text(bbtags[butnumber]);
+			}
+
+			buttext = eval('document.forms[form_name].addbbcode' + butnumber + '.value');
+
+			if (bbtags[butnumber] != '[*]')
+			{
+				eval('document.forms[form_name].addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"');
+			}
+			imageTag = false;
+		}
+		document.forms[form_name].elements[text_name].focus();
+		return;
+	}
+	else
+	{
+		// Open tags
+
+		// Close image tag before adding another
+		if (imageTag && (bbnumber != 14))
+		{
+			insert_text(bbtags[15]);
+
+			// Remove the close image tag from the list
+			lastValue = arraypop(bbcode) - 1;
+
+			// Return button back to normal state
+			document.forms[form_name].addbbcode14.value = 'Img';
+			imageTag = false;
+		}
+
+		// Open tag
+		insert_text(bbtags[bbnumber]);
+
+		// Check to stop additional tags after an unclosed image tag
+		if (bbnumber == 14 && imageTag == false)
+		{
+			imageTag = 1; 
+		}
+
+		if (bbtags[bbnumber] != '[*]')
+		{
+			arraypush(bbcode, bbnumber + 1);
+			eval('document.forms[form_name].addbbcode'+bbnumber+'.value += "*"');
+		}
+
+		document.forms[form_name].elements[text_name].focus();
+		return;
+	}
+
+	storeCaret(document.forms[form_name].elements[text_name]);
+}
+
 /**
 * From http://www.massless.org/mozedit/
 */
@@ -283,7 +440,7 @@ function mozWrap(txtarea, open, close)
 }
 
 /**
-* Insert at Caret position. Code from
+* Insert at Claret position. Code from
 * http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
 */
 function storeCaret(textEl)
@@ -301,7 +458,6 @@ 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';
@@ -309,7 +465,7 @@ function colorPalette(dir, width, height)
 	numberList[3] = 'BF';
 	numberList[4] = 'FF';
 
-	document.writeln('<table class="type2">');
+	document.write('<table cellspacing="1" cellpadding="0" border="0" class="type2">');
 
 	for (r = 0; r < 5; r++)
 	{
@@ -328,8 +484,8 @@ function colorPalette(dir, width, height)
 			for (b = 0; b < 5; b++)
 			{
 				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
-				document.write('<td bgcolor="#' + color + '">');
-				document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;" onmouseover="helpline(\'s\');"  onmouseout="helpline(\'tip\');"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>');
+				document.write('<td style="line-height: ' + height + 'px; background-color:#' + color + '; width: ' + width + 'px; height: ' + height + 'px;">');
+				document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;" onmouseover="helpline(\'s\');"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>');
 				document.writeln('</td>');
 			}
 
@@ -346,54 +502,3 @@ function colorPalette(dir, width, height)
 	}
 	document.writeln('</table>');
 }
-
-
-/**
-* Caret Position object
-*/
-function caretPosition()
-{
-	var start = null;
-	var end = null;
-}
-
-
-/**
-* Get the caret position in an textarea
-*/
-function getCaretPosition(txtarea)
-{
-	var caretPos = new caretPosition();
-	
-	// simple Gecko/Opera way
-	if (txtarea.selectionStart || txtarea.selectionStart == 0)
-	{
-		caretPos.start = txtarea.selectionStart;
-		caretPos.end = txtarea.selectionEnd;
-	}
-	// dirty and slow IE way
-	else if (document.selection)
-	{
-		// get current selection
-		var range = document.selection.createRange();
-
-		// a new selection of the whole textarea
-		var range_all = document.body.createTextRange();
-		range_all.moveToElementText(txtarea);
-		
-		// calculate selection start point by moving beginning of range_all to beginning of range
-		var sel_start;
-		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++)
-		{
-			range_all.moveStart('character', 1);
-		}
-	
-		txtarea.sel_start = sel_start;
-	
-		// we ignore the end value for IE, this is already dirty enough and we don't need it
-		caretPos.start = txtarea.sel_start;
-		caretPos.end = txtarea.sel_start;			
-	}
-
-	return caretPos;
-}

phpBB/adm/style/install_convert.html

@@ -1,134 +1,100 @@
 <!-- INCLUDE install_header.html -->
 
-<!-- IF S_NOT_INSTALLED -->
+<form id="install_convert" method="post" action="{U_ACTION}">
 
-	<h1>{TITLE}</h1>
+<h2>{TITLE}</h2>
+<p>{BODY}</p>
 
-	<p>{BODY}</p>
-
-<!-- ELSE -->
-
-	<form id="install_convert" method="post" action="{U_ACTION}">
-
-	<h1>{TITLE}</h1>
-
-	<p>{BODY}</p>
-
-	<!-- IF S_ERROR_BOX -->
-	<div class="errorbox">
-		<h3>{ERROR_TITLE}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
-	<!-- ENDIF -->
-
-	<!-- IF S_LIST -->
-		<table cellspacing="1">
-			<caption>{L_AVAILABLE_CONVERTORS}</caption>
-			<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
-		<thead>
+<!-- IF S_LIST -->
+	<table cellspacing="1">
+		<caption>{L_AVAILABLE_CONVERTORS}</caption>
+		<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
+	<thead>
+	<tr>
+		<th>{L_SOFTWARE}</th>
+		<th>{L_VERSION}</th>
+		<th>{L_AUTHOR}</th>
+		<th>{L_OPTIONS}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- IF .convertors -->
+		<!-- BEGIN convertors -->
 		<tr>
-			<th>{L_SOFTWARE}</th>
-			<th>{L_VERSION}</th>
-			<th>{L_AUTHOR}</th>
-			<th>{L_OPTIONS}</th>
+			<td>{convertors.SOFTWARE}</td>
+			<td>{convertors.VERSION}</td>
+			<td>{convertors.AUTHOR}</td>
+			<td><a href="{convertors.U_CONVERT}">{L_CONVERT}</a></td>
+		</tr>
+		<!-- END convertors -->
+	<!-- ELSE -->
+		<tr>
+			<td>{L_NO_CONVERTORS}</td>
+			<td>-</td>
+			<td>-</td>
+			<td>-</td>
 		</tr>
-		</thead>
-		<tbody>
-		<!-- IF .convertors -->
-			<!-- BEGIN convertors -->
-			<tr>
-				<td>{convertors.SOFTWARE}</td>
-				<td>{convertors.VERSION}</td>
-				<td>{convertors.AUTHOR}</td>
-				<td><a href="{convertors.U_CONVERT}">{L_CONVERT}</a></td>
-			</tr>
-			<!-- END convertors -->
-		<!-- ELSE -->
-			<tr>
-				<td>{L_NO_CONVERTORS}</td>
-				<td>-</td>
-				<td>-</td>
-				<td>-</td>
-			</tr>
-		<!-- ENDIF -->
-		</tbody>
-		</table>
 	<!-- ENDIF -->
-
-	<!-- IF S_CONTINUE -->
-		</form>
-
-		<fieldset class="submit-buttons">
-			<form method="post" action="{U_NEW_ACTION}">
-				<input class="button1" type="submit" name="submit_new" value="{L_NEW}" />
-			</form>
-			<br />
-			<form method="post" action="{U_CONTINUE_ACTION}">
-				<input class="button1" type="submit" name="submit_cont" value="{L_CONTINUE}" />
-			</form>
-		</fieldset>
-
-		<form method="post" action="{U_ACTION}">
-	<!-- ENDIF -->
-
-	<!-- IF .checks -->
-		<fieldset>
-
-		<!-- BEGIN checks -->
-			<!-- IF checks.S_LEGEND -->
-				<!-- IF not checks.S_FIRST_ROW -->
-				</fieldset>
-
-				<fieldset>
-				<!-- ENDIF -->
-					<legend>{checks.LEGEND}</legend>
-					<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
-			<!-- ELSE -->
-
-				<dl>
-					<dt><label>{checks.TITLE}:</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-					<dd>{checks.RESULT}</dd>
-				</dl>
-			<!-- ENDIF -->
-		<!-- END checks -->
-
-		</fieldset>
-	<!-- ENDIF -->
-
-	<!-- IF .options -->
-		<fieldset>
-
-		<!-- BEGIN options -->
-			<!-- IF options.S_LEGEND -->
-				<!-- IF not options.S_FIRST_ROW -->
-					</fieldset>
-
-					<fieldset>
-				<!-- ENDIF -->
-					<legend>{options.LEGEND}</legend>
-			<!-- ELSE -->
-
-				<dl>
-					<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-					<dd>{options.CONTENT}</dd>
-				</dl>
-
-			<!-- ENDIF -->
-		<!-- END options -->
-
-		</fieldset>
-	<!-- ENDIF -->
-
-	<!-- IF L_SUBMIT -->
-		<!-- IF L_MESSAGE --><p>{L_MESSAGE}</p><!-- ENDIF -->
-
-		<fieldset class="submit-buttons">
-			{S_HIDDEN}
-			<!-- IF L_SUBMIT --><input class="button1<!-- IF S_REFRESH --> disabled<!-- ENDIF -->" type="submit" id="submit" <!-- IF S_REFRESH -->disabled="disabled" <!-- ELSE --> onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" <!-- ENDIF -->name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
-		</fieldset>
-	<!-- ENDIF -->
-
-	</form>
+	</tbody>
+	</table>
 <!-- ENDIF -->
 
+<!-- IF .checks -->
+	<fieldset>
+
+	<!-- BEGIN checks -->
+		<!-- IF checks.S_LEGEND -->
+			<!-- IF not checks.S_FIRST_ROW -->
+			</fieldset>
+
+			<fieldset>
+			<!-- ENDIF -->
+				<legend>{checks.LEGEND}</legend>
+				<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
+		<!-- ELSE -->
+
+			<dl>
+				<dt>{checks.TITLE}:</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+				<dd>{checks.RESULT}</dd>
+			</dl>
+		<!-- ENDIF -->
+	<!-- END checks -->
+
+	</fieldset>
+<!-- ENDIF -->
+
+<!-- IF .options -->
+	<fieldset>
+
+	<!-- BEGIN options -->
+		<!-- IF options.S_LEGEND -->
+			<!-- IF not options.S_FIRST_ROW -->
+				</fieldset>
+		
+				<fieldset>
+			<!-- ENDIF -->
+				<legend>{options.LEGEND}</legend>
+		<!-- ELSE -->
+
+			<dl>
+				<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+				<dd>{options.CONTENT}</dd>
+			</dl>
+
+		<!-- ENDIF -->
+	<!-- END options -->
+
+	</fieldset>
+<!-- ENDIF -->
+
+<!-- IF L_SUBMIT -->
+	<fieldset class="submit-buttons">
+		<!-- IF L_MESSAGE --><p>{L_MESSAGE}</p><!-- ENDIF -->
+		{S_HIDDEN}
+		<!-- IF L_SUBMIT --><input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
+	</fieldset>
+<!-- ENDIF -->
+
+</form>
+
 <!-- INCLUDE install_footer.html -->

phpBB/adm/style/install_footer.html

@@ -3,7 +3,6 @@
 				</div>
 			<span class="corners-bottom"><span></span></span>
 		</div>
-		</div>
 	</div>
 	
 	<!--
@@ -18,7 +17,7 @@
 	// -->
 	
 	<div id="page-footer">
-		Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
+		Powered by phpBB {VERSION} &copy; 2006 <a href="http://www.phpbb.com/">phpBB Group</a>
 	</div>
 </div>
 

phpBB/adm/style/install_header.html

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

phpBB/adm/style/install_install.html

@@ -1,8 +1,8 @@
 <!-- INCLUDE install_header.html -->
 
-<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
+<form id="install_install" method="post" action="{U_ACTION}">
 
-<!-- IF TITLE --><h1>{TITLE}</h1><!-- ENDIF -->
+<!-- IF TITLE --><h2>{TITLE}</h2><!-- ENDIF -->
 <!-- IF BODY --><p>{BODY}</p><!-- ENDIF -->
 
 <!-- IF .checks -->
@@ -54,11 +54,12 @@
 <!-- ENDIF -->
 
 <!-- IF S_SHOW_DOWNLOAD -->
-	<h1>{L_DL_CONFIG}</h1>
-	<p>{L_DL_CONFIG_EXPLAIN}</p>
+	<fieldset>
+		<legend>{L_DL_CONFIG}</legend>
+		<p>{L_DL_CONFIG_EXPLAIN}</p>
+	</fieldset>
 
 	<fieldset class="submit-buttons">
-		<legend>{L_DL_CONFIG}</legend>
 		{S_HIDDEN}
 		<input class="button1" type="submit" id="dlconfig" name="dlconfig" value="{L_DL_DOWNLOAD}" />&nbsp;<input class="button1" type="submit" id="dldone" name="dldone" value="{L_DL_DONE}" />
 	</fieldset>
@@ -66,12 +67,11 @@
 
 <!-- IF L_SUBMIT -->
 	<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';" name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
+		<!-- IF L_SUBMIT --><input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
 	</fieldset>
 <!-- ENDIF -->
 
 </form>
 
-<!-- INCLUDE install_footer.html -->
+<!-- INCLUDE install_footer.html -->

phpBB/adm/style/install_main.html

@@ -1,6 +1,6 @@
 <!-- INCLUDE install_header.html -->
 
-	<h1>{TITLE}</h1>
+	<h2>{TITLE}</h2>
 	<p>{BODY}</p>
 
 <!-- INCLUDE install_footer.html -->

phpBB/adm/style/install_update.html

@@ -1,56 +1,18 @@
 <!-- INCLUDE install_header.html -->
 
-<script type="text/javascript">
-// <![CDATA[
-	function popup(url, width, height, name)
-	{
-		if (!name)
-		{
-			name = '_popup';
-		}
-
-		window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
-		return false;
-	}
-
-	function diff_popup(url)
-	{
-		popup(url, 950, 600, '_diff');
-		return false;
-	}
-// ]]>
-</script>
-
 <!-- IF S_ERROR -->
-	<div class="errorbox" style="margin-top: 0;">
-		<h3>{L_NOTICE}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
+	<h1>{L_NOTICE}</h1>
+	<p style="color: red;">{ERROR_MSG}</p>
 <!-- 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_STEP}" />
+		<input class="button1" type="submit" name="submit" value="{L_NEXT}" />
 	</fieldset>
 
 	</form>
@@ -63,7 +25,7 @@
 	<p>{L_UPDATE_SUCCESS_EXPLAIN}</p>
 
 	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
+		<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES_AGAIN}" />
 	</fieldset>
 
 	</form>
@@ -90,31 +52,23 @@
 		<legend></legend>
 	<dl>
 		<dt><label>{L_CURRENT_VERSION}</label></dt>
-		<dd><strong>{CURRENT_VERSION}</strong></dd>
+		<dd><b>{CURRENT_VERSION}</b></dd>
 	</dl>
 	<dl>
 		<dt><label>{L_LATEST_VERSION}</label></dt>
-		<dd><strong>{LATEST_VERSION}</strong></dd>
+		<dd><b>{LATEST_VERSION}</b></dd>
 	</dl>
-	<!-- IF PACKAGE_VERSION and not S_UP_TO_DATE -->
-	<dl>
-		<dt><label>{L_PACKAGE_UPDATES_TO}</label></dt>
-		<dd><strong>{PACKAGE_VERSION}</strong></dd>
-	</dl>
-	<!-- ENDIF -->
 	</fieldset>
 
 	<!-- IF not S_UP_TO_DATE -->
-
-		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
+		<form id="install_update" method="post" action="{U_ACTION}">
 
 		<fieldset class="submit-buttons">
-			<p>{L_UPDATE_DATABASE_EXPLAIN}</p>
-			<input class="button1" type="submit" name="db_update" value="{L_UPDATE_DATABASE}" />
+			<p>{L_CHECK_FILES_EXPLAIN}</p>
+			<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
 		</fieldset>
 
 		</form>
-
 	<!-- ELSE -->
 		<form id="install_update" method="post" action="{U_ACTION}">
 
@@ -126,170 +80,93 @@
 		</form>
 	<!-- ENDIF -->
 
-<!-- ELSEIF S_DB_UPDATE -->
-
-	<!-- IF not S_DB_UPDATE_FINISHED -->
-
-		<h1>{L_PERFORM_DATABASE_UPDATE}</h1>
-
-		<p>
-			{L_PERFORM_DATABASE_UPDATE_EXPLAIN}<br />
-		</p>
-
-		<br /><br />
-
-		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
-
-		<fieldset class="submit-buttons">
-			<a href="{U_DB_UPDATE}" class="button1">{L_RUN_DATABASE_SCRIPT}</a>
-
-			<!-- input class="button1" type="submit" name="db_update" value="{L_CHECK_UPDATE_DATABASE}" / -->
-		</fieldset>
-
-		</form>
-
-	<!-- ELSE -->
-
-		<h1>{L_UPDATE_DB_SUCCESS}</h1>
-
-		<br /><br />
-
-		<form id="install_update" method="post" action="{U_ACTION}">
-
-		<fieldset class="submit-buttons">
-			<p>{L_CHECK_FILES_EXPLAIN}</p>
-			<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
-		</fieldset>
-
-		</form>
-
-	<!-- ENDIF -->
-
 <!-- ELSEIF S_FILE_CHECK -->
 
-	<!-- IF S_ALL_UP_TO_DATE -->
+	<h1>{L_COLLECTED_INFORMATIONS}</h1>
 
-		<div class="successbox">
-			<h3>{L_UPDATE_SUCCESS}</h3>
-			<p>{L_ALL_FILES_UP_TO_DATE}</p>
+	<p>{L_COLLECTED_INFORMATIONS_EXPLAIN}</p>
+
+	<!-- IF S_NO_UPDATE_FILES -->
+		<div class="errorbox">
+			<h3>{L_NO_UPDATE_FILES}</h3>
+
+			<p>{L_NO_UPDATE_FILES_EXPLAIN}</p><br />
+
+			<strong>{NO_UPDATE_FILES}</strong>
+			
 		</div>
+	<!-- ENDIF -->
+
+	<form id="install_update" method="post" action="{U_UPDATE_ACTION}">
+
+	<!-- IF .files -->
+		<!-- BEGIN files -->
+			<!-- IF files.S_STATUS -->
+				<!-- IF not files.S_FIRST_ROW -->
+					</fieldset>
+				<!-- ENDIF -->
+
+				<h2>{files.TITLE}</h2>
+
+				<p>{files.EXPLAIN}</p>
+
+				<!--table cellspacing="1">
+					<col class="row1" /><col class="row2" /><col class="row2" />
+				<tbody -->
+				<fieldset>
+					<legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
+			<!-- ELSE -->
+				<dl>
+					<!-- IF files.STATUS eq 'up_to_date' -->
+						<dd class="full" style="text-align: left;"><strong>{files.FILENAME}</strong></dd>
+					<!-- ELSE -->
+						<dt>
+							<strong>{files.FILENAME}</strong>
+							<!-- IF files.S_CUSTOM -->
+							<br /><span><em>{L_FILE_USED}: </em>{files.CUSTOM_ORIGINAL}</span>
+							<!-- ENDIF -->
+							<!-- IF files.NUM_CONFLICTS -->
+							<br /><span>{L_NUM_CONFLICTS}: {files.NUM_CONFLICTS}</span>
+							<!-- ENDIF -->
+						</dt>
+						<dd>[ <a href="{files.U_SHOW_DIFF}" onclick="popup({files.UA_SHOW_DIFF}, 700, 500);">{files.L_SHOW_DIFF}</a> ]</dd>
+						<!-- IF files.S_CUSTOM -->
+							<dd><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" />&nbsp; {L_DO_NOT_UPDATE}</dd>
+						<!-- ENDIF -->
+						<!-- IF files.STATUS eq 'conflict' -->
+							<dd><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="1" checked="checked" />&nbsp; {L_MERGE_NEW_FILE_OPTION}<br /><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="2" />&nbsp; {L_MERGE_MOD_FILE_OPTION}</dd>
+						<!-- ENDIF -->
+					<!-- ENDIF -->
+				</dl>
+			<!-- ENDIF -->
+		<!-- END files -->
+
+		</fieldset>
+	<!-- ENDIF -->
+
+	<br />
+
+	<fieldset class="quick">
+		<input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
+	</fieldset>
+
+	<br />
+
+	<!-- IF S_ALL_UP_TO_DATE -->
+		</form>
+
+		<!-- IF S_VERSION_UP_TO_DATE -->
+			<p>{L_NO_DATABASE_UPDATE_NEEDED}</p>
+		<!-- ELSE -->
+			<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
+
+			<fieldset class="submit-buttons">
+				<p>{L_ALL_FILES_UP_TO_DATE}</p>
+				<input class="button1" type="submit" name="db_update" value="{L_UPDATE_DATABASE}" />
+			</fieldset>
+		<!-- ENDIF -->
 
 	<!-- ELSE -->
-		<h1>{L_COLLECTED_INFORMATION}</h1>
-
-		<p>{L_COLLECTED_INFORMATION_EXPLAIN}</p>
-
-		<!-- IF S_NO_UPDATE_FILES -->
-			<div class="errorbox">
-				<h3>{L_NO_UPDATE_FILES}</h3>
-
-				<p>{L_NO_UPDATE_FILES_EXPLAIN}</p><br />
-
-				<strong>{NO_UPDATE_FILES}</strong>
-				
-			</div>
-		<!-- ENDIF -->
-
-		<form id="install_update" method="post" action="{U_UPDATE_ACTION}">
-
-		<!-- IF .files -->
-			<!-- BEGIN files -->
-				<!-- IF files.S_STATUS -->
-					<!-- IF not files.S_FIRST_ROW -->
-						</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 -->
-					<dl>
-						<!-- IF files.STATUS eq 'up_to_date' -->
-							<dd class="full" style="text-align: left;"><strong>{files.FILENAME}</strong></dd>
-						<!-- ELSE -->
-							<dt style="width: 60%;">
-								<strong><!-- IF files.DIR_PART -->{files.DIR_PART}<br /><!-- ENDIF -->{files.FILE_PART}</strong>
-								<!-- IF files.S_CUSTOM -->
-								<br /><span><em>{L_FILE_USED}: </em>{files.CUSTOM_ORIGINAL}</span>
-								<!-- ENDIF -->
-								<!-- IF files.NUM_CONFLICTS -->
-								<br /><span>{L_NUM_CONFLICTS}: {files.NUM_CONFLICTS}</span>
-								<!-- ENDIF -->
-							</dt>
-							<dd style="margin-left: 60%;"><!-- IF files.STATUS eq 'modified' -->&nbsp;<!-- ELSE --><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --><!-- ENDIF --></dd>
-							<!-- IF files.S_CUSTOM -->
-								<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-							<!-- ENDIF -->
-							
-							<!-- IF files.STATUS eq 'modified' -->
-							</dl>
-							<dl>
-								<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt>
-								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
-							</dl>
-							<dl>
-								<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
-							</dl>
-							<dl>
-								<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
-								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
-							</dl>
-							<!-- IF not files.S_LAST_ROW -->
-							</fieldset>
-
-							<fieldset>
-								<legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
-							<!-- ENDIF -->
-
-							<!-- ENDIF -->
-
-							<!-- IF files.STATUS eq 'conflict' -->
-							</dl>
-							<dl>
-								<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-								<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
-							</dl>
-								<!-- IF not files.S_BINARY -->
-									<dl>
-										<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="3" /> {L_MERGE_NEW_FILE_OPTION}</label></dt>
-										<dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
-									</dl>
-									<dl>
-										<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt>
-										<dd style="margin-left: 60%;">[<a href="{files.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
-									</dl>
-								<!-- ENDIF -->
-							<!-- IF not files.S_LAST_ROW -->
-							</fieldset>
-
-							<fieldset>
-								<legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
-							<!-- ENDIF -->
-
-							<!-- ENDIF -->
-						<!-- ENDIF -->
-					<!-- IF files.STATUS neq 'conflict' and files.STATUS neq 'modified' --></dl><!-- ENDIF -->
-				<!-- ENDIF -->
-			<!-- END files -->
-
-			</fieldset></div>
-		<!-- ENDIF -->
-
-		<br />
-
-		<fieldset class="quick">
-			<input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
-		</fieldset>
-
-		<br />
-
 		<h1>{L_UPDATE_METHOD}</h1>
 
 		<p>{L_UPDATE_METHOD_EXPLAIN}</p>
@@ -298,34 +175,15 @@
 			<input class="button1" type="submit" name="ftp_upload" value="{L_FTP_UPDATE_METHOD}" />&nbsp; &nbsp;<input class="button1" type="submit" name="download" value="{L_DOWNLOAD_UPDATE_METHOD}" />
 		</fieldset>
 
-		</form>
-
 	<!-- ENDIF -->
 
-<!-- ELSEIF S_DOWNLOAD_FILES -->
-
-	<h1>{L_DOWNLOAD_UPDATE_METHOD}</h1>
-
-	<p>{L_DOWNLOAD_UPDATE_METHOD_EXPLAIN}</p>
-
-	<form id="install_update" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_SELECT_DOWNLOAD_FORMAT}</legend>
-	<dl>
-		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
-		<dd>{RADIO_BUTTONS}</dd>
-	</dl>
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}
-		<input type="submit" class="button2" value="{L_CHECK_FILES_AGAIN}" name="check_again" />&nbsp; &nbsp;<input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" />
-	</fieldset>
-
 	</form>
 
-	<br /><br />
+<!-- ELSEIF S_DOWNLOAD_FILES -->
+
+	<h1>{L_SELECT_DOWNLOAD_FORMAT}</h1>
+
+	<p>{L_DOWNLOAD_UPDATE_METHOD_EXPLAIN}</p>
 
 	<p>{L_MAPPING_FILE_STRUCTURE}</p>
 
@@ -349,6 +207,23 @@
 	</tbody>
 	</table>
 
+	<form id="install_update" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_DOWNLOAD_AS}</legend>
+	<dl>
+		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
+		<dd>{RADIO_BUTTONS}</dd>
+	</dl>
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		{S_HIDDEN_FIELDS}
+		<input type="submit" class="button2" value="{L_CHECK_FILES_AGAIN}" name="check_again" />&nbsp; &nbsp;<input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" />
+	</fieldset>
+
+	</form>
+
 <!-- ELSEIF S_FTP_UPLOAD -->
 
 	<h1>{L_SELECT_FTP_SETTINGS}</h1>
@@ -369,12 +244,12 @@
 		<legend>{L_FTP_SETTINGS}</legend>
 	<dl>
 		<dt><label>{L_UPLOAD_METHOD}:</label></dt>
-		<dd><strong>{UPLOAD_METHOD}</strong></dd>
+		<dd><b>{UPLOAD_METHOD}</b></dd>
 	</dl>
 	<!-- BEGIN data -->
 	<dl>
 		<dt><label for="{data.DATA}">{data.NAME}:</label><br /><span>{data.EXPLAIN}</span></dt>
-		<dd><input type="<!-- IF data.DATA == 'password' -->password<!-- ELSE -->text<!-- ENDIF -->" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" /></dd>
+		<dd><input type="text" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" /></dd>
 	</dl>
 	<!-- END data -->
 	</fieldset>
@@ -388,6 +263,16 @@
 
 	</form>
 
+<!-- ELSEIF S_DB_UPDATE -->
+
+	<h1>{L_PERFORM_DATABASE_UPDATE}</h1>
+
+	<p>
+		{L_PERFORM_DATABASE_UPDATE_EXPLAIN}<br />
+		<br />
+		<a href="{U_DB_UPDATE}"><strong>&raquo; {L_RUN_DATABASE_SCRIPT} &laquo;</strong></a>
+	</p>
+
 <!-- ENDIF -->
 
 <!-- INCLUDE install_footer.html -->

phpBB/adm/style/install_update_diff.html

@@ -11,59 +11,24 @@
 
 <link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
-<script type="text/javascript">
-// <![CDATA[
-function resize_panel()
-{
-	var block = document.getElementById('codepanel');	
-	var height;
-	
-	if (window.innerHeight)
-	{
-		height = window.innerHeight - 150;
-		block.style.height = height + 'px';
-	}
-	else
-	{
-		//whatever IE needs to do this
-	}	
-}
-// ]]>
-</script>
-
 <style type="text/css">
-/* <![CDATA[ */
+<!--
 
 #main {
-	font-size: 1em;
+	font-size: 1.25em;
 	line-height: 0.7em;
 	margin: 0;
 	padding: 0;
 	width: 99%;
 }
 
-#diff_content {
-	padding: 30px 10px 10px;
-}
-
-<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
-div#codepanel {
-	overflow: auto;
-	width: 100%;
-	height: 350px;
-	display: inline-block;
-}
-<!-- ELSE -->
-div#codepanel {	
-	background-color: #eee;
-}
-<!-- ENDIF -->
-
 <!-- IF not S_DIFF_NEW_FILE -->
+
 /**
 * Unified Diff
 */
 .file {
+	border: 1px solid #eee;
 	line-height: .7em;
 }
 
@@ -104,11 +69,8 @@ div#codepanel {
 * Column Diff
 */
 table.hrdiff {
+	width: 99%;
 	margin: 0 0 8px 5px;
-	width: 100%;
-	overflow: hidden;
-	border-bottom: 1px solid #999;
-	table-layout: fixed;
 }
 
 table.hrdiff th {
@@ -127,30 +89,9 @@ table.hrdiff thead th {
 	padding: 2px;
 }
 
-table.hrdiff tr:first-child th {
-	border-top: none;
-}
-
 table.hrdiff tbody th {
 	padding: 2em 1px 1px 1px;
 	font-size: 80%;
-	border-top: 1px solid #999;
-}
-
-table.hrdiff tbody td.old {
-	border-left: 1px solid #999;
-	border-right: 1px solid #999;	
-}
-table.hrdiff tbody td.new {
-	border-right: 1px solid #999;	
-}
-
-table.hrdiff td pre {
-	overflow: auto;
-	display: block;
-	width: 100%;
-	overflow: auto;
-	display: block;
 }
 
 table.hrdiff .unmodified {
@@ -198,56 +139,43 @@ table.hrdiff caption span {
 
 <!-- ENDIF -->
 
-/* ]]> */
+//-->
 </style>
 
 </head>
 
-
-<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
-<body onresize="resize_panel();" onload="resize_panel();">
-<!-- ELSE -->
 <body>
-<!-- ENDIF -->
 
 <div id="wrap">
 	<div id="page-header">
 <!-- IF S_DIFF_NEW_FILE -->
-
 		<h1>{L_VIEWING_FILE_CONTENTS}</h1>
 <!-- ELSE -->
 		<h1>{L_VIEWING_FILE_DIFF}</h1>
 <!-- ENDIF -->
 <!-- IF not S_DIFF_NEW_FILE -->
-		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
+		<br />
 		<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">
+		<div class="panel">
 			<span class="corners-top"><span></span></span>
-				<div id="diff_content">
+				<div id="content">
 					<div id="main">
-
 <!-- IF S_DIFF_CONFLICT_FILE -->
-		<div style="float: {S_CONTENT_FLOW_END};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
+		<div style="float: right;"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
 <!-- ENDIF -->
-						{DIFF_CONTENT}
+					{DIFF_CONTENT}
 					</div>
 				</div>
 			<span class="corners-bottom"><span></span></span>
 		</div>
-		</div>
 	</div>
 	
-
 <!-- INCLUDE simple_footer.html -->

phpBB/adm/style/overall_footer.html

@@ -3,13 +3,12 @@
 				</div>
 			<span class="corners-bottom"><span></span></span>
 		</div>
-		</div>
 	</div>
 	
 	<!--
 		We request you retain the full copyright notice below including the link to www.phpbb.com.
 		This not only gives respect to the large amount of time given freely by the developers
-		but also helps build interest, traffic and use of phpBB. If you (honestly) cannot retain
+		but also helps build interest, traffic and use of phpBB2. 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.
@@ -19,8 +18,8 @@
 	
 	<div id="page-footer">
 		<!-- IF S_COPYRIGHT_HTML -->
-			Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
-			<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
+			Powered by phpBB {VERSION} &copy; 2006 <a href="http://www.phpbb.com/">phpBB Group</a>
+			{L_TRANSLATION_INFO}
 		<!-- ENDIF -->
 
 		<!-- IF DEBUG_OUTPUT -->

phpBB/adm/style/overall_header.html

@@ -12,14 +12,11 @@
 <link href="style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 
 <script type="text/javascript">
-// <![CDATA[
+<!--
 var jump_page = '{LA_JUMP_PAGE}:';
 var on_page = '{ON_PAGE}';
 var per_page = '{PER_PAGE}';
-var base_url = '{A_BASE_URL}';
-
-var menu_state = 'shown';
-
+var base_url = '{BASE_URL}';
 
 /**
 * Jump to page
@@ -82,89 +79,34 @@ function marklist(id, name, state)
 }
 
 /**
-* Find a member
+* Open trace popup
 */
-function find_username(url)
+function trace(link)
 {
-	popup(url, 760, 570, '_usersearch');
+	window.open(link, '_trace', 'height=515, resizable=yes, scrollbars=yes, width=680');
 	return false;
 }
 
-/**
-* Window popup
-*/
-function popup(url, width, height, name)
-{
-	if (!name)
+<!-- IF S_INCLUDE_SWATCH -->
+	/**
+	* Color swatch
+	*/
+	function swatch()
 	{
-		name = '_popup';
+		window.open('{UA_SWATCH}', '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636');
+		return false;
 	}
+<!-- ENDIF -->
 
-	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}">
-
+<body>
 <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">
@@ -175,17 +117,12 @@ function switch_menu()
 			<!-- END t_block1 -->
 			</ul>
 		</div>
-
-		<div id="acp">
+	
 		<div class="panel">
 			<span class="corners-top"><span></span></span>
 				<div id="content">
-					<!-- IF not S_USER_NOTICE --> 
-					<div id="toggle">
-						<a id="toggle-handle" accesskey="m" title="{L_MENU_TOGGLE}" onclick="switch_menu(); return false;" href="#"></a></div>
-					<!-- ENDIF -->
 					<div id="menu">
-						<p>{L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [&nbsp;<a href="{U_LOGOUT}">{L_LOGOUT}</a>&nbsp;][&nbsp;<a href="{U_ADM_LOGOUT}">{L_ADM_LOGOUT}</a>&nbsp;]</p>
+						<p>{L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [&nbsp;<a href="{U_LOGOUT}">{L_LOGOUT}</a>&nbsp;]</p>
 						<ul>
 						<!-- BEGIN l_block1 -->
 							<!-- IF l_block1.S_SELECTED -->

phpBB/adm/style/permission_mask.html

@@ -1,139 +1,255 @@
 
 <script type="text/javascript">
-// <![CDATA[
+<!--
 	var active_pmask = '0';
 	var active_fmask = '0';
 	var active_cat = '0';
 
-	var id = '000';
-
 	var role_options = new Array();
 
 	<!-- IF S_ROLE_JS_ARRAY -->
 		{S_ROLE_JS_ARRAY}
 	<!-- ENDIF -->
-// ]]>
+
+	/**
+	* Show/hide option panels
+	* value = suffix for ID to show
+	*/
+	function swap_options(pmask, fmask, cat)
+	{
+		id = pmask + fmask + cat;
+		active_option = active_pmask + active_fmask + active_cat;
+
+		if (id == active_option)
+		{
+			return;
+		}
+		
+		// Hide active options
+		dE('options' + active_option, -1);
+		dE('head' + active_pmask + active_fmask, 1, 'inline');
+		dE('apply' + active_pmask + active_fmask, -1);
+
+		// Display container
+		dE('options' + id, 1);
+		dE('head' + pmask + fmask, -1, 'inline');
+		dE('apply' + pmask + fmask, 1);
+
+		active_pmask = pmask;
+		active_fmask = fmask;
+		active_cat = cat;
+	}
+
+	/**
+	* Mark all radio buttons in one panel
+	* id = table ID container, s = status ['y'/'u'/'n']
+	*/
+	function mark_options(id, s)
+	{
+		var t = document.getElementById(id);
+
+		if (!t)
+		{
+			return;
+		}
+
+		var rb = t.getElementsByTagName('input');
+
+		for (var r = 0; r < rb.length; r++ )
+		{
+			if (rb[r].id.substr(rb[r].id.length-1) == s)
+			{
+				rb[r].checked = true;
+			}
+		}
+	}
+
+	/**
+	* Mark one radio button in one panel
+	* id = table ID container, field_name = the auth option, s = status ['y'/'u'/'n']
+	*/
+	function mark_one_option(id, field_name, s)
+	{
+		var t = document.getElementById(id);
+
+		if (!t)
+		{
+			return;
+		}
+
+		var rb = t.getElementsByTagName('input');
+
+		for (var r = 0; r < rb.length; r++ )
+		{
+			if (rb[r].id.substr(rb[r].id.length-field_name.length-3, field_name.length) == field_name && rb[r].id.substr(rb[r].id.length-1) == s)
+			{
+				rb[r].checked = true;
+			}
+		}
+	}
+
+	/**
+	* Reset role dropdown field to Select role... if an option gets changed
+	*/
+	function reset_role(id)
+	{
+		var t = document.getElementById(id);
+
+		if (!t)
+		{
+			return;
+		}
+
+		t.options[0].selected = true;
+	}
+
+	/**
+	* Load role and set options accordingly
+	*/
+	function set_role_settings(role_id, target_id)
+	{
+		settings = role_options[role_id];
+
+		if (!settings)
+		{
+			return;
+		}
+
+		// Mark all options to no (unset) first...
+		mark_options(target_id, 'u');
+
+		for (var r in settings)
+		{
+			mark_one_option(target_id, r, (settings[r] == 1) ? 'y' : 'n');
+		}
+	}
+
+//-->
 </script>
-<script type="text/javascript" src="style/permissions.js"></script>
 
 <!-- BEGIN p_mask -->
-<div class="clearfix"></div>
-<h3>{p_mask.NAME}<!-- IF p_mask.S_LOCAL --> <span class="small"> [{p_mask.L_ACL_TYPE}]</span><!-- ENDIF --></h3>
 
-<!-- BEGIN f_mask -->
 <div class="clearfix"></div>
-<fieldset class="permissions" id="perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
-	<legend id="legend{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
-		<!-- IF not p_mask.S_VIEW -->
-			<input type="checkbox" style="display: none;" class="permissions-checkbox" name="inherit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" id="checkbox{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" value="1" onclick="toggle_opacity('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')" /> 
-		<!-- ELSE -->
-		<!-- ENDIF -->
-		<!-- IF p_mask.f_mask.PADDING --><span class="padding">{p_mask.f_mask.PADDING}{p_mask.f_mask.PADDING}</span><!-- ENDIF -->{p_mask.f_mask.NAME}
-	</legend>
-	<!-- IF not p_mask.S_VIEW -->
-		<div class="permissions-switch">
-			<div class="permissions-reset">
-				<a href="#" onclick="mark_options('perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}', 'y'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_ALL_YES}</a> &middot; <a href="#" onclick="mark_options('perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}', 'u'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_ALL_NO}</a> &middot; <a href="#" onclick="mark_options('perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}', 'n'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_ALL_NEVER}</a>
-			</div>
-			<a href="#" onclick="swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '0', true); return false;">{L_ADVANCED_PERMISSIONS}</a><!-- IF not p_mask.S_VIEW and p_mask.f_mask.S_CUSTOM --> *<!-- ENDIF -->
-		</div>
-		<dl class="permissions-simple">
-			<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}:</label></dt>
-			<!-- IF p_mask.f_mask.S_ROLE_OPTIONS -->
-				<dd style="margin-left: 20%"><select id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" onchange="set_role_settings(this.options[selectedIndex].value, 'advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')">{p_mask.f_mask.S_ROLE_OPTIONS}</select></dd>
-			<!-- ELSE -->
-				<dd>{L_NO_ROLE_AVAILABLE}</dd>
-			<!-- ENDIF -->
-		</dl>
+
+<fieldset class="permissions">
+	<!-- IF p_mask.USER_GROUPS_DEFAULT or p_mask.USER_GROUPS_CUSTOM -->
+		<br />
+		<p>
+		<!-- IF p_mask.USER_GROUPS_DEFAULT --><b>{p_mask.NAME}</b> {L_USER_IS_MEMBER_OF_DEFAULT}: <b>{p_mask.USER_GROUPS_DEFAULT}</b><br /><!-- ENDIF -->
+		<!-- IF p_mask.USER_GROUPS_CUSTOM --><b>{p_mask.NAME}</b> {L_USER_IS_MEMBER_OF_CUSTOM}: <b>{p_mask.USER_GROUPS_CUSTOM}</b><!-- ENDIF -->
+		</p>
 	<!-- ENDIF -->
 
-	<!-- BEGIN category -->
-		<!-- IF p_mask.f_mask.category.S_FIRST_ROW -->
-			<!-- IF not p_mask.S_VIEW -->
-				<div class="permissions-advanced" id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" style="display: none;">
-			<!-- ELSE -->
-				<div class="permissions-advanced" id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
-			<!-- ENDIF -->
+	<table cellspacing="1" class="pmask">
+	<thead>
+	<tr>
+		<th style="text-align: left; width: 70%">{p_mask.NAME}<!-- IF p_mask.S_LOCAL --><span class="small" style="text-transform: none;"> [{p_mask.L_ACL_TYPE}]</span><!-- ENDIF --></th>
+		<th>{p_mask.CATEGORIES}</th>
+	</tr>
+	</thead>
+	<tbody>
 
-			<div class="permissions-category">
-				<ul>
-		<!-- ENDIF -->
- 		
-		<!-- IF p_mask.f_mask.category.S_YES -->
-			<li class="permissions-preset-yes<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
-		<!-- ELSEIF p_mask.f_mask.category.S_NEVER -->
-			<li class="permissions-preset-never<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
-		<!-- ELSEIF p_mask.f_mask.category.S_NO -->
-			<li class="permissions-preset-no<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
-		<!-- ELSE -->
-			<li class="permissions-preset-custom<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
-		<!-- ENDIF -->
-		<a href="#" onclick="swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '{p_mask.f_mask.category.S_ROW_COUNT}', false<!-- IF p_mask.S_VIEW -->, true<!-- ENDIF -->); return false;"><span class="tabbg"><span class="colour"></span>{category.CAT_NAME}</span></a></li>
-	<!-- END category -->
-				</ul>
-			</div>
-
-	<!-- BEGIN category -->
-		<div class="permissions-panel" id="options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" <!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
-			<span class="corners-top"><span></span></span>
-			<div class="tablewrap">
-				<table id="table{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" cellspacing="1">
-				<colgroup>
-					<col class="permissions-name" />
-					<col class="permissions-yes" />
-					<col class="permissions-no" />
-					<!-- IF not p_mask.S_VIEW -->
-						<col class="permissions-never" />
+	<!-- BEGIN f_mask -->
+		<!-- IF p_mask.f_mask.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<td class="name">
+			<table cellspacing="0" cellpadding="0" class="type2" style="background-color: transparent; border: 0;">
+			<tbody>
+			<tr>
+				<td width="16">
+					<span id="head{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}"<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW --> style="display: none;"<!-- ENDIF -->>
+						<!-- IF not p_mask.S_VIEW --><input type="checkbox" class="radio" name="inherit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" value="1" /><!-- ELSE -->&nbsp;<!-- ENDIF -->
+					</span>
+				</td>
+				<td><span>{p_mask.f_mask.PADDING}<!-- IF p_mask.f_mask.FOLDER_IMAGE --> {p_mask.f_mask.FOLDER_IMAGE} <!-- ENDIF --><a href="#" onclick="swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '0'); return false;">{p_mask.f_mask.NAME}</a></span></td>
+				<td style="text-align: right;">
+				<!-- IF p_mask.S_VIEW -->
+					&nbsp;
+				<!-- ELSE -->
+					<!-- IF p_mask.f_mask.S_ROLE_OPTIONS -->
+						<b>{L_ROLE}:</b>&nbsp; &nbsp;<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, 'a_options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')">{p_mask.f_mask.S_ROLE_OPTIONS}</select>
+					<!-- ELSE -->
+						<b>{L_ROLE}:</b> {L_NO_ROLE_AVAILABLE}
 					<!-- ENDIF -->
-				</colgroup>
+				<!-- ENDIF -->
+				</td>
+			</tr>
+			</tbody>
+			</table>
+		</td>
+		<!-- BEGIN category -->
+			<!-- IF p_mask.f_mask.category.S_YES -->
+				<td class="preset preset_yes">
+			<!-- ELSEIF p_mask.f_mask.category.S_NEVER -->
+				<td class="preset preset_never">
+			<!-- ELSEIF p_mask.f_mask.category.S_NO -->
+				<td class="preset preset_no">
+			<!-- ELSE -->
+				<td class="preset preset_custom">
+			<!-- 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}'); return false;"><span></span></a></td>
+		<!-- END category -->
+	</tr>
+	<tr class="row3">
+		<td style="vertical-align: top;">
+			<div id="apply{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" style="text-align: left; width: 98%; margin: 5px;<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW --><!-- ELSE --> display: none;<!-- ENDIF -->">
+			<!-- IF not p_mask.S_VIEW -->
+				<div style="float: left; width: 60%;">
+					<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}" />
+				</div>
+				<div style="float: right; text-align: right; width: 35%;">
+					<p class="small">
+						[<a href="#" onclick="mark_options('a_options{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}'); return false;">{L_ALL_YES}</a>]<br />
+						[<a href="#" onclick="mark_options('a_options{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}'); return false;">{L_ALL_NEVER}</a>]<br />
+						[<a href="#" onclick="mark_options('a_options{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}'); return false;">{L_ALL_NO}</a>]
+					</p>
+				</div>
+			<!-- ELSE -->
+				&nbsp;
+			<!-- ENDIF -->
+			</div>
+		</td>
+		<td colspan="{p_mask.S_NUM_CATS}" id="a_options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" style="vertical-align: top; text-align: left;">
+			<div style="width: 350px; height: 0; line-height: 0;">&nbsp;</div>
+			<!-- BEGIN category -->
+				<table cellspacing="1" id="options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" class="type3"<!-- 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 -->>
 				<thead>
 				<tr>
-					<th class="name" scope="col"><strong>{L_ACL_SETTING}</strong></th>
+					<th scope="col" style="text-align: left; padding-left: 0;"><strong>{L_ACL_SETTING} [{p_mask.f_mask.category.CAT_NAME}]</strong></th>
 				<!-- IF p_mask.S_VIEW -->
-					<th class="value" scope="col">{L_ACL_YES}</th>
-					<th class="value" scope="col">{L_ACL_NEVER}</th>
+					<th scope="col">{L_ACL_YES}</th>
+					<th scope="col">{L_ACL_NEVER}</th>
 				<!-- ELSE -->
-					<th class="value permissions-yes" scope="col"><a href="#" onclick="mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'y'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false, 'yes'); return false;">{L_ACL_YES}</a></th>
-					<th class="value permissions-no" scope="col"><a href="#" onclick="mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'u'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false, 'no'); return false;">{L_ACL_NO}</a></th>
-					<th class="value permissions-never" scope="col"><a href="#" onclick="mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'n'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false, 'never'); return false;">{L_ACL_NEVER}</a></th>
+					<th 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}'); return false;">{L_ACL_YES}</a></th>
+					<th 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}'); return false;">{L_ACL_NO}</a></th>
+					<th 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}'); return false;">{L_ACL_NEVER}</a></th>
 				<!-- ENDIF -->
 				</tr>
 				</thead>
 				<tbody>
 				<!-- BEGIN mask -->
 					<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
-					<th class="permissions-name<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->"><!-- IF p_mask.f_mask.category.mask.U_TRACE --><a href="{p_mask.f_mask.category.mask.U_TRACE}" class="trace" onclick="popup(this.href, 750, 515, '_trace'); return false;" title="{L_TRACE_SETTING}"><img src="images/icon_trace.gif" alt="{L_TRACE_SETTING}" /></a> <!-- ENDIF -->{p_mask.f_mask.category.mask.PERMISSION}</th>
+					<th><!-- IF p_mask.f_mask.category.mask.U_TRACE --><a href="#" 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>
 					<!-- 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>
+						<td<!-- IF p_mask.f_mask.category.mask.S_YES --> class="yes"<!-- ELSE --> class="no"<!-- ENDIF -->>&nbsp;</td>
+						<td<!-- IF p_mask.f_mask.category.mask.S_NEVER --> class="never"<!-- ELSE --> class="no"<!-- ENDIF -->>&nbsp;</td>
 					<!-- ELSE -->
-						<td class="permissions-yes"><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_y"><input onclick="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_y" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></label></td>
-						<td class="permissions-no"><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_u"><input onclick="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_u" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_NO --> checked="checked"<!-- ENDIF --> value="-1" /></label></td>
-						<td class="permissions-never"><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_n"><input onclick="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_n" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_NEVER --> checked="checked"<!-- ENDIF --> value="0" /></label></td>
+						<td class="no"><input onchange="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')" 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" /></td>
+						<td class="no"><input onchange="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')" 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" /></td>
+						<td class="no"><input onchange="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')" 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" /></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 -->
+			<!-- END category -->
+		</td>
+	</tr>
+	<!-- END f_mask -->
+	
+	</tbody>
+	</table>
 
-			<span class="corners-bottom"><span></span></span>
-		</div>
-	<!-- END category -->
-			<div class="clearfix"></div>
-	</div>
 </fieldset>
-<!-- END f_mask -->
 
 <!-- END p_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: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a><!-- ENDIF -->
+	<!-- IF U_BACK --><a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a><!-- ENDIF -->
 
 	<h3>{L_TRACE_FOR}: {PERMISSION_USERNAME} / <!-- IF FORUM_NAME -->{FORUM_NAME} / <!-- ENDIF -->{PERMISSION} </h3>
 
@@ -41,18 +41,11 @@
 		<td>{trace.INFORMATION}</td>
 	</tr>
 	<!-- END trace -->
-	<tr class="row2">
-		<td style="white-space: nowrap;"><strong>{L_TRACE_RESULT}</strong></td>
-		<td colspan="2" style="text-align: center;" class="<!-- IF S_RESULT_NEVER -->never<!-- ELSEIF S_RESULT_YES -->yes<!-- ELSE -->no<!-- ENDIF -->">
-		<!-- IF S_RESULT_NEVER -->{L_ACL_NEVER}<!-- ELSEIF S_RESULT_YES -->{L_ACL_YES}<!-- ELSE -->{L_ACL_NO}<!-- ENDIF -->
-		</td>
-		<td>{L_RESULTING_PERMISSION}</td>
-	</tr>
 	</tbody>
 	</table>
 
 	<br />
 
-</div>
-
 <!-- INCLUDE simple_footer.html -->
+
+</div>

phpBB/adm/style/permissions.js

@@ -1,359 +0,0 @@
-/**
-* Hide and show all checkboxes
-* status = true (show boxes), false (hide boxes)
-*/
-function display_checkboxes(status) 
-{
-	var form = document.getElementById('set-permissions');
-	var cb = document.getElementsByTagName('input');
-	var display;
-
-	//show
-	if (status)
-	{
-		display = 'inline';
-	}
-	//hide
-	else
-	{
-		display = 'none';
-	}
-	
-	for (var i = 0; i < cb.length; i++ )
-	{
-		if (cb[i].className == 'permissions-checkbox')
-		{
-			cb[i].style.display = display;
-		}
-		
-	}	
-	
-}
-
-
-/**
-* Change opacity of element
-* e = element
-* value = 0 (hidden) till 10 (fully visible)
-*/
-function set_opacity(e, value) {
-	e.style.opacity = value/10;
-	
-	//IE opacity currently turned off, because of its astronomical stupidity
-	//e.style.filter = 'alpha(opacity=' + value*10 + ')';
-}
-
-/**
-* Reset the opacity and checkboxes
-* block_id = id of the element that needs to be toggled
-*/
-function toggle_opacity(block_id) {
-	var cb = document.getElementById('checkbox' + block_id);
-	var fs = document.getElementById('perm' + block_id);
-	
-	if (cb.checked) 
-	{
-		set_opacity(fs, 5);
-	} 
-	else 
-	{
-		set_opacity(fs, 10);
-	}
-}
-
-/**
-* Reset the opacity and checkboxes
-* value = 0 (checked) and 1 (unchecked)
-* except_id = id of the element not to hide
-*/
-function reset_opacity(status, except_id) {
-	var perm = document.getElementById('set-permissions');
-	var fs = perm.getElementsByTagName('fieldset');
-	var opacity = 5;
-
-	if (status)
-	{
-		opacity = 10;	
-	}
-	
-	for (var i = 0; i < fs.length; i++ )
-	{
-		if (fs[i].className != 'quick')
-		{
-			set_opacity(fs[i], opacity);
-		}
-	}
-
-	if (typeof(except_id) != 'undefined')
-	{
-		set_opacity(document.getElementById('perm' + except_id), 10);
-	}
-
-	//reset checkboxes too
-	marklist('set-permissions', 'inherit', !status);
-}
-
-
-/**
-* Check whether we have a full radiobutton row of true
-* index = offset for the row of inputs (0 == first row, 1 == second, 2 == third),
-* rb = array of radiobuttons
-*/
-function get_radio_status(index, rb) 
-{
-	for (var i = index; i < rb.length; i = i + 3 )
-	{
-		if (rb[i].checked != true)
-		{
-			if (i > index)
-			{
-				//at least one is true, but not all (custom)
-				return 2;
-			}
-			//first one is not true
-			return 0;
-		}
-	}
-
-	// all radiobuttons true
-	return 1;
-}
-
-/**
-* Set tab colours
-* id = panel the tab needs to be set for, 
-* init = initialising on open, 
-* quick = If no calculation needed, this contains the colour
-*/
-function set_colours(id, init, quick)
-{
-	var table = document.getElementById('table' + id);
-	var tab = document.getElementById('tab' + id);
-
-	if (typeof(quick) != 'undefined') 
-	{
-		tab.className = 'permissions-preset-' + quick + ' activetab';
-		return;
-	}
-
-	var rb = table.getElementsByTagName('input');
-	var colour = 'custom';
-
-	var status = get_radio_status(0, rb);
-
-	if (status == 1)
-	{
-		colour = 'yes';
-	}
-	else if (status == 0) 
-	{
-		// We move on to No
-		status = get_radio_status(1, rb);
-
-		if (status == 1)
-		{
-			colour = 'no';
-		}
-		else if (status == 0) 
-		{
-			// We move on to Never
-			status = get_radio_status(2, rb);
-
-			if (status == 1)
-			{
-				colour = 'never';
-			}
-		}
-	}
-
-	if (init)
-	{
-		tab.className = 'permissions-preset-' + colour;
-	}
-	else
-	{
-		tab.className = 'permissions-preset-' + colour + ' activetab';
-	}
-}
-
-/**
-* Initialise advanced tab colours on first load
-* block_id = block that is opened
-*/
-function init_colours(block_id)
-{	
-	var block = document.getElementById('advanced' + block_id);
-	var panels = block.getElementsByTagName('div');
-	var tab = document.getElementById('tab' + id);
-
-	for (var i = 0; i < panels.length; i++)
-	{
-		if(panels[i].className == 'permissions-panel')
-		{
-			set_colours(panels[i].id.replace(/options/, ''), true);
-		}
-	}
-
-	tab.className = tab.className + ' activetab';
-}
-
-/**
-* Show/hide option panels
-* value = suffix for ID to show
-* adv = we are opening advanced permissions
-* view = called from view permissions
-*/
-function swap_options(pmask, fmask, cat, adv, view)
-{
-	id = pmask + fmask + cat;
-	active_option = active_pmask + active_fmask + active_cat;
-
-	var	old_tab = document.getElementById('tab' + active_option);	
-	var new_tab = document.getElementById('tab' + id);
-	var adv_block = document.getElementById('advanced' + pmask + fmask);
-
-	if (adv_block.style.display == 'block' && adv == true)
-	{
-		dE('advanced' + pmask + fmask, -1);
-		reset_opacity(1);
-		display_checkboxes(false);
-		return;
-	}
-
-	// no need to set anything if we are clicking on the same tab again
-	if (new_tab == old_tab && !adv)
-	{
-		return;
-	}
-
-	// init colours
-	if (adv && (pmask + fmask) != (active_pmask + active_fmask))
-	{
-		init_colours(pmask + fmask);
-		display_checkboxes(true);
-		reset_opacity(1);
-	} 
-	else if (adv) 
-	{
-		//Checkbox might have been clicked, but we need full visibility
-		display_checkboxes(true);
-		reset_opacity(1);
-	}
-
-	// set active tab
-	old_tab.className = old_tab.className.replace(/\ activetab/g, '');
-	new_tab.className = new_tab.className + ' activetab';
-
-	if (id == active_option && adv != true)
-	{
-		return;
-	}
-
-	dE('options' + active_option, -1);
-	
-	//hiding and showing the checkbox
-	if (document.getElementById('checkbox' + active_pmask + active_fmask))
-	{
-		dE('checkbox' + pmask + fmask, -1);	
-		
-		if ((pmask + fmask) != (active_pmask + active_fmask))
-		{
-			document.getElementById('checkbox' + active_pmask + active_fmask).style.display = 'inline';
-		}
-	}
-
-	if (!view)
-	{
-		dE('advanced' + active_pmask + active_fmask, -1);
-	}
-
-	if (!view)
-	{
-		dE('advanced' + pmask + fmask, 1);
-	}
-	dE('options' + id, 1);
-
-	active_pmask = pmask;
-	active_fmask = fmask;
-	active_cat = cat;
-}
-
-/**
-* Mark all radio buttons in one panel
-* id = table ID container, s = status ['y'/'u'/'n']
-*/
-function mark_options(id, s)
-{
-	var t = document.getElementById(id);
-
-	if (!t)
-	{
-		return;
-	}
-
-	var rb = t.getElementsByTagName('input');
-
-	for (var r = 0; r < rb.length; r++)
-	{
-		if (rb[r].id.substr(rb[r].id.length-1) == s)
-		{
-			rb[r].checked = true;
-		}
-	}
-}
-
-function mark_one_option(id, field_name, s)
-{
-	var t = document.getElementById(id);
-
-	if (!t)
-	{
-		return;
-	}
-
-	var rb = t.getElementsByTagName('input');
-
-	for (var r = 0; r < rb.length; r++)
-	{
-		if (rb[r].id.substr(rb[r].id.length-field_name.length-3, field_name.length) == field_name && rb[r].id.substr(rb[r].id.length-1) == s)
-		{
-			rb[r].checked = true;
-		}
-	}
-}
-
-/**
-* Reset role dropdown field to Select role... if an option gets changed
-*/
-function reset_role(id)
-{
-	var t = document.getElementById(id);
-
-	if (!t)
-	{
-		return;
-	}
-
-	t.options[0].selected = true;
-}
-
-/**
-* Load role and set options accordingly
-*/
-function set_role_settings(role_id, target_id)
-{
-	settings = role_options[role_id];
-
-	if (!settings)
-	{
-		return;
-	}
-
-	// Mark all options to no (unset) first...
-	mark_options(target_id, 'u');
-
-	for (var r in settings)
-	{
-		mark_one_option(target_id, r, (settings[r] == 1) ? 'y' : 'n');
-	}
-}

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_body.html

@@ -1,6 +1,6 @@
 <!-- INCLUDE simple_header.html -->
 
-<div class="successbox">
+<div class="errorbox">
 	<h3>{MESSAGE_TITLE}</h3>
 	<p>{MESSAGE_TEXT}</p>
 </div>

phpBB/adm/style/simple_footer.html

@@ -1,11 +1,11 @@
-		<div style="text-align: {S_CONTENT_FLOW_END};"><a href="#" onclick="self.close(); return false;">{L_CLOSE_WINDOW}</a></div>
+		<div style="text-align: right;"><a href="#" onclick="self.close(); return false;">{L_CLOSE_WINDOW}</a></div>
 	<br /><br />
 </div>
 
 <!--
 	We request you retain the full copyright notice below including the link to www.phpbb.com.
 	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB. If you (honestly) cannot retain
+	but also helps build interest, traffic and use of phpBB2. 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,8 +16,8 @@
 <div id="page-footer">
 
 	<!-- IF S_COPYRIGHT_HTML -->
-		<br />Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
-		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
+		<br />Powered by phpBB {VERSION} &copy; 2006 <a href="http://www.phpbb.com/">phpBB Group</a>
+		{TRANSLATION_INFO}
 	<!-- ENDIF -->
 
 	<!-- IF DEBUG_OUTPUT -->

phpBB/adm/style/simple_header.html

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

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 class="type2">
+	<table>
 	<tbody>
 	<!-- BEGIN source -->
 		<tr valign="top">
@@ -16,6 +16,5 @@
 	</table>
 
 </div>
-</div>
-</div>
+
 <!-- INCLUDE simple_footer.html -->

phpBB/adm/swatch.php

@@ -1,10 +1,10 @@
 <?php
-/**
+/** 
 *
 * @package phpBB3
 * @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
 *
 */
 
@@ -12,8 +12,7 @@
 * @ignore
 */
 define('IN_PHPBB', true);
-define('ADMIN_START', true);
-$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
+$phpbb_root_path = './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 include($phpbb_root_path . 'common.' . $phpEx);
 
@@ -29,22 +28,11 @@ $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'		=> $form,
-	'NAME'			=> $name,
-	'T_IMAGES_PATH'	=> "{$phpbb_root_path}images/",
-
-	'S_USER_LANG'			=> $user->lang['USER_LANG'],
-	'S_CONTENT_DIRECTION'	=> $user->lang['DIRECTION'],
-	'S_CONTENT_ENCODING'	=> 'UTF-8',
-));
+	'OPENER'		=> addslashes(request_var('form', '')),
+	'NAME'			=> request_var('name', ''),
+	'T_IMAGES_PATH'	=> "{$phpbb_root_path}images/",)
+);
 
 $template->display('body');
 

phpBB/cache/.htaccess

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

phpBB/cache/index.htm

@@ -1,10 +0,0 @@
-<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

@@ -1,10 +1,10 @@
 <?php
-/**
+/** 
 *
 * @package phpBB3
 * @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
 *
 * Minimum Requirement: PHP 4.3.3
 */
@@ -65,26 +65,8 @@ function deregister_globals()
 	{
 		if (isset($not_unset[$varname]))
 		{
-			// 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'];
-				}
-			}
+			// Hacking attempt. No point in continuing.
+			exit;
 		}
 
 		unset($GLOBALS[$varname]);
@@ -94,7 +76,7 @@ function deregister_globals()
 }
 
 // If we are on PHP >= 6.0.0 we do not need some code
-if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
+if (version_compare(phpversion(), '6.0.0-dev', '>='))
 {
 	/**
 	* @ignore
@@ -106,7 +88,7 @@ else
 	set_magic_quotes_runtime(0);
 
 	// Be paranoid with passed vars
-	if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' || !function_exists('ini_get'))
+	if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
 	{
 		deregister_globals();
 	}
@@ -116,7 +98,16 @@ else
 
 if (defined('IN_CRON'))
 {
-	$phpbb_root_path = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+	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) . '/';
+	}
 }
 
 if (!file_exists($phpbb_root_path . 'config.' . $phpEx))
@@ -131,7 +122,7 @@ if (!defined('PHPBB_INSTALLED'))
 	// Redirect the user to the installer
 	// We have to generate a full HTTP/1.1 header here since we can't guarantee to have any of the information
 	// available as used by the redirect function
-	$server_name = (!empty($_SERVER['HTTP_HOST'])) ? strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'));
+	$server_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME');
 	$server_port = (!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT');
 	$secure = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 1 : 0;
 
@@ -150,11 +141,7 @@ if (!defined('PHPBB_INSTALLED'))
 
 	if ($server_port && (($secure && $server_port <> 443) || (!$secure && $server_port <> 80)))
 	{
-		// HTTP HOST can carry a port number...
-		if (strpos($server_name, ':') === false)
-		{
-			$url .= ':' . $server_port;
-		}
+		$url .= ':' . $server_port;
 	}
 
 	$url .= $script_path;
@@ -188,16 +175,13 @@ 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(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
+set_error_handler('msg_handler');
 
 // Instantiate some basic classes
 $user		= new user();
@@ -207,7 +191,7 @@ $cache		= new cache();
 $db			= new $sql_db();
 
 // Connect to DB
-$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, defined('PHPBB_DB_NEW_LINK') ? PHPBB_DB_NEW_LINK : false);
+$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false);
 
 // We do not need this any longer, unset for safety purposes
 unset($dbpasswd);
@@ -215,13 +199,11 @@ 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)
+// Disable board if the install/ directory is still present
+if (file_exists($phpbb_root_path . 'install') && !defined('ADMIN_START'))
 {
-	@include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx);
+	$message = (!empty($config['board_disable_msg'])) ? $config['board_disable_msg'] : 'BOARD_DISABLE';
+	trigger_error($message);
 }
 
 ?>

phpBB/cron.php

@@ -1,10 +1,10 @@
 <?php
-/**
+/** 
 *
 * @package phpBB3
 * @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
 *
 */
 
@@ -12,7 +12,7 @@
 */
 define('IN_PHPBB', true);
 define('IN_CRON', true);
-$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './';
+$phpbb_root_path = './';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 include($phpbb_root_path . 'common.' . $phpEx);
 
@@ -30,41 +30,7 @@ header('Content-length: 43');
 
 echo base64_decode('R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==');
 
-// 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;
-}
+flush();
 
 /**
 * Run cron-like action
@@ -79,12 +45,6 @@ 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();
 
@@ -259,29 +219,13 @@ 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

@@ -1,147 +0,0 @@
-<?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

@@ -1,126 +0,0 @@
-<?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();
-
-?>