diff --git a/phpBB/admin/admin_forum_prune.php b/phpBB/admin/admin_forum_prune.php
index 7cd40fd1ef..a766360e12 100644
--- a/phpBB/admin/admin_forum_prune.php
+++ b/phpBB/admin/admin_forum_prune.php
@@ -168,9 +168,9 @@ else
 		$forum_name = ( $forum_id == -1 ) ? $lang['All_Forums'] : $forum_rows[0]['forum_name'];
 
 		$prune_data = $lang['Prune_topics_not_posted'] . " "; 
-		$prune_data .= '<input type="text" name="prunedays" size="4"> ' . $lang['Days'];
+		$prune_data .= '<input class="post" type="text" name="prunedays" size="4"> ' . $lang['Days'];
 
-		$hidden_input = '<input type="hidden" name="' . POST_FORUM_URL . '" value="' . $forum_id . '">';
+		$hidden_input = '<input type="hidden" name="' . POST_FORUM_URL . '" value="' . $forum_id . '" />';
 
 		//
 		// Assign the template variables.
diff --git a/phpBB/admin/admin_styles.php b/phpBB/admin/admin_styles.php
index 09e8917ba2..478369a4f9 100644
--- a/phpBB/admin/admin_styles.php
+++ b/phpBB/admin/admin_styles.php
@@ -748,7 +748,7 @@ switch( $mode )
 				$s_hidden_fields = '<input type="hidden" name="theme_info" value="' . htmlspecialchars($theme_data) . '" />';
 				$s_hidden_fields .= '<input type="hidden" name="send_file" value="1" /><input type="hidden" name="mode" value="export" />';
 				
-				$download_form = '<form action="' . append_sid("admin_styles.$phpEx") . '" method="post"><input type="submit" name="submit" value="' . $lang['Download'] . '" />' . $s_hidden_fields;
+				$download_form = '<form action="' . append_sid("admin_styles.$phpEx") . '" method="post"><input class="mainoption" type="submit" name="submit" value="' . $lang['Download'] . '" />' . $s_hidden_fields;
 
 				$template->set_filenames(array(
 					"body" => "message_body.tpl")
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 825da992f0..ba5b947a15 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -143,6 +143,11 @@ p,ul,td {font-size:10pt;}
 <li>Fixed wrong maxlength in modcp_split.tpl subject field</li>
 <li>Fixed inability to edit username of guest poster - <b>vHiker</b></li>
 <li>Fixed ability for guests to post with certain registered usernames</li>
+<li>Fixed various HTML issues to improve XHTML compliance - <b>Daz</b></li>
+<li>Fixed missing template var {L_PM} for memberslist - <b>Daz</b></li>
+<li>Fixed wrong key name for $images['Topic_un_watch'] - <b>Daz</b></li>
+<li>Fixed missing template var {S_WATCH_TOPIC_IMG} for viewtopic - <b>Daz</b></li>
+<li></li>
 <li></li>
 </ul>
 
diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html
index 18af111d91..b16714346a 100644
--- a/phpBB/docs/README.html
+++ b/phpBB/docs/README.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html">
 <meta http-equiv="Content-Style-Type" content="text/css">
-<title>phpBB 2.0.3 :: Readme</title>
+<title>phpBB 2.0.4 :: Readme</title>
 <link rel="stylesheet" href="../templates/subSilver/subSilver.css" type="text/css" />
 <style type="text/css">
 <!--
@@ -24,7 +24,7 @@ p,ul,td {font-size:10pt;}
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 	<tr>
 		<td><img src="../templates/subSilver/images/logo_phpBB.gif" border="0" alt="phpBB 2 : Creating Communities" vspace="1" /></a></td>
-		<td align="center" width="100%" valign="middle"><span class="maintitle">phpBB 2.0.3 README</span></td>
+		<td align="center" width="100%" valign="middle"><span class="maintitle">phpBB 2.0.4 README</span></td>
 	</tr>
 </table>
 
@@ -76,7 +76,7 @@ p,ul,td {font-size:10pt;}
 
 <p>A number of language packs and subSilver localisations are now available. You can find them on our official download page:</p>
 
-<p><a href="http://www.phpbb.com/downloads.php" target="_new">http://www.phpbb.com/downloads.php</a></p>
+<p><a href="http://www.phpbb.com/downloads.php#lang" target="_new">http://www.phpbb.com/downloads.php</a></p>
 
 <p>This is the <i>Official</i> location for all support 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>
 
@@ -84,7 +84,7 @@ p,ul,td {font-size:10pt;}
 
 <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>
 
-<p><b>Please note</b> that users who have upgraded to 2.0.3 from versions prior to RC-3 should will <b>need</b> to download new versions of the language/subSilver image packs. Any package downloaded prior to the availability of RC-3 will <b>not</b> function correctly with this version of phpBB 2.</p>
+<p><b>Please note</b> that users who have upgraded to 2.0.4 from versions prior to RC-3 should will <b>need</b> to download new versions of the language/subSilver image packs. Any package downloaded prior to the availability of RC-3 will <b>not</b> function correctly with this version of phpBB 2.</p>
 
 <p>If you have upgraded from 2.0.0 and make use of non-English language packs you will benefit from downloading updated versions which will become available shortly. These introduce a number of strings which went missing from the first version plus a few updates and additions.</p>
 
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 38233139c6..e17c60d563 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -122,7 +122,7 @@ function make_jumpbox($action, $match_forum_id = 0)
 			message_die(GENERAL_ERROR, 'Could not obtain forums information', '', __LINE__, __FILE__, $sql);
 		}
 
-		$boxstring = '<select name="' . POST_FORUM_URL . '" onChange="if(this.options[this.selectedIndex].value != -1){ forms[\'jumpbox\'].submit() }"><option value="-1">' . $lang['Select_forum'] . '</option>';
+		$boxstring = '<select name="' . POST_FORUM_URL . '" onchange="if(this.options[this.selectedIndex].value != -1){ forms[\'jumpbox\'].submit() }"><option value="-1">' . $lang['Select_forum'] . '</option>';
 
 		$forum_rows = array();
 		while ( $row = $db->sql_fetchrow($result) )
@@ -171,7 +171,7 @@ function make_jumpbox($action, $match_forum_id = 0)
 	}
 	else
 	{
-		$boxstring .= '<select name="' . POST_FORUM_URL . '" onChange="if(this.options[this.selectedIndex].value != -1){ forms[\'jumpbox\'].submit() }"></select>';
+		$boxstring .= '<select name="' . POST_FORUM_URL . '" onchange="if(this.options[this.selectedIndex].value != -1){ forms[\'jumpbox\'].submit() }"></select>';
 	}
 
 	if ( !empty($SID) )
