This commit was manufactured by cvs2svn to create tag

'release_3_0_B5'.

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

phpBB/adm/index.php

@@ -11,14 +11,15 @@
 /**
 */
 define('IN_PHPBB', 1);
+define('ADMIN_START', 1);
 define('NEED_SID', true);
 
 // Include files
 $phpbb_root_path = './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
-require($phpbb_root_path . 'common.'.$phpEx);
-require($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
-require($phpbb_root_path . 'includes/functions_module.'.$phpEx);
+require($phpbb_root_path . 'common.' . $phpEx);
+require($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
+require($phpbb_root_path . 'includes/functions_module.' . $phpEx);
 
 // Start session management
 $user->session_begin();
@@ -51,7 +52,7 @@ $phpbb_admin_path = './';
 
 // Some oft used variables
 $safe_mode		= (@ini_get('safe_mode') || @strtolower(ini_get('safe_mode')) == 'on') ? true : false;
-$file_uploads 	= (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on') ? true : false;
+$file_uploads	= (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on') ? true : false;
 $module_id		= request_var('i', '');
 $mode			= request_var('mode', '');
 
@@ -59,6 +60,9 @@ $mode			= request_var('mode', '');
 $template->set_custom_template($phpbb_admin_path . 'style', 'admin');
 $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'] = '';
 
@@ -73,7 +77,7 @@ $module->set_active($module_id, $mode);
 
 // Assign data to the template engine for the list of modules
 // We do this before loading the active module for correct menu display in trigger_error
-$module->assign_tpl_vars("{$phpbb_admin_path}index.$phpEx$SID");
+$module->assign_tpl_vars(append_sid("{$phpbb_admin_path}index.$phpEx"));
 
 // Load and execute the relevant module
 $module->load_active();
@@ -87,25 +91,25 @@ $template->set_filenames(array(
 
 adm_page_footer();
 
-// ---------
-// FUNCTIONS
-//
+/**
+* Header for acp pages
+*/
 function adm_page_header($page_title)
 {
 	global $config, $db, $user, $template;
-	global $phpbb_root_path, $phpbb_admin_path, $phpEx, $SID;
+	global $phpbb_root_path, $phpbb_admin_path, $phpEx, $SID, $_SID;
 
 	if (defined('HEADER_INC'))
 	{
 		return;
 	}
-	
+
 	define('HEADER_INC', true);
 
 	// gzip_compression
 	if ($config['gzip_compress'])
 	{
-		if (extension_loaded('zlib') && !headers_sent())
+		if (@extension_loaded('zlib') && !headers_sent())
 		{
 			ob_start('ob_gzhandler');
 		}
@@ -114,33 +118,57 @@ function adm_page_header($page_title)
 	$template->assign_vars(array(
 		'PAGE_TITLE'			=> $page_title,
 		'USERNAME'				=> $user->data['username'],
+
+		'SID'					=> $SID,
+		'_SID'					=> $_SID,
+		'SESSION_ID'			=> $user->session_id,
 		'ROOT_PATH'				=> $phpbb_admin_path,
 
-		'U_LOGOUT'				=> "{$phpbb_root_path}ucp.$phpEx$SID&mode=logout",
-		'U_ADM_INDEX'			=> "{$phpbb_admin_path}index.$phpEx$SID",
-		'U_INDEX'				=> "{$phpbb_root_path}index.$phpEx$SID",
+		'U_LOGOUT'				=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout'),
+		'U_ADM_INDEX'			=> append_sid("{$phpbb_admin_path}index.$phpEx"),
+		'U_INDEX'				=> append_sid("{$phpbb_root_path}index.$phpEx"),
 
-		'S_CONTENT_DIRECTION' 	=> $user->lang['DIRECTION'],
-		'S_CONTENT_ENCODING' 	=> $user->lang['ENCODING'],
-		'S_CONTENT_DIR_LEFT' 	=> $user->lang['LEFT'],
-		'S_CONTENT_DIR_RIGHT' 	=> $user->lang['RIGHT'],
-		)
-	);
+		'T_IMAGES_PATH'			=> "{$phpbb_root_path}images/",
+		'T_SMILIES_PATH'		=> "{$phpbb_root_path}{$config['smilies_path']}/",
+		'T_AVATAR_PATH'			=> "{$phpbb_root_path}{$config['avatar_path']}/",
+		'T_AVATAR_GALLERY_PATH'	=> "{$phpbb_root_path}{$config['avatar_gallery_path']}/",
+		'T_ICONS_PATH'			=> "{$phpbb_root_path}{$config['icons_path']}/",
+		'T_RANKS_PATH'			=> "{$phpbb_root_path}{$config['ranks_path']}/",
+		'T_UPLOAD_PATH'			=> "{$phpbb_root_path}{$config['upload_path']}/",
 
-	if (!empty($config['send_encoding']))
-	{
-		header('Content-type: text/html; charset: ' . $user->lang['ENCODING']);
-	}
-	header('Cache-Control: private, no-cache="set-cookie", pre-check=0, post-check=0');
+		'ICON_MOVE_UP'				=> '<img src="' . $phpbb_admin_path . 'images/icon_up.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />',
+		'ICON_MOVE_UP_DISABLED'		=> '<img src="' . $phpbb_admin_path . 'images/icon_up_disabled.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />',
+		'ICON_MOVE_DOWN'			=> '<img src="' . $phpbb_admin_path . 'images/icon_down.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />',
+		'ICON_MOVE_DOWN_DISABLED'	=> '<img src="' . $phpbb_admin_path . 'images/icon_down_disabled.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />',		
+		'ICON_EDIT'					=> '<img src="' . $phpbb_admin_path . 'images/icon_edit.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />',
+		'ICON_EDIT_DISABLED'		=> '<img src="' . $phpbb_admin_path . 'images/icon_edit_disabled.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />',
+		'ICON_DELETE'				=> '<img src="' . $phpbb_admin_path . 'images/icon_delete.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />',
+		'ICON_DELETE_DISABLED'		=> '<img src="' . $phpbb_admin_path . 'images/icon_delete_disabled.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />',
+		'ICON_SYNC'					=> '<img src="' . $phpbb_admin_path . 'images/icon_sync.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />',
+		'ICON_SYNC_DISABLED'		=> '<img src="' . $phpbb_admin_path . 'images/icon_sync_disabled.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />',
+
+		'S_USER_LANG'			=> $user->lang['USER_LANG'],
+		'S_CONTENT_DIRECTION'	=> $user->lang['DIRECTION'],
+		'S_CONTENT_ENCODING'	=> 'UTF-8',
+	));
+
+	// application/xhtml+xml not used because of IE
+	header('Content-type: text/html; charset=UTF-8');
+
+	header('Cache-Control: private, no-cache="set-cookie"');
 	header('Expires: 0');
 	header('Pragma: no-cache');
 
 	return;
 }
 
+/**
+* Page footer for acp pages
+*/
 function adm_page_footer($copyright_html = true)
 {
-	global $db, $config, $template, $SID, $user, $auth, $starttime, $phpbb_root_path, $phpEx, $cache;
+	global $db, $config, $template, $user, $auth, $cache;
+	global $starttime, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 
 	// Output page creation time
 	if (defined('DEBUG'))
@@ -148,12 +176,12 @@ function adm_page_footer($copyright_html = true)
 		$mtime = explode(' ', microtime());
 		$totaltime = $mtime[0] + $mtime[1] - $starttime;
 
-		if (!empty($_REQUEST['explain']) && $auth->acl_get('a_') && method_exists($db, 'sql_report'))
+		if (!empty($_REQUEST['explain']) && $auth->acl_get('a_') && defined('DEBUG_EXTRA') && method_exists($db, 'sql_report'))
 		{
 			$db->sql_report('display');
 		}
 
-		$debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' .  (($config['gzip_compress']) ? 'On' : 'Off' ) . ' | Load : '  . (($user->load) ? $user->load : 'N/A'), $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'))
 		{
@@ -169,36 +197,36 @@ function adm_page_footer($copyright_html = true)
 				}
 			}
 
-			$debug_output .= ' | <a href="' . (($_SERVER['REQUEST_URI']) ? htmlspecialchars($_SERVER['REQUEST_URI']) : "index.$phpEx$SID") . ((strpos($_SERVER['REQUEST_URI'], '?') !== false) ? '&amp;' : '?') . 'explain=1">Explain</a>';
+			$debug_output .= ' | <a href="' . build_url() . '&amp;explain=1">Explain</a>';
 		}
 	}
 
 	$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']
-		)
+		'VERSION'			=> $config['version'])
 	);
 
 	$template->display('body');
 
-	// Unload cache, must be done before the DB connection if closed
-	if (!empty($cache))
-	{
-		$cache->unload();
-	}
-
-	// Close our DB connection.
-	$db->sql_close();
+	garbage_collection();
 
 	exit;
 }
 
+/**
+* Generate back link for acp pages
+*/
 function adm_back_link($u_action)
 {
-	return '<br /><br /><a href="' . $u_action . '">&laquo; Back to previous page</a>';
+	global $user;
+	return '<br /><br /><a href="' . $u_action . '">&laquo; ' . $user->lang['BACK_TO_PREV'] . '</a>';
 }
 
+/**
+* Build select field options in acp pages
+*/
 function build_select($option_ary, $option_default = false)
 {
 	global $user;
@@ -213,6 +241,9 @@ function build_select($option_ary, $option_default = false)
 	return $html;
 }
 
+/**
+* Build radio fields in acp pages
+*/
 function h_radio($name, &$input_ary, $input_default = false, $id = false, $key = false)
 {
 	global $user;
@@ -230,6 +261,9 @@ function h_radio($name, &$input_ary, $input_default = false, $id = false, $key =
 	return $html;
 }
 
+/**
+* Build configuration template for acp configuration pages
+*/
 function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 {
 	global $user, $module;
@@ -245,21 +279,21 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 			$maxlength = (int) $tpl_type[2];
 
 			$tpl = '<input id="' . $key . '" type="' . $tpl_type[0] . '"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="' . $name . '" value="' . $new[$config_key] . '" />';
-			break;
+		break;
 
 		case 'dimension':
 			$size = (int) $tpl_type[1];
 			$maxlength = (int) $tpl_type[2];
 
 			$tpl = '<input id="' . $key . '" type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_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;
+		break;
 
 		case 'textarea':
 			$rows = (int) $tpl_type[1];
 			$cols = (int) $tpl_type[2];
 
 			$tpl = '<textarea id="' . $key . '" name="' . $name . '" rows="' . $rows . '" cols="' . $cols . '">' . $new[$config_key] . '</textarea>';
-			break;
+		break;
 
 		case 'radio':
 			$key_yes	= ($new[$config_key]) ? ' checked="checked"' : '';
@@ -272,7 +306,7 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 			$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 . '&nbsp;&nbsp;' . $tpl_no : $tpl_no . '&nbsp;&nbsp;' . $tpl_yes;
-			break;
+		break;
 
 		case 'select':
 		case 'custom':
@@ -291,7 +325,7 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 			{
 				break;
 			}
-			
+
 			if (isset($vars['params']))
 			{
 				$args = array();
@@ -327,18 +361,145 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 				$tpl = $return;
 			}
 
-			break;
+		break;
 
 		default:
-			break;
+		break;
 	}
 
 	if (isset($vars['append']))
 	{
 		$tpl .= $vars['append'];
 	}
-	
+
 	return $tpl;
 }
 
+/**
+* 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;
+
+	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;
+		}
+
+		// Validate a bit. ;) String is already checked through request_var(), therefore we do not check this again
+		switch ($config_definition['validate'])
+		{
+			case 'bool':
+				$cfg_array[$config_name] = ($cfg_array[$config_name]) ? 1 : 0;
+			break;
+
+			case 'int':
+				$cfg_array[$config_name] = (int) $cfg_array[$config_name];
+			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;
+
+			// Relative path (appended $phpbb_root_path)
+			case 'rpath':
+			case 'rwpath':
+				if (!$cfg_array[$config_name])
+				{
+					break;
+				}
+
+				$destination = $cfg_array[$config_name];
+
+				// Adjust destination path (no trailing slash)
+				if (substr($destination, -1, 1) == '/' || substr($destination, -1, 1) == '\\')
+				{
+					$destination = substr($destination, 0, -1);
+				}
+
+				$destination = str_replace(array('../', '..\\', './', '.\\'), '', $destination);
+				if ($destination && ($destination[0] == '/' || $destination[0] == "\\"))
+				{
+					$destination = '';
+				}
+
+				$cfg_array[$config_name] = trim($destination);
+
+			// Path being relative (still prefixed by phpbb_root_path), but with the ability to escape the root dir...
+			case 'path':
+			case 'wpath':
+
+				if (!$cfg_array[$config_name])
+				{
+					break;
+				}
+
+				$cfg_array[$config_name] = trim($cfg_array[$config_name]);
+
+				// Make sure no NUL byte is present...
+				if (strpos($cfg_array[$config_name], '\0') !== false || strpos($cfg_array[$config_name], '%00') !== false)
+				{
+					$cfg_array[$config_name] = '';
+					break;
+				}
+
+				if (!file_exists($phpbb_root_path . $cfg_array[$config_name]))
+				{
+					$error[] = sprintf($user->lang['DIRECTORY_DOES_NOT_EXIST'], $cfg_array[$config_name]);
+				}
+
+				if (file_exists($phpbb_root_path . $cfg_array[$config_name]) && !is_dir($phpbb_root_path . $cfg_array[$config_name]))
+				{
+					$error[] = sprintf($user->lang['DIRECTORY_NOT_DIR'], $cfg_array[$config_name]);
+				}
+
+				// 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_writeable($phpbb_root_path . $cfg_array[$config_name]))
+					{
+						$error[] = sprintf($user->lang['DIRECTORY_NOT_WRITEABLE'], $cfg_array[$config_name]);
+					}
+				}
+
+			break;
+		}
+	}
+
+	return;
+}
+
 ?>

phpBB/adm/style/acp_attachments.html

@@ -2,6 +2,10 @@
 
 <a name="maincontent"></a>
 
+<!-- IF U_BACK -->
+	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+<!-- ENDIF -->
+
 <h1>{L_TITLE}</h1>
 
 <p>{L_TITLE_EXPLAIN}</p>
@@ -33,122 +37,73 @@
 
 <!-- IF S_ATTACHMENT_SETTINGS -->
 
-	<form id="attachsettings" method="post" action="{U_ACTION}">
-	<fieldset>
-		<legend>{L_ACP_ATTACHMENT_SETTINGS}</legend>
-		<dl>
-			<dt><label for="upload_dir">{L_UPLOAD_DIR}:</label><br /><span>{L_UPLOAD_DIR_EXPLAIN}</span></dt>
-			<dd><input type="text" id="upload_dir" size="25" maxlength="100" name="upload_path" value="{UPLOAD_PATH}" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="display_order">{L_DISPLAY_ORDER}:</label><br /><span>{L_DISPLAY_ORDER_EXPLAIN}</span></dt>
-			<dd><input type="radio" class="radio" id="display_order" name="display_order" value="0"<!-- IF not DISPLAY_ORDER --> checked="checked"<!-- ENDIF --> /> {L_DESCENDING} &nbsp; <input type="radio" name="display_order" value="1"<!-- IF DISPLAY_ORDER --> checked="checked"<!-- ENDIF --> class="radio" /> {L_ASCENDING}</dd>
-		</dl>
-		<dl>
-			<dt><label for="attach_quota">{L_ATTACH_QUOTA}:</label><br /><span>{L_ATTACH_QUOTA_EXPLAIN}</span></dt>
-			<dd><input type="text" id="attach_quota" size="8" maxlength="15" name="attachment_quota" value="{ATTACHMENT_QUOTA}" /> <select name="quota_size">{S_QUOTA_SIZE_OPTIONS}</select></dd>
-		</dl>
-		<dl>
-			<dt><label for="max_filesize">{L_ATTACH_MAX_FILESIZE}:</label><br /><span>{L_ATTACH_MAX_FILESIZE_EXPLAIN}</span></dt>
-			<dd><input type="text" id="max_filesize" size="8" maxlength="15" name="max_filesize" value="{MAX_FILESIZE}" /> <select name="size">{S_MAX_FILESIZE_OPTIONS}</select></dd>
-		</dl>
-		<dl>
-			<dt><label for="max_pm_filesize">{L_ATTACH_MAX_PM_FILESIZE}:</label><br /><span>{L_ATTACH_MAX_PM_FILESIZE_EXPLAIN}</span></dt>
-			<dd><input type="text" id="max_pm_filesize" size="8" maxlength="15" name="max_filesize_pm" value="{MAX_PM_FILESIZE}" /> <select name="pm_size">{S_MAX_PM_FILESIZE_OPTIONS}</select></dd>
-		</dl>
-		<dl>
-			<dt><label for="max_attachments">{L_MAX_ATTACHMENTS}:</label></dt>
-			<dd><input type="text" id="max_attachments" size="3" maxlength="3" name="max_attachments" value="{MAX_ATTACHMENTS}" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="max_attachments_pm">{L_MAX_ATTACHMENTS_PM}:</label></dt>
-			<dd><input type="text" id="max_attachments_pm" size="3" maxlength="3" name="max_attachments_pm" value="{MAX_ATTACHMENTS_PM}" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="secure_downloads">{L_SECURE_DOWNLOADS}:</label><br /><span>{L_SECURE_DOWNLOADS_EXPLAIN}</span></dt>
-			<dd><input type="radio" id="secure_downloads" name="secure_downloads" value="1"<!-- IF SECURE_DOWNLOADS --> checked="checked"<!-- ENDIF --> class="radio" /> {L_YES}&nbsp;&nbsp;<input type="radio" name="secure_downloads" value="0"<!-- IF not SECURE_DOWNLOADS --> checked="checked"<!-- ENDIF --> class="radio" /> {L_NO}</dd>
-		</dl>
-		<dl>
-			<dt><label for="allow_deny">{L_SECURE_ALLOW_DENY}:</label><br /><span>{L_SECURE_ALLOW_DENY_EXPLAIN}</span></dt>
-			<dd><input type="radio" id="allow_deny" name="secure_allow_deny" value="1"<!-- IF SECURE_ALLOW_DENY --> checked="checked"<!-- ENDIF --> class="radio" /> {L_ORDER_ALLOW_DENY}&nbsp;&nbsp;<input type="radio" name="secure_allow_deny" value="0"<!-- IF not SECURE_ALLOW_DENY --> checked="checked"<!-- ENDIF --> class="radio" /> {L_ORDER_DENY_ALLOW}</dd>
-		</dl>
-		<dl>
-			<dt><label for="referer">{L_SECURE_EMPTY_REFERER}:</label><br /><span>{L_SECURE_EMPTY_REFERER_EXPLAIN}</span></dt>
-			<dd><input type="radio" id="referer" name="secure_allow_empty_referer" value="1"<!-- IF ALLOW_EMPTY_REFERER --> checked="checked"<!-- ENDIF --> class="radio" /> {L_YES}&nbsp;&nbsp;<input type="radio" name="secure_allow_empty_referer" value="0"<!-- IF not ALLOW_EMPTY_REFERER --> checked="checked"<!-- ENDIF --> class="radio" /> {L_NO}</dd>
-		</dl>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_SETTINGS_CAT_IMAGES} [{L_ASSIGNED_GROUP}: {ASSIGNED_GROUPS}]</legend>
-		<dl>
-			<dt><label for="display_inlined">{L_DISPLAY_INLINED}:</label><br /><span>{L_DISPLAY_INLINED_EXPLAIN}</span></dt>
-			<dd><input type="radio" id="display_inlined" name="img_display_inlined" value="1"<!-- IF DISPLAY_INLINED --> checked="checked"<!-- ENDIF --> class="radio" /> {L_YES}&nbsp;&nbsp;<input type="radio" name="img_display_inlined" value="0"<!-- IF not DISPLAY_INLINED --> checked="checked"<!-- ENDIF --> class="radio" /> {L_NO}</dd>
-		</dl>
-	<!-- IF S_THUMBNAIL_SUPPORT -->
-		<dl>
-			<dt><label for="create_thumbnail">{L_CREATE_THUMBNAIL}:</label><br /><span>{L_CREATE_THUMBNAIL_EXPLAIN}</span></dt>
-			<dd><input type="radio" id="create_thumbnail" name="img_create_thumbnail" value="1"<!-- IF CREATE_THUMBNAIL --> checked="checked"<!-- ENDIF --> class="radio" /> {L_YES}&nbsp;&nbsp;<input type="radio" name="img_create_thumbnail" value="0"<!-- IF not CREATE_THUMBNAIL --> checked="checked"<!-- ENDIF --> class="radio" /> {L_NO}</dd>
-		</dl>
-		<dl>
-			<dt><label for="thumb_filesize">{L_MIN_THUMB_FILESIZE}:</label><br /><span>{L_MIN_THUMB_FILESIZE_EXPLAIN}</span></dt>
-			<dd><input type="text" id="thumb_filesize" size="7" maxlength="15" name="img_min_thumb_filesize" value="{MIN_THUMB_FILESIZE}" /> {L_BYTES}</dd>
-		</dl>
+	<!-- IF not S_THUMBNAIL_SUPPORT -->
+		<div class="errorbox">
+			<p>{L_NO_THUMBNAIL_SUPPORT}</p>
+		</div>
 	<!-- ENDIF -->
-		<dl>
-			<dt><label for="imagick_path">{L_IMAGICK_PATH}:</label><br /><span>{L_IMAGICK_PATH_EXPLAIN}</span></dt>
-			<dd><input type="text" id="imagick_path" size="20" maxlength="200" name="img_imagick" value="{IMG_IMAGICK}" />&nbsp;&nbsp;<span>[ <a href="{U_SEARCH_IMAGICK}">{L_SEARCH_IMAGICK}</a> ]</span></dd>
-		</dl>
-		<dl>
-			<dt><label for="image_size">{L_MAX_IMAGE_SIZE}:</label><br /><span>{L_MAX_IMAGE_SIZE_EXPLAIN}</span></dt>
-			<dd><input type="text" id="image_size" size="3" maxlength="4" name="img_max_width" value="{MAX_WIDTH}" /> px X <input type="text" size="3" maxlength="4" name="img_max_height" value="{MAX_HEIGHT}" /> px</dd>
-		</dl>
-		<dl>
-			<dt><label for="link_size">{L_IMAGE_LINK_SIZE}:</label><br /><span>{L_IMAGE_LINK_SIZE_EXPLAIN}</span></dt>
-			<dd><input type="text" id="link_size" size="3" maxlength="4" name="img_link_width" value="{LINK_WIDTH}" /> px X <input type="text" size="3" maxlength="4" name="img_link_height" value="{LINK_HEIGHT}" /> px</dd>
-		</dl>
+
+	<form id="attachsettings" method="post" action="{U_ACTION}">
+	<!-- BEGIN options -->
+		<!-- IF options.S_LEGEND -->
+			<!-- IF not options.S_FIRST_ROW -->
+				</fieldset>
+			<!-- ENDIF -->
+			<fieldset>
+				<legend>{options.LEGEND}</legend>
+		<!-- ELSE -->
+
+			<dl>
+				<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+				<dd>{options.CONTENT}</dd>
+			</dl>
+
+		<!-- ENDIF -->
+	<!-- END options -->
 	</fieldset>
 
 	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 	</fieldset>
 
 	<!-- IF not S_SECURE_DOWNLOADS -->
-	<div class="errorbox">
-		<p>{L_SECURE_DOWNLOAD_NOTICE}</p>
-	</div>
+		<div class="errorbox">
+			<p>{L_SECURE_DOWNLOAD_NOTICE}</p>
+		</div>
 	<!-- ENDIF -->
 
 	<fieldset>
 		<legend>{L_SECURE_TITLE}</legend>
 		<p>{L_DOWNLOAD_ADD_IPS_EXPLAIN}</p>
-		<dl>
-			<dt><label for="ip_hostname">{L_IP_HOSTNAME}:</label></dt>
-			<dd><textarea id="ip_hostname" cols="40" rows="3" name="ips"></textarea></dd>
-		</dl>
-		<dl>
-			<dt><label for="exclude">{L_IP_EXCLUDE}:</label><br /><span>{L_EXCLUDE_ENTERED_IP}</span></dt>
-			<dd><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>
+	<dl>
+		<dt><label for="ip_hostname">{L_IP_HOSTNAME}:</label></dt>
+		<dd><textarea id="ip_hostname" cols="40" rows="3" name="ips"></textarea></dd>
+	</dl>
+	<dl>
+		<dt><label for="exclude">{L_IP_EXCLUDE}:</label><br /><span>{L_EXCLUDE_ENTERED_IP}</span></dt>
+		<dd><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 class="quick">
+	<p class="quick">
 		<input class="button1" type="submit" id="securesubmit" name="securesubmit" value="{L_SUBMIT}" />
+	</p>
 	</fieldset>
 
 	<fieldset>
 		<legend>{L_REMOVE_IPS}</legend>
 	<!-- IF S_DEFINED_IPS -->
-		<p>{L_DOWNLOAD_REMOVE_IPS_EXPLAIN}</p>
+			<p>{L_DOWNLOAD_REMOVE_IPS_EXPLAIN}</p>
 		<dl>
 			<dt><label for="remove_ip_hostname">{L_IP_HOSTNAME}:</label></dt>
 			<dd><select name="unip[]" id="remove_ip_hostname" multiple="multiple" size="10">{DEFINED_IPS}</select></dd>
 		</dl>
-	</fieldset>
 
-	<fieldset class="quick">
-		<input class="button1" type="submit" id="unsecuresubmit" name="unsecuresubmit" value="{L_SUBMIT}" />
-	</fieldset>
+		<p class="quick">
+			<input class="button1" type="submit" id="unsecuresubmit" name="unsecuresubmit" value="{L_SUBMIT}" />
+		</p>
+		</fieldset>
 
 	<!-- ELSE -->
 		<p>{L_NO_IPS_DEFINED}</p>
@@ -216,57 +171,58 @@
 			<input type="hidden" name="g" value="{GROUP_ID}" />
 
 			<legend>{L_LEGEND}</legend>
-			<dl>
-				<dt><label for="group_name">{L_GROUP_NAME}:</label></dt>
-				<dd><input type="text" id="group_name" size="20" maxlength="100" name="group_name" value="{GROUP_NAME}" /></dd>
-			</dl>
-			<dl>
-				<dt><label for="category">{L_SPECIAL_CATEGORY}:</label><br /><span>{L_SPECIAL_CATEGORY_EXPLAIN}</span></dt>
-				<dd>{S_CATEGORY_SELECT}</dd>
-			</dl>
-			<dl>
-				<dt><label for="allowed">{L_ALLOWED}:</label></dt>
-				<dd><input type="checkbox" id="allowed" name="allow_group" value="1"<!-- IF ALLOW_GROUP --> checked="checked"<!-- ENDIF --> /></dd>
-			</dl>
-			<dl>
-				<dt><label for="allow_in_pm">{L_ALLOW_IN_PM}:</label></dt>
-				<dd><input type="checkbox" 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 --> name="image_upload_icon" alt="" title="" />&nbsp;</dd>
-			</dl>
-			<dl>
-				<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}:</label></dt>
-				<dd><input type="text" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
-			</dl>
-			<dl>
-				<dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}:</label></dt>
-				<dd><div id="ext">{ASSIGNED_EXTENSIONS}</div> <span>[<a href="{U_EXTENSIONS}">{L_GO_TO_EXTENSIONS}</a> ]</span></dd>
-				<dd><select name="extensions[]" id="assigned_extensions" class="narrow" onchange="show_extensions(this);" multiple="multiple" size="8">{S_EXTENSION_OPTIONS}</select></dd>
-			</dl>
-			<dl>
-				<dt><label for="allowed_forums">{L_ALLOWED_FORUMS}:</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt>
-				<dd><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>
+		<dl>
+			<dt><label for="group_name">{L_GROUP_NAME}:</label></dt>
+			<dd><input type="text" id="group_name" size="20" maxlength="100" name="group_name" value="{GROUP_NAME}" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="category">{L_SPECIAL_CATEGORY}:</label><br /><span>{L_SPECIAL_CATEGORY_EXPLAIN}</span></dt>
+			<dd>{S_CATEGORY_SELECT}</dd>
+		</dl>
+		<dl>
+			<dt><label for="allowed">{L_ALLOWED}:</label></dt>
+			<dd><input type="checkbox" class="radio" id="allowed" name="allow_group" value="1"<!-- IF ALLOW_GROUP --> checked="checked"<!-- ENDIF --> /></dd>
+		</dl>
+		<dl>
+			<dt><label for="allow_in_pm">{L_ALLOW_IN_PM}:</label></dt>
+			<dd><input type="checkbox" class="radio" id="allow_in_pm" name="allow_in_pm" value="1"<!-- IF ALLOW_IN_PM --> checked="checked"<!-- ENDIF --> /></dd>
+		</dl>
+		<dl>
+			<dt><label for="upload_icon">{L_UPLOAD_ICON}:</label></dt>
+			<dd><select name="upload_icon" id="upload_icon" onchange="update_image(this.options[selectedIndex].value);">
+					<option value="no_image"<!-- IF S_NO_IMAGE --> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>{S_FILENAME_LIST}
+			</select></dd>
+			<dd>&nbsp;<img <!-- IF S_NO_IMAGE -->src="{PHPBB_ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> name="image_upload_icon" alt="" title="" />&nbsp;</dd>
+		</dl>
+		<dl>
+			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}:</label></dt>
+			<dd><input type="text" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
+		</dl>
+		<dl>
+			<dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}:</label></dt>
+			<dd><div id="ext">{ASSIGNED_EXTENSIONS}</div> <span>[<a href="{U_EXTENSIONS}">{L_GO_TO_EXTENSIONS}</a> ]</span></dd>
+			<dd><select name="extensions[]" id="assigned_extensions" class="narrow" onchange="show_extensions(this);" multiple="multiple" size="8">{S_EXTENSION_OPTIONS}</select></dd>
+		</dl>
+		<dl>
+			<dt><label for="allowed_forums">{L_ALLOWED_FORUMS}:</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt>
+			<dd><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 class="submit-buttons">
+		<p class="submit-buttons">
 			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		</p>
+
 		</fieldset>
 
 		</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>
@@ -278,25 +234,27 @@
 		</thead>
 		<tbody>
 		<!-- BEGIN groups -->
-			<!-- IF groups.S_ADD_SPACER -->
+			<!-- IF groups.S_ADD_SPACER and not groups.S_FIRST_ROW -->
 			<tr>
 				<td class="spacer" colspan="3">&nbsp;</td>
 			</tr>
 			<!-- ENDIF -->
 			<tr>
-				<td><a href="{groups.U_EDIT}">{groups.GROUP_NAME}</a></td>
+				<td><strong>{groups.GROUP_NAME}</strong>
+					<!-- IF groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>&raquo; {L_NOT_ALLOWED_IN_PM}</span><!-- ENDIF -->
+					<!-- IF groups.S_ALLOWED_IN_PM and not groups.S_GROUP_ALLOWED --><br /><span>&raquo; {L_ONLY_ALLOWED_IN_PM}</span><!-- ENDIF -->
+				</td>
 				<td>{groups.CATEGORY}</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>
+				<td align="center" valign="middle" style="white-space: nowrap;">&nbsp;<a href="{groups.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{groups.U_DELETE}">{ICON_DELETE}</a>&nbsp;</td>
 			</tr>
 		<!-- END groups -->
 		</tbody>
 		</table>
-
-		<form id="extgroups" method="post" action="{U_ACTION}">
-			<fieldset class="quick">
+		<p class="quick">
 				{L_CREATE_GROUP}: <input type="text" name="group_name" maxlength="30" /> 
 				<input class="button2" name="add" type="submit" value="{L_SUBMIT}" />
-			</fieldset>
+		</p>
+		</fieldset>
 		</form>
 
 	<!-- ENDIF -->
@@ -306,18 +264,18 @@
 	<form id="add_ext" method="post" action="{U_ACTION}">
 	<fieldset>
 		<legend>{L_ADD_EXTENSION}</legend>
-		<dl>
-			<dt><label for="add_extension">{L_EXTENSION}</label></dt>
-			<dd><input type="text" id="add_extension" size="20" maxlength="100" name="add_extension" value="{ADD_EXTENSION}" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="extension_group">{L_EXTENSION_GROUP}</label></dt>
-			<dd>{GROUP_SELECT_OPTIONS}</dd>
-		</dl>
-	</fieldset>
+	<dl>
+		<dt><label for="add_extension">{L_EXTENSION}</label></dt>
+		<dd><input type="text" id="add_extension" size="20" maxlength="100" name="add_extension" value="{ADD_EXTENSION}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="extension_group">{L_EXTENSION_GROUP}</label></dt>
+		<dd>{GROUP_SELECT_OPTIONS}</dd>
+	</dl>
 
-	<fieldset class="quick">
+	<p class="quick">
 		<input type="submit" id="add_extension_check" name="add_extension_check" class="button2" value="{L_SUBMIT}" />
+	</p>
 	</fieldset>
 
 	</form>
@@ -326,6 +284,9 @@
 
 	<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>
@@ -343,18 +304,18 @@
 		</tr>
 		<!-- ENDIF -->
 		<tr> 
-			<input type="hidden" name="extension_change_list[]" value="{extensions.EXTENSION_ID}" />
 			<td><b>{extensions.EXTENSION}</b></td>
 			<td>{extensions.GROUP_OPTIONS}</td>
-			<td><input type="checkbox" name="extension_id_list[]" value="{extensions.EXTENSION_ID}" /></td>
+			<td><input type="checkbox" class="radio" name="extension_id_list[]" value="{extensions.EXTENSION_ID}" /><input type="hidden" name="extension_change_list[]" value="{extensions.EXTENSION_ID}" /></td>
 		</tr>
 	<!-- END extensions -->
 	</tbody>
 	</table>
 
-	<fieldset class="submit-buttons">
+	<p class="submit-buttons">
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
 	</fieldset>
 	
 	</form>
@@ -363,10 +324,14 @@
 
 	<form id="orphan" method="post" action="{U_ACTION}">
 
+	<fieldset class="tabulated">
+	<legend>{L_TITLE}</legend>
+
 	<table cellspacing="1">
 	<thead>
 	<tr>
 		<th>{L_FILENAME}</th>
+		<th>{L_FILEDATE}</th>
 		<th>{L_FILESIZE}</th>
 		<th>{L_ATTACH_POST_ID}</th>
 		<th>{L_ATTACH_TO_POST}</th>
@@ -376,28 +341,33 @@
 	<tbody>
 	<!-- BEGIN orphan -->
 		<!-- IF orphan.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td><a href="{orphan.U_FILE}" rel="file">{orphan.FILE}</a></td>
+			<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>
+			<td>{orphan.FILETIME}</td>
 			<td>{orphan.FILESIZE}</td>
-			<td><b>ID: </b><input type="text" name="post_id[{orphan.FILE}]" size="7" maxlength="10" value="{orphan.POST_IDS}" /></td>
-			<td><input type="checkbox" name="add[{orphan.FILE}]" /></td>
-			<td><input type="checkbox" name="delete[{orphan.FILE}]" /></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>
 	<!-- END orphan -->
-	<tr>
-		<td colspan="3">&nbsp;</td>
-		<td class="small"><a href="javascript:marklist('orphan', 'add', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('orphan', 'add', false);">{L_UNMARK_ALL}</a></td>
-		<td class="small"><a href="javascript:marklist('orphan', 'delete', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('orphan', 'delete', false);">{L_UNMARK_ALL}</a></td>
+	<tr class="row4">
+		<td colspan="4">&nbsp;</td>
+		<td class="small"><a href="#" onclick="marklist('orphan', 'add', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('orphan', 'add', false); return false;">{L_UNMARK_ALL}</a></td>
+		<td class="small"><a href="#" onclick="marklist('orphan', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('orphan', 'delete', false); return false;">{L_UNMARK_ALL}</a></td>
 	</tr>
 	</tbody>
 	</table>
 
-	<fieldset class="submit-buttons">
+	<br />
+
+	<p class="submit-buttons">
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
+
 	</fieldset>
 
 	</form>
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_ban.html

@@ -12,18 +12,21 @@
 <!--
 
 	var ban_length = new Array();
+		ban_length[-1] = '';
 	<!-- BEGIN ban_length -->
-		ban_length['{ban_length.BAN_ID}'] = "{ban_length.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.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.REASON}";
+		ban_give_reason['{ban_give_reason.BAN_ID}'] = "{ban_give_reason.A_REASON}";
 	<!-- END ban_give_reason -->
 
 	function display_details(option)
@@ -40,33 +43,33 @@
 
 <fieldset>
 	<legend>{L_TITLE}</legend>
-	<dl>
-		<dt><label for="ban">{L_BAN_CELL}:</label></dt>
-		<dd><textarea name="ban" cols="40" rows="3" id="ban"></textarea></dd>
-		<!-- IF S_USERNAME_BAN --><dd>[ <a href="#" 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><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><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" id="banreason" class="medium" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="bangivereason">{L_BAN_GIVE_REASON}:</label></dt>
-		<dd><input name="bangivereason" type="text" id="bangivereason" class="medium" /></dd>
-	</dl>
-</fieldset>
+<dl>
+	<dt><label for="ban">{L_BAN_CELL}:</label></dt>
+	<dd><textarea name="ban" cols="40" rows="3" id="ban"></textarea></dd>
+	<!-- IF S_USERNAME_BAN --><dd>[ <a href="#" onclick="window.open('{U_FIND_USER}', '_phpbbsearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF -->
+</dl>
+<dl>
+	<dt><label for="banlength">{L_BAN_LENGTH}:</label></dt>
+	<dd><select name="banlength" id="banlength">{S_BAN_END_OPTIONS}</select></dd>
+	<dd><input type="text" name="banlengthother" maxlength="10" /> (YYYY-MM-DD)</dd>
+</dl>
+<dl>
+	<dt><label for="banexclude">{L_BAN_EXCLUDE}:</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>
+	<dd><input type="radio" name="banexclude" value="1" class="radio" /> {L_YES} &nbsp; <input type="radio" name="banexclude" id="banexclude" value="0" checked="checked" class="radio" /> {L_NO}</dd>
+</dl>
+<dl>
+	<dt><label for="banreason">{L_BAN_REASON}:</label></dt>
+	<dd><input name="banreason" type="text" id="banreason" class="medium" maxlength="3000" /></dd>
+</dl>
+<dl>
+	<dt><label for="bangivereason">{L_BAN_GIVE_REASON}:</label></dt>
+	<dd><input name="bangivereason" type="text" id="bangivereason" class="medium" maxlength="3000" /></dd>
+</dl>
 
-<fieldset class="submit-buttons">
+<p class="submit-buttons">
 	<input class="button1" type="submit" id="bansubmit" name="bansubmit" value="{L_SUBMIT}" />&nbsp;
 	<input class="button2" type="reset" id="banreset" name="banreset" value="{L_RESET}" />
+</p>
 </fieldset>
 
 <br /><br />
@@ -81,33 +84,34 @@
 <!-- IF S_BANNED_OPTIONS -->
 	<dl>
 		<dt><label for="unban">{L_BAN_CELL}:</label></dt>
-		<dd><select id="unban" name="unban[]" multiple="multiple" size="10" style="width: 50%" onchange="display_details(this.options[this.selectedIndex].value)">{BANNED_OPTIONS}</select></dd>
+		<dd><select id="unban" name="unban[]" multiple="multiple" size="10" style="width: 50%" onchange="if (this.selectedIndex > -1) display_details(this.options[this.selectedIndex].value); else display_details(-1);">{BANNED_OPTIONS}</select></dd>
 	</dl>
 	<dl>
 		<dt><label for="unbanlength">{L_BAN_LENGTH}:</label></dt>
-		<dd><input style="border: 0px;" type="text" name="unbanlength" id="unbanlength" class="full" /></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: 0px;" type="text" name="unbanreason" id="unbanreason" class="full" /></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: 0px;" type="text" name="unbangivereason" id="unbangivereason" class="full" /></dd>
+		<dd><input style="border: 0px;" type="text" name="unbangivereason" id="unbangivereason" class="full" disabled="disabled" /></dd>
 	</dl>
-</fieldset>
 
-<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}" />
-</fieldset>
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="unbansubmit" name="unbansubmit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="unbanreset" name="unbanreset" value="{L_RESET}" />
+	</p>
+	</fieldset>
 
 <!-- ELSE -->
 
 	<p>{L_NO_BAN_CELL}</p>
 </fieldset>
+
 <!-- ENDIF -->
 
 </form>
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_bbcodes.html

@@ -15,36 +15,47 @@
 	<fieldset>
 		<legend>{L_BBCODE_USAGE}</legend>
 		<p>{L_BBCODE_USAGE_EXPLAIN}</p>
-		<dl>
-			<dt><label for="bbcode_match">{L_EXAMPLES}</label><br /><br /><span>{L_BBCODE_USAGE_EXAMPLE}</span></dt>
-			<dd><textarea id="bbcode_match" name="bbcode_match" cols="60" rows="5">{BBCODE_MATCH}</textarea></dd>
-		</dl>
+	<dl>
+		<dt><label for="bbcode_match">{L_EXAMPLES}</label><br /><br /><span>{L_BBCODE_USAGE_EXAMPLE}</span></dt>
+		<dd><textarea id="bbcode_match" name="bbcode_match" cols="60" rows="5">{BBCODE_MATCH}</textarea></dd>
+	</dl>
 	</fieldset>
 
 	<fieldset>
 		<legend>{L_HTML_REPLACEMENT}</legend>
 		<p>{L_HTML_REPLACEMENT_EXPLAIN}</p>
-		<dl>
-			<dt><label for="bbcode_tpl">{L_EXAMPLES}</label><br /><br /><span>{L_HTML_REPLACEMENT_EXAMPLE}</span></dt>
-			<dd><textarea id="bbcode_tpl" name="bbcode_tpl" cols="60" rows="8">{BBCODE_TPL}</textarea></dd>
-		</dl>
+	<dl>
+		<dt><label for="bbcode_tpl">{L_EXAMPLES}</label><br /><br /><span>{L_HTML_REPLACEMENT_EXAMPLE}</span></dt>
+		<dd><textarea id="bbcode_tpl" name="bbcode_tpl" cols="60" rows="8">{BBCODE_TPL}</textarea></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_BBCODE_HELPLINE}</legend>
+		<p>{L_BBCODE_HELPLINE_EXPLAIN}</p>
+	<dl>
+		<dt><label for="bbcode_helpline">{L_BBCODE_HELPLINE_TEXT}</label></dt>
+		<dd><input type="text" id="bbcode_helpline" name="bbcode_helpline" size="60" maxlength="255" value="{BBCODE_HELPLINE}" /></dd>
+	</dl>
 	</fieldset>
 
 	<fieldset>
 		<legend>{L_SETTINGS}</legend>
-		<dl>
-			<dt><label for="display_on_posting">{L_DISPLAY_ON_POSTING}</label></dt>
-			<dd><input type="checkbox" name="display_on_posting" id="display_on_posting" value="1"<!-- IF DISPLAY_ON_POSTING --> checked="checked"<!-- ENDIF --> /></dd>
-		</dl>
+	<dl>
+		<dt><label for="display_on_posting">{L_DISPLAY_ON_POSTING}</label></dt>
+		<dd><input type="checkbox" class="radio" name="display_on_posting" id="display_on_posting" value="1"<!-- IF DISPLAY_ON_POSTING --> checked="checked"<!-- ENDIF --> /></dd>
+	</dl>
 	</fieldset>
 
 	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 	</fieldset>
 	
 	<br />
-	<table cellspacing="1">
+
+	<table cellspacing="1" id="down">
 	<thead>
 	<tr>
 		<th colspan="2">{L_TOKENS}</th>
@@ -75,31 +86,34 @@
 
 	<p>{L_ACP_BBCODES_EXPLAIN}</p>
 	
-	<table cellspacing="1">
+	<form id="acp_bbcodes" method="post" action="{U_ACTION}">
+	<fieldset class="tabulated">
+	<legend>{L_ACP_BBCODES}</legend>
+
+	<table cellspacing="1" id="down">
 	<thead>
-		<tr>
-			<th>{L_BBCODE_TAG}</th>
-			<th>{L_ACTION}</th>
-		</tr>
+	<tr>
+		<th>{L_BBCODE_TAG}</th>
+		<th>{L_ACTION}</th>
+	</tr>
 	</thead>
 	<tbody>
 	<!-- BEGIN bbcodes -->
 		<!-- IF bbcodes.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 			<td style="text-align: center;">{bbcodes.BBCODE_TAG}</td>
-			<td style="text-align: center;"><a href="{bbcodes.U_EDIT}">{L_EDIT}</a> | <a href="{bbcodes.U_DELETE}">{L_DELETE}</a></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>
 	<!-- END bbcodes -->
 	</tbody>
 	</table>
 
-	<form id="acp_bbcodes" method="post" action="{U_ACTION}">
-
-	<fieldset class="quick">
+	<p class="quick">
 		<input class="button2" name="submit" type="submit" value="{L_ADD_BBCODE}" />
+	</p>
 	</fieldset>
 
 	</form>
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_board.html

@@ -6,6 +6,13 @@
 
 <p>{L_TITLE_EXPLAIN}</p>
 
+<!-- IF S_ERROR -->
+	<div class="errorbox">
+		<h3>{L_WARNING}</h3>
+		<p>{ERROR_MSG}</p>
+	</div>
+<!-- ENDIF -->
+
 <form id="acp_board" method="post" action="{U_ACTION}">
 
 <!-- BEGIN options -->
@@ -24,6 +31,7 @@
 
 	<!-- ENDIF -->
 <!-- END options -->
+
 <!-- IF S_AUTH -->
 	<!-- BEGIN auth_tpl -->
 		{auth_tpl.TPL}
@@ -32,10 +40,11 @@
 </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>
 
 </form>
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_bots.html

@@ -21,35 +21,35 @@
 
 	<fieldset>
 		<legend>{L_TITLE}</legend>
-		<dl>
-			<dt><label for="bot_name">{L_BOT_NAME}:</label><br /><span>{L_BOT_NAME_EXPLAIN}</span></dt>
-			<dd><input name="bot_name" type="text" id="bot_name" value="{BOT_NAME}" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="bot_style">{L_BOT_STYLE}:</label><br /><span>{L_BOT_STYLE_EXPLAIN}</span></dt>
-			<dd><select id="bot_style" name="bot_style">{S_STYLE_OPTIONS}</select></dd>
-		</dl>
-		<dl>
-			<dt><label for="bot_lang">{L_BOT_LANG}:</label><br /><span>{L_BOT_LANG_EXPLAIN}</span></dt>
-			<dd><select id="bot_lang" name="bot_lang">{S_LANG_OPTIONS}</select></dd>
-		</dl>
-		<dl>
-			<dt><label for="bot_active">{L_BOT_ACTIVE}:</label></dt>
-			<dd><select id="bot_active" name="bot_active">{S_ACTIVE_OPTIONS}</select></dd>
-		</dl>
-		<dl>
-			<dt><label for="bot_agent">{L_BOT_AGENT}:</label><br /><span>{L_BOT_AGENT_EXPLAIN}</span></dt>
-			<dd><input name="bot_agent" type="text" id="bot_agent" value="{BOT_AGENT}" /></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}" /></dd>
-		</dl>
-	</fieldset>
+	<dl>
+		<dt><label for="bot_name">{L_BOT_NAME}:</label><br /><span>{L_BOT_NAME_EXPLAIN}</span></dt>
+		<dd><input name="bot_name" type="text" id="bot_name" value="{BOT_NAME}" maxlength="255" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="bot_style">{L_BOT_STYLE}:</label><br /><span>{L_BOT_STYLE_EXPLAIN}</span></dt>
+		<dd><select id="bot_style" name="bot_style">{S_STYLE_OPTIONS}</select></dd>
+	</dl>
+	<dl>
+		<dt><label for="bot_lang">{L_BOT_LANG}:</label><br /><span>{L_BOT_LANG_EXPLAIN}</span></dt>
+		<dd><select id="bot_lang" name="bot_lang">{S_LANG_OPTIONS}</select></dd>
+	</dl>
+	<dl>
+		<dt><label for="bot_active">{L_BOT_ACTIVE}:</label></dt>
+		<dd><select id="bot_active" name="bot_active">{S_ACTIVE_OPTIONS}</select></dd>
+	</dl>
+	<dl>
+		<dt><label for="bot_agent">{L_BOT_AGENT}:</label><br /><span>{L_BOT_AGENT_EXPLAIN}</span></dt>
+		<dd><input name="bot_agent" type="text" id="bot_agent" value="{BOT_AGENT}" maxlength="255" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="bot_ip">{L_BOT_IP}:</label><br /><span>{L_BOT_IP_EXPLAIN}</span></dt>
+		<dd><input name="bot_ip" type="text" id="bot_ip" value="{BOT_IP}" maxlength="255" /></dd>
+	</dl>
 
-	<fieldset class="submit-buttons">
+	<p class="submit-buttons">
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
 	</fieldset>
 
 	</form>
@@ -64,12 +64,12 @@
 
 	<table cellspacing="1">
 	<thead>
-		<tr>
-			<th>{L_BOT_NAME}</th>
-			<th>{L_BOT_LAST_VISIT}</th>
-			<th colspan="3">{L_OPTIONS}</th>
-			<th>{L_MARK}</th>
-		</tr>
+	<tr>
+		<th>{L_BOT_NAME}</th>
+		<th>{L_BOT_LAST_VISIT}</th>
+		<th colspan="3">{L_OPTIONS}</th>
+		<th>{L_MARK}</th>
+	</tr>
 	</thead>
 	<tbody>
 	<!-- BEGIN bots -->
@@ -79,7 +79,7 @@
 			<td style="text-align: center;">&nbsp;<a href="{bots.U_ACTIVATE_DEACTIVATE}">{bots.L_ACTIVATE_DEACTIVATE}</a>&nbsp;</td>
 			<td style="text-align: center;">&nbsp;<a href="{bots.U_EDIT}">{L_EDIT}</a>&nbsp;</td>
 			<td style="text-align: center;">&nbsp;<a href="{bots.U_DELETE}">{L_DELETE}</a>&nbsp;</td>
-			<td style="text-align: center;"><input type="checkbox" name="mark[]" value="{bots.BOT_ID}" class="radio" /></td>
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{bots.BOT_ID}" /></td>
 		</tr>
 	<!-- END bots -->
 	</tbody>
@@ -89,7 +89,7 @@
 		<input class="button2" name="add" type="submit" value="{L_BOT_ADD}" />
 	</fieldset>
 
-	<fieldset class="quick">
+	<fieldset class="quick" style="float: right;">
 		<select name="action">{S_BOT_OPTIONS}</select>
 		<input class="button2" name="submit" type="submit" value="{L_SUBMIT}" />
 	</fieldset>
@@ -98,4 +98,4 @@
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_captcha.html

@@ -0,0 +1,41 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h1>{L_ACP_VC_SETTINGS}</h1>
+
+<p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
+
+<form id="acp_captcha" method="post" action="{U_ACTION}">
+
+<fieldset>
+	<legend>{L_GENERAL_OPTIONS}</legend>
+<dl>
+	<dt><label for="enable_confirm">{L_VISUAL_CONFIRM_REG}:</label><br /><span>{L_VISUAL_CONFIRM_REG_EXPLAIN}</span></dt>
+	<dd><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><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><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_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 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>
+
+</form>
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_database.html

@@ -1,57 +1,89 @@
 <!-- INCLUDE overall_header.html -->
 
 <a name="maincontent"></a>
+
 <!-- IF MODE eq 'restore' -->
-<h1>{L_ACP_RESTORE}</h1>
+	<h1>{L_ACP_RESTORE}</h1>
 
-<p>{L_ACP_RESTORE_EXPLAIN}</p>
+	<p>{L_ACP_RESTORE_EXPLAIN}</p>
 
-<form id="acp_backup" method="post" action="{U_ACTION}">
-<fieldset>
-	<legend>{L_RESTORE_OPTIONS}</legend>
+	<form id="acp_backup" method="post" action="{U_ACTION}">
+	
+	<fieldset>
+		<legend>{L_RESTORE_OPTIONS}</legend>
 	<dl>
-		<dt><label for="user">{L_SELECT_FILE}:</label></dt>
-		<dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF not files.SUPPORTED --> disabled="disabled"<!-- ENDIF --><!-- IF files.SELECTED --> selected="selected"<!-- ENDIF -->>{files.FILE}</option><!-- END files --></select></dd>
+		<dt><label for="file">{L_SELECT_FILE}:</label></dt>
+		<dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_LAST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd>
 	</dl>
-</fieldset>
-<fieldset class="submit-buttons">
-	<input class="button1" type="submit" id="submit" name="submit" value="{L_START_RESTORE}" />&nbsp;
-	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-</fieldset>
-</form>
+
+	<!-- IF .files -->
+		<p class="submit-buttons">
+			<input class="button1" type="submit" id="submit" name="submit" value="{L_START_RESTORE}" />&nbsp;
+			<input class="button2" type="submit" id="delete" name="delete" value="{L_DELETE_BACKUP}" />&nbsp;
+			<input class="button2" type="submit" id="download" name="download" value="{L_DOWNLOAD_BACKUP}" />
+		</p>
+	<!-- ENDIF -->
+
+	</fieldset>
+	</form>
+
 <!-- ELSE -->
-<h1>{L_ACP_BACKUP}</h1>
+	<h1>{L_ACP_BACKUP}</h1>
 
-<p>{L_ACP_BACKUP_EXPLAIN}</p>
+	<p>{L_ACP_BACKUP_EXPLAIN}</p>
 
-<form id="acp_backup" method="post" action="{U_ACTION}">
-<fieldset>
-	<legend>{L_BACKUP_OPTIONS}</legend>
+	<script type="text/javascript">
+	<!--
+
+		function selector(bool)
+		{
+			var table = document.getElementById('table');
+
+			for (var i = 0; i < table.options.length; i++)
+			{
+				table.options[i].selected = bool;
+			}
+		}
+
+	//-->
+	</script>
+
+	<form id="acp_backup" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_BACKUP_OPTIONS}</legend>
 	<dl>
-		<dt><label for="user">{L_BACKUP_TYPE}:</label></dt>
-		<dd><input type="radio" name="type" value="full" id="type" checked="checked" />&nbsp;{L_FULL_BACKUP}&nbsp;&nbsp;<input type="radio" name="type" value="structure" id="type" />&nbsp;{L_STRUCTURE_ONLY}&nbsp;&nbsp;<input type="radio" name="type" value="data" id="type" />&nbsp;{L_DATA_ONLY}</dd>
+		<dt><label for="type">{L_BACKUP_TYPE}:</label></dt>
+		<dd><input type="radio" class="radio" name="type" value="full" id="type" checked="checked" />&nbsp;{L_FULL_BACKUP}&nbsp;&nbsp;<input type="radio" name="type" class="radio" value="structure" />&nbsp;{L_STRUCTURE_ONLY}&nbsp;&nbsp;<input type="radio" class="radio" name="type" value="data" />&nbsp;{L_DATA_ONLY}</dd>
 	</dl>
 	<dl>
-		<dt><label for="user">{L_FILE_TYPE}:</label></dt>
-		<!-- BEGIN methods -->
-		<dd><input name="method" id="method" type="radio" value="{methods.TYPE}"<!-- IF methods.S_FIRST_ROW -->checked="checked"<!-- ENDIF --> />&nbsp;{methods.TYPE}</dd>
-		<!-- END methods -->
+		<dt><label for="method">{L_FILE_TYPE}:</label></dt>
+		<dd><!-- BEGIN methods -->
+		<input name="method"<!-- IF methods.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> type="radio" class="radio" value="{methods.TYPE}" />&nbsp;{methods.TYPE}
+		<!-- END methods --></dd>
 	</dl>
 	<dl>
-		<dt><label for="user">{L_ACTION}:</label></dt>
-		<dd><input type="radio" name="where" value="download" id="where" checked="checked" />&nbsp;{L_DOWNLOAD}&nbsp;&nbsp;<input type="radio" name="where" value="store" id="where" />&nbsp;{L_STORE_LOCAL}</dd>
+		<dt><label for="where">{L_ACTION}:</label></dt>
+		<dd><input type="radio" class="radio" name="where" value="store_and_download" id="where" checked="checked" />&nbsp;{L_STORE_AND_DOWNLOAD}&nbsp;&nbsp;<input type="radio" class="radio" name="where" value="store" />&nbsp;{L_STORE_LOCAL}&nbsp;&nbsp;<input type="radio" class="radio" name="where" value="download" />&nbsp;{L_DOWNLOAD}</dd>
 	</dl>
 	<dl>
-		<dt><label for="user">{L_TABLE_SELECT}:</label></dt>
+		<dt><label for="table">{L_TABLE_SELECT}:</label></dt>
+		<dd><select id="table" name="table[]" size="10" multiple="multiple">
 		<!-- BEGIN tables -->
-		<dd><input name="table[]" id="table[]" type="checkbox" value="{tables.TABLE}" />&nbsp;{tables.TABLE}</dd>
+			<option value="{tables.TABLE}">{tables.TABLE}</option>
 		<!-- END tables -->
+		</select></dd>
+		<dd><a href="#" onclick="selector(true)">{L_SELECT_ALL}</a> :: <a href="#" onclick="selector(false)">{L_DESELECT_ALL}</a></dd>
 	</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}" />
-</fieldset>
-</form>
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
+	</fieldset>
+
+	</form>
+
 <!-- ENDIF -->
-<!-- INCLUDE overall_footer.html -->
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_disallow.html

@@ -10,14 +10,14 @@
 
 <fieldset>
 	<legend>{L_ADD_DISALLOW_TITLE}</legend>
-	<dl>
-		<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_ADD_DISALLOW_EXPLAIN}</span></dt>
-		<dd><input id="user" type="text" name="disallowed_user" class="medium" /></dd>
-	</dl>
-</fieldset>
+<dl>
+	<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_ADD_DISALLOW_EXPLAIN}</span></dt>
+	<dd><input id="user" type="text" name="disallowed_user" class="medium" maxlength="255" /></dd>
+</dl>
 
-<fieldset class="quick">
+<p class="quick">
 	<input class="button1" type="submit" name="disallow" value="{L_SUBMIT}" />
+</p>
 </fieldset>
 
 <h1>{L_DELETE_DISALLOW_TITLE}</h1>
@@ -31,17 +31,15 @@
 		<dt><label for="disallowed">{L_USERNAME}:</label></dt>
 		<dd><select name="disallowed_id" id="disallowed">{S_DISALLOWED_NAMES}</select></dd>
 	</dl>
-</fieldset>
-
-<fieldset class="quick">
-	<input class="button1" type="submit" name="allow" value="{L_SUBMIT}" />
-</fieldset>
 
+	<p class="quick">
+		<input class="button1" type="submit" name="allow" value="{L_SUBMIT}" />
+	</p>
 <!-- ELSE -->
 	<p>{L_NO_DISALLOWED}</p>
-</fieldset>
 <!-- ENDIF -->
+</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="#" onclick="window.open('{U_FIND_USERNAME}', '_phpbbsearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;">{L_FIND_USERNAME}</a> ]</dd>
+	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); 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_IMMEDIATLY}:</label></dt>
-	<dd><input id="send" type="checkbox" name="send_immediatly" checked="checked" /></dd>
+	<dt><label for="send">{L_SEND_IMMEDIATELY}:</label></dt>
+	<dd><input id="send" type="checkbox" class="radio" name="send_immediately" checked="checked" /></dd>
 </dl>
-</fieldset>
 
-<fieldset class="submit-buttons">
+<p 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>
 </fieldset>
 
 </form>
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_forums.html

@@ -7,6 +7,9 @@
 	<script type="text/javascript">
 	<!--
 
+		/**
+		* Handle displaying/hiding several options based on the forum type
+		*/
 		function display_options(value)
 		{
 			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
@@ -20,6 +23,17 @@
 				}
 			<!-- 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);
@@ -43,6 +57,41 @@
 			}
 		}
 
+		/**
+		* 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>
 
@@ -53,10 +102,10 @@
 	<p>{L_FORUM_EDIT_EXPLAIN}</p>
 
 	<!-- IF S_ERROR -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
 	<!-- ENDIF -->
 
 	<form id="forumedit" method="post" action="{U_EDIT_ACTION}">
@@ -68,12 +117,24 @@
 		<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"<!-- IF S_FORUM_POST --> style="display: none;"<!-- ENDIF -->>
-	<dl>
-		<dt><label for="type_action">{L_DECIDE_MOVE_DELETE_CONTENT}:</label></dt>
-		<dd><input type="radio" class="radio" id="type_action" name="type_action" value="delete" checked="checked" /> {L_DELETE_ALL_POSTS}</dd>
-		<!-- IF S_MOVE_FORUM_OPTIONS --><dd><input type="radio" class="radio" name="type_action" value="move" /> {L_MOVE_POSTS_TO} <select name="to_forum_id">{S_MOVE_FORUM_OPTIONS}</select></dd><!-- ENDIF -->
-	</dl>
+	<div id="type_actions">
+		<dl>
+			<dt><label for="type_action">{L_DECIDE_MOVE_DELETE_CONTENT}:</label></dt>
+			<dd><input type="radio" class="radio" id="type_action" name="type_action" value="delete" checked="checked" /> {L_DELETE_ALL_POSTS}</dd>
+			<!-- IF S_MOVE_FORUM_OPTIONS --><dd><input type="radio" class="radio" name="type_action" value="move" /> {L_MOVE_POSTS_TO} <select name="to_forum_id">{S_MOVE_FORUM_OPTIONS}</select></dd><!-- ENDIF -->
+		</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><input type="radio" class="radio" name="action_subforums" value="move" checked="checked" /> {L_MOVE_SUBFORUMS_TO} <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
+			<!-- ELSE -->
+				<dd><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</dd>
+			<!-- ENDIF -->
+		</dl>
 	</div>
 	<!-- ENDIF -->
 	<dl>
@@ -82,48 +143,63 @@
 	</dl>
 	<dl>
 		<dt><label for="forum_name">{L_FORUM_NAME}:</label></dt>
-		<dd><input class="medium" type="text" id="forum_name" name="forum_name" value="{FORUM_NAME}" /></dd>
+		<dd><input class="medium" type="text" id="forum_name" name="forum_name" value="{FORUM_NAME}" maxlength="255" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="forum_desc">{L_FORUM_DESC}:</label><br /><span>{L_FORUM_DESC_EXPLAIN}</span></dt>
-		<dd><textarea id="forum_desc" name="forum_desc" rows="5" cols="45">{FORUM_DESC}</textarea></dd>
+		<dd><textarea id="forum_desc" name="forum_desc" rows="5" cols="45" maxlength="255">{FORUM_DESC}</textarea></dd>
+		<dd><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE} &nbsp; <input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES} &nbsp; <input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</dd>
 	</dl>
 	<dl>
 		<dt><label for="forum_image">{L_FORUM_IMAGE}:</label><br /><span>{L_FORUM_IMAGE_EXPLAIN}</span></dt>
-		<dd><input class="medium" type="text" id="forum_image" name="forum_image" value="{FORUM_IMAGE}" /></dd>
+		<dd><input class="medium" type="text" id="forum_image" name="forum_image" value="{FORUM_IMAGE}" maxlength="255" /></dd>
 		<!-- IF FORUM_IMAGE_SRC -->
 			<dd><img src="{FORUM_IMAGE_SRC}" alt="{L_FORUM_IMAGE}" /></dd>
 		<!-- ENDIF -->
 	</dl>
+	<dl>
+		<dt><label for="forum_password">{L_FORUM_PASSWORD}:</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt>
+		<dd><input type="password" id="forum_password" name="forum_password" value="{FORUM_PASSWORD}" maxlength="40" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}:</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt>
+		<dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="{FORUM_PASSWORD_CONFIRM}" /></dd>
+	</dl>
 	<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_ADD_ACTION -->
 	<dl>
 		<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
 		<dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>
 	</dl>
-	<!-- ENDIF -->
 	</fieldset>
 
-	<div id="forum_cat_options"<!-- IF not S_FORUM_CAT --> style="display: none;"<!-- ENDIF -->>
+	<div id="forum_cat_options">
 		<fieldset>
 			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
 		<dl>
 			<dt><label for="display_active">{L_DISPLAY_ACTIVE_TOPICS}:</label><br /><span>{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}</span></dt>
 			<dd><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"<!-- IF not S_FORUM_POST --> style="display: none;"<!-- ENDIF -->>
+	<div id="forum_post_options">
 		<fieldset>
 			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
 		<dl>
 			<dt><label for="forum_status">{L_FORUM_STATUS}:</label></dt>
 			<dd><select id="forum_status" name="forum_status">{S_STATUS_OPTIONS}</select></dd>
 		</dl>
+		<dl>
+			<dt><label for="display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
+			<dd><input type="radio" class="radio" name="display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+		</dl>
+		<dl>
+			<dt><label for="enable_post_review">{L_ENABLE_POST_REVIEW}:</label><br /><span>{L_ENABLE_POST_REVIEW_EXPLAIN}</span></dt>
+			<dd><input type="radio" class="radio" name="enable_post_review" value="1"<!-- IF S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="enable_post_review" value="0"<!-- IF not S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+		</dl>
 		<dl>
 			<dt><label for="enable_indexing">{L_ENABLE_INDEXING}:</label><br /><span>{L_ENABLE_INDEXING_EXPLAIN}</span></dt>
 			<dd><input type="radio" class="radio" name="enable_indexing" value="1"<!-- IF S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="enable_indexing" value="0"<!-- IF not S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
@@ -132,31 +208,33 @@
 			<dt><label for="enable_icons">{L_ENABLE_TOPIC_ICONS}:</label></dt>
 			<dd><input type="radio" class="radio" name="enable_icons" value="1"<!-- IF S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="enable_icons" value="0"<!-- IF not S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
 		</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><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="display_recent">{L_ENABLE_RECENT}:</label><br /><span>{L_ENABLE_RECENT_EXPLAIN}</span></dt>
 			<dd><input type="radio" class="radio" name="display_recent" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="display_recent" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
 		</dl>
+		<dl>
+			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}:</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
+			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>
+		</dl>
+		</fieldset>
+
+		<fieldset>
+			<legend>{L_FORUM_PRUNE_SETTINGS}</legend>
 		<dl>
 			<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}:</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt>
 			<dd><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}" /> {L_DAYS}</dd>
+			<dd><input type="text" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_days">{L_AUTO_PRUNE_DAYS}:</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
-			<dd><input type="text" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" /> {L_DAYS}</dd>
+			<dd><input type="text" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" maxlength="4" size="4" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_viewed">{L_AUTO_PRUNE_VIEWED}:</label><br /><span>{L_AUTO_PRUNE_VIEWED_EXPLAIN}</span></dt>
-			<dd><input type="text" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" /> {L_DAYS}</dd>
+			<dd><input type="text" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" maxlength="4" size="4" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
@@ -170,27 +248,19 @@
 			<dt><label for="prune_sticky">{L_PRUNE_STICKY}:</label></dt>
 			<dd><input type="radio" class="radio" name="prune_sticky" value="1"<!-- IF S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="prune_sticky" value="0"<!-- IF not S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
 		</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}" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="forum_password">{L_FORUM_PASSWORD}:</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt>
-			<dd><input type="password" id="forum_password" name="forum_password" value="{FORUM_PASSWORD}" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}:</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt>
-			<dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="{FORUM_PASSWORD_CONFIRM}" /></dd>
-		</dl>
 		</fieldset>
 	</div>
 
-	<div id="forum_link_options"<!-- IF not S_FORUM_LINK --> style="display: none;"<!-- ENDIF -->>
+	<div id="forum_link_options">
 		<fieldset>
 			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
+		<dl>
+			<dt><label for="link_display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
+			<dd><input type="radio" class="radio" name="link_display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="link_display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+		</dl>
 		<dl>
 			<dt><label for="forum_link">{L_FORUM_LINK}:</label><br /><span>{L_FORUM_LINK_EXPLAIN}</span></dt>
-			<dd><input class="medium" type="text" id="forum_link" name="forum_link" value="{FORUM_DATA_LINK}" /></dd>
+			<dd><input class="medium" type="text" id="forum_link" name="forum_link" value="{FORUM_DATA_LINK}" maxlength="255" /></dd>
 		</dl>
 		<dl>
 			<dt><label for="forum_link_track">{L_FORUM_LINK_TRACK}:</label><br /><span>{L_FORUM_LINK_TRACK_EXPLAIN}</span></dt>
@@ -199,12 +269,12 @@
 		</fieldset>
 	</div>
 
-	<div id="forum_rules_options"<!-- IF S_FORUM_LINK --> style="display: none;"<!-- ENDIF -->>
+	<div id="forum_rules_options">
 		<fieldset>
 			<legend>{L_FORUM_RULES}</legend>
 		<dl>
 			<dt><label for="forum_rules_link">{L_FORUM_RULES_LINK}:</label><br /><span>{L_FORUM_RULES_LINK_EXPLAIN}</span></dt>
-			<dd><input class="medium" type="text" id="forum_rules_link" name="forum_rules_link" value="{FORUM_RULES_LINK}" /></dd>
+			<dd><input class="medium" type="text" id="forum_rules_link" name="forum_rules_link" value="{FORUM_RULES_LINK}" maxlength="255" /></dd>
 		</dl>
 	<!-- IF FORUM_RULES_PREVIEW -->
 		<dl>
@@ -215,12 +285,13 @@
 		<dl>
 			<dt><label for="forum_rules">{L_FORUM_RULES}:</label><br /><span>{L_FORUM_RULES_EXPLAIN}</span></dt>
 			<dd><textarea id="forum_rules" name="forum_rules" rows="4" cols="70">{FORUM_RULES_PLAIN}</textarea></dd>
-			<dd><input type="checkbox" name="parse_bbcode"<!-- IF S_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE} &nbsp; <input type="checkbox" name="parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES} &nbsp; <input type="checkbox" name="parse_urls"<!-- IF S_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</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}" />
 	</fieldset>
@@ -236,10 +307,10 @@
 	<p>{L_FORUM_DELETE_EXPLAIN}</p>
 
 	<!-- IF S_ERROR -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
 	<!-- ENDIF -->
 
 	<form id="acp_forum" method="post" action="{U_ACTION}">
@@ -268,80 +339,136 @@
 			<!-- ENDIF -->
 		</dl>
 	<!-- ENDIF -->
-	</fieldset>
 
-	<fieldset class="quick">
+	<p class="quick">
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+	</p>
 	</fieldset>
 
 	</form>
 
+<!-- ELSEIF S_CONTINUE_SYNC -->
+
+	<script type="text/javascript">
+	<!--
+
+		var close_waitscreen = 0;
+		window.open('{UA_PROGRESS_BAR}', '_sync', 'height=240, resizable=yes, scrollbars=no, width=400');
+
+	//-->
+	</script>
+
+	<h1>{L_FORUM_ADMIN}</h1>
+
+	<p>{L_FORUM_ADMIN_EXPLAIN}</p>
+
+	<p>{L_PROGRESS_EXPLAIN}</p>
+
 <!-- ELSE -->
 
+	<script type="text/javascript">
+	<!--
+
+		/**
+		* Popup search progress bar
+		*/
+		function popup_progress_bar()
+		{
+			var close_waitscreen = 0;
+			window.open('{UA_PROGRESS_BAR}', '_sync', 'height=240, resizable=yes, scrollbars=no, width=400');
+		}
+
+	//-->
+	</script>
+
 	<h1>{L_FORUM_ADMIN}</h1>
 
 	<p>{L_FORUM_ADMIN_EXPLAIN}</p>
 
 	<!-- IF ERROR_MSG -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
 	<!-- ENDIF -->
 
 	<!-- IF S_RESYNCED -->
+		<script type="text/javascript">
+		<!--
+			var close_waitscreen = 1;
+		//-->
+		</script>
+
 		<div class="successbox">
 			<h3>{L_NOTIFY}</h3>
 			<p>{L_FORUM_RESYNCED}</p>
 		</div>
 	<!-- ENDIF -->
-	
+
 	<p><strong>{NAVIGATION}<!-- IF S_NO_FORUMS --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a><!-- IF not S_LINK --> | <a href="{U_SYNC}">{L_RESYNC}</a><!-- ENDIF --->]<!-- ENDIF --></strong></p>
 
-<!-- IF forums -->
-	<table cellspacing="1">
-		<col class="row1" /><col class="row1" /><col class="row2" />
-	<tbody>
-	<!-- BEGIN forums -->
-		<tr>
-			<td style="width: 5%;">{forums.FOLDER_IMAGE}</td>
-			<td>
-				<strong><!-- IF forums.S_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF --></strong>
-				<!-- IF forums.FORUM_DESCRIPTION --><br /><span>{forums.FORUM_DESCRIPTION}</span><!-- ENDIF -->
-				<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}: <b>{forums.FORUM_TOPICS}</b> / {L_POSTS}: <b>{forums.FORUM_POSTS}</b></span><!-- ENDIF -->
-			</td>
-			<td style="width: 15%; text-align: right; white-space: nowrap;"><!-- IF not forums.S_FIRST_ROW --><a href="{forums.U_MOVE_UP}"><img src="images/icon_up.gif" alt="{L_MOVE_UP}" title="{L_MOVE_UP}" width="16" height="16" /></a> <!-- ENDIF -->
-				<!-- IF not forums.S_LAST_ROW --><a href="{forums.U_MOVE_DOWN}"><img src="images/icon_down.gif" alt="{L_MOVE_DOWN}" title="{L_MOVE_DOWN}" width="16" height="16" /></a> <!-- ENDIF -->
-				<a href="{forums.U_EDIT}"><img src="images/icon_edit.gif" alt="{L_EDIT}" title="{L_EDIT}" width="16" height="16" /></a> 
-				<!-- IF not forums.S_LINK --><a href="{forums.U_SYNC}"><img src="images/icon_sync.gif" alt="{L_RESYNC}" title="{L_RESYNC}" width="16" height="16" /></a> <!-- ENDIF -->
-				<a href="{forums.U_DELETE}"><img src="images/icon_delete.gif" alt="{L_DELETE}" title="{L_DELETE}" width="16" height="16" /></a></td>
-		</tr>
-	<!-- END forums -->
-	</tbody>
-	</table>
-<!-- ENDIF -->
+	<!-- IF .forums -->
+		<table cellspacing="1">
+			<col class="row1" /><col class="row1" /><col class="row2" />
+		<tbody>
+		<!-- BEGIN forums -->
+			<tr>
+				<td style="width: 5%;">{forums.FOLDER_IMAGE}</td>
+				<td>
+					<!-- IF forums.FORUM_IMAGE --><div style="float: left; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF -->
+					<strong><!-- IF forums.S_FORUM_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF --></strong>
+					<!-- IF forums.FORUM_DESCRIPTION --><br /><span>{forums.FORUM_DESCRIPTION}</span><!-- ENDIF -->
+					<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}: <b>{forums.FORUM_TOPICS}</b> / {L_POSTS}: <b>{forums.FORUM_POSTS}</b></span><!-- ENDIF -->
+				</td>
+				<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
+					<!-- IF forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
+						{ICON_MOVE_UP_DISABLED}
+						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<!-- ELSEIF not forums.S_FIRST_ROW && not forums.S_LAST_ROW-->
+						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a>
+						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<!-- ELSEIF forums.S_LAST_ROW && not forums.S_FIRST_ROW -->
+						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a>
+						{ICON_MOVE_DOWN_DISABLED}
+					<!-- ELSE -->
+						{ICON_MOVE_UP_DISABLED}
+						{ICON_MOVE_DOWN_DISABLED}
+					<!-- ENDIF -->
+					<a href="{forums.U_EDIT}">{ICON_EDIT}</a>
+					<!-- IF not forums.S_FORUM_LINK -->
+						<a href="{forums.U_SYNC}" onclick="popup_progress_bar();">{ICON_SYNC}</a>
+					<!-- ELSE -->
+						{ICON_SYNC_DISABLED}
+					<!-- ENDIF -->
+					<a href="{forums.U_DELETE}">{ICON_DELETE}</a>
+				</td>
+			</tr>
+		<!-- END forums -->
+		</tbody>
+		</table>
+	<!-- ENDIF -->
+
+	<form id="fselect" method="post" action="{U_SEL_ACTION}">
+
+	<fieldset class="quick">
+		{L_SELECT_FORUM}: <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select>
+
+		<input class="button2" type="submit" value="{L_GO}" />
+	</fieldset>
+
+	</form>
 
 	<form id="forums" method="post" action="{U_ACTION}">
 
-	<fieldset class="quick" style="float: left;">
+	<fieldset class="quick">
 		<input type="hidden" name="action" value="add" />
 
-		<input type="text" name="forum_name" /> 
+		<input type="text" name="forum_name" value="" maxlength="255" />
 		<input class="button2" name="addforum" type="submit" value="{L_CREATE_FORUM}" />
 	</fieldset>
 
 	</form>
 
-	<form id="fselect" method="post" action="{U_SEL_ACTION}">
-
-	<fieldset class="quick">
-		{L_SELECT_FORUM}: <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select> 
-
-		<input class="button2" type="submit" value="{L_GO}" />
-	</fieldset>
-	
-	</form>
-
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_groups.html

@@ -21,14 +21,15 @@
 
 	<fieldset>
 		<legend>{L_GROUP_DETAILS}</legend>
-		<dl>
-			<dt><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}:</label></dt>
-			<dd><!-- IF S_SPECIAL_GROUP --><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_description">{L_GROUP_DESC}:</label></dt>
-			<dd><input name="group_description" type="text" id="group_description" value="{GROUP_DESCRIPTION}" /></dd>
-		</dl>
+	<dl>
+		<dt><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}:</label></dt>
+		<dd><!-- IF S_SPECIAL_GROUP --><b>{GROUP_NAME}</b><!-- ENDIF --><input name="group_name" type="<!-- IF S_SPECIAL_GROUP -->hidden<!-- ELSE -->text<!-- ENDIF -->" id="group_name" value="{GROUP_INTERNAL_NAME}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="group_desc">{L_GROUP_DESC}:</label></dt>
+		<dd><textarea id="group_desc" name="group_desc" rows="5" cols="45">{GROUP_DESC}</textarea></dd>
+		<dd><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE} &nbsp; <input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES} &nbsp; <input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</dd>
+	</dl>
 	<!-- IF not S_SPECIAL_GROUP -->
 		<dl>
 			<dt><label for="group_type">{L_GROUP_TYPE}:</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
@@ -43,60 +44,70 @@
 		<input name="group_type" type="hidden" value="{GROUP_TYPE_SPECIAL}" />
 	<!-- ENDIF -->
 
-	<!-- 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>
-	</dl>
+	<!-- IF S_ADD_GROUP and S_GROUP_PERM -->
+		<dl>
+			<dt><label for="group_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
+			<dd><select id="group_perm_from" name="group_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_GROUP_OPTIONS}</select></dd>
+		</dl>
 	<!-- ENDIF -->
 	</fieldset>
 
 	<fieldset>
 		<legend>{L_GROUP_SETTINGS_SAVE}</legend>
-		<dl>
-			<dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}:</label></dt>
-			<dd><input name="group_receive_pm" type="checkbox" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd>
-		</dl>
-		<dl>
-			<dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}:</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt>
-			<dd><input name="group_message_limit" type="text" id="group_message_limit" maxlength="4" size="4" value="{GROUP_MESSAGE_LIMIT}" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
-			<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />&nbsp;&nbsp;<span>[ <a href="#" onclick="swatch(); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>
-		</dl>
-		<dl>
-			<dt><label for="group_rank">{L_GROUP_RANK}:</label></dt>
-			<dd><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></dd>
-		</dl>
+	<!-- 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></dt>
+		<dd><input name="group_receive_pm" type="checkbox" class="radio" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd>
+	</dl>
+	<dl>
+		<dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}:</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt>
+		<dd><input name="group_message_limit" type="text" id="group_message_limit" maxlength="4" size="4" value="{GROUP_MESSAGE_LIMIT}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
+		<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />&nbsp;&nbsp;<span>[ <a href="#" onclick="swatch(); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>
+	</dl>
+	<dl>
+		<dt><label for="group_rank">{L_GROUP_RANK}:</label></dt>
+		<dd><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></dd>
+	</dl>
 	</fieldset>
 
 	<fieldset>
 		<legend>{L_GROUP_AVATAR}</legend>
-		<dl>
-			<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-			<dd>{AVATAR_IMAGE}</dd>
-			<dd><input type="checkbox" name="delete" />&nbsp;<span>{L_DELETE_AVATAR}</span></dd>
-		</dl>
+	<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>
+				<dd><input type="file" id="uploadfile" name="uploadfile" /></dd>
 			</dl>
 			<dl>
 				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
 				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd>
 			</dl>
 		<!-- ENDIF -->
-			<dl>
-				<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-				<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd>
-			</dl>
-			<dl>
-				<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
-				<dd><input name="width" type="text" id="width" size="3" value="{GROUP_AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{GROUP_AVATAR_HEIGHT}" /> <span>px</span></dd>
-			</dl>
+		<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="{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> 
 				<dt><label>{L_AVATAR_GALLERY}:</label></dt>
@@ -108,26 +119,26 @@
 
 		<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>
+		<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;">
@@ -138,6 +149,7 @@
 	</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}" />
 	</fieldset>
@@ -148,12 +160,16 @@
 
 	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
-	<h1>{L_GROUP_MEMBERS}</h1>
+	<h1>{L_GROUP_MEMBERS} :: {GROUP_NAME}</h1>
 
 	<p>{L_GROUP_MEMBERS_EXPLAIN}</p>
 
 	<form id="list" method="post" action="{U_ACTION}">
 
+	<fieldset class="quick">
+		<a href="{U_DEFAULT_ALL}">&raquo; {L_MAKE_DEFAULT_FOR_ALL}</a>
+	</fieldset>
+
 	<table cellspacing="1">
 	<thead>
 	<tr>
@@ -165,24 +181,22 @@
 	</tr>
 	</thead>
 	<tbody>
-	<!-- IF not S_GROUP_SPECIAL -->
-		<tr>
-			<td class="row3" colspan="5"><b>{L_GROUP_LEAD}</b></td>
+	<tr>
+		<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 -->
+			<td><a href="{leader.U_USER_EDIT}">{leader.USERNAME}</a></td>
+			<td style="text-align: center;"><!-- IF leader.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
+			<td style="text-align: center;">{leader.JOINED}</td>
+			<td style="text-align: center;">{leader.USER_POSTS}</td>
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{leader.USER_ID}" /></td>
 		</tr>
-		<!-- BEGIN leader -->
-			<!-- IF leader.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-				<td><a href="{leader.U_USER_EDIT}">{leader.USERNAME}</a></td>
-				<td style="text-align: center;"><!-- IF leader.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
-				<td style="text-align: center;">{leader.JOINED}</td>
-				<td style="text-align: center;">{leader.USER_POSTS}</td>
-				<td style="text-align: center;"><input type="checkbox" name="mark[]" value="{leader.USER_ID}" /></td>
-			</tr>
-		<!-- BEGINELSE -->
-			<tr>
-				<td class="row1" colspan="5" style="text-align: center;">{L_GROUPS_NO_MODS}</td>
-			</tr>
-		<!-- END leader -->
-	<!-- ENDIF -->
+	<!-- BEGINELSE -->
+		<tr>
+			<td class="row1" colspan="5" style="text-align: center;">{L_GROUPS_NO_MODS}</td>
+		</tr>
+	<!-- END leader -->
 	<tr>
 		<td class="row3" colspan="5"><b>{L_GROUP_APPROVED}</b></td>
 	</tr>
@@ -197,7 +211,7 @@
 			<td style="text-align: center;"><!-- IF member.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
 			<td style="text-align: center;">{member.JOINED}</td>
 			<td style="text-align: center;">{member.USER_POSTS}</td>
-			<td style="text-align: center;"><input type="checkbox" name="mark[]" value="{member.USER_ID}" /></td>
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{member.USER_ID}" /></td>
 		</tr>
 		<!-- ENDIF -->
 	<!-- BEGINELSE -->
@@ -207,20 +221,16 @@
 	<!-- END member -->
 	</tbody>
 	</table>
-
-	<div class="pagination" style="float: left;">
-		<!-- IF PAGINATION -->
-			<a href="javascript:jumpto();" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-		<!-- ELSE -->
-			{S_ON_PAGE}
-		<!-- ENDIF -->
+	<!-- 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">
-		<span class="small"><a href="javascript:marklist('list', 'mark', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('list', 'mark', 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>
@@ -240,12 +250,12 @@
 	<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}" target="usersearch">{L_FIND_USERNAME}</a> ]</dd>
+		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd>
 	</dl>
-	</fieldset>
 
-	<fieldset class="quick">
+	<p class="quick">
 		<input class="button2" type="submit" name="addusers" value="{L_SUBMIT}" />
+	</p>
 	</fieldset>
 
 	</form>
@@ -256,6 +266,13 @@
 
 	<p>{L_ACP_GROUPS_MANAGE_EXPLAIN}</p>
 
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
 	<h1>{L_USER_DEF_GROUPS}</h1>
 
 	<p>{L_USER_DEF_GROUPS_EXPLAIN}</p>
@@ -266,23 +283,32 @@
 		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
-		<th style="width: 50%">{L_MANAGE}</th>
+		<th style="width: 50%">{L_GROUP}</th>
 		<th>{L_TOTAL_MEMBERS}</th>
-		<th colspan="3">{L_OPTIONS}</th>
+		<th colspan="2">{L_OPTIONS}</th>
+		<th>{L_ACTION}</th>
 	</tr>
 	</thead>
 	<tbody>
 	<!-- BEGIN groups -->
 		<!-- IF groups.S_SPECIAL -->
+		<!-- IF groups.S_FIRST_ROW -->
+			<tr>
+				<td colspan="5" class="row3">{L_NO_GROUPS_CREATED}</td>
+			</tr>
+		<!-- ENDIF -->
 	</tbody>
 	</table>
 
 	<fieldset class="quick">
 		<!-- IF S_GROUP_ADD -->
-			{L_CREATE_GROUP}: <input type="text" name="group_name" value="" /> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" />
+			{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 -->
 	</fieldset>
 
+	</form>
+
 	<h1>{L_SPECIAL_GROUPS}</h1>
 
 	<p>{L_SPECIAL_GROUPS_EXPLAIN}</p>
@@ -291,18 +317,19 @@
 		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
-		<th style="width: 50%">{L_MANAGE}</th>
+		<th style="width: 50%">{L_GROUP}</th>
 		<th>{L_TOTAL_MEMBERS}</th>
-		<th colspan="3">{L_OPTIONS}</th>
+		<th colspan="2">{L_OPTIONS}</th>
+		<th>{L_ACTION}</th>
 	</tr>
 	</thead>
 	<tbody>
 		<!-- ELSE -->
 		<tr>
-			<td><a href="{groups.U_LIST}">{groups.GROUP_NAME}</a></td>
+			<td><strong>{groups.GROUP_NAME}</strong></td>
 			<td style="text-align: center;">{groups.TOTAL_MEMBERS}</td>
-			<td style="text-align: center;"><a href="{groups.U_DEFAULT}">{L_GROUP_DEFAULT}</a></td>
-			<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_EDIT}</a></td>
+			<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_SETTINGS}</a></td>
+			<td style="text-align: center;"><a href="{groups.U_LIST}">{L_MEMBERS}</a></td>
 			<td style="text-align: center;"><!-- IF not groups.S_GROUP_SPECIAL and groups.U_DELETE --><a href="{groups.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
 		</tr>
 		<!-- ENDIF -->
@@ -310,8 +337,6 @@
 	</tbody>
 	</table>
 
-	</form>
-
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_icons.html

@@ -12,6 +12,9 @@
 
 	<form id="acp_icons" method="post" action="{U_ACTION}">
 
+	<fieldset class="tabulated">
+	<legend>{L_TITLE}</legend>
+
 	<table cellspacing="1">
 	<thead>
 	<tr>
@@ -42,13 +45,13 @@
 		<td style="text-align: center;"><img src="{items.IMG_SRC}" alt="" title="" /><input type="hidden" name="image[{items.IMG}]" value="1" /></td>
 		<td style="vertical-align: top;">[{items.IMG}]</td>
 		<!-- IF S_SMILIES -->
-			<td><input class="post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" /></td>
-			<td><input class="post" type="text" name="emotion[{items.IMG}]" value="{items.EMOTION}" size="10" /></td>
+			<td><input class="post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" maxlength="50" /></td>
+			<td><input class="post" type="text" name="emotion[{items.IMG}]" value="{items.EMOTION}" size="10" maxlength="50" /></td>
 		<!-- ENDIF -->
 		<td><input class="post" type="text" size="3" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
 		<td><input class="post" type="text" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
 		<td>
-			<input type="checkbox" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} />
+			<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 -->
@@ -57,16 +60,17 @@
 			<td><select name="order[{items.IMG}]">{S_ORDER_LIST}</select></td>
 		<!-- ENDIF -->	
 		<!-- IF S_ADD -->
-			<td><input type="checkbox" name="add_img[{items.IMG}]" value="1" /></td>
+			<td><input type="checkbox" class="radio" name="add_img[{items.IMG}]" value="1" /></td>
 		<!-- ENDIF -->
 		</tr>
 	<!-- END items -->
 	</tbody>
 	</table>
 
-	<fieldset class="submit-buttons">
+	<p class="submit-buttons">
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
 	</fieldset>
 
 	</form>
@@ -86,7 +90,6 @@
 	
 	<!-- IF not S_PAK_OPTIONS -->
 		<p>{L_NO_PAK_OPTIONS}</p>
-	</fieldset>
 
 	<!-- ELSE -->
 		<dl>
@@ -96,12 +99,12 @@
 			<dt><label for="current">{L_CURRENT}</label><br /><span>{L_CURRENT_EXPLAIN}</span></dt>
 			<dd><input type="radio" class="radio" id="current" name="current" value="keep" checked="checked" /> {L_KEEP_ALL}&nbsp; &nbsp;<input type="radio" class="radio" name="current" value="replace" /> {L_REPLACE_MATCHES}&nbsp; &nbsp;<input type="radio" class="radio" name="current" value="delete" /> {L_DELETE_ALL}&nbsp;</dd>
 		</dl>
-	</fieldset>
 
-	<fieldset class="quick">
+	<p class="quick">
 		<input class="button1" type="submit" id="import" name="import" value="{L_IMPORT_SUBMIT}" />
-	</fieldset>
+	</p>
 	<!-- ENDIF -->
+	</fieldset>
 
 	</form>
 
@@ -118,8 +121,14 @@
 		</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>
@@ -128,8 +137,7 @@
 		<th>{L_CODE}</th>
 		<th>{L_EMOTION}</th>
 		<!-- ENDIF -->
-		<th>{L_ACTION}</th>
-		<th>{L_REORDER}</th>
+		<th>{L_OPTIONS}</th>
 	</tr>
 	</thead>
 	<tbody>
@@ -140,26 +148,28 @@
 			</tr>
 		<!-- ENDIF -->
 		<!-- IF items.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td style="text-align: center;"><img src="{items.IMG_SRC}" width="{items.WIDTH}" height="{items.HEIGHT}" alt="{items.ALT_TEXT}" title="{items.ALT_TEXT}" /></td>
+			<td style="width: 85%; text-align: center;"><img src="{items.IMG_SRC}" width="{items.WIDTH}" height="{items.HEIGHT}" alt="{items.ALT_TEXT}" title="{items.ALT_TEXT}" /></td>
 			<!-- IF S_SMILIES -->
 				<td style="text-align: center;">{items.CODE}</td>
 				<td style="text-align: center;">{items.EMOTION}</td>
 			<!-- ENDIF -->
-			<td style="text-align: center;"><a href="{items.U_EDIT}">{L_EDIT}</a> | <a href="{items.U_DELETE}">{L_DELETE}</a></td>
-			<td style="text-align: center;"><a href="{items.U_MOVE_UP}">{L_MOVE_UP}</a> <br /> <a href="{items.MOVE_DOWN}">{L_MOVE_DOWN}</a></td>
+			<td style="text-align: right; white-space: nowrap;">
+				<!-- IF items.S_FIRST_ROW -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF -->&nbsp;
+				<!-- IF items.S_LAST_ROW -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF -->
+				&nbsp;<a href="{items.U_EDIT}">{ICON_EDIT}</a> <a href="{items.U_DELETE}">{ICON_DELETE}</a>
+			</td>
 		</tr>
 	<!-- END items -->
 	</tbody>
 	</table>
 
-	<form id="acp_icons" method="post" action="{U_ACTION}">
-
-	<fieldset class="quick">
+	<p class="quick">
 		<input class="button2" name="add" type="submit" value="{L_ICON_ADD}" />&nbsp; &nbsp;<input class="button2" type="submit" name="edit" value="{L_ICON_EDIT}" />
+	</p>
 	</fieldset>
 
 	</form>
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_inactive.html

@@ -0,0 +1,71 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+
+<h2>{L_INACTIVE_USERS}</h2>
+
+<p>{L_INACTIVE_USERS_EXPLAIN}</p>
+
+<form id="inactive" method="post" action="{U_ACTION}">
+
+<div class="clearfix"></div>
+
+<!-- IF PAGINATION -->
+<div class="pagination">
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+</div>
+<!-- ENDIF -->
+
+<table cellspacing="1">
+<thead>
+<tr>
+	<th>{L_USERNAME}</th>
+	<th>{L_JOINED}</th>
+	<th>{L_INACTIVE_DATE}</th>
+	<th>{L_INACTIVE_REASON}</th>
+	<th>{L_LAST_VISIT}</th>
+	<th>{L_MARK}</th>
+</tr>
+</thead>
+<tbody>
+<!-- BEGIN inactive -->
+	<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
+		<td><a href="{inactive.U_USER_ADMIN}">{inactive.USERNAME}</a></td>
+		<td>{inactive.JOINED}</td>
+		<td>{inactive.INACTIVE_DATE}</td>
+		<td>{inactive.REASON}</td>
+		<td>{inactive.LAST_VISIT}</td>
+		<td>&nbsp;<input type="checkbox" class="radio" name="mark[]" value="{inactive.USER_ID}" />&nbsp;</td>
+	</tr>
+<!-- BEGINELSE -->
+	<tr>
+		<td colspan="6" style="text-align: center;">{L_NO_INACTIVE_USERS}</td>
+	</tr>
+<!-- END inactive -->
+</tbody>
+</table>
+
+	<fieldset class="display-options">
+		{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
+		<input class="button2" type="submit" value="{L_GO}" name="sort" />
+	</fieldset>
+	<hr />
+	<!-- IF PAGINATION -->
+	<div class="pagination">
+			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
+	</div>
+	<!-- ENDIF -->
+
+	<fieldset class="quick">
+		<select name="action">{S_INACTIVE_OPTIONS}</select>
+		<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
+<p class="small"><a href="#" onclick="marklist('inactive', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('inactive', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>		
+	</fieldset>
+
+
+
+
+</form>
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_jabber.html

@@ -17,37 +17,42 @@
 
 <fieldset>
 	<legend>{L_ACP_JABBER_SETTINGS}</legend>
-	<dl>
-		<dt><label for="jab_enable">{L_JAB_ENABLE}:</label><br /><span>{L_JAB_ENABLE_EXPLAIN}</span></dt>
-		<dd><input type="radio" class="radio" id="jab_enable" name="jab_enable" value="1"<!-- IF JAB_ENABLE --> checked="checked"<!-- ENDIF --> />&nbsp;{L_ENABLED}&nbsp; &nbsp;<input type="radio" class="radio" name="jab_enable" value="0"<!-- IF not JAB_ENABLE --> checked="checked"<!-- ENDIF --> />&nbsp;{L_DISABLED}</dd>
-	</dl>
-	<dl>
-		<dt><label for="jab_host">{L_JAB_SERVER}:</label><br /><span>{L_JAB_SERVER_EXPLAIN}</span></dt>
-		<dd><input type="text" id="jab_host" name="jab_host" value="{JAB_HOST}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="jab_port">{L_JAB_PORT}:</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt>
-		<dd><input type="text" id="jab_port" name="jab_port" value="{JAB_PORT}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="jab_username">{L_JAB_USERNAME}:</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt>
-		<dd><input type="text" id="jab_username" name="jab_username" value="{JAB_USERNAME}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="jab_password">{L_JAB_PASSWORD}:</label></dt>
-		<dd><input type="text" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="jab_resource">{L_JAB_RESOURCE}:</label><br /><span>{L_JAB_RESOURCE_EXPLAIN}</span></dt>
-		<dd><input type="text" id="jab_resource" name="jab_resource" value="{JAB_RESOURCE}" /></dd>
-	</dl>
-</fieldset>
+<dl>
+	<dt><label for="jab_enable">{L_JAB_ENABLE}:</label><br /><span>{L_JAB_ENABLE_EXPLAIN}</span></dt>
+	<dd><input type="radio" class="radio" id="jab_enable" name="jab_enable" value="1"<!-- IF JAB_ENABLE --> checked="checked"<!-- ENDIF --> />&nbsp;{L_ENABLED}&nbsp; &nbsp;<input type="radio" class="radio" name="jab_enable" value="0"<!-- IF not JAB_ENABLE --> checked="checked"<!-- ENDIF --> />&nbsp;{L_DISABLED}</dd>
+</dl>
+<dl>
+	<dt><label for="jab_host">{L_JAB_SERVER}:</label><br /><span>{L_JAB_SERVER_EXPLAIN}</span></dt>
+	<dd><input type="text" id="jab_host" name="jab_host" value="{JAB_HOST}" /></dd>
+</dl>
+<dl>
+	<dt><label for="jab_port">{L_JAB_PORT}:</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt>
+	<dd><input type="text" id="jab_port" name="jab_port" value="{JAB_PORT}" maxlength="5" size="5" /></dd>
+</dl>
+<dl>
+	<dt><label for="jab_username">{L_JAB_USERNAME}:</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt>
+	<dd><input type="text" id="jab_username" name="jab_username" value="{JAB_USERNAME}" /></dd>
+</dl>
+<dl>
+	<dt><label for="jab_password">{L_JAB_PASSWORD}:</label></dt>
+	<dd><input type="password" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd>
+</dl>
+<dl>
+	<dt><label for="jab_resource">{L_JAB_RESOURCE}:</label><br /><span>{L_JAB_RESOURCE_EXPLAIN}</span></dt>
+	<dd><input type="text" id="jab_resource" name="jab_resource" value="{JAB_RESOURCE}" /></dd>
+</dl>
+<dl>
+	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}:</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt>
+	<dd><input type="text" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" maxlength="5" size="5" /></dd>
+</dl>
 
-<fieldset class="submit-buttons">
+<p class="submit-buttons">
 	<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+</p>
+
 </fieldset>
 
 </form>
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_language.html

@@ -7,7 +7,7 @@
 	<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,10 +16,10 @@
 		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
 		<dd>{RADIO_BUTTONS}</dd>
 	</dl>
-	</fieldset>
 
-	<fieldset class="quick">
+	<p class="quick">
 		<input type="submit" class="button2" value="{L_DOWNLOAD}" name="download" />
+	</p>
 	</fieldset>
 
 	</form>
@@ -36,24 +36,24 @@
 		<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}" /></dd>
+		<dd><input type="text" id="lang_english_name" name="lang_english_name" value="{LANG_ENGLISH_NAME}" maxlength="100" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="lang_local_name">{L_LANG_LOCAL_NAME}:</label></dt>
-		<dd><input type="text" id="lang_local_name" name="lang_local_name" value="{LANG_LOCAL_NAME}" /></dd>
+		<dd><input type="text" id="lang_local_name" name="lang_local_name" value="{LANG_LOCAL_NAME}" maxlength="255" /></dd>
 	</dl>
 	<dl>
 		<dt><label>{L_LANG_ISO_CODE}:</label></dt>
-		<dd><b>{LANG_ISO}</b></dd>
+		<dd><strong>{LANG_ISO}</strong></dd>
 	</dl>
 	<dl>
 		<dt><label for="lang_author">{L_LANG_AUTHOR}:</label></dt>
-		<dd><input type="text" id="lang_author" name="lang_author" value="{LANG_AUTHOR}" /></dd>
+		<dd><input type="text" id="lang_author" name="lang_author" value="{LANG_AUTHOR}" maxlength="255" /></dd>
 	</dl>
-	</fieldset>
 
-	<fieldset class="quick" style="margin-top: -15px;">
+	<p class="quick" style="margin-top: -15px;">
 		<input type="submit" name="update_details" class="button2" value="{L_SUBMIT}" />
+	</p>
 	</fieldset>
 	
 	</form>
@@ -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">
@@ -85,7 +85,7 @@
 		<tbody>
 		<!-- BEGIN missing -->
 			<tr class="row4">
-				<td><b>{missing.FILE}</b></td>
+				<td><strong>{missing.FILE}</strong></td>
 				<td style="text-align: right;"><input type="submit" name="missing_file[{missing.KEY}]" value="{L_SELECT}" class="button2" /></td>
 			</tr>
 			{missing.TPL}
@@ -104,20 +104,29 @@
 
 	<p>{L_LANGUAGE_ENTRIES_EXPLAIN}</p>
 
-	<form id="entries" method="post" action="{U_ENTRY_ACTION}">
+	<form id="lang_entries" method="post" action="{U_ENTRY_ACTION}">
 
 	<!-- IF S_FROM_STORE -->
 		<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: right;">
 		<select name="language_file">{S_LANG_OPTIONS}</select>&nbsp;<input type="submit" class="button2" name="change" value="{L_SELECT}" />
 	</fieldset>
 
 	<br /><br /><br />
 
+	<!-- DIRTY DIRTY DIRTY IE -->
+	<!--[if lt IE 8]>
+	<style type="text/css">
+		input.langvalue, textarea.langvalue {
+		width: 450px;
+		}
+	</style>
+	< ![endif]-->
+
 	<table cellspacing="1">
 	<thead>
 	<!-- IF S_EMAIL_FILE -->
@@ -131,26 +140,35 @@
 		</tr>
 	<!-- ENDIF -->
 	<tr>
-		<td class="row3"><b>{PRINT_MESSAGE}<!-- IF S_FROM_STORE --><br /><span style="color: red;">{L_FILE_FROM_STORAGE}</span><!-- ENDIF --></b></td>
-		<td class="row3" 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}" /><!-- IF ALLOW_UPLOAD -->&nbsp;&nbsp;{L_UPLOAD_METHOD}:&nbsp;<!-- BEGIN buttons--><input type="radio"<!-- IF buttons.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> 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>
+		<td rowspan="2" class="row3"><strong>{PRINT_MESSAGE}<!-- IF S_FROM_STORE --><br /><span style="color: red;">{L_FILE_FROM_STORAGE}</span><!-- ENDIF --></strong></td>
+		<td class="row3" style="text-align: right;"><input type="submit" name="download_file" class="button2" value="{L_SUBMIT_AND_DOWNLOAD}" />&nbsp;&nbsp;<input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /></td>
+	</tr>
+	<tr>
+		<td class="row3" style="text-align: right;">	
+		<!-- IF ALLOW_UPLOAD -->&nbsp;&nbsp;{L_UPLOAD_METHOD}:&nbsp;<!-- BEGIN buttons--><input type="radio" class="radio"<!-- IF buttons.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> 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>
 	</thead>
 	<tbody>
 	<!-- IF S_EMAIL_FILE -->
 		<tr>
-			<td class="row2" colspan="2" style="text-align: center;"><textarea name="entry" id="entry" cols="80" rows="20" style="width: 90%">{LANG}</textarea></td>
+			<td class="row2" colspan="2" style="text-align: center;"><textarea name="entry" id="entry" cols="80" rows="20">{LANG}</textarea></td>
 		</tr>
 	<!-- ELSE -->
 		{TPL}
 	<!-- ENDIF -->
 	<tr>
-		<td class="row3" colspan="3" style="text-align: right;"><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}" /><!-- IF ALLOW_UPLOAD -->&nbsp;&nbsp;{L_UPLOAD_METHOD}:&nbsp;<!-- BEGIN buttons--><input type="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>
+		<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: right">&laquo; {L_BACK}</a>
 
 	<h1>{L_UPLOAD_SETTINGS}</h1>
@@ -171,12 +189,12 @@
 		<legend>{L_UPLOAD_SETTINGS}</legend>
 	<dl>
 		<dt><label>{L_UPLOAD_METHOD}:</label></dt>
-		<dd><b>{NAME}</b></dd>
+		<dd><strong>{NAME}</strong></dd>
 	</dl>
 	<!-- BEGIN data -->
 	<dl>
-		<dt><label for="store">{data.NAME}:</label><br /><span>{data.EXPLAIN}</span></dt>
-		<dd><input type="text" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" checked="checked" /></dd>
+		<dt><label for="{data.DATA}">{data.NAME}:</label><br /><span>{data.EXPLAIN}</span></dt>
+		<dd><input type="<!-- IF data.DATA == 'password' -->password<!-- ELSE -->text<!-- ENDIF -->" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" /></dd>
 	</dl>
 	<!-- END data -->
 	</fieldset>
@@ -188,6 +206,7 @@
 	</fieldset>
 
 	</form>
+
 <!-- ELSE -->
 
 	<h1>{L_ACP_LANGUAGE_PACKS}</h1>
@@ -206,27 +225,27 @@
 	</thead>
 	<tbody>
 	<tr>
-		<td class="row3" colspan="5"><b>{L_INSTALLED_LANGUAGE_PACKS}</b></td>
+		<td class="row3" colspan="5"><strong>{L_INSTALLED_LANGUAGE_PACKS}</strong></td>
 	</tr>
 	<!-- BEGIN lang -->
 		<!-- IF lang.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 		<td><a href="{lang.U_DETAILS}">{lang.ENGLISH_NAME}</a> {lang.TAG}</td>
 		<td>{lang.LOCAL_NAME}</td>
-		<td style="text-align: center;"><b>{lang.ISO}</b></td>
+		<td style="text-align: center;"><strong>{lang.ISO}</strong></td>
 		<td style="text-align: center;">{lang.USED_BY}</td>
 		<td style="text-align: center;">&nbsp;<a href="{lang.U_DOWNLOAD}">{L_DOWNLOAD}</a>&nbsp;|&nbsp;<a href="{lang.U_DELETE}">{L_DELETE}</a></td>
 	</tr>
 	<!-- END lang -->
 	<!-- IF .notinst -->
 	<tr>
-		<td class="row3" colspan="5"><b>{L_UNINSTALLED_LANGUAGE_PACKS}</b></td>
+		<td class="row3" colspan="5"><strong>{L_UNINSTALLED_LANGUAGE_PACKS}</strong></td>
 	</tr>
 	<!-- ENDIF -->
 	<!-- BEGIN notinst -->
 		<!-- IF notinst.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 		<td>{notinst.NAME}</td>
 		<td>{notinst.LOCAL_NAME}</td>
-		<td style="text-align: center;"><b>{notinst.ISO}</b></td>
+		<td style="text-align: center;"><strong>{notinst.ISO}</strong></td>
 		<td colspan="2" style="text-align: center;"><a href="{notinst.U_INSTALL}">{L_INSTALL}</a></td>
 	</tr>
 	<!-- END notinst -->
@@ -235,4 +254,4 @@
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_logs.html

@@ -8,66 +8,78 @@
 
 <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="javascript:jumpto();" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-	<!-- ELSE -->
-		{S_ON_PAGE}
-	<!-- ENDIF -->
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
 </div>
+<!-- ENDIF -->
 
 <!-- IF .log -->
-<table cellspacing="1">
-<thead>
-<tr>
-	<th>{L_USERNAME}</th>
-	<th>{L_IP}</th>
-	<th>{L_TIME}</th>
-	<th>{L_ACTION}</th>
-	<th>{L_MARK}</th>
-</tr>
-</thead>
-<tbody>
-<!-- BEGIN log -->
-	<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-		<td>{log.USERNAME}</td>
-		<td style="text-align: center;">{log.IP}</td>
-		<td style="text-align: center;">{log.DATE}</td>
-		<td>{log.ACTION}<!-- IF log.DATA --><br />{log.DATA}</span><!-- ENDIF --></td>
-		<td style="text-align: center;"><input type="checkbox" name="mark[]" value="{log.ID}" /></td>
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_USERNAME}</th>
+		<th>{L_IP}</th>
+		<th>{L_TIME}</th>
+		<th>{L_ACTION}</th>
+		<th>{L_MARK}</th>
 	</tr>
-<!-- END log -->
-</tbody>
-</table>
+	</thead>
+	<tbody>
+	<!-- BEGIN log -->
+		<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
+			<td>
+				{log.USERNAME}
+				<!-- IF log.REPORTEE_USERNAME -->
+				<br />&raquo; {log.REPORTEE_USERNAME}
+				<!-- ENDIF -->
+			</td>
+			<td style="text-align: center;">{log.IP}</td>
+			<td style="text-align: center;">{log.DATE}</td>
+			<td>{log.ACTION}<!-- IF log.DATA --><br /><span>{log.DATA}</span><!-- ENDIF --></td>
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td>
+		</tr>
+	<!-- END log -->
+	</tbody>
+	</table>
+
 <!-- ELSE -->
+
 	<div class="errorbox">
 		<p>{L_NO_ENTRIES}</p>
 	</div>
+
 <!-- ENDIF -->
 
-<!-- IF S_SHOW_FORUMS -->
-<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 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_SHOW_FORUMS -->
+	<fieldset class="quick">
+		{L_SELECT_FORUM}: <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select>
+		<input class="button2" type="submit" value="{L_GO}" />
+	</fieldset>
 <!-- ENDIF -->
 
 <!-- IF S_CLEARLOGS -->
 	<fieldset class="quick">
-		<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;
+		<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" /><br />
+		<p class="small"><a href="#" onclick="marklist('list', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>
 	</fieldset>
 <!-- ENDIF -->
 
+
+
 </form>
 
 <!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_main.html

@@ -1,141 +1,171 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a><h1>{L_WELCOME_PHPBB}</h1>
+<a name="maincontent"></a>
 
-<p>{L_ADMIN_INTRO}</p>
+<!-- IF S_RESTORE_PERMISSIONS -->
 
-<table cellspacing="1">
-	<caption>{L_FORUM_STATS}</caption>
-	<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
-	<thead>
-		<tr>
-			<th>{L_STATISTIC}</th>
-			<th>{L_VALUE}</th>
-			<th>{L_STATISTIC}</th>
-			<th>{L_VALUE}</th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr>
-			<td>{L_NUMBER_POSTS}: </td>
-			<td><b>{TOTAL_POSTS}</b></td>
-			<td>{L_POSTS_PER_DAY}: </td>
-			<td><b>{POSTS_PER_DAY}</b></td>
-		</tr>
-		<tr>
-			<td>{L_NUMBER_TOPICS}: </td>
-			<td><b>{TOTAL_TOPICS}</b></td>
-			<td>{L_TOPICS_PER_DAY}: </td>
-			<td><b>{TOPICS_PER_DAY}</b></td>
-		</tr>
-		<tr>
-			<td>{L_NUMBER_USERS}: </td>
-			<td><b>{TOTAL_USERS}</b></td>
-			<td>{L_USERS_PER_DAY}: </td>
-			<td><b>{USERS_PER_DAY}</b></td>
-		</tr>
-		<tr>
-			<td>{L_NUMBER_FILES}: </td>
-			<td><b>{TOTAL_FILES}</b></td>
-			<td>{L_FILES_PER_DAY}: </td>
-			<td><b>{FILES_PER_DAY}</b></td>
-		</tr>
-		<tr>
-			<td>{L_BOARD_STARTED}: </td>
-			<td><b>{START_DATE}</b></td>
-			<td>{L_AVATAR_DIR_SIZE}: </td>
-			<td><b>{AVATAR_DIR_SIZE}</b></td>
-		</tr>
-		<tr>
-			<td>{L_DATABASE_SIZE}: </td>
-			<td><b>{DBSIZE}</b></td>
-			<td>{L_UPLOAD_DIR_SIZE}: </td>
-			<td><b>{UPLOAD_DIR_SIZE}</b></td>
-		</tr>
-		<tr>
-			<td>{L_GZIP_COMPRESSION}: </td>
-			<td><b>{GZIP_COMPRESSION}</b></td>
-			<td>&nbsp;</td>
-			<td>&nbsp;</td>
-		</tr>
-	</tbody>
-</table>
+	<h1>{L_PERMISSIONS_TRANSFERRED}</h1>
 
-<form id="stats" method="post" action="{U_ACTION}">
-<fieldset class="quick">
-	<select name="action">{S_ACTION_OPTIONS}</select>
+	<p>{L_PERMISSIONS_TRANSFERRED_EXPLAIN}</p>
 
-	<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
-</fieldset>
-</form>
+<!-- ELSE -->
 
-<h2>{L_ADMIN_LOG}</h2>
+	<h1>{L_WELCOME_PHPBB}</h1>
 
-<p>{L_ADMIN_LOG_INDEX_EXPLAIN}</p>
+	<p>{L_ADMIN_INTRO}</p>
 
-<table cellspacing="1">
-<thead>
-<tr>
-	<th>{L_USERNAME}</th>
-	<th>{L_IP}</th>
-	<th>{L_TIME}</th>
-	<th>{L_ACTION}</th>
-</tr>
-</thead>
-<tbody>
-<!-- BEGIN log -->
-	<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-		<td>{log.USERNAME}</td>
-		<td style="text-align: center;">{log.IP}</td>
-		<td style="text-align: center;">{log.DATE}</td>
-		<td>{log.ACTION}</td>
-	</tr>
-<!-- END log -->
-</tbody>
-</table>
-
-<!-- IF S_INACTIVE_USERS -->
-	<h2>{L_INACTIVE_USERS}</h2>
-
-	<p>{L_INACTIVE_USERS_EXPLAIN}</p>
-
-	<form id="inactive" method="post" action="{U_ACTION}">
+	<!-- IF S_REMOVE_INSTALL -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{L_REMOVE_INSTALL}</p>
+		</div>
+	<!-- ENDIF -->
 
 	<table cellspacing="1">
+		<caption>{L_FORUM_STATS}</caption>
+		<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
 	<thead>
-		<tr>
-			<th>{L_USERNAME}</th>
-			<th>{L_JOINED}</th>
-			<th>{L_MARK}</th>
-		</tr>
+	<tr>
+		<th>{L_STATISTIC}</th>
+		<th>{L_VALUE}</th>
+		<th>{L_STATISTIC}</th>
+		<th>{L_VALUE}</th>
+	</tr>
 	</thead>
 	<tbody>
-	<!-- BEGIN inactive -->
-		<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+	<tr>
+		<td>{L_NUMBER_POSTS}: </td>
+		<td><b>{TOTAL_POSTS}</b></td>
+		<td>{L_POSTS_PER_DAY}: </td>
+		<td><b>{POSTS_PER_DAY}</b></td>
+	</tr>
+	<tr>
+		<td>{L_NUMBER_TOPICS}: </td>
+		<td><b>{TOTAL_TOPICS}</b></td>
+		<td>{L_TOPICS_PER_DAY}: </td>
+		<td><b>{TOPICS_PER_DAY}</b></td>
+	</tr>
+	<tr>
+		<td>{L_NUMBER_USERS}: </td>
+		<td><b>{TOTAL_USERS}</b></td>
+		<td>{L_USERS_PER_DAY}: </td>
+		<td><b>{USERS_PER_DAY}</b></td>
+	</tr>
+	<tr>
+		<td>{L_NUMBER_FILES}: </td>
+		<td><b>{TOTAL_FILES}</b></td>
+		<td>{L_FILES_PER_DAY}: </td>
+		<td><b>{FILES_PER_DAY}</b></td>
+	</tr>
 
-			<td><a href="{inactive.U_USER_ADMIN}">{inactive.USERNAME}</a></td>
-			<td>{inactive.DATE}</td>
-			<td>&nbsp;<input type="checkbox" name="mark[]" value="{inactive.USER_ID}" />&nbsp;</td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td colspan="3" style="text-align: center;">{L_NO_INACTIVE_USERS}</td>
-		</tr>
-	<!-- END inactive -->
+
+	<tr>
+		<td>{L_BOARD_STARTED}: </td>
+		<td><b>{START_DATE}</b></td>
+		<td>{L_AVATAR_DIR_SIZE}: </td>
+		<td><b>{AVATAR_DIR_SIZE}</b></td>
+	</tr>
+	<tr>
+		<td>{L_DATABASE_SIZE}: </td>
+		<td><b>{DBSIZE}</b></td>
+		<td>{L_UPLOAD_DIR_SIZE}: </td>
+		<td><b>{UPLOAD_DIR_SIZE}</b></td>
+	</tr>
+	<tr>
+		<td>{L_DATABASE_SERVER_INFO}: </td>
+		<td><b>{DATABASE_INFO}</b></td>
+		<td>{L_GZIP_COMPRESSION}: </td>
+		<td><b>{GZIP_COMPRESSION}</b></td>
+	</tr>
+	<!-- IF S_TOTAL_ORPHAN -->
+	<tr>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+		<td>{L_NUMBER_ORPHAN}: </td>
+		<td><b>{TOTAL_ORPHAN}</b></td>
+	</tr>
+	<!-- ENDIF -->
 	</tbody>
 	</table>
 
-	<!-- IF .inactive -->
+	<!-- IF S_ACTION_OPTIONS -->
+		<form id="stats" method="post" action="{U_ACTION}">
 		<fieldset class="quick">
-			<p><a href="javascript:marklist('inactive', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="javascript:marklist('inactive', 'mark', false);">{L_UNMARK_ALL}</a></p>
-			<select name="action">{S_INACTIVE_OPTIONS}</select>
+			<select name="action">{S_ACTION_OPTIONS}</select>
 
 			<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
 		</fieldset>
+		</form>
 	<!-- ENDIF -->
 
-	</form>
+	<!-- IF .log -->
+		<h2>{L_ADMIN_LOG}</h2>
+
+		<p>{L_ADMIN_LOG_INDEX_EXPLAIN}</p>
+
+		<table cellspacing="1">
+		<thead>
+		<tr>
+			<th>{L_USERNAME}</th>
+			<th>{L_IP}</th>
+			<th>{L_TIME}</th>
+			<th>{L_ACTION}</th>
+		</tr>
+		</thead>
+		<tbody>
+		<!-- BEGIN log -->
+			<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
+				<td>{log.USERNAME}</td>
+				<td style="text-align: center;">{log.IP}</td>
+				<td style="text-align: center;">{log.DATE}</td>
+				<td>{log.ACTION}</td>
+			</tr>
+		<!-- END log -->
+		</tbody>
+		</table>
+
+		<br />
+		<div style="text-align: right;"><a href="{U_ADMIN_LOG}">&raquo; {L_VIEW_ADMIN_LOG}</a></div>
+
+	<!-- ENDIF -->
+
+	<!-- IF S_INACTIVE_USERS -->
+		<h2>{L_INACTIVE_USERS}</h2>
+
+		<p>{L_INACTIVE_USERS_EXPLAIN_INDEX}</p>
+
+		<div style="text-align: right;"><a href="{U_INACTIVE_USERS}">&raquo; {L_VIEW_INACTIVE_USERS}</a></div>
+
+		<table cellspacing="1">
+		<thead>
+		<tr>
+			<th>{L_USERNAME}</th>
+			<th>{L_JOINED}</th>
+			<th>{L_INACTIVE_DATE}</th>
+			<th>{L_INACTIVE_REASON}</th>
+			<th>{L_LAST_VISIT}</th>
+		</tr>
+		</thead>
+		<tbody>
+		<!-- BEGIN inactive -->
+			<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
+				<td><a href="{inactive.U_USER_ADMIN}">{inactive.USERNAME}</a></td>
+				<td>{inactive.JOINED}</td>
+				<td>{inactive.INACTIVE_DATE}</td>
+				<td>{inactive.REASON}</td>
+				<td>{inactive.LAST_VISIT}</td>
+			</tr>
+		<!-- BEGINELSE -->
+			<tr>
+				<td colspan="5" style="text-align: center;">{L_NO_INACTIVE_USERS}</td>
+			</tr>
+		<!-- END inactive -->
+		</tbody>
+		</table>
+
+	<!-- ENDIF -->
 
 <!-- ENDIF -->
 

phpBB/adm/style/acp_modules.html

@@ -21,23 +21,28 @@
 
 		function display_modes(value)
 		{
-			// Remove select fields
+			// Find the old select tag
 			var item = document.getElementById('module_mode');
-			var j = 0;
-	
-			// empty existing items
-			for (var i = 0; i <= item.options.length; i++)
-			{
-				item.options[i] = null;
-			}
 
+			// Create the new select tag
+			var new_node = document.createElement('select');
+			new_node.setAttribute('id', 'module_mode');
+			new_node.setAttribute('name', 'module_mode');
+
+			// Substitute it for the old one
+			item.parentNode.replaceChild(new_node, item);
+
+			// Reset the variable
+			item = document.getElementById('module_mode');
+
+			var j = 0;
 <!-- BEGIN m_names -->
 		
 			if (value == '{m_names.NAME}')
 			{
 	<!-- BEGIN modes -->
-				item.options[j] = new Option('{m_names.modes.VALUE}');
-				item.options[j].value = '{m_names.modes.OPTION}';
+				item.options[j] = new Option('{m_names.modes.A_VALUE}');
+				item.options[j].value = '{m_names.modes.A_OPTION}';
 				j++;
 	<!-- END modes -->
 			}
@@ -57,60 +62,60 @@
 	<p>{L_EDIT_MODULE_EXPLAIN}</p>
 
 	<!-- IF S_ERROR -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
 	<!-- ENDIF -->
 
 	<form id="moduleedit" method="post" action="{U_EDIT_ACTION}">
 
 	<fieldset>
 		<legend>{L_GENERAL_OPTIONS}</legend>
-		<dl>
-			<dt><label for="module_langname">{L_MODULE_LANGNAME}:</label><br />
-			<span>{L_MODULE_LANGNAME_EXPLAIN}</span></dt>
-			<dd><input name="module_langname" type="text" id="module_langname" value="{MODULE_LANGNAME}" class="medium" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="module_type">{L_MODULE_TYPE}:</label></dt>
-			<dd><select name="module_type" id="module_type" onchange="display_options(this.value);"><option value="category"<!-- IF S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_CATEGORY}</option><option value="module"<!-- IF not S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_MODULE}</option></select></dd>
-		</dl>
-		<dl>
-			<dt><label for="parent_id">{L_PARENT}:</label></dt>
-			<dd><select name="module_parent_id" id="parent_id">{S_CAT_OPTIONS}</select></dd>
-		</dl>
-		<hr />
-		<dl>
-			<dt><label for="module_enabled">{L_MODULE_ENABLED}:</label></dt>
-			<dd><label><input class="radio" type="radio" name="module_enabled" id="module_enabled" value="1"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input class="radio" type="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_langname">{L_MODULE_LANGNAME}:</label><br />
+		<span>{L_MODULE_LANGNAME_EXPLAIN}</span></dt>
+		<dd><input name="module_langname" type="text" id="module_langname" value="{MODULE_LANGNAME}" class="medium" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="module_type">{L_MODULE_TYPE}:</label></dt>
+		<dd><select name="module_type" id="module_type" onchange="display_options(this.value);"><option value="category"<!-- IF S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_CATEGORY}</option><option value="module"<!-- IF not S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_MODULE}</option></select></dd>
+	</dl>
+	<dl>
+		<dt><label for="parent_id">{L_PARENT}:</label></dt>
+		<dd><select name="module_parent_id" id="parent_id">{S_CAT_OPTIONS}</select></dd>
+	</dl>
+	<hr />
+	<dl>
+		<dt><label for="module_enabled">{L_MODULE_ENABLED}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="module_enabled" id="module_enabled" value="1"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+		<label><input type="radio" class="radio" name="module_enabled" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<div id="modoptions"<!-- IF S_IS_CAT --> style="display: none;"<!-- ENDIF -->>
 		<dl>
 			<dt><label for="module_display">{L_MODULE_DISPLAYED}:</label><br /><span>{L_MODULE_DISPLAYED_EXPLAIN}</span></dt>
-			<dd><label><input class="radio" type="radio" name="module_display" id="module_display" value="1"<!-- IF MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input class="radio" type="radio" name="module_display" value="0"<!-- IF not MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<dd><label><input type="radio" class="radio" name="module_display" id="module_display" value="1"<!-- IF MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="module_display" value="0"<!-- IF not MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="module_name">{L_CHOOSE_MODULE}:</label><br />
+			<dt><label for="module_basename">{L_CHOOSE_MODULE}:</label><br />
 			<span>{L_CHOOSE_MODULE_EXPLAIN}</span></dt>
-			<dd><select name="module_name" id="module_name" onchange="display_modes(this.value);">{S_MODULE_NAMES}</select></dd>
+			<dd><select name="module_basename" id="module_basename" onchange="display_modes(this.value);">{S_MODULE_NAMES}</select></dd>
 		</dl>
 		<dl>
 			<dt><label for="module_mode">{L_CHOOSE_MODE}:</label><br />
 			<span>{L_CHOOSE_MODE_EXPLAIN}</span></dt>
 			<dd><select name="module_mode" id="module_mode">{S_MODULE_MODES}</select></dd>
 		</dl>
-		</div>
-	</fieldset>
+	</div>
 
-	<fieldset class="submit-buttons">
+	<p class="submit-buttons">
 		<input type="hidden" name="action" value="{ACTION}" />
 		<input type="hidden" name="m" value="{MODULE_ID}" />
 		
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
 	</fieldset>
 
 	</form>
@@ -122,10 +127,10 @@
 	<p>{L_ACP_MODULE_MANAGEMENT_EXPLAIN}</p>
 
 	<!-- IF S_ERROR -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
 	<!-- ENDIF -->
 
 	<table cellspacing="1">
@@ -136,40 +141,43 @@
 	</tbody>
 	</table>
 
-<!-- IF .modules -->
-	<table cellspacing="1">
-		<col class="row1" /><col class="row1" /><col class="row2" /><col class="row2" />
-	<tbody>
-	<!-- BEGIN modules -->
-		<tr>
-			<td style="width: 5%;">{modules.MODULE_IMAGE}</td>
-			<td style="width: 50%;"><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;"><a href="{modules.U_MOVE_UP}">{L_MOVE_UP}</a><br /><a href="{modules.U_MOVE_DOWN}">{L_MOVE_DOWN}</a></td>
-			<td style="width: 20%; white-space: nowrap; text-align: center; vertical-align: middle;">&nbsp;
-				<a href="{modules.U_EDIT}">{L_EDIT}</a> | <a href="{modules.U_DELETE}">{L_DELETE}</a> |
-				<!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->
-			&nbsp;</td>
-		</tr>
-	<!-- END modules -->
-	</tbody>
-	</table>
-<!-- ENDIF -->
+	<!-- IF .modules -->
+		<table cellspacing="1">
+			<col class="row1" /><col class="row1" /><col class="row2" /><col class="row2" />
+		<tbody>
+		<!-- BEGIN modules -->
+			<tr>
+				<td style="width: 5%;">{modules.MODULE_IMAGE}</td>
+				<td><a href="{modules.U_MODULE}">{modules.MODULE_TITLE}</a><!-- IF not modules.MODULE_DISPLAYED --> <span class="small">[{L_HIDDEN_MODULE}]</span><!-- ENDIF --></td>
+				<td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;">&nbsp;<!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->&nbsp;</td>
+				<td style="width:90px; white-space: nowrap; text-align: right; vertical-align: middle;">
+					<!-- IF modules.S_FIRST_ROW && not modules.S_LAST_ROW -->
+						{ICON_MOVE_UP_DISABLED}
+						<a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<!-- ELSEIF not modules.S_FIRST_ROW && not modules.S_LAST_ROW-->
+						<a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
+						<a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
+					<!-- ELSEIF modules.S_LAST_ROW && not modules.S_FIRST_ROW -->
+						<a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
+						{ICON_MOVE_DOWN_DISABLED}
+					<!-- ELSE -->
+						{ICON_MOVE_UP_DISABLED}
+						{ICON_MOVE_DOWN_DISABLED}
+					<!-- ENDIF -->
+					<a href="{modules.U_EDIT}">{ICON_EDIT}</a> 
+					<a href="{modules.U_DELETE}">{ICON_DELETE}</a>
+				</td>
+			</tr>
+		<!-- END modules -->
+		</tbody>
+		</table>
+	<!-- ENDIF -->
 
-	<form id="module" method="post" action="{U_ACTION}">
-
-	<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" /> 
-		<input class="button2" name="addmodule" type="submit" value="{L_CREATE_MODULE}" />
-	</fieldset>
-
-	</form>
+	<div class="clearfix">&nbsp;</div>
 
 	<form id="quick" method="post" action="{U_ACTION}">
 
-	<fieldset class="quick">
+	<fieldset class="quick" style="float: right;">
 		<input type="hidden" name="action" value="quickadd" />
 
 		<select name="quick_install">{S_INSTALL_OPTIONS}</select>
@@ -177,6 +185,20 @@
 	</fieldset>
 	
 	</form>
+
+	<form id="module" method="post" action="{U_ACTION}">
+
+	<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 class="button2" name="addmodule" type="submit" value="{L_CREATE_MODULE}" />
+	</fieldset>
+
+	</form>
+
+	<div class="clearfix">&nbsp;</div>
 	
 	<form id="mselect" method="post" action="{U_SEL_ACTION}">
 	<fieldset class="quick">
@@ -188,4 +210,4 @@
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_permission_roles.html

@@ -6,49 +6,22 @@
 
 	<script type="text/javascript">
 	<!--
-		var active_option = 'options0';
+		var active_pmask = '0';
+		var active_fmask = '0';
+		var active_cat = '0';
 
-		// 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 id = '000';
 
-			active_option = id;
-		}
-
-		// 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;
-				}
-			}
-		}
+		var role_options = new Array();
 
+		<!-- IF S_ROLE_JS_ARRAY -->
+			{S_ROLE_JS_ARRAY}
+		<!-- ENDIF -->
 	//-->
 	</script>
 
+	<script type="text/javascript" src="style/permissions.js"></script>
+
 	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
 	<h1>{L_TITLE}</h1>
@@ -62,21 +35,18 @@
 
 	<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}" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="pre_select">{L_DISPLAY_FOR_GROUP}:</label><br /><span>{L_DISPLAY_FOR_GROUP_EXPLAIN}</span></dt>
-			<dd><select name="pre_select" id="pre_select" onchange="if(this.value=='custom'){dE('custom_group',1);}else{dE('custom_group',-1);}">{S_PRESELECT_OPTIONS}</select></dd>
-			<dd id="custom_group"<!-- IF not S_CUSTOM_GROUP_IDS --> style="display:none;"<!-- ENDIF -->>
-				<select name="role_group_ids[]" id="role_group_id" style="width: 100%;" multiple="multiple" size="10">{S_GROUP_OPTIONS}</select>
-			</dd>
-		</dl>
-	</fieldset>
+	<dl>
+		<dt><label for="role_name">{L_ROLE_NAME}:</label></dt>
+		<dd><input name="role_name" type="text" id="role_name" value="{ROLE_NAME}" maxlength="255" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="role_description">{L_ROLE_DESCRIPTION}:</label><br /><span>{L_ROLE_DESCRIPTION_EXPLAIN}</span></dt>
+		<dd><textarea id="role_description" name="role_description" rows="3" cols="45">{ROLE_DESCRIPTION}</textarea></dd>
+	</dl>
 
-	<fieldset class="quick">
+	<p class="quick">
 		<input type="submit" class="button1" name="submit" value="{L_SUBMIT}" />
+	</p>
 	</fieldset>
 
 	<!-- IF S_DISPLAY_ROLE_MASK -->
@@ -95,62 +65,64 @@
 	<h1>{L_ACL_TYPE}</h1>
 
 	<fieldset class="quick">
-		<a href="javascript: mark_options('a_options', 'y');">{L_ALL_YES}</a> &bull; <a href="javascript: mark_options('a_options', 'n');">{L_ALL_NO}</a> &bull; <a href="javascript: mark_options('a_options', 'u');">{L_ALL_UNSET}</a>
+		<a href="#" onclick="mark_options('advanced00', 'y'); init_colours('00'); return false;">{L_ALL_YES}</a> &bull; <a href="#" onclick="mark_options('advanced00', 'n'); init_colours('00'); return false;">{L_ALL_NEVER}</a> &bull; <a href="#" onclick="mark_options('advanced00', 'u'); init_colours('00'); return false;">{L_ALL_NO}</a>
 	</fieldset>
 
-	<fieldset class="permissions">
+	<fieldset class="perm nolegend">
 
-		<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_yes">
-			<!-- ELSEIF auth.S_NO -->
-				<td class="preset_no">
-			<!-- ELSEIF auth.S_UNSET -->
-				<td class="preset_unset">
-			<!-- ELSE -->
-				<td class="preset_custom">
-			<!-- ENDIF -->
-				<a href="javascript:swap_options('options{auth.S_ROW_COUNT}');"><span>&nbsp;</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%;">
+		<div id="advanced00">
+			<div class="perm_cat">
+				<ul>
+				<!-- BEGIN auth -->
+					<!-- IF auth.S_YES -->
+						<li class="perm_preset_yes<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
+					<!-- ELSEIF auth.S_NEVER -->
+						<li class="perm_preset_never<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
+					<!-- ELSEIF auth.S_NO -->
+						<li class="perm_preset_no<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
+					<!-- ELSE -->
+						<li class="perm_preset_custom<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
+					<!-- ENDIF -->
+						<a href="#" onclick="swap_options('0','0','{auth.S_ROW_COUNT}'); return false;"><span class="tabbg"><span class="colour"></span>{auth.CAT_NAME}</span></a></li>	
+				<!-- END auth -->
+				</ul>
+			</div>
 			<!-- BEGIN auth -->
-				<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="javascript: mark_options('options{auth.S_ROW_COUNT}', 'y');">{L_ACL_YES}</a></th>
-					<th scope="col"><a href="javascript: mark_options('options{auth.S_ROW_COUNT}', 'u');">{L_ACL_UNSET}</a></th>
-					<th scope="col"><a href="javascript: mark_options('options{auth.S_ROW_COUNT}', 'n');">{L_ACL_NO}</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="unset"><input id="setting[{auth.mask.FIELD_NAME}]_y" name="setting[{auth.mask.FIELD_NAME}]" type="radio"<!-- IF auth.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></td>
-					<td class="unset"><input id="setting[{auth.mask.FIELD_NAME}]_u" name="setting[{auth.mask.FIELD_NAME}]" type="radio"<!-- IF auth.mask.S_UNSET --> checked="checked"<!-- ENDIF --> value="-1" /></td>
-					<td class="unset"><input id="setting[{auth.mask.FIELD_NAME}]_n" name="setting[{auth.mask.FIELD_NAME}]" type="radio"<!-- IF auth.mask.S_NO --> checked="checked"<!-- ENDIF --> value="0" /></td>
-				</tr>
-				<!-- END mask -->
-				</tbody>
-				</table>
+			<div class="perm_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" scope="col"><a href="#" onclick="mark_options('options00{auth.S_ROW_COUNT}', 'y'); set_colours('00{auth.S_ROW_COUNT}', false, 'yes'); return false;">{L_ACL_YES}</a></th>
+						<th class="value" scope="col"><a href="#" onclick="mark_options('options00{auth.S_ROW_COUNT}', 'u'); set_colours('00{auth.S_ROW_COUNT}', false, 'no'); return false;">{L_ACL_NO}</a></th>
+						<th class="value" scope="col"><a href="#" onclick="mark_options('options00{auth.S_ROW_COUNT}', 'n'); set_colours('00{auth.S_ROW_COUNT}', false, 'never'); return false;">{L_ACL_NEVER}</a></th>
+					</tr>
+					</thead>
+					<tbody>
+					<!-- BEGIN mask -->
+						<!-- IF auth.mask.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
+						<th class="permission_name<!-- IF auth.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->">{auth.mask.PERMISSION}</th>
+							
+						<td><label for="{auth.mask.FIELD_NAME}_y"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting[{auth.mask.FIELD_NAME}]_y" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></label></td>
+						<td><label for="{auth.mask.FIELD_NAME}_u"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting[{auth.mask.FIELD_NAME}]_u" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NO --> checked="checked"<!-- ENDIF --> value="-1" /></label></td>
+						<td><label for="{auth.mask.FIELD_NAME}_n"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting[{auth.mask.FIELD_NAME}]_n" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NEVER --> checked="checked"<!-- ENDIF --> value="0" /></label></td>
+					</tr>
+					<!-- END mask -->
+					</tbody>
+					</table>
+				</div>
+				<span class="corners-bottom"><span></span></span>
+			</div>
 			<!-- END auth -->
-			</td>
-		</tr>
-		</tbody>
-		</table>
+		</div>
 
 	</fieldset>
 
@@ -172,43 +144,50 @@
 	<form id="acp_roles" method="post" action="{U_ACTION}">
 
 	<table cellspacing="1">
-		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
+		<col class="col2" /><col class="col2" /><col class="col1" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
-		<th style="width: 50%">{L_ROLE_NAME}</th>
-		<th>{L_DISPLAY_FOR_GROUP}</th>
-		<th colspan="3">{L_OPTIONS}</th>
+		<th>{L_ROLE_NAME}</th>
+		<th colspan="2">{L_OPTIONS}</th>
 	</tr>
 	</thead>
 	<tbody>
 	<!-- BEGIN roles -->
 	<tr>
-		<td style="vertical-align: top;"><b>{roles.NAME}</b></td>
-		<td style="vertical-align: top;">
-			<!-- IF roles.S_GROUP -->
-				<!-- BEGIN groups -->
-					<a href="{roles.groups.U_GROUP}">{roles.groups.GROUP_NAME}</a><br />
-				<!-- END groups -->
-			<!-- ELSE -->
-				{L_EVERY_USER_GROUP}
-			<!-- ENDIF -->
+		<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>
+			<!-- ELSEIF not roles.S_FIRST_ROW && not roles.S_LAST_ROW-->
+				<a href="{roles.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
+				<a href="{roles.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
+			<!-- ELSEIF roles.S_LAST_ROW && not roles.S_FIRST_ROW -->
+				<a href="{roles.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
+				{ICON_MOVE_DOWN_DISABLED}
+			<!-- ELSE -->
+				{ICON_MOVE_UP_DISABLED}
+				{ICON_MOVE_DOWN_DISABLED}
+			<!-- ENDIF -->	
+			<a href="{roles.U_EDIT}" title="{L_EDIT_ROLE}">{ICON_EDIT}</a> 
+			<a href="{roles.U_REMOVE}" title="{L_REMOVE_ROLE}">{ICON_DELETE}</a>
 		</td>
-		<td style="vertical-align: top; white-space: nowrap;"><a href="{roles.U_EDIT}">{L_EDIT_ROLE}</a></td>
-		<td style="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="vertical-align: top; white-space: nowrap;"><a href="{roles.U_REMOVE}">{L_REMOVE_ROLE}</a></td>
 	</tr>
 	<!-- END roles -->
 	</tbody>
 	</table>
 
 	<fieldset class="quick">
-		{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 />
+		{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 />
 	</fieldset>
 
 	</form>
 
 	<!-- IF S_DISPLAY_ROLE_MASK -->
-		
+
 		<a name="assigned_to"></a>
 
 		<h1>{L_ROLE_ASSIGNED_TO}</h1>
@@ -217,8 +196,6 @@
 
 	<!-- ENDIF -->
 
-
 <!-- ENDIF -->
 
-
 <!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_permissions.html

@@ -6,9 +6,7 @@
 	
 	<h1>{L_ACP_PERMISSIONS}</h1>
 
-	<p>{L_ACP_PERMISSIONS_EXPLAIN}</p>
-
-	Here, an introductionary text will be placed, explaining permissions and the several menu items. Also adding quick links to this page.
+	{L_ACP_PERMISSIONS_EXPLAIN}
 
 <!-- ENDIF -->
 
@@ -32,7 +30,7 @@
 		<dl>
 			<dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt>
 			<dd><select id="forum" name="forum_id[]"<!-- IF S_FORUM_MULTIPLE --> multiple="multiple"<!-- ENDIF --> size="10">{S_FORUM_OPTIONS}</select></dd>
-			<!-- IF S_FORUM_ALL --><dd><input type="checkbox" name="all_forums" value="1" />&nbsp; {L_ALL_FORUMS}</dd><!-- ENDIF -->
+			<!-- IF S_FORUM_ALL --><dd><input type="checkbox" class="radio" name="all_forums" value="1" />&nbsp; {L_ALL_FORUMS}</dd><!-- ENDIF -->
 		</dl>
 		</fieldset>
 
@@ -63,23 +61,6 @@
 
 			</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 -->
@@ -91,8 +72,8 @@
 		<dl>
 			<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
 			<dd><input class="medium" type="text" id="username" name="username[]" /></dd>
-			<dd>[ <a href="#" onclick="window.open('{U_FIND_USERNAME}', '_phpbbsearch', '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" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> &nbsp;{L_SELECT_ANONYMOUS}</dd>
+			<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd>
+			<dd class="full" style="text-align: left;"><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> &nbsp;{L_SELECT_ANONYMOUS}</dd>
 		</dl>
 		</fieldset>
 
@@ -136,14 +117,13 @@
 				<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>
-				<dd class="full" style="text-align: right;"><input type="checkbox" name="all_users" value="1" />&nbsp; {L_ALL_USERS}</dd>
+				<!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><input type="checkbox" class="radio" name="all_users" value="1" />&nbsp; {L_ALL_USERS}</dd><!-- ENDIF -->
 			</dl>
 			</fieldset>
 			
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
-				<input class="button2" type="submit" name="action[delete]" value="{L_DELETE}" /> &nbsp;
-				<input class="button1" type="submit" name="submit_edit_options" value="{L_SET_PERMISSIONS}" />
+				<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>
@@ -155,14 +135,13 @@
 				<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;"><input type="checkbox" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> &nbsp;{L_SELECT_ANONYMOUS}</dd>
+				<dd class="full" style="text-align: left;"><div style="float: right;">[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</div><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> &nbsp;{L_SELECT_ANONYMOUS}</dd>
 			</dl>
 			</fieldset>
 
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
-				<input class="button2" type="submit" name="find_username" value="{L_FIND_USERNAME}" onclick="window.open('{U_FIND_USERNAME}', '_phpbbsearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;" /> &nbsp;
-				<input class="button1" type="submit" name="submit_add_options" value="{L_SET_PERMISSIONS}" />
+				<input class="button1" type="submit" name="submit_add_options" value="{L_ADD_PERMISSIONS}" />
 			</fieldset>
 			
 			</form>
@@ -183,14 +162,13 @@
 				<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>
-				<dd class="full" style="text-align: right;"><input type="checkbox" name="all_groups" value="1" />&nbsp; {L_ALL_GROUPS}</dd>
+				<!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><input type="checkbox" class="radio" name="all_groups" value="1" />&nbsp; {L_ALL_GROUPS}</dd><!-- ENDIF -->
 			</dl>
 			</fieldset>
 			
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
-				<input class="button2" type="submit" name="action[delete]" value="{L_DELETE}" />&nbsp;
-				<input class="button1" type="submit" name="submit_edit_options" value="{L_SET_PERMISSIONS}" />
+				<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>
@@ -206,7 +184,7 @@
 
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
-				<input type="submit" class="button1" name="submit_add_options" value="{L_SET_PERMISSIONS}" />
+				<input type="submit" class="button1" name="submit_add_options" value="{L_ADD_PERMISSIONS}" />
 			</fieldset>
 			
 			</form>
@@ -244,8 +222,8 @@
 			<dl>
 				<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
 				<dd><input type="text" id="username" name="username[]" /></dd>
-				<dd>[ <a href="#" onclick="window.open('{U_FIND_USERNAME}', '_phpbbsearch', '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" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> &nbsp;{L_SELECT_ANONYMOUS}</dd>
+				<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd>
+				<dd class="full" style="text-align: left;"><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> &nbsp;{L_SELECT_ANONYMOUS}</dd>
 			</dl>
 			</fieldset>
 
@@ -283,8 +261,8 @@
 			<fieldset>
 				<legend>{L_LOOK_UP_GROUP}</legend>
 			<dl>
-				<dt><label for="group">{L_LOOK_UP_GROUP}:</label></dt>
-				<dd><select name="group_id[]" id="group">{S_ADD_GROUP_OPTIONS}</select></dd>
+				<dt><label for="group_select">{L_LOOK_UP_GROUP}:</label></dt>
+				<dd><select name="group_id[]" id="group_select">{S_ADD_GROUP_OPTIONS}</select></dd>
 				<dd>&nbsp;</dd>
 			</dl>
 			</fieldset>
@@ -343,6 +321,14 @@
 
 	<br /><br />
 
+	<!-- include tooltip file -->
+	<script type="text/javascript" src="style/tooltip.js"></script>
+	<script type="text/javascript">
+	<!--
+		window.onload = function(){enable_tooltips_select('set_permissions', '{LA_ROLE_DESCRIPTION}', 'role')};
+	//-->
+	</script>
+
 	<form id="set_permissions" method="post" action="{U_ACTION}">
 
 	{S_HIDDEN_FIELDS}
@@ -351,14 +337,9 @@
 
 	<br /><br />
 
-	<fieldset class="quick" style="float: left;">
-		{L_PERMISSION_APPLIED_TO_ALL}<br />
-		<a href="javascript:marklist('set_permissions', 'inherit', true);">{L_MARK_ALL}</a> &bull; <a href="javascript:marklist('set_permissions', 'inherit', 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="reset" name="cancel" value="{L_RESET}" />
+		<input class="button2" type="button" name="cancel" value="{L_RESET}" onclick="document.forms['set_permissions'].reset(); init_colours(active_pmask + active_fmask);" />
 	</fieldset>
 
 	<br /><br />

phpBB/adm/style/acp_php_info.html

@@ -7,6 +7,7 @@
 <p>{L_ACP_PHP_INFO_EXPLAIN}</p>
 
 <div style="overflow: auto; width: 99%;">
-{PHPINFO}
+	{PHPINFO}
 </div>
+
 <!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_profile.html

@@ -11,10 +11,10 @@
 	<p>{L_EXPLAIN}</p>
 
 	<!-- IF ERROR_MSG -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
 	<!-- ENDIF -->
 
 	<form id="add_profile_field" method="post" action="{U_ACTION}">
@@ -23,43 +23,86 @@
 
 		<fieldset>
 			<legend>{L_TITLE}</legend>
-			<dl>
-				<dt><label>{L_FIELD_TYPE}:</label><br /><span>{L_FIELD_TYPE_EXPLAIN}</span></dt>
-				<dd><b>{FIELD_TYPE}</b></dd>
-			</dl>
-			<dl>
-				<dt><label for="field_ident">{L_FIELD_IDENT}:</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
-				<dd><input class="medium" type="text" id="field_ident" name="field_ident" value="{FIELD_IDENT}" /></dd>
-			</dl>
+		<dl>
+			<dt><label>{L_FIELD_TYPE}:</label><br /><span>{L_FIELD_TYPE_EXPLAIN}</span></dt>
+			<dd><b>{FIELD_TYPE}</b></dd>
+		</dl>
+		<!-- IF S_EDIT_MODE -->
+		<dl>
+			<dt><label>{L_FIELD_IDENT}:</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
+			<dd><input type="hidden" name="field_ident" value="{FIELD_IDENT}" /><strong>{FIELD_IDENT}</strong></dd>
+		</dl>
+		<!-- ELSE -->
+		<dl>
+			<dt><label for="field_ident">{L_FIELD_IDENT}:</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
+			<dd><input class="medium" type="text" id="field_ident" name="field_ident" value="{FIELD_IDENT}" /></dd>
+		</dl>
+		<!-- ENDIF -->
+		<dl>
+			<dt><label for="field_no_view">{L_DISPLAY_PROFILE_FIELD}:</label><br /><span>{L_DISPLAY_PROFILE_FIELD_EXPLAIN}</span></dt>
+			<dd><input type="radio" class="radio" id="field_no_view" name="field_no_view" value="0"<!-- IF not S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_YES} <input type="radio" class="radio" name="field_no_view" value="1"<!-- IF S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+		</dl>
 		</fieldset>
 
+		<fieldset>
+			<legend>{L_VISIBILITY_OPTION}</legend>
+		<dl>
+			<dt><label for="field_option_none">{L_DISPLAY_AT_PROFILE}:</label><br /><span>{L_DISPLAY_AT_PROFILE_EXPLAIN}</span></dt>
+			<dd><input type="radio" class="radio" id="field_option_none" name="field_option" value="none"<!-- IF not S_SHOW_ON_REG and not S_FIELD_REQUIRED and not S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd>
+		</dl>
+		<dl>
+			<dt><label for="field_show_on_reg">{L_DISPLAY_AT_REGISTER}:</label><br /><span>{L_DISPLAY_AT_REGISTER_EXPLAIN}</span></dt>
+			<dd><input type="radio" class="radio" id="field_show_on_reg" name="field_option" value="field_show_on_reg"<!-- IF S_SHOW_ON_REG --> checked="checked"<!-- ENDIF --> /></dd>
+		</dl>
+		<dl>
+			<dt><label for="field_required">{L_REQUIRED_FIELD}:</label><br /><span>{L_REQUIRED_FIELD_EXPLAIN}</span></dt>
+			<dd><input type="radio" class="radio" id="field_required" name="field_option" value="field_required"<!-- IF S_FIELD_REQUIRED --> checked="checked"<!-- ENDIF --> /></dd>
+		</dl>
+		<dl>
+			<dt><label for="field_hide">{L_HIDE_PROFILE_FIELD}:</label><br /><span>{L_HIDE_PROFILE_FIELD_EXPLAIN}</span></dt>
+			<dd><input type="radio" class="radio" id="field_hide" name="field_option" value="field_hide"<!-- IF S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd>
+		</dl>
+		</fieldset>
+
+		<!-- IF S_EDIT_MODE -->
+			<fieldset class="quick">
+				<input class="button1" type="submit" name="save" value="{L_SAVE}" />
+			</fieldset>
+		<!-- ENDIF -->
+
 		<fieldset>
 			<legend>{L_LANG_SPECIFIC}</legend>
+		<dl>
+			<dt><label for="lang_name">{L_USER_FIELD_NAME}:</label></dt>
+			<dd><input class="medium" type="text" id="lang_name" name="lang_name" value="{LANG_NAME}" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="lang_explain">{L_FIELD_DESCRIPTION}:</label><br /><span>{L_FIELD_DESCRIPTION_EXPLAIN}</span></dt>
+			<dd><textarea id="lang_explain" name="lang_explain" rows="3" cols="80">{LANG_EXPLAIN}</textarea></dd>
+		</dl>
+		<!-- IF S_TEXT or S_STRING -->
 			<dl>
-				<dt><label for="lang_name">{L_USER_FIELD_NAME}:</label></dt>
-				<dd><input class="medium" type="text" id="lang_name" name="lang_name" value="{LANG_NAME}" /></dd>
+				<dt><label for="lang_default_value">{L_DEFAULT_VALUE}:</label><br /><span>{L_DEFAULT_VALUE_EXPLAIN}</span></dt>
+				<dd><!-- IF S_STRING --><input class="medium" type="text" id="lang_default_value" name="lang_default_value" value="{LANG_DEFAULT_VALUE}" /><!-- ELSE --><textarea id="lang_default_value" name="lang_default_value" rows="5" cols="80">{LANG_DEFAULT_VALUE}</textarea><!-- ENDIF --></dd>
 			</dl>
+		<!-- ENDIF -->
+		<!-- IF S_BOOL or S_DROPDOWN -->
 			<dl>
-				<dt><label for="lang_explain">{L_FIELD_DESCRIPTION}:</label><br /><span>{L_FIELD_DESCRIPTION_EXPLAIN}</span></dt>
-				<dd><textarea id="lang_explain" name="lang_explain" rows="3" cols="80">{LANG_EXPLAIN}</textarea></dd>
+				<dt><label for="lang_options">{L_ENTRIES}:</label>
+					<!-- IF S_EDIT_MODE and S_DROPDOWN -->
+						<br /><span>{L_EDIT_DROPDOWN_LANG_EXPLAIN}</span>
+					<!-- ELSE -->
+						<br /><span>{L_LANG_OPTIONS_EXPLAIN}</span>
+					<!-- ENDIF -->
+				</dt>
+			<!-- IF S_DROPDOWN -->
+				<dd><textarea id="lang_options" name="lang_options" rows="5" cols="80">{LANG_OPTIONS}</textarea></dd>
+			<!-- ELSE -->
+				<dd><input class="medium" id="lang_options" name="lang_options[0]" value="{FIRST_LANG_OPTION}" /> {L_FIRST_OPTION}</dd>
+				<dd><input class="medium" name="lang_options[1]" value="{SECOND_LANG_OPTION}" /> {L_SECOND_OPTION}</dd>
+			<!-- ENDIF -->
 			</dl>
-			<!-- IF S_TEXT or S_STRING -->
-				<dl>
-					<dt><label for="lang_default_value">{L_DEFAULT_VALUE}:</label><br /><span>{L_DEFAULT_VALUE_EXPLAIN}</span></dt>
-					<dd><!-- IF S_STRING --><input class="medium" type="text" id="lang_default_value" name="lang_default_value" value="{LANG_DEFAULT_VALUE}" /><!-- ELSE --><textarea id="lang_default_value" name="lang_default_value" rows="5" cols="80">{LANG_DEFAULT_VALUE}</textarea><!-- ENDIF --></dd>
-				</dl>
-			<!-- ENDIF -->
-			<!-- IF S_BOOL or S_DROPDOWN -->
-				<dl>
-					<dt><label for="lang_options">{L_ENTRIES}:</label><br /><span>{L_LANG_OPTIONS_EXPLAIN}</span></dt>
-				<!-- IF S_DROPDOWN -->
-					<dd><textarea id="lang_options" name="lang_options" rows="5" cols="80">{LANG_OPTIONS}</textarea></dd>
-				<!-- ELSE -->
-					<dd><input class="medium" id="lang_options" name="lang_options[0]" value="{FIRST_LANG_OPTION}" /> {L_FIRST_OPTION}</dd>
-					<dd><input class="medium" name="lang_options[1]" value="{SECOND_LANG_OPTION}" /> {L_SECOND_OPTION}</dd>
-				<!-- ENDIF -->
-				</dl>
-			<!-- ENDIF -->
+		<!-- ENDIF -->
 		</fieldset>
 
 		<fieldset class="quick">
@@ -71,22 +114,6 @@
 
 		<fieldset>
 			<legend>{L_TITLE}</legend>
-		<dl>
-			<dt><label for="field_required">{L_REQUIRED_FIELD}:</label><br /><span>{L_REQUIRED_FIELD_EXPLAIN}</span></dt>
-			<dd><input type="checkbox" id="field_required" name="field_required" value="1"<!-- IF S_FIELD_REQUIRED --> checked="checked"<!-- ENDIF --> /></dd>
-		</dl>
-		<dl>
-			<dt><label for="field_show_on_reg">{L_DISPLAY_AT_REGISTRATION}:</label></dt>
-			<dd><input type="checkbox" id="field_show_on_reg" name="field_show_on_reg" value="1"<!-- IF S_SHOW_ON_REG --> checked="checked"<!-- ENDIF --> /></dd>
-		</dl>
-		<dl>
-			<dt><label for="field_hide">{L_HIDE_PROFILE_FIELD}:</label><br /><span>{L_HIDE_PROFILE_FIELD_EXPLAIN}</span></dt>
-			<dd><input type="checkbox" id="field_hide" name="field_hide" value="1"<!-- IF S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd>
-		</dl>
-		<dl>
-			<dt><label for="field_no_view">{L_EXCLUDE_FROM_VIEW}:</label><br /><span>{L_EXCLUDE_FROM_VIEW_EXPLAIN}</span></dt>
-			<dd><input type="checkbox" id="field_no_view" name="field_no_view" value="1"<!-- IF S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /></dd>
-		</dl>
 		<!-- BEGIN option -->
 			<dl>
 				<dt><label>{option.TITLE}:</label><!-- IF option.EXPLAIN --><br /><span>{option.EXPLAIN}</span><!-- ENDIF --></dt>
@@ -101,25 +128,9 @@
 		
 		<fieldset class="quick" style="float: right">
 			{S_HIDDEN_FIELDS}
-			<input class="button1" type="submit" name="update" value="{L_UPDATE_PREVIEW}" />&nbsp;
 			<input class="button1" type="submit" name="next" value="{L_NEXT}" />
 		</fieldset>
 
-		<br /><br />
-
-		<fieldset>
-			<legend>{L_PREVIEW_PROFILE_FIELD}</legend>
-			<!-- IF USER_ERROR --><p style="color: red;">{USER_ERROR}</p><!-- ELSE --><p style="color: green;">{L_EVERYTHING_OK}</p><!-- ENDIF -->
-		<dl>
-			<dt><label>{PREVIEW_LANG_NAME}:</label><!-- IF PREVIEW_LANG_EXPLAIN --><br /><span>{PREVIEW_LANG_EXPLAIN}</span><!-- ENDIF --></dt>
-			<dd>{PREVIEW_FIELD}</dd> 
-		</dl>
-		</fieldset>
-
-		<fieldset class="quick">
-			<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		</fieldset>
-
 	<!-- ELSEIF S_STEP_THREE -->
 
 		<!-- BEGIN options -->
@@ -150,14 +161,20 @@
 <!-- ELSE -->
 
 	<h1>{L_ACP_CUSTOM_PROFILE_FIELDS}</h1>
-	
+
+	<!-- IF S_NEED_EDIT -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{L_CUSTOM_FIELDS_NOT_TRANSLATED}</p>
+		</div>
+	<!-- ENDIF -->
+
 	<table cellspacing="1">
 	<thead>
 	<tr>
 		<th>{L_FIELD_IDENT}</th>
 		<th>{L_FIELD_TYPE}</th>
-		<th colspan="3">{L_OPTIONS}</th>
-		<th>{L_REORDER}</th>
+		<th colspan="2">{L_OPTIONS}</th>
 	</tr>
 	</thead>
 	<tbody>
@@ -166,10 +183,27 @@
 
 		<td>{fields.FIELD_IDENT}</td>
 		<td>{fields.FIELD_TYPE}</td>
-		<td><a href="{fields.U_ACTIVATE_DEACTIVATE}">{fields.L_ACTIVATE_DEACTIVATE}</a></td>
-		<td><a href="{fields.U_EDIT}"><!-- IF fields.S_NEED_EDIT --><span style="color:red">{L_EDIT}</span><!-- ELSE -->{L_EDIT}<!-- ENDIF --></a></td>
-		<td><a href="{fields.U_DELETE}">{L_DELETE}</a></td>
-		<td style="text-align: center;"><a href="{fields.U_MOVE_UP}">{L_MOVE_UP}</a> | <a href="{fields.U_MOVE_DOWN}">{L_MOVE_DOWN}</a></td>
+		<td style="text-align: center;"><a href="{fields.U_ACTIVATE_DEACTIVATE}">{fields.L_ACTIVATE_DEACTIVATE}</a><!-- IF fields.S_NEED_EDIT --> | <a href="{fields.U_TRANSLATE}" style="color: red;">{L_TRANSLATE}</a><!-- ENDIF --></td>
+
+		<td style="width: 80px; text-align: right; white-space: nowrap;">
+			<!-- IF fields.S_FIRST_ROW && not fields.S_LAST_ROW -->
+				{ICON_MOVE_UP_DISABLED}
+				<a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+			<!-- ELSEIF not fields.S_FIRST_ROW && not fields.S_LAST_ROW-->
+				<a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
+				<a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
+			<!-- ELSEIF fields.S_LAST_ROW && not fields.S_FIRST_ROW -->
+				<a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a>
+				{ICON_MOVE_DOWN_DISABLED}	
+			<!-- ENDIF -->
+			<!-- IF not fields.S_NEED_EDIT -->
+				<a href="{fields.U_EDIT}">{ICON_EDIT}</a> 
+			<!-- ELSE -->
+				{ICON_EDIT_DISABLED}
+			<!-- ENDIF -->
+			<a href="{fields.U_DELETE}">{ICON_DELETE}</a>
+		</td>
+
 	</tr>
 	<!-- END fields -->
 	</tbody>
@@ -179,11 +213,12 @@
 	
 	<fieldset class="quick">
 		<input class="small" type="text" name="field_ident" /> <select name="field_type">{S_TYPE_OPTIONS}</select>
-		<input class="button1" type="submit" name="create" value="{L_CREATE_NEW_FIELD}" />
+		<input class="button1" type="submit" name="submit" value="{L_CREATE_NEW_FIELD}" />
+		<input type="hidden" name="create" value="1" />
 	</fieldset>
 
 	</form>
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_prune_forums.html

@@ -25,7 +25,7 @@
 	</tr>
 	<!-- BEGINELSE -->
 		<tr>
-			<td class="row3" style="text-align: center;">{L_NO_PRUNE}</td>
+			<td colspan="3" class="row3" style="text-align: center;">{L_NO_PRUNE}</td>
 		</tr>
 	<!-- END pruned -->
 	</tbody>
@@ -44,10 +44,10 @@
 	<dl>
 		<dd class="full"><select name="f[]" multiple="multiple" size="5">{S_FORUM_OPTIONS}</select></dd>
 	</dl>
-	</fieldset>
 	
-	<fieldset class="quick">
+	<p class="quick">
 		<input class="button1" type="submit" value="{L_LOOK_UP_FORUM}" />
+	</p>
 	</fieldset>
 
 	</form>
@@ -88,16 +88,16 @@
 		<dt><label for="sticky">{L_PRUNE_STICKY}:</label></dt>
 		<dd><input type="radio" class="radio" name="prune_sticky" value="1" /> {L_YES} &nbsp; <input type="radio" class="radio" id="sticky" name="prune_sticky" value="0" checked="checked" /> {L_NO}</dd>
 	</dl>
-	</fieldset>
 	
-	<fieldset class="quick">
+	<p class="quick">
 		{S_HIDDEN_FIELDS}
 
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
+	</p>
 	</fieldset>
 
 	</form>
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_prune_users.html

@@ -43,15 +43,15 @@
 	<dt><label for="deactivate">{L_DEACTIVATE_DELETE}:</label><br /><span>{L_DEACTIVATE_DELETE_EXPLAIN}</span></dt>
 	<dd><input type="radio" class="radio" name="action" value="delete" /> {L_DELETE_USERS}&nbsp;&nbsp;<input type="radio" class="radio" id="deactivate" name="action" value="deactivate" checked="checked" /> {L_DEACTIVATE}</dd>
 </dl>
-</fieldset>
 
-<fieldset class="submit-buttons">
+<p class="submit-buttons">
 	<input type="hidden" name="prune" value="1" />
 
 	<input class="button1" type="submit" id="update" name="update" value="{L_SUBMIT}" />&nbsp;
 	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+</p>
 </fieldset>
 
 </form>
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_ranks.html

@@ -8,7 +8,6 @@
 
 	<script type="text/javascript">
 	<!--
-
 		function update_image(newimage)
 		{
 			document.getElementById('image').src = (newimage) ? "{RANKS_PATH}/" + newimage : "./images/spacer.gif";
@@ -27,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}" /></dd>
+		<dd><input name="title" type="text" id="title" value="{RANK_TITLE}" maxlength="255" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="rank_image">{L_RANK_IMAGE}:</label></dt>
@@ -44,13 +43,13 @@
 		<dd><input name="min_posts" type="text" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd>
 	</dl>
 	</div>
-	</fieldset>
 
-	<fieldset class="submit-buttons">
+	<p class="submit-buttons">
 		<input type="hidden" name="action" value="save" />
 
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
 	</fieldset>
 
 	</form>
@@ -61,6 +60,10 @@
 
 	<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>
@@ -76,20 +79,19 @@
 		<td style="text-align: center;"><!-- IF ranks.S_RANK_IMAGE --><img src="{ranks.RANK_IMAGE}" alt="{ranks.RANK_TITLE}" title="{ranks.RANK_TITLE}" /><!-- ELSE -->&nbsp; - &nbsp;<!-- ENDIF --></td>
 		<td style="text-align: center;">{ranks.RANK_TITLE}</td>
 		<td style="text-align: center;"><!-- IF ranks.S_SPECIAL_RANK -->&nbsp; - &nbsp;<!-- ELSE -->{ranks.MIN_POSTS}<!-- ENDIF --></td>
-		<td style="text-align: center;"><a href="{ranks.U_EDIT}">{L_EDIT}</a> | <a href="{ranks.U_DELETE}">{L_DELETE}</a></td>
+		<td style="text-align: center;"><a href="{ranks.U_EDIT}">{ICON_EDIT}</a> <a href="{ranks.U_DELETE}">{ICON_DELETE}</a></td>
 	</tr>
 	<!-- END ranks -->
 	</tbody>
 	</table>
 
-	<form id="acp_ranks" method="post" action="{U_ACTION}">
-
-	<fieldset class="quick">
+	<p class="quick">
 		<input class="button2" name="add" type="submit" value="{L_ADD_RANK}" />
+	</p>
 	</fieldset>
 
 	</form>
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_reasons.html

@@ -17,24 +17,42 @@
 		</div>
 	<!-- ENDIF -->
 
+	<!-- IF not S_TRANSLATED -->
+		<h3>{L_AVAILABLE_TITLES}</h3>
+
+		<p>{S_AVAILABLE_TITLES}</p>
+	<!-- ENDIF -->
+
 	<form id="acp_reasons" method="post" action="{U_ACTION}">
 
 	<fieldset>
 		<legend>{L_TITLE}</legend>
-		<p><!-- IF S_TRANSLATED -->{L_IS_TRANSLATED}<!-- ELSE -->{L_IS_NOT_TRANSLATED}<!-- 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}" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="reason_description">{L_REASON_DESCRIPTION}:</label></dt>
-			<dd><textarea name="reason_description" id="reason_description" rows="8">{REASON_DESCRIPTION}</textarea></dd>
-		</dl>
-	</fieldset>
+		<p><!-- IF S_TRANSLATED -->{L_IS_TRANSLATED_EXPLAIN}<!-- ELSE -->{L_IS_NOT_TRANSLATED_EXPLAIN}<!-- ENDIF --></p>
+	<dl>
+		<dt><label for="reason_title">{L_REASON_TITLE}:</label></dt>
+		<dd><input name="reason_title" type="text" id="reason_title" value="{REASON_TITLE}" maxlength="255" /></dd>
+	</dl>
+	<!-- IF S_TRANSLATED -->
+	<dl>
+		<dt>{L_REASON_TITLE_TRANSLATED}</dt>
+		<dd>{TRANSLATED_TITLE}</dd>
+	</dl>
+	<!-- ENDIF -->
+	<dl>
+		<dt><label for="reason_description">{L_REASON_DESCRIPTION}:</label></dt>
+		<dd><textarea name="reason_description" id="reason_description" rows="8">{REASON_DESCRIPTION}</textarea></dd>
+	</dl>
+	<!-- IF S_TRANSLATED -->
+	<dl>
+		<dt>{L_REASON_DESC_TRANSLATED}</dt>
+		<dd>{TRANSLATED_DESCRIPTION}</dd>
+	</dl>
+	<!-- ENDIF -->
 
-	<fieldset class="submit-buttons">
+	<p class="submit-buttons">
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
 	</fieldset>
 
 	</form>
@@ -45,48 +63,64 @@
 
 	<p>{L_ACP_REASONS_EXPLAIN}</p>
 
-<!-- IF reasons -->
-	<table cellspacing="1">
-		<col class="row1" /><col class="row1" /><col class="row2" />
-	<thead>
-	<tr>
-		<th>{L_REASON}</th>
-		<th>{L_USED_IN_REPORTS}</th>
-		<th>{L_OPTIONS}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN reasons -->
-		<tr>
-			<td>
-				<i style="float: 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>
-			<td style="width: 100px;">{reasons.REASON_COUNT}</td>
-			<td style="width: 15%; text-align: right; white-space: nowrap;">
-				<!-- IF not reasons.S_FIRST_ROW --><a href="{reasons.U_MOVE_UP}"><img src="images/icon_up.gif" alt="{L_MOVE_UP}" title="{L_MOVE_UP}" width="16" height="16" /></a> <!-- ENDIF -->
-				<!-- IF not reasons.S_LAST_ROW --><a href="{reasons.U_MOVE_DOWN}"><img src="images/icon_down.gif" alt="{L_MOVE_DOWN}" title="{L_MOVE_DOWN}" width="16" height="16" /></a> <!-- ENDIF -->
-				<a href="{reasons.U_EDIT}"><img src="images/icon_edit.gif" alt="{L_EDIT}" title="{L_EDIT}" width="16" height="16" /></a> 
-				<!-- IF reasons.U_DELETE --><a href="{reasons.U_DELETE}"><img src="images/icon_delete.gif" alt="{L_DELETE}" title="{L_DELETE}" width="16" height="16" /></a><!-- ENDIF -->
-			</td>
-		</tr>
-	<!-- END reasons -->
-	</tbody>
-	</table>
-<!-- ENDIF -->
-
 	<form id="reasons" method="post" action="{U_ACTION}">
+	<fieldset class="tabulated">
+	<legend>{L_ACP_REASONS}</legend>
 
-	<fieldset class="quick">
+	<!-- IF .reasons -->
+		<table cellspacing="1">
+			<col class="row1" /><col class="row1" /><col class="row2" />
+		<thead>
+		<tr>
+			<th>{L_REASON}</th>
+			<th>{L_USED_IN_REPORTS}</th>
+			<th>{L_OPTIONS}</th>
+		</tr>
+		</thead>
+		<tbody>
+		<!-- BEGIN reasons -->
+			<tr>
+				<td>
+					<i style="float: 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>
+				<td style="width: 100px;">{reasons.REASON_COUNT}</td>
+				<td style="width: 80px; text-align: right; white-space: nowrap;">
+					<!-- IF reasons.S_FIRST_ROW && not reasons.S_LAST_ROW -->
+						{ICON_MOVE_UP_DISABLED}
+						<a href="{reasons.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<!-- ELSEIF not reasons.S_FIRST_ROW && not reasons.S_LAST_ROW-->
+						<a href="{reasons.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
+						<a href="{reasons.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
+					<!-- ELSEIF reasons.S_LAST_ROW && not reasons.S_FIRST_ROW -->
+						<a href="{reasons.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
+						{ICON_MOVE_DOWN_DISABLED}
+					<!-- ENDIF -->
+					<a href="{reasons.U_EDIT}">{ICON_EDIT}</a> 
+					<!-- IF reasons.U_DELETE -->
+						<a href="{reasons.U_DELETE}">{ICON_DELETE}</a>
+					<!-- ELSE -->
+						{ICON_DELETE_DISABLED}
+					<!-- ENDIF -->
+				</td>
+			</tr>
+		<!-- END reasons -->
+		</tbody>
+		</table>
+
+	<!-- ENDIF -->
+
+	<p class="quick">
 		<input type="hidden" name="action" value="add" />
 
 		<input type="text" name="reason_title" /> 
 		<input class="button2" name="addreason" type="submit" value="{L_ADD_NEW_REASON}" />
+	</p>
 	</fieldset>
 
 	</form>
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_search.html

@@ -3,21 +3,25 @@
 <a name="maincontent"></a>
 
 <!-- IF S_SETTINGS -->
-<h1>{L_ACP_SEARCH_SETTINGS}</h1>
+	<h1>{L_ACP_SEARCH_SETTINGS}</h1>
 
-<p>{L_ACP_SEARCH_SETTINGS_EXPLAIN}</p>
+	<p>{L_ACP_SEARCH_SETTINGS_EXPLAIN}</p>
 
-<form id="acp_search" method="post" action="{U_ACTION}">
-<fieldset>
-	<legend>{L_GENERAL_SEARCH_SETTINGS}</legend>
+	<form id="acp_search" method="post" action="{U_ACTION}">
 
+	<fieldset>
+		<legend>{L_GENERAL_SEARCH_SETTINGS}</legend>
 	<dl>
 		<dt><label for="load_search">{L_YES_SEARCH}:</label><br /><span>{L_YES_SEARCH_EXPLAIN}</span></dt>
-		<dd><input type="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" name="config[load_search]" value="0"<!-- IF not S_YES_SEARCH --> checked="checked"<!-- ENDIF --> class="radio" />&nbsp;{L_NO}</dd>
+		<dd><input type="radio" class="radio" id="load_search" name="config[load_search]" value="1"<!-- IF S_YES_SEARCH --> checked="checked"<!-- ENDIF --> />&nbsp;{L_YES}&nbsp;&nbsp;<input type="radio" class="radio" name="config[load_search]" value="0"<!-- IF not S_YES_SEARCH --> checked="checked"<!-- ENDIF --> />&nbsp;{L_NO}</dd>
 	</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}" /></dd>
+		<dd><input id="search_interval" type="text" size="4" maxlength="4" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>
+	</dl>
+	<dl>
+		<dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}:</label><br /><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt>
+		<dd><input id="search_anonymous_interval" type="text" size="4" maxlength="4" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>
 	</dl>
 	<dl>
 		<dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}:</label><br /><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt>
@@ -29,91 +33,112 @@
 	</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}" /></dd>
+		<dd><input id="search_store_results" type="text" size="4" maxlength="6" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>
 	</dl>
-</fieldset>
-
-<fieldset>
-	<legend>{L_SEARCH_TYPE}</legend>
+	</fieldset>
 
+	<fieldset>
+		<legend>{L_SEARCH_TYPE}</legend>
 	<dl>
 		<dt><label for="search_type">{L_SEARCH_TYPE}:</label><br /><span>{L_SEARCH_TYPE_EXPLAIN}</span></dt>
 		<dd><select id="search_type" name="config[search_type]">{S_SEARCH_TYPES}</select></dd>
 	</dl>
-</fieldset>
+	</fieldset>
 
-<!-- BEGIN backend -->
-<fieldset>
-	<legend>{backend.NAME}</legend>
+	<!-- BEGIN backend -->
 
-	{backend.SETTINGS}
-</fieldset>
-<!-- END backend -->
+		<fieldset>
+			<legend>{backend.NAME}</legend>
+		{backend.SETTINGS}
+		</fieldset>
 
-<fieldset class="submit-buttons">
-	<input class="button1" type="submit" id="submit" name="submit" value="Submit" />&nbsp;
-	<input class="button2" type="reset" id="reset" name="reset" value="Reset" />
-</fieldset>
+	<!-- END backend -->
 
-</form>
+	<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>
+
+	</form>
 
 <!-- ELSEIF S_INDEX -->
-<script language="javascript" type="text/javascript">
-<!--
-	function popup_progress_bar(progress_type)
-	{
-	    close_waitscreen = 0;
-		window.open('{U_PROGRESS_BAR}&type=' + progress_type, '_index', 'HEIGHT=200,resizable=yes,scrollbars=no,WIDTH=400');
-	}
-//-->
-</script>
 
-<h1>{L_ACP_SEARCH_INDEX}</h1>
+	<script type="text/javascript">
+	<!--
 
-<p>{L_ACP_SEARCH_INDEX_EXPLAIN}</p>
+		/**
+		* Popup search progress bar
+		*/
+		function popup_progress_bar(progress_type)
+		{
+			close_waitscreen = 0;
+			window.open('{UA_PROGRESS_BAR}&type=' + progress_type, '_index', 'HEIGHT=240,resizable=yes,scrollbars=no,WIDTH=400');
+		}
+	//-->
+	</script>
 
-<!-- IF S_CONTINUE_INDEXING -->
-	<a href="{U_CONTINUE_INDEXING}" onclick="javascript:popup_progress_bar('{S_CONTINUE_INDEXING}');">{L_CONTINUE}</a>
+	<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>
+	<!-- ELSE -->
+
+		<!-- BEGIN backend -->
+
+			<!-- IF backend.S_STATS -->
+
+			<form id="acp_search_index_{backend.NAME}" method="post" action="{U_ACTION}">
+
+				<fieldset class="tabulated">
+
+				{backend.S_HIDDEN_FIELDS}
+
+				<legend>{L_INDEX_STATS}: {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></legend>
+
+				<table cellspacing="1">
+					<caption>{backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></caption>
+					<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
+				<thead>
+				<tr>
+					<th>{L_STATISTIC}</th>
+					<th>{L_VALUE}</th>
+					<th>{L_STATISTIC}</th>
+					<th>{L_VALUE}</th>
+				</tr>
+				</thead>
+				<tbody>
+				<!-- BEGIN data -->
+					<tr>
+						<td>{backend.data.STATISTIC_1}:</td>
+						<td>{backend.data.VALUE_1}</td>
+						<td>{backend.data.STATISTIC_2}<!-- IF backend.data.STATISTIC_2 -->:<!-- ENDIF --></td>
+						<td>{backend.data.VALUE_2}</td>
+					</tr>
+				<!-- END data -->
+				</tbody>
+				</table>
+			
+			<!-- ENDIF -->
+			
+			<p class="quick">
+			<!-- IF backend.S_INDEXED -->
+				<input class="button2" type="submit" name="action[delete]" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');" />
+			<!-- ELSE -->
+				<input class="button2" type="submit" name="action[create]" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');" />
+			<!-- ENDIF -->
+			</p>
+			</fieldset>
+
+			</form>
+		<!-- END backend -->
+
+	<!-- ENDIF -->
 
-	<p>{L_CONTINUE_EXPLAIN}</p>
-<!-- ELSE -->
-<!-- BEGIN backend -->
-<!-- IF backend.S_STATS -->
-<table cellspacing="1">
-	<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>
-		<th>{L_STATISTIC}</th>
-		<th>{L_VALUE}</th>
-		<th>{L_STATISTIC}</th>
-		<th>{L_VALUE}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN data -->
-	<tr>
-		<td>{backend.data.STATISTIC_1}:</td>
-		<td>{backend.data.VALUE_1}</td>
-		<td>{backend.data.STATISTIC_2}<!-- IF backend.data.STATISTIC_2 -->:<!-- ENDIF --></td>
-		<td>{backend.data.VALUE_2}</td>
-	</tr>
-	<!-- END data -->
-	</tbody>
-</table>
-<!-- ENDIF -->
-<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="javascript:popup_progress_bar('delete')" />
-		<!-- ELSE -->
-			<input class="button2" type="submit" name="action[create]" value="{L_CREATE_INDEX}" onclick="javascript:popup_progress_bar('create')" />
-		<!-- ENDIF -->
-	</fieldset>
-</form>
-<!-- END backend -->
-<!-- ENDIF -->
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_styles.html

@@ -11,7 +11,7 @@
 	<p>{L_EXPLAIN}</p>
 
 	<form id="acp_styles" method="post" action="{U_ACTION}">
-	
+
 	<fieldset>
 		<legend>{L_TITLE}</legend>
 	<dl>
@@ -22,10 +22,10 @@
 		<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>
-	</fieldset>
 
-	<fieldset class="quick">
+	<p class="quick">
 		<input class="button1" type="submit" name="update" value="{L_DELETE}" />
+	</p>
 	</fieldset>
 
 	</form>
@@ -37,77 +37,407 @@
 	<h1>{L_TITLE}</h1>
 
 	<p>{L_EXPLAIN}</p>
-	<script language="javascript" type="text/javascript" defer="defer">
-	<!--
 
-	function update_image(newimage)
-	{
-		document.newimg.src = (newimage) ? "../styles/{NAME}/imageset/" + newimage : "images/no_image.png";
-	}
+	<!-- 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">
+	<!--
+		function update_image(newimage)
+		{
+			document.getElementById('newimg').src = (newimage) ? "../styles/{NAME}/imageset/" + newimage : "images/no_image.png";
+		}
 	//-->
 	</script>
-	<form method="post" action="{U_ACTION}"><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 -->
+
+	<form method="post" action="{U_ACTION}">
+
+	<fieldset class="quick" style="text-align: left;">
+		<legend>{L_SELECT_IMAGE}</legend>
+		{L_SELECT_IMAGE}: <select name="imgname" onchange="this.form.submit();">
+		<!-- BEGIN category -->
 			<option class="sep" value="">{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="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>
+		</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="images/no_image.png" 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><input type="radio" class="radio" name="imgsize" id="imgsize" value="1"<!-- IF IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_YES}&nbsp;&nbsp;<input type="radio" class="radio" name="imgsize" value="0"<!-- IF not IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+	</dl>
+	</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}" />
+	</fieldset>
+
+	</form>
+
+<!-- ELSEIF S_EDIT_TEMPLATE or S_EDIT_THEME -->
+
+	<script type="text/javascript" defer="defer">
+	<!--
+		function append_text_rows(form_name, value)
+		{
+			url = document.getElementById(form_name).action;
+			var_start = url.indexOf('&text_rows=');
+			if (var_start == -1)
+			{
+				document.getElementById(form_name).action = url + "&text_rows=" + value;
+			}
+			else
+			{
+				url_start = url.substring(0, var_start + 1);
+				var_end = url.substring(var_start + 1).indexOf('&');
+				if (var_end == -1)
+				{
+					document.getElementById(form_name).action = url_start + "text_rows=" + value;
+				}
+				else
+				{
+					document.getElementById(form_name).action = url_start + url.substring(var_end + var_start + 2) + "&text_rows=" + value;
+				}
+			}
+		}
+	//-->
+	</script>
+
+	<!-- 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="button2" type="submit" value="{L_SELECT}" /></dd>
+		</dl>
+		</fieldset>
+
+		</form>
+
+		<!-- IF TEMPLATE_FILE -->
+			<script 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 + "&text_rows=" + value;
+					}
+					else
+					{
+						url_start = url.substring(0, var_start + 1);
+						var_end = url.substring(var_start + 1).indexOf('&');
+						if (var_end == -1)
+						{
+							document.getElementById(form_name).action = url_start + "text_rows=" + value;
+						}
+						else
+						{
+							document.getElementById(form_name).action = url_start + url.substring(var_end + var_start + 2) + "&text_rows=" + value;
+						}
+					}
+				}
+			//-->
+			</script>
+
+			<form id="acp_template" method="post" action="{U_ACTION}">
+
+			<fieldset>
+				<legend>{L_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="button2" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd>
+			</dl>
+			<textarea id="template_data" name="template_data" style="font-family:'Courier New', monospace;font-size:9pt;line-height:125%;width:100%;" cols="80" rows="{TEXT_ROWS}">{TEMPLATE_DATA}</textarea>
+			</fieldset>
+
+			<fieldset class="submit-buttons">
+				<legend>{L_SUBMIT}</legend>
+				{S_HIDDEN_FIELDS}
+				<input class="button1" id="save" type="submit" name="save" value="{L_SUBMIT}" />
+			</fieldset>
+
+			</form>
+		<!-- ENDIF -->
+
+	<!-- ELSEIF S_EDIT_THEME -->
+
+		<script type="text/javascript">
+		<!--
+
+			function change_editor_height(height)
+			{
+				editor = document.getElementById('css_data');
+				editor.rows = Math.max(5, Math.min(height, 999));
+
+				append_text_rows('acp_styles', height);
+				append_text_rows('acp_theme', height);
+				append_text_rows('acp_custom_class', height);
+			}
+
+		//-->
+		</script>
+
+		<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+
+		<h1>{L_EDIT_THEME}</h1>
+
+		<p>{L_EDIT_THEME_EXPLAIN}</p>
+
+		<p>{L_SELECTED_THEME}: <strong>{SELECTED_THEME}</strong></p>
+
+		<!-- IF S_SHOWCSS -->
+			<h3>{L_SHOW_CSS_NOTE}</h3>
+			<p>{L_SHOW_CSS_EXPLAIN}</p>
+		<!-- ENDIF -->
+		<form id="acp_styles" method="post" action="{U_ACTION}">
+
+		<fieldset>
+			<legend>{L_SELECT_CLASS}</legend>
+		<dl>
+			<dt><label for="css_class">{L_SELECT_CLASS}:</label></dt>
+			<dd><select id="css_class" name="css_class" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_CLASSES}</select></dd>
+			<dd><input class="button1" type="submit" id="select_class" name="select_class" value="{L_SELECT}" /></dd>
+		</dl>
+		<!-- IF S_CLASS -->
+			<dl>
+				<dt><label>{L_SELECTED_CLASS}:</label></dt>
+				<dd>{S_CLASS}</dd>
+			</dl>
+		<!-- ENDIF -->
+		</fieldset>
+	
+		</form>
+
+		<!-- IF S_CLASS -->
+
+			<form id="acp_theme" method="post" action="{U_ACTION}">
+
+			<!-- IF S_SHOWCSS -->
+
+				<fieldset>
+					<legend>{L_THEME_EDITOR}</legend>
+				<dl>
+					<dt><label for="text_rows">{L_THEME_EDITOR_HEIGHT}:</label></dt>
+					<dd><input id="text_rows" type="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="button1" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd>
+				</dl>
+				<textarea id="css_data" name="css_data" style="font-family:'Courier New', monospace;font-size:9pt;line-height:125%;width:100%;" cols="80" rows="{TEXT_ROWS}">{CSS_DATA}</textarea>
+				</fieldset>
+
+			<!-- ELSE -->
+
+				<fieldset>
+					<legend>{L_BACKGROUND}</legend>
+				<dl>
+					<dt><label for="background_color">{L_BACKGROUND_COLOUR}:</label><br /><span>{L_CSS_COLOUR_EXPLAIN}</span></dt>
+					<dd><input id="background_color" name="background_color" type="text" value="{BACKGROUND_COLOR}" size="6" />&nbsp;&nbsp;<span>[ <a href="#" onclick="swatch('background_color'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>
+				</dl>
+				<dl>
+					<dt><label for="backround_image">{L_BACKGROUND_IMAGE}:</label></dt>
+					<dd><select id="background_image" name="background_image">{S_BACKGROUND_IMAGE}</select></dd>
+				</dl>
+				<dl>
+					<dt><label for="background_repeat">{L_BACKGROUND_REPEAT}:</label></dt>
+					<dd><select id="background_repeat" name="background_repeat">{S_BACKGROUND_REPEAT}</select></dd>
+				</dl>
+				</fieldset>
+
+				<fieldset>
+					<legend>{L_FOREGROUND}</legend>
+				<dl>
+					<dt><label for="color">{L_FONT_COLOUR}:</label><br /><span>{L_CSS_COLOUR_EXPLAIN}</span></dt>
+					<dd><input id="color" name="color" type="text" value="{COLOR}" size="6" />&nbsp;&nbsp;<span>[ <a href="#" onclick="swatch('color'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>
+				</dl>
+				<dl>
+					<dt><label for="font_family">{L_FONT_FACE}:</label><br /><span>{L_FONT_FACE_EXPLAIN}</span></dt>
+					<dd><input id="font_family" name="font_family" type="text" value="{FONT_FAMILY}" size="40" maxlength="255" /></dd>
+				</dl>
+				<dl>
+					<dt><label for="font_size">{L_FONT_SIZE}:</label></dt>
+					<dd><input id="font_size" name="font_size" type="text" value="{FONT_SIZE}" size="5" maxlength="5" /> <select id="font_size_unit" name="font_size_unit">{S_FONT_SIZE_UNITS}</select></dd>
+				</dl>
+				<dl>
+					<dt><label for="font_weight">{L_BOLD}:</label></dt>
+					<dd><input id="font_weight" type="radio" class="radio" name="font_weight" value="bold"<!-- IF FONT_WEIGHT eq "bold" --> checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="font_weight" value="none"<!-- IF FONT_WEIGHT eq "none" --> checked="checked"<!-- ENDIF --> /> {L_NO} &nbsp; <input type="radio" class="radio" name="font_weight" value=""<!-- IF not FONT_WEIGHT --> checked="checked"<!-- ENDIF --> /> {L_UNSET}</dd>
+				</dl>
+				<dl>
+					<dt><label for="font_style">{L_ITALIC}:</label></dt>
+					<dd><input id="font_style" type="radio" class="radio" name="font_style" value="italic"<!-- IF FONT_STYLE eq "italic" --> checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="font_style" value="none"<!-- IF FONT_STYLE eq "none" --> checked="checked"<!-- ENDIF --> /> {L_NO} &nbsp; <input type="radio" class="radio" name="font_style" value=""<!-- IF not FONT_STYLE --> checked="checked"<!-- ENDIF --> /> {L_UNSET}</dd>
+				</dl>
+				<dl>
+					<dt><label for="text_decoration">{L_UNDERLINE}:</label></dt>
+					<dd><input id="text_decoration" type="radio" class="radio" name="text_decoration" value="underline"<!-- IF TEXT_DECORATION eq "underline" --> checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="text_decoration" value="none"<!-- IF TEXT_DECORATION eq "none" --> checked="checked"<!-- ENDIF --> /> {L_NO} &nbsp; <input type="radio" class="radio" name="text_decoration" value=""<!-- IF not TEXT_DECORATION --> checked="checked"<!-- ENDIF --> /> {L_UNSET}</dd>
+				</dl>
+				<dl>
+					<dt><label for="line_height">{L_LINE_SPACING}</label></dt>
+					<dd><input id="line_height" name="line_height" type="text" value="{LINE_HEIGHT}" size="3" maxlength="3" /> <select id="line_height_unit" name="line_height_unit">{S_LINE_HEIGHT_UNITS}</select></dd>
+				</dl>
+				</fieldset>
+
+			<!-- ENDIF -->
+
+			<fieldset class="submit-buttons">
+				<legend>{L_SUBMIT}</legend>
+				{S_HIDDEN_FIELDS}
+				<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+				<!-- IF S_SHOWCSS -->
+					<input class="button2" type="submit" id="hidecss" name="hidecss" value="{L_HIDE_CSS}" />&nbsp;
+				<!-- ELSE -->
+					<input class="button2" type="submit" id="showcss" name="showcss" value="{L_SHOW_CSS}" />&nbsp;
 				<!-- ENDIF -->
-				<!-- 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 neq '' -->{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_NONE}</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_DIMENSIONS}: </b><br /><span class="gensmall">{L_DIMENSIONS_EXPLAIN}</span></td>
-					<td class="row2"><input type="radio" name="imgsize" value="1"<!-- IF IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_YES}&nbsp;&nbsp;<input type="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>
+				<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+			</fieldset>
+
+			</form>
+
+		<!-- ENDIF -->
+
+		<br />
+		<h1>{L_CUSTOM_CLASS}</h1>
+
+		<p>{L_CUSTOM_CLASS_EXPLAIN}</p>
+
+		<form id="acp_custom_class" method="post" action="{U_ACTION}">
+
+		<fieldset>
+			<legend>{L_CUSTOM_CLASS}</legend>
+		<dl>
+			<dt><label for="custom_class">{L_CSS_CLASS_NAME}:</label></dt>
+			<dd><input id="custom_class" name="custom_class" type="text" value="" maxlength="40" size="40" /></dd>
+		</dl>
+
+		<p class="quick">
+			<input class="button1" type="submit" id="add_custom" name="add_custom" value="{L_SUBMIT}" />
+		</p>
+		</fieldset>
+
+		</form>
+	
+	<!-- ENDIF -->
+
+<!-- ELSEIF S_CACHE -->
+
+	<script type="text/javascript">
+	<!--
+
+		function viewsource(url)
+		{
+			window.open(url, '_source', 'HEIGHT=550,resizable=yes,scrollbars=yes,WIDTH=750');
+			return false;
+		}
+	
+	//-->
+	</script>
+
+	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
+	
+	<h1>{L_TEMPLATE_CACHE}</h1>
+	
+	<p>{L_TEMPLATE_CACHE_EXPLAIN}</p>
+	
+	<form name="acp_styles" method="post" action="{U_ACTION}">
+	<fieldset class="tabulated">
+	<legend>{L_TEMPLATE_CACHE}</legend>
+
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_CACHE_FILENAME}</th>
+		<th>{L_CACHE_FILESIZE}</th>
+		<th>{L_CACHE_CACHED}</th>
+		<th>{L_CACHE_MODIFIED}</th>
+		<th>{L_MARK}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN file -->
+		<!-- IF file.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<td><a href="{file.U_VIEWSOURCE}" onclick="viewsource('{file.UA_VIEWSOURCE}');return false">{file.FILENAME}</a></td>
+			<td>{file.FILESIZE}</td>
+			<td>{file.CACHED}</td>
+			<td>{file.MODIFIED}</td>
+			<td><input type="checkbox" class="radio" name="delete[]" value="{file.FILENAME}" /></td>
 		</tr>
-	</table></form>
+	<!-- BEGINELSE -->
+		<tr class="row1">
+			<td colspan="5">{L_TEMPLATE_CACHE_EMPTY}</td>
+		</tr>
+	<!-- END file -->
+	</tbody>
+	</table>
+
+	<p class="quick">
+		<span class="small"><a href="#" onclick="marklist('acp_styles', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('acp_styles', 'delete', false); return false;">{L_UNMARK_ALL}</a></span><br />
+
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_DELETE_MARKED}" />
+	</p>
+	</fieldset>
+
+	</form>
 
 <!-- ELSEIF S_EXPORT -->
 
@@ -118,14 +448,14 @@
 	<p>{L_EXPLAIN}</p>
 
 	<!-- IF S_ERROR_MSG -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
 	<!-- ENDIF -->
 
 	<form id="acp_styles" method="post" action="{U_ACTION}">
-	
+
 	<fieldset>
 		<legend>{L_TITLE}</legend>
 	<dl>
@@ -133,18 +463,18 @@
 		<dd><b>{NAME}</b></dd>
 	</dl>
 	<!-- IF S_STYLE -->
-	<dl>
-		<dt><label for="inc_template">{L_INCLUDE_TEMPLATE}:</label></dt>
-		<dd><input type="radio" class="radio" id="inc_template" name="inc_template" value="1" checked="checked" />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="inc_template" value="0" />&nbsp; {L_NO}</dd>
-	</dl>
-	<dl>
-		<dt><label for="inc_theme">{L_INCLUDE_THEME}:</label></dt>
-		<dd><input type="radio" class="radio" id="inc_theme" name="inc_theme" value="1" checked="checked" />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="inc_theme" value="0" />&nbsp; {L_NO}</dd>
-	</dl>
-	<dl>
-		<dt><label for="inc_imageset">{L_INCLUDE_IMAGESET}:</label></dt>
-		<dd><input type="radio" class="radio" id="inc_imageset" name="inc_imageset" value="1" checked="checked" />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="inc_imageset" value="0" />&nbsp; {L_NO}</dd>
-	</dl>
+		<dl>
+			<dt><label for="inc_template">{L_INCLUDE_TEMPLATE}:</label></dt>
+			<dd><input type="radio" class="radio" id="inc_template" name="inc_template" value="1" checked="checked" />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="inc_template" value="0" />&nbsp; {L_NO}</dd>
+		</dl>
+		<dl>
+			<dt><label for="inc_theme">{L_INCLUDE_THEME}:</label></dt>
+			<dd><input type="radio" class="radio" id="inc_theme" name="inc_theme" value="1" checked="checked" />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="inc_theme" value="0" />&nbsp; {L_NO}</dd>
+		</dl>
+		<dl>
+			<dt><label for="inc_imageset">{L_INCLUDE_IMAGESET}:</label></dt>
+			<dd><input type="radio" class="radio" id="inc_imageset" name="inc_imageset" value="1" checked="checked" />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="inc_imageset" value="0" />&nbsp; {L_NO}</dd>
+		</dl>
 	<!-- ENDIF -->
 	<dl>
 		<dt><label for="store">{L_DOWNLOAD_STORE}:</label><br /><span>{L_DOWNLOAD_STORE_EXPLAIN}</span></dt>
@@ -154,10 +484,10 @@
 		<dt><label for="format">{L_ARCHIVE_FORMAT}:</label></dt>
 		<dd>{FORMAT_BUTTONS}</dd>
 	</dl>
-	</fieldset>
-	
-	<fieldset class="quick">
+
+	<p class="quick">
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+	</p>
 	</fieldset>
 
 	</form>
@@ -168,15 +498,16 @@
 
 	<p>{L_EXPLAIN}</p>
 
-	<!-- IF S_STYLE --> <!-- DEFINE $COLSPAN = 4 --> <!-- ELSE --> <!-- DEFINE $COLSPAN = 3 --> <!-- ENDIF -->
-	
+	<!-- IF S_STYLE --> <!-- DEFINE $COLSPAN = 5 --> <!-- ELSE --> <!-- DEFINE $COLSPAN = 4 --> <!-- ENDIF -->
+
 	<table cellspacing="1">
-		<col class="row1" /><!-- IF S_STYLE --><col class="row1" /><!-- ENDIF --><col class="row2" />
+		<col class="row1" /><!-- IF S_STYLE --><col class="row1" /><!-- ENDIF --><col class="row2" /><col class="row2" />
 	<thead>
 	<tr>
 		<th>{L_NAME}</th>
 		<!-- IF S_STYLE --><th>{L_STYLE_USED_BY}</th><!-- ENDIF -->
 		<th>{L_OPTIONS}</th>
+		<th>{L_ACTIONS}</th>
 	</tr>
 	</thead>
 	<tbody>
@@ -185,42 +516,49 @@
 	</tr>
 	<!-- BEGIN installed -->
 	<tr>
-		<td><a href="{installed.U_EDIT}">{installed.NAME}</a><!-- IF installed.S_DEFAULT_STYLE --> *<!-- ENDIF --></td>
+		<td><strong>{installed.NAME}</strong><!-- IF installed.S_DEFAULT_STYLE --> *<!-- ENDIF --></td>
 		<!-- IF S_STYLE -->
 			<td style="text-align: center;">{installed.STYLE_COUNT}</td>
 		<!-- ENDIF -->
+		<td style="text-align: center;">
+			{installed.S_OPTIONS}
+		</td>
 		<td style="text-align: center;">
 			<!-- IF S_STYLE -->
 				<a href="{installed.U_STYLE_ACT_DEACT}">{installed.L_STYLE_ACT_DEACT}</a> |
 			<!-- ENDIF -->
-			{installed.S_OPTIONS} | <a href="{installed.U_PREVIEW}" onclick="this.target='_preview';">{L_PREVIEW}</a>
+			{installed.S_ACTIONS}
+			<!-- IF S_STYLE -->
+				| <a href="{installed.U_PREVIEW}">{L_PREVIEW}</a>
+			<!-- ENDIF -->
 		</td>
 	<!-- END installed -->
 	<tr>
 		<td class="row3" colspan="{$COLSPAN}"><b>{L_UNINSTALLED}</b></td>
 	</tr>
 	<!-- IF not .uninstalled -->
-	<tr>
-		<td class="row1" colspan="{$COLSPAN}" style="text-align: center;">{L_NO_UNINSTALLED}</td>
-	</tr>
+		<tr>
+			<td class="row1" colspan="{$COLSPAN}" style="text-align: center;">{L_NO_UNINSTALLED}</td>
+		</tr>
 	<!-- ENDIF -->
 	<!-- BEGIN uninstalled -->
-	<tr>
-		<td<!-- IF S_STYLE --> colspan="2"<!-- ENDIF -->>{uninstalled.NAME}<br /><b class="small">{L_COPYRIGHT}: {uninstalled.COPYRIGHT}</b></td>
-		<td style="text-align: center;"><a href="{uninstalled.U_INSTALL}">{L_INSTALL}</a></td>
-	</tr>
+		<tr>
+			<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 -->
 	</tbody>
 	</table>
 
 	<!-- IF S_STYLE -->
-	<form id="acp_styles" method="post" action="{U_ACTION}">
+		<form id="acp_styles" method="post" action="{U_ACTION}">
 
 		<fieldset class="quick">
+			<legend>{L_CREATE}</legend>
 			{L_CREATE}: <input type="text" name="name" value="" /> {L_FROM} <select name="basis">{S_BASIS_OPTIONS}</select> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" />
 		</fieldset>
 
-	</form>
+		</form>
 	<!-- ENDIF -->
 
 <!-- ELSEIF S_DETAILS -->
@@ -232,10 +570,10 @@
 	<p>{L_EXPLAIN}</p>
 
 	<!-- IF S_ERROR_MSG -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
 	<!-- ENDIF -->
 
 	<form id="acp_styles" method="post" action="{U_ACTION}">
@@ -288,7 +626,8 @@
 	<!-- ENDIF -->
 	</fieldset>
 
-	<fieldset class="quick">
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
 	</fieldset>
 
@@ -296,4 +635,4 @@
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_update.html

@@ -0,0 +1,40 @@
+<!-- INCLUDE overall_header.html -->
+
+<a name="maincontent"></a>
+	
+<!-- IF S_VERSION_CHECK -->
+
+	<h1>{L_VERSION_CHECK}</h1>
+
+	<p>{L_VERSION_CHECK_EXPLAIN}</p>
+
+	<!-- IF S_UP_TO_DATE -->
+		<div class="successbox">
+			<p>{L_VERSION_UP_TO_DATE_ACP}</p>
+		</div>
+	<!-- ELSE -->
+		<div class="errorbox">
+			<p>{L_VERSION_NOT_UP_TO_DATE_ACP}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<fieldset>
+		<legend></legend>
+	<dl>
+		<dt><label>{L_CURRENT_VERSION}</label></dt>
+		<dd><b>{CURRENT_VERSION}</b></dd>
+	</dl>
+	<dl>
+		<dt><label>{L_LATEST_VERSION}</label></dt>
+		<dd><b>{LATEST_VERSION}</b></dd>
+	</dl>
+	</fieldset>
+
+	<!-- IF not S_UP_TO_DATE -->
+		{UPDATE_INSTRUCTIONS}
+		<br /><br />
+	<!-- ENDIF -->
+
+<!-- ENDIF -->
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_users.html

@@ -15,13 +15,13 @@
 	<dl>
 		<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
 		<dd><input class="medium" type="text" id="username" name="username" /></dd>
-		<dd>[ <a href="#" onclick="window.open('{U_FIND_USERNAME}', '_phpbbsearch', '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" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}" /> &nbsp;{L_SELECT_ANONYMOUS}</dd>
+		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd>
+		<dd class="full" style="text-align: left;"><input type="checkbox" class="radio" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}" /> &nbsp;{L_SELECT_ANONYMOUS}</dd>
 	</dl>
-	</fieldset>
 
-	<fieldset class="quick">
+	<p class="quick">
 		<input type="submit" name="submituser" value="{L_SUBMIT}" class="button1" />
+	</p>
 	</fieldset>
 
 	</form>
@@ -68,7 +68,7 @@
 	<form id="mode_select" method="post" action="{U_MODE_SELECT}">
 
 	<fieldset class="quick">
-		{L_SELECT_FORM}: <select name="mode" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_FORM_OPTIONS}</select>
+		{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}" />
 	</fieldset>
 
 	</form>
@@ -84,7 +84,14 @@
 	<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>
@@ -93,13 +100,21 @@
 	<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>
+		<dd>[ <a href="#" onclick="window.open('{U_WHOIS}', '_whois', 'height=500, resizable=yes, scrollbars=yes, width=700'); return false;">{L_WHOIS}</a> ]</dd>
 	</dl>
 	<!-- ENDIF -->
 	<dl>
 		<dt><label>{L_LAST_ACTIVE}:</label></dt>
 		<dd><strong>{USER_LASTACTIVE}</strong></dd>
 	</dl>
+	<dl>
+		<dt><label>{L_POSTS}:</label></dt>
+		<dd><strong>{USER_POSTS}</strong></dd>
+	</dl>
+	<dl>
+		<dt><label>{L_WARNINGS}:</label></dt>
+		<dd><strong>{USER_WARNINGS}</strong></dd>
+	</dl>
 	<dl>
 		<dt><label for="user_founder">{L_FOUNDER}:</label><br /><span>{L_FOUNDER_EXPLAIN}</span></dt>
 		<dd><input type="radio" class="radio" name="user_founder" value="1"<!-- IF S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> />&nbsp;{L_YES}&nbsp; <input type="radio" class="radio" name="user_founder" value="0"<!-- IF not S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> />&nbsp;{L_NO}&nbsp;</dd>
@@ -125,19 +140,17 @@
 
 	<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>
-	<dl>
-		<dt><label for="delete_user">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
-		<dd><input type="checkbox" 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>
+		<!-- 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>
 
@@ -151,20 +164,9 @@
 
 	<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="javascript:jumpto();" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-		<!-- ELSE -->
-			{S_ON_PAGE}
-		<!-- ENDIF -->
+			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
 	</div>
 	<!-- ENDIF -->
 
@@ -175,7 +177,7 @@
 		<th>{L_REPORT_BY}</th>
 		<th>{L_IP}</th>
 		<th>{L_TIME}</th>
-		<th>{L_ACTION}</th>
+		<th>{L_FEEDBACK}</th>
 		<th>{L_MARK}</th>
 	</tr>
 	</thead>
@@ -190,7 +192,7 @@
 				{log.ACTION}
 				<!-- IF log.DATA --><br />&#187; <span class="gensmall">[ {log.DATA} ]</span><!-- ENDIF -->
 			</td>
-			<td style="text-align: center;"><input type="checkbox" name="mark[]" value="{log.ID}" /></td>
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td>
 		</tr>
 	<!-- END log -->
 	</tbody>
@@ -200,12 +202,23 @@
 			<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">
-			<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;
+			<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />
+			<p class="small"><a href="#" onclick="marklist('list', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false);">{L_UNMARK_ALL}</a></p>
 		</fieldset>
 	<!-- ENDIF -->
 
@@ -339,7 +352,7 @@
 	</dl>
 	<dl> 
 		<dt><label for="tz">{L_BOARD_TIMEZONE}:</label></dt>
-		<dd><select id="tz" name="tz">{S_TZ_OPTIONS}</select></dd>
+		<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>
@@ -347,7 +360,7 @@
 	</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><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>
@@ -436,11 +449,11 @@
 
 	<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" name="delete" />&nbsp;<span>{L_DELETE_AVATAR}</span></dd>
-		</dl>
+	<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> 
@@ -452,6 +465,7 @@
 				<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>
@@ -460,6 +474,7 @@
 				<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>
@@ -471,26 +486,26 @@
 
 		<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>
+		<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;">
@@ -512,10 +527,10 @@
 
 	<fieldset>
 		<legend>{L_ACP_USER_RANK}</legend>
-		<dl>
-			<dt><label for="user_rank">{L_USER_RANK}:</label></dt>
-			<dd><select name="user_rank" id="user_rank">{S_RANK_OPTIONS}</select></dd>
-		</dl>
+	<dl>
+		<dt><label for="user_rank">{L_USER_RANK}:</label></dt>
+		<dd><select name="user_rank" id="user_rank">{S_RANK_OPTIONS}</select></dd>
+	</dl>
 	</fieldset>
 
 	<fieldset class="quick">
@@ -534,23 +549,30 @@
 
 	// 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]');
+	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
-	b_help = "{L_BBCODE_B_HELP}";
-	i_help = "{L_BBCODE_I_HELP}";
-	u_help = "{L_BBCODE_U_HELP}";
-	q_help = "{L_BBCODE_Q_HELP}";
-	c_help = "{L_BBCODE_C_HELP}";
-	l_help = "{L_BBCODE_L_HELP}";
-	o_help = "{L_BBCODE_O_HELP}";
-	p_help = "{L_BBCODE_P_HELP}";
-	w_help = "{L_BBCODE_W_HELP}";
-	a_help = "{L_BBCODE_A_HELP}";
-	s_help = "{L_BBCODE_S_HELP}";
-	f_help = "{L_BBCODE_F_HELP}";
-	e_help = "{L_BBCODE_E_HELP}";
+	var help_line = {
+		b: '{LA_BBCODE_B_HELP}',
+		i: '{LA_BBCODE_I_HELP}',
+		u: '{LA_BBCODE_U_HELP}',
+		q: '{LA_BBCODE_Q_HELP}',
+		c: '{LA_BBCODE_C_HELP}',
+		l: '{LA_BBCODE_L_HELP}',
+		o: '{LA_BBCODE_O_HELP}',
+		p: '{LA_BBCODE_P_HELP}',
+		w: '{LA_BBCODE_W_HELP}',
+		s: '{LA_BBCODE_S_HELP}',
+		f: '{LA_BBCODE_F_HELP}',
+		e: '{LA_BBCODE_E_HELP}',
+		d: '{LA_BBCODE_D_HELP}',
+		t: '{LA_BBCODE_T_HELP}',
+		tip: '{L_STYLES_TIP}'
+		<!-- BEGIN custom_tags -->
+			,cb_{custom_tags.BBCODE_ID}: '{custom_tags.BBCODE_HELPLINE}'
+		<!-- END custom_tags -->
+	}
 
 	//-->
 	</script>
@@ -559,48 +581,64 @@
 	<form id="user_signature" method="post" action="{U_ACTION}">
 
 	<!-- IF SIGNATURE_PREVIEW -->
-	<fieldset>
-		<legend>{L_ADMIN_SIG_PREVIEW}</legend>
-		<p>{SIGNATURE_PREVIEW}</p>
-	</fieldset>
+		<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 class="button2" type="button" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" onmouseover="helpline('b')" />
-			<input class="button2" type="button" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" onmouseover="helpline('i')" />
-			<input class="button2" type="button" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" onmouseover="helpline('u')" />
-			<input class="button2" type="button" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" onmouseover="helpline('q')" />
-			<input class="button2" type="button" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" />
-			<input class="button2" type="button" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" />
-			<input class="button2" type="button" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" />
-			<input class="button2" type="button" accesskey="p" name="addbbcode14" value="Img" style="width: 40px"  onclick="bbstyle(14)" onmouseover="helpline('p')" />
-			<input class="button2" type="button" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" onmouseover="helpline('w')" />
-			{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')">
+			<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px;" onclick="bbstyle(2)" onmouseover="helpline('i')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px;" onclick="bbstyle(4)" onmouseover="helpline('u')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" onmouseover="helpline('q')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="t" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" />
+			<!-- IF S_BBCODE_IMG -->
+				<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" onmouseout="helpline('tip')" />
+			<!-- ENDIF -->
+			<!-- IF S_LINKS_ALLOWED -->
+				<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" onmouseover="helpline('w')" onmouseout="helpline('tip')" />
+			<!-- ENDIF -->
+			<!-- IF S_BBCODE_FLASH -->
+				<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" onmouseover="helpline('d')" onmouseout="helpline('tip')" />
+			<!-- ENDIF -->
+
+			{L_FONT_SIZE}: <select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" onmouseover="helpline('f')" onmouseout="helpline('tip')">
 				<option value="7">{L_FONT_TINY}</option>
 				<option value="9">{L_FONT_SMALL}</option>
 				<option value="12" selected="selected">{L_FONT_NORMAL}</option>
 				<option value="18">{L_FONT_LARGE}</option>
-				<option  value="24">{L_FONT_HUGE}</option>
+				<option value="24">{L_FONT_HUGE}</option>
 			</select>
-			<a href="javascript:bbstyle(-1)" 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: 110px;"><script type="text/javascript"><!-- 
-				colorPalette('v', 17, 5); 
-				//--></script>
-			</dt>
-			<dd style="text-align: left; margin-left: 110px;"><textarea name="signature" rows="10" cols="60" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{SIGNATURE}</textarea></dd>
-			<dd style="text-align: left; margin-left: 110px;">
-				<!-- IF S_BBCODE_ALLOWED --><input type="checkbox" name="disable_bbcode"{S_BBCODE_CHECKED} />&nbsp; {L_DISABLE_BBCODE} &nbsp;<!-- ENDIF -->
-				<!-- IF S_SMILIES_ALLOWED --><input type="checkbox" name="disable_smilies"{S_SMILIES_CHECKED} />&nbsp; {L_DISABLE_SMILIES} &nbsp;<!-- ENDIF -->
-				<input type="checkbox" name="disable_magic_url"{S_MAGIC_URL_CHECKED} />&nbsp; {L_DISABLE_MAGIC_URL} &nbsp;
-				<br /><br /><strong>{L_OPTIONS}: </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {SMILIES_STATUS}
-			</dd>
-		</dl>
+		<div style="text-align: left;"><textarea name="signature" rows="10" cols="60" style="width: 80%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{SIGNATURE}</textarea></div>
+
+		<div>
+			<!-- IF S_BBCODE_ALLOWED -->
+				<input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} />&nbsp; {L_DISABLE_BBCODE} &nbsp;
+			<!-- ENDIF -->
+			<!-- IF S_SMILIES_ALLOWED -->
+				<input type="checkbox" class="radio" name="disable_smilies"{S_SMILIES_CHECKED} />&nbsp; {L_DISABLE_SMILIES} &nbsp;
+			<!-- ENDIF -->
+			<!-- IF S_LINKS_ALLOWED -->
+				<input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} />&nbsp; {L_DISABLE_MAGIC_URL} &nbsp;
+			<!-- ENDIF -->
+			<br /><br /><strong>{L_OPTIONS}: </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}
+		</div>
 	</fieldset>
 
 	<fieldset class="quick">
@@ -624,7 +662,7 @@
 		<!-- 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 -->{L_GROUP_DEFAULT}<!-- ENDIF --></td>
+			<td><!-- IF group.S_NO_DEFAULT --><a href="{group.U_DEFAULT}">{L_GROUP_DEFAULT}</a><!-- ELSE --><strong>{L_GROUP_DEFAULT}</strong><!-- ENDIF --></td>
 			<td><!-- IF not group.S_SPECIAL_GROUP --><a href="{group.U_DEMOTE_PROMOTE}">{group.L_DEMOTE_PROMOTE}</a><!-- ENDIF --></td>
 			<td><a href="{group.U_DELETE}">{L_GROUP_DELETE}</a></td>
 		<!-- ENDIF -->
@@ -642,20 +680,12 @@
 
 	<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>
 
-	<div class="pagination" style="float: right;">
-		<!-- IF PAGINATION -->
-			<a href="javascript:jumpto();" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
-		<!-- ELSE -->
-			{S_ON_PAGE}
-		<!-- ENDIF -->
+	<!-- 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>
-
-	<div class="clearfix"></div>
+	<!-- ENDIF -->
 
 	<!-- IF .attach -->
 	<table cellspacing="1">
@@ -665,17 +695,17 @@
 		<th>{L_POST_TIME}</th>
 		<th>{L_FILESIZE}</th>
 		<th>{L_DOWNLOADS}</th>
-		<th>{L_DELETE}</th>
+		<th>{L_MARK}</th>
 	</tr>
 	</thead>
 	<tbody>
 	<!-- BEGIN attach -->
 		<!-- IF attach.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 		<td><a href="{attach.U_DOWNLOAD}">{attach.REAL_FILENAME}</a><br /><span class="small"><!-- IF attach.S_IN_MESSAGE --><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" name="mark[]" value="{attach.ATTACH_ID}" /></td>
+		<td style="text-align: center">{attach.POST_TIME}</td>
+		<td style="text-align: center">{attach.SIZE}</td>
+		<td style="text-align: center">{attach.DOWNLOAD_COUNT}</td>
+		<td style="text-align: center"><input type="checkbox" class="radio" name="mark[]" value="{attach.ATTACH_ID}" /></td>
 	</tr>
 	<!-- END attach -->
 	</tbody>
@@ -685,23 +715,44 @@
 		<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>
 	</fieldset>
 
 	</form>
 
 <!-- ELSEIF S_PERMISSIONS -->
 
-	<fieldset class="quick">
+	<div style="float: right;">
 		<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>
-	</fieldset>
+	</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" />
+		</fieldset>
+
+	</form>
+
+	<br clear="all" />
 
 	<!-- INCLUDE permission_mask.html -->
 
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_words.html

@@ -16,18 +16,18 @@
 		<legend>{L_EDIT_WORD}</legend>
 		<dl>
 			<dt><label for="word">{L_WORD}</label></dt>
-			<dd><input id="word" type="text" name="word" value="{WORD}" /></dd>
+			<dd><input id="word" type="text" name="word" value="{WORD}" maxlength="255" /></dd>
 		</dl>
 		<dl>
 			<dt><label for="replacement">{L_REPLACEMENT}</label></dt>
-			<dd><input id="replacement" type="text" name="replacement" value="{REPLACEMENT}" /></dd>
+			<dd><input id="replacement" type="text" name="replacement" value="{REPLACEMENT}" maxlength="255" /></dd>
 		</dl>
 		{S_HIDDEN_FIELDS}
-	</fieldset>
 
-	<fieldset class="submit-buttons">
+	<p class="submit-buttons">
 		<input class="button1" type="submit" id="submit" name="save" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
 	</fieldset>
 
 	</form>
@@ -38,35 +38,37 @@
 
 	<p>{L_ACP_WORDS_EXPLAIN}</p>
 
+	<form id="acp_words" method="post" action="{U_ACTION}">
+
+	<fieldset class="tabulated">
+	<legend>{L_ACP_WORDS}</legend>
+	<p class="quick">
+		{S_HIDDEN_FIELDS}
+		<input class="button2" name="add" type="submit" value="{L_ADD_WORD}" />
+	</p>
+
 	<table cellspacing="1">
 	<thead>
-		<tr>
-			<th>{L_WORD}</th>
-			<th>{L_REPLACEMENT}</th>
-			<th colspan="2">{L_ACTION}</th>
-		</tr>
+	<tr>
+		<th>{L_WORD}</th>
+		<th>{L_REPLACEMENT}</th>
+		<th>{L_ACTION}</th>
+	</tr>
 	</thead>
 	<tbody>
 	<!-- BEGIN words -->
 		<!-- IF words.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 		<td style="text-align: center;">{words.WORD}</td>
 		<td style="text-align: center;">{words.REPLACEMENT}</td>
-		<td>&nbsp;<a href="{words.U_EDIT}">{L_EDIT}</a>&nbsp;</td>
-		<td>&nbsp;<a href="{words.U_DELETE}">{L_DELETE}</a>&nbsp;</td>
+		<td>&nbsp;<a href="{words.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{words.U_DELETE}">{ICON_DELETE}</a>&nbsp;</td>
 	</tr>
 	<!-- END words -->
 	</tbody>
 	</table>
 
-	<form id="acp_words" method="post" action="{U_ACTION}">
-
-	<fieldset class="quick">
-		{S_HIDDEN_FIELDS}
-		<input class="button2" name="add" type="submit" value="{L_ADD_WORD}" />
 	</fieldset>
 
 	</form>
-
 <!-- ENDIF -->
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/colour_swatch.html

@@ -0,0 +1,78 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
+<meta http-equiv="imagetoolbar" content="no" />
+<title>{L_COLOUR_SWATCH}</title>
+
+<style type="text/css">
+<!--
+	body {
+		background-color: #404040;
+		color: #fff;
+	}
+
+	td {
+		border: solid 1px #333; 
+	}
+
+	.over { 
+		border-color: white; 
+	}
+
+	.out {
+		border-color: #333333; 
+	}
+
+	img {
+		border: 0;
+	}
+//-->
+</style>
+</head>
+
+<body>
+
+<script type="text/javascript">
+<!--
+	var r = 0, g = 0, b = 0;
+
+	var numberList = new Array(6);
+	numberList[0] = '00';
+	numberList[1] = '33';
+	numberList[2] = '66';
+	numberList[3] = '99';
+	numberList[4] = 'CC';
+	numberList[5] = 'FF';
+
+	document.writeln('<table cellspacing="0" cellpadding="0" border="0">');
+
+	for (r = 0; r < 6; r++)
+	{
+		document.writeln('<tr>');
+
+		for (g = 0; g < 6; g++)
+		{
+			for (b = 0; b < 6; b++)
+			{
+				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
+				document.write('<td style="background-color: #' + color + ';" onmouseover="this.className=\'over\'" onmouseout="this.className=\'out\'">');
+				document.write('<a href="#" onclick="cell(\'' + color + '\'); return false;"><img src="{T_IMAGES_PATH}spacer.gif" width="15" height="12" alt="#' + color + '" title="#' + color + '" \/><\/a>');
+				document.writeln('<\/td>');
+			}
+		}
+		document.writeln('<\/tr>');
+	}
+	document.writeln('<\/table>');
+
+	function cell(color)
+	{
+		opener.document.forms["{OPENER}"].{NAME}.value = color;
+	}
+//-->
+</script>
+
+</body>
+</html>

phpBB/adm/style/custom_profile_fields.html

@@ -17,7 +17,7 @@
 	<!-- IF bool.FIELD_LENGTH eq 1 -->
 		<!-- BEGIN options --><input type="radio" class="radio" name="{bool.FIELD_IDENT}" value="{bool.options.OPTION_ID}"{bool.options.CHECKED} /> {bool.options.VALUE}&nbsp; &nbsp;<!-- END options -->
 	<!-- ELSE -->
-		<input type="checkbox" name="{bool.FIELD_IDENT}"<!-- 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 -->
 

phpBB/adm/style/editor.js

@@ -1,5 +1,7 @@
-// bbCode control by subBlue design [ www.subBlue.com ]
-// Includes unixsafe colour palette selector by SHS`
+/**
+* bbCode control by subBlue design [ www.subBlue.com ]
+* Includes unixsafe colour palette selector by SHS`
+*/
 
 // Startup variables
 var imageTag = false;
@@ -10,130 +12,67 @@ var theSelection = false;
 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_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 is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1));
+var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
 
-var is_win = ((clientPC.indexOf("win")!=-1) || (clientPC.indexOf("16bit") != -1));
-var is_mac = (clientPC.indexOf("mac")!=-1);
+var baseHeight;
+window.onload = initInsertions;
 
-// Shows the help messages in the helpline window
-function helpline(help) {
-	document.forms[form_name].helpbox.value = eval(help + "_help");
+/**
+* Shows the help messages in the helpline window
+*/
+function helpline(help)
+{
+	document.forms[form_name].helpbox.value = help_line[help];
 }
 
-// Replacement for arrayname.length property
-function getarraysize(thearray) {
-	for (i = 0; i < thearray.length; i++) {
-		if ((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;
-}
-
-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 {
-		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;
+/**
+* Fix a bug involving the TextRange object. From
+* http://www.frostjedi.com/terra/scripts/demo/caretBug.html
+*/ 
+function initInsertions() 
+{
+	var textarea = document.forms[form_name].elements[text_name];
+	textarea.focus();
+	if (is_ie && typeof(baseHeight) != 'number')
+	{
+		baseHeight = document.selection.createRange().duplicate().boundingHeight;
 	}
 }
 
-function bbfontstyle(bbopen, bbclose) {
-	if ((clientVer >= 4) && is_ie && is_win) {
-		theSelection = document.selection.createRange().text;
-		if (!theSelection) {
-			insert_text(bbopen + bbclose);
-			document.forms[form_name].elements[text_name].focus();
-			return;
-		}
-		document.selection.createRange().text = bbopen + theSelection + bbclose;
-		document.forms[form_name].elements[text_name].focus();
-		return;
+/**
+* bbstyle
+*/
+function bbstyle(bbnumber)
+{	
+	if (bbnumber != -1)
+	{
+		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
 	} else {
-		insert_text(bbopen + bbclose);
-		document.forms[form_name].elements[text_name].focus();
-		return;
-	}
-	storeCaret(document.forms[form_name].elements[text_name]);
-}
-
-function insert_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;
-	} else {
-		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;
+		insert_text('[*]');
+		document.forms[form_name].elements[text_name].focus();		
 	}
 }
 
-function attach_inline() {
-	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]');
-}
-
-function bbstyle(bbnumber) {
-
-	donotinsert = false;
+/**
+* Apply bbcodes
+*/
+function bbfontstyle(bbopen, bbclose)
+{
 	theSelection = false;
-	bblast = 0;
-	document.forms[form_name].elements[text_name].focus();
-
-	if (bbnumber == -1) { // Close all open tags & default button names
-		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=]";
-		imageTag = false; // All tags are closed including image tags :D
-		document.forms[form_name].elements[text_name].focus();
-		return;
-	}
+		
+	var textarea = document.forms[form_name].elements[text_name];
+	textarea.focus();
 
 	if ((clientVer >= 4) && is_ie && is_win)
 	{
-		theSelection = document.selection.createRange().text; // Get text selection
-		if (theSelection) {
+		// Get text selection
+		theSelection = document.selection.createRange().text;
+
+		if (theSelection)
+		{
 			// Add tags around selection
-			document.selection.createRange().text = bbtags[bbnumber] + theSelection + bbtags[bbnumber+1];
+			document.selection.createRange().text = bbopen + theSelection + bbclose;
 			document.forms[form_name].elements[text_name].focus();
 			theSelection = '';
 			return;
@@ -141,166 +80,298 @@ function bbstyle(bbnumber) {
 	}
 	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], bbtags[bbnumber+1]);
+		mozWrap(document.forms[form_name].elements[text_name], bbopen, bbclose);
 		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;
-		}
-	}
+	//The new position for the cursor after adding the bbcode
+	var new_pos = getCaretPosition(textarea).start + bbopen.length;
 
-	if ((bbnumber == 10) && (bbtags[10] != "[*]"))
+	// Open tag
+	insert_text(bbopen + bbclose);
+
+	// Center the cursor when we don't have a selection
+	// Gecko and proper browsers
+	if (!isNaN(textarea.selectionStart))
 	{
-		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] != "[*]"))
+		textarea.selectionStart = new_pos;
+		textarea.selectionEnd = new_pos;
+	}	
+	// IE
+	else if (document.selection)
 	{
-		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] = "[*]";
-		}
+		var range = textarea.createTextRange(); 
+        range.move("character", new_pos); 
+		range.select();
+		storeCaret(document.forms[form_name].elements[text_name]);		
 	}
 
-	if (donotinsert) {		// Close all open tags up to the one just clicked & default button names
-		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
-
-		if (imageTag && (bbnumber != 14)) {		// Close image tag before adding another
-			insert_text(bbtags[15]);
-
-			lastValue = arraypop(bbcode) - 1;	// Remove the close image tag from the list
-			document.forms[form_name].addbbcode14.value = "Img";	// Return button back to normal state
-			imageTag = false;
-		}
-
-		// Open tag
-		insert_text(bbtags[bbnumber]);
-
-		if ((bbnumber == 14) && (imageTag == false)) imageTag = 1; // Check to stop additional tags after an unclosed image tag
-		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]);
+	document.forms[form_name].elements[text_name].focus();
+	return;
 }
 
-// From http://www.massless.org/mozedit/
+/**
+* Insert text at position
+*/
+function insert_text(text, spaces, popup)
+{
+	var textarea;
+	
+	if (!popup) 
+	{
+		textarea = document.forms[form_name].elements[text_name];
+	} else 
+	{
+		textarea = opener.document.forms[form_name].elements[text_name];
+	}
+	if (spaces) 
+	{
+		text = ' ' + text + ' ';
+	}
+	
+	if (!isNaN(textarea.selectionStart))
+	{
+		var sel_start = textarea.selectionStart;
+		var sel_end = textarea.selectionEnd;
+
+		mozWrap(textarea, text, '')
+		textarea.selectionStart = sel_start + text.length;
+		textarea.selectionEnd = sel_end + text.length;
+	}	
+	
+	else if (textarea.createTextRange && textarea.caretPos)
+	{
+		if (baseHeight != textarea.caretPos.boundingHeight) 
+		{
+			textarea.focus();
+			storeCaret(textarea);
+		}		
+		var caret_pos = textarea.caretPos;
+		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
+		
+	}
+
+	else
+	{
+		textarea.value = textarea.value + text;
+	}
+	document.forms[form_name].elements[text_name].focus();
+}
+
+/**
+* Add inline attachment at position
+*/
+function attach_inline(index, filename)
+{
+	insert_text('[attachment=' + index + ']' + filename + '[/attachment]');
+	document.forms[form_name].elements[text_name].focus();
+}
+
+/**
+* Add quote text to message
+*/
+function addquote(post_id, username)
+{
+	var message_name = 'message_' + post_id;
+	var theSelection = '';
+	var divarea = false;
+
+	if (document.all)
+	{
+		divarea = document.all[message_name];
+	}
+	else
+	{
+		divarea = document.getElementById(message_name);
+	}
+
+	// Get text selection - not only the post content :(
+	if (window.getSelection)
+	{
+		theSelection = window.getSelection().toString();
+	}
+	else if (document.getSelection)
+	{
+		theSelection = document.getSelection();
+	}
+	else if (document.selection)
+	{
+		theSelection = document.selection.createRange().text;
+	}
+
+	if (theSelection == '' || typeof theSelection == 'undefined' || theSelection == null)
+	{
+		if (divarea.innerHTML)
+		{
+			theSelection = divarea.innerHTML.replace(/<br>/ig, '\n');
+			theSelection = theSelection.replace(/<br\/>/ig, '\n');
+			theSelection = theSelection.replace(/&lt\;/ig, '<');
+			theSelection = theSelection.replace(/&gt\;/ig, '>');
+			theSelection = theSelection.replace(/&amp\;/ig, '&');			
+		}
+		else if (document.all)
+		{
+			theSelection = divarea.innerText;
+		}
+		else if (divarea.textContent)
+		{
+			theSelection = divarea.textContent;
+		}
+		else if (divarea.firstChild.nodeValue)
+		{
+			theSelection = divarea.firstChild.nodeValue;
+		}
+	}
+
+	if (theSelection)
+	{
+		insert_text('[quote="' + username + '"]' + theSelection + '[/quote]');
+	}
+
+	return;
+}
+
+/**
+* From http://www.massless.org/mozedit/
+*/
 function mozWrap(txtarea, open, close)
 {
 	var selLength = txtarea.textLength;
 	var selStart = txtarea.selectionStart;
 	var selEnd = txtarea.selectionEnd;
+	var scrollTop = txtarea.scrollTop;
+
 	if (selEnd == 1 || selEnd == 2) 
+	{
 		selEnd = selLength;
+	}
 
 	var s1 = (txtarea.value).substring(0,selStart);
 	var s2 = (txtarea.value).substring(selStart, selEnd)
 	var s3 = (txtarea.value).substring(selEnd, selLength);
+
 	txtarea.value = s1 + open + s2 + close + s3;
+	txtarea.selectionStart = selEnd + open.length + close.length;
+	txtarea.selectionEnd = txtarea.selectionStart;
+	txtarea.focus();
+	txtarea.scrollTop = scrollTop;
+
 	return;
 }
 
-// Insert at Claret position. Code from
-// http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
-function storeCaret(textEl) {
-	if (textEl.createTextRange) { textEl.caretPos = document.selection.createRange().duplicate(); }
+/**
+* Insert at Caret position. Code from
+* http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
+*/
+function storeCaret(textEl)
+{
+	if (textEl.createTextRange)
+	{
+		textEl.caretPos = document.selection.createRange().duplicate();
+	}
 }
 
+/**
+* Color pallette
+*/
 function colorPalette(dir, width, height)
 {
 	var r = 0, g = 0, b = 0;
 	var numberList = new Array(6);
-	numberList[0] = "00";
-	numberList[1] = "40";
-	numberList[2] = "80";
-	numberList[3] = "BF";
-	numberList[4] = "FF";
-	document.writeln('<table class="type2">');
-	for(r = 0; r < 5; r++)
+
+	numberList[0] = '00';
+	numberList[1] = '40';
+	numberList[2] = '80';
+	numberList[3] = 'BF';
+	numberList[4] = 'FF';
+
+	document.writeln('<table cellspacing="1" cellpadding="0" border="0">');
+
+	for (r = 0; r < 5; r++)
 	{
 		if (dir == 'h')
 		{
 			document.writeln('<tr>');
 		}
-		for(g = 0; g < 5; g++)
+
+		for (g = 0; g < 5; g++)
 		{
 			if (dir == 'v')
 			{
 				document.writeln('<tr>');
 			}
-			for(b = 0; b < 5; b++)
+			
+			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="javascript:bbfontstyle(\'[color=#' + color + ']\', \'[/color]\');" onmouseover="helpline(\'s\');"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>');
+				document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;" onmouseover="helpline(\'s\');"  onmouseout="helpline(\'tip\');"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>');
 				document.writeln('</td>');
 			}
+
 			if (dir == 'v')
 			{
 				document.writeln('</tr>');
 			}
 		}
+
 		if (dir == 'h')
 		{
 			document.writeln('</tr>');
 		}
 	}
 	document.writeln('</table>');
+}
+
+
+/**
+* Caret Position object
+*/
+function caretPosition()
+{
+	var start = null;
+	var end = null;
+}
+
+
+/**
+* Get the caret position in an textarea
+*/
+function getCaretPosition(txtarea)
+{
+	var caretPos = new caretPosition();
+	
+	// simple Gecko/Opera way
+	if(txtarea.selectionStart || txtarea.selectionStart == 0)
+	{
+		caretPos.start = txtarea.selectionStart;
+		caretPos.end = txtarea.selectionEnd;
+	}
+	// dirty and slow IE way
+	else if(document.selection)
+	{
+		// get current selection
+		var range = document.selection.createRange();
+
+		// a new selection of the whole textarea
+		var range_all = document.body.createTextRange();
+		range_all.moveToElementText(txtarea);
+		
+		// calculate selection start point by moving beginning of range_all to beginning of range
+		var sel_start;
+		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++)
+		{		
+			range_all.moveStart('character', 1);
+		}
+		
+		txtarea.sel_start = sel_start;
+				
+		// we ignore the end value for IE, this is already dirty enough and we don't need it
+		caretPos.start = txtarea.sel_start;
+		caretPos.end = txtarea.sel_start;		
+	}
+
+	return caretPos;
 }

phpBB/adm/style/install_convert.html

@@ -0,0 +1,125 @@
+<!-- INCLUDE install_header.html -->
+
+<!-- IF S_NOT_INSTALLED -->
+
+	<h1>{TITLE}</h1>
+
+	<p>{BODY}</p>
+
+<!-- ELSE -->
+
+	<form id="install_convert" method="post" action="{U_ACTION}">
+
+	<h1>{TITLE}</h1>
+	<p>{BODY}</p>
+
+	<!-- IF S_LIST -->
+		<table cellspacing="1">
+			<caption>{L_AVAILABLE_CONVERTORS}</caption>
+			<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
+		<thead>
+		<tr>
+			<th>{L_SOFTWARE}</th>
+			<th>{L_VERSION}</th>
+			<th>{L_AUTHOR}</th>
+			<th>{L_OPTIONS}</th>
+		</tr>
+		</thead>
+		<tbody>
+		<!-- IF .convertors -->
+			<!-- BEGIN convertors -->
+			<tr>
+				<td>{convertors.SOFTWARE}</td>
+				<td>{convertors.VERSION}</td>
+				<td>{convertors.AUTHOR}</td>
+				<td><a href="{convertors.U_CONVERT}">{L_CONVERT}</a></td>
+			</tr>
+			<!-- END convertors -->
+		<!-- ELSE -->
+			<tr>
+				<td>{L_NO_CONVERTORS}</td>
+				<td>-</td>
+				<td>-</td>
+				<td>-</td>
+			</tr>
+		<!-- ENDIF -->
+		</tbody>
+		</table>
+	<!-- ENDIF -->
+
+	<!-- IF S_CONTINUE -->
+		</form>
+
+		<fieldset class="submit-buttons">
+			<form method="post" action="{U_NEW_ACTION}">
+				<input class="button1" type="submit" name="submit_new" value="{L_NEW}" />
+			</form>
+			<br />
+			<form method="post" action="{U_CONTINUE_ACTION}">
+				<input class="button1" type="submit" name="submit_cont" value="{L_CONTINUE}" />
+			</form>
+		</fieldset>
+
+		<form method="post" action="{U_ACTION}">
+	<!-- ENDIF -->
+
+	<!-- IF .checks -->
+		<fieldset>
+
+		<!-- BEGIN checks -->
+			<!-- IF checks.S_LEGEND -->
+				<!-- IF not checks.S_FIRST_ROW -->
+				</fieldset>
+
+				<fieldset>
+				<!-- ENDIF -->
+					<legend>{checks.LEGEND}</legend>
+					<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
+			<!-- ELSE -->
+
+				<dl>
+					<dt>{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<!-- IF S_REFRESH --> disabled<!-- ENDIF -->" type="submit" id="submit" <!-- IF S_REFRESH -->disabled="disabled" <!-- ELSE --> onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" <!-- ENDIF -->name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
+		</fieldset>
+	<!-- ENDIF -->
+
+	</form>
+<!-- ENDIF -->
+
+<!-- INCLUDE install_footer.html -->

phpBB/adm/style/install_error.html

@@ -0,0 +1,8 @@
+<!-- INCLUDE install_header.html -->
+
+<div class="errorbox">
+	<h3>{MESSAGE_TITLE}</h3>
+	<p>{MESSAGE_TEXT}</p>
+</div>
+
+<!-- INCLUDE install_footer.html -->

phpBB/adm/style/install_footer.html

@@ -1,4 +1,4 @@
-						
+
 					</div>
 				</div>
 			<span class="corners-bottom"><span></span></span>

phpBB/adm/style/install_header.html

@@ -1,9 +1,10 @@
 <!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}">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
 <head>
 
 <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
 <meta http-equiv="imagetoolbar" content="no" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
@@ -16,6 +17,14 @@
 <div id="wrap">
 	<div id="page-header">
 		<h1>{L_INSTALL_PANEL}</h1>
+		<!-- IF S_LANG_SELECT -->
+		<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>
 	
 	<div id="page-body">

phpBB/adm/style/install_install.html

@@ -2,49 +2,76 @@
 
 <form id="install_install" method="post" action="{U_ACTION}">
 
-<h2>{TITLE}</h2>
-{BODY}
+<!-- IF TITLE --><h1>{TITLE}</h1><!-- ENDIF -->
+<!-- IF BODY --><p>{BODY}</p><!-- ENDIF -->
 
-<!-- BEGIN checks -->
-	<!-- IF checks.S_LEGEND -->
-		<!-- IF not checks.S_FIRST_ROW -->
+<!-- IF .checks -->
+	<fieldset>
+
+	<!-- BEGIN checks -->
+		<!-- IF checks.S_LEGEND -->
+			<!-- IF not checks.S_FIRST_ROW -->
 			</fieldset>
+
+			<fieldset>
+			<!-- ENDIF -->
+				<legend>{checks.LEGEND}</legend>
+				<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
+		<!-- ELSE -->
+
+			<dl>
+				<dt>{checks.TITLE}:<!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+				<dd>{checks.RESULT}</dd>
+			</dl>
 		<!-- ENDIF -->
-		<fieldset>
-			<legend>{checks.LEGEND}</legend>
-			<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
-	<!-- ELSE -->
+	<!-- END checks -->
 
-		<dl>
-			<dt>{checks.TITLE}:</label><!-- IF checks.S_EXPLAIN --><br /><span>{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>
 
-<!-- BEGIN options -->
-	<!-- IF options.S_LEGEND -->
-		<!-- IF not options.S_FIRST_ROW -->
-			</fieldset>
 		<!-- ENDIF -->
-		<fieldset>
-			<legend>{options.LEGEND}</legend>
-	<!-- ELSE -->
+	<!-- END options -->
 
-		<dl>
-			<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-			<dd>{options.CONTENT}</dd>
-		</dl>
+	</fieldset>
+<!-- ENDIF -->
 
-	<!-- ENDIF -->
-<!-- END options -->
-</fieldset>
+<!-- IF S_SHOW_DOWNLOAD -->
+	<h1>{L_DL_CONFIG}</h1>
+	<p>{L_DL_CONFIG_EXPLAIN}</p>
+
+	<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>
+<!-- ENDIF -->
 
 <!-- IF L_SUBMIT -->
-<fieldset class="submit-buttons">
-	<!-- IF L_SUBMIT --><input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
-</fieldset>
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		{S_HIDDEN}
+		<!-- IF L_SUBMIT --><input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
+	</fieldset>
 <!-- ENDIF -->
 
 </form>
-<!-- INCLUDE install_footer.html -->
+
+<!-- INCLUDE install_footer.html -->

phpBB/adm/style/install_main.html

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

phpBB/adm/style/install_update.html

@@ -0,0 +1,336 @@
+<!-- INCLUDE install_header.html -->
+
+<script type="text/javascript">
+<!--
+	function popup(url, width, height)
+	{
+		window.open(url.replace(/&amp;/g, '&'), 'diff', 'height=' + height + ',resizable=yes,scrollbars=yes,width=' + width);
+		return false;
+	}
+//-->
+</script>
+
+<!-- IF S_ERROR -->
+	<h1>{L_NOTICE}</h1>
+	<p style="color: red;">{ERROR_MSG}</p>
+<!-- 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}" />
+	</fieldset>
+
+	</form>
+
+<!-- ELSEIF S_UPLOAD_SUCCESS -->
+
+	<form id="install_update" method="post" action="{U_ACTION}">
+
+	<h1>{L_UPDATE_SUCCESS}</h1>
+	<p>{L_UPDATE_SUCCESS_EXPLAIN}</p>
+
+	<fieldset class="submit-buttons">
+		<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES_AGAIN}" />
+	</fieldset>
+
+	</form>
+
+<!-- ENDIF -->
+
+<!-- IF S_VERSION_CHECK -->
+
+	<h1>{L_VERSION_CHECK}</h1>
+
+	<p>{L_VERSION_CHECK_EXPLAIN}</p>
+
+	<!-- IF S_UP_TO_DATE -->
+		<div class="successbox">
+			<p>{L_VERSION_UP_TO_DATE}</p>
+		</div>
+	<!-- ELSE -->
+		<div class="errorbox">
+			<p>{L_VERSION_NOT_UP_TO_DATE}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<fieldset>
+		<legend></legend>
+	<dl>
+		<dt><label>{L_CURRENT_VERSION}</label></dt>
+		<dd><b>{CURRENT_VERSION}</b></dd>
+	</dl>
+	<dl>
+		<dt><label>{L_LATEST_VERSION}</label></dt>
+		<dd><b>{LATEST_VERSION}</b></dd>
+	</dl>
+	</fieldset>
+
+	<!-- IF not S_UP_TO_DATE -->
+
+		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
+
+		<fieldset class="submit-buttons">
+			<p>{L_UPDATE_DATABASE_EXPLAIN}</p>
+			<input class="button1" type="submit" name="db_update" value="{L_UPDATE_DATABASE}" />
+		</fieldset>
+
+		</form>
+
+	<!-- ELSE -->
+		<form id="install_update" method="post" action="{U_ACTION}">
+
+		<fieldset class="submit-buttons">
+			<p>{L_CHECK_FILES_UP_TO_DATE}</p>
+			<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
+		</fieldset>
+
+		</form>
+	<!-- ENDIF -->
+
+<!-- ELSEIF S_DB_UPDATE -->
+
+	<!-- IF not S_DB_UPDATE_FINISHED -->
+
+		<h1>{L_PERFORM_DATABASE_UPDATE}</h1>
+
+		<p>
+			{L_PERFORM_DATABASE_UPDATE_EXPLAIN}<br />
+			<br />
+			<a href="{U_DB_UPDATE}" target="update"><strong>&raquo; {L_RUN_DATABASE_SCRIPT} &laquo;</strong></a>
+		</p>
+
+		<br /><br />
+
+		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
+
+		<fieldset class="submit-buttons">
+			<input class="button1" type="submit" name="db_update" value="{L_CHECK_UPDATE_DATABASE}" />
+		</fieldset>
+
+		</form>
+
+	<!-- ELSE -->
+
+		<h1>{L_UPDATE_DB_SUCCESS}</h1>
+
+		<br /><br />
+
+		<form id="install_update" method="post" action="{U_ACTION}">
+
+		<fieldset class="submit-buttons">
+			<p>{L_CHECK_FILES_EXPLAIN}</p>
+			<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
+		</fieldset>
+
+		</form>
+
+	<!-- ENDIF -->
+
+<!-- ELSEIF S_FILE_CHECK -->
+
+	<!-- IF S_ALL_UP_TO_DATE -->
+
+		<div class="successbox">
+			<h3>{L_UPDATE_SUCCESS}</h3>
+			<p>{L_ALL_FILES_UP_TO_DATE}</p>
+		</div>
+
+	<!-- ELSE -->
+		<h1>{L_COLLECTED_INFORMATION}</h1>
+
+		<p>{L_COLLECTED_INFORMATION_EXPLAIN}</p>
+
+		<!-- IF S_NO_UPDATE_FILES -->
+			<div class="errorbox">
+				<h3>{L_NO_UPDATE_FILES}</h3>
+
+				<p>{L_NO_UPDATE_FILES_EXPLAIN}</p><br />
+
+				<strong>{NO_UPDATE_FILES}</strong>
+				
+			</div>
+		<!-- ENDIF -->
+
+		<form id="install_update" method="post" action="{U_UPDATE_ACTION}">
+
+		<!-- IF .files -->
+			<!-- BEGIN files -->
+				<!-- IF files.S_STATUS -->
+					<!-- IF not files.S_FIRST_ROW -->
+						</fieldset>
+					<!-- ENDIF -->
+
+					<h2>{files.TITLE}</h2>
+
+					<p>{files.EXPLAIN}</p>
+
+					<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 not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="popup('{files.U_SHOW_DIFF}', 700, 500); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
+							<!-- IF files.S_CUSTOM -->
+								<dd style="margin-left: 60%;"><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" />&nbsp; {L_DO_NOT_UPDATE}</dd>
+							<!-- ENDIF -->
+							<!-- IF files.STATUS eq 'conflict' -->
+							</dl>
+							<dl>
+								<dt style="width: 60%"><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="1" checked="checked" />&nbsp; {L_MERGE_NO_MERGE_NEW_OPTION}</dt>
+								<dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="popup('{files.U_VIEW_NO_MERGE_NEW}', 700, 500); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
+							</dl>
+							<dl>
+								<dt style="width: 60%"><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="2" />&nbsp; {L_MERGE_NO_MERGE_MOD_OPTION}</dt>
+								<dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NO_MERGE_MOD}" onclick="popup('{files.U_VIEW_NO_MERGE_MOD}', 700, 500); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
+							</dl>
+								<!-- IF not files.S_BINARY -->
+									<dl>
+										<dt style="width: 60%"><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="3" />&nbsp; {L_MERGE_NEW_FILE_OPTION}</dt>
+										<dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NEW_FILE}" onclick="popup('{files.U_VIEW_NEW_FILE}', 700, 500); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
+									</dl>
+									<dl>
+										<dt style="width: 60%"><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="4" />&nbsp; {L_MERGE_MOD_FILE_OPTION}</dt>
+										<dd style="margin-left: 60%;">[<a href="{files.U_VIEW_MOD_FILE}" onclick="popup('{files.U_VIEW_MOD_FILE}', 700, 500); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
+									</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' --></dl><!-- ENDIF -->
+				<!-- ENDIF -->
+			<!-- END files -->
+
+			</fieldset>
+		<!-- ENDIF -->
+
+		<br />
+
+		<fieldset class="quick">
+			<input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
+		</fieldset>
+
+		<br />
+
+		<h1>{L_UPDATE_METHOD}</h1>
+
+		<p>{L_UPDATE_METHOD_EXPLAIN}</p>
+
+		<fieldset class="submit-buttons">
+			<input class="button1" type="submit" name="ftp_upload" value="{L_FTP_UPDATE_METHOD}" />&nbsp; &nbsp;<input class="button1" type="submit" name="download" value="{L_DOWNLOAD_UPDATE_METHOD}" />
+		</fieldset>
+
+		</form>
+
+	<!-- ENDIF -->
+
+<!-- ELSEIF S_DOWNLOAD_FILES -->
+
+	<h1>{L_SELECT_DOWNLOAD_FORMAT}</h1>
+
+	<p>{L_DOWNLOAD_UPDATE_METHOD_EXPLAIN}</p>
+
+	<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>
+
+	<br /><br />
+
+	<p>{L_MAPPING_FILE_STRUCTURE}</p>
+
+	<table cellspacing="1">
+		<col class="row1" /><col class="row2" /><col class="row1" />
+	<thead>
+	<tr>
+		<th style="width: 49%">{L_ARCHIVE_FILE}</th>
+		<th style="width: 2%">&nbsp;</th>
+		<th style="width: 49%">{L_DESTINATION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN location -->
+	<tr>
+		<td>{location.SOURCE}</td>
+		<td><strong>&raquo;</strong></td>
+		<td>{location.DESTINATION}</td>
+	</tr>
+	<!-- END location -->
+	</tbody>
+	</table>
+
+<!-- ELSEIF S_FTP_UPLOAD -->
+
+	<h1>{L_SELECT_FTP_SETTINGS}</h1>
+
+	<form id="install_update" method="post" action="{U_ACTION}">
+
+	<!-- IF S_CONNECTION_SUCCESS -->
+		<div class="successbox">
+			<p>{L_CONNECTION_SUCCESS}</p>
+		</div>
+	<!-- ELSEIF S_CONNECTION_FAILED -->
+		<div class="errorbox">
+			<p>{L_CONNECTION_FAILED}<br />{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<fieldset>
+		<legend>{L_FTP_SETTINGS}</legend>
+	<dl>
+		<dt><label>{L_UPLOAD_METHOD}:</label></dt>
+		<dd><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>
+	</dl>
+	<!-- END data -->
+	</fieldset>
+	
+	<fieldset class="submit-buttons">
+		{S_HIDDEN_FIELDS}
+		<input class="button2" type="submit" name="check_again" value="{L_BACK}" />
+		<input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}" />
+		<input class="button1" type="submit" name="submit" value="{L_UPDATE_FILES}" />
+	</fieldset>
+
+	</form>
+
+<!-- ENDIF -->
+
+<!-- INCLUDE install_footer.html -->

phpBB/adm/style/install_update_diff.html

@@ -0,0 +1,244 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<head>
+
+<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
+<meta http-equiv="imagetoolbar" content="no" />
+<!-- IF META -->{META}<!-- ENDIF -->
+<title>{PAGE_TITLE}</title>
+
+<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+
+<script type="text/javascript">
+<!--
+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">
+<!--
+
+#main {
+	font-size: 1.25em;
+	line-height: 0.7em;
+	margin: 0;
+	padding: 0;
+	width: 99%;
+}
+
+<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
+div#codepanel {
+	overflow: auto;
+	width: 100%;
+	height: 350px;
+}
+<!-- ELSE -->
+div#codepanel {	
+	background-color: #eee;
+}
+<!-- ENDIF -->
+
+<!-- IF not IS_DIFF_NEW_FILE -->
+/**
+* Unified Diff
+*/
+.file {
+	line-height: .7em;
+}
+
+.diff {
+	margin: 0;
+}
+
+.added {
+	background-color: #dfd;
+}
+
+.removed {
+	background-color: #fdd;
+}
+
+.info {
+	color: #888;
+}
+
+.context {
+	background-color: #eee;
+}
+
+/**
+* Inline Diff
+*/
+.ins {
+	background-color: #dfd;
+	text-decoration: underline;
+}
+
+.del {
+	background-color: #fdd;
+	text-decoration: line-through;
+}
+
+/**
+* Column Diff
+*/
+table.hrdiff {
+	margin: 0 0 8px 5px;
+	width: 100%;
+	overflow: hidden;
+	border-bottom: 1px solid #999;
+	table-layout: fixed;
+}
+
+table.hrdiff th {
+	text-align: left;
+	width: 50%;
+	color: #333;
+	font-family: Verdana,Helvetica,sans-serif;
+	font-size: 11px;
+	border-bottom: 1px solid #999;
+	background: transparent;
+}
+
+table.hrdiff thead th {
+	font-weight: bold;
+	font-size: 110%;
+	padding: 2px;
+}
+
+table.hrdiff tr:first-child th {
+	border-top: none;
+}
+
+table.hrdiff tbody th {
+	padding: 2em 1px 1px 1px;
+	font-size: 80%;
+	border-top: 1px solid #999;
+}
+
+table.hrdiff tbody td.old {
+	border-left: 1px solid #999;
+	border-right: 1px solid #999;	
+}
+table.hrdiff tbody td.new {
+	border-right: 1px solid #999;	
+}
+
+table.hrdiff td pre {
+	overflow: auto;
+	display: block;
+	width: 100%;
+	overflow: auto;
+	display: block;
+}
+
+table.hrdiff .unmodified {
+	background: #fff;
+}
+
+table.hrdiff .added {
+	background: #9f9;
+}
+
+table.hrdiff .added_empty {
+	background: #cfc;
+}
+
+table.hrdiff .modified {
+	background: #fd9;
+}
+
+table.hrdiff .removed {
+	background: #f99;
+}
+
+table.hrdiff .removed_empty {
+	background: #fcc;
+}
+
+table.hrdiff caption {
+	caption-side: top;
+	text-align: left;
+	margin: 0 0 8px 5px;
+	font-size: 90%;
+	font-weight: bold;
+	padding: 5px;
+}
+
+table.hrdiff caption span {
+	height: 10px;
+	width: 10px;
+	line-height: 10px;
+	letter-spacing: 10px;
+	border: 1px solid #000;
+	margin-left: 0.5em;
+	vertical-align: baseline;
+}
+
+<!-- ENDIF -->
+
+//-->
+</style>
+
+</head>
+
+
+<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
+<body onresize="resize_panel();" onload="resize_panel();">
+<!-- ELSE -->
+<body>
+<!-- ENDIF -->
+
+<div id="wrap">
+	<div id="page-header">
+<!-- IF S_DIFF_NEW_FILE -->
+
+		<h1>{L_VIEWING_FILE_CONTENTS}</h1>
+<!-- ELSE -->
+		<h1>{L_VIEWING_FILE_DIFF}</h1>
+<!-- ENDIF -->
+<!-- IF not S_DIFF_NEW_FILE -->
+		<br />
+		<form method="post">
+			<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}" />
+		</form>
+<!-- ENDIF -->
+	</div>
+	
+	<div id="page-body">
+		<div class="panel" id="codepanel">
+			<span class="corners-top"><span></span></span>
+				<div id="content">
+					<div id="main">
+
+<!-- IF S_DIFF_CONFLICT_FILE -->
+		<div style="float: right;"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
+<!-- ENDIF -->
+						{DIFF_CONTENT}
+					</div>
+				</div>
+			<span class="corners-bottom"><span></span></span>
+		</div>
+	</div>
+	
+
+<!-- INCLUDE simple_footer.html -->

phpBB/adm/style/message_body.html

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

phpBB/adm/style/overall_footer.html

@@ -1,4 +1,4 @@
-						
+
 					</div>
 				</div>
 			<span class="corners-bottom"><span></span></span>
@@ -13,14 +13,15 @@
 		"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
 		forums may be affected.
 	
-		The phpBB Group : 2004
+		The phpBB Group : 2006
 	// -->
 	
 	<div id="page-footer">
 		<!-- IF S_COPYRIGHT_HTML -->
 			Powered by phpBB {VERSION} &copy; 2006 <a href="http://www.phpbb.com/">phpBB Group</a>
+			<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 		<!-- ENDIF -->
-	
+
 		<!-- IF DEBUG_OUTPUT -->
 			<!-- IF S_COPYRIGHT_HTML --><br /><!-- ENDIF -->
 			{DEBUG_OUTPUT}

phpBB/adm/style/overall_header.html

@@ -1,9 +1,10 @@
 <!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}">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
 <head>
 
 <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
 <meta http-equiv="imagetoolbar" content="no" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
@@ -12,24 +13,28 @@
 
 <script type="text/javascript">
 <!--
-var jump_page = '{L_JUMP_PAGE}:';
+var jump_page = '{LA_JUMP_PAGE}:';
 var on_page = '{ON_PAGE}';
 var per_page = '{PER_PAGE}';
 var base_url = '{BASE_URL}';
 
-// Jump to page
+/**
+* Jump to page
+*/
 function jumpto()
 {
 	var page = prompt(jump_page, on_page);
 
 	if (page !== null && !isNaN(page) && page > 0)	
 	{
-		document.location.href = base_url.replace('&amp;', '&') + '&start=' + ((page - 1) * per_page);
+		document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
 	}
 }
 
-// Set display of page element
-// s[-1,0,1] = hide,toggle display,show
+/**
+* Set display of page element
+* s[-1,0,1] = hide,toggle display,show
+*/
 function dE(n, s, type)
 {
 	if (!type)
@@ -45,11 +50,18 @@ function dE(n, s, type)
 	e.style.display = (s == 1) ? type : 'none';
 }
 
-// Mark/unmark checkboxes
-// id = ID of parent container, name = name prefix, state = state [true/false]
+/**
+* Mark/unmark checkboxes
+* id = ID of parent container, name = name prefix, state = state [true/false]
+*/
 function marklist(id, name, state)
 {
 	var parent = document.getElementById(id);
+	if (!parent)
+	{
+		eval('parent = document.' + id);
+	}
+
 	if (!parent)
 	{
 		return;
@@ -66,19 +78,42 @@ function marklist(id, name, state)
 	}
 }
 
-<!-- IF S_INCLUDE_SWATCH -->
-	function swatch()
-	{
-		window.open('{U_SWATCH}', '_swatch', 'height=115, resizable=yes, scrollbars=no, width=636');
-		return false;
-	}
-<!-- ENDIF -->
+/**
+* Open trace popup
+*/
+function trace(link)
+{
+	window.open(link.replace(/&amp;/g, '&'), '_trace', 'height=515, resizable=yes, scrollbars=yes, width=680');
+	return false;
+}
+
+/**
+* Find a member
+*/
+function find_username()
+{
+	<!-- IF UA_FIND_USERNAME -->
+	window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=570, resizable=yes, scrollbars=yes, width=760');
+	<!-- ENDIF -->
+	return false;
+}
+
+/**
+* Color swatch
+*/
+function swatch(field)
+{
+	<!-- IF UA_SWATCH -->
+	window.open('{UA_SWATCH}' + field, '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636');
+	<!-- ENDIF -->
+	return false;
+}
 
 //-->
 </script>
 </head>
 
-<body>
+<body class="{S_CONTENT_DIRECTION}">
 <div id="wrap">
 	<div id="page-header">
 		<h1>{L_ADMIN_PANEL}</h1>

phpBB/adm/style/permission_mask.html

@@ -5,239 +5,126 @@
 	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 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 -->
 
-<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>
+<div class="clearfix"></div>
+<h3>{p_mask.NAME}<!-- IF p_mask.S_LOCAL --> <span class="small"> [{p_mask.L_ACL_TYPE}]</span><!-- ENDIF --></h3>
+
+<!-- BEGIN f_mask -->
+
+<fieldset class="perm" id="perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
+	<legend id="legend{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
+		<!-- IF not p_mask.S_VIEW -->
+			<input type="checkbox" style="display: none;" class="perm_cb" name="inherit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" id="checkbox{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" value="1" onclick="toggle_opacity('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')" /> 
+		<!-- ELSE -->
+		<!-- ENDIF -->
+		
+		{p_mask.f_mask.NAME}
+	</legend>
+	<!-- IF not p_mask.S_VIEW -->
+		<div class="perm_switch">
+			<a href="#" onclick="swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '0', true); return false;">{L_ADVANCED_PERMISSIONS}</a>
+		</div>
+		<dl class="perm_simple">
+			<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}:</label></dt>
+			<!-- IF p_mask.f_mask.S_ROLE_OPTIONS -->
+				<dd style="margin-left: 20%"><select id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" onchange="set_role_settings(this.options[selectedIndex].value, 'advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')">{p_mask.f_mask.S_ROLE_OPTIONS}</select></dd>
+			<!-- ELSE -->
+				<dd>{L_NO_ROLE_AVAILABLE}</dd>
+			<!-- ENDIF -->
+		</dl>
 	<!-- ENDIF -->
 
-	<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>
+	<!-- BEGIN category -->
+		<!-- IF p_mask.f_mask.category.S_FIRST_ROW -->
+			<div class="perm_advanced" id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}"<!-- IF not p_mask.S_VIEW --> style="display: none;"<!-- ENDIF -->>
 
-	<!-- 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" name="inherit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" value="1" /><!-- ELSE -->&nbsp;<!-- ENDIF -->
-					</span>
-				</td>
-				<td>{p_mask.f_mask.PADDING}<a href="javascript:swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '0');">{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 -->
-				<!-- ENDIF -->
-				</td>
-			</tr>
-			</tbody>
-			</table>
-		</td>
-		<!-- BEGIN category -->
-			<!-- IF p_mask.f_mask.category.S_YES -->
-				<td class="preset_yes">
-			<!-- ELSEIF p_mask.f_mask.category.S_NO -->
-				<td class="preset_no">
-			<!-- ELSEIF p_mask.f_mask.category.S_UNSET -->
-				<td class="preset_unset">
-			<!-- ELSE -->
-				<td class="preset_custom">
-			<!-- ENDIF -->
-				<a href="javascript:swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '{p_mask.f_mask.category.S_ROW_COUNT}');"><span>&nbsp;</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="javascript: 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}');">{L_ALL_YES}</a>]<br />
-						[<a href="javascript: 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}');">{L_ALL_NO}</a>]<br />
-						[<a href="javascript: 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}');">{L_ALL_UNSET}</a>]
-					</p>
-				</div>
-			<!-- ELSE -->
-				&nbsp;
-			<!-- ENDIF -->
+			<div class="perm_cat">
+				<ul>
+		<!-- ENDIF -->
+ 		
+		<!-- IF p_mask.f_mask.category.S_YES -->
+			<li class="perm_preset_yes<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
+		<!-- ELSEIF p_mask.f_mask.category.S_NEVER -->
+			<li class="perm_preset_never<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
+		<!-- ELSEIF p_mask.f_mask.category.S_NO -->
+			<li class="perm_preset_no<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
+		<!-- ELSE -->
+			<li class="perm_preset_custom<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
+		<!-- 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>
-		</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 -->>
+
+	<!-- BEGIN category -->
+		<div class="perm_panel" id="options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" <!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
+			<span class="corners-top"><span></span></span>
+			<div class="tablewrap">
+				<table id="table{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" cellspacing="1">
+				<colgroup>
+					<col class="permissions_name" />
+					<col class="permissions_yes" />
+					<col class="permissions_no" />
+					<!-- IF not p_mask.S_VIEW -->
+						<col class="permissions_never" />
+					<!-- ENDIF -->
+				</colgroup>
 				<thead>
 				<tr>
-					<th scope="col" style="text-align: left; padding-left: 0;"><strong>{L_ACL_SETTING} [{p_mask.f_mask.category.CAT_NAME}]</strong></th>
+					<th class="name" scope="col"><strong>{L_ACL_SETTING}</strong></th>
 				<!-- IF p_mask.S_VIEW -->
-					<th scope="col">{L_ACL_YES}</th>
-					<th scope="col">{L_ACL_NO}</th>
+					<th style="width: 40px;" class="value" scope="col">{L_ACL_YES}</th>
+					<th style="width: 40px;" class="value" scope="col">{L_ACL_NEVER}</th>
 				<!-- ELSE -->
-					<th scope="col"><a href="javascript: 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}');">{L_ACL_YES}</a></th>
-					<th scope="col"><a href="javascript: 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}');">{L_ACL_UNSET}</a></th>
-					<th scope="col"><a href="javascript: 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}');">{L_ACL_NO}</a></th>
+					<th class="value" scope="col"><a href="#" onclick="mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'y'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false, 'yes'); return false;">{L_ACL_YES}</a></th>
+					<th class="value" scope="col"><a href="#" onclick="mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'u'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false, 'no'); return false;">{L_ACL_NO}</a></th>
+					<th class="value" scope="col"><a href="#" onclick="mark_options('options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', 'n'); reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false, 'never'); return false;">{L_ACL_NEVER}</a></th>
 				<!-- 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>{p_mask.f_mask.category.mask.PERMISSION}</th>
+					<th class="permission_name<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->"><!-- IF p_mask.f_mask.category.mask.U_TRACE --><a href="#" class="trace" onclick="trace('{p_mask.f_mask.category.mask.U_TRACE}'); return false;" title="{L_TRACE_SETTING}"><img src="images/icon_trace.gif" alt="{L_TRACE_SETTING}" /></a> <!-- ENDIF -->{p_mask.f_mask.category.mask.PERMISSION}</th>
 					<!-- IF p_mask.S_VIEW -->
-						<td<!-- IF p_mask.f_mask.category.mask.S_YES --> class="yes"<!-- ELSE --> class="unset"<!-- ENDIF -->>&nbsp;</td>
-						<td<!-- IF p_mask.f_mask.category.mask.S_NO --> class="no"<!-- ELSE --> class="unset"<!-- ENDIF -->>&nbsp;</td>
+						<td<!-- IF p_mask.f_mask.category.mask.S_YES --> class="yes"<!-- ENDIF -->>&nbsp;</td>
+						<td<!-- IF p_mask.f_mask.category.mask.S_NEVER --> class="never"<!-- ENDIF -->></td>
 					<!-- ELSE -->
-						<td class="unset"><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}" type="radio"<!-- IF p_mask.f_mask.category.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></td>
-						<td class="unset"><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}" type="radio"<!-- IF p_mask.f_mask.category.mask.S_UNSET --> checked="checked"<!-- ENDIF --> value="-1" /></td>
-						<td class="unset"><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}" type="radio"<!-- IF p_mask.f_mask.category.mask.S_NO --> checked="checked"<!-- ENDIF --> value="0" /></td>
+						<td><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_y"><input onchange="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_y" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></label></td>
+						<td><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_u"><input onchange="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_u" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_NO --> checked="checked"<!-- ENDIF --> value="-1" /></label></td>
+						<td><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_n"><input onchange="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_n" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_NEVER --> checked="checked"<!-- ENDIF --> value="0" /></label></td>
 					<!-- ENDIF -->
 				</tr>
 				<!-- END mask -->
 				</tbody>
 				</table>
-			<!-- END category -->
-		</td>
-	</tr>
-	<!-- END f_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}" />
+				<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>	
+			</fieldset>
+		
+			<!-- ENDIF -->
+			<span class="corners-bottom"><span></span></span>
+		</div>
+	<!-- END category -->
+	</div>
 </fieldset>
+<!-- END f_mask -->
 
 <!-- END p_mask -->

phpBB/adm/style/permission_trace.html

@@ -0,0 +1,51 @@
+<!-- INCLUDE simple_header.html -->
+
+<div style="background-color: #fff; padding: 10px; margin-top: 10px;" class="permissions">
+
+	<!-- IF U_BACK --><a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a><!-- ENDIF -->
+
+	<h3>{L_TRACE_FOR}: {PERMISSION_USERNAME} / <!-- IF FORUM_NAME -->{FORUM_NAME} / <!-- ENDIF -->{PERMISSION} </h3>
+
+	<br />
+
+	<table cellspacing="1" class="type1">
+	<thead>
+	<tr>
+		<th>{L_TRACE_WHO}</th>
+		<th style="width: 50px;">{L_ACL_SETTING}</th>
+		<th style="width: 50px;">{L_TRACE_TOTAL}</th>
+		<th>{L_INFORMATION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN trace -->
+		<!-- IF trace.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
+		<td style="white-space: nowrap;"><strong>{trace.WHO}</strong></td>
+
+		<!-- IF trace.S_SETTING_NEVER -->
+			<td class="never">{L_ACL_NEVER}</td>
+		<!-- ELSEIF trace.S_SETTING_YES -->
+			<td class="yes">{L_ACL_YES}</td>
+		<!-- ELSE -->
+			<td class="no">{L_ACL_NO}</td>
+		<!-- ENDIF -->
+
+		<!-- IF trace.S_TOTAL_NEVER -->
+			<td class="never">{L_ACL_NEVER}</td>
+		<!-- ELSEIF trace.S_TOTAL_YES -->
+			<td class="yes">{L_ACL_YES}</td>
+		<!-- ELSE -->
+			<td class="no">{L_ACL_NO}</td>
+		<!-- ENDIF -->
+
+		<td>{trace.INFORMATION}</td>
+	</tr>
+	<!-- END trace -->
+	</tbody>
+	</table>
+
+	<br />
+
+<!-- INCLUDE simple_footer.html -->
+
+</div>

phpBB/adm/style/permissions.js

@@ -0,0 +1,359 @@
+/**
+* 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 == 'perm_cb')
+		{
+			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 = 'perm_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 = 'perm_preset_' + colour;
+	}
+	else
+	{
+		tab.className = 'perm_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 == 'perm_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,10 @@
 <!-- INCLUDE simple_header.html -->
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 <!--
+	/**
+	* Close previously opened popup
+	*/
 	function close_popup()
 	{
 		if (opener != null)
@@ -22,14 +25,13 @@
 //-->
 </script>
 
-
 <div class="successbox">
 	<h3>{L_PROGRESS}</h3>
 	<img src="images/progress_bar.gif" alt="{L_PROGRESS}" />
 	<p>{L_PROGRESS_EXPLAIN}</p>
 </div>
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 <!--
 	close_popup();
 //-->

phpBB/adm/style/simple_body.html

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

phpBB/adm/style/simple_footer.html

@@ -1,4 +1,4 @@
-		<div style="text-align: right;"><a href="#" onclick="javascript: self.close();">{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>
 
@@ -10,13 +10,14 @@
 	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
 	forums may be affected.
 
-	The phpBB Group : 2004
+	The phpBB Group : 2006
 // -->
 
 <div id="page-footer">
 
 	<!-- IF S_COPYRIGHT_HTML -->
-		<br />Powered by phpBB {VERSION} &copy; 2005 <a href="http://www.phpbb.com/">phpBB Group</a>
+		<br />Powered by phpBB {VERSION} &copy; 2006 <a href="http://www.phpbb.com/">phpBB Group</a>
+		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 	<!-- ENDIF -->
 
 	<!-- IF DEBUG_OUTPUT -->

phpBB/adm/style/simple_header.html

@@ -1,9 +1,10 @@
 <!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}">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
 <head>
 
 <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
+<meta http-equiv="Content-Language" content="{S_USER_LANG}" />
 <meta http-equiv="imagetoolbar" content="no" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
@@ -12,24 +13,28 @@
 
 <script type="text/javascript">
 <!--
-var jump_page = '{L_JUMP_PAGE}:';
+var jump_page = '{LA_JUMP_PAGE}:';
 var on_page = '{ON_PAGE}';
 var per_page = '{PER_PAGE}';
 var base_url = '{BASE_URL}';
 
-// Jump to page
+/**
+* Jump to page
+*/
 function jumpto()
 {
 	var page = prompt(jump_page, on_page);
 
 	if (page !== null && !isNaN(page) && page > 0)	
 	{
-		document.location.href = base_url.replace('&amp;', '&') + '&start=' + ((page - 1) * per_page);
+		document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
 	}
 }
 
-// Set display of page element
-// s[-1,0,1] = hide,toggle display,show
+/**
+* Set display of page element
+* s[-1,0,1] = hide,toggle display,show
+*/
 function dE(n, s, type)
 {
 	if (!type)
@@ -45,8 +50,10 @@ function dE(n, s, type)
 	e.style.display = (s == 1) ? type : 'none';
 }
 
-// Mark/unmark checkboxes
-// id = ID of parent container, name = name prefix, state = state [true/false]
+/**
+* Mark/unmark checkboxes
+* id = ID of parent container, name = name prefix, state = state [true/false]
+*/
 function marklist(id, name, state)
 {
 	var parent = document.getElementById(id);
@@ -66,18 +73,32 @@ function marklist(id, name, state)
 	}
 }
 
-<!-- IF S_INCLUDE_SWATCH -->
-	function swatch()
-	{
-		window.open('{U_SWATCH}', '_swatch', 'height=115, resizable=yes, scrollbars=no, width=636');
-		return false;
-	}
-<!-- ENDIF -->
+/**
+* Find a member
+*/
+function find_username()
+{
+	<!-- IF UA_FIND_USERNAME -->
+	window.open('{UA_FIND_USERNAME}', '_usersearch', 'height=570, resizable=yes, scrollbars=yes, width=760');
+	<!-- ENDIF -->
+	return false;
+}
+
+/**
+* Color swatch
+*/
+function swatch(field)
+{
+	<!-- IF UA_SWATCH -->
+	window.open('{UA_SWATCH}' + field, '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636');
+	<!-- ENDIF -->
+	return false;
+}
 
 //-->
 </script>
 </head>
 
-<body>
+<body class="{S_CONTENT_DIRECTION}">
 
 <div id="page-body" style="padding: 0 10px;">

phpBB/adm/style/sql_report.css

@@ -1,131 +0,0 @@
-/*
-	$Id$	
-
-	    The original "subSilver" theme for phpBB2
-	Created by subBlue design :: http://www.subBlue.com
-	  Updated for phpBB 2.2 by psoTFX :: phpBB Group
-	        Copyright (c) 2002 phpBB Group
-*/
-
-body {
-	background-color:	white;
-	font-family:		Verdana, Arial, Helvetica, sans-serif;
-	margin:				0;
-	border:				0;
-	padding:			0;
-}
-
-p {
-	font-size:	8pt;
-}
-
-.maintitle, h1 {
-	font:			bold 18pt 'Trebuchet MS', Verdana, sans-serif;
-	text-decoration:none; 
-	line-height:	120%; 
-}
-
-h2 {
-	font:			bold 12pt Arial, Helvetica, sans-serif;
-	text-decoration:none; 
-	line-height:	120%; 
-}
-
-.maintitle {
-	color:	#12749B
-}
-
-/*
-	Anchors
-*/
-a:link, a:active, a:visited { color: #006699; text-decoration: none; }
-a:hover { color: #DD6900; text-decoration: underline; }
-
-a.nav { color: #006699; text-decoration: none; }
-a.nav:hover { text-decoration: underline; }
-
-a.th:link { color: #FFA34F; text-decoration: none; }
-a.th:active { color: #FFA34F; text-decoration: none; }
-a.th:visited { color: #FFA34F; text-decoration: none; }
-a.th:hover {  color: #FFA34F; text-decoration: underline; }
-
-/*
-	Non-tag specific
-*/
-.gen, .gensmall {
-	color:	black;
-}
-.gen {
-	font-size:	8pt;
-}
-.gensmall {
-	font-size:	7pt;
-}
-.nav {
-	color:	black;
-	font-size:	7pt;
-	font-weight: bold;
-}
-
-.error { color: #FF0000 }
-
-/*
-	Tables
-*/
-table.bg {
-	background-color: #ACBBC6
-}
-
-th, td { 
-	font:	normal 8pt Verdana, Arial, Helvetica, sans-serif;
-}
-
-th	{
-	height:				25px;
-	background-color:	#006699;
-	color:				#FFA34F;
-	font-weight:		bold;
-	font-size:			11px;
-}
-
-td.cat {
-	height:				28px;
-	background-color:	#D1D7DC; 
-}
-
-.row1 {
-	background-color:	#EFEFEF;
-}
-.row2 {
-	background-color:	#DEE3E7;
-}
-.row3 {
-	background-color:	#D1D7DC;
-}
-
-/*
-	Misc
-*/
-hr	{ 
-	height:				0px; 
-	border:				solid #D1D7DC 0px; 
-	border-top-width:	1px;
-}
-
-/*
-	Forms
-*/
-input {
-	text-indent: 2px;
-}
-
-textarea, select {
-	border: 1px solid; 
-}
-
-input, textarea, select {
-	color:			black;
-	font:			normal 8pt Verdana, Arial, Helvetica, sans-serif;
-	border-color:	black;
-}
-

phpBB/adm/style/tooltip.js

@@ -0,0 +1,251 @@
+/*
+javascript for Bubble Tooltips by Alessandro Fulciniti
+- http://pro.html.it - http://web-graphics.com 
+obtained from: http://web-graphics.com/mtarchive/001717.php
+
+phpBB Development Team:
+	- modified to adhere to our coding guidelines
+	- integration into our design
+	- added ability to perform tooltips on select elements
+	- further adjustements
+*/
+
+var head_text, tooltip_mode;
+
+/**
+* Enable tooltip replacements for links
+*/
+function enable_tooltips_link(id, headline, sub_id)
+{
+	var links, i, hold;
+	
+	head_text = headline;
+
+	if (!document.getElementById || !document.getElementsByTagName)
+	{
+		return;
+	}
+
+	hold = document.createElement('span');
+	hold.id = '_tooltip_container';
+	hold.setAttribute('id', '_tooltip_container');
+	hold.style.position = 'absolute';
+
+	document.getElementsByTagName('body')[0].appendChild(hold);
+
+	if (id == null)
+	{
+		links = document.getElementsByTagName('a');
+	}
+	else
+	{
+		links = document.getElementById(id).getElementsByTagName('a');
+	}
+
+	for (i = 0; i < links.length; i++)
+	{
+		if (sub_id)
+		{
+			if (links[i].id.substr(0, sub_id.length) == sub_id)
+			{
+				prepare(links[i]);
+			}
+		}
+		else
+		{
+			prepare(links[i]);
+		}
+	}
+
+	tooltip_mode = 'link';
+}
+
+/**
+* Enable tooltip replacements for selects
+*/
+function enable_tooltips_select(id, headline, sub_id)
+{
+	var links, i, hold;
+	
+	head_text = headline;
+
+	if (!document.getElementById || !document.getElementsByTagName)
+	{
+		return;
+	}
+
+	hold = document.createElement('span');
+	hold.id = '_tooltip_container';
+	hold.setAttribute('id', '_tooltip_container');
+	hold.style.position = 'absolute';
+
+	document.getElementsByTagName('body')[0].appendChild(hold);
+
+	if (id == null)
+	{
+		links = document.getElementsByTagName('option');
+	}
+	else
+	{
+		links = document.getElementById(id).getElementsByTagName('option');
+	}
+
+	for (i = 0; i < links.length; i++)
+	{
+		if (sub_id)
+		{
+			if (links[i].parentNode.id.substr(0, sub_id.length) == sub_id)
+			{
+				prepare(links[i]);
+			}
+		}
+		else
+		{
+			prepare(links[i]);
+		}
+	}
+
+	tooltip_mode = 'select';
+}
+
+/**
+* Prepare elements to replace
+*/
+function prepare(element)
+{
+	var tooltip, text, desc, title;
+
+	text = element.getAttribute('title');
+
+	if (text == null || text.length == 0)
+	{
+		return;
+	}
+
+	element.removeAttribute('title');
+	tooltip = create_element('span', 'tooltip');
+
+	title = create_element('span', 'top');
+	title.appendChild(document.createTextNode(head_text));
+	tooltip.appendChild(title);
+
+	desc = create_element('span', 'bottom');
+	desc.innerHTML = text;
+	tooltip.appendChild(desc);
+
+	set_opacity(tooltip);
+
+	element.tooltip = tooltip;
+	element.onmouseover = show_tooltip;
+	element.onmouseout = hide_tooltip;
+
+	if (tooltip_mode == 'link')
+	{
+		element.onmousemove = locate;
+	}
+}
+
+/**
+* Show tooltip
+*/
+function show_tooltip(e)
+{
+	document.getElementById('_tooltip_container').appendChild(this.tooltip);
+	locate(this);
+}
+
+/**
+* Hide tooltip
+*/
+function hide_tooltip(e)
+{
+	var d = document.getElementById('_tooltip_container');
+	if (d.childNodes.length > 0)
+	{
+		d.removeChild(d.firstChild);
+	}
+}
+
+/**
+* Set opacity on tooltip element
+*/
+function set_opacity(element)
+{
+	element.style.filter = 'alpha(opacity:95)';
+	element.style.KHTMLOpacity = '0.95';
+	element.style.MozOpacity = '0.95';
+	element.style.opacity = '0.95';
+}
+
+/**
+* Create new element
+*/
+function create_element(tag, c)
+{
+	var x = document.createElement(tag);
+	x.className = c;
+	x.style.display = 'block';
+	return x;
+}
+
+/**
+* Correct positioning of tooltip container
+*/
+function locate(e)
+{
+	var posx = 0;
+	var posy = 0;
+
+	e = e.parentNode;
+
+	if (e.offsetParent)
+	{
+		for (var posx = 0, posy = 0; e.offsetParent; e = e.offsetParent)
+		{
+			posx += e.offsetLeft;
+			posy += e.offsetTop;
+		}
+	}
+	else
+	{
+		posx = e.offsetLeft;
+		posy = e.offsetTop;
+	}
+
+	if (tooltip_mode == 'link')
+	{
+		document.getElementById('_tooltip_container').style.top=(posy+20) + 'px';
+		document.getElementById('_tooltip_container').style.left=(posx-20) + 'px';
+	}
+	else
+	{
+		document.getElementById('_tooltip_container').style.top=(posy+30) + 'px';
+		document.getElementById('_tooltip_container').style.left=(posx-205) + 'px';
+	}
+
+/*
+	if (e == null)
+	{
+		e = window.event;
+	}
+
+	if (e.pageX || e.pageY)
+	{
+		posx = e.pageX;
+		posy = e.pageY;
+	}
+	else if (e.clientX || e.clientY)
+	{
+		if (document.documentElement.scrollTop)
+		{
+			posx = e.clientX+document.documentElement.scrollLeft;
+			posy = e.clientY+document.documentElement.scrollTop;
+		}
+		else
+		{
+			posx = e.clientX+document.body.scrollLeft;
+			posy = e.clientY+document.body.scrollTop;
+		}
+	}
+*/
+}

phpBB/adm/style/viewsource.html

@@ -0,0 +1,20 @@
+<!-- INCLUDE simple_header.html -->
+
+<div class="panel" style="padding: 10px;">
+
+	<h1>{FILENAME}</h1>
+
+	<table>
+	<tbody>
+	<!-- BEGIN source -->
+		<tr valign="top">
+			<td class="sourcenum">{source.LINENUM}&nbsp;&nbsp;</td>
+			<td class="source">{source.LINE}</td>
+		</tr>
+	<!-- END source -->
+	</tbody>
+	</table>
+
+</div>
+
+<!-- INCLUDE simple_footer.html -->

phpBB/adm/swatch.php

@@ -1,73 +1,45 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
-<head>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="imagetoolbar" content="no" />
-<title>phpBB3 Color Swatch</title>
+<?php
+/** 
+*
+* @package phpBB3
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
 
-<style type="text/css">
-<!--
-body {
-	background-color: #404040;
-	color: #fff;
-}
+/**
+* @ignore
+*/
+define('IN_PHPBB', true);
+$phpbb_root_path = './../';
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
+include($phpbb_root_path . 'common.' . $phpEx);
 
-td {
-	border: solid 1px #333; 
-}
+// Start session management
+$user->session_begin(false);
+$auth->acl($user->data);
+$user->setup();
 
-.over { 
-	border-color: white; 
-}
+// Set custom template for admin area
+$template->set_custom_template($phpbb_root_path . 'adm/style', 'admin');
 
-.out {
-	border-color: #333333; 
-}
+$template->set_filenames(array(
+	'body' => 'colour_swatch.html')
+);
 
-img {
-	border: 0;
-}
+$template->assign_vars(array(
+	'OPENER'		=> addslashes(request_var('form', '')),
+	'NAME'			=> request_var('name', ''),
+	'T_IMAGES_PATH'	=> "{$phpbb_root_path}images/",
 
-//-->
-</style>
-</head>
+	'S_USER_LANG'			=> $user->lang['USER_LANG'],
+	'S_CONTENT_DIRECTION'	=> $user->lang['DIRECTION'],
+	'S_CONTENT_ENCODING'	=> 'UTF-8',
+));
 
-<body>
+$template->display('body');
 
-<script type="text/javascript">
-<!--
-	var r = 0, g = 0, b = 0;
-	var numberList = new Array(6);
-	numberList[0] = "00";
-	numberList[1] = "33";
-	numberList[2] = "66";
-	numberList[3] = "99";
-	numberList[4] = "CC";
-	numberList[5] = "FF";
-	document.writeln('<table cellspacing="0" cellpadding="0" border="0">');
-	for(r = 0; r < 6; r++)
-	{
-		document.writeln('<tr>');
-		for(g = 0; g < 6; g++)
-		{
-			for(b = 0; b < 6; b++)
-			{
-				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
-				document.write('<td bgcolor="#' + color + '" onmouseover="this.className=\'over\'" onmouseout="this.className=\'out\'">');
-				document.write('<a href="javascript:cell(\'' + color + '\');"><img src="./images/spacer.gif" width="15" height="12" alt="#' + color + '" title="#' + color + '" \/><\/a>');
-				document.writeln('<\/td>');
-			}
-		}
-		document.writeln('<\/tr>');
-	}
-	document.writeln('<\/table>');
+garbage_collection();
 
-function cell(color)
-{
-	opener.document.forms['<?php echo htmlspecialchars(addslashes($_GET['form'])); ?>'].<?php echo htmlspecialchars(addslashes($_GET['name'])); ?>.value = color;
-}
-//-->
-</script>
-
-</body>
-</html>
+?>

phpBB/common.php

@@ -9,10 +9,6 @@
 * Minimum Requirement: PHP 4.3.3
 */
 
-// Remove the following line to enable this software, be sure you note what it
-// says before continuing
-die('This software is unsupported in any and all respects. By removing this notice (found in common.php) you are noting your acceptance of this. Do not ask support questions of any kind for this release at either area51.phpbb.com or www.phpbb.com. Support for this version will appear when the beta cycle begins');
-
 /**
 */
 if (!defined('IN_PHPBB'))
@@ -23,61 +19,133 @@ if (!defined('IN_PHPBB'))
 $starttime = explode(' ', microtime());
 $starttime = $starttime[1] + $starttime[0];
 
-error_reporting(E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
-//error_reporting(E_ALL);
-set_magic_quotes_runtime(0);
+// Report all errors, except notices
+error_reporting(E_ALL ^ E_NOTICE);
 
-// Protect against GLOBALS tricks
-if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS']))
+/*
+* Remove variables created by register_globals from the global scope
+* Thanks to Matt Kavanagh
+*/
+function deregister_globals()
 {
-	exit;
-}
+	$not_unset = array(
+		'GLOBALS'	=> true,
+		'_GET'		=> true,
+		'_POST'		=> true,
+		'_COOKIE'	=> true,
+		'_REQUEST'	=> true,
+		'_SERVER'	=> true,
+		'_SESSION'	=> true,
+		'_ENV'		=> true,
+		'_FILES'	=> true,
+		'phpEx'		=> true,
+		'phpbb_root_path'	=> true
+	);
 
-// Protect against _SESSION tricks
-if (isset($_SESSION) && !is_array($_SESSION))
-{
-	exit;
-}
-
-// Be paranoid with passed vars
-if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
-{
-	$not_unset = array('_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_SESSION', '_ENV', '_FILES', 'phpEx', 'phpbb_root_path');
-
-	// Not only will array_merge give a warning if a parameter
-	// is not an array, it will actually fail. So we check if
-	// _SESSION has been initialised.
+	// Not only will array_merge and array_keys give a warning if
+	// a parameter is not an array, array_merge will actually fail.
+	// So we check if _SESSION has been initialised.
 	if (!isset($_SESSION) || !is_array($_SESSION))
 	{
 		$_SESSION = array();
 	}
 
-	// Merge all into one extremely huge array; unset
-	// this later
-	$input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_SESSION, $_ENV, $_FILES);
+	// Merge all into one extremely huge array; unset this later
+	$input = array_merge(
+		array_keys($_GET),
+		array_keys($_POST),
+		array_keys($_COOKIE),
+		array_keys($_SERVER),
+		array_keys($_SESSION),
+		array_keys($_ENV),
+		array_keys($_FILES)
+	);
 
-	foreach ($input as $varname => $void)
+	foreach ($input as $varname)
 	{
-		if (!in_array($varname, $not_unset))
+		if (isset($not_unset[$varname]))
 		{
-			unset(${$varname});
+			// Hacking attempt. No point in continuing.
+			exit;
 		}
+
+		unset($GLOBALS[$varname]);
 	}
 
 	unset($input);
 }
 
+// If we are on PHP >= 6.0.0 we do not need some code
+if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
+{
+	/**
+	* @ignore
+	*/
+	define('STRIP', false);
+}
+else
+{
+	set_magic_quotes_runtime(0);
+
+	// Be paranoid with passed vars
+	if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
+	{
+		deregister_globals();
+	}
+
+	define('STRIP', (get_magic_quotes_gpc()) ? true : false);
+}
+
 if (defined('IN_CRON'))
 {
 	chdir($phpbb_root_path);
-	$phpbb_root_path = getcwd() . '/';
+	if (@function_exists('getcwd'))
+	{
+		$phpbb_root_path = getcwd() . '/';
+	}
+	else
+	{
+		// This is a best guess
+		$phpbb_root_path = pathinfo($_SERVER['SCRIPT_FILENAME'], PATHINFO_DIRNAME) . '/';
+	}
 }
 
-require($phpbb_root_path . 'config.'.$phpEx);
+if (!file_exists($phpbb_root_path . 'config.' . $phpEx))
+{
+	die("<p>The config.$phpEx file could not be found.</p><p><a href=\"{$phpbb_root_path}install/index.$phpEx\">Click here to install phpBB</a></p>");
+}
+
+require($phpbb_root_path . 'config.' . $phpEx);
 
 if (!defined('PHPBB_INSTALLED'))
 {
-	header('Location: install/index.'.$phpEx);
+	// Redirect the user to the installer
+	// We have to generate a full HTTP/1.1 header here since we can't guarantee to have any of the information
+	// available as used by the redirect function
+	$server_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME');
+	$server_port = (!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT');
+	$secure = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 1 : 0;
+
+	$script_name = (!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : getenv('PHP_SELF');
+	if (!$script_name)
+	{
+		$script_name = (!empty($_SERVER['REQUEST_URI'])) ? $_SERVER['REQUEST_URI'] : getenv('REQUEST_URI');
+	}
+
+	// Replace any number of consecutive backslashes and/or slashes with a single slash
+	// (could happen on some proxy setups and/or Windows servers)
+	$script_path = trim(dirname($script_name)) . '/install/index.' . $phpEx;
+	$script_path = preg_replace('#[\\\\/]{2,}#', '/', $script_path);
+
+	$url = (($secure) ? 'https://' : 'http://') . $server_name;
+
+	if ($server_port && (($secure && $server_port <> 443) || (!$secure && $server_port <> 80)))
+	{
+		$url .= ':' . $server_port;
+	}
+
+	$url .= $script_path;
+	header('Location: ' . $url);
 	exit;
 }
 
@@ -101,17 +169,16 @@ if (!empty($load_extensions))
 	}
 }
 
-define('STRIP', (get_magic_quotes_gpc()) ? true : false);
-
 // Include files
 require($phpbb_root_path . 'includes/acm/acm_' . $acm_type . '.' . $phpEx);
-require($phpbb_root_path . 'includes/acm/acm_main.' . $phpEx);
-require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);
+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/constants.' . $phpEx);
+require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);
+require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 
 // Set PHP error handler to ours
 set_error_handler('msg_handler');
@@ -132,10 +199,4 @@ unset($dbpasswd);
 // Grab global variables, re-cache if necessary
 $config = $cache->obtain_config();
 
-// Warn about install/ directory
-if (file_exists('install'))
-{
-//	trigger_error('REMOVE_INSTALL');
-}
-
-?>
+?>

phpBB/cron.php

@@ -14,23 +14,40 @@ define('IN_PHPBB', true);
 define('IN_CRON', true);
 $phpbb_root_path = './';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
-include($phpbb_root_path . 'common.'.$phpEx);
+include($phpbb_root_path . 'common.' . $phpEx);
+
+// Do not update users last page entry
+$user->session_begin(false);
+$auth->acl($user->data);
 
 $cron_type = request_var('cron_type', '');
-
 $use_shutdown_function = (@function_exists('register_shutdown_function')) ? true : false;
 
+// Output transparent gif
+header('Cache-Control: no-cache');
+header('Content-type: image/gif');
+header('Content-length: 43');
+
+echo base64_decode('R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==');
+
+flush();
+
 /**
 * Run cron-like action
 * Real cron-based layer will be introduced in 3.2
-*
-* @todo check gc-intervals here too (important!)
 */
 switch ($cron_type)
 {
 	case 'queue':
-		include_once($phpbb_root_path . 'includes/functions_messenger.'.$phpEx);
+
+		if (time() - $config['queue_interval'] <= $config['last_queue_run'] || !file_exists($phpbb_root_path . 'cache/queue.' . $phpEx))
+		{
+			break;
+		}
+
+		include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
 		$queue = new queue();
+
 		if ($use_shutdown_function)
 		{
 			register_shutdown_function(array(&$queue, 'process'));
@@ -39,9 +56,16 @@ switch ($cron_type)
 		{
 			$queue->process();
 		}
+
 	break;
 
 	case 'tidy_cache':
+
+		if (time() - $config['cache_gc'] <= $config['cache_last_gc'] || !method_exists($cache, 'tidy'))
+		{
+			break;
+		}
+
 		if ($use_shutdown_function)
 		{
 			register_shutdown_function(array(&$cache, 'tidy'));
@@ -50,16 +74,19 @@ switch ($cron_type)
 		{
 			$cache->tidy();
 		}
+
 	break;
 
 	case 'tidy_search':
+		
 		// Select the search method
-		$search_type = $config['search_type'];
+		$search_type = basename($config['search_type']);
 
-		if (!file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx) || (time() - $config['search_last_gc'] <= $config['search_gc']))
+		if (time() - $config['search_gc'] <= $config['search_last_gc'] || !file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx))
 		{
 			break;
 		}
+
 		include_once("{$phpbb_root_path}includes/search/$search_type.$phpEx");
 
 		// We do some additional checks in the module to ensure it can actually be utilised
@@ -79,10 +106,17 @@ switch ($cron_type)
 		{
 			$search->tidy();
 		}
-		set_config('search_last_gc', time());
+
+	break;
 
 	case 'tidy_warnings':
-		include_once($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
+
+		if (time() - $config['warnings_gc'] <= $config['warnings_last_gc'])
+		{
+			break;
+		}
+
+		include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 
 		if ($use_shutdown_function)
 		{
@@ -92,10 +126,17 @@ switch ($cron_type)
 		{
 			tidy_warnings();
 		}
+
 	break;
 
 	case 'tidy_database':
-		include_once($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
+
+		if (time() - $config['database_gc'] <= $config['database_last_gc'])
+		{
+			break;
+		}
+
+		include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 
 		if ($use_shutdown_function)
 		{
@@ -105,9 +146,16 @@ switch ($cron_type)
 		{
 			tidy_database();
 		}
+
 	break;
 
 	case 'tidy_sessions':
+
+		if (time() - $config['session_gc'] <= $config['session_last_gc'])
+		{
+			break;
+		}
+
 		if ($use_shutdown_function)
 		{
 			register_shutdown_function(array(&$user, 'session_gc'));
@@ -116,6 +164,7 @@ switch ($cron_type)
 		{
 			$user->session_gc();
 		}
+
 	break;
 
 	case 'prune_forum':
@@ -137,7 +186,7 @@ switch ($cron_type)
 		// Do the forum Prune thang
 		if ($row['prune_next'] < time() && $row['enable_prune'])
 		{
-			include_once($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
+			include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 
 			if ($row['prune_days'])
 			{
@@ -167,14 +216,16 @@ switch ($cron_type)
 	break;
 }
 
-// Output transparent gif
-header('Cache-Control: no-cache');
-header('Content-type: image/gif');
-header('Content-length: 43');
+// Unloading cache and closing db after having done the dirty work.
+if ($use_shutdown_function)
+{
+	register_shutdown_function('garbage_collection');
+}
+else
+{
+	garbage_collection();
+}
 
-echo base64_decode('R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==');
-
-flush();
 exit;
 
 ?>

phpBB/develop/add_permissions.php

@@ -33,13 +33,13 @@ require($phpbb_root_path . 'includes/acm/acm_' . $acm_type . '.'.$phpEx);
 require($phpbb_root_path . 'includes/db/' . $dbms . '.'.$phpEx);
 include($phpbb_root_path . 'includes/functions.'.$phpEx);
 
-define('ACL_NO', 0);
+define('ACL_NEVER', 0);
 define('ACL_YES', 1);
-define('ACL_UNSET', -1);
+define('ACL_NO', -1);
 
-define('ACL_GROUPS_TABLE', $table_prefix.'auth_groups');
-define('ACL_OPTIONS_TABLE', $table_prefix.'auth_options');
-define('ACL_USERS_TABLE', $table_prefix.'auth_users');
+define('ACL_GROUPS_TABLE', $table_prefix.'acl_groups');
+define('ACL_OPTIONS_TABLE', $table_prefix.'acl_options');
+define('ACL_USERS_TABLE', $table_prefix.'acl_users');
 define('GROUPS_TABLE', $table_prefix.'groups');
 define('USERS_TABLE', $table_prefix.'users');
 
@@ -56,7 +56,6 @@ $f_permissions = array(
 	'f_read'	=> array(1, 0),
 	'f_post'	=> array(1, 0),
 	'f_reply'	=> array(1, 0),
-	'f_quote'	=> array(1, 0),
 	'f_edit'	=> array(1, 0),
 	'f_user_lock'	=> array(1, 0),
 	'f_delete'	=> array(1, 0),
@@ -69,7 +68,6 @@ $f_permissions = array(
 	'f_attach'	=> array(1, 0),
 	'f_download'=> array(1, 0),
 	'f_icons'	=> array(1, 0),
-	'f_html'	=> array(1, 0),
 	'f_bbcode'	=> array(1, 0),
 	'f_smilies'	=> array(1, 0),
 	'f_img'		=> array(1, 0),
@@ -77,11 +75,10 @@ $f_permissions = array(
 	'f_sigs'	=> array(1, 0),
 	'f_search'	=> array(1, 0),
 	'f_email'	=> array(1, 0),
-	'f_rate'	=> array(1, 0),
 	'f_print'	=> array(1, 0),
 	'f_ignoreflood'	=> array(1, 0),
 	'f_postcount'	=> array(1, 0),
-	'f_moderate'=> array(1, 0),
+	'f_noapprove'=> array(1, 0),
 	'f_report'	=> array(1, 0),
 	'f_subscribe'	=> array(1, 0),
 );
@@ -104,9 +101,7 @@ $m_permissions = array(
 $a_permissions = array(
 	'a_'		=> array(0, 1),
 	'a_server'	=> array(0, 1),
-	'a_defaults'=> array(0, 1),
 	'a_board'	=> array(0, 1),
-	'a_cookies'	=> array(0, 1),
 	'a_clearlogs'	=> array(0, 1),
 	'a_words'	=> array(0, 1),
 	'a_icons'	=> array(0, 1),
@@ -161,11 +156,9 @@ $u_permissions = array(
 	'u_attach'		=> array(0, 1),
 	'u_sig'			=> array(0, 1),
 	'u_pm_attach'	=> array(0, 1),
-	'u_pm_html'		=> array(0, 1),
 	'u_pm_bbcode'	=> array(0, 1),
 	'u_pm_smilies'	=> array(0, 1),
 	'u_pm_download'	=> array(0, 1),
-	'u_pm_report'	=> array(0, 1),
 	'u_pm_edit'		=> array(0, 1),
 	'u_pm_printpm'	=> array(0, 1),
 	'u_pm_emailpm'	=> array(0, 1),
@@ -219,14 +212,14 @@ foreach ($prefixes as $prefix)
 		
 			echo "<p><b>Adding $auth_option...</b></p>\n";
 
-			mass_auth('group', 0, 'guests', $auth_option, ACL_NO);
-			mass_auth('group', 0, 'inactive', $auth_option, ACL_NO);
-			mass_auth('group', 0, 'inactive_coppa', $auth_option, ACL_NO);
-			mass_auth('group', 0, 'registered_coppa', $auth_option, ACL_NO);
-			mass_auth('group', 0, 'registered', $auth_option, (($prefix != 'm_' && $prefix != 'a_') ? ACL_YES : ACL_NO));
-			mass_auth('group', 0, 'super_moderators', $auth_option, (($prefix != 'a_') ? ACL_YES : ACL_NO));
+			mass_auth('group', 0, 'guests', $auth_option, ACL_NEVER);
+			mass_auth('group', 0, 'inactive', $auth_option, ACL_NEVER);
+			mass_auth('group', 0, 'inactive_coppa', $auth_option, ACL_NEVER);
+			mass_auth('group', 0, 'registered_coppa', $auth_option, ACL_NEVER);
+			mass_auth('group', 0, 'registered', $auth_option, (($prefix != 'm_' && $prefix != 'a_') ? ACL_YES : ACL_NEVER));
+			mass_auth('group', 0, 'global_moderators', $auth_option, (($prefix != 'a_') ? ACL_YES : ACL_NEVER));
 			mass_auth('group', 0, 'administrators', $auth_option, ACL_YES);
-			mass_auth('group', 0, 'bots', $auth_option, (($prefix != 'm_' && $prefix != 'a_') ? ACL_YES : ACL_NO));
+			mass_auth('group', 0, 'bots', $auth_option, (($prefix != 'm_' && $prefix != 'a_') ? ACL_YES : ACL_NEVER));
 		}
 	}
 }
@@ -235,7 +228,6 @@ $sql = 'UPDATE ' . USERS_TABLE . " SET user_permissions = ''";
 $db->sql_query($sql);
 
 $cache->destroy('acl_options');
-$cache->save();
 
 echo "<p><b>Done</b></p>\n";
  
@@ -244,7 +236,7 @@ echo "<p><b>Done</b></p>\n";
 	$forum_id = forum ids (array|int|0) -> 0 == all forums
 	$ug_id = [int] user_id|group_id : [string] usergroup name
 	$acl_list = [string] acl entry : [array] acl entries
-	$setting = ACL_YES|ACL_NO|ACL_UNSET
+	$setting = ACL_YES|ACL_NEVER|ACL_NO
 */
 function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 {
@@ -345,7 +337,7 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 
 			switch ($setting)
 			{
-				case ACL_UNSET:
+				case ACL_NO:
 					if (isset($cur_auth[$forum][$auth_option_id]))
 					{
 						$sql_ary['delete'][] = "DELETE FROM $table 
@@ -379,7 +371,7 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 		switch ($sql_type)
 		{
 			case 'insert':
-				switch (SQL_LAYER)
+				switch ($db->sql_layer)
 				{
 					case 'mysql':
 					case 'mysql4':

phpBB/develop/adjust_bbcodes.php

@@ -0,0 +1,174 @@
+<?php
+/**
+* Only adjust bitfields, do not rewrite text...
+* All new parsings have the img, flash and quote modes set to true
+*
+* 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);
+include($phpbb_root_path . 'includes/message_parser.' . $phpEx);
+
+// Start session management
+$user->session_begin();
+$auth->acl($user->data);
+$user->setup();
+
+$echos = 0;
+
+// Adjust user signatures
+$message_parser = new parse_message();
+$message_parser->mode = 'sig';
+$message_parser->bbcode_init();
+
+$sql = 'SELECT user_id, user_sig, user_sig_bbcode_uid, user_sig_bbcode_bitfield
+	FROM ' . USERS_TABLE;
+$result = $db->sql_query($sql);
+
+while ($row = $db->sql_fetchrow($result))
+{
+	// Convert bbcodes back to their normal form
+	if ($row['user_sig_bbcode_uid'] && $row['user_sig'])
+	{
+		decode_message($row['user_sig'], $row['user_sig_bbcode_uid']);
+
+		$message_parser->message = $row['user_sig'];
+
+		$message_parser->prepare_bbcodes();
+		$message_parser->parse_bbcode();
+
+		$bitfield = $message_parser->bbcode_bitfield;
+
+		$sql = 'UPDATE ' . USERS_TABLE . " SET user_sig_bbcode_bitfield = '" . $db->sql_escape($bitfield) . "'
+			WHERE user_id = " . $row['user_id'];
+		$db->sql_query($sql);
+
+		if ($echos > 200)
+		{
+			echo '<br />' . "\n";
+			$echos = 0;
+		}
+
+		echo '.';
+		$echos++;
+
+		flush();
+	}
+	else
+	{
+		$sql = 'UPDATE ' . USERS_TABLE . " SET user_sig_bbcode_bitfield = ''
+			WHERE user_id = " . $row['user_id'];
+		$db->sql_query($sql);
+	}
+}
+$db->sql_freeresult($result);
+
+
+// Now adjust posts
+
+$message_parser = new parse_message();
+$message_parser->mode = 'post';
+$message_parser->bbcode_init();
+
+// Update posts
+$sql = 'SELECT post_id, post_text, bbcode_uid, enable_bbcode, enable_smilies, enable_sig
+	FROM ' . POSTS_TABLE;
+$result = $db->sql_query($sql);
+
+while ($row = $db->sql_fetchrow($result))
+{
+	// Convert bbcodes back to their normal form
+	if ($row['enable_bbcode'])
+	{
+		decode_message($row['post_text'], $row['bbcode_uid']);
+
+		$message_parser->message = $row['post_text'];
+
+		$message_parser->prepare_bbcodes();
+		$message_parser->parse_bbcode();
+
+		$bitfield = $message_parser->bbcode_bitfield;
+
+		$sql = 'UPDATE ' . POSTS_TABLE . " SET bbcode_bitfield = '" . $db->sql_escape($bitfield) . "'
+			WHERE post_id = " . $row['post_id'];
+		$db->sql_query($sql);
+
+		if ($echos > 200)
+		{
+			echo '<br />' . "\n";
+			$echos = 0;
+		}
+
+		echo '.';
+		$echos++;
+
+		flush();
+	}
+	else
+	{
+		$sql = 'UPDATE ' . POSTS_TABLE . " SET bbcode_bitfield = ''
+			WHERE post_id = " . $row['post_id'];
+		$db->sql_query($sql);
+	}
+}
+$db->sql_freeresult($result);
+
+// Now to the private messages
+$message_parser = new parse_message();
+$message_parser->mode = 'post';
+$message_parser->bbcode_init();
+
+// Update pms
+$sql = 'SELECT msg_id, message_text, bbcode_uid, enable_bbcode
+	FROM ' . PRIVMSGS_TABLE;
+$result = $db->sql_query($sql);
+
+while ($row = $db->sql_fetchrow($result))
+{
+	// Convert bbcodes back to their normal form
+	if ($row['enable_bbcode'])
+	{
+		decode_message($row['message_text'], $row['bbcode_uid']);
+
+		$message_parser->message = $row['message_text'];
+
+		$message_parser->prepare_bbcodes();
+		$message_parser->parse_bbcode();
+
+		$bitfield = $message_parser->bbcode_bitfield;
+
+		$sql = 'UPDATE ' . PRIVMSGS_TABLE . " SET bbcode_bitfield = '" . $db->sql_escape($bitfield) . "'
+			WHERE msg_id = " . $row['msg_id'];
+		$db->sql_query($sql);
+
+		if ($echos > 200)
+		{
+			echo '<br />' . "\n";
+			$echos = 0;
+		}
+
+		echo '.';
+		$echos++;
+
+		flush();
+	}
+	else
+	{
+		$sql = 'UPDATE ' . PRIVMSGS_TABLE . " SET bbcode_bitfield = ''
+			WHERE msg_id = " . $row['msg_id'];
+		$db->sql_query($sql);
+	}
+}
+$db->sql_freeresult($result);
+
+// Done
+$db->sql_close();
+
+?>

phpBB/develop/adjust_usernames.php

@@ -0,0 +1,52 @@
+<?php
+/**
+* Adjust username_clean column.
+*
+* You should make a backup from your users table 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;
+
+$sql = 'SELECT user_id, username
+	FROM ' . USERS_TABLE;
+$result = $db->sql_query($sql);
+
+while ($row = $db->sql_fetchrow($result))
+{
+	$sql = 'UPDATE ' . USERS_TABLE . "
+		SET username_clean = '" . $db->sql_escape(utf8_clean_string($row['username'])) . "'
+		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);
+
+echo 'FINISHED';
+
+// Done
+$db->sql_close();
+
+?>

phpBB/develop/benchmark.php

@@ -313,7 +313,7 @@ function make_post($new_topic_id, $forum_id, $user_id, $post_username, $text, $m
 		else
 		{
 			// Rollback
-			if(SQL_LAYER == "mysql")
+			if($db->sql_layer == "mysql")
 			{
 				$sql = "DELETE FROM " . POSTS_TABLE . "
 					WHERE post_id = $new_post_id";

phpBB/develop/fill.php

@@ -12,7 +12,7 @@
 // -------------------------------------------------------------
 
 define('IN_PHPBB', true);
-$phpbb_root_path = './';
+$phpbb_root_path = './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 include($phpbb_root_path . 'common.'.$phpEx);
 include($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
@@ -22,13 +22,13 @@ header('Expires: 0');
 ignore_user_abort(true);
 
 // number of topics to create
-$num_topics = 5000000;
+$num_topics = 10000;
 
 // number of topics to be generated per call
-$batch_size = 100000;
+$batch_size = 2000;
 
 // max number of posts per topic
-$posts_per_topic = 500000;
+$posts_per_topic = 500;
 
 
 // general vars
@@ -40,7 +40,7 @@ switch ($mode)
 	case 'generate':
 		$user_ids = $forum_ids = $topic_rows = array();
 
-		$sql = 'SELECT user_id FROM ' . USERS_TABLE;
+		$sql = 'SELECT user_id FROM ' . USERS_TABLE . ' WHERE user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ') OR user_id = ' . ANONYMOUS;
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
 		{
@@ -60,7 +60,7 @@ switch ($mode)
 		{
 			$db->sql_query('TRUNCATE TABLE ' . POSTS_TABLE);
 			$db->sql_query('TRUNCATE TABLE ' . TOPICS_TABLE);
-			$db->sql_query('TRUNCATE TABLE ' . TOPICS_TABLE . '_prefetch');
+//			$db->sql_query('TRUNCATE TABLE ' . TOPICS_TABLE . '_prefetch');
 		}
 
 		$db->sql_query('LOCK TABLES ' . POSTS_TABLE . ' WRITE, ' . TOPICS_TABLE . ' WRITE');
@@ -86,7 +86,7 @@ switch ($mode)
 			$rows = array();
 			$post_time = mt_rand(0, time());
 
-			$num_posts = mt_rand(1, $posts_per_topic);
+			$num_posts = $posts_per_topic; //mt_rand(1, $posts_per_topic);
 			for ($i = 0; $i < $num_posts; ++$i)
 			{
 				$poster_id = $user_ids[array_rand($user_ids)];
@@ -108,18 +108,20 @@ switch ($mode)
 
 		if ($topic_id >= $num_topics)
 		{
-			echo '<meta http-equiv="refresh" content="0; url=fill.' . $phpEx . '?mode=sync&amp;' . time() . '">And now for something completely different...';
+			echo '<meta http-equiv="refresh" content="10; url=fill.' . $phpEx . '?mode=sync&amp;' . time() . '">And now for something completely different...';
 
 			$db->sql_query('ANALYZE TABLES ' . TOPICS_TABLE . ', ' . POSTS_TABLE);
+			flush();
 		}
 		else
 		{
-			echo '<meta http-equiv="refresh" content="0; url=fill.' . $phpEx . '?start=' . $topic_id . '&amp;' . time() . '">To the next page... (' . $topic_id . '/' . $num_topics . ')';
+			echo '<meta http-equiv="refresh" content="10; url=fill.' . $phpEx . '?start=' . $topic_id . '&amp;' . time() . '">To the next page... (' . $topic_id . '/' . $num_topics . ')';
+			flush();
 		}
 	break;
 
 	case 'sync':
-		error_reporting(E_ALL);
+/*		error_reporting(E_ALL);
 		$sync_all = TRUE;
 
 		if ($sync_all)
@@ -158,8 +160,11 @@ switch ($mode)
 		{
 			trigger_error('Done');
 		}
+	*/
 }
 
+$db->sql_close();
+
 function rndm_username()
 {
 	static $usernames;

phpBB/develop/generate_utf_casefold.php

@@ -0,0 +1,147 @@
+<?php
+/** 
+*
+* @package phpBB3
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+if (php_sapi_name() != 'cli')
+{
+	die("This program must be run from the command line.\n");
+}
+
+set_time_limit(0);
+
+define('IN_PHPBB', true);
+$phpbb_root_path = '../';
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
+
+echo "Checking for required files\n";
+download('http://unicode.org/Public/UNIDATA/CaseFolding.txt');
+echo "\n";
+
+
+/**
+* Load the CaseFolding table
+*/
+echo "Loading CaseFolding\n";
+$unidata = file_get_contents('CaseFolding.txt');
+
+
+function utf8_chr($cp)
+{
+    if ($cp > 0xFFFF)
+    {
+        return chr(0xF0 | ($cp >> 18)) . chr(0x80 | (($cp >> 12) & 0x3F)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
+    }
+    else if ($cp > 0x7FF)
+    {
+        return chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
+    }
+    else if ($cp > 0x7F)
+    {
+        return chr(0xC0 | ($cp >> 6)) . chr(0x80 | ($cp & 0x3F));
+    }
+    else
+    {
+        return chr($cp);
+    }
+}
+
+preg_match_all('/^([0-9A-F]+); ([CFS]); ([0-9A-F]+(?: [0-9A-F]+)*);/im', $unidata, $array, PREG_SET_ORDER);
+
+$uniarray = array();
+
+foreach ($array as $value)
+{
+    $uniarray[$value[2]][utf8_chr(hexdec((string)$value[1]))] = implode(array_map('utf8_chr', array_map('hexdec', explode(' ', $value[3]))));
+}
+
+foreach ($uniarray as $idx => $contents)
+{
+	echo "Writing to case_fold_$idx.$phpEx\n";
+	$fp = fopen($phpbb_root_path . 'includes/utf/data/case_fold_' . strtolower($idx) . '.' . $phpEx, 'wb');
+	fwrite($fp, '<?php return ' . my_var_export($contents) . ';');
+	fclose($fp);
+}
+
+/**
+* Return a parsable string representation of a variable
+*
+* This is function is limited to array/strings/integers
+*
+* @param	mixed	$var		Variable
+* @return	string				PHP code representing the variable
+*/
+function my_var_export($var)
+{
+	if (is_array($var))
+	{
+		$lines = array();
+
+		foreach ($var as $k => $v)
+		{
+			$lines[] = my_var_export($k) . '=>' . my_var_export($v);
+		}
+
+		return 'array(' . implode(',', $lines) . ')';
+	}
+	else if (is_string($var))
+	{
+		return "'" . str_replace(array('\\', "'"), array('\\\\', "\\'"), $var) . "'";
+	}
+	else
+	{
+		return $var;
+	}
+}
+
+/**
+* Download a file to the develop/ dir
+*
+* @param	string	$url		URL of the file to download
+* @return	void
+*/
+function download($url)
+{
+	global $phpbb_root_path;
+
+	if (file_exists($phpbb_root_path . 'develop/' . basename($url)))
+	{
+		return;
+	}
+
+	echo 'Downloading from ', $url, ' ';
+
+	if (!$fpr = fopen($url, 'rb'))
+	{
+		die("Can't download from $url\nPlease download it yourself and put it in the develop/ dir, kthxbai");
+	}
+
+	if (!$fpw = fopen($phpbb_root_path . 'develop/' . basename($url), 'wb'))
+	{
+		die("Can't open develop/" . basename($url) . " for output... please check your permissions or something");
+	}
+
+	$i = 0;
+	$chunk = 32768;
+	$done = '';
+
+	while (!feof($fpr))
+	{
+		$i += fwrite($fpw, fread($fpr, $chunk));
+		echo str_repeat("\x08", strlen($done));
+
+		$done = ($i >> 10) . ' KiB';
+		echo $done;
+	}
+	fclose($fpr);
+	fclose($fpw);
+
+	echo "\n";
+}
+
+?>

phpBB/develop/generate_utf_tables.php

@@ -0,0 +1,559 @@
+<?php
+/** 
+*
+* @package phpBB3
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+if (php_sapi_name() != 'cli')
+{
+	die("This program must be run from the command line.\n");
+}
+
+set_time_limit(0);
+
+define('IN_PHPBB', true);
+$phpbb_root_path = '../';
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
+
+echo "Checking for required files\n";
+download('http://www.unicode.org/Public/UNIDATA/CompositionExclusions.txt');
+download('http://www.unicode.org/Public/UNIDATA/DerivedNormalizationProps.txt');
+download('http://www.unicode.org/Public/UNIDATA/UnicodeData.txt');
+echo "\n";
+
+require_once($phpbb_root_path . 'includes/utf/utf_normalizer.' . $phpEx);
+$file_contents = array();
+
+/**
+* Generate some Hangul/Jamo stuff
+*/
+echo "\nGenerating Hangul and Jamo tables\n";
+for ($i = 0; $i < UNICODE_HANGUL_LCOUNT; ++$i)
+{
+	$utf_char = cp_to_utf(UNICODE_HANGUL_LBASE + $i);
+	$file_contents['utf_normalizer_common']['utf_jamo_index'][$utf_char] = $i * UNICODE_HANGUL_VCOUNT * UNICODE_HANGUL_TCOUNT + UNICODE_HANGUL_SBASE;
+	$file_contents['utf_normalizer_common']['utf_jamo_type'][$utf_char] = UNICODE_JAMO_L;
+}
+
+for ($i = 0; $i < UNICODE_HANGUL_VCOUNT; ++$i)
+{
+	$utf_char = cp_to_utf(UNICODE_HANGUL_VBASE + $i);
+	$file_contents['utf_normalizer_common']['utf_jamo_index'][$utf_char] = $i * UNICODE_HANGUL_TCOUNT;
+	$file_contents['utf_normalizer_common']['utf_jamo_type'][$utf_char] = UNICODE_JAMO_V;
+}
+
+for ($i = 0; $i < UNICODE_HANGUL_TCOUNT; ++$i)
+{
+	$utf_char = cp_to_utf(UNICODE_HANGUL_TBASE + $i);
+	$file_contents['utf_normalizer_common']['utf_jamo_index'][$utf_char] = $i;
+	$file_contents['utf_normalizer_common']['utf_jamo_type'][$utf_char] = UNICODE_JAMO_T;
+}
+
+/**
+* Load the CompositionExclusions table
+*/
+echo "Loading CompositionExclusion\n";
+$fp = fopen('CompositionExclusions.txt', 'rt');
+
+$exclude = array();
+while (!feof($fp))
+{
+	$line = fgets($fp, 1024);
+
+	if (!strpos(' 0123456789ABCDEFabcdef', $line[0]))
+	{
+		continue;
+	}
+
+	$cp = strtok($line, ' ');
+
+	if ($pos = strpos($cp, '..'))
+	{
+		$start = hexdec(substr($cp, 0, $pos));
+		$end = hexdec(substr($cp, $pos + 2));
+
+		for ($i = $start; $i < $end; ++$i)
+		{
+			$exclude[$i] = 1;
+		}
+	}
+	else
+	{
+		$exclude[hexdec($cp)] = 1;
+	}
+}
+fclose($fp);
+
+/**
+* Load QuickCheck tables
+*/
+echo "Generating QuickCheck tables\n";
+$fp = fopen('DerivedNormalizationProps.txt', 'rt');
+
+while (!feof($fp))
+{
+	$line = fgets($fp, 1024);
+
+	if (!strpos(' 0123456789ABCDEFabcdef', $line[0]))
+	{
+		continue;
+	}
+
+	$p = array_map('trim', explode(';', strtok($line, '#')));
+
+	/**
+	* Capture only NFC_QC, NFKC_QC
+	*/
+	if (!preg_match('#^NFK?C_QC$#', $p[1]))
+	{
+		continue;
+	}
+
+	if ($pos = strpos($p[0], '..'))
+	{
+		$start = hexdec(substr($p[0], 0, $pos));
+		$end = hexdec(substr($p[0], $pos + 2));
+	}
+	else
+	{
+		$start = $end = hexdec($p[0]);
+	}
+
+	if ($start >= UTF8_HANGUL_FIRST && $end <= UTF8_HANGUL_LAST)
+	{
+		/**
+		* We do not store Hangul syllables in the array
+		*/
+		continue;
+	}
+
+	if ($p[2] == 'M')
+	{
+		$val = UNICODE_QC_MAYBE;
+	}
+	else
+	{
+		$val = UNICODE_QC_NO;
+	}
+
+	if ($p[1] == 'NFKC_QC')
+	{
+		$file = 'utf_nfkc_qc';
+	}
+	else
+	{
+		$file = 'utf_nfc_qc';
+	}
+
+	for ($i = $start; $i <= $end; ++$i)
+	{
+		/**
+		* The vars have the same name as the file: $utf_nfc_qc is in utf_nfc_qc.php
+		*/
+		$file_contents[$file][$file][cp_to_utf($i)] = $val;
+	}
+}
+fclose($fp);
+
+/**
+* Do mappings
+*/
+echo "Loading Unicode decomposition mappings\n";
+$fp = fopen($phpbb_root_path . 'develop/UnicodeData.txt', 'rt');
+
+$map = array();
+while (!feof($fp))
+{
+	$p = explode(';', fgets($fp, 1024));
+	$cp = hexdec($p[0]);
+
+	if (!empty($p[3]))
+	{
+		/**
+		* Store combining class > 0
+		*/
+		$file_contents['utf_normalizer_common']['utf_combining_class'][cp_to_utf($cp)] = (int) $p[3];
+	}
+
+	if (!isset($p[5]) || !preg_match_all('#[0-9A-F]+#', strip_tags($p[5]), $m))
+	{
+		continue;
+	}
+
+	if (strpos($p[5], '>'))
+	{
+		$map['NFKD'][$cp] = implode(' ', array_map('hexdec', $m[0]));
+	}
+	else
+	{
+		$map['NFD'][$cp] = $map['NFKD'][$cp] = implode(' ', array_map('hexdec', $m[0]));
+	}
+}
+fclose($fp);
+
+/**
+* Build the canonical composition table
+*/
+echo "Generating the Canonical Composition table\n";
+foreach ($map['NFD'] as $cp => $decomp_seq)
+{
+	if (!strpos($decomp_seq, ' ') || isset($exclude[$cp]))
+	{
+		/**
+		* Singletons are excluded from canonical composition
+		*/
+		continue;
+	}
+
+	$utf_seq = implode('', array_map('cp_to_utf', explode(' ', $decomp_seq)));
+
+	if (!isset($file_contents['utf_canonical_comp']['utf_canonical_comp'][$utf_seq]))
+	{
+		$file_contents['utf_canonical_comp']['utf_canonical_comp'][$utf_seq] = cp_to_utf($cp);
+	}
+}
+
+/**
+* Decompose the NF[K]D mappings recursively and prepare the file contents
+*/
+echo "Generating the Canonical and Compatibility Decomposition tables\n\n";
+foreach ($map as $type => $decomp_map)
+{
+	foreach ($decomp_map as $cp => $decomp_seq)
+	{
+		$decomp_map[$cp] = decompose($decomp_map, $decomp_seq);
+	}
+	unset($decomp_seq);
+
+	if ($type == 'NFKD')
+	{
+		$file = 'utf_compatibility_decomp';
+		$var = 'utf_compatibility_decomp';
+	}
+	else
+	{
+		$file = 'utf_canonical_decomp';
+		$var = 'utf_canonical_decomp';
+	}
+
+	/**
+	* Generate the corresponding file
+	*/
+	foreach ($decomp_map as $cp => $decomp_seq)
+	{
+		$file_contents[$file][$var][cp_to_utf($cp)] = implode('', array_map('cp_to_utf', explode(' ', $decomp_seq)));
+	}
+}
+
+/**
+* Generate and/or alter the files
+*/
+foreach ($file_contents as $file => $contents)
+{
+	/**
+	* Generate a new file
+	*/
+	echo "Writing to $file.$phpEx\n";
+
+	if (!$fp = fopen($phpbb_root_path . 'includes/utf/data/' . $file . '.' . $phpEx, 'wb'))
+	{
+		trigger_error('Cannot open ' . $file . ' for write');
+	}
+
+	fwrite($fp, '<?php');
+	foreach ($contents as $var => $val)
+	{
+		fwrite($fp, "\n\$GLOBALS[" . my_var_export($var) . ']=' . my_var_export($val) . ";");
+	}
+	fclose($fp);
+}
+
+echo "\n*** UTF-8 normalization tables done\n\n";
+
+/**
+* Now we'll generate the files needed by the search indexer
+*/
+echo "Generating search indexer tables\n";
+
+$fp = fopen($phpbb_root_path . 'develop/UnicodeData.txt', 'rt');
+
+$map = array();
+while ($line = fgets($fp, 1024))
+{
+	/**
+	* The current line is split, $m[0] hold the codepoint in hexadecimal and
+	* all other fields numbered as in http://www.unicode.org/Public/UNIDATA/UCD.html#UnicodeData.txt
+	*/
+	$m = explode(';', $line);
+
+	/**
+	* @var	integer	$cp			Current char codepoint
+	* @var	string	$utf_char	UTF-8 representation of current char
+	*/
+	$cp = hexdec($m[0]);
+	$utf_char = cp_to_utf($cp);
+
+	/**
+	* $m[2] holds the "General Category" of the character
+	* @link http://www.unicode.org/Public/UNIDATA/UCD.html#General_Category_Values
+	*/
+	switch ($m[2][0])
+	{
+		case 'L':
+			/**
+			* We allow all letters and map them to their lowercased counterpart on the fly
+			*/
+			$map_to_hex = (isset($m[13][0])) ? $m[13] : $m[0];
+
+			if (preg_match('#^LATIN.*(?:LETTER|LIGATURE) ([A-Z]{2}(?![A-Z]))$#', $m[1], $capture))
+			{
+				/**
+				* Special hack for some latin ligatures. Using the name of a character
+				* is bad practice, but for now it works well enough.
+				*
+				* @todo Note that ligatures with combining marks such as U+01E2 are
+				* not supported at this time
+				*/
+				$map[$cp] = strtolower($capture[1]);
+			}
+			else if (isset($m[13][0]))
+			{
+				/**
+				* If the letter has a lowercased form, use it
+				*/
+				$map[$cp] = hex_to_utf($m[13]);
+			}
+			else
+			{
+				/**
+				* In all other cases, map the letter to itself
+				*/
+				$map[$cp] = $utf_char;
+			}
+			break;
+
+		case 'M':
+			/**
+			* We allow all marks, they are mapped to themselves
+			*/
+			$map[$cp] = $utf_char;
+			break;
+
+		case 'N':
+			/**
+			* We allow all numbers, but we map them to their numeric value whenever
+			* possible. The numeric value (field #8) is in ASCII already
+			*
+			* @todo Note that fractions such as U+00BD will be converted to something
+			* like "1/2", with a slash. However, "1/2" entered in ASCII is converted
+			* to "1 2". This will have to be fixed.
+			*/
+			$map[$cp] = (isset($m[8][0])) ? $m[8] : $utf_char;
+			break;
+
+		default:
+			/**
+			* Everything else is ignored, skip to the next line
+			*/
+			continue 2;
+	}
+}
+fclose($fp);
+
+/**
+* Add some cheating
+*/
+$cheats = array(
+	'00DF'	=>	'ss',		#	German sharp S
+	'00D6'	=>	'oe',		#	Capital O with diaeresis
+	'00F6'	=>	'oe',		#	Small O with diaeresis
+);
+
+/**
+* Add our "cheat replacements" to the map
+*/
+foreach ($cheats as $hex => $map_to)
+{
+	$map[hexdec($hex)] = $map_to;
+}
+
+/**
+* Split the map into smaller blocks
+*/
+$file_contents = array();
+foreach ($map as $cp => $map_to)
+{
+	$file_contents[$cp >> 11][cp_to_utf($cp)] = $map_to;
+}
+unset($map);
+
+foreach ($file_contents as $idx => $contents)
+{
+	echo "Writing to search_indexer_$idx.$phpEx\n";
+	$fp = fopen($phpbb_root_path . 'includes/utf/data/search_indexer_' . $idx . '.' . $phpEx, 'wb');
+	fwrite($fp, '<?php return ' . my_var_export($contents) . ';');
+	fclose($fp);
+}
+echo "\n*** Search indexer tables done\n\n";
+
+
+die("\nAll done!\n");
+
+
+////////////////////////////////////////////////////////////////////////////////
+//                             Internal functions                             //
+////////////////////////////////////////////////////////////////////////////////
+
+/**
+* Decompose a sequence recusively
+*
+* @param	array	$decomp_map	Decomposition mapping, passed by reference
+* @param	string	$decomp_seq	Decomposition sequence as decimal codepoints separated with a space
+* @return	string				Decomposition sequence, fully decomposed
+*/
+function decompose(&$decomp_map, $decomp_seq)
+{
+	$ret = array();
+	foreach (explode(' ', $decomp_seq) as $cp)
+	{
+		if (isset($decomp_map[$cp]))
+		{
+			$ret[] = decompose($decomp_map, $decomp_map[$cp]);
+		}
+		else
+		{
+			$ret[] = $cp;
+		}
+	}
+
+	return implode(' ', $ret);
+}
+
+
+/**
+* Return a parsable string representation of a variable
+*
+* This is function is limited to array/strings/integers
+*
+* @param	mixed	$var		Variable
+* @return	string				PHP code representing the variable
+*/
+function my_var_export($var)
+{
+	if (is_array($var))
+	{
+		$lines = array();
+
+		foreach ($var as $k => $v)
+		{
+			$lines[] = my_var_export($k) . '=>' . my_var_export($v);
+		}
+
+		return 'array(' . implode(',', $lines) . ')';
+	}
+	else if (is_string($var))
+	{
+		return "'" . str_replace(array('\\', "'"), array('\\\\', "\\'"), $var) . "'";
+	}
+	else
+	{
+		return $var;
+	}
+}
+
+/**
+* Download a file to the develop/ dir
+*
+* @param	string	$url		URL of the file to download
+* @return	void
+*/
+function download($url)
+{
+	global $phpbb_root_path;
+
+	if (file_exists($phpbb_root_path . 'develop/' . basename($url)))
+	{
+		return;
+	}
+
+	echo 'Downloading from ', $url, ' ';
+
+	if (!$fpr = fopen($url, 'rb'))
+	{
+		die("Can't download from $url\nPlease download it yourself and put it in the develop/ dir, kthxbai");
+	}
+
+	if (!$fpw = fopen($phpbb_root_path . 'develop/' . basename($url), 'wb'))
+	{
+		die("Can't open develop/" . basename($url) . " for output... please check your permissions or something");
+	}
+
+	$i = 0;
+	$chunk = 32768;
+	$done = '';
+
+	while (!feof($fpr))
+	{
+		$i += fwrite($fpw, fread($fpr, $chunk));
+		echo str_repeat("\x08", strlen($done));
+
+		$done = ($i >> 10) . ' KiB';
+		echo $done;
+	}
+	fclose($fpr);
+	fclose($fpw);
+
+	echo "\n";
+}
+
+/**
+* Convert a codepoint in hexadecimal to a UTF-8 char
+*
+* @param	string	$hex		Codepoint, in hexadecimal
+* @return	string				UTF-8 char
+*/
+function hex_to_utf($hex)
+{
+	return cp_to_utf(hexdec($hex));
+}
+
+/**
+* Return a UTF string formed from a sequence of codepoints in hexadecimal
+*
+* @param	string	$seq		Sequence of codepoints, separated with a space
+* @return	string				UTF-8 string
+*/
+function hexseq_to_utf($seq)
+{
+	return implode('', array_map('hex_to_utf', explode(' ', $seq)));
+}
+
+/**
+* Convert a codepoint to a UTF-8 char
+*
+* @param	integer	$cp			Unicode codepoint
+* @return	string				UTF-8 string
+*/
+function cp_to_utf($cp)
+{
+	if ($cp > 0xFFFF)
+	{
+		return chr(0xF0 | ($cp >> 18)) . chr(0x80 | (($cp >> 12) & 0x3F)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
+	}
+	else if ($cp > 0x7FF)
+	{
+		return chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
+	}
+	else if ($cp > 0x7F)
+	{
+		return chr(0xC0 | ($cp >> 6)) . chr(0x80 | ($cp & 0x3F));
+	}
+	else
+	{
+		return chr($cp);
+	}
+}

phpBB/develop/lang_duplicates.php

@@ -0,0 +1,131 @@
+<html>
+	<head>
+		<title>Duplicate Language Keys</title>
+	</head>
+	<body>
+<?php
+// -------------------------------------------------------------
+//
+// $Id$
+//
+// @copyright (c) 2005 phpBB Group 
+// @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+// 
+// -------------------------------------------------------------
+// Thanks to arod-1
+
+define('IN_PHPBB', 1);
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
+$phpbb_root_path='./../';
+include($phpbb_root_path . 'common.'.$phpEx);
+
+$mode = request_var('mode', '');
+
+$modules = find_modules($phpbb_root_path . 'language/en');
+
+$kkeys = $keys = array();
+$langdir = dirname(__FILE__);
+
+if (isset($lang))
+{
+	unset($lang);
+}
+
+foreach($modules as $module)
+{
+	require_once("$langdir$module");
+	if (isset($lang))
+	{
+		$kkeys[$module] = $lang;
+		$keys[] = $module;
+		unset($lang);
+	}
+}
+
+$equal = $case = $diff = 0;
+$output = array();
+
+while ($module = array_shift($keys))
+{
+	$keys_1 = array_keys($kkeys[$module]);
+
+	foreach ($keys as $other_module)
+	{
+		$keys_2 = array_keys($kkeys[$other_module]);
+
+		foreach(array_intersect($keys_1, $keys_2) as $dup)
+		{
+			if ($kkeys[$module][$dup] == $kkeys[$other_module][$dup])
+			{
+				$compare = "Equal";
+				$equal++;
+			}
+			else if (strcasecmp($kkeys[$module][$dup], $kkeys[$other_module][$dup]) == 0)
+			{
+				$compare = "Differ in case";
+				$case++;
+			}
+			else
+			{
+				$compare = "'{$kkeys[$module][$dup]}' - '{$kkeys[$other_module][$dup]}'";
+				$diff++;
+			}
+
+			$color = '';
+			if ((basename($module) == "common.$phpEx") || (basename($other_module) == "common.$phpEx"))
+			{
+				$color = ' style="color:#B00000;"';
+			}
+
+			switch ($mode)
+			{
+				case 'module':
+					$output[$module][] = "<tr$color><td>" . ((isset($output[$module])) ? '&nbsp;' : "<b>$module</b>" ) . "</td><td>$dup</td><td>$other_module</td><td>$compare</td></tr>";
+				break;
+
+				default:
+					$output[$dup][] = "<tr$color><td><b>$dup</b></td><td>$module</td><td>$other_module</td><td>$compare</td></tr>";
+				break;
+			}
+		}
+	}
+}//var_dump($output);
+
+echo "<p><a href=\"lang_duplicates.php\">By Key</a> <a href=\"lang_duplicates.php?mode=module\">By Module</a></p><p>Equal: <b>$equal</b>, Differ in case only: $case, differ in content: $diff</p>";
+switch ($mode)
+{
+	case 'module':
+		echo "<table cellpadding=\"4\"><tr><th>Key</th><th>First File</th><th>Second File</th><th>Difference</th></tr>";
+		foreach ($output as $module => $html)
+		{
+			echo implode('', $html);
+		}
+	break;
+
+	default:
+		ksort($output);
+		echo "<table cellpadding=\"4\"><tr><th>File</th><th>Key</th><th>Conflicting File</th><th>Difference</th></tr>";
+		foreach ($output as $dup)
+		{
+			echo implode('', $dup);
+		}
+	break;
+}
+
+echo "</table>";
+
+
+function find_modules($dirname)
+{
+	$list = glob("$dirname/*.php");
+
+	foreach(glob("$dirname/*", GLOB_ONLYDIR) as $name)
+	{
+		$list =  array_merge($list, find_modules($name));
+	}
+	return $list;
+}
+
+?>
+	</body>
+</html>

phpBB/develop/merge_attachment_tables.php

@@ -48,7 +48,7 @@ $sql = "CREATE TABLE {$table_prefix}attachments
 			AND a.post_id = p.post_id";
 $db->sql_query($sql);
 
-switch (SQL_LAYER)
+switch ($db->sql_layer)
 {
 	case 'mysql':
 	case 'mysql4':

phpBB/develop/merge_post_tables.php

@@ -54,7 +54,7 @@ $sql = "CREATE TABLE {$table_prefix}posts
 		WHERE pt.post_id = p.post_id";
 $db->sql_query($sql);
 
-switch (SQL_LAYER)
+switch ($db->sql_layer)
 {
 	case 'mysql':
 	case 'mysql4':
@@ -150,7 +150,7 @@ while ($row = $db->sql_fetchrow($result))
 }
 $db->sql_freeresult($result);
 
-switch (SQL_LAYER)
+switch ($db->sql_layer)
 {
 	case 'oracle':
 		$sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id

phpBB/develop/regex.php

@@ -0,0 +1,74 @@
+<?php
+
+// IP regular expressions
+
+$dec_octet = '(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])';
+$h16 = '[\dA-F]{1,4}';
+$ipv4 = "(?:$dec_octet\.){3}$dec_octet";
+$ls32 = "(?:$h16:$h16|$ipv4)";
+
+$ipv6_construct = array(
+	array(false,	'',		'{6}',	$ls32),
+	array(false,	'::',	'{5}',	$ls32),
+	array('',		':',	'{4}',	$ls32),
+	array('{1,2}',	':',	'{3}',	$ls32),
+	array('{1,3}',	':',	'{2}',	$ls32),
+	array('{1,4}',	':',	'',		$ls32),
+	array('{1,5}',	':',	false,	$ls32),
+	array('{1,6}',	':',	false,	$h16),
+	array('{1,7}',	':',	false,	'')
+);
+
+$ipv6 = '(?:';
+foreach ($ipv6_construct as $ip_type)
+{
+	$ipv6 .= '(?:';
+	if ($ip_type[0] !== false)
+	{
+		$ipv6 .= "(?:$h16:)" . $ip_type[0];
+	}
+	$ipv6 .= $ip_type[1];
+	if ($ip_type[2] !== false)
+	{
+		$ipv6 .= "(?:$h16:)" . $ip_type[2];
+	}
+	$ipv6 .= $ip_type[3] . ')|';
+}
+$ipv6 = substr($ipv6, 0, -1) . ')';
+
+echo 'IPv4: ' . $ipv4 . "<br />\nIPv6: " . $ipv6 . "<br />\n";
+
+// URL regular expressions
+
+$pct_encoded = "%[\dA-F]{2}";
+$unreserved = 'a-z0-9\-._~';
+$sub_delims = '!$&\'()*+,;=';
+$pchar = "(?:[$unreserved$sub_delims:@|]+|$pct_encoded)"; // rfc: no "|"
+
+$scheme = '[a-z][a-z\d+\-.]*';
+$reg_name = "(?:[$unreserved$sub_delims|@]+|$pct_encoded)+"; // rfc: * instead of + and no "|" and no "@" (included instead of userinfo
+//$userinfo = "(?:(?:[$unreserved$sub_delims:]+|$pct_encoded))*";
+$ipv4_simple = '[0-9.]+';
+$ipv6_simple = '\[[a-z0-9.]+:[a-z0-9.]+:[a-z0-9.:]+\]';
+$host = "(?:$reg_name|$ipv4_simple|$ipv6_simple)";
+$port = '\d*';
+//$authority = "(?:$userinfo@)?$host(?::$port)?";
+$authority = "$host(?::$port)?";
+$segment = "$pchar*";
+$path_abempty = "(?:/$segment)*";
+$hier_part = "/{2}$authority$path_abempty";
+$query = "(?:[$unreserved$sub_delims:@/?|]+|$pct_encoded)*"; // pchar | "/" | "?", rfc: no "|"
+$fragment = $query;
+
+$url =  "$scheme:$hier_part(?:\?$query)?(?:\#$fragment)?";
+echo 'URL: ' . $url . "<br />\n";
+
+// no scheme, shortened authority, but host has to start with www.
+$www_url =  "www\.$reg_name(?::$port)?$path_abempty(?:\?$query)?(?:\#$fragment)?";
+echo 'www.URL: ' . $www_url . "<br />\n";
+
+// no schema and no authority
+$relative_url = "$segment$path_abempty(?:\?$query)?(?:\#$fragment)?";
+echo 'relative URL: ' . $relative_url . "<br />\n";
+
+?>

phpBB/develop/search_fill.php

@@ -82,7 +82,7 @@ for(;$postcounter <= $max_post_id; $postcounter += $batchsize)
 	$rowset = $db->sql_fetchrowset($result);
 	$db->sql_freeresult($result);
 
-	$post_rows = count($rowset);
+	$post_rows = sizeof($rowset);
 	
 	if( $post_rows )
 	{

phpBB/develop/utf_normalizer_test.php

@@ -0,0 +1,380 @@
+<?php
+/** 
+*
+* @package phpBB3
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+if (php_sapi_name() != 'cli')
+{
+	die("This program must be run from the command line.\n");
+}
+
+set_time_limit(0);
+error_reporting(E_ALL);
+
+define('IN_PHPBB', true);
+$phpbb_root_path = '../';
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
+
+
+/**
+* Let's download some files we need
+*/
+download('http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt');
+download('http://www.unicode.org/Public/UNIDATA/UnicodeData.txt');
+
+/**
+* Those are the tests we run
+*/
+$test_suite = array(
+	/**
+	* NFC
+	*   c2 ==  NFC(c1) ==  NFC(c2) ==  NFC(c3)
+	*   c4 ==  NFC(c4) ==  NFC(c5)
+	*/
+	'NFC'	=>	array(
+		'c2'	=>	array('c1', 'c2', 'c3'),
+		'c4'	=>	array('c4', 'c5')
+	),
+
+	/**
+	* NFD
+	*   c3 ==  NFD(c1) ==  NFD(c2) ==  NFD(c3)
+	*   c5 ==  NFD(c4) ==  NFD(c5)
+	*/
+	'NFD'	=>	array(
+		'c3'	=>	array('c1', 'c2', 'c3'),
+		'c5'	=>	array('c4', 'c5')
+	),
+
+	/**
+	* NFKC
+	*   c4 == NFKC(c1) == NFKC(c2) == NFKC(c3) == NFKC(c4) == NFKC(c5)
+	*/
+	'NFKC'	=>	array(
+		'c4'	=>	array('c1', 'c2', 'c3', 'c4', 'c5')
+	),
+
+	/**
+	* NFKD
+	*   c5 == NFKD(c1) == NFKD(c2) == NFKD(c3) == NFKD(c4) == NFKD(c5)
+	*/
+	'NFKD'	=>	array(
+		'c5'	=>	array('c1', 'c2', 'c3', 'c4', 'c5')
+	)
+);
+
+require_once($phpbb_root_path . 'includes/utf/utf_normalizer.' . $phpEx);
+
+$i = $n = 0;
+$failed = false;
+$tested_chars = array();
+
+$fp = fopen($phpbb_root_path . 'develop/NormalizationTest.txt', 'rb');
+while (!feof($fp))
+{
+	$line = fgets($fp);
+	++$n;
+
+	if ($line[0] == '@')
+	{
+		if ($i)
+		{
+			echo "done\n";
+		}
+
+		$i = 0;
+		echo "\n", substr($line, 1), "\n\n";
+		continue;
+	}
+
+	if (!strpos(' 0123456789ABCDEF', $line[0]))
+	{
+		continue;
+	}
+
+	if (++$i % 100 == 0)
+	{
+		echo $i, ' ';
+	}
+
+	list($c1, $c2, $c3, $c4, $c5) = explode(';', $line);
+
+	if (!strpos($c1, ' '))
+	{
+		/**
+		* We are currently testing a single character, we add it to the list of
+		* characters we have processed so that we can exclude it when testing
+		* for invariants
+		*/
+		$tested_chars[$c1] = 1;
+	}
+
+	foreach ($test_suite as $form => $serie)
+	{
+		foreach ($serie as $expected => $tests)
+		{
+			$hex_expected = ${$expected};
+			$utf_expected = hexseq_to_utf($hex_expected);
+
+			foreach ($tests as $test)
+			{
+				$utf_result = call_user_func(array('utf_normalizer', $form), $utf_expected);
+
+				if (strcmp($utf_expected, $utf_result))
+				{
+					$failed = true;
+					$hex_result = utf_to_hexseq($utf_result);
+
+					echo "\nFAILED $expected == $form($test) ($hex_expected != $hex_result)";
+				}
+			}
+		}
+
+		if ($failed)
+		{
+			die("\n\nFailed at line $n\n");
+		}
+	}
+}
+fclose($fp);
+
+/**
+* Test for invariants
+*/
+echo "\n\nTesting for invariants...\n\n";
+
+$fp = fopen($phpbb_root_path . 'develop/UnicodeData.txt', 'rt');
+
+$n = 0;
+while (!feof($fp))
+{
+	if (++$n % 100 == 0)
+	{
+		echo $n, ' ';
+	}
+
+	$line = fgets($fp, 1024);
+
+	if (!$pos = strpos($line, ';'))
+	{
+		continue;
+	}
+
+	$hex_tested = $hex_expected = substr($line, 0, $pos);
+
+	if (isset($tested_chars[$hex_tested]))
+	{
+		continue;
+	}
+
+	$utf_expected = hex_to_utf($hex_expected);
+
+	if ($utf_expected >= UTF8_SURROGATE_FIRST
+	 && $utf_expected <= UTF8_SURROGATE_LAST)
+	{
+		/**
+		* Surrogates are illegal on their own, we expect the normalizer
+		* to return a replacement char
+		*/
+		$utf_expected = UTF8_REPLACEMENT;
+		$hex_expected = utf_to_hexseq($utf_expected);
+	}
+
+	foreach (array('nfc', 'nfkc', 'nfd', 'nfkd') as $form)
+	{
+		$utf_result = utf_normalizer::$form($utf_expected);
+		$hex_result = utf_to_hexseq($utf_result);
+//		echo "$form($utf_expected) == $utf_result\n";
+
+		if (strcmp($utf_expected, $utf_result))
+		{
+			$failed = 1;
+
+			echo "\nFAILED $hex_expected == $form($hex_tested) ($hex_expected != $hex_result)";
+		}
+	}
+
+	if ($failed)
+	{
+		die("\n\nFailed at line $n\n");
+	}
+}
+fclose($fp);
+
+die("\n\nALL TESTS PASSED SUCCESSFULLY\n");
+
+/**
+* Download a file to the develop/ dir
+*
+* @param	string	$url		URL of the file to download
+* @return	void
+*/
+function download($url)
+{
+	global $phpbb_root_path;
+
+	if (file_exists($phpbb_root_path . 'develop/' . basename($url)))
+	{
+		return;
+	}
+
+	echo 'Downloading from ', $url, ' ';
+
+	if (!$fpr = fopen($url, 'rb'))
+	{
+		die("Can't download from $url\nPlease download it yourself and put it in the develop/ dir, kthxbai");
+	}
+
+	if (!$fpw = fopen($phpbb_root_path . 'develop/' . basename($url), 'wb'))
+	{
+		die("Can't open develop/" . basename($url) . " for output... please check your permissions or something");
+	}
+
+	$i = 0;
+	$chunk = 32768;
+	$done = '';
+
+	while (!feof($fpr))
+	{
+		$i += fwrite($fpw, fread($fpr, $chunk));
+		echo str_repeat("\x08", strlen($done));
+
+		$done = ($i >> 10) . ' KiB';
+		echo $done;
+	}
+	fclose($fpr);
+	fclose($fpw);
+
+	echo "\n";
+}
+
+/**
+* Convert a UTF string to a sequence of codepoints in hexadecimal
+*
+* @param	string	$utf	UTF string
+* @return	integer			Unicode codepoints in hex
+*/
+function utf_to_hexseq($str)
+{
+	$pos = 0;
+	$len = strlen($str);
+	$ret = array();
+
+	while ($pos < $len)
+	{
+		$c = $str[$pos];
+		switch ($c & "\xF0")
+		{
+			case "\xC0":
+			case "\xD0":
+				$utf_char = substr($str, $pos, 2);
+				$pos += 2;
+				break;
+
+			case "\xE0":
+				$utf_char = substr($str, $pos, 3);
+				$pos += 3;
+				break;
+
+			case "\xF0":
+				$utf_char = substr($str, $pos, 4);
+				$pos += 4;
+				break;
+
+			default:
+				$utf_char = $c;
+				++$pos;
+		}
+
+		$hex = dechex(utf_to_cp($utf_char));
+
+		if (!isset($hex[3]))
+		{
+			$hex = substr('000' . $hex, -4);
+		}
+
+		$ret[] = $hex;
+	}
+
+	return strtr(implode(' ', $ret), 'abcdef', 'ABCDEF');
+}
+
+/**
+* Convert a UTF-8 char to its codepoint
+*
+* @param	string	$utf_char	UTF-8 char
+* @return	integer				Unicode codepoint
+*/
+function utf_to_cp($utf_char)
+{
+	switch (strlen($utf_char))
+	{
+		case 1:
+			return ord($utf_char);
+
+		case 2:
+			return ((ord($utf_char[0]) & 0x1F) << 6) | (ord($utf_char[1]) & 0x3F);
+
+		case 3:
+			return ((ord($utf_char[0]) & 0x0F) << 12) | ((ord($utf_char[1]) & 0x3F) << 6) | (ord($utf_char[2]) & 0x3F);
+
+		case 4:
+			return ((ord($utf_char[0]) & 0x07) << 18) | ((ord($utf_char[1]) & 0x3F) << 12) | ((ord($utf_char[2]) & 0x3F) << 6) | (ord($utf_char[3]) & 0x3F);
+
+		default:
+			die('UTF-8 chars can only be 1-4 bytes long');
+	}
+}
+
+/**
+* Return a UTF string formed from a sequence of codepoints in hexadecimal
+*
+* @param	string	$seq		Sequence of codepoints, separated with a space
+* @return	string				UTF-8 string
+*/
+function hexseq_to_utf($seq)
+{
+	return implode('', array_map('hex_to_utf', explode(' ', $seq)));
+}
+
+/**
+* Convert a codepoint in hexadecimal to a UTF-8 char
+*
+* @param	string	$hex		Codepoint, in hexadecimal
+* @return	string				UTF-8 char
+*/
+function hex_to_utf($hex)
+{
+	return cp_to_utf(hexdec($hex));
+}
+
+/**
+* Convert a codepoint to a UTF-8 char
+*
+* @param	integer	$cp			Unicode codepoint
+* @return	string				UTF-8 string
+*/
+function cp_to_utf($cp)
+{
+	if ($cp > 0xFFFF)
+	{
+		return chr(0xF0 | ($cp >> 18)) . chr(0x80 | (($cp >> 12) & 0x3F)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
+	}
+	else if ($cp > 0x7FF)
+	{
+		return chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
+	}
+	else if ($cp > 0x7F)
+	{
+		return chr(0xC0 | ($cp >> 6)) . chr(0x80 | ($cp & 0x3F));
+	}
+	else
+	{
+		return chr($cp);
+	}
+}

phpBB/docs/AUTHORS

@@ -1,22 +1,43 @@
 /* ********************************************************************** *\
 /*                                                                        *\
-/*                   phpBB3 <20> Copyright 2003 phpBB Group                  *\
+/*                   phpBB3 <20> Copyright 2006 phpBB Group                  *\
 /*                                                                        *\
 /*                       [ http://www.phpbb.com/ ]                        *\
 /*                                                                        *\
 /* ********************************************************************** *\
 
-Please see: http://www.phpbb.com/about.php for a list of all the people involved in phpBB.
-Original subSilver by subBlue Design, Tom Beddard, <20> 2001 phpBB Group
+Please see: http://www.phpbb.com/about/ for a list of all the people currently
+involved in phpBB.
+
+phpBB Project Manager : theFinn (James Atkinson)
+
+phpBB Lead Developers : Acyd Burn (Meik Sievertsen)
+                        psoTFX (Paul S. Owen) [2001 - 09/2005]
+
+phpBB Developers      : DavidMJ (David M.)
+                        GrahamJE (Graham Eames)
+                        naderman (Nils Adermann)
+                        subBlue (Tom Beddard)
+
+                        BartVB (Bart van Bragt) - [11/2000 - 03/2006]
+                        Ashe (Ludovic Arnaud) - [10/2002 - 11/2003, 06/2006 - 10/2006]
+
+
+Original subSilver by subBlue Design, Tom Beddard, (c) 2001 phpBB Group
 
 phpBB3 contains code from the following applications:
 
 LGPL licenced:
-Smarty <EFBFBD> 2001, 2002 by ispi of Lincoln, Inc, http://smarty.php.net/
+Smarty (c) 2001, 2002 by ispi of Lincoln, Inc, http://smarty.php.net/
 
 GPL licenced:
-phpMyAdmin <EFBFBD> 2001,2003 phpMyAdmin Devel team, http://www.phpmyadmin.net/ 
-Jabber class <EFBFBD> 2003 Carlo Zottmann, http://phpjabber.g-blog.net
+phpMyAdmin (c) 2001,2003 phpMyAdmin Devel team, http://www.phpmyadmin.net/ 
+Jabber Class (c) 2004 Nathan Fritz, http://cjphp.netflint.net
+Chora (c) 2000-2006, The Horde Project. http://horde.org/chora/
+Horde Project (c) 2000-2006, The Horde Project. http://horde.org/
 
 PHP License, version 3.0:
-Pear <EFBFBD> 2001-2004 PHP Group, http://pear.php.net
+Pear (c) 2001-2004 PHP Group, http://pear.php.net
+
+Text_Diff-0.2.1 http://pear.php.net/package/Text_Diff
+

phpBB/docs/CHANGELOG.html

@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<title>phpBB 3.0.x Changelog</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="resource-type" content="document" />
+<meta name="description" lang="en" content="phpBB 3.0.x Changelog" />
+<meta name="keywords" lang="en" content="" />
+<meta name="author" content="phpBB Group" />
+<meta name="copyright" content="phpBB Group" />
+<meta name="MSSmartTagsPreventParsing" content="true" />
+
+<style type="text/css">
+<!--
+
+/* The original "subSilver" theme for phpBB2 Created by subBlue design :: http://www.subBlue.com */
+body {
+	background-color: white;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	margin: 0;
+	border: 0;
+	padding: 0;
+}
+
+img {
+	border: 0;
+}
+
+p {
+	font-size: 8pt;
+}
+
+hr { 
+	height: 0; 
+	border: solid #D1D7DC 0;
+	border-top-width: 1px;
+}
+
+#title, h1 {
+	font: bold 18pt 'Trebuchet MS', Verdana, sans-serif;
+	text-decoration: none;
+	line-height: 120%;
+}
+
+h2 {
+	font: bold 12pt Arial, Helvetica, sans-serif;
+	text-decoration: none;
+	line-height: 120%;
+}
+
+h3 {
+	font: bold 10pt Arial, Helvetica, sans-serif;
+	text-decoration: none;
+	line-height: 120%;
+}
+
+.paragraph {
+	margin-left: 20px;
+}
+
+/* Structure */
+#logo {
+	background: #fff url(header_bg.jpg) repeat-x top right;
+	height: 60px;
+}
+
+#title {
+	color: #12749b;
+	float: right;
+	margin: 10px 10px 0;
+}
+
+#main {
+	margin-left: 25px;
+	margin-right: 25px;
+}
+
+.good {
+	color: green;
+}
+
+.bad {
+	color: red;
+}
+
+#footer {
+	margin-left: 75px;
+	font-size: 70%;
+	color: #006600;
+}
+
+code {
+	color: #006600; 
+	font-weight: normal;
+	font-family: 'Courier New', monospace;
+	border-color: #D1D7DC;
+	border-width: 1px;
+	border-style: solid;
+	background-color: #FAFAFA;
+}
+
+.indent p {
+	padding-left: 20px;
+	font-size: 90%;
+}
+
+/* Anchors */
+a {
+	font-size: 70%;
+}
+
+a:link, a:active, a:visited {
+	color:	#006699;
+	text-decoration: none;
+}
+
+a:hover {
+	color: #DD6900;
+	text-decoration: underline;
+}
+
+a.nav {
+	color: #006699;
+	text-decoration: none;
+}
+
+a.nav:hover {
+	text-decoration: underline;
+}
+
+p a {
+	font-size: 100%;
+}
+
+.menu {
+	font-size: 80%;
+}
+
+.menu li a {
+	font-size: 100%;
+}
+
+.comment {
+	color: green;
+}
+
+//-->
+</style>
+
+</head>
+
+<body>
+
+<div id="logo">
+	<div id="title">phpBB 3.0.x Changelog</div>
+	<img src="header_left.jpg" alt="phpBB Logo" />
+</div>
+
+<a name="top"></a><div id="main">
+
+<!-- BEGIN DOCUMENT -->
+
+<p>This is a non-exhaustive (but still near complete) changelog for phpBB 3.0.x including release candidate versions. Our thanks to all those people who've contributed bug reports and code fixes.</p>
+
+<h1>Changelog</h1>
+
+<ol class="menu">
+	<li><a href="#changelog">Changelog</a>
+	<ol type="i">
+		<li><a href="#v30rc1">Changes since RC-1</a></li>
+	</ol>
+	</li>
+	<li><a href="#disclaimer">Copyright and disclaimer</a></li>
+</ol>
+
+<hr />
+
+<a name="changelog"></a><h1>1. Changelog</h1>
+
+	<a name="v30rc1"></a><b>1.i. Changes since 3.0.RC1</b>
+	<br /><br />
+	<div class="paragraph">
+
+	<ul class="menu">
+		<li>&nbsp;</li>
+	</ul>
+
+	</div>
+	<a href="#top">Top</a>
+	<br /><br />
+
+	<hr />
+
+<a name="disclaimer"></a><h1>2. Copyright and disclaimer</h1>
+
+	<div class="paragraph">
+
+	<p>This application is opensource software released under the <a href="http://www.gnu.org/licenses/gpl.html">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2007 <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+
+</div>
+<a href="#top">Top</a>
+
+<!-- END DOCUMENT -->
+
+</div>
+
+<br /><br />
+
+<div id="footer">Note that a full list of fixed bugs can be found at the bug tracker (<a href="README.html#bugs">see section on bug reporting</a>)<br /><br /></div>
+
+</body>
+</html>

phpBB/docs/FAQ.html

@@ -0,0 +1,380 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<title>phpBB 3.0.x FAQ</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="resource-type" content="document" />
+<meta name="description" lang="en" content="phpBB 3.0.x frequently asked questions" />
+<meta name="keywords" lang="en" content="" />
+<meta name="author" content="phpBB Group" />
+<meta name="copyright" content="phpBB Group" />
+<meta name="MSSmartTagsPreventParsing" content="true" />
+
+<style type="text/css">
+<!--
+
+/* The original "subSilver" theme for phpBB2 Created by subBlue design :: http://www.subBlue.com */
+body {
+	background-color: white;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	margin: 0;
+	border: 0;
+	padding: 0;
+}
+
+img {
+	border: 0;
+}
+
+p {
+	font-size: 8pt;
+}
+
+hr { 
+	height: 0; 
+	border: solid #D1D7DC 0;
+	border-top-width: 1px;
+}
+
+#title, h1 {
+	font: bold 18pt 'Trebuchet MS', Verdana, sans-serif;
+	text-decoration: none;
+	line-height: 120%;
+}
+
+h2 {
+	font: bold 12pt Arial, Helvetica, sans-serif;
+	text-decoration: none;
+	line-height: 120%;
+}
+
+h3 {
+	font: bold 10pt Arial, Helvetica, sans-serif;
+	text-decoration: none;
+	line-height: 120%;
+}
+
+.paragraph {
+	margin-left: 20px;
+}
+
+/* Structure */
+#logo {
+	background: #fff url(header_bg.jpg) repeat-x top right;
+	height: 60px;
+}
+
+#title {
+	color: #12749b;
+	float: right;
+	margin: 10px 10px 0;
+}
+
+#main {
+	margin-left: 25px;
+	margin-right: 25px;
+}
+
+.good {
+	color: green;
+}
+
+.bad {
+	color: red;
+}
+
+#footer {
+	margin-left: 75px;
+	font-size: 70%;
+	color: #006600;
+}
+
+code {
+	color: #006600; 
+	font-weight: normal;
+	font-family: 'Courier New', monospace;
+	border-color: #D1D7DC;
+	border-width: 1px;
+	border-style: solid;
+	background-color: #FAFAFA;
+}
+
+.indent p {
+	padding-left: 20px;
+	font-size: 90%;
+}
+
+/* Anchors */
+a {
+	font-size: 70%;
+}
+
+a:link, a:active, a:visited {
+	color:	#006699;
+	text-decoration: none;
+}
+
+a:hover {
+	color: #DD6900;
+	text-decoration: underline;
+}
+
+a.nav {
+	color: #006699;
+	text-decoration: none;
+}
+
+a.nav:hover {
+	text-decoration: underline;
+}
+
+p a {
+	font-size: 100%;
+}
+
+.menu {
+	font-size: 80%;
+}
+
+.menu li a {
+	font-size: 100%;
+}
+
+.comment {
+	color: green;
+}
+
+//-->
+</style>
+
+</head>
+
+<body>
+
+<div id="logo">
+	<div id="title">phpBB 3.0.x FAQ</div>
+	<img src="header_left.jpg" alt="phpBB Logo" />
+</div>
+
+<a name="top"></a><div id="main">
+
+<!-- BEGIN DOCUMENT -->
+
+<p>This is a very basic Frequently Asked Questions (FAQ) page which attempts to answer some of the more commonly asked questions. It is by no means exhaustive and should be used in combination with the 'built-in' User FAQ within phpBB3, the community forums and our IRC channel (see <a href="README.html">README</a> for details).</p>
+
+<h1>FAQ</h1>
+
+<!-- add entry about common UTF8 problems (for example wrong uploading, editing) -->
+<ul class="menu">
+	<li><a href="#install">I cannot install this it is too difficult! Will you do it?</a></li>
+	<li><a href="#legal">I am having problems with the admin at a certain board, help!</a></li>
+	<li><a href="#legal">A board has ripped off my graphics/software/etc., stop them!</a></li>
+	<li><a href="#legal">A board is dealing in warez/porn/etc., you need to prevent them doing this!</a></li>
+	<li><a href="#legal">I want to sue you because i think you host an illegal board!</a></li>
+	<li><a href="#viewonline">According to viewonline a user is doing/reading something they should not be able to!</a></li>
+	<li><a href="#mail">I keep getting Mail sending errors when I (or my users) post/send PM's/etc.!</a></li>
+	<li><a href="#mail_language">My users are complaining that emails are not in their selected language!</a></li>
+	<li><a href="#aol_browser">My AOL based users keep getting logged out!</a></li>
+	<li><a href="#avatars">No matter what I set the uploadable avatars to I cannot upload one from my computer!</a></li>
+	<li><a href="#gallery_avatars">I just cannot get gallery avatars to appear!</a></li>
+	<li><a href="#permissions">How do I use/set permissions?</a></li>
+	<li><a href="#login_issues">I (or my users) cannot stay logged in to the forum!</a></li>
+	<li><a href="#logout_issues">My users are complaining about being logged out too quickly!</a></li>
+	<li><a href="#not_answered">My question isn't answered here!</a></li>
+	<li><a href="#disclaimer">Copyright and disclaimer</a></li>
+</ul>
+
+<hr />
+
+<a name="install"></a><h3>I cannot install this it is too difficult! Will you do it?</h3>
+
+<div class="paragraph">
+
+<p>Simple answer, no we will not. We are not being difficult when we say this we are actually trying to help you. phpBB has a reputation for being easy to install, that reputation is we believe well deserved. It is a simple process of unarchiving a single file, uploading the resulting directory/files to their intended location and entering some data in a web based form. The sequence of events, what to type where, etc. is covered in detail in the accompanying <a href="INSTALL.html">INSTALL.html</a> documentation. If you cannot install phpBB3 the chances are you will be unable to administer or update it.</p>
+
+<p>There are people, companies (unrelated to your hosting provider), etc. that will install your forum, either for free or for a payment. We do not recommend you make use of these offers. Unless the service is provided by your hosting company you will have to divulge passwords and other sensitive details. If you did not know how to use an ATM would you give a passer-by your bank card and PIN and ask them to show you what to do? No, probably not! The same applies to your hosting account details!</p>
+
+<p>We think a better solution is for you to carefully read the enclosed documentation, read through our knowledge base at <a href="http://www.phpbb.com/">www.phpbb.com</a> and if necessary ask for help on any thing you get stuck on. However, the decision is yours but please note we may not offer support if we believe you have had the board installed by a third party. In such cases you should direct your questions to that company or person/s.</p>
+
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="legal"></a>
+<h3>I am having problems with the admin at a certain board, help!</h3>
+<h3>A board has ripped off my graphics/software/etc., stop them!</h3>
+<h3>A board is dealing in warez/porn/etc., you need to prevent them doing this!</h3>
+<h3>I want to sue you because i think you host an illegal board!</h3>
+
+<div class="paragraph">
+
+<p>We provide the software, we have absolutely nothing to do with any board that runs it (beyond phpbb.com of course!) and we also do not host any site. The GPL grants the user an unlimited right of use subject to their adherence of that licence. Therefore we cannot prevent, dictate, control or otherwise limit the use of phpBB software. So please do not contact us for such matters.</p>
+
+<p>If you have a problem with a given board please take it up with them, not us. We are not and cannot be held legally responsible for any third party use of this software (much like Microsoft et al cannot be held responsible for the use of Windows in illegal activities, etc.). Additionally we do <strong>not</strong> track the use of phpBB software in any way. So please do not ask us for details on a &quot;given&quot; board we will not be able to help you. If any law firms or lawyers out there send us writs, cease and desist orders, etc. for third party website use of this software we reserve the right to charge for time wasted dealing with such issues...</p>
+
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="viewonline"></a><h3>According to viewonline a user is doing/reading something they should not be able to!</h3>
+
+<div class="paragraph">
+
+<p>No, they probably are not. phpBB uses sessions to keep track of users as they move between pages. The session information tells us who this user is. Therefore in order to determine what a user can do on a page we first need the session details. Once this data is available we can check whether the user is permitted to do whatever it is they are trying to do. This can result in it appearing as if a user is reading a topic in a forum they should not be able to access. Or perhaps viewing private messages when they are only guests, etc. In practice the user is not doing these things, they are viewing a &quot;You are not permitted to do this&quot; type message. The session data has simply been updated before we were able to determine what the user could or could not do.</p>
+
+<p>Of course this only applies where permissions have been set correctly!</p>
+
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="mail"></a><h3>I keep getting Mail sending errors when I (or my users) post/send PM's/etc.!</h3>
+
+<div class="paragraph">
+
+<p>This error will occur if phpBB cannot send mail. phpBB can send email two ways; using the PHP <code>mail()</code> function or directly via SMTP. Some hosting providers limit the <code>mail()</code> function to prevent its use in spamming, others may rename it or limit its functionality. If the <code>mail()</code> function got renamed, you are able to enter the correct name within the administration control panel. In either case you may need to make use of SMTP. This requires that you have access to such a facility, e.g. your hosting provider may provide one (perhaps requiring specific written authorisation), etc. Please see <a href="http://www.phpbb.com/">www.phpbb.com</a> for additional help on this matter.</p>
+
+<p>If you do require SMTP services please do not ask (on our forums or elsewhere) for someone to provide you with one. Open relays are now things of the past thanks to the unthinking spammers out there. Therefore you are unlikely to find someone willing to offer you (free) services.</p>
+
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="mail_language"></a><h3>My users are complaining that emails are not in their selected language!</h3>
+
+<div class="paragraph">
+
+<p>You must have deleted a language pack or the language pack is incomplete. phpBB will try to send emails in the users selected language. If it cannot find a suitable email template it will switch to the boards default language.</p>
+
+<!-- additional entry about encoded emails -->
+
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="aol_browser"></a><h3>My AOL based users keep getting logged out!</h3>
+
+<div class="paragraph">
+
+<p>phpBB uses sessions to keep track of users as they browse the board. These sessions use a combination of a unique session id, the users IP and if specified the users browser and/or the users x-forwarded-for header to identify each user. We make use of all of this as an extra safe-guard to help prevent sessions being hijacked (by discovering the unique session id).</p>
+
+<p>Unfortunately this only works when the users IP is constant as they browse the board. For most users this will be the case. However certain providers route their users via a cluster of proxys. In some cases, particularly the AOL browser, this results in different IPs being forwarded as the user moves between pages. We take account of this by not checking the entire IP by default but only the first "three quads" (<samp>A.B.C</samp>). Again in most cases this will be fine. However again AOL uses IPs which can vary so much that checking only the first two quads results in a fairly static IP being available for session validation.</p>
+
+<p>If you are experiencing problems related to this you can set the Session IP validation parameter found in <code>Admin-&gt;General-&gt;Server Configuration-&gt;Security Settings</code> to <samp>A.B</samp>. Please note that reducing the IP validation length does potentially increase the risk of sessions being hijacked (this is something for you to consider, phpBB Group takes no responsibility should anything happen!). We suggest to at least additionally enable the browser validation.</p>
+
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="avatars"></a><h3>No matter what I set the uploadable avatars to I cannot upload one from my computer!</h3>
+
+<div class="paragraph">
+
+<p>There are two possibilities here, the first is you have not created the directory you specified as the storage location for avatars, ie. as specified in the <code>Admin -&gt; General -&gt; Board Configuration -&gt; Avatar settings</code> section. If the directory does not exist uploadeable avatars are automatically disabled. You should create the required directory (ensuring it has global write access or other appropriate permissions to allow the webserver to write files to it).</p>
+
+<p>The second possibility is that your provider has disabled file_upload support. You should contact your provider and ask them if this is the case. There is not a lot you can do, there are still three other avatar settings left to choose from including uploading via an URL which will work fine.</p>
+
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="gallery_avatars"></a><h3>I just cannot get gallery avatars to appear!</h3>
+
+<div class="paragraph">
+
+<p>phpBB categorises gallery avatars and it does this by reading through folders contained in the location you specified as being the gallery path. For example, if you set the gallery path to <samp>images/avatars/gallery</samp> phpBB will expect to find a series of folders within that path, eg. <samp>images/avatars/gallery/moviestars</samp>, <samp>images/avatars/gallery/cartoons</samp>, <samp>images/avatars/gallery/misc</samp>, etc. Placing images directly in <samp>images/avatars/gallery/</samp> will result in nothing being listed in your gallery.</p>
+
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="permissions"></a><h3>How do I use/set permissions?</h3>
+
+<div class="paragraph">
+
+<p>Please read our documentation about <a href="#">permissions</a>.</p>
+
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="login_issues"></a><h3>I (or my users) cannot stay logged in to the forum!</h3>
+
+<div class="paragraph">
+
+<p>If you (or your users) are, after attempting a login, being returned to the index (or other page) without appearing to be logged in the most likely problem is incorrect cookie settings. phpBB uses cookies to store a session id and a small amount of user data. For this data to be stored correctly the cookie domain, name, path and secure settings must be correct. You can check this in <code>Admin-&gt;General-&gt;Server Configuration-&gt;Cookie Settings</code>. Typically the cookie domain can be left blank and the cookie path set to <samp>/</samp> (a single forward slash). Do <strong>not</strong> set the cookie as being secure unless your board is running over a secure sockets layer connection, ie. https://</p>
+
+<p>If you still have problems try setting the cookie domain to your full domain name, eg. <samp>www.mysystem.tld</samp>, <samp>www.something.mydomain.tld</samp>. You <strong>must</strong> ensure the domain name contains at least two dots or browsers will be unlikely to recognise the cookie, eg. <samp>.mydomain.com</samp>, <samp>mydomain.com</samp>. Do <strong>not</strong> add http:// or anything else to the domain name!</p>
+
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="logout_issues"></a><h3>My users are complaining about being logged out too quickly!</h3>
+
+<div class="paragraph">
+
+<p>You can increase the default length of sessions (ie. how long before a users session is considered 'dead') in <code>Admin-&gt;General-&gt;Server Configuration-&gt;Load Settings</code>. Set it to whatever value your users feel comfortable with, remember that security issues may affect your decision (ie. having too long a session may allow non-users to abuse your board should a user forget to logout or otherwise leave a current session on a public workstation).</p>
+
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="not_answered"></a><h3>My question isn't answered here!</h3>
+
+<div class="paragraph">
+
+<p>Please read our <a href="#">extensive user documentation</a> first, it may just explain what you want to know.</p>
+
+<p>Feel free to search our community forum for the information you require. <strong>PLEASE DO NOT</strong> post your question without having first used search, chances are someone has already asked and answered your question. You can find our board here:</p>
+
+<p><a href="http://www.phpbb.com">www.phpbb.com</a></p>
+
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="disclaimer"></a><h3>Copyright and disclaimer</h3>
+
+<div class="paragraph">
+
+	<p>This application is opensource software released under the <a href="http://www.gnu.org/licenses/gpl.html">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2007 <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+
+</div>
+<a href="#top">Top</a>
+
+<!-- END DOCUMENT -->
+
+</div>
+
+<div id="footer">&nbsp; <br /><br /></div>
+
+</body>
+</html>

phpBB/docs/INSTALL.html

@@ -0,0 +1,519 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<title>phpBB 3.0.x Install</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="resource-type" content="document" />
+<meta name="description" lang="en" content="phpBB 3.0.x Installation, updating and conversion informations" />
+<meta name="keywords" lang="en" content="" />
+<meta name="author" content="phpBB Group" />
+<meta name="copyright" content="phpBB Group" />
+<meta name="MSSmartTagsPreventParsing" content="true" />
+
+<style type="text/css">
+<!--
+
+/* The original "subSilver" theme for phpBB2 Created by subBlue design :: http://www.subBlue.com */
+body {
+	background-color: white;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	margin: 0;
+	border: 0;
+	padding: 0;
+}
+
+img {
+	border: 0;
+}
+
+p {
+	font-size: 8pt;
+}
+
+hr { 
+	height: 0; 
+	border: solid #D1D7DC 0;
+	border-top-width: 1px;
+}
+
+#title, h1 {
+	font: bold 18pt 'Trebuchet MS', Verdana, sans-serif;
+	text-decoration: none;
+	line-height: 120%;
+}
+
+h2 {
+	font: bold 12pt Arial, Helvetica, sans-serif;
+	text-decoration: none;
+	line-height: 120%;
+}
+
+h3 {
+	font: bold 10pt Arial, Helvetica, sans-serif;
+	text-decoration: none;
+	line-height: 120%;
+}
+
+.paragraph {
+	margin-left: 20px;
+}
+
+/* Structure */
+#logo {
+	background: #fff url(header_bg.jpg) repeat-x top right;
+	height: 60px;
+}
+
+#title {
+	color: #12749b;
+	float: right;
+	margin: 10px 10px 0;
+}
+
+#main {
+	margin-left: 25px;
+	margin-right: 25px;
+}
+
+.good {
+	color: green;
+}
+
+.bad {
+	color: red;
+}
+
+#footer {
+	margin-left: 75px;
+	font-size: 70%;
+	color: #006600;
+}
+
+code {
+	color: #006600; 
+	font-weight: normal;
+	font-family: 'Courier New', monospace;
+	border-color: #D1D7DC;
+	border-width: 1px;
+	border-style: solid;
+	background-color: #FAFAFA;
+}
+
+.indent p {
+	padding-left: 20px;
+	font-size: 90%;
+}
+
+/* Anchors */
+a {
+	font-size: 70%;
+}
+
+a:link, a:active, a:visited {
+	color:	#006699;
+	text-decoration: none;
+}
+
+a:hover {
+	color: #DD6900;
+	text-decoration: underline;
+}
+
+a.nav {
+	color: #006699;
+	text-decoration: none;
+}
+
+a.nav:hover {
+	text-decoration: underline;
+}
+
+p a {
+	font-size: 100%;
+}
+
+.menu {
+	font-size: 80%;
+}
+
+.menu li a {
+	font-size: 100%;
+}
+
+.comment {
+	color: green;
+}
+
+//-->
+</style>
+
+</head>
+
+<body>
+
+<div id="logo">
+	<div id="title">phpBB 3.0.x Install</div>
+	<img src="header_left.jpg" alt="phpBB Logo" />
+</div>
+
+<a name="top"></a><div id="main">
+
+<!-- BEGIN DOCUMENT -->
+
+<p><strong>Please read this document completely before proceeding with installation, updating or converting.</strong></p>
+
+<p>Please note these instructions are not fully comprehensive, a more thorough userguide will be available on the phpBB website in the near future. However, this document will walk you through the basics on installing, updating and converting the forum software.</p>
+
+<p>A basic overview of running phpBB3 can be found in the accompanying <a href="README.html">README</a> documentation. Please ensure you read that document in addition to this! For more detailed information on using phpBB3 you should read <a href="http://www.phpbb.com/support/documentation/">the documentation</a> available online.</p>
+
+<h1>Install</h1>
+
+<ol class="menu">
+	<li><a href="#quickinstall">Quick install</a></li>
+	<li><a href="#require">Requirements</a></li>
+	<li><a href="#install">New installation</a></li>
+	<li><a href="#update">Updating from stable releases of phpBB 3.0.x</a>
+	<ol type="i">
+		<li><a href="#update_full">Full package</a></li>
+		<li><a href="#update_files">Changed files only</a></li>
+		<li><a href="#update_patch">Patch file</a></li>
+		<li><a href="#update_auto">Automatic update package</a></li>
+		<li><a href="#update_all">All package types</a></li>
+	</ol>
+	</li>
+	<li><a href="#convert">Conversion from phpBB 2.0.x to phpBB 3.0.x</a>
+	<ol type="i">
+		<li><a href="#prereq">Requirements before converting</a></li>
+		<li><a href="#conversion">Converting</a></li>
+		<li><a href="#postreq">Things to do after conversion</a></li>
+	</ol>
+	</li>
+	<li><a href="#postinstall">Important (security related) post-Install tasks for all installation methods</a>
+	<ol type="i">
+		<li><a href="#avatars">Uploadable avatars</a></li>
+	</ol>
+	</li>
+	<li><a href="#disclaimer">Disclaimer</a></li>
+</ol>
+
+<hr />
+
+<a name="quickinstall"></a><h1>1. Quick install</h1>
+
+<div class="paragraph">
+	<p>If you have basic knowledge of using FTP and are sure your hosting service or server will run phpBB3 you can use these steps to quickly get started. For a more detailed explanation you should skip this and go to <a href="#require">section 2</a> below.</p>
+
+	<ol class="menu">
+		<li>Decompress the phpBB3 archive to a local directory on your system.</li>
+		<li>Upload all the files contained in this archive (retaining the directory structure) to a web accessible directory on your server or hosting account.</li>
+		<li>Change the permissions on config.php to be writeable by all (666 or -rw-rw-rw- within your FTP Client)</li>
+		<li>Change the permissions on the following directories to be writeable by all (777 or -rwxrwxrwx within your FTP Client):<br />
+			<code>store/</code>, <code>cache/</code>, <code>files/</code> and <code>images/avatars/upload/</code>.</li>
+		<li>Using your web browser visit the location you placed phpBB3 with the addition of install/index.php or pointing directly to install/, e.g. http://www.mydomain.com/phpBB2/install/, http://www.mydomain.com/forum/install/ etc.</li>
+		<li>Click the <em>INSTALL</em> tab, follow the steps and fill out all the requested information.</li>
+		<li>Change the permissions on config.php to be writeable only by yourself (644 or -rw-r--r-- within your FTP Client)</li>
+		<li>phpBB3 should now be available, please <strong>MAKE SURE</strong> you read at least <a href="#postinstall">Section 6</a> below for important, security related post-installation instructions.</li>
+	</ol>
+
+	<p>If you experienced problems or do not know how to proceed with any of the steps above please read the rest of this document.</p>
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="require"></a><h1>2. Requirements</h1>
+
+<div class="paragraph">
+	<p>phpBB3 has a few requirements which must be met before you are able to install and use it.</p>
+
+	<ul class="menu">
+		<li>A webserver or web hosting account running on any major Operating System with support for PHP</li>
+		<li>A SQL database system, <strong>one of</strong>:
+		<ul>
+			<li>MySQL 3.23 or above (MySQLi supported)</li>
+			<li>PostgreSQL 7.3+</li>
+			<li>SQLite 2.8.2+</li>
+			<li>Firebird 2.0</li>
+			<li>MS SQL Server 2000 or above (directly or via ODBC)</li>
+			<li>Oracle</li>
+		</ul>
+		</li>
+		<li><strong>PHP 4.3.3</strong> or above with support for the database you intend to use.</li>
+		<li>These optional presence of the following modules within PHP will provide access to additional features, but they are not required.
+		<ul>
+			<li>zlib Compression support</li>
+			<li>Remote FTP support</li>
+			<li>XML support</li>
+			<li>Imagemagick support</li>
+			<li>GD Support</li>
+		</ul>
+		</li>
+	</ul>
+
+	<p>If your server or hosting account does not meet the requirements above we are afraid phpBB3 is not for you.</p>
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="install"></a><h1>3. New installation</h1>
+
+<div class="paragraph">
+	
+	<p>Installation of phpBB3 will vary according to your server and database. If you have <em>shell access</em> to your account (via telnet or ssh for example) you may want to upload the entire phpBB3 archive (in binary mode!) to a directory on your host and unarchive it there.</p>
+
+	<p>If you do not have shell access or do not wish to use it you will need to decompress the phpBB3 archive to a local directory on your system using your favourite compression program, e.g. winzip, rar, zip, etc. From there you must FTP <strong>ALL</strong> the files it contains (being sure to retain the directory structure and filenames) to your host. Please ensure that the cases of filenames are retained, do <strong>NOT</strong> force filenames to all lower or upper case doing so will cause errors later.</p>
+
+	<p>All .php, .inc, .sql, .cfg, .html and .txt files should be uploaded in <strong>ASCII</strong> mode, while all graphics should be uploaded in <strong>BINARY</strong> mode. If you are unfamiliar with what this means please refer to your FTP client documentation. In most cases this is all handled transparantly by your ftp client but if you encounter problems later you should be sure the files where uploaded correctly as described here.</p>
+
+	<p>phpBB3 comes supplied with english as its standard language. However a number of separate packs for different languages are available. If you are not a native english speaker you may wish to install one or more of these packages before continuing. The installation process below will allow you to select a default language from those available (you can of course change this default at a later stage). For more details of language packs, where to obtain them and how to install them please see the <a href="README.html#i18n">README</a>.</p>
+
+	<p>Once all the files have been uploaded to your site you should point your browser at this location with the addition of <code>install/</code>. For example if your domain name is <em>www.mydomain.tld</em> and you placed phpBB3 in a directory /phpBB3 off your web root you would enter <em>http://www.mydomain.tld/phpBB3/install/</em> or (alternatively) <em>http://www.mydomain.tld/phpBB3/install/index.php</em> into your browser. When you have done this you should see the phpBB3 Installation screen appear.</p>
+
+	<h3>Introduction:</h3>
+
+	<p>The installation screen gives you a short introduction into phpBB. It allows you to read the license phpBB3 is released under (General Public License) and provides information about how you can receive support. To start the installation, use the <em>Install</em> button.</p>
+
+	<h3>Requirements</h3>
+
+	<p>The first page you will see after starting the installation is the Requirements list. phpBB3 checks automatically whether everything that it needs to run properly is installed on your server. You need to have at least the minimum PHP version installed, and at least one database available to continue the installation. Also important, is that all shown folders are available and do have the correct permissions. Please see the description of each section to find out whether they are optional or required for phpBB3 to run. If everything is in order, you can continue the installation with <em>Start Install</em>.</p>
+
+	<h3>Database settings</h3>
+
+	<p>You now have to decide which database to use. See the <a href="#require">Requirements section</a> for information on which databases are supported. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need:</p>
+
+	<ul class="menu">
+		<li>The Database Type - the database you will be using.</li>
+		<li>The Database server hostname or DSN - the address of the database server.</li>
+		<li>The Database server port - the port of the database server (most of the time this is not needed).</li>
+		<li>The Database name - the name of the database on the server.</li>
+		<li>The Database username and Database password - the login data to access the database.</li>
+	</ul>
+
+	<div class="indent">
+		<p><strong>Note:</strong> if you are installing using SQLite, you should enter the full path to your database file in the DSN field and leave the username and password fields blank. For security reasons, you should make sure that the database file is not stored in a location accessible from the web.</p>
+	</div>
+
+	<p>You don't need to change the Prefix for tables in database setting, unless you plan on using multipe phpBB installations on one database. In this case you can use a different prefix for each installation to make it work.</p>
+
+	<p>After you entered your details, you can continue with the Proceed to next step button. Now phpBB3 will check whether the data you entered will lead to a successful database connection and whether tables with the same prefix already exist.</p>
+
+	<p>A <em>Could not connect to the database</em> error means that you didn't enter the database data correctly and it is not possible for phpBB to connect. Make sure that everything you entered is in order and try again. Again, if you are unsure about your database settings, please contact your host.</p>
+
+	<p>If you installed another version of phpBB before on the same database with the same prefix, phpBB will inform you and you just need to enter a different database prefix.</p>
+
+	<p>If you see the Successful Connection message, you can continue to the next step.</p>
+
+	<h3>Administrator details</h3>
+
+	<p>Now you have to create your administration user. This user will have full administration access and he will be the first user on your forum. All fields on this page are required. You can also set the default language of your forum on this page. In a vanilla phpBB3 installation we only include English [GB]. You can download further languages from <a href="http://www.phpbb.com/">www.phpbb.com</a>, and add them before installing or later.</p>
+
+	<h3>Configuration file</h3>
+
+	<p>In this step, phpBB will try to write the configuration file automatically. The forum needs the configuration to run properly. It contains all database settings, so without it, phpBB will not be able to access the database.</p>
+
+	<p>Usually writing the configuration file automatically works fine. But in some cases it can fail due to wrong file permissions, for instance. In this case, you need to upload the file manually. phpBB asks you to download the config.php file and tells you what to do with it. Please read the instructions carefully. After you have uploaded the file, use <em>Done</em> to get to the last step. If <em>Done</em> returns you to the same page as before, and does not return a success message, you did not upload the file correctly.</p>
+
+	<h3>Advanced settings</h3>
+
+	<p>The Advanced settings allow you to set some parameters of the board configuration. They are optional, and you can always change them later. So if you are not sure what these settings mean, proceed to the final step and finish the installation.</p>
+
+	<p>If the installation was successful, you can now use the Login button to visit the Administration Control Panel. Congratulations, you have installed phpBB3 successfully. But there is still work ahead!</p>
+
+	<p>If you are unable to get phpBB3 installed even after reading this guide, please look at the support section to find out where you can ask for further assistance.</p>
+
+	<p>At this point if you are converting from phpBB 2.0.x, you should refer to the <a href="#convert">conversion steps</a> for further information. If not, you should remove the install directory from your server as you will only be able to access the Administration Control Panel whilst it is present.</p>
+
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="update"></a><h1>4. Updating from stable releases of phpBB 3.0.x</h1>
+
+<p>If you are currently using a stable release of phpBB3 updating to this version is straightforward. You would have downloaded one of four packages and your choice determines what you need to do. <strong>Please Note</strong>: That before updating we heavily recommend you do a <em>full backup of your database and existing phpBB3 files</em>! If you are unsure how to achieve this please ask your hosting provider for advice.</p>
+
+<p><strong>Please make sure you update your phpBB3 source files too, even if you run the <code>database_update.php</code> file.</strong></p>
+
+<a name="update_full"></a><b>4.i. Full package</b>
+<br /><br />
+<div class="paragraph">
+
+	<p>The full package is normally meant for new installations, but if you want to replace all source files this package comes in handy.</p>
+
+	<p>First you should make a copy of your existing <em>config.php</em> file, keep it in a safe place! Next delete all the existing phpBB3 files, you may want to leave your <code>files/</code> and <code>images/</code> directory in place. You can leave alternative styles in-place too. With this complete you can upload the new phpBB3 files (see <a href="#install">New installation</a> for details if necessary). Once complete copy back your saved <em>config.php</em>, replacing the new one. Another method is to just <strong>replace</strong> the existing files with the files from the full package - though make sure you do <strong>not</strong> overwrite your config.php file.</p>
+
+	<p>You should now run <code>install/database_update.php</code> which, depending on your previous version, will make a number of database changes. You may receive <em>FAILURES</em> during this procedure, they should not be a cause for concern unless you see an actual <em>ERROR</em>, in which case the script will stop (in this case you should seek help via our forums or bug tracker).</p>
+
+	<p>Once the install/database_update.php has completed you may proceed to the Administration Control Panel and check remove the install directory as advised.</p>
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<a name="update_files"></a><b>4.ii. Changed files only</b>
+<br /><br />
+<div class="paragraph">
+
+	<p>This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have <samp>3.0.0</samp> you should select the phpBB-3.0.0_to_3.0.1.zip/tar.gz file.</p>
+
+	<p>The directory structure has been preserved enabling you (if you wish) to simply upload the contents of the archive to the appropriate location on your server, i.e. simply overwrite the existing files with the new versions. Do not forget that if you have installed any Mods these files will overwrite the originals possibly destroying them in the process. You will need to re-add Mods to any affected file before uploading.</p>
+
+	<p>As for the other update procedures you should run <b>install/database_update.php</b> after you have finished updating the files. This will update your database schema and increment the version number.</p>
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<a name="update_patch"></a><b>4.iii. Patch file</b>
+<br /><br />
+
+<div class="paragraph">
+
+	<p>The patch file is probably the best solution for those with many Mods or other changes who do not want to re-add them back to all the changed files. To use this you will need command line access to a standard UNIX type <strong>patch</strong> application. If you do not have access to such an application but still want to use this update approach we recommend the <a href="update_auto">Automatic update package</a> explained below.</p>
+
+	<p>A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is 3.0.0 you need the phpBB-3.0.0_to_3.0.1.patch file. Place the correct patch in the parent directory containing the phpBB3 core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: <strong>patch -cl -d [PHPBB DIRECTORY] -p1 &lt; [PATCH NAME]</strong> (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB3, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.</p>
+
+	<p>If you do get failures you should look at using the <a href="#update_files">Changed files only</a> package to replace the files which failed to patch, please note that you will need to manually re-add any Mods to these particular files. Alternatively if you know how you can examine the .rej files to determine what failed where and make manual adjustments to the relevant source.</p>
+
+	<p>You should of course delete the patch file (or files) after use. As for the other update procedures you should run <code>install/database_update.php</code> after you have finished updating the files. This will update your database schema and data (if appropriate) and increment the version number.</p>
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<a name="update_auto"></a><b>4.iv. Automatic update package</b>
+<br /><br />
+
+<div class="paragraph">
+
+	<p>The automatic update package is holding - contrary to the others - only the update informations for updating the last released version to the latest available version. These package is meant for use with the automatic update tool.</p>
+
+	<p>To perform the update, either follow the instructions from the <code>Administration Control Panel -&gt; System</code> Tab - this should point out that you are running an outdated version and will guide you through the update - or following the instructions listed below.</p>
+
+	<ul class="menu">
+		<li>Go to the <a href="http://www.phpbb.com/downloads/">downloads page</a> and download the latest update package listed there.</li>
+		<li>Upload the archives contents to your phpBB installation - only the install folder is required. Upload the whole install folder, retaining the file structure.</li>
+		<li>After the install folder is present, phpBB3 will go offline automatically.</li>
+		<li>Point your browser to the install directory, for example <samp>http://www.example.com/phpBB3/install/</samp></li>
+		<li>Choose the "Update" Tab and follow the instructions</li>
+	</ul>
+
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<a name="update_all"></a><b>4.v. All package types</b>
+<br /><br />
+
+<div class="paragraph">
+
+	<p>If you have non-English language packs installed you may want to see if a new version has been made available. A number of missing strings may have been added which, though not essential, may be beneficial to users. Please note that at this time not all language packs have been updated so you should be prepared to periodically check for updates.</p>
+
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="convert"></a><h1>5. Conversion from phpBB 2.0.x to phpBB 3.0.x</h1>
+
+<p>This paragraph explains the steps necessary to convert your existing phpBB2 installation to phpBB3.</p>
+
+<a name="prereq"></a><b>5.i. Requirements before converting</b>
+<br /><br />
+
+<div class="paragraph">
+	<p>Before converting we heavily recommend you do a <em>full backup of your database and files</em>! If you are unsure how to achieve this please ask your hosting provider for advice. In order to convert, you need to have a new phpBB3 installation within the same database (but with a different prefix) as your old 2.0.x installation. You basically need to follow the basic instructions given for <a href="#install">New installations</a>. Please <strong>do not</strong> overwrite any old files - install phpBB3 at a different location.</p>
+
+	<p>Once you made a backup of everything and also have a brand new phpBB3 installation, you can now begin the conversion.</p>
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<a name="conversion"></a><b>5.ii. Converting</b>
+<br /><br />
+
+<div class="paragraph">
+
+	<p>To begin the conversion visit the install folder of your phpBB3 installation (the same as you have done for installing). Now you will see a new tab <em>Convert</em>. Click this tab.</p>
+
+	<p>As with install the conversion is automated. Your previous 2.0.x database tables will not be touched as well as the original 2.0.x files remaining untouched. The conversion is actually only filling your phpBB3 database tables and copying additional data over to your phpBB3 installation. This has the benefit that if something goes wrong you are able to either re-run the conversion or continue a conversion, while your old board is still accessible. We really recommend you disable your old installation while converting, else you may have inconsistent data after the conversion.</p>
+	
+	<p>Please note that this conversion process may take quite some time and depending on your hosting provider this may result in it failing (due to web server or other timeout issues). If this is the case you should ask your provider if they are willing to allow the convert script to temporarily exceed their limits (be nice and they will probably be quite helpful).</p>
+
+	<p>Once completed your board should be immediately available. If you encountered errors you should report the problems to our bug tracker or seek help via our forums (see <a href="README.html">README</a> for details).</p>
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<a name="postreq"></a><b>5.iii. Things to do after conversion</b>
+<br /><br />
+
+<div class="paragraph">
+
+	<p>After successful conversion there may be a few items you need to do - apart from checking if the installation is accessible and everything displayed correctly.</p>
+
+	<p>The first thing you may want to do is going to the administration control panel and checking every configuration item within the general tab. Thereafter you may want to adjust the forum descriptions/names if you entered HTML there. You also may want to access the other administrative sections, e.g. adjusting permissions, smilies, icons, ranks, etc.</p>
+
+	<p>Within the conversion the search index has not been created or transferred. This means after conversion you are not able to find any matches if you want to search for something. We recommend you rebuild your search index within <code>Admin -&gt; Maintenance -&gt; Database -&gt; Search Index</code>.</p>
+
+	<p>Once you are pleased with your new installation you may want to give it the name of your old installation, changing the directory name. With phpBB3 this is possible without any problems - but you may still want to check your cookie settings within the administration panel, if the cookie path need to be adjusted prior to renaming.</p>
+
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="postinstall"></a><h1>6. Important (security related) post-Install tasks for all installation methods</h1>
+
+<div class="paragraph">
+
+	<p>Once you have succssfully installed phpBB3 you <strong>MUST</strong> ensure you remove the entire install/ directory. Leaving the install directory in place is a <em>very serious potential security issue</em> which may lead to deletion or alteration of files, etc. Please note that until this directory is not removed phpBB3 will not operate and a warning message will be displayed. Beyond this <strong>essential</strong> deletion you may also wish to delete the docs/ directories if you wish.</p>
+
+	<p>With these directories deleted you should proceed to the administration panel. Depending on how the installation completed you may have been directed there automatically. If not, login as the administrator you specified during install/conversion and click the <strong>Administration Panel</strong> link at the bottom of any page. Ensure that details specified in <code>Admin -&gt; General</code> are correct!</p>
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<a name="avatars"></a><b>6.i. Uploadable avatars</b>
+<br /><br />
+<div class="paragraph">
+
+	<p>phpBB3 supports several methods for allowing users to select their own <em>avatar</em> (an avatar is a small image generally unique to a user and displayed just below their username in posts).</p>
+
+	<p>Two of these options allow users to upload an avatar from their machine or a remote location (via a URL). If you wish to enable this function you should first ensure the correct paths for uploadeable avatars is set in <code>Admin -&gt; General -&gt; Board Configuration -&gt; Avatar settings</code>. By default this is <em>images/avatars/uploads</em> but you can set it to whatever you like, just ensure the configuration setting is updated. You must also ensure this directory can be written to by the webserver. Usually this means you have to alter its permissions to allow anyone to read and write to. Exactly how you should do this depends on your ftp client or server operating system.</p>
+
+	<p>On UNIX systems for example you set the directory to a+rwx (or ugo+rwx or even 777). This can be done from a command line on your server using chmod or via your FTP client (using the Change Permissions, chmod or other Permissions dialoge box, see your FTP clients documentation for help). Most FTP clients list permissions in the form of User (Read, Write, Execute), Group (Read, Write, Execute) and Other (Read, Write, Execute). You need to tick all of these boxes to set correct permissions.</p>
+
+	<p>On Windows system you need to ensure the directory is not write-protected and that it has global write permissions (see your servers documentation or contact your hosting provider if you are unsure on how to achieve this).</p>
+
+	<p>Please be aware that setting a directories permissions to global write access is a potential security issue. While it is unlikely that anything nasty will occur (such as all the avatars being deleted) there are always people out there to cause trouble. Therefore you should monitor this directory and if possible make regular backups.</p>
+</div>
+
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="disclaimer"></a><h1>7. Copyright and disclaimer</h1>
+
+	<div class="paragraph">
+
+	<p>This application is opensource software released under the <a href="http://www.gnu.org/licenses/gpl.html">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2007 <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+
+</div>
+<a href="#top">Top</a>
+
+<!-- END DOCUMENT -->
+
+</div>
+
+<div id="footer">&nbsp;<br /><br /></div>
+
+</body>
+</html>

phpBB/docs/README.html

@@ -0,0 +1,432 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<title>phpBB 3.0.x Readme</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="resource-type" content="document" />
+<meta name="description" lang="en" content="phpBB 3.0.x Readme" />
+<meta name="keywords" lang="en" content="" />
+<meta name="author" content="phpBB Group" />
+<meta name="copyright" content="phpBB Group" />
+<meta name="MSSmartTagsPreventParsing" content="true" />
+
+<style type="text/css">
+<!--
+
+/* The original "subSilver" theme for phpBB2 Created by subBlue design :: http://www.subBlue.com */
+body {
+	background-color: white;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	margin: 0;
+	border: 0;
+	padding: 0;
+}
+
+img {
+	border: 0;
+}
+
+p {
+	font-size: 8pt;
+}
+
+hr { 
+	height: 0; 
+	border: solid #D1D7DC 0;
+	border-top-width: 1px;
+}
+
+#title, h1 {
+	font: bold 18pt 'Trebuchet MS', Verdana, sans-serif;
+	text-decoration: none;
+	line-height: 120%;
+}
+
+h2 {
+	font: bold 12pt Arial, Helvetica, sans-serif;
+	text-decoration: none;
+	line-height: 120%;
+}
+
+h3 {
+	font: bold 10pt Arial, Helvetica, sans-serif;
+	text-decoration: none;
+	line-height: 120%;
+}
+
+.paragraph {
+	margin-left: 20px;
+}
+
+/* Structure */
+#logo {
+	background: #fff url(header_bg.jpg) repeat-x top right;
+	height: 60px;
+}
+
+#title {
+	color: #12749b;
+	float: right;
+	margin: 10px 10px 0;
+}
+
+#main {
+	margin-left: 25px;
+	margin-right: 25px;
+}
+
+.good {
+	color: green;
+}
+
+.bad {
+	color: red;
+}
+
+#footer {
+	margin-left: 75px;
+	font-size: 70%;
+	color: #006600;
+}
+
+code {
+	color: #006600; 
+	font-weight: normal;
+	font-family: 'Courier New', monospace;
+	border-color: #D1D7DC;
+	border-width: 1px;
+	border-style: solid;
+	background-color: #FAFAFA;
+}
+
+.indent p {
+	padding-left: 20px;
+	font-size: 90%;
+}
+
+/* Anchors */
+a {
+	font-size: 70%;
+}
+
+a:link, a:active, a:visited {
+	color:	#006699;
+	text-decoration: none;
+}
+
+a:hover {
+	color: #DD6900;
+	text-decoration: underline;
+}
+
+a.nav {
+	color: #006699;
+	text-decoration: none;
+}
+
+a.nav:hover {
+	text-decoration: underline;
+}
+
+p a {
+	font-size: 100%;
+}
+
+.menu {
+	font-size: 80%;
+}
+
+.menu li a {
+	font-size: 100%;
+}
+
+.comment {
+	color: green;
+}
+
+//-->
+</style>
+
+</head>
+
+<body>
+
+<div id="logo">
+	<div id="title">phpBB 3.0.x Readme</div>
+	<img src="header_left.jpg" alt="phpBB Logo" />
+</div>
+
+<a name="top"></a><div id="main">
+
+<!-- BEGIN DOCUMENT -->
+
+<p>Thank you for downloading phpBB3. This README will guide through the basics of installation and operation of phpBB3. Please ensure you read this and the accompanying documentation fully <strong>before</strong> proceeding with the installation.</p>
+
+<h1>Readme</h1>
+
+<ol class="menu">
+	<li><a href="#install">Installing phpBB3</a></li>
+	<li><a href="#run">Running phpBB3</a>
+	<ol type="i">
+		<li><a href="#i18n">Internationalisation (i18n)</a></li>
+		<li><a href="#styles">Styles</a></li>
+		<li><a href="#mods">Mods</a></li>
+	</ol>
+	</li>
+	<li><a href="#help">Getting help with phpBB3</a>
+	<ol type="i">
+		<li><a href="#userguide">Userguide</a></li>
+		<li><a href="#website">Community Forums</a></li>
+		<li><a href="#irc">Internet Relay Chat</a></li>
+	</ol>
+	</li>
+	<li><a href="#status">Status of this version</a></li>
+	<li><a href="#bugs">Reporting Bugs</a>
+	<ol type="i">
+		<li><a href="#securitybugs">Security related bugs</a></li>
+	</ol>
+	</li>
+	<li><a href="#curbugs">Overview of current bug list</a></li>
+	<li><a href="#php">PHP compatibility issues</a></li>
+	<li><a href="#disclaimer">Disclaimer</a></li>
+</ol>
+
+<hr />
+
+<a name="install"></a><h1>1. Installing phpBB3</h1>
+
+<div class="paragraph">
+
+	<p>Installation and update/conversion instructions can be found in the <a href="INSTALL.html">INSTALL</a> document contained in this distribution. If you are intending to convert from a previous phpBB 2.0.x installation we highly recommend you backup any existing data before proceeding!</p>
+
+	<p>Users of phpBB3 Beta versions cannot directly update or convert.</p>
+
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="run"></a><h1>2. Running phpBB3</h1>
+
+	<p>Once installed phpBB is easily managed by both admin and moderator control panels. If you need help or advice with phpBB please see <a href="#help">Section 3</a> below.</p>
+
+	<a name="i18n"></a><b>2.i. Internationalisation (i18n)</b>
+	<br /><br />
+	<div class="paragraph">
+
+	<p>A number of language packs and style localisations are available. You can find them on our official download page:</p>
+
+	<p><a href="http://www.phpbb.com/downloads/">http://www.phpbb.com/downloads/</a></p>
+
+	<p>This is the <em>official</em> location for all supported language sets. If you download a package from a 3rd party site you do so with the understanding that we cannot offer support. So please, do not ask for help in these cases!</p>
+
+	<p>Installation of these packages is straightforward, simply download the required language pack and unarchive it into the <samp>languages/</samp> folder. Please ensure you retain the directory structure when doing this! Once uploaded go to the <code>Admin-&gt;System-&gt;Language Packs</code> and install the now appeared new language pack. To install the style image packs you should unarchive the file/s into the styles/subSilver/imageset directory, again you must retain the directory structure. Once installed the languages will become immediately available.</p>
+
+	<p>If your language is not available please visit our forums where you will find a topic listing translations currently available or in preparation. This topic also gives you information should you wish to volunteer to translate a language not currently listed</p>
+
+	</div>
+	<a href="#top">Top</a>
+	<br /><br />
+
+	<a name="styles"></a><b>2.ii. Styles</b>
+	<br /><br />
+	<div class="paragraph">
+
+	<p>Although phpBB Group are rather proud of the included styles we realise that it may not be to everyones tastes. Therefore phpBB3 allows styles to be switched with relative ease. Firstly you need to locate and download a style you like. We maintain such a site at</p>
+
+	<p><a href="http://www.phpbb.com/styles/">http://www.phpbb.com/styles/</a></p>
+
+	<p><strong>Please note</strong> that 3rd party styles downloaded for versions of phpBB2 will <strong>not</strong> work in phpBB3.</p>
+
+	<p>Once you have downloaded a style the usual next step is to unarchive (or upload the unarchived contents of) the package into your <samp>styles/</samp> directory. You then need to visit <code>Administration -&gt; Styles</code>, you should see the new style available, click install and it will become available for all your users.</p>
+
+	</div>
+	<a href="#top">Top</a>
+	<br /><br />
+
+	<a name="mods"></a><b>2.iii. Mods</b>
+	<br /><br />
+	<div class="paragraph">
+
+	<p>Although not officially supported by phpBB Group, phpBB has a thriving modification scene. These third party modifications to the standard phpBB extend its capabilities still further and can be found at:</p>
+
+	<p><a href="http://www.phpbb.com/mods">http://www.phpbb.com/mods</a></p>
+
+	<p><strong>Please remember</strong> that any bugs or other issues that occur after you have added any modification should <strong>NOT</strong> be reported to the bug tracker (see below). First remove the modification and see if the problem is resolved.</p>
+
+	<p>Also remember that any modifications which modify the database in any way may render upgrading your forum to future versions more difficult unless we state otherwise. With all this said many users have and continue to utilise many of the mods already available with great success.</p>
+
+	</div>
+	<a href="#top">Top</a>
+	<br /><br />
+
+<hr />
+
+<a name="help"></a><h1>3. Getting help with phpBB3</h1>
+
+	<p>phpBB3 can seem a little daunting to new users in places, particularly with regard the permission system. The first thing you should do is check the <a href="FAQ.html">FAQ</a> which covers a few basic getting started questions. If you need additional help there are several places you should look.</p>
+
+	<a name="userguide"></a><b>3.i. phpBB3 Userguide</b>
+	<br /><br />
+	<div class="paragraph">
+
+	<p>A comprehensive userguide is now available online and can be accessed from the following location:</p>
+
+	<p><a href="http://www.phpbb.com/support/documentation/">http://www.phpbb.com/support/documentation/</a></p>
+
+	<p>This covers everything from installation through setting permissions and managing users.</p>
+
+	</div>
+	<a href="#top">Top</a>
+	<br /><br />
+
+	<a name="website"></a><b>3.ii. Community Forums</b>
+	<br /><br />
+
+	<div class="paragraph">
+
+	<p>phpBB Group maintains a thriving community where a number of people have generously decided to donate their time to help support users. This site can be found at:</p>
+
+	<p><a href="http://www.phpbb.com/">http://www.phpbb.com/</a></p>
+
+	<p>If you do seek help via our forums please be sure to do a Search before posting. This may well save both you and us time and allow the developer, moderator and support groups to spend more time responding to people with unknown issues and problems. Please also remember that phpBB is an entirely volunteer effort, no one receives any compensation for the time they give, this includes moderators as well as developers. So please be respectful and mindful when awaiting responses.</p>
+
+	</div>
+	<a href="#top">Top</a>
+	<br /><br />
+
+	<a name="irc"></a><b>3.iii Internet Relay Chat</b>
+	<br /><br />
+	<div class="paragraph">
+
+	<p>Another place you may find help is our IRC channel. This operates on the Freenode IRC network, <em>irc.freenode.net</em> and the channel is <em>#phpbb</em> and can be accessed by any good IRC client such as mIRC, XChat, etc. Again, please do not abuse this service and be respectful of other users.</p>
+
+	</div>
+	<a href="#top">Top</a>
+	<br /><br />
+
+<hr />
+
+<a name="status"></a><h1>4. Status of this version</h1>
+
+<div class="paragraph">
+	<p>This is the third stable release of phpBB. The 3.0.x line is essentially feature frozen, point releases will see only bugs and such like fixed, though feature alterations and minor feature additions may be done. Our next major release will be phpBB 3.2 and the planning phase has begun (the unstable development version is 3.1). Please do not post questions asking when 3.2 will be available, no release date has been set.</p>
+
+	<p>For those interested in the development of phpBB should keep an eye on the community forums to see how things are progressing:</p>
+
+	<p><a href="http://area51.phpbb.com/">http://area51.phpbb.com/phpBB/</a></p>
+
+	<p>Please note that this forum should <strong>NOT</strong> be used to obtain support for or ask questions about phpBB 2.0.x or phpBB 3.0.x, the main community forums are the place for this. Any such posts will be locked and go unanswered.</p>
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="bugs"></a><h1>5. Reporting Bugs</h1>
+
+<div class="paragraph">
+	<p>The phpBB Group uses a bug tracking system to store, list and manage all reported bugs, it can be found at the location listed below. Please <strong>DO NOT</strong> post bug reports to our forums, they will be locked. In addition please <strong>DO NOT</strong> use the bug tracker for support requests. Posting such a request will only see you directed to the support forums (while taking time away from working on real bugs).</p>
+
+	<p><a href="http://www.phpbb.com/bugs/">http://www.phpbb.com/bugs/</a></p>
+
+	<p>While we very much appreciate receiving bug reports (the more reports the more stable phpBB will be) we ask you carry out a few steps before adding new entries:</p>
+
+	<ul class="menu">
+		<li>Firstly determine if your bug is reproduceable, how to determine this depends on the bug in question. Only if the bug is reproduceable it is likely to be a problem with phpBB3 (or in some way connected). If something cannot be reproduced it may turn out to have been your hosting provider working on something, a user doing something silly, etc. Bug reports for non-reproduceable events can slow down our attempts to fix real, reproduceable issues<br /><br /></li>
+		<li>Next please read or search through the existing bug reports to see if <em>your</em> bug (or one very similar to it) is already listed. If it is please add to that existing bug rather than creating a new duplicate entry (all this does is slow us down).<br /><br /></li>
+		<li>Check the forums (use search!) to see if people have discussed anything that sounds similar to what you are seeing. However, as noted above please <strong>DO NOT</strong> post your particular bug to the forum unless it's non-reproduceable or you are sure it's related to something you have done rather phpBB3<br /><br /></li>
+		<li>If no existing bug exists then please feel free to add it</li>
+	</ul>
+
+	<p>If you do post a new bug (i.e. one that isn't already listed in the bug tracker) firstly make sure you have logged in (your username and password are the same as for the community forums) then please include the following details:</p>
+
+	<ul class="menu">
+		<li>Your server type/version, eg. Apache 1.3.28, IIS 4, Sambar, etc.</li>
+		<li>PHP version and mode of operation, eg. PHP 5.1.1 as a module, PHP 4.4.4 running as CGI, etc.</li>
+		<li>DB type/version, eg. MySQL 4.0.1, PostgreSQL 7.3.2, MSSQL Server 2000 SP1, etc.</li>
+	</ul>
+
+	<p>The relevant database type/version is listed within the administration control panel</p>
+
+	<p>Please also be as detailed as you can in your report, if possible list the steps required to duplicate the problem. If you have a fix which you are <strong>VERY SURE</strong> works (and is consistent with our <a href="coding-guidelines.html">coding guidelines</a>) and does not introduce further problems or incompatibilities please let us know. However only include it in the bug report if you really must, if we need it we'll ask you for it.</p>
+
+	<p>Once a bug has been submitted you will be emailed any follow up comments added to it. <strong>Please</strong> if you are requested to supply additional information, do so! It is frustrating for us to receive bug reports, ask for additional information but get nothing. In these cases we have a policy of closing the bug, which may leave a very real problem in place. Obviously we would rather not have this situation arise.</p>
+
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<a name="securitybugs"></a><b>5.i. Security related bugs</b>
+<br /><br />
+<div class="paragraph">
+	<p>If you find a potential security related vulnerability in phpBB please <strong>DO NOT</strong> post it to the bug tracker, public forums, etc.! Doing so may allow unscrupulous users to take advantage of it before we have time to put a fix in place. All security related bugs should be sent to our security tracker:</p>
+
+	<p><a href="http://www.phpbb.com/security/">http://www.phpbb.com/security/</a></p>
+
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="curbugs"></a><h1>6. Overview of current bug list</h1>
+
+<div class="paragraph">
+	<p>This list is not complete but does represent those bugs which may effect users on a wider scale. Other bugs listed in the tracker have typically been shown to be limited to certain setups or methods of installation/upgrade.</p>
+
+	<ul class="menu">
+		<li>By default cannot post very large messages with MSSQL (this can be configured within MSSQL)</li>
+		<li>Conversions may fail to complete on large boards under some hosts</li>
+	</ul>
+
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="php"></a><h1>7. PHP compatibility issues</h1>
+
+<div class="paragraph">
+	<p>phpBB is no longer supported on PHP3 due to several compatibility issues and we recommend that you upgrade to the latest stable release of PHP5 to run phpBB. The minimum version required is PHP 4.3.3.</p>
+
+	<p>Please remember that running any application on a developmental version of PHP can lead to strange/unexpected results which may appear to be bugs in the application (which may not be true). Therefore we recommend you upgrade to the newest stable version of PHP before running phpBB3. If you are running a developmental version of PHP please check any bugs you find on a system running a stable release before submitting.</p>
+
+	<p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MSSQL Server 2000, PostgreSQL 7.x, Oracle 8, SQLite and Firebird. Versions of PHP used range from 4.3.3 to 6.0.0-dev without problem. </p>
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<a name="phpsec"></a><b>7.i. Notice on PHP security issues</b>
+
+<br /><br />
+<div class="paragraph">
+<p>Currently there are no known issues regarding PHP security.</p>
+</div>
+<a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="disclaimer"></a><h1>8. Copyright and disclaimer</h1>
+
+	<div class="paragraph">
+
+	<p>This application is opensource software released under the <a href="http://www.gnu.org/licenses/gpl.html">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2007 <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+
+</div>
+<a href="#top">Top</a>
+
+<!-- END DOCUMENT -->
+
+</div>
+
+<div id="footer">&nbsp;<br /><br /></div>
+
+</body>
+</html>

phpBB/docs/auth_api.html

@@ -1,88 +1,372 @@
-<html>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-<link rel="stylesheet" href="../templates/subSilver/subSilver.css" type="text/css" />
+<title>Auth API</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="resource-type" content="document" />
+<meta name="description" lang="en" content="Olympus coding guidelines document" />
+<meta name="keywords" lang="en" content="" />
+<meta name="author" content="phpBB Group" />
+<meta name="copyright" content="phpBB Group" />
+<meta name="MSSmartTagsPreventParsing" content="true" />
+<link rel="shortcut icon" href="" />
+
 <style type="text/css">
 <!--
-p,ul,td {font-size:10pt;}
-h2 {font-size:15pt;font-weight:bold;color:red}
-h3 {font-size:12pt;color:blue}
+
+/*
+	    The original "subSilver" theme for phpBB2
+	Created by subBlue design :: http://www.subBlue.com
+*/
+
+body {
+	background-color:	white;
+	font-family:		Verdana, Arial, Helvetica, sans-serif;
+	margin:				0px;
+	border:				0px;
+	padding:			0px;
+}
+
+img {
+	border: 0;
+}
+
+p {
+	font-size:	8pt;
+}
+
+hr { 
+	height: 0px; 
+	border: solid #D1D7DC 0px; 
+	border-top-width: 1px;
+}
+
+#title, h1 {
+	font: bold 18pt 'Trebuchet MS', Verdana, sans-serif;
+	text-decoration: none; 
+	line-height: 120%; 
+}
+
+h2 {
+	font: bold 12pt Arial, Helvetica, sans-serif;
+	text-decoration: none; 
+	line-height: 120%; 
+}
+
+h3 {
+	font: bold 10pt Arial, Helvetica, sans-serif;
+	text-decoration: none; 
+	line-height: 120%; 
+}
+
+.paragraph {
+	margin-left: 20px;
+}
+
+/* 
+	Structure 
+*/
+#logo {
+	background: #fff url(header_bg.jpg) repeat-x top right;
+	height: 60px;
+}
+
+#title {
+	color: #12749b;
+	float: right;
+	margin: 10px 10px 0;
+}
+
+#main {
+	margin-left: 25px;
+	margin-right: 25px;
+}
+
+.good {
+	color: green;
+}
+
+.bad {
+	color: red;
+}
+
+#footer {
+	margin-left: 75px;
+	font-size: 70%;
+	color: #006600;
+}
+
+code { 
+	color: #006600; 
+	font-weight: normal; 
+	font-family: 'Courier New', monospace; 
+	border-color: #D1D7DC; 
+	border-width: 1px; 
+	border-style: solid; 
+	background-color: #FAFAFA; 
+}
+
+.indent p {
+	padding-left: 20px;
+	font-size: 90%;
+}
+
+/*
+	Anchors
+*/
+a {
+	font-size: 70%;
+}
+
+a:link, a:active, a:visited {
+	color:	#006699;
+	text-decoration:	none;
+}
+
+a:hover {
+	color:				#DD6900;
+	text-decoration:	underline;
+}
+
+a.nav {
+	color:				#006699;
+	text-decoration:	none;
+}
+
+a.nav:hover {
+	text-decoration:	underline;
+}
+
+p a {
+	font-size: 100%;
+}
+
+.menu {
+	font-size: 80%;
+}
+
+.menu li a {
+	font-size: 100%;
+}
 //-->
 </style>
+
+<!--[if IE]>
+<style type="text/css">
+body {
+	scrollbar-face-color:		#DEE3E7;
+	scrollbar-highlight-color:	white;
+	scrollbar-shadow-color:		#DEE3E7;
+	scrollbar-3dlight-color:	#D1D7DC;
+	scrollbar-arrow-color:		#006699;
+	scrollbar-track-color:		#EFEFEF;
+	scrollbar-darkshadow-color: #98AAB1;
+}
+</style>
+<![endif]-->
+
 </head>
-<body bgcolor="#E5E5E5" text="#000000" link="#006699" vlink="#006699">
 
-<table width="100%" border="0" cellspacing="0" cellpadding="10" align="center">
-	<tr>
-		<td class="bodyline"><table width="100%" border="0" cellspacing="0" cellpadding="0">
-			<tr>
-				<td>
+<body>
 
-<h1>Using the <i><u>auth</u></i> class</h1>
+<div id="logo">
+	<div id="title">Auth API</div>
+	<a href="index.php"><img src="header_left.jpg" alt="phpBB Logo" /></a>
+</div>
 
-<h2>What is it?</h2>
+<a name="top"></a><div id="main">
 
-<p>The <i><u>auth</u></i> class contains methods related to authorisation users to access various board functions, e.g. posting, viewing, replying, logging in (and out), etc. If you need to check whether a user can carry out a task or handle user login/logouts this class is required.</p>
+<p>This is an explanation of how to use the phpBB auth/acl API. This document is (c) 2006 phpBB Group, copying or redistribution is not allowed without permission.</p>
 
-<h2>Initialisation</h2>
+<h1>Auth API</h1>
 
-<p>To use any methods contained with the <i><u>auth</u></i> class it first needs to be instantiated. This is best achieved early in the execution of the script in the following manner:
+<ol class="menu">
+	<li><a href="#intro">Introduction</a></li>
+	<li><a href="#methods">Methods</a>
+	<ol type="i">
+		<li><a href="#acl">acl</a></li>
+		<li><a href="#acl_get">acl_get</a></li>
+		<li><a href="#acl_gets">acl_gets</a></li>
+		<li><a href="#acl_getf">acl_getf</a></li>
+		<li><a href="#acl_getf_global">acl_getf_global</a></li>
+		<li><a href="#acl_cache">acl_cache</a></li>
+	</ol>
+	</li>
+	<li><a href="#admin_related">Admin related functions</a></li>
+</ol>
 
-<pre>$auth = new auth();</pre>
+<hr />
 
-<p>Once an instance of the object has been created you are free to call the various methods it contains. Please note that should you wish to use the <i><u>auth_admin</u></i> methods you will need to instantiate this seperately but in the same way.</p>
+<a name="intro"></a><h1>1. Introduction</h1>
 
-<h3><i>acl</i></h3>
+	<div class="paragraph">
 
-<p>The <i>acl</i> method is the initialisation routine for all the acl functions. If you intend calling any acl method you must first call this. The method takes as its one and only required parameter a hash of userdata. This hash must contain at least the following information; user_id, user_permissions and user_founder. It is called in the following way:
+	<h3>What is it?</h3>
 
-<pre>$auth->acl(<i>userdata</i>);</pre>
+	<p>The <code>auth</code> class contains methods related to authorisation users to access various board functions, e.g. posting, viewing, replying, logging in (and out), etc. If you need to check whether a user can carry out a task or handle user login/logouts this class is required.</p>
 
-<p>Where userdata is the hash containing the aforementioned data.</p>
+	<h3>Initialisation</h3>
 
-<h3><i>acl_get</i></h3>
+	<p>To use any methods contained with the <code>auth</code> class it first needs to be instantiated. This is best achieved early in the execution of the script in the following manner:</p>
 
-<p>This method is the primary way of determining what a user can and cannot do for a given option in, optionally, a given forum. The method should be called in the following way:</p>
+	<blockquote><pre>
+$auth = new auth();
+	</pre></blockquote>
 
-<pre>$result = $auth->acl_get(<i>option</i>[, <i>forum</i>]);</pre>
+	<p>Once an instance of the class has been created you are free to call the various methods it contains. Please note that should you wish to use the <code>auth_admin</code> methods you will need to instantiate this separately but in the same way.</p>
 
-<p>Where option is a string representing the required option, e.g. 'f_list', 'm_edit', 'a_adduser', etc. The optional forum term is the integer forum_id.</p>
+	</div>
+	<a href="#top">Top</a>
+	<br /><br />
 
-<pThe method returns a positive integer when the user is allowed to carry out the option and a zero if denied.</p>
+<hr />
 
-<h3><i>acl_gets</i></h3>
+<a name="methods"></a><h1>2. Methods</h1>
 
-<p>This method is funtionally similar to <i>acl_get</i> in that it returns information on whether a user can or cannot carry out a given task. The difference here is the ability to test several different options in one go. This may be useful for testing whether a user is a moderator or an admin in one call. Rather than having to call and check <i>acl_get</i> twice.</p>
+	<p>Following are the methods you are able to use.</p>
 
-<p>The method should be called thus:</p>
+	<a name="acl"></a><b>2.i. acl</b>
+	<br /><br />
+	<div class="paragraph">
+	
+	<p>The <code>acl</code> method is the initialisation routine for all the acl functions. If you intend calling any acl method you must first call this. The method takes as its one and only required parameter an associative array containing user information as stored in the database. This array must contain at least the following information; user_id, user_permissions and user_type. It is called in the following way:</p>
 
-<pre>$result = $auth->acl_gets(<i>option1</i>[, <i>option2</i>, ..., <i>optionN</i>, <i>forum</i>]);</pre>
+	<blockquote><pre>
+$auth->acl(<code>userdata</code>);
+	</pre></blockquote>
 
-<p>As with the <i>acl_get</i> method the options are strings representing the required permissions to check. The forum again is an integer representing a given forum_id.</p>
+	<p>Where userdata is the array containing the aforementioned data.</p>
 
-<h3><i>acl_cache</i></h3>
-
-<p>This should be considered a private method and not be called externally. It handles the generation of the user_permissions data from the basic user and group authorisation data. When necessary this method is called automatically by <i>acl</i>.</p>
-
-<h3><i>login</i></h3>
-
-<p></p>
-
-<h2>Admin related functions</h2>
-
-<p>A number of additional methods are available related to <i><u>auth</u></i>. These handle more basic functions such as adding user and group permissions, new options and clearing the user cache. These methods are contained within a seperate class, <i><u>auth_admin</u></i>. This can be found in the functions_admin source.</p>
-
-<p>To use any methods this class contains it first needs to be instantiated seperately from <i><u>auth</u></i>. This is achieved in the same way as <i><u>auth</u></i>:</p>
-
-<pre>$authadmin = new auth_admin();</pre>
-
-<p>This instance gives you access to both the methods of this specific class and that of <i><u>auth</u></i>.</p>
+	</div>
+	<a href="#top">Top</a>
+	<br /><br />
 
 
-				</td>
-			</tr>
-		</table></td>
-	</tr>
-</table>
+	<a name="acl_get"></a><b>2.ii. acl_get</b>
+	<br /><br />
+	<div class="paragraph">
+
+	<p>This method is the primary way of determining what a user can and cannot do for a given option globally or in a given forum. The method should be called in the following way:</p>
+
+	<blockquote><pre>
+$result = $auth->acl_get(<code>option</code>[, <code>forum</code>]);
+	</pre></blockquote>
+
+	<p>Where option is a string representing the required option, e.g. 'f_list', 'm_edit', 'a_adduser', etc. By adding a ! in front of the option, e.g. '!f_list' the result of this method will be negated. The optional forum term is the integer forum_id.</p>
+
+	<p>The method returns a positive integer when the user is allowed to carry out the option and a zero if denied or the other way around if the option is prefixed with an exclamation mark.</p>
+
+	<p>If you specify a forum and there is also a global setting for the specified option then this method will return a positive integer if one of them evaluates to a positive integer. An example would be the m_approve option which can be set per forum but also globally. If a user has the global option he will automatically have m_approve in every forum.</p>
+
+	<p>There are some special options or <em>flags</em> which are used as prefixes for other options, e.g. 'f_' or 'm_'. These flags will automatically be set to a positive integer if the user has one or more permissions with the given prefix. A local setting will result in the flag being set only locally (so it will require a forum id to retrieve). If a user has one or more global permissions with the prefix acl_get will return a positive integer regardless of the forum id.</p>
+
+	</div>
+	<a href="#top">Top</a>
+	<br /><br />
+
+
+	<a name="acl_gets"></a><b>2.iii. acl_gets</b>
+	<br /><br />
+	<div class="paragraph">
+
+	<p>This method is funtionally similar to <code>acl_get</code> in that it returns information on whether a user can or cannot carry out a given task. The difference here is the ability to test several different options in one go. This may be useful for testing whether a user is a moderator or an admin in one call. Rather than having to call and check <code>acl_get</code> twice.</p>
+
+	<p>The method should be called thus:</p>
+
+	<blockquote><pre>
+$result = $auth->acl_gets(<code>option1</code>[, <code>option2</code>, ..., <code>optionN</code>, <code>forum</code>]);
+	</pre></blockquote>
+
+	<p>As with the <code>acl_get</code> method the options are strings representing the required permissions to check. The forum again is an integer representing a given forum_id.</p>
+
+	<p>The method will return a positive integer if <code>acl_get</code> for one of the options evaluates to a positive integer (combines permissions with OR).</p>
+
+	</div>
+	<a href="#top">Top</a>
+	<br /><br />
+
+
+	<a name="acl_getf"></a><b>2.iv. acl_getf</b>
+	<br /><br />
+	<div class="paragraph">
+
+	<p>This method is used to find out in which forums a user is allowed to carry out an operation or to find out in which forums he is not allowed to carry out an operation. The method should be called in the following way:</p>
+
+	<blockquote><pre>
+$result = $auth->acl_getf(<code>option</code>[, <code>clean</code>]);
+	</pre></blockquote>
+
+	<p>Just like in the <code>acl_get</code> method the option is a string specifying the permission which has to be checked (negation using ! is allowed). The second parameter is a boolean. If it is set to false this method returns all forums with either zero or a positive integer. If it is set to true only those forums with a positive integer as the result will be returned.</p>
+
+	<p>The method returns an associative array of the form:</p>
+
+	<blockquote><pre>
+array(<em>forum_id1</em> => array(<em>option</em> => <em>integer</em>), <em>forum_id2</em> => ...)
+	</pre></blockquote>
+
+	<p>Where option is the option passed to the method and integer is either zero or a positive integer and the same <code>acl_get(option, forum_id)</code> would return.</p>
+
+	</div>
+	<a href="#top">Top</a>
+	<br /><br />
+
+
+	<a name="acl_getf_global"></a><b>2.v. acl_getf_global</b>
+	<br /><br />
+	<div class="paragraph">
+
+	<p>This method is used to find out whether a user has a permission in at least one forum or globally. This method is similar to checking whether <code>acl_getf(option, true)</code> returned one or more forums but it's faster. It should be called in the following way:</p>
+
+	<blockquote><pre>
+$result = acl_getf_global(<code>option</code>)
+	</pre></blockquote>
+
+	<p>As with the previous methods option is a string specifying the permission which has to be checked.</p>
+
+	<p>This method returns either zero or a positive integer.</p>
+
+	</div>
+	<a href="#top">Top</a>
+	<br /><br />
+
+
+	<a name="acl_cache"></a><b>2.vi. acl_cache</b>
+	<br /><br />
+	<div class="paragraph">
+
+	<p>This should be considered a private method and not be called externally. It handles the generation of the user_permissions data from the basic user and group authorisation data. When necessary this method is called automatically by <code>acl</code>.</p>
+
+	</div>
+	<a href="#top">Top</a>
+	<br /><br />
+
+<hr />
+
+<a name="admin_related"></a><h1>3. Admin related functions</h1>
+
+	<div class="paragraph">
+
+	<p>A number of additional methods are available related to <code>auth</code>. These handle more basic functions such as adding user and group permissions, new options and clearing the user cache. These methods are contained within a separate class, <code>auth_admin</code>. This can be found in <code>includes/acp/auth.php</code>.</p>
+
+	<p>To use any methods this class contains it first needs to be instantiated separately from <code>auth</code>. This is achieved in the same way as <code>auth</code>:</p>
+
+	<blockquote><pre>
+$auth_admin = new auth_admin();
+	</pre></blockquote>
+
+	<p>This instance gives you access to both the methods of this specific class and that of <code>auth</code>.</p>
+
+	</div>
+	<a href="#top">Top</a>
+
+</div>
+
+<div id="footer"> $Id$ 
+<br /><br />
+</div>
 
 </body>
-</html>
+</html>

phpBB/download.php

@@ -9,19 +9,18 @@
 */
 
 /**
+* @ignore
 */
 define('IN_PHPBB', true);
 $phpbb_root_path = './';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
-include($phpbb_root_path . 'common.'.$phpEx);
+include($phpbb_root_path . 'common.' . $phpEx);
 
 $download_id = request_var('id', 0);
-
-// Thumbnails are not handled by this file by default - but for modders this should be interesting. ;)
 $thumbnail = request_var('t', false);
 
-// Start session management
-$user->session_begin();
+// Start session management, do not update session page.
+$user->session_begin(false);
 $auth->acl($user->data);
 $user->setup('viewtopic');
 
@@ -35,16 +34,17 @@ if (!$config['allow_attachments'] && !$config['allow_pm_attach'])
 	trigger_error('ATTACHMENT_FUNCTIONALITY_DISABLED');
 }
 
-$sql = 'SELECT attach_id, in_message, post_msg_id, extension
+$sql = 'SELECT attach_id, in_message, post_msg_id, extension, is_orphan, poster_id
 	FROM ' . ATTACHMENTS_TABLE . "
 	WHERE attach_id = $download_id";
 $result = $db->sql_query_limit($sql, 1);
+$attachment = $db->sql_fetchrow($result);
+$db->sql_freeresult($result);
 
-if (!($attachment = $db->sql_fetchrow($result)))
+if (!$attachment)
 {
 	trigger_error('ERROR_NO_ATTACHMENT');
 }
-$db->sql_freeresult($result);
 
 if ((!$attachment['in_message'] && !$config['allow_attachments']) || ($attachment['in_message'] && !$config['allow_pm_attach']))
 {
@@ -52,44 +52,74 @@ if ((!$attachment['in_message'] && !$config['allow_attachments']) || ($attachmen
 }
 
 $row = array();
-if (!$attachment['in_message'])
-{
-	// 
-	$sql = 'SELECT p.forum_id, f.forum_password, f.parent_id
-		FROM ' . POSTS_TABLE . ' p, ' . FORUMS_TABLE . ' f
-		WHERE p.post_id = ' . $attachment['post_msg_id'] . '
-			AND p.forum_id = f.forum_id';
-	$result = $db->sql_query_limit($sql, 1);
-	$row = $db->sql_fetchrow($result);
-	$db->sql_freeresult($result);
 
-	if ($auth->acl_gets('f_download', 'u_download', $row['forum_id']))
+if ($attachment['is_orphan'])
+{
+	// We allow admins having attachment permissions to see orphan attachments...
+	$own_attachment = ($auth->acl_get('a_attach') || $attachment['poster_id'] == $user->data['user_id']) ? true : false;
+
+	if (!$own_attachment || ($attachment['in_message'] && !$auth->acl_get('u_pm_download')) || (!$attachment['in_message'] && !$auth->acl_get('u_download')))
 	{
-		if ($row['forum_password'])
+		trigger_error('ERROR_NO_ATTACHMENT');
+	}
+
+	// Obtain all extensions...
+	$extensions = $cache->obtain_attach_extensions(true);
+}
+else
+{
+	if (!$attachment['in_message'])
+	{
+		// 
+		$sql = 'SELECT p.forum_id, f.forum_password, f.parent_id
+			FROM ' . POSTS_TABLE . ' p, ' . FORUMS_TABLE . ' f
+			WHERE p.post_id = ' . $attachment['post_msg_id'] . '
+				AND p.forum_id = f.forum_id';
+		$result = $db->sql_query_limit($sql, 1);
+		$row = $db->sql_fetchrow($result);
+		$db->sql_freeresult($result);
+
+		// Global announcement?
+		if (!$row)
 		{
-			// Do something else ... ?
-			login_forum_box($row);
+			$forum_id = request_var('f', 0);
+
+			$sql = 'SELECT forum_id, forum_password, parent_id
+				FROM ' . FORUMS_TABLE . '
+				WHERE forum_id = ' . $forum_id;
+			$result = $db->sql_query($sql);
+			$row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+		}
+
+		if ($auth->acl_get('u_download') && $auth->acl_get('f_download', $row['forum_id']))
+		{
+			if ($row['forum_password'])
+			{
+				// Do something else ... ?
+				login_forum_box($row);
+			}
+		}
+		else
+		{
+			trigger_error('SORRY_AUTH_VIEW_ATTACH');
 		}
 	}
 	else
 	{
-		trigger_error('SORRY_AUTH_VIEW_ATTACH');
+		$row['forum_id'] = false;
+		if (!$auth->acl_get('u_pm_download'))
+		{
+			trigger_error('SORRY_AUTH_VIEW_ATTACH');
+		}
 	}
-}
-else
-{
-	$row['forum_id'] = 0;
-	if (!$auth->acl_get('u_pm_download') || !$config['auth_download_pm'])
-	{
-		trigger_error('SORRY_AUTH_VIEW_ATTACH');
-	}
-}
 
-// disallowed ?
-$extensions = array();
-if (!extension_allowed($row['forum_id'], $attachment['extension'], $extensions))
-{
-	trigger_error(sprintf($user->lang['EXTENSION_DISABLED_AFTER_POSTING'], $attachment['extension']));
+	// disallowed?
+	$extensions = array();
+	if (!extension_allowed($row['forum_id'], $attachment['extension'], $extensions))
+	{
+		trigger_error(sprintf($user->lang['EXTENSION_DISABLED_AFTER_POSTING'], $attachment['extension']));
+	}
 }
 
 if (!download_allowed())
@@ -100,24 +130,26 @@ if (!download_allowed())
 $download_mode = (int) $extensions[$attachment['extension']]['download_mode'];
 
 // Fetching filename here to prevent sniffing of filename
-$sql = 'SELECT attach_id, in_message, post_msg_id, extension, physical_filename, real_filename, mimetype
+$sql = 'SELECT attach_id, is_orphan, in_message, post_msg_id, extension, physical_filename, real_filename, mimetype
 	FROM ' . ATTACHMENTS_TABLE . "
 	WHERE attach_id = $download_id";
 $result = $db->sql_query_limit($sql, 1);
+$attachment = $db->sql_fetchrow($result);
+$db->sql_freeresult($result);
 
-if (!($attachment = $db->sql_fetchrow($result)))
+if (!$attachment)
 {
 	trigger_error('ERROR_NO_ATTACHMENT');
 }
-$db->sql_freeresult($result);
 
 $attachment['physical_filename'] = basename($attachment['physical_filename']);
+$display_cat = $extensions[$attachment['extension']]['display_cat'];
 
 if ($thumbnail)
 {
 	$attachment['physical_filename'] = 'thumb_' . $attachment['physical_filename'];
 }
-else
+else if (($display_cat == ATTACHMENT_CATEGORY_NONE || $display_cat == ATTACHMENT_CATEGORY_IMAGE) && !$attachment['is_orphan'])
 {
 	// Update download count
 	$sql = 'UPDATE ' . ATTACHMENTS_TABLE . ' 
@@ -129,12 +161,14 @@ else
 // Determine the 'presenting'-method
 if ($download_mode == PHYSICAL_LINK)
 {
+	// This presenting method should no longer be used
 	if (!@is_dir($phpbb_root_path . $config['upload_path']))
 	{
 		trigger_error($user->lang['PHYSICAL_DOWNLOAD_NOT_POSSIBLE']);
 	}
 
-	redirect($config['upload_path'] . '/' . $attachment['physical_filename']);
+	redirect($phpbb_root_path . $config['upload_path'] . '/' . $attachment['physical_filename']);
+	exit;
 }
 else
 {
@@ -157,82 +191,97 @@ function send_file_to_browser($attachment, $upload_dir, $category)
 		trigger_error($user->lang['ERROR_NO_ATTACHMENT'] . '<br /><br />' . sprintf($user->lang['FILE_NOT_FOUND_404'], $filename));
 	}
 
-	// Determine the Browser the User is using, because of some nasty incompatibilities.
-	// borrowed from phpMyAdmin. :)
-	$user_agent = (!empty($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : '';
-
-	if (ereg('Opera(/| )([0-9].[0-9]{1,2})', $user_agent, $log_version))
-	{
-		$browser_version = $log_version[2];
-		$browser_agent = 'opera';
-	}
-	else if (ereg('MSIE ([0-9].[0-9]{1,2})', $user_agent, $log_version))
-	{
-		$browser_version = $log_version[1];
-		$browser_agent = 'ie';
-	}
-	else if (ereg('OmniWeb/([0-9].[0-9]{1,2})', $user_agent, $log_version))
-	{
-		$browser_version = $log_version[1];
-		$browser_agent = 'omniweb';
-	}
-	else if (ereg('(Konqueror/)(.*)(;)', $user_agent, $log_version))
-	{
-		$browser_version = $log_version[2];
-		$browser_agent = 'konqueror';
-	}
-	else if (ereg('Mozilla/([0-9].[0-9]{1,2})', $user_agent, $log_version) && ereg('Safari/([0-9]*)', $user_agent, $log_version2))
-	{
-		$browser_version = $log_version[1] . '.' . $log_version2[1];
-		$browser_agent = 'safari';
-	}
-	else if (ereg('Mozilla/([0-9].[0-9]{1,2})', $user_agent, $log_version))
-	{
-		$browser_version = $log_version[1];
-		$browser_agent = 'mozilla';
-	}
-	else
-	{
-		$browser_version = 0;
-		$browser_agent = 'other';
-	}
-
 	// Correct the mime type - we force application/octetstream for all files, except images
 	// Please do not change this, it is a security precaution
-	if ($category == ATTACHMENT_CATEGORY_NONE && strpos($attachment['mimetype'], 'image') === false)
+	if (strpos($attachment['mimetype'], 'image') !== 0)
 	{
-		$attachment['mimetype'] = ($browser_agent == 'ie' || $browser_agent == 'opera') ? 'application/octetstream' : 'application/octet-stream';
+		$attachment['mimetype'] = (strpos(strtolower($user->browser), 'msie') !== false || strpos(strtolower($user->browser), 'opera') !== false) ? 'application/octetstream' : 'application/octet-stream';
 	}
 
 	if (@ob_get_length())
 	{
 		@ob_end_clean();
 	}
-	
-	// Now the tricky part... let's dance
-	header('Pragma: public');
-
-	// Send out the Headers
-	header('Content-Type: ' . $attachment['mimetype'] . '; name="' . $attachment['real_filename'] . '"');
-	header('Content-Disposition: inline; filename="' . $attachment['real_filename'] . '"');
 
 	// Now send the File Contents to the Browser
 	$size = @filesize($filename);
+
+	// To correctly display further errors we need to make sure we are using the correct headers for both (unsetting content-length may not work)
+
+	// Check if headers already sent or not able to get the file contents.
+	if (headers_sent() || !@file_exists($filename) || !@is_readable($filename))
+	{
+		// PHP track_errors setting On?
+		if (!empty($php_errormsg))
+		{
+			trigger_error($user->lang['UNABLE_TO_DELIVER_FILE'] . '<br />' . sprintf($user->lang['TRACKED_PHP_ERROR'], $php_errormsg));
+		}
+
+		trigger_error('UNABLE_TO_DELIVER_FILE');
+	}
+
+	// Now the tricky part... let's dance
+	header('Pragma: public');
+
+	/**
+	* Commented out X-Sendfile support. To not expose the physical filename within the header if xsendfile is absent we need to look into methods of checking it's status.
+	*
+	* Try X-Sendfile since it is much more server friendly - only works if the path is *not* outside of the root path...
+	* lighttpd has core support for it. An apache2 module is available at http://celebnamer.celebworld.ws/stuff/mod_xsendfile/
+	*
+	* Not really ideal, but should work fine...
+	* <code>
+	*	if (strpos($upload_dir, '/') !== 0 && strpos($upload_dir, '../') === false)
+	*	{
+	*		header('X-Sendfile: ' . $filename);
+	*	}
+	* </code>
+	*/
+
+	// Send out the Headers. Do not set Content-Disposition to inline please, it is a security measure for users using the Internet Explorer.
+	header('Content-Type: ' . $attachment['mimetype']);
+	header('Content-Disposition: ' . ((strpos($attachment['mimetype'], 'image') === 0) ? 'inline' : 'attachment') . '; ' . header_filename($attachment['real_filename']));
+
 	if ($size)
 	{
-		header("Content-length: $size");
+		header("Content-Length: $size");
 	}
-	$result = @readfile($filename);
-	
-	if (!$result)
+
+	// Try to deliver in chunks
+	@set_time_limit(0);
+
+	$fp = @fopen($filename, 'rb');
+
+	if ($fp !== false)
 	{
-		trigger_error('Unable to deliver file.<br />Error was: ' . $php_errormsg, E_USER_WARNING);
+		while (!feof($fp))
+		{
+			echo fread($fp, 8192);
+		}
+		fclose($fp);
 	}
 
 	flush();
 	exit;
 }
 
+/*
+* Get a browser friendly UTF-8 encoded filename
+*/
+function header_filename($file)
+{
+	// There be dragons here...
+	// IE follows no RFC, follow the RFC for extended filename for the rest
+	if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)
+	{
+		return "filename=" . rawurlencode($file);
+	}
+	else
+	{
+		return "filename*=UTF-8''" . rawurlencode($file);
+	}
+}
+
 /**
 * Check if downloading item is allowed
 */
@@ -245,7 +294,7 @@ function download_allowed()
 		return true;
 	}
 
-	$url = (getenv('HTTP_REFERER')) ? trim(getenv('HTTP_REFERER')) : trim($_SERVER['HTTP_REFERER']);
+	$url = (!empty($_SERVER['HTTP_REFERER'])) ? trim($_SERVER['HTTP_REFERER']) : trim(getenv('HTTP_REFERER'));
 
 	if (!$url)
 	{
@@ -253,25 +302,40 @@ function download_allowed()
 	}
 
 	// Split URL into domain and script part
-	$url = explode('?', str_replace(array('http://', 'https://'), array('', ''), $url));
-	$hostname = trim($url[0]);
+	$url = @parse_url($url);
+
+	if ($url === false)
+	{
+		return ($config['secure_allow_empty_referer']) ? true : false;
+	}
+
+	$hostname = $url['host'];
 	unset($url);
 
 	$allowed = ($config['secure_allow_deny']) ? false : true;
 	$iplist = array();
 
-	$ip_ary = gethostbynamel($hostname);
-
-	foreach ($ip_ary as $ip)
+	if (($ip_ary = @gethostbynamel($hostname)) !== false)
 	{
-		if ($ip)
+		foreach ($ip_ary as $ip)
 		{
-			$iplist[] = $ip;
+			if ($ip)
+			{
+				$iplist[] = $ip;
+			}
 		}
 	}
 	
 	// Check for own server...
-	if (preg_match('#^.*?' . $config['server_name'] . '.*?$#i', $hostname))
+	$server_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME');
+
+	// Forcing server vars is the only way to specify/override the protocol
+	if ($config['force_server_vars'] || !$server_name)
+	{
+		$server_name = $config['server_name'];
+	}
+
+	if (preg_match('#^.*?' . preg_quote($server_name, '#') . '.*?$#i', $hostname))
 	{
 		$allowed = true;
 	}
@@ -292,7 +356,7 @@ function download_allowed()
 			{
 				foreach ($iplist as $ip)
 				{
-					if (preg_match('#^' . str_replace('*', '.*?', $site_ip) . '$#i', $ip))
+					if (preg_match('#^' . str_replace('*', '.*?', preg_quote($site_ip, '#')) . '$#i', $ip))
 					{
 						if ($row['ip_exclude'])
 						{
@@ -309,7 +373,7 @@ function download_allowed()
 
 			if ($site_hostname)
 			{
-				if (preg_match('#^' . str_replace('*', '.*?', $site_hostname) . '$#i', $hostname))
+				if (preg_match('#^' . str_replace('*', '.*?', preg_quote($site_hostname, '#')) . '$#i', $hostname))
 				{
 					if ($row['ip_exclude'])
 					{
@@ -323,7 +387,6 @@ function download_allowed()
 				}
 			}
 		}
-
 		$db->sql_freeresult($result);
 	}
 	

phpBB/faq.php

@@ -9,11 +9,12 @@
 */
 
 /**
+* @ignore
 */
 define('IN_PHPBB', true);
 $phpbb_root_path = './';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
-include($phpbb_root_path . 'common.'.$phpEx);
+include($phpbb_root_path . 'common.' . $phpEx);
 
 // Start session management
 $user->session_begin();
@@ -28,85 +29,45 @@ switch ($mode)
 	case 'bbcode':
 		$l_title = $user->lang['BBCODE_GUIDE'];
 		$user->add_lang('bbcode', false, true);
-		break;
+	break;
 
 	default:
-		$l_title = $user->lang['FAQ'];
+		$l_title = $user->lang['FAQ_EXPLAIN'];
 		$user->add_lang('faq', false, true);
-		break;
+	break;
 }
 
 // Pull the array data from the lang pack
-$j = 0;
-$counter = 0;
-$counter_2 = 0;
-$help_block = array();
-$help_block_titles = array();
-
+$help_blocks = array();
 foreach ($user->help as $help_ary)
 {
-	if ($help_ary[0] != '--')
+	if ($help_ary[0] == '--')
 	{
-		$help_block[$j][$counter]['id'] = $counter_2;
-		$help_block[$j][$counter]['question'] = $help_ary[0];
-		$help_block[$j][$counter]['answer'] = $help_ary[1];
+		$template->assign_block_vars('faq_block', array(
+			'BLOCK_TITLE'		=> $help_ary[1])
+		);
 
-		$counter++;
-		$counter_2++;
+		continue;
 	}
-	else
-	{
-		$j = ($counter != 0) ? $j + 1 : 0;
 
-		$help_block_titles[$j] = $help_ary[1];
-
-		$counter = 0;
-	}
+	$template->assign_block_vars('faq_block.faq_row', array(
+		'FAQ_QUESTION'		=> $help_ary[0],
+		'FAQ_ANSWER'		=> $help_ary[1])
+	);
 }
 
-//
 // Lets build a page ...
 $template->assign_vars(array(
 	'L_FAQ_TITLE'	=> $l_title,
 	'L_BACK_TO_TOP'	=> $user->lang['BACK_TO_TOP'])
 );
 
-for ($i = 0, $size = sizeof($help_block); $i < $size; $i++)
-{
-	if (sizeof($help_block[$i]))
-	{
-		$template->assign_block_vars('faq_block', array(
-			'BLOCK_TITLE' => $help_block_titles[$i])
-		);
-
-		$template->assign_block_vars('faq_block_link', array(
-			'BLOCK_TITLE' => $help_block_titles[$i])
-		);
-
-		for ($j = 0, $_size = sizeof($help_block[$i]); $j < $_size; $j++)
-		{
-			$template->assign_block_vars('faq_block.faq_row', array(
-				'FAQ_QUESTION' => $help_block[$i][$j]['question'],
-				'FAQ_ANSWER' => $help_block[$i][$j]['answer'],
-
-				'U_FAQ_ID' => 'f'.$help_block[$i][$j]['id'])
-			);
-
-			$template->assign_block_vars('faq_block_link.faq_row_link', array(
-				'FAQ_LINK' => $help_block[$i][$j]['question'],
-
-				'U_FAQ_LINK' => '#f' . $help_block[$i][$j]['id'])
-			);
-		}
-	}
-}
-
 page_header($l_title);
 
 $template->set_filenames(array(
 	'body' => 'faq_body.html')
 );
-make_jumpbox('viewforum.'.$phpEx);
+make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx"));
 
 page_footer();
 

phpBB/images/avatars/gallery/index.htm

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