diff -crbBN phpbb203/admin/admin_board.php phpbb2011/admin/admin_board.php
*** phpbb203/admin/admin_board.php	Sat Jul 10 20:16:18 2004
--- phpbb2011/admin/admin_board.php	Thu Nov 18 21:02:11 2004
***************
*** 6,12 ****
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: admin_board.php,v 1.51.2.1 2002/05/12 00:47:39 psotfx Exp $
   *
   *
   ***************************************************************************/
--- 6,12 ----
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: admin_board.php,v 1.51.2.9 2004/11/18 17:49:33 acydburn Exp $
   *
   *
   ***************************************************************************/
***************
*** 16,22 ****
  if( !empty($setmodules) )
  {
  	$file = basename(__FILE__);
! 	$module['General']['Configuration'] = "$file?mode=config";
  	return;
  }
  
--- 16,22 ----
  if( !empty($setmodules) )
  {
  	$file = basename(__FILE__);
! 	$module['General']['Configuration'] = "$file";
  	return;
  }
  
***************
*** 43,52 ****
  	{
  		$config_name = $row['config_name'];
  		$config_value = $row['config_value'];
! 		$default_config[$config_name] = $config_value;
  		
  		$new[$config_name] = ( isset($HTTP_POST_VARS[$config_name]) ) ? $HTTP_POST_VARS[$config_name] : $default_config[$config_name];
  
  		if( isset($HTTP_POST_VARS['submit']) )
  		{
  			$sql = "UPDATE " . CONFIG_TABLE . " SET
--- 43,57 ----
  	{
  		$config_name = $row['config_name'];
  		$config_value = $row['config_value'];
! 		$default_config[$config_name] = isset($HTTP_POST_VARS['submit']) ? str_replace("'", "\'", $config_value) : $config_value;
  		
  		$new[$config_name] = ( isset($HTTP_POST_VARS[$config_name]) ) ? $HTTP_POST_VARS[$config_name] : $default_config[$config_name];
  
+ 		if ($config_name == 'cookie_name')
+ 		{
+ 			$cookie_name = str_replace('.', '_', $new['cookie_name']);
+ 		}
+ 
  		if( isset($HTTP_POST_VARS['submit']) )
  		{
  			$sql = "UPDATE " . CONFIG_TABLE . " SET
***************
*** 68,74 ****
  }
  
  $style_select = style_select($new['default_style'], 'default_style', "../templates");
! $lang_select = language_select($new['default_lang'], 'default_lang', "../language");
  $timezone_select = tz_select($new['board_timezone'], 'board_timezone');
  
  $disable_board_yes = ( $new['board_disable'] ) ? "checked=\"checked\"" : "";
--- 73,79 ----
  }
  
  $style_select = style_select($new['default_style'], 'default_style', "../templates");
! $lang_select = language_select($new['default_lang'], 'default_lang', "language");
  $timezone_select = tz_select($new['board_timezone'], 'board_timezone');
  
  $disable_board_yes = ( $new['board_disable'] ) ? "checked=\"checked\"" : "";
***************
*** 92,97 ****
--- 97,105 ----
  $activation_user = ( $new['require_activation'] == USER_ACTIVATION_SELF ) ? "checked=\"checked\"" : "";
  $activation_admin = ( $new['require_activation'] == USER_ACTIVATION_ADMIN ) ? "checked=\"checked\"" : "";
  
+ $confirm_yes = ($new['enable_confirm']) ? 'checked="checked"' : '';
+ $confirm_no = (!$new['enable_confirm']) ? 'checked="checked"' : '';
+ 
  $board_email_form_yes = ( $new['board_email_form'] ) ? "checked=\"checked\"" : "";
  $board_email_form_no = ( !$new['board_email_form'] ) ? "checked=\"checked\"" : "";
  
***************
*** 155,160 ****
--- 163,170 ----
  	"L_NONE" => $lang['Acc_None'], 
  	"L_USER" => $lang['Acc_User'], 
  	"L_ADMIN" => $lang['Acc_Admin'], 
+ 	"L_VISUAL_CONFIRM" => $lang['Visual_confirm'], 
+ 	"L_VISUAL_CONFIRM_EXPLAIN" => $lang['Visual_confirm_explain'], 
  	"L_COOKIE_SETTINGS" => $lang['Cookie_settings'], 
  	"L_COOKIE_SETTINGS_EXPLAIN" => $lang['Cookie_settings_explain'], 
  	"L_COOKIE_DOMAIN" => $lang['Cookie_domain'],
***************
*** 242,247 ****
--- 252,260 ----
  	"ACTIVATION_USER_CHECKED" => $activation_user,
  	"ACTIVATION_ADMIN" => USER_ACTIVATION_ADMIN, 
  	"ACTIVATION_ADMIN_CHECKED" => $activation_admin, 
+ 	"CONFIRM_ENABLE" => $confirm_yes,
+ 	"CONFIRM_DISABLE" => $confirm_no,
+ 	"ACTIVATION_NONE_CHECKED" => $activation_none,
  	"BOARD_EMAIL_FORM_ENABLE" => $board_email_form_yes, 
  	"BOARD_EMAIL_FORM_DISABLE" => $board_email_form_no, 
  	"MAX_POLL_OPTIONS" => $new['max_poll_options'], 
diff -crbBN phpbb203/admin/admin_db_utilities.php phpbb2011/admin/admin_db_utilities.php
*** phpbb203/admin/admin_db_utilities.php	Sat Jul 10 20:16:19 2004
--- phpbb2011/admin/admin_db_utilities.php	Thu Nov 18 21:02:11 2004
***************
*** 6,12 ****
  *     copyright            : (C) 2001 The phpBB Group
  *     email                : support@phpbb.com
  *
! *     $Id: admin_db_utilities.php,v 1.42.2.5 2002/06/27 21:26:46 dougk_ff7 Exp $
  *
  ****************************************************************************/
  
--- 6,12 ----
  *     copyright            : (C) 2001 The phpBB Group
  *     email                : support@phpbb.com
  *
! *     $Id: admin_db_utilities.php,v 1.42.2.10 2003/03/04 21:02:19 acydburn Exp $
  *
  ****************************************************************************/
  
***************
*** 34,49 ****
  {
  	$filename = basename(__FILE__);
  	$module['General']['Backup_DB'] = $filename . "?perform=backup";
- 	if(@phpversion() >= '4.0.0')
- 	{	
- 		$file_uploads = @ini_get('file_uploads');
- 	}
- 	else
- 	{
- 		$file_uploads = @get_cfg_var('file_uploads');
- 	}
  
! 	if( ($file_uploads != 0 || empty($file_uploads)) && (strtolower($file_uploads) != 'off') && (@phpversion() != '4.0.4pl1') )
  	{
  		$module['General']['Restore_DB'] = $filename . "?perform=restore";
  	}
--- 34,43 ----
  {
  	$filename = basename(__FILE__);
  	$module['General']['Backup_DB'] = $filename . "?perform=backup";
  
! 	$file_uploads = (@phpversion() >= '4.0.0') ? @ini_get('file_uploads') : @get_cfg_var('file_uploads');
! 
! 	if( (empty($file_uploads) || $file_uploads != 0) && (strtolower($file_uploads) != 'off') && (@phpversion() != '4.0.4pl1') )
  	{
  		$module['General']['Restore_DB'] = $filename . "?perform=restore";
  	}
***************
*** 572,628 ****
  function get_table_content_mysql($table, $handler)
  {
  	global $db;
- 	//
- 	// Grab the data from the table.
- 	//
- 	$result = $db->sql_query("SELECT * FROM $table");
  
! 	if (!$result)
  	{
  		message_die(GENERAL_ERROR, "Failed in get_table_content (select *)", "", __LINE__, __FILE__, "SELECT * FROM $table");
  	}
  
- 	if($db->sql_numrows($result) > 0)
- 	{
- 		$schema_insert = "\n#\n# Table Data for $table\n#\n";
- 	}
- 	else
- 	{
- 		$schema_insert = "";
- 	}
- 
- 	$handler($schema_insert);
- 
- 	//
  	// Loop through the resulting rows and build the sql statement.
! 	//
! 
! 	while ($row = $db->sql_fetchrow($result))
  	{
! 		$table_list = '(';
! 		$num_fields = $db->sql_numfields($result);
! 		//
  		// Grab the list of field names.
! 		//
  		for ($j = 0; $j < $num_fields; $j++)
  		{
! 			$table_list .= $db->sql_fieldname($j, $result) . ', ';
  		}
- 		//
- 		// Get rid of the last comma
- 		//
- 		$table_list = ereg_replace(', $', '', $table_list);
  		$table_list .= ')';
! 		//
  		// Start building the SQL statement.
- 		//
  		$schema_insert = "INSERT INTO $table $table_list VALUES(";
! 		//
  		// Loop through the rows and fill in data for each column
- 		//
  		for ($j = 0; $j < $num_fields; $j++)
  		{
! 			if(!isset($row[$j]))
  			{
  				//
  				// If there is no data for the column set it to null.
--- 566,606 ----
  function get_table_content_mysql($table, $handler)
  {
  	global $db;
  
! 	// Grab the data from the table.
! 	if (!($result = $db->sql_query("SELECT * FROM $table")))
  	{
  		message_die(GENERAL_ERROR, "Failed in get_table_content (select *)", "", __LINE__, __FILE__, "SELECT * FROM $table");
  	}
  
  	// Loop through the resulting rows and build the sql statement.
! 	if ($row = $db->sql_fetchrow($result))
  	{
! 		$handler("\n#\n# Table Data for $table\n#\n");
! 		$field_names = array();
! 
  		// Grab the list of field names.
! 		$num_fields = $db->sql_numfields($result);
! 		$table_list = '(';
  		for ($j = 0; $j < $num_fields; $j++)
  		{
! 			$field_names[$j] = $db->sql_fieldname($j, $result);
! 			$table_list .= (($j > 0) ? ', ' : '') . $field_names[$j];
! 			
  		}
  		$table_list .= ')';
! 
! 		do
! 		{
  			// Start building the SQL statement.
  			$schema_insert = "INSERT INTO $table $table_list VALUES(";
! 
  			// Loop through the rows and fill in data for each column
  			for ($j = 0; $j < $num_fields; $j++)
  			{
! 				$schema_insert .= ($j > 0) ? ', ' : '';
! 
! 				if(!isset($row[$field_names[$j]]))
  				{
  					//
  					// If there is no data for the column set it to null.
***************
*** 630,657 ****
  				// sql file not to reimport if the last column was null in
  				// any table.  Should be fixed now :) JLH
  				//
! 				$schema_insert .= ' NULL,';
  			}
! 			elseif ($row[$j] != '')
  			{
! 				$schema_insert .= ' \'' . addslashes($row[$j]) . '\',';
  			}
  			else
  			{
! 				$schema_insert .= '\'\',';
  			}
  		}
! 		//
! 		// Get rid of the the last comma.
! 		//
! 		$schema_insert = ereg_replace(',$', '', $schema_insert);
  		$schema_insert .= ');';
! 		//
  		// Go ahead and send the insert statement to the handler function.
- 		//
  		$handler(trim($schema_insert));
  
  	}
  	return(true);
  }
  
--- 608,634 ----
  					// sql file not to reimport if the last column was null in
  					// any table.  Should be fixed now :) JLH
  					//
! 					$schema_insert .= 'NULL';
  				}
! 				elseif ($row[$field_names[$j]] != '')
  				{
! 					$schema_insert .= '\'' . addslashes($row[$field_names[$j]]) . '\'';
  				}
  				else
  				{
! 					$schema_insert .= '\'\'';
  				}
  			}
! 
  			$schema_insert .= ');';
! 
  			// Go ahead and send the insert statement to the handler function.
  			$handler(trim($schema_insert));
  
  		}
+ 		while ($row = $db->sql_fetchrow($result));
+ 	}
+ 
  	return(true);
  }
  
***************
*** 681,701 ****
  	{
  		case 'backup':
  
! 			if( SQL_LAYER == 'oracle' || SQL_LAYER == 'odbc' || SQL_LAYER == 'mssql' )
! 			{
  				switch(SQL_LAYER)
  				{
  					case 'oracle':
! 						$db_type = "Oracle";
  						break;
! 					case 'odbc':
! 						$db_type = "ODBC";
  						break;
  					case 'mssql':
! 						$db_type = "MSSQL";
  						break;
  				}
  
  				include('./page_header_admin.'.$phpEx);
  
  				$template->set_filenames(array(
--- 657,682 ----
  	{
  		case 'backup':
  
! 			$error = false;
  			switch(SQL_LAYER)
  			{
  				case 'oracle':
! 					$error = true;
! 					break;
! 				case 'db2':
! 					$error = true;
  					break;
! 				case 'msaccess':
! 					$error = true;
  					break;
  				case 'mssql':
! 				case 'mssql-odbc':
! 					$error = true;
  					break;
  			}
  
+ 			if ($error)
+ 			{
  				include('./page_header_admin.'.$phpEx);
  
  				$template->set_filenames(array(
***************
*** 709,715 ****
  
  				$template->pparse("body");
  
! 				break;
  			}
  
  			$tables = array('auth_access', 'banlist', 'categories', 'config', 'disallow', 'forums', 'forum_prune', 'groups', 'posts', 'posts_text', 'privmsgs', 'privmsgs_text', 'ranks', 'search_results', 'search_wordlist', 'search_wordmatch', 'sessions', 'smilies', 'themes', 'themes_name', 'topics', 'topics_watch', 'user_group', 'users', 'vote_desc', 'vote_results', 'vote_voters', 'words');
--- 690,696 ----
  
  				$template->pparse("body");
  
! 				include('./page_footer_admin.'.$phpEx);
  			}
  
  			$tables = array('auth_access', 'banlist', 'categories', 'config', 'disallow', 'forums', 'forum_prune', 'groups', 'posts', 'posts_text', 'privmsgs', 'privmsgs_text', 'ranks', 'search_results', 'search_wordlist', 'search_wordmatch', 'sessions', 'smilies', 'themes', 'themes_name', 'topics', 'topics_watch', 'user_group', 'users', 'vote_desc', 'vote_results', 'vote_voters', 'words');
***************
*** 721,726 ****
--- 701,708 ----
  
  			$gzipcompress = (!empty($HTTP_POST_VARS['gzipcompress'])) ? $HTTP_POST_VARS['gzipcompress'] : ( (!empty($HTTP_GET_VARS['gzipcompress'])) ? $HTTP_GET_VARS['gzipcompress'] : 0 );
  
+ 			$drop = (!empty($HTTP_POST_VARS['drop'])) ? intval($HTTP_POST_VARS['drop']) : ( (!empty($HTTP_GET_VARS['drop'])) ? intval($HTTP_GET_VARS['drop']) : 0 );
+ 
  			if(!empty($additional_tables))
  			{
  				if(ereg(",", $additional_tables))
***************
*** 780,786 ****
  				);
  
  				$template->assign_vars(array(
! 					"META" => "<meta http-equiv=\"refresh\" content=\"2;url=admin_db_utilities.$phpEx?perform=backup&additional_tables=" . quotemeta($additional_tables) . "&backup_type=$backup_type&drop=1&amp;backupstart=1&gzipcompress=$gzipcompress&startdownload=1\">",
  
  					"MESSAGE_TITLE" => $lang['Database_Utilities'] . " : " . $lang['Backup'],
  					"MESSAGE_TEXT" => $lang['Backup_download'])
--- 762,768 ----
  				);
  
  				$template->assign_vars(array(
! 					"META" => '<meta http-equiv="refresh" content="2;url=' . append_sid("admin_db_utilities.$phpEx?perform=backup&additional_tables=" . quotemeta($additional_tables) . "&backup_type=$backup_type&drop=1&amp;backupstart=1&gzipcompress=$gzipcompress&startdownload=1") . '">',
  
  					"MESSAGE_TITLE" => $lang['Database_Utilities'] . " : " . $lang['Backup'],
  					"MESSAGE_TEXT" => $lang['Backup_download'])
***************
*** 836,850 ****
  			for($i = 0; $i < count($tables); $i++)
  			{
  				$table_name = $tables[$i];
! 				if(SQL_LAYER != 'mysql4')
! 				{
! 					$table_def_function = "get_table_def_" . SQL_LAYER;
! 					$table_content_function = "get_table_content_" . SQL_LAYER;
! 				}
! 				else
  				{
  					$table_def_function = "get_table_def_mysql";
  					$table_content_function = "get_table_content_mysql";
  				}
  
  				if($backup_type != 'data')
--- 818,836 ----
  			for($i = 0; $i < count($tables); $i++)
  			{
  				$table_name = $tables[$i];
! 
! 				switch (SQL_LAYER)
  				{
+ 					case 'postgresql':
+ 						$table_def_function = "get_table_def_postgresql";
+ 						$table_content_function = "get_table_content_postgresql";
+ 						break;
+ 
+ 					case 'mysql':
+ 					case 'mysql4':
  						$table_def_function = "get_table_def_mysql";
  						$table_content_function = "get_table_content_mysql";
+ 						break;
  				}
  
  				if($backup_type != 'data')
***************
*** 872,878 ****
  			break;
  
  		case 'restore':
! 			if(!isset($restore_start))
  			{
  				//
  				// Define Template files...
--- 858,864 ----
  			break;
  
  		case 'restore':
! 			if(!isset($HTTP_POST_VARS['restore_start']))
  			{
  				//
  				// Define Template files...
***************
*** 919,925 ****
  				// a hackers attempt at getting us to process a local system
  				// file.
  				//
! 				if( file_exists($backup_file_tmpname) )
  				{
  					if( preg_match("/^(text\/[a-zA-Z]+)|(application\/(x\-)?gzip(\-compressed)?)|(application\/octet-stream)$/is", $backup_file_type) )
  					{
--- 905,911 ----
  				// a hackers attempt at getting us to process a local system
  				// file.
  				//
! 				if( file_exists(phpbb_realpath($backup_file_tmpname)) )
  				{
  					if( preg_match("/^(text\/[a-zA-Z]+)|(application\/(x\-)?gzip(\-compressed)?)|(application\/octet-stream)$/is", $backup_file_type) )
  					{
diff -crbBN phpbb203/admin/admin_disallow.php phpbb2011/admin/admin_disallow.php
*** phpbb203/admin/admin_disallow.php	Sat Jul 10 20:16:19 2004
--- phpbb2011/admin/admin_disallow.php	Thu Nov 18 21:02:11 2004
***************
*** 6,12 ****
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: admin_disallow.php,v 1.9.2.1 2002/05/12 00:47:40 psotfx Exp $
   *
   *
   ***************************************************************************/
--- 6,12 ----
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: admin_disallow.php,v 1.9.2.2 2002/11/26 11:42:11 psotfx Exp $
   *
   *
   ***************************************************************************/
***************
*** 41,48 ****
  {
  	include($phpbb_root_path . 'includes/functions_validate.'.$phpEx);
  
! 	$disallowed_user = ( isset($HTTP_POST_VARS['disallowed_user']) ) ? $HTTP_POST_VARS['disallowed_user'] : $HTTP_GET_VARS['disallowed_user'];
  
  	if( !validate_username($disallowed_user) )
  	{
  		$message = $lang['Disallowed_already'];
--- 41,52 ----
  {
  	include($phpbb_root_path . 'includes/functions_validate.'.$phpEx);
  
! 	$disallowed_user = ( isset($HTTP_POST_VARS['disallowed_user']) ) ? trim($HTTP_POST_VARS['disallowed_user']) : trim($HTTP_GET_VARS['disallowed_user']);
  
+ 	if ($disallowed_user == '')
+ 	{
+ 		message_die(MESSAGE, $lang['Fields_empty']);
+ 	}
  	if( !validate_username($disallowed_user) )
  	{
  		$message = $lang['Disallowed_already'];
diff -crbBN phpbb203/admin/admin_forum_prune.php phpbb2011/admin/admin_forum_prune.php
*** phpbb203/admin/admin_forum_prune.php	Sat Jul 10 20:16:18 2004
--- phpbb2011/admin/admin_forum_prune.php	Thu Nov 18 21:02:11 2004
***************
*** 6,12 ****
  *     copyright            : (C) 2001 The phpBB Group
  *     email                : support@phpbb.com
  *
! *     $Id: admin_forum_prune.php,v 1.22.2.2 2002/05/12 15:57:44 psotfx Exp $
  *
  ****************************************************************************/
  
--- 6,12 ----
  *     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 $
  *
  ****************************************************************************/
  
***************
*** 168,176 ****
  		$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'];
  
! 		$hidden_input = '<input type="hidden" name="' . POST_FORUM_URL . '" value="' . $forum_id . '">';
  
  		//
  		// Assign the template variables.
--- 168,176 ----
  		$forum_name = ( $forum_id == -1 ) ? $lang['All_Forums'] : $forum_rows[0]['forum_name'];
  
  		$prune_data = $lang['Prune_topics_not_posted'] . " "; 
! 		$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 . '" />';
  
  		//
  		// Assign the template variables.
diff -crbBN phpbb203/admin/admin_forumauth.php phpbb2011/admin/admin_forumauth.php
*** phpbb203/admin/admin_forumauth.php	Sat Jul 10 20:16:19 2004
--- phpbb2011/admin/admin_forumauth.php	Thu Nov 18 21:02:11 2004
***************
*** 6,12 ****
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: admin_forumauth.php,v 1.23.2.4 2002/05/21 16:52:08 psotfx Exp $
   *
   *
   ***************************************************************************/
--- 6,12 ----
   *   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 $
   *
   *
   ***************************************************************************/
***************
*** 102,121 ****
  	{
  		if(isset($HTTP_POST_VARS['simpleauth']))
  		{
! 			$simple_ary = $simple_auth_ary[$HTTP_POST_VARS['simpleauth']];
  
  			for($i = 0; $i < count($simple_ary); $i++)
  			{
  				$sql .= ( ( $sql != '' ) ? ', ' : '' ) . $forum_auth_fields[$i] . ' = ' . $simple_ary[$i];
  			}
  
  			$sql = "UPDATE " . FORUMS_TABLE . " SET $sql WHERE forum_id = $forum_id";
  		}
  		else
  		{
  			for($i = 0; $i < count($forum_auth_fields); $i++)
  			{
! 				$value = $HTTP_POST_VARS[$forum_auth_fields[$i]];
  
  				if ( $forum_auth_fields[$i] == 'auth_vote' )
  				{
--- 102,124 ----
  	{
  		if(isset($HTTP_POST_VARS['simpleauth']))
  		{
! 			$simple_ary = $simple_auth_ary[intval($HTTP_POST_VARS['simpleauth'])];
  
  			for($i = 0; $i < count($simple_ary); $i++)
  			{
  				$sql .= ( ( $sql != '' ) ? ', ' : '' ) . $forum_auth_fields[$i] . ' = ' . $simple_ary[$i];
  			}
  
+ 			if (is_array($simple_ary))
+ 			{
  				$sql = "UPDATE " . FORUMS_TABLE . " SET $sql WHERE forum_id = $forum_id";
  			}
+ 		}
  		else
  		{
  			for($i = 0; $i < count($forum_auth_fields); $i++)
  			{
! 				$value = intval($HTTP_POST_VARS[$forum_auth_fields[$i]]);
  
  				if ( $forum_auth_fields[$i] == 'auth_vote' )
  				{
diff -crbBN phpbb203/admin/admin_forums.php phpbb2011/admin/admin_forums.php
*** phpbb203/admin/admin_forums.php	Sat Jul 10 20:16:19 2004
--- phpbb2011/admin/admin_forums.php	Thu Nov 18 21:02:11 2004
***************
*** 6,12 ****
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: admin_forums.php,v 1.40.2.3 2002/07/19 14:10:06 psotfx Exp $
   *
   ***************************************************************************/
  
--- 6,12 ----
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: admin_forums.php,v 1.40.2.11 2004/03/25 15:57:19 acydburn Exp $
   *
   ***************************************************************************/
  
***************
*** 43,49 ****
  	"auth_reply" => AUTH_ALL, 
  	"auth_edit" => AUTH_REG, 
  	"auth_delete" => AUTH_REG, 
! 	"auth_sticky" => AUTH_REG, 
  	"auth_announce" => AUTH_MOD, 
  	"auth_vote" => AUTH_REG, 
  	"auth_pollcreate" => AUTH_REG
--- 43,49 ----
  	"auth_reply" => AUTH_ALL, 
  	"auth_edit" => AUTH_REG, 
  	"auth_delete" => AUTH_REG, 
! 	"auth_sticky" => AUTH_MOD, 
  	"auth_announce" => AUTH_MOD, 
  	"auth_vote" => AUTH_REG, 
  	"auth_pollcreate" => AUTH_REG
***************
*** 55,60 ****
--- 55,61 ----
  if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
  {
  	$mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
+ 	$mode = htmlspecialchars($mode);
  }
  else
  {
***************
*** 301,306 ****
--- 302,313 ----
  			$catlist = get_list('category', $cat_id, TRUE);
  
  			$forumstatus == ( FORUM_LOCKED ) ? $forumlocked = "selected=\"selected\"" : $forumunlocked = "selected=\"selected\"";
+ 			
+ 			// These two options ($lang['Status_unlocked'] and $lang['Status_locked']) seem to be missing from
+ 			// the language files.
+ 			$lang['Status_unlocked'] = isset($lang['Status_unlocked']) ? $lang['Status_unlocked'] : 'Unlocked';
+ 			$lang['Status_locked'] = isset($lang['Status_locked']) ? $lang['Status_locked'] : 'Locked';
+ 			
  			$statuslist = "<option value=\"" . FORUM_UNLOCKED . "\" $forumunlocked>" . $lang['Status_unlocked'] . "</option>\n";
  			$statuslist .= "<option value=\"" . FORUM_LOCKED . "\" $forumlocked>" . $lang['Status_locked'] . "</option>\n"; 
  
***************
*** 604,611 ****
  			// Either delete or move all posts in a forum
  			if($to_id == -1)
  			{
  				include($phpbb_root_path . "includes/prune.$phpEx");
! 				prune($from_id, 0); // Delete everything from forum
  			}
  			else
  			{
--- 610,650 ----
  			// Either delete or move all posts in a forum
  			if($to_id == -1)
  			{
+ 				// Delete polls in this forum
+ 				$sql = "SELECT v.vote_id 
+ 					FROM " . VOTE_DESC_TABLE . " v, " . TOPICS_TABLE . " t 
+ 					WHERE t.forum_id = $from_id 
+ 						AND v.topic_id = t.topic_id";
+ 				if (!($result = $db->sql_query($sql)))
+ 				{
+ 					message_die(GENERAL_ERROR, "Couldn't obtain list of vote ids", "", __LINE__, __FILE__, $sql);
+ 				}
+ 
+ 				if ($row = $db->sql_fetchrow($result))
+ 				{
+ 					$vote_ids = '';
+ 					do
+ 					{
+ 						$vote_ids = (($vote_ids != '') ? ', ' : '') . $row['vote_id'];
+ 					}
+ 					while ($row = $db->sql_fetchrow($result));
+ 
+ 					$sql = "DELETE FROM " . VOTE_DESC_TABLE . " 
+ 						WHERE vote_id IN ($vote_ids)";
+ 					$db->sql_query($sql);
+ 
+ 					$sql = "DELETE FROM " . VOTE_RESULTS_TABLE . " 
+ 						WHERE vote_id IN ($vote_ids)";
+ 					$db->sql_query($sql);
+ 
+ 					$sql = "DELETE FROM " . VOTE_USERS_TABLE . " 
+ 						WHERE vote_id IN ($vote_ids)";
+ 					$db->sql_query($sql);
+ 				}
+ 				$db->sql_freeresult($result);
+ 				
  				include($phpbb_root_path . "includes/prune.$phpEx");
! 				prune($from_id, 0, true); // Delete everything from forum
  			}
  			else
  			{
***************
*** 636,641 ****
--- 676,732 ----
  				}
  				sync('forum', $to_id);
  			}
+ 
+ 			// Alter Mod level if appropriate - 2.0.4
+ 			$sql = "SELECT ug.user_id 
+ 				FROM " . AUTH_ACCESS_TABLE . " a, " . USER_GROUP_TABLE . " ug 
+ 				WHERE a.forum_id <> $from_id 
+ 					AND a.auth_mod = 1
+ 					AND ug.group_id = a.group_id";
+ 			if( !$result = $db->sql_query($sql) )
+ 			{
+ 				message_die(GENERAL_ERROR, "Couldn't obtain moderator list", "", __LINE__, __FILE__, $sql);
+ 			}
+ 
+ 			if ($row = $db->sql_fetchrow($result))
+ 			{
+ 				$user_ids = '';
+ 				do
+ 				{
+ 					$user_ids .= (($user_ids != '') ? ', ' : '' ) . $row['user_id'];
+ 				}
+ 				while ($row = $db->sql_fetchrow($result));
+ 
+ 				$sql = "SELECT ug.user_id 
+ 					FROM " . AUTH_ACCESS_TABLE . " a, " . USER_GROUP_TABLE . " ug 
+ 					WHERE a.forum_id = $from_id 
+ 						AND a.auth_mod = 1 
+ 						AND ug.group_id = a.group_id
+ 						AND ug.user_id NOT IN ($user_ids)";
+ 				if( !$result2 = $db->sql_query($sql) )
+ 				{
+ 					message_die(GENERAL_ERROR, "Couldn't obtain moderator list", "", __LINE__, __FILE__, $sql);
+ 				}
+ 					
+ 				if ($row = $db->sql_fetchrow($result2))
+ 				{
+ 					$user_ids = '';
+ 					do
+ 					{
+ 						$user_ids .= (($user_ids != '') ? ', ' : '' ) . $row['user_id'];
+ 					}
+ 					while ($row = $db->sql_fetchrow($result2));
+ 
+ 					$sql = "UPDATE " . USERS_TABLE . " 
+ 						SET user_level = " . USER . " 
+ 						WHERE user_id IN ($user_ids) 
+ 							AND user_level <> " . ADMIN;
+ 					$db->sql_query($sql);
+ 				}
+ 				$db->sql_freeresult($result);
+ 
+ 			}
+ 			$db->sql_freeresult($result2);
  
  			$sql = "DELETE FROM " . FORUMS_TABLE . "
  				WHERE forum_id = $from_id";
diff -crbBN phpbb203/admin/admin_groups.php phpbb2011/admin/admin_groups.php
*** phpbb203/admin/admin_groups.php	Sat Jul 10 20:16:19 2004
--- phpbb2011/admin/admin_groups.php	Thu Nov 18 21:02:11 2004
***************
*** 6,12 ****
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: admin_groups.php,v 1.25.2.5 2002/07/31 19:14:46 dougk_ff7 Exp $
   *
   *
   ***************************************************************************/
--- 6,12 ----
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: admin_groups.php,v 1.25.2.9 2004/03/25 15:57:20 acydburn Exp $
   *
   *
   ***************************************************************************/
***************
*** 43,54 ****
  }
  else
  {
! 	$group_id = '';
  }
  
  if ( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
  {
  	$mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
  }
  else
  {
--- 43,55 ----
  }
  else
  {
! 	$group_id = 0;
  }
  
  if ( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
  {
  	$mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
+ 	$mode = htmlspecialchars($mode);
  }
  else
  {
***************
*** 171,176 ****
--- 172,227 ----
  	//
  	if ( isset($HTTP_POST_VARS['group_delete']) )
  	{
+ 		//
+ 		// Reset User Moderator Level
+ 		//
+ 
+ 		// Is Group moderating a forum ?
+ 		$sql = "SELECT auth_mod FROM " . AUTH_ACCESS_TABLE . " 
+ 			WHERE group_id = " . $group_id;
+ 		if ( !($result = $db->sql_query($sql)) )
+ 		{
+ 			message_die(GENERAL_ERROR, 'Could not select auth_access', '', __LINE__, __FILE__, $sql);
+ 		}
+ 
+ 		$row = $db->sql_fetchrow($result);
+ 		if (intval($row['auth_mod']) == 1)
+ 		{
+ 			// Yes, get the assigned users and update their Permission if they are no longer moderator of one of the forums
+ 			$sql = "SELECT user_id FROM " . USER_GROUP_TABLE . "
+ 				WHERE group_id = " . $group_id;
+ 			if ( !($result = $db->sql_query($sql)) )
+ 			{
+ 				message_die(GENERAL_ERROR, 'Could not select user_group', '', __LINE__, __FILE__, $sql);
+ 			}
+ 
+ 			$rows = $db->sql_fetchrowset($result);
+ 			for ($i = 0; $i < count($rows); $i++)
+ 			{
+ 				$sql = "SELECT g.group_id FROM " . AUTH_ACCESS_TABLE . " a, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug
+ 				WHERE (a.auth_mod = 1) AND (g.group_id = a.group_id) AND (a.group_id = ug.group_id) AND (g.group_id = ug.group_id) 
+ 					AND (ug.user_id = " . intval($rows[$i]['user_id']) . ") AND (ug.group_id <> " . $group_id . ")";
+ 				if ( !($result = $db->sql_query($sql)) )
+ 				{
+ 					message_die(GENERAL_ERROR, 'Could not obtain moderator permissions', '', __LINE__, __FILE__, $sql);
+ 				}
+ 
+ 				if ($db->sql_numrows($result) == 0)
+ 				{
+ 					$sql = "UPDATE " . USERS_TABLE . " SET user_level = " . USER . " 
+ 					WHERE user_level = " . MOD . " AND user_id = " . intval($rows[$i]['user_id']);
+ 					
+ 					if ( !$db->sql_query($sql) )
+ 					{
+ 						message_die(GENERAL_ERROR, 'Could not update moderator permissions', '', __LINE__, __FILE__, $sql);
+ 					}
+ 				}
+ 			}
+ 		}
+ 
+ 		//
+ 		// Delete Group
+ 		//
  		$sql = "DELETE FROM " . GROUPS_TABLE . "
  			WHERE group_id = " . $group_id;
  		if ( !$db->sql_query($sql) )
***************
*** 213,219 ****
  			message_die(GENERAL_MESSAGE, $lang['No_group_moderator']);
  		}
  		
! 		$this_userdata = get_userdata($group_moderator);
  		$group_moderator = $this_userdata['user_id'];
  
  		if ( !$group_moderator )
--- 264,270 ----
  			message_die(GENERAL_MESSAGE, $lang['No_group_moderator']);
  		}
  		
! 		$this_userdata = get_userdata($group_moderator, true);
  		$group_moderator = $this_userdata['user_id'];
  
  		if ( !$group_moderator )
diff -crbBN phpbb203/admin/admin_mass_email.php phpbb2011/admin/admin_mass_email.php
*** phpbb203/admin/admin_mass_email.php	Sat Jul 10 20:16:18 2004
--- phpbb2011/admin/admin_mass_email.php	Thu Nov 18 21:02:11 2004
***************
*** 6,12 ****
  *     copyright            : (C) 2001 The phpBB Group
  *     email                : support@phpbb.com
  *
! *     $Id: admin_mass_email.php,v 1.15.2.5 2002/05/20 00:52:18 psotfx Exp $
  *
  ****************************************************************************/
  
--- 6,12 ----
  *     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 $
  *
  ****************************************************************************/
  
***************
*** 79,88 ****
  
  	if ( $row = $db->sql_fetchrow($result) )
  	{
! 		$bcc_list = '';
  		do
  		{
! 			$bcc_list .= ( ( $bcc_list != '' ) ? ', ' : '' ) . $row['user_email'];
  		}
  		while ( $row = $db->sql_fetchrow($result) );
  
--- 79,88 ----
  
  	if ( $row = $db->sql_fetchrow($result) )
  	{
! 		$bcc_list = array();
  		do
  		{
! 			$bcc_list[] = $row['user_email'];
  		}
  		while ( $row = $db->sql_fetchrow($result) );
  
***************
*** 116,127 ****
  
  		$emailer = new emailer($board_config['smtp_delivery']);
  	
! 		$email_headers = 'Return-Path: ' . $userdata['board_email'] . "\nFrom: " . $board_config['board_email'] . "\n";
! 		$email_headers .= 'X-AntiAbuse: Board servername - ' . $board_config['server_name'] . "\n";
  		$email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n";
  		$email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n";
  		$email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\n";
- 		$email_headers .= "Bcc: $bcc_list\n";
  
  		$emailer->use_template('admin_send_email');
  		$emailer->email_address($board_config['board_email']);
--- 116,133 ----
  
  		$emailer = new emailer($board_config['smtp_delivery']);
  	
! 		$emailer->from($board_config['board_email']);
! 		$emailer->replyto($board_config['board_email']);
! 
! 		for ($i = 0; $i < count($bcc_list); $i++)
! 		{
! 			$emailer->bcc($bcc_list[$i]);
! 		}
! 
! 		$email_headers = 'X-AntiAbuse: Board servername - ' . $board_config['server_name'] . "\n";
  		$email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n";
  		$email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n";
  		$email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\n";
  
  		$emailer->use_template('admin_send_email');
  		$emailer->email_address($board_config['board_email']);
diff -crbBN phpbb203/admin/admin_ranks.php phpbb2011/admin/admin_ranks.php
*** phpbb203/admin/admin_ranks.php	Sat Jul 10 20:16:19 2004
--- phpbb2011/admin/admin_ranks.php	Thu Nov 18 21:02:11 2004
***************
*** 6,13 ****
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: admin_ranks.php,v 1.13.2.2 2002/05/12 15:57:44 psotfx Exp $
!  *
   *
   ***************************************************************************/
  
--- 6,12 ----
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: admin_ranks.php,v 1.13.2.4 2004/03/25 15:57:20 acydburn Exp $
   *
   ***************************************************************************/
  
***************
*** 39,44 ****
--- 38,44 ----
  if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
  {
  	$mode = ($HTTP_GET_VARS['mode']) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode'];
+ 	$mode = htmlspecialchars($mode);
  }
  else 
  {
***************
*** 162,169 ****
  			}
  		}
  
! 		if( $rank_id )
  		{
  			$sql = "UPDATE " . RANKS_TABLE . "
  				SET rank_title = '" . str_replace("\'", "''", $rank_title) . "', rank_special = $special_rank, rank_min = $min_posts, rank_image = '" . str_replace("\'", "''", $rank_image) . "'
  				WHERE rank_id = $rank_id";
--- 162,180 ----
  			}
  		}
  
! 		if ($rank_id)
! 		{
! 			if (!$special_rank)
! 			{
! 				$sql = "UPDATE " . USERS_TABLE . " 
! 					SET user_rank = 0 
! 					WHERE user_rank = $rank_id";
! 
! 				if( !$result = $db->sql_query($sql) ) 
  				{
+ 					message_die(GENERAL_ERROR, $lang['No_update_ranks'], "", __LINE__, __FILE__, $sql);
+ 				}
+ 			}
  			$sql = "UPDATE " . RANKS_TABLE . "
  				SET rank_title = '" . str_replace("\'", "''", $rank_title) . "', rank_special = $special_rank, rank_min = $min_posts, rank_image = '" . str_replace("\'", "''", $rank_image) . "'
  				WHERE rank_id = $rank_id";
diff -crbBN phpbb203/admin/admin_smilies.php phpbb2011/admin/admin_smilies.php
*** phpbb203/admin/admin_smilies.php	Sat Jul 10 20:16:19 2004
--- phpbb2011/admin/admin_smilies.php	Thu Nov 18 21:02:11 2004
***************
*** 6,12 ****
  *     copyright            : (C) 2001 The phpBB Group
  *     email                : support@phpbb.com
  *
! *     $Id: admin_smilies.php,v 1.22.2.5 2002/07/19 14:10:07 psotfx Exp $
  *
  ****************************************************************************/
  
--- 6,12 ----
  *     copyright            : (C) 2001 The phpBB Group
  *     email                : support@phpbb.com
  *
! *     $Id: admin_smilies.php,v 1.22.2.13 2004/03/25 15:57:20 acydburn Exp $
  *
  ****************************************************************************/
  
***************
*** 57,62 ****
--- 57,63 ----
  if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
  {
  	$mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
+ 	$mode = htmlspecialchars($mode);
  }
  else
  {
***************
*** 72,78 ****
  
  while($file = @readdir($dir))
  {
! 	if( !@is_dir($phpbb_root_path . $board_config['smilies_path'] . '/' . $file) )
  	{
  		$img_size = @getimagesize($phpbb_root_path . $board_config['smilies_path'] . '/' . $file);
  
--- 73,79 ----
  
  while($file = @readdir($dir))
  {
! 	if( !@is_dir(phpbb_realpath($phpbb_root_path . $board_config['smilies_path'] . '/' . $file)) )
  	{
  		$img_size = @getimagesize($phpbb_root_path . $board_config['smilies_path'] . '/' . $file);
  
***************
*** 239,245 ****
  			FROM " . SMILIES_TABLE;
  		if( !$result = $db->sql_query($sql) )
  		{
! 			message_die(GENERAL_ERROR, "Couldn't delete smiley", "", __LINE__, __FILE__, $sql);
  		}
  
  		$resultset = $db->sql_fetchrowset($result);
--- 240,246 ----
  			FROM " . SMILIES_TABLE;
  		if( !$result = $db->sql_query($sql) )
  		{
! 			message_die(GENERAL_ERROR, "Could not get smiley list", "", __LINE__, __FILE__, $sql);
  		}
  
  		$resultset = $db->sql_fetchrowset($result);
***************
*** 313,318 ****
--- 314,320 ----
  			//
  
  			$smiley_id = ( !empty($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id'];
+ 			$smiley_id = intval($smiley_id);
  
  			$sql = "DELETE FROM " . SMILIES_TABLE . "
  				WHERE smilies_id = " . $smiley_id;
***************
*** 333,338 ****
--- 335,341 ----
  			//
  
  			$smiley_id = ( !empty($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id'];
+ 			$smiley_id = intval($smiley_id);
  
  			$sql = "SELECT *
  				FROM " . SMILIES_TABLE . "
***************
*** 399,408 ****
  			// Get the submitted data, being careful to ensure that we only
  			// accept the data we are looking for.
  			//
! 			$smile_code = ( isset($HTTP_POST_VARS['smile_code']) ) ? $HTTP_POST_VARS['smile_code'] : $HTTP_GET_VARS['smile_code'];
! 			$smile_url = ( isset($HTTP_POST_VARS['smile_url']) ) ? $HTTP_POST_VARS['smile_url'] : $HTTP_GET_VARS['smile_url'];
! 			$smile_emotion = ( isset($HTTP_POST_VARS['smile_emotion']) ) ? $HTTP_POST_VARS['smile_emotion'] : $HTTP_GET_VARS['smile_emotion'];
  			$smile_id = ( isset($HTTP_POST_VARS['smile_id']) ) ? intval($HTTP_POST_VARS['smile_id']) : intval($HTTP_GET_VARS['smile_id']);
  			//
  			// Convert < and > to proper htmlentities for parsing.
  			//
--- 402,418 ----
  			// Get the submitted data, being careful to ensure that we only
  			// accept the data we are looking for.
  			//
! 			$smile_code = ( isset($HTTP_POST_VARS['smile_code']) ) ? trim($HTTP_POST_VARS['smile_code']) : trim($HTTP_GET_VARS['smile_code']);
! 			$smile_url = ( isset($HTTP_POST_VARS['smile_url']) ) ? trim($HTTP_POST_VARS['smile_url']) : trim($HTTP_GET_VARS['smile_url']);
! 			$smile_emotion = ( isset($HTTP_POST_VARS['smile_emotion']) ) ? trim($HTTP_POST_VARS['smile_emotion']) : trim($HTTP_GET_VARS['smile_emotion']);
  			$smile_id = ( isset($HTTP_POST_VARS['smile_id']) ) ? intval($HTTP_POST_VARS['smile_id']) : intval($HTTP_GET_VARS['smile_id']);
+ 
+ 			// If no code was entered complain ...
+ 			if ($smile_code == '' || $smile_url == '')
+ 			{
+ 				message_die(MESSAGE, $lang['Fields_empty']);
+ 			}
+ 
  			//
  			// Convert < and > to proper htmlentities for parsing.
  			//
***************
*** 415,422 ****
  			$sql = "UPDATE " . SMILIES_TABLE . "
  				SET code = '" . str_replace("\'", "''", $smile_code) . "', smile_url = '" . str_replace("\'", "''", $smile_url) . "', emoticon = '" . str_replace("\'", "''", $smile_emotion) . "'
  				WHERE smilies_id = $smile_id";
! 			$result = $db->sql_query($sql);
! 			if( !$result )
  			{
  				message_die(GENERAL_ERROR, "Couldn't update smilies info", "", __LINE__, __FILE__, $sql);
  			}
--- 425,431 ----
  			$sql = "UPDATE " . SMILIES_TABLE . "
  				SET code = '" . str_replace("\'", "''", $smile_code) . "', smile_url = '" . str_replace("\'", "''", $smile_url) . "', emoticon = '" . str_replace("\'", "''", $smile_emotion) . "'
  				WHERE smilies_id = $smile_id";
! 			if( !($result = $db->sql_query($sql)) )
  			{
  				message_die(GENERAL_ERROR, "Couldn't update smilies info", "", __LINE__, __FILE__, $sql);
  			}
***************
*** 439,444 ****
--- 448,459 ----
  			$smile_url = ( isset($HTTP_POST_VARS['smile_url']) ) ? $HTTP_POST_VARS['smile_url'] : $HTTP_GET_VARS['smile_url'];
  			$smile_emotion = ( isset($HTTP_POST_VARS['smile_emotion']) ) ? $HTTP_POST_VARS['smile_emotion'] : $HTTP_GET_VARS['smile_emotion'];
  
+ 			// If no code was entered complain ...
+ 			if ($smile_code == '' || $smile_url == '')
+ 			{
+ 				message_die(MESSAGE, $lang['Fields_empty']);
+ 			}
+ 
  			//
  			// Convert < and > to proper htmlentities for parsing.
  			//
diff -crbBN phpbb203/admin/admin_styles.php phpbb2011/admin/admin_styles.php
*** phpbb203/admin/admin_styles.php	Sat Jul 10 20:16:19 2004
--- phpbb2011/admin/admin_styles.php	Thu Nov 18 21:02:11 2004
***************
*** 6,12 ****
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: admin_styles.php,v 1.27.2.3 2002/05/13 13:18:17 psotfx Exp $
   *
   *
   ***************************************************************************/
--- 6,12 ----
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: admin_styles.php,v 1.27.2.13 2004/07/15 17:57:50 acydburn Exp $
   *
   *
   ***************************************************************************/
***************
*** 39,65 ****
  // Check if the user has cancled a confirmation message.
  //
  $phpbb_root_path = "./../";
  
  $confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : FALSE;
  $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE;
  
! if( empty($HTTP_POST_VARS['send_file']) )
! {
! 	$no_page_header = ( $cancel ) ? TRUE : FALSE;
! 	require($phpbb_root_path . 'extension.inc');
! 	require('./pagestart.' . $phpEx);
! }
  
! if( $cancel )
  {
! 	$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
! 	header($header_location  . append_sid("admin_styles.$phpEx"));
! 	exit;
  }
  
  if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
  {
  	$mode = ( isset($HTTP_GET_VARS['mode']) ) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode'];
  }
  else 
  {
--- 39,65 ----
  // Check if the user has cancled a confirmation message.
  //
  $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;
  
! $no_page_header = (!empty($HTTP_POST_VARS['send_file']) || $cancel) ? TRUE : FALSE;
! 
! require('./pagestart.' . $phpEx);
! 
! $confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : FALSE;
! $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE;
  
! if ($cancel)
  {
! 	redirect('admin/' . append_sid("admin_styles.$phpEx", true));
  }
  
  if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
  {
  	$mode = ( isset($HTTP_GET_VARS['mode']) ) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode'];
+ 	$mode = htmlspecialchars($mode);
  }
  else 
  {
***************
*** 134,142 ****
  			{
  				while( $sub_dir = @readdir($dir) )
  				{
! 					if( !is_file($phpbb_root_path . 'templates/' .$sub_dir) && !is_link($phpbb_root_path . 'templates/' .$sub_dir) && $sub_dir != "." && $sub_dir != ".." && $sub_dir != "CVS" )
  					{
! 						if( @file_exists($phpbb_root_path. "templates/" . $sub_dir . "/theme_info.cfg") )
  						{
  							include($phpbb_root_path. "templates/" . $sub_dir . "/theme_info.cfg");
  							
--- 134,142 ----
  			{
  				while( $sub_dir = @readdir($dir) )
  				{
! 					if( !is_file(phpbb_realpath($phpbb_root_path . 'templates/' .$sub_dir)) && !is_link(phpbb_realpath($phpbb_root_path . 'templates/' .$sub_dir)) && $sub_dir != "." && $sub_dir != ".." && $sub_dir != "CVS" )
  					{
! 						if( @file_exists(@phpbb_realpath($phpbb_root_path. "templates/" . $sub_dir . "/theme_info.cfg")) )
  						{
  							include($phpbb_root_path. "templates/" . $sub_dir . "/theme_info.cfg");
  							
***************
*** 492,498 ****
  				$themes_title = $lang['Edit_theme'];
  				$themes_explain = $lang['Edit_theme_explain'];
  				
! 				$style_id = $HTTP_GET_VARS['style_id'];
  				
  				$selected_names = array();
  				$selected_values = array();
--- 492,498 ----
  				$themes_title = $lang['Edit_theme'];
  				$themes_explain = $lang['Edit_theme_explain'];
  				
! 				$style_id = intval($HTTP_GET_VARS['style_id']);
  				
  				$selected_names = array();
  				$selected_values = array();
***************
*** 551,557 ****
  				$s_template_select = '<select name="template_name">';
  				while( $file = @readdir($dir) )
  				{	
! 					if( !is_file($phpbb_root_path . 'templates/' . $file) && !is_link($phpbb_root_path . 'templates/' . $file) && $file != "." && $file != ".." && $file != "CVS" )
  					{
  						if($file == $selected['template_name'])
  						{
--- 551,557 ----
  				$s_template_select = '<select name="template_name">';
  				while( $file = @readdir($dir) )
  				{	
! 					if( !is_file(phpbb_realpath($phpbb_root_path . 'templates/' . $file)) && !is_link(phpbb_realpath($phpbb_root_path . 'templates/' . $file)) && $file != "." && $file != ".." && $file != "CVS" )
  					{
  						if($file == $selected['template_name'])
  						{
***************
*** 707,713 ****
  
  			$sql = "SELECT * 
  				FROM " . THEMES_TABLE . " 
! 				WHERE template_name = '$template_name'";
  			if(!$result = $db->sql_query($sql))
  			{
  				message_die(GENERAL_ERROR, "Could not get theme data for selected template", "", __LINE__, __FILE__, $sql);
--- 707,713 ----
  
  			$sql = "SELECT * 
  				FROM " . THEMES_TABLE . " 
! 				WHERE template_name = '" . str_replace("\'", "''", $template_name) . "'";
  			if(!$result = $db->sql_query($sql))
  			{
  				message_die(GENERAL_ERROR, "Could not get theme data for selected template", "", __LINE__, __FILE__, $sql);
***************
*** 750,756 ****
  				$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;
  
  				$template->set_filenames(array(
  					"body" => "message_body.tpl")
--- 750,756 ----
  				$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 class="mainoption" type="submit" name="submit" value="' . $lang['Download'] . '" />' . $s_hidden_fields;
  
  				$template->set_filenames(array(
  					"body" => "message_body.tpl")
***************
*** 792,798 ****
  				$s_template_select = '<select name="export_template">';
  				while( $file = @readdir($dir) )
  				{	
! 					if( !is_file($phpbb_root_path . 'templates/' . $file) && !is_link($phpbb_root_path . 'templates/' .$file) && $file != "." && $file != ".." && $file != "CVS" )
  					{
  						$s_template_select .= '<option value="' . $file . '">' . $file . "</option>\n";
  					}
--- 792,798 ----
  				$s_template_select = '<select name="export_template">';
  				while( $file = @readdir($dir) )
  				{	
! 					if( !is_file(phpbb_realpath($phpbb_root_path . 'templates/' . $file)) && !is_link(phpbb_realpath($phpbb_root_path . 'templates/' .$file)) && $file != "." && $file != ".." && $file != "CVS" )
  					{
  						$s_template_select .= '<option value="' . $file . '">' . $file . "</option>\n";
  					}
***************
*** 932,938 ****
  		break;
  }
  
! if( !$HTTP_POST_VARS['send_file'] )
  {
  	include('./page_footer_admin.'.$phpEx);
  }
--- 932,938 ----
  		break;
  }
  
! if (empty($HTTP_POST_VARS['send_file']))
  {
  	include('./page_footer_admin.'.$phpEx);
  }
diff -crbBN phpbb203/admin/admin_ug_auth.php phpbb2011/admin/admin_ug_auth.php
*** phpbb203/admin/admin_ug_auth.php	Sat Jul 10 20:16:19 2004
--- phpbb2011/admin/admin_ug_auth.php	Thu Nov 18 21:02:11 2004
***************
*** 6,12 ****
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: admin_ug_auth.php,v 1.13.2.2 2002/05/12 15:57:44 psotfx Exp $
   *
   *
   ***************************************************************************/
--- 6,12 ----
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: admin_ug_auth.php,v 1.13.2.5 2004/03/25 15:57:20 acydburn Exp $
   *
   *
   ***************************************************************************/
***************
*** 54,59 ****
--- 54,64 ----
  	}
  }
  
+ $user_id = intval($user_id);
+ $group_id = intval($group_id);
+ $adv = intval($adv);
+ $mode = htmlspecialchars($mode);
+ 
  //
  // Start program - define vars
  //
***************
*** 510,516 ****
  {
  	if ( isset($HTTP_POST_VARS['username']) )
  	{
! 		$this_userdata = get_userdata($HTTP_POST_VARS['username']);
  		if ( !is_array($this_userdata) )
  		{
  			message_die(GENERAL_MESSAGE, $lang['No_such_user']);
--- 515,521 ----
  {
  	if ( isset($HTTP_POST_VARS['username']) )
  	{
! 		$this_userdata = get_userdata($HTTP_POST_VARS['username'], true);
  		if ( !is_array($this_userdata) )
  		{
  			message_die(GENERAL_MESSAGE, $lang['No_such_user']);
diff -crbBN phpbb203/admin/admin_user_ban.php phpbb2011/admin/admin_user_ban.php
*** phpbb203/admin/admin_user_ban.php	Sat Jul 10 20:16:19 2004
--- phpbb2011/admin/admin_user_ban.php	Thu Nov 18 21:02:11 2004
***************
*** 6,12 ****
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: admin_user_ban.php,v 1.21.2.2 2002/05/12 15:57:45 psotfx Exp $
   *
   *
   ***************************************************************************/
--- 6,12 ----
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: admin_user_ban.php,v 1.21.2.5 2004/03/25 15:57:20 acydburn Exp $
   *
   *
   ***************************************************************************/
***************
*** 49,55 ****
  	$user_list = array();
  	if ( !empty($HTTP_POST_VARS['username']) )
  	{
! 		$this_userdata = get_userdata($HTTP_POST_VARS['username']);
  		if( !$this_userdata )
  		{
  			message_die(GENERAL_MESSAGE, $lang['No_user_id_specified'] );
--- 49,55 ----
  	$user_list = array();
  	if ( !empty($HTTP_POST_VARS['username']) )
  	{
! 		$this_userdata = get_userdata($HTTP_POST_VARS['username'], true);
  		if( !$this_userdata )
  		{
  			message_die(GENERAL_MESSAGE, $lang['No_user_id_specified'] );
***************
*** 155,161 ****
  			// contained in the annotated php manual at php.com (ereg
  			// section)
  			//
! 			if ( eregi('^(([[:alnum:]\*]+([-_.][[:alnum:]\*]+)*\.?)|(\*))@([[:alnum:]]+([-_]?[[:alnum:]]+)*\.){1,3}([[:alnum:]]{2,6})$', trim($email_list_temp[$i])) )
  			{
  				$email_list[] = trim($email_list_temp[$i]);
  			}
--- 155,161 ----
  			// contained in the annotated php manual at php.com (ereg
  			// section)
  			//
! 			if (preg_match('#^(([a-z0-9&.-_+])|(\*))+@[a-z0-9\-]+\.([a-z0-9\-]+\.)*?[a-z]+$#is', trim($email_list_temp[$i])))
  			{
  				$email_list[] = trim($email_list_temp[$i]);
  			}
***************
*** 277,283 ****
  		{
  			if ( $user_list[$i] != -1 )
  			{
! 				$where_sql .= ( ( $where_sql != '' ) ? ', ' : '' ) . $user_list[$i];
  			}
  		}
  	}
--- 277,283 ----
  		{
  			if ( $user_list[$i] != -1 )
  			{
! 				$where_sql .= ( ( $where_sql != '' ) ? ', ' : '' ) . intval($user_list[$i]);
  			}
  		}
  	}
***************
*** 290,296 ****
  		{
  			if ( $ip_list[$i] != -1 )
  			{
! 				$where_sql .= ( ( $where_sql != '' ) ? ', ' : '' ) . $ip_list[$i];
  			}
  		}
  	}
--- 290,296 ----
  		{
  			if ( $ip_list[$i] != -1 )
  			{
! 				$where_sql .= ( ( $where_sql != '' ) ? ', ' : '' ) . str_replace("\'", "''", $ip_list[$i]);
  			}
  		}
  	}
***************
*** 303,309 ****
  		{
  			if ( $email_list[$i] != -1 )
  			{
! 				$where_sql .= ( ( $where_sql != '' ) ? ', ' : '' ) . $email_list[$i];
  			}
  		}
  	}
--- 303,309 ----
  		{
  			if ( $email_list[$i] != -1 )
  			{
! 				$where_sql .= ( ( $where_sql != '' ) ? ', ' : '' ) . str_replace("\'", "''", $email_list[$i]);
  			}
  		}
  	}
diff -crbBN phpbb203/admin/admin_users.php phpbb2011/admin/admin_users.php
*** phpbb203/admin/admin_users.php	Sat Jul 10 20:16:18 2004
--- phpbb2011/admin/admin_users.php	Thu Nov 18 21:02:11 2004
***************
*** 6,12 ****
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: admin_users.php,v 1.57.2.6 2002/06/27 22:54:09 dougk_ff7 Exp $
   *
   *
   ***************************************************************************/
--- 6,12 ----
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: admin_users.php,v 1.57.2.26 2004/03/25 15:57:20 acydburn Exp $
   *
   *
   ***************************************************************************/
***************
*** 30,36 ****
  	return;
  }
  
! $phpbb_root_path = "./../";
  require($phpbb_root_path . 'extension.inc');
  require('./pagestart.' . $phpEx);
  require($phpbb_root_path . 'includes/bbcode.'.$phpEx);
--- 30,36 ----
  	return;
  }
  
! $phpbb_root_path = './../';
  require($phpbb_root_path . 'extension.inc');
  require('./pagestart.' . $phpEx);
  require($phpbb_root_path . 'includes/bbcode.'.$phpEx);
***************
*** 38,49 ****
--- 38,53 ----
  require($phpbb_root_path . 'includes/functions_selects.'.$phpEx);
  require($phpbb_root_path . 'includes/functions_validate.'.$phpEx);
  
+ $html_entities_match = array('#<#', '#>#');
+ $html_entities_replace = array('&lt;', '&gt;');
+ 
  //
  // Set mode
  //
  if( isset( $HTTP_POST_VARS['mode'] ) || isset( $HTTP_GET_VARS['mode'] ) )
  {
  	$mode = ( isset( $HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
+ 	$mode = htmlspecialchars($mode);
  }
  else
  {
***************
*** 53,74 ****
  //
  // Begin program
  //
! if( $mode == 'edit' || $mode == 'save' && ( isset($HTTP_POST_VARS['username']) || isset($HTTP_GET_VARS[POST_USERS_URL]) || isset( $HTTP_POST_VARS[POST_USERS_URL]) ) )
  {
  	//
  	// Ok, the profile has been modified and submitted, let's update
  	//
! 	if( ( $mode == 'save' && isset( $HTTP_POST_VARS['submit'] ) ) || isset( $HTTP_POST_VARS['avatargallery'] ) || isset( $HTTP_POST_VARS['submitavatar'] ) || isset( $HTTP_POST_VARS['cancelavatar'] ) )
  	{
! 		$user_id = intval( $HTTP_POST_VARS['id'] );
  
! 		$this_userdata = get_userdata($user_id);
! 		if( !$this_userdata )
  		{
  			message_die(GENERAL_MESSAGE, $lang['No_user_id_specified'] );
  		}
  
! 		$username = ( !empty($HTTP_POST_VARS['username']) ) ? trim(strip_tags( $HTTP_POST_VARS['username'] ) ) : '';
  		$email = ( !empty($HTTP_POST_VARS['email']) ) ? trim(strip_tags(htmlspecialchars( $HTTP_POST_VARS['email'] ) )) : '';
  
  		$password = ( !empty($HTTP_POST_VARS['password']) ) ? trim(strip_tags(htmlspecialchars( $HTTP_POST_VARS['password'] ) )) : '';
--- 57,223 ----
  //
  // Begin program
  //
! if ( $mode == 'edit' || $mode == 'save' && ( isset($HTTP_POST_VARS['username']) || isset($HTTP_GET_VARS[POST_USERS_URL]) || isset( $HTTP_POST_VARS[POST_USERS_URL]) ) )
  {
  	//
  	// Ok, the profile has been modified and submitted, let's update
  	//
! 	if ( ( $mode == 'save' && isset( $HTTP_POST_VARS['submit'] ) ) || isset( $HTTP_POST_VARS['avatargallery'] ) || isset( $HTTP_POST_VARS['submitavatar'] ) || isset( $HTTP_POST_VARS['cancelavatar'] ) )
  	{
! 		$user_id = intval($HTTP_POST_VARS['id']);
  
! 		if (!($this_userdata = get_userdata($user_id)))
  		{
  			message_die(GENERAL_MESSAGE, $lang['No_user_id_specified'] );
  		}
  
! 		if( $HTTP_POST_VARS['deleteuser'] )
! 		{
! 			$sql = "SELECT g.group_id 
! 				FROM " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g  
! 				WHERE ug.user_id = $user_id 
! 					AND g.group_id = ug.group_id 
! 					AND g.group_single_user = 1";
! 			if( !($result = $db->sql_query($sql)) )
! 			{
! 				message_die(GENERAL_ERROR, 'Could not obtain group information for this user', '', __LINE__, __FILE__, $sql);
! 			}
! 
! 			$row = $db->sql_fetchrow($result);
! 			
! 			$sql = "UPDATE " . POSTS_TABLE . "
! 				SET poster_id = " . DELETED . ", post_username = '$username' 
! 				WHERE poster_id = $user_id";
! 			if( !$db->sql_query($sql) )
! 			{
! 				message_die(GENERAL_ERROR, 'Could not update posts for this user', '', __LINE__, __FILE__, $sql);
! 			}
! 
! 			$sql = "UPDATE " . TOPICS_TABLE . "
! 				SET topic_poster = " . DELETED . " 
! 				WHERE topic_poster = $user_id";
! 			if( !$db->sql_query($sql) )
! 			{
! 				message_die(GENERAL_ERROR, 'Could not update topics for this user', '', __LINE__, __FILE__, $sql);
! 			}
! 			
! 			$sql = "UPDATE " . VOTE_USERS_TABLE . "
! 				SET vote_user_id = " . DELETED . "
! 				WHERE vote_user_id = $user_id";
! 			if( !$db->sql_query($sql) )
! 			{
! 				message_die(GENERAL_ERROR, 'Could not update votes for this user', '', __LINE__, __FILE__, $sql);
! 			}
! 			
! 			$sql = "SELECT group_id
! 				FROM " . GROUPS_TABLE . "
! 				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) )
! 			{
! 				$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);
! 				}
! 			}
! 
! 			$sql = "DELETE FROM " . USERS_TABLE . "
! 				WHERE user_id = $user_id";
! 			if( !$db->sql_query($sql) )
! 			{
! 				message_die(GENERAL_ERROR, 'Could not delete user', '', __LINE__, __FILE__, $sql);
! 			}
! 
! 			$sql = "DELETE FROM " . USER_GROUP_TABLE . "
! 				WHERE user_id = $user_id";
! 			if( !$db->sql_query($sql) )
! 			{
! 				message_die(GENERAL_ERROR, 'Could not delete user from user_group table', '', __LINE__, __FILE__, $sql);
! 			}
! 
! 			$sql = "DELETE FROM " . GROUPS_TABLE . "
! 				WHERE group_id = " . $row['group_id'];
! 			if( !$db->sql_query($sql) )
! 			{
! 				message_die(GENERAL_ERROR, 'Could not delete group for this user', '', __LINE__, __FILE__, $sql);
! 			}
! 
! 			$sql = "DELETE FROM " . AUTH_ACCESS_TABLE . "
! 				WHERE group_id = " . $row['group_id'];
! 			if( !$db->sql_query($sql) )
! 			{
! 				message_die(GENERAL_ERROR, 'Could not delete group for this user', '', __LINE__, __FILE__, $sql);
! 			}
! 
! 			$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . "
! 				WHERE user_id = $user_id";
! 			if ( !$db->sql_query($sql) )
! 			{
! 				message_die(GENERAL_ERROR, 'Could not delete user from topic watch table', '', __LINE__, __FILE__, $sql);
! 			}
! 			
! 			$sql = "DELETE FROM " . BANLIST_TABLE . "
! 				WHERE ban_userid = $user_id";
! 			if ( !$db->sql_query($sql) )
! 			{
! 				message_die(GENERAL_ERROR, 'Could not delete user from banlist table', '', __LINE__, __FILE__, $sql);
! 			}
! 
! 			$sql = "SELECT privmsgs_id
! 				FROM " . PRIVMSGS_TABLE . "
! 				WHERE privmsgs_from_userid = $user_id 
! 					OR privmsgs_to_userid = $user_id";
! 			if ( !($result = $db->sql_query($sql)) )
! 			{
! 				message_die(GENERAL_ERROR, 'Could not select all users private messages', '', __LINE__, __FILE__, $sql);
! 			}
! 
! 			// This little bit of code directly from the private messaging section.
! 			while ( $row_privmsgs = $db->sql_fetchrow($result) )
! 			{
! 				$mark_list[] = $row_privmsgs['privmsgs_id'];
! 			}
! 			
! 			if ( count($mark_list) )
! 			{
! 				$delete_sql_id = implode(', ', $mark_list);
! 				
! 				$delete_text_sql = "DELETE FROM " . PRIVMSGS_TEXT_TABLE . "
! 					WHERE privmsgs_text_id IN ($delete_sql_id)";
! 				$delete_sql = "DELETE FROM " . PRIVMSGS_TABLE . "
! 					WHERE privmsgs_id IN ($delete_sql_id)";
! 				
! 				if ( !$db->sql_query($delete_sql) )
! 				{
! 					message_die(GENERAL_ERROR, 'Could not delete private message info', '', __LINE__, __FILE__, $delete_sql);
! 				}
! 				
! 				if ( !$db->sql_query($delete_text_sql) )
! 				{
! 					message_die(GENERAL_ERROR, 'Could not delete private message text', '', __LINE__, __FILE__, $delete_text_sql);
! 				}
! 			}
! 
! 			$message = $lang['User_deleted'] . '<br /><br />' . sprintf($lang['Click_return_useradmin'], '<a href="' . append_sid("admin_users.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');
! 
! 			message_die(GENERAL_MESSAGE, $message);
! 		}
! 
! 		$username = ( !empty($HTTP_POST_VARS['username']) ) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['username']))) : '';
  		$email = ( !empty($HTTP_POST_VARS['email']) ) ? trim(strip_tags(htmlspecialchars( $HTTP_POST_VARS['email'] ) )) : '';
  
  		$password = ( !empty($HTTP_POST_VARS['password']) ) ? trim(strip_tags(htmlspecialchars( $HTTP_POST_VARS['password'] ) )) : '';
***************
*** 129,146 ****
  			$password_confirm = '';
  
  			$icq = stripslashes($icq);
! 			$aim = stripslashes($aim);
! 			$msn = stripslashes($msn);
! 			$yim = stripslashes($yim);
! 
! 			$website = stripslashes($website);
! 			$location = stripslashes($location);
! 			$occupation = stripslashes($occupation);
! 			$interests = stripslashes($interests);
! 			$signature = stripslashes($signature);
  
  			$user_lang = stripslashes($user_lang);
! 			$user_dateformat = stripslashes($user_dateformat);
  
  			if ( !isset($HTTP_POST_VARS['cancelavatar'])) 
  			{
--- 278,295 ----
  			$password_confirm = '';
  
  			$icq = stripslashes($icq);
! 			$aim = htmlspecialchars(stripslashes($aim));
! 			$msn = htmlspecialchars(stripslashes($msn));
! 			$yim = htmlspecialchars(stripslashes($yim));
! 
! 			$website = htmlspecialchars(stripslashes($website));
! 			$location = htmlspecialchars(stripslashes($location));
! 			$occupation = htmlspecialchars(stripslashes($occupation));
! 			$interests = htmlspecialchars(stripslashes($interests));
! 			$signature = htmlspecialchars(stripslashes($signature));
  
  			$user_lang = stripslashes($user_lang);
! 			$user_dateformat = htmlspecialchars(stripslashes($user_dateformat));
  
  			if ( !isset($HTTP_POST_VARS['cancelavatar'])) 
  			{
***************
*** 156,179 ****
  
  		$error = FALSE;
  
! 		if( stripslashes($username) != $this_userdata['username'] )
  		{
  			unset($rename_user);
  
  			$result = validate_username($username);
  			if ( $result['error'] )
  			{
  				$error = TRUE;
  				$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $result['error_msg'];
  			}
! 			else
  			{
! 				$username_sql = "username = '" . str_replace("\'", "''", $username) . "', ";
  				$rename_user = $username; // Used for renaming usergroup
  			}
  		}
  
! 		$passwd_sql = "";
  		if( !empty($password) && !empty($password_confirm) )
  		{
  			//
--- 305,337 ----
  
  		$error = FALSE;
  
! 		if (stripslashes($username) != $this_userdata['username'])
  		{
  			unset($rename_user);
  
+ 			if ( stripslashes(strtolower($username)) != strtolower($this_userdata['username']) ) 
+ 			{
  				$result = validate_username($username);
  				if ( $result['error'] )
  				{
  					$error = TRUE;
  					$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $result['error_msg'];
  				}
! 				else if ( strtolower(str_replace("\\'", "''", $username)) == strtolower($userdata['username']) )
  				{
! 					$error = TRUE;
! 					$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Username_taken'];
! 				}
! 			}
! 
! 			if (!$error)
! 			{
! 				$username_sql = "username = '" . str_replace("\\'", "''", $username) . "', ";
  				$rename_user = $username; // Used for renaming usergroup
  			}
  		}
  
! 		$passwd_sql = '';
  		if( !empty($password) && !empty($password_confirm) )
  		{
  			//
***************
*** 201,207 ****
  			$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Password_mismatch'];
  		}
  
! 		if( $signature != "" )
  		{
  			$sig_length_check = preg_replace('/(\[.*?)(=.*?)\]/is', '\\1]', stripslashes($signature));
  			if ( $allowhtml )
--- 359,365 ----
  			$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Password_mismatch'];
  		}
  
! 		if ($signature != '')
  		{
  			$sig_length_check = preg_replace('/(\[.*?)(=.*?)\]/is', '\\1]', stripslashes($signature));
  			if ( $allowhtml )
***************
*** 231,237 ****
  		{
  			if( $this_userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $this_userdata['user_avatar'] != "" )
  			{
! 				if( @file_exists("./" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar']) )
  				{
  					@unlink("./" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar']);
  				}
--- 389,395 ----
  		{
  			if( $this_userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $this_userdata['user_avatar'] != "" )
  			{
! 				if( @file_exists(@phpbb_realpath("./" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar'])) )
  				{
  					@unlink("./" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar']);
  				}
***************
*** 256,264 ****
  
  			if( $user_avatar_loc != "" )
  			{
! 				if( file_exists($user_avatar_loc) && ereg(".jpg$|.gif$|.png$", $user_avatar_name) )
  				{
! 					if( $user_avatar_size <= $board_config['avatar_filesize'] && $avatar_size > 0)
  					{
  						$error_type = false;
  
--- 414,422 ----
  
  			if( $user_avatar_loc != "" )
  			{
! 				if( file_exists(@phpbb_realpath($user_avatar_loc)) && ereg(".jpg$|.gif$|.png$", $user_avatar_name) )
  				{
! 					if( $user_avatar_size <= $board_config['avatar_filesize'] && $user_avatar_size > 0)
  					{
  						$error_type = false;
  
***************
*** 299,305 ****
  
  								if( $this_userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $this_userdata['user_avatar'] != "" )
  								{
! 									if( @file_exists("./../" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar']) )
  									{
  										@unlink("./../" . $board_config['avatar_path'] . "/". $this_userdata['user_avatar']);
  									}
--- 457,463 ----
  
  								if( $this_userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $this_userdata['user_avatar'] != "" )
  								{
! 									if( @file_exists(@phpbb_realpath("./../" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar'])) )
  									{
  										@unlink("./../" . $board_config['avatar_path'] . "/". $this_userdata['user_avatar']);
  									}
***************
*** 408,414 ****
  
  										if( $this_userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $this_userdata['user_avatar'] != "")
  										{
! 											if( file_exists("./../" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar']) )
  											{
  												@unlink("./../" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar']);
  											}
--- 566,572 ----
  
  										if( $this_userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $this_userdata['user_avatar'] != "")
  										{
! 											if( file_exists(@phpbb_realpath("./../" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar'])) )
  											{
  												@unlink("./../" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar']);
  											}
***************
*** 495,693 ****
  		//
  		if( !$error )
  		{
! 			if( $HTTP_POST_VARS['deleteuser'] )
! 			{
! 				$sql = "SELECT g.group_id 
! 					FROM " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g  
! 					WHERE ug.user_id = $user_id 
! 						AND g.group_id = ug.group_id 
! 						AND g.group_single_user = 1";
! 				if( !($result = $db->sql_query($sql)) )
! 				{
! 					message_die(GENERAL_ERROR, 'Could not obtain group information for this user', '', __LINE__, __FILE__, $sql);
! 				}
! 
! 				$row = $db->sql_fetchrow($result);
! 				
! 				$sql = "UPDATE " . POSTS_TABLE . "
! 					SET poster_id = " . DELETED . ", post_username = '$username' 
! 					WHERE poster_id = $user_id";
! 				if( !$db->sql_query($sql) )
! 				{
! 					message_die(GENERAL_ERROR, 'Could not update posts for this user', '', __LINE__, __FILE__, $sql);
! 				}
! 
! 				$sql = "UPDATE " . TOPICS_TABLE . "
! 					SET topic_poster = " . DELETED . " 
! 					WHERE topic_poster = $user_id";
! 				if( !$db->sql_query($sql) )
! 				{
! 					message_die(GENERAL_ERROR, 'Could not update topics for this user', '', __LINE__, __FILE__, $sql);
! 				}
! 				
! 				$sql = "UPDATE " . VOTE_USERS_TABLE . "
! 					SET vote_user_id = " . DELETED . "
! 					WHERE vote_user_id = $user_id";
! 				if( !$db->sql_query($sql) )
! 				{
! 					message_die(GENERAL_ERROR, 'Could not update votes for this user', '', __LINE__, __FILE__, $sql);
! 				}
! 				
! 				$sql = "SELECT group_id
! 					FROM " . GROUPS_TABLE . "
! 					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) )
! 				{
! 					$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);
! 					}
! 				}
! 
! 				$sql = "DELETE FROM " . USERS_TABLE . "
! 					WHERE user_id = $user_id";
! 				if( !$db->sql_query($sql) )
! 				{
! 					message_die(GENERAL_ERROR, 'Could not delete user', '', __LINE__, __FILE__, $sql);
! 				}
! 
! 				$sql = "DELETE FROM " . USER_GROUP_TABLE . "
  					WHERE user_id = $user_id";
- 				if( !$db->sql_query($sql) )
- 				{
- 					message_die(GENERAL_ERROR, 'Could not delete user from user_group table', '', __LINE__, __FILE__, $sql);
- 				}
- 
- 				$sql = "DELETE FROM " . GROUPS_TABLE . "
- 					WHERE group_id = " . $row['group_id'];
- 				if( !$db->sql_query($sql) )
- 				{
- 					message_die(GENERAL_ERROR, 'Could not delete group for this user', '', __LINE__, __FILE__, $sql);
- 				}
  
! 				$sql = "DELETE FROM " . AUTH_ACCESS_TABLE . "
! 					WHERE group_id = " . $row['group_id'];
! 				if( !$db->sql_query($sql) )
! 				{
! 					message_die(GENERAL_ERROR, 'Could not delete group for this user', '', __LINE__, __FILE__, $sql);
! 				}
! 
! 				$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . "
! 					WHERE user_id = $user_id";
! 				if ( !$db->sql_query($sql) )
  				{
! 					message_die(GENERAL_ERROR, 'Could not delete user from topic watch table', '', __LINE__, __FILE__, $sql);
! 				}
! 
! 				$sql = "SELECT privmsgs_id
! 					FROM " . PRIVMSGS_TABLE . "
! 					WHERE ( ( privmsgs_from_userid = $user_id 
! 							AND privmsgs_type = " . PRIVMSGS_NEW_MAIL . " )
! 						OR ( privmsgs_from_userid = $user_id
! 							AND privmsgs_type = " . PRIVMSGS_SENT_MAIL . " )
! 						OR ( privmsgs_to_userid = $user_id
! 							AND privmsgs_type = " . PRIVMSGS_READ_MAIL . " )
! 						OR ( privmsgs_to_userid = $user_id
! 							AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " )
! 						OR ( privmsgs_from_userid = $user_id
! 							AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " ) )";
! 				if ( !($result = $db->sql_query($sql)) )
  				{
! 					message_die(GENERAL_ERROR, 'Could not select all user\'s private messages', '', __LINE__, __FILE__, $sql);
! 				}
! 				
! 				//
! 				// This little bit of code directly from the private messaging section.
! 				// Thanks Paul!
! 				//
! 				
! 				while ( $row_privmsgs = $db->sql_fetchrow($result) )
  				{
! 					$mark_list[] = $row_privmsgs['privmsgs_id'];
  				}
- 				
- 				if ( count($mark_list) )
- 				{
- 					$delete_sql_id = implode(', ', $mark_list);
- 					
- 					//
- 					// We shouldn't need to worry about updating conters here...
- 					// They are already gone!
- 					//
- 					
- 					$delete_text_sql = "DELETE FROM " . PRIVMSGS_TEXT_TABLE . "
- 						WHERE privmsgs_text_id IN ($delete_sql_id)";
- 					$delete_sql = "DELETE FROM " . PRIVMSGS_TABLE . "
- 						WHERE privmsgs_id IN ($delete_sql_id)";
- 					
- 					//
- 					// Shouldn't need the switch statement here, either, as we just want
- 					// to take out all of the private messages.  This will not affect
- 					// the other messages we want to keep; the ids are unique.
- 					//
- 					
- 					if ( !$db->sql_query($delete_sql) )
- 					{
- 						message_die(GENERAL_ERROR, 'Could not delete private message info', '', __LINE__, __FILE__, $delete_sql);
  					}
  					
! 					if ( !$db->sql_query($delete_text_sql) )
  					{
! 						message_die(GENERAL_ERROR, 'Could not delete private message text', '', __LINE__, __FILE__, $delete_text_sql);
! 					}
! 				}
  				
- 				$sql = "UPDATE " . PRIVMSGS_TABLE . "
- 					SET privmsgs_to_userid = " . DELETED . "
- 					WHERE privmsgs_to_userid = $user_id";
  				if ( !$db->sql_query($sql) )
  				{
! 					message_die(GENERAL_ERROR, 'Could not update private messages saved to the user', '', __LINE__, __FILE__, $sql);
  				}
- 				
- 				$sql = "UPDATE " . PRIVMSGS_TABLE . "
- 					SET privmsgs_from_userid = " . DELETED . "
- 					WHERE privmsgs_from_userid = $user_id";
- 				if ( !$db->sql_query($sql) )
- 				{
- 					message_die(GENERAL_ERROR, 'Could not update private messages saved from the user', '', __LINE__, __FILE__, $sql);
  				}
  
- 				$message = $lang['User_deleted'];
- 
- 			}
- 			else
- 			{
- 				$sql = "UPDATE " . USERS_TABLE . "
- 					SET " . $username_sql . $passwd_sql . "user_email = '" . str_replace("\'", "''", $email) . "', user_icq = '" . str_replace("\'", "''", $icq) . "', user_website = '" . str_replace("\'", "''", $website) . "', user_occ = '" . str_replace("\'", "''", $occupation) . "', user_from = '" . str_replace("\'", "''", $location) . "', user_interests = '" . str_replace("\'", "''", $interests) . "', user_sig = '" . str_replace("\'", "''", $signature) . "', user_viewemail = $viewemail, user_aim = '" . str_replace("\'", "''", $aim) . "', user_yim = '" . str_replace("\'", "''", $yim) . "', user_msnm = '" . str_replace("\'", "''", $msn) . "', user_attachsig = $attachsig, user_sig_bbcode_uid = '$signature_bbcode_uid', user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowavatar = $user_allowavatar, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_notify = $notifyreply, user_allow_pm = $user_allowpm, user_notify_pm = $notifypm, user_popup_pm = $popuppm, user_lang = '" . str_replace("\'", "''", $user_lang) . "', user_style = $user_style, user_timezone = $user_timezone, user_dateformat = '" . str_replace("\'", "''", $user_dateformat) . "', user_active = $user_status, user_rank = $user_rank" . $avatar_sql . "
- 					WHERE user_id = $user_id";
- 				if( $result = $db->sql_query($sql) )
- 				{
- 					if( isset($rename_user) )
- 					{
- 						$sql = "UPDATE " . GROUPS_TABLE . "
- 							SET group_name = '".str_replace("\'", "''", $rename_user)."'
- 							WHERE group_name = '".str_replace("\'", "''", $this_userdata['username'] )."'";
- 						if( !$result = $db->sql_query($sql) )
- 						{
- 							message_die(GENERAL_ERROR, 'Could not rename users group', '', __LINE__, __FILE__, $sql);
- 						}
- 					}
  					$message .= $lang['Admin_user_updated'];
  				}
  				else
--- 653,687 ----
  		//
  		if( !$error )
  		{
! 			$sql = "UPDATE " . USERS_TABLE . "
! 				SET " . $username_sql . $passwd_sql . "user_email = '" . str_replace("\'", "''", $email) . "', user_icq = '" . str_replace("\'", "''", $icq) . "', user_website = '" . str_replace("\'", "''", $website) . "', user_occ = '" . str_replace("\'", "''", $occupation) . "', user_from = '" . str_replace("\'", "''", $location) . "', user_interests = '" . str_replace("\'", "''", $interests) . "', user_sig = '" . str_replace("\'", "''", $signature) . "', user_viewemail = $viewemail, user_aim = '" . str_replace("\'", "''", $aim) . "', user_yim = '" . str_replace("\'", "''", $yim) . "', user_msnm = '" . str_replace("\'", "''", $msn) . "', user_attachsig = $attachsig, user_sig_bbcode_uid = '$signature_bbcode_uid', user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowavatar = $user_allowavatar, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_notify = $notifyreply, user_allow_pm = $user_allowpm, user_notify_pm = $notifypm, user_popup_pm = $popuppm, user_lang = '" . str_replace("\'", "''", $user_lang) . "', user_style = $user_style, user_timezone = $user_timezone, user_dateformat = '" . str_replace("\'", "''", $user_dateformat) . "', user_active = $user_status, user_rank = $user_rank" . $avatar_sql . "
  				WHERE user_id = $user_id";
  
! 			if( $result = $db->sql_query($sql) )
  			{
! 				if( isset($rename_user) )
  				{
! 					$sql = "UPDATE " . GROUPS_TABLE . "
! 						SET group_name = '".str_replace("\'", "''", $rename_user)."'
! 						WHERE group_name = '".str_replace("'", "''", $this_userdata['username'] )."'";
! 					if( !$result = $db->sql_query($sql) )
  					{
! 						message_die(GENERAL_ERROR, 'Could not rename users group', '', __LINE__, __FILE__, $sql);
  					}
  				}
  				
! 				// Delete user session, to prevent the user navigating the forum (if logged in) when disabled
! 				if (!$user_status)
  				{
! 					$sql = "DELETE FROM " . SESSIONS_TABLE . " 
! 						WHERE session_user_id = " . $user_id;
  
  					if ( !$db->sql_query($sql) )
  					{
! 						message_die(GENERAL_ERROR, 'Error removing user session', '', __LINE__, __FILE__, $sql);
  					}
  				}
  				
  				$message .= $lang['Admin_user_updated'];
  			}
  			else
***************
*** 695,701 ****
  					$error = TRUE;
  					$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Admin_user_fail'];
  				}
- 			}
  
  			$message .= '<br /><br />' . sprintf($lang['Click_return_useradmin'], '<a href="' . append_sid("admin_users.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');
  
--- 689,694 ----
***************
*** 713,736 ****
  
  			$template->assign_var_from_handle('ERROR_BOX', 'reg_header');
  
! 			$username = stripslashes($username);
  			$email = stripslashes($email);
  			$password = '';
  			$password_confirm = '';
  
  			$icq = stripslashes($icq);
! 			$aim = str_replace('+', ' ', stripslashes($aim));
! 			$msn = stripslashes($msn);
! 			$yim = stripslashes($yim);
! 
! 			$website = stripslashes($website);
! 			$location = stripslashes($location);
! 			$occupation = stripslashes($occupation);
! 			$interests = stripslashes($interests);
! 			$signature = stripslashes($signature);
  
  			$user_lang = stripslashes($user_lang);
! 			$user_dateformat = stripslashes($user_dateformat);
  		}
  	}
  	else if( !isset( $HTTP_POST_VARS['submit'] ) && $mode != 'save' && !isset( $HTTP_POST_VARS['avatargallery'] ) && !isset( $HTTP_POST_VARS['submitavatar'] ) && !isset( $HTTP_POST_VARS['cancelavatar'] ) )
--- 706,729 ----
  
  			$template->assign_var_from_handle('ERROR_BOX', 'reg_header');
  
! 			$username = htmlspecialchars(stripslashes($username));
  			$email = stripslashes($email);
  			$password = '';
  			$password_confirm = '';
  
  			$icq = stripslashes($icq);
! 			$aim = htmlspecialchars(str_replace('+', ' ', stripslashes($aim)));
! 			$msn = htmlspecialchars(stripslashes($msn));
! 			$yim = htmlspecialchars(stripslashes($yim));
! 
! 			$website = htmlspecialchars(stripslashes($website));
! 			$location = htmlspecialchars(stripslashes($location));
! 			$occupation = htmlspecialchars(stripslashes($occupation));
! 			$interests = htmlspecialchars(stripslashes($interests));
! 			$signature = htmlspecialchars(stripslashes($signature));
  
  			$user_lang = stripslashes($user_lang);
! 			$user_dateformat = htmlspecialchars(stripslashes($user_dateformat));
  		}
  	}
  	else if( !isset( $HTTP_POST_VARS['submit'] ) && $mode != 'save' && !isset( $HTTP_POST_VARS['avatargallery'] ) && !isset( $HTTP_POST_VARS['submitavatar'] ) && !isset( $HTTP_POST_VARS['cancelavatar'] ) )
***************
*** 746,752 ****
  		}
  		else
  		{
! 			$this_userdata = get_userdata( $HTTP_POST_VARS['username'] );
  			if( !$this_userdata )
  			{
  				message_die(GENERAL_MESSAGE, $lang['No_user_id_specified'] );
--- 739,745 ----
  		}
  		else
  		{
! 			$this_userdata = get_userdata($HTTP_POST_VARS['username'], true);
  			if( !$this_userdata )
  			{
  				message_die(GENERAL_MESSAGE, $lang['No_user_id_specified'] );
***************
*** 763,777 ****
  		$password_confirm = '';
  
  		$icq = $this_userdata['user_icq'];
! 		$aim = str_replace('+', ' ', $this_userdata['user_aim'] );
! 		$msn = $this_userdata['user_msnm'];
! 		$yim = $this_userdata['user_yim'];
! 
! 		$website = $this_userdata['user_website'];
! 		$location = $this_userdata['user_from'];
! 		$occupation = $this_userdata['user_occ'];
! 		$interests = $this_userdata['user_interests'];
! 		$signature = $this_userdata['user_sig'];
  
  		$viewemail = $this_userdata['user_viewemail'];
  		$notifypm = $this_userdata['user_notify_pm'];
--- 756,772 ----
  		$password_confirm = '';
  
  		$icq = $this_userdata['user_icq'];
! 		$aim = htmlspecialchars(str_replace('+', ' ', $this_userdata['user_aim'] ));
! 		$msn = htmlspecialchars($this_userdata['user_msnm']);
! 		$yim = htmlspecialchars($this_userdata['user_yim']);
! 
! 		$website = htmlspecialchars($this_userdata['user_website']);
! 		$location = htmlspecialchars($this_userdata['user_from']);
! 		$occupation = htmlspecialchars($this_userdata['user_occ']);
! 		$interests = htmlspecialchars($this_userdata['user_interests']);
! 
! 		$signature = ($this_userdata['user_sig_bbcode_uid'] != '') ? preg_replace('#:' . $this_userdata['user_sig_bbcode_uid'] . '#si', '', $this_userdata['user_sig']) : $this_userdata['user_sig'];
! 		$signature = preg_replace($html_entities_match, $html_entities_replace, $signature);
  
  		$viewemail = $this_userdata['user_viewemail'];
  		$notifypm = $this_userdata['user_notify_pm'];
***************
*** 788,794 ****
  		$user_style = $this_userdata['user_style'];
  		$user_lang = $this_userdata['user_lang'];
  		$user_timezone = $this_userdata['user_timezone'];
! 		$user_dateformat = $this_userdata['user_dateformat'];
  		
  		$user_status = $this_userdata['user_active'];
  		$user_allowavatar = $this_userdata['user_allowavatar'];
--- 783,789 ----
  		$user_style = $this_userdata['user_style'];
  		$user_lang = $this_userdata['user_lang'];
  		$user_timezone = $this_userdata['user_timezone'];
! 		$user_dateformat = htmlspecialchars($this_userdata['user_dateformat']);
  		
  		$user_status = $this_userdata['user_active'];
  		$user_allowavatar = $this_userdata['user_allowavatar'];
***************
*** 816,822 ****
  			$avatar_images = array();
  			while( $file = @readdir($dir) )
  			{
! 				if( $file != "." && $file != ".." && !is_file("./../" . $board_config['avatar_gallery_path'] . "/" . $file) && !is_link("./../" . $board_config['avatar_gallery_path'] . "/" . $file) )
  				{
  					$sub_dir = @opendir("../" . $board_config['avatar_gallery_path'] . "/" . $file);
  
--- 811,817 ----
  			$avatar_images = array();
  			while( $file = @readdir($dir) )
  			{
! 				if( $file != "." && $file != ".." && !is_file(phpbb_realpath("./../" . $board_config['avatar_gallery_path'] . "/" . $file)) && !is_link(phpbb_realpath("./../" . $board_config['avatar_gallery_path'] . "/" . $file)) )
  				{
  					$sub_dir = @opendir("../" . $board_config['avatar_gallery_path'] . "/" . $file);
  
***************
*** 844,850 ****
  
  			if( isset($HTTP_POST_VARS['avatarcategory']) )
  			{
! 				$category = $HTTP_POST_VARS['avatarcategory'];
  			}
  			else
  			{
--- 839,845 ----
  
  			if( isset($HTTP_POST_VARS['avatarcategory']) )
  			{
! 				$category = htmlspecialchars($HTTP_POST_VARS['avatarcategory']);
  			}
  			else
  			{
***************
*** 980,987 ****
  			$rank_select_box .= '<option value="' . $rank_id . '"' . $selected . '>' . $rank . '</option>';
  		}
  
- 		$signature = preg_replace('/\:[0-9a-z\:]*?\]/si', ']', $signature);
- 		
  		$template->set_filenames(array(
  			"body" => "admin/user_edit_body.tpl")
  		);
--- 975,980 ----
***************
*** 1024,1030 ****
  			'ALWAYS_ALLOW_SMILIES_YES' => ($allowsmilies) ? 'checked="checked"' : '',
  			'ALWAYS_ALLOW_SMILIES_NO' => (!$allowsmilies) ? 'checked="checked"' : '',
  			'AVATAR' => $avatar,
! 			'LANGUAGE_SELECT' => language_select($user_lang, 'language', '../language'),
  			'TIMEZONE_SELECT' => tz_select($user_timezone),
  			'STYLE_SELECT' => style_select($user_style, 'style'),
  			'DATE_FORMAT' => $user_dateformat,
--- 1017,1023 ----
  			'ALWAYS_ALLOW_SMILIES_YES' => ($allowsmilies) ? 'checked="checked"' : '',
  			'ALWAYS_ALLOW_SMILIES_NO' => (!$allowsmilies) ? 'checked="checked"' : '',
  			'AVATAR' => $avatar,
! 			'LANGUAGE_SELECT' => language_select($user_lang),
  			'TIMEZONE_SELECT' => tz_select($user_timezone),
  			'STYLE_SELECT' => style_select($user_style, 'style'),
  			'DATE_FORMAT' => $user_dateformat,
***************
*** 1108,1114 ****
  			'S_PROFILE_ACTION' => append_sid("admin_users.$phpEx"))
  		);
  
! 		if( file_exists('./../' . $board_config['avatar_path'] ) && ($board_config['allow_avatar_upload'] == TRUE) )
  		{
  			if ( $form_enctype != '' )
  			{
--- 1101,1107 ----
  			'S_PROFILE_ACTION' => append_sid("admin_users.$phpEx"))
  		);
  
! 		if( file_exists(@phpbb_realpath('./../' . $board_config['avatar_path'])) && ($board_config['allow_avatar_upload'] == TRUE) )
  		{
  			if ( $form_enctype != '' )
  			{
***************
*** 1117,1123 ****
  			$template->assign_block_vars('avatar_remote_upload', array() );
  		}
  
! 		if( file_exists('./../' . $board_config['avatar_gallery_path'] ) && ($board_config['allow_avatar_local'] == TRUE) )
  		{
  			$template->assign_block_vars('avatar_local_gallery', array() );
  		}
--- 1110,1116 ----
  			$template->assign_block_vars('avatar_remote_upload', array() );
  		}
  
! 		if( file_exists(@phpbb_realpath('./../' . $board_config['avatar_gallery_path'])) && ($board_config['allow_avatar_local'] == TRUE) )
  		{
  			$template->assign_block_vars('avatar_local_gallery', array() );
  		}
diff -crbBN phpbb203/admin/admin_words.php phpbb2011/admin/admin_words.php
*** phpbb203/admin/admin_words.php	Sat Jul 10 20:16:19 2004
--- phpbb2011/admin/admin_words.php	Thu Nov 18 21:02:11 2004
***************
*** 6,12 ****
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: admin_words.php,v 1.10.2.2 2002/05/12 15:57:45 psotfx Exp $
   *
   *
   ***************************************************************************/
--- 6,12 ----
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: admin_words.php,v 1.10.2.3 2004/03/25 15:57:20 acydburn Exp $
   *
   *
   ***************************************************************************/
***************
*** 39,44 ****
--- 39,45 ----
  if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
  {
  	$mode = ($HTTP_GET_VARS['mode']) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode'];
+ 	$mode = htmlspecialchars($mode);
  }
  else 
  {
***************
*** 63,69 ****
  {
  	if( $mode == "edit" || $mode == "add" )
  	{
! 		$word_id = ( isset($HTTP_GET_VARS['id']) ) ? $HTTP_GET_VARS['id'] : 0;
  
  		$template->set_filenames(array(
  			"body" => "admin/words_edit_body.tpl")
--- 64,70 ----
  {
  	if( $mode == "edit" || $mode == "add" )
  	{
! 		$word_id = ( isset($HTTP_GET_VARS['id']) ) ? intval($HTTP_GET_VARS['id']) : 0;
  
  		$template->set_filenames(array(
  			"body" => "admin/words_edit_body.tpl")
***************
*** 113,119 ****
  	}
  	else if( $mode == "save" )
  	{
! 		$word_id = ( isset($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : 0;
  		$word = ( isset($HTTP_POST_VARS['word']) ) ? trim($HTTP_POST_VARS['word']) : "";
  		$replacement = ( isset($HTTP_POST_VARS['replacement']) ) ? trim($HTTP_POST_VARS['replacement']) : "";
  
--- 114,120 ----
  	}
  	else if( $mode == "save" )
  	{
! 		$word_id = ( isset($HTTP_POST_VARS['id']) ) ? intval($HTTP_POST_VARS['id']) : 0;
  		$word = ( isset($HTTP_POST_VARS['word']) ) ? trim($HTTP_POST_VARS['word']) : "";
  		$replacement = ( isset($HTTP_POST_VARS['replacement']) ) ? trim($HTTP_POST_VARS['replacement']) : "";
  
***************
*** 150,155 ****
--- 151,157 ----
  		if( isset($HTTP_POST_VARS['id']) ||  isset($HTTP_GET_VARS['id']) )
  		{
  			$word_id = ( isset($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id'];
+ 			$word_id = intval($word_id);
  		}
  		else
  		{
diff -crbBN phpbb203/admin/index.php phpbb2011/admin/index.php
*** phpbb203/admin/index.php	Sat Jul 10 20:16:19 2004
--- phpbb2011/admin/index.php	Thu Nov 18 21:02:11 2004
***************
*** 6,12 ****
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: index.php,v 1.40.2.2 2002/05/17 22:58:18 psotfx Exp $
   *
   *
   ***************************************************************************/
--- 6,12 ----
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: index.php,v 1.40.2.6 2004/07/11 16:46:15 acydburn Exp $
   *
   *
   ***************************************************************************/
***************
*** 132,137 ****
--- 132,138 ----
  		"L_ADMIN_INTRO" => $lang['Admin_intro'],
  		"L_FORUM_STATS" => $lang['Forum_stats'],
  		"L_WHO_IS_ONLINE" => $lang['Who_is_Online'],
+ 		"L_USERNAME" => $lang['Username'],
  		"L_LOCATION" => $lang['Location'],
  		"L_LAST_UPDATE" => $lang['Last_updated'],
  		"L_IP_ADDRESS" => $lang['IP_Address'],
***************
*** 331,337 ****
  		WHERE s.session_logged_in = " . TRUE . " 
  			AND u.user_id = s.session_user_id 
  			AND u.user_id <> " . ANONYMOUS . " 
! 			AND u.user_session_time >= " . ( time() - 300 ) . " 
  		ORDER BY u.user_session_time DESC";
  	if(!$result = $db->sql_query($sql))
  	{
--- 332,338 ----
  		WHERE s.session_logged_in = " . TRUE . " 
  			AND u.user_id = s.session_user_id 
  			AND u.user_id <> " . ANONYMOUS . " 
! 			AND s.session_time >= " . ( time() - 300 ) . " 
  		ORDER BY u.user_session_time DESC";
  	if(!$result = $db->sql_query($sql))
  	{
***************
*** 454,460 ****
  					"FORUM_LOCATION" => $location,
  					"IP_ADDRESS" => $reg_ip, 
  
! 					"U_WHOIS_IP" => "http://www.samspade.org/t/ipwhois?a=$reg_ip", 
  					"U_USER_PROFILE" => append_sid("admin_users.$phpEx?mode=edit&amp;" . POST_USERS_URL . "=" . $onlinerow_reg[$i]['user_id']),
  					"U_FORUM_LOCATION" => append_sid($location_url))
  				);
--- 455,461 ----
  					"FORUM_LOCATION" => $location,
  					"IP_ADDRESS" => $reg_ip, 
  
! 					"U_WHOIS_IP" => "http://network-tools.com/default.asp?host=$reg_ip", 
  					"U_USER_PROFILE" => append_sid("admin_users.$phpEx?mode=edit&amp;" . POST_USERS_URL . "=" . $onlinerow_reg[$i]['user_id']),
  					"U_FORUM_LOCATION" => append_sid($location_url))
  				);
***************
*** 546,552 ****
  				"FORUM_LOCATION" => $location,
  				"IP_ADDRESS" => $guest_ip, 
  
! 				"U_WHOIS_IP" => "http://www.samspade.org/t/ipwhois?a=$guest_ip", 
  				"U_FORUM_LOCATION" => append_sid($location_url))
  			);
  		}
--- 547,553 ----
  				"FORUM_LOCATION" => $location,
  				"IP_ADDRESS" => $guest_ip, 
  
! 				"U_WHOIS_IP" => "http://network-tools.com/default.asp?host=$guest_ip", 
  				"U_FORUM_LOCATION" => append_sid($location_url))
  			);
  		}
diff -crbBN phpbb203/admin/page_header_admin.php phpbb2011/admin/page_header_admin.php
*** phpbb203/admin/page_header_admin.php	Sat Jul 10 20:16:19 2004
--- phpbb2011/admin/page_header_admin.php	Thu Nov 18 21:02:11 2004
***************
*** 6,12 ****
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: page_header_admin.php,v 1.12.2.2 2002/05/12 15:57:45 psotfx Exp $
   *
   *
   ***************************************************************************/
--- 6,12 ----
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: page_header_admin.php,v 1.12.2.5 2003/06/10 20:48:18 acydburn Exp $
   *
   *
   ***************************************************************************/
***************
*** 35,41 ****
  {
  	$phpver = phpversion();
  
! 	if ( $phpver >= '4.0.4pl1' && strstr($HTTP_USER_AGENT,'compatible') )
  	{
  		if ( extension_loaded('zlib') )
  		{
--- 35,43 ----
  {
  	$phpver = phpversion();
  
! 	$useragent = (isset($_SERVER["HTTP_USER_AGENT"]) ) ? $_SERVER["HTTP_USER_AGENT"] : $HTTP_USER_AGENT;
! 
! 	if ( $phpver >= '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) )
  	{
  		if ( extension_loaded('zlib') )
  		{
***************
*** 62,67 ****
--- 64,73 ----
  	'header' => 'admin/page_header.tpl')
  );
  
+ // Format Timezone. We are unable to use array_pop here, because of PHP3 compatibility
+ $l_timezone = explode('.', $board_config['board_timezone']);
+ $l_timezone = (count($l_timezone) > 1 && $l_timezone[count($l_timezone)-1] != 0) ? $lang[sprintf('%.1f', $board_config['board_timezone'])] : $lang[number_format($board_config['board_timezone'])];
+ 
  //
  // The following assigns all _common_ variables that may be used at any point
  // in a template. Note that all URL's should be wrapped in append_sid, as
***************
*** 77,83 ****
  
  	'U_INDEX' => append_sid('../index.'.$phpEx),
  
! 	'S_TIMEZONE' => sprintf($lang['All_times'], $lang[$board_config['board_timezone']]),
  	'S_LOGIN_ACTION' => append_sid('../login.'.$phpEx),
  	'S_JUMPBOX_ACTION' => append_sid('../viewforum.'.$phpEx),
  	'S_CURRENT_TIME' => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), 
--- 83,89 ----
  
  	'U_INDEX' => append_sid('../index.'.$phpEx),
  
! 	'S_TIMEZONE' => sprintf($lang['All_times'], $l_timezone),
  	'S_LOGIN_ACTION' => append_sid('../login.'.$phpEx),
  	'S_JUMPBOX_ACTION' => append_sid('../viewforum.'.$phpEx),
  	'S_CURRENT_TIME' => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), 
diff -crbBN phpbb203/admin/pagestart.php phpbb2011/admin/pagestart.php
*** phpbb203/admin/pagestart.php	Sat Jul 10 20:16:19 2004
--- phpbb2011/admin/pagestart.php	Thu Nov 18 21:02:11 2004
***************
*** 6,12 ****
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: pagestart.php,v 1.1.2.2 2002/05/13 13:18:17 psotfx Exp $
   *
   *
   ***************************************************************************/
--- 6,12 ----
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: pagestart.php,v 1.1.2.7 2004/03/24 14:43:31 psotfx Exp $
   *
   *
   ***************************************************************************/
***************
*** 20,32 ****
   *
   ***************************************************************************/
  
! if ( !defined('IN_PHPBB') )
  {
  	die("Hacking attempt");
  }
  
  define('IN_ADMIN', true);
! 
  include($phpbb_root_path . 'common.'.$phpEx);
  
  //
--- 20,32 ----
   *
   ***************************************************************************/
  
! if (!defined('IN_PHPBB'))
  {
  	die("Hacking attempt");
  }
  
  define('IN_ADMIN', true);
! // Include files
  include($phpbb_root_path . 'common.'.$phpEx);
  
  //
***************
*** 37,54 ****
  //
  // End session management
  //
! if( !$userdata['session_logged_in'] )
  {
! 	$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
! 	header($header_location . '../' . append_sid("login.$phpEx?redirect=admin/"));
! 	exit;
  }
! else if( $userdata['user_level'] != ADMIN )
  {
  	message_die(GENERAL_MESSAGE, $lang['Not_admin']);
  }
  
! if ( empty($no_page_header) )
  {
  	// Not including the pageheader can be neccesarry if META tags are
  	// needed in the calling script.
--- 37,65 ----
  //
  // End session management
  //
! 
! if (!$userdata['session_logged_in'])
  {
! 	redirect(append_sid("login.$phpEx?redirect=admin/", true));
  }
! else if ($userdata['user_level'] != ADMIN)
  {
  	message_die(GENERAL_MESSAGE, $lang['Not_admin']);
  }
  
! if ($HTTP_GET_VARS['sid'] != $userdata['session_id'])
! {
! 	$url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name'])), '', $HTTP_SERVER_VARS['REQUEST_URI']);
! 	$url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['script_path'])), '', $url);
! 	$url = str_replace('//', '/', $url);
! 	$url = preg_replace('/sid=([^&]*)(&?)/i', '', $url);
! 	$url = preg_replace('/\?$/', '', $url);
! 	$url .= ((strpos($url, '?')) ? '&' : '?') . 'sid=' . $userdata['session_id'];
! 
! 	redirect("index.$phpEx?sid=" . $userdata['session_id']);
! }
! 
! if (empty($no_page_header))
  {
  	// Not including the pageheader can be neccesarry if META tags are
  	// needed in the calling script.
diff -crbBN phpbb203/common.php phpbb2011/common.php
*** phpbb203/common.php	Sat Jul 10 20:16:20 2004
--- phpbb2011/common.php	Thu Nov 18 21:02:13 2004
***************
*** 6,13 ****
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: common.php,v 1.74.2.3 2002/05/13 13:18:17 psotfx Exp $
!  *
   *
   ***************************************************************************/
  
--- 6,12 ----
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: common.php,v 1.74.2.14 2004/11/18 17:49:34 acydburn Exp $
   *
   ***************************************************************************/
  
***************
*** 25,33 ****
--- 24,100 ----
  	die("Hacking attempt");
  }
  
+ //
  error_reporting  (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
  set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
  
+ // The following code (unsetting globals) was contributed by Matt Kavanagh
+ 
+ // PHP5 with register_long_arrays off?
+ if (!isset($HTTP_POST_VARS) && isset($_POST))
+ {
+ 	$HTTP_POST_VARS = $_POST;
+ 	$HTTP_GET_VARS = $_GET;
+ 	$HTTP_SERVER_VARS = $_SERVER;
+ 	$HTTP_COOKIE_VARS = $_COOKIE;
+ 	$HTTP_ENV_VARS = $_ENV;
+ 	$HTTP_POST_FILES = $_FILES;
+ 
+ 	// _SESSION is the only superglobal which is conditionally set
+ 	if (isset($_SESSION))
+ 	{
+ 		$HTTP_SESSION_VARS = $_SESSION;
+ 	}
+ }
+ 
+ if (@phpversion() < '4.0.0')
+ {
+ 	// PHP3 path; in PHP3, globals are _always_ registered
+ 	
+ 	// We 'flip' the array of variables to test like this so that
+ 	// we can validate later with isset($test[$var]) (no in_array())
+ 	$test = array('HTTP_GET_VARS' => NULL, 'HTTP_POST_VARS' => NULL, 'HTTP_COOKIE_VARS' => NULL, 'HTTP_SERVER_VARS' => NULL, 'HTTP_ENV_VARS' => NULL, 'HTTP_POST_FILES' => NULL);
+ 
+ 	// Loop through each input array
+ 	@reset($test);
+ 	while (list($input,) = @each($test))
+ 	{
+ 		while (list($var,) = @each($$input))
+ 		{
+ 			// Validate the variable to be unset
+ 			if (!isset($test[$var]) && $var != 'test' && $var != 'input')
+ 			{
+ 				unset($$var);
+ 			}
+ 		}
+ 	}
+ }
+ else if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
+ {
+ 	// PHP4+ path
+ 	
+ 	// Not only will array_merge give a warning if a parameter
+ 	// is not an array, it will actually fail. So we check if
+ 	// HTTP_SESSION_VARS has been initialised.
+ 	if (!isset($HTTP_SESSION_VARS))
+ 	{
+ 		$HTTP_SESSION_VARS = array();
+ 	}
+ 
+ 	// Merge all into one extremely huge array; unset
+ 	// this later
+ 	$input = array_merge($HTTP_GET_VARS, $HTTP_POST_VARS, $HTTP_COOKIE_VARS, $HTTP_SERVER_VARS, $HTTP_SESSION_VARS, $HTTP_ENV_VARS, $HTTP_POST_FILES);
+ 
+ 	unset($input['input']);
+ 	
+ 	while (list($var,) = @each($input))
+ 	{
+ 		unset($$var);
+ 	}
+    
+ 	unset($input);
+ }
+ 
  //
  // addslashes to vars if magic_quotes_gpc is off
  // this is a security precaution to prevent someone
***************
*** 106,118 ****
  $theme = array();
  $images = array();
  $lang = array();
  $gen_simple_header = FALSE;
  
  include($phpbb_root_path . 'config.'.$phpEx);
  
  if( !defined("PHPBB_INSTALLED") )
  {
! 	header("Location: install.$phpEx");
  	exit;
  }
  
--- 173,186 ----
  $theme = array();
  $images = array();
  $lang = array();
+ $nav_links = array();
  $gen_simple_header = FALSE;
  
  include($phpbb_root_path . 'config.'.$phpEx);
  
  if( !defined("PHPBB_INSTALLED") )
  {
! 	header("Location: install/install.$phpEx");
  	exit;
  }
  
***************
*** 124,167 ****
  include($phpbb_root_path . 'includes/db.'.$phpEx);
  
  //
- // Mozilla navigation bar
- // Default items that should be valid on all pages.
- // Defined here and not in page_header.php so they can be redefined in the code
- //
- $nav_links['top'] = array ( 
- 	'url' => append_sid($phpbb_root_dir."index.".$phpEx),
- 	'title' => sprintf($lang['Forum_Index'], $board_config['sitename'])
- );
- $nav_links['search'] = array ( 
- 	'url' => append_sid($phpbb_root_dir."search.".$phpEx),
- 	'title' => $lang['Search']
- );
- $nav_links['help'] = array ( 
- 	'url' => append_sid($phpbb_root_dir."faq.".$phpEx),
- 	'title' => $lang['FAQ']
- );
- $nav_links['author'] = array ( 
- 	'url' => append_sid($phpbb_root_dir."memberlist.".$phpEx),
- 	'title' => $lang['Memberlist']
- );
- 
- //
  // Obtain and encode users IP
  //
! if( getenv('HTTP_X_FORWARDED_FOR') != '' )
! {
! 	$client_ip = ( !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : $REMOTE_ADDR );
! 
! 	if ( preg_match("/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", getenv('HTTP_X_FORWARDED_FOR'), $ip_list) )
! 	{
! 		$private_ip = array('/^0\./', '/^127\.0\.0\.1/', '/^192\.168\..*/', '/^172\.16\..*/', '/^10..*/', '/^224..*/', '/^240..*/');
! 		$client_ip = preg_replace($private_ip, $client_ip, $ip_list[1]);
! 	}
! }
! else
! {
! 	$client_ip = ( !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : $REMOTE_ADDR );
! }
  $user_ip = encode_ip($client_ip);
  
  //
--- 192,205 ----
  include($phpbb_root_path . 'includes/db.'.$phpEx);
  
  //
  // Obtain and encode users IP
  //
! // I'm removing HTTP_X_FORWARDED_FOR ... this may well cause other problems such as
! // private range IP's appearing instead of the guilty routable IP, tough, don't
! // even bother complaining ... go scream and shout at the idiots out there who feel
! // "clever" is doing harm rather than good ... karma is a great thing ... :)
! //
! $client_ip = ( !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : $REMOTE_ADDR );
  $user_ip = encode_ip($client_ip);
  
  //
***************
*** 179,184 ****
--- 217,227 ----
  while ( $row = $db->sql_fetchrow($result) )
  {
  	$board_config[$row['config_name']] = $row['config_value'];
+ }
+ 
+ if (file_exists('install') || file_exists('contrib'))
+ {
+ 	message_die(GENERAL_MESSAGE, 'Please ensure both the install/ and contrib/ directories are deleted');
  }
  
  //
diff -crbBN phpbb203/db/mssql.php phpbb2011/db/mssql.php
*** phpbb203/db/mssql.php	Sat Jul 10 20:16:18 2004
--- phpbb2011/db/mssql.php	Thu Nov 18 21:02:11 2004
***************
*** 6,12 ****
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : supportphpbb.com
   *
!  *   $Id: mssql.php,v 1.22.2.1 2002/05/12 01:27:26 psotfx Exp $
   *
   ***************************************************************************/
  
--- 6,12 ----
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : supportphpbb.com
   *
!  *   $Id: mssql.php,v 1.22.2.2 2002/12/21 18:31:53 psotfx Exp $
   *
   ***************************************************************************/
  
***************
*** 51,57 ****
  		$this->server = $sqlserver;
  		$this->dbname = $database;
  
! 		$this->db_connect_id = ( $this->persistency ) ? mssql_pconnect($this->server, $this->user, $this->password) : mssql_connect($this->server, $this->user, $this->password);
  
  		if( $this->db_connect_id && $this->dbname != "" )
  		{
--- 51,57 ----
  		$this->server = $sqlserver;
  		$this->dbname = $database;
  
! 		$this->db_connect_id = ( $this->persistency ) ? @mssql_pconnect($this->server, $this->user, $this->password) : @mssql_connect($this->server, $this->user, $this->password);
  
  		if( $this->db_connect_id && $this->dbname != "" )
  		{
***************
*** 92,98 ****
  	//
  	// Query method
  	//
! 	function sql_query($query = "", $transaction = FALSE)
  	{
  		//
  		// Remove any pre-existing queries
--- 92,98 ----
  	//
  	// Query method
  	//
! 	function sql_query($query = '', $transaction = FALSE)
  	{
  		//
  		// Remove any pre-existing queries
***************
*** 100,112 ****
  		unset($this->result);
  		unset($this->row);
  
! 		if ( $query != "" )
  		{
  			$this->num_queries++;
  
  			if ( $transaction == BEGIN_TRANSACTION && !$this->in_transaction )
  			{
! 				if ( !mssql_query("BEGIN TRANSACTION", $this->db_connect_id) )
  				{
  					return false;
  				}
--- 100,112 ----
  		unset($this->result);
  		unset($this->row);
  
! 		if ( $query != '' )
  		{
  			$this->num_queries++;
  
  			if ( $transaction == BEGIN_TRANSACTION && !$this->in_transaction )
  			{
! 				if ( !@mssql_query('BEGIN TRANSACTION', $this->db_connect_id) )
  				{
  					return false;
  				}
***************
*** 125,131 ****
  			// returns something then there's a problem. This may well be a false assumption though
  			// ... needs checking under Windows itself.
  			//
! 			if( preg_match("/^SELECT(.*?)(LIMIT ([0-9]+)[, ]*([0-9]+)*)?$/s", $query, $limits) )
  			{
  				$query = $limits[1];
  
--- 125,131 ----
  			// returns something then there's a problem. This may well be a false assumption though
  			// ... needs checking under Windows itself.
  			//
! 			if( preg_match('#^SELECT(.*?)(LIMIT ([0-9]+)[, ]*([0-9]+)*)?$#s', $query, $limits) )
  			{
  				$query = $limits[1];
  
***************
*** 134,143 ****
  					$row_offset = ( $limits[4] ) ? $limits[3] : "";
  					$num_rows = ( $limits[4] ) ? $limits[4] : $limits[3];
  
! 					$query = "TOP " . ( $row_offset + $num_rows ) . $query;
  				}
  
! 				$this->result = mssql_query("SELECT $query", $this->db_connect_id); 
  
  				if( $this->result )
  				{
--- 134,143 ----
  					$row_offset = ( $limits[4] ) ? $limits[3] : "";
  					$num_rows = ( $limits[4] ) ? $limits[4] : $limits[3];
  
! 					$query = 'TOP ' . ( $row_offset + $num_rows ) . $query;
  				}
  
! 				$this->result = @mssql_query("SELECT $query", $this->db_connect_id); 
  
  				if( $this->result )
  				{
***************
*** 145,164 ****
  
  					if( $row_offset > 0 )
  					{
! 						mssql_data_seek($this->result, $row_offset);
  					}
  				}
  			}
! 			else if( eregi("^INSERT ", $query) )
  			{
! 				if( mssql_query($query, $this->db_connect_id) )
  				{
  					$this->result = time() + microtime();
  
! 					$result_id = mssql_query("SELECT @@IDENTITY AS id, @@ROWCOUNT as affected", $this->db_connect_id);
  					if( $result_id )
  					{
! 						if( $row = mssql_fetch_array($result_id) )
  						{
  							$this->next_id[$this->db_connect_id] = $row['id'];	
  							$this->affected_rows[$this->db_connect_id] = $row['affected'];
--- 145,164 ----
  
  					if( $row_offset > 0 )
  					{
! 						@mssql_data_seek($this->result, $row_offset);
  					}
  				}
  			}
! 			else if( preg_match('#^INSERT #i', $query) )
  			{
! 				if( @mssql_query($query, $this->db_connect_id) )
  				{
  					$this->result = time() + microtime();
  
! 					$result_id = @mssql_query('SELECT @@IDENTITY AS id, @@ROWCOUNT as affected', $this->db_connect_id);
  					if( $result_id )
  					{
! 						if( $row = @mssql_fetch_array($result_id) )
  						{
  							$this->next_id[$this->db_connect_id] = $row['id'];	
  							$this->affected_rows[$this->db_connect_id] = $row['affected'];
***************
*** 168,181 ****
  			}
  			else
  			{
! 				if( mssql_query($query, $this->db_connect_id) )
  				{
  					$this->result = time() + microtime();
  
! 					$result_id = mssql_query("SELECT @@ROWCOUNT as affected", $this->db_connect_id);
  					if( $result_id )
  					{
! 						if( $row = mssql_fetch_array($result_id) )
  						{
  							$this->affected_rows[$this->db_connect_id] = $row['affected'];
  						}
--- 168,181 ----
  			}
  			else
  			{
! 				if( @mssql_query($query, $this->db_connect_id) )
  				{
  					$this->result = time() + microtime();
  
! 					$result_id = @mssql_query('SELECT @@ROWCOUNT as affected', $this->db_connect_id);
  					if( $result_id )
  					{
! 						if( $row = @mssql_fetch_array($result_id) )
  						{
  							$this->affected_rows[$this->db_connect_id] = $row['affected'];
  						}
***************
*** 187,193 ****
  			{
  				if( $this->in_transaction )
  				{
! 					mssql_query("ROLLBACK", $this->db_connect_id);
  					$this->in_transaction = FALSE;
  				}
  
--- 187,193 ----
  			{
  				if( $this->in_transaction )
  				{
! 					@mssql_query('ROLLBACK', $this->db_connect_id);
  					$this->in_transaction = FALSE;
  				}
  
***************
*** 198,204 ****
  			{
  				$this->in_transaction = FALSE;
  
! 				if( !@mssql_query("COMMIT", $this->db_connect_id) )
  				{
  					@mssql_query("ROLLBACK", $this->db_connect_id);
  					return false;
--- 198,204 ----
  			{
  				$this->in_transaction = FALSE;
  
! 				if( !@mssql_query('COMMIT', $this->db_connect_id) )
  				{
  					@mssql_query("ROLLBACK", $this->db_connect_id);
  					return false;
***************
*** 213,221 ****
  			{
  				$this->in_transaction = FALSE;
  
! 				if( !@mssql_query("COMMIT", $this->db_connect_id) )
  				{
! 					@mssql_query("ROLLBACK", $this->db_connect_id);
  					return false;
  				}
  			}
--- 213,221 ----
  			{
  				$this->in_transaction = FALSE;
  
! 				if( !@mssql_query('COMMIT', $this->db_connect_id) )
  				{
! 					@mssql_query('ROLLBACK', $this->db_connect_id);
  					return false;
  				}
  			}
***************
*** 236,242 ****
  
  		if( $query_id )
  		{
! 			return ( !empty($this->limit_offset[$query_id]) ) ? mssql_num_rows($query_id) - $this->limit_offset[$query_id] : @mssql_num_rows($query_id);
  		}
  		else
  		{
--- 236,242 ----
  
  		if( $query_id )
  		{
! 			return ( !empty($this->limit_offset[$query_id]) ) ? @mssql_num_rows($query_id) - $this->limit_offset[$query_id] : @mssql_num_rows($query_id);
  		}
  		else
  		{
***************
*** 251,257 ****
  			$query_id = $this->result;
  		}
  
! 		return ( $query_id ) ? mssql_num_fields($query_id) : false;
  	}
  
  	function sql_fieldname($offset, $query_id = 0)
--- 251,257 ----
  			$query_id = $this->result;
  		}
  
! 		return ( $query_id ) ? @mssql_num_fields($query_id) : false;
  	}
  
  	function sql_fieldname($offset, $query_id = 0)
***************
*** 261,267 ****
  			$query_id = $this->result;
  		}
  
! 		return ( $query_id ) ? mssql_field_name($query_id, $offset) : false;
  	}
  
  	function sql_fieldtype($offset, $query_id = 0)
--- 261,267 ----
  			$query_id = $this->result;
  		}
  
! 		return ( $query_id ) ? @mssql_field_name($query_id, $offset) : false;
  	}
  
  	function sql_fieldtype($offset, $query_id = 0)
***************
*** 271,277 ****
  			$query_id = $this->result;
  		}
  
! 		return ( $query_id ) ? mssql_field_type($query_id, $offset) : false;
  	}
  
  	function sql_fetchrow($query_id = 0)
--- 271,277 ----
  			$query_id = $this->result;
  		}
  
! 		return ( $query_id ) ? @mssql_field_type($query_id, $offset) : false;
  	}
  
  	function sql_fetchrow($query_id = 0)
***************
*** 285,291 ****
  		{
  			empty($row);
  
! 			$row = mssql_fetch_array($query_id);
  
  			while( list($key, $value) = @each($row) )
  			{
--- 285,291 ----
  		{
  			empty($row);
  
! 			$row = @mssql_fetch_array($query_id);
  
  			while( list($key, $value) = @each($row) )
  			{
***************
*** 313,319 ****
  			$i = 0;
  			empty($rowset);
  
! 			while( $row = mssql_fetch_array($query_id))
  			{
  				while( list($key, $value) = @each($row) )
  				{
--- 313,319 ----
  			$i = 0;
  			empty($rowset);
  
! 			while( $row = @mssql_fetch_array($query_id))
  			{
  				while( list($key, $value) = @each($row) )
  				{
***************
*** 344,361 ****
  			{
  				if( $this->limit_offset[$query_id] > 0 )
  				{
! 					$result = ( !empty($this->limit_offset[$query_id]) ) ? mssql_result($this->result, ($this->limit_offset[$query_id] + $row), $field) : false;
  				}
  				else
  				{
! 					$result = mssql_result($this->result, $row, $field);
  				}
  			}
  			else
  			{
  				if( empty($this->row[$query_id]) )
  				{
! 					$this->row[$query_id] = mssql_fetch_array($query_id);
  					$result = stripslashes($this->row[$query_id][$field]);
  				}
  			}
--- 344,361 ----
  			{
  				if( $this->limit_offset[$query_id] > 0 )
  				{
! 					$result = ( !empty($this->limit_offset[$query_id]) ) ? @mssql_result($this->result, ($this->limit_offset[$query_id] + $row), $field) : false;
  				}
  				else
  				{
! 					$result = @mssql_result($this->result, $row, $field);
  				}
  			}
  			else
  			{
  				if( empty($this->row[$query_id]) )
  				{
! 					$this->row[$query_id] = @mssql_fetch_array($query_id);
  					$result = stripslashes($this->row[$query_id][$field]);
  				}
  			}
***************
*** 377,383 ****
  
  		if( $query_id )
  		{
! 			return ( !empty($this->limit_offset[$query_id]) ) ? mssql_data_seek($query_id, ($this->limit_offset[$query_id] + $rownum)) : mssql_data_seek($query_id, $rownum);
  		}
  		else
  		{
--- 377,383 ----
  
  		if( $query_id )
  		{
! 			return ( !empty($this->limit_offset[$query_id]) ) ? @mssql_data_seek($query_id, ($this->limit_offset[$query_id] + $rownum)) : @mssql_data_seek($query_id, $rownum);
  		}
  		else
  		{
***************
*** 402,408 ****
  			$query_id = $this->result;
  		}
  
! 		return ( $query_id ) ? mssql_free_result($query_id) : false;
  	}
  
  	function sql_error($query_id = 0)
--- 402,408 ----
  			$query_id = $this->result;
  		}
  
! 		return ( $query_id ) ? @mssql_free_result($query_id) : false;
  	}
  
  	function sql_error($query_id = 0)
diff -crbBN phpbb203/db/oracle.php phpbb2011/db/oracle.php
*** phpbb203/db/oracle.php	Sat Jul 10 20:16:18 2004
--- phpbb2011/db/oracle.php	Thu Nov 18 21:02:11 2004
***************
*** 6,12 ****
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: oracle.php,v 1.18 2002/01/28 17:24:45 psotfx Exp $
   *
   ***************************************************************************/
  
--- 6,12 ----
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: oracle.php,v 1.18.2.1 2002/11/26 11:42:12 psotfx Exp $
   *
   ***************************************************************************/
  
***************
*** 296,302 ****
  		{
  			$rows = @OCIFetchStatement($query_id, $results);
  			@OCIExecute($query_id, OCI_DEFAULT);
! 			for($i = 0; $i <= $rows; $i++)
  			{
  				@OCIFetchInto($query_id, $tmp_result, OCI_ASSOC+OCI_RETURN_NULLS);
  
--- 296,302 ----
  		{
  			$rows = @OCIFetchStatement($query_id, $results);
  			@OCIExecute($query_id, OCI_DEFAULT);
! 			for($i = 0; $i < $rows; $i++)
  			{
  				@OCIFetchInto($query_id, $tmp_result, OCI_ASSOC+OCI_RETURN_NULLS);
  
diff -crbBN phpbb203/faq.php phpbb2011/faq.php
*** phpbb203/faq.php	Sat Jul 10 20:16:19 2004
--- phpbb2011/faq.php	Thu Nov 18 21:02:13 2004
***************
*** 6,12 ****
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: faq.php,v 1.14 2002/03/31 00:06:33 psotfx Exp $
   *
   *
   ***************************************************************************/
--- 6,12 ----
   *   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 $
   *
   *
   ***************************************************************************/
***************
*** 34,39 ****
--- 34,42 ----
  // End session management
  //
  
+ // Set vars to prevent naughtiness
+ $faq = array();
+ 
  //
  // Load the appropriate faq file
  //
***************
*** 97,103 ****
  $template->set_filenames(array(
  	'body' => 'faq_body.tpl')
  );
! make_jumpbox('viewforum.'.$phpEx, $forum_id);
  
  $template->assign_vars(array(
  	'L_FAQ_TITLE' => $l_title, 
--- 100,106 ----
  $template->set_filenames(array(
  	'body' => 'faq_body.tpl')
  );
! make_jumpbox('viewforum.'.$phpEx);
  
  $template->assign_vars(array(
  	'L_FAQ_TITLE' => $l_title, 
diff -crbBN phpbb203/groupcp.php phpbb2011/groupcp.php
*** phpbb203/groupcp.php	Sat Jul 10 20:16:18 2004
--- phpbb2011/groupcp.php	Thu Nov 18 21:02:13 2004
***************
*** 6,12 ****
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: groupcp.php,v 1.58.2.5 2002/05/20 00:21:09 psotfx Exp $
   *
   *
   ***************************************************************************/
--- 6,12 ----
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : support@phpbb.com
   *
!  *   $Id: groupcp.php,v 1.58.2.22 2004/11/18 17:49:34 acydburn Exp $
   *
   *
   ***************************************************************************/
***************
*** 127,133 ****
  
  if ( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GROUPS_URL]) )
  {
! 	$group_id = ( isset($HTTP_GET_VARS[POST_GROUPS_URL]) ) ? intval($HTTP_GET_VARS[POST_GROUPS_URL]) : intval($HTTP_POST_VARS[POST_GROUPS_URL]);
  }
  else
  {
--- 127,133 ----
  
  if ( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GROUPS_URL]) )
  {
! 	$group_id = ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) ) ? intval($HTTP_POST_VARS[POST_GROUPS_URL]) : intval($HTTP_GET_VARS[POST_GROUPS_URL]);
  }
  else
  {
***************
*** 137,142 ****
--- 137,143 ----
  if ( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
  {
  	$mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
+ 	$mode = htmlspecialchars($mode);
  }
  else
  {
***************
*** 151,165 ****
  //
  // Default var values
  //
- $header_location = ( @preg_match('/Microsoft|WebSTAR/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
  $is_moderator = FALSE;
  
  if ( isset($HTTP_POST_VARS['groupstatus']) && $group_id )
  {
  	if ( !$userdata['session_logged_in'] )
  	{
! 		header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
! 		exit;
  	}
  
  	$sql = "SELECT group_moderator 
--- 152,164 ----
  //
  // Default var values
  //
  $is_moderator = FALSE;
  
  if ( isset($HTTP_POST_VARS['groupstatus']) && $group_id )
  {
  	if ( !$userdata['session_logged_in'] )
  	{
! 		redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
  	}
  
  	$sql = "SELECT group_moderator 
***************
*** 208,215 ****
  	//
  	if ( !$userdata['session_logged_in'] )
  	{
! 		header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
! 		exit;
  	}
  
  	$sql = "SELECT ug.user_id, g.group_type
--- 207,213 ----
  	//
  	if ( !$userdata['session_logged_in'] )
  	{
! 		redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
  	}
  
  	$sql = "SELECT ug.user_id, g.group_type
***************
*** 277,293 ****
  	include($phpbb_root_path . 'includes/emailer.'.$phpEx);
  	$emailer = new emailer($board_config['smtp_delivery']);
  
! 	$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
  
  	$emailer->use_template('group_request', $moderator['user_lang']);
  	$emailer->email_address($moderator['user_email']);
! 	$emailer->set_subject();//$lang['Group_request']
! 	$emailer->extra_headers($email_headers);
  
  	$emailer->assign_vars(array(
  		'SITENAME' => $board_config['sitename'], 
  		'GROUP_MODERATOR' => $moderator['username'],
! 		'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']), 
  
  		'U_GROUPCP' => $server_url . '?' . POST_GROUPS_URL . "=$group_id&validate=true")
  	);
--- 275,291 ----
  	include($phpbb_root_path . 'includes/emailer.'.$phpEx);
  	$emailer = new emailer($board_config['smtp_delivery']);
  
! 	$emailer->from($board_config['board_email']);
! 	$emailer->replyto($board_config['board_email']);
  
  	$emailer->use_template('group_request', $moderator['user_lang']);
  	$emailer->email_address($moderator['user_email']);
! 	$emailer->set_subject($lang['Group_request']);
  
  	$emailer->assign_vars(array(
  		'SITENAME' => $board_config['sitename'], 
  		'GROUP_MODERATOR' => $moderator['username'],
! 		'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']) : '', 
  
  		'U_GROUPCP' => $server_url . '?' . POST_GROUPS_URL . "=$group_id&validate=true")
  	);
***************
*** 310,322 ****
  	//
  	if ( $cancel )
  	{
! 		header($header_location . append_sid("groupcp.$phpEx", true));
! 		exit;
  	}
  	elseif ( !$userdata['session_logged_in'] )
  	{
! 		header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
! 		exit;
  	}
  
  	if ( $confirm )
--- 308,318 ----
  	//
  	if ( $cancel )
  	{
! 		redirect(append_sid("groupcp.$phpEx", true));
  	}
  	elseif ( !$userdata['session_logged_in'] )
  	{
! 		redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
  	}
  
  	if ( $confirm )
***************
*** 357,363 ****
  			'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid("index.$phpEx") . '">')
  		);
  
! 		$message = $lang['Usub_success'] . '<br /><br />' . sprintf($lang['Click_return_group'], '<a href="' . append_sid("groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
  
  		message_die(GENERAL_MESSAGE, $message);
  	}
--- 353,359 ----
  			'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid("index.$phpEx") . '">')
  		);
  
! 		$message = $lang['Unsub_success'] . '<br /><br />' . sprintf($lang['Click_return_group'], '<a href="' . append_sid("groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
  
  		message_die(GENERAL_MESSAGE, $message);
  	}
***************
*** 399,406 ****
  	{
  		if ( !$userdata['session_logged_in'] )
  		{
! 			header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
! 			exit;
  		}
  	}
  
--- 395,401 ----
  	{
  		if ( !$userdata['session_logged_in'] )
  		{
! 			redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
  		}
  	}
  
***************
*** 430,436 ****
  			$sql = "SELECT g.group_moderator, g.group_type, aa.auth_mod 
  				FROM " . GROUPS_TABLE . " g, " . AUTH_ACCESS_TABLE . " aa 
  				WHERE g.group_id = $group_id
! 					AND aa.group_id = g.group_id(+)";
  			break;
  
  		default:
--- 425,431 ----
  			$sql = "SELECT g.group_moderator, g.group_type, aa.auth_mod 
  				FROM " . GROUPS_TABLE . " g, " . AUTH_ACCESS_TABLE . " aa 
  				WHERE g.group_id = $group_id
! 					AND aa.group_id (+) = g.group_id";
  			break;
  
  		default:
***************
*** 461,468 ****
  		{
  			if ( !$userdata['session_logged_in'] )
  			{
! 				header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
! 				exit;
  			}
  
  			if ( !$is_moderator )
--- 456,462 ----
  		{
  			if ( !$userdata['session_logged_in'] )
  			{
! 				redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
  			}
  
  			if ( !$is_moderator )
***************
*** 478,484 ****
  
  			if ( isset($HTTP_POST_VARS['add']) )
  			{
! 				$username = ( isset($HTTP_POST_VARS['username']) ) ? $HTTP_POST_VARS['username'] : "";
  				
  				$sql = "SELECT user_id, user_email, user_lang, user_level  
  					FROM " . USERS_TABLE . " 
--- 472,478 ----
  
  			if ( isset($HTTP_POST_VARS['add']) )
  			{
! 				$username = ( isset($HTTP_POST_VARS['username']) ) ? phpbb_clean_username($HTTP_POST_VARS['username']) : '';
  				
  				$sql = "SELECT user_id, user_email, user_lang, user_level  
  					FROM " . USERS_TABLE . " 
***************
*** 559,575 ****
  					include($phpbb_root_path . 'includes/emailer.'.$phpEx);
  					$emailer = new emailer($board_config['smtp_delivery']);
  
! 					$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
  
  					$emailer->use_template('group_added', $row['user_lang']);
  					$emailer->email_address($row['user_email']);
! 					$emailer->set_subject();//$lang['Group_added']
! 					$emailer->extra_headers($email_headers);
  
  					$emailer->assign_vars(array(
  						'SITENAME' => $board_config['sitename'], 
  						'