################################################################################
##
##   Hack Title:		phpBB 2.0.17 - 2.0.18 Code Changes
##   Hack Version:		1.0.0
##   Hack Author:		Complied by Thoul, code by phpBB Group
##   Hack Description:	All changes in phpBB made between 2.0.17 and 2.0.18.
##
##   Compatibility:		2.0.17
##   Installation Level:	Moderate
##   Installation Time:	60 minutes
##
##   Files To Edit:		55
##						common.php
##						groupcp.php
##						index.php
##						login.php
##						memberlist.php
##						modcp.php
##						posting.php
##						privmsg.php
##						search.php
##						viewtopic.php
##						admin/admin_board.php
##						admin/admin_disallow.php
##						admin/admin_smilies.php
##						admin/admin_styles.php
##						admin/admin_ug_auth.php
##						admin/admin_user_ban.php
##						admin/admin_users.php
##						admin/index.php
##						admin/page_footer_admin.php
##						db/mysql.php
##						db/mysql4.php
##						includes/bbcode.php
##						includes/constants.php
##						includes/db.php
##						includes/emailer.php
##						includes/functions.php
##						includes/functions_admin.php
##						includes/functions_post.php
##						includes/functions_search.php
##						includes/functions_validate.php
##						includes/page_header.php
##						includes/page_tail.php
##						includes/sessions.php
##						includes/smtp.php
##						includes/usercp_activate.php
##						includes/usercp_avatar.php
##						includes/usercp_register.php
##						includes/usercp_sendpasswd.php
##						includes/usercp_viewprofile.php
##						language/lang_english/email/topic_notify.tpl
##						language/lang_english/lang_admin.php
##						language/lang_english/lang_main.php
##						templates/subSilver/admin/board_config_body.tpl
##						templates/subSilver/admin/forum_admin_body.tpl
##						templates/subSilver/admin/index_frameset.tpl
##						templates/subSilver/admin/page_header.tpl
##						templates/subSilver/admin/styles_addnew_body.tpl
##						templates/subSilver/admin/styles_edit_body.tpl
##						templates/subSilver/admin/styles_list_body.tpl
##						templates/subSilver/admin/user_edit_body.tpl
##						templates/subSilver/bbcode.tpl
##						templates/subSilver/groupcp_info_body.tpl
##						templates/subSilver/index_body.tpl
##						templates/subSilver/login_body.tpl
##						templates/subSilver/overall_header.tpl
##						templates/subSilver/profile_add_body.tpl
##						templates/subSilver/search_body.tpl
##						templates/subSilver/search_results_posts.tpl
##						templates/subSilver/subSilver.cfg
##
##   Support:				http://www.phpbbhacks.com/forums 
##
################################################################################
##
##  You downloaded this hack from phpBBHacks.com,
##  the #1 source for phpBB related downloads.
##
##  Please visit http://www.phpbbhacks.com/forums for support.
##
################################################################################
##
##  This hack is released under the GPL License. 
##
################################################################################
##
##  BEFORE ADDING THIS HACK TO YOUR FORUM, please be sure to backup ALL
##  affected files.
##
################################################################################
##
##----------[ PLEASE NOTE ]------------------------------
##
## Once you have completed the code changes, create an install/ directory in
## your forum's root directory, and upload the update_to_latest.php file that
## comes in any phpBB 2.0.18 download to the install/ directory.  Run
## update_to_latest.php by opening it via your web browser, just as you would a
## normal forum page.  Afterward, delete the file and the install/ directory so
## that your forum is accessible again.


##
##----------[ OPEN ]-------------------------------------
##

common.php

##
##----------[ FIND ]-------------------------------------
##

// The following code (unsetting globals) was contributed by Matt Kavanagh

// PHP5 with register_long_arrays off?
if (!isset($HTTP_POST_VARS) && isset($_POST))

##
##----------[ REPLACE WITH ]-----------------------------
##

// The following code (unsetting globals)
// Thanks to Matt Kavanagh and Stefan Esser for providing feedback as well as patch files

// PHP5 with register_long_arrays off?
if (@phpversion() >= '5.0.0' && (!@ini_get('register_long_arrays') || @ini_get('register_long_arrays') == '0' || strtolower(@ini_get('register_long_arrays')) == 'off'))

##
##----------[ FIND ]-------------------------------------
##

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, 'phpEx' => NULL, 'phpbb_root_path' => 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')

##
##----------[ REPLACE WITH ]-----------------------------
##

// Protect against GLOBALS tricks
if (isset($HTTP_POST_VARS['GLOBALS']) || isset($HTTP_POST_FILES['GLOBALS']) || isset($HTTP_GET_VARS['GLOBALS']) || isset($HTTP_COOKIE_VARS['GLOBALS']))
{
	die("Hacking attempt");
}

// Protect against HTTP_SESSION_VARS tricks
if (isset($HTTP_SESSION_VARS) && !is_array($HTTP_SESSION_VARS))
{
	die("Hacking attempt");
}

if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')

##
##----------[ FIND ]-------------------------------------
##

	if (!isset($HTTP_SESSION_VARS))

##
##----------[ REPLACE WITH ]-----------------------------
##

	if (!isset($HTTP_SESSION_VARS) || !is_array($HTTP_SESSION_VARS))

##
##----------[ FIND ]-------------------------------------
##
## The line before unset($input); contains two spaces.
## The objective here is to delete these.
##

 
	unset($input);

##
##----------[ REPLACE WITH ]-----------------------------
##


	unset($input);

##
##----------[ FIND ]-------------------------------------
##

	header("Location: install/install.$phpEx");

##
##----------[ REPLACE WITH ]-----------------------------
##

	header('Location: ' . $phpbb_root_path . 'install/install.' . $phpEx);

##
##----------[ FIND ]-------------------------------------
##

include($phpbb_root_path . 'includes/db.'.$phpEx);

##
##----------[ AFTER, ADD ]-----------------------------
##


// We do not need this any longer, unset for safety purposes
unset($dbpasswd);

##
##----------[ OPEN ]-------------------------------------
##

groupcp.php

##
##----------[ FIND ]-------------------------------------
##

	$temp_url = append_sid("search.$phpEx?search_author=" . urlencode($username) . "&amp;showresults=posts");
	$search_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_search'] . '" alt="' . $lang['Search_user_posts'] . '" title="' . $lang['Search_user_posts'] . '" border="0" /></a>';
	$search = '<a href="' . $temp_url . '">' . $lang['Search_user_posts'] . '</a>';

##
##----------[ REPLACE WITH ]-----------------------------
##

	$temp_url = append_sid("search.$phpEx?search_author=" . urlencode($row['username']) . "&amp;showresults=posts");
	$search_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_search'] . '" alt="' . sprintf($lang['Search_user_posts'], $row['username']) . '" title="' . sprintf($lang['Search_user_posts'], $row['username']) . '" border="0" /></a>';
	$search = '<a href="' . $temp_url . '">' . sprintf($lang['Search_user_posts'], $row['username']) . '</a>';

##
##----------[ FIND ]-------------------------------------
##

		//
		// Load and process templates
		//

##
##----------[ AFTER, ADD ]-------------------------------
##

		$page_title = $lang['Group_Control_Panel'];

##
##----------[ OPEN ]-------------------------------------
##

index.php

