diff -x .svn -aruN 2.0.22.src/admin/admin_board.php 2.0.23.src/admin/admin_board.php
--- 2.0.22.src/admin/admin_board.php	2006-12-19 11:29:14.000000000 -0600
+++ 2.0.23.src/admin/admin_board.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: admin_board.php,v 1.51.2.16 2006/12/16 13:11:24 acydburn Exp $
+ *   $Id: admin_board.php 6772 2006-12-16 13:11:28Z acydburn $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/admin/admin_db_utilities.php 2.0.23.src/admin/admin_db_utilities.php
--- 2.0.22.src/admin/admin_db_utilities.php	2006-12-19 11:29:14.000000000 -0600
+++ 2.0.23.src/admin/admin_db_utilities.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
 *     copyright            : (C) 2001 The phpBB Group
 *     email                : support@phpbb.com
 *
-*     $Id: admin_db_utilities.php,v 1.42.2.14 2006/02/10 20:35:40 grahamje Exp $
+*     $Id: admin_db_utilities.php 5539 2006-02-10 20:35:40Z grahamje $
 *
 ****************************************************************************/
 
diff -x .svn -aruN 2.0.22.src/admin/admin_disallow.php 2.0.23.src/admin/admin_disallow.php
--- 2.0.22.src/admin/admin_disallow.php	2006-12-19 11:29:14.000000000 -0600
+++ 2.0.23.src/admin/admin_disallow.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: admin_disallow.php,v 1.9.2.4 2005/12/18 13:57:50 grahamje Exp $
+ *   $Id: admin_disallow.php 5352 2005-12-18 13:57:51Z grahamje $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/admin/admin_forum_prune.php 2.0.23.src/admin/admin_forum_prune.php
--- 2.0.22.src/admin/admin_forum_prune.php	2006-12-19 11:29:14.000000000 -0600
+++ 2.0.23.src/admin/admin_forum_prune.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
 *     copyright            : (C) 2001 The phpBB Group
 *     email                : support@phpbb.com
 *
-*     $Id: admin_forum_prune.php,v 1.22.2.3 2002/12/18 14:14:07 psotfx Exp $
+*     $Id: admin_forum_prune.php 3207 2002-12-18 14:14:11Z psotfx $
 *
 ****************************************************************************/
 
diff -x .svn -aruN 2.0.22.src/admin/admin_forumauth.php 2.0.23.src/admin/admin_forumauth.php
--- 2.0.22.src/admin/admin_forumauth.php	2006-12-19 11:29:14.000000000 -0600
+++ 2.0.23.src/admin/admin_forumauth.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: admin_forumauth.php,v 1.23.2.5 2004/03/25 15:57:19 acydburn Exp $
+ *   $Id: admin_forumauth.php 4876 2004-03-25 15:57:20Z acydburn $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/admin/admin_forums.php 2.0.23.src/admin/admin_forums.php
--- 2.0.22.src/admin/admin_forums.php	2006-12-19 11:29:14.000000000 -0600
+++ 2.0.23.src/admin/admin_forums.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: admin_forums.php,v 1.40.2.13 2006/03/09 21:55:09 grahamje Exp $
+ *   $Id: admin_forums.php 6981 2007-02-10 12:14:24Z acydburn $
  *
  ***************************************************************************/
 
@@ -626,7 +626,7 @@
 					$vote_ids = '';
 					do
 					{
-						$vote_ids = (($vote_ids != '') ? ', ' : '') . $row['vote_id'];
+						$vote_ids .= (($vote_ids != '') ? ', ' : '') . $row['vote_id'];
 					}
 					while ($row = $db->sql_fetchrow($result));
 
diff -x .svn -aruN 2.0.22.src/admin/admin_groups.php 2.0.23.src/admin/admin_groups.php
--- 2.0.22.src/admin/admin_groups.php	2006-12-19 11:29:14.000000000 -0600
+++ 2.0.23.src/admin/admin_groups.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: admin_groups.php,v 1.25.2.13 2006/03/09 19:42:41 grahamje Exp $
+ *   $Id: admin_groups.php 5614 2006-03-09 19:42:41Z grahamje $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/admin/admin_mass_email.php 2.0.23.src/admin/admin_mass_email.php
--- 2.0.22.src/admin/admin_mass_email.php	2006-12-19 11:29:14.000000000 -0600
+++ 2.0.23.src/admin/admin_mass_email.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
 *     copyright            : (C) 2001 The phpBB Group
 *     email                : support@phpbb.com
 *
-*     $Id: admin_mass_email.php,v 1.15.2.7 2003/05/03 23:24:01 acydburn Exp $
+*     $Id: admin_mass_email.php 3966 2003-05-03 23:24:04Z acydburn $
 *
 ****************************************************************************/
 
diff -x .svn -aruN 2.0.22.src/admin/admin_ranks.php 2.0.23.src/admin/admin_ranks.php
--- 2.0.22.src/admin/admin_ranks.php	2006-12-19 11:29:14.000000000 -0600
+++ 2.0.23.src/admin/admin_ranks.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: admin_ranks.php,v 1.13.2.8 2006/04/13 09:56:48 grahamje Exp $
+ *   $Id: admin_ranks.php 8377 2008-02-10 12:52:05Z acydburn $
  *
  ***************************************************************************/
 
@@ -34,7 +34,7 @@
 $phpbb_root_path = "./../";
 require($phpbb_root_path . 'extension.inc');
 
-$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false;
+$cancel = ( isset($HTTP_POST_VARS['cancel']) || isset($_POST['cancel']) ) ? true : false;
 $no_page_header = $cancel;
 
 require('./pagestart.' . $phpEx);
diff -x .svn -aruN 2.0.22.src/admin/admin_smilies.php 2.0.23.src/admin/admin_smilies.php
--- 2.0.22.src/admin/admin_smilies.php	2006-12-19 11:29:14.000000000 -0600
+++ 2.0.23.src/admin/admin_smilies.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
 *     copyright            : (C) 2001 The phpBB Group
 *     email                : support@phpbb.com
 *
-*     $Id: admin_smilies.php,v 1.22.2.18 2006/04/13 09:56:48 grahamje Exp $
+*     $Id: admin_smilies.php 8377 2008-02-10 12:52:05Z acydburn $
 *
 ****************************************************************************/
 
@@ -36,23 +36,20 @@
 	return;
 }
 
+$phpbb_root_path = "./../";
+require($phpbb_root_path . 'extension.inc');
+
+$cancel = ( isset($HTTP_POST_VARS['cancel']) || isset($_POST['cancel']) ) ? true : false;
+$no_page_header = $cancel;
+
 //
 // Load default header
 //
-if( isset($HTTP_GET_VARS['export_pack']) )
+if ((!empty($HTTP_GET_VARS['export_pack']) && $HTTP_GET_VARS['export_pack'] == 'send') || (!empty($_GET['export_pack']) && $_GET['export_pack'] == 'send'))
 {
-	if ( $HTTP_GET_VARS['export_pack'] == "send" )
-	{	
-		$no_page_header = true;
-	}
+	$no_page_header = true;
 }
 
-$phpbb_root_path = "./../";
-require($phpbb_root_path . 'extension.inc');
-
-$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false;
-$no_page_header = $cancel;
-
 require('./pagestart.' . $phpEx);
 
 if ($cancel)
diff -x .svn -aruN 2.0.22.src/admin/admin_styles.php 2.0.23.src/admin/admin_styles.php
--- 2.0.22.src/admin/admin_styles.php	2006-12-19 11:29:14.000000000 -0600
+++ 2.0.23.src/admin/admin_styles.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: admin_styles.php,v 1.27.2.17 2006/04/20 13:34:15 grahamje Exp $
+ *   $Id: admin_styles.php 8377 2008-02-10 12:52:05Z acydburn $
  *
  *
  ***************************************************************************/
@@ -41,10 +41,10 @@
 $phpbb_root_path = "./../";
 require($phpbb_root_path . 'extension.inc');
 
-$confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : FALSE;
-$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE;
+$confirm = (isset($HTTP_POST_VARS['confirm']) || isset($_POST['confirm'])) ? TRUE : FALSE;
+$cancel = (isset($HTTP_POST_VARS['cancel']) || isset($_POST['cancel'])) ? TRUE : FALSE;
 
-$no_page_header = (!empty($HTTP_POST_VARS['send_file']) || $cancel) ? TRUE : FALSE;
+$no_page_header = (!empty($HTTP_POST_VARS['send_file']) || !empty($_POST['send_file']) || $cancel) ? TRUE : FALSE;
 
 require('./pagestart.' . $phpEx);
 
diff -x .svn -aruN 2.0.22.src/admin/admin_ug_auth.php 2.0.23.src/admin/admin_ug_auth.php
--- 2.0.22.src/admin/admin_ug_auth.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/admin/admin_ug_auth.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: admin_ug_auth.php,v 1.13.2.10 2005/09/14 18:14:29 acydburn Exp $
+ *   $Id: admin_ug_auth.php 8378 2008-02-10 17:18:29Z acydburn $
  *
  *
  ***************************************************************************/