diff --git a/phpBB/includes/functions_post.php b/phpBB/includes/functions_post.php
index 2c6f0c7b35..95ba928bf2 100644
--- a/phpBB/includes/functions_post.php
+++ b/phpBB/includes/functions_post.php
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-if ( !defined('IN_PHPBB') )
+if (!defined('IN_PHPBB'))
 {
 	die('Hacking attempt');
 }
@@ -39,67 +39,46 @@ function prepare_message($message, $html_on, $bbcode_on, $smile_on, $bbcode_uid
 {
 	global $board_config, $html_entities_match, $html_entities_replace;
 
-	// Clean up the message - comment out second line if reverting to old
-	// html system
+	//
+	// Clean up the message
+	//
 	$message = trim($message);
-	$message = preg_replace($html_entities_match, $html_entities_replace, $message);
 
 	if ($html_on)
 	{
-		// ported from 2.2 - old system remains commented out below
-		// If $html is true then "allowed_tags" are converted back from entity
-		// form, others remain ... note this differs from the old version where you
-		// only needed to specify the first part of the tag ... with this version
-		// you need to specify either the exact layout of the tag or use preg_
-		// pattern matches ... this should prevent users from abusing simple
-		// tags by adding styles with javascript, etc. but may complicate the lives
-		// of those who use things like flash etc. ... it also won't close tags
-		// which have previously been left in entity form, e.g. <b style="fdsfs">dfsdf</b>
-		// assuming b was in the allowed tags it would leave the <b style ...> but convert
-		// the </b> ... will look into tightening this up for 2.0.5 (and 2.2 of course)
-		$allowed_tags = split(',', $board_config['allow_html_tags']);
-
-		if (sizeof($allowed_tags))
-		{
-			$message = preg_replace('#&lt;(\/?)(' . str_replace('*', '.*?', implode('|', $allowed_tags)) . ')&gt;#is', '<\1\2>', $message);
-		}
-	}	
-/*
-	if ($html_on)
-	{
-		$allowed_tags = split(',', $board_config['allow_html_tags']);
+		$allowed_html_tags = split(',', $board_config['allow_html_tags']);
 
 		$end_html = 0;
 		$start_html = 1;
 		$tmp_message = '';
 		$message = ' ' . $message . ' ';
 
-		while ( $start_html = strpos($message, '<', $start_html) )
+		while ($start_html = strpos($message, '<', $start_html))
 		{
-			$tmp_message .= preg_replace($html_entities_match, $html_entities_replace, substr($message, $end_html + 1, ( $start_html - $end_html - 1 )));
+			$tmp_message .= preg_replace($html_entities_match, $html_entities_replace, substr($message, $end_html + 1, ($start_html - $end_html - 1)));
 
-			if ( $end_html = strpos($message, '>', $start_html) )
+			if ($end_html = strpos($message, '>', $start_html))
 			{
 				$length = $end_html - $start_html + 1;
 				$hold_string = substr($message, $start_html, $length);
 
-				if ( ( $unclosed_open = strrpos(' ' . $hold_string, '<') ) != 1 )
+				if (($unclosed_open = strrpos(' ' . $hold_string, '<')) != 1)
 				{
 					$tmp_message .= preg_replace($html_entities_match, $html_entities_replace, substr($hold_string, 0, $unclosed_open - 1));
 					$hold_string = substr($hold_string, $unclosed_open - 1);
 				}
 
 				$tagallowed = false;
-				for($i = 0; $i < sizeof($allowed_html_tags); $i++)
+				for ($i = 0; $i < sizeof($allowed_html_tags); $i++)
 				{
 					$match_tag = trim($allowed_html_tags[$i]);
-					if ( preg_match('/^<\/?' . $match_tag . '(?!(\s*)style(\s*)\\=)/i', $hold_string) )
+					if (preg_match('#^<\/?' . $match_tag . '(?!(.*?)((style)|(on[\w]+?))[\s]*?)#i', $hold_string))
 					{
 						$tagallowed = true;
 					}
 				}
 
-				$tmp_message .= ( $length && !$tagallowed ) ? preg_replace($html_entities_match, $html_entities_replace, $hold_string) : $hold_string;
+				$tmp_message .= ($length && !$tagallowed) ? preg_replace($html_entities_match, $html_entities_replace, $hold_string) : $hold_string;
 
 				$start_html += $length;
 			}
@@ -112,20 +91,19 @@ function prepare_message($message, $html_on, $bbcode_on, $smile_on, $bbcode_uid
 			}
 		}
 
-		if ( $end_html != strlen($message) && $tmp_message != '' )
+		if ($end_html != strlen($message) && $tmp_message != '')
 		{
 			$tmp_message .= preg_replace($html_entities_match, $html_entities_replace, substr($message, $end_html + 1));
 		}
 
-		$message = ( $tmp_message != '' ) ? trim($tmp_message) : trim($message);
+		$message = ($tmp_message != '') ? trim($tmp_message) : trim($message);
 	}
 	else
 	{
 		$message = preg_replace($html_entities_match, $html_entities_replace, $message);
 	}
-*/
 
-	if( $bbcode_on && $bbcode_uid != '' )
+	if($bbcode_on && $bbcode_uid != '')
 	{
 		$message = bbencode_first_pass($message, $bbcode_uid);
 	}
@@ -148,18 +126,18 @@ function prepare_post(&$mode, &$post_data, &$bbcode_on, &$html_on, &$smilies_on,
 	global $board_config, $userdata, $lang, $phpEx, $phpbb_root_path;
 
 	// Check username
-	if ( !empty($username) )
+	if (!empty($username))
 	{
 		$username = trim(strip_tags($username));
 
-		if ( !$userdata['session_logged_in'] || ( $userdata['session_logged_in'] && $username != $userdata['username'] ) )
+		if (!$userdata['session_logged_in'] || ($userdata['session_logged_in'] && $username != $userdata['username']))
 		{
 			include($phpbb_root_path . 'includes/functions_validate.'.$phpEx);
 
 			$result = validate_username($username);
-			if ( $result['error'] )
+			if ($result['error'])
 			{
-				$error_msg .= ( !empty($error_msg) ) ? '<br />' . $result['error_msg'] : $result['error_msg'];
+				$error_msg .= (!empty($error_msg)) ? '<br />' . $result['error_msg'] : $result['error_msg'];
 			}
 		}
 		else
@@ -169,62 +147,62 @@ function prepare_post(&$mode, &$post_data, &$bbcode_on, &$html_on, &$smilies_on,
 	}
 
 	// Check subject
-	if ( !empty($subject) )
+	if (!empty($subject))
 	{
 		$subject = htmlspecialchars(trim($subject));
 	}
-	else if ( $mode == 'newtopic' || ( $mode == 'editpost' && $post_data['first_post'] ) )
+	else if ($mode == 'newtopic' || ($mode == 'editpost' && $post_data['first_post']))
 	{
-		$error_msg .= ( !empty($error_msg) ) ? '<br />' . $lang['Empty_subject'] : $lang['Empty_subject'];
+		$error_msg .= (!empty($error_msg)) ? '<br />' . $lang['Empty_subject'] : $lang['Empty_subject'];
 	}
 
 	// Check message
-	if ( !empty($message) )
+	if (!empty($message))
 	{
-		$bbcode_uid = ( $bbcode_on ) ? make_bbcode_uid() : '';
+		$bbcode_uid = ($bbcode_on) ? make_bbcode_uid() : '';
 		$message = prepare_message(trim($message), $html_on, $bbcode_on, $smilies_on, $bbcode_uid);
 	}
-	else if ( $mode != 'delete' && $mode != 'poll_delete' ) 
+	else if ($mode != 'delete' && $mode != 'poll_delete') 
 	{
-		$error_msg .= ( !empty($error_msg) ) ? '<br />' . $lang['Empty_message'] : $lang['Empty_message'];
+		$error_msg .= (!empty($error_msg)) ? '<br />' . $lang['Empty_message'] : $lang['Empty_message'];
 	}
 
 	//
 	// Handle poll stuff
 	//
-	if ( $mode == 'newtopic' || ( $mode == 'editpost' && $post_data['first_post'] ) )
+	if ($mode == 'newtopic' || ($mode == 'editpost' && $post_data['first_post']))
 	{
-		$poll_length = ( isset($poll_length) ) ? max(0, intval($poll_length)) : 0;
+		$poll_length = (isset($poll_length)) ? max(0, intval($poll_length)) : 0;
 
-		if ( !empty($poll_title) )
+		if (!empty($poll_title))
 		{
 			$poll_title = htmlspecialchars(trim($poll_title));
 		}
 
-		if( !empty($poll_options) )
+		if(!empty($poll_options))
 		{
 			$temp_option_text = array();
-			while( list($option_id, $option_text) = @each($poll_options) )
+			while(list($option_id, $option_text) = @each($poll_options))
 			{
 				$option_text = trim($option_text);
-				if ( !empty($option_text) )
+				if (!empty($option_text))
 				{
 					$temp_option_text[$option_id] = htmlspecialchars($option_text);
 				}
 			}
 			$option_text = $temp_option_text;
 
-			if ( count($poll_options) < 2 )
+			if (count($poll_options) < 2)
 			{
-				$error_msg .= ( !empty($error_msg) ) ? '<br />' . $lang['To_few_poll_options'] : $lang['To_few_poll_options'];
+				$error_msg .= (!empty($error_msg)) ? '<br />' . $lang['To_few_poll_options'] : $lang['To_few_poll_options'];
 			}
-			else if ( count($poll_options) > $board_config['max_poll_options'] ) 
+			else if (count($poll_options) > $board_config['max_poll_options']) 
 			{
-				$error_msg .= ( !empty($error_msg) ) ? '<br />' . $lang['To_many_poll_options'] : $lang['To_many_poll_options'];
+				$error_msg .= (!empty($error_msg)) ? '<br />' . $lang['To_many_poll_options'] : $lang['To_many_poll_options'];
 			}
-			else if ( $poll_title == '' )
+			else if ($poll_title == '')
 			{
-				$error_msg .= ( !empty($error_msg) ) ? '<br />' . $lang['Empty_poll_title'] : $lang['Empty_poll_title'];
+				$error_msg .= (!empty($error_msg)) ? '<br />' . $lang['Empty_poll_title'] : $lang['Empty_poll_title'];
 			}
 		}
 	}
@@ -244,60 +222,60 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 
 	$current_time = time();
 
-	if ( $mode == 'newtopic' || $mode == 'reply' ) 
+	if ($mode == 'newtopic' || $mode == 'reply') 
 	{
 		//
 		// Flood control
 		//
-		$where_sql = ( $userdata['user_id'] == ANONYMOUS ) ? "poster_ip = '$user_ip'" : 'poster_id = ' . $userdata['user_id'];
+		$where_sql = ($userdata['user_id'] == ANONYMOUS) ? "poster_ip = '$user_ip'" : 'poster_id = ' . $userdata['user_id'];
 		$sql = "SELECT MAX(post_time) AS last_post_time
 			FROM " . POSTS_TABLE . "
 			WHERE $where_sql";
-		if ( $result = $db->sql_query($sql) )
+		if ($result = $db->sql_query($sql))
 		{
-			if ( $row = $db->sql_fetchrow($result) )
+			if ($row = $db->sql_fetchrow($result))
 			{
-				if ( intval($row['last_post_time']) > 0 && ( $current_time - intval($row['last_post_time']) ) < intval($board_config['flood_interval']) )
+				if (intval($row['last_post_time']) > 0 && ($current_time - intval($row['last_post_time'])) < intval($board_config['flood_interval']))
 				{
 					message_die(GENERAL_MESSAGE, $lang['Flood_Error']);
 				}
 			}
 		}
 	}
-	else if ( $mode == 'editpost' )
+	else if ($mode == 'editpost')
 	{
 		remove_search_post($post_id);
 	}
 
-	if ( $mode == 'newtopic' || ( $mode == 'editpost' && $post_data['first_post'] ) )
+	if ($mode == 'newtopic' || ($mode == 'editpost' && $post_data['first_post']))
 	{
-		$topic_vote = ( !empty($poll_title) && count($poll_options) >= 2 ) ? 1 : 0;
-		$sql  = ( $mode != "editpost" ) ? "INSERT INTO " . TOPICS_TABLE . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type, topic_vote) VALUES ('$post_subject', " . $userdata['user_id'] . ", $current_time, $forum_id, " . TOPIC_UNLOCKED . ", $topic_type, $topic_vote)" : "UPDATE " . TOPICS_TABLE . " SET topic_title = '$post_subject', topic_type = $topic_type, topic_vote = $topic_vote WHERE topic_id = $topic_id";
-		if ( !$db->sql_query($sql) )
+		$topic_vote = (!empty($poll_title) && count($poll_options) >= 2) ? 1 : 0;
+		$sql  = ($mode != "editpost") ? "INSERT INTO " . TOPICS_TABLE . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type, topic_vote) VALUES ('$post_subject', " . $userdata['user_id'] . ", $current_time, $forum_id, " . TOPIC_UNLOCKED . ", $topic_type, $topic_vote)" : "UPDATE " . TOPICS_TABLE . " SET topic_title = '$post_subject', topic_type = $topic_type, topic_vote = $topic_vote WHERE topic_id = $topic_id";
+		if (!$db->sql_query($sql))
 		{
 			message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 		}
 
-		if ( $mode == 'newtopic' )
+		if ($mode == 'newtopic')
 		{
 			$topic_id = $db->sql_nextid();
 		}
 	}
 
-	$edited_sql = ( $mode == 'editpost' && !$post_data['last_post'] && $post_data['poster_post'] ) ? ", post_edit_time = $current_time, post_edit_count = post_edit_count + 1 " : "";
-	$sql = ( $mode != "editpost" ) ? "INSERT INTO " . POSTS_TABLE . " (topic_id, forum_id, poster_id, post_username, post_time, poster_ip, enable_bbcode, enable_html, enable_smilies, enable_sig) VALUES ($topic_id, $forum_id, " . $userdata['user_id'] . ", '$post_username', $current_time, '$user_ip', $bbcode_on, $html_on, $smilies_on, $attach_sig)" : "UPDATE " . POSTS_TABLE . " SET post_username = $post_username, enable_bbcode = $bbcode_on, enable_html = $html_on, enable_smilies = $smilies_on, enable_sig = $attach_sig" . $edited_sql . " WHERE post_id = $post_id";
-	if ( !$db->sql_query($sql, BEGIN_TRANSACTION) )
+	$edited_sql = ($mode == 'editpost' && !$post_data['last_post'] && $post_data['poster_post']) ? ", post_edit_time = $current_time, post_edit_count = post_edit_count + 1 " : "";
+	$sql = ($mode != "editpost") ? "INSERT INTO " . POSTS_TABLE . " (topic_id, forum_id, poster_id, post_username, post_time, poster_ip, enable_bbcode, enable_html, enable_smilies, enable_sig) VALUES ($topic_id, $forum_id, " . $userdata['user_id'] . ", '$post_username', $current_time, '$user_ip', $bbcode_on, $html_on, $smilies_on, $attach_sig)" : "UPDATE " . POSTS_TABLE . " SET post_username = $post_username, enable_bbcode = $bbcode_on, enable_html = $html_on, enable_smilies = $smilies_on, enable_sig = $attach_sig" . $edited_sql . " WHERE post_id = $post_id";
+	if (!$db->sql_query($sql, BEGIN_TRANSACTION))
 	{
 		message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 	}
 
-	if ( $mode != 'editpost' )
+	if ($mode != 'editpost')
 	{
 		$post_id = $db->sql_nextid();
 	}
 
-	$sql = ( $mode != 'editpost' ) ? "INSERT INTO " . POSTS_TEXT_TABLE . " (post_id, post_subject, bbcode_uid, post_text) VALUES ($post_id, '$post_subject', '$bbcode_uid', '$post_message')" : "UPDATE " . POSTS_TEXT_TABLE . " SET post_text = '$post_message',  bbcode_uid = '$bbcode_uid', post_subject = '$post_subject' WHERE post_id = $post_id";
-	if ( !$db->sql_query($sql) )
+	$sql = ($mode != 'editpost') ? "INSERT INTO " . POSTS_TEXT_TABLE . " (post_id, post_subject, bbcode_uid, post_text) VALUES ($post_id, '$post_subject', '$bbcode_uid', '$post_message')" : "UPDATE " . POSTS_TEXT_TABLE . " SET post_text = '$post_message',  bbcode_uid = '$bbcode_uid', post_subject = '$post_subject' WHERE post_id = $post_id";
+	if (!$db->sql_query($sql))
 	{
 		message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 	}
@@ -309,32 +287,32 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 	// 
 	if (($mode == 'newtopic' || ($mode == 'editpost' && $post_data['edit_poll'])) && !empty($poll_title) && count($poll_options) >= 2)
 	{
-		$sql = ( !$post_data['has_poll'] ) ? "INSERT INTO " . VOTE_DESC_TABLE . " (topic_id, vote_text, vote_start, vote_length) VALUES ($topic_id, '$poll_title', $current_time, " . ( $poll_length * 86400 ) . ")" : "UPDATE " . VOTE_DESC_TABLE . " SET vote_text = '$poll_title', vote_length = " . ( $poll_length * 86400 ) . " WHERE topic_id = $topic_id";
-		if ( !$db->sql_query($sql) )
+		$sql = (!$post_data['has_poll']) ? "INSERT INTO " . VOTE_DESC_TABLE . " (topic_id, vote_text, vote_start, vote_length) VALUES ($topic_id, '$poll_title', $current_time, " . ($poll_length * 86400) . ")" : "UPDATE " . VOTE_DESC_TABLE . " SET vote_text = '$poll_title', vote_length = " . ($poll_length * 86400) . " WHERE topic_id = $topic_id";
+		if (!$db->sql_query($sql))
 		{
 			message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 		}
 
 		$delete_option_sql = '';
 		$old_poll_result = array();
-		if ( $mode == 'editpost' && $post_data['has_poll'] )
+		if ($mode == 'editpost' && $post_data['has_poll'])
 		{
 			$sql = "SELECT vote_option_id, vote_result  
 				FROM " . VOTE_RESULTS_TABLE . " 
 				WHERE vote_id = $poll_id 
 				ORDER BY vote_option_id ASC";
-			if ( !($result = $db->sql_query($sql)) )
+			if (!($result = $db->sql_query($sql)))
 			{
 				message_die(GENERAL_ERROR, 'Could not obtain vote data results for this topic', '', __LINE__, __FILE__, $sql);
 			}
 
-			while ( $row = $db->sql_fetchrow($result) )
+			while ($row = $db->sql_fetchrow($result))
 			{
 				$old_poll_result[$row['vote_option_id']] = $row['vote_result'];
 
-				if ( !isset($poll_options[$row['vote_option_id']]) )
+				if (!isset($poll_options[$row['vote_option_id']]))
 				{
-					$delete_option_sql .= ( $delete_option_sql != '' ) ? ', ' . $row['vote_option_id'] : $row['vote_option_id'];
+					$delete_option_sql .= ($delete_option_sql != '') ? ', ' . $row['vote_option_id'] : $row['vote_option_id'];
 				}
 			}
 		}
@@ -346,15 +324,15 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 		@reset($poll_options);
 
 		$poll_option_id = 1;
-		while ( list($option_id, $option_text) = each($poll_options) )
+		while (list($option_id, $option_text) = each($poll_options))
 		{
-			if ( !empty($option_text) )
+			if (!empty($option_text))
 			{
 				$option_text = str_replace("\'", "''", htmlspecialchars($option_text));
-				$poll_result = ( $mode == "editpost" && isset($old_poll_result[$option_id]) ) ? $old_poll_result[$option_id] : 0;
+				$poll_result = ($mode == "editpost" && isset($old_poll_result[$option_id])) ? $old_poll_result[$option_id] : 0;
 
-				$sql = ( $mode != "editpost" || !isset($old_poll_result[$option_id]) ) ? "INSERT INTO " . VOTE_RESULTS_TABLE . " (vote_id, vote_option_id, vote_option_text, vote_result) VALUES ($poll_id, $poll_option_id, '$option_text', $poll_result)" : "UPDATE " . VOTE_RESULTS_TABLE . " SET vote_option_text = '$option_text', vote_result = $poll_result WHERE vote_option_id = $option_id AND vote_id = $poll_id";
-				if ( !$db->sql_query($sql) )
+				$sql = ($mode != "editpost" || !isset($old_poll_result[$option_id])) ? "INSERT INTO " . VOTE_RESULTS_TABLE . " (vote_id, vote_option_id, vote_option_text, vote_result) VALUES ($poll_id, $poll_option_id, '$option_text', $poll_result)" : "UPDATE " . VOTE_RESULTS_TABLE . " SET vote_option_text = '$option_text', vote_result = $poll_result WHERE vote_option_id = $option_id AND vote_id = $poll_id";
+				if (!$db->sql_query($sql))
 				{
 					message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 				}
@@ -362,12 +340,12 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 			}
 		}
 
-		if ( $delete_option_sql != '' )
+		if ($delete_option_sql != '')
 		{
 			$sql = "DELETE FROM " . VOTE_RESULTS_TABLE . " 
 				WHERE vote_option_id IN ($delete_option_sql) 
 					AND vote_id = $poll_id";
-			if ( !$db->sql_query($sql) )
+			if (!$db->sql_query($sql))
 			{
 				message_die(GENERAL_ERROR, 'Error deleting pruned poll options', '', __LINE__, __FILE__, $sql);
 			}
@@ -387,15 +365,15 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i
 {
 	global $db;
 
-	$sign = ( $mode == 'delete' ) ? '- 1' : '+ 1';
+	$sign = ($mode == 'delete') ? '- 1' : '+ 1';
 	$forum_update_sql = "forum_posts = forum_posts $sign";
 	$topic_update_sql = '';
 
-	if ( $mode == 'delete' )
+	if ($mode == 'delete')
 	{
-		if ( $post_data['last_post'] )
+		if ($post_data['last_post'])
 		{
-			if ( $post_data['first_post'] )
+			if ($post_data['first_post'])
 			{
 				$forum_update_sql .= ', forum_topics = forum_topics - 1';
 			}
@@ -407,44 +385,44 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i
 				$sql = "SELECT MAX(post_id) AS last_post_id
 					FROM " . POSTS_TABLE . " 
 					WHERE topic_id = $topic_id";
-				if ( !($result = $db->sql_query($sql)) )
+				if (!($result = $db->sql_query($sql)))
 				{
 					message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
 				}
 
-				if ( $row = $db->sql_fetchrow($result) )
+				if ($row = $db->sql_fetchrow($result))
 				{
 					$topic_update_sql .= ', topic_last_post_id = ' . $row['last_post_id'];
 				}
 			}
 
-			if ( $post_data['last_topic'] )
+			if ($post_data['last_topic'])
 			{
 				$sql = "SELECT MAX(post_id) AS last_post_id
 					FROM " . POSTS_TABLE . " 
 					WHERE forum_id = $forum_id"; 
-				if ( !($result = $db->sql_query($sql)) )
+				if (!($result = $db->sql_query($sql)))
 				{
 					message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
 				}
 
-				if ( $row = $db->sql_fetchrow($result) )
+				if ($row = $db->sql_fetchrow($result))
 				{
-					$forum_update_sql .= ( $row['last_post_id'] ) ? ', forum_last_post_id = ' . $row['last_post_id'] : ', forum_last_post_id = 0';
+					$forum_update_sql .= ($row['last_post_id']) ? ', forum_last_post_id = ' . $row['last_post_id'] : ', forum_last_post_id = 0';
 				}
 			}
 		}
-		else if ( $post_data['first_post'] ) 
+		else if ($post_data['first_post']) 
 		{
 			$sql = "SELECT MIN(post_id) AS first_post_id
 				FROM " . POSTS_TABLE . " 
 				WHERE topic_id = $topic_id";
-			if ( !($result = $db->sql_query($sql)) )
+			if (!($result = $db->sql_query($sql)))
 			{
 				message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
 			}
 
-			if ( $row = $db->sql_fetchrow($result) )
+			if ($row = $db->sql_fetchrow($result))
 			{
 				$topic_update_sql .= 'topic_replies = topic_replies - 1, topic_first_post_id = ' . $row['first_post_id'];
 			}
@@ -454,10 +432,10 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i
 			$topic_update_sql .= 'topic_replies = topic_replies - 1';
 		}
 	}
-	else if ( $mode != 'poll_delete' )
+	else if ($mode != 'poll_delete')
 	{
-		$forum_update_sql .= ", forum_last_post_id = $post_id" . ( ( $mode == 'newtopic' ) ? ", forum_topics = forum_topics $sign" : "" ); 
-		$topic_update_sql = "topic_last_post_id = $post_id" . ( ( $mode == 'reply' ) ? ", topic_replies = topic_replies $sign" : ", topic_first_post_id = $post_id" );
+		$forum_update_sql .= ", forum_last_post_id = $post_id" . (($mode == 'newtopic') ? ", forum_topics = forum_topics $sign" : ""); 
+		$topic_update_sql = "topic_last_post_id = $post_id" . (($mode == 'reply') ? ", topic_replies = topic_replies $sign" : ", topic_first_post_id = $post_id");
 	}
 	else 
 	{
@@ -467,28 +445,28 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i
 	$sql = "UPDATE " . FORUMS_TABLE . " SET 
 		$forum_update_sql 
 		WHERE forum_id = $forum_id";
-	if ( !$db->sql_query($sql) )
+	if (!$db->sql_query($sql))
 	{
 		message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 	}
 
-	if ( $topic_update_sql != '' )
+	if ($topic_update_sql != '')
 	{
 		$sql = "UPDATE " . TOPICS_TABLE . " SET 
 			$topic_update_sql 
 			WHERE topic_id = $topic_id";
-		if ( !$db->sql_query($sql) )
+		if (!$db->sql_query($sql))
 		{
 			message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 		}
 	}
 
-	if ( $mode != 'poll_delete' )
+	if ($mode != 'poll_delete')
 	{
 		$sql = "UPDATE " . USERS_TABLE . "
 			SET user_posts = user_posts $sign 
 			WHERE user_id = $user_id";
-		if ( !$db->sql_query($sql, END_TRANSACTION) )
+		if (!$db->sql_query($sql, END_TRANSACTION))
 		{
 			message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 		}
@@ -505,40 +483,40 @@ function delete_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 	global $board_config, $lang, $db, $phpbb_root_path, $phpEx;
 	global $userdata, $user_ip;
 
-	if ( $mode != 'poll_delete' )
+	if ($mode != 'poll_delete')
 	{
 		include($phpbb_root_path . 'includes/functions_search.'.$phpEx);
 
 		$sql = "DELETE FROM " . POSTS_TABLE . " 
 			WHERE post_id = $post_id";
-		if ( !$db->sql_query($sql) )
+		if (!$db->sql_query($sql))
 		{
 			message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
 		}
 
 		$sql = "DELETE FROM " . POSTS_TEXT_TABLE . " 
 			WHERE post_id = $post_id";
-		if ( !$db->sql_query($sql) )
+		if (!$db->sql_query($sql))
 		{
 			message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
 		}
 
-		if ( $post_data['last_post'] )
+		if ($post_data['last_post'])
 		{
-			if ( $post_data['first_post'] )
+			if ($post_data['first_post'])
 			{
 				$forum_update_sql .= ', forum_topics = forum_topics - 1';
 				$sql = "DELETE FROM " . TOPICS_TABLE . " 
 					WHERE topic_id = $topic_id 
 						OR topic_moved_id = $topic_id";
-				if ( !$db->sql_query($sql) )
+				if (!$db->sql_query($sql))
 				{
 					message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
 				}
 
 				$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . "
 					WHERE topic_id = $topic_id";
-				if ( !$db->sql_query($sql) )
+				if (!$db->sql_query($sql))
 				{
 					message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
 				}
@@ -548,31 +526,31 @@ function delete_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 		remove_search_post($post_id);
 	}
 
-	if ( $mode == 'poll_delete' || ( $mode == 'delete' && $post_data['first_post'] && $post_data['last_post'] ) && $post_data['has_poll'] && $post_data['edit_poll'] )
+	if ($mode == 'poll_delete' || ($mode == 'delete' && $post_data['first_post'] && $post_data['last_post']) && $post_data['has_poll'] && $post_data['edit_poll'])
 	{
 		$sql = "DELETE FROM " . VOTE_DESC_TABLE . " 
 			WHERE topic_id = $topic_id";
-		if ( !$db->sql_query($sql) )
+		if (!$db->sql_query($sql))
 		{
 			message_die(GENERAL_ERROR, 'Error in deleting poll', '', __LINE__, __FILE__, $sql);
 		}
 
 		$sql = "DELETE FROM " . VOTE_RESULTS_TABLE . " 
 			WHERE vote_id = $poll_id";
-		if ( !$db->sql_query($sql) )
+		if (!$db->sql_query($sql))
 		{
 			message_die(GENERAL_ERROR, 'Error in deleting poll', '', __LINE__, __FILE__, $sql);
 		}
 
 		$sql = "DELETE FROM " . VOTE_USERS_TABLE . " 
 			WHERE vote_id = $poll_id";
-		if ( !$db->sql_query($sql) )
+		if (!$db->sql_query($sql))
 		{
 			message_die(GENERAL_ERROR, 'Error in deleting poll', '', __LINE__, __FILE__, $sql);
 		}
 	}
 
-	if ( $mode == 'delete' && $post_data['first_post'] && $post_data['last_post'] )
+	if ($mode == 'delete' && $post_data['first_post'] && $post_data['last_post'])
 	{
 		$meta = '<meta http-equiv="refresh" content="3;url=' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . '=' . $forum_id) . '">';
 		$message = $lang['Deleted'];
@@ -580,7 +558,7 @@ function delete_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 	else
 	{
 		$meta = '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . '=' . $topic_id) . '">';
-		$message = ( ( $mode == 'poll_delete' ) ? $lang['Poll_delete'] : $lang['Deleted'] ) . '<br /><br />' . sprintf($lang['Click_return_topic'], '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . '">', '</a>');
+		$message = (($mode == 'poll_delete') ? $lang['Poll_delete'] : $lang['Deleted']) . '<br /><br />' . sprintf($lang['Click_return_topic'], '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . '">', '</a>');
 	}
 
 	$message .=  '<br /><br />' . sprintf($lang['Click_return_forum'], '<a href="' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">', '</a>');
@@ -598,30 +576,30 @@ function user_notification($mode, &$post_data, &$topic_title, &$forum_id, &$topi
 
 	$current_time = time();
 
-	if ( $mode == 'delete' )
+	if ($mode == 'delete')
 	{
-		$delete_sql = ( !$post_data['first_post'] && !$post_data['last_post'] ) ? " AND user_id = " . $userdata['user_id'] : '';
+		$delete_sql = (!$post_data['first_post'] && !$post_data['last_post']) ? " AND user_id = " . $userdata['user_id'] : '';
 		$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . " WHERE topic_id = $topic_id" . $delete_sql;
-		if ( !$db->sql_query($sql) )
+		if (!$db->sql_query($sql))
 		{
 			message_die(GENERAL_ERROR, 'Could not change topic notify data', '', __LINE__, __FILE__, $sql);
 		}
 	}
 	else 
 	{
-		if ( $mode == 'reply' )
+		if ($mode == 'reply')
 		{
 			$sql = "SELECT ban_userid 
 				FROM " . BANLIST_TABLE;
-			if ( !($result = $db->sql_query($sql)) )
+			if (!($result = $db->sql_query($sql)))
 			{
 				message_die(GENERAL_ERROR, 'Could not obtain banlist', '', __LINE__, __FILE__, $sql);
 			}
 
 			$user_id_sql = '';
-			while ( $row = $db->sql_fetchrow($result) )
+			while ($row = $db->sql_fetchrow($result))
 			{
-				if ( isset($row['ban_userid']) )
+				if (isset($row['ban_userid']))
 				{
 					$user_id_sql = ', ' . $row['ban_userid'];
 				}
@@ -630,17 +608,17 @@ function user_notification($mode, &$post_data, &$topic_title, &$forum_id, &$topi
 			$sql = "SELECT u.user_id, u.user_email, u.user_lang 
 				FROM " . TOPICS_WATCH_TABLE . " tw, " . USERS_TABLE . " u 
 				WHERE tw.topic_id = $topic_id 
-					AND tw.user_id NOT IN (" . $userdata['user_id'] . ", " . ANONYMOUS . $user_id_sql . " ) 
+					AND tw.user_id NOT IN (" . $userdata['user_id'] . ", " . ANONYMOUS . $user_id_sql . ") 
 					AND tw.notify_status = " . TOPIC_WATCH_UN_NOTIFIED . " 
 					AND u.user_id = tw.user_id";
-			if ( !($result = $db->sql_query($sql)) )
+			if (!($result = $db->sql_query($sql)))
 			{
 				message_die(GENERAL_ERROR, 'Could not obtain list of topic watchers', '', __LINE__, __FILE__, $sql);
 			}
 
 			$update_watched_sql = '';
 			$bcc_list_ary = array();
-			if ( $row = $db->sql_fetchrow($result) )
+			if ($row = $db->sql_fetchrow($result))
 			{
 				// Sixty second limit
 				@set_time_limit(60);
@@ -653,15 +631,15 @@ function user_notification($mode, &$post_data, &$topic_title, &$forum_id, &$topi
 					}
 					$update_watched_sql .= ($update_watched_sql != '') ? ', ' . $row['user_id'] : $row['user_id'];
 				}
-				while ( $row = $db->sql_fetchrow($result) );
+				while ($row = $db->sql_fetchrow($result));
 
 				//
 				// Let's do some checking to make sure that mass mail functions
 				// are working in win32 versions of php.
 				//
-				if ( preg_match('/[c-z]:\\\.*/i', getenv('PATH')) && !$board_config['smtp_delivery'])
+				if (preg_match('/[c-z]:\\\.*/i', getenv('PATH')) && !$board_config['smtp_delivery'])
 				{
-					$ini_val = ( @phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var';
+					$ini_val = (@phpversion() >= '4.0.0') ? 'ini_get' : 'get_cfg_var';
 
 					// We are running on windows, force delivery to use our smtp functions
 					// since php's are broken by default
@@ -679,10 +657,10 @@ function user_notification($mode, &$post_data, &$topic_title, &$forum_id, &$topi
 					obtain_word_list($orig_word, $replacement_word);
 
 					$script_name = preg_replace('/^\/?(.*?)\/?$/', '\1', trim($board_config['script_path']));
-					$script_name = ( $script_name != '' ) ? $script_name . '/viewtopic.'.$phpEx : 'viewtopic.'.$phpEx;
+					$script_name = ($script_name != '') ? $script_name . '/viewtopic.'.$phpEx : 'viewtopic.'.$phpEx;
 					$server_name = trim($board_config['server_name']);
-					$server_protocol = ( $board_config['cookie_secure'] ) ? 'https://' : 'http://';
-					$server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/';
+					$server_protocol = ($board_config['cookie_secure']) ? 'https://' : 'http://';
+					$server_port = ($board_config['server_port'] <> 80) ? ':' . trim($board_config['server_port']) . '/' : '/';
 
 					$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
 
@@ -715,7 +693,7 @@ function user_notification($mode, &$post_data, &$topic_title, &$forum_id, &$topi
 			}
 			$db->sql_freeresult($result);
 
-			if ( $update_watched_sql != '' )
+			if ($update_watched_sql != '')
 			{
 				$sql = "UPDATE " . TOPICS_WATCH_TABLE . "
 					SET notify_status = " . TOPIC_WATCH_NOTIFIED . "
@@ -729,28 +707,28 @@ function user_notification($mode, &$post_data, &$topic_title, &$forum_id, &$topi
 			FROM " . TOPICS_WATCH_TABLE . "
 			WHERE topic_id = $topic_id
 				AND user_id = " . $userdata['user_id'];
-		if ( !($result = $db->sql_query($sql)) )
+		if (!($result = $db->sql_query($sql)))
 		{
 			message_die(GENERAL_ERROR, 'Could not obtain topic watch information', '', __LINE__, __FILE__, $sql);
 		}
 
 		$row = $db->sql_fetchrow($result);
 
-		if ( !$notify_user && !empty($row['topic_id']) )
+		if (!$notify_user && !empty($row['topic_id']))
 		{
 			$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . "
 				WHERE topic_id = $topic_id
 					AND user_id = " . $userdata['user_id'];
-			if ( !$db->sql_query($sql) )
+			if (!$db->sql_query($sql))
 			{
 				message_die(GENERAL_ERROR, 'Could not delete topic watch information', '', __LINE__, __FILE__, $sql);
 			}
 		}
-		else if ( $notify_user && empty($row['topic_id']) )
+		else if ($notify_user && empty($row['topic_id']))
 		{
 			$sql = "INSERT INTO " . TOPICS_WATCH_TABLE . " (user_id, topic_id, notify_status)
 				VALUES (" . $userdata['user_id'] . ", $topic_id, 0)";
-			if ( !$db->sql_query($sql) )
+			if (!$db->sql_query($sql))
 			{
 				message_die(GENERAL_ERROR, 'Could not insert topic watch information', '', __LINE__, __FILE__, $sql);
 			}
@@ -772,7 +750,7 @@ function generate_smilies($mode, $page_id)
 	$inline_rows = 5;
 	$window_columns = 8;
 
-	if ( $mode == 'window' )
+	if ($mode == 'window')
 	{
 		$userdata = session_pagestart($user_ip, $page_id);
 		init_userprefs($userdata);
@@ -790,13 +768,13 @@ function generate_smilies($mode, $page_id)
 	$sql = "SELECT emoticon, code, smile_url   
 		FROM " . SMILIES_TABLE . " 
 		ORDER BY smilies_id";
-	if ( $result = $db->sql_query($sql) )
+	if ($result = $db->sql_query($sql))
 	{
 		$num_smilies = 0;
 		$rowset = array();
-		while ( $row = $db->sql_fetchrow($result) )
+		while ($row = $db->sql_fetchrow($result))
 		{
-			if ( empty($rowset[$row['smile_url']]) )
+			if (empty($rowset[$row['smile_url']]))
 			{
 				$rowset[$row['smile_url']]['code'] = str_replace('\\', '\\\\', str_replace("'", "\\'", $row['code']));
 				$rowset[$row['smile_url']]['emoticon'] = $row['emoticon'];
@@ -804,18 +782,18 @@ function generate_smilies($mode, $page_id)
 			}
 		}
 
-		if ( $num_smilies )
+		if ($num_smilies)
 		{
-			$smilies_count = ( $mode == 'inline' ) ? min(19, $num_smilies) : $num_smilies;
-			$smilies_split_row = ( $mode == 'inline' ) ? $inline_columns - 1 : $window_columns - 1;
+			$smilies_count = ($mode == 'inline') ? min(19, $num_smilies) : $num_smilies;
+			$smilies_split_row = ($mode == 'inline') ? $inline_columns - 1 : $window_columns - 1;
 
 			$s_colspan = 0;
 			$row = 0;
 			$col = 0;
 
-			while ( list($smile_url, $data) = @each($rowset) )
+			while (list($smile_url, $data) = @each($rowset))
 			{
-				if ( !$col )
+				if (!$col)
 				{
 					$template->assign_block_vars('smilies_row', array());
 				}
@@ -828,9 +806,9 @@ function generate_smilies($mode, $page_id)
 
 				$s_colspan = max($s_colspan, $col + 1);
 
-				if ( $col == $smilies_split_row )
+				if ($col == $smilies_split_row)
 				{
-					if ( $mode == 'inline' && $row == $inline_rows - 1 )
+					if ($mode == 'inline' && $row == $inline_rows - 1)
 					{
 						break;
 					}
@@ -843,7 +821,7 @@ function generate_smilies($mode, $page_id)
 				}
 			}
 
-			if ( $mode == 'inline' && $num_smilies > $inline_rows * $inline_columns )
+			if ($mode == 'inline' && $num_smilies > $inline_rows * $inline_columns)
 			{
 				$template->assign_block_vars('switch_smilies_extra', array());
 
@@ -861,7 +839,7 @@ function generate_smilies($mode, $page_id)
 		}
 	}
 
-	if ( $mode == 'window' )
+	if ($mode == 'window')
 	{
 		$template->pparse('smiliesbody');
 
@@ -869,4 +847,4 @@ function generate_smilies($mode, $page_id)
 	}
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/phpBB/install/install.php b/phpBB/install/install.php
index 677c712076..cb5114b083 100644
--- a/phpBB/install/install.php
+++ b/phpBB/install/install.php
@@ -175,10 +175,10 @@ function guess_lang()
 		'macedonian'				=> 'mk', 
 		'dutch'						=> 'nl([_-][a-z]+)?', 
 		'norwegian'					=> 'no', 
+		'punjabi'					=> 'pa', 
 		'polish'					=> 'pl', 
 		'portuguese_brazil'			=> 'pt[_-]br', 
 		'portuguese'				=> 'pt([_-][a-z]+)?', 
-		'punjabi'					=> 'pa', 
 		'romanian'					=> 'ro([_-][a-z]+)?', 
 		'russian'					=> 'ru([_-][a-z]+)?', 
 		'slovenian'					=> 'sl([_-][a-z]+)?', 
@@ -205,7 +205,7 @@ function guess_lang()
 			{
 				if (preg_match('#' . $match . '#i', trim($accept_lang_ary[$i])))
 				{
-					if (file_exists($phpbb_root_path . 'language/lang_' . $lang))
+					if (file_exists(@realpath($phpbb_root_path . 'language/lang_' . $lang)))
 					{
 						return $lang;
 					}
@@ -584,7 +584,7 @@ else if (!empty($HTTP_POST_VARS['ftp_file']))
 		// section.
 		$s_hidden_fields = '<input type="hidden" name="username" value="' . $admin_name . '" />';
 		$s_hidden_fields .= '<input type="hidden" name="password" value="' . $admin_pass1 . '" />';
-		$s_hidden_fields .= '<input type="hidden" name="redirect" value="admin/index.php" />';
+		$s_hidden_fields .= '<input type="hidden" name="redirect" value="admin/index.'.$phpEx.'" />';
 		$s_hidden_fields .= '<input type="hidden" name="submit" value="' . $lang['Login'] . '" />';
 
 		page_header($lang['Inst_Step_2']);
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index cc8dbb2fed..0c1405c97e 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -107,6 +107,7 @@ $template->assign_vars(array(
 	'L_ICQ' => $lang['ICQ'], 
 	'L_JOINED' => $lang['Joined'], 
 	'L_POSTS' => $lang['Posts'], 
+	'L_PM' => $lang['Private_Message'], 
 
 	'S_MODE_SELECT' => $select_sort_mode,
 	'S_ORDER_SELECT' => $select_sort_order,
diff --git a/phpBB/modcp.php b/phpBB/modcp.php
index a092461747..06fa2e25ad 100644
--- a/phpBB/modcp.php
+++ b/phpBB/modcp.php
@@ -1024,7 +1024,7 @@ switch( $mode )
 			'L_SELECT' => $lang['Select'], 
 
 			'U_VIEW_FORUM' => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"), 
-			'S_HIDDEN_FIELDS' => '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" /><input type="hidden" name="' . POST_FORUM_URL . '" value="' . $forum_id . '">',
+			'S_HIDDEN_FIELDS' => '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" /><input type="hidden" name="' . POST_FORUM_URL . '" value="' . $forum_id . '" />',
 			'S_MODCP_ACTION' => append_sid("modcp.$phpEx"))
 		);
 
diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php
index 514805f1a2..0434a39a38 100644
--- a/phpBB/privmsg.php
+++ b/phpBB/privmsg.php
@@ -161,7 +161,7 @@ if ( $mode == 'newpm' )
 			$l_new_message = $lang['You_no_new_pm'];
 		}
 
-		$l_new_message .= '<br /><br />' . sprintf($lang['Click_view_privmsg'], '<a href="' . append_sid("privmsg.".$phpEx."?folder=inbox") . '" onClick="jump_to_inbox();return false;" target="_new">', '</a>');
+		$l_new_message .= '<br /><br />' . sprintf($lang['Click_view_privmsg'], '<a href="' . append_sid("privmsg.".$phpEx."?folder=inbox") . '" onclick="jump_to_inbox();return false;" target="_new">', '</a>');
 	}
 	else
 	{
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index a418369796..88264fe501 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -598,7 +598,7 @@ if ( $can_watch_topic )
 	if ( $is_watching_topic )
 	{
 		$s_watching_topic = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;unwatch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '">' . $lang['Stop_watching_topic'] . '</a>';
-		$s_watching_topic_img = ( isset($images['Topic_un_watch']) ) ? "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;unwatch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['Topic_un_watch'] . '" alt="' . $lang['Stop_watching_topic'] . '" title="' . $lang['Stop_watching_topic'] . '" border="0"></a>' : '';
+		$s_watching_topic_img = ( isset($images['topic_un_watch']) ) ? "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;unwatch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['topic_un_watch'] . '" alt="' . $lang['Stop_watching_topic'] . '" title="' . $lang['Stop_watching_topic'] . '" border="0"></a>' : '';
 	}
 	else
 	{
@@ -651,6 +651,7 @@ $template->assign_vars(array(
 	'S_AUTH_LIST' => $s_auth_can,
 	'S_TOPIC_ADMIN' => $topic_mod,
 	'S_WATCH_TOPIC' => $s_watching_topic,
+	'S_WATCH_TOPIC_IMG' => $s_watching_topic_img,
 
 	'U_VIEW_TOPIC' => append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;start=$start&amp;postdays=$post_days&amp;postorder=$post_order&amp;highlight=$highlight"),
 	'U_VIEW_FORUM' => $view_forum_url,
@@ -779,7 +780,7 @@ if ( !empty($forum_topic_data['topic_vote']) )
 				'U_VIEW_RESULTS' => append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;postdays=$post_days&amp;postorder=$post_order&amp;vote=viewresult"))
 			);
 
-			$s_hidden_fields = '<input type="hidden" name="topic_id" value="' . $topic_id . '"><input type="hidden" name="mode" value="vote">';
+			$s_hidden_fields = '<input type="hidden" name="topic_id" value="' . $topic_id . '" /><input type="hidden" name="mode" value="vote" />';
 		}
 
 		if ( count($orig_word) )