##
##----------[ FIND ]-------------------------------------
##

	if ( $userdata['session_logged_in'] )
	{
		$sql = "SELECT t.forum_id, t.topic_id, p.post_time 

##
##----------[ REPLACE WITH ]-----------------------------
##

	if ($userdata['session_logged_in'])
	{
		// 60 days limit
		if ($userdata['user_lastvisit'] < (time() - 5184000))
		{
			$userdata['user_lastvisit'] = time() - 5184000;
		}

		$sql = "SELECT t.forum_id, t.topic_id, p.post_time 

##
##----------[ OPEN ]-------------------------------------
##

login.php

##
##----------[ FIND ]-------------------------------------
##

	else if( ( isset($HTTP_GET_VARS['logout']) || isset($HTTP_POST_VARS['logout']) ) && $userdata['session_logged_in'] )
	{

##
##----------[ AFTER, ADD ]-------------------------------
##

		// session id check
		if ($sid == '' || $sid != $userdata['session_id'])
		{
			message_die(GENERAL_ERROR, 'Invalid_session');
		}


##
##----------[ FIND ]-------------------------------------
##

		if( isset($HTTP_POST_VARS['redirect']) || isset($HTTP_GET_VARS['redirect']) )
		{
			$forward_to = $HTTP_SERVER_VARS['QUERY_STRING'];

##
##----------[ BEFORE, ADD ]------------------------------
##

		$forward_page = '';


##
##----------[ FIND AND DELETE ]-------------------------------------
##

					$forward_page = '';


##
##----------[ FIND AND DELETE ]-------------------------------------
##

		else
		{
			$forward_page = '';
		}

##
##----------[ FIND ]-------------------------------------
##

		make_jumpbox('viewforum.'.$phpEx, $forum_id);

##
##----------[ REPLACE WITH ]-----------------------------
##

		make_jumpbox('viewforum.'.$phpEx);

##
##----------[ OPEN ]-------------------------------------
##

memberlist.php

##
##----------[ FIND ]-------------------------------------
##

$mode_types = array('joindate', 'username', 'location', 'posts', 'email', 'website', 'topten');

##
##----------[ REPLACE WITH ]-----------------------------
##

$mode_types = array('joined', 'username', 'location', 'posts', 'email', 'website', 'topten');

##
##----------[ OPEN ]-------------------------------------
##

modcp.php

##
##----------[ FIND ]-------------------------------------
##

			message_die(MESSAGE, sprintf($lang['Sorry_auth_delete'], $is_auth['auth_delete_type']));

##
##----------[ REPLACE WITH ]-----------------------------
##

			message_die(GENERAL_MESSAGE, sprintf($lang['Sorry_auth_delete'], $is_auth['auth_delete_type']));

##
##----------[ FIND ]-------------------------------------
##

					'U_SEARCHPOSTS' => append_sid("search.$phpEx?search_author=" . urlencode($username) . "&amp;showresults=topics"))

##
##----------[ REPLACE WITH ]-----------------------------
##

					'U_SEARCHPOSTS' => append_sid("search.$phpEx?search_author=" . (($id == ANONYMOUS) ? 'Anonymous' : urlencode($username)) . "&amp;showresults=topics"))

##
##----------[ OPEN ]-------------------------------------
##

posting.php

##
##----------[ FIND ]-------------------------------------
##

$refresh = $preview || $poll_add || $poll_edit || $poll_delete;

##
##----------[ AFTER, ADD ]-------------------------------
##

$orig_word = $replacement_word = array();

##
##----------[ FIND ]-------------------------------------
##

$topic_type = ( !empty($HTTP_POST_VARS['topictype']) ) ? intval($HTTP_POST_VARS['topictype']) : POST_NORMAL;

##
##----------[ AFTER, ADD ]-------------------------------
##

$topic_type = ( in_array($topic_type, array(POST_NORMAL, POST_STICKY, POST_ANNOUNCE)) ) ? $topic_type : POST_NORMAL;

##
##----------[ FIND ]-------------------------------------
##

		$sql = "SELECT f.*, t.topic_status, t.topic_title  

##
##----------[ REPLACE WITH ]-----------------------------
##

		$sql = "SELECT f.*, t.topic_status, t.topic_title, t.topic_type  

##
##----------[ FIND ]-------------------------------------
##

		$select_sql = ( !$submit ) ? ", t.topic_title, p.enable_bbcode, p.enable_html, p.enable_smilies, p.enable_sig, p.post_username, pt.post_subject, pt.post_text, pt.bbcode_uid, u.username, u.user_id, u.user_sig" : '';

##
##----------[ REPLACE WITH ]-----------------------------
##

		$select_sql = (!$submit) ? ', t.topic_title, p.enable_bbcode, p.enable_html, p.enable_smilies, p.enable_sig, p.post_username, pt.post_subject, pt.post_text, pt.bbcode_uid, u.username, u.user_id, u.user_sig, u.user_sig_bbcode_uid' : '';

##
##----------[ FIND ]-------------------------------------
##

		{
			$topic_id = $post_info['topic_id'];
		}

##
##----------[ AFTER, ADD ]-------------------------------
##

		if ( $mode == 'newtopic' )
		{
			$post_data['topic_type'] = POST_NORMAL;
		}

##
##----------[ FIND ]-------------------------------------
##

		$post_data['has_poll'] = false;
		$post_data['edit_poll'] = false;
	}

##
##----------[ AFTER, ADD ]-------------------------------
##

	if ( $mode == 'poll_delete' && !isset($poll_id) )
	{
		message_die(GENERAL_MESSAGE, $lang['No_such_post']);
	}

##
##----------[ FIND ]-------------------------------------
##

		$user_sig = ( $post_info['user_sig'] != '' && $board_config['allow_sig'] ) ? $post_info['user_sig'] : '';

##
##----------[ AFTER, ADD ]-------------------------------
##

		$userdata['user_sig_bbcode_uid'] = $post_info['user_sig_bbcode_uid'];

##
##----------[ OPEN ]-------------------------------------
##

privmsg.php

##
##----------[ FIND ]-------------------------------------
##

			if ( $sent_info['sent_items'] >= $board_config['max_sentbox_privmsgs'] )

##
##----------[ REPLACE WITH ]-----------------------------
##

			if ($board_config['max_sentbox_privmsgs'] && $sent_info['sent_items'] >= $board_config['max_sentbox_privmsgs'])

##
##----------[ FIND ]-------------------------------------
##

	$search_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_search'] . '" alt="' . $lang['Search_user_posts'] . '" title="' . $lang['Search_user_posts'] . '" border="0" /></a>';
	$search = '<a href="' . $temp_url . '">' . $lang['Search_user_posts'] . '</a>';

##
##----------[ REPLACE WITH ]-----------------------------
##

	$search_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_search'] . '" alt="' . sprintf($lang['Search_user_posts'], $username_from) . '" title="' . sprintf($lang['Search_user_posts'], $username_from) . '" border="0" /></a>';
	$search = '<a href="' . $temp_url . '">' . sprintf($lang['Search_user_posts'], $username_from) . '</a>';

##
##----------[ FIND ]-------------------------------------
##

			if ( $saved_info['savebox_items'] >= $board_config['max_savebox_privmsgs'] )

##
##----------[ REPLACE WITH ]-----------------------------
##

			if ($board_config['max_savebox_privmsgs'] && $saved_info['savebox_items'] >= $board_config['max_savebox_privmsgs'] )

##
##----------[ FIND ]-------------------------------------
##

	if ( $submit )
	{
		if ( !empty($HTTP_POST_VARS['username']) )

##
##----------[ BEFORE, ADD ]------------------------------
##

	if ($submit && $mode == 'edit')
	{
		$sql = 'SELECT privmsgs_from_userid
			FROM ' . PRIVMSGS_TABLE . '
			WHERE privmsgs_id = ' . (int) $privmsg_id . '
				AND privmsgs_from_userid = ' . $userdata['user_id'];

		if (!($result = $db->sql_query($sql)))
		{
			message_die(GENERAL_ERROR, "Could not obtain message details", "", __LINE__, __FILE__, $sql);
		}

		if (!($row = $db->sql_fetchrow($result)))
		{
			message_die(GENERAL_MESSAGE, $lang['No_such_post']);
		}
		$db->sql_freeresult($result);

		unset($row);
	}


##
##----------[ FIND ]-------------------------------------
##

			$to_userdata = $db->sql_fetchrow($result);

##
##----------[ REPLACE WITH ]-----------------------------
##

			if (!($to_userdata = $db->sql_fetchrow($result)))
			{
				$error = TRUE;
				$error_msg = $lang['No_such_user'];
			}

##
##----------[ FIND ]-------------------------------------
##

				if ( $inbox_info['inbox_items'] >= $board_config['max_inbox_privmsgs'] )

##
##----------[ REPLACE WITH ]-----------------------------
##

				if ($board_config['max_inbox_privmsgs'] && $inbox_info['inbox_items'] >= $board_config['max_inbox_privmsgs'])

##
##----------[ FIND ]-------------------------------------
##

					'USERNAME' => $to_username, 

##
##----------[ REPLACE WITH ]-----------------------------
##

					'USERNAME' => stripslashes($to_username), 

##
##----------[ FIND ]-------------------------------------
##


		if ( $mode == 'edit' )
		{
			$sql = "SELECT pm.*, pmt.privmsgs_bbcode_uid, pmt.privmsgs_text, u.username, u.user_id, u.user_sig 

##
##----------[ REPLACE WITH ]-----------------------------
##

		else if ( $mode == 'edit' )
		{
			$sql = "SELECT pm.*, pmt.privmsgs_bbcode_uid, pmt.privmsgs_text, u.username, u.user_id, u.user_sig 

##
##----------[ FIND ]-------------------------------------
##

			$privmsg_subject = $privmsg_message = '';

##
##----------[ REPLACE WITH ]-----------------------------
##

			$privmsg_subject = $privmsg_message = $to_username = '';

##
##----------[ FIND AND DELETE ]-------------------------------------
##

		'S_NAMES_SELECT' => $user_names_select,

##
##----------[ OPEN ]-------------------------------------
##

search.php

##
##----------[ FIND ]-------------------------------------
##

			$split_search = ( !strstr($multibyte_charset, $lang['ENCODING']) ) ?  split_words(clean_words('search', stripslashes($search_keywords), $stopword_array, $synonym_array), 'search') : split(' ', $search_keywords);	

##
##----------[ REPLACE WITH ]-----------------------------
##

			$stripped_keywords = stripslashes($search_keywords);
			$split_search = ( !strstr($multibyte_charset, $lang['ENCODING']) ) ?  split_words(clean_words('search', $stripped_keywords, $stopword_array, $synonym_array), 'search') : split(' ', $search_keywords);	
			unset($stripped_keywords);

##
##----------[ FIND ]-------------------------------------
##

	ORDER BY c.cat_id, f.forum_order";

##
##----------[ REPLACE WITH ]-----------------------------
##

	ORDER BY c.cat_order, f.forum_order";

##
##----------[ OPEN ]-------------------------------------
##

viewtopic.php

##
##----------[ FIND ]-------------------------------------
##

if ( !isset($topic_id) && !isset($post_id) )

##
##----------[ REPLACE WITH ]-----------------------------
##

if (!$topic_id && !$post_id)

##
##----------[ FIND ]-------------------------------------
##

			WHERE
				t2.topic_id = $topic_id
				AND t.forum_id = t2.forum_id

##
##----------[ AFTER, ADD ]-------------------------------
##

				AND t.topic_moved_id = 0

##
##----------[ FIND ]-------------------------------------
##

$join_sql_table = ( empty($post_id) ) ? '' : ", " . POSTS_TABLE . " p, " . POSTS_TABLE . " p2 ";
$join_sql = ( empty($post_id) ) ? "t.topic_id = $topic_id" : "p.post_id = $post_id AND t.topic_id = p.topic_id AND p2.topic_id = p.topic_id AND p2.post_id <= $post_id";
$count_sql = ( empty($post_id) ) ? '' : ", COUNT(p2.post_id) AS prev_posts";

$order_sql = ( empty($post_id) ) ? '' : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, t.topic_last_post_id, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments ORDER BY p.post_id ASC";

##
##----------[ REPLACE WITH ]-----------------------------
##

$join_sql_table = (!$post_id) ? '' : ", " . POSTS_TABLE . " p, " . POSTS_TABLE . " p2 ";
$join_sql = (!$post_id) ? "t.topic_id = $topic_id" : "p.post_id = $post_id AND t.topic_id = p.topic_id AND p2.topic_id = p.topic_id AND p2.post_id <= $post_id";
$count_sql = (!$post_id) ? '' : ", COUNT(p2.post_id) AS prev_posts";

$order_sql = (!$post_id) ? '' : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, t.topic_last_post_id, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments ORDER BY p.post_id ASC";

##
##----------[ FIND ]-------------------------------------
##

		$redirect = ( isset($post_id) ) ? POST_POST_URL . "=$post_id" : POST_TOPIC_URL . "=$topic_id";
		$redirect .= ( isset($start) ) ? "&start=$start" : '';

##
##----------[ REPLACE WITH ]-----------------------------
##

		$redirect = ($post_id) ? POST_POST_URL . "=$post_id" : POST_TOPIC_URL . "=$topic_id";
		$redirect .= ($start) ? "&start=$start" : '';

##
##----------[ FIND ]-------------------------------------
##

if ( !empty($post_id) )

##
##----------[ REPLACE WITH ]-----------------------------
##

if ($post_id)

##
##----------[ FIND ]-------------------------------------
##

			$highlight_match .= (($highlight_match != '') ? '|' : '') . str_replace('*', '\w*', phpbb_preg_quote($words[$i], '#'));

##
##----------[ REPLACE WITH ]-----------------------------
##

			$highlight_match .= (($highlight_match != '') ? '|' : '') . str_replace('*', '\w*', preg_quote($words[$i], '#'));

##
##----------[ FIND ]-------------------------------------
##

	$search_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_search'] . '" alt="' . $lang['Search_user_posts'] . '" title="' . sprintf($lang['Search_user_posts'], $postrow[$i]['username']) . '" border="0" /></a>';

##
##----------[ REPLACE WITH ]-----------------------------
##

	$search_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_search'] . '" alt="' . sprintf($lang['Search_user_posts'], $postrow[$i]['username']) . '" title="' . sprintf($lang['Search_user_posts'], $postrow[$i]['username']) . '" border="0" /></a>';

##
##----------[ FIND ]-------------------------------------
##

	if ( $board_config['allow_bbcode'] )
	{
		if ( $user_sig != '' && $user_sig_bbcode_uid != '' )
		{
			$user_sig = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($user_sig, $user_sig_bbcode_uid) : preg_replace('/\:[0-9a-z\:]+\]/si', ']', $user_sig);
		}

		if ( $bbcode_uid != '' )
		{
			$message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace('/\:[0-9a-z\:]+\]/si', ']', $message);
		}

##
##----------[ REPLACE WITH ]-----------------------------
##

	if ($user_sig != '' && $user_sig_bbcode_uid != '')
	{
		$user_sig = ($board_config['allow_bbcode']) ? bbencode_second_pass($user_sig, $user_sig_bbcode_uid) : preg_replace("/\:$user_sig_bbcode_uid/si", '', $user_sig);
	}

	if ($bbcode_uid != '')
	{
		$message = ($board_config['allow_bbcode']) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace("/\:$bbcode_uid/si", '', $message);

##
##----------[ OPEN ]-------------------------------------
##

admin/admin_board.php

##
##----------[ FIND ]-------------------------------------
##

$confirm_yes = ($new['enable_confirm']) ? 'checked="checked"' : '';
$confirm_no = (!$new['enable_confirm']) ? 'checked="checked"' : '';

##
##----------[ AFTER, ADD ]-------------------------------
##

$allow_autologin_yes = ($new['allow_autologin']) ? 'checked="checked"' : '';
$allow_autologin_no = (!$new['allow_autologin']) ? 'checked="checked"' : '';

##
##----------[ FIND ]-------------------------------------
##

	"L_ADMIN" => $lang['Acc_Admin'], 
	"L_VISUAL_CONFIRM" => $lang['Visual_confirm'], 
	"L_VISUAL_CONFIRM_EXPLAIN" => $lang['Visual_confirm_explain'], 

##
##----------[ AFTER, ADD ]-------------------------------
##

	"L_ALLOW_AUTOLOGIN" => $lang['Allow_autologin'],
	"L_ALLOW_AUTOLOGIN_EXPLAIN" => $lang['Allow_autologin_explain'],
	"L_AUTOLOGIN_TIME" => $lang['Autologin_time'],
	"L_AUTOLOGIN_TIME_EXPLAIN" => $lang['Autologin_time_explain'],

##
##----------[ FIND ]-------------------------------------
##

	"CONFIRM_DISABLE" => $confirm_no,
	"ACTIVATION_NONE_CHECKED" => $activation_none,

##
##----------[ REPLACE WITH ]-----------------------------
##

	"CONFIRM_DISABLE" => $confirm_no,
	'ALLOW_AUTOLOGIN_YES' => $allow_autologin_yes,
	'ALLOW_AUTOLOGIN_NO' => $allow_autologin_no,
	'AUTOLOGIN_TIME' => (int) $new['max_autologin_time'],

##
##----------[ OPEN ]-------------------------------------
##

admin/admin_disallow.php

##
##----------[ FIND ]-------------------------------------
##

		message_die(MESSAGE, $lang['Fields_empty']);

##
##----------[ REPLACE WITH ]-----------------------------
##

		message_die(GENERAL_MESSAGE, $lang['Fields_empty']);

##
##----------[ OPEN ]-------------------------------------
##

admin/admin_smilies.php

##
##----------[ FIND ]-------------------------------------
##

			$smile_url = ( isset($HTTP_POST_VARS['smile_url']) ) ? trim($HTTP_POST_VARS['smile_url']) : trim($HTTP_GET_VARS['smile_url']);

##
##----------[ AFTER, ADD ]-------------------------------
##

			$smile_url = phpbb_ltrim(basename($smile_url), "'");

##
##----------[ FIND ]-------------------------------------
##

				message_die(MESSAGE, $lang['Fields_empty']);

##
##----------[ REPLACE WITH ]-----------------------------
##

				message_die(GENERAL_MESSAGE, $lang['Fields_empty']);

##
##----------[ FIND ]-------------------------------------
##

			$smile_url = ( isset($HTTP_POST_VARS['smile_url']) ) ? $HTTP_POST_VARS['smile_url'] : $HTTP_GET_VARS['smile_url'];

##
##----------[ AFTER, ADD ]-------------------------------
##

			$smile_url = phpbb_ltrim(basename($smile_url), "'");

##
##----------[ FIND ]-------------------------------------
##

				message_die(MESSAGE, $lang['Fields_empty']);

##
##----------[ REPLACE WITH ]-----------------------------
##

				message_die(GENERAL_MESSAGE, $lang['Fields_empty']);

##
##----------[ OPEN ]-------------------------------------
##

admin/admin_styles.php

##
##----------[ FIND ]-------------------------------------
##

				"L_STYLESHEET" => $lang['Stylesheet'],

##
##----------[ AFTER, ADD ]-------------------------------
##

				"L_STYLESHEET_EXPLAIN" => $lang['Stylesheet_explain'],

##
##----------[ OPEN ]-------------------------------------
##

admin/admin_ug_auth.php

##
##----------[ FIND ]-------------------------------------
##

			$sql = "SELECT * 
				FROM " . FORUMS_TABLE . " f
				ORDER BY forum_order";

##
##----------[ REPLACE WITH ]-----------------------------
##

			$sql = 'SELECT f.* 
				FROM ' . FORUMS_TABLE . ' f, ' . CATEGORIES_TABLE . ' c
				WHERE f.cat_id = c.cat_id
				ORDER BY c.cat_order, f.forum_order';

##
##----------[ FIND ]-------------------------------------
##

	if( count($name) )
	{
		$t_usergroup_list = $t_pending_list = '';
		for($i = 0; $i < count($ug_info); $i++)

##
##----------[ REPLACE WITH ]-----------------------------
##

	$t_usergroup_list = $t_pending_list = '';
	if( count($name) )
	{
		for($i = 0; $i < count($ug_info); $i++)

##
##----------[ FIND ]-------------------------------------
##

	else
	{
		$t_usergroup_list = $lang['None'];
	}

	$s_column_span = 2; // Two columns always present

##
##----------[ REPLACE WITH ]-----------------------------
##


	$t_usergroup_list = ($t_usergroup_list == '') ? $lang['None'] : $t_usergroup_list;
	$t_pending_list = ($t_pending_list == '') ? $lang['None'] : $t_pending_list;

	$s_column_span = 2; // Two columns always present

##
##----------[ OPEN ]-------------------------------------
##

admin/admin_user_ban.php

##
##----------[ FIND ]-------------------------------------
##

			if (preg_match('#^(([a-z0-9&.-_+])|(\*))+@[a-z0-9\-]+\.([a-z0-9\-]+\.)*?[a-z]+$#is', trim($email_list_temp[$i])))

##
##----------[ REPLACE WITH ]-----------------------------
##

			if (preg_match('/^(([a-z0-9&\'\.\-_\+])|(\*))+@(([a-z0-9\-])|(\*))+\.([a-z0-9\-]+\.)*?[a-z]+$/is', trim($email_list_temp[$i])))

##
##----------[ OPEN ]-------------------------------------
##

admin/admin_users.php

##
##----------[ FIND ]-------------------------------------
##

		if( $HTTP_POST_VARS['deleteuser'] )

##
##----------[ REPLACE WITH ]-----------------------------
##

		if( $HTTP_POST_VARS['deleteuser'] && ( $userdata['user_id'] != $user_id ) )

##
##----------[ FIND ]-------------------------------------
##

		$user_avatar_local = ( isset( $HTTP_POST_VARS['avatarselect'] ) && !empty($HTTP_POST_VARS['submitavatar'] ) && $board_config['allow_avatar_local'] ) ? $HTTP_POST_VARS['avatarselect'] : ( ( isset( $HTTP_POST_VARS['avatarlocal'] )  ) ? $HTTP_POST_VARS['avatarlocal'] : '' );

##
##----------[ AFTER, ADD ]-------------------------------
##

		$user_avatar_category = ( isset($HTTP_POST_VARS['avatarcatname']) && $board_config['allow_avatar_local'] ) ? htmlspecialchars($HTTP_POST_VARS['avatarcatname']) : '' ;

##
##----------[ FIND ]-------------------------------------
##

				$user_avatar = $user_avatar_local;

##
##----------[ REPLACE WITH ]-----------------------------
##

				$user_avatar = $user_avatar_category . '/' . $user_avatar_local;

##
##----------[ FIND ]-------------------------------------
##

			$avatar_sql = ", user_avatar = '" . str_replace("\'", "''", $user_avatar_local) . "', user_avatar_type = " . USER_AVATAR_GALLERY;

##
##----------[ REPLACE WITH ]-----------------------------
##

			$avatar_sql = ", user_avatar = '" . str_replace("\'", "''", phpbb_ltrim(basename($user_avatar_category), "'") . '/' . phpbb_ltrim(basename($user_avatar_local), "'")) . "', user_avatar_type = " . USER_AVATAR_GALLERY;

##
##----------[ FIND ]-------------------------------------
##

							$avatar_images[$file][$avatar_row_count][$avatar_col_count] = $file . "/" . $sub_file;

##
##----------[ REPLACE WITH ]-----------------------------
##

							$avatar_images[$file][$avatar_row_count][$avatar_col_count] = $sub_file;

##
##----------[ FIND ]-------------------------------------
##

						"AVATAR_IMAGE" => "../" . $board_config['avatar_gallery_path'] . "/" . $avatar_images[$category][$i][$j])

##
##----------[ REPLACE WITH ]-----------------------------
##

						"AVATAR_IMAGE" => "../" . $board_config['avatar_gallery_path'] . '/' . $category . '/' . $avatar_images[$category][$i][$j])

##
##----------[ FIND ]-------------------------------------
##

			$s_hidden_fields = '<input type="hidden" name="mode" value="edit" /><input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" />';

##
##----------[ REPLACE WITH ]-----------------------------
##

			$s_hidden_fields = '<input type="hidden" name="mode" value="edit" /><input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" /><input type="hidden" name="avatarcatname" value="' . $category . '" />';

##
##----------[ FIND ]-------------------------------------
##

			$s_hidden_fields .= '<input type="hidden" name="avatarlocal" value="' . $user_avatar_local . '" />';

##
##----------[ REPLACE WITH ]-----------------------------
##

			$s_hidden_fields .= '<input type="hidden" name="avatarlocal" value="' . $user_avatar_local . '" /><input type="hidden" name="avatarcatname" value="' . $user_avatar_category . '" />';

##
##----------[ OPEN ]-------------------------------------
##

admin/index.php

##
##----------[ FIND ]-------------------------------------
##

	if ($fsock = @fsockopen('www.phpbb.com', 80, $errno, $errstr))

##
##----------[ REPLACE WITH ]-----------------------------
##

	if ($fsock = @fsockopen('www.phpbb.com', 80, $errno, $errstr, 10))

##
##----------[ FIND ]-------------------------------------
##

			$version_info .= '<br />' . sprintf($lang['Latest_version_info'], $latest_version) . sprintf($lang['Current_version_info'], '2' . $board_config['version']) . '</p>';

##
##----------[ REPLACE WITH ]-----------------------------
##

			$version_info .= '<br />' . sprintf($lang['Latest_version_info'], $latest_version) . ' ' . sprintf($lang['Current_version_info'], '2' . $board_config['version']) . '</p>';

##
##----------[ OPEN ]-------------------------------------
##

admin/page_footer_admin.php

##
##----------[ FIND ]-------------------------------------
##

//
// Show the overall footer.
//

##
##----------[ BEFORE, ADD ]------------------------------
##

global $do_gzip_compress;


##
##----------[ FIND ]-------------------------------------
##

	'TRANSLATION_INFO' => $lang['TRANSLATION_INFO'])

##
##----------[ REPLACE WITH ]-----------------------------
##

	'TRANSLATION_INFO' => (isset($lang['TRANSLATION_INFO'])) ? $lang['TRANSLATION_INFO'] : ((isset($lang['TRANSLATION'])) ? $lang['TRANSLATION'] : ''))

##
##----------[ OPEN ]-------------------------------------
##

db/mysql.php

##
##----------[ FIND ]-------------------------------------
##

						$result = $this->rowset[$query_id][$field];

##
##----------[ REPLACE WITH ]-----------------------------
##

						$result = $this->rowset[$query_id][0][$field];

##
##----------[ OPEN ]-------------------------------------
##

db/mysql4.php

##
##----------[ FIND ]-------------------------------------
##

						$result = $this->rowset[$query_id][$field];

##
##----------[ REPLACE WITH ]-----------------------------
##

						$result = $this->rowset[$query_id][0][$field];

##
##----------[ OPEN ]-------------------------------------
##

includes/bbcode.php

##
##----------[ FIND ]-------------------------------------
##

				bbcode_array_push($stack, $match);

##
##----------[ REPLACE WITH ]-----------------------------
##

				array_push($stack, $match);

##
##----------[ FIND ]-------------------------------------
##

						$match = bbcode_array_pop($stack);

##
##----------[ REPLACE WITH ]-----------------------------
##

						$match = array_pop($stack);

##
##----------[ FIND ]-------------------------------------
##

							$match = bbcode_array_pop($stack);

##
##----------[ REPLACE WITH ]-----------------------------
##

							$match = array_pop($stack);

##
##----------[ FIND ]-------------------------------------
##

 * This function does exactly what the PHP4 function array_push() does
 * however, to keep phpBB compatable with PHP 3 we had to come up with our own
 * method of doing it.

##
##----------[ AFTER, ADD ]-------------------------------
##

 * This function was deprecated in phpBB 2.0.18

##
##----------[ FIND ]-------------------------------------
##

 * This function does exactly what the PHP4 function array_pop() does
 * however, to keep phpBB compatable with PHP 3 we had to come up with our own
 * method of doing it.

##
##----------[ REPLACE WITH ]-----------------------------
##

 * This function was deprecated in phpBB 2.0.18

##
##----------[ FIND ]-------------------------------------
##

			$orig[] = "/(?<=.\W|\W.|^\W)" . phpbb_preg_quote($smilies[$i]['code'], "/") . "(?=.\W|\W.|\W$)/";

##
##----------[ REPLACE WITH ]-----------------------------
##

			$orig[] = "/(?<=.\W|\W.|^\W)" . preg_quote($smilies[$i]['code'], "/") . "(?=.\W|\W.|\W$)/";

##
##----------[ OPEN ]-------------------------------------
##

includes/constants.php

##
##----------[ FIND ]-------------------------------------
##

define('SESSIONS_TABLE', $table_prefix.'sessions');

##
##----------[ AFTER, ADD ]-------------------------------
##

define('SESSIONS_KEYS_TABLE', $table_prefix.'sessions_keys');

##
##----------[ OPEN ]-------------------------------------
##

includes/db.php

##
##----------[ FIND ]-------------------------------------
##
## The objective here is to replace spaces at the beginning of the line
## with a tab.
##

   message_die(CRITICAL_ERROR, "Could not connect to the database");

##
##----------[ REPLACE WITH ]-----------------------------
##

	message_die(CRITICAL_ERROR, "Could not connect to the database");

##
##----------[ OPEN ]-------------------------------------
##

includes/emailer.php

##
##----------[ FIND ]-------------------------------------
##

			$drop_header .= '[\r\n]*?' . phpbb_preg_quote($match[1], '#');

##
##----------[ REPLACE WITH ]-----------------------------
##

			$drop_header .= '[\r\n]*?' . preg_quote($match[1], '#');

##
##----------[ FIND ]-------------------------------------
##

			$drop_header .= '[\r\n]*?' . phpbb_preg_quote($match[1], '#');

##
##----------[ REPLACE WITH ]-----------------------------
##

			$drop_header .= '[\r\n]*?' . preg_quote($match[1], '#');

##
##----------[ FIND ]-------------------------------------
##

		$str = preg_replace('#' . phpbb_preg_quote($spacer, '#') . '$#', '', $str);

##
##----------[ REPLACE WITH ]-----------------------------
##

		$str = preg_replace('#' . preg_quote($spacer, '#') . '$#', '', $str);

##
##----------[ OPEN ]-------------------------------------
##

includes/functions.php

##
##----------[ FIND ]-------------------------------------
##
## The objective here is to remove a tab at the end of the line.
##

	$username = phpbb_rtrim($username, "\\");	

##
##----------[ REPLACE WITH ]-----------------------------
##

	$username = phpbb_rtrim($username, "\\");

##
##----------[ FIND ]-------------------------------------
##

	return $username;
}

##
##----------[ AFTER, ADD ]-------------------------------
##

/**
* This function is a wrapper for ltrim, as charlist is only supported in php >= 4.1.0
* Added in phpBB 2.0.18
*/
function phpbb_ltrim($str, $charlist = false)
{
	if ($charlist === false)
	{
		return ltrim($str);
	}
	
	$php_version = explode('.', PHP_VERSION);

	// php version < 4.1.0
	if ((int) $php_version[0] < 4 || ((int) $php_version[0] == 4 && (int) $php_version[1] < 1))
	{
		while ($str{0} == $charlist)
		{
			$str = substr($str, 1);
		}
	}
	else
	{
		$str = ltrim($str, $charlist);
	}

	return $str;
}


##
##----------[ FIND ]-------------------------------------
##

			$orig_word[] = '#\b(' . str_replace('\*', '\w*?', phpbb_preg_quote($row['word'], '#')) . ')\b#i';

##
##----------[ REPLACE WITH ]-----------------------------
##

			$orig_word[] = '#\b(' . str_replace('\*', '\w*?', preg_quote($row['word'], '#')) . ')\b#i';

##
##----------[ OPEN ]-------------------------------------
##

includes/functions_admin.php

##
##----------[ FIND ]-------------------------------------
##

	$sql = "SELECT forum_id, forum_name
		FROM " . FORUMS_TABLE . " 
		ORDER BY cat_id, forum_order";

##
##----------[ REPLACE WITH ]-----------------------------
##

	$sql = 'SELECT f.forum_id, f.forum_name
		FROM ' . CATEGORIES_TABLE . ' c, ' . FORUMS_TABLE . ' f
		WHERE f.cat_id = c.cat_id 
		ORDER BY c.cat_order, f.forum_order';

##
##----------[ FIND ]-------------------------------------
##

				$sql = ( $row['total_posts'] ) ? "UPDATE " . TOPICS_TABLE . " SET topic_replies = " . ( $row['total_posts'] - 1 ) . ", topic_first_post_id = " . $row['first_post'] . ", topic_last_post_id = " . $row['last_post'] . " WHERE topic_id = $id" : "DELETE FROM " . TOPICS_TABLE . " WHERE topic_id = $id";
				if ( !$db->sql_query($sql) )
				{
					message_die(GENERAL_ERROR, 'Could not update topic', '', __LINE__, __FILE__, $sql);

##
##----------[ REPLACE WITH ]-----------------------------
##

				if ($row['total_posts'])
				{
					// Correct the details of this topic
					$sql = 'UPDATE ' . TOPICS_TABLE . ' 
						SET topic_replies = ' . ($row['total_posts'] - 1) . ', topic_first_post_id = ' . $row['first_post'] . ', topic_last_post_id = ' . $row['last_post'] . "
						WHERE topic_id = $id";

					if (!$db->sql_query($sql))
					{
						message_die(GENERAL_ERROR, 'Could not update topic', '', __LINE__, __FILE__, $sql);
					}
				}
				else
				{
					// There are no replies to this topic
					// Check if it is a move stub
					$sql = 'SELECT topic_moved_id 
						FROM ' . TOPICS_TABLE . " 
						WHERE topic_id = $id";

					if (!($result = $db->sql_query($sql)))
					{
						message_die(GENERAL_ERROR, 'Could not get topic ID', '', __LINE__, __FILE__, $sql);
					}

					if ($row = $db->sql_fetchrow($result))
					{
						if (!$row['topic_moved_id'])
						{
							$sql = 'DELETE FROM ' . TOPICS_TABLE . " WHERE topic_id = $id";
			
							if (!$db->sql_query($sql))
							{
								message_die(GENERAL_ERROR, 'Could not remove topic', '', __LINE__, __FILE__, $sql);
							}
						}
					}

					$db->sql_freeresult($result);

##
##----------[ OPEN ]-------------------------------------
##

includes/functions_post.php

##
##----------[ FIND ]-------------------------------------
##

function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_id, &$post_id, &$poll_id, &$topic_type, &$bbcode_on, &$html_on, &$smilies_on, &$attach_sig, &$bbcode_uid, &$post_username, &$post_subject, &$post_message, &$poll_title, &$poll_options, &$poll_length)

##
##----------[ REPLACE WITH ]-----------------------------
##

function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_id, &$post_id, &$poll_id, &$topic_type, &$bbcode_on, &$html_on, &$smilies_on, &$attach_sig, &$bbcode_uid, $post_username, $post_subject, $post_message, $poll_title, &$poll_options, &$poll_length)

##
##----------[ FIND ]-------------------------------------
##

	if ($mode == 'delete')
	{
		$delete_sql = (!$post_data['first_post'] && !$post_data['last_post']) ? " AND user_id = " . $userdata['user_id'] : '';
		$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . " WHERE topic_id = $topic_id" . $delete_sql;
		if (!$db->sql_query($sql))
		{
			message_die(GENERAL_ERROR, 'Could not change topic notify data', '', __LINE__, __FILE__, $sql);
		}
	}
	else 

##
##----------[ REPLACE WITH ]-----------------------------
##

	if ($mode != 'delete')

##
##----------[ FIND ]-------------------------------------
##

		$page_title = $lang['Emoticons'] . " - $topic_title";

##
##----------[ REPLACE WITH ]-----------------------------
##

		$page_title = $lang['Emoticons'];

##
##----------[ OPEN ]-------------------------------------
##

includes/functions_search.php

##
##----------[ FIND ]-------------------------------------
##

function split_words(&$entry, $mode = 'post')

##
##----------[ REPLACE WITH ]-----------------------------
##

function split_words($entry, $mode = 'post')

##
##----------[ OPEN ]-------------------------------------
##

includes/functions_validate.php

##
##----------[ FIND ]-------------------------------------
##

	$username = phpbb_clean_username($username);
	
	$sql = "SELECT username 
		FROM " . USERS_TABLE . " 
		WHERE LOWER(username) = '" . strtolower($username) . "'";
	if ($result = $db->sql_query($sql))
	{
		if ($row = $db->sql_fetchrow($result))

##
##----------[ REPLACE WITH ]-----------------------------
##

	$username = phpbb_clean_username($username);

	$sql = "SELECT username 
		FROM " . USERS_TABLE . "
		WHERE LOWER(username) = '" . strtolower($username) . "'";
	if ($result = $db->sql_query($sql))
	{
		while ($row = $db->sql_fetchrow($result))

##
##----------[ FIND ]-------------------------------------
##

				if (preg_match("#\b(" . str_replace("\*", ".*?", phpbb_preg_quote($row['disallow_username'], '#')) . ")\b#i", $username))

##
##----------[ REPLACE WITH ]-----------------------------
##

				if (preg_match("#\b(" . str_replace("\*", ".*?", preg_quote($row['disallow_username'], '#')) . ")\b#i", $username))

##
##----------[ FIND ]-------------------------------------
##

				if (preg_match("#\b(" . str_replace("\*", ".*?", phpbb_preg_quote($row['word'], '#')) . ")\b#i", $username))

##
##----------[ REPLACE WITH ]-----------------------------
##

				if (preg_match("#\b(" . str_replace("\*", ".*?", preg_quote($row['word'], '#')) . ")\b#i", $username))

##
##----------[ OPEN ]-------------------------------------
##

includes/page_header.php

##
##----------[ FIND ]-------------------------------------
##

	$template->assign_block_vars('switch_user_logged_out', array());

##
##----------[ AFTER, ADD ]-------------------------------
##

	//
	// Allow autologin?
	//
	if (!isset($board_config['allow_autologin']) || $board_config['allow_autologin'] )
	{
		$template->assign_block_vars('switch_allow_autologin', array());
		$template->assign_block_vars('switch_user_logged_out.switch_allow_autologin', array());
	}

##
##----------[ OPEN ]-------------------------------------
##

includes/page_tail.php

##
##----------[ FIND ]-------------------------------------
##

//
// Show the overall footer.
//

##
##----------[ BEFORE, ADD ]------------------------------
##

global $do_gzip_compress;


##
##----------[ FIND ]-------------------------------------
##

	'TRANSLATION_INFO' => ( isset($lang['TRANSLATION_INFO']) ) ? $lang['TRANSLATION_INFO'] : '',

##
##----------[ REPLACE WITH ]-----------------------------
##

	'TRANSLATION_INFO' => (isset($lang['TRANSLATION_INFO'])) ? $lang['TRANSLATION_INFO'] : ((isset($lang['TRANSLATION'])) ? $lang['TRANSLATION'] : ''),

##
##----------[ OPEN ]-------------------------------------
##

includes/sessions.php

##
##----------[ FIND AND DELETE ]-------------------------------------
##

	$expiry_time = $current_time - $board_config['session_length'];

##
##----------[ FIND ]-------------------------------------
##

	// Try and pull the last time stored in a cookie, if it exists
	//
	$sql = "SELECT * 
		FROM " . USERS_TABLE . " 
		WHERE user_id = $user_id";
	if ( !($result = $db->sql_query($sql)) )
	{
		message_die(CRITICAL_ERROR, 'Could not obtain lastvisit data from user table', '', __LINE__, __FILE__, $sql);
	}

	$userdata = $db->sql_fetchrow($result);

	if ( $user_id != ANONYMOUS )
	{
		$auto_login_key = $userdata['user_password'];

		if ( $auto_create )
		{
			if ( isset($sessiondata['autologinid']) && $userdata['user_active'] )
			{
				// We have to login automagically
				if( $sessiondata['autologinid'] === $auto_login_key )
				{
					// autologinid matches password
					$login = 1;
					$enable_autologin = 1;
				}
				else
				{
					// No match; don't login, set as anonymous user
					$login = 0; 
					$enable_autologin = 0; 
					$user_id = $userdata['user_id'] = ANONYMOUS;
				
					$sql = 'SELECT * FROM ' . USERS_TABLE . ' WHERE user_id = ' . ANONYMOUS;
					$result = $db->sql_query($sql);
					$userdata = $db->sql_fetchrow($result);
					$db->sql_freeresult($result);
				}
			}
			else
			{
				// Autologin is not set. Don't login, set as anonymous user
				$login = 0;
				$enable_autologin = 0;
				$user_id = $userdata['user_id'] = ANONYMOUS;

				$sql = 'SELECT * FROM ' . USERS_TABLE . ' WHERE user_id = ' . ANONYMOUS;
				$result = $db->sql_query($sql);
				$userdata = $db->sql_fetchrow($result);
				$db->sql_freeresult($result);
			}
		}
		else
		{
			$login = 1;
		}
	}
	else
	{
		$login = 0;
		$enable_autologin = 0;

##
##----------[ REPLACE WITH ]-----------------------------
##

	// Are auto-logins allowed?
	// If allow_autologin is not set or is true then they are
	// (same behaviour as old 2.0.x session code)
	//
	if (isset($board_config['allow_autologin']) && !$board_config['allow_autologin'])
	{
		$enable_autologin = $sessiondata['autologinid'] = false;
	}

	// 
	// First off attempt to join with the autologin value if we have one
	// If not, just use the user_id value
	//
	$userdata = array();

	if ($user_id != ANONYMOUS)
	{
		if (isset($sessiondata['autologinid']) && (string) $sessiondata['autologinid'] != '' && $user_id)
		{
			$sql = 'SELECT u.* 
				FROM ' . USERS_TABLE . ' u, ' . SESSIONS_KEYS_TABLE . ' k
				WHERE u.user_id = ' . (int) $user_id . "
					AND u.user_active = 1
					AND k.user_id = u.user_id
					AND k.key_id = '" . md5($sessiondata['autologinid']) . "'";
			if (!($result = $db->sql_query($sql)))
			{
				message_die(CRITICAL_ERROR, 'Error doing DB query userdata row fetch', '', __LINE__, __FILE__, $sql);
			}

			$userdata = $db->sql_fetchrow($result);
			$db->sql_freeresult($result);
		
			$enable_autologin = $login = 1;
		}
		else if (!$auto_create)
		{
			$sessiondata['autologinid'] = '';
			$sessiondata['userid'] = $user_id;

			$sql = 'SELECT *
				FROM ' . USERS_TABLE . '
				WHERE user_id = ' . (int) $user_id . '
					AND user_active = 1';
			if (!($result = $db->sql_query($sql)))
			{
				message_die(CRITICAL_ERROR, 'Error doing DB query userdata row fetch', '', __LINE__, __FILE__, $sql);
			}

			$userdata = $db->sql_fetchrow($result);
			$db->sql_freeresult($result);

			$login = 1;
		}
	}

	//
	// At this point either $userdata should be populated or
	// one of the below is true
	// * Key didn't match one in the DB
	// * User does not exist
	// * User is inactive
	//
	if (!sizeof($userdata) || !is_array($userdata) || !$userdata)
	{
		$sessiondata['autologinid'] = '';
		$sessiondata['userid'] = $user_id = ANONYMOUS;
		$enable_autologin = $login = 0;

		$sql = 'SELECT *
			FROM ' . USERS_TABLE . '
			WHERE user_id = ' . (int) $user_id;
		if (!($result = $db->sql_query($sql)))
		{
			message_die(CRITICAL_ERROR, 'Error doing DB query userdata row fetch', '', __LINE__, __FILE__, $sql);
		}

		$userdata = $db->sql_fetchrow($result);
		$db->sql_freeresult($result);

##
##----------[ FIND ]-------------------------------------
##

	{// ( $userdata['user_session_time'] > $expiry_time && $auto_create ) ? $userdata['user_lastvisit'] : ( 

##
##----------[ REPLACE WITH ]-----------------------------
##

	{

##
##----------[ FIND ]-------------------------------------
##

		$sessiondata['autologinid'] = (!$admin) ? (( $enable_autologin && $sessionmethod == SESSION_METHOD_COOKIE ) ? $auto_login_key : '') : $sessiondata['autologinid'];

##
##----------[ REPLACE WITH ]-----------------------------
##

		//
		// Regenerate the auto-login key
		//
		if ($enable_autologin)
		{
			list($sec, $usec) = explode(' ', microtime());
			mt_srand(hexdec(substr($session_id, 0, 8)) + (float) $sec + ((float) $usec * 1000000));
			$auto_login_key = uniqid(mt_rand(), true);
			
			if (isset($sessiondata['autologinid']) && (string) $sessiondata['autologinid'] != '')
			{
				$sql = 'UPDATE ' . SESSIONS_KEYS_TABLE . "
					SET last_ip = '$user_ip', key_id = '" . md5($auto_login_key) . "', last_login = $current_time
					WHERE key_id = '" . md5($sessiondata['autologinid']) . "'";
			}
			else
			{
				$sql = 'INSERT INTO ' . SESSIONS_KEYS_TABLE . "(key_id, user_id, last_ip, last_login)
					VALUES ('" . md5($auto_login_key) . "', $user_id, '$user_ip', $current_time)";
			}

			if ( !$db->sql_query($sql) )
			{
				message_die(CRITICAL_ERROR, 'Error updating session key', '', __LINE__, __FILE__, $sql);
			}
			
			$sessiondata['autologinid'] = $auto_login_key;
			unset($auto_login_key);
		}
		else
		{
			$sessiondata['autologinid'] = '';
		}

//		$sessiondata['autologinid'] = (!$admin) ? (( $enable_autologin && $sessionmethod == SESSION_METHOD_COOKIE ) ? $auto_login_key : '') : $sessiondata['autologinid'];

##
##----------[ FIND ]-------------------------------------
##

	$userdata['session_admin'] = $admin;

##
##----------[ AFTER, ADD ]-------------------------------
##

	$userdata['session_key'] = $sessiondata['autologinid'];

##
##----------[ FIND ]-------------------------------------
##

					//
					// Delete expired sessions
					//
					$expiry_time = $current_time - $board_config['session_length'];

					$sql = "DELETE FROM " . SESSIONS_TABLE . " 
						WHERE session_time < $expiry_time 
							AND session_id <> '$session_id'";
					if ( !$db->sql_query($sql) )
					{
						message_die(CRITICAL_ERROR, 'Error clearing sessions table', '', __LINE__, __FILE__, $sql);
					}

##
##----------[ REPLACE WITH ]-----------------------------
##

					session_clean($userdata['session_id']);

##
##----------[ FIND ]-------------------------------------
##

//
// session_end closes out a session
// deleting the corresponding entry
// in the sessions table
//
function session_end($session_id, $user_id)
{
	global $db, $lang, $board_config;

##
##----------[ REPLACE WITH ]-----------------------------
##

/**
* Terminates the specified session
* It will delete the entry in the sessions table for this session,
* remove the corresponding auto-login key and reset the cookies
*/
function session_end($session_id, $user_id)
{
	global $db, $lang, $board_config, $userdata;

##
##----------[ FIND AND DELETE ]-------------------------------------
##

	//
	// Pull cookiedata or grab the URI propagated sid
	//
	if ( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) )
	{
		$session_id = isset( $HTTP_COOKIE_VARS[$cookiename . '_sid'] ) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : '';
		$sessionmethod = SESSION_METHOD_COOKIE;
	}
	else
	{
		$session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : '';
		$sessionmethod = SESSION_METHOD_GET;
	}


##
##----------[ FIND ]-------------------------------------
##

	$sql = "DELETE FROM " . SESSIONS_TABLE . " 

##
##----------[ REPLACE WITH ]-----------------------------
##

	$sql = 'DELETE FROM ' . SESSIONS_TABLE . " 

##
##----------[ FIND ]-------------------------------------
##

		message_die(CRITICAL_ERROR, 'Error removing user session', '', __LINE__, __FILE__, $sql);
	}

##
##----------[ AFTER, ADD ]-------------------------------
##

	//
	// Remove this auto-login entry (if applicable)
	//
	if ( isset($userdata['session_key']) && $userdata['session_key'] != '' )
	{
		$autologin_key = md5($userdata['session_key']);
		$sql = 'DELETE FROM ' . SESSIONS_KEYS_TABLE . '
			WHERE user_id = ' . (int) $user_id . "
				AND key_id = '$autologin_key'";
		if ( !$db->sql_query($sql) )
		{
			message_die(CRITICAL_ERROR, 'Error removing auto-login key', '', __LINE__, __FILE__, $sql);
		}
	}

	//
	// We expect that message_die will be called after this function,
	// but just in case it isn't, reset $userdata to the details for a guest
	//
	$sql = 'SELECT *
		FROM ' . USERS_TABLE . '
		WHERE user_id = ' . ANONYMOUS;
	if ( !($result = $db->sql_query($sql)) )
	{
		message_die(CRITICAL_ERROR, 'Error obtaining user details', '', __LINE__, __FILE__, $sql);
	}
	if ( !($userdata = $db->sql_fetchrow($result)) )
	{
		message_die(CRITICAL_ERROR, 'Error obtaining user details', '', __LINE__, __FILE__, $sql);
	}
	$db->sql_freeresult($result);



##
##----------[ FIND ]-------------------------------------
##

	setcookie($cookiename . '_data', '', $current_time - 31536000, $cookiepath, $cookiedomain, $cookiesecure);
	setcookie($cookiename . '_sid', '', $current_time - 31536000, $cookiepath, $cookiedomain, $cookiesecure);

	return true;
}

##
##----------[ AFTER, ADD ]-------------------------------
##

/**
* Removes expired sessions and auto-login keys from the database
*/
function session_clean($session_id)
{
	global $board_config, $db;

	//
	// Delete expired sessions
	//
	$sql = 'DELETE FROM ' . SESSIONS_TABLE . ' 
		WHERE session_time < ' . (time() - (int) $board_config['session_length']) . " 
			AND session_id <> '$session_id'";
	if ( !$db->sql_query($sql) )
	{
		message_die(CRITICAL_ERROR, 'Error clearing sessions table', '', __LINE__, __FILE__, $sql);
	}

	//
	// Delete expired auto-login keys
	// If max_autologin_time is not set then keys will never be deleted
	// (same behaviour as old 2.0.x session code)
	//
	if (!empty($board_config['max_autologin_time']) && $board_config['max_autologin_time'] > 0)
	{
		$sql = 'DELETE FROM ' . SESSIONS_KEYS_TABLE . '
			WHERE last_login < ' . (time() - (86400 * (int) $board_config['max_autologin_time']));
		$db->sql_query($sql);
	}

	return true;
}


##
##----------[ FIND ]-------------------------------------
##

		$url .= ( ( strpos($url, '?') != false ) ?  ( ( $non_html_amp ) ? '&' : '&amp;' ) : '?' ) . $SID;

##
##----------[ REPLACE WITH ]-----------------------------
##

		$url .= ( ( strpos($url, '?') !== false ) ?  ( ( $non_html_amp ) ? '&' : '&amp;' ) : '?' ) . $SID;

##
##----------[ OPEN ]-------------------------------------
##

includes/smtp.php

##
##----------[ FIND ]-------------------------------------
##

function server_parse($socket, $response, $line = __LINE__) 
{ 
	while (substr($server_response, 3, 1) != ' ') 

##
##----------[ REPLACE WITH ]-----------------------------
##

function server_parse($socket, $response, $line = __LINE__) 
{
	$server_response = '';
	while (substr($server_response, 3, 1) != ' ') 

##
##----------[ OPEN ]-------------------------------------
##

includes/usercp_activate.php

##
##----------[ FIND ]-------------------------------------
##

		if (intval($board_config['require_activation']) == USER_ACTIVATION_ADMIN && $userdata['user_level'] != ADMIN)
		{
			message_die(GENERAL_MESSAGE, $lang['Not_Authorised']);

##
##----------[ REPLACE WITH ]-----------------------------
##

		if (intval($board_config['require_activation']) == USER_ACTIVATION_ADMIN && $row['user_newpasswd'] == '')
		{
			if (!$userdata['session_logged_in'])
			{
				redirect(append_sid('login.' . $phpEx . '?redirect=profile.' . $phpEx . '&mode=activate&' . POST_USERS_URL . '=' . $row['user_id'] . '&act_key=' . trim($HTTP_GET_VARS['act_key'])));
			}
			else if ($userdata['user_level'] != ADMIN)
			{
				message_die(GENERAL_MESSAGE, $lang['Not_Authorised']);
			}

##
##----------[ OPEN ]-------------------------------------
##

includes/usercp_avatar.php

##
##----------[ FIND ]-------------------------------------
##

function user_avatar_gallery($mode, &$error, &$error_msg, $avatar_filename)
{
	global $board_config;

	$avatar_filename = str_replace(array('../', '..\\', './', '.\\'), '', $avatar_filename);
	if ($avatar_filename{0} == '/' || $avatar_filename{0} == "\\")
	{
		return '';
	}

	if ( file_exists(@phpbb_realpath($board_config['avatar_gallery_path'] . '/' . $avatar_filename)) && ($mode == 'editprofile') )
	{
		$return = ", user_avatar = '" . str_replace("\'", "''", $avatar_filename) . "', user_avatar_type = " . USER_AVATAR_GALLERY;

##
##----------[ REPLACE WITH ]-----------------------------
##

function user_avatar_gallery($mode, &$error, &$error_msg, $avatar_filename, $avatar_category)
{
	global $board_config;

	$avatar_filename = phpbb_ltrim(basename($avatar_filename), "'");
	$avatar_category = phpbb_ltrim(basename($avatar_category), "'");
	
	if(!preg_match('/(\.gif$|\.png$|\.jpg|\.jpeg)$/is', $avatar_filename))
	{
		return '';
	}

	if ($avatar_filename == "" || $avatar_category == "")
	{
		return '';
	} 

	if ( file_exists(@phpbb_realpath($board_config['avatar_gallery_path'] . '/' . $avatar_category . '/' . $avatar_filename)) && ($mode == 'editprofile') )
	{
		$return = ", user_avatar = '" . str_replace("\'", "''", $avatar_category . '/' . $avatar_filename) . "', user_avatar_type = " . USER_AVATAR_GALLERY;

##
##----------[ FIND ]-------------------------------------
##

	if ( $avatar_mode == 'remote' && preg_match('/^(http:\/\/)?([\w\-\.]+)\:?([0-9]*)\/(.*)$/', $avatar_filename, $url_ary) )

##
##----------[ BEFORE, ADD ]------------------------------
##

	$width = $height = 0;
	$type = '';


##
##----------[ FIND ]-------------------------------------
##

			list($width, $height) = @getimagesize($tmp_filename);

##
##----------[ REPLACE WITH ]-----------------------------
##

			list($width, $height, $type) = @getimagesize($tmp_filename);

##
##----------[ FIND ]-------------------------------------
##

		list($width, $height) = @getimagesize($avatar_filename);

##
##----------[ REPLACE WITH ]-----------------------------
##

		list($width, $height, $type) = @getimagesize($avatar_filename);

##
##----------[ FIND ]-------------------------------------
##

	if ( $width > 0 && $height > 0 && $width <= $board_config['avatar_max_width'] && $height <= $board_config['avatar_max_height'] )

##
##----------[ BEFORE, ADD ]------------------------------
##

	switch ($type)
	{
		// GIF
		case 1:
			if ($imgtype != '.gif')
			{
				@unlink($tmp_filename);
				message_die(GENERAL_ERROR, 'Unable to upload file', '', __LINE__, __FILE__);
			}
		break;

		// JPG, JPC, JP2, JPX, JB2
		case 2:
		case 9:
		case 10:
		case 11:
		case 12:
			if ($imgtype != '.jpg' && $imgtype != '.jpeg')
			{
				@unlink($tmp_filename);
				message_die(GENERAL_ERROR, 'Unable to upload file', '', __LINE__, __FILE__);
			}
		break;

		// PNG
		case 3:
			if ($imgtype != '.png')
			{
				@unlink($tmp_filename);
				message_die(GENERAL_ERROR, 'Unable to upload file', '', __LINE__, __FILE__);
			}
		break;

		default:
			@unlink($tmp_filename);
			message_die(GENERAL_ERROR, 'Unable to upload file', '', __LINE__, __FILE__);
	}


##
##----------[ FIND ]-------------------------------------
##

			if ( file_exists(@phpbb_realpath('./' . $board_config['avatar_path'] . '/' . $current_avatar)) )
			{
				@unlink('./' . $board_config['avatar_path'] . '/' . $current_avatar);
			}

##
##----------[ REPLACE WITH ]-----------------------------
##

			user_avatar_delete($current_type, $current_avatar);


##
##----------[ FIND ]-------------------------------------
##

					$avatar_images[$file][$avatar_row_count][$avatar_col_count] = $file . '/' . $sub_file; 

##
##----------[ REPLACE WITH ]-----------------------------
##

					$avatar_images[$file][$avatar_row_count][$avatar_col_count] = $sub_file; 

##
##----------[ FIND ]-------------------------------------
##

				"AVATAR_IMAGE" => $board_config['avatar_gallery_path'] . '/' . $avatar_images[$category][$i][$j], 

##
##----------[ REPLACE WITH ]-----------------------------
##

				"AVATAR_IMAGE" => $board_config['avatar_gallery_path'] . '/' . $category . '/' . $avatar_images[$category][$i][$j], 

##
##----------[ FIND ]-------------------------------------
##

	$s_hidden_vars = '<input type="hidden" name="sid" value="' . $session_id . '" /><input type="hidden" name="agreed" value="true" />';

##
##----------[ REPLACE WITH ]-----------------------------
##

	$s_hidden_vars = '<input type="hidden" name="sid" value="' . $session_id . '" /><input type="hidden" name="agreed" value="true" /><input type="hidden" name="avatarcatname" value="' . $category . '" />';

##
##----------[ OPEN ]-------------------------------------
##

includes/usercp_register.php

##
##----------[ FIND ]-------------------------------------
##

$error = FALSE;

##
##----------[ AFTER, ADD ]-------------------------------
##

$error_msg = '';

##
##----------[ FIND ]-------------------------------------
##

		$attachsig = ( isset($HTTP_POST_VARS['attachsig']) ) ? ( ($HTTP_POST_VARS['attachsig']) ? TRUE : 0 ) : 0;

##
##----------[ REPLACE WITH ]-----------------------------
##

		$attachsig = ( isset($HTTP_POST_VARS['attachsig']) ) ? ( ($HTTP_POST_VARS['attachsig']) ? TRUE : 0 ) : $userdata['user_attachsig'];

##
##----------[ FIND ]-------------------------------------
##

	$user_avatar_local = ( isset($HTTP_POST_VARS['avatarselect']) && !empty($HTTP_POST_VARS['submitavatar']) && $board_config['allow_avatar_local'] ) ? htmlspecialchars($HTTP_POST_VARS['avatarselect']) : ( ( isset($HTTP_POST_VARS['avatarlocal'])  ) ? htmlspecialchars($HTTP_POST_VARS['avatarlocal']) : '' );

##
##----------[ AFTER, ADD ]-------------------------------
##

	$user_avatar_category = ( isset($HTTP_POST_VARS['avatarcatname']) && $board_config['allow_avatar_local'] ) ? htmlspecialchars($HTTP_POST_VARS['avatarcatname']) : '' ;

##
##----------[ FIND ]-------------------------------------
##

	$user_avatar = ( empty($user_avatar_loc) && $mode == 'editprofile' ) ? $userdata['user_avatar'] : '';
	$user_avatar_type = ( empty($user_avatar_loc) && $mode == 'editprofile' ) ? $userdata['user_avatar_type'] : '';

##
##----------[ REPLACE WITH ]-----------------------------
##

	$user_avatar = ( empty($user_avatar_local) && $mode == 'editprofile' ) ? $userdata['user_avatar'] : '';
	$user_avatar_type = ( empty($user_avatar_local) && $mode == 'editprofile' ) ? $userdata['user_avatar_type'] : '';

##
##----------[ FIND ]-------------------------------------
##

		$signature = stripslashes($signature);

##
##----------[ REPLACE WITH ]-----------------------------
##

		$signature = htmlspecialchars(stripslashes($signature));

##
##----------[ FIND ]-------------------------------------
##

			$user_avatar = $user_avatar_local;

##
##----------[ REPLACE WITH ]-----------------------------
##

			$user_avatar = $user_avatar_category . '/' . $user_avatar_local;

##
##----------[ FIND ]-------------------------------------
##

		if ( $signature_bbcode_uid == '' )

##
##----------[ REPLACE WITH ]-----------------------------
##

		if ( !isset($signature_bbcode_uid) || $signature_bbcode_uid == '' )

##
##----------[ FIND ]-------------------------------------
##

		if ( @file_exists(@phpbb_realpath('./' . $board_config['avatar_path'] . '/' . $userdata['user_avatar'])) )
		{
			@unlink(@phpbb_realpath('./' . $board_config['avatar_path'] . '/' . $userdata['user_avatar']));
		}

##
##----------[ REPLACE WITH ]-----------------------------
##

		user_avatar_delete($userdata['user_avatar_type'], $userdata['user_avatar']);

##
##----------[ FIND ]-------------------------------------
##

		if ( @file_exists(@phpbb_realpath('./' . $board_config['avatar_path'] . '/' . $userdata['user_avatar'])) )
		{
			@unlink(@phpbb_realpath('./' . $board_config['avatar_path'] . '/' . $userdata['user_avatar']));
		}
		$avatar_sql = user_avatar_gallery($mode, $error, $error_msg, $user_avatar_local);

##
##----------[ REPLACE WITH ]-----------------------------
##

		user_avatar_delete($userdata['user_avatar_type'], $userdata['user_avatar']);
		$avatar_sql = user_avatar_gallery($mode, $error, $error_msg, $user_avatar_local, $user_avatar_category);

##
##----------[ FIND ]-------------------------------------
##

				$emailer->from($board_config['board_email']);
				$emailer->replyto($board_config['board_email']);

				$emailer->use_template('user_activate', stripslashes($user_lang));
				$emailer->email_address($email);
				$emailer->set_subject($lang['Reactivate']);

				$emailer->assign_vars(array(
					'SITENAME' => $board_config['sitename'],
					'USERNAME' => preg_replace($unhtml_specialchars_match, $unhtml_specialchars_replace, substr(str_replace("\'", "'", $username), 0, 25)),
					'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']) : '',

					'U_ACTIVATE' => $server_url . '?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey)
				);
				$emailer->send();
				$emailer->reset();

##
##----------[ REPLACE WITH ]-----------------------------
##

 				if ( $board_config['require_activation'] != USER_ACTIVATION_ADMIN )
 				{
 					$emailer->from($board_config['board_email']);
 					$emailer->replyto($board_config['board_email']);
 
 					$emailer->use_template('user_activate', stripslashes($user_lang));
 					$emailer->email_address($email);
 					$emailer->set_subject($lang['Reactivate']);
  
 					$emailer->assign_vars(array(
 						'SITENAME' => $board_config['sitename'],
 						'USERNAME' => preg_replace($unhtml_specialchars_match, $unhtml_specialchars_replace, substr(str_replace("\'", "'", $username), 0, 25)),
 						'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']) : '',
  
 						'U_ACTIVATE' => $server_url . '?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey)
 					);
 					$emailer->send();
 					$emailer->reset();
 				}
 				else if ( $board_config['require_activation'] == USER_ACTIVATION_ADMIN )
 				{
 					$sql = 'SELECT user_email, user_lang 
 						FROM ' . USERS_TABLE . '
 						WHERE user_level = ' . ADMIN;
 					
 					if ( !($result = $db->sql_query($sql)) )
 					{
 						message_die(GENERAL_ERROR, 'Could not select Administrators', '', __LINE__, __FILE__, $sql);
 					}
 					
 					while ($row = $db->sql_fetchrow($result))
 					{
 						$emailer->from($board_config['board_email']);
 						$emailer->replyto($board_config['board_email']);
 						
 						$emailer->email_address(trim($row['user_email']));
 						$emailer->use_template("admin_activate", $row['user_lang']);
 						$emailer->set_subject($lang['Reactivate']);
 
 						$emailer->assign_vars(array(
 							'USERNAME' => preg_replace($unhtml_specialchars_match, $unhtml_specialchars_replace, substr(str_replace("\'", "'", $username), 0, 25)),
 							'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']),
 
 							'U_ACTIVATE' => $server_url . '?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey)
 						);
 						$emailer->send();
 						$emailer->reset();
 					}
 					$db->sql_freeresult($result);
 				}

##
##----------[ FIND ]-------------------------------------
##

	display_avatar_gallery($mode, $avatar_category, $user_id, $email, $current_email, $coppa, $username, $email, &$new_password, &$cur_password, $password_confirm, $icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature, $viewemail, $notifypm, $popup_pm, $notifyreply, $attachsig, $allowhtml, $allowbbcode, $allowsmilies, $allowviewonline, $user_style, $user_lang, $user_timezone, $user_dateformat, $userdata['session_id']);

##
##----------[ REPLACE WITH ]-----------------------------
##

	display_avatar_gallery($mode, $avatar_category, $user_id, $email, $current_email, $coppa, $username, $email, $new_password, $cur_password, $password_confirm, $icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature, $viewemail, $notifypm, $popup_pm, $notifyreply, $attachsig, $allowhtml, $allowbbcode, $allowsmilies, $allowviewonline, $user_style, $user_lang, $user_timezone, $user_dateformat, $userdata['session_id']);

##
##----------[ FIND ]-------------------------------------
##

	if ( !isset($user_template) )
	{
		$selected_template = $board_config['system_template'];

##
##----------[ REPLACE WITH ]-----------------------------
##

	if ( !isset($user_style) )
	{
		$user_style = $board_config['default_style'];

##
##----------[ FIND ]-------------------------------------
##

		$s_hidden_fields .= '<input type="hidden" name="avatarlocal" value="' . $user_avatar_local . '" />';

##
##----------[ REPLACE WITH ]-----------------------------
##

		$s_hidden_fields .= '<input type="hidden" name="avatarlocal" value="' . $user_avatar_local . '" /><input type="hidden" name="avatarcatname" value="' . $user_avatar_category . '" />';

##
##----------[ OPEN ]-------------------------------------
##

includes/usercp_sendpasswd.php

##
##----------[ FIND ]-------------------------------------
##

			$key_len = ( $str_len > 6 ) ? $key_len : 6;

##
##----------[ REPLACE WITH ]-----------------------------
##

			$key_len = ($key_len > 6) ? $key_len : 6;

##
##----------[ OPEN ]-------------------------------------
##

includes/usercp_viewprofile.php

##
##----------[ FIND ]-------------------------------------
##

$search_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_search'] . '" alt="' . $lang['Search_user_posts'] . '" title="' . sprintf($lang['Search_user_posts'], $profiledata['username']) . '" border="0" /></a>';

##
##----------[ REPLACE WITH ]-----------------------------
##

$search_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_search'] . '" alt="' . sprintf($lang['Search_user_posts'], $profiledata['username']) . '" title="' . sprintf($lang['Search_user_posts'], $profiledata['username']) . '" border="0" /></a>';

##
##----------[ OPEN ]-------------------------------------
##

language/lang_english/email/topic_notify.tpl

##
##----------[ FIND ]-------------------------------------
##

Hello {USERNAME},

##
##----------[ REPLACE WITH ]-----------------------------
##

Hello,

##
##----------[ OPEN ]-------------------------------------
##

language/lang_english/lang_admin.php

##
##----------[ FIND ]-------------------------------------
##

$lang['Visual_confirm'] = 'Enable Visual Confirmation';
$lang['Visual_confirm_explain'] = 'Requires users enter a code defined by an image when registering.';

##
##----------[ AFTER, ADD ]-------------------------------
##


// Autologin Keys - added 2.0.18
$lang['Allow_autologin'] = 'Allow automatic logins';
$lang['Allow_autologin_explain'] = 'Determines whether users are allowed to select to be automatically logged in when visiting the forum';
$lang['Autologin_time'] = 'Automatic login key expiry';
$lang['Autologin_time_explain'] = 'How long a autologin key is valid for in days if the user does not visit the board. Set to zero to disable expiry.';

##
##----------[ FIND ]-------------------------------------
##

$lang['Stylesheet'] = 'CSS Stylesheet';

##
##----------[ AFTER, ADD ]-------------------------------
##

$lang['Stylesheet_explain'] = 'Filename for CSS stylesheet to use for this theme.';

##
##----------[ OPEN ]-------------------------------------
##

language/lang_english/lang_main.php

##
##----------[ FIND AND DELETE ]-------------------------------------
##

$lang['Send_email'] = 'Send e-mail to user';

##
##----------[ FIND AND DELETE ]-------------------------------------
##

$lang['Delete_post'] = 'Delete this post';

##
##----------[ FIND ]-------------------------------------
##

$lang['Email'] = 'E-mail';
$lang['Send_private_message'] = 'Send private message';
$lang['Hidden_email'] = '[ Hidden ]';
$lang['Search_user_posts'] = 'Search for posts by this user';

##
##----------[ REPLACE WITH ]-----------------------------
##

$lang['Send_private_message'] = 'Send private message';
$lang['Hidden_email'] = '[ Hidden ]';

##
##----------[ FIND AND DELETE ]-------------------------------------
##

$lang['Too_many_registers'] = 'You have made too many registration attempts. Please try again later.';

##
##----------[ OPEN ]-------------------------------------
##

templates/subSilver/admin/board_config_body.tpl

##
##----------[ FIND ]-------------------------------------
##

		<td class="row1">{L_BOARD_EMAIL_FORM}<br /><span class="gensmall">{L_BOARD_EMAIL_FORM_EXPLAIN}</span></td>
		<td class="row2"><input type="radio" name="board_email_form" value="1" {BOARD_EMAIL_FORM_ENABLE} /> {L_ENABLED}&nbsp;&nbsp;<input type="radio" name="board_email_form" value="0" {BOARD_EMAIL_FORM_DISABLE} /> {L_DISABLED}</td>

##
##----------[ BEFORE, ADD ]------------------------------
##

		<td class="row1">{L_ALLOW_AUTOLOGIN}<br /><span class="gensmall">{L_ALLOW_AUTOLOGIN_EXPLAIN}</span></td>
		<td class="row2"><input type="radio" name="allow_autologin" value="1" {ALLOW_AUTOLOGIN_YES} />{L_YES}&nbsp; &nbsp;<input type="radio" name="allow_autologin" value="0" {ALLOW_AUTOLOGIN_NO} />{L_NO}</td>
	</tr>
	<tr>
		<td class="row1">{L_AUTOLOGIN_TIME} <br /><span class="gensmall">{L_AUTOLOGIN_TIME_EXPLAIN}</span></td>
		<td class="row2"><input class="post" type="text" size="3" maxlength="4" name="max_autologin_time" value="{AUTOLOGIN_TIME}" /></td>
	</tr>
	<tr>

##
##----------[ OPEN ]-------------------------------------
##

templates/subSilver/admin/forum_admin_body.tpl

##
##----------[ FIND ]-------------------------------------
##

		<td class="catRight" align="center" valign="middle"><span class="gen">&nbsp</span></td>

##
##----------[ REPLACE WITH ]-----------------------------
##

		<td class="catRight" align="center" valign="middle"><span class="gen">&nbsp;</span></td>

##
##----------[ OPEN ]-------------------------------------
##

templates/subSilver/admin/index_frameset.tpl

##
##----------[ FIND ]-------------------------------------
##

<html>

##
##----------[ REPLACE WITH ]-----------------------------
##

<html dir="{S_CONTENT_DIRECTION}">

##
##----------[ OPEN ]-------------------------------------
##

templates/subSilver/admin/page_header.tpl

##
##----------[ FIND ]-------------------------------------
##

<html>

##
##----------[ REPLACE WITH ]-----------------------------
##

<html dir="{S_CONTENT_DIRECTION}">

##
##----------[ OPEN ]-------------------------------------
##

templates/subSilver/admin/styles_addnew_body.tpl

##
##----------[ FIND ]-------------------------------------
##

<P>{L_STYLES_ADD_TEXT}</p>

##
##----------[ REPLACE WITH ]-----------------------------
##

<p>{L_STYLES_ADD_TEXT}</p>

##
##----------[ FIND ]-------------------------------------
##

</table></form>

##
##----------[ REPLACE WITH ]-----------------------------
##

</table>

##
##----------[ OPEN ]-------------------------------------
##

templates/subSilver/admin/styles_edit_body.tpl

##
##----------[ FIND ]-------------------------------------
##

		<td class="row1">{L_STYLESHEET}:<br /><span class="gensmall">Filename for CSS stylesheet to use for this theme.</span></td>

##
##----------[ REPLACE WITH ]-----------------------------
##

		<td class="row1">{L_STYLESHEET}:<br /><span class="gensmall">{L_STYLESHEET_EXPLAIN}</span></td>

##
##----------[ OPEN ]-------------------------------------
##

templates/subSilver/admin/styles_list_body.tpl

##
##----------[ FIND ]-------------------------------------
##

<P>{L_STYLES_TEXT}</p>

##
##----------[ REPLACE WITH ]-----------------------------
##

<p>{L_STYLES_TEXT}</p>

##
##----------[ FIND ]-------------------------------------
##

</table></form>

##
##----------[ REPLACE WITH ]-----------------------------
##

</table>

##
##----------[ OPEN ]-------------------------------------
##

templates/subSilver/admin/user_edit_body.tpl

##
##----------[ FIND ]-------------------------------------
##

		<input class="post" type="text" name="avatarurl" size="40" class="post" style="width: 200px"  />

##
##----------[ REPLACE WITH ]-----------------------------
##

		<input class="post" type="text" name="avatarurl" size="40" style="width: 200px"  />

##
##----------[ FIND ]-------------------------------------
##

		<input class="post" type="text" name="avatarremoteurl" size="40" class="post" style="width: 200px"  />

##
##----------[ REPLACE WITH ]-----------------------------
##

		<input class="post" type="text" name="avatarremoteurl" size="40" style="width: 200px"  />

##
##----------[ OPEN ]-------------------------------------
##

templates/subSilver/bbcode.tpl

##
##----------[ FIND ]-------------------------------------
##

<!-- BEGIN email --><a href="mailto:{EMAIL}">{EMAIL}</A><!-- END email -->

##
##----------[ REPLACE WITH ]-----------------------------
##

<!-- BEGIN email --><a href="mailto:{EMAIL}">{EMAIL}</a><!-- END email -->

##
##----------[ OPEN ]-------------------------------------
##

templates/subSilver/groupcp_info_body.tpl

##
##----------[ FIND ]-------------------------------------
##

		<td class="row2"><span class="gen"><span class="gen"><input type="radio" name="group_type" value="{S_GROUP_OPEN_TYPE}" {S_GROUP_OPEN_CHECKED} /> {L_GROUP_OPEN} &nbsp;&nbsp;<input type="radio" name="group_type" value="{S_GROUP_CLOSED_TYPE}" {S_GROUP_CLOSED_CHECKED} />	{L_GROUP_CLOSED} &nbsp;&nbsp;<input type="radio" name="group_type" value="{S_GROUP_HIDDEN_TYPE}" {S_GROUP_HIDDEN_CHECKED} />	{L_GROUP_HIDDEN} &nbsp;&nbsp; <input class="mainoption" type="submit" name="groupstatus" value="{L_UPDATE}" /></span></td>

##
##----------[ REPLACE WITH ]-----------------------------
##

		<td class="row2"><span class="gen"><input type="radio" name="group_type" value="{S_GROUP_OPEN_TYPE}" {S_GROUP_OPEN_CHECKED} /> {L_GROUP_OPEN} &nbsp;&nbsp;<input type="radio" name="group_type" value="{S_GROUP_CLOSED_TYPE}" {S_GROUP_CLOSED_CHECKED} />	{L_GROUP_CLOSED} &nbsp;&nbsp;<input type="radio" name="group_type" value="{S_GROUP_HIDDEN_TYPE}" {S_GROUP_HIDDEN_CHECKED} />	{L_GROUP_HIDDEN} &nbsp;&nbsp; <input class="mainoption" type="submit" name="groupstatus" value="{L_UPDATE}" /></span></td>

##
##----------[ FIND ]-------------------------------------
##

		<td class="catBottom" colspan="8" align="right"><span class="cattitle">
			<input type="submit" name="remove" value="{L_REMOVE_SELECTED}" class="mainoption" />

##
##----------[ REPLACE WITH ]-----------------------------
##

		<td class="catBottom" colspan="8" align="right">
			<span class="cattitle"><input type="submit" name="remove" value="{L_REMOVE_SELECTED}" class="mainoption" /></span>

##
##----------[ OPEN ]-------------------------------------
##

templates/subSilver/index_body.tpl

##
##----------[ FIND ]-------------------------------------
##

	<td align="left"><span class="gensmall"><a href="{U_MARK_READ}" class="gensmall">{L_MARK_FORUMS_READ}</a></span></td>

##
##----------[ REPLACE WITH ]-----------------------------
##

 	<td align="left">
 	<!-- BEGIN switch_user_logged_in -->
 		<span class="gensmall"><a href="{U_MARK_READ}" class="gensmall">{L_MARK_FORUMS_READ}</a></span>
 	<!-- END switch_user_logged_in -->
 	</td>

##
##----------[ FIND ]-------------------------------------
##

		<input class="post" type="password" name="password" size="10" maxlength="32" />

##
##----------[ AFTER, ADD ]-------------------------------
##

		<!-- BEGIN switch_allow_autologin -->

##
##----------[ FIND ]-------------------------------------
##

		&nbsp;&nbsp; &nbsp;&nbsp;{L_AUTO_LOGIN} 
		<input class="text" type="checkbox" name="autologin" />

##
##----------[ AFTER, ADD ]-------------------------------
##

		<!-- END switch_allow_autologin -->

##
##----------[ OPEN ]-------------------------------------
##

templates/subSilver/login_body.tpl

##
##----------[ FIND ]-------------------------------------
##

		  <tr align="center"> 
			<td colspan="2"><span class="gen">{L_AUTO_LOGIN}: <input type="checkbox" name="autologin" /></span></td>
		  </tr>

##
##----------[ BEFORE, ADD ]------------------------------
##

		  <!-- BEGIN switch_allow_autologin -->

##
##----------[ AFTER, ADD ]-------------------------------
##

		  <!-- END switch_allow_autologin -->

##
##----------[ OPEN ]-------------------------------------
##

templates/subSilver/overall_header.tpl

##
##----------[ FIND ]-------------------------------------
##

						<td align="center" valign="top" nowrap="nowrap"><span class="mainmenu">&nbsp;<a href="{U_FAQ}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_faq.gif" width="12" height="13" border="0" alt="{L_FAQ}" hspace="3" />{L_FAQ}</a></span><span class="mainmenu">&nbsp; &nbsp;<a href="{U_SEARCH}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_search.gif" width="12" height="13" border="0" alt="{L_SEARCH}" hspace="3" />{L_SEARCH}</a>&nbsp; &nbsp;<a href="{U_MEMBERLIST}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_members.gif" width="12" height="13" border="0" alt="{L_MEMBERLIST}" hspace="3" />{L_MEMBERLIST}</a>&nbsp; &nbsp;<a href="{U_GROUP_CP}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_groups.gif" width="12" height="13" border="0" alt="{L_USERGROUPS}" hspace="3" />{L_USERGROUPS}</a>&nbsp; 
						<!-- BEGIN switch_user_logged_out -->
						&nbsp;<a href="{U_REGISTER}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_register.gif" width="12" height="13" border="0" alt="{L_REGISTER}" hspace="3" />{L_REGISTER}</a></span>&nbsp;
						<!-- END switch_user_logged_out -->
						</td>

##
##----------[ REPLACE WITH ]-----------------------------
##

						<td align="center" valign="top" nowrap="nowrap"><span class="mainmenu">&nbsp;<a href="{U_FAQ}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_faq.gif" width="12" height="13" border="0" alt="{L_FAQ}" hspace="3" />{L_FAQ}</a>&nbsp; &nbsp;<a href="{U_SEARCH}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_search.gif" width="12" height="13" border="0" alt="{L_SEARCH}" hspace="3" />{L_SEARCH}</a>&nbsp; &nbsp;<a href="{U_MEMBERLIST}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_members.gif" width="12" height="13" border="0" alt="{L_MEMBERLIST}" hspace="3" />{L_MEMBERLIST}</a>&nbsp; &nbsp;<a href="{U_GROUP_CP}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_groups.gif" width="12" height="13" border="0" alt="{L_USERGROUPS}" hspace="3" />{L_USERGROUPS}</a>&nbsp; 
						<!-- BEGIN switch_user_logged_out -->
						&nbsp;<a href="{U_REGISTER}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_register.gif" width="12" height="13" border="0" alt="{L_REGISTER}" hspace="3" />{L_REGISTER}</a>&nbsp;
						<!-- END switch_user_logged_out -->
						</span></td>

##
##----------[ OPEN ]-------------------------------------
##

templates/subSilver/profile_add_body.tpl

##
##----------[ FIND ]-------------------------------------
##

		<input type="text" name="icq" class="post"style="width: 100px"  size="10" maxlength="15" value="{ICQ}" />

##
##----------[ REPLACE WITH ]-----------------------------
##

		<input type="text" name="icq" class="post" style="width: 100px"  size="10" maxlength="15" value="{ICQ}" />

##
##----------[ FIND ]-------------------------------------
##

		<input type="text" class="post"style="width: 150px"  name="aim" size="20" maxlength="255" value="{AIM}" />

##
##----------[ REPLACE WITH ]-----------------------------
##

		<input type="text" class="post" style="width: 150px"  name="aim" size="20" maxlength="255" value="{AIM}" />

##
##----------[ FIND ]-------------------------------------
##

		<input type="text" class="post"style="width: 150px"  name="msn" size="20" maxlength="255" value="{MSN}" />

##
##----------[ REPLACE WITH ]-----------------------------
##

		<input type="text" class="post" style="width: 150px"  name="msn" size="20" maxlength="255" value="{MSN}" />

##
##----------[ FIND ]-------------------------------------
##

		<input type="text" class="post"style="width: 150px"  name="yim" size="20" maxlength="255" value="{YIM}" />

##
##----------[ REPLACE WITH ]-----------------------------
##

		<input type="text" class="post" style="width: 150px"  name="yim" size="20" maxlength="255" value="{YIM}" />

##
##----------[ FIND ]-------------------------------------
##

		<input type="text" class="post"style="width: 200px"  name="website" size="25" maxlength="255" value="{WEBSITE}" />

##
##----------[ REPLACE WITH ]-----------------------------
##

		<input type="text" class="post" style="width: 200px"  name="website" size="25" maxlength="255" value="{WEBSITE}" />

##
##----------[ FIND ]-------------------------------------
##

		<input type="text" class="post"style="width: 200px"  name="location" size="25" maxlength="100" value="{LOCATION}" />

##
##----------[ REPLACE WITH ]-----------------------------
##

		<input type="text" class="post" style="width: 200px"  name="location" size="25" maxlength="100" value="{LOCATION}" />

##
##----------[ FIND ]-------------------------------------
##

		<input type="text" class="post"style="width: 200px"  name="occupation" size="25" maxlength="100" value="{OCCUPATION}" />

##
##----------[ REPLACE WITH ]-----------------------------
##

		<input type="text" class="post" style="width: 200px"  name="occupation" size="25" maxlength="100" value="{OCCUPATION}" />

##
##----------[ FIND ]-------------------------------------
##

		<input type="text" class="post"style="width: 200px"  name="interests" size="35" maxlength="150" value="{INTERESTS}" />

##
##----------[ REPLACE WITH ]-----------------------------
##

		<input type="text" class="post" style="width: 200px"  name="interests" size="35" maxlength="150" value="{INTERESTS}" />

##
##----------[ FIND ]-------------------------------------
##

		<textarea name="signature"style="width: 300px"  rows="6" cols="30" class="post">{SIGNATURE}</textarea>

##
##----------[ REPLACE WITH ]-----------------------------
##

		<textarea name="signature" style="width: 300px" rows="6" cols="30" class="post">{SIGNATURE}</textarea>

##
##----------[ OPEN ]-------------------------------------
##

templates/subSilver/search_body.tpl

##
##----------[ FIND ]-------------------------------------
##

		<td class="row2" valign="middle" nowrap="nowrap"><span class="genmed"><select class="post" name="sort_by">{S_SORT_OPTIONS}</select><br /><input type="radio" name="sort_dir" value="ASC" /> {L_SORT_ASCENDING}<br /><input type="radio" name="sort_dir" value="DESC" checked /> {L_SORT_DESCENDING}</span>&nbsp;</td>

##
##----------[ REPLACE WITH ]-----------------------------
##

		<td class="row2" valign="middle" nowrap="nowrap"><span class="genmed"><select class="post" name="sort_by">{S_SORT_OPTIONS}</select><br /><input type="radio" name="sort_dir" value="ASC" /> {L_SORT_ASCENDING}<br /><input type="radio" name="sort_dir" value="DESC" checked="checked" /> {L_SORT_DESCENDING}</span>&nbsp;</td>

##
##----------[ OPEN ]-------------------------------------
##

templates/subSilver/search_results_posts.tpl

##
##----------[ FIND ]-------------------------------------
##

	<td class="catHead" colspan="2" height="28"><span class="topictitle"><img src="templates/subSilver/images/folder.gif" align="absmiddle">&nbsp; {L_TOPIC}:&nbsp;<a href="{searchresults.U_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a></span></td>

##
##----------[ REPLACE WITH ]-----------------------------
##

	<td class="catHead" colspan="2" height="28"><span class="topictitle"><img src="templates/subSilver/images/folder.gif" align="absmiddle" />&nbsp; {L_TOPIC}:&nbsp;<a href="{searchresults.U_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a></span></td>

##
##----------[ OPEN ]-------------------------------------
##

templates/subSilver/subSilver.cfg

##
##----------[ FIND ]-------------------------------------
##

$images['topic_watch'] = "";

##
##----------[ REPLACE WITH ]-----------------------------
##

$images['Topic_watch'] = "";

##
##----------[ SAVE AND CLOSE ALL FILES ]-----------------
##
##     End
##