@@ -231,11 +231,46 @@
 		else
 		{
 	
-			$change_mod_list = ( isset($HTTP_POST_VARS['moderator']) ) ? $HTTP_POST_VARS['moderator'] : false;
+			$change_mod_list = ( isset($HTTP_POST_VARS['moderator']) ) ? $HTTP_POST_VARS['moderator'] : array();
 
 			if ( empty($adv) )
 			{
-				$change_acl_list = ( isset($HTTP_POST_VARS['private']) ) ? $HTTP_POST_VARS['private'] : false;
+				$sql = "SELECT f.* 
+					FROM " . FORUMS_TABLE . " f, " . CATEGORIES_TABLE . " c
+					WHERE f.cat_id = c.cat_id
+					ORDER BY c.cat_order, f.forum_order ASC";
+				if ( !($result = $db->sql_query($sql)) )
+				{
+					message_die(GENERAL_ERROR, "Couldn't obtain forum information", "", __LINE__, __FILE__, $sql);
+				}
+
+				$forum_access = $forum_auth_level_fields = array();
+				while( $row = $db->sql_fetchrow($result) )
+				{
+					$forum_access[] = $row;
+				}
+				$db->sql_freeresult($result);
+
+				for($i = 0; $i < count($forum_access); $i++)
+				{
+					$forum_id = $forum_access[$i]['forum_id'];
+
+					for($j = 0; $j < count($forum_auth_fields); $j++)
+					{
+						$forum_auth_level_fields[$forum_id][$forum_auth_fields[$j]] = $forum_access[$i][$forum_auth_fields[$j]] == AUTH_ACL;
+					}
+				}
+
+				while( list($forum_id, $value) = @each($HTTP_POST_VARS['private']) )
+				{
+					while( list($auth_field, $exists) = @each($forum_auth_level_fields[$forum_id]) )
+					{
+						if ($exists)
+						{
+							$change_acl_list[$forum_id][$auth_field] = $value;
+						}
+					}
+				}
 			}
 			else
 			{
@@ -289,11 +324,11 @@
 				$forum_id = $forum_access[$i]['forum_id'];
 
 				if ( 
-					( isset($auth_access[$forum_id]['auth_mod']) && $change_mod_list[$forum_id]['auth_mod'] != $auth_access[$forum_id]['auth_mod'] ) || 
-					( !isset($auth_access[$forum_id]['auth_mod']) && !empty($change_mod_list[$forum_id]['auth_mod']) ) 
+					( isset($auth_access[$forum_id]['auth_mod']) && $change_mod_list[$forum_id] != $auth_access[$forum_id]['auth_mod'] ) || 
+					( !isset($auth_access[$forum_id]['auth_mod']) && !empty($change_mod_list[$forum_id]) ) 
 				)
 				{
-					$update_mod_status[$forum_id] = $change_mod_list[$forum_id]['auth_mod'];
+					$update_mod_status[$forum_id] = $change_mod_list[$forum_id];
 
 					if ( !$update_mod_status[$forum_id] )
 					{
diff -x .svn -aruN 2.0.22.src/admin/admin_user_ban.php 2.0.23.src/admin/admin_user_ban.php
--- 2.0.22.src/admin/admin_user_ban.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/admin/admin_user_ban.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: admin_user_ban.php,v 1.21.2.6 2005/10/30 15:17:13 acydburn Exp $
+ *   $Id: admin_user_ban.php 5283 2005-10-30 15:17:14Z acydburn $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/admin/admin_users.php 2.0.23.src/admin/admin_users.php
--- 2.0.22.src/admin/admin_users.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/admin/admin_users.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: admin_users.php,v 1.57.2.35 2006/03/26 14:43:24 grahamje Exp $
+ *   $Id: admin_users.php 6981 2007-02-10 12:14:24Z acydburn $
  *
  *
  ***************************************************************************/
@@ -109,30 +109,12 @@
 				message_die(GENERAL_ERROR, 'Could not update votes for this user', '', __LINE__, __FILE__, $sql);
 			}
 			
-			$sql = "SELECT group_id
-				FROM " . GROUPS_TABLE . "
+			$sql = "UPDATE " . GROUPS_TABLE . "
+				SET group_moderator = " . $userdata['user_id'] . "
 				WHERE group_moderator = $user_id";
-			if( !($result = $db->sql_query($sql)) )
-			{
-				message_die(GENERAL_ERROR, 'Could not select groups where user was moderator', '', __LINE__, __FILE__, $sql);
-			}
-			
-			while ( $row_group = $db->sql_fetchrow($result) )
-			{
-				$group_moderator[] = $row_group['group_id'];
-			}
-			
-			if ( count($group_moderator) )
+			if( !$db->sql_query($sql) )
 			{
-				$update_moderator_id = implode(', ', $group_moderator);
-				
-				$sql = "UPDATE " . GROUPS_TABLE . "
-					SET group_moderator = " . $userdata['user_id'] . "
-					WHERE group_moderator IN ($update_moderator_id)";
-				if( !$db->sql_query($sql) )
-				{
-					message_die(GENERAL_ERROR, 'Could not update group moderators', '', __LINE__, __FILE__, $sql);
-				}
+				message_die(GENERAL_ERROR, 'Could not update group moderators', '', __LINE__, __FILE__, $sql);
 			}
 
 			$sql = "DELETE FROM " . USERS_TABLE . "
diff -x .svn -aruN 2.0.22.src/admin/admin_words.php 2.0.23.src/admin/admin_words.php
--- 2.0.22.src/admin/admin_words.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/admin/admin_words.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: admin_words.php,v 1.10.2.6 2006/04/13 09:56:48 grahamje Exp $
+ *   $Id: admin_words.php 8377 2008-02-10 12:52:05Z acydburn $
  *
  *
  ***************************************************************************/
@@ -35,7 +35,7 @@
 $phpbb_root_path = "./../";
 require($phpbb_root_path . 'extension.inc');
 
-$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false;
+$cancel = (isset($HTTP_POST_VARS['cancel']) || isset($_POST['cancel'])) ? true : false;
 $no_page_header = $cancel;
 
 require('./pagestart.' . $phpEx);
@@ -107,8 +107,8 @@
 		}
 
 		$template->assign_vars(array(
-			"WORD" => $word_info['word'],
-			"REPLACEMENT" => $word_info['replacement'],
+			"WORD" => htmlspecialchars($word_info['word']),
+			"REPLACEMENT" => htmlspecialchars($word_info['replacement']),
 
 			"L_WORDS_TITLE" => $lang['Words_title'],
 			"L_WORDS_TEXT" => $lang['Words_explain'],
@@ -257,8 +257,8 @@
 		$template->assign_block_vars("words", array(
 			"ROW_COLOR" => "#" . $row_color,
 			"ROW_CLASS" => $row_class,
-			"WORD" => $word,
-			"REPLACEMENT" => $replacement,
+			"WORD" => htmlspecialchars($word),
+			"REPLACEMENT" => htmlspecialchars($replacement),
 
 			"U_WORD_EDIT" => append_sid("admin_words.$phpEx?mode=edit&amp;id=$word_id"),
 			"U_WORD_DELETE" => append_sid("admin_words.$phpEx?mode=delete&amp;id=$word_id"))
diff -x .svn -aruN 2.0.22.src/admin/index.php 2.0.23.src/admin/index.php
--- 2.0.22.src/admin/index.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/admin/index.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: index.php,v 1.40.2.10 2005/12/04 12:55:28 grahamje Exp $
+ *   $Id: index.php 5318 2005-12-04 12:55:28Z grahamje $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/admin/page_footer_admin.php 2.0.23.src/admin/page_footer_admin.php
--- 2.0.22.src/admin/page_footer_admin.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/admin/page_footer_admin.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: page_footer_admin.php,v 1.9.2.5 2005/09/19 20:49:06 grahamje Exp $
+ *   $Id: page_footer_admin.php 5214 2005-09-19 20:49:06Z grahamje $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/admin/page_header_admin.php 2.0.23.src/admin/page_header_admin.php
--- 2.0.22.src/admin/page_header_admin.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/admin/page_header_admin.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: page_header_admin.php,v 1.12.2.7 2006/01/29 21:19:02 grahamje Exp $
+ *   $Id: page_header_admin.php 5509 2006-01-29 21:19:02Z grahamje $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/admin/pagestart.php 2.0.23.src/admin/pagestart.php
--- 2.0.22.src/admin/pagestart.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/admin/pagestart.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: pagestart.php,v 1.1.2.10 2006/01/22 17:11:09 grahamje Exp $
+ *   $Id: pagestart.php 5487 2006-01-22 17:11:09Z grahamje $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/common.php 2.0.23.src/common.php
--- 2.0.22.src/common.php	2006-12-19 11:29:16.000000000 -0600
+++ 2.0.23.src/common.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: common.php,v 1.74.2.25 2006/05/26 17:46:59 grahamje Exp $
+ *   $Id: common.php 5970 2006-05-26 17:46:59Z grahamje $
  *
  ***************************************************************************/

diff -x .svn -aruN 2.0.22.src/db/db2.php 2.0.23.src/db/db2.php
--- 2.0.22.src/db/db2.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/db/db2.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: db2.php,v 1.2 2002/01/28 17:24:45 psotfx Exp $
+ *   $Id: db2.php 1997 2002-01-28 17:25:58Z psotfx $
  *
  ***************************************************************************/
 
diff -x .svn -aruN 2.0.22.src/db/msaccess.php 2.0.23.src/db/msaccess.php
--- 2.0.22.src/db/msaccess.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/db/msaccess.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: msaccess.php,v 1.8.2.2 2002/09/28 12:50:59 psotfx Exp $
+ *   $Id: msaccess.php 2906 2002-09-28 12:50:59Z psotfx $
  *
  ***************************************************************************/
 
diff -x .svn -aruN 2.0.22.src/db/mssql-odbc.php 2.0.23.src/db/mssql-odbc.php
--- 2.0.22.src/db/mssql-odbc.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/db/mssql-odbc.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: mssql-odbc.php,v 1.7 2002/03/20 17:48:30 psotfx Exp $
+ *   $Id: mssql-odbc.php 2380 2002-03-20 17:48:30Z psotfx $
  *
  ***************************************************************************/
 
diff -x .svn -aruN 2.0.22.src/db/mssql.php 2.0.23.src/db/mssql.php
--- 2.0.22.src/db/mssql.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/db/mssql.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : supportphpbb.com
  *
- *   $Id: mssql.php,v 1.22.2.4 2006/03/09 19:57:37 grahamje Exp $
+ *   $Id: mssql.php 5615 2006-03-09 19:57:47Z grahamje $
  *
  ***************************************************************************/
 
diff -x .svn -aruN 2.0.22.src/db/mysql.php 2.0.23.src/db/mysql.php
--- 2.0.22.src/db/mysql.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/db/mysql.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: mysql.php,v 1.16.2.1 2005/09/18 16:17:20 acydburn Exp $
+ *   $Id: mysql.php 5211 2005-09-18 16:17:21Z acydburn $
  *
  ***************************************************************************/
 
diff -x .svn -aruN 2.0.22.src/db/mysql4.php 2.0.23.src/db/mysql4.php
--- 2.0.22.src/db/mysql4.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/db/mysql4.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : supportphpbb.com
  *
- *   $Id: mysql4.php,v 1.5.2.1 2005/09/18 16:17:20 acydburn Exp $
+ *   $Id: mysql4.php 5211 2005-09-18 16:17:21Z acydburn $
  *
  ***************************************************************************/
 
diff -x .svn -aruN 2.0.22.src/db/postgres7.php 2.0.23.src/db/postgres7.php
--- 2.0.22.src/db/postgres7.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/db/postgres7.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
    *   copyright            : (C) 2001 The phpBB Group
    *   email                : supportphpbb.com
    *
-   *   $Id: postgres7.php,v 1.19.2.3 2005/05/06 20:50:10 acydburn Exp $
+   *   $Id: postgres7.php 5142 2005-05-06 20:50:13Z acydburn $
    *
    ***************************************************************************/
 
diff -x .svn -aruN 2.0.22.src/docs/CHANGELOG.html 2.0.23.src/docs/CHANGELOG.html
--- 2.0.22.src/docs/CHANGELOG.html	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/docs/CHANGELOG.html	2008-03-11 10:41:34.000000000 -0500
@@ -32,6 +32,7 @@
 <ol>
 <li><a href="#changelog">Changelog</a></li>
 <ol type="i">
+	<li><a href="#2022">Changes since 2.0.22</a></li>
 	<li><a href="#2021">Changes since 2.0.21</a></li>
 	<li><a href="#2020">Changes since 2.0.20</a></li>
 	<li><a href="#2019">Changes since 2.0.19</a></li>
@@ -67,7 +68,26 @@
 
 <p>This is a non-exhaustive (but still near complete) changelog for phpBB 2.0.x including beta and release candidate versions. Our thanks to all those people who've contributed bug reports and code fixes.</p>
 
-<a name="2021"></a><h3 class="h3">l.i. Changes since 2.0.21</h3>
+<a name="2022"></a><h3 class="h3">l.i. Changes since 2.0.22</h3>
+
+<ul>
+<li>[Fix] Correctly re-assign group moderator on user deletion (Bug #280)</li>
+<li>[Fix] Deleting a forum with multiple polls included (Bug #6740)</li>
+<li>[Fix] Fixed postgresql query for obtaining group moderator in groupcp.php (Bug #6550)</li>
+<li>[Fix] Selected field on first entry by default for font size within posting_body.tpl (Bug #7124)</li>
+<li>[Fix] Adjusted maxlength parameters in admin/styles_edit_body.tpl (Bug #81)</li>
+<li>[Fix] Fixed html output in make_forum_select if no forums present (Bug #436)</li>
+<li>[Fix] Fixed spelling error(s) in lang_admin.php (Bug #7172, #6978)</li>
+<li>[Fix] Correctly display censored words in admin panel (Bug #12271)</li>
+<li>[Fix] Do not allow soft hyphen \xAD in usernames (reported by Bander00)</li>
+<li>[Fix] Fixed the group permission system's use of array access</li>
+<li>[Fix] Simple group permissions now work properly</li>
+<li>[Sec] Fix possible XSRF Vulnerability in private messaging and groups handling</li>
+<li>[Fix] Fix inability to export smilies (Bug #2265)</li>
+<li>[Fix] Fixing some problems with PHP5 and register_long_arrays off</li>
+</ul>
+
+<a name="2021"></a><h3 class="h3">l.ii. Changes since 2.0.21</h3>
 
 <ul>
 <li>[Fix] Check for user's existence prior to showing email form</li>
@@ -83,7 +103,7 @@
 <li>[Sec] Added session checks to various forms - kellanved</li>
 </ul>
 
-<a name="2020"></a><h3 class="h3">l.ii. Changes since 2.0.20</h3>
+<a name="2020"></a><h3 class="h3">l.iii. Changes since 2.0.20</h3>
 
 <ul>
 <li>[Fix] Changes to random number generator code to explicitly truncate the length of the string</li>
@@ -100,7 +120,7 @@
 </ul>
 
 
-<a name="2019"></a><h3 class="h3">l.iii. Changes since 2.0.19</h3>
+<a name="2019"></a><h3 class="h3">l.iv. Changes since 2.0.19</h3>
 
 <ul>
 <li>[Fix] Prevent login attempts from incrementing for inactive users</li>
@@ -133,7 +153,7 @@
 </ul>
 
 
-<a name="2018"></a><h3 class="h3">l.iv. Changes since 2.0.18</h3>
+<a name="2018"></a><h3 class="h3">l.v. Changes since 2.0.18</h3>
 
 <ul>
 <li>[Fix] corrected index on session keys table under MS SQL</li>
@@ -152,7 +172,7 @@
 </ul>
 
 
-<a name="2017"></a><h3 class="h3">l.v. Changes since 2.0.17</h3>
+<a name="2017"></a><h3 class="h3">l.vi. Changes since 2.0.17</h3>
 
 <ul>
 <li>[Fix] incorrect handling of password resets if admin activation is enabled (Bug #88)</li>
@@ -200,7 +220,7 @@
 <li>[Sec] compare imagetype on avatar uploading to match the file extension from uploaded file</li>
 </ul>
 
-<a name="2016"></a><h3 class="h3">l.vi. Changes since 2.0.16</h3>
+<a name="2016"></a><h3 class="h3">l.vii. Changes since 2.0.16</h3>
 
 <ul>
 <li>Added extra checks to the deletion code in privmsg.php - reported by party_fan</li>
@@ -216,7 +236,7 @@
 <li>Correctly set username on posts when deleting a user from the admin panel</li>
 </ul>
 
-<a name="2015"></a><h3 class="h3">l.vii. Changes since 2.0.15</h3>
+<a name="2015"></a><h3 class="h3">l.viii. Changes since 2.0.15</h3>
 
 <ul>
 <li>Fixed critical issue with highlighting - <b>Discovered and fix provided by Ron van Daal</b></li>
@@ -228,7 +248,7 @@
 <li>Fixed bug in admin re-authentication redirect for servers not having index.php as one of their default files set</li>
 </ul>
 
-<a name="2014"></a><h3 class="h3">l.viii. Changes since 2.0.14</h3>
+<a name="2014"></a><h3 class="h3">l.ix. Changes since 2.0.14</h3>
 
 <ul>
 <li>Fixed moderator status removal in groupcp.php</li>
@@ -250,7 +270,7 @@
 <li>Empty url/img bbcodes no longer get parsed</li>
 </ul>
 
-<a name="2013"></a><h3 class="h3">l.ix. Changes since 2.0.13</h3>
+<a name="2013"></a><h3 class="h3">l.x. Changes since 2.0.13</h3>
 
 <ul>
 <li>Hardened author and keyword search a bit to not allow very server intensive searches</li>
@@ -267,7 +287,7 @@
 <li>Fixed case-sensitivity issues in postgres7.php - <b>R45</b></li>
 </ul>
 
-<a name="2012"></a><h3 class="h3">l.x. Changes since 2.0.12</h3>
+<a name="2012"></a><h3 class="h3">l.xi. Changes since 2.0.12</h3>
 
 <ul>
 <li>Ommitted preg_replace warning in viewtopic due to improper working of preg_quote in PHP - originally reported by matrix_killer, fix submitted by another party</li>
@@ -275,7 +295,7 @@
 <li>Minimum requirements raised to PHP 4.0.3 or above due to fixing vulnerability issues breaking PHP3 compatibility.</li>
 </ul>
 
-<a name="2011"></a><h3 class="h3">l.xi. Changes since 2.0.11</h3>
+<a name="2011"></a><h3 class="h3">l.xii. Changes since 2.0.11</h3>
 
 <ul>
 <li>Added confirm table to admin_db_utilities.php</li>
@@ -290,7 +310,7 @@
 <li>Fixed path disclosure bug in viewtopic.php caused by a PHP 4.3.10 bug - <b>matrix_killer</b></li>
 </ul>
 
-<a name="2010"></a><h3 class="h3">l.xii. Changes since 2.0.10</h3>
+<a name="2010"></a><h3 class="h3">l.xiii. Changes since 2.0.10</h3>
 
 <ul>
 <li>Fixed vulnerability in highlighting code (<b>very high severity, please update your installation as soon as possible</b>)</li>
@@ -301,7 +321,7 @@
 <li>Added visual confirmation mod to code base</li>
 </ul>
 
-<a name="209"></a><h3 class="h3">l.xiii. Changes since 2.0.9</h3>
+<a name="209"></a><h3 class="h3">l.xiv. Changes since 2.0.9</h3>
 
 <ul>
 <li>Fixed deleting of styles in admin_styles.php</li>
@@ -314,7 +334,7 @@
 <li>Fixed visual confirmation code. The image was not created due to a wrong regular expression.</li>
 </ul>
 
-<a name="208"></a><h3 class="h3">l.xiv. Changes since 2.0.8</h3>
+<a name="208"></a><h3 class="h3">l.xv. Changes since 2.0.8</h3>
 
 <ul>
 <li>Fixed one vulnerability in admin_board.php - <b>Xore</b></li>
@@ -333,7 +353,7 @@
 <li>Fixed problem with SID not delivered to next page in groupcp.php</li>
 </ul>
 
-<a name="207"></a><h3 class="h3">l.xv. Changes since 2.0.7</h3>
+<a name="207"></a><h3 class="h3">l.xvi. Changes since 2.0.7</h3>
 
 <ul>
 <li>Fixed several vulnerabilities in admin pages</li>
@@ -345,7 +365,7 @@
 <li>Fixed sql injection vulnerability in privmsg - 2.0.8a</li>
 </ul>
 
-<a name="206"></a><h3 class="h3">1.xvi. Changes since 2.0.6</h3>
+<a name="206"></a><h3 class="h3">1.xvii. Changes since 2.0.6</h3>
 
 <ul>
 <li>Fixed several vulnerabilities in modcp - <b>Robert Lavierck</b></li>
@@ -359,7 +379,7 @@
 <li>Fixed potential vulnerability in avatar gallery</li>
 </ul>
 
-<a name="205"></a><h3 class="h3">1.xvii. Changes since 2.0.5</h3>
+<a name="205"></a><h3 class="h3">1.xviii. Changes since 2.0.5</h3>
 
 <ul>
 <li>Fixed various email issues</li>
@@ -375,7 +395,7 @@
 <li>Fixed sql injection with reset date format field in profile - <b>tendor</b></li>
 </ul>
 
-<a name="204"></a><h3 class="h3">1.xviii. Changes since 2.0.4</h3>
+<a name="204"></a><h3 class="h3">1.xix. Changes since 2.0.4</h3>
 
 <ul>
 <li>Removed user facing session_id checks</li>
@@ -447,7 +467,7 @@
 <li>Default English support for visual confirmation - translators are encouraged to support this</li>
 </ul>
 
-<a name="203"></a><h3 class="h3">1.xix. Changes since 2.0.3</h3>
+<a name="203"></a><h3 class="h3">1.xx. Changes since 2.0.3</h3>
 
 <ul>
 <li>Fixed cross-browser scripting issue with highlight param</li>
@@ -574,7 +594,7 @@
 <li>Fixed potential SQL vulnerability with marking of private messages - <b>Ulf Harnhammar</b></li>
 </ul>
 
-<a name="202"></a><h3 class="h3">1.xx. Changes since 2.0.2</h3>
+<a name="202"></a><h3 class="h3">1.xxi. Changes since 2.0.2</h3>
 
 <ul>
 <li>Fixed potential cross-site scripting vulnerability with avatars - <b>Showscout</b></li>
@@ -583,7 +603,7 @@
 <li>Fixed (hopefully) issue with MS Access and multiple pages</li>
 </ul>
 
-<a name="201"></a><h3 class="h3">1.xxi. Changes since 2.0.1</h3>
+<a name="201"></a><h3 class="h3">1.xxii. Changes since 2.0.1</h3>
 
 <ul>
 <li>Fixed missing "username" lang variable in user admin template</li>
@@ -618,7 +638,7 @@
 <li>Fix emailer to allow sending emails with language-specific character sets</li>
 </ul>
 
-<a name="200"></a><h3 class="h3">1.xxii. Changes since 2.0.0</h3>
+<a name="200"></a><h3 class="h3">1.xxiii. Changes since 2.0.0</h3>
 
 <ul>
 <li>Fixed delete image bug for normal users</li>
@@ -675,7 +695,7 @@
 <li>Added database closure to admin frameset page</li>
 </ul>
 
-<a name="final"></a><h3 class="h3">1.xxiii. Changes since RC-4</h3>
+<a name="final"></a><h3 class="h3">1.xxiv. Changes since RC-4</h3>
 
 <ul>
 <li>Fixed improper report of general error when posting messages containing errors</li>
@@ -705,7 +725,7 @@
 <li>Fixed various remaining usergroup display issues</li>
 </ul>
 
-<a name="rc4"></a><h3 class="h3">1.xxiv. Changes since RC-3</h3>
+<a name="rc4"></a><h3 class="h3">1.xxv. Changes since RC-3</h3>
 
 <ul>
 <li>Addressed serious security issue with included files</li>
@@ -736,7 +756,7 @@
 <li>Fix (hopefully) remaining ICQ overlay issue with view profile in subSilver</li>
 </ul>
 
-<a name="rc3"></a><h3 class="h3">1.xxv. Changes since RC-2</h3>
+<a name="rc3"></a><h3 class="h3">1.xxvi. Changes since RC-2</h3>
 
 <ul>
 <li>Fixed infamous install parse error</li>
@@ -769,7 +789,7 @@
 <li>Hidden usergroups are now completely hidden from view</li>
 </ul>
 
-<a name="rc2"></a><h3 class="h3">1.xxvi. Changes since RC-1</h3>
+<a name="rc2"></a><h3 class="h3">1.xxvii. Changes since RC-1</h3>
 
 <ul>
 <li>Fixed numerous PostgreSQL related issues</li>
@@ -789,7 +809,7 @@
 <li>Various other fixes and updates</li>
 </ul>
 
-<a name="rc1"></a><h3 class="h3">1.xxvii. Changes since RC-1 (pre)</h3>
+<a name="rc1"></a><h3 class="h3">1.xxviii. Changes since RC-1 (pre)</h3>
 
 <ul>
 <li>Upgrade script completed for initial fully functional release</li>
diff -x .svn -aruN 2.0.22.src/docs/INSTALL.html 2.0.23.src/docs/INSTALL.html
--- 2.0.22.src/docs/INSTALL.html	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/docs/INSTALL.html	2008-03-11 10:41:34.000000000 -0500
@@ -194,7 +194,7 @@
 
 <a name="upgradeSTABLE_files"></a><h3 class="h3">7.ii. Changed files only</h3>
 
-<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 2.0.21 you should select the phpBB-2.0.21_to_2.0.22.zip/tar.gz file.</p>
+<p>This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have 2.0.22 you should select the phpBB-2.0.22_to_2.0.23.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>
 
@@ -204,7 +204,7 @@
 
 <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 <b>patch</b> application.</p>
 
-<p>A number of patch files are provided to allow you to upgrade from previous stable releases. Select the correct patch, e.g. if your current version is 2.0.21 you need the phpBB-2.0.21_to_2.0.22.patch. Place the correct patch in the parent directory containing the phpBB 2 core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: <b>patch -cl -d [PHPBB DIRECTORY] -p1 &lt; [PATCH NAME]</b> (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB2, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.</p>
+<p>A number of patch files are provided to allow you to upgrade from previous stable releases. Select the correct patch, e.g. if your current version is 2.0.22 you need the phpBB-2.0.22_to_2.0.23.patch. Place the correct patch in the parent directory containing the phpBB 2 core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: <b>patch -cl -d [PHPBB DIRECTORY] -p1 &lt; [PATCH NAME]</b> (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB2, 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="#upgradeSTABLE_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>
 
diff -x .svn -aruN 2.0.22.src/docs/codingstandards.htm 2.0.23.src/docs/codingstandards.htm
--- 2.0.22.src/docs/codingstandards.htm	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/docs/codingstandards.htm	2008-03-11 10:41:34.000000000 -0500
@@ -83,7 +83,7 @@
 		    copyright            : (C) 2000 The phpBB Group
 		    email                : support@phpBB.com
 		
-		    $Id: codingstandards.htm,v 1.3 2001/06/09 21:00:12 natec Exp $
+		    $Id: codingstandards.htm 445 2001-06-09 21:00:12Z natec $
 		
 		 ***************************************************************************/
 		
diff -x .svn -aruN 2.0.22.src/extension.inc 2.0.23.src/extension.inc
--- 2.0.22.src/extension.inc	2006-12-19 11:29:16.000000000 -0600
+++ 2.0.23.src/extension.inc	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group        
  *   email                : support@phpbb.com                           
  *                                                          
- *   $Id: extension.inc,v 1.5 2002/04/04 11:52:50 psotfx Exp $
+ *   $Id: extension.inc 2480 2002-04-04 11:52:50Z psotfx $
  *                                                            
  * 
  ***************************************************************************/ 
diff -x .svn -aruN 2.0.22.src/faq.php 2.0.23.src/faq.php
--- 2.0.22.src/faq.php	2006-12-19 11:29:16.000000000 -0600
+++ 2.0.23.src/faq.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: faq.php,v 1.14.2.2 2004/07/11 16:46:15 acydburn Exp $
+ *   $Id: faq.php 4926 2004-07-11 16:46:20Z acydburn $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/groupcp.php 2.0.23.src/groupcp.php
--- 2.0.22.src/groupcp.php	2006-12-19 11:29:16.000000000 -0600
+++ 2.0.23.src/groupcp.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: groupcp.php,v 1.58.2.27 2006/12/16 13:11:24 acydburn Exp $
+ *   $Id: groupcp.php 8357 2008-02-01 11:59:05Z Kellanved $
  *
  *
  ***************************************************************************/
@@ -146,7 +146,7 @@
 
 $confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : 0;
 $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : 0;
-
+$sid = ( isset($HTTP_POST_VARS['sid']) ) ? $HTTP_POST_VARS['sid'] : '';
 $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0;
 $start = ($start < 0) ? 0 : $start;
 
@@ -210,6 +210,10 @@
 	{
 		redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
 	}
+	else if ( $sid !== $userdata['session_id'] )
+	{
+		message_die(GENERAL_ERROR, $lang['Session_invalid']);
+	}
 
 	$sql = "SELECT ug.user_id, g.group_type
 		FROM " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g 
@@ -221,7 +225,7 @@
 		message_die(GENERAL_ERROR, 'Could not obtain user and group information', '', __LINE__, __FILE__, $sql);
 	}
 
-	if (	$row = $db->sql_fetchrow($result) )
+	if ( $row = $db->sql_fetchrow($result))
 	{
 		if ( $row['group_type'] == GROUP_OPEN )
 		{
@@ -311,10 +315,15 @@
 	{
 		redirect(append_sid("groupcp.$phpEx", true));
 	}
-	elseif ( !$userdata['session_logged_in'] )
+	else if ( !$userdata['session_logged_in'] )
 	{
 		redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
 	}
+	else if ( $sid !== $userdata['session_id'] )
+	{
+		message_die(GENERAL_ERROR, $lang['Session_invalid']);
+	}
+
 
 	if ( $confirm )
 	{
@@ -363,6 +372,7 @@
 		$unsub_msg = ( isset($HTTP_POST_VARS['unsub']) ) ? $lang['Confirm_unsub'] : $lang['Confirm_unsub_pending'];
 
 		$s_hidden_fields = '<input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" /><input type="hidden" name="unsub" value="1" />';
+		$s_hidden_fields .= '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
 
 		$page_title = $lang['Group_Control_Panel'];
 		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
@@ -420,7 +430,7 @@
 							WHERE aa.group_id = g.group_id  
 						)
 					)
-				ORDER BY aa.auth_mod DESC";
+				ORDER BY auth_mod DESC";
 			break;
 
 		case 'oracle':
@@ -461,6 +471,10 @@
 			if ( !$userdata['session_logged_in'] )
 			{
 				redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
+			} 
+			else if ( $sid !== $userdata['session_id'] )
+			{
+				message_die(GENERAL_ERROR, $lang['Session_invalid']);
 			}
 
 			if ( !$is_moderator )
@@ -901,7 +915,7 @@
 
 	generate_user_info($group_moderator, $board_config['default_dateformat'], $is_moderator, $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim);
 
-	$s_hidden_fields .= '';
+	$s_hidden_fields .= '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
 
 	$template->assign_vars(array(
 		'L_GROUP_INFORMATION' => $lang['Group_Information'],
diff -x .svn -aruN 2.0.22.src/images/avatars/gallery/index.htm 2.0.23.src/images/avatars/gallery/index.htm
--- 2.0.22.src/images/avatars/gallery/index.htm	2004-07-11 10:49:19.000000000 -0500
+++ 2.0.23.src/images/avatars/gallery/index.htm	2008-03-11 10:41:34.000000000 -0500
@@ -1,10 +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>
+<html>
+<head>
+<title></title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body bgcolor="#FFFFFF" text="#000000">
+
+</body>
+</html>
diff -x .svn -aruN 2.0.22.src/images/avatars/index.htm 2.0.23.src/images/avatars/index.htm
--- 2.0.22.src/images/avatars/index.htm	2004-07-11 10:49:19.000000000 -0500
+++ 2.0.23.src/images/avatars/index.htm	2008-03-11 10:41:34.000000000 -0500
@@ -1,10 +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>
+<html>
+<head>
+<title></title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body bgcolor="#FFFFFF" text="#000000">
+
+</body>
+</html>
diff -x .svn -aruN 2.0.22.src/images/index.htm 2.0.23.src/images/index.htm
--- 2.0.22.src/images/index.htm	2001-11-21 07:06:55.000000000 -0600
+++ 2.0.23.src/images/index.htm	2008-03-11 10:41:34.000000000 -0500
@@ -1,10 +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>
+<html>
+<head>
+<title></title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body bgcolor="#FFFFFF" text="#000000">
+
+</body>
+</html>
diff -x .svn -aruN 2.0.22.src/includes/auth.php 2.0.23.src/includes/auth.php
--- 2.0.22.src/includes/auth.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/auth.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group        
  *   email                : support@phpbb.com                           
  *                                                          
- *   $Id: auth.php,v 1.37.2.7 2006/03/06 17:28:51 grahamje Exp $                                                           
+ *   $Id: auth.php 5604 2006-03-06 17:28:51Z grahamje $                                                           
  *                                                            
  * 
  ***************************************************************************/ 
diff -x .svn -aruN 2.0.22.src/includes/bbcode.php 2.0.23.src/includes/bbcode.php
--- 2.0.22.src/includes/bbcode.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/bbcode.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: bbcode.php,v 1.36.2.41 2006/02/26 17:34:50 grahamje Exp $
+ *   $Id: bbcode.php 5589 2006-02-26 17:35:17Z grahamje $
  *
  ***************************************************************************/
 
diff -x .svn -aruN 2.0.22.src/includes/constants.php 2.0.23.src/includes/constants.php
--- 2.0.22.src/includes/constants.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/constants.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : ('C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: constants.php,v 1.47.2.6 2005/10/30 15:17:14 acydburn Exp $
+ *   $Id: constants.php 5283 2005-10-30 15:17:14Z acydburn $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/includes/db.php 2.0.23.src/includes/db.php
--- 2.0.22.src/includes/db.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/db.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: db.php,v 1.10.2.3 2005/10/30 15:17:14 acydburn Exp $
+ *   $Id: db.php 5283 2005-10-30 15:17:14Z acydburn $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/includes/emailer.php 2.0.23.src/includes/emailer.php
--- 2.0.22.src/includes/emailer.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/emailer.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
     copyright            : (C) 2001 The phpBB Group
     email                : support@phpbb.com
 
-    $Id: emailer.php,v 1.15.2.35 2005/10/05 17:42:04 grahamje Exp $
+    $Id: emailer.php 5261 2005-10-05 17:42:04Z grahamje $
 
 ***************************************************************************/
 
diff -x .svn -aruN 2.0.22.src/includes/functions.php 2.0.23.src/includes/functions.php
--- 2.0.22.src/includes/functions.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/functions.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: functions.php,v 1.133.2.48 2006/12/16 13:11:26 acydburn Exp $
+ *   $Id: functions.php 8377 2008-02-10 12:52:05Z acydburn $
  *
  *
  ***************************************************************************/
@@ -370,7 +370,7 @@
 
 		$userdata['user_lang'] = $default_lang;
 	}
-	elseif ( $userdata['user_id'] === ANONYMOUS && $board_config['default_lang'] !== $default_lang )
+	elseif ( $userdata['user_id'] == ANONYMOUS && $board_config['default_lang'] !== $default_lang )
 	{
 		$sql = 'UPDATE ' . CONFIG_TABLE . "
 			SET config_value = '" . $default_lang . "'
diff -x .svn -aruN 2.0.22.src/includes/functions_admin.php 2.0.23.src/includes/functions_admin.php
--- 2.0.22.src/includes/functions_admin.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/functions_admin.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: functions_admin.php,v 1.5.2.5 2005/09/14 19:16:21 acydburn Exp $
+ *   $Id: functions_admin.php 6981 2007-02-10 12:14:24Z acydburn $
  *
  *
  ***************************************************************************/
@@ -26,7 +26,7 @@
 //
 function make_forum_select($box_name, $ignore_forum = false, $select_forum = '')
 {
-	global $db, $userdata;
+	global $db, $userdata, $lang;
 
 	$is_auth_ary = auth(AUTH_READ, AUTH_LIST_ALL, $userdata);
 
@@ -49,7 +49,7 @@
 		}
 	}
 
-	$forum_list = ( $forum_list == '' ) ? '<option value="-1">-- ! No Forums ! --</option>' : '<select name="' . $box_name . '">' . $forum_list . '</select>';
+	$forum_list = ( $forum_list == '' ) ? $lang['No_forums'] : '<select name="' . $box_name . '">' . $forum_list . '</select>';
 
 	return $forum_list;
 }
diff -x .svn -aruN 2.0.22.src/includes/functions_post.php 2.0.23.src/includes/functions_post.php
--- 2.0.22.src/includes/functions_post.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/functions_post.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: functions_post.php,v 1.9.2.52 2006/05/06 13:38:55 grahamje Exp $
+ *   $Id: functions_post.php 5886 2006-05-06 13:38:55Z grahamje $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/includes/functions_search.php 2.0.23.src/includes/functions_search.php
--- 2.0.22.src/includes/functions_search.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/functions_search.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
 *     copyright            : (C) 2002 The phpBB Group
 *     email                : support@phpbb.com
 *
-*     $Id: functions_search.php,v 1.8.2.20 2005/09/14 18:14:30 acydburn Exp $
+*     $Id: functions_search.php 5204 2005-09-14 18:14:30Z acydburn $
 *
 ****************************************************************************/
 
diff -x .svn -aruN 2.0.22.src/includes/functions_selects.php 2.0.23.src/includes/functions_selects.php
--- 2.0.22.src/includes/functions_selects.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/functions_selects.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: functions_selects.php,v 1.3.2.5 2005/05/06 20:50:11 acydburn Exp $
+ *   $Id: functions_selects.php 5142 2005-05-06 20:50:13Z acydburn $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/includes/functions_validate.php 2.0.23.src/includes/functions_validate.php
--- 2.0.22.src/includes/functions_validate.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/functions_validate.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: functions_validate.php,v 1.6.2.15 2005/10/30 15:17:14 acydburn Exp $
+ *   $Id: functions_validate.php 8361 2008-02-01 12:49:38Z acydburn $
  *
  *
  ***************************************************************************/
@@ -101,7 +101,7 @@
 	$db->sql_freeresult($result);
 
 	// Don't allow " and ALT-255 in username.
-	if (strstr($username, '"') || strstr($username, '&quot;') || strstr($username, chr(160)))
+	if (strstr($username, '"') || strstr($username, '&quot;') || strstr($username, chr(160)) || strstr($username, chr(173)))
 	{
 		return array('error' => true, 'error_msg' => $lang['Username_invalid']);
 	}
diff -x .svn -aruN 2.0.22.src/includes/page_header.php 2.0.23.src/includes/page_header.php
--- 2.0.22.src/includes/page_header.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/page_header.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: page_header.php,v 1.106.2.25 2005/10/30 15:17:14 acydburn Exp $
+ *   $Id: page_header.php 5283 2005-10-30 15:17:14Z acydburn $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/includes/page_tail.php 2.0.23.src/includes/page_tail.php
--- 2.0.22.src/includes/page_tail.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/page_tail.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: page_tail.php,v 1.27.2.4 2005/09/14 18:14:30 acydburn Exp $
+ *   $Id: page_tail.php 5204 2005-09-14 18:14:30Z acydburn $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/includes/prune.php 2.0.23.src/includes/prune.php
--- 2.0.22.src/includes/prune.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/prune.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
 *   copyright            : (C) 2001 The phpBB Group
 *   email                : support@phpbb.com
 *
-*   $Id: prune.php,v 1.19.2.7 2006/01/29 17:31:16 grahamje Exp $
+*   $Id: prune.php 5508 2006-01-29 17:31:16Z grahamje $
 *
 *
 ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/includes/sessions.php 2.0.23.src/includes/sessions.php
--- 2.0.22.src/includes/sessions.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/sessions.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: sessions.php,v 1.58.2.25 2006/05/18 19:23:07 grahamje Exp $
+ *   $Id: sessions.php 5930 2006-05-18 19:23:07Z grahamje $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/includes/smtp.php 2.0.23.src/includes/smtp.php
--- 2.0.22.src/includes/smtp.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/smtp.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: smtp.php,v 1.16.2.11 2005/09/27 20:24:35 grahamje Exp $
+ *   $Id: smtp.php 5230 2005-09-27 20:24:35Z grahamje $
  *
  ***************************************************************************/
 
diff -x .svn -aruN 2.0.22.src/includes/sql_parse.php 2.0.23.src/includes/sql_parse.php
--- 2.0.22.src/includes/sql_parse.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/sql_parse.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
 *     copyright            : (C) 2001 The phpBB Group
 *     email                : support@phpbb.com
 *
-*     $Id: sql_parse.php,v 1.8 2002/03/18 23:53:12 psotfx Exp $
+*     $Id: sql_parse.php 2328 2002-03-18 23:53:12Z psotfx $
 *
 ****************************************************************************/
 
diff -x .svn -aruN 2.0.22.src/includes/template.php 2.0.23.src/includes/template.php
--- 2.0.22.src/includes/template.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/template.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: template.php,v 1.10.2.5 2005/05/06 20:50:11 acydburn Exp $
+ *   $Id: template.php 5142 2005-05-06 20:50:13Z acydburn $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/includes/topic_review.php 2.0.23.src/includes/topic_review.php
--- 2.0.22.src/includes/topic_review.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/topic_review.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: topic_review.php,v 1.5.2.4 2005/05/06 20:50:12 acydburn Exp $
+ *   $Id: topic_review.php 5142 2005-05-06 20:50:13Z acydburn $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/includes/usercp_activate.php 2.0.23.src/includes/usercp_activate.php
--- 2.0.22.src/includes/usercp_activate.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/usercp_activate.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: usercp_activate.php,v 1.6.2.9 2005/09/14 18:14:30 acydburn Exp $
+ *   $Id: usercp_activate.php 5204 2005-09-14 18:14:30Z acydburn $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/includes/usercp_avatar.php 2.0.23.src/includes/usercp_avatar.php
--- 2.0.22.src/includes/usercp_avatar.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/usercp_avatar.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: usercp_avatar.php,v 1.8.2.24 2006/05/23 21:09:27 grahamje Exp $
+ *   $Id: usercp_avatar.php 5962 2006-05-23 21:09:27Z grahamje $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/includes/usercp_confirm.php 2.0.23.src/includes/usercp_confirm.php
--- 2.0.22.src/includes/usercp_confirm.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/usercp_confirm.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: usercp_confirm.php,v 1.1.2.4 2006/05/30 19:29:43 grahamje Exp $
+ *   $Id: usercp_confirm.php 5990 2006-05-30 19:29:44Z grahamje $
  *
  ***************************************************************************/
 
diff -x .svn -aruN 2.0.22.src/includes/usercp_email.php 2.0.23.src/includes/usercp_email.php
--- 2.0.22.src/includes/usercp_email.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/usercp_email.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: usercp_email.php,v 1.7.2.14 2006/12/16 13:11:26 acydburn Exp $
+ *   $Id: usercp_email.php 6772 2006-12-16 13:11:28Z acydburn $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/includes/usercp_register.php 2.0.23.src/includes/usercp_register.php
--- 2.0.22.src/includes/usercp_register.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/usercp_register.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: usercp_register.php,v 1.20.2.78 2006/12/17 10:51:27 acydburn Exp $
+ *   $Id: usercp_register.php 6775 2006-12-17 10:51:27Z acydburn $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/includes/usercp_sendpasswd.php 2.0.23.src/includes/usercp_sendpasswd.php
--- 2.0.22.src/includes/usercp_sendpasswd.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/usercp_sendpasswd.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: usercp_sendpasswd.php,v 1.6.2.13 2005/09/14 18:14:30 acydburn Exp $
+ *   $Id: usercp_sendpasswd.php 5204 2005-09-14 18:14:30Z acydburn $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/includes/usercp_viewprofile.php 2.0.23.src/includes/usercp_viewprofile.php
--- 2.0.22.src/includes/usercp_viewprofile.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/includes/usercp_viewprofile.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: usercp_viewprofile.php,v 1.5.2.6 2005/09/14 18:14:30 acydburn Exp $
+ *   $Id: usercp_viewprofile.php 5204 2005-09-14 18:14:30Z acydburn $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/index.php 2.0.23.src/index.php
--- 2.0.22.src/index.php	2006-12-19 11:29:16.000000000 -0600
+++ 2.0.23.src/index.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: index.php,v 1.99.2.7 2006/01/28 11:13:39 acydburn Exp $
+ *   $Id: index.php 5502 2006-01-28 11:13:39Z acydburn $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/language/lang_english/lang_admin.php 2.0.23.src/language/lang_english/lang_admin.php
--- 2.0.22.src/language/lang_english/lang_admin.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/language/lang_english/lang_admin.php	2008-03-11 10:41:34.000000000 -0500
@@ -7,7 +7,7 @@
  *     copyright            : (C) 2001 The phpBB Group
  *     email                : support@phpbb.com
  *
- *     $Id: lang_admin.php,v 1.35.2.17 2006/02/05 15:59:48 grahamje Exp $
+ *     $Id: lang_admin.php 6981 2007-02-10 12:14:24Z acydburn $
  *
  ****************************************************************************/
 
@@ -216,7 +216,7 @@
 $lang['Ban_email'] = 'Ban one or more email addresses';
 $lang['Ban_email_explain'] = 'To specify more than one email address, separate them with commas. To specify a wildcard username, use * like *@hotmail.com';
 
-$lang['Unban_username'] = 'Un-ban one more specific users';
+$lang['Unban_username'] = 'Un-ban one or more specific users';
 $lang['Unban_username_explain'] = 'You can unban multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser';
 
 $lang['Unban_IP'] = 'Un-ban one or more IP addresses';
@@ -574,7 +574,7 @@
 
 $lang['Delete_disallow'] = 'Delete';
 $lang['Delete_disallow_title'] = 'Remove a Disallowed Username';
-$lang['Delete_disallow_explain'] = 'You can remove a disallowed username by selecting the username from this list and clicking submit';
+$lang['Delete_disallow_explain'] = 'You can remove a disallowed username by selecting the username from this list and clicking delete';
 
 $lang['Add_disallow'] = 'Add';
 $lang['Add_disallow_title'] = 'Add a disallowed username';
diff -x .svn -aruN 2.0.22.src/language/lang_english/lang_bbcode.php 2.0.23.src/language/lang_english/lang_bbcode.php
--- 2.0.22.src/language/lang_english/lang_bbcode.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/language/lang_english/lang_bbcode.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: lang_bbcode.php,v 1.3.2.2 2002/12/18 15:40:20 psotfx Exp $
+ *   $Id: lang_bbcode.php 3208 2002-12-18 15:40:21Z psotfx $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/language/lang_english/lang_faq.php 2.0.23.src/language/lang_english/lang_faq.php
--- 2.0.22.src/language/lang_english/lang_faq.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/language/lang_english/lang_faq.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: lang_faq.php,v 1.4.2.3 2002/12/18 15:40:20 psotfx Exp $
+ *   $Id: lang_faq.php 3208 2002-12-18 15:40:21Z psotfx $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/language/lang_english/lang_main.php 2.0.23.src/language/lang_english/lang_main.php
--- 2.0.22.src/language/lang_english/lang_main.php	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/language/lang_english/lang_main.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *     copyright            : (C) 2001 The phpBB Group
  *     email                : support@phpbb.com
  *
- *     $Id: lang_main.php,v 1.85.2.22 2006/12/16 13:11:28 acydburn Exp $
+ *     $Id: lang_main.php 6772 2006-12-16 13:11:28Z acydburn $
  *
  ****************************************************************************/
 
diff -x .svn -aruN 2.0.22.src/login.php 2.0.23.src/login.php
--- 2.0.22.src/login.php	2006-12-19 11:29:16.000000000 -0600
+++ 2.0.23.src/login.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: login.php,v 1.47.2.25 2006/12/16 13:11:24 acydburn Exp $
+ *   $Id: login.php 6772 2006-12-16 13:11:28Z acydburn $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/memberlist.php 2.0.23.src/memberlist.php
--- 2.0.22.src/memberlist.php	2006-12-19 11:29:16.000000000 -0600
+++ 2.0.23.src/memberlist.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: memberlist.php,v 1.36.2.13 2006/12/16 13:11:24 acydburn Exp $
+ *   $Id: memberlist.php 6772 2006-12-16 13:11:28Z acydburn $
  *
  ***************************************************************************/
 
diff -x .svn -aruN 2.0.22.src/modcp.php 2.0.23.src/modcp.php
--- 2.0.22.src/modcp.php	2006-12-19 11:29:16.000000000 -0600
+++ 2.0.23.src/modcp.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: modcp.php,v 1.71.2.29 2006/12/16 13:11:24 acydburn Exp $
+ *   $Id: modcp.php 6772 2006-12-16 13:11:28Z acydburn $
  *
  ***************************************************************************/
 
diff -x .svn -aruN 2.0.22.src/posting.php 2.0.23.src/posting.php
--- 2.0.22.src/posting.php	2006-12-19 11:29:16.000000000 -0600
+++ 2.0.23.src/posting.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: posting.php,v 1.159.2.30 2006/12/16 13:11:24 acydburn Exp $
+ *   $Id: posting.php 6772 2006-12-16 13:11:28Z acydburn $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/privmsg.php 2.0.23.src/privmsg.php
--- 2.0.22.src/privmsg.php	2006-12-19 11:29:16.000000000 -0600
+++ 2.0.23.src/privmsg.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: privmsg.php,v 1.96.2.50 2006/12/16 13:11:25 acydburn Exp $
+ *   $Id: privmsg.php 8342 2008-01-29 11:05:17Z Kellanved $
  *
  *
  ***************************************************************************/
@@ -668,6 +668,7 @@
 	{
 		$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" />';
 		$s_hidden_fields .= ( isset($HTTP_POST_VARS['delete']) ) ? '<input type="hidden" name="delete" value="true" />' : '<input type="hidden" name="deleteall" value="true" />';
+		$s_hidden_fields .= '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
 
 		for($i = 0; $i < count($mark_list); $i++)
 		{
@@ -698,7 +699,7 @@
 		include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
 
 	}
-	else if ( $confirm )
+	else if ($confirm && $sid === $userdata['session_id'])
 	{
 		$delete_sql_id = '';
 
diff -x .svn -aruN 2.0.22.src/profile.php 2.0.23.src/profile.php
--- 2.0.22.src/profile.php	2006-12-19 11:29:16.000000000 -0600
+++ 2.0.23.src/profile.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: profile.php,v 1.193.2.7 2006/04/09 16:17:27 grahamje Exp $
+ *   $Id: profile.php 5777 2006-04-09 16:17:28Z grahamje $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/search.php 2.0.23.src/search.php
--- 2.0.22.src/search.php	2006-12-19 11:29:16.000000000 -0600
+++ 2.0.23.src/search.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: search.php,v 1.72.2.21 2006/12/16 13:11:25 acydburn Exp $
+ *   $Id: search.php 6772 2006-12-16 13:11:28Z acydburn $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/templates/subSilver/admin/styles_edit_body.tpl 2.0.23.src/templates/subSilver/admin/styles_edit_body.tpl
--- 2.0.22.src/templates/subSilver/admin/styles_edit_body.tpl	2006-12-19 11:29:15.000000000 -0600
+++ 2.0.23.src/templates/subSilver/admin/styles_edit_body.tpl	2008-03-11 10:41:34.000000000 -0500
@@ -9,7 +9,7 @@
 	</tr>
 	<tr>
 		<td class="row1">{L_THEME_NAME}:</td>
-		<td class="row2" colspan="2"><input class="post" type="text" size="25" maxlength="100" name="style_name" value="{THEME_NAME}"></td>
+		<td class="row2" colspan="2"><input class="post" type="text" size="25" maxlength="30" name="style_name" value="{THEME_NAME}"></td>
 	</tr>
 	<tr>
 		<td class="row1">{L_TEMPLATE}:</td>
@@ -64,176 +64,176 @@
 	<tr>
 		<td class="row1">{L_TR_COLOR1}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="tr_color1" value="{TR_COLOR1}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="tr_color1_name" value="{TR_COLOR1_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="tr_color1_name" value="{TR_COLOR1_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TR_COLOR2}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="tr_color2" value="{TR_COLOR2}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="tr_color2_name" value="{TR_COLOR2_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="tr_color2_name" value="{TR_COLOR2_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TR_COLOR3}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="tr_color3" value="{TR_COLOR3}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="tr_color3_name" value="{TR_COLOR3_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="tr_color3_name" value="{TR_COLOR3_NAME}">
 	</tr>
 	<tr>
 		<td class="row1">{L_TR_CLASS1}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="tr_class1" value="{TR_CLASS1}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="tr_class1_name" value="{TR_CLASS1_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="tr_class1_name" value="{TR_CLASS1_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TR_CLASS2}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="tr_class2" value="{TR_CLASS2}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="tr_class2_name" value="{TR_CLASS2_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="tr_class2_name" value="{TR_CLASS2_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TR_CLASS3}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="tr_class3" value="{TR_CLASS3}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="tr_class3_name" value="{TR_CLASS3_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="tr_class3_name" value="{TR_CLASS3_NAME}">
 	</tr>
 	<tr>
 		<td class="row1">{L_TH_COLOR1}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="th_color1" value="{TH_COLOR1}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="th_color1_name" value="{TH_COLOR1_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="th_color1_name" value="{TH_COLOR1_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TH_COLOR2}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="th_color2" value="{TH_COLOR2}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="th_color2_name" value="{TH_COLOR2_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="th_color2_name" value="{TH_COLOR2_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TH_COLOR3}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="th_color3" value="{TH_COLOR3}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="th_color3_name" value="{TH_COLOR3_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="th_color3_name" value="{TH_COLOR3_NAME}">
 	</tr>
 	<tr>
 		<td class="row1">{L_TH_CLASS1}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="th_class1" value="{TH_CLASS1}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="th_class1_name" value="{TH_CLASS1_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="th_class1_name" value="{TH_CLASS1_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TH_CLASS2}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="th_class2" value="{TH_CLASS2}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="th_class2_name" value="{TH_CLASS2_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="th_class2_name" value="{TH_CLASS2_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TH_CLASS3}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="th_class3" value="{TH_CLASS3}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="th_class3_name" value="{TH_CLASS3_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="th_class3_name" value="{TH_CLASS3_NAME}">
 	</tr>
 	<tr>
 		<td class="row1">{L_TD_COLOR1}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="td_color1" value="{TD_COLOR1}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="td_color1_name" value="{TD_COLOR1_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="td_color1_name" value="{TD_COLOR1_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TD_COLOR2}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="td_color2" value="{TD_COLOR2}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="td_color2_name" value="{TD_COLOR2_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="td_color2_name" value="{TD_COLOR2_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TD_COLOR3}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="td_color3" value="{TD_COLOR3}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="td_color3_name" value="{TD_COLOR3_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="td_color3_name" value="{TD_COLOR3_NAME}">
 	</tr>
 	<tr>
 		<td class="row1">{L_TD_CLASS1}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="td_class1" value="{TD_CLASS1}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="td_class1_name" value="{TD_CLASS1_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="td_class1_name" value="{TD_CLASS1_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TD_CLASS2}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="td_class2" value="{TD_CLASS2}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="td_class2_name" value="{TD_CLASS2_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="td_class2_name" value="{TD_CLASS2_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_TD_CLASS3}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="td_class3" value="{TD_CLASS3}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="td_class3_name" value="{TD_CLASS3_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="td_class3_name" value="{TD_CLASS3_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_FONTFACE_1}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontface1" value="{FONTFACE1}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="fontface1_name" value="{FONTFACE1_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontface1_name" value="{FONTFACE1_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_FONTFACE_2}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontface2" value="{FONTFACE2}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="fontface2_name" value="{FONTFACE2_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontface2_name" value="{FONTFACE2_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_FONTFACE_3}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontface3" value="{FONTFACE3}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="fontface3_name" value="{FONTFACE3_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontface3_name" value="{FONTFACE3_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_FONTSIZE_1}:</td>
 		<td class="row2"><input class="post" type="text" size="4" maxlength="4" name="fontsize1" value="{FONTSIZE1}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="fontsize1_name" value="{FONTSIZE1_NAME}">	
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontsize1_name" value="{FONTSIZE1_NAME}">	
 	</tr>
 
 	<tr>
 		<td class="row1">{L_FONTSIZE_2}:</td>
 		<td class="row2"><input class="post" type="text" size="4" maxlength="4" name="fontsize2" value="{FONTSIZE2}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="fontsize2_name" value="{FONTSIZE2_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontsize2_name" value="{FONTSIZE2_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_FONTSIZE_3}:</td>
 		<td class="row2"><input class="post" type="text" size="4" maxlength="4" name="fontsize3" value="{FONTSIZE3}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="fontsize3_name" value="{FONTSIZE3_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontsize3_name" value="{FONTSIZE3_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_FONTCOLOR_1}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="fontcolor1" value="{FONTCOLOR1}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="fontcolor1_name" value="{FONTCOLOR1_NAME}">	
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontcolor1_name" value="{FONTCOLOR1_NAME}">	
 	</tr>
 
 	<tr>
 		<td class="row1">{L_FONTCOLOR_2}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="fontcolor2" value="{FONTCOLOR2}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="fontcolor2_name" value="{FONTCOLOR2_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontcolor2_name" value="{FONTCOLOR2_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_FONTCOLOR_3}:</td>
 		<td class="row2"><input class="post" type="text" size="6" maxlength="6" name="fontcolor3" value="{FONTCOLOR3}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="fontcolor3_name" value="{FONTCOLOR3_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="fontcolor3_name" value="{FONTCOLOR3_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_SPAN_CLASS_1}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="span_class1" value="{SPAN_CLASS1}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="span_class1_name" value="{SPAN_CLASS1_NAME}">	
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="span_class1_name" value="{SPAN_CLASS1_NAME}">	
 	</tr>
 
 	<tr>
 		<td class="row1">{L_SPAN_CLASS_2}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="span_class2" value="{SPAN_CLASS2}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="span_class2_name" value="{SPAN_CLASS2_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="span_class2_name" value="{SPAN_CLASS2_NAME}">
 	</tr>
 
 	<tr>
 		<td class="row1">{L_SPAN_CLASS_3}:</td>
 		<td class="row2"><input class="post" type="text" size="25" maxlength="25" name="span_class3" value="{SPAN_CLASS3}"></td>
-		<td class="row2"><input class="post" type="text" size="25" maxlength="100" name="span_class3_name" value="{SPAN_CLASS3_NAME}">
+		<td class="row2"><input class="post" type="text" size="25" maxlength="50" name="span_class3_name" value="{SPAN_CLASS3_NAME}">
 	</tr>
 
 
diff -x .svn -aruN 2.0.22.src/templates/subSilver/posting_body.tpl 2.0.23.src/templates/subSilver/posting_body.tpl
--- 2.0.22.src/templates/subSilver/posting_body.tpl	2006-12-19 11:29:16.000000000 -0600
+++ 2.0.23.src/templates/subSilver/posting_body.tpl	2008-03-11 10:41:34.000000000 -0500
@@ -372,11 +372,11 @@
 					  <option style="color:violet; background-color: {T_TD_COLOR1}" value="violet" class="genmed">{L_COLOR_VIOLET}</option>
 					  <option style="color:white; background-color: {T_TD_COLOR1}" value="white" class="genmed">{L_COLOR_WHITE}</option>
 					  <option style="color:black; background-color: {T_TD_COLOR1}" value="black" class="genmed">{L_COLOR_BLACK}</option>
-					</select> &nbsp;{L_FONT_SIZE}:<select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.selectedIndex=0;" onMouseOver="helpline('f')">
+					</select> &nbsp;{L_FONT_SIZE}:<select name="addbbcode20" selected onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.selectedIndex=0;" onMouseOver="helpline('f')">
 					  <option value="0" class="genmed">{L_FONT_SIZE}</option>
 					  <option value="7" class="genmed">{L_FONT_TINY}</option>
 					  <option value="9" class="genmed">{L_FONT_SMALL}</option>
-					  <option value="12" selected class="genmed">{L_FONT_NORMAL}</option>
+					  <option value="12" class="genmed">{L_FONT_NORMAL}</option>
 					  <option value="18" class="genmed">{L_FONT_LARGE}</option>
 					  <option  value="24" class="genmed">{L_FONT_HUGE}</option>
 					</select>
diff -x .svn -aruN 2.0.22.src/templates/subSilver/subSilver.cfg 2.0.23.src/templates/subSilver/subSilver.cfg
--- 2.0.22.src/templates/subSilver/subSilver.cfg	2006-12-19 11:29:16.000000000 -0600
+++ 2.0.23.src/templates/subSilver/subSilver.cfg	2008-03-11 10:41:34.000000000 -0500
@@ -8,7 +8,7 @@
 //
 // **    subSilver dev. forum: www.subSky.com/phpBB2/      **
 //
-// $Id: subSilver.cfg,v 1.11.2.1 2005/10/08 19:41:31 grahamje Exp $
+// $Id: subSilver.cfg 5266 2005-10-08 19:41:31Z grahamje $
 //
 // Please note that to enable support of different languages
 // the {LANG} place holder is available. This will be replaced
diff -x .svn -aruN 2.0.22.src/viewforum.php 2.0.23.src/viewforum.php
--- 2.0.22.src/viewforum.php	2006-12-19 11:29:16.000000000 -0600
+++ 2.0.23.src/viewforum.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: viewforum.php,v 1.139.2.13 2006/12/16 13:11:25 acydburn Exp $
+ *   $Id: viewforum.php 6772 2006-12-16 13:11:28Z acydburn $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/viewonline.php 2.0.23.src/viewonline.php
--- 2.0.22.src/viewonline.php	2006-12-19 11:29:16.000000000 -0600
+++ 2.0.23.src/viewonline.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: viewonline.php,v 1.54.2.4 2005/05/06 20:50:10 acydburn Exp $
+ *   $Id: viewonline.php 5142 2005-05-06 20:50:13Z acydburn $
  *
  *
  ***************************************************************************/
diff -x .svn -aruN 2.0.22.src/viewtopic.php 2.0.23.src/viewtopic.php
--- 2.0.22.src/viewtopic.php	2006-12-19 11:29:16.000000000 -0600
+++ 2.0.23.src/viewtopic.php	2008-03-11 10:41:34.000000000 -0500
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: viewtopic.php,v 1.186.2.47 2006/12/16 13:11:25 acydburn Exp $
+ *   $Id: viewtopic.php 6772 2006-12-16 13:11:28Z acydburn $
  *
  *
  ***************************************************************************/